From 3cf090bd627f788ff2a4fb9435a594aa0bead18f Mon Sep 17 00:00:00 2001 From: Danielle Mayabb Date: Thu, 30 May 2024 13:16:07 -0700 Subject: [PATCH] Add 'total hours' to more reports - Add to project details - Add to projects evaluation --- web/js/projectDetailsReport.js | 968 ++++++++++++++++++--------------- web/projectsEvaluation.php | 51 +- 2 files changed, 577 insertions(+), 442 deletions(-) diff --git a/web/js/projectDetailsReport.js b/web/js/projectDetailsReport.js index d6f383a17..a0abb9914 100644 --- a/web/js/projectDetailsReport.js +++ b/web/js/projectDetailsReport.js @@ -17,454 +17,572 @@ * along with PhpReport. If not, see . */ -Ext.onReady(function(){ - - // Main Panel - var mainPanel = new Ext.FormPanel({ - width: 426, - labelWidth: 125, - frame:true, - layout: 'table', - layoutConfig:{ - columns: 2, - tableAttrs: { - style: { - width: '100%' - } - } - }, - title: 'Project Data', - bodyStyle: 'padding:5px 5px 0px 5px;', - defaults: { - colspan: 2, - }, - defaultType: 'fieldset', - items:[{ - xtype: 'fieldset', - autoWidth: true, - columnWidth: 0.5, - title: 'Basic Data', - collapsible: true, - autoHeight: true, - defaults: { - width: 250, - labelStyle: 'width: 125; font-weight:bold; padding: 0 0 0 0;', - }, - defaultType:'displayfield', - items: [{ - id:'name', - name: 'name', - fieldLabel:'Name', - value: projectData.description, - },{ - id:'id', - name: 'id', - fieldLabel:'Id', - value: projectData.id, - },{ - id:'customer', - name: 'customer', - fieldLabel:'Customer', - value: projectData.customerName, - },{ - id:'init', - name: 'init', - fieldLabel:'Init Date', - value: (projectData.initDate)? projectData.initDate.format('d/m/Y') : "---", - },{ - id:'end', - name: 'end', - fieldLabel:'End Date', - value: (projectData.endDate)? projectData.endDate.format('d/m/Y') : "---", - },{ - id:'active', - name:'active', - fieldLabel: 'Active', - value: projectData.active? "Yes":"No", - //check if project is active but finish date has passed - style: (projectData.active && projectData.endDate && new Date() > projectData.endDate)? - {color:"red"} : {}, - },{ - id: 'estHours', - name:'estHours', - fieldLabel: 'Estimated Hours', - value: projectData.estimatedHours, - },{ - id: 'movedHours', - name:'movedHours', - fieldLabel: 'Moved Hours', - value: projectData.movedHours, - },{ - id: 'invoice', - name:'invoice', - fieldLabel: 'Invoice', - value: projectData.invoice, - },{ - id: 'Type', - name:'Type', - fieldLabel: 'Type', - value: projectData.type, - } - ] - },{ - xtype: 'fieldset', - columnWidth: 0.5, - title: 'Work Hours Data', - width: 200, - collapsible: true, - colspan: 1, - autoHeight: true, - defaults: { - width: 50, - labelStyle: 'width: 125; font-weight:bold; padding: 0 0 0 0;', - }, - defaultType:'displayfield', - items: [{ - id: 'estimatedHoursWithMoved', - name:'estimatedHoursWithMoved', - fieldLabel: 'Estimated Hours', - value: projectData.finalEstimatedHours, - },{ - id: 'workedHours', - name:'workedHours', - fieldLabel: 'Worked Hours', - value: projectData.workedHours, - },{ - id: 'workDeviation', - name:'workDeviation', - fieldLabel: 'Deviation', - value: projectData.workDeviation, - },{ - id: 'workDeviationPercent', - name:'workDeviationPercent', - fieldLabel: 'Deviation %', - value: projectData.workDeviationPercent, - }, - (projectData.futureLoggedHours > 0) ? - { - id: 'futureLoggedHours', - name:'futureLoggedHours', - fieldLabel: 'Hours Logged in The Future', - value: projectData.futureLoggedHours, - labelStyle: 'color:red; font-weight:bold;', - style: {color:"red"}, - } : {}, - ] - },{ - xtype: 'fieldset', - columnWidth: 0.5, - width: 200, - title: 'Price Per Hour Data', - collapsible: true, - colspan:1, - autoHeight: true, - defaults: { - width: 50, - labelStyle: 'width: 125; font-weight:bold; padding: 0 0 0 0;', - }, - defaultType:'displayfield', - items: [{ - id: 'estInvoice', - name:'estInvoice', - fieldLabel: 'Estimated Price', - value: projectData.estInvoice, - },{ - id: 'currentInvoice', - name:'currentInvoice', - fieldLabel: 'Current Price', - value: projectData.currentInvoice, - },{ - id: 'invoiceDeviation', - name:'invoiceDeviation', - fieldLabel: 'Deviation', - value: projectData.invoiceDeviation, - },{ - id: 'invoiceDeviationPercent', - name:'invoiceDeviationPercent', - fieldLabel: 'Deviation %', - value: projectData.invoiceDeviationPercent, - } - ] - }] - }); - - mainPanel.render(Ext.get("content")); - - Ext.ux.DynamicGridPanel = Ext.extend(Ext.ux.ExportableGridPanel, { - - initComponent: function(){ - /** - * Default configuration options. - * - * You are free to change the values or add/remove options. - * The important point is to define a data store with JsonReader - * without configuration and columns with empty array. We are going - * to setup our reader with the metaData information returned by the server. - * See http://extjs.com/deploy/dev/docs/?class=Ext.data.JsonReader for more - * information how to configure your JsonReader with metaData. - * - * A data store with remoteSort = true displays strange behaviours such as - * not to display arrows when you sort the data and inconsistent ASC, DESC option. - * Any suggestions are welcome - */ - var config = { - viewConfig: {forceFit: true}, - stateful: true, - loadMask: true, - stripeRows: true, - ds: new Ext.data.Store({ - url: this.storeUrl, - reader: new Ext.data.JsonReader() - }), - columns: [] - }; - - Ext.apply(this, config); - Ext.apply(this.initialConfig, config); - - Ext.ux.DynamicGridPanel.superclass.initComponent.apply(this, arguments); +Ext.onReady(function () { + let taskHoursTotalDisplayGrid1 = ''; + let taskHoursTotalDisplayGrid2 = ''; + let taskHoursTotalDisplayGrid3 = ''; + // Main Panel + var mainPanel = new Ext.FormPanel({ + width: 426, + labelWidth: 125, + frame: true, + layout: 'table', + layoutConfig: { + columns: 2, + tableAttrs: { + style: { + width: '100%' + } + } + }, + title: 'Project Data', + bodyStyle: 'padding:5px 5px 0px 5px;', + defaults: { + colspan: 2 + }, + defaultType: 'fieldset', + items: [ + { + xtype: 'fieldset', + autoWidth: true, + columnWidth: 0.5, + title: 'Basic Data', + collapsible: true, + autoHeight: true, + defaults: { + width: 250, + labelStyle: 'width: 125; font-weight:bold; padding: 0 0 0 0;' + }, + defaultType: 'displayfield', + items: [ + { + id: 'name', + name: 'name', + fieldLabel: 'Name', + value: projectData.description }, - - onRender: function(ct, position){ - this.colModel.defaultSortable = true; - - Ext.ux.DynamicGridPanel.superclass.onRender.call(this, ct, position); - + { + id: 'id', + name: 'id', + fieldLabel: 'Id', + value: projectData.id + }, + { + id: 'customer', + name: 'customer', + fieldLabel: 'Customer', + value: projectData.customerName + }, + { + id: 'init', + name: 'init', + fieldLabel: 'Init Date', + value: projectData.initDate ? projectData.initDate.format('d/m/Y') : '---' + }, + { + id: 'end', + name: 'end', + fieldLabel: 'End Date', + value: projectData.endDate ? projectData.endDate.format('d/m/Y') : '---' + }, + { + id: 'active', + name: 'active', + fieldLabel: 'Active', + value: projectData.active ? 'Yes' : 'No', + //check if project is active but finish date has passed + style: + projectData.active && projectData.endDate && new Date() > projectData.endDate + ? { color: 'red' } + : {} + }, + { + id: 'estHours', + name: 'estHours', + fieldLabel: 'Estimated Hours', + value: projectData.estimatedHours + }, + { + id: 'movedHours', + name: 'movedHours', + fieldLabel: 'Moved Hours', + value: projectData.movedHours + }, + { + id: 'invoice', + name: 'invoice', + fieldLabel: 'Invoice', + value: projectData.invoice + }, + { + id: 'Type', + name: 'Type', + fieldLabel: 'Type', + value: projectData.type } - }); + ] + }, + { + xtype: 'fieldset', + columnWidth: 0.5, + title: 'Work Hours Data', + width: 200, + collapsible: true, + colspan: 1, + autoHeight: true, + defaults: { + width: 50, + labelStyle: 'width: 125; font-weight:bold; padding: 0 0 0 0;' + }, + defaultType: 'displayfield', + items: [ + { + id: 'estimatedHoursWithMoved', + name: 'estimatedHoursWithMoved', + fieldLabel: 'Estimated Hours', + value: projectData.finalEstimatedHours + }, + { + id: 'workedHours', + name: 'workedHours', + fieldLabel: 'Worked Hours', + value: projectData.workedHours + }, + { + id: 'workDeviation', + name: 'workDeviation', + fieldLabel: 'Deviation', + value: projectData.workDeviation + }, + { + id: 'workDeviationPercent', + name: 'workDeviationPercent', + fieldLabel: 'Deviation %', + value: projectData.workDeviationPercent + }, + projectData.futureLoggedHours > 0 + ? { + id: 'futureLoggedHours', + name: 'futureLoggedHours', + fieldLabel: 'Hours Logged in The Future', + value: projectData.futureLoggedHours, + labelStyle: 'color:red; font-weight:bold;', + style: { color: 'red' } + } + : {} + ] + }, + { + xtype: 'fieldset', + columnWidth: 0.5, + width: 200, + title: 'Price Per Hour Data', + collapsible: true, + colspan: 1, + autoHeight: true, + defaults: { + width: 50, + labelStyle: 'width: 125; font-weight:bold; padding: 0 0 0 0;' + }, + defaultType: 'displayfield', + items: [ + { + id: 'estInvoice', + name: 'estInvoice', + fieldLabel: 'Estimated Price', + value: projectData.estInvoice + }, + { + id: 'currentInvoice', + name: 'currentInvoice', + fieldLabel: 'Current Price', + value: projectData.currentInvoice + }, + { + id: 'invoiceDeviation', + name: 'invoiceDeviation', + fieldLabel: 'Deviation', + value: projectData.invoiceDeviation + }, + { + id: 'invoiceDeviationPercent', + name: 'invoiceDeviationPercent', + fieldLabel: 'Deviation %', + value: projectData.invoiceDeviationPercent + } + ] + } + ] + }); + + mainPanel.render(Ext.get('content')); + + Ext.ux.DynamicGridPanel = Ext.extend(Ext.ux.ExportableGridPanel, { + initComponent: function () { + /** + * Default configuration options. + * + * You are free to change the values or add/remove options. + * The important point is to define a data store with JsonReader + * without configuration and columns with empty array. We are going + * to setup our reader with the metaData information returned by the server. + * See http://extjs.com/deploy/dev/docs/?class=Ext.data.JsonReader for more + * information how to configure your JsonReader with metaData. + * + * A data store with remoteSort = true displays strange behaviours such as + * not to display arrows when you sort the data and inconsistent ASC, DESC option. + * Any suggestions are welcome + */ + var config = { + viewConfig: { forceFit: true }, + stateful: true, + loadMask: true, + stripeRows: true, + ds: new Ext.data.Store({ + url: this.storeUrl, + reader: new Ext.data.JsonReader() + }), + columns: [] + }; + + Ext.apply(this, config); + Ext.apply(this.initialConfig, config); + + Ext.ux.DynamicGridPanel.superclass.initComponent.apply(this, arguments); + }, + + onRender: function (ct, position) { + this.colModel.defaultSortable = true; + + Ext.ux.DynamicGridPanel.superclass.onRender.call(this, ct, position); + } + }); + + var grid = new Ext.ux.DynamicGridPanel({ + id: 'projectUserCustomerGrid', + stateId: 'projectUserCustomerGrid', + storeUrl: 'services/getProjectUserCustomerReportJsonService.php?pid=' + projectData.id, + rowNumberer: false, + checkboxSelModel: false, + width: 400, + height: 250, + columnLines: true, + frame: false, + title: 'Project Users Worked Hours Report', + iconCls: 'silk-table', + footerStyle: 'color: #15428b; font-size: 12px; font-weight: bold; padding: 4px;' + }); + + grid.store.on( + 'load', + function () { + let total = 0; + + /** + * Thats the magic! + * + * JSON data returned from server has the column definitions + */ + if (typeof grid.store.reader.jsonData.columns === 'object') { + var columns = []; + var width = 0; + + /** + * Adding RowNumberer or setting selection model as CheckboxSelectionModel + * We need to add them before other columns to display first + */ + if (grid.rowNumberer) { + columns.push(new Ext.grid.RowNumberer()); + } + if (grid.checkboxSelModel) { + columns.push(new Ext.grid.CheckboxSelectionModel()); + } - var grid = new Ext.ux.DynamicGridPanel({ - id: 'projectUserCustomerGrid', - stateId: 'projectUserCustomerGrid', - storeUrl: 'services/getProjectUserCustomerReportJsonService.php?pid=' + projectData.id, - rowNumberer: false, - checkboxSelModel: false, - width: 400, - height: 250, - columnLines: true, - frame: false, - title: 'Project Users Worked Hours Report', - iconCls: 'silk-table', + Ext.each(grid.store.reader.jsonData.columns, function (column) { + columns.push(column); + width += column.width; }); + // We add a dumb column we'll hide for preventing rendering + // problems on resizing + columns.push( + new Ext.grid.Column({ dataIndex: 'dumb', header: 'dumb', id: 'dumbColumn', width: 25 }) + ); - grid.store.on('load', function(){ - /** - * Thats the magic! - * - * JSON data returned from server has the column definitions - */ - if(typeof(grid.store.reader.jsonData.columns) === 'object') { - var columns = []; - var width = 0; - - /** - * Adding RowNumberer or setting selection model as CheckboxSelectionModel - * We need to add them before other columns to display first - */ - if(grid.rowNumberer) { columns.push(new Ext.grid.RowNumberer()); } - if(grid.checkboxSelModel) { columns.push(new Ext.grid.CheckboxSelectionModel()); } - - Ext.each(grid.store.reader.jsonData.columns, function(column){ - columns.push(column); - width += column.width; - }); - - // We add a dumb column we'll hide for preventing rendering - // problems on resizing - columns.push( new Ext.grid.Column({dataIndex: 'dumb', header: 'dumb', id: 'dumbColumn', width: 25})); - - width += 25; + width += 25; - /** - * Setting column model configuration - */ - grid.getColumnModel().setConfig(columns); - grid.setSize(width, 250); + /** + * Setting column model configuration + */ + grid.getColumnModel().setConfig(columns); + grid.setSize(width, 250); - if (!grid.rendered) - grid.render(Ext.get("content")); + if (!grid.rendered) grid.render(Ext.get('content')); - // We hide the dumb column - grid.getColumnModel().setHidden(grid.getColumnModel().getIndexById('dumbColumn'), true); + // We hide the dumb column + grid.getColumnModel().setHidden(grid.getColumnModel().getIndexById('dumbColumn'), true); - } - - }, this); - - var grid2 = new Ext.ux.DynamicGridPanel({ - id: 'projectUserStoryGrid', - stateId: 'projectUserStoryGrid', - storeUrl: 'services/getProjectUserStoryReportJsonService.php?pid=' + projectData.id, - rowNumberer: false, - columnLines: true, - checkboxSelModel: false, - width: 400, - height: 250, - frame: false, - title: 'Project User-Story Worked Hours Report', - iconCls: 'silk-table', + let data = grid.store.data.items; + data.forEach((item) => { + total += item.data.total; }); + taskHoursTotalDisplayGrid1 = total.toFixed(2).toString(); + let parent = document.getElementById('projectUserCustomerGrid').childNodes[1]; + let children = parent.childNodes; + children[2].innerHTML = `Total hours: ${taskHoursTotalDisplayGrid1}`; + } + }, + this + ); + + var grid2 = new Ext.ux.DynamicGridPanel({ + id: 'projectUserStoryGrid', + stateId: 'projectUserStoryGrid', + storeUrl: 'services/getProjectUserStoryReportJsonService.php?pid=' + projectData.id, + rowNumberer: false, + columnLines: true, + checkboxSelModel: false, + width: 400, + height: 250, + frame: false, + title: 'Project User-Story Worked Hours Report', + iconCls: 'silk-table', + footerStyle: 'color: #15428b; font-size: 12px; font-weight: bold; padding: 4px;' + }); + + grid2.store.on( + 'load', + function () { + let total = 0; + /** + * Thats the magic! + * + * JSON data returned from server has the column definitions + */ + if (typeof grid2.store.reader.jsonData.columns === 'object') { + var columns = []; + var width = 0; + + /** + * Adding RowNumberer or setting selection model as CheckboxSelectionModel + * We need to add them before other columns to display first + */ + if (grid2.rowNumberer) { + columns.push(new Ext.grid2.RowNumberer()); + } + if (grid2.checkboxSelModel) { + columns.push(new Ext.grid2.CheckboxSelectionModel()); + } + Ext.each(grid2.store.reader.jsonData.columns, function (column) { + columns.push(column); + width += column.width; + }); - grid2.store.on('load', function(){ - /** - * Thats the magic! - * - * JSON data returned from server has the column definitions - */ - if(typeof(grid2.store.reader.jsonData.columns) === 'object') { - var columns = []; - var width = 0; - - /** - * Adding RowNumberer or setting selection model as CheckboxSelectionModel - * We need to add them before other columns to display first - */ - if(grid2.rowNumberer) { columns.push(new Ext.grid2.RowNumberer()); } - if(grid2.checkboxSelModel) { columns.push(new Ext.grid2.CheckboxSelectionModel()); } - - Ext.each(grid2.store.reader.jsonData.columns, function(column){ - columns.push(column); - width += column.width; - }); - - // We add a dumb column we'll hide for preventing rendering - // problems on resizing - columns.push( new Ext.grid.Column({dataIndex: 'dumb', header: 'dumb', id: 'dumbColumn', width: 25})); - - width += 25; + // We add a dumb column we'll hide for preventing rendering + // problems on resizing + columns.push( + new Ext.grid.Column({ dataIndex: 'dumb', header: 'dumb', id: 'dumbColumn', width: 25 }) + ); - /** - * Setting column model configuration - */ - grid2.getColumnModel().setConfig(columns); - grid2.setSize(width, 250); + width += 25; - if (!grid2.rendered) - grid2.render(Ext.get("content")); + /** + * Setting column model configuration + */ + grid2.getColumnModel().setConfig(columns); + grid2.setSize(width, 250); - // We hide the dumb column - grid2.getColumnModel().setHidden(grid2.getColumnModel().getIndexById('dumbColumn'), true); + if (!grid2.rendered) grid2.render(Ext.get('content')); - } + // We hide the dumb column + grid2.getColumnModel().setHidden(grid2.getColumnModel().getIndexById('dumbColumn'), true); - }, this); - - var grid3 = new Ext.ux.DynamicGridPanel({ - id: 'projectUserWeeklyHoursGrid', - stateId: 'projectUserWeeklyHoursGrid', - storeUrl: 'services/getProjectUserWeeklyHoursReportJsonService.php?pid=' + projectData.id, - rowNumberer: false, - columnLines: true, - checkboxSelModel: false, - width: 400, - height: 250, - frame: false, - title: 'Project User-Weekly Worked Hours Report', - iconCls: 'silk-table', + let data = grid.store.data.items; + data.forEach((item) => { + total += item.data.total; }); + taskHoursTotalDisplayGrid2 = total.toFixed(2).toString(); + let parent = document.getElementById('projectUserStoryGrid').childNodes[1]; + let children = parent.childNodes; + children[2].innerHTML = `Total hours: ${taskHoursTotalDisplayGrid2}`; + } + }, + this + ); + + var grid3 = new Ext.ux.DynamicGridPanel({ + id: 'projectUserWeeklyHoursGrid', + stateId: 'projectUserWeeklyHoursGrid', + storeUrl: 'services/getProjectUserWeeklyHoursReportJsonService.php?pid=' + projectData.id, + rowNumberer: false, + columnLines: true, + checkboxSelModel: false, + width: 400, + height: 250, + frame: false, + title: 'Project User-Weekly Worked Hours Report', + iconCls: 'silk-table', + footerStyle: 'color: #15428b; font-size: 12px; font-weight: bold; padding: 4px;' + }); + + //Add link to server-side CSV export + grid3.getBottomToolbar().removeAll(); + grid3.getBottomToolbar().add({ + xtype: 'button', + text: 'Download as CSV', + handler: function () { + var init = workingResultsForm.getStartDate(); + var end = workingResultsForm.getEndDate(); + window.open( + 'services/getProjectUserWeeklyHoursReportJsonService.php' + + '?pid=' + + projectData.id + + '&format=csv' + + '&init=' + + init.getFullYear() + + '-' + + (init.getMonth() + 1) + + '-' + + init.getDate() + + '&end=' + + end.getFullYear() + + '-' + + (end.getMonth() + 1) + + '-' + + end.getDate() + ); + } + }); + + grid3.store.on( + 'load', + function () { + let total = 0; + /** + * Thats the magic! + * + * JSON data returned from server has the column definitions + */ + if (typeof grid3.store.reader.jsonData.columns === 'object') { + var columns = []; + var width = 0; + + /** + * Adding RowNumberer or setting selection model as CheckboxSelectionModel + * We need to add them before other columns to display first + */ + if (grid3.rowNumberer) { + columns.push(new Ext.grid3.RowNumberer()); + } + if (grid3.checkboxSelModel) { + columns.push(new Ext.grid3.CheckboxSelectionModel()); + } - //Add link to server-side CSV export - grid3.getBottomToolbar().removeAll(); - grid3.getBottomToolbar().add({ - xtype: 'button', - text: 'Download as CSV', - handler: function () { - var init = workingResultsForm.getStartDate(); - var end = workingResultsForm.getEndDate(); - window.open( - "services/getProjectUserWeeklyHoursReportJsonService.php" + - "?pid=" + projectData.id + - "&format=csv" + - "&init=" + init.getFullYear() + "-" + (init.getMonth()+1) - + "-" + init.getDate() + - "&end=" + end.getFullYear() + "-" + (end.getMonth() + 1) - + "-" + end.getDate()); - } + Ext.each(grid3.store.reader.jsonData.columns, function (column) { + columns.push(column); + width += column.width; }); + // We add a dumb column we'll hide for preventing rendering + // problems on resizing + columns.push( + new Ext.grid.Column({ dataIndex: 'dumb', header: 'dumb', id: 'dumbColumn', width: 25 }) + ); - grid3.store.on('load', function(){ - - /** - * Thats the magic! - * - * JSON data returned from server has the column definitions - */ - if(typeof(grid3.store.reader.jsonData.columns) === 'object') { - - var columns = []; - var width = 0; - - /** - * Adding RowNumberer or setting selection model as CheckboxSelectionModel - * We need to add them before other columns to display first - */ - if(grid3.rowNumberer) { columns.push(new Ext.grid3.RowNumberer()); } - if(grid3.checkboxSelModel) { columns.push(new Ext.grid3.CheckboxSelectionModel()); } - - Ext.each(grid3.store.reader.jsonData.columns, function(column){ - columns.push(column); - width += column.width; - }); - - // We add a dumb column we'll hide for preventing rendering - // problems on resizing - columns.push( new Ext.grid.Column({dataIndex: 'dumb', header: 'dumb', id: 'dumbColumn', width: 25})); - - width += 25; - - /** - * Setting column model configuration - */ - grid3.getColumnModel().setConfig(columns); - grid3.setSize(width, 250); - - if (!grid3.rendered) - grid3.render(Ext.get("content")); - - // We hide the dumb column - grid3.getColumnModel().setHidden(grid3.getColumnModel().getIndexById('dumbColumn'), true); - - } - - }, this); - - // dates filter form - var workingResultsForm = new Ext.ux.DateIntervalForm({ - renderTo: 'content', - listeners: { - 'view': function (element, init, end) { - - grid.store.removeAll(); - grid.store.proxy.conn.url= 'services/getProjectUserCustomerReportJsonService.php' + - '?pid=' + projectData.id + - '&init=' + init.getFullYear() + "-" + (init.getMonth()+1) + "-" + init.getDate() + - "&end=" + end.getFullYear() + "-" + (end.getMonth() + 1) + "-" + end.getDate(); - grid.store.load(); - - grid2.store.removeAll(); - grid2.store.proxy.conn.url= 'services/getProjectUserStoryReportJsonService.php' + - '?pid=' + projectData.id + - '&init=' + init.getFullYear() + "-" + (init.getMonth()+1) + "-" + init.getDate() + - "&end=" + end.getFullYear() + "-" + (end.getMonth() + 1) + "-" + end.getDate(); - grid2.store.load(); - - grid3.store.removeAll(); - grid3.store.proxy.conn.url= 'services/getProjectUserWeeklyHoursReportJsonService.php' + - '?pid=' + projectData.id + - '&init=' + init.getFullYear() + "-" + (init.getMonth()+1) + "-" + init.getDate() + - "&end=" + end.getFullYear() + "-" + (end.getMonth() + 1) + "-" + end.getDate(); - grid3.store.load(); - - } - } - }); - workingResultsForm.focus(); + width += 25; + + /** + * Setting column model configuration + */ + grid3.getColumnModel().setConfig(columns); + grid3.setSize(width, 250); - grid.store.load(); - grid2.store.load(); - grid3.store.load(); + if (!grid3.rendered) grid3.render(Ext.get('content')); + // We hide the dumb column + grid3.getColumnModel().setHidden(grid3.getColumnModel().getIndexById('dumbColumn'), true); + + let data = grid.store.data.items; + data.forEach((item) => { + total += item.data.total; + }); + taskHoursTotalDisplayGrid3 = total.toFixed(2).toString(); + let parent = document.getElementById('projectUserWeeklyHoursGrid').childNodes[1]; + let children = parent.childNodes; + children[2].innerHTML = `Total hours: ${taskHoursTotalDisplayGrid3}`; + } + }, + this + ); + + // dates filter form + var workingResultsForm = new Ext.ux.DateIntervalForm({ + renderTo: 'content', + listeners: { + view: function (element, init, end) { + grid.store.removeAll(); + grid.store.proxy.conn.url = + 'services/getProjectUserCustomerReportJsonService.php' + + '?pid=' + + projectData.id + + '&init=' + + init.getFullYear() + + '-' + + (init.getMonth() + 1) + + '-' + + init.getDate() + + '&end=' + + end.getFullYear() + + '-' + + (end.getMonth() + 1) + + '-' + + end.getDate(); + grid.store.load(); + + grid2.store.removeAll(); + grid2.store.proxy.conn.url = + 'services/getProjectUserStoryReportJsonService.php' + + '?pid=' + + projectData.id + + '&init=' + + init.getFullYear() + + '-' + + (init.getMonth() + 1) + + '-' + + init.getDate() + + '&end=' + + end.getFullYear() + + '-' + + (end.getMonth() + 1) + + '-' + + end.getDate(); + grid2.store.load(); + + grid3.store.removeAll(); + grid3.store.proxy.conn.url = + 'services/getProjectUserWeeklyHoursReportJsonService.php' + + '?pid=' + + projectData.id + + '&init=' + + init.getFullYear() + + '-' + + (init.getMonth() + 1) + + '-' + + init.getDate() + + '&end=' + + end.getFullYear() + + '-' + + (end.getMonth() + 1) + + '-' + + end.getDate(); + grid3.store.load(); + } + } + }); + workingResultsForm.focus(); + + grid.store.load(); + grid2.store.load(); + grid3.store.load(); }); diff --git a/web/projectsEvaluation.php b/web/projectsEvaluation.php index 4a6dc81b3..88c18a79f 100644 --- a/web/projectsEvaluation.php +++ b/web/projectsEvaluation.php @@ -23,18 +23,18 @@ $sid = $_GET["sid"] ?? NULL; /* We check authentication and authorization */ -require_once(PHPREPORT_ROOT . '/web/auth.php'); +require_once (PHPREPORT_ROOT . '/web/auth.php'); /* Include the generic header and sidebar*/ define('PAGE_TITLE', "PhpReport - Projects Evaluation"); -include_once("include/header.php"); -include_once(PHPREPORT_ROOT . '/util/ConfigurationParametersManager.php'); -include_once(PHPREPORT_ROOT . '/util/UnknownParameterException.php'); -include_once(PHPREPORT_ROOT . '/util/LoginManager.php'); -include_once(PHPREPORT_ROOT . '/model/vo/ProjectVO.php'); -include_once(PHPREPORT_ROOT . '/model/facade/ProjectsFacade.php'); -include_once(PHPREPORT_ROOT . '/model/facade/AdminFacade.php'); -include_once(PHPREPORT_ROOT . '/web/services/WebServicesFunctions.php'); +include_once ("include/header.php"); +include_once (PHPREPORT_ROOT . '/util/ConfigurationParametersManager.php'); +include_once (PHPREPORT_ROOT . '/util/UnknownParameterException.php'); +include_once (PHPREPORT_ROOT . '/util/LoginManager.php'); +include_once (PHPREPORT_ROOT . '/model/vo/ProjectVO.php'); +include_once (PHPREPORT_ROOT . '/model/facade/ProjectsFacade.php'); +include_once (PHPREPORT_ROOT . '/model/facade/AdminFacade.php'); +include_once (PHPREPORT_ROOT . '/web/services/WebServicesFunctions.php'); // We retrieve the Areas $areas = AdminFacade::GetAllAreas(); @@ -44,10 +44,10 @@