From 7622719cb6030ce8cabe38cadaa501c293361a04 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Wed, 20 May 2015 12:02:54 -0400 Subject: [PATCH] =?UTF-8?q?PM-1185=20Los=20triggers=20UserInfo=20y=20WSInf?= =?UTF-8?q?ormationUser=20despliegan=20el=20codigo=20del=20calendar=20y=20?= =?UTF-8?q?del=20campo=20replaced=20by=20en=20lugar=20de=20la=20descripci?= =?UTF-8?q?=C3=B3Causa=20:=20Definida=20asi.=20Soluci=C3=B3=20Se=20agrego?= =?UTF-8?q?=203=20campos=20mas=20que=20muestran=20su=20descripci=C3=B3:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/classes/model/Users.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php index 3cde3ad74..9b7ad4e9b 100755 --- a/workflow/engine/classes/model/Users.php +++ b/workflow/engine/classes/model/Users.php @@ -287,17 +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)){ + 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"] ); + 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;