diff --git a/gulliver/js/pmchart/pmCharts.js b/gulliver/js/pmchart/pmCharts.js
index 434174dfc..e0be418c8 100644
--- a/gulliver/js/pmchart/pmCharts.js
+++ b/gulliver/js/pmchart/pmCharts.js
@@ -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)
diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php
index 388d48542..91b444eef 100755
--- a/workflow/engine/classes/model/AppDelegation.php
+++ b/workflow/engine/classes/model/AppDelegation.php
@@ -133,7 +133,7 @@ class AppDelegation extends BaseAppDelegation
//The function return an array now. By JHL
$delTaskDueDate = $this->calculateDueDate($sNextTasParam);
- $delRiskDate = $this->calculateRiskDate($delTaskDueDate, $this->getRisk());
+ $delRiskDate = $this->calculateRiskDate($sNextTasParam, $this->getRisk());
//$this->setDelTaskDueDate( $delTaskDueDate['DUE_DATE'] ); // Due date formatted
$this->setDelTaskDueDate($delTaskDueDate);
@@ -379,8 +379,18 @@ class AppDelegation extends BaseAppDelegation
public function calculateRiskDate($dueDate, $risk)
{
try {
- $riskTime = strtotime($dueDate) - strtotime($this->getDelDelegateDate()); //Seconds
- $riskTime = $riskTime - ($riskTime * $risk);
+
+ $data = array();
+ if (isset( $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] ) && $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] == 'true') {
+ $data['TAS_DURATION'] = $sNextTasParam['NEXT_TASK']['TAS_DURATION'];
+ $data['TAS_TIMEUNIT'] = $sNextTasParam['NEXT_TASK']['TAS_TIMEUNIT'];
+ } else {
+ $task = TaskPeer::retrieveByPK( $this->getTasUid() );
+ $data['TAS_DURATION'] = $task->getTasDuration();
+ $data['TAS_TIMEUNIT'] = $task->getTasTimeUnit();
+ }
+
+ $riskTime = $data['TAS_DURATION'] - ($data['TAS_DURATION'] * $risk);
//Calendar - Use the dates class to calculate dates
$calendar = new calendar();
@@ -394,9 +404,8 @@ class AppDelegation extends BaseAppDelegation
}
//Risk date
- $riskDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), round($riskTime / (60 * 60)), "HOURS", $arrayCalendarData);
+ $riskDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), round($riskTime), $data['TAS_TIMEUNIT'], $arrayCalendarData);
- //Return
return $riskDate;
} catch (Exception $e) {
throw $e;
diff --git a/workflow/engine/classes/model/DashboardDasInd.php b/workflow/engine/classes/model/DashboardDasInd.php
index d6796bfa0..002555fd8 100644
--- a/workflow/engine/classes/model/DashboardDasInd.php
+++ b/workflow/engine/classes/model/DashboardDasInd.php
@@ -108,10 +108,40 @@ class DashboardDasInd extends BaseDashboardDasInd
}
}
- public function getOwnerByDashboard ($dasUid)
+ public function loadOwnerByUserId ($usrId)
{
-
- }
+ try {
+ $criteria = new Criteria('workflow');
+ $criteria->add(DashboardDasIndPeer::OWNER_UID, $usrId);
+ $criteria->add(DashboardDasIndPeer::OWNER_TYPE, "USER");
+
+ $dataset = DashboardDasIndPeer::doSelectRS($criteria);
+ $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+ $fields = array();
+
+ while ($dataset->next()) {
+ $auxField = $dataset->getRow();
+ $fields[] = $auxField;
+ }
+
+ $criteria = new Criteria('workflow');
+ $criteria->add(DashboardDasIndPeer::OWNER_TYPE, "GROUP");
+ $criteria->add(GroupUserPeer::USR_UID, $usrId);
+ $criteria->addJoin(GroupUserPeer::GRP_UID, DashboardDasIndPeer::OWNER_UID);
+
+ $dataset = DashboardDasIndPeer::doSelectRS($criteria);
+ $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+
+ while ($dataset->next()) {
+ $auxField = $dataset->getRow();
+ $fields[] = $auxField;
+ }
+
+ return $fields;
+ } catch (Exception $error) {
+ throw $error;
+ }
+ }
}
diff --git a/workflow/engine/controllers/strategicDashboard.php b/workflow/engine/controllers/strategicDashboard.php
index f8ea0b7db..25abf3a44 100644
--- a/workflow/engine/controllers/strategicDashboard.php
+++ b/workflow/engine/controllers/strategicDashboard.php
@@ -14,6 +14,7 @@ class StrategicDashboard extends Controller
private $urlProxy;
private $clientToken;
private $usrId;
+ private $usrUnitCost;
// Class constructor
public function __construct ()
@@ -32,6 +33,13 @@ class StrategicDashboard extends Controller
die;
}
$this->usrId = $RBAC->aUserInfo['USER_INFO']['USR_UID'];
+ $user = new Users();
+ $user = $user->load($RBAC->aUserInfo['USER_INFO']['USR_UID']);
+ $this->usrUnitCost = '$';
+ if (isset($user['USR_UNIT_COST'])) {
+ $this->usrUnitCost = $user['USR_UNIT_COST'];
+ }
+
$this->urlProxy = '/api/1.0/' . SYS_SYS . '/';
//change
$clientId = 'x-pm-local-client';
@@ -170,13 +178,12 @@ class StrategicDashboard extends Controller
}
$this->setView( 'strategicDashboard/viewDashboard' );
- $this->setVar('urlProxy',$this->urlProxy);
- $this->setVar('usrId',$this->usrId);
- $this->setVar('credentials',$this->clientToken);
+ $this->setVar('urlProxy', $this->urlProxy);
+ $this->setVar('usrId', $this->usrId);
+ $this->setVar('credentials', $this->clientToken);
+ $this->setVar('unitCost', $this->usrUnitCost);
$translation = array();
-
-
$translation['ID_MANAGERS_DASHBOARDS'] = G::LoadTranslation( 'ID_MANAGERS_DASHBOARDS');
$translation['ID_PRO_EFFICIENCY_INDEX'] = G::LoadTranslation( 'ID_PRO_EFFICIENCY_INDEX');
$translation['ID_EFFICIENCY_USER'] = G::LoadTranslation( 'ID_EFFICIENCY_USER');
@@ -203,6 +210,7 @@ class StrategicDashboard extends Controller
$translation['ID_OVERDUE'] = G::LoadTranslation( 'ID_OVERDUE');
$translation['ID_AT_RISK'] = G::LoadTranslation( 'ID_AT_RISK');
$translation['ID_ON_TIME'] = G::LoadTranslation( 'ID_ON_TIME');
+
$this->setVar('translation', $translation);
$this->render();
} catch (Exception $error) {
@@ -215,12 +223,12 @@ class StrategicDashboard extends Controller
{
try {
$this->setView( 'strategicDashboard/viewDashboardIE' );
- $this->setVar('urlProxy',$this->urlProxy);
- $this->setVar('usrId',$this->usrId);
- $this->setVar('credentials',$this->clientToken);
+ $this->setVar('urlProxy', $this->urlProxy);
+ $this->setVar('usrId', $this->usrId);
+ $this->setVar('credentials', $this->clientToken);
+ $this->setVar('unitCost', $this->usrUnitCost);
$translation = array();
-
$translation['ID_MANAGERS_DASHBOARDS'] = G::LoadTranslation( 'ID_MANAGERS_DASHBOARDS');
$translation['ID_PRO_EFFICIENCY_INDEX'] = G::LoadTranslation( 'ID_PRO_EFFICIENCY_INDEX');
$translation['ID_EFFICIENCY_USER'] = G::LoadTranslation( 'ID_EFFICIENCY_USER');
diff --git a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
index 435c4f8ba..1890c651e 100644
--- a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
+++ b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
@@ -100,7 +100,7 @@ ViewDashboardPresenter.prototype.dashboardIndicatorsViewModel = function(data) {
//to be sure that percentages sum up to 100 (the rounding will lost decimals)%
newObject.percentageOnTime = 100 - newObject.percentageOverdue - newObject.percentageAtRisk;
newObject.overdueVisibility = (newObject.percentageOverdue > 0)? "visible" : "hidden";
- newObject.atRiskVisiblity = (newObject.percentageAtRisk > 0)? "visible" : "hidden";
+ newObject.atRiskVisibility = (newObject.percentageAtRisk > 0)? "visible" : "hidden";
newObject.onTimeVisibility = (newObject.percentageOnTime > 0)? "visible" : "hidden";
returnList.push(newObject);
i++;
@@ -164,25 +164,8 @@ 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);
+ graphData.push(newObject);
+ originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.indicatorId = data.id;
originalObject.json = JSON.stringify(originalObject);
@@ -190,16 +173,11 @@ 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, 10);
+ retval.dataToDraw = this.adaptGraphData(graphData);
- //TODO aumentar el símbolo de moneda $
- retval.inefficiencyCostToShow = "$ " +Math.round(retval.inefficiencyCost);
+ retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost);
retval.efficiencyIndexToShow = Math.round(retval.efficiencyIndex * 100) / 100;
return retval;
};
@@ -216,23 +194,8 @@ 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);
+ graphData.push(newObject);
+ originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.indicatorId = data.id;
originalObject.json = JSON.stringify(originalObject);
@@ -240,15 +203,10 @@ 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);
+ retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost);
retval.efficiencyIndexToShow = Math.round(retval.efficiencyIndex * 100) / 100;
return retval;
};
@@ -263,20 +221,18 @@ ViewDashboardPresenter.prototype.statusViewModel = function(indicatorId, data) {
$.each(data.dataList, function(index, originalObject) {
originalObject.taskTitle = that.helper.labelIfEmpty(originalObject.taskTitle);
- //TODO use more that 10 chars when the label and color problem in pie 2D is solved.
var title = originalObject.taskTitle.substring(0,10);
- //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
};
@@ -298,8 +254,7 @@ ViewDashboardPresenter.prototype.statusViewModel = function(indicatorId, data) {
retval.graph1Data = this.orderGraphData(graph1Data, "down").splice(0,7)
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 +325,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.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) {
- graphData.push(newObject);
- }
+ 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 +352,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.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) {
- graphData.push(newObject);
- }
+ 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 +406,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;
+ });
+}
diff --git a/workflow/engine/js/strategicDashboard/viewDashboardView.js b/workflow/engine/js/strategicDashboard/viewDashboardView.js
index 0cec9c51e..d62c6fc20 100644
--- a/workflow/engine/js/strategicDashboard/viewDashboardView.js
+++ b/workflow/engine/js/strategicDashboard/viewDashboardView.js
@@ -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);
@@ -366,10 +394,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");
}
@@ -407,6 +452,8 @@ var loadIndicator = function (indicatorId, initDate, endDate) {
break;
}
});
+ hideScrollIfAllDivsAreVisible();
+ hideTitleAndSortDiv();
}
var setIndicatorActiveMarker = function () {
@@ -507,7 +554,7 @@ var fillStatusIndicatorFirstView = function (presenterData) {
allowDrillDown:true,
allowTransition:true,
- showTip: true,
+ showTip: false,
allowZoom: false,
showLabels: true
}
@@ -526,7 +573,6 @@ var fillStatusIndicatorFirstView = function (presenterData) {
var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(presenterData.id)
setIndicatorActiveMarker();
- $('#relatedLabel').hide();
}
var fillStatusIndicatorFirstViewDetail = function(presenterData) {
@@ -550,7 +596,6 @@ var fillStatusIndicatorFirstViewDetail = function(presenterData) {
}
var fillSpecialIndicatorFirstView = function(presenterData) {
- $('#relatedLabel').show();
var widgetBuilder = new WidgetBuilder();
var panel = $('#indicatorsDataGridStack').data('gridstack');
panel.remove_all();
@@ -587,8 +632,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: G_STRING['ID_GROUPS']},
+ axisY:{ showAxis: true, label: G_STRING['ID_COSTS']},
gridLinesX:false,
gridLinesY:true,
showTip: true,
@@ -669,8 +714,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: G_STRING['ID_USER'] },
+ axisY:{ showAxis: true, label: G_STRING['ID_COSTS'] },
showErrorBars: true
}
@@ -679,7 +724,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 = G_STRING['ID_TASK'] ;
var graph = new BarChart(presenterData.dataToDraw, detailParams, null, null);
graph.drawChart();
}
@@ -704,7 +749,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 +840,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: G_STRING.ID_TIME_HOURS },
gridLinesX:false,
gridLinesY:true,
showTip: true,
@@ -810,7 +862,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: G_STRING.ID_TIME_HOURS },
gridLinesX:false,
gridLinesY:true,
showTip: true,
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php b/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php
index 318f32c5e..741af63e9 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php
@@ -23,7 +23,7 @@ class Dashboard {
require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "DashboardDasInd.php");
$oDashboardDasInd = new \DashboardDasInd();
- $response = $oDashboardDasInd->loadByOwner($usr_uid);
+ $response = $oDashboardDasInd->loadOwnerByUserId($usr_uid);
return $response;
}
@@ -40,27 +40,32 @@ class Dashboard {
{
$resp = array();
$dashboards = $this->getDashboardsUidByUser($usr_uid);
- $existFavorite = false;
- foreach($dashboards as $i=>$x) {
- $resp[$i] = $this->getDashboard($x['DAS_UID']);
- $Dashboard = new \ProcessMaker\BusinessModel\Dashboard();
- $dashConfig = $Dashboard->getConfig($usr_uid);
- $resp[$i]['DAS_FAVORITE'] = 0;
- foreach ($dashConfig as $dashId=>$dashData) {
- if($dashId == $x['DAS_UID'] ) {
- $resp[$i]['DAS_FAVORITE'] = $dashData['dashFavorite'];
- if ($dashData['dashFavorite']==1) {
- $existFavorite = true;
- }
+ $existFavorite = false;
+ foreach($dashboards as $i=>$x) {
+ //$resp[$i] = $this->getDashboard($x['DAS_UID']);
+ $dashboardUser = $this->getDashboard($x['DAS_UID']);
+ if ($dashboardUser['DAS_STATUS'] == 0) {
+ continue;
+ }
+ $resp[$i] = $dashboardUser;
+ $Dashboard = new \ProcessMaker\BusinessModel\Dashboard();
+ $dashConfig = $Dashboard->getConfig($usr_uid);
+ $resp[$i]['DAS_FAVORITE'] = 0;
+ foreach ($dashConfig as $dashId=>$dashData) {
+ if($dashId == $x['DAS_UID'] ) {
+ $resp[$i]['DAS_FAVORITE'] = $dashData['dashFavorite'];
+ if ($dashData['dashFavorite']==1) {
+ $existFavorite = true;
}
}
- }
-
- //if no favorite is set, the default vavorite is the first one
- if ($existFavorite == false && $dashboards != null && sizeof($dashboards)>0) {
- $resp[0]['DAS_FAVORITE'] = 1;
+ }
}
- return $resp;
+
+ //if no favorite is set, the default favorite is the first one
+ if ($existFavorite == false && $resp != null && sizeof($resp)>0) {
+ $resp[0]['DAS_FAVORITE'] = 1;
+ }
+ return $resp;
}
/**
diff --git a/workflow/engine/src/ProcessMaker/Project/Bpmn.php b/workflow/engine/src/ProcessMaker/Project/Bpmn.php
index 8cb27df25..cefce6f69 100755
--- a/workflow/engine/src/ProcessMaker/Project/Bpmn.php
+++ b/workflow/engine/src/ProcessMaker/Project/Bpmn.php
@@ -1348,13 +1348,15 @@ class Bpmn extends Handler
$oCriteria->add( \BpmnFlowPeer::FLO_POSITION, $iPosition, '>' );
$oDataset = \BpmnFlowPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
- $oDataset->next();
- $aRow = $oDataset->getRow();
- $oCriteria2 = new Criteria('workflow');
- $oCriteria2->add( \BpmnFlowPeer::FLO_POSITION, $aRow['FLO_POSITION'] - 1);
- BasePeer::doUpdate($oCriteria, $oCriteria2, $con);
- $oDataset->next();
-
+ while ($oDataset->next()) {
+ $aRow = $oDataset->getRow();
+ $newPosition = ((int)$aRow['FLO_POSITION'])-1;
+ $oCriteriaTemp = new Criteria( 'workflow' );
+ $oCriteriaTemp->add( \BpmnFlowPeer::FLO_UID, $aRow['FLO_UID'] );
+ $oCriteria2 = new Criteria('workflow');
+ $oCriteria2->add(\BpmnFlowPeer::FLO_POSITION, $newPosition);
+ BasePeer::doUpdate($oCriteriaTemp, $oCriteria2, $con);
+ }
} catch (Exception $oException) {
throw $oException;
}
diff --git a/workflow/engine/templates/cases/cases_ScreenDerivation.html b/workflow/engine/templates/cases/cases_ScreenDerivation.html
index 6cb5122e2..4ad2fe413 100755
--- a/workflow/engine/templates/cases/cases_ScreenDerivation.html
+++ b/workflow/engine/templates/cases/cases_ScreenDerivation.html
@@ -68,8 +68,7 @@
{else}
- |
- {$data.NEXT_TASK.TAS_TITLE}{$data.NEXT_TASK.TAS_HIDDEN_FIELD} |
+ {$data.NEXT_TASK.TAS_TITLE}{$data.NEXT_TASK.TAS_HIDDEN_FIELD} |
{/if}
{/if}
@@ -93,8 +92,7 @@
{else}
- |
- {$data.NEXT_TASK.USR_HIDDEN_FIELD} |
+ {$data.NEXT_TASK.USR_HIDDEN_FIELD} |
{/if}
{/if}
diff --git a/workflow/engine/templates/strategicDashboard/dashboardList.js b/workflow/engine/templates/strategicDashboard/dashboardList.js
index 0489446ce..8f6d51292 100644
--- a/workflow/engine/templates/strategicDashboard/dashboardList.js
+++ b/workflow/engine/templates/strategicDashboard/dashboardList.js
@@ -76,6 +76,8 @@ Ext.onReady(function() {
statusButton = new Ext.Action({
text: _('ID_STATUS'),
+ icon : '',
+ id : 'activator',
iconCls: 'silk-add',
handler: statusDashboard,
disabled: true
@@ -105,19 +107,19 @@ Ext.onReady(function() {
}
}
+ var activator = Ext.getCmp('activator');
+
if( record.data.DAS_STATUS == 1 ){
- statusButton.setIconClass('icon-activate');
- statusButton.setText( _('ID_DEACTIVATE') );
+ activator.setIcon('/images/deactivate.png');
+ activator.setText( _('ID_DEACTIVATE') );
editButton.enable();
deleteButton.enable();
- //statusButton.enable();
} else {
- statusButton.setIconClass('icon-deactivate');
- statusButton.setText( _('ID_ACTIVATE') );
+ activator.setIcon('/images/activate.png');
+ activator.setText( _('ID_ACTIVATE') );
editButton.disable();
deleteButton.disable();
- //statusButton.disable();
- }
+ }
},
rowdeselect: function(sm, index, record){
editButton.disable();
@@ -237,7 +239,7 @@ Ext.onReady(function() {
viewConfig: {
forceFit:true
},
- title : _('ID_DASHBOARD'),
+ title : _('ID_STRATEGIC_DASHBOARD'),
store: store,
cm: cmodel,
sm: smodel,
diff --git a/workflow/engine/templates/strategicDashboard/formDashboard.js b/workflow/engine/templates/strategicDashboard/formDashboard.js
index 8893a9f56..ab4025611 100644
--- a/workflow/engine/templates/strategicDashboard/formDashboard.js
+++ b/workflow/engine/templates/strategicDashboard/formDashboard.js
@@ -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
+
+
-
+
+
+
- 
+
-
-