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

Merge pull request #491 from marcoAntonioNina/BUG-9553

Browse Source 
BUG 9553 Event setup duration unit of measure is not displayed SOLVED
This commit is contained in:
julceslauhub
2012-08-21 08:44:06 -07:00
parent 3c428e2d41 efcd361449
commit 14705928a8
13 changed files with 238 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/xmlform/events/eventsEdit.html
View File

@@ -48,7 +48,7 @@
</tr>
<tr>
<td class='FormLabel' width="{$form_labelWidth}">{$EVN_TAS_ESTIMATED_DURATION}</td>
<td class='FormFieldContent' >{$form.EVN_TAS_ESTIMATED_DURATION} {$EVN_WHEN} </td>
<td class='FormFieldContent' >{$form.EVN_TAS_ESTIMATED_DURATION} {$form.EVN_TIME_UNIT} </td>
</tr>
<tr>
<td class='FormLabel' width="{$form_labelWidth}"><font color="red">* </font>{$EVN_WHEN_OCCURS}</td>

7
workflow/engine/xmlform/events/eventsEdit.xml
View File

@@ -53,6 +53,10 @@ SELECT TAS_UID, TAS_TITLE FROM tasks
<en>Estimated Task duration</en>
</EVN_TAS_ESTIMATED_DURATION>
<EVN_TIME_UNIT type="dropdown" required="1">
<en> <option name="DAYS">Days</option><option name="HOURS">Hours</option></en>
</EVN_TIME_UNIT>
<EVN_WHEN type="text" size="4" maxlength="4" validate="Real" required="1" defaultvalue="1">
<en>days</en>
</EVN_WHEN>
@@ -114,6 +118,7 @@ var onGraphChange = function(oForm) {
oWhenOccurs = getField('EVN_WHEN_OCCURS');
oStatus = getField('EVN_STATUS');
oWhen = getField('EVN_WHEN');
timeUnit = getField('EVN_TIME_UNIT');
oEstimated = getField('EVN_TAS_ESTIMATED_DURATION');
query = "";
@@ -132,6 +137,7 @@ var onGraphChange = function(oForm) {
query = query + "&s=i";
query = query + "&w=" + oWhen.value;
query = query + "&t=" + timeUnit.value;
query = query + "&e=" + oEstimated.value;
var x = document.getElementsByName('theImage');
@@ -143,6 +149,7 @@ leimnud.event.add(getField('EVN_RELATED_TO'), 'change', onChangeRelatedTo);
leimnud.event.add(getField('EVN_WHEN_OCCURS'), 'change', onGraphChange);
leimnud.event.add(getField('EVN_WHEN'), 'keyup', onGraphChange);
leimnud.event.add(getField('EVN_STATUS'), 'change', onGraphChange);
leimnud.event.add(getField('EVN_TIME_UNIT'), 'change', onGraphChange);
leimnud.event.add(getField('EVN_TAS_ESTIMATED_DURATION'), 'keyup', onGraphChange);
onChangeRelatedTo();

3
workflow/engine/xmlform/events/eventsEditAction.html
View File

@@ -31,6 +31,9 @@
</tr>
<tr style="display: none">
<td colspan="2">{$form.EVN_TAS_ESTIMATED_DURATION}</td>
</tr>
<tr style="display: none">
<td colspan="2">{$form.EVN_TIME_UNIT}</td>
</tr>
<tr style="display: none">
<td colspan="2">{$form.EVN_WHEN_OCCURS}</td>

2
workflow/engine/xmlform/events/eventsEditAction.xml
View File

@@ -19,6 +19,8 @@
<EVN_TAS_ESTIMATED_DURATION type="hidden"/>
<EVN_TIME_UNIT type="hidden"/>
<EVN_WHEN_OCCURS type="hidden"/>
<EVN_STATUS type="hidden"/>

6
workflow/engine/xmlform/events/eventsNew.html
View File

@@ -47,9 +47,9 @@
<td class='FormFieldContent' >{$form.EVN_TAS_UID_FROM} {$EVN_TAS_UID_TO} {$form.EVN_TAS_UID_TO}</td>
</tr>
<tr>
<td class='FormLabel' width="{$form_labelWidth}">{$EVN_TAS_ESTIMATED_DURATION}</td>
<td class='FormFieldContent' >{$form.EVN_TAS_ESTIMATED_DURATION} {$EVN_WHEN} </td>
</tr>
<td class='FormLabel' width="{$form_labelWidth}">{$EVN_TAS_ESTIMATED_DURATION} </td>
<td class='FormFieldContent' >{$form.EVN_TAS_ESTIMATED_DURATION} {$form.EVN_TIME_UNIT} </td>
</tr>
<tr>
<td class='FormLabel' width="{$form_labelWidth}"><font color="red">* </font>{$EVN_WHEN_OCCURS}</td>
<td class='FormFieldContent' >{$form.EVN_WHEN} {$EVN_WHEN} {$form.EVN_WHEN_OCCURS}</td>

7
workflow/engine/xmlform/events/eventsNew.xml
View File

@@ -53,6 +53,10 @@ SELECT TAS_UID, TAS_TITLE FROM tasks
<en>Estimated Task duration</en>
</EVN_TAS_ESTIMATED_DURATION>
<EVN_TIME_UNIT type="dropdown" required="1">
<en> <option name="DAYS">Days</option><option name="HOURS">Hours</option></en>
</EVN_TIME_UNIT>
<EVN_WHEN type="text" size="4" maxlength="4" validate="Real" required="1" defaultvalue="1">
<en>days</en>
</EVN_WHEN>
@@ -116,6 +120,7 @@ var onGraphChange = function(oForm) {
oWhenOccurs = getField('EVN_WHEN_OCCURS');
oStatus = getField('EVN_STATUS');
oWhen = getField('EVN_WHEN');
timeUnit = getField('EVN_TIME_UNIT');
oEstimated = getField('EVN_TAS_ESTIMATED_DURATION');
query = "";
@@ -135,6 +140,7 @@ var onGraphChange = function(oForm) {
query = query + "&w=" + oWhen.value;
query = query + "&e=" + oEstimated.value;
query = query + "&t=" + timeUnit.value;
var x = document.getElementsByName('theImage');
x[0].src = '../events/eventsSetupGraph'+query;
@@ -145,6 +151,7 @@ leimnud.event.add(getField('EVN_RELATED_TO'), 'change', onChangeRelatedTo);
leimnud.event.add(getField('EVN_WHEN_OCCURS'), 'change', onGraphChange);
leimnud.event.add(getField('EVN_WHEN'), 'keyup', onGraphChange);
leimnud.event.add(getField('EVN_STATUS'), 'change', onGraphChange);
leimnud.event.add(getField('EVN_TIME_UNIT'), 'change', onGraphChange);
leimnud.event.add(getField('EVN_TAS_ESTIMATED_DURATION'), 'keyup', onGraphChange);
onChangeRelatedTo();