From b4318bb90df9b635ee65530e082b9bbc73ee41cf Mon Sep 17 00:00:00 2001 From: danteloayza Date: Thu, 26 Mar 2015 18:46:58 -0400 Subject: [PATCH] users.js update --- workflow/engine/templates/users/users.js | 165 +++++++++++++++++++++-- 1 file changed, 153 insertions(+), 12 deletions(-) diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js index 4f56e47a6..7117d3cd8 100755 --- a/workflow/engine/templates/users/users.js +++ b/workflow/engine/templates/users/users.js @@ -383,7 +383,7 @@ Ext.onReady(function () { ] }) }); - + comboRole = new Ext.form.ComboBox({ fieldLabel : _('ID_ROLE'), hiddenName : 'USR_ROLE', @@ -449,6 +449,7 @@ Ext.onReady(function () { Ext.getCmp('usernameReview').setVisible(true); } } +<<<<<<< HEAD }, { xtype: 'label', @@ -477,6 +478,93 @@ Ext.onReady(function () { id : 'USR_ZIP_CODE', fieldLabel : _('ID_ZIP_CODE'), xtype : 'textfield', +======= + } + }, + { + xtype: 'label', + fieldLabel: ' ', + id:'usernameReview', + width: 300, + labelSeparator: '' + }, + { + id : 'USR_EMAIL', + fieldLabel : ' * ' + _('ID_EMAIL'), + vtype : 'email', + xtype : 'textfield', + width : 260, + allowBlank : false + }, + { + xtype : 'textarea', + name : 'USR_ADDRESS', + fieldLabel : _('ID_ADDRESS'), + labelSeparator : '', + height : 50, + width : 260 + }, + { + id : 'USR_ZIP_CODE', + fieldLabel : _('ID_ZIP_CODE'), + xtype : 'textfield', + width : 260 + }, + comboCountry, + comboRegion, + comboLocation, + { + id : 'USR_PHONE', + fieldLabel : _('ID_PHONE'), + xtype : 'textfield', + width : 260 + }, + { + id : 'USR_POSITION', + fieldLabel : _('ID_POSITION'), + xtype : 'textfield', + width : 260 + }, + comboReplacedBy, + dateField, + comboCalendar, + comboStatus, + comboRole + ] + }); + /*----------------------------------********---------------------------------*/ + var costByHour = new Ext.form.FieldSet({ + title : _('ID_COSTS'), + items : [ + { + id : 'USR_COST_BY_HOUR', + fieldLabel : _('ID_COST_BY_HOUR'), + xtype : 'numberfield', + decimalSeparator : '.', + maxLength : 13, + width : 80 + }, + { + id : 'USR_UNIT_COST', + fieldLabel : _('ID_UNITS'), + xtype : 'textfield', + maxLength : 50, + width : 80 + } + ] + }); + /*----------------------------------********---------------------------------*/ + var passwordFields = new Ext.form.FieldSet({ + title : _('ID_CHANGE_PASSWORD'), + items : [ + { + xtype : "textfield", + id : "currentPassword", + name : "currentPassword", + fieldLabel : _("ID_PASSWORD_CURRENT"), + inputType : "password", + hidden : (typeof EDITPROFILE != "undefined" && EDITPROFILE == 1)? false : true, +>>>>>>> upstream/dashboards width : 260 }, comboCountry, @@ -502,6 +590,29 @@ Ext.onReady(function () { ] }); + /*----------------------------------********---------------------------------*/ + var costByHour = new Ext.form.FieldSet({ + title : _('ID_COSTS'), + items : [ + { + id : 'USR_COST_BY_HOUR', + fieldLabel : _('ID_COST_BY_HOUR'), + xtype : 'numberfield', + decimalSeparator : '.', + maxLength : 13, + width : 80 + }, + { + id : 'USR_UNIT_COST', + fieldLabel : _('ID_UNITS'), + xtype : 'textfield', + maxLength : 50, + width : 80 + } + ] + }); + /*----------------------------------********---------------------------------*/ + var passwordFields = new Ext.form.FieldSet({ title : _('ID_CHANGE_PASSWORD'), items : [ @@ -739,6 +850,9 @@ Ext.onReady(function () { }, items : [ informationFields, + /*----------------------------------********---------------------------------*/ + costByHour, + /*----------------------------------********---------------------------------*/ passwordFields, accountOptions, profileFields, @@ -885,11 +999,29 @@ Ext.onReady(function () { fieldLabel : _('ID_ROLE'), xtype : 'label', width : 260 - } - + }, ] }); + /*----------------------------------********---------------------------------*/ + costByHour2 = new Ext.form.FieldSet({ + title : _('ID_COSTS'), + items : [ + { + id : 'USR_COST_BY_HOUR2', + fieldLabel : _('ID_COST_BY_HOUR'), + xtype : 'label', + width : 260 + }, + { + id : 'USR_UNIT_COST2', + fieldLabel : _('ID_UNITS'), + xtype : 'label', + width : 260 + } + ] + }); + /*----------------------------------********---------------------------------*/ passwordFields2 = new Ext.form.FieldSet({ title : _('ID_PASSWORD'), items : [ @@ -938,6 +1070,9 @@ Ext.onReady(function () { box2, //profileFields2, informationFields2, + /*----------------------------------********---------------------------------*/ + costByHour2, + /*----------------------------------********---------------------------------*/ //passwordFields2, preferencesFields2 ], @@ -1103,11 +1238,11 @@ function saveUser() if (Ext.getCmp('USR_USERNAME').getValue() != '') { if (previousUsername != '') { if (Ext.getCmp('USR_USERNAME').getValue() != previousUsername) { - if (!flagValidateUsername) { - Ext.Msg.alert( _('ID_ERROR'), Ext.getCmp('usernameReview').html); - return false; - } - } + if (!flagValidateUsername) { + Ext.Msg.alert( _('ID_ERROR'), Ext.getCmp('usernameReview').html); + return false; + } + } } else { if (!flagValidateUsername) { Ext.Msg.alert( _('ID_ERROR'), Ext.getCmp('usernameReview').html); @@ -1117,9 +1252,9 @@ function saveUser() if (USR_UID == '00000000000000000000000000000001') { if (Ext.getCmp('USR_ROLE').getValue() != PROCESSMAKER_ADMIN) { - Ext.Msg.alert( _('ID_ERROR'), _('ID_ADMINISTRATOR_ROLE_CANT_CHANGED')); + Ext.Msg.alert( _('ID_ERROR'), _('ID_ADMINISTRATOR_ROLE_CANT_CHANGED')); return false; - } + } } } else { @@ -1291,6 +1426,10 @@ function loadUserData() USR_POSITION : data.user.USR_POSITION, USR_DUE_DATE : data.user.USR_DUE_DATE, USR_STATUS : data.user.USR_STATUS, + /*----------------------------------********---------------------------------*/ + USR_COST_BY_HOUR : data.user.USR_COST_BY_HOUR, + USR_UNIT_COST : data.user.USR_UNIT_COST, + /*----------------------------------********---------------------------------*/ USR_LOGGED_NEXT_TIME : data.user.USR_LOGGED_NEXT_TIME }); @@ -1312,9 +1451,11 @@ function loadUserData() Ext.getCmp("USR_DUE_DATE2").setText(data.user.USR_DUE_DATE); Ext.getCmp("USR_STATUS2").setText(_('ID_' + data.user.USR_STATUS)); Ext.getCmp("USR_ROLE2").setText(data.user.USR_ROLE_NAME); - + /*----------------------------------********---------------------------------*/ + Ext.getCmp("USR_COST_BY_HOUR2").setText(data.user.USR_COST_BY_HOUR); + Ext.getCmp("USR_UNIT_COST2").setText(data.user.USR_UNIT_COST); + /*----------------------------------********---------------------------------*/ Ext.getCmp("USR_CALENDAR2").setText(data.user.CALENDAR_NAME); - Ext.getCmp("PREF_DEFAULT_MAIN_MENU_OPTION2").setText(data.user.MENUSELECTED_NAME); Ext.getCmp("PREF_DEFAULT_CASES_MENUSELECTED2").setText(data.user.CASES_MENUSELECTED_NAME); } else {