diff --git a/workflow/engine/js/strategicDashboard/viewDashboardView.js b/workflow/engine/js/strategicDashboard/viewDashboardView.js index 3c919494f..6aebaab0d 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardView.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardView.js @@ -395,10 +395,27 @@ var hideScrollIfAllDivsAreVisible = function(){ $('#scrollImg').hide(); } else { + $('#scrollImg').css('visibility', 'visible'); $('#scrollImg').show(); } } +var hideTitleAndSortDiv = function(){ + if (window.currentIndicator == null) { + $('#relatedLabel').hide(); + } + switch (window.currentIndicator.type) { + case "1010": + case "1030": + $('#relatedLabel').css('visibility', 'visible'); + $('#relatedLabel').show(); + break; + default: + $('#relatedLabel').hide(); + break; + } +} + var selectedOrderOfDetailList = function () { return ($('#sortListButton').hasClass('fa-chevron-up') ? "up" : "down"); } @@ -436,6 +453,8 @@ var loadIndicator = function (indicatorId, initDate, endDate) { break; } }); + hideScrollIfAllDivsAreVisible(); + hideTitleAndSortDiv(); } var setIndicatorActiveMarker = function () { @@ -555,7 +574,6 @@ var fillStatusIndicatorFirstView = function (presenterData) { var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(presenterData.id) setIndicatorActiveMarker(); - $('#relatedLabel').hide(); } var fillStatusIndicatorFirstViewDetail = function(presenterData) { @@ -579,7 +597,6 @@ var fillStatusIndicatorFirstViewDetail = function(presenterData) { } var fillSpecialIndicatorFirstView = function(presenterData) { - $('#relatedLabel').show(); var widgetBuilder = new WidgetBuilder(); var panel = $('#indicatorsDataGridStack').data('gridstack'); panel.remove_all();