Changeset 6676

Timestamp:

Jan 25, 2018, 10:00:21 AM (3 years ago)

Author:

kbut

Message:

add message when finish execution

Location:

admin-center/trunk/fuentes/admin-center.install/usr/share

Files:

• admin-center/lib/utils.js (modified) (1 diff)
• n4d/python-plugins/TaskMan.py (modified) (1 diff)

admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/lib/utils.js

@@ -407 +407 @@
                                 percent=progress_array[progress_array.length-1];
                                 $("#modal-progress-bar").css("width", percent).html(percent);
-                                if (percent=="100%") {
-                                        $("#progress-container").removeClass("active");
-                                        $("#modal-progress-bar").removeClass("progress-bar-info").addClass("progress-bar-success");
-                                        $("#modal-progress-bar").html(self._("100% -- FINISHED --"));
-                                        
-                                        $("#logviewer_btStop").removeClass("btn-primary").addClass("btn-success");
-                                        $("#logviewer_btStop").off("click");
-                                        
-                                        
-                                        /*
-                                         *NOT SUPPORTED... LOG FILE IS NOT COMPLETE AT ALL...
-                                        // Prepare window for download log
-                                        var targetTask=$("#logviewer_btStop").attr("targetjob");
-                                        var taskid=targetTask.substring("6",targetTask.length);
-                                        
-                                        self.n4d([sessionStorage.username , sessionStorage.password],
-                                                         "TaskMan",
-                                                         "prepareLogForDownload",
-                                                         [taskid],
-                                                         function(response){
-                                                                if (response.status) {
-                                                                        var link="logs/"+response.file;
-                                                                        $("#logviewer_btStop").html("<a href='"+link+"'>Download Log</a>");
-                                                                        }
-                                                        });*/
-
-                                }
-                        } else {
+                        } 
+                        else {
                                 // Or add text to log
                                 $(modallog).append("<div>"+msgtext+"</div>");
                                 self.logfilesadded++;
-                                if (msgtext.indexOf("Finished with status")!=-1) {
+                                if (msgtext.indexOf("[TASKMANAGER] process finished")!=-1) {
+                                        $("#progress-container").removeClass("active");
                                         $("#logviewer_btStop").removeClass("btn-primary");
                                         $("#logviewer_btStop").off("click");
-                                        
+                                        $("#modal-progress-bar").removeClass("progress-bar-info").addClass("progress-bar-success");
                                 }
                                 

admin-center/trunk/fuentes/admin-center.install/usr/share/n4d/python-plugins/TaskMan.py

@@ -152 +152 @@
         except Exception as e:
             print "[TASKMANAGER] Exception while reading pipe "+str(e)
+        self.ws.send(str({"id": str(task.taskid), "line":"[TASKMANAGER] process finished"}))
+