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 ""
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 <developers@colosa.com>\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 "<div align=\"center\">Importing Existing Process</div>"
# 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

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

@@ -285,6 +285,11 @@ class Home extends Controller
$_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

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'
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])

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_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','','',' ','') ,

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

@@ -233,6 +233,11 @@ function startCase() {
$_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'] );

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

@@ -61,7 +61,7 @@
</tr>
<tr>
<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>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$TAS_UID}</td>
@@ -252,4 +252,3 @@
</div>
</form>

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

@@ -50,13 +50,7 @@
<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>
</SCH_NAME>
<PRO_UID type="dropdown" required="1" style="width:300px" options="Array" dependentfields="TAS_UID">
<![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 type="hidden" required="1" style="width:300px" dependentfields="TAS_UID" mode="edit">
</PRO_UID>
<TAS_UID type="dropdown" required="1" style="width:300px" options="Array" >
<![CDATA[ SELECT DISTINCT A.TAS_UID, B.CON_VALUE AS TAS_TITLE
@@ -283,15 +277,6 @@ switch (getField('SCH_OPTION').value){
}
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(){
//hiddeRow('EDIT_USER');
@@ -630,7 +615,6 @@ function case_userSchedulerValidate(username, password) {
});
oRPCProcess.callback = function(rpc){
document.getElementById("processListDropdown").innerHTML = rpc.xmlhttp.responseText;
if (getField('PRO_UID')!=null){
var process_uid = getField('PRO_UID').value;
loadTasksDropdown(process_uid,user_uid);

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

@@ -51,7 +51,7 @@
</tr>
<tr>
<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>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$TAS_UID}</td>

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

@@ -556,7 +556,6 @@ function case_userSchedulerValidate(username, password) {
});
oRPCProcess.callback = function(rpc){
document.getElementById("processListDropdown").innerHTML = rpc.xmlhttp.responseText;
if (getField('PRO_UID')!=null){
var process_uid = getField('PRO_UID').value;
} else {