diff --git a/workflow/engine/classes/class.indicatorsCalculator.php b/workflow/engine/classes/class.indicatorsCalculator.php index 16f884a96..321e1857e 100644 --- a/workflow/engine/classes/class.indicatorsCalculator.php +++ b/workflow/engine/classes/class.indicatorsCalculator.php @@ -337,6 +337,36 @@ class indicatorsCalculator return $retval; } + public function ueiCostHistoric($employeeId, $initDate, $endDate, $periodicity) + { + if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0); + if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0); + + $periodicitySelectFields = $this->periodicityFieldsForSelect($periodicity); + $periodicityGroup = $this->periodicityFieldsForGrouping($periodicity); + $initYear = $initDate->format("Y"); + $initMonth = $initDate->format("m"); + $initDay = $endDay = 1; + $endYear = $endDate->format("Y"); + $endMonth = $endDate->format("m"); + + //$params[":initYear"] = $initYear; + //$params[":initMonth"] = $initMonth; + $params[":endYear"] = $endYear; + $params[":endMonth"] = $endMonth; + + + $sqlString = "SELECT $periodicitySelectFields " . $this->ueiCostFormula . " as EEC + FROM USR_REPORTING + WHERE + IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)" + . $periodicityGroup; + + $retval = $this->pdoExecutor($sqlString, $params); + //$retval = $this->propelExecutor($sqlString); + return $retval; + } + public function generalIndicatorData($indicatorId, $initDate, $endDate, $periodicity) { if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0); if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0); diff --git a/workflow/engine/js/strategicDashboard/viewDashboardModel.js b/workflow/engine/js/strategicDashboard/viewDashboardModel.js index 9ae702eeb..c2b63eca1 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardModel.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardModel.js @@ -2,8 +2,11 @@ var ViewDashboardModel = function (oauthToken, server, workspace) { this.server = server; this.workspace = workspace; this.baseUrl = "/api/1.0/" + workspace + "/"; + //this.baseUrl = "http://127.0.0.1:8080/api/1.0/workflow/"; this.oauthToken = oauthToken; this.helper = new ViewDashboardHelper(); + this.cache = []; + this.forceRemote=false; //if true, the next call will go to the remote server }; ViewDashboardModel.prototype.userDashboards = function(userId) { @@ -14,16 +17,16 @@ ViewDashboardModel.prototype.dashboardIndicators = function(dashboardId, initDat return this.getJson('dashboard/' + dashboardId + '/indicator?dateIni=' + initDate + '&dateFin=' + endDate); }; -ViewDashboardModel.prototype.peiData = function(indicatorId, measureDate, compareDate) { +ViewDashboardModel.prototype.peiData = function(indicatorId, compareDate, measureDate) { var endPoint = "ReportingIndicators/process-efficiency-data?" + "indicator_uid=" + indicatorId + - "&measure_date=" + measureDate + "&compare_date=" + compareDate + + "&measure_date=" + measureDate + "&language=en"; return this.getJson(endPoint); } -ViewDashboardModel.prototype.statusData = function(indicatorId, measureDate, compareDate) { +ViewDashboardModel.prototype.statusData = function() { var endPoint = "ReportingIndicators/status-indicator"; return this.getJson(endPoint); } @@ -37,11 +40,11 @@ ViewDashboardModel.prototype.peiDetailData = function(process, initDate, endDate return this.getJson(endPoint); } -ViewDashboardModel.prototype.ueiData = function(indicatorId, measureDate, compareDate) { +ViewDashboardModel.prototype.ueiData = function(indicatorId, compareDate, measureDate ) { var endPoint = "ReportingIndicators/employee-efficiency-data?" + "indicator_uid=" + indicatorId + - "&measure_date=" + measureDate + "&compare_date=" + compareDate + + "&measure_date=" + measureDate + "&language=en"; return this.getJson(endPoint); } @@ -100,18 +103,34 @@ ViewDashboardModel.prototype.setPositionIndicator = function(data) { ViewDashboardModel.prototype.getJson = function (endPoint) { var that = this; var callUrl = this.baseUrl + endPoint - return $.ajax({ - url: callUrl, - type: 'GET', - datatype: 'json', - error: function(jqXHR, textStatus, errorThrown) { - throw new Error(callUrl + ' -- ' + errorThrown); - }, - beforeSend: function (xhr) { - xhr.setRequestHeader('Authorization', 'Bearer ' + that.oauthToken); - //xhr.setRequestHeader('Access-Control-Allow-Origin', '*'); - } - }); + var requestFinished = $.Deferred(); + var itemInCache = that.getCacheItem(endPoint); + + if (itemInCache != null && !this.forceRemote) { + that.forceRemote = false; + requestFinished.resolve(itemInCache); + return requestFinished.promise(); + } + else { + return $.ajax({ + url: callUrl, + type: 'GET', + datatype: 'json', + success: function (data) { + that.forceRemote = false; + requestFinished.resolve(data); + that.putInCache(endPoint, data); + // return requestFinished.promise(); + }, + error: function(jqXHR, textStatus, errorThrown) { + throw new Error(callUrl + ' -- ' + errorThrown); + }, + beforeSend: function (xhr) { + xhr.setRequestHeader('Authorization', 'Bearer ' + that.oauthToken); + //xhr.setRequestHeader('Access-Control-Allow-Origin', '*'); + } + }); + } } ViewDashboardModel.prototype.postJson = function (endPoint, data) { @@ -154,3 +173,22 @@ ViewDashboardModel.prototype.putJson = function (endPoint, data) { }); }; +ViewDashboardModel.prototype.getCacheItem = function (endPoint) { + var retval = null; + $.each(this.cache, function(index, objectItem) { + if (objectItem.key == endPoint) { + retval = objectItem.value; + } + }); + return retval; +} + +ViewDashboardModel.prototype.putInCache = function (endPoint, data) { + var cacheItem = this.getCacheItem(endPoint); + if (cacheItem == null) { + this.cache.push ({ key: endPoint, value:data }); + } + else { + cacheItem.value = data; + } +} diff --git a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js index 7742aea1b..703e3780e 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js @@ -9,7 +9,7 @@ var ViewDashboardPresenter = function (model) { ViewDashboardPresenter.prototype.getUserDashboards = function (userId) { var that = this; var requestFinished = $.Deferred(); - this.model.userDashboards(userId) + that.model.userDashboards(userId) .done(function(modelData){ var viewModel = that.userDashboardsViewModel(modelData) requestFinished.resolve(viewModel); @@ -159,7 +159,7 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) { $.each(data.data, function(index, originalObject) { var map = { "name" : "datalabel", - "efficiencyIndex" : "value" + "inefficiencyCost" : "value" }; var newObject = that.helper.merge(originalObject, {}, map); var shortLabel = (newObject.datalabel == null) @@ -168,18 +168,22 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) { newObject.datalabel = shortLabel; graphData.push(newObject); - originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost); + originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost); originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100; originalObject.indicatorId = data.id; originalObject.json = JSON.stringify(originalObject); }); var retval = {}; - //TODO selecte de 7 worst cases no the first 7 retval = data; + graphData.sort(function(a,b) { + var retval = 0; + retval = ((a.value*1.0 <= b.value*1.0) ? 1 : -1); + return retval; + }) retval.dataToDraw = graphData.splice(0,7); //TODO aumentar el símbolo de moneda $ - retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost); + retval.inefficiencyCostToShow = "$ " +Math.round(retval.inefficiencyCost); retval.efficiencyIndexToShow = Math.round(retval.efficiencyIndex * 100) / 100; return retval; }; @@ -190,7 +194,7 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) { $.each(data.data, function(index, originalObject) { var map = { "name" : "datalabel", - "averageTime" : "value", + "inefficiencyCost" : "value", "deviationTime" : "dispersion" }; var newObject = that.helper.merge(originalObject, {}, map); @@ -200,18 +204,22 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) { newObject.datalabel = shortLabel; graphData.push(newObject); - originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost); + originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost); originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100; originalObject.indicatorId = data.id; originalObject.json = JSON.stringify(originalObject); }); var retval = {}; - //TODO selecte de 7 worst cases no the first 7 retval = data; + graphData.sort(function(a,b) { + var retval = 0; + retval = ((a.value*1.0 <= b.value*1.0) ? 1 : -1); + return retval; + }) retval.dataToDraw = graphData.splice(0,7); //TODO aumentar el símbolo de moneda $ - retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost); + retval.inefficiencyCostToShow = "$ " + Math.round(retval.inefficiencyCost); retval.efficiencyIndexToShow = Math.round(retval.efficiencyIndex * 100) / 100; return retval; }; @@ -280,7 +288,9 @@ ViewDashboardPresenter.prototype.indicatorViewModel = function(data) { ViewDashboardPresenter.prototype.getSpecialIndicatorSecondLevel = function (entityId, indicatorType, initDate, endDate) { var that = this; var requestFinished = $.Deferred(); - //entityid is the process id or group id + //if modelData is passed (because it was cached on the view) no call is made to the server. + //and just a order is applied to the list + switch (indicatorType) { case "1010": this.model.peiDetailData(entityId, initDate, endDate) @@ -307,6 +317,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelPei = function(modelD //returns object {dataToDraw[], entityData[] //user/tasks data} var that = this; var graphData = []; + $.each(modelData, function(index, originalObject) { var map = { "name" : "datalabel", @@ -315,7 +326,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelPei = function(modelD }; var newObject = that.helper.merge(originalObject, {}, map); newObject.datalabel = ((newObject.datalabel == null) ? "" : newObject.datalabel.substring(0, 7)); - originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost); + originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost); originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100; graphData.push(newObject); }); @@ -330,6 +341,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelUei = function(modelD //returns object {dataToDraw[], entityData[] //user/tasks data} var that = this; var graphData = []; + $.each(modelData, function(index, originalObject) { var map = { "name" : "datalabel", @@ -338,7 +350,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelUei = function(modelD }; var newObject = that.helper.merge(originalObject, {}, map); newObject.datalabel = ((newObject.datalabel == null) ? "" : newObject.datalabel.substring(0, 7)); - originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost); + originalObject.inefficiencyCostToShow = "$ " +Math.round(originalObject.inefficiencyCost); originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100; graphData.push(newObject); }); @@ -349,11 +361,21 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelUei = function(modelD }; /*-------SECOND LEVEL INDICATOR DATA*/ - - - - - - - - +ViewDashboardPresenter.prototype.orderDataList = function(listData, orderDirection, orderFunction) { + //orderDirection is passed in case no order FUnction is passed (to use in the default ordering) + var orderToUse = orderFunction; + if (orderFunction == undefined) { + orderToUse = function (a ,b) { + var retval = 0; + if (orderDirection == "down") { + retval = ((a.inefficiencyCost*1.0 <= b.inefficiencyCost*1.0) ? 1 : -1); + } + else { + //the 1,-1 are flipped + retval = ((a.inefficiencyCost*1.0 <= b.inefficiencyCost*1.0) ? -1 : 1); + } + return retval; + } + } + return listData.sort(orderToUse); +} diff --git a/workflow/engine/js/strategicDashboard/viewDashboardView.js b/workflow/engine/js/strategicDashboard/viewDashboardView.js index 8fb321dff..a7ced8a77 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardView.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardView.js @@ -80,6 +80,7 @@ WidgetBuilder.prototype.buildSpecialIndicatorFirstView = function (indicatorData $retval.find('.breadcrumb').append ('
  • '+indicatorPrincipalData.title+'
    • ') $retval.find(".sind-index-selector").text(G_STRING.ID_EFFICIENCY_INDEX); $retval.find(".sind-cost-selector").text(G_STRING.ID_INEFFICIENCY_COST); + this.setColorForInefficiency($retval.find(".sind-cost-number-selector"), indicatorData); return $retval; } @@ -93,7 +94,8 @@ WidgetBuilder.prototype.buildSpecialIndicatorFirstViewDetail = function (oneItem var template = _.template ($("script.specialIndicatorDetail").html()); var $retval = $(template(oneItemDetail)); $retval.find(".detail-efficiency-selector").text(G_STRING.ID_EFFICIENCY_INDEX); - $retval.find(".detail-cost-selector").text(G_STRING.ID_EFFICIENCY_COST); + $retval.find(".detail-cost-selector").text(G_STRING.ID_INEFFICIENCY_COST); + this.setColorForInefficiency($retval.find(".detail-cost-number-selector"), oneItemDetail); return $retval; } @@ -136,6 +138,7 @@ WidgetBuilder.prototype.buildSpecialIndicatorSecondView = function (secondViewDa $retval.find('.breadcrumb').find('li').remove(); $retval.find('.breadcrumb').append ('
  • ' + window.currentIndicator.title + '
    • '); $retval.find('.breadcrumb').append ('
  • ' + window.currentEntityData.name + '
    • '); + this.setColorForInefficiency($retval.find(".sind-cost-number-selector"), window.currentEntityData); return $retval; }; @@ -145,10 +148,11 @@ WidgetBuilder.prototype.buildSpecialIndicatorSecondViewDetail = function (oneIte if (!oneItemDetail.hasOwnProperty("name")){throw new Error("buildSpecialIndicatorFirstViewDetail -> detailData has not the name param. Has it the correct Type? ->" + oneItemDetail);} _.templateSettings.variable = "detailData"; - var template = _.template ($("script.ueiDetail").html()); + var template = _.template ($("script.specialIndicatorSencondViewDetail").html()); var $retval = $(template(oneItemDetail)); $retval.find(".detail-efficiency-selector").text(G_STRING.ID_EFFICIENCY_INDEX); - $retval.find(".detail-cost-selector").text(G_STRING.ID_EFFICIENCY_COST); + $retval.find(".detail-cost-selector").text(G_STRING.ID_INEFFICIENCY_COST); + this.setColorForInefficiency($retval.find(".detail-cost-number-selector"), oneItemDetail); return $retval; } @@ -172,6 +176,19 @@ WidgetBuilder.prototype.buildGeneralIndicatorFirstView = function (indicatorData return $retval; } + +WidgetBuilder.prototype.setColorForInefficiency = function ($widget, indicatorData) { + //turn red/gree the font according if is positive or negative: var $widget = $retval.find(".sind-cost-number-selector"); + $widget.removeClass("red"); + $widget.removeClass("green"); + if (indicatorData.inefficiencyCost >= 0) { + $widget.addClass("green"); + } + else { + $widget.addClass("red"); + } +} + /**********************************************************************/ helper = new ViewDashboardHelper(); var ws = urlProxy.split('/'); @@ -182,24 +199,37 @@ window.loadedIndicators = []; //updated in das-title-selector.click->fillIndicat window.currentEntityData = null; window.currentIndicator = null;//updated in ind-button-selector.click ->loadIndicator, ready->loadIndicator window.currentDashboardId = null; - - -function hideScrollIfAllDivsAreVisible(){ - if ($('.hideme').length <= 0) { - $('#scrollImg').hide(); - } - else { - $('#scrollImg').show(); - } -} +window.currentDetailFunction = null; +window.currentDetailList = null; $(document).ready(function() { $('#indicatorsGridStack').gridstack(); $('#indicatorsDataGridStack').gridstack(); $('#relatedDetailGridStack').gridstack(); + $('#sortListButton').click(function() { + var btn = $(this); + if (btn.hasClass('fa-chevron-up')) { + btn.removeClass('fa-chevron-up'); + btn.addClass('fa-chevron-down'); + } + else { + btn.removeClass('fa-chevron-down'); + btn.addClass('fa-chevron-up'); + } - /* Show on scroll functionality... */ + window.currentDetailFunction (presenter.orderDataList ( + window.currentDetailList, + selectedOrderOfDetailList())); + //send scroll +1 and -1 to activate the show/hide event. + //both scrolls are sent cause if the scroll at the end + //scroll +1 has no effect but -1 yes + $(window).scrollTop($(window).scrollTop() + 1); + $(window).scrollTop($(window).scrollTop() - 1); + return false; + }); + + /* Show on scroll functionality */ $(window).scroll( function() { /* Check the location of each desired element */ $('.hideme').each( function(i){ @@ -218,12 +248,12 @@ $(document).ready(function() { $('#scrollImg').mouseover(function() { isHover = true; var interval = window.setInterval(function () { - var newPos = $(window).scrollTop() + 200; + var newPos = $(window).scrollTop() + 100; $(window).scrollTop(newPos); if (isHover == false) { window.clearInterval(interval); } - }, 100); + }, 200); }); $('#scrollImg').mouseleave(function() { @@ -282,6 +312,14 @@ $(document).ready(function() { /*-------------------------------clicks----------------------------*/ + $('body').on('click','.btn-compare', function() { + presenter.getDashboardIndicators(window.currentDashboardId, defaultInitDate(), defaultEndDate()) + .done(function(indicatorsVM) { + fillIndicatorWidgets(indicatorsVM); + loadIndicator(getFavoriteIndicator().id, defaultInitDate(), defaultEndDate()); + }); + }); + $('#dashboardsList').on('click','.das-title-selector', function() { var dashboardId = $(this).parent().data('dashboard-id'); window.currentDashboardId = dashboardId; @@ -311,7 +349,8 @@ $(document).ready(function() { window.currentEntityData = {"entityId":$(this).data('detail-id'), "indicatorId":$(this).data('indicator-id'), "efficiencyIndexToShow":$(this).data('detail-index'), - "inefficiencyCostToShow":$(this).data('detail-cost'), + "inefficiencyCostToShow":$(this).data('detail-cost-to-show'), + "inefficiencyCost":$(this).data('detail-cost'), "name":$(this).data('detail-name') }; //TODO PASS REAL VALUES @@ -319,12 +358,24 @@ $(document).ready(function() { .done(function (viewModel) { fillSpecialIndicatorSecondView(viewModel); }); - $('.breadcrum').find('ol').append('
  • lalal
    • '); }); initialDraw(); }); -function initialDraw() { +var hideScrollIfAllDivsAreVisible = function(){ + if ($('.hideme').length <= 0) { + $('#scrollImg').hide(); + } + else { + $('#scrollImg').show(); + } +} + +var selectedOrderOfDetailList = function () { + return ($('#sortListButton').hasClass('fa-chevron-up') ? "up" : "down"); +} + +var initialDraw = function () { presenter.getUserDashboards(pageUserId) .then(function(dashboardsVM) { fillDashboardsList(dashboardsVM); @@ -337,7 +388,7 @@ function initialDraw() { }); } -function loadIndicator(indicatorId, initDate, endDate) { +var loadIndicator = function (indicatorId, initDate, endDate) { var builder = new WidgetBuilder(); window.currentIndicator = builder.getIndicatorLoadedById(indicatorId); presenter.getIndicatorData(indicatorId, window.currentIndicator.type, initDate, endDate) @@ -357,7 +408,7 @@ function loadIndicator(indicatorId, initDate, endDate) { }); } -function setIndicatorActiveMarker () { +var setIndicatorActiveMarker = function () { $('.panel-footer').each (function () { $(this).removeClass('panel-active'); var indicatorId = $(this).parents('.ind-button-selector').data('indicator-id'); @@ -367,7 +418,7 @@ function setIndicatorActiveMarker () { }); } -function getFavoriteIndicator() { +var getFavoriteIndicator = function() { var retval = (window.loadedIndicators.length > 0) ? window.loadedIndicators[0] : null; @@ -381,21 +432,22 @@ function getFavoriteIndicator() { return retval; } -function defaultInitDate() { +var defaultInitDate = function() { var date = new Date(); var dateMonth = date.getMonth(); var dateYear = date.getFullYear(); - return "01-"+(dateMonth+1)+"-"+dateYear; + var initDate = $('#year').val() + '-' + $('#month').val() + '-' + '01'; + return initDate; } -function defaultEndDate() { +var defaultEndDate = function () { var date = new Date(); var dateMonth = date.getMonth(); var dateYear = date.getFullYear(); - return "30-"+(dateMonth)+"-"+dateYear; + return dateYear + "-" + (dateMonth + 1) + "-30"; } -function fillDashboardsList (presenterData) { +var fillDashboardsList = function (presenterData) { if (presenterData == null || presenterData.length == 0) { $('#dashboardsList').append(G_STRING['ID_NO_DATA_TO_DISPLAY']); } @@ -414,7 +466,7 @@ function fillDashboardsList (presenterData) { }; -function fillIndicatorWidgets (presenterData) { +var fillIndicatorWidgets = function (presenterData) { var widgetBuilder = new WidgetBuilder(); var grid = $('#indicatorsGridStack').data('gridstack'); grid.remove_all(); @@ -433,7 +485,7 @@ function fillIndicatorWidgets (presenterData) { }); } -function fillStatusIndicatorFirstView (presenterData) { +var fillStatusIndicatorFirstView = function (presenterData) { var widgetBuilder = new WidgetBuilder(); var panel = $('#indicatorsDataGridStack').data('gridstack'); panel.remove_all(); @@ -475,11 +527,10 @@ function fillStatusIndicatorFirstView (presenterData) { graph3.drawChart(); var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(presenterData.id) - //this.fillStatusIndicatorFirstViewDetail(presenterData); setIndicatorActiveMarker(); } -function fillStatusIndicatorFirstViewDetail (presenterData) { +var fillStatusIndicatorFirstViewDetail = function(presenterData) { var widgetBuilder = new WidgetBuilder(); var gridDetail = $('#relatedDetailGridStack').data('gridstack'); //gridDetail.remove_all(); @@ -499,7 +550,7 @@ function fillStatusIndicatorFirstViewDetail (presenterData) { } } -function fillSpecialIndicatorFirstView (presenterData) { +var fillSpecialIndicatorFirstView = function(presenterData) { var widgetBuilder = new WidgetBuilder(); var panel = $('#indicatorsDataGridStack').data('gridstack'); panel.remove_all(); @@ -519,7 +570,7 @@ function fillSpecialIndicatorFirstView (presenterData) { allowTransition:true, showTip: true, allowZoom: false, - gapWidth:0.2, + gapWidth:0.3, useShadows: true, thickness: 30, showLabels: true, @@ -554,6 +605,8 @@ function fillSpecialIndicatorFirstView (presenterData) { if (indicatorPrincipalData.type == "1010") { var graph = new Pie3DChart(presenterData.dataToDraw, peiParams, null, null); graph.drawChart(); + //the pie chart goes to much upwards,so a margin is added: + $('#specialIndicatorGraph').css('margin-top','60px'); } if (indicatorPrincipalData.type == "1030") { @@ -561,21 +614,29 @@ function fillSpecialIndicatorFirstView (presenterData) { graph.drawChart(); } - this.fillSpecialIndicatorFirstViewDetail(presenterData); + + this.fillSpecialIndicatorFirstViewDetail(presenter.orderDataList(presenterData.data, selectedOrderOfDetailList())); setIndicatorActiveMarker(); } -function fillSpecialIndicatorFirstViewDetail (presenterData) { +var fillSpecialIndicatorFirstViewDetail = function (list) { //presenterData = { id: "indId", efficiencyIndex: "0.11764706", efficiencyVariation: -0.08235294, // inefficiencyCost: "-127.5000", inefficiencyCostToShow: -127, efficiencyIndexToShow: 0.12 // data: {indicatorId, uid, name, averateTime...}, dataToDraw: [{datalabe, value}] } var widgetBuilder = new WidgetBuilder(); var gridDetail = $('#relatedDetailGridStack').data('gridstack'); - //gridDetail.remove_all(); + gridDetail.remove_all(); - $.each(presenterData.data, function(index, dataItem) { + window.currentDetailList = list; + window.currentDetailFunction = fillSpecialIndicatorFirstViewDetail; + + $.each(list, function(index, dataItem) { var $widget = widgetBuilder.buildSpecialIndicatorFirstViewDetail(dataItem); var x = (index % 2 == 0) ? 6 : 0; + //the first 2 elements are not hidden + if (index < 2) { + $widget.removeClass("hideme"); + } gridDetail.add_widget($widget, x, 15, 6, 2, true); }); if (window.currentIndicator.type == "1010") { @@ -584,9 +645,10 @@ function fillSpecialIndicatorFirstViewDetail (presenterData) { if (window.currentIndicator.type == "1030") { $('#relatedLabel').find('h3').text(G_STRING['ID_RELATED_GROUPS']); } + hideScrollIfAllDivsAreVisible(); } -function fillSpecialIndicatorSecondView (presenterData) { +var fillSpecialIndicatorSecondView = function(presenterData) { //presenterData= object {dataToDraw[], entityData[] //user/tasks data} var widgetBuilder = new WidgetBuilder(); var panel = $('#indicatorsDataGridStack').data('gridstack'); @@ -627,10 +689,10 @@ function fillSpecialIndicatorSecondView (presenterData) { var graph = new BarChart(presenterData.dataToDraw, detailParams, null, null); graph.drawChart(); } - this.fillSpecialIndicatorSecondViewDetail(presenterData); + this.fillSpecialIndicatorSecondViewDetail(presenter.orderDataList(presenterData.entityData, selectedOrderOfDetailList())); } -function fillSpecialIndicatorSecondViewDetail (presenterData) { +var fillSpecialIndicatorSecondViewDetail = function (list) { //presenterData = { entityData: Array[{name,uid,inefficiencyCost, // inefficiencyIndex, deviationTime, // averageTime}], @@ -639,9 +701,16 @@ function fillSpecialIndicatorSecondViewDetail (presenterData) { var gridDetail = $('#relatedDetailGridStack').data('gridstack'); gridDetail.remove_all(); - $.each(presenterData.entityData, function(index, dataItem) { + window.currentDetailList = list; + window.currentDetailFunction = fillSpecialIndicatorSecondViewDetail; + + $.each(list, function(index, dataItem) { var $widget = widgetBuilder.buildSpecialIndicatorSecondViewDetail(dataItem); var x = (index % 2 == 0) ? 6 : 0; + //the first 2 elements are not hidden + if (index < 2) { + $widget.removeClass("hideme"); + } gridDetail.add_widget($widget, x, 15, 6, 2, true); }); @@ -651,9 +720,10 @@ function fillSpecialIndicatorSecondViewDetail (presenterData) { if (window.currentIndicator.type == "1030") { $('#relatedLabel').find('h3').text(G_STRING['ID_RELATED_USERS']); } + hideScrollIfAllDivsAreVisible(); } -function fillGeneralIndicatorFirstView (presenterData) { +var fillGeneralIndicatorFirstView = function (presenterData) { var widgetBuilder = new WidgetBuilder(); var panel = $('#indicatorsDataGridStack').data('gridstack'); panel.remove_all(); @@ -779,7 +849,7 @@ function fillGeneralIndicatorFirstView (presenterData) { setIndicatorActiveMarker(); } -function animateProgress (indicatorItem, widget){ +var animateProgress = function (indicatorItem, widget){ var getRequestAnimationFrame = function () { return window.requestAnimationFrame || window.webkitRequestAnimationFrame || diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php b/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php index 1c9bb8521..2491b49cb 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php @@ -18,7 +18,7 @@ class ReportingIndicators * * return decimal value */ - public function getPeiCompleteData($indicatorUid, $measureDate, $compareDate, $language) + public function getPeiCompleteData($indicatorUid, $compareDate, $measureDate, $language) { G::loadClass('indicatorsCalculator'); $calculator = new \IndicatorsCalculator(); @@ -33,6 +33,7 @@ class ReportingIndicators $retval = array( "id" => $indicatorUid, "efficiencyIndex" => $peiValue, + "efficiencyIndexCompare" => $peiCompare, "efficiencyVariation" => ($peiValue-$peiCompare), "inefficiencyCost" => $peiCost, "data"=>$processes); @@ -49,29 +50,17 @@ class ReportingIndicators * * return decimal value */ - public function getUeiCompleteData($indicatorUid, $measureDate, $compareDate, $language) + public function getUeiCompleteData($indicatorUid, $compareDate, $measureDate,$language) { G::loadClass('indicatorsCalculator'); $calculator = new \IndicatorsCalculator(); $groups = $calculator->ueiUserGroups($indicatorUid, $measureDate, $measureDate, $language); - $groupIds = array(); - foreach($groups as $p) { - array_push($groupIds, $p['uid']); - } - - if (sizeof($groupIds) == 0) { - $groupIds = null; - } - //TODO think what if each indicators has a group or user subset assigned. Now are all $ueiValue = current(reset($calculator->ueiHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE))); $arrCost = $calculator->ueiUserGroups($indicatorUid, $measureDate, $measureDate, $language); - $ueiCost = (sizeof($arrCost) > 0) - ? $arrCost[0]['inefficiencyCost'] - : null; - + $ueiCost = current(reset($calculator->ueiCostHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE))); $ueiCompare = current(reset($calculator->ueiHistoric(null, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE))); $retval = array( diff --git a/workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php b/workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php index 60db98f0e..23a5190c9 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php @@ -71,223 +71,6 @@ class ReportingIndicators extends Api } } -// /** -// * Returns the aggregate Efficiency of a employee or set of employees -// * -// * @param string $employee_list {@from path} -// * @param string $init_date {@from path} -// * @param string $end_date {@from path} -// * @return array -// * -// * @url GET /employee-efficiency-index -// */ -// public function doGetEmployeeEfficiencyIndex($employee_list, $init_date, $end_date) -// { -// try { -// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators(); -// $listArray = (strlen($employee_list) > 1) -// ? $listArray = explode(',', $employee_list) -// : null; -// $response = $indicatorsObj->getEmployeeEfficiencyIndex($listArray, -// new \DateTime($init_date), -// new \DateTime($end_date)); -// return $response; -// } catch (\Exception $e) { -// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); -// } -// } -// -// /** -// * Lists tasks of a employee and it's statistics (efficiency, average times, etc.) -// * -// * @param string $employee_list {@from path} -// * @param string $init_date {@from path} -// * @param string $end_date {@from path} -// * @param string $language {@from path} -// * @return array -// * -// * @url GET /employee-tasks -// */ -// public function doGetEmployeeTasksInfo($employee_list, $init_date, $end_date, $language) -// { -// if ($employee_list == null || strlen($employee_list) <= 1) -// throw new InvalidArgumentException ('employee_list must have at least a value', 0); -// -// try { -// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators(); -// $listArray = $listArray = explode(',', $employee_list); -// $response = $indicatorsObj->getEmployeeTasksInfoList($listArray, -// new \DateTime($init_date), -// new \DateTime($end_date), -// $language); -// return $response; -// } catch (\Exception $e) { -// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); -// } -// } -// -// /** -// * Returns the percent of Cases with Overdue time -// * -// * @param string $$process_list {@from path} -// * @param string $init_date {@from path} -// * @param string $end_date {@from path} -// * @return array -// * -// * @url GET /percent-overdue-cases -// */ -// public function doGetPercentOverdueByProcess($process_list, $init_date, $end_date) -// { -// try { -// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators(); -// $listArray = (strlen($process_list) > 1) -// ? $listArray = explode(',', $process_list) -// : null; -// $response = $indicatorsObj->getPercentOverdueCasesByProcess($listArray, -// new \DateTime($init_date), -// new \DateTime($end_date)); -// return $response; -// } catch (\Exception $e) { -// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); -// } -// } -// -// /** -// * Returns the percent of Cases with Overdue time with the selected periodicity -// * -// * @param string $$process_list {@from path} -// * @param string $init_date {@from path} -// * @param string $end_date {@from path} -// * @param string $periodicity {@from path} -// * @return array -// * -// * @url GET /percent-overdue-cases-history -// */ -// public function doGetPercentOverdueByProcessHistory($process_list, $init_date, $end_date, $periodicity) -// { -// try { -// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators(); -// $listArray = (strlen($process_list) > 1) -// ? $listArray = explode(',', $process_list) -// : null; -// $response = $indicatorsObj->getPercentOverdueCasesByProcessHistory($listArray, -// new \DateTime($init_date), -// new \DateTime($end_date), -// $periodicity); -// return $response; -// } catch (\Exception $e) { -// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); -// } -// } -// -// /** -// * Returns the total of Cases with New time -// * -// * @param string $$process_list {@from path} -// * @param string $init_date {@from path} -// * @param string $end_date {@from path} -// * @return array -// * -// * @url GET /total-new-cases -// */ -// public function doGetTotalNewByProcess($process_list, $init_date, $end_date) -// { -// try { -// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators(); -// $listArray = (strlen($process_list) > 1) -// ? $listArray = explode(',', $process_list) -// : null; -// $response = $indicatorsObj->getPercentNewCasesByProcess($listArray, -// new \DateTime($init_date), -// new \DateTime($end_date)); -// return $response; -// } catch (\Exception $e) { -// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); -// } -// } -// -// /** -// * Returns the total of Cases with New time with the selected periodicity -// * -// * @param string $$process_list {@from path} -// * @param string $init_date {@from path} -// * @param string $end_date {@from path} -// * @param string $periodicity {@from path} -// * @return array -// * -// * @url GET /total-new-cases-history -// */ -// public function doGetTotalNewByProcessHistory($process_list, $init_date, $end_date, $periodicity) -// { -// try { -// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators(); -// $listArray = (strlen($process_list) > 1) -// ? $listArray = explode(',', $process_list) -// : null; -// $response = $indicatorsObj->getPercentNewCasesByProcessHistory($listArray, -// new \DateTime($init_date), -// new \DateTime($end_date), -// $periodicity); -// return $response; -// } catch (\Exception $e) { -// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); -// } -// } -// -// /** -// * Returns the total of Cases with Completed time -// * -// * @param string $$process_list {@from path} -// * @param string $init_date {@from path} -// * @param string $end_date {@from path} -// * @return array -// * -// * @url GET /total-completed-cases -// */ -// public function doGetTotalCompletedByProcess($process_list, $init_date, $end_date) -// { -// try { -// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators(); -// $listArray = (strlen($process_list) > 1) -// ? $listArray = explode(',', $process_list) -// : null; -// $response = $indicatorsObj->getPercentCompletedCasesByProcess($listArray, -// new \DateTime($init_date), -// new \DateTime($end_date)); -// return $response; -// } catch (\Exception $e) { -// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); -// } -// } -// -// /** -// * Returns the total of Cases with Completed time with the selected periodicity -// * -// * @param string $$process_list {@from path} -// * @param string $init_date {@from path} -// * @param string $end_date {@from path} -// * @param string $periodicity {@from path} -// * @return array -// * -// * @url GET /total-completed-cases-history -// */ -// public function doGetTotalCompletedByProcessHistory($process_list, $init_date, $end_date, $periodicity) -// { -// try { -// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators(); -// $listArray = (strlen($process_list) > 1) -// ? $listArray = explode(',', $process_list) -// : null; -// $response = $indicatorsObj->getPercentCompletedCasesByProcessHistory($listArray, -// new \DateTime($init_date), -// new \DateTime($end_date), -// $periodicity); -// return $response; -// } catch (\Exception $e) { -// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); -// } -// } -// /** * Returns the total of Cases with Completed time with the selected periodicity * @@ -299,7 +82,7 @@ class ReportingIndicators extends Api * * @url GET /process-efficiency-data */ - public function doGetProcessEficciencyData($indicator_uid, $measure_date, $compare_date, $language) + public function doGetProcessEficciencyData($indicator_uid, $compare_date, $measure_date, $language) { try { $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators(); @@ -324,7 +107,7 @@ class ReportingIndicators extends Api * * @url GET /employee-efficiency-data */ - public function doGetEmployeeEficciencyData($indicator_uid, $measure_date, $compare_date, $language) + public function doGetEmployeeEficciencyData($indicator_uid, $compare_date, $measure_date, $language) { try { $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators(); diff --git a/workflow/engine/templates/strategicDashboard/viewDashboard.html b/workflow/engine/templates/strategicDashboard/viewDashboard.html index b33bc9545..ad24c58b3 100644 --- a/workflow/engine/templates/strategicDashboard/viewDashboard.html +++ b/workflow/engine/templates/strategicDashboard/viewDashboard.html @@ -35,10 +35,12 @@ {/foreach} - - - - + + + + + + - - + + - +
    @@ -340,7 +344,7 @@ {/literal} - @@ -389,7 +393,14 @@
    -

    +
    +
    +

    +
    +
    + Sort:     +
    +
    - - - diff --git a/workflow/public_html/css/sb-admin-2.css b/workflow/public_html/css/sb-admin-2.css index f4ebc8176..de0be12a1 100644 --- a/workflow/public_html/css/sb-admin-2.css +++ b/workflow/public_html/css/sb-admin-2.css @@ -566,7 +566,7 @@ table.dataTable thead .sorting:after { } .panel-active{ - background-color: #000; + background-color: #D99058; position: relative; } @@ -729,11 +729,18 @@ table.dataTable thead .sorting:after { font-size: 14px; } -.process-button .blue{ +.process-button .blue, +.process-button .red, +.process-button .green{ font-size: 24px; } -.process-button:hover .blue, .process-button:hover, .process-button:hover .grey{ +.process-button:hover .blue, +.process-button:hover, +.process-button:hover .grey, +.process-button:hover .red, +.process-button:hover .green +{ background: #337AB8; color:#fff !important; }