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

Improvement form Dashboard

Browse Source
This commit is contained in:
Marco Antonio Nina Mena
2015-04-29 11:24:06 -04:00
parent ea7e63188f
commit ce8bbd44ef
2 changed files with 272 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/AppDelegation.php
View File

@@ -404,7 +404,7 @@ class AppDelegation extends BaseAppDelegation
} }
//Risk date //Risk date
$riskDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), round($riskTime), $data['TAS_TIMEUNIT'], $arrayCalendarData); $riskDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), $riskTime, $data['TAS_TIMEUNIT'], $arrayCalendarData);
return $riskDate; return $riskDate;
} catch (Exception $e) { } catch (Exception $e) {

78
workflow/engine/templates/strategicDashboard/formDashboard.js
View File

@@ -41,7 +41,6 @@ var frmDashboard;
var addTabButton; var addTabButton;
var tabPanel; var tabPanel;
var dashboardIndicatorFields; var dashboardIndicatorFields;
var dashboardIndicatorPanel;
var store; var store;
var indexTab = 0; var indexTab = 0;
@@ -49,7 +48,7 @@ var comboPageSize = 10;
var resultTpl; var resultTpl;
var storeIndicatorType; var storeIndicatorType;
var storeGraphic; var storeGraphic;
var storeFrecuency; var storeFrequency;
var storeProject; var storeProject;
var storeGroup; var storeGroup;
var storeUsers; var storeUsers;
@@ -79,20 +78,21 @@ Ext.onReady( function() {
items : [ items : [
{ {
id : 'DAS_TITLE', id : 'DAS_TITLE',
fieldLabel : _('ID_DASHBOARD_TITLE'), fieldLabel : '<span style=\"color:red;\" ext:qtip="'+ _('ID_FIELD_REQUIRED', _('ID_DASHBOARD_TITLE')) +'"> * </span>' + _('ID_DASHBOARD_TITLE'),
xtype : 'textfield', xtype : 'textfield',
anchor : '85%', anchor : '85%',
maxLength : 250, maxLength : 250,
maskRe : /([a-zA-Z0-9\s]+)$/, maskRe : /([a-zA-Z0-9_'\s]+)$/,
regex : /([a-zA-Z0-9_'\s]+)$/,
regexText : _('ID_INVALID_VALUE', _('ID_DASHBOARD_TITLE')),
allowBlank : false allowBlank : false
}, },
{ {
xtype : 'textarea', xtype : 'textarea',
id : 'DAS_DESCRIPTION', id : 'DAS_DESCRIPTION',
fieldLabel : _('ID_DESCRIPTION'), fieldLabel : _('ID_DESCRIPTION'),
labelSeparator : '',
anchor : '85%', anchor : '85%',
maskRe : /([a-zA-Z0-9\s]+)$/, maskRe : /([a-zA-Z0-9_'\s]+)$/,
height : 50, height : 50,
} }
] ]
@@ -295,7 +295,7 @@ Ext.onReady( function() {
} }
}); });
storeFrecuency = new Ext.data.GroupingStore( { storeFrequency = new Ext.data.GroupingStore( {
proxy : new Ext.data.HttpProxy({ proxy : new Ext.data.HttpProxy({
api: { api: {
read : urlProxy + 'catalog/periodicity' read : urlProxy + 'catalog/periodicity'
@@ -528,13 +528,14 @@ Ext.onReady( function() {
flag = true; flag = true;
break; break;
case 'yes': case 'yes':
tabPanel.getItem(component.id).show();
flag = false; flag = false;
var dasIndUid = Ext.getCmp('DAS_IND_UID_'+component.id).getValue(); var dasIndUid = Ext.getCmp('DAS_IND_UID_'+component.id).getValue();
if (typeof dasIndUid != 'undefined' && dasIndUid != '') { if (typeof dasIndUid != 'undefined' && dasIndUid != '') {
removeIndicator(dasIndUid); removeIndicator(dasIndUid);
} }
tabActivate.remove(component.id); tabActivate.remove(component.id);
tabPanel.remove(component); tabPanel.remove(component, true);
break; break;
} }
}, },
@@ -671,7 +672,6 @@ Ext.onReady( function() {
] ]
}); });
ownerInfoGrid.store.load();
ownerInfoGrid.on("afterrender", function(component) { ownerInfoGrid.on("afterrender", function(component) {
component.getBottomToolbar().refresh.hideParent = true; component.getBottomToolbar().refresh.hideParent = true;
component.getBottomToolbar().refresh.hide(); component.getBottomToolbar().refresh.hide();
@@ -698,6 +698,7 @@ Ext.onReady( function() {
} }
dashboardOwnerFields.items.items[0].bindStore(dataUserGroup); dashboardOwnerFields.items.items[0].bindStore(dataUserGroup);
} ); } );
storeUsers.on( 'load', function( store, records, options ) { storeUsers.on( 'load', function( store, records, options ) {
for (var i=0; i< store.data.length; i++) { for (var i=0; i< store.data.length; i++) {
row = []; row = [];
@@ -751,11 +752,13 @@ var addTab = function (flag) {
hidden : true hidden : true
}, },
{ {
fieldLabel : _('ID_INDICATOR_TITLE'), fieldLabel : '<span style=\"color:red;\" ext:qtip="'+ _('ID_FIELD_REQUIRED', _('ID_INDICATOR_TITLE')) +'"> * </span>' + _('ID_INDICATOR_TITLE'),
id : 'IND_TITLE_'+ indexTab, id : 'IND_TITLE_'+ indexTab,
xtype : 'textfield', xtype : 'textfield',
anchor : '85%', anchor : '85%',
maskRe : /([a-zA-Z0-9\s]+)$/, maskRe : /([a-zA-Z0-9_'\s]+)$/,
regex : /([a-zA-Z0-9_'\s]+)$/,
regexText : _('ID_INVALID_VALUE', _('ID_INDICATOR_TITLE')),
maxLength : 250, maxLength : 250,
allowBlank : false allowBlank : false
}, },
@@ -763,7 +766,7 @@ var addTab = function (flag) {
anchor : '85%', anchor : '85%',
editable : false, editable : false,
id : 'IND_TYPE_'+ indexTab, id : 'IND_TYPE_'+ indexTab,
fieldLabel : _('ID_INDICATOR_TYPE'), fieldLabel : '<span style=\"color:red;\" ext:qtip="'+ _('ID_FIELD_REQUIRED', _('ID_INDICATOR_TYPE')) +'"> * </span>' + _('ID_INDICATOR_TYPE'),
displayField : 'CAT_LABEL_ID', displayField : 'CAT_LABEL_ID',
valueField : 'CAT_UID', valueField : 'CAT_UID',
forceSelection : false, forceSelection : false,
@@ -782,6 +785,7 @@ 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]; 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') { if (value == '1050') {
field = Ext.getCmp('IND_PROCESS_'+index); field = Ext.getCmp('IND_PROCESS_'+index);
field.setValue('0');
field.disable(); field.disable();
field.hide(); field.hide();
} else { } else {
@@ -874,18 +878,17 @@ var addTab = function (flag) {
new Ext.form.ComboBox({ new Ext.form.ComboBox({
anchor : '85%', anchor : '85%',
editable : false, editable : false,
fieldLabel : _('ID_PROCESS'), fieldLabel : '<span style=\"color:red;\" ext:qtip="'+ _('ID_FIELD_REQUIRED', _('ID_PROCESS')) +'"> * </span>' + _('ID_PROCESS'),
id : 'IND_PROCESS_'+ indexTab, id : 'IND_PROCESS_'+ indexTab,
displayField : 'prj_name', displayField : 'prj_name',
valueField : 'prj_uid', valueField : 'prj_uid',
forceSelection : false, forceSelection : true,
emptyText : _('ID_EMPTY_PROCESSES'), emptyText : _('ID_EMPTY_PROCESSES'),
selectOnFocus : true, selectOnFocus : true,
hidden : true, hidden : true,
typeAhead : true, typeAhead : true,
autocomplete : true, autocomplete : true,
triggerAction : 'all', triggerAction : 'all',
value : '0',
store : storeProject store : storeProject
}), }),
new Ext.form.ComboBox({ new Ext.form.ComboBox({
@@ -918,7 +921,7 @@ var addTab = function (flag) {
typeAhead : true, typeAhead : true,
autocomplete : true, autocomplete : true,
triggerAction : 'all', triggerAction : 'all',
store : storeFrecuency store : storeFrequency
}), }),
new Ext.form.ComboBox({ new Ext.form.ComboBox({
anchor : '85%', anchor : '85%',
@@ -950,7 +953,7 @@ var addTab = function (flag) {
typeAhead : true, typeAhead : true,
autocomplete : true, autocomplete : true,
triggerAction : 'all', triggerAction : 'all',
store : storeFrecuency store : storeFrequency
}) })
] ]
}) })
@@ -1086,7 +1089,6 @@ var saveDashboard = function () {
}, },
data: JSON.stringify(data), data: JSON.stringify(data),
success: function (response) { success: function (response) {
var jsonResp = Ext.util.JSON.decode(response.responseText);
saveAllDashboardOwner(DAS_UID); saveAllDashboardOwner(DAS_UID);
saveAllIndicators(DAS_UID); saveAllIndicators(DAS_UID);
myMask.hide(); myMask.hide();
@@ -1109,11 +1111,25 @@ var saveAllIndicators = function (DAS_UID) {
tabPanel.getItem(tabActivate[tab]).show(); tabPanel.getItem(tabActivate[tab]).show();
var fieldsTab = tabPanel.getItem(tabActivate[tab]).items.items[0].items.items[0].items.items; 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]; var goal = fieldsTab[3];
fieldsTab.push(goal.items.items[0]); fieldsTab.push(goal.items.items[0]);
fieldsTab.push(goal.items.items[1]); fieldsTab.push(goal.items.items[1]);
data = []; var data = [];
data['DAS_UID'] = DAS_UID; data['DAS_UID'] = DAS_UID;
for (var index in fieldsTab) { for (var index in fieldsTab) {
@@ -1122,12 +1138,12 @@ var saveAllIndicators = function (DAS_UID) {
continue; continue;
} }
id = node.id; var id = node.id;
if (typeof id == 'undefined' || id.indexOf('fieldSet_') != -1 ) { if (typeof id == 'undefined' || id.indexOf('fieldSet_') != -1 ) {
continue; continue;
} }
id = id.split('_'); id = id.split('_');
field = ''; var field = '';
for (var part = 0; part<id.length-1; part++) { for (var part = 0; part<id.length-1; part++) {
if (part == 0) { if (part == 0) {
field = id[part]; field = id[part];
@@ -1135,25 +1151,7 @@ var saveAllIndicators = function (DAS_UID) {
field = field+'_'+id[part]; field = field+'_'+id[part];
} }
} }
value = node.getValue(); var 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_TITLE' ? 'DAS_IND_TITLE' : field;
field = field == 'IND_TYPE' ? 'DAS_IND_TYPE' : field; field = field == 'IND_TYPE' ? 'DAS_IND_TYPE' : field;