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

Merged in dheeyi/processmaker/PM-1185 (pull request #2186)

Browse Source 
PM-1185 Los triggers UserInfo y WSInformationUser despliegan el codigo del calendar y del campo replaced by en lugar de la descripción.
This commit is contained in:
Julio Cesar Laura Avendaño
2015-05-21 17:01:10 -04:00
parent d8a2ac26f2 7622719cb6
commit 8fdcabed56
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/classes/model/CalendarDefinition.php
View File

@@ -450,5 +450,14 @@ class CalendarDefinition extends BaseCalendarDefinition
$oDataset->next();
return $oDataset->getRow();
}
public function calendarName ($calendarUid)
{
$tr = CalendarDefinitionPeer::retrieveByPK( $calendarUid );
if ((is_object( $tr ) && get_class( $tr ) == 'CalendarDefinition')) {
return $tr->getCalendarName();
}
return false;
}
}

13
workflow/engine/classes/model/Users.php
View File

@@ -261,7 +261,7 @@ class Users extends BaseUsers
//Calendar
$calendar = new Calendar();
$calendarInfo = $calendar->getCalendarFor( $userUid, $userUid, $userUid );
$aFields["USR_CALENDAR"] = ($calendarInfo["CALENDAR_APPLIED"] != "DEFAULT") ? $calendarInfo["CALENDAR_UID"] : "";
$aFields["USR_CALENDAR"] = ($calendarInfo["CALENDAR_APPLIED"] != "DEFAULT") ? $calendarInfo["CALENDAR_UID"] : "";
//Photo
$pathPhoto = PATH_IMAGES_ENVIRONMENT_USERS . $userUid . ".gif";
@@ -287,10 +287,21 @@ class Users extends BaseUsers
$arrayData["birthday"] = $aFields["USR_BIRTHDAY"];
$arrayData["position"] = $aFields["USR_POSITION"];
$arrayData["replacedby"] = $aFields["USR_REPLACED_BY"];
if(strlen($arrayData["replacedby"] != 0)){
$oUser = UsersPeer::retrieveByPK( $arrayData["replacedby"] );
$arrayData["replacedbyfullname"] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();
}
$arrayData["duedate"] = $aFields["USR_DUE_DATE"];
$arrayData["calendar"] = $aFields["USR_CALENDAR"];
if(strlen($aFields["USR_CALENDAR"] != 0)){
$arrayData["calendarname"] = $calendar->calendarName( $aFields["USR_CALENDAR"] );
}
$arrayData["status"] = $aFields["USR_STATUS"];
$arrayData["department"] = $aFields["DEP_UID"];
if (strlen($arrayData["department"]) != 0) {
$oDepart = DepartmentPeer::retrieveByPk( $arrayData["department"] );
$arrayData["departmentname"] = $oDepart->getDepTitle();
}
$arrayData["reportsto"] = $aFields["USR_REPORTS_TO"];
$arrayData["userexperience"] = $aFields["USR_UX"];
$arrayData["photo"] = $pathPhoto;