From 83a2ecc61b468032fb8c3b791e84c37d1348bdf2 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Wed, 22 Oct 2014 14:11:07 -0400
Subject: [PATCH] PM 356 "El boton Save no ejecuta ninguna..." SOLVED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Code Issue:
El boton "Save" no ejecuta ninguna accion en Process Events/Trigger Script
Cause:
Cuando se crea un nuevo Events de tipo Intermediate Conditional o Intermediate timer, en dynaform New Event al hacer click
en Save no se guardaban los datos mostrando un error.
Solution:
En el dynaform New Events en los labels Execute trigger en el dropdown se adiciona un label "Create a new trigger" y en el
"Estimated Task duration" e añ el "*" como campo requerido, tambien se adiciono la validacion de los campos requerridos
con sus respectivos mensajes y el error que ocacionaba al guardar los datos se elimina la condicion que se tenia.
---
 workflow/engine/js/events/events.js           | 10 ++++++++++
 .../engine/xmlform/events/eventsEdit.html     |  8 ++++----
 workflow/engine/xmlform/events/eventsEdit.xml |  2 +-
 workflow/engine/xmlform/events/eventsNew.html |  6 +++---
 workflow/engine/xmlform/events/eventsNew.xml  |  2 +-
 .../engine/xmlform/events/eventsOptions.xml   | 19 ++++++++++++++++---
 6 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/workflow/engine/js/events/events.js b/workflow/engine/js/events/events.js
index 99a68e84d..80d6646c7 100755
--- a/workflow/engine/js/events/events.js
+++ b/workflow/engine/js/events/events.js
@@ -9,6 +9,16 @@ var eventsNewAction = function(oForm) {
     return false;
   }
 
+  if (getField("EVN_TAS_ESTIMATED_DURATION").value.trim() == "") {
+      msgBox("Set a estimated task duration please.", "alert");
+      return false;
+  }
+
+  if (getField("EVN_WHEN").value.trim() == ""){
+      msgBox("Set a days please.", "alert");
+      return false;
+  }
+
   if (oForm) {
     oRPC = new leimnud.module.rpc.xmlhttp({
       url   : '../events/eventsNewAction',
diff --git a/workflow/engine/xmlform/events/eventsEdit.html b/workflow/engine/xmlform/events/eventsEdit.html
index 384b5a3b5..16f4aa530 100755
--- a/workflow/engine/xmlform/events/eventsEdit.html
+++ b/workflow/engine/xmlform/events/eventsEdit.html
@@ -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>
diff --git a/workflow/engine/xmlform/events/eventsEdit.xml b/workflow/engine/xmlform/events/eventsEdit.xml
index 5e8789e94..e4ece2acc 100755
--- a/workflow/engine/xmlform/events/eventsEdit.xml
+++ b/workflow/engine/xmlform/events/eventsEdit.xml
@@ -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>
diff --git a/workflow/engine/xmlform/events/eventsNew.html b/workflow/engine/xmlform/events/eventsNew.html
index 37b9d5455..9fb920576 100755
--- a/workflow/engine/xmlform/events/eventsNew.html
+++ b/workflow/engine/xmlform/events/eventsNew.html
@@ -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>
diff --git a/workflow/engine/xmlform/events/eventsNew.xml b/workflow/engine/xmlform/events/eventsNew.xml
index 218f4de8d..cc5a300d1 100755
--- a/workflow/engine/xmlform/events/eventsNew.xml
+++ b/workflow/engine/xmlform/events/eventsNew.xml
@@ -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>
diff --git a/workflow/engine/xmlform/events/eventsOptions.xml b/workflow/engine/xmlform/events/eventsOptions.xml
index fd351530a..fc131f852 100755
--- a/workflow/engine/xmlform/events/eventsOptions.xml
+++ b/workflow/engine/xmlform/events/eventsOptions.xml
@@ -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,6 +35,21 @@ var eventsEditAction = function(sUID) {
 };
 
 var eventsSave = function(oForm) {
+  if (getField("EVN_DESCRIPTION").value.trim() == "") {
+      msgBox("Set a description please.", "alert");
+      return false;
+  }
+
+  if (getField("EVN_TAS_ESTIMATED_DURATION").value.trim() == "") {
+      msgBox("Set a estimated task duration please.", "alert");
+      return false;
+  }
+
+  if (getField("EVN_WHEN").value.trim() == ""){
+      msgBox("Set a days please.", "alert");
+      return false;
+  }
+
   if (oForm.onsubmit()) {
     res = ajax_post(oForm.action, oForm, 'POST');
     currentPopupWindow.remove();
@@ -43,11 +58,9 @@ var eventsSave = function(oForm) {
 };
 
 var eventsTriggerSave = function(oForm) {
-  if (oForm.onsubmit()) {
     res = ajax_post(oForm.action, oForm, 'POST');
     currentPopupWindow.remove();
     @#PAGED_TABLE_ID.refresh();
-  }
 };
 
 var eventsDelete = function(sUID) {