diff --git a/gulliver/js/maborak/core/module.panel.js b/gulliver/js/maborak/core/module.panel.js index 29a925267..45d047a61 100755 --- a/gulliver/js/maborak/core/module.panel.js +++ b/gulliver/js/maborak/core/module.panel.js @@ -693,6 +693,7 @@ leimnud.Package.Public({ this.makeTab=function(dynamic) { if(this.loading===true){return false;} + var thm = this.tab.display==="vertical"?"":"H"; var tb =this.elements.tabOptions[this.tabSelected]; tb.className="panel_tabOptionSelected"+thm+"___"+this.getTheme("tabOptionSelected"); diff --git a/workflow/engine/js/processmap/core/processes_Map.js b/workflow/engine/js/processmap/core/processes_Map.js index 978dc7935..d13368eb1 100755 --- a/workflow/engine/js/processmap/core/processes_Map.js +++ b/workflow/engine/js/processmap/core/processes_Map.js @@ -21,6 +21,17 @@ var saveDataTaskTemporal = function(iForm) oTaskData.TAS_START = (getField('TAS_START').checked ? 'TRUE' : 'FALSE'); oTaskData.TAS_PRIORITY_VARIABLE = getField('TAS_PRIORITY_VARIABLE').value; oTaskData.TAS_DERIVATION_SCREEN_TPL = getField('TAS_DERIVATION_SCREEN_TPL').value; + + var fieldEval = new input(getField('TAS_TITLE')); + if (getField('TAS_TITLE').value.trim() == '') { + fieldEval.failed(); + new leimnud.module.app.alert().make( { + label : _('ID_NAME_TAS_TITLE_REQUIRE') + }); + return false; + } else { + fieldEval.passed(); + } break; case 2: case '2': @@ -65,6 +76,17 @@ var saveDataTaskTemporal = function(iForm) oTaskData.TAS_TYPE_DAY = getField('TAS_TYPE_DAY').value; oTaskData.TAS_CALENDAR = getField('TAS_CALENDAR').value; oTaskData.TAS_TRANSFER_FLY = (getField('TAS_TRANSFER_FLY').checked ? 'TRUE' : 'FALSE'); + + var fieldEval = new input(getField('TAS_DURATION')); + if (getField('TAS_DURATION').value.trim() == '') { + fieldEval.failed(); + new leimnud.module.app.alert().make( { + label : _('ID_TAS_DURATION_REQUIRE') + }); + return false; + } else { + fieldEval.passed(); + } break; case 4: case '4': @@ -109,7 +131,7 @@ var saveDataTaskTemporal = function(iForm) } else { fieldEval.passed(); } - switch ( getField('TAS_DEF_MESSAGE_TYPE').value ) { + switch (getField('TAS_DEF_MESSAGE_TYPE').value) { case 'text' : var vmesn = new input(getField('TAS_DEF_MESSAGE')); if (getField('TAS_DEF_MESSAGE').value.trim() == '' ) { @@ -124,7 +146,7 @@ var saveDataTaskTemporal = function(iForm) break; case 'template' : var vmesn = new input(getField('TAS_DEF_MESSAGE_TEMPLATE')); - if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == '' ){ + if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == ''){ vmesn.failed(); new leimnud.module.app.alert().make( { label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED @@ -137,7 +159,7 @@ var saveDataTaskTemporal = function(iForm) } } - if(typeof getField('SEND_EMAIL') != 'undefined' ) + if(typeof getField('SEND_EMAIL') != 'undefined') oTaskData.SEND_EMAIL = getField('SEND_EMAIL').checked ? 'TRUE' : 'FALSE'; else oTaskData.SEND_EMAIL = 'FALSE'; diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js index b9b4274fd..f55035db9 100755 --- a/workflow/engine/js/processmap/core/processmap.js +++ b/workflow/engine/js/processmap/core/processmap.js @@ -1573,7 +1573,7 @@ var processmap=function(){ var iForm=function(panel,index,ifo){ //saveDataTaskTemporal(ifo); if(typeof(panel.flag) == 'undefined') { - if ( !saveDataTaskTemporal(ifo)) { + if (!saveDataTaskTemporal(ifo)) { var tabPass = panel.tabSelected; panel.tabSelected = panel.tabLastSelected; panel.tabLastSelected = tabPass; diff --git a/workflow/engine/xmlform/tasks/tasks_Notifications.xml b/workflow/engine/xmlform/tasks/tasks_Notifications.xml index 3b76a9434..e195ae6b7 100755 --- a/workflow/engine/xmlform/tasks/tasks_Notifications.xml +++ b/workflow/engine/xmlform/tasks/tasks_Notifications.xml @@ -74,10 +74,10 @@ } else { fieldEval.passed(); } - switch ( getField('TAS_DEF_MESSAGE_TYPE').value ) { + switch (getField('TAS_DEF_MESSAGE_TYPE').value) { case 'text' : var vmesn = new input(getField('TAS_DEF_MESSAGE')); - if (getField('TAS_DEF_MESSAGE').value.trim() == '' ) { + if (getField('TAS_DEF_MESSAGE').value.trim() == '') { new leimnud.module.app.alert().make( { label : G_STRINGS.ID_MESSAGE_FIELD_REQUIRED }); @@ -88,7 +88,7 @@ break; case 'template' : var vmesn = new input(getField('TAS_DEF_MESSAGE_TEMPLATE')); - if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == '' ){ + if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == ''){ new leimnud.module.app.alert().make( { label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED }); @@ -158,7 +158,7 @@ var _oVarsPanel_; var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) { - if( sProcess == '') { + if(sProcess == '') { sProcess = @@PRO_UID; } _oVarsPanel_ = new leimnud.module.panel();