From 7fae3b581b8465d1d54320c7b8b3f232f3202c20 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Wed, 13 Feb 2013 11:49:57 -0400 Subject: [PATCH 1/4] Change label for web service TaskCase --- workflow/engine/xmlform/setup/wsrTaskCase.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/xmlform/setup/wsrTaskCase.xml b/workflow/engine/xmlform/setup/wsrTaskCase.xml index 5a4f7ba86..e0ffb9530 100755 --- a/workflow/engine/xmlform/setup/wsrTaskCase.xml +++ b/workflow/engine/xmlform/setup/wsrTaskCase.xml @@ -2,7 +2,7 @@ - Del Index + Task Uid @@ -13,4 +13,4 @@ Delegate Index - \ No newline at end of file + \ No newline at end of file From f9022a7cf5be95ffab57ad3b80e9b2011864d2ab Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Wed, 13 Feb 2013 12:15:09 -0400 Subject: [PATCH 2/4] BUG 10808 Error assigning Porcess Permissions or Process Supervisor SOLVED - Missing validation when "glob" function return a boolean value - Add validation --- gulliver/system/class.xmlform.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index f73f48a2f..a5ff6fed6 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -5123,8 +5123,10 @@ class XmlForm $newVersion = false; if ($forceParse || ((! file_exists( $this->parsedFile )) || (filemtime( $filename ) > filemtime( $this->parsedFile )) || (filemtime( __FILE__ ) > filemtime( $this->parsedFile ))) || (! file_exists( $this->scriptFile )) || (filemtime( $filename ) > filemtime( $this->scriptFile ))) { - foreach (glob( $filesToDelete ) as $fileToDelete) { - @unlink( $fileToDelete ); + if (glob( $filesToDelete )) { + foreach (glob( $filesToDelete ) as $fileToDelete) { + @unlink( $fileToDelete ); + } } $this->tree = new Xml_Document(); $this->tree->parseXmlFile( $filename ); From eacaf16ed2a9f478d4ef23119d8df2ebc3f76e82 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Wed, 13 Feb 2013 12:53:19 -0400 Subject: [PATCH 3/4] Change label for ws TaskCase --- .../content/translations/english/processmaker.en.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index b81802c71..390693aa0 100644 --- 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 master) 2.0.46-testing.5-223-gcdc0cdf\n" +"Project-Id-Version: ProcessMaker (Branch master) 2.0.46-testing.5-230-gf9022a7\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2013-02-08 13:33:52\n" +"PO-Revision-Date: 2013-02-13 12:52:08\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -29456,8 +29456,8 @@ msgstr "Role Title" # setup/wsrTaskCase.xml?guid # setup/wsrTaskCase.xml #: text - guid -msgid "[setup/wsrTaskCase.xml?guid] Del Index" -msgstr "Del Index" +msgid "Task Uid" +msgstr "Task Uid" # setup/wsrTaskCase.xml?name # setup/wsrTaskCase.xml From 670a713e92989780664046001abab012245f5283 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Wed, 13 Feb 2013 14:10:20 -0400 Subject: [PATCH 4/4] BUG 0000 "Improvement in the cases list" SOLVED - Problem in the ordering of the column in cases list - Validation for the ordering of the column - Improvement in the cases list using the field DEL_LAST_INDEX - Improvement in the cases list columns current user and current task - Improvement in the cases list when solr is enabled and disabled - Added column currrent user in participated * Available from version ProcessMaker-2.0.46 --- workflow/engine/classes/class.AppSolr.php | 55 +++++++++++++++++-- .../engine/classes/class.applications.php | 37 ++++++++++++- .../engine/classes/class.configuration.php | 39 ++++++------- .../engine/methods/cases/proxyCasesList.php | 2 +- workflow/engine/templates/cases/casesList.js | 6 +- 5 files changed, 108 insertions(+), 31 deletions(-) diff --git a/workflow/engine/classes/class.AppSolr.php b/workflow/engine/classes/class.AppSolr.php index b46056cf5..7bfb72a64 100644 --- a/workflow/engine/classes/class.AppSolr.php +++ b/workflow/engine/classes/class.AppSolr.php @@ -816,9 +816,9 @@ class AppSolr $localDate = date( 'Y-m-d H:i:s', strtotime( $solrdate ) ); $aRow['APP_CREATE_DATE'] = $localDate; - $solrdate = $data["DEL_LAST_UPDATE_DATE"]; - $localDate = date( 'Y-m-d H:i:s', strtotime( $solrdate ) ); - $aRow['APP_UPDATE_DATE'] = $localDate; + //$solrdate = $data["DEL_LAST_UPDATE_DATE"]; + //$localDate = date( 'Y-m-d H:i:s', strtotime( $solrdate ) ); + //$aRow['APP_UPDATE_DATE'] = $localDate; // get delegation data from DB //filter data from db @@ -839,7 +839,7 @@ class AppSolr $aRow['APP_FINISH_DATE'] = null; - $aRow['APP_CURRENT_USER'] = $row['USR_NAME'] . " " . $row['USR_LAST']; + $aRow["APP_CURRENT_USER"] = (!empty($row["USR_NAME"]) || !empty($row["USR_LAST"]))? $row["USR_NAME"] . " " . $row["USR_LAST"] : "[" . strtoupper(G::LoadTranslation("ID_UNASSIGNED")) . "]"; $aRow['APP_DEL_PREVIOUS_USER'] = $row['USR_PREV_NAME'] . " " . $row['USR_PREV_LAST']; $aRow['APP_OVERDUE_PERCENTAGE'] = $row['APP_OVERDUE_PERCENTAGE']; $aRow['APP_TAS_TITLE'] = $row['APP_TAS_TITLE']; @@ -865,6 +865,8 @@ class AppSolr $aRow["APP_STATUS"] = G::LoadTranslation("ID_" . $aRow["APP_STATUS"]); } + $aRow["APP_UPDATE_DATE"] = $row["APP_UPDATE_DATE"]; + $rows[] = $aRow; } } @@ -951,6 +953,8 @@ class AppSolr */ public function getListApplicationDelegationData($arrayAppUid, $action, $appStatus) { + $appCacheView = new AppCacheView(); + $c = new Criteria(); $c->addSelectColumn( AppDelegationPeer::APP_UID ); @@ -978,6 +982,7 @@ class AppSolr $c->addSelectColumn( AppDelegationPeer::DEL_TASK_DUE_DATE ); $c->addSelectColumn( AppDelegationPeer::DEL_THREAD_STATUS ); $c->addSelectColumn( AppDelegationPeer::TAS_UID ); + $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); $c->addAlias("u", UsersPeer::TABLE_NAME); $c->addAlias("uprev", UsersPeer::TABLE_NAME); @@ -1011,6 +1016,34 @@ class AppSolr $arrayCondition[] = array(AppDelegationPeer::DEL_THREAD, "at.APP_THREAD_INDEX"); $c->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); + //Current delegation + $c->addAlias("APPDEL", AppDelegationPeer::TABLE_NAME); + $c->addAlias("USRCR", UsersPeer::TABLE_NAME); + + $arrayCondition = array(); + $arrayCondition[] = array(AppDelegationPeer::APP_UID, "APPDEL.APP_UID"); + $arrayCondition[] = array("APPDEL.DEL_LAST_INDEX", 1); + $c->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); + + $arrayCondition = array(); + $arrayCondition[] = array("APPDEL.USR_UID", "USRCR.USR_UID"); + $c->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); + + $c->addAsColumn("USRCR_USR_UID", "USRCR.USR_UID"); + $c->addAsColumn("USRCR_USR_FIRSTNAME", "USRCR.USR_FIRSTNAME"); + $c->addAsColumn("USRCR_USR_LASTNAME", "USRCR.USR_LASTNAME"); + $c->addAsColumn("USRCR_USR_USERNAME", "USRCR.USR_USERNAME"); + + $c->addAlias("CONTASKCR", ContentPeer::TABLE_NAME); + + $arrayCondition = array(); + $arrayCondition[] = array("APPDEL.TAS_UID", "CONTASKCR.CON_ID"); + $arrayCondition[] = array("CONTASKCR.CON_CATEGORY", DBAdapter::getStringDelimiter() . "TAS_TITLE" . DBAdapter::getStringDelimiter()); + $arrayCondition[] = array("CONTASKCR.CON_LANG", DBAdapter::getStringDelimiter() . "en" . DBAdapter::getStringDelimiter()); + $c->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); + + $c->addAsColumn("CONTASKCR_APP_TAS_TITLE", "CONTASKCR.CON_VALUE"); + $c->add(AppDelegationPeer::APP_UID, $arrayAppUid, Criteria::IN); //$c->add (AppDelegationPeer::DEL_INDEX, $delIndex); @@ -1021,8 +1054,6 @@ class AppSolr } break; default: - $appCacheView = new AppCacheView(); - //Paused $sqlAppDelay = $appCacheView->getAppDelaySql(AppDelegationPeer::APP_UID, AppDelegationPeer::DEL_INDEX); @@ -1099,7 +1130,19 @@ class AppSolr $appDataRows = array (); while (is_array( $row )) { + //Current delegation + if ($action == "sent" || $action == "search" || $action == "simple_search" || $action == "to_revise" || $action == "to_reassign") { + //Current task + $row["APP_TAS_TITLE"] = $row["CONTASKCR_APP_TAS_TITLE"]; + + //Current user + $row["USR_NAME"] = $row["USRCR_USR_FIRSTNAME"]; + $row["USR_LAST"] = $row["USRCR_USR_LASTNAME"]; + } + + //Set data $appDataRows[] = $row; + $rs->next(); $row = $rs->getRow(); } diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index 9f4974bec..fe0a080bc 100644 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -154,7 +154,26 @@ class Applications $Criteria->addAsColumn( 'USR_LASTNAME', 'CU.USR_LASTNAME' ); $Criteria->addAsColumn( 'USR_USERNAME', 'CU.USR_USERNAME' ); - // Fix for previous user + //Current delegation + $Criteria->addAlias("APPCVCR", AppCacheViewPeer::TABLE_NAME); + $Criteria->addAlias("USRCR", UsersPeer::TABLE_NAME); + + $arrayCondition = array(); + $arrayCondition[] = array(AppCacheViewPeer::APP_UID, "APPCVCR.APP_UID"); + $arrayCondition[] = array("APPCVCR.DEL_LAST_INDEX", 1); + $Criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); + + $arrayCondition = array(); + $arrayCondition[] = array("APPCVCR.USR_UID", "USRCR.USR_UID"); + $Criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); + + $Criteria->addAsColumn("APPCVCR_APP_TAS_TITLE", "APPCVCR.APP_TAS_TITLE"); + $Criteria->addAsColumn("USRCR_USR_UID", "USRCR.USR_UID"); + $Criteria->addAsColumn("USRCR_USR_FIRSTNAME", "USRCR.USR_FIRSTNAME"); + $Criteria->addAsColumn("USRCR_USR_LASTNAME", "USRCR.USR_LASTNAME"); + $Criteria->addAsColumn("USRCR_USR_USERNAME", "USRCR.USR_USERNAME"); + + //Previous user if (($action == "todo" || $action == "selfservice" || $action == "unassigned" || $action == "paused" || $action == "to_revise" || $action == "sent") || ($status == "TO_DO" || $status == "DRAFT" || $status == "PAUSED" || $status == "CANCELLED" || $status == "COMPLETED")) { $Criteria->addAlias( 'PU', 'USERS' ); $Criteria->addJoin( AppCacheViewPeer::PREVIOUS_USR_UID, 'PU.USR_UID', Criteria::LEFT_JOIN ); @@ -397,7 +416,6 @@ class Applications while ($aRow = $oDataset->getRow()) { //$aRow = $oAppCache->replaceRowUserData($aRow); - /* * For participated cases, we want the last step in the case, not only the last step this user participated. To do that we get every case information again for the last step. (This could be solved by a subquery, but Propel might not support it and subqueries can be slower for larger * datasets). @@ -421,8 +439,21 @@ class Applications $maxDataset->close(); }*/ + //Current delegation + if ($action == "sent" || $action == "search" || $action == "simple_search" || $action == "to_revise" || $action == "to_reassign") { + //Current task + $aRow["APP_TAS_TITLE"] = $aRow["APPCVCR_APP_TAS_TITLE"]; + + //Current user + $aRow["USR_UID"] = $aRow["USRCR_USR_UID"]; + $aRow["USR_FIRSTNAME"] = $aRow["USRCR_USR_FIRSTNAME"]; + $aRow["USR_LASTNAME"] = $aRow["USRCR_USR_LASTNAME"]; + $aRow["USR_USERNAME"] = $aRow["USRCR_USR_USERNAME"]; + } + + //Unassigned user if (! isset( $aRow['APP_CURRENT_USER'] )) { - $aRow['APP_CURRENT_USER'] = "[Unassigned]"; + $aRow['APP_CURRENT_USER'] = "[" . strtoupper(G::LoadTranslation("ID_UNASSIGNED")) . "]"; } // replacing the status data with their respective translation diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index 5048b7a81..6fb38a9f8 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -519,11 +519,11 @@ class Configurations // extends Configuration switch ($action) { case "draft": $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center"); + $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" => ($translation == 1)? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150); - $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" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_DUE_DATE") : "**ID_DUE_DATE**", "dataIndex" => "DEL_TASK_DUE_DATE", "width" => 110); @@ -551,10 +551,10 @@ class Configurations // extends Configuration break; case "paused": $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center"); + $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150); - $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90); @@ -586,11 +586,11 @@ class Configurations // extends Configuration $caseReaderFields[] = array("name" => "CASE_NOTES_COUNT"); break; case "unassigned": - $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 40, "align" => "left"); + $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center"); + $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150); - $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90); @@ -624,13 +624,14 @@ class Configurations // extends Configuration case "sent": case "participated": $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center"); + $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" => ($translation == 1)? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150); - $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" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120); + $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 120, "sortable" => true); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 80); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_STATUS") : "**ID_STATUS**", "dataIndex" => "APP_STATUS", "width" => 50); @@ -659,13 +660,13 @@ class Configurations // extends Configuration case "search": case "simple_search": $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center"); - $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false); - $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false); - $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 100); $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" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120); + $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false); + $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false); + $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120); + $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120); //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 120 ); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 120, "sortable" => true); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 80); @@ -695,11 +696,11 @@ class Configurations // extends Configuration break; case "to_revise": $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center"); + $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" => ($translation == 1)? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150); - $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" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90); @@ -732,11 +733,11 @@ class Configurations // extends Configuration $caseReaderFields[] = array("name" => "CASE_NOTES_COUNT"); break; case "to_reassign": - $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false); - $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false); + $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center"); $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"); + $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false); + $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120); @@ -763,11 +764,11 @@ class Configurations // extends Configuration break; case "gral": $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center"); + $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" => ($translation == 1)? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150); - $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" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 90, "sortable" => false); @@ -793,10 +794,10 @@ class Configurations // extends Configuration default: //todo $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center"); + $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150); - $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90); diff --git a/workflow/engine/methods/cases/proxyCasesList.php b/workflow/engine/methods/cases/proxyCasesList.php index c34925477..e5f7088d8 100755 --- a/workflow/engine/methods/cases/proxyCasesList.php +++ b/workflow/engine/methods/cases/proxyCasesList.php @@ -106,7 +106,7 @@ try { $dateTo, $callback, $dir, - $sort, + (strpos($sort, ".") !== false)? $sort : "APP_CACHE_VIEW." . $sort, $category ); diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index fe97c7636..994402928 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -518,6 +518,8 @@ Ext.onReady ( function() { if( c.id == 'unpauseLink') c.renderer = unpauseLink; if( c.dataIndex == 'CASE_SUMMARY') c.renderer = renderSummary; if( c.dataIndex == 'CASE_NOTES_COUNT') c.renderer = renderNote; + + //Format the name if is disabled solr, otherwise show without format if (solrEnabled == 0) { if( c.dataIndex == 'APP_DEL_PREVIOUS_USER') c.renderer = previous_full_name; if( c.dataIndex == 'APP_CURRENT_USER') c.renderer = full_name; @@ -1114,7 +1116,7 @@ Ext.onReady ( function() { var btnSearch = new Ext.Button ({ text: _('ID_SEARCH'), iconCls: 'button_menu_ext ss_sprite ss_page_find', - //cls: 'x-form-toolbar-standardButton', + //cls: 'x-form-toolbar-standardButton', handler: doSearch }); @@ -1122,7 +1124,7 @@ Ext.onReady ( function() { //var viewText = Ext.getCmp('casesGrid').getView(); viewText.emptyText = _('ID_NO_RECORDS_FOUND'); //Ext.getCmp('casesGrid').getView().refresh(); - + searchText = textSearch.getValue(); storeCases.setBaseParam( 'search', searchText); storeCases.load({params:{ start : 0 , limit : pageSize }});