fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/3.2' of bitbucket.org:colosa/processmaker into feature/HOR-2440

Browse Source
This commit is contained in:
Paula Quispe
2017-02-09 12:50:46 -04:00
parent 6cc5a15d49 1ba069ffee
commit 67cad7a073
41 changed files with 579 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/model/AdditionalTables.php
View File

@@ -778,6 +778,10 @@ class AdditionalTables extends BaseAdditionalTables
// quick fix
// map all empty values as NULL for Database
foreach ($caseData as $dKey => $dValue) {
if (is_array($dValue) && count($dValue)) {
$j = key($dValue);
$dValue = (is_array($dValue[$j])) ? $dValue : $dValue[$j];
}
if (!is_array($dValue)) {
foreach ($fieldTypes as $key => $fieldType) {
foreach ($fieldType as $name => $theType) {
@@ -897,6 +901,10 @@ class AdditionalTables extends BaseAdditionalTables
$caseData = unserialize($caseData);
}
foreach ($caseData as $i => $v) {
if (is_array($v) && count($v)) {
$j = key($v);
$v = (is_array($v[$j])) ? $v : $v[$j];
}
foreach ($fieldTypes as $key => $fieldType) {
foreach ($fieldType as $name => $type) {
if ( strtoupper ( $i) == $name) {

11
workflow/engine/classes/model/AppDelegation.php
View File

@@ -447,6 +447,7 @@ class AppDelegation extends BaseAppDelegation
//Get Task properties
$task = TaskPeer::retrieveByPK( $this->getTasUid() );
$aData = array();
$aData['TAS_UID'] = $this->getTasUid();
//Added to allow User defined Timing Control at Run time from Derivation screen
if (isset( $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] ) && $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] == 'true') {
@@ -476,7 +477,7 @@ class AppDelegation extends BaseAppDelegation
//Calendar - Use the dates class to calculate dates
$calendar = new calendar();
$arrayCalendarData = array();
$arrayCalendarData = $calendar->getCalendarData($aCalendarUID);
if ($calendar->pmCalendarUid == "") {
$calendar->getCalendar(null, $this->getProUid(), $this->getTasUid());
@@ -485,11 +486,11 @@ class AppDelegation extends BaseAppDelegation
}
//Due date
/*$iDueDate = $calendar->calculateDate( $this->getDelDelegateDate(), $aData['TAS_DURATION'], $aData['TAS_TIMEUNIT'] //hours or days, ( we only accept this two types or maybe weeks
);*/
$dueDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), $aData["TAS_DURATION"], $aData["TAS_TIMEUNIT"], $arrayCalendarData);
$initDate = $this->getDelDelegateDate();
$timeZone = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($initDate);
$dueDate = $calendar->dashCalculateDate($timeZone, $aData["TAS_DURATION"], $aData["TAS_TIMEUNIT"], $arrayCalendarData);
//Return
$dueDate = \ProcessMaker\Util\DateTime::convertDataToUtc($dueDate);
return $dueDate;
}

22
workflow/engine/classes/model/ProcessUser.php
View File

@@ -97,21 +97,21 @@ class ProcessUser extends BaseProcessUser
{
try {
$oCriteria = new Criteria();
$oCriteria->add( ProcessUserPeer::PRO_UID, $proUid );
$oCriteria->add( ProcessUserPeer::PU_TYPE, 'SUPERVISOR' );
$oCriteria->add( ProcessUserPeer::USR_UID, $usrUid );
$dataset = ProcessUserPeer::doSelectRS( $oCriteria );
$dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oCriteria->add(ProcessUserPeer::PRO_UID, $proUid);
$oCriteria->add(ProcessUserPeer::PU_TYPE, 'SUPERVISOR');
$oCriteria->add(ProcessUserPeer::USR_UID, $usrUid);
$dataset = ProcessUserPeer::doSelectRS($oCriteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
//If the user is in Assigned supervisors list
if($dataset->next()){
if ($dataset->next()) {
return true;
} else {
//If the user is in a group in Assigned supervisors list
$oCriteria = new Criteria();
$oCriteria->add( ProcessUserPeer::PRO_UID, $proUid );
$oCriteria->add( ProcessUserPeer::PU_TYPE, 'GROUP_SUPERVISOR');
$dataset = ProcessUserPeer::doSelectRS( $oCriteria );
$dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oCriteria->add(ProcessUserPeer::PRO_UID, $proUid);
$oCriteria->add(ProcessUserPeer::PU_TYPE, 'GROUP_SUPERVISOR');
$dataset = ProcessUserPeer::doSelectRS($oCriteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oGroups = new Groups();
$aGroups = $oGroups->getActiveGroupsForAnUser($usrUid);
while ($dataset->next()) {
@@ -119,8 +119,6 @@ class ProcessUser extends BaseProcessUser
$groupUid = $row['USR_UID'];
if (in_array($groupUid, $aGroups)) {
return true;
} else {
return false;
}
}
return false;

1
workflow/engine/classes/model/Task.php
View File

@@ -409,6 +409,7 @@ class Task extends BaseTask
$this->setTasPosx("");
$this->setTasPosy("");
$this->setTasColor("");
$this->setTasGroupVariable("");
$this->fromArray($aData,BasePeer::TYPE_FIELDNAME);
if ($this->validate()) {