diff --git a/gulliver/js/ext/min/ext-all.js b/gulliver/js/ext/min/ext-all.js index 4ad554266..b87d79e56 100644 --- a/gulliver/js/ext/min/ext-all.js +++ b/gulliver/js/ext/min/ext-all.js @@ -18,7 +18,7 @@ this.getBrowser=function() return{name:name,version:version,screen:screen}} this.createInfoPanel=function(url,params,columnsSize) {var labelColumnWidth=170;var valueColumnWidth=350;params=params||{};if(typeof columnsSize!='undefined'){labelColumnWidth=columnsSize[0]||labelColumnWidth;valueColumnWidth=columnsSize[1]||valueColumnWidth;} -return new Ext.grid.GridPanel({store:new Ext.data.GroupingStore({autoLoad:true,proxy:new Ext.data.HttpProxy({url:url,method:'POST'}),baseParams:params,reader:new Ext.data.JsonReader({fields:[{name:'label'},{name:'value'},{name:'section'}]}),groupField:'section'}),columns:[{width:labelColumnWidth,dataIndex:'label',renderer:function(v){return''+v+''},align:'right'},{width:valueColumnWidth,dataIndex:'value'},{hidden:true,dataIndex:'section'}],autoHeight:true,columnLines:true,trackMouseOver:false,disableSelection:true,view:new Ext.grid.GroupingView({forceFit:true,headersDisabled:true,groupTextTpl:'{group}'}),loadMask:true});} +return new Ext.grid.GridPanel({store:new Ext.data.GroupingStore({autoLoad:true,proxy:new Ext.data.HttpProxy({url:url,method:'POST'}),baseParams:params,reader:new Ext.data.JsonReader({fields:[{name:'label'},{name:'value'},{name:'section'}]}),groupField:'section'}),columns:[{width:labelColumnWidth,dataIndex:"label",renderer:function(v){return""+v+""},align:"right"},{width:valueColumnWidth,dataIndex:"value",renderer:function(v){return Ext.util.Format.htmlEncode(v);}},{hidden:true,dataIndex:"section"}],autoHeight:true,columnLines:true,trackMouseOver:false,disableSelection:true,view:new Ext.grid.GroupingView({forceFit:true,headersDisabled:true,groupTextTpl:'{group}'}),loadMask:true});} this.cookie={create:function(name,value,days){if(days){var date=new Date();date.setTime(date.getTime()+(days*24*60*60*1000));var expires="; expires="+date.toGMTString();}else var expires="";document.cookie=name+"="+value+expires+"; path=/";},read:function(name){var nameEQ=name+"=";var ca=document.cookie.split(';');for(var i=0;i','
','

',t,'

',s,'
','
',''].join('');} @@ -50,6 +50,7 @@ function _DF(DATE_TIME,D_FORMAT) {function LZ(x){return(x<0||x>9?"":"0")+x;} if(typeof D_FORMAT=='undefined'){if(typeof FORMATS!='undefined'){D_FORMAT=FORMATS.dateFormat;} else{D_FORMAT='m/d/Y';}} +if(D_FORMAT.indexOf(' \\d\\e ')){D_FORMAT=D_FORMAT.replace(/ \\d\\e /gi," [of] ");} if(!(DATE_TIME!='')){if(DATE_TIME=='') return'';else return'**'+DATE_TIME+'**';} @@ -60,6 +61,7 @@ else if(H>12){values['g']=H-12;} else{values['g']=H;} values['h']=LZ(values['g']);values['i']=LZ(m);values['s']=LZ(s);if(H>11)values['a']='pm';else values['a']='am';if(H>11)values['A']='PM';else values['A']='AM';if(typeof FORMATS=='undefined')values['T']='**';else values['T']=FORMATS.TimeZone;var aDate=D_FORMAT.split('');var aux='';var xParts=new Array('Y','y','F','M','m','n','d','j','D','l','G','H','g','h','i','s','a','A','T');for(var i=0;i');} diff --git a/gulliver/js/ext/pmos-common.js b/gulliver/js/ext/pmos-common.js index 023459ded..9fdd835d1 100755 --- a/gulliver/js/ext/pmos-common.js +++ b/gulliver/js/ext/pmos-common.js @@ -113,19 +113,25 @@ PMExtJSCommon = function() { }), groupField: 'section' }), - columns : [{ - width : labelColumnWidth, - dataIndex : 'label', - renderer: function(v){return ''+v+''}, - align: 'right' - }, - { - width : valueColumnWidth, - dataIndex : 'value' - },{ - hidden: true, - dataIndex : 'section' - }], + columns : [ + { + width : labelColumnWidth, + dataIndex : "label", + renderer: function(v){return ""+v+""}, + align: "right" + }, + { + width : valueColumnWidth, + dataIndex : "value", + renderer: function (v) { + return Ext.util.Format.htmlEncode(v); + } + }, + { + hidden: true, + dataIndex : "section" + } + ], autoHeight : true, columnLines: true, trackMouseOver:false, @@ -358,14 +364,14 @@ function __() var existTranslations = true; var existIdLabel = true; eval("if( typeof TRANSLATIONS_" + argv[0].toUpperCase() + " != 'undefined' && TRANSLATIONS_" + argv[0].toUpperCase() + ") { existTranslations = true; } else { existTranslations = false; }"); - if (existTranslations) { + if (existTranslations) { eval("if( typeof TRANSLATIONS_" + argv[0].toUpperCase() + "[argv[1]] != 'undefined' ) { existIdLabel = true; } else { existIdLabel = false; }"); if (existIdLabel) { if (argc > 2) { eval("trn = TRANSLATIONS_" + argv[0].toUpperCase() + "[argv[0]];"); for (i = 2; i < argv.length; i++) { trn = trn.replace('{'+(i-2)+'}', argv[i]); - } + } } else { eval("trn = TRANSLATIONS_" + argv[0].toUpperCase() + "[argv[1]];"); } @@ -428,6 +434,10 @@ function _DF(DATE_TIME, D_FORMAT) } } + if (D_FORMAT.indexOf(' \\d\\e ')) { + D_FORMAT = D_FORMAT.replace(/ \\d\\e /gi, " [of] "); + } + if (!(DATE_TIME != '')) { if (DATE_TIME == '') return ''; @@ -499,6 +509,11 @@ function _DF(DATE_TIME, D_FORMAT) aux = aux + values[aDate[i]]; } } + + if (aux.indexOf(" [of] ")) { + aux = aux.replace(/\[of\]/g, "de"); + } + return aux; } diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index b7b113929..3b3076bf1 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -88,7 +88,7 @@ class Configurations // extends Configuration } } } - + public function exists($cfgID) { return $this->Configuration->exists($cfgID,"",'','',''); @@ -314,11 +314,11 @@ class Configurations // extends Configuration return null; } } - - + + public function userNameFormat($username, $fullname) { - + try { if (!isset($this->UserConfig)) { $this->UserConfig = $this->getConfiguration('ENVIRONMENT_SETTINGS', ''); @@ -486,6 +486,7 @@ class Configurations // extends Configuration $arrayFormat[] = array("id" => "d M, Y", "name" => G::LoadTranslation("ID_DATE_FORMAT_12")); //"d M, Y" i.e: "17 Nov, 2010" $arrayFormat[] = array("id" => "d m, Y", "name" => G::LoadTranslation("ID_DATE_FORMAT_13")); //"d m, Y" i.e: "17 11, 2010" $arrayFormat[] = array("id" => "d.m.Y", "name" => G::LoadTranslation("ID_DATE_FORMAT_14")); //"d.m.Y" i.e: "17.11.2010" + $arrayFormat[] = array("id" => "d \d\e F \d\e Y", "name" => G::LoadTranslation("ID_DATE_FORMAT_17")); //"d \d\e F \d\e Y" i.e: "2 de Febrero de 2013" (Spanish format) return $arrayFormat; } @@ -523,6 +524,12 @@ class Configurations // extends Configuration $newCreation = ''; $maskTime = array('d' => '%d', 'D' => '%A', 'j' => '%e', 'l' => '%A', 'N' => '%u', 'S' => '%d', 'w' => '%w', 'z' => '%j', 'W' => '%W', 'F' => '%B', 'm' => '%m', 'M' => '%B', 'n' => '%m', 'o' => '%Y', 'Y' => '%Y', 'y' => '%g', 'a' => '%P', 'A' => '%p', 'g' => '%l', 'G' => '%k', 'h' => '%I', 'H' => '%H', 'i' => '%M', 's' => '%S'); $creationDateMask = trim($creationDateMask); + + if (strpos($creationDateMask, ' \\d\\e ') !== false) { + $creationDateMask = str_replace(' \\d\\e ', ' [xx] ', $creationDateMask); + } + + for ($i = 0; $i < strlen($creationDateMask); $i++) { if ($creationDateMask[$i] != ' ' && isset($maskTime[$creationDateMask[$i]])) { $newCreation .= $maskTime[$creationDateMask[$i]]; @@ -560,8 +567,19 @@ class Configurations // extends Configuration setlocale(LC_TIME, $langLocate); $dateTime = utf8_encode(strftime($newCreation, mktime(0, 0, 0, $m, $d, $y))); + + if (strpos($dateTime, ' ') !== false) { + $dateTime = ucwords($dateTime); + } + + if (strpos($dateTime, ' [xx] ') !== false) { + $dateTime = str_replace('[xx]', ' de ', $dateTime); + } } + + } + return $dateTime; } @@ -940,4 +958,4 @@ class Configurations // extends Configuration return $ver; } } - \ No newline at end of file + diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index b1fd3b210..709219120 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -12505,6 +12505,12 @@ msgstr "M d, Y" msgid "m D, Y" msgstr "m D, Y" +# TRANSLATION +# LABEL/ID_DATE_FORMAT_17 +#: LABEL/ID_DATE_FORMAT_17 +msgid "d de F de Y" +msgstr "d de F de Y" + # TRANSLATION # LABEL/ID_EXPIRES_IN #: LABEL/ID_EXPIRES_IN diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 8cf8455ae..814a5233a 100755 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -1354,10 +1354,15 @@ class Installer extends Controller public function setConfiguration() { - $query = << "pt-BR", + "dateFormat" => 'd \d\e F \d\e Y' + ); + + $value = serialize($value); + $query = "INSERT INTO CONFIGURATION (CFG_UID, CFG_VALUE) VALUES ('ENVIRONMENT_SETTINGS', '".mysql_real_escape_string($value)."')"; + $this->mysqlQuery($query); } diff --git a/workflow/engine/methods/cases/cases_Scheduler_Edit.php b/workflow/engine/methods/cases/cases_Scheduler_Edit.php index 41f5f0dd0..d54863d45 100755 --- a/workflow/engine/methods/cases/cases_Scheduler_Edit.php +++ b/workflow/engine/methods/cases/cases_Scheduler_Edit.php @@ -125,6 +125,12 @@ try { $aFields['PHP_START_DATE'] = date( 'Y-m-d' ); $aFields['PHP_END_DATE'] = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 5 ) ); + $aFields['SCH_LIST'] = ''; + foreach ($_SESSION['_DBArray']['cases_scheduler'] as $key => $item) { + $aFields['SCH_LIST'] .= ($item['SCH_UID'] != $_GET['SCH_UID']) ? htmlspecialchars($item['SCH_NAME'], ENT_QUOTES) . '^' : '' ; + } + + $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Scheduler_Edit.xml', '', $aFields, 'cases_Scheduler_Update' ); G::RenderPage( 'publishBlank', 'blank' ); diff --git a/workflow/engine/methods/cases/cases_Scheduler_New.php b/workflow/engine/methods/cases/cases_Scheduler_New.php index 33f970ac0..02f407815 100755 --- a/workflow/engine/methods/cases/cases_Scheduler_New.php +++ b/workflow/engine/methods/cases/cases_Scheduler_New.php @@ -86,6 +86,11 @@ try { $aFields['UID_SCHEDULER'] = "scheduler"; + $aFields['SCH_LIST'] = ''; + foreach ($_SESSION['_DBArray']['cases_scheduler'] as $key => $item) { + $aFields['SCH_LIST'] .= htmlspecialchars($item['SCH_NAME'], ENT_QUOTES) . '^'; + } + $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Scheduler_New.xml', '', $aFields, 'cases_Scheduler_Save' ); G::RenderPage( 'publishBlank', 'blank' ); diff --git a/workflow/engine/methods/events/eventsEditAction.php b/workflow/engine/methods/events/eventsEditAction.php index 72e939d66..eff7749f3 100755 --- a/workflow/engine/methods/events/eventsEditAction.php +++ b/workflow/engine/methods/events/eventsEditAction.php @@ -76,6 +76,8 @@ if (isset( $parameters->TO )) { //echo '
';print_r($parameters->TO);
     foreach ($parameters->TO as $item) {
         $row = explode( '|', $item );
+        $row[1] = trim($row[1]);
+
         switch ($row[0]) {
             case 'usr':
                 require_once ('classes/model/Users.php');
@@ -117,6 +119,8 @@ if (isset( $parameters->CC )) {
     $paramCC[] = Array ('id' => 'char','name' => 'char' );
     foreach ($parameters->CC as $item) {
         $row = explode( '|', $item );
+        $row[1] = trim($row[1]);
+
         switch ($row[0]) {
             case 'usr':
                 require_once ('classes/model/Users.php');
@@ -156,6 +160,8 @@ if (isset( $parameters->BCC )) {
     $paramBCC[] = Array ('id' => 'char','name' => 'char' );
     foreach ($parameters->BCC as $item) {
         $row = explode( '|', $item );
+        $row[1] = trim($row[1]);
+
         switch ($row[0]) {
             case 'usr':
                 require_once ('classes/model/Users.php');
diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php
index 208da56dc..7978c89b7 100755
--- a/workflow/engine/methods/setup/skin_Ajax.php
+++ b/workflow/engine/methods/setup/skin_Ajax.php
@@ -50,13 +50,16 @@ function skinList ()
         $wildcard = '@';
     }
 
-    $classicSkin = '';
+    $filterList = array();
     if (defined('PARTNER_FLAG')) {
-        $classicSkin = '00000000000000000000000000000001';
+        $filterList = array(
+            '00000000000000000000000000000001',
+            '00000000000000000000000000000002'
+        );
     }
 
     foreach ($skinList['skins'] as $key => $value) {
-        if (!isset($value['SKIN_ID']) || $value['SKIN_ID'] != $classicSkin) {
+        if (! isset($value['SKIN_ID']) || ! in_array($value['SKIN_ID'], $filterList)) {
             if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') {
                 if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
                     $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );
diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php
index 63b4a3914..6daf05314 100755
--- a/workflow/engine/skinEngine/skinEngine.php
+++ b/workflow/engine/skinEngine/skinEngine.php
@@ -726,7 +726,7 @@ class SkinEngine
         G::LoadClass( "configuration" );
         $conf = new Configurations();
         if ( defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) {
-            $smarty->assign('udate', $conf->getSystemDate(date('Y-m-d H:i:s')));
+            $smarty->assign('udate', $conf->getSystemDate(date('Y-m-d')));
         } else {
             $smarty->assign('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG));
         }
diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html
index c75080f25..fb5c8fbed 100755
--- a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html
+++ b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html
@@ -22,6 +22,9 @@
                                               
               {$form.SCH_UID}
              
+            
+                {$form.SCH_LIST}
+            
              
               {$form.SCH_ADVANCED}
              
diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml
index ee70d3211..97a80812e 100755
--- a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml
+++ b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml
@@ -13,6 +13,8 @@
 
 
 
+
+
 
 
 
@@ -48,7 +50,7 @@
 
 
 
-Description
+Name
 
 
 
@@ -247,7 +249,7 @@ WHERE A.PRO_UID='@#PRO_UID' AND A.TAS_START = 'TRUE' ]]>
 
 
 
-
+
 Update
 
 
@@ -758,18 +760,36 @@ function collapseAdvancedOptions(){
  * @return true/false boolean
  */
 
-function validateSchedulerFields(){
+function validateSchedulerFields(oForm) {
 
-var validFields = true;
-var requiredFields = '';
-var badFormatFields = '';
-var startDate = document.getElementById('form[SCH_START_DATE]').value;
-var endDate = document.getElementById('form[SCH_END_DATE]').value;
+    var schedulerTitle = document.getElementById('form[SCH_NAME]').value;
+    schedulerTitle = schedulerTitle.replace(/^\s*|\s*$/g,"");
+    if (schedulerTitle == '') {
+        document.getElementById('form[SCH_NAME]').focus();
+        msgBox("@G::LoadTranslation(ID_REQUIRED_NAME_CASE_SCHEDULER)", 'alert');
+        return false;
+    }
+    
+    var listNames = document.getElementById('form[SCH_LIST]').value;
+    listNames = listNames.split("^");
+    for (var i= 1; i
               {$form.SCH_UID}
              
+             
+              {$form.SCH_LIST}
+             
              
               {$form.SCH_USER_UID}
              
diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_New.xml b/workflow/engine/xmlform/cases/cases_Scheduler_New.xml
index a8d6a5950..1ab952a83 100755
--- a/workflow/engine/xmlform/cases/cases_Scheduler_New.xml
+++ b/workflow/engine/xmlform/cases/cases_Scheduler_New.xml
@@ -16,7 +16,8 @@
 
 
 
-
+
+
 
 
 
@@ -230,7 +231,7 @@
 Start a case based on following registered Plugin.
 
 
-
+
 Save
 
 
@@ -243,7 +244,6 @@ hideAll();
 hideProperties();
 
 
-
 function $_GET(q,s) {
     s = (s) ? s : self.location.search;
     var re = new RegExp('&'+q+'=([^&]*)','i');
@@ -622,149 +622,160 @@ function case_userSchedulerValidate(username, password) {
  * @return true/false boolean
  */
 
-function validateSchedulerFields(){
+function validateSchedulerFields(oForm) {
 
-getField("SCH_NAME").value = getField("SCH_NAME").value.trim();
+    var schedulerTitle = document.getElementById('form[SCH_NAME]').value;
+    schedulerTitle = schedulerTitle.replace(/^\s*|\s*$/g,"");
+    if (schedulerTitle == '') {
+        document.getElementById('form[SCH_NAME]').focus();
+        msgBox("@G::LoadTranslation(ID_REQUIRED_NAME_CASE_SCHEDULER)", 'alert');
+        return false;
+    }
+    
+    var listNames = document.getElementById('form[SCH_LIST]').value;
+    listNames = listNames.split("^");
+    if (schedulerTitle.toLowerCase() == (listNames[i]).toLowerCase()) {
+        if (schedulerTitle == listNames[i]) {
+            document.getElementById('form[SCH_NAME]').focus();
+            msgBox("@G::LoadTranslation(ID_DUPLICATE_CASE_SCHEDULER_NAME)", 'alert');
+            return false;
+        }
+    }
+    getField("SCH_NAME").value = schedulerTitle;
 
-var validFields = true;
-var requiredFields = '';
-var badFormatFields = '';
-var startDate = document.getElementById('form[SCH_START_DATE]').value;
-var endDate = document.getElementById('form[SCH_END_DATE]').value;
+    var validFields = true;
+    var requiredFields = '';
+    var badFormatFields = '';
+    var startDate = document.getElementById('form[SCH_START_DATE]').value;
+    var endDate = document.getElementById('form[SCH_END_DATE]').value;
 
-startDate = startDate.split("-");
-endDate = endDate.split("-");
-startDate = new Date(startDate[0],startDate[1],startDate[2]);
-endDate   = new Date(endDate[0],endDate[1],endDate[2]);
+    startDate = startDate.split("-");
+    endDate = endDate.split("-");
+    startDate = new Date(startDate[0],startDate[1],startDate[2]);
+    endDate   = new Date(endDate[0],endDate[1],endDate[2]);
 
-    if (document.getElementById('form[SCH_START_DATE]').value==''){
-        requiredFields = requiredFields + 'Start Date,';
-        validFields = false;
-    } else {
-        if (document.getElementById('form[SCH_END_DATE]').value!='')
-            if (startDate>endDate){
-                badFormatFields = badFormatFields + 'Start Date can\'t be greater than End Date';
+        if (document.getElementById('form[SCH_START_DATE]').value=='') {
+            requiredFields = requiredFields + 'Start Date,';
+            validFields = false;
+        } else {
+            if (document.getElementById('form[SCH_END_DATE]').value!='') {
+                if (startDate>endDate) {
+                    badFormatFields = badFormatFields + 'Start Date can\'t be greater than End Date';
+                    validFields = false;
+                }
+            }
+        }
+        // check if the field time is compliant with the regular expression
+        // for time format hh:mm
+        var regExpString = "([0-1]\\d|2[0-3]):([0-5]\\d)";
+        var timeRegexp = new RegExp(regExpString);
+        if (document.getElementById('form[SCH_OPTION]').value != 5) {
+            if (!timeRegexp.test(document.getElementById('form[SCH_START_TIME]').value)) {
+                msgBox('The time format is invalid','alert');
+                return false;
+            }
+            if (document.getElementById('form[SCH_START_TIME]').value=='') {
+                requiredFields = requiredFields + 'Execution Time,';
                 validFields = false;
             }
-    }
-    // check if the field time is compliant with the regular expression
-    // for time format hh:mm
-    var regExpString = "([0-1]\\d|2[0-3]):([0-5]\\d)";
-    var timeRegexp = new RegExp(regExpString);
-    if (document.getElementById('form[SCH_OPTION]').value != 5) {
-      if (!timeRegexp.test(document.getElementById('form[SCH_START_TIME]').value)){
-        msgBox('The time format is invalid','alert');
-        return false;
-      }
-      if (document.getElementById('form[SCH_START_TIME]').value==''){
-          requiredFields = requiredFields + 'Execution Time,';
-          validFields = false;
-      }
-    } else {
-      if (document.getElementById('form[SCH_REPEAT_EVERY]').value==''){
-          requiredFields = requiredFields + 'Every,';
-          validFields = false;
-      }
-    }
-    switch(document.getElementById('form[SCH_OPTION]').value){
-        // daily
-        case '1':
-            //if(document.getElementById('form[SCH_DAYS_PERFORM_TASK][1]').checked==true||document.getElementById('form[SCH_DAYS_PERFORM_TASK][2]').checked==true||document.getElementById('form[SCH_DAYS_PERFORM_TASK][3]').checked==true){
+        } else {
+            if (document.getElementById('form[SCH_REPEAT_EVERY]').value=='') {
+                requiredFields = requiredFields + 'Every,';
+                validFields = false;
+            }
+        }
+        switch (document.getElementById('form[SCH_OPTION]').value) {
+            // daily
+            case '1':
+                //if(document.getElementById('form[SCH_DAYS_PERFORM_TASK][1]').checked==true||document.getElementById('form[SCH_DAYS_PERFORM_TASK][2]').checked==true||document.getElementById('form[SCH_DAYS_PERFORM_TASK][3]').checked==true){
                 if(document.getElementById('form[SCH_DAYS_PERFORM_TASK]').value!=''){
                     validFields = true;
                 } else {
                     requiredFields = requiredFields + 'Weekdays,';
                     validFields = false;
                 }
-
-        break;
-        // weekly
-        case '2':
-            if (document.getElementById('form[SCH_EVERY_DAYS]').value==''){
-                requiredFields = requiredFields + 'Number of Weeks,';
-                validFields = false;
-            } else {
-                for (week=1;week<=4;week++){
-                    weekIdOne = 'form[SCH_WEEK_DAYS]['+week+']';
-                    if (document.getElementById(weekIdOne).checked==true){
-                        validFields = true;
-                        break;
-                    } else {
-                        validFields = false;
-                    }
-                }
-                if (!validFields){
-                    for (week=1;week<=3;week++){
-                        weekIdTwo = 'form[SCH_WEEK_DAYS_2]['+(week+4)+']';
-                        if (document.getElementById(weekIdTwo).checked==true){
+                break;
+                // weekly
+            case '2':
+                if (document.getElementById('form[SCH_EVERY_DAYS]').value=='') {
+                    requiredFields = requiredFields + 'Number of Weeks,';
+                    validFields = false;
+                } else {
+                    for (week=1;week<=4;week++) {
+                        weekIdOne = 'form[SCH_WEEK_DAYS]['+week+']';
+                        if (document.getElementById(weekIdOne).checked==true) {
                             validFields = true;
                             break;
                         } else {
                             validFields = false;
                         }
                     }
-                }
-                if (!validFields){
-                    requiredFields = requiredFields + 'Weeks,';
-                    validFields = false;
-                }
-            }
-        break;
-        //monthly
-        case '3':
-            if (document.getElementById('form[SCH_START_DAY][1]').checked==true||document.getElementById('form[SCH_START_DAY][2]').checked==true){
-                for (month=1;month<=4;month++){
-                    monthIdOne = 'form[SCH_MONTHS]['+month+']';
-                    monthIdTwo = 'form[SCH_MONTHS_2]['+(month+4)+']';
-                    monthIdThree = 'form[SCH_MONTHS_3]['+(month+8)+']';
-
-                    if (document.getElementById(monthIdOne).checked==true||document.getElementById(monthIdTwo).checked==true||document.getElementById(monthIdThree).checked==true){
-                        validFields = true;
-                        break;
-                    } else {
+                    if (!validFields){
+                        for (week=1;week<=3;week++){
+                            weekIdTwo = 'form[SCH_WEEK_DAYS_2]['+(week+4)+']';
+                            if (document.getElementById(weekIdTwo).checked==true) {
+                                validFields = true;
+                                break;
+                            } else {
+                                validFields = false;
+                            }
+                        }
+                    }
+                    if (!validFields){
+                        requiredFields = requiredFields + 'Weeks,';
                         validFields = false;
                     }
                 }
-                if (!validFields){
-                    requiredFields = requiredFields + 'Months,';
+                break;
+                //monthly
+            case '3':
+                if (document.getElementById('form[SCH_START_DAY][1]').checked==true||document.getElementById('form[SCH_START_DAY][2]').checked==true){
+                    for (month=1;month<=4;month++){
+                        monthIdOne = 'form[SCH_MONTHS]['+month+']';
+                        monthIdTwo = 'form[SCH_MONTHS_2]['+(month+4)+']';
+                        monthIdThree = 'form[SCH_MONTHS_3]['+(month+8)+']';
+
+                        if (document.getElementById(monthIdOne).checked==true||document.getElementById(monthIdTwo).checked==true||document.getElementById(monthIdThree).checked==true){
+                            validFields = true;
+                            break;
+                        } else {
+                            validFields = false;
+                        }
+                    }
+                    if (!validFields){
+                        requiredFields = requiredFields + 'Months,';
+                        validFields = false;
+                    }
+                } else {
+                    requiredFields = requiredFields + 'Start Day,';
                     validFields = false;
                 }
-            } else {
-                requiredFields = requiredFields + 'Start Day,';
+                break;
+            //run once
+            case '4':
+                validFields = true;
+                break;
+            //run every
+            case '5':
+                validFields = true;
+                break;
+            default:
                 validFields = false;
-            }
-
-
-        break;
-        //run once
-        case '4':
-
-                validFields = true;
-
-        break;
-        //run every
-        case '5':
-
-                validFields = true;
-
-        break;
-        default:
-            validFields = false;
-        break;
-    }
-    if (requiredFields!='') {
-        var message = "The fields "+requiredFields+" can\'t be empty";
-        msgBox(message, 'alert');
-        return false;
-    } else {
-        if (badFormatFields!=''){
-            var message =  badFormatFields;
+            break;
+        }
+        if (requiredFields!='') {
+            var message = "The fields "+requiredFields+" can\'t be empty";
             msgBox(message, 'alert');
             return false;
         } else {
-            return true;
+            if (badFormatFields!='') {
+                var message =  badFormatFields;
+                msgBox(message, 'alert');
+                return false;
+            } else {
+                oForm.submit();
+            }
         }
-    }
 }
 
 function resetForm(){