From b07e2bca10dda4f5ed8b60409794198c6bb33154 Mon Sep 17 00:00:00 2001
From: Hector Cortez <hector@colosa.com>
Date: Wed, 7 Mar 2012 19:23:01 -0400
Subject: [PATCH] BUG 8691 Add validation before save on Task Notification.

- if the checkbox optiono was enabled "After routing notify the next assigned user(s).", validate that the fields are not empty or not selected, for both options when Content Type is "Plain text" or "HTML Template".
- We performed the validation of the Subject and Message and Template selected fields.
---
 .../js/processmap/core/processes_Map.js       | 34 ++++++++++++++++++-
 .../xmlform/tasks/tasks_AssignmentRules.xml   |  2 ++
 .../xmlform/tasks/tasks_Notifications.html    |  4 +--
 .../xmlform/tasks/tasks_Notifications.xml     |  4 +--
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/js/processmap/core/processes_Map.js b/workflow/engine/js/processmap/core/processes_Map.js
index c3c86270e..59e40225e 100755
--- a/workflow/engine/js/processmap/core/processes_Map.js
+++ b/workflow/engine/js/processmap/core/processes_Map.js
@@ -90,6 +90,34 @@ var saveDataTaskTemporal = function(iForm)
       break;
       case 7:
       case '7':
+        if ( getField('SEND_EMAIL') != null && (typeof (getField('SEND_EMAIL')) != 'undefined' ) ) {
+          // validate fields TAS_DEF_SUBJECT_MESSAGE, TAS_DEF_MESSAGE
+          if (getField('SEND_EMAIL').checked) {
+            if (getField('TAS_DEF_SUBJECT_MESSAGE').value == '') {
+              new leimnud.module.app.alert().make( {
+                label : G_STRINGS.ID_SUBJECT_FIELD_REQUIRED
+              });
+              return false;
+            }
+            switch ( getField('TAS_DEF_MESSAGE_TYPE').value ) {
+              case 'text' :
+                if (getField('TAS_DEF_MESSAGE').value == '' ) {
+                  new leimnud.module.app.alert().make( {
+                    label : G_STRINGS.ID_MESSAGE_FIELD_REQUIRED
+                  });
+                  return false;
+                }
+                break;
+              case 'template' :
+                if (getField('TAS_DEF_MESSAGE_TEMPLATE').value == '' ){
+                  new leimnud.module.app.alert().make( {
+                    label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED
+                  });
+                  return false;
+                }
+                break;
+            }
+        }
         if(typeof getField('SEND_EMAIL') != 'undefined' )
           oTaskData.SEND_EMAIL      = getField('SEND_EMAIL').checked ? 'TRUE' : 'FALSE';
         else
@@ -98,6 +126,7 @@ var saveDataTaskTemporal = function(iForm)
         oTaskData.TAS_DEF_SUBJECT_MESSAGE  = getField('TAS_DEF_SUBJECT_MESSAGE').value.replace(re, "@amp@");
         oTaskData.TAS_DEF_MESSAGE_TYPE     = getField('TAS_DEF_MESSAGE_TYPE').value;
         oTaskData.TAS_DEF_MESSAGE_TEMPLATE = getField('TAS_DEF_MESSAGE_TEMPLATE').value;
+      }
       break;
     }
   }
@@ -106,12 +135,15 @@ var saveDataTaskTemporal = function(iForm)
     oTaskData = {};
   }
   iLastTab = iForm;
+  return true;
 };
 
 var saveTaskData = function(oForm, iForm, iType)
 {
   iLastTab = iForm;
-  saveDataTaskTemporal(iForm);
+  if ( !saveDataTaskTemporal(iForm)) {
+    return false;
+  }
   oTaskData.TAS_UID = getField('TAS_UID').value;
  /* while (oTaskData.TAS_TITLE.charAt(0)==' '){ 
 		oTaskData.TAS_TITLE = oTaskData.TAS_TITLE.substring(1,oTaskData.TAS_TITLE.length) ;
diff --git a/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml b/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
index 631df139c..b62ac8f92 100755
--- a/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
+++ b/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
@@ -101,8 +101,10 @@ if (aTaskFlag[1])
     break;*/
   }
   getField('TAS_ASSIGN_VARIABLE').value         = oTaskData.TAS_ASSIGN_VARIABLE;
+/*
   getField('TAS_MI_INSTANCE_VARIABLE').value    = oTaskData.TAS_MI_INSTANCE_VARIABLE;
   getField('TAS_MI_COMPLETE_VARIABLE').value    = oTaskData.TAS_MI_COMPLETE_VARIABLE;
+*/
   /*getField('TAS_DERIVATION').checked          = (oTaskData.TAS_DERIVATION == 'TRUE' ? true : false);
   getField('TAS_PRIORITY_VARIABLE').checked     = (oTaskData.TAS_PRIORITY_VARIABLE == 'TRUE' ? true : false);
   getField('TAS_ASSIGN_LOCATION').checked       = (oTaskData.TAS_ASSIGN_LOCATION == 'TRUE' ? true : false);
diff --git a/workflow/engine/xmlform/tasks/tasks_Notifications.html b/workflow/engine/xmlform/tasks/tasks_Notifications.html
index 962b700d0..9d9f57a82 100755
--- a/workflow/engine/xmlform/tasks/tasks_Notifications.html
+++ b/workflow/engine/xmlform/tasks/tasks_Notifications.html
@@ -21,7 +21,7 @@
               <td>{$form.SEND_EMAIL}</td>
             </tr>
             <tr>
-              <td class='FormLabel' width="{$form_labelWidth}">{$TAS_DEF_SUBJECT_MESSAGE}</td>
+              <td class='FormLabel' width="{$form_labelWidth}"><font color="red">*  </font>{$TAS_DEF_SUBJECT_MESSAGE}</td>
               <td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TAS_DEF_SUBJECT_MESSAGE}
                 <input type="button" onclick="showDynaformsFormVars('form[TAS_DEF_SUBJECT_MESSAGE]', '../controls/varsAjax', '', '@#');return false;" value="@#">
               </td>
@@ -31,7 +31,7 @@
               <td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TAS_DEF_MESSAGE_TYPE}</td>
             </tr>
             <tr>
-              <td class='FormLabel' width="{$form_labelWidth}">{$TAS_DEF_MESSAGE}</td>
+              <td class='FormLabel' width="{$form_labelWidth}"><font color="red">*  </font>{$TAS_DEF_MESSAGE}</td>
               <td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TAS_DEF_MESSAGE}</td>
             </tr>
             <tr>
diff --git a/workflow/engine/xmlform/tasks/tasks_Notifications.xml b/workflow/engine/xmlform/tasks/tasks_Notifications.xml
index 14c05f6e2..f6544df11 100755
--- a/workflow/engine/xmlform/tasks/tasks_Notifications.xml
+++ b/workflow/engine/xmlform/tasks/tasks_Notifications.xml
@@ -11,7 +11,7 @@
     <en>After routing notify the next assigned user(s).</en>
   </SEND_EMAIL>
   
-  <TAS_DEF_SUBJECT_MESSAGE type="text" size="50">
+  <TAS_DEF_SUBJECT_MESSAGE type="text" size="50" required="1">
     <en>Subject</en>
   </TAS_DEF_SUBJECT_MESSAGE>
 
@@ -22,7 +22,7 @@
     </en>
   </TAS_DEF_MESSAGE_TYPE>
 
-  <TAS_DEF_MESSAGE type="textareapm" cols="50" rows="10" group="1" showVars="1" process="@#PRO_UID" symbol="@#">
+  <TAS_DEF_MESSAGE type="textareapm" cols="50" rows="10" group="1" showVars="1" process="@#PRO_UID" symbol="@#" required="1">
     <en>Message</en>
   </TAS_DEF_MESSAGE>