NDD-54, NDD-46, NDD-53
This commit is contained in:
@@ -109,7 +109,6 @@ BarChart.prototype.drawBars = function(data, canvas, param) {
|
||||
var currObj = this;
|
||||
|
||||
if (data == null || data.length == 0) {
|
||||
console.log(graphDim);
|
||||
canvas.append("text")
|
||||
.attr('class','pm-charts-no-draw')
|
||||
.attr("y", graphDim.height/2)
|
||||
@@ -1204,7 +1203,7 @@ PieChart.prototype.drawPie2D = function (dataset, canvas, param) {
|
||||
});
|
||||
gradients.enter().append("svg:radialGradient")
|
||||
.attr("id", function (d, i) {
|
||||
return "gradient" + d.datalabel;
|
||||
return "gradient" + i;
|
||||
})
|
||||
.attr("class", "gradient")
|
||||
.attr("xlink:href", "#master");
|
||||
@@ -1245,7 +1244,7 @@ PieChart.prototype.drawPie2D = function (dataset, canvas, param) {
|
||||
|
||||
// Each sector will refer to its gradient fill
|
||||
paths.attr("fill", function (d, i) {
|
||||
return "url(#gradient" + d.data.datalabel + ")";
|
||||
return "url(#gradient" + i + ")";
|
||||
})
|
||||
.transition().duration(1000).attrTween("d", tweenIn).each("end", function () {
|
||||
this._listenToEvents = true;
|
||||
@@ -1549,7 +1548,7 @@ Pie3DChart.prototype.drawPie3D = function (data, canvas, param) {
|
||||
.enter()
|
||||
.append("text")
|
||||
.attr("x", w + 30)
|
||||
.attr("class", "pie-label")
|
||||
.attr("class", "legend")
|
||||
//.attr("y",i*10+50)
|
||||
.text(function (d, i) {
|
||||
return d.datalabel + " - " + getPercent(d.value * 1)
|
||||
|
||||
@@ -164,24 +164,7 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) {
|
||||
"inefficiencyCost" : "value"
|
||||
};
|
||||
var newObject = that.helper.merge(originalObject, {}, map);
|
||||
var shortLabel = (newObject.datalabel == null)
|
||||
? ""
|
||||
: newObject.datalabel.substring(0,15);
|
||||
|
||||
newObject.datalabel = shortLabel;
|
||||
|
||||
//use positive values for drawing;
|
||||
if (newObject.value > 0) {
|
||||
newObject.value = 0;
|
||||
}
|
||||
if (newObject.value < 0) {
|
||||
newObject.value = Math.abs(newObject.value);
|
||||
}
|
||||
|
||||
if (newObject.value > 0) {
|
||||
graphData.push(newObject);
|
||||
}
|
||||
|
||||
originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost);
|
||||
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
|
||||
originalObject.indicatorId = data.id;
|
||||
@@ -190,13 +173,9 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) {
|
||||
|
||||
var retval = {};
|
||||
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);
|
||||
|
||||
this.makeShortLabel(graphData, 12);
|
||||
retval.dataToDraw = this.adaptGraphData(graphData);
|
||||
|
||||
//TODO aumentar el símbolo de moneda $
|
||||
retval.inefficiencyCostToShow = "$ " +Math.round(retval.inefficiencyCost);
|
||||
@@ -216,22 +195,7 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) {
|
||||
"deviationTime" : "dispersion"
|
||||
};
|
||||
var newObject = that.helper.merge(originalObject, {}, map);
|
||||
var shortLabel = (newObject.datalabel == null)
|
||||
? ""
|
||||
: newObject.datalabel.substring(0,7);
|
||||
|
||||
newObject.datalabel = shortLabel;
|
||||
//use positive values for drawing;
|
||||
if (newObject.value > 0) {
|
||||
newObject.value = 0;
|
||||
}
|
||||
if (newObject.value < 0) {
|
||||
newObject.value = Math.abs(newObject.value);
|
||||
}
|
||||
|
||||
if (newObject.value > 0) {
|
||||
graphData.push(newObject);
|
||||
}
|
||||
originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost);
|
||||
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
|
||||
originalObject.indicatorId = data.id;
|
||||
@@ -240,12 +204,8 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) {
|
||||
|
||||
var retval = {};
|
||||
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);
|
||||
this.makeShortLabel(graphData, 10);
|
||||
retval.dataToDraw = this.adaptGraphData(graphData);
|
||||
|
||||
//TODO aumentar el símbolo de moneda $
|
||||
retval.inefficiencyCostToShow = "$ " + Math.round(retval.inefficiencyCost);
|
||||
@@ -268,15 +228,15 @@ ViewDashboardPresenter.prototype.statusViewModel = function(indicatorId, data) {
|
||||
|
||||
//TODO Do not use the str. replace when color and lable in pie 2D is solved.
|
||||
var newObject1 = {
|
||||
datalabel : title.trim().replace(" ", "_"),
|
||||
datalabel : title,
|
||||
value : originalObject.percentageTotalOverdue
|
||||
};
|
||||
var newObject2 = {
|
||||
datalabel : title.trim().replace(" ", "_"),
|
||||
datalabel : title,
|
||||
value : originalObject.percentageTotalAtRisk
|
||||
};
|
||||
var newObject3 = {
|
||||
datalabel : title.trim().replace(" ", "_"),
|
||||
datalabel : title,
|
||||
value : originalObject.percentageTotalOnTime
|
||||
};
|
||||
|
||||
@@ -299,7 +259,6 @@ ViewDashboardPresenter.prototype.statusViewModel = function(indicatorId, data) {
|
||||
retval.graph2Data = this.orderGraphData(graph2Data, "down").splice(0,7)
|
||||
retval.graph3Data = this.orderGraphData(graph3Data, "down").splice(0,7)
|
||||
//TODO correct 2D Pie so we don't depend on label name
|
||||
|
||||
$.each(retval.graph1Data, function(index, item) { item.datalabel = (index + 1) + "." + item.datalabel; });
|
||||
$.each(retval.graph2Data, function(index, item) { item.datalabel = (index + 1) + "." + item.datalabel; });
|
||||
$.each(retval.graph3Data, function(index, item) { item.datalabel = (index + 1) + "." + item.datalabel; });
|
||||
@@ -370,29 +329,15 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelPei = function(modelD
|
||||
"deviationTime" : "dispersion"
|
||||
};
|
||||
var newObject = that.helper.merge(originalObject, {}, map);
|
||||
newObject.datalabel = ((newObject.datalabel == null) ? "" : newObject.datalabel.substring(0, 7));
|
||||
originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost);
|
||||
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
|
||||
originalObject.deviationTimeToShow = Math.round(originalObject.deviationTime);
|
||||
//use positive values for drawing;
|
||||
if (newObject.value > 0) {
|
||||
newObject.value = 0;
|
||||
}
|
||||
if (newObject.value < 0) {
|
||||
newObject.value = Math.abs(newObject.value);
|
||||
}
|
||||
|
||||
if (newObject.value > 0) {
|
||||
originalObject.rankToShow = originalObject.rank + "/" + modelData.length;
|
||||
graphData.push(newObject);
|
||||
}
|
||||
});
|
||||
var retval = {};
|
||||
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);
|
||||
this.makeShortLabel(graphData, 10);
|
||||
retval.dataToDraw = this.adaptGraphData(graphData);
|
||||
retval.entityData = modelData;
|
||||
return retval;
|
||||
};
|
||||
@@ -411,30 +356,16 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelUei = function(modelD
|
||||
"deviationTime" : "dispersion"
|
||||
};
|
||||
var newObject = that.helper.merge(originalObject, {}, map);
|
||||
newObject.datalabel = ((newObject.datalabel == null) ? "" : newObject.datalabel.substring(0, 7));
|
||||
originalObject.inefficiencyCostToShow = "$ " +Math.round(originalObject.inefficiencyCost);
|
||||
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
|
||||
originalObject.deviationTimeToShow = Math.round(originalObject.deviationTime);
|
||||
//use positive values for drawing;
|
||||
if (newObject.value > 0) {
|
||||
newObject.value = 0;
|
||||
}
|
||||
if (newObject.value < 0) {
|
||||
newObject.value = Math.abs(newObject.value);
|
||||
}
|
||||
|
||||
if (newObject.value > 0) {
|
||||
originalObject.rankToShow = originalObject.rank + "/" + modelData.length;
|
||||
graphData.push(newObject);
|
||||
}
|
||||
|
||||
});
|
||||
var retval = {};
|
||||
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);
|
||||
this.makeShortLabel(graphData, 10);
|
||||
retval.dataToDraw = this.adaptGraphData(graphData);
|
||||
retval.entityData = modelData;
|
||||
return retval;
|
||||
};
|
||||
@@ -479,3 +410,33 @@ ViewDashboardPresenter.prototype.orderGraphData = function(listData, orderDirect
|
||||
}
|
||||
return listData.sort(orderToUse);
|
||||
}
|
||||
|
||||
ViewDashboardPresenter.prototype.adaptGraphData = function(listData) {
|
||||
var workList = this.orderGraphData(listData, "up");
|
||||
var newList = [];
|
||||
$.each(workList, function(index, item) {
|
||||
item.datalabel = (index + 1) + "." + item.datalabel;
|
||||
//use positive values for drawing;
|
||||
if (item.value > 0) {
|
||||
item.value = 0;
|
||||
}
|
||||
if (item.value < 0) {
|
||||
item.value = Math.abs(item.value);
|
||||
}
|
||||
|
||||
if (item.value > 0) {
|
||||
newList.push(item);
|
||||
}
|
||||
});
|
||||
return newList.splice(0,7);
|
||||
}
|
||||
|
||||
ViewDashboardPresenter.prototype.makeShortLabel = function(listData, labelLength) {
|
||||
$.each(listData, function(index, item) {
|
||||
var shortLabel = (item.datalabel == null)
|
||||
? ""
|
||||
: item.datalabel.substring(0,labelLength);
|
||||
item.datalabel = shortLabel;
|
||||
item.datalabel = shortLabel;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -141,13 +141,41 @@ WidgetBuilder.prototype.buildSpecialIndicatorSecondView = function (secondViewDa
|
||||
return $retval;
|
||||
};
|
||||
|
||||
WidgetBuilder.prototype.buildSpecialIndicatorSecondViewDetail = function (oneItemDetail) {
|
||||
WidgetBuilder.prototype.buildSpecialIndicatorSecondViewDetailPei = function (oneItemDetail) {
|
||||
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);}
|
||||
|
||||
_.templateSettings.variable = "detailData";
|
||||
var template = _.template ($("script.specialIndicatorSencondViewDetail").html());
|
||||
var template = _.template ($("script.specialIndicatorSecondViewDetailPei").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.buildSpecialIndicatorSecondViewDetailUei = function (oneItemDetail) {
|
||||
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);}
|
||||
|
||||
_.templateSettings.variable = "detailData";
|
||||
var template = _.template ($("script.specialIndicatorSecondViewDetailUei").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.buildSpecialIndicatorSecondViewDetaiUei = function (oneItemDetail) {
|
||||
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);}
|
||||
|
||||
_.templateSettings.variable = "detailData";
|
||||
var template = _.template ($("script.specialIndicatorSencondViewDetailUei").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);
|
||||
@@ -281,6 +309,7 @@ $(document).ready(function() {
|
||||
'height': item.height <= 1 ? 2 : item.height
|
||||
}
|
||||
widgets.push(widgetsObj);
|
||||
console.log(widgetsObj);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -587,8 +616,8 @@ var fillSpecialIndicatorFirstView = function(presenterData) {
|
||||
graph: {
|
||||
allowDrillDown:false,
|
||||
allowTransition:true,
|
||||
axisX:{ showAxis: true, label: G_STRING.ID_GROUPS},
|
||||
axisY:{ showAxis: true, label: G_STRING.ID_COSTS},
|
||||
axisX:{ showAxis: true, label: "Group" },
|
||||
axisY:{ showAxis: true, label: "Cost" },
|
||||
gridLinesX:false,
|
||||
gridLinesY:true,
|
||||
showTip: true,
|
||||
@@ -669,8 +698,8 @@ var fillSpecialIndicatorSecondView = function(presenterData) {
|
||||
gridLinesX: true,
|
||||
gridLinesY: true,
|
||||
area: {visible: false, css:"area"},
|
||||
axisX:{ showAxis: true, label: G_STRING.ID_USER },
|
||||
axisY:{ showAxis: true, label: G_STRING.ID_COSTS },
|
||||
axisX:{ showAxis: true, label: "User" },
|
||||
axisY:{ showAxis: true, label: "Cost" },
|
||||
showErrorBars: true
|
||||
|
||||
}
|
||||
@@ -679,7 +708,7 @@ var fillSpecialIndicatorSecondView = function(presenterData) {
|
||||
var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(window.currentEntityData.indicatorId);
|
||||
|
||||
if (window.currentIndicator.type == "1010") {
|
||||
detailParams.graph.axisX.label = G_STRING.ID_TASK;
|
||||
detailParams.graph.axisX.label = "Task";
|
||||
var graph = new BarChart(presenterData.dataToDraw, detailParams, null, null);
|
||||
graph.drawChart();
|
||||
}
|
||||
@@ -704,7 +733,14 @@ var fillSpecialIndicatorSecondViewDetail = function (list) {
|
||||
window.currentDetailFunction = fillSpecialIndicatorSecondViewDetail;
|
||||
|
||||
$.each(list, function(index, dataItem) {
|
||||
var $widget = widgetBuilder.buildSpecialIndicatorSecondViewDetail(dataItem);
|
||||
if (window.currentIndicator.type == "1010") {
|
||||
var $widget = widgetBuilder.buildSpecialIndicatorSecondViewDetailPei(dataItem);
|
||||
}
|
||||
|
||||
if (window.currentIndicator.type == "1030") {
|
||||
var $widget = widgetBuilder.buildSpecialIndicatorSecondViewDetailUei(dataItem);
|
||||
}
|
||||
|
||||
var x = (index % 2 == 0) ? 6 : 0;
|
||||
//the first 2 elements are not hidden
|
||||
if (index < 2) {
|
||||
@@ -788,7 +824,7 @@ var fillGeneralIndicatorFirstView = function (presenterData) {
|
||||
allowDrillDown:false,
|
||||
allowTransition:true,
|
||||
axisX:{ showAxis: true, label: G_STRING.ID_YEAR },
|
||||
axisY:{ showAxis: true, label: G_STRING.ID_COSTS},
|
||||
axisY:{ showAxis: true, label: "Q" },
|
||||
gridLinesX:false,
|
||||
gridLinesY:true,
|
||||
showTip: true,
|
||||
@@ -810,7 +846,7 @@ var fillGeneralIndicatorFirstView = function (presenterData) {
|
||||
allowDrillDown:false,
|
||||
allowTransition:true,
|
||||
axisX:{ showAxis: true, label: G_STRING.ID_YEAR },
|
||||
axisY:{ showAxis: true, label: G_STRING.ID_COSTS },
|
||||
axisY:{ showAxis: true, label: "Q" },
|
||||
gridLinesX:false,
|
||||
gridLinesY:true,
|
||||
showTip: true,
|
||||
|
||||
@@ -79,13 +79,11 @@ Ext.onReady( function() {
|
||||
items : [
|
||||
{
|
||||
id : 'DAS_TITLE',
|
||||
fieldLabel : _('ID_DASHBOARD_TITLE')+ ' *',
|
||||
fieldLabel : _('ID_DASHBOARD_TITLE'),
|
||||
xtype : 'textfield',
|
||||
anchor : '85%',
|
||||
maxLength : 250,
|
||||
maskRe : /([a-zA-Z0-9_'\s]+)$/,
|
||||
regex : /([a-zA-Z0-9_'\s]+)$/,
|
||||
regexText : _('ID_INVALID_VALUE', _('ID_DASHBOARD_TITLE')),
|
||||
maskRe : /([a-zA-Z0-9\s]+)$/,
|
||||
allowBlank : false
|
||||
},
|
||||
{
|
||||
@@ -94,7 +92,7 @@ Ext.onReady( function() {
|
||||
fieldLabel : _('ID_DESCRIPTION'),
|
||||
labelSeparator : '',
|
||||
anchor : '85%',
|
||||
maskRe : /([a-zA-Z0-9_'\s]+)$/,
|
||||
maskRe : /([a-zA-Z0-9\s]+)$/,
|
||||
height : 50,
|
||||
}
|
||||
]
|
||||
@@ -530,14 +528,13 @@ Ext.onReady( function() {
|
||||
flag = true;
|
||||
break;
|
||||
case 'yes':
|
||||
tabPanel.getItem(component.id).show();
|
||||
flag = false;
|
||||
var dasIndUid = Ext.getCmp('DAS_IND_UID_'+component.id).getValue();
|
||||
if (typeof dasIndUid != 'undefined' && dasIndUid != '') {
|
||||
removeIndicator(dasIndUid);
|
||||
}
|
||||
tabActivate.remove(component.id);
|
||||
tabPanel.remove(component, true);
|
||||
tabPanel.remove(component);
|
||||
break;
|
||||
}
|
||||
},
|
||||
@@ -674,6 +671,7 @@ Ext.onReady( function() {
|
||||
]
|
||||
});
|
||||
|
||||
ownerInfoGrid.store.load();
|
||||
ownerInfoGrid.on("afterrender", function(component) {
|
||||
component.getBottomToolbar().refresh.hideParent = true;
|
||||
component.getBottomToolbar().refresh.hide();
|
||||
@@ -700,7 +698,6 @@ Ext.onReady( function() {
|
||||
}
|
||||
dashboardOwnerFields.items.items[0].bindStore(dataUserGroup);
|
||||
} );
|
||||
|
||||
storeUsers.on( 'load', function( store, records, options ) {
|
||||
for (var i=0; i< store.data.length; i++) {
|
||||
row = [];
|
||||
@@ -754,13 +751,11 @@ var addTab = function (flag) {
|
||||
hidden : true
|
||||
},
|
||||
{
|
||||
fieldLabel : _('ID_INDICATOR_TITLE')+ ' *',
|
||||
fieldLabel : _('ID_INDICATOR_TITLE'),
|
||||
id : 'IND_TITLE_'+ indexTab,
|
||||
xtype : 'textfield',
|
||||
anchor : '85%',
|
||||
maskRe : /([a-zA-Z0-9_'\s]+)$/,
|
||||
regex : /([a-zA-Z0-9_'\s]+)$/,
|
||||
regexText : _('ID_INVALID_VALUE', _('ID_INDICATOR_TITLE')),
|
||||
maskRe : /([a-zA-Z0-9\s]+)$/,
|
||||
maxLength : 250,
|
||||
allowBlank : false
|
||||
},
|
||||
@@ -768,7 +763,7 @@ var addTab = function (flag) {
|
||||
anchor : '85%',
|
||||
editable : false,
|
||||
id : 'IND_TYPE_'+ indexTab,
|
||||
fieldLabel : _('ID_INDICATOR_TYPE')+ ' *',
|
||||
fieldLabel : _('ID_INDICATOR_TYPE'),
|
||||
displayField : 'CAT_LABEL_ID',
|
||||
valueField : 'CAT_UID',
|
||||
forceSelection : false,
|
||||
@@ -787,7 +782,6 @@ var addTab = function (flag) {
|
||||
var fields = ['DAS_IND_FIRST_FIGURE_'+index,'DAS_IND_FIRST_FREQUENCY_'+index,'DAS_IND_SECOND_FIGURE_'+index, 'DAS_IND_SECOND_FREQUENCY_'+index];
|
||||
if (value == '1050') {
|
||||
field = Ext.getCmp('IND_PROCESS_'+index);
|
||||
field.setValue('0');
|
||||
field.disable();
|
||||
field.hide();
|
||||
} else {
|
||||
@@ -880,17 +874,18 @@ var addTab = function (flag) {
|
||||
new Ext.form.ComboBox({
|
||||
anchor : '85%',
|
||||
editable : false,
|
||||
fieldLabel : _('ID_PROCESS')+ ' *',
|
||||
fieldLabel : _('ID_PROCESS'),
|
||||
id : 'IND_PROCESS_'+ indexTab,
|
||||
displayField : 'prj_name',
|
||||
valueField : 'prj_uid',
|
||||
forceSelection : true,
|
||||
forceSelection : false,
|
||||
emptyText : _('ID_EMPTY_PROCESSES'),
|
||||
selectOnFocus : true,
|
||||
hidden : true,
|
||||
typeAhead : true,
|
||||
autocomplete : true,
|
||||
triggerAction : 'all',
|
||||
value : '0',
|
||||
store : storeProject
|
||||
}),
|
||||
new Ext.form.ComboBox({
|
||||
@@ -1091,6 +1086,7 @@ var saveDashboard = function () {
|
||||
},
|
||||
data: JSON.stringify(data),
|
||||
success: function (response) {
|
||||
var jsonResp = Ext.util.JSON.decode(response.responseText);
|
||||
saveAllDashboardOwner(DAS_UID);
|
||||
saveAllIndicators(DAS_UID);
|
||||
myMask.hide();
|
||||
@@ -1113,25 +1109,11 @@ var saveAllIndicators = function (DAS_UID) {
|
||||
tabPanel.getItem(tabActivate[tab]).show();
|
||||
var fieldsTab = tabPanel.getItem(tabActivate[tab]).items.items[0].items.items[0].items.items;
|
||||
|
||||
if (fieldsTab[1].getValue().trim() == '') {
|
||||
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_TITLE_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
|
||||
fieldsTab[1].focus(true,10);
|
||||
return false;
|
||||
} else if (fieldsTab[2].getValue().trim() == '') {
|
||||
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_TYPE_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
|
||||
fieldsTab[2].focus(true,10);
|
||||
return false;
|
||||
} else if (fieldsTab[2].getValue() != '1050' && fieldsTab[4].getValue().trim() == '') {
|
||||
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_PROCESS_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
|
||||
fieldsTab[4].focus(true,10);
|
||||
return false;
|
||||
}
|
||||
|
||||
var goal = fieldsTab[3];
|
||||
fieldsTab.push(goal.items.items[0]);
|
||||
fieldsTab.push(goal.items.items[1]);
|
||||
|
||||
var data = [];
|
||||
data = [];
|
||||
data['DAS_UID'] = DAS_UID;
|
||||
|
||||
for (var index in fieldsTab) {
|
||||
@@ -1140,12 +1122,12 @@ var saveAllIndicators = function (DAS_UID) {
|
||||
continue;
|
||||
}
|
||||
|
||||
var id = node.id;
|
||||
id = node.id;
|
||||
if (typeof id == 'undefined' || id.indexOf('fieldSet_') != -1 ) {
|
||||
continue;
|
||||
}
|
||||
id = id.split('_');
|
||||
var field = '';
|
||||
field = '';
|
||||
for (var part = 0; part<id.length-1; part++) {
|
||||
if (part == 0) {
|
||||
field = id[part];
|
||||
@@ -1153,7 +1135,25 @@ var saveAllIndicators = function (DAS_UID) {
|
||||
field = field+'_'+id[part];
|
||||
}
|
||||
}
|
||||
var value = node.getValue();
|
||||
value = node.getValue();
|
||||
|
||||
if (field == 'IND_TITLE' && value.trim() == '') {
|
||||
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_TITLE_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
|
||||
node.focus(true,10);
|
||||
return false;
|
||||
} else if (field == 'IND_TYPE' && value.trim() == '') {
|
||||
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_TYPE_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
|
||||
node.focus(true,10);
|
||||
return false;
|
||||
} else if (field == 'IND_GOAL' && value.trim() == '') {
|
||||
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_GOAL_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
|
||||
node.focus(true,10);
|
||||
return false;
|
||||
} else if (field == 'IND_PROCESS' && value.trim() == '') {
|
||||
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_PROCESS_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
|
||||
node.focus(true,10);
|
||||
return false;
|
||||
}
|
||||
|
||||
field = field == 'IND_TITLE' ? 'DAS_IND_TITLE' : field;
|
||||
field = field == 'IND_TYPE' ? 'DAS_IND_TYPE' : field;
|
||||
|
||||
@@ -35,12 +35,14 @@
|
||||
{/foreach}
|
||||
</script>
|
||||
|
||||
<!-- View Dashboard Files-->
|
||||
<script type="text/javascript" src="/jscore/strategicDashboard/viewDashboardHelper.js"></script>
|
||||
<script type="text/javascript" src="/jscore/strategicDashboard/viewDashboardModel.js"></script>
|
||||
<script type="text/javascript" src="/jscore/strategicDashboard/viewDashboardPresenter.js"></script>
|
||||
<script type="text/javascript" src="/jscore/strategicDashboard/viewDashboardView.js"></script>
|
||||
|
||||
|
||||
|
||||
<script type="text/template" class="specialIndicatorButtonTemplate">
|
||||
<div class="col-lg-3 col-md-6 dashPro ind-button-selector"
|
||||
id="indicatorButton-<%- indicator.id %>"
|
||||
@@ -200,28 +202,56 @@
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script type="text/template" class="specialIndicatorSencondViewDetail">
|
||||
<script type="text/template" class="specialIndicatorSecondViewDetailUei">
|
||||
<div class="process-div well hideme detail-button-selector" data-gs-no-resize="true"
|
||||
id="detailData-<%- detailData.uid %>"
|
||||
data-indicator-id="<%- detailData.indicatorId %>"
|
||||
data-detail-id="<%- detailData.uid %>">
|
||||
<div class="panel-heading greenbg">
|
||||
<div class="col-xs-12 text-center detail-title-selector"><i class="fa fa-tasks fa-fw"></i> <span id="usrName"><%- detailData.name %></span> </div>
|
||||
<div class="col-xs-12 text-center detail-title-selector">
|
||||
<i class="fa fa-tasks fa-fw"></i>
|
||||
<span id="usrName"><%- detailData.name %> </span>
|
||||
<span>(<%- detailData.rankToShow %>)</span>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
<div class="text-center huge">
|
||||
<div class="col-xs-12 vcenter-task">
|
||||
<div class="col-xs-4 ">
|
||||
<div class="col-xs-6 ">
|
||||
<div class="blue small"><%- detailData.efficiencyIndexToShow%></div>
|
||||
<div class="smallB grey detail-efficiency-selector ellipsis"></div>
|
||||
</div>
|
||||
<div class="col-xs-4 ">
|
||||
<div class="col-xs-6 ">
|
||||
<div class="small detail-cost-number-selector"><%- detailData.inefficiencyCostToShow%></div>
|
||||
<div class="smallB grey detail-cost-selector ellipsis"></div>
|
||||
</div>
|
||||
<div class="col-xs-4 ">
|
||||
<div class="blue small"><%- detailData.deviationTimeToShow%></div>
|
||||
<div class="smallB grey detail-sdv-selector ellipsis">SDV</div>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script type="text/template" class="specialIndicatorSecondViewDetailPei">
|
||||
<div class="process-div well hideme detail-button-selector" data-gs-no-resize="true"
|
||||
id="detailData-<%- detailData.uid %>"
|
||||
data-indicator-id="<%- detailData.indicatorId %>"
|
||||
data-detail-id="<%- detailData.uid %>">
|
||||
<div class="panel-heading greenbg">
|
||||
<div class="col-xs-12 text-center detail-title-selector">
|
||||
<i class="fa fa-tasks fa-fw"></i>
|
||||
<span id="usrName"><%- detailData.name %> </span>
|
||||
</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.efficiencyIndexToShow%></div>
|
||||
<div class="smallB grey detail-efficiency-selector ellipsis"></div>
|
||||
</div>
|
||||
<div class="col-xs-6 ">
|
||||
<div class="small detail-cost-number-selector"><%- detailData.inefficiencyCostToShow%></div>
|
||||
<div class="smallB grey detail-cost-selector ellipsis"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
@@ -242,15 +272,15 @@
|
||||
<div class="col-xs-12 vcenter-task">
|
||||
<div class="col-xs-4 ">
|
||||
<div class="blue small"><%- detailData.percentageOverdue%> %</div>
|
||||
<div class="smallB grey fontMedium detail-efficiency-selector">{translate label="ID_OVERDUE"}</div>
|
||||
<div class="smallB grey fontMedium detail-efficiency-selector">Overdue</div>
|
||||
</div>
|
||||
<div class="col-xs-4">
|
||||
<div class="blue small"><%- detailData.percentageAtRisk%> %</div>
|
||||
<div class="smallB grey fontMedium detail-efficiency-selector">{translate label="ID_AT_RISK"}</div>
|
||||
<div class="smallB grey fontMedium detail-efficiency-selector">At Risk</div>
|
||||
</div>
|
||||
<div class="col-xs-4 ">
|
||||
<div class="blue small"><%- detailData.percentageOnTime%> %</div>
|
||||
<div class="smallB grey fontMedium detail-efficiency-selector">{translate label="ID_ON_TIME"}</div>
|
||||
<div class="smallB grey fontMedium detail-efficiency-selector">On Time</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
@@ -294,15 +324,15 @@
|
||||
</div>
|
||||
<div class="text-center huge" style="margin:0 auto; width:98%;">
|
||||
<div class="col-xs-4" style="width:auto;">
|
||||
<div class="status-graph-title-low">{translate label="ID_OVERDUE"}:</div>
|
||||
<div class="status-graph-title-low">Overdue:</div>
|
||||
<div id="graph1" style="width:400px; height:300px;"></div>
|
||||
</div>
|
||||
<div class="col-xs-4" style="width:auto;">
|
||||
<div class="status-graph-title-medium">{translate label="ID_AT_RISK"}:</div>
|
||||
<div class="status-graph-title-medium">At Risk:</div>
|
||||
<div id="graph2" style="width:400px; height:300px;"></div>
|
||||
</div>
|
||||
<div class="col-xs-4" style="width:auto;">
|
||||
<div class="status-graph-title-high">{translate label="ID_ON_TIME"}:</div>
|
||||
<div class="status-graph-title-high">On Time:</div>
|
||||
<div id="graph3" style="width:400px; height:300px;"></div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -312,6 +342,7 @@
|
||||
|
||||
</head>
|
||||
|
||||
|
||||
<body id="page-top" class="index">
|
||||
<img id="scrollImg" class="floating" src="/images/scrolldown.gif" width="80" height="80" style="border-radius:85px;"/>
|
||||
<div id="wrapper">
|
||||
@@ -418,7 +449,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user