From e24ceaedd15f1ac6dc1815e96b92207dc9eb3627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Loguercio?= <jloguercio.work@gmail.com>
Date: Mon, 4 Jul 2016 12:42:06 -0500
Subject: [PATCH] Fix Individual Work correction ajax loader

---
 main/inc/ajax/work.ajax.php | 10 ++++++++--
 main/inc/lib/api.lib.php    |  1 -
 main/work/work.lib.php      | 27 ++++++++++++---------------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/main/inc/ajax/work.ajax.php b/main/inc/ajax/work.ajax.php
index db4738cb60..41173b5a05 100755
--- a/main/inc/ajax/work.ajax.php
+++ b/main/inc/ajax/work.ajax.php
@@ -129,14 +129,20 @@ switch ($action) {
             if (isset($result['url'])) {
                 $json['result'] = Display::return_icon(
                     'accept.png',
-                    get_lang('Uploaded')
+                    get_lang('Uploaded'),
+                    [],
+                    ICON_SIZE_TINY
                 );
             } else {
                 $json['result'] = Display::return_icon(
                     'exclamation.png',
-                    get_lang('Error')
+                    get_lang('Error'),
+                    [],
+                    ICON_SIZE_TINY
                 );
             }
+
+            header('Content-Type: application/json');
             echo json_encode($json);
         }
 
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 43a4ea457b..e9290209b0 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -6457,7 +6457,6 @@ function api_get_jquery_libraries_js($libraries) {
         $js .= api_get_asset('blueimp-canvas-to-blob/js/canvas-to-blob.min.js');
         $js .= api_get_asset('jquery-file-upload/js/jquery.iframe-transport.js');
         $js .= api_get_asset('jquery-file-upload/js/jquery.fileupload.js');
-        $js .= api_get_asset('jquery-file-upload/js/jquery.fileupload-ui.js');
         $js .= api_get_asset('jquery-file-upload/js/jquery.fileupload-process.js');
         $js .= api_get_asset('jquery-file-upload/js/jquery.fileupload-image.js');
         $js .= api_get_asset('jquery-file-upload/js/jquery.fileupload-audio.js');
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index cd72570f35..4c176463c3 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -2021,38 +2021,35 @@ function get_work_user_list(
                         $action .=  '<a href="'.$url.'work_list_all.php?'.api_get_cidreq().'&id='.$work_id.'&action=export_to_doc&item_id='.$item_id.'" title="'.get_lang('ExportToDoc').'" >'.
                             Display::return_icon('export_doc.png', get_lang('ExportToDoc'),array(), ICON_SIZE_SMALL).'</a> ';
                     }
-
+                    $loadingText = get_lang('Loading');
+                    $uploadedText = get_lang('Uploaded');
                     $correction = '
                         <form
                         id="file_upload_'.$item_id.'"
                         class="work_correction_file_upload file_upload_small fileinput-button"
                         action="'.api_get_path(WEB_AJAX_PATH).'work.ajax.php?'.api_get_cidreq().'&a=upload_correction_file&item_id='.$item_id.'" method="POST" enctype="multipart/form-data"
                         >
-                        <div class="text-center button-load">
+                        <div id="progress_'.$item_id.'" class="text-center button-load">
                             '.get_lang('ClickOrDropOneFileHere').'
                             '.Display::return_icon('upload_file.png', get_lang('Correction'), [], ICON_SIZE_TINY).'
                         </div>
 
-                        <input type="file" name="file" class="" multiple>
+                        <input id="file_'.$item_id.'" type="file" name="file" class="" multiple>
                         </form>
                     ';
 
                     $correction .= "<script>
                     $(document).ready(function() {
                         $('#file_upload_".$item_id."').fileupload({
-                            uploadTable: $('.files'),
-                            downloadTable: $('.files'),
-                            buildUploadRow: function (files, index) {
-                                $('.files').show();
-                                return $('<tr><td>' + files[index].name + '<\/td>' +
-                                    '<td class=\"file_upload_progress\"><div><\/div><\/td>' +
-                                    '<td class=\"file_upload_cancel\">' +
-                                    '<button class=\"ui-state-default ui-corner-all\" title=\"".get_lang('Cancel')."\">' +
-                                    '<span class=\"ui-icon ui-icon-cancel\">".get_lang('Cancel')."<\/span>' +'<\/button>'+
-                                    '<\/td><\/tr>');
+                            add: function (e, data) {
+                                $('#progress_$item_id').html();
+                                $('#file_$item_id').remove();
+                                data.context = $('#progress_$item_id').html('$loadingText <br /> <em class=\"fa fa-spinner fa-pulse fa-fw\"></em>');
+                                data.submit();
                             },
-                            buildDownloadRow: function (file) {
-                                return $('<tr><td>' + file.name + '<\/td> <td> ' + file.size + ' <\/td>  <td>&nbsp;' + file.result + ' <\/td> <\/tr>');
+                            done: function (e, data) {
+                                data.context.text('Upload finished.');
+                                $('#progress_$item_id').html('$uploadedText '+data._response.result.result+'<br />'+data._response.result.name);
                             }
                         });
                     });