diff --git a/workflow/engine/classes/class.indicatorsCalculator.php b/workflow/engine/classes/class.indicatorsCalculator.php index b352e3403..f4bbcfcb6 100644 --- a/workflow/engine/classes/class.indicatorsCalculator.php +++ b/workflow/engine/classes/class.indicatorsCalculator.php @@ -550,14 +550,6 @@ class indicatorsCalculator $response = array(); $result = $this->statusIndicatorGeneral($usrUid); - $list = new \ListInbox(); - $filters = array(); - $filters['sort'] = "LIST_INBOX.APP_UPDATE_DATE"; - $filters['dir'] = "ASC"; - $filters['action'] = "to_do"; - $filters['paged'] = 0; - $response['data'] = $list->loadList($usrUid, $filters); - $response['overdue'] = 0; $response['atRisk'] = 0; $response['onTime'] = 0; diff --git a/workflow/engine/controllers/strategicDashboard.php b/workflow/engine/controllers/strategicDashboard.php index a4583e212..c2b07ca7a 100644 --- a/workflow/engine/controllers/strategicDashboard.php +++ b/workflow/engine/controllers/strategicDashboard.php @@ -197,7 +197,6 @@ class StrategicDashboard extends Controller $translation['ID_TIME_HOURS'] = G::LoadTranslation( 'ID_TIME_HOURS'); $translation['ID_GROUPS'] = G::LoadTranslation( 'ID_GROUPS'); $translation['ID_COSTS'] = G::LoadTranslation( 'ID_COSTS'); - $translation['ID_PROCESS'] = G::LoadTranslation( 'ID_PROCESS'); $translation['ID_TASK'] = G::LoadTranslation( 'ID_TASK'); $translation['ID_USER'] = G::LoadTranslation( 'ID_USER'); $translation['ID_YEAR'] = G::LoadTranslation( 'ID_YEAR'); diff --git a/workflow/engine/js/strategicDashboard/viewDashboardView.js b/workflow/engine/js/strategicDashboard/viewDashboardView.js index e50eb44d1..54901a5cd 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardView.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardView.js @@ -88,23 +88,15 @@ WidgetBuilder.prototype.buildSpecialIndicatorFirstViewDetail = function (oneItem //detailData = {indicatorId, uid, name, averateTime...} if (oneItemDetail == null){throw new Error("oneItemDetail is null ");} if (!typeof(oneItemDetail) === 'object'){throw new Error( "detailData is not and object ->" + oneItemDetail);} - if (window.currentIndicator.type != '1050' && !oneItemDetail.hasOwnProperty("name")){throw new Error("buildSpecialIndicatorFirstViewDetail -> detailData has not the name param. Has it the correct Type? ->" + oneItemDetail);} + 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.specialIndicatorDetail").html()); - if (window.currentIndicator.type == '1050') { - template = _.template ($("script.statusInboxDetail").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_INEFFICIENCY_COST); - - if (window.currentIndicator.type == '1050') { - $retval.find(".detail-pro-title").text(G_STRING.ID_PROCESS); - $retval.find(".detail-tas-title").text(G_STRING.ID_TASK); - } - this.setColorForInefficiency($retval.find(".detail-cost-number-selector"), oneItemDetail); - return $retval; + _.templateSettings.variable = "detailData"; + 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_INEFFICIENCY_COST); + this.setColorForInefficiency($retval.find(".detail-cost-number-selector"), oneItemDetail); + return $retval; } WidgetBuilder.prototype.buildStatusIndicatorFirstView = function (indicatorData) { @@ -382,7 +374,6 @@ $(document).ready(function() { $('#indicatorsGridStack').on('click','.ind-button-selector', function() { var indicatorId = $(this).data('indicator-id'); loadIndicator(indicatorId, defaultInitDate(), defaultEndDate()); - }); $('body').on('click','.bread-back-selector', function() { @@ -628,8 +619,7 @@ var fillStatusIndicatorFirstView = function (presenterData) { var graph3 = new PieChart(presenterData.graph3Data, graphParams3, null, null); graph3.drawChart(); - var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(presenterData.id); - this.fillSpecialIndicatorFirstViewDetail(presenter.orderDataList(presenterData.data, selectedOrderOfDetailList())); + var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(presenterData.id) setIndicatorActiveMarker(); } @@ -704,7 +694,7 @@ var fillSpecialIndicatorFirstView = function(presenterData) { } }; - var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(presenterData.id); + var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(presenterData.id) if (indicatorPrincipalData.type == "1010") { var graph = new Pie3DChart(presenterData.dataToDraw, peiParams, null, null); @@ -731,7 +721,7 @@ var fillSpecialIndicatorFirstViewDetail = function (list) { var gridDetail = $('#relatedDetailGridStack').data('gridstack'); gridDetail.remove_all(); - window.currentDetailList = list; + window.currentDetailList = list; window.currentDetailFunction = fillSpecialIndicatorFirstViewDetail; $.each(list, function(index, dataItem) { @@ -743,20 +733,13 @@ var fillSpecialIndicatorFirstViewDetail = function (list) { } gridDetail.add_widget($widget, x, 15, 6, 2, true); }); - var label = ''; - switch (window.currentIndicator.type) { - case '1010': - label = G_STRING['ID_RELATED_PROCESS']; - break; - case '1030': - label = G_STRING['ID_RELATED_GROUPS']; - break; - case '1050': - label = G_STRING['ID_RELATED_TASKS']; - break; - } - $('#relatedLabel').find('h3').text(label); - hideScrollIfAllDivsAreVisible(); + if (window.currentIndicator.type == "1010") { + $('#relatedLabel').find('h3').text(G_STRING['ID_RELATED_PROCESS']); + } + if (window.currentIndicator.type == "1030") { + $('#relatedLabel').find('h3').text(G_STRING['ID_RELATED_GROUPS']); + } + hideScrollIfAllDivsAreVisible(); } var fillSpecialIndicatorSecondView = function(presenterData) { @@ -971,7 +954,7 @@ var fillGeneralIndicatorFirstView = function (presenterData) { setIndicatorActiveMarker(); } -/*var animateProgress = function (indicatorItem, widget){ +var animateProgress = function (indicatorItem, widget){ var getRequestAnimationFrame = function () { return window.requestAnimationFrame || window.webkitRequestAnimationFrame || @@ -1015,7 +998,7 @@ var fillGeneralIndicatorFirstView = function (presenterData) { } fpAnimationFrame(animacion); -};*/ +}; /*var dashboardButtonTemplate = '
\ \ diff --git a/workflow/engine/templates/strategicDashboard/viewDashboard.html b/workflow/engine/templates/strategicDashboard/viewDashboard.html index b1c8fd47d..58b11bc69 100644 --- a/workflow/engine/templates/strategicDashboard/viewDashboard.html +++ b/workflow/engine/templates/strategicDashboard/viewDashboard.html @@ -4,7 +4,6 @@ - Dashboards @@ -34,7 +33,7 @@ {/foreach} - + @@ -42,304 +41,271 @@ - + - + - + - +
+
+
<%- indicator.efficiencyIndexToShow %>
+
+
+
+
{$unitCost} <%- indicator.inefficiencyCostToShow %>
+
+
+
+
+
+
+
+ - + + - + - + - + - + - - - - - + + - + @@ -400,76 +366,76 @@

-
-
-
{translate label="ID_DASH_COMPARE_INIT_PERIOD"}:
-
-
- +
+
+
{translate label="ID_DASH_COMPARE_INIT_PERIOD"}:
+
+
+ - -
-
-
{translate label="ID_DASH_COMPARE_END_PERIOD"}:
-
+ +
+
+
{translate label="ID_DASH_COMPARE_END_PERIOD"}:
+
-
- +
+ - -
+ +
-
- -
+
+ +
-
+
@@ -502,18 +468,18 @@
- +
-
+
diff --git a/workflow/public_html/css/sb-admin-2.css b/workflow/public_html/css/sb-admin-2.css index ca77a80ea..5a446c188 100644 --- a/workflow/public_html/css/sb-admin-2.css +++ b/workflow/public_html/css/sb-admin-2.css @@ -545,10 +545,6 @@ table.dataTable thead .sorting:after { margin: 11px 17px 0 0; } -.dashboard-right { - margin: 5px; -} - .dashboard-right h5{ margin: 20px 12px 0 0; }