fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in bugfix/HOR-3620 (pull request #5842)

Browse Source 
HOR-3620

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
David Callizaya
2017-08-04 14:16:59 +00:00
committed by Paula Quispe
parent ddfb4eea63 7e8ad3431d
commit f7f66824ca
14 changed files with 1112 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/bin/cron_single.php
View File

@@ -745,7 +745,7 @@ function executeCaseSelfService()
setExecutionMessage("Unassigned case"); setExecutionMessage("Unassigned case");
saveLog("unassignedCase", "action", "Unassigned case", "c"); saveLog("unassignedCase", "action", "Unassigned case", "c");
$calendar = new calendar(); $calendar = new Calendar();
while ($rsCriteria->next()) { while ($rsCriteria->next()) {

5
workflow/engine/classes/class.calendar.php → workflow/engine/classes/Calendar.php
View File

@@ -28,7 +28,6 @@
* @name calendar * @name calendar
* created 2010-03-22 * created 2010-03-22
* *
* @author Hugo Loza <hugo@colosa.com> 2010-03-22 *
*/ */
require_once ("classes/model/CalendarDefinition.php"); require_once ("classes/model/CalendarDefinition.php");
@@ -43,7 +42,7 @@ require_once ("classes/model/CalendarDefinition.php");
* @package workflow.engine.classes * @package workflow.engine.classes
* *
*/ */
class calendar extends CalendarDefinition class Calendar extends CalendarDefinition
{ {
public $pmCalendarUid = ''; public $pmCalendarUid = '';
public $pmCalendarData = array(); public $pmCalendarData = array();
@@ -316,7 +315,7 @@ class calendar extends CalendarDefinition
* @param string(32) $proUid * @param string(32) $proUid
* @param string(32) $tasUid * @param string(32) $tasUid
*/ */
function calendar ($userUid = NULL, $proUid = NULL, $tasUid = NULL) function Calendar ($userUid = NULL, $proUid = NULL, $tasUid = NULL)
{ {
$this->userUid = $userUid; $this->userUid = $userUid;
$this->proUid = $proUid; $this->proUid = $proUid;

2
workflow/engine/classes/class.dates.php
View File

@@ -74,7 +74,7 @@ class dates
{ {
//$oldDate=$this->calculateDate_noCalendar( $sInitDate, $iDuration, $sTimeUnit, $iTypeDay, $UsrUid, $ProUid, $TasUid); //$oldDate=$this->calculateDate_noCalendar( $sInitDate, $iDuration, $sTimeUnit, $iTypeDay, $UsrUid, $ProUid, $TasUid);
//Set Calendar when the object is instanced in this order/priority (Task, User, Process, Default) //Set Calendar when the object is instanced in this order/priority (Task, User, Process, Default)
$calendarObj = new calendar($UsrUid, $ProUid, $TasUid); $calendarObj = new Calendar($UsrUid, $ProUid, $TasUid);
//Get next Business Hours/Range based on : //Get next Business Hours/Range based on :
switch (strtoupper($sTimeUnit)) { switch (strtoupper($sTimeUnit)) {
case 'DAYS': case 'DAYS':

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

@@ -467,7 +467,7 @@ class AppDelegation extends BaseAppDelegation
} }
//Calendar - Use the dates class to calculate dates //Calendar - Use the dates class to calculate dates
$calendar = new calendar(); $calendar = new Calendar();
$arrayCalendarData = $calendar->getCalendarData($aCalendarUID); $arrayCalendarData = $calendar->getCalendarData($aCalendarUID);
@@ -503,7 +503,7 @@ class AppDelegation extends BaseAppDelegation
$riskTime = $data['TAS_DURATION'] - ($data['TAS_DURATION'] * $risk); $riskTime = $data['TAS_DURATION'] - ($data['TAS_DURATION'] * $risk);
//Calendar - Use the dates class to calculate dates //Calendar - Use the dates class to calculate dates
$calendar = new calendar(); $calendar = new Calendar();
$arrayCalendarData = array(); $arrayCalendarData = array();
@@ -537,11 +537,11 @@ class AppDelegation extends BaseAppDelegation
$rs->next(); $rs->next();
$row = $rs->getRow(); $row = $rs->getRow();
$i = 0; $i = 0;
$calendar = new calendar(); $calendar = new Calendar();
$now = new DateTime(); $now = new DateTime();
while (is_array ($row)) { while (is_array ($row)) {
$oAppDel = AppDelegationPeer::retrieveByPk( $row['APP_UID'], $row['DEL_INDEX'] ); $oAppDel = AppDelegationPeer::retrieveByPk( $row['APP_UID'], $row['DEL_INDEX'] );
$calendar = new calendar(); $calendar = new Calendar();
$calendar->getCalendar($row['USR_UID'], $row['PRO_UID'], $row['TAS_UID']); $calendar->getCalendar($row['USR_UID'], $row['PRO_UID'], $row['TAS_UID']);
$calData = $calendar->getCalendarData(); $calData = $calendar->getCalendarData();
$calculatedValues = $this->getValuesToStoreForCalculateDuration($row, $calendar, $calData, $now); $calculatedValues = $this->getValuesToStoreForCalculateDuration($row, $calendar, $calData, $now);

2
workflow/engine/classes/model/Application.php
View File

@@ -447,7 +447,7 @@ class Application extends BaseApplication
@file_put_contents( PATH_DATA . "cron", serialize( $arrayCron ) ); @file_put_contents( PATH_DATA . "cron", serialize( $arrayCron ) );
} }
$calendar = new calendar(); $calendar = new Calendar();
$c = new Criteria( 'workflow' ); $c = new Criteria( 'workflow' );
$c->clearSelectColumns(); $c->clearSelectColumns();

6
workflow/engine/classes/model/Event.php
View File

@@ -425,7 +425,7 @@ class Event extends BaseEvent
try { try {
$rowsCreated = 0; $rowsCreated = 0;
$rowsRejected = 0; $rowsRejected = 0;
$oCalendar = new calendar(); $oCalendar = new Calendar();
//SELECT //SELECT
// EVENT.PRO_UID, // EVENT.PRO_UID,
@@ -550,7 +550,7 @@ class Event extends BaseEvent
try { try {
$rowsCreated = 0; $rowsCreated = 0;
$rowsRejected = 0; $rowsRejected = 0;
$oCalendar = new calendar(); $oCalendar = new Calendar();
// SELECT TASK2.* , // SELECT TASK2.* ,
// EVENT.EVN_UID, EVENT.PRO_UID, EVENT.EVN_TAS_UID_FROM, // EVENT.EVN_UID, EVENT.PRO_UID, EVENT.EVN_TAS_UID_FROM,
// EVENT.EVN_TAS_ESTIMATED_DURATION, EVENT.EVN_WHEN, // EVENT.EVN_TAS_ESTIMATED_DURATION, EVENT.EVN_WHEN,
@@ -872,7 +872,7 @@ class Event extends BaseEvent
public function toCalculateTime ($aData, $iDate = null) public function toCalculateTime ($aData, $iDate = null)
{ {
$oCalendar = new calendar(); $oCalendar = new Calendar();
$iDate = isset( $iDate ) ? $iDate : date( 'Y-m-d H:i:s' ); $iDate = isset( $iDate ) ? $iDate : date( 'Y-m-d H:i:s' );

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

@@ -171,7 +171,7 @@ class UsersProperties extends BaseUsersProperties
} }
} }
if (PPP_EXPIRATION_IN > 0) { if (PPP_EXPIRATION_IN > 0) {
$oCalendar = new calendar(); $oCalendar = new Calendar();
if ($oCalendar->pmCalendarUid == '') { if ($oCalendar->pmCalendarUid == '') {
$oCalendar->pmCalendarUid = '00000000000000000000000000000001'; $oCalendar->pmCalendarUid = '00000000000000000000000000000001';

2
workflow/engine/controllers/admin.php
View File

@@ -84,7 +84,7 @@ class Admin extends Controller
//$RBAC->requirePermissions('PM_SETUP_ADVANCE'); //$RBAC->requirePermissions('PM_SETUP_ADVANCE');
$CalendarUid = str_replace( '"', '', isset( $_GET['id'] ) ? $_GET['id'] : G::GenerateUniqueID() ); $CalendarUid = str_replace( '"', '', isset( $_GET['id'] ) ? $_GET['id'] : G::GenerateUniqueID() );
$calendarObj = new calendar(); $calendarObj = new Calendar();
if ((isset( $_GET['id'] )) && ($_GET['id'] != "")) { if ((isset( $_GET['id'] )) && ($_GET['id'] != "")) {
$fields = $calendarObj->getCalendarInfoE( $CalendarUid ); $fields = $calendarObj->getCalendarInfoE( $CalendarUid );

2
workflow/engine/controllers/adminProxy.php
View File

@@ -293,7 +293,7 @@ class adminProxy extends HttpProxyController
//] //]
$form = $_POST; $form = $_POST;
$calendarObj=new calendar(); $calendarObj=new Calendar();
$calendarObj->saveCalendarInfo($form); $calendarObj->saveCalendarInfo($form);
echo "{success: true}"; echo "{success: true}";
} }

2
workflow/engine/methods/setup/calendarDelete.php
View File

@@ -3,7 +3,7 @@ try {
$CalendarUid = $_GET['id']; $CalendarUid = $_GET['id'];
$calendarObj = new calendar(); $calendarObj = new Calendar();
$calendarObj->deleteCalendar( $CalendarUid ); $calendarObj->deleteCalendar( $CalendarUid );
G::Header( 'location: calendarList' ); G::Header( 'location: calendarList' );

2
workflow/engine/methods/setup/calendarEdit.php
View File

@@ -34,7 +34,7 @@ $G_ID_SUB_MENU_SELECTED = 'CALENDAR';
$CalendarUid = str_replace( '"', '', isset( $_GET['id'] ) ? $_GET['id'] : G::GenerateUniqueID() ); $CalendarUid = str_replace( '"', '', isset( $_GET['id'] ) ? $_GET['id'] : G::GenerateUniqueID() );
//TODO: Add validation before save for all fields //TODO: Add validation before save for all fields
$calendarObj = new calendar(); $calendarObj = new Calendar();
if ((isset( $_GET['id'] )) && ($_GET['id'] != "")) { if ((isset( $_GET['id'] )) && ($_GET['id'] != "")) {
$fields = $calendarObj->getCalendarInfoE( $CalendarUid ); $fields = $calendarObj->getCalendarInfoE( $CalendarUid );
$fields['OLD_NAME'] = $fields['CALENDAR_NAME']; $fields['OLD_NAME'] = $fields['CALENDAR_NAME'];

2
workflow/engine/methods/setup/calendarSave.php
View File

@@ -37,7 +37,7 @@ switch ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' )) {
try { try {
$form = $_POST['form']; $form = $_POST['form'];
$calendarObj = new calendar(); $calendarObj = new Calendar();
$calendarObj->saveCalendarInfo( $form ); $calendarObj->saveCalendarInfo( $form );
G::Header( 'location: calendarList' ); G::Header( 'location: calendarList' );

6
workflow/engine/methods/setup/calendar_Ajax.php
View File

@@ -39,7 +39,7 @@ switch ($_POST['action']) {
$limit = isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : $limit_size; $limit = isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : $limit_size;
$filter = isset( $_REQUEST['textFilter'] ) ? $_REQUEST['textFilter'] : ''; $filter = isset( $_REQUEST['textFilter'] ) ? $_REQUEST['textFilter'] : '';
$calendar = new calendar(); $calendar = new Calendar();
$CRI = $calendar->getCalendarCriterias( $filter, $start, $limit ); $CRI = $calendar->getCalendarCriterias( $filter, $start, $limit );
$aUsers = $calendar->getAllCounterByCalendar( 'USER' ); $aUsers = $calendar->getAllCounterByCalendar( 'USER' );
@@ -73,7 +73,7 @@ switch ($_POST['action']) {
break; break;
case 'canDeleteCalendar': case 'canDeleteCalendar':
$cal_uid = $_POST['CAL_UID']; $cal_uid = $_POST['CAL_UID'];
$cal = new calendar(); $cal = new Calendar();
$total = 0; $total = 0;
$u = $cal->getAllCounterByCalendar( 'USER' ); $u = $cal->getAllCounterByCalendar( 'USER' );
$t_u = isset( $u[$cal_uid] ) ? $u[$cal_uid] : 0; $t_u = isset( $u[$cal_uid] ) ? $u[$cal_uid] : 0;
@@ -87,7 +87,7 @@ switch ($_POST['action']) {
break; break;
case 'deleteCalendar': case 'deleteCalendar':
$CalendarUid = $_POST['CAL_UID']; $CalendarUid = $_POST['CAL_UID'];
$calendarObj = new calendar(); $calendarObj = new Calendar();
$calendarObj->deleteCalendar( $CalendarUid ); $calendarObj->deleteCalendar( $CalendarUid );
echo '{success: true}'; echo '{success: true}';
break; break;