sinatra-hexacta 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94878352931180fed716175089275de8178feddbfd3d967864ff1781e6d6ef69
-  data.tar.gz: 8b51e6e2a13b4f90c56af20b7d35f4928556ad98e29b062ef0e5a78bd67f947b
+  metadata.gz: ad4cb12cd628024ed6e4e738e18c9f436d6ad725ce069f0cf9711a2ff8dcadcb
+  data.tar.gz: 682a9a782840a2a23f265a93a8417240d3fab31a8fbffb20cb53260966545412
 SHA512:
-  metadata.gz: 81abe6f03be0934d7b718e1d952c9bbdfa44f1a35306b8c7fad085d1173e390830f3931de9f143d9a7b2569c224e54818392cc4878cf613e27c5c48109ae5d7d
-  data.tar.gz: 806507f14e95da83d1e69fa514966c83e92c5cc8d217a1965c44136a923d823070e2901e70ed2c57dca1daefa33f9fd58bb20331f56309cdb6515b813a4be0d0
+  metadata.gz: fc836bea599b405ff3107e60050be60af7be679d267060795e9e62631b4a5770a58ee073b69e3e5e35ba6274cc26d1ecfd2cee46b8b2f967d9346996ab04dfea
+  data.tar.gz: 4b04d40911507e384c655b0a21f89f87bbe02c48ae7a71c9fd15dd27a7a0ecb93b6cdaf60f360d50b6e5dec048cf4b78c5afc362bf0f8c3273cbc6f976e3ec27

data/lib/sinatra/extensions/processmanager.rb

@@ -56,6 +56,10 @@ class ProcessHandler
     @interrupted = true
   end
 
+  def interrupted?
+    @interrupted
+  end
+
   def running?
     @total != @performed
   end

data/lib/sinatra/public/js/process.js

@@ -10,28 +10,60 @@ class ProcessManager {
   }
 
   static update(progress) {
-    $("#processes .progress-bar").css("width",progress + "%");
+    if ($("#processes .progress").hasClass("active")) {
+      $("#processes .progress-bar").css("width",progress + "%");
+    }
+  }
+
+  static init() {
+    $("#processes .progress-bar").css("width","0%");
+    $("#processes .icon").addClass("rotating");
+    $("#processes .icon").removeClass("zmdi-check-circle").addClass("zmdi-settings");
+    $("#processes .progress").addClass("active");
+    $("#processes a").removeClass("hidden");
+    $("#processes .progress-bar").removeClass("progress-bar-success").removeClass("progress-bar-warning").removeClass("progress-bar-danger");
+    $("#processes .detail").html("Cargando...");
   }
 
   static complete() {
     $("#processes .progress-bar").css("width","100%");
-    $("#processes .rotating").removeClass("rotating");
-    $("#processes .zmdi").removeClass("zmdi-settings").addClass("zmdi-check-circle");
+    $("#processes .icon").removeClass("rotating");
+    $("#processes .icon").removeClass("zmdi-settings").addClass("zmdi-check-circle");
+    $("#processes a").addClass("hidden");
     $("#processes .progress").removeClass("active");
     $("#processes .progress-bar").addClass("progress-bar-success");
     $("#processes .detail").html("Completado. Refresca la pantalla para actualizar la información.");
   }
 
+  static error() {
+    $("#processes .progress-bar").css("width","100%");
+    $("#processes .icon").removeClass("rotating");
+    $("#processes .icon").removeClass("zmdi-settings").addClass("zmdi-check-circle");
+    $("#processes a").addClass("hidden");
+    $("#processes .progress").removeClass("active");
+    $("#processes .progress-bar").addClass("progress-bar-danger");
+    $("#processes .detail").html("Ha ocurrido un error.");
+  }
+
+  static cancel() {
+    $("#processes .progress-bar").css("width","100%");
+    $("#processes .icon").removeClass("rotating");
+    $("#processes a").addClass("hidden");
+    $("#processes .progress").removeClass("active");
+    $("#processes .progress-bar").addClass("progress-bar-warning");
+    $("#processes .detail").html("Proceso cancelado. Refresca la pantalla para actualizar la información.");
+  }
+
   static start(clazz) {
     $.ajax({
       url: "/process",
       type: 'POST',
       data: { class : clazz },
       success: function(result) {
-        ProcessManager.show('Cargando...');
-        ProcessManager.update(0);
+        ProcessManager.init();
       },
       error: function(error) {
+        ProcessManager.error();
       }
     });
   }
@@ -43,10 +75,10 @@ class ProcessManager {
       type: 'POST',
       data: map,
       success: function(result) {
-        ProcessManager.show('Cargando...');
-        ProcessManager.update(0);
+        ProcessManager.init();
       },
       error: function(error) {
+        ProcessManager.error();
       }
     });
   }
@@ -59,17 +91,16 @@ class ProcessManager {
       success: function(result) {
         if (result != "") {
           if (result.progress >= 100.0) {
-            //ProcessManager.hide();
             ProcessManager.complete()
             ProcessManager.cleanProcess(clazz);
           } else {
             ProcessManager.show(result.name);
           }
           ProcessManager.update(result.progress);
-          
         }
       },
       error: function(error) {
+        ProcessManager.error();
       }
     });
   }
@@ -79,8 +110,10 @@ class ProcessManager {
       url: "/processes/" + clazz,
       type: 'POST',
       success: function(result) {
+        ProcessManager.cancel();
       },
       error: function(error) {
+         ProcessManager.error();
       }
     });
   }

data/lib/sinatra/views/alerts/process.slim

@@ -1,11 +1,21 @@
 .row#processes style="height:0px;overflow: hidden;-webkit-transition: all 0.5s ease-in-out;-o-transition: all 0.5s ease-in-out;transition: all 0.5s ease-in-out;"
   .col-xs-12
     .progress.progress-striped.active style="height:80px;"
+      a.lv-item.p-20.p-absolute style="right: 1%;z-index: 10;" role="button" onclick="clean_process();"
+        .media
+          .pull-right
+            i.zmdi.zmdi-hc-3x.zmdi-close-circle.c-white
       .progress-bar aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" style="width: 0%;text-align:left;"
-        .lv-item.p-20.p-fixed
+        .lv-item.p-20.p-absolute
           .media
             .pull-left
-              i.zmdi.zmdi-hc-3x.zmdi-settings.c-white.rotating
+              i.zmdi.zmdi-hc-3x.zmdi-settings.c-white.rotating.icon
             .media-body
               .lv-title.c-white.title
-              small.lv-small.c-white.detail Espera por favor...
+              small.lv-small.c-white.detail Espera por favor...
+
+
+javascript:
+  function clean_process() {
+    console.log("Override 'clean_process' function");
+  }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Marco Zanger