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

BUG-10181 Modificando la clase Calendar.

Browse Source 
Modificar las funciones de la clase Calendar para que ahora se realize el calculo de NewDate tomando en cuenta los weekends.
This commit is contained in:
jennylee
2013-11-26 17:36:40 -04:00
parent ddc9dbcd67
commit 1245dd6d3c
4 changed files with 597 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,6 @@ class AppDelegation extends BaseAppDelegation
$this->setDelTaskDueDate( $delTaskDueDate['DUE_DATE'] ); // Due date formatted
if ((defined( "DEBUG_CALENDAR_LOG" )) && (DEBUG_CALENDAR_LOG)) {
$this->setDelData( $delTaskDueDate['DUE_DATE_LOG'] ); // Log of actions made by Calendar Engine
} else {
@@ -291,11 +290,18 @@ class AppDelegation extends BaseAppDelegation
$aCalendarUID = '';
}
//use the dates class to calculate dates
$dates = new dates();
$iDueDate = $dates->calculateDate( $this->getDelDelegateDate(), $aData['TAS_DURATION'], $aData['TAS_TIMEUNIT'], //hours or days, ( we only accept this two types or maybe weeks
$aData['TAS_TYPE_DAY'], //working or calendar days
$this->getUsrUid(), $task->getProUid(), $aData['TAS_UID'], $aCalendarUID );
//use the dates class to calculate dates
$calendar = new calendar();
if ($calendar->pmCalendarUid == '') {
$calendar->getCalendar(null, $task->getProUid());
$calendar->getCalendarData();
}
$iDueDate = $calendar->calculateDate( $this->getDelDelegateDate(), $aData['TAS_DURATION'], $aData['TAS_TIMEUNIT'] //hours or days, ( we only accept this two types or maybe weeks
//$aData['TAS_TYPE_DAY'], //working or calendar days
// $this->getUsrUid(), $task->getProUid(), $aData['TAS_UID'], $aCalendarUID
);
return $iDueDate;
}

10
workflow/engine/classes/model/UsersProperties.php
View File

@@ -175,8 +175,14 @@ class UsersProperties extends BaseUsersProperties
}
if (PPP_EXPIRATION_IN > 0) {
G::LoadClass( 'dates' );
$oDates = new dates();
$fDays = $oDates->calculateDuration( date( 'Y-m-d H:i:s' ), $sLastUpdate );
$oCalendar = new calendar();
if ($calendar->pmCalendarUid == '') {
$calendar->getCalendar($this->usrID);
$calendar->getCalendarData();
}
$fDays = $oCalendar->calculateDuration( date( 'Y-m-d H:i:s' ), $sLastUpdate );
if ($fDays > (PPP_EXPIRATION_IN * 24)) {
$aErrors[] = 'ID_PPP_EXPIRATION_IN';
}