diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po old mode 100755 new mode 100644 index 09b5836c2..d64dde42e --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -1,8 +1,8 @@ msgid "" 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" -"PO-Revision-Date: 2012-08-01 10:50:13\n" +"PO-Revision-Date: 2012-08-10 16:39:34\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -12721,6 +12721,24 @@ msgstr "Reason of the cancel of case" msgid "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 #: text - ADD_TAB_NAME @@ -16201,6 +16219,12 @@ msgstr "Task Due Date" msgid "[cases/cases_Resume.xml?DEL_FINISH_DATE] 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 #: title - GENERAL_INF @@ -16249,12 +16273,6 @@ msgstr "Properties" msgid "[cases/cases_Scheduler_Edit.xml?SCH_NAME] 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 #: dropdown - TAS_UID @@ -21884,7 +21902,7 @@ msgstr "Report Database:" # login/newSite.xml?AO_DB_DROP # login/newSite.xml #: 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" # login/newSite.xml?WS @@ -23489,6 +23507,12 @@ msgstr "Process Information" msgid "[processes/processes_Edit.xml?PRO_TITLE] 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 #: textarea - PRO_DESCRIPTION @@ -23876,7 +23900,7 @@ msgstr "
Importing Existing Process
" # processes/processes_ImportExisting.xml?TITLE1 # processes/processes_ImportExisting.xml #: 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:" # processes/processes_ImportExisting.xml?IMPORT_OPTION @@ -29123,11 +29147,11 @@ msgstr "Message" msgid "[tasks/tasks_Notifications.xml?TAS_DEF_MESSAGE_TEMPLATE] 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 -#: dropdown - TAS_DEF_MESSAGE_TEMPLATE - -msgid "[tasks/tasks_Notifications.xml?TAS_DEF_MESSAGE_TEMPLATE-]" -msgstr "- None -" +#: dropdown - TAS_DEF_MESSAGE_TEMPLATE - alert_message.html +msgid "[tasks/tasks_Notifications.xml?TAS_DEF_MESSAGE_TEMPLATE-alert_message.html]" +msgstr "-- Default --" # tasks/tasks_Owner.xml?TAS_OWNER_APP # tasks/tasks_Owner.xml diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php index 4cf844910..5e6d3ae99 100755 --- a/workflow/engine/controllers/home.php +++ b/workflow/engine/controllers/home.php @@ -49,7 +49,7 @@ class Home extends Controller $data = isset($httpData->d) ? unserialize(base64_decode($httpData->d)) : ''; $template = $this->clientBrowser['name'] == 'msie' ? 'login_ie' : 'login_standard'; $skin = $this->clientBrowser['name'] == 'msie' ? $this->lastSkin : 'simplified'; - + if (!is_array($data)) { $data = array('u'=>'', 'p'=>'', 'm'=>''); } @@ -99,15 +99,15 @@ class Home extends Controller } unset($processList[0]); - + //Get simplified options global $G_TMP_MENU; - + $mnu = new Menu(); $mnu->load('simplified'); $arrayMnuOption = array(); $mnuNewCase = array(); - + if (!empty($mnu->Options)) { foreach ($mnu->Options as $index => $value) { $option = array( @@ -117,7 +117,7 @@ class Home extends Controller 'icon' => $mnu->Icons[$index], 'class' => $mnu->ElementClass[$index] ); - + if ($mnu->Id[$index] != 'S_NEW_CASE') { $arrayMnuOption[] = $option; } @@ -126,7 +126,7 @@ class Home extends Controller } } } - + $this->setView('home/index'); $this->setVar('usrUid', $this->userID); @@ -146,7 +146,7 @@ class Home extends Controller { require_once 'classes/model/Step.php'; G::LoadClass('applications'); - + $apps = new Applications(); $step = new Step; @@ -265,7 +265,7 @@ class Home extends Controller // Completting with Notes $notes = $appNotes->getNotesList($row['APP_UID'], '', $notesStart, $notesLimit); $notes = $notes['array']; - + $cases['data'][$i]['NOTES_COUNT'] = $notes['totalCount']; $cases['data'][$i]['NOTES_LIST'] = $notes['notes']; } @@ -277,14 +277,19 @@ class Home extends Controller G::LoadClass('case'); $case = new Cases(); $aData = $case->startCase($httpData->id, $_SESSION['USER_LOGGED']); - + $_SESSION['APPLICATION'] = $aData['APPLICATION']; $_SESSION['INDEX'] = $aData['INDEX']; $_SESSION['PROCESS'] = $aData['PROCESS']; $_SESSION['TASK'] = $httpData->id; $_SESSION['STEP_POSITION'] = 0; $_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(); $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 diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index aa37a9f53..a20146186 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -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' UNION ALL 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]) diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 598429dc3..db12db4f7 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -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_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_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 ('AD','','',' ','') , diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php index cbca42565..5c911b65d 100755 --- a/workflow/engine/methods/cases/casesStartPage_Ajax.php +++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php @@ -25,12 +25,12 @@ function getProcessList() { $calendar = new Calendar ( ); $oProcess = new Process ( ); $oCase = new Cases ( ); - + //Get ProcessStatistics Info $start = 0; $limit = ''; $proData = $oProcess->getAllProcesses($start, $limit); - + $bCanStart = $oCase->canStartCase ( $_SESSION ['USER_LOGGED'] ); if ($bCanStart) { $processListInitial = $oCase->getStartCasesPerType ( $_SESSION ['USER_LOGGED'], 'category' ); @@ -46,18 +46,18 @@ function getProcessList() { foreach ( $processList as $key => $processInfo ) { ksort ( $processList [$key] ); } - + if (! isset ( $_REQUEST ['node'] )) { $node = 'root'; } else { $node = $_REQUEST ['node']; } - - + + foreach($proData as $key => $proInfo){ $proData[$proInfo['PRO_UID']]=$proInfo; } - + $processListTree = array (); if (1) { 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']['PRO_TAS_TITLE']=str_replace(")","",str_replace("(","",trim(str_replace($tempTreeChild ['otherAttributes']['PRO_TITLE'],"",$tempTreeChild ['otherAttributes']["value"])))); $tempTreeChild ['qtip']=$tempTreeChild ['otherAttributes']['PRO_DESCRIPTION']; - + //$tempTree['cls']='file'; - + $tempTreeChildren [] = $tempTreeChild; } } - + $tempTree['children']=$tempTreeChildren; - + $processListTree [] = $tempTree; } } else { @@ -125,7 +125,7 @@ function getProcessList() { //$tempTree['cls']='file'; $processListTree [] = $tempTree; } - + } $processList = $processListTree; } else { @@ -148,16 +148,16 @@ function ellipsis($text, $numb) { $etc = "..."; $text = $text . $etc; } - + return $text; } function lookinginforContentProcess($sproUid){ require_once 'classes/model/Content.php'; require_once 'classes/model/Task.php'; - require_once 'classes/model/Content.php'; - - $oContent = new Content(); + require_once 'classes/model/Content.php'; + + $oContent = new Content(); ///we are looking for a pro title for this process $sproUid $oCriteria = new Criteria('workflow'); $oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE'); @@ -168,16 +168,16 @@ function ellipsis($text, $numb) { $oDataset->next(); $aRow = $oDataset->getRow(); if(!is_array($aRow)){ - + $oC = new Criteria('workflow'); $oC->addSelectColumn(TaskPeer::TAS_UID); $oC->add( TaskPeer::PRO_UID, $sproUid); $oDataset1 = TaskPeer::doSelectRS($oC); $oDataset1->setFetchmode(ResultSet::FETCHMODE_ASSOC); - + while($oDataset1->next()){ $aRow1 = $oDataset1->getRow(); - + $oCriteria1 = new Criteria('workflow'); $oCriteria1->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE'); $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG); @@ -197,9 +197,9 @@ function ellipsis($text, $numb) { $oDataset3->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset3->next(); $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; @@ -208,7 +208,7 @@ function ellipsis($text, $numb) { function startCase() { G::LoadClass ( 'case' ); - + /* GET , POST & $_SESSION Vars */ /* unset any variable, because we are starting a new case */ if (isset ( $_SESSION ['APPLICATION'] )) unset ( $_SESSION ['APPLICATION'] ); @@ -220,27 +220,32 @@ function startCase() { /* Process */ try { $oCase = new Cases ( ); - + lookinginforContentProcess($_POST['processId']); - + $aData = $oCase->startCase ( $_REQUEST ['taskId'], $_SESSION ['USER_LOGGED'] ); - + $_SESSION ['APPLICATION'] = $aData ['APPLICATION']; $_SESSION ['INDEX'] = $aData ['INDEX']; $_SESSION ['PROCESS'] = $aData ['PROCESS']; $_SESSION ['TASK'] = $_REQUEST ['taskId']; $_SESSION ['STEP_POSITION'] = 0; - + $_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 ( ); $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'; - + $_SESSION ['BREAKSTEP'] ['NEXT_STEP'] = $aNextStep; $aData ['openCase'] = $aNextStep; - + $aData ['status'] = 'success'; print (G::json_encode ( $aData )) ; } @@ -256,11 +261,11 @@ function getSimpleDashboardData() { require_once ("classes/model/AppCacheView.php"); require_once 'classes/model/Process.php'; $sUIDUserLogged = $_SESSION ['USER_LOGGED']; - + $Criteria = new Criteria ( 'workflow' ); - + $Criteria->clearSelectColumns (); - + $Criteria->addSelectColumn ( AppCacheViewPeer::PRO_UID ); $Criteria->addSelectColumn ( AppCacheViewPeer::APP_UID ); $Criteria->addSelectColumn ( AppCacheViewPeer::APP_NUMBER ); @@ -276,24 +281,24 @@ function getSimpleDashboardData() { $Criteria->addSelectColumn ( AppCacheViewPeer::DEL_DELAYED ); $Criteria->addSelectColumn ( AppCacheViewPeer::USR_UID ); $Criteria->addSelectColumn ( AppCacheViewPeer::APP_THREAD_STATUS ); - + $Criteria->add ( AppCacheViewPeer::APP_STATUS, array ("TO_DO", "DRAFT" ), CRITERIA::IN ); $Criteria->add ( AppCacheViewPeer::USR_UID, array ($sUIDUserLogged, "" ), CRITERIA::IN ); - + $Criteria->add ( AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL ); - + //$Criteria->add ( AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN' ); - + $Criteria->add ( AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN' ); - + //execute the query $oDataset = AppCacheViewPeer::doSelectRS ( $Criteria ); $oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC ); $oDataset->next (); - + $oProcess = new Process ( ); - + $rows = array (); $processNames = array (); while ( $aRow = $oDataset->getRow () ) { @@ -302,7 +307,7 @@ function getSimpleDashboardData() { $aProcess = $oProcess->load ( $aRow ['PRO_UID'] ); $processNames [$aRow ['PRO_UID']] = $aProcess ['PRO_TITLE']; } - + if ($aRow ['USR_UID'] == "") $aRow ['APP_STATUS'] = "UNASSIGNED"; 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; $rows [$processNames [$aRow ['PRO_UID']]][$aRow ['APP_STATUS']]['count']++; } - + $oDataset->next (); } //Generate different groups of data for graphs @@ -320,12 +325,12 @@ function getSimpleDashboardData() { $i++; 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['caseDelayed'][]=array('delayed'=>'On Time','total'=>100); $rowsResponse['caseDelayed'][]=array('delayed'=>'Delayed','total'=>50); - + print_r ( G::json_encode ( $rowsResponse ) ); } diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html index 860eb8ca4..19db2e8b2 100755 --- a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html +++ b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html @@ -1,6 +1,6 @@ -
+
- +
@@ -61,7 +61,7 @@ -
+ {$form.PRO_UID} * {$TAS_UID} @@ -104,7 +104,7 @@ {$form.SELECT_DATE} - + {$form.SELECT_1} @@ -142,7 +142,7 @@ {$form.SCH_WEEK_DAYS_2} {$SCH_WEEK_DAYS_2} - + @@ -156,15 +156,15 @@ -
{$form.SCH_START_DAY} {$SCH_START_DAY_OPT_1} {$form.SCH_START_DAY_OPT_1}
- {$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}
+ 		{$SCH_START_DAY_OPT_1} {$form.SCH_START_DAY_OPT_1}
+ {$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}
- - + + @@ -177,7 +177,7 @@ - + {$SCH_MONTHS} @@ -190,7 +190,7 @@ - +
@@ -211,7 +211,7 @@ - + --> {$form.SELECT_PLUGIN} - +
{$form.CASE_SH_PLUGIN_UID}
@@ -249,7 +249,6 @@ - +
- \ No newline at end of file diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml index 877782860..f8542fe7e 100755 --- a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml +++ b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml @@ -50,17 +50,11 @@ Description - - -Process + - Task @@ -99,10 +93,10 @@ WHERE A.PRO_UID='@#PRO_UID' AND A.TAS_START = 'TRUE' ]]> Daily - +