From 28052f15e5bb78ec49eaa659f1811685c72eb28d Mon Sep 17 00:00:00 2001 From: Alvaro Campos Date: Thu, 15 Dec 2011 12:27:51 -0400 Subject: [PATCH] BUG 7084 the problem with the grid was solved reassign all cases by task --- .../translations/english/processmaker.en.po | 54 ++++++++++++++++--- workflow/engine/data/mssql/insert.sql | 12 ++++- workflow/engine/data/mysql/insert.sql | 9 +++- .../engine/methods/cases/casesListExtJs.php | 22 ++++---- .../methods/cases/proxyReassignCasesList.php | 51 ++++-------------- 5 files changed, 86 insertions(+), 62 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 4c7d0df6a..421f36a56 100755 --- 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-dev) 2.0.34.rc4-203-gb873e5a\n" +"Project-Id-Version: ProcessMaker (Branch 2.0-dev) 2.0.34.rc4-179-g5fa57e9\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2011-12-05 08:57:57\n" +"PO-Revision-Date: 2011-11-28 11:40:40\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -4048,8 +4048,8 @@ msgstr "The following fields cannot have these names because they are reserved # TRANSLATION # LABEL/ID_PROCESS_CATEGORY #: LABEL/ID_PROCESS_CATEGORY -msgid "Process category" -msgstr "Process category" +msgid "Process Categories" +msgstr "Process Categories" # TRANSLATION # LABEL/ID_LOCATION @@ -11431,6 +11431,36 @@ msgstr "Search XML metadata" msgid "FTP Monitor Settings" msgstr "FTP Monitor Settings" +# TRANSLATION +# LABEL/ID_ERROR_UPLOADING_FILENAME +#: LABEL/ID_ERROR_UPLOADING_FILENAME +msgid "[LABEL/ID_ERROR_UPLOADING_FILENAME] There was an error uploading the file, probably the file size if greater than upload_max_filesize parameter in php.ini, please check this parameter and try again." +msgstr "There was an error uploading the file, probably the file size if greater than upload_max_filesize parameter in php.ini, please check this parameter and try again." + +# TRANSLATION +# LABEL/ID_POSTED_DATA_EMPTY +#: LABEL/ID_POSTED_DATA_EMPTY +msgid "Posted data is empty!" +msgstr "Posted data is empty!" + +# TRANSLATION +# LABEL/ID_MOST_AT_LEAST_3_DAY +#: LABEL/ID_MOST_AT_LEAST_3_DAY +msgid "You must define at least 3 Working Days!" +msgstr "You must define at least 3 Working Days!" + +# TRANSLATION +# LABEL/ID_SELECT_ALL +#: LABEL/ID_SELECT_ALL +msgid "You must define at least one 'ALL' for other days you have not defined" +msgstr "You must define at least one 'ALL' for other days you have not defined" + +# TRANSLATION +# LABEL/ID_ASSIGN_USERGROUPS +#: LABEL/ID_ASSIGN_USERGROUPS +msgid "Assign users group or user" +msgstr "Assign users group or user" + # additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml #: text - ADD_TAB_NAME @@ -30011,6 +30041,12 @@ msgstr "Photo" msgid "[users/users_EditRT.xml?USR_RESUME] Résumé" msgstr "Résumé" +# users/users_EditRT.xml?MAX_FILES_SIZE +# users/users_EditRT.xml +#: edit - MAX_FILES_SIZE +msgid "Max upload files size in bytes" +msgstr "Max upload files size in bytes" + # users/users_EditRT.xml?TITLE1 # users/users_EditRT.xml #: title - TITLE1 @@ -30275,6 +30311,12 @@ msgstr "Photo" msgid "[users/users_New.xml?USR_RESUME] Résumé" msgstr "Résumé" +# users/users_New.xml?MAX_FILES_SIZE +# users/users_New.xml +#: edit - MAX_FILES_SIZE +msgid "[users/users_New.xml?MAX_FILES_SIZE] Max upload files size in bytes" +msgstr "Max upload files size in bytes" + # users/users_New.xml?TITLE1 # users/users_New.xml #: title - TITLE1 @@ -31340,8 +31382,8 @@ msgstr "Relative Start and End Dates" # dynaforms/fields/date.xml?PMED_AFTERBEFORE_DESC # dynaforms/fields/date.xml #: subtitle - PMED_AFTERBEFORE_DESC -msgid "Data Codes: A number followed by a letter to indicate the unit of time (d=day m=month y=year).
Use negative numbers for past dates and positive numbers for future dates
\tNOTE. When these relative dates are set have the priority, leave empty to use Start and End dates." -msgstr "Data Codes: A number followed by a letter to indicate the unit of time (d=day m=month y=year).
Use negative numbers for past dates and positive numbers for future dates
\tNOTE. When these relative dates are set have the priority, leave empty to use Start and End dates." +msgid "Data Codes: A number followed by a letter to indicate the unit of time (d=day m=month y=year).
Use negative numbers for past dates and positive numbers for future dates
NOTE. When these relative dates are set have the priority, leave empty to use Start and End dates." +msgstr "Data Codes: A number followed by a letter to indicate the unit of time (d=day m=month y=year).
Use negative numbers for past dates and positive numbers for future dates
NOTE. When these relative dates are set have the priority, leave empty to use Start and End dates." # dynaforms/fields/date.xml?PME_BEFOREDATE # dynaforms/fields/date.xml diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index 559479171..262bba059 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -2735,7 +2735,7 @@ SELECT 'LABEL','ID_TASK_NO_STEPS','en','The task doesn''t have any steps','2011- UNION ALL SELECT 'JAVASCRIPT','ID_FIELDS_RESERVED_WORDS','en','The following fields cannot have these names because they are reserved words','2011-10-26' UNION ALL -SELECT 'LABEL','ID_PROCESS_CATEGORY','en','Process category','2011-10-26' +SELECT 'LABEL','ID_PROCESS_CATEGORY','en','Process Categories','2011-12-14' UNION ALL SELECT 'LABEL','ID_LOCATION','en','Location','2011-10-26' UNION ALL @@ -5226,6 +5226,16 @@ SELECT 'LABEL','ID_SEARCH_PATTERN','en','Search Pattern','2011-11-28' SELECT 'LABEL','ID_SEARCH_XML_METADATA','en','Search XML metadata','2011-11-28' UNION ALL SELECT 'LABEL','ID_FTP_MONITOR_SETTINGS','en','FTP Monitor Settings','2011-11-28' + UNION ALL +SELECT 'LABEL','ID_ERROR_UPLOADING_FILENAME','en','There was an error uploading the file, probably the file size if greater than upload_max_filesize parameter in php.ini, please check this parameter and try again.','2011-12-06' + UNION ALL +SELECT 'LABEL','ID_POSTED_DATA_EMPTY','en','Posted data is empty!','2011-12-06' + UNION ALL +SELECT 'LABEL','ID_MOST_AT_LEAST_3_DAY','en','You must define at least 3 Working Days!','2011-12-12' + UNION ALL +SELECT 'LABEL','ID_SELECT_ALL','en','You must define at least one ''ALL'' for other days you have not defined','2011-12-12' + UNION ALL +SELECT 'LABEL','ID_ASSIGN_USERGROUPS','en','Assign users group or user','2011-12-12' ; 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 4247a287c..7da216523 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -2063,7 +2063,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PLEASE_SELECT_LOGO','en','Please Select Logo','2011-10-26') , ( 'LABEL','ID_TASK_NO_STEPS','en','The task doesn''t have any steps','2011-10-26') , ( 'JAVASCRIPT','ID_FIELDS_RESERVED_WORDS','en','The following fields cannot have these names because they are reserved words','2011-10-26') , -( 'LABEL','ID_PROCESS_CATEGORY','en','Process category','2011-10-26') , +( 'LABEL','ID_PROCESS_CATEGORY','en','Process Categories','2011-12-14') , ( 'LABEL','ID_LOCATION','en','Location','2011-10-26') , ( 'JAVASCRIPT','ID_GROUP','en','Group','2011-10-26') , ( 'LABEL','ID_COUNTRY','en','Country','2011-10-26') , @@ -3323,7 +3323,12 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MONITORED_FOLDER','en','Monitored Folder','2011-11-28') , ( 'LABEL','ID_SEARCH_PATTERN','en','Search Pattern','2011-11-28') , ( 'LABEL','ID_SEARCH_XML_METADATA','en','Search XML metadata','2011-11-28') , -( 'LABEL','ID_FTP_MONITOR_SETTINGS','en','FTP Monitor Settings','2011-11-28') ; +( 'LABEL','ID_FTP_MONITOR_SETTINGS','en','FTP Monitor Settings','2011-11-28') , +( 'LABEL','ID_ERROR_UPLOADING_FILENAME','en','There was an error uploading the file, probably the file size if greater than upload_max_filesize parameter in php.ini, please check this parameter and try again.','2011-12-06') , +( 'LABEL','ID_POSTED_DATA_EMPTY','en','Posted data is empty!','2011-12-06') , +( 'LABEL','ID_MOST_AT_LEAST_3_DAY','en','You must define at least 3 Working Days!','2011-12-12') , +( 'LABEL','ID_SELECT_ALL','en','You must define at least one ''ALL'' for other days you have not defined','2011-12-12') , +( 'LABEL','ID_ASSIGN_USERGROUPS','en','Assign users group or user','2011-12-12') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php index 7ede18079..460f19a5d 100755 --- a/workflow/engine/methods/cases/casesListExtJs.php +++ b/workflow/engine/methods/cases/casesListExtJs.php @@ -196,7 +196,7 @@ //get the processes for this user in this action $cProcess->clearSelectColumns ( ); - $cProcess->setDistinct(); + // $cProcess->setDistinct(); $cProcess->addSelectColumn ( AppCacheViewPeer::PRO_UID ); $cProcess->addSelectColumn ( AppCacheViewPeer::APP_PRO_TITLE ); $oDataset = AppCacheViewPeer::doSelectRS($cProcess); @@ -612,7 +612,7 @@ $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'), 'dataIndex' => 'CASE_SUMMARY', 'width' => 45, 'align' => 'center', 'sorteable'=>false); $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center', 'sorteable'=>false); $caseColumns[] = array( 'header' => 'TaskUid', 'dataIndex' => 'TAS_UID' , 'width' => 150 ,'hidden'=> true, 'hideable'=> false); - $caseColumns[] = array( 'header' => 'DelIndex', 'dataIndex' => 'DEL_INDEX' , 'width' => 150 ); + $caseColumns[] = array( 'header' => 'DelIndex', 'dataIndex' => 'DEL_INDEX' , 'width' => 150 ,'hidden'=> true, 'hideable'=> false); $caseColumns[] = array( 'header' => 'UserUid', 'dataIndex' => 'USR_UID', 'width' => 50, 'hidden'=> true, 'hideable'=> false); $caseColumns[] = array( 'header' => 'PreUsrUid', 'dataIndex' => 'PREVIOUS_USR_UID','width' => 50, 'hidden'=> true, 'hideable'=> false); $caseColumns[] = array( 'header' => '#', 'dataIndex' => 'APP_NUMBER', 'width' => 45, 'align' => 'center'); @@ -685,18 +685,18 @@ */ function getReassignList() { $caseColumns = array (); - $caseColumns[] = array( 'header' => '#', 'dataIndex' => 'APP_NUMBER', 'width' => 40 ); - $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'), 'dataIndex' => 'CASE_SUMMARY', 'width' => 45, 'align' => 'center', 'sorteable'=>false); - $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'),'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center', 'sorteable'=>false); - $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'), 'dataIndex' => 'APP_TITLE', 'width' => 100, 'hidden'=> true); - $caseColumns[] = array( 'header' => 'CaseId', 'dataIndex' => 'APP_UID' , 'width' => 200, 'hidden'=> true, 'hideable'=> false); - $caseColumns[] = array( 'header' => 'User', 'dataIndex' => 'USR_UID' , 'width' => 200, 'hidden'=> true, 'hideable'=> false); - $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'), 'dataIndex' => 'APP_TAS_TITLE', 'width' => 120 ); - $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'), 'dataIndex' => 'APP_PRO_TITLE', 'width' => 120 ); + $caseColumns[] = array( 'header' => '#', 'dataIndex' => 'APP_NUMBER', 'width' => 40 ); + $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'), 'dataIndex' => 'CASE_SUMMARY', 'width' => 45,'hidden'=> true); + $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'),'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45,'hidden'=> true); + $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'), 'dataIndex' => 'APP_TITLE', 'width' => 100, 'hidden'=> true); + $caseColumns[] = array( 'header' => 'CaseId', 'dataIndex' => 'APP_UID' , 'width' => 200, 'hidden'=> true, 'hideable'=> false); + $caseColumns[] = array( 'header' => 'User', 'dataIndex' => 'USR_UID' , 'width' => 200, 'hidden'=> true, 'hideable'=> false); + $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'), 'dataIndex' => 'APP_TAS_TITLE', 'width' => 120 ); + $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'), 'dataIndex' => 'APP_PRO_TITLE', 'width' => 120 ); $caseColumns[] = array( 'header' => 'Reassigned Uid', 'dataIndex' => 'APP_REASSIGN_USER_UID','width' => 120, 'hidden'=> true, 'hideable'=> false ); $caseColumns[] = array( 'header' => 'Reassigned Uid', 'dataIndex' => 'TAS_UID', 'width' => 120, 'hidden'=> true, 'hideable'=> false ); $caseColumns[] = array( 'header' => G::LoadTranslation('ID_REASSIGN_TO'),'dataIndex' => 'APP_REASSIGN_USER', 'width' => 170 ); - + $caseReaderFields = array(); $caseReaderFields[] = array( 'name' => 'APP_NUMBER' ); $caseReaderFields[] = array( 'name' => 'APP_TITLE' ); diff --git a/workflow/engine/methods/cases/proxyReassignCasesList.php b/workflow/engine/methods/cases/proxyReassignCasesList.php index 14156552d..31831b91b 100755 --- a/workflow/engine/methods/cases/proxyReassignCasesList.php +++ b/workflow/engine/methods/cases/proxyReassignCasesList.php @@ -17,22 +17,13 @@ $allUidsRecords = array(); $allTasUids = array(); - $nonDuplicateAppUids = array(); + // getting all App Uids and task Uids foreach ($sentUids as $sentUid){ $aItem = explode('|',$sentUid); $allUidsRecords[] = array ( 'APP_UID' => $aItem[0] , 'TAS_UID' => $aItem[1], 'DEL_INDEX' => $aItem[2]); -// $allUidsRecords[] = array ( 'APP_UID' => $aItem[0] , 'TAS_UID' => $aItem[1] ); } - // filtering the cases with duplicated TasUids - foreach ($sentUids as $sentUid){ - $aItem = explode('|',$sentUid); - if (!in_array($aItem[1],$allTasUids)){ - $nonDuplicateAppUids[] = array ( 'APP_UID' => $aItem[0] , 'TAS_UID' => $aItem[1], 'DEL_INDEX' => $aItem[2]); - $allTasUids[] = $aItem[1]; - } - } - + $sReassignFromUser = isset($_POST['user']) ? $_POST['user'] : ''; $sProcessUid = isset($_POST['process']) ? $_POST['process'] : ''; @@ -46,27 +37,11 @@ $oGroups = new Groups (); $oUser = new Users (); $oCases = new Cases (); - -// $oAppCache = new AppCacheView(); -// $oCriteria = $oAppCache->getToReassignListCriteria(); -//// $oCriteria->( AppCacheViewPeer::APP_TAS_TITLE ); -// $oCriteria->add(AppCacheViewPeer::PRO_UID, $sProcessUid); -// $oCriteria->add(AppCacheViewPeer::USR_UID, $sReassignFromUser); -// $oCriteria->addGroupByColumn(AppCacheViewPeer::APP_TAS_TITLE); -//// $oCriteria->setDistinct(); -// -// $oDataset = AppCacheViewPeer::doSelectRS($oCriteria); -// $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); -// $oDataset->next(); -// $APP_UIDS = array(); -// -// while($aRow = $oDataset->getRow()){ -// $APP_UIDS[] = $aRow['APP_UID']; -// $oDataset->next(); -// } + $aCasesList = Array(); - - foreach ( $nonDuplicateAppUids as $aRecord ) { + $vard = 0; + foreach ( $allUidsRecords as $aRecord ) { + $vard = $vard + 1; $APP_UID = $aRecord['APP_UID']; $delIndex = $aRecord['DEL_INDEX']; $aCase = $oCases->loadCaseByDelegation($APP_UID,$delIndex); @@ -79,9 +54,7 @@ foreach ( $aCaseUsers as $aCaseUser ) { if ( $aCaseUser['USR_UID'] != $sReassignFromUser ) { $aCaseUserRecord = $oUser->load($aCaseUser['USR_UID']); - $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')'; -// $aUsersInvolved[$aCaseUser['USR_UID']] = $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']; // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')'; -// $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')'; + $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); // . ' (' . $aCaseUserRecord['USR_USERNAME'] } } } @@ -90,20 +63,14 @@ foreach ( $aCaseUsers as $aCaseUser ) { if ( $aCaseUser['USR_UID'] != $sReassignFromUser ) { $aCaseUserRecord = $oUser->load($aCaseUser['USR_UID']); -// $aUsersInvolved[$aCaseUser['USR_UID']] = $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']; // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')'; - $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')'; -// $aUsersInvolved[$aCaseUser['USR_UID']] = $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']; // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')'; -// $aUsersInvolved[$aCaseUser['USR_UID']] = $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']; // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')'; + $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); } } -// $oTmp = new stdClass(); -// $oTmp->items = $aUsersInvolved; $oTmp = $aUsersInvolved; -// $oTmp->id = $aCase['APP_UID']; $aCase['USERS'] = $oTmp; array_push($aCasesList, $aCase); } - + $filedNames = Array ( "APP_UID", "APP_NUMBER",