BUG 5120 Change text to clarify the purpose of user for the Case Scheduler SOLVED

- Fix some issues in the logic of the validation
- Change some validations

workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml

@@ -8,7 +8,7 @@
 <en>General Information</en>
 </GENERAL_INF>
 <PROPERTIES_INF type="subtitle" enablehtml="1">
-<en>Enter the username and password for the user who will be assigned to the initial task in the case(s).</en>
+<en>Enter the username and password of the user who will be assigned to the initial task in the case.</en>
 </PROPERTIES_INF>
 <SCH_UID type="hidden" >
 <en></en>
@@ -356,7 +356,7 @@ function hideAll() {
 	contractSubtitle('SELECT_2');
 	contractSubtitle('SELECT_3');
     contractSubtitle('SELECT_EVERY');
-    
+
 	//contractSubtitle('ADVANCED_4');
     document.getElementById('startTime').style.display='none';
     document.getElementById('everyTime').style.display='none';
@@ -420,7 +420,7 @@ function showSelection(opt) {
                                 expandSubtitle('SELECT_1');
                                 contractSubtitle('SELECT_2');
                                 contractSubtitle('SELECT_3');
-                                
+
                                 document.getElementById('form[SELECT_EVERY]').style.display='none';
                                 document.getElementById('endDateTable').style.display='';
                                 document.getElementById('startTime').style.display='';
@@ -432,7 +432,7 @@ function showSelection(opt) {
                                 expandSubtitle('SELECT_2');
                                 contractSubtitle('SELECT_3');
                                 hideRow('SCH_EVERY_DAYS');
-                                
+
                                 document.getElementById('form[SELECT_EVERY]').style.display='none';
                                 document.getElementById('endDateTable').style.display='';
                                 document.getElementById('startTime').style.display='';
@@ -457,7 +457,7 @@ function showSelection(opt) {
                                     getField('SCH_START_DAY_OPT_2_DAYS_WEEK').disabled=false;
                                     getField('SCH_START_DAY_OPT_2_DAYS_WEEK').style.display="";
                                 }
-                                
+
                                 document.getElementById('form[SELECT_EVERY]').style.display='none';
                                 document.getElementById('endDateTable').style.display='';
                                 document.getElementById('startTime').style.display='';
@@ -467,7 +467,7 @@ function showSelection(opt) {
                                 contractSubtitle('SELECT_1');
                                 contractSubtitle('SELECT_2');
                                 contractSubtitle('SELECT_3');
-                                
+
                                 document.getElementById('form[SELECT_EVERY]').style.display='none';
                                 document.getElementById('endDateTable').style.display='';
                                 document.getElementById('startTime').style.display='';
@@ -478,7 +478,7 @@ function showSelection(opt) {
                                 contractSubtitle('SELECT_2');
                                 contractSubtitle('SELECT_3');
                                 enable(getField('SCH_REPEAT_EVERY'));
-                                
+
                                 document.getElementById('form[SELECT_TIME_DAY]').style.display='none';
                                 document.getElementById('endDateTable').style.display='none';
                                 document.getElementById('startTime').style.display='none';
@@ -647,22 +647,25 @@ leimnud.event.add(getField('SCH_REPEAT_UNTIL'), 'change', function() {
  * @return void
  */
 function case_userSchedulerValidate(username, password) {
-    //G.alert(username);
-    //G.alert(password);
     var user_uid;
 
     var oRPC = new leimnud.module.rpc.xmlhttp({
        	    url   : '../cases/cases_SchedulerValidateUser',
              async : true,
              method: 'POST',
-             args  : "USERNAME="+username+"&PASSWORD="+password
+             args  : "USERNAME="+username+"&PASSWORD="+password+"&PRO_UID="+$_GET('PRO_UID')
     });
 
     oRPC.callback = function(rpc){
-       //msgBox(rpc.xmlhttp.responseText,"alert");
-       getField('SCH_USER_UID').value = rpc.xmlhttp.responseText;
-       user_uid = rpc.xmlhttp.responseText;
-       //alert(user_uid);
+       sresponse = rpc.xmlhttp.responseText.parseJSON();
+
+       if (sresponse.status_code != 0) {
+         msgBox(sresponse.message, "alert");
+         return false;
+       }
+
+       getField('SCH_USER_UID').value = sresponse.message;
+       user_uid = sresponse.message;
 
        var oRPCProcess = new leimnud.module.rpc.xmlhttp({
        	    url   : '../cases/cases_SchedulerGetProcesses',
@@ -684,15 +687,7 @@ function case_userSchedulerValidate(username, password) {
 
        oRPCProcess.make();
 
-       /*  if(rpc.xmlhttp.responseText>=1){
-           //getField('SEARCH').disabled = false;
-           msgBox("User successfully logged","alert");
-           getField('SCH_USR_UID').value = rpc.xmlhttp.responseText;
-         } else {
-           //getField('SEARCH').disabled = true;
-           msgBox(rpc.xmlhttp.responseText,"alert");
-         }
-       */
+
       }.extend(this);
     oRPC.make();