fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add interfaz list Inbox"

Browse Source 
This reverts commit c326dc43c37047faf54f9a6bfa2774722f45e33d.
This commit is contained in:
Dante
2015-05-29 11:45:06 -04:00
parent a5322a97a2
commit 535d11a41b
5 changed files with 372 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.indicatorsCalculator.php
View File

@@ -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;

1
workflow/engine/controllers/strategicDashboard.php
View File

@@ -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');

37
workflow/engine/js/strategicDashboard/viewDashboardView.js
View File

@@ -88,21 +88,13 @@ 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;
}
@@ -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);
@@ -743,19 +733,12 @@ 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;
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']);
}
$('#relatedLabel').find('h3').text(label);
hideScrollIfAllDivsAreVisible();
}
@@ -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 = ' <div class="btn-group pull-left"> \
<button id="favorite" type="button" class="btn btn-success"><i class="fa fa-star fa-1x"></i></button> \

34
workflow/engine/templates/strategicDashboard/viewDashboard.html
View File

@@ -4,7 +4,6 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon" />
<title>Dashboards</title>
<link rel="stylesheet" href="/lib/pmdynaform/libs/bootstrap-3.1.1/css/bootstrap.min.css">
@@ -294,39 +293,6 @@
</div>
</script>
<script type="text/template" class="statusInboxDetail">
<div class="process-div well hideme detail-button-selector"
data-gs-no-resize="true"
style="cursor:pointer;"
id="detailData-<%- detailData.APP_UID %>"
data-detail-tas-uid="<%- detailData.TAS_UID %>"
>
<div class="panel-heading greenbg">
<div class="col-xs-11 text-center detail-title-selector">
<div class="blue small">#<%- detailData.APP_NUMBER %></div>
<div class="ellipsis"><%- detailData.APP_TAS_TITLE%> </div>
</div>
<div class="col-xs-1 text-center detail-title-selector">
<i class="fa fa-chevron-right fa-fw"></i>
</div>
<div class="clearfix"></div>
</div>
<div class="text-center huge">
<div class="col-xs-12 vcenter-task">
<div class="col-xs-6 ">
<div class="blue small"><%- detailData.APP_PRO_TITLE %></div>
<div class="smallB grey detail-pro-title ellipsis"></div>
</div>
<div class="col-xs-6 ">
<div class="blue small"><%- detailData.APP_TAS_TITLE%></div>
<div class="smallB grey detail-tas-title ellipsis"></div>
</div>
</div>
<div class="clearfix"></div>
</div>
</div>
</script>
<script type="text/template" class="dashboardButtonTemplate">
<div id="dashboardButton-<%- dashboard.id %>" class="btn-group pull-left"
data-dashboard-id="<%- dashboard.id %>" >

4
workflow/public_html/css/sb-admin-2.css
View File

@@ -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;
}