Fixed issue #17846: Expression manager on file upload question type d…

…on't work on same page (#2269)

* Fixed issue #17846: Expression manager on file upload question type don't work on same page

* Revert "Fixed issue #17846: Expression manager on file upload question type don't work on same page"

This reverts commit a7c090f.

* Fixed issue #17846: Expression manager on file upload question type don't work on same page

* Fixed issue #17846: Expression manager on file upload question type don't work on same page

Co-authored-by: encuestabizdevgit <devgit@encuesta.biz>

application/helpers/expressions/em_manager_helper.php

@@ -4087,7 +4087,7 @@ public function setVariableAndTokenMappingsForExpressionManager($surveyid,$force
                         $jsVarName_on = 'answer' . $sgqa;;
                         break;
                     case '|': //File Upload
-                        $jsVarName = $sgqa;
+                        $jsVarName = 'java' . $sgqa;
                         $jsVarName_on = $jsVarName;
                         break;
                     case 'P': //Multiple choice with comments checkbox + text

application/views/survey/questions/answer/file_upload/answer.twig

@@ -21,8 +21,8 @@
             <span class='fa fa-upload'></span>&nbsp;{{ gT('Upload files') }}
         </a>
     </div>
-    <input type='hidden' id='{{ fileid }}' name='{{ fileid }}' value='{{ value }}' />
-    <input type='hidden' id='{{ fileid }}_filecount' name='{{ fileid }}_filecount' value="{{ filecountvalue }}" />
+    <input type='hidden' id='java{{ fileid }}' name='{{ fileid }}' value='{{ value }}' />
+    <input type='hidden' id='java{{ fileid }}_filecount' name='{{ fileid }}_filecount' value="{{ filecountvalue }}" />
     <div id='{{ fileid }}_uploadedfiles'>
 
     </div>

assets/scripts/expressions/em_javascript.js

@@ -46,6 +46,10 @@ $(document).on("change",".radio-item :radio:not([onclick]), .button-item :radio:
 $(document).on("change",".checkbox-item :checkbox:not([onclick]),.button-item :checkbox:not([onclick])",function(event){
     checkconditions($(this).val(), $(this).attr('name'), 'checkbox', 'click')
 });
+/* hidden item */
+$(document).on("updated",".answer-item :hidden, .upload-item :hidden",function(event){
+    checkconditions($(this).val(), $(this).attr('name'), 'equation', 'updated')
+});
 
 /**
  * For number

assets/scripts/modaldialog.js

@@ -135,8 +135,8 @@ function displayUploadedFiles(jsonstring, filecount, fieldname, show_title, show
 }
 
 function copyJSON(jsonstring, filecount, fieldname, show_title, show_comment, pos) {
-    $('#'+fieldname).val(jsonstring);
-    $('#'+fieldname+'_filecount').val(filecount);
+    $('#java'+fieldname).val(jsonstring).trigger('updated');
+    $('#java'+fieldname+'_filecount').val(filecount).trigger('updated');
     displayUploadedFiles(jsonstring, filecount, fieldname, show_title, show_comment, pos);
 }
 

assets/scripts/uploader.js

@@ -30,14 +30,14 @@ function doFileUpload()
 {
     var fieldname = $('#ia').val();
     /* Load the previously uploaded files */
-    var filecount = window.parent.window.$('#' + fieldname + '_filecount').val();
+    var filecount = window.parent.window.$('#java' + fieldname + '_filecount').val();
     $('#' + fieldname + '_filecount').val(filecount);
 
     var image_extensions = new Array("gif", "jpeg", "jpg", "png", "swf", "psd", "bmp", "tiff", "jp2", "iff", "bmp", "xbm", "ico");
 
     if (filecount > 0)
     {
-        var jsontext = window.parent.window.$('#' + fieldname).val();
+        var jsontext = window.parent.window.$('#java' + fieldname).val();
         var json = '';
         try{
             json = JSON.parse(jsontext);