From c55eb6d58b3a3248152692b8246b9fcfafe868b5 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Mena Date: Tue, 26 May 2015 16:48:58 -0400 Subject: [PATCH] Add interfaz list Inbox --- .../classes/class.indicatorsCalculator.php | 8 + .../engine/controllers/strategicDashboard.php | 1 + .../strategicDashboard/viewDashboardView.js | 57 +- .../strategicDashboard/viewDashboard.html | 738 +++++++++--------- workflow/public_html/css/sb-admin-2.css | 4 + 5 files changed, 436 insertions(+), 372 deletions(-) diff --git a/workflow/engine/classes/class.indicatorsCalculator.php b/workflow/engine/classes/class.indicatorsCalculator.php index f4bbcfcb6..b352e3403 100644 --- a/workflow/engine/classes/class.indicatorsCalculator.php +++ b/workflow/engine/classes/class.indicatorsCalculator.php @@ -550,6 +550,14 @@ 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 c2b07ca7a..a4583e212 100644 --- a/workflow/engine/controllers/strategicDashboard.php +++ b/workflow/engine/controllers/strategicDashboard.php @@ -197,6 +197,7 @@ 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 54901a5cd..e50eb44d1 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardView.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardView.js @@ -88,15 +88,23 @@ 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 (!oneItemDetail.hasOwnProperty("name")){throw new Error("buildSpecialIndicatorFirstViewDetail -> detailData has not the name param. Has it the correct Type? ->" + 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);} - _.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; + _.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; } WidgetBuilder.prototype.buildStatusIndicatorFirstView = function (indicatorData) { @@ -374,6 +382,7 @@ $(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() { @@ -619,7 +628,8 @@ var fillStatusIndicatorFirstView = function (presenterData) { var graph3 = new PieChart(presenterData.graph3Data, graphParams3, null, null); graph3.drawChart(); - var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(presenterData.id) + var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(presenterData.id); + this.fillSpecialIndicatorFirstViewDetail(presenter.orderDataList(presenterData.data, selectedOrderOfDetailList())); setIndicatorActiveMarker(); } @@ -694,7 +704,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); @@ -721,7 +731,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) { @@ -733,13 +743,20 @@ var fillSpecialIndicatorFirstViewDetail = function (list) { } gridDetail.add_widget($widget, x, 15, 6, 2, true); }); - 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 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(); } var fillSpecialIndicatorSecondView = function(presenterData) { @@ -954,7 +971,7 @@ var fillGeneralIndicatorFirstView = function (presenterData) { setIndicatorActiveMarker(); } -var animateProgress = function (indicatorItem, widget){ +/*var animateProgress = function (indicatorItem, widget){ var getRequestAnimationFrame = function () { return window.requestAnimationFrame || window.webkitRequestAnimationFrame || @@ -998,7 +1015,7 @@ var animateProgress = function (indicatorItem, widget){ } fpAnimationFrame(animacion); -}; +};*/ /*var dashboardButtonTemplate = '
\ \ diff --git a/workflow/engine/templates/strategicDashboard/viewDashboard.html b/workflow/engine/templates/strategicDashboard/viewDashboard.html index 58b11bc69..b1c8fd47d 100644 --- a/workflow/engine/templates/strategicDashboard/viewDashboard.html +++ b/workflow/engine/templates/strategicDashboard/viewDashboard.html @@ -4,6 +4,7 @@ + Dashboards @@ -33,7 +34,7 @@ {/foreach} - + @@ -41,271 +42,304 @@ - + - + - + - +
+
+
<%- indicator.efficiencyIndexToShow %>
+
+
+
+
{$unitCost} <%- indicator.inefficiencyCostToShow %>
+
+
+
+
+
+
+
+ - + + - + - + - + - + - + + - - + + - + @@ -366,76 +400,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"}:
+
-
- +
+ - -
+ +
-
- -
+
+ +
-
+
@@ -468,18 +502,18 @@
- +
-
+
diff --git a/workflow/public_html/css/sb-admin-2.css b/workflow/public_html/css/sb-admin-2.css index 5a446c188..ca77a80ea 100644 --- a/workflow/public_html/css/sb-admin-2.css +++ b/workflow/public_html/css/sb-admin-2.css @@ -545,6 +545,10 @@ table.dataTable thead .sorting:after { margin: 11px 17px 0 0; } +.dashboard-right { + margin: 5px; +} + .dashboard-right h5{ margin: 20px 12px 0 0; }