From f2d96e0d3a53bae94f02ff56c265a9b37949c253 Mon Sep 17 00:00:00 2001 From: Carlos Pacha Date: Mon, 10 Jan 2011 16:21:26 +0000 Subject: [PATCH] correction validate time and added labels --- .../xmlform/cases/cases_Scheduler_Edit.xml | 45 +++++++++++++------ .../xmlform/cases/cases_Scheduler_New.xml | 3 +- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml index ca6163572..4c1b595dc 100644 --- a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml +++ b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml @@ -253,6 +253,17 @@ WHERE A.PRO_UID='@#PRO_UID' AND A.TAS_START = 'TRUE' ]]> // hideAll(); // hideProperties(); + +function $_GET(q,s) { + s = (s) ? s : self.location.search; + var re = new RegExp('&'+q+'=([^&]*)','i'); + return (s=s.replace(/^\?/,'&').match(re)) ? s=s[1] : s=''; +} + +function backToList(){ + //alert($_GET('PRO_UID')); + self.location = 'cases_Scheduler_List?PRO_UID='+$_GET('PRO_UID'); +} document.getElementById('form[EDIT_USER]').style.display='none'; switch (getField('SCH_OPTION').value){ case '1': @@ -548,14 +559,18 @@ leimnud.event.add(getField('SCH_START_TIME'), 'change', function() { var parties = answer.split(':'); if(parties[0]>23){ - msgBox('The time can not be increased to 23:59', 'alert'); - getField('SCH_REPEAT_UNTIL').value=''; - getField('SCH_REPEAT_UNTIL').focus(); + msgBox(G_STRINGS.ID_SCHEDULER_CANT_PUT_TIME, 'alert'); + getField('SCH_START_TIME').value=''; + //getField('SCH_REPEAT_UNTIL').value=''; + //getField('SCH_REPEAT_UNTIL').focus(); + getField('UPDATE').focus(); } if(parties[1]>59){ - msgBox('The mininutos can not be greater than about 59', 'alert'); - getField('SCH_REPEAT_UNTIL').value=''; - getField('SCH_REPEAT_UNTIL').focus(); + msgBox(G_STRINGS.ID_SCHEDULER_CANT_PUT_MINUTES, 'alert'); + getField('SCH_START_TIME').value=''; + //getField('SCH_REPEAT_UNTIL').value=''; + //getField('SCH_REPEAT_UNTIL').focus(); + getField('UPDATE').focus(); } }); @@ -567,14 +582,18 @@ leimnud.event.add(getField('SCH_REPEAT_UNTIL'), 'change', function() { var parties = answer.split(':'); if(parties[0]>23){ - msgBox('The time can not be increased to 23:59', 'alert'); - getField('SCH_REPEAT_UNTIL').value=''; - getField('SCH_REPEAT_UNTIL').focus(); + msgBox(G_STRINGS.ID_SCHEDULER_CANT_PUT_TIME, 'alert'); + getField('SCH_START_TIME').value=''; + //getField('SCH_REPEAT_UNTIL').value=''; + //getField('SCH_REPEAT_UNTIL').focus(); + getField('UPDATE').focus(); + } if(parties[1]>59){ - msgBox('The mininutos can not be greater than about 59', 'alert'); - getField('SCH_REPEAT_UNTIL').value=''; - getField('SCH_REPEAT_UNTIL').focus(); + msgBox(G_STRINGS.ID_SCHEDULER_CANT_PUT_MINUTES, 'alert'); + //getField('SCH_REPEAT_UNTIL').value=''; + //getField('SCH_REPEAT_UNTIL').focus(); + getField('UPDATE').focus(); } }); /* @@ -833,4 +852,4 @@ endDate = new Date(endDate[0],endDate[1],endDate[2]); } ]]> - \ No newline at end of file + diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_New.xml b/workflow/engine/xmlform/cases/cases_Scheduler_New.xml index 8e5d72503..63b3bdc69 100644 --- a/workflow/engine/xmlform/cases/cases_Scheduler_New.xml +++ b/workflow/engine/xmlform/cases/cases_Scheduler_New.xml @@ -229,6 +229,7 @@ hideAll(); hideProperties(); + function $_GET(q,s) { s = (s) ? s : self.location.search; var re = new RegExp('&'+q+'=([^&]*)','i'); @@ -451,7 +452,7 @@ leimnud.event.add(getField('SCH_START_TIME'), 'change', function() { var parties = answer.split(':'); if(parties[0]>23){ - msgBox('The time can not be increased to 23:59', 'alert'); + msgBox(G_STRINGS.ID_SCHEDULER_CANT_PUT_TIME, 'alert'); getField('SCH_START_TIME').value=''; //getField('SCH_REPEAT_UNTIL').value=''; //getField('SCH_REPEAT_UNTIL').focus();