#3 APPROVE: view current items for approve - fixed stats view

Gorbush · Jul 12, 2018 · 4030c8d · 4030c8d
1 parent e1319b1
commit 4030c8d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/ui/web/src/main/resources/static/js/importRequest.js b/ui/web/src/main/resources/static/js/importRequest.js
@@ -188,9 +188,8 @@ var ImportRequestsTree = {
         ImportRequestsTree.autoRefreshCheck.prop('checked', false);
     },
     updateProgress: function (stats) {
-        ImportRequestsTree.progress.folders.setProgress(stats.folders, stats.foldersDone,
-            stats.foldersDone + " of " + stats.folders);
-        ImportRequestsTree.progress.files.setProgress(stats.files, 0,stats.files+" files");
+        ImportRequestsTree.progress.folders.setProgress(stats.foldersDone, stats.folders, stats.foldersDone + " of " + stats.folders);
+        ImportRequestsTree.progress.files.setProgress(stats.files, stats.files >= 0 ? stats.files : 0,stats.files+" files");
     },
     refresh: function() {
         var id = ImportRequestsTree.getActiveProcessId();

diff --git a/ui/web/src/main/resources/templates/main/importProgress.html b/ui/web/src/main/resources/templates/main/importProgress.html
@@ -75,8 +75,8 @@
                     <tr><td> Finished </td><td name="process.finished" class="date" th:text="${process.finished?.toString('YYYY-MM-dd HH:mm:ss')}"></td> </tr>
                     <tr><td> Folder </td><td name="lastDetail.path" th:text="${details[0]?.path}" th:if="${details.size() > 0}"></td> </tr>
                     <tr><td> Progress: </td><td name="lastDetail.path" th:text="${details[0]?.path}" th:if="${details.size() > 0}"></td> </tr>
-                    <tr><td class="text-right"> Folders:</td><td><div id="filesProgress"></div></td></tr>
-                    <tr><td class="text-right"> Files:</td><td><div id="foldersProgress"></div></td></tr>
+                    <tr><td class="text-right"> Folders:</td><td><div id="foldersProgress"></div></td></tr>
+                    <tr><td class="text-right"> Files:</td><td><div id="filesProgress"></div></td></tr>
                     <!-- tr><td class="text-right"> Sample:</td><td><progress id="allProgress" class="progressbar" max="10" value="3"></progress></td></tr>
                     <tr><td class="text-right"> Sample:</td><td><progress id="allProgressA"  class="progressbar" ></progress></td></tr -->
                 </table>