fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in luisfernandosl/processmaker/PM-682 (pull request #1033)

Browse Source 
PM 682 "El boton Save no ejecuta ninguna..." SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2014-10-23 12:27:44 -04:00
parent 0298c64de7 f5ea486fbb
commit b9edbad86e
6 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,20 @@
var eventsNewAction = function(oForm) {
if(getField('EVN_DESCRIPTION').value.trim() == ''){
msgBox('Set a description please.', 'alert');
new leimnud.module.app.alert().make({label: _("ID_PLEASE_ENTER_DESCRIPTION")});
return false;
}
if (getField("EVN_TAS_ESTIMATED_DURATION").value.trim() == "") {
new leimnud.module.app.alert().make({label: _("ID_PLEASE_CONFIGURE_ESTIMATED_DURATION_TASK")});
return false;
}
if (getField("EVN_WHEN").value.trim() == ""){
new leimnud.module.app.alert().make({label: _("ID_PLEASE_SET_VALUE_DAYS_EXECUTION_TIME_FIELD")});
return false;
}
if (oForm) {
oRPC = new leimnud.module.rpc.xmlhttp({
url : '../events/eventsNewAction',

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

@@ -2,7 +2,7 @@
<input type="hidden" name="__notValidateThisFields__" id="__notValidateThisFields__" value="" />
<input type="hidden" name="DynaformRequiredFields" id="DynaformRequiredFields" value='{$form_objectRequiredFields}' />
{$form.PRO_UID} {$form.EVN_UID}
{$form.PRO_UID} {$form.EVN_UID}
<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
<div class="content" style="height:{$form_height};" >
<table width="99%">
@@ -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='FormLabel' width="{$form_labelWidth}"><font color="red">* </font>{$EVN_TAS_ESTIMATED_DURATION}</td>
<td class='FormFieldContent' >{$form.EVN_TAS_ESTIMATED_DURATION} {$form.EVN_TIME_UNIT} </td>
</tr>
</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>
@@ -80,7 +80,7 @@
<tr>
<td class='FormLabel' colspan='2' style="text-align:center;" >
<img name="theImage" border='0' src="../events/eventsSetupGraph" >
<img name="theImage" border='0' src="../events/eventsSetupGraph" >
</td>
</tr>
<tr>

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

@@ -56,7 +56,7 @@ SELECT TAS_UID, TAS_TITLE FROM tasks
</EVN_ACTION>
<TRI_UID type="dropdown" required="0" sqlconnection="dbarray">
SELECT * FROM TMP_TRIGGERS
<en><![CDATA[]]></en>
<en><![CDATA[Create a new trigger]]></en>
</TRI_UID>
<TITLE3 type="title">
<en><![CDATA[Event scheduled graph]]></en>

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

@@ -2,7 +2,7 @@
<input type="hidden" name="__notValidateThisFields__" id="__notValidateThisFields__" value="" />
<input type="hidden" name="DynaformRequiredFields" id="DynaformRequiredFields" value='{$form_objectRequiredFields}' />
{$form.PRO_UID} {$form.EVN_UID}
{$form.PRO_UID} {$form.EVN_UID}
<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
<div class="content" style="height:{$form_height};" >
<table width="99%">
@@ -47,7 +47,7 @@
<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='FormLabel' width="{$form_labelWidth}"><font color="red">* </font>{$EVN_TAS_ESTIMATED_DURATION} </td>
<td class='FormFieldContent' >{$form.EVN_TAS_ESTIMATED_DURATION} {$form.EVN_TIME_UNIT} </td>
</tr>
<tr>
@@ -80,7 +80,7 @@
<tr>
<td class='FormLabel' colspan='2' style="text-align:center;" >
<img name="theImage" border='0' src="../events/eventsSetupGraph" >
<img name="theImage" border='0' src="../events/eventsSetupGraph" >
</td>
</tr>
<tr>

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

@@ -56,7 +56,7 @@ SELECT TAS_UID, TAS_TITLE FROM tasks
</EVN_ACTION>
<TRI_UID type="dropdown" required="0" sqlconnection="dbarray">
SELECT * FROM TMP_TRIGGERS
<en><![CDATA[]]><option name=""><![CDATA[]]></option></en>
<en><![CDATA[]]><option name=""><![CDATA[Create a new trigger]]></option></en>
</TRI_UID>
<TITLE3 type="title">
<en><![CDATA[Event scheduled graph]]></en>

25
workflow/engine/xmlform/events/eventsOptions.xml
View File

@@ -21,7 +21,7 @@ var triggerSave = function (form){
ajax_post(form.action, form, 'POST');
currentPopupWindow.remove();
}
var eventsNew = function() {
popupWindow('@G::LoadTranslation(ID_NEW_EVENT)', '@G::encryptlink(@#eventsNew)?PRO_UID=@%PRO_UID&EVN_TYPE=@%EVN_TYPE' , 540, 500);
};
@@ -35,19 +35,30 @@ var eventsEditAction = function(sUID) {
};
var eventsSave = function(oForm) {
if (oForm.onsubmit()) {
res = ajax_post(oForm.action, oForm, 'POST');
currentPopupWindow.remove();
@#PAGED_TABLE_ID.refresh();
if (getField("EVN_DESCRIPTION").value.trim() == "") {
new leimnud.module.app.alert().make({label: _("ID_PLEASE_ENTER_DESCRIPTION")});
return false;
}
if (getField("EVN_TAS_ESTIMATED_DURATION").value.trim() == "") {
new leimnud.module.app.alert().make({label: _("ID_PLEASE_CONFIGURE_ESTIMATED_DURATION_TASK")});
return false;
}
if (getField("EVN_WHEN").value.trim() == ""){
new leimnud.module.app.alert().make({label: _("ID_PLEASE_SET_VALUE_DAYS_EXECUTION_TIME_FIELD")});
return false;
}
res = ajax_post(oForm.action, oForm, 'POST');
currentPopupWindow.remove();
@#PAGED_TABLE_ID.refresh();
};
var eventsTriggerSave = function(oForm) {
if (oForm.onsubmit()) {
res = ajax_post(oForm.action, oForm, 'POST');
currentPopupWindow.remove();
@#PAGED_TABLE_ID.refresh();
}
};
var eventsDelete = function(sUID) {