fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in luisfernandosl/processmaker/PM-356 (pull request #995)

Browse Source 
PM 356 "The description of process events..." SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2014-10-20 17:30:45 -04:00
parent 1ac8361d1d 6c3a5e872f
commit 269c4d293d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,10 @@ class Event extends BaseEvent
$aData['EVN_UID'] = G::generateUniqueID();
}
if (isset($aData["EVN_DESCRIPTION"])) {
$aData["EVN_DESCRIPTION"] = str_replace("__AMP__", "&", $aData["EVN_DESCRIPTION"]);
}
$oConnection = Propel::getConnection( EventPeer::DATABASE_NAME );
try {
$oEvent = new Event();
@@ -503,12 +507,12 @@ class Event extends BaseEvent
$estimatedDuration = (float) $aData['EVN_TAS_ESTIMATED_DURATION'];
$when = (float) $aData['EVN_WHEN'];
$whenOccurs = $aData['EVN_WHEN_OCCURS'];
if ($oCalendar->pmCalendarUid == '') {
$oCalendar->getCalendar(null, $aData['PRO_UID'], $aData['TAS_UID']);
$oCalendar->getCalendarData();
}
if ($whenOccurs == 'AFTER_TIME') {
//for multiple $sDueDate = date('Y-m-d H:i:s', $oDates->calculateDate($aData['DEL_DELEGATE_DATE'], $estimatedDuration, 'days', 1));
$sDueDate = $aData['DEL_TASK_DUE_DATE'];
@@ -619,7 +623,7 @@ class Event extends BaseEvent
$estimatedDuration = (float) $aData['EVN_TAS_ESTIMATED_DURATION'];
$when = (float) $aData['EVN_WHEN'];
$whenOccurs = $aData['EVN_WHEN_OCCURS'];
if ($oCalendar->pmCalendarUid == '') {
$oCalendar->getCalendar(null, $aData['PRO_UID'], $aData['TAS_UID']);
$oCalendar->getCalendarData();

2
workflow/engine/js/events/events.js
View File

@@ -14,7 +14,7 @@ var eventsNewAction = function(oForm) {
url : '../events/eventsNewAction',
method: 'POST',
args : 'PRO_UID=' + getField('PRO_UID').value
+ '&EVN_DESCRIPTION=' + getField('EVN_DESCRIPTION').value
+ "&EVN_DESCRIPTION=" + stringReplace("\\&", "__AMP__", getField("EVN_DESCRIPTION").value)
+ '&EVN_STATUS=' + getField('EVN_STATUS').value
+ '&EVN_WHEN=' + getField('EVN_WHEN').value
+ '&EVN_WHEN_OCCURS=' + getField('EVN_WHEN_OCCURS').value