From 105953825ae0069134b777a464b0c6458b92b85a Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Mon, 26 May 2014 09:00:05 -0400 Subject: [PATCH 1/3] Se modifica end point de cases task --- .../src/ProcessMaker/BusinessModel/Cases.php | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index c9ae92176..41a0f6a56 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -1540,6 +1540,15 @@ class Cases $oCriteria->addSelectColumn(\ContentPeer::CON_VALUE); $oCriteria->addSelectColumn(\TaskPeer::TAS_START); $oCriteria->addSelectColumn(\TaskPeer::TAS_TYPE); + + $oCriteria->addSelectColumn(\TaskPeer::TAS_ASSIGN_TYPE); + $oCriteria->addSelectColumn(\TaskPeer::TAS_ASSIGN_LOCATION); + $oCriteria->addSelectColumn(\TaskPeer::TAS_ASSIGN_LOCATION_ADHOC); + $oCriteria->addSelectColumn(\TaskPeer::TAS_LAST_ASSIGNED); + $oCriteria->addSelectColumn(\TaskPeer::TAS_START); + $oCriteria->addSelectColumn(\TaskPeer::TAS_TO_LAST_USER); + $oCriteria->addSelectColumn(\TaskPeer::TAS_DERIVATION); + $aConditions = array(); $aConditions[] = array(0 => \TaskPeer::TAS_UID, 1 => \ContentPeer::CON_ID); $aConditions[] = array(0 => \ContentPeer::CON_CATEGORY, 1 => \DBAdapter::getStringDelimiter() . 'TAS_TITLE' . \DBAdapter::getStringDelimiter() ); @@ -1584,6 +1593,15 @@ class Cases $oTask->tas_title = htmlentities($aRow1['CON_VALUE'], ENT_QUOTES, 'UTF-8'); } } + + $oTask->tas_assign_type = $aRow1['TAS_ASSIGN_TYPE']; + $oTask->tas_assign_location = $aRow1['TAS_ASSIGN_LOCATION']; + $oTask->tas_assign_location_adhoc = $aRow1['TAS_ASSIGN_LOCATION_ADHOC']; + $oTask->tas_last_assigned = $aRow1['TAS_LAST_ASSIGNED']; + $oTask->tas_start = $aRow1['TAS_START']; + $oTask->tas_to_last_user = $aRow1['TAS_TO_LAST_USER']; + $oTask->tas_derivation = $aRow1['TAS_DERIVATION']; + $oTask->routing = new \StdClass(); $oTask->routing->rou_type = ''; $oTask->routing->to = array(); @@ -1609,30 +1627,8 @@ class Cases $oDataset2 = \AppDelegationPeer::doSelectRS($oCriteria); $oDataset2->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $oDataset2->next(); + while ($aRow2 = $oDataset2->getRow()) { - switch ($aRow2['ROU_TYPE']) { - case 'SEQUENTIAL': - $aRow2['ROU_TYPE'] = 0; - break; - case 'SELECT': - $aRow2['ROU_TYPE'] = 1; - break; - case 'EVALUATE': - $aRow2['ROU_TYPE'] = 2; - break; - case 'PARALLEL': - $aRow2['ROU_TYPE'] = 3; - break; - case 'PARALLEL-BY-EVALUATION': - $aRow2['ROU_TYPE'] = 4; - break; - case 'SEC-JOIN': - $aRow2['ROU_TYPE'] = 5; - break; - case 'DISCRIMINATOR': - $aRow2['ROU_TYPE'] = 8; - break; - } $iDiff = strtotime($aRow2['DEL_FINISH_DATE']) - strtotime($aRow2['DEL_INIT_DATE']); $oTo = new \StdClass(); $oTo->rou_next_task = $aRow2['ROU_NEXT_TASK']; @@ -1673,22 +1669,22 @@ class Cases $aRow2['FINISH'] = ''; } if (empty($aRow2["FINISH"]) && $aRow1["TAS_UID"] == $sTask) { - $oTask->color = "#FF0000"; //Red + $oTask->status = G::LoadTranslation( 'ID_TASK_IN_PROGRESS' ); } else { if (!empty($aRow2["FINISH"])) { - $oTask->color = "#006633"; //Green + $oTask->status = G::LoadTranslation( 'ID_COMPLETED_TASK' ); } else { - if ($oTask->routing->rou_type != 5) { + if ($oTask->routing->rou_type != 'SEC-JOIN') { if ($aRow2["CANT"] != 0) { - $oTask->color = "#FF0000"; //Red + $oTask->status = G::LoadTranslation( 'ID_TASK_IN_PROGRESS' ); } else { - $oTask->color = "#939598"; //Gray + $oTask->status = G::LoadTranslation( 'ID_PENDING_TASK' ); } } else { if ($aRow3) { - $oTask->color = "#FF0000"; //Red + $oTask->status = G::LoadTranslation( 'ID_TASK_IN_PROGRESS' ); } else { - $oTask->color = "#939598"; //Gray + $oTask->status = G::LoadTranslation( 'ID_PENDING_TASK' ); } } } @@ -1717,19 +1713,19 @@ class Cases $aRow2['FINISH'] = ''; } if (empty($aRow2["FINISH"]) && $aRow1["TAS_UID"] == $sTask) { - $oTask->color = "#FF0000"; //Red + $oTask->status = G::LoadTranslation( 'ID_TASK_IN_PROGRESS' ); } else { if (!empty($aRow2["FINISH"])) { - $oTask->color = "#006633"; //Green + $oTask->status = G::LoadTranslation( 'ID_COMPLETED_TASK' ); } else { - if ($oTask->routing->rou_type != 5) { + if ($oTask->routing->rou_type != 'SEC-JOIN') { if ($aRow2["CANT"] != 0) { - $oTask->color = "#FF0000"; //Red + $oTask->status = G::LoadTranslation( 'ID_TASK_IN_PROGRESS' ); } else { - $oTask->color = "#939598"; //Gray + $oTask->status = G::LoadTranslation( 'ID_PENDING_TASK' ); } } else { - $oTask->color = "#FF9900"; //Yellow + $oTask->status = G::LoadTranslation( 'ID_PARALLEL_TASK' ); } } } @@ -1743,4 +1739,4 @@ class Cases throw $e; } } -} \ No newline at end of file +} From d205e8b4eb69de7e5ee2dc7c8f1d901dae3a0b7f Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Mon, 9 Jun 2014 10:04:55 -0400 Subject: [PATCH 2/3] BUG-15041 "Inactive Groups are display in list of available..." SOLVED - Inactive Groups are display in list of available groups - Added condition to only get active groups --- workflow/engine/classes/class.processMap.php | 2 +- workflow/engine/classes/model/Groupwf.php | 1 - workflow/engine/src/ProcessMaker/BusinessModel/Task.php | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 78d6e8233..e5a8013ae 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -1239,7 +1239,7 @@ class processMap $result = $groups->getAllGroup($start, $limit, $filter); $c = 0; foreach ($result['rows'] as $results) { - if (!in_array($results['GRP_UID'], $aUIDS1)) { + if ($results["GRP_STATUS"] == "ACTIVE" && !in_array($results["GRP_UID"], $aUIDS1)) { $c++; $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn('COUNT(*) AS MEMBERS_NUMBER'); diff --git a/workflow/engine/classes/model/Groupwf.php b/workflow/engine/classes/model/Groupwf.php index 39675b78a..3d25fee22 100755 --- a/workflow/engine/classes/model/Groupwf.php +++ b/workflow/engine/classes/model/Groupwf.php @@ -347,7 +347,6 @@ class Groupwf extends BaseGroupwf $criteria->addSelectColumn( GroupwfPeer::GRP_STATUS ); $criteria->addSelectColumn( GroupwfPeer::GRP_UX ); $criteria->addAsColumn( 'GRP_TITLE', ContentPeer::CON_VALUE ); - $criteria->addSelectColumn( ContentPeer::CON_VALUE, 'COCHALO' ); $criteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN ); $criteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); $criteria->add( ContentPeer::CON_LANG, SYS_LANG ); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index c6cac2c64..71e66a64e 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -900,6 +900,7 @@ class Task $criteria->addSelectColumn( \GroupwfPeer::GRP_UX ); $criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE ); $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN ); + $criteria->add(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL); $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); $criteria->add( \ContentPeer::CON_LANG, SYS_LANG ); $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); From 3fffdece417317ec62a0b9b06e4e6f01ba677639 Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Mon, 9 Jun 2014 10:58:45 -0400 Subject: [PATCH 3/3] Fix harcoded labels by a translation ID Users country, city and location --- workflow/engine/src/ProcessMaker/BusinessModel/User.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/User.php b/workflow/engine/src/ProcessMaker/BusinessModel/User.php index 63a8058bc..e1e1f061d 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/User.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/User.php @@ -223,7 +223,7 @@ class User if ($form['USR_COUNTRY'] != '') { $oCountry = \IsoCountryPeer::retrieveByPK($form['USR_COUNTRY']); if (is_null($oCountry)) { - throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array($form['USR_COUNTRY']))); + throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('usr_country'))); } } } @@ -231,7 +231,7 @@ class User if ($form['USR_CITY'] != '') { $oCity = \IsoSubdivisionPeer::retrieveByPK($form['USR_COUNTRY'], $form['USR_CITY']); if (is_null($oCity)) { - throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array($form['USR_CITY']))); + throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('usr_city'))); } } } @@ -239,7 +239,7 @@ class User if ($form['USR_LOCATION'] != '') { $oLocation = \IsoLocationPeer::retrieveByPK($form['USR_COUNTRY'], $form['USR_LOCATION']); if (is_null($oLocation)) { - throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array($form['USR_LOCATION']))); + throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('usr_location'))); } } }