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

BUG 9422 Fix many issues related to Case Scheduler/Events

Browse Source 
- Problem updating the info for the case schedulers
- Add all the validations needed
This commit is contained in:
Julio Cesar Laura
2012-08-10 16:44:36 -04:00
parent 843d0acda3
commit ba7d24a3a5
9 changed files with 216 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
workflow/engine/content/translations/english/processmaker.en.po Executable file → Normal file
View File

@@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: ProcessMaker (Branch 2.0-testing) 2.0.43-testing.4-10-gb493668\n" "Project-Id-Version: ProcessMaker (Branch master) 2.0.41-testing.4-720-g843d0ac\n"
"POT-Creation-Date: \n" "POT-Creation-Date: \n"
"PO-Revision-Date: 2012-08-01 10:50:13\n" "PO-Revision-Date: 2012-08-10 16:39:34\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n" "Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -12721,6 +12721,24 @@ msgstr "Reason of the cancel of case"
msgid "The Case canceled. By the reason:" msgid "The Case canceled. By the reason:"
msgstr "The Case canceled. By the reason:" msgstr "The Case canceled. By the reason:"
# TRANSLATION
# LABEL/MIME_DES_DOCX
#: LABEL/MIME_DES_DOCX
msgid "[LABEL/MIME_DES_DOCX] Word Document"
msgstr "Word Document"
# TRANSLATION
# LABEL/MIME_DES_XLSX
#: LABEL/MIME_DES_XLSX
msgid "[LABEL/MIME_DES_XLSX] Excel Document"
msgstr "Excel Document"
# TRANSLATION
# LABEL/ID_PROCESSED
#: LABEL/ID_PROCESSED
msgid "Processed"
msgstr "Processed"
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml?ADD_TAB_NAME
# additionalTables/additionalTablesData.xml # additionalTables/additionalTablesData.xml
#: text - ADD_TAB_NAME #: text - ADD_TAB_NAME
@@ -16201,6 +16219,12 @@ msgstr "Task Due Date"
msgid "[cases/cases_Resume.xml?DEL_FINISH_DATE] Finish Date" msgid "[cases/cases_Resume.xml?DEL_FINISH_DATE] Finish Date"
msgstr "Finish Date" msgstr "Finish Date"
# cases/cases_Resume.xml?DESCRIPTION
# cases/cases_Resume.xml
#: text - DESCRIPTION
msgid "[cases/cases_Resume.xml?DESCRIPTION] Case Description"
msgstr "Case Description"
# cases/cases_Scheduler_Edit.xml?GENERAL_INF # cases/cases_Scheduler_Edit.xml?GENERAL_INF
# cases/cases_Scheduler_Edit.xml # cases/cases_Scheduler_Edit.xml
#: title - GENERAL_INF #: title - GENERAL_INF
@@ -16249,12 +16273,6 @@ msgstr "Properties"
msgid "[cases/cases_Scheduler_Edit.xml?SCH_NAME] Description" msgid "[cases/cases_Scheduler_Edit.xml?SCH_NAME] Description"
msgstr "Description" msgstr "Description"
# cases/cases_Scheduler_Edit.xml?PRO_UID
# cases/cases_Scheduler_Edit.xml
#: dropdown - PRO_UID
msgid "[cases/cases_Scheduler_Edit.xml?PRO_UID] Process"
msgstr "Process"
# cases/cases_Scheduler_Edit.xml?TAS_UID # cases/cases_Scheduler_Edit.xml?TAS_UID
# cases/cases_Scheduler_Edit.xml # cases/cases_Scheduler_Edit.xml
#: dropdown - TAS_UID #: dropdown - TAS_UID
@@ -21884,7 +21902,7 @@ msgstr "Report Database:"
# login/newSite.xml?AO_DB_DROP # login/newSite.xml?AO_DB_DROP
# login/newSite.xml # login/newSite.xml
#: checkbox - AO_DB_DROP #: checkbox - AO_DB_DROP
msgid "Drop database if exist" msgid "[login/newSite.xml?AO_DB_DROP] Drop database if exist"
msgstr "Drop database if exist" msgstr "Drop database if exist"
# login/newSite.xml?WS # login/newSite.xml?WS
@@ -23489,6 +23507,12 @@ msgstr "Process Information"
msgid "[processes/processes_Edit.xml?PRO_TITLE] Title" msgid "[processes/processes_Edit.xml?PRO_TITLE] Title"
msgstr "Title" msgstr "Title"
# processes/processes_Edit.xml?PRO_VALIDATE_TITLE
# processes/processes_Edit.xml
#: text - PRO_VALIDATE_TITLE
msgid "[processes/processes_Edit.xml?PRO_VALIDATE_TITLE] Title"
msgstr "Title"
# processes/processes_Edit.xml?PRO_DESCRIPTION # processes/processes_Edit.xml?PRO_DESCRIPTION
# processes/processes_Edit.xml # processes/processes_Edit.xml
#: textarea - PRO_DESCRIPTION #: textarea - PRO_DESCRIPTION
@@ -23876,7 +23900,7 @@ msgstr "<div align=\"center\">Importing Existing Process</div>"
# processes/processes_ImportExisting.xml?TITLE1 # processes/processes_ImportExisting.xml?TITLE1
# processes/processes_ImportExisting.xml # processes/processes_ImportExisting.xml
#: subtitle - TITLE1 #: subtitle - TITLE1
msgid "The process you are trying to import already exist. Please select one of the following options to continue:" msgid "[processes/processes_ImportExisting.xml?TITLE1] The process you are trying to import already exist. Please select one of the following options to continue:"
msgstr "The process you are trying to import already exist. Please select one of the following options to continue:" msgstr "The process you are trying to import already exist. Please select one of the following options to continue:"
# processes/processes_ImportExisting.xml?IMPORT_OPTION # processes/processes_ImportExisting.xml?IMPORT_OPTION
@@ -29123,11 +29147,11 @@ msgstr "Message"
msgid "[tasks/tasks_Notifications.xml?TAS_DEF_MESSAGE_TEMPLATE] Template" msgid "[tasks/tasks_Notifications.xml?TAS_DEF_MESSAGE_TEMPLATE] Template"
msgstr "Template" msgstr "Template"
# tasks/tasks_Notifications.xml?TAS_DEF_MESSAGE_TEMPLATE- # tasks/tasks_Notifications.xml?TAS_DEF_MESSAGE_TEMPLATE-alert_message.html
# tasks/tasks_Notifications.xml # tasks/tasks_Notifications.xml
#: dropdown - TAS_DEF_MESSAGE_TEMPLATE - #: dropdown - TAS_DEF_MESSAGE_TEMPLATE - alert_message.html
msgid "[tasks/tasks_Notifications.xml?TAS_DEF_MESSAGE_TEMPLATE-]" msgid "[tasks/tasks_Notifications.xml?TAS_DEF_MESSAGE_TEMPLATE-alert_message.html]"
msgstr "- None -" msgstr "-- Default --"
# tasks/tasks_Owner.xml?TAS_OWNER_APP # tasks/tasks_Owner.xml?TAS_OWNER_APP
# tasks/tasks_Owner.xml # tasks/tasks_Owner.xml

25
workflow/engine/controllers/home.php
View File

@@ -49,7 +49,7 @@ class Home extends Controller
$data = isset($httpData->d) ? unserialize(base64_decode($httpData->d)) : ''; $data = isset($httpData->d) ? unserialize(base64_decode($httpData->d)) : '';
$template = $this->clientBrowser['name'] == 'msie' ? 'login_ie' : 'login_standard'; $template = $this->clientBrowser['name'] == 'msie' ? 'login_ie' : 'login_standard';
$skin = $this->clientBrowser['name'] == 'msie' ? $this->lastSkin : 'simplified'; $skin = $this->clientBrowser['name'] == 'msie' ? $this->lastSkin : 'simplified';
if (!is_array($data)) { if (!is_array($data)) {
$data = array('u'=>'', 'p'=>'', 'm'=>''); $data = array('u'=>'', 'p'=>'', 'm'=>'');
} }
@@ -99,15 +99,15 @@ class Home extends Controller
} }
unset($processList[0]); unset($processList[0]);
//Get simplified options //Get simplified options
global $G_TMP_MENU; global $G_TMP_MENU;
$mnu = new Menu(); $mnu = new Menu();
$mnu->load('simplified'); $mnu->load('simplified');
$arrayMnuOption = array(); $arrayMnuOption = array();
$mnuNewCase = array(); $mnuNewCase = array();
if (!empty($mnu->Options)) { if (!empty($mnu->Options)) {
foreach ($mnu->Options as $index => $value) { foreach ($mnu->Options as $index => $value) {
$option = array( $option = array(
@@ -117,7 +117,7 @@ class Home extends Controller
'icon' => $mnu->Icons[$index], 'icon' => $mnu->Icons[$index],
'class' => $mnu->ElementClass[$index] 'class' => $mnu->ElementClass[$index]
); );
if ($mnu->Id[$index] != 'S_NEW_CASE') { if ($mnu->Id[$index] != 'S_NEW_CASE') {
$arrayMnuOption[] = $option; $arrayMnuOption[] = $option;
} }
@@ -126,7 +126,7 @@ class Home extends Controller
} }
} }
} }
$this->setView('home/index'); $this->setView('home/index');
$this->setVar('usrUid', $this->userID); $this->setVar('usrUid', $this->userID);
@@ -146,7 +146,7 @@ class Home extends Controller
{ {
require_once 'classes/model/Step.php'; require_once 'classes/model/Step.php';
G::LoadClass('applications'); G::LoadClass('applications');
$apps = new Applications(); $apps = new Applications();
$step = new Step; $step = new Step;
@@ -265,7 +265,7 @@ class Home extends Controller
// Completting with Notes // Completting with Notes
$notes = $appNotes->getNotesList($row['APP_UID'], '', $notesStart, $notesLimit); $notes = $appNotes->getNotesList($row['APP_UID'], '', $notesStart, $notesLimit);
$notes = $notes['array']; $notes = $notes['array'];
$cases['data'][$i]['NOTES_COUNT'] = $notes['totalCount']; $cases['data'][$i]['NOTES_COUNT'] = $notes['totalCount'];
$cases['data'][$i]['NOTES_LIST'] = $notes['notes']; $cases['data'][$i]['NOTES_LIST'] = $notes['notes'];
} }
@@ -277,14 +277,19 @@ class Home extends Controller
G::LoadClass('case'); G::LoadClass('case');
$case = new Cases(); $case = new Cases();
$aData = $case->startCase($httpData->id, $_SESSION['USER_LOGGED']); $aData = $case->startCase($httpData->id, $_SESSION['USER_LOGGED']);
$_SESSION['APPLICATION'] = $aData['APPLICATION']; $_SESSION['APPLICATION'] = $aData['APPLICATION'];
$_SESSION['INDEX'] = $aData['INDEX']; $_SESSION['INDEX'] = $aData['INDEX'];
$_SESSION['PROCESS'] = $aData['PROCESS']; $_SESSION['PROCESS'] = $aData['PROCESS'];
$_SESSION['TASK'] = $httpData->id; $_SESSION['TASK'] = $httpData->id;
$_SESSION['STEP_POSITION'] = 0; $_SESSION['STEP_POSITION'] = 0;
$_SESSION['CASES_REFRESH'] = true; $_SESSION['CASES_REFRESH'] = true;
// Execute Events
require_once 'classes/model/Event.php';
$event = new Event();
$event->createAppEvents($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['TASK']);
$oCase = new Cases(); $oCase = new Cases();
$aNextStep = $oCase->getNextStep($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION']); $aNextStep = $oCase->getNextStep($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION']);
//../cases/cases_Open?APP_UID={$APP.APP_UID}&DEL_INDEX={$APP.DEL_INDEX}&action=todo //../cases/cases_Open?APP_UID={$APP.APP_UID}&DEL_INDEX={$APP.DEL_INDEX}&action=todo

6
workflow/engine/data/mssql/insert.sql
View File

@@ -5675,6 +5675,12 @@ SELECT 'LABEL','ID_CASE_PAUSE_LABEL_NOTE','en','The Case paused. By the reason:'
SELECT 'LABEL','ID_CASE_CANCEL_REASON','en','Reason of the cancel of case','2012-08-01' SELECT 'LABEL','ID_CASE_CANCEL_REASON','en','Reason of the cancel of case','2012-08-01'
UNION ALL UNION ALL
SELECT 'LABEL','ID_CASE_CANCEL_LABEL_NOTE','en','The Case canceled. By the reason:','2012-08-01' SELECT 'LABEL','ID_CASE_CANCEL_LABEL_NOTE','en','The Case canceled. By the reason:','2012-08-01'
UNION ALL
SELECT 'LABEL','MIME_DES_DOCX','en','Word Document','2012-08-07'
UNION ALL
SELECT 'LABEL','MIME_DES_XLSX','en','Excel Document','2012-08-07'
UNION ALL
SELECT 'LABEL','ID_PROCESSED','en','Processed','2012-08-10'
; ;
INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID]) INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID])

5
workflow/engine/data/mysql/insert.sql
View File

@@ -3557,7 +3557,10 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_NOTIFY_USERS_CASE','en','Notify users of case','2012-08-01') , ( 'LABEL','ID_NOTIFY_USERS_CASE','en','Notify users of case','2012-08-01') ,
( 'LABEL','ID_CASE_PAUSE_LABEL_NOTE','en','The Case paused. By the reason:','2012-08-01') , ( 'LABEL','ID_CASE_PAUSE_LABEL_NOTE','en','The Case paused. By the reason:','2012-08-01') ,
( 'LABEL','ID_CASE_CANCEL_REASON','en','Reason of the cancel of case','2012-08-01') , ( 'LABEL','ID_CASE_CANCEL_REASON','en','Reason of the cancel of case','2012-08-01') ,
( 'LABEL','ID_CASE_CANCEL_LABEL_NOTE','en','The Case canceled. By the reason:','2012-08-01') ; ( 'LABEL','ID_CASE_CANCEL_LABEL_NOTE','en','The Case canceled. By the reason:','2012-08-01') ,
( 'LABEL','MIME_DES_DOCX','en','Word Document','2012-08-07') ,
( 'LABEL','MIME_DES_XLSX','en','Excel Document','2012-08-07') ,
( 'LABEL','ID_PROCESSED','en','Processed','2012-08-10') ;
INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('AD','','',' ','') , ('AD','','',' ','') ,

91
workflow/engine/methods/cases/casesStartPage_Ajax.php
View File

@@ -25,12 +25,12 @@ function getProcessList() {
$calendar = new Calendar ( ); $calendar = new Calendar ( );
$oProcess = new Process ( ); $oProcess = new Process ( );
$oCase = new Cases ( ); $oCase = new Cases ( );
//Get ProcessStatistics Info //Get ProcessStatistics Info
$start = 0; $start = 0;
$limit = ''; $limit = '';
$proData = $oProcess->getAllProcesses($start, $limit); $proData = $oProcess->getAllProcesses($start, $limit);
$bCanStart = $oCase->canStartCase ( $_SESSION ['USER_LOGGED'] ); $bCanStart = $oCase->canStartCase ( $_SESSION ['USER_LOGGED'] );
if ($bCanStart) { if ($bCanStart) {
$processListInitial = $oCase->getStartCasesPerType ( $_SESSION ['USER_LOGGED'], 'category' ); $processListInitial = $oCase->getStartCasesPerType ( $_SESSION ['USER_LOGGED'], 'category' );
@@ -46,18 +46,18 @@ function getProcessList() {
foreach ( $processList as $key => $processInfo ) { foreach ( $processList as $key => $processInfo ) {
ksort ( $processList [$key] ); ksort ( $processList [$key] );
} }
if (! isset ( $_REQUEST ['node'] )) { if (! isset ( $_REQUEST ['node'] )) {
$node = 'root'; $node = 'root';
} else { } else {
$node = $_REQUEST ['node']; $node = $_REQUEST ['node'];
} }
foreach($proData as $key => $proInfo){ foreach($proData as $key => $proInfo){
$proData[$proInfo['PRO_UID']]=$proInfo; $proData[$proInfo['PRO_UID']]=$proInfo;
} }
$processListTree = array (); $processListTree = array ();
if (1) { if (1) {
foreach ( $processList as $key => $processInfo ) { foreach ( $processList as $key => $processInfo ) {
@@ -93,15 +93,15 @@ function getProcessList() {
$tempTreeChild ['otherAttributes'] = array_merge($processInfoChild,$proData[ $processInfoChild ['pro_uid'] ],$calendar->getCalendarFor ( $processInfoChild ['uid'], $processInfoChild ['uid'], $processInfoChild ['uid'] )); $tempTreeChild ['otherAttributes'] = array_merge($processInfoChild,$proData[ $processInfoChild ['pro_uid'] ],$calendar->getCalendarFor ( $processInfoChild ['uid'], $processInfoChild ['uid'], $processInfoChild ['uid'] ));
$tempTreeChild ['otherAttributes']['PRO_TAS_TITLE']=str_replace(")","",str_replace("(","",trim(str_replace($tempTreeChild ['otherAttributes']['PRO_TITLE'],"",$tempTreeChild ['otherAttributes']["value"])))); $tempTreeChild ['otherAttributes']['PRO_TAS_TITLE']=str_replace(")","",str_replace("(","",trim(str_replace($tempTreeChild ['otherAttributes']['PRO_TITLE'],"",$tempTreeChild ['otherAttributes']["value"]))));
$tempTreeChild ['qtip']=$tempTreeChild ['otherAttributes']['PRO_DESCRIPTION']; $tempTreeChild ['qtip']=$tempTreeChild ['otherAttributes']['PRO_DESCRIPTION'];
//$tempTree['cls']='file'; //$tempTree['cls']='file';
$tempTreeChildren [] = $tempTreeChild; $tempTreeChildren [] = $tempTreeChild;
} }
} }
$tempTree['children']=$tempTreeChildren; $tempTree['children']=$tempTreeChildren;
$processListTree [] = $tempTree; $processListTree [] = $tempTree;
} }
} else { } else {
@@ -125,7 +125,7 @@ function getProcessList() {
//$tempTree['cls']='file'; //$tempTree['cls']='file';
$processListTree [] = $tempTree; $processListTree [] = $tempTree;
} }
} }
$processList = $processListTree; $processList = $processListTree;
} else { } else {
@@ -148,16 +148,16 @@ function ellipsis($text, $numb) {
$etc = "..."; $etc = "...";
$text = $text . $etc; $text = $text . $etc;
} }
return $text; return $text;
} }
function lookinginforContentProcess($sproUid){ function lookinginforContentProcess($sproUid){
require_once 'classes/model/Content.php'; require_once 'classes/model/Content.php';
require_once 'classes/model/Task.php'; require_once 'classes/model/Task.php';
require_once 'classes/model/Content.php'; require_once 'classes/model/Content.php';
$oContent = new Content(); $oContent = new Content();
///we are looking for a pro title for this process $sproUid ///we are looking for a pro title for this process $sproUid
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE'); $oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE');
@@ -168,16 +168,16 @@ function ellipsis($text, $numb) {
$oDataset->next(); $oDataset->next();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
if(!is_array($aRow)){ if(!is_array($aRow)){
$oC = new Criteria('workflow'); $oC = new Criteria('workflow');
$oC->addSelectColumn(TaskPeer::TAS_UID); $oC->addSelectColumn(TaskPeer::TAS_UID);
$oC->add( TaskPeer::PRO_UID, $sproUid); $oC->add( TaskPeer::PRO_UID, $sproUid);
$oDataset1 = TaskPeer::doSelectRS($oC); $oDataset1 = TaskPeer::doSelectRS($oC);
$oDataset1->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset1->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while($oDataset1->next()){ while($oDataset1->next()){
$aRow1 = $oDataset1->getRow(); $aRow1 = $oDataset1->getRow();
$oCriteria1 = new Criteria('workflow'); $oCriteria1 = new Criteria('workflow');
$oCriteria1->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE'); $oCriteria1->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE');
$oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG); $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG);
@@ -197,9 +197,9 @@ function ellipsis($text, $numb) {
$oDataset3->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset3->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset3->next(); $oDataset3->next();
$aRow3 = $oDataset3->getRow(); $aRow3 = $oDataset3->getRow();
Content::insertContent( 'PRO_TITLE', '', $aRow3['CON_ID'], 'en', $aRow3['CON_VALUE'] ); Content::insertContent( 'PRO_TITLE', '', $aRow3['CON_ID'], 'en', $aRow3['CON_VALUE'] );
} }
return 1; return 1;
@@ -208,7 +208,7 @@ function ellipsis($text, $numb) {
function startCase() { function startCase() {
G::LoadClass ( 'case' ); G::LoadClass ( 'case' );
/* GET , POST & $_SESSION Vars */ /* GET , POST & $_SESSION Vars */
/* unset any variable, because we are starting a new case */ /* unset any variable, because we are starting a new case */
if (isset ( $_SESSION ['APPLICATION'] )) unset ( $_SESSION ['APPLICATION'] ); if (isset ( $_SESSION ['APPLICATION'] )) unset ( $_SESSION ['APPLICATION'] );
@@ -220,27 +220,32 @@ function startCase() {
/* Process */ /* Process */
try { try {
$oCase = new Cases ( ); $oCase = new Cases ( );
lookinginforContentProcess($_POST['processId']); lookinginforContentProcess($_POST['processId']);
$aData = $oCase->startCase ( $_REQUEST ['taskId'], $_SESSION ['USER_LOGGED'] ); $aData = $oCase->startCase ( $_REQUEST ['taskId'], $_SESSION ['USER_LOGGED'] );
$_SESSION ['APPLICATION'] = $aData ['APPLICATION']; $_SESSION ['APPLICATION'] = $aData ['APPLICATION'];
$_SESSION ['INDEX'] = $aData ['INDEX']; $_SESSION ['INDEX'] = $aData ['INDEX'];
$_SESSION ['PROCESS'] = $aData ['PROCESS']; $_SESSION ['PROCESS'] = $aData ['PROCESS'];
$_SESSION ['TASK'] = $_REQUEST ['taskId']; $_SESSION ['TASK'] = $_REQUEST ['taskId'];
$_SESSION ['STEP_POSITION'] = 0; $_SESSION ['STEP_POSITION'] = 0;
$_SESSION ['CASES_REFRESH'] = true; $_SESSION ['CASES_REFRESH'] = true;
// Execute Events
require_once 'classes/model/Event.php';
$event = new Event();
$event->createAppEvents($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['TASK']);
$oCase = new Cases ( ); $oCase = new Cases ( );
$aNextStep = $oCase->getNextStep ( $_SESSION ['PROCESS'], $_SESSION ['APPLICATION'], $_SESSION ['INDEX'], $_SESSION ['STEP_POSITION'] ); $aNextStep = $oCase->getNextStep ( $_SESSION ['PROCESS'], $_SESSION ['APPLICATION'], $_SESSION ['INDEX'], $_SESSION ['STEP_POSITION'] );
$aNextStep['PAGE'] = 'open?APP_UID='.$aData ['APPLICATION'].'&DEL_INDEX='.$aData ['INDEX'].'&action=draft'; $aNextStep['PAGE'] = 'open?APP_UID='.$aData ['APPLICATION'].'&DEL_INDEX='.$aData ['INDEX'].'&action=draft';
$_SESSION ['BREAKSTEP'] ['NEXT_STEP'] = $aNextStep; $_SESSION ['BREAKSTEP'] ['NEXT_STEP'] = $aNextStep;
$aData ['openCase'] = $aNextStep; $aData ['openCase'] = $aNextStep;
$aData ['status'] = 'success'; $aData ['status'] = 'success';
print (G::json_encode ( $aData )) ; print (G::json_encode ( $aData )) ;
} }
@@ -256,11 +261,11 @@ function getSimpleDashboardData() {
require_once ("classes/model/AppCacheView.php"); require_once ("classes/model/AppCacheView.php");
require_once 'classes/model/Process.php'; require_once 'classes/model/Process.php';
$sUIDUserLogged = $_SESSION ['USER_LOGGED']; $sUIDUserLogged = $_SESSION ['USER_LOGGED'];
$Criteria = new Criteria ( 'workflow' ); $Criteria = new Criteria ( 'workflow' );
$Criteria->clearSelectColumns (); $Criteria->clearSelectColumns ();
$Criteria->addSelectColumn ( AppCacheViewPeer::PRO_UID ); $Criteria->addSelectColumn ( AppCacheViewPeer::PRO_UID );
$Criteria->addSelectColumn ( AppCacheViewPeer::APP_UID ); $Criteria->addSelectColumn ( AppCacheViewPeer::APP_UID );
$Criteria->addSelectColumn ( AppCacheViewPeer::APP_NUMBER ); $Criteria->addSelectColumn ( AppCacheViewPeer::APP_NUMBER );
@@ -276,24 +281,24 @@ function getSimpleDashboardData() {
$Criteria->addSelectColumn ( AppCacheViewPeer::DEL_DELAYED ); $Criteria->addSelectColumn ( AppCacheViewPeer::DEL_DELAYED );
$Criteria->addSelectColumn ( AppCacheViewPeer::USR_UID ); $Criteria->addSelectColumn ( AppCacheViewPeer::USR_UID );
$Criteria->addSelectColumn ( AppCacheViewPeer::APP_THREAD_STATUS ); $Criteria->addSelectColumn ( AppCacheViewPeer::APP_THREAD_STATUS );
$Criteria->add ( AppCacheViewPeer::APP_STATUS, array ("TO_DO", "DRAFT" ), CRITERIA::IN ); $Criteria->add ( AppCacheViewPeer::APP_STATUS, array ("TO_DO", "DRAFT" ), CRITERIA::IN );
$Criteria->add ( AppCacheViewPeer::USR_UID, array ($sUIDUserLogged, "" ), CRITERIA::IN ); $Criteria->add ( AppCacheViewPeer::USR_UID, array ($sUIDUserLogged, "" ), CRITERIA::IN );
$Criteria->add ( AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL ); $Criteria->add ( AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
//$Criteria->add ( AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN' ); //$Criteria->add ( AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN' );
$Criteria->add ( AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN' ); $Criteria->add ( AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN' );
//execute the query //execute the query
$oDataset = AppCacheViewPeer::doSelectRS ( $Criteria ); $oDataset = AppCacheViewPeer::doSelectRS ( $Criteria );
$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
$oDataset->next (); $oDataset->next ();
$oProcess = new Process ( ); $oProcess = new Process ( );
$rows = array (); $rows = array ();
$processNames = array (); $processNames = array ();
while ( $aRow = $oDataset->getRow () ) { while ( $aRow = $oDataset->getRow () ) {
@@ -302,7 +307,7 @@ function getSimpleDashboardData() {
$aProcess = $oProcess->load ( $aRow ['PRO_UID'] ); $aProcess = $oProcess->load ( $aRow ['PRO_UID'] );
$processNames [$aRow ['PRO_UID']] = $aProcess ['PRO_TITLE']; $processNames [$aRow ['PRO_UID']] = $aProcess ['PRO_TITLE'];
} }
if ($aRow ['USR_UID'] == "") if ($aRow ['USR_UID'] == "")
$aRow ['APP_STATUS'] = "UNASSIGNED"; $aRow ['APP_STATUS'] = "UNASSIGNED";
if (((in_array ( $aRow ['APP_STATUS'], array ("TO_DO", "UNASSIGNED" ) )) && ($aRow ['APP_THREAD_STATUS'] == "OPEN")) || ($aRow ['APP_STATUS'] == "DRAFT")) { if (((in_array ( $aRow ['APP_STATUS'], array ("TO_DO", "UNASSIGNED" ) )) && ($aRow ['APP_THREAD_STATUS'] == "OPEN")) || ($aRow ['APP_STATUS'] == "DRAFT")) {
@@ -310,7 +315,7 @@ function getSimpleDashboardData() {
if(!isset($rows [$processNames [$aRow ['PRO_UID']]] [$aRow ['APP_STATUS']]['count'])) $rows [$processNames [$aRow ['PRO_UID']]] [$aRow ['APP_STATUS']]['count']=0; if(!isset($rows [$processNames [$aRow ['PRO_UID']]] [$aRow ['APP_STATUS']]['count'])) $rows [$processNames [$aRow ['PRO_UID']]] [$aRow ['APP_STATUS']]['count']=0;
$rows [$processNames [$aRow ['PRO_UID']]][$aRow ['APP_STATUS']]['count']++; $rows [$processNames [$aRow ['PRO_UID']]][$aRow ['APP_STATUS']]['count']++;
} }
$oDataset->next (); $oDataset->next ();
} }
//Generate different groups of data for graphs //Generate different groups of data for graphs
@@ -320,12 +325,12 @@ function getSimpleDashboardData() {
$i++; $i++;
if($i<=10){ if($i<=10){
$rowsResponse['caseStatusByProcess'][]=array('process'=>$processID,'inbox'=>isset($processInfo['TO_DO']['count'])?$processInfo['TO_DO']['count']:0,'draft'=>isset($processInfo['DRAFT']['count'])?$processInfo['DRAFT']['count']:0,'unassigned'=>isset($processInfo['UNASSIGNED']['count'])?$processInfo['UNASSIGNED']['count']:0); $rowsResponse['caseStatusByProcess'][]=array('process'=>$processID,'inbox'=>isset($processInfo['TO_DO']['count'])?$processInfo['TO_DO']['count']:0,'draft'=>isset($processInfo['DRAFT']['count'])?$processInfo['DRAFT']['count']:0,'unassigned'=>isset($processInfo['UNASSIGNED']['count'])?$processInfo['UNASSIGNED']['count']:0);
} }
} }
$rowsResponse['caseDelayed'][]=array('delayed'=>'On Time','total'=>100); $rowsResponse['caseDelayed'][]=array('delayed'=>'On Time','total'=>100);
$rowsResponse['caseDelayed'][]=array('delayed'=>'Delayed','total'=>50); $rowsResponse['caseDelayed'][]=array('delayed'=>'Delayed','total'=>50);
print_r ( G::json_encode ( $rowsResponse ) ); print_r ( G::json_encode ( $rowsResponse ) );
} }

33
workflow/engine/xmlform/cases/cases_Scheduler_Edit.html
View File

@@ -1,6 +1,6 @@
<form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit='return validateForm("{$form_objectRequiredFields}".parseJSON());'> <form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit='return validateForm("{$form_objectRequiredFields}".parseJSON());'>
<div class="borderForm" style="width:{$form_width}; padding-left:0; padding-right:0; border-width:{$form_border};"> <div class="borderForm" style="width:{$form_width}; padding-left:0; padding-right:0; border-width:{$form_border};">
<div class="borderForm" style="padding-left: 0pt; padding-right: 0pt;"> <div class="borderForm" style="padding-left: 0pt; padding-right: 0pt;">
<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div> <div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
<div class="content" style=""> <div class="content" style="">
@@ -61,7 +61,7 @@
</tr> </tr>
<tr> <tr>
<td class="FormLabel" width="{$form_labelWidth}" style=""></td> <td class="FormLabel" width="{$form_labelWidth}" style=""></td>
<td class="FormFieldContent"><div id="processLabel"></div><div style="display:none;" id="processListDropdown">{$form.PRO_UID}</div></td> <td class="FormFieldContent">{$form.PRO_UID}</td>
</tr> </tr>
<tr> <tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$TAS_UID}</td> <td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$TAS_UID}</td>
@@ -104,7 +104,7 @@
<span>{$form.SELECT_DATE}</span> <span>{$form.SELECT_DATE}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="FormSubTitle" colspan="2" id="form[SELECT_1]" align=""> <td class="FormSubTitle" colspan="2" id="form[SELECT_1]" align="">
<span>{$form.SELECT_1}</span> <span>{$form.SELECT_1}</span>
@@ -142,7 +142,7 @@
<td style="vertical-align: top"> {$form.SCH_WEEK_DAYS_2} {$SCH_WEEK_DAYS_2} </td> <td style="vertical-align: top"> {$form.SCH_WEEK_DAYS_2} {$SCH_WEEK_DAYS_2} </td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -156,15 +156,15 @@
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>
<td style="width: 20%">{$form.SCH_START_DAY}</td> <td style="width: 20%">{$form.SCH_START_DAY}</td>
<td> {$SCH_START_DAY_OPT_1} {$form.SCH_START_DAY_OPT_1} <br/> <td> {$SCH_START_DAY_OPT_1} {$form.SCH_START_DAY_OPT_1} <br/>
{$SCH_START_DAY_OPT_2_WEEKS} {$SCH_START_DAY_OPT_2_DAYS_WEEK} {$SCH_START_DAY_OPT_2_WEEKS} {$SCH_START_DAY_OPT_2_DAYS_WEEK}
{$form.SCH_START_DAY_OPT_2_WEEKS} {$form.SCH_START_DAY_OPT_2_DAYS_WEEK} <br/> {$form.SCH_START_DAY_OPT_2_WEEKS} {$form.SCH_START_DAY_OPT_2_DAYS_WEEK} <br/>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
<tr> <tr>
<td class="FormLabel" width="{$form_labelWidth}"> </td> <td class="FormLabel" width="{$form_labelWidth}"> </td>
<td class="FormFieldContent"> </td> <td class="FormFieldContent"> </td>
@@ -177,7 +177,7 @@
<td class="FormLabel" width="{$form_labelWidth}"> </td> <td class="FormLabel" width="{$form_labelWidth}"> </td>
<td class="FormFieldContent"> </td> <td class="FormFieldContent"> </td>
</tr> </tr>
<tr> <tr>
<td class="FormLabel" width="{$form_labelWidth}">{$SCH_MONTHS}</td> <td class="FormLabel" width="{$form_labelWidth}">{$SCH_MONTHS}</td>
<td class="FormFieldContent"> <td class="FormFieldContent">
@@ -190,7 +190,7 @@
</table> </table>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="display:none;" class="FormLabel" width="{$form_labelWidth}"><br></td> <td style="display:none;" class="FormLabel" width="{$form_labelWidth}"><br></td>
@@ -211,7 +211,7 @@
<td class="FormLabel" width="{$form_labelWidth}"></td> <td class="FormLabel" width="{$form_labelWidth}"></td>
<td class="FormFieldContent"></td> <td class="FormFieldContent"></td>
</tr> </tr>
<!-- <!--
<tr> <tr>
<td class="FormLabel" width="{$form_labelWidth}">{$SCH_REPEAT_UNTIL}</td> <td class="FormLabel" width="{$form_labelWidth}">{$SCH_REPEAT_UNTIL}</td>
<td class="FormFieldContent">{$form.SCH_REPEAT_UNTIL}</td> <td class="FormFieldContent">{$form.SCH_REPEAT_UNTIL}</td>
@@ -220,13 +220,13 @@
<td class="FormLabel" width="{$form_labelWidth}"><br></td> <td class="FormLabel" width="{$form_labelWidth}"><br></td>
<td>{$form.SCH_REPEAT_STOP_IF_RUNNING}</td> <td>{$form.SCH_REPEAT_STOP_IF_RUNNING}</td>
</tr> </tr>
--> -->
<tr> <tr>
<td class="FormSubTitle" colspan="2" id="form[SELECT_PLUGIN]" align=""> <td class="FormSubTitle" colspan="2" id="form[SELECT_PLUGIN]" align="">
<span>{$form.SELECT_PLUGIN}</span> <span>{$form.SELECT_PLUGIN}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<div id="pluginsListDropdown">{$form.CASE_SH_PLUGIN_UID}</div> <div id="pluginsListDropdown">{$form.CASE_SH_PLUGIN_UID}</div>
<div id="pluginsListContent"></div> <div id="pluginsListContent"></div>
@@ -249,7 +249,6 @@
<script type="text/javascript"> <script type="text/javascript">
{$form.SHOW_HIDE_JS} {$form.SHOW_HIDE_JS}
</script> </script>
</div> </div>
</form> </form>

100
workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml
View File

@@ -50,17 +50,11 @@
<SCH_NAME type="text" maxlength="100" validate="Any" required="1" readonly="0" size="40" mode="edit" mask="" strto="" dependentfields="" defaultvalue="" hint="" formula="" function="" sqlconnection="" savelabel="0"> <SCH_NAME type="text" maxlength="100" validate="Any" required="1" readonly="0" size="40" mode="edit" mask="" strto="" dependentfields="" defaultvalue="" hint="" formula="" function="" sqlconnection="" savelabel="0">
<en>Description</en> <en>Description</en>
</SCH_NAME> </SCH_NAME>
<PRO_UID type="dropdown" required="1" style="width:300px" options="Array" dependentfields="TAS_UID"> <PRO_UID type="hidden" required="1" style="width:300px" dependentfields="TAS_UID" mode="edit">
<![CDATA[ SELECT DISTINCT(TASK.PRO_UID) AS PRO_UID, CONTENT.CON_VALUE as PRO_TITLE FROM TASK
LEFT JOIN PROCESS ON (PROCESS.PRO_UID=TASK.PRO_UID)
LEFT JOIN TASK_USER ON (TASK.TAS_UID=TASK_USER.TAS_UID)
LEFT JOIN CONTENT ON (PROCESS.PRO_UID=CONTENT.CON_ID AND CONTENT.CON_CATEGORY='PRO_TITLE')
WHERE USR_UID = '@#SCH_USER_UID']]>
<en>Process </en>
</PRO_UID> </PRO_UID>
<TAS_UID type="dropdown" required="1" style="width:300px" options="Array" > <TAS_UID type="dropdown" required="1" style="width:300px" options="Array" >
<![CDATA[ SELECT DISTINCT A.TAS_UID, B.CON_VALUE AS TAS_TITLE <![CDATA[ SELECT DISTINCT A.TAS_UID, B.CON_VALUE AS TAS_TITLE
FROM TASK A INNER JOIN CONTENT B ON A.TAS_UID = B.CON_ID AND B.CON_CATEGORY='TAS_TITLE' FROM TASK A INNER JOIN CONTENT B ON A.TAS_UID = B.CON_ID AND B.CON_CATEGORY='TAS_TITLE'
WHERE A.PRO_UID='@#PRO_UID' AND A.TAS_START = 'TRUE' ]]> WHERE A.PRO_UID='@#PRO_UID' AND A.TAS_START = 'TRUE' ]]>
<en>Task </en> <en>Task </en>
</TAS_UID> </TAS_UID>
@@ -99,10 +93,10 @@ WHERE A.PRO_UID='@#PRO_UID' AND A.TAS_START = 'TRUE' ]]>
<SELECT_1 type="subtitle" enablehtml="1"> <SELECT_1 type="subtitle" enablehtml="1">
<en> Daily</en> <en> Daily</en>
</SELECT_1> </SELECT_1>
<!-- <!--
<SCH_DAYS_PERFORM_TASK type="radiogroup" required="0" defaultValue="1" mode="edit" options="Array"> <SCH_DAYS_PERFORM_TASK type="radiogroup" required="0" defaultValue="1" mode="edit" options="Array">
<en>Perform this task <en>Perform this task
<option name="1">Every Day</option> <option name="1">Every Day</option>
<option name="2">Weekdays</option> <option name="2">Weekdays</option>
<option name="3">Every</option> <option name="3">Every</option>
@@ -123,7 +117,7 @@ WHERE A.PRO_UID='@#PRO_UID' AND A.TAS_START = 'TRUE' ]]>
</SCH_EVERY_DAYS> </SCH_EVERY_DAYS>
<SCH_WEEK_DAYS type="checkgroup" required="0" mode="edit" options="Array" COLS="2" defaultvalue="" hint="" sqlconnection="" readonly="0" savelabel="0"> <SCH_WEEK_DAYS type="checkgroup" required="0" mode="edit" options="Array" COLS="2" defaultvalue="" hint="" sqlconnection="" readonly="0" savelabel="0">
<en>Select the day(s) of the week <en>Select the day(s) of the week
<option name="1">Monday</option> <option name="1">Monday</option>
<option name="2">Tuesday</option> <option name="2">Tuesday</option>
<option name="3">Wednesday</option> <option name="3">Wednesday</option>
@@ -131,7 +125,7 @@ WHERE A.PRO_UID='@#PRO_UID' AND A.TAS_START = 'TRUE' ]]>
</SCH_WEEK_DAYS> </SCH_WEEK_DAYS>
<SCH_WEEK_DAYS_2 type="checkgroup" required="0" mode="edit" options="Array" defaultvalue="" hint="" sqlconnection="" readonly="0" savelabel="0"> <SCH_WEEK_DAYS_2 type="checkgroup" required="0" mode="edit" options="Array" defaultvalue="" hint="" sqlconnection="" readonly="0" savelabel="0">
<en> <en>
<option name="5">Friday</option> <option name="5">Friday</option>
<option name="6">Saturday</option> <option name="6">Saturday</option>
<option name="7">Sunday</option></en> <option name="7">Sunday</option></en>
@@ -171,7 +165,7 @@ WHERE A.PRO_UID='@#PRO_UID' AND A.TAS_START = 'TRUE' ]]>
</SCH_START_DAY_OPT_2_DAYS_WEEK> </SCH_START_DAY_OPT_2_DAYS_WEEK>
<SCH_MONTHS type="checkgroup" mode="edit" options="Array"> <SCH_MONTHS type="checkgroup" mode="edit" options="Array">
<en>Of the month(s) <en>Of the month(s)
<option name="1">Jan</option> <option name="1">Jan</option>
<option name="2">Feb</option> <option name="2">Feb</option>
<option name="3">Mar</option> <option name="3">Mar</option>
@@ -230,7 +224,7 @@ WHERE A.PRO_UID='@#PRO_UID' AND A.TAS_START = 'TRUE' ]]>
</en> </en>
</SCH_REPEAT_EVERY_OPT> </SCH_REPEAT_EVERY_OPT>
<!-- <!--
<SCH_REPEAT_UNTIL type="text" maxlength="5" validate="Any" required="0" readonly="0" size="5" mode="edit" mask="##:##" strto="" dependentfields="" defaultvalue="" hint="" formula="" function="" sqlconnection="" savelabel="0"> <SCH_REPEAT_UNTIL type="text" maxlength="5" validate="Any" required="0" readonly="0" size="5" mode="edit" mask="##:##" strto="" dependentfields="" defaultvalue="" hint="" formula="" function="" sqlconnection="" savelabel="0">
<en>Until Hours/Minutes(HH:MM)</en> <en>Until Hours/Minutes(HH:MM)</en>
</SCH_REPEAT_UNTIL> </SCH_REPEAT_UNTIL>
@@ -283,15 +277,6 @@ switch (getField('SCH_OPTION').value){
} }
showProperties(); showProperties();
document.getElementById('processLabel').innerHTML = document.getElementById('form[PRO_UID]')[document.getElementById('form[PRO_UID]').selectedIndex].innerHTML;
;
//hideAll();
/*
if (getField('SCH_ADVANCED').value=='false'){
contractSubtitle('ADVANCED_4');
document.getElementById('checkAdvanced').checked=false;
}
*/
function hideProperties(){ function hideProperties(){
//hiddeRow('EDIT_USER'); //hiddeRow('EDIT_USER');
@@ -342,17 +327,17 @@ if (getField('SCH_REPEAT_EVERY').value!=''){
function disableAdvanced(){ function disableAdvanced(){
//disable(getField('SCH_END_DATE')); //disable(getField('SCH_END_DATE'));
disable(getField('SCH_REPEAT_EVERY')); disable(getField('SCH_REPEAT_EVERY'));
disable(getField('SCH_REPEAT_EVERY_OPT')); disable(getField('SCH_REPEAT_EVERY_OPT'));
// disable(getField('SCH_REPEAT_UNTIL')); // disable(getField('SCH_REPEAT_UNTIL'));
// disable(getField('SCH_REPEAT_STOP_IF_RUNNING')); // disable(getField('SCH_REPEAT_STOP_IF_RUNNING'));
getField('UPDATE').disabled=true; getField('UPDATE').disabled=true;
document.getElementById('form[SELECT_DATE]').style.display='none'; document.getElementById('form[SELECT_DATE]').style.display='none';
document.getElementById('form[SELECT_1]').style.display='none'; document.getElementById('form[SELECT_1]').style.display='none';
document.getElementById('form[SELECT_2]').style.display='none'; document.getElementById('form[SELECT_2]').style.display='none';
document.getElementById('form[SELECT_3]').style.display='none'; document.getElementById('form[SELECT_3]').style.display='none';
} }
function hideAll() { function hideAll() {
@@ -377,10 +362,10 @@ var oRPCProcess = new leimnud.module.rpc.xmlhttp({
oRPCProcess.callback = function(rpc){ oRPCProcess.callback = function(rpc){
//alert(rpc.xmlhttp.responseText); //alert(rpc.xmlhttp.responseText);
if(rpc.xmlhttp.responseText!=""){ if(rpc.xmlhttp.responseText!=""){
document.getElementById("pluginsListContent").innerHTML = rpc.xmlhttp.responseText; document.getElementById("pluginsListContent").innerHTML = rpc.xmlhttp.responseText;
} }
}.extend(this); }.extend(this);
oRPCProcess.make(); oRPCProcess.make();
@@ -406,18 +391,18 @@ function showSelection(opt) {
document.getElementById("pluginsListDropdown").innerHTML = rpc.xmlhttp.responseText; document.getElementById("pluginsListDropdown").innerHTML = rpc.xmlhttp.responseText;
showPluginSelection(plgUid,getField('PRO_UID').value); showPluginSelection(plgUid,getField('PRO_UID').value);
} }
}.extend(this); }.extend(this);
oRPCProcess.make(); oRPCProcess.make();
} else { } else {
contractSubtitle('SELECT_TIME_DAY'); contractSubtitle('SELECT_TIME_DAY');
getField('UPDATE').disabled=true; getField('UPDATE').disabled=true;
} }
switch(opt){ switch(opt){
case '0' : hideAll(); case '0' : hideAll();
break; break;
case '1' : expandSubtitle('SELECT_DATE'); case '1' : expandSubtitle('SELECT_DATE');
expandSubtitle('SELECT_1'); expandSubtitle('SELECT_1');
@@ -460,7 +445,7 @@ function showSelection(opt) {
contractSubtitle('SELECT_3'); contractSubtitle('SELECT_3');
document.getElementById('endDateTable').style.display='none'; document.getElementById('endDateTable').style.display='none';
break; break;
} }
} }
@@ -468,7 +453,7 @@ function showSelection(opt) {
leimnud.event.add(getField('SCH_OPTION'), 'change', function() { leimnud.event.add(getField('SCH_OPTION'), 'change', function() {
var opt = getField('SCH_OPTION').value; var opt = getField('SCH_OPTION').value;
showSelection(opt); showSelection(opt);
}); });
leimnud.event.add(getField('SCH_START_DAY][1'), 'click', function() { leimnud.event.add(getField('SCH_START_DAY][1'), 'click', function() {
@@ -511,7 +496,7 @@ leimnud.event.add(getField('SCH_EVERY_DAYS'), 'change', function() {
weeks = getField('SCH_EVERY_DAYS').value; weeks = getField('SCH_EVERY_DAYS').value;
if(!(weeks>=1 && weeks<=52) ) { if(!(weeks>=1 && weeks<=52) ) {
msgBox('Weeks must be between 1 and 52', 'alert'); msgBox('Weeks must be between 1 and 52', 'alert');
getField('SCH_EVERY_DAYS').value = ''; getField('SCH_EVERY_DAYS').value = '';
} }
}); });
@@ -519,7 +504,7 @@ leimnud.event.add(getField('SCH_START_DAY_OPT_1'), 'change', function() {
days = getField('SCH_START_DAY_OPT_1').value; days = getField('SCH_START_DAY_OPT_1').value;
if(!(days>=1 && days<=31) ) { if(!(days>=1 && days<=31) ) {
msgBox('The days must be between 1 and 31', 'alert'); msgBox('The days must be between 1 and 31', 'alert');
getField('SCH_START_DAY_OPT_1').value = '1'; getField('SCH_START_DAY_OPT_1').value = '1';
} }
}); });
@@ -541,15 +526,15 @@ leimnud.event.add(getField('SCH_END_DATE_CHK'), 'click', function() {
leimnud.event.add(getField('SCH_REPEAT_TASK_CHK'), 'click', function() { leimnud.event.add(getField('SCH_REPEAT_TASK_CHK'), 'click', function() {
if(getField('SCH_REPEAT_TASK_CHK').checked){ if(getField('SCH_REPEAT_TASK_CHK').checked){
enable(getField('SCH_REPEAT_EVERY')); enable(getField('SCH_REPEAT_EVERY'));
enable(getField('SCH_REPEAT_EVERY_OPT')); enable(getField('SCH_REPEAT_EVERY_OPT'));
// enable(getField('SCH_REPEAT_UNTIL')); // enable(getField('SCH_REPEAT_UNTIL'));
// enable(getField('SCH_REPEAT_STOP_IF_RUNNING')); // enable(getField('SCH_REPEAT_STOP_IF_RUNNING'));
} else { } else {
disable(getField('SCH_REPEAT_EVERY')); disable(getField('SCH_REPEAT_EVERY'));
disable(getField('SCH_REPEAT_EVERY_OPT')); disable(getField('SCH_REPEAT_EVERY_OPT'));
// disable(getField('SCH_REPEAT_UNTIL')); // disable(getField('SCH_REPEAT_UNTIL'));
// disable(getField('SCH_REPEAT_STOP_IF_RUNNING')); // disable(getField('SCH_REPEAT_STOP_IF_RUNNING'));
} }
}); });
@@ -566,8 +551,8 @@ leimnud.event.add(getField('SCH_START_TIME'), 'change', function() {
//getField('SCH_REPEAT_UNTIL').value=''; //getField('SCH_REPEAT_UNTIL').value='';
//getField('SCH_REPEAT_UNTIL').focus(); //getField('SCH_REPEAT_UNTIL').focus();
getField('UPDATE').focus(); getField('UPDATE').focus();
} }
if(parties[1]>59){ if(parties[1]>59){
msgBox(G_STRINGS.ID_SCHEDULER_CANT_PUT_MINUTES, 'alert'); msgBox(G_STRINGS.ID_SCHEDULER_CANT_PUT_MINUTES, 'alert');
getField('SCH_START_TIME').value=''; getField('SCH_START_TIME').value='';
//getField('SCH_REPEAT_UNTIL').value=''; //getField('SCH_REPEAT_UNTIL').value='';
@@ -590,8 +575,8 @@ leimnud.event.add(getField('SCH_REPEAT_UNTIL'), 'change', function() {
//getField('SCH_REPEAT_UNTIL').focus(); //getField('SCH_REPEAT_UNTIL').focus();
getField('UPDATE').focus(); getField('UPDATE').focus();
} }
if(parties[1]>59){ if(parties[1]>59){
msgBox(G_STRINGS.ID_SCHEDULER_CANT_PUT_MINUTES, 'alert'); msgBox(G_STRINGS.ID_SCHEDULER_CANT_PUT_MINUTES, 'alert');
//getField('SCH_REPEAT_UNTIL').value=''; //getField('SCH_REPEAT_UNTIL').value='';
//getField('SCH_REPEAT_UNTIL').focus(); //getField('SCH_REPEAT_UNTIL').focus();
@@ -630,7 +615,6 @@ function case_userSchedulerValidate(username, password) {
}); });
oRPCProcess.callback = function(rpc){ oRPCProcess.callback = function(rpc){
document.getElementById("processListDropdown").innerHTML = rpc.xmlhttp.responseText;
if (getField('PRO_UID')!=null){ if (getField('PRO_UID')!=null){
var process_uid = getField('PRO_UID').value; var process_uid = getField('PRO_UID').value;
loadTasksDropdown(process_uid,user_uid); loadTasksDropdown(process_uid,user_uid);
@@ -760,7 +744,7 @@ endDate = new Date(endDate[0],endDate[1],endDate[2]);
switch(document.getElementById('form[SCH_OPTION]').value){ switch(document.getElementById('form[SCH_OPTION]').value){
// daily // daily
case '1': 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][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!=''){ if(document.getElementById('form[SCH_DAYS_PERFORM_TASK]').value!=''){
validFields = true; validFields = true;
@@ -768,7 +752,7 @@ endDate = new Date(endDate[0],endDate[1],endDate[2]);
requiredFields = requiredFields + 'Weekdays,'; requiredFields = requiredFields + 'Weekdays,';
validFields = false; validFields = false;
} }
break; break;
// weekly // weekly
case '2': case '2':
@@ -830,9 +814,9 @@ endDate = new Date(endDate[0],endDate[1],endDate[2]);
break; break;
//run once //run once
case '4': case '4':
validFields = true; validFields = true;
break; break;
default: default:
validFields = false; validFields = false;
@@ -854,4 +838,4 @@ endDate = new Date(endDate[0],endDate[1],endDate[2]);
} }
]]></SHOW_HIDE_JS> ]]></SHOW_HIDE_JS>
</dynaForm> </dynaForm>

30
workflow/engine/xmlform/cases/cases_Scheduler_New.html
View File

@@ -1,4 +1,4 @@
<form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit='return validateForm("{$form_objectRequiredFields}".parseJSON());'> <form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit='return validateForm("{$form_objectRequiredFields}".parseJSON());'>
<div class="borderForm" style="width:{$form_width}; padding-left:0; padding-right:0; border-width:{$form_border};"> <div class="borderForm" style="width:{$form_width}; padding-left:0; padding-right:0; border-width:{$form_border};">
<div class="borderForm" style="padding-left: 0pt; padding-right: 0pt;"> <div class="borderForm" style="padding-left: 0pt; padding-right: 0pt;">
<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div> <div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
@@ -51,7 +51,7 @@
</tr> </tr>
<tr> <tr>
<td class="FormLabel" width="{$form_labelWidth}">{$PRO_UID}</td> <td class="FormLabel" width="{$form_labelWidth}">{$PRO_UID}</td>
<td class="FormFieldContent"><div id="processListDropdown">{$form.PRO_UID}</div></td> <td class="FormFieldContent">{$form.PRO_UID}</td>
</tr> </tr>
<tr> <tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$TAS_UID}</td> <td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$TAS_UID}</td>
@@ -110,7 +110,7 @@
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="FormLabel" width="{$form_labelWidth}"></td> <td class="FormLabel" width="{$form_labelWidth}"></td>
@@ -134,14 +134,14 @@
<td style="vertical-align: top"> {$form.SCH_WEEK_DAYS_2} {$SCH_WEEK_DAYS_2} </td> <td style="vertical-align: top"> {$form.SCH_WEEK_DAYS_2} {$SCH_WEEK_DAYS_2} </td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="FormLabel" width="{$form_labelWidth}"> </td> <td class="FormLabel" width="{$form_labelWidth}"> </td>
<td class="FormFieldContent"></td> <td class="FormFieldContent"></td>
</tr> </tr>
<tr> <tr>
<td class="FormSubTitle" colspan="2" id="form[SELECT_3]" align=""> <td class="FormSubTitle" colspan="2" id="form[SELECT_3]" align="">
<span>{$form.SELECT_3}</span> <span>{$form.SELECT_3}</span>
@@ -153,9 +153,9 @@
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>
<td style="width: 35%">{$form.SCH_START_DAY}</td> <td style="width: 35%">{$form.SCH_START_DAY}</td>
<td> {$SCH_START_DAY_OPT_1} {$form.SCH_START_DAY_OPT_1} <br/> <td> {$SCH_START_DAY_OPT_1} {$form.SCH_START_DAY_OPT_1} <br/>
{$SCH_START_DAY_OPT_2_WEEKS} {$SCH_START_DAY_OPT_2_DAYS_WEEK} {$SCH_START_DAY_OPT_2_WEEKS} {$SCH_START_DAY_OPT_2_DAYS_WEEK}
{$form.SCH_START_DAY_OPT_2_WEEKS} {$form.SCH_START_DAY_OPT_2_DAYS_WEEK} <br/> {$form.SCH_START_DAY_OPT_2_WEEKS} {$form.SCH_START_DAY_OPT_2_DAYS_WEEK} <br/>
</td> </td>
</tr> </tr>
@@ -170,7 +170,7 @@
<td class="FormLabel" width="{$form_labelWidth}"></td> <td class="FormLabel" width="{$form_labelWidth}"></td>
<td class="FormFieldContent"> </td> <td class="FormFieldContent"> </td>
</tr> </tr>
<tr> <tr>
<td class="FormLabel" width="{$form_labelWidth}">{$SCH_MONTHS}</td> <td class="FormLabel" width="{$form_labelWidth}">{$SCH_MONTHS}</td>
<td class="FormFieldContent"> <td class="FormFieldContent">
@@ -204,13 +204,13 @@
<td class="FormLabel" width="{$form_labelWidth}"></td> <td class="FormLabel" width="{$form_labelWidth}"></td>
<td class="FormFieldContent"></td> <td class="FormFieldContent"></td>
</tr> </tr>
<tr> <tr>
<td class="FormSubTitle" colspan="2" id="form[SELECT_PLUGIN]" align=""> <td class="FormSubTitle" colspan="2" id="form[SELECT_PLUGIN]" align="">
<span>{$form.SELECT_PLUGIN}</span> <span>{$form.SELECT_PLUGIN}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<div id="pluginsListDropdown">{$form.PRO_UID}</div> <div id="pluginsListDropdown">{$form.PRO_UID}</div>
<div id="pluginsListContent">{$form.PRO_UID}</div> <div id="pluginsListContent">{$form.PRO_UID}</div>
@@ -220,10 +220,10 @@
<td width="{$form_labelWidth}"></td> <td width="{$form_labelWidth}"></td>
<td ></td> <td ></td>
</tr> </tr>
<tr> <tr>
<td class="FormButton" colspan="2" align="">{$form.SAVE}&nbsp;&nbsp;{$form.BTNCANCEL}</td> <td class="FormButton" colspan="2" align="">{$form.SAVE}&nbsp;&nbsp;{$form.BTNCANCEL}</td>
</tr> </tr>
</tbody></table> </tbody></table>
</td> </td>
@@ -235,7 +235,7 @@
<script type="text/javascript"> <script type="text/javascript">
{$form.SHOW_HIDE_JS} {$form.SHOW_HIDE_JS}
</script> </script>
</div> </div>
</form> </form>

65
workflow/engine/xmlform/cases/cases_Scheduler_New.xml
View File

@@ -80,7 +80,7 @@
</SELECT_1> </SELECT_1>
<!-- <!--
<SCH_DAYS_PERFORM_TASK type="radiogroup" defaultValue="1" required="0" mode="edit" options="Array"> <SCH_DAYS_PERFORM_TASK type="radiogroup" defaultValue="1" required="0" mode="edit" options="Array">
<en>Perform this task <en>Perform this task
<option name="1">Every Day</option> <option name="1">Every Day</option>
<option name="2">Weekdays</option> <option name="2">Weekdays</option>
@@ -104,7 +104,7 @@
<en>Every</en> <en>Every</en>
</SCH_EVERY_DAYS> </SCH_EVERY_DAYS>
<SCH_WEEK_DAYS type="checkgroup" required="0" mode="edit" options="Array" COLS="2" defaultvalue="" hint="" sqlconnection="" readonly="0" savelabel="0"> <SCH_WEEK_DAYS type="checkgroup" required="0" mode="edit" options="Array" COLS="2" defaultvalue="" hint="" sqlconnection="" readonly="0" savelabel="0">
<en>Select the day(s) of the week below <en>Select the day(s) of the week below
<option name="1">Monday</option> <option name="1">Monday</option>
<option name="2">Tuesday</option> <option name="2">Tuesday</option>
<option name="3">Wednesday</option> <option name="3">Wednesday</option>
@@ -112,7 +112,7 @@
</SCH_WEEK_DAYS> </SCH_WEEK_DAYS>
<SCH_WEEK_DAYS_2 type="checkgroup" required="0" mode="edit" options="Array" defaultvalue="" hint="" sqlconnection="" readonly="0" savelabel="0"> <SCH_WEEK_DAYS_2 type="checkgroup" required="0" mode="edit" options="Array" defaultvalue="" hint="" sqlconnection="" readonly="0" savelabel="0">
<en> <en>
<option name="5">Friday</option> <option name="5">Friday</option>
<option name="6">Saturday</option> <option name="6">Saturday</option>
<option name="7">Sunday</option></en> <option name="7">Sunday</option></en>
@@ -152,7 +152,7 @@
</en> </en>
</SCH_START_DAY_OPT_2_DAYS_WEEK> </SCH_START_DAY_OPT_2_DAYS_WEEK>
<SCH_MONTHS type="checkgroup" mode="edit" options="Array"> <SCH_MONTHS type="checkgroup" mode="edit" options="Array">
<en>Of the month(s) <en>Of the month(s)
<option name="1">Jan</option> <option name="1">Jan</option>
<option name="2">Feb</option> <option name="2">Feb</option>
<option name="3">Mar</option> <option name="3">Mar</option>
@@ -229,7 +229,7 @@
<en>Cancel</en> <en>Cancel</en>
</BTNCANCEL> </BTNCANCEL>
<SHOW_HIDE_JS type="javascript"><![CDATA[ <SHOW_HIDE_JS type="javascript"><![CDATA[
hideAll(); hideAll();
hideProperties(); hideProperties();
@@ -267,8 +267,8 @@ function showProperties(){
document.getElementById('form[EDIT_USER]').style.display=''; document.getElementById('form[EDIT_USER]').style.display='';
document.getElementById('form[PERFORM_TASK]').style.display=''; document.getElementById('form[PERFORM_TASK]').style.display='';
document.getElementById('form[SELECT_TIME_DAY]').style.display=''; document.getElementById('form[SELECT_TIME_DAY]').style.display='';
} }
@@ -279,15 +279,15 @@ contractSubtitle('SELECT_PLUGIN');
contractSubtitle('SELECT_1'); contractSubtitle('SELECT_1');
contractSubtitle('SELECT_2'); contractSubtitle('SELECT_2');
contractSubtitle('SELECT_3'); contractSubtitle('SELECT_3');
getField('SAVE').disabled=true; getField('SAVE').disabled=true;
// document.getElementById('form[SELECT_TIME_DAY]').style.display='none'; // document.getElementById('form[SELECT_TIME_DAY]').style.display='none';
document.getElementById('form[SELECT_DATE]').style.display='none'; document.getElementById('form[SELECT_DATE]').style.display='none';
document.getElementById('form[SELECT_1]').style.display='none'; document.getElementById('form[SELECT_1]').style.display='none';
document.getElementById('form[SELECT_2]').style.display='none'; document.getElementById('form[SELECT_2]').style.display='none';
document.getElementById('form[SELECT_3]').style.display='none'; document.getElementById('form[SELECT_3]').style.display='none';
} }
function showPluginSelection(opt,pro_uid) { function showPluginSelection(opt,pro_uid) {
@@ -297,15 +297,15 @@ var oRPCProcess = new leimnud.module.rpc.xmlhttp({
url : '../cases/cases_SchedulerGetPlugins', url : '../cases/cases_SchedulerGetPlugins',
async : true, async : true,
method: 'POST', method: 'POST',
args : "action=pluginCaseSchedulerForm&selectedOption="+opt+"&pro_uid="+pro_uid args : "action=pluginCaseSchedulerForm&selectedOption="+opt+"&pro_uid="+pro_uid
}); });
oRPCProcess.callback = function(rpc){ oRPCProcess.callback = function(rpc){
//alert(rpc.xmlhttp.responseText); //alert(rpc.xmlhttp.responseText);
if(rpc.xmlhttp.responseText!=""){ if(rpc.xmlhttp.responseText!=""){
document.getElementById("pluginsListContent").innerHTML = rpc.xmlhttp.responseText; document.getElementById("pluginsListContent").innerHTML = rpc.xmlhttp.responseText;
} }
}.extend(this); }.extend(this);
oRPCProcess.make(); oRPCProcess.make();
@@ -316,7 +316,7 @@ function showSelection(opt) {
if (opt!=0) { if (opt!=0) {
expandSubtitle('SELECT_TIME_DAY'); expandSubtitle('SELECT_TIME_DAY');
getField('SAVE').disabled=false; getField('SAVE').disabled=false;
var oRPCProcess = new leimnud.module.rpc.xmlhttp({ var oRPCProcess = new leimnud.module.rpc.xmlhttp({
url : '../cases/cases_SchedulerGetPlugins', url : '../cases/cases_SchedulerGetPlugins',
async : true, async : true,
@@ -331,11 +331,11 @@ function showSelection(opt) {
expandSubtitle('SELECT_PLUGIN'); expandSubtitle('SELECT_PLUGIN');
document.getElementById("pluginsListDropdown").innerHTML = rpc.xmlhttp.responseText; document.getElementById("pluginsListDropdown").innerHTML = rpc.xmlhttp.responseText;
} }
}.extend(this); }.extend(this);
oRPCProcess.make(); oRPCProcess.make();
} else { } else {
contractSubtitle('SELECT_TIME_DAY'); contractSubtitle('SELECT_TIME_DAY');
getField('SAVE').disabled=true; getField('SAVE').disabled=true;
@@ -396,7 +396,7 @@ function showSelection(opt) {
leimnud.event.add(getField('SCH_OPTION'), 'change', function() { leimnud.event.add(getField('SCH_OPTION'), 'change', function() {
var opt = getField('SCH_OPTION').value; var opt = getField('SCH_OPTION').value;
showSelection(opt); showSelection(opt);
}); });
leimnud.event.add(getField('SCH_START_DAY][1'), 'click', function() { leimnud.event.add(getField('SCH_START_DAY][1'), 'click', function() {
@@ -439,7 +439,7 @@ leimnud.event.add(getField('SCH_EVERY_DAYS'), 'change', function() {
days = getField('SCH_EVERY_DAYS').value; days = getField('SCH_EVERY_DAYS').value;
if(!(days>=1 && days<=52) ) { if(!(days>=1 && days<=52) ) {
msgBox('Weeks must be between 1 and 52', 'alert'); msgBox('Weeks must be between 1 and 52', 'alert');
getField('SCH_EVERY_DAYS').value = ''; getField('SCH_EVERY_DAYS').value = '';
} }
}); });
@@ -447,7 +447,7 @@ leimnud.event.add(getField('SCH_START_DAY_OPT_1'), 'change', function() {
days = getField('SCH_START_DAY_OPT_1').value; days = getField('SCH_START_DAY_OPT_1').value;
if(!(days>=1 && days<=31) ) { if(!(days>=1 && days<=31) ) {
msgBox('The days must be between 1 and 31', 'alert'); msgBox('The days must be between 1 and 31', 'alert');
getField('SCH_START_DAY_OPT_1').value = '1'; getField('SCH_START_DAY_OPT_1').value = '1';
} }
}); });
@@ -455,12 +455,12 @@ leimnud.event.add(getField('SCH_START_TIME'), 'keyup', function() {
if (getField('SCH_START_TIME').value.charAt(0)) { if (getField('SCH_START_TIME').value.charAt(0)) {
if (isNaN(getField('SCH_START_TIME').value.charAt(0)) == true) { if (isNaN(getField('SCH_START_TIME').value.charAt(0)) == true) {
getField('SCH_START_TIME').value = getField('SCH_START_TIME').value.slice(0, -1); getField('SCH_START_TIME').value = getField('SCH_START_TIME').value.slice(0, -1);
} }
} }
if (getField('SCH_START_TIME').value.charAt(1)) { if (getField('SCH_START_TIME').value.charAt(1)) {
if (isNaN(getField('SCH_START_TIME').value.charAt(1)) == true) { if (isNaN(getField('SCH_START_TIME').value.charAt(1)) == true) {
getField('SCH_START_TIME').value = getField('SCH_START_TIME').value.slice(0, -1); getField('SCH_START_TIME').value = getField('SCH_START_TIME').value.slice(0, -1);
} }
} }
var oVar = getField('SCH_START_TIME').value.charAt(2); var oVar = getField('SCH_START_TIME').value.charAt(2);
if (isNaN(oVar) == true) { if (isNaN(oVar) == true) {
@@ -471,7 +471,7 @@ leimnud.event.add(getField('SCH_START_TIME'), 'keyup', function() {
if (isNaN(getField('SCH_START_TIME').value.charAt(4)) == true) { if (isNaN(getField('SCH_START_TIME').value.charAt(4)) == true) {
getField('SCH_START_TIME').value = getField('SCH_START_TIME').value.slice(0, -1); getField('SCH_START_TIME').value = getField('SCH_START_TIME').value.slice(0, -1);
} }
} }
} }
}); });
@@ -487,8 +487,8 @@ leimnud.event.add(getField('SCH_START_TIME'), 'change', function() {
//getField('SCH_REPEAT_UNTIL').focus(); //getField('SCH_REPEAT_UNTIL').focus();
getField('SAVE').focus(); getField('SAVE').focus();
} }
if(parties[1]>59){ if(parties[1]>59){
msgBox('The minutes can not be greater than 59', 'alert'); msgBox('The minutes can not be greater than 59', 'alert');
getField('SCH_START_TIME').value=''; getField('SCH_START_TIME').value='';
//getField('SCH_REPEAT_UNTIL').value=''; //getField('SCH_REPEAT_UNTIL').value='';
@@ -522,7 +522,7 @@ function case_userSchedulerValidate(username, password) {
msgBox(G_STRINGS.ID_CASE_SCHEDULER_VALIDATE_ALERT, "alert"); msgBox(G_STRINGS.ID_CASE_SCHEDULER_VALIDATE_ALERT, "alert");
return false; return false;
} }
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : '../cases/cases_SchedulerValidateUser', url : '../cases/cases_SchedulerValidateUser',
async : true, async : true,
@@ -556,19 +556,18 @@ function case_userSchedulerValidate(username, password) {
}); });
oRPCProcess.callback = function(rpc){ oRPCProcess.callback = function(rpc){
document.getElementById("processListDropdown").innerHTML = rpc.xmlhttp.responseText;
if (getField('PRO_UID')!=null){ if (getField('PRO_UID')!=null){
var process_uid = getField('PRO_UID').value; var process_uid = getField('PRO_UID').value;
} else { } else {
var process_uid = gup('PRO_UID'); var process_uid = gup('PRO_UID');
} }
loadTasksDropdown(process_uid,user_uid); loadTasksDropdown(process_uid,user_uid);
}.extend(this); }.extend(this);
oRPCProcess.make(); oRPCProcess.make();
}.extend(this); }.extend(this);
oRPC.make(); oRPC.make();
@@ -625,7 +624,7 @@ endDate = new Date(endDate[0],endDate[1],endDate[2]);
requiredFields = requiredFields + 'Weekdays,'; requiredFields = requiredFields + 'Weekdays,';
validFields = false; validFields = false;
} }
break; break;
// weekly // weekly
case '2': case '2':
@@ -666,7 +665,7 @@ endDate = new Date(endDate[0],endDate[1],endDate[2]);
monthIdOne = 'form[SCH_MONTHS]['+month+']'; monthIdOne = 'form[SCH_MONTHS]['+month+']';
monthIdTwo = 'form[SCH_MONTHS_2]['+(month+4)+']'; monthIdTwo = 'form[SCH_MONTHS_2]['+(month+4)+']';
monthIdThree = 'form[SCH_MONTHS_3]['+(month+8)+']'; monthIdThree = 'form[SCH_MONTHS_3]['+(month+8)+']';
if (document.getElementById(monthIdOne).checked==true||document.getElementById(monthIdTwo).checked==true||document.getElementById(monthIdThree).checked==true){ if (document.getElementById(monthIdOne).checked==true||document.getElementById(monthIdTwo).checked==true||document.getElementById(monthIdThree).checked==true){
validFields = true; validFields = true;
break; break;
@@ -687,9 +686,9 @@ endDate = new Date(endDate[0],endDate[1],endDate[2]);
break; break;
//run once //run once
case '4': case '4':
validFields = true; validFields = true;
break; break;
default: default:
validFields = false; validFields = false;
@@ -761,7 +760,7 @@ function collapseAdvancedOptions(){
//contractSubtitle('ADVANCED_4'); //contractSubtitle('ADVANCED_4');
document.getElementById('EditLogAdvancedOptions').innerHTML = 'hidden'; document.getElementById('EditLogAdvancedOptions').innerHTML = 'hidden';
document.getElementById('checkAdvanced').checked = false; document.getElementById('checkAdvanced').checked = false;
//document.getElementById('form[SCH_END_DATE]').value = ''; //document.getElementById('form[SCH_END_DATE]').value = '';
document.getElementById('form[SCH_END_DATE][div]').innerHTML = ''; document.getElementById('form[SCH_END_DATE][div]').innerHTML = '';
document.getElementById('form[SCH_REPEAT_TASK_CHK]').checked = false; document.getElementById('form[SCH_REPEAT_TASK_CHK]').checked = false;