sinatra-hexacta 0.8.1 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ad5538fd84652a893cfd5558b33fe7c5ce61fb52847c6ab9368ca34ce22479b
-  data.tar.gz: a762b60ae1fc61b22ca12feeb8ea3badfab646e7fd9ee80624e12bfe97bd19fe
+  metadata.gz: ad4cb12cd628024ed6e4e738e18c9f436d6ad725ce069f0cf9711a2ff8dcadcb
+  data.tar.gz: 682a9a782840a2a23f265a93a8417240d3fab31a8fbffb20cb53260966545412
 SHA512:
-  metadata.gz: bbac8da74bbd92c84af23a43c38969368b992199b23097259c1ad7ed5939f65391f17023dfdb2132fbea9e19a1895712580400eea08af344de8a21a34e6fc76c
-  data.tar.gz: 1c432e57128475e51fd688ebbb5c203cae28e6c9ec0fb2f7663c51868b7d1c299e243cfcf913bb0bd1f5f29e1e4d0f7a5516491521561790ef8494503d47203c
+  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/handlers/processes.rb

@@ -9,16 +9,17 @@ module Sinatra
       get '/processes' do
         return "" if ProcessManager.instance.find(params[:class]).nil?
         content_type :json
-        return { "progress" => ProcessManager.instance.find(params[:class]).progress }.to_json
+        return { 'name' => ProcessManager.instance.find(params[:class]).name, 'progress' => ProcessManager.instance.find(params[:class]).progress }.to_json
       end
 
       post '/processes/:clazz' do |clazz|
         ProcessManager.instance.clean(clazz)
+        200
       end
 
       post '/process' do
         klass = Object.const_get("#{params[:class]}")
-        a_handler = ProcessManager.instance.run(klass)
+        a_handler = ProcessManager.instance.run(klass,params)
         a_handler.to_json
       end
     end

data/lib/sinatra/helpers/alerts.rb

@@ -23,6 +23,10 @@ module Sinatra
       slim "#{Hexacta::GEM_FILE_DIR}/alerts/error".to_sym, locals: option_hash
     end
 
+    def process_alert(option_hash)
+      slim "#{Hexacta::GEM_FILE_DIR}/alerts/process".to_sym, locals: option_hash
+    end
+
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/alerts")
     copy_all_files("/lib/sinatra/views/alerts","/app/views/#{Hexacta::GEM_FILE_DIR}/alerts")
   end

data/lib/sinatra/public/css/app.min.1.css

@@ -16387,3 +16387,39 @@ svg.ct-chart-bar, svg.ct-chart-line{
   0% { width: 0; }
   100% { width: 100%; }
 }
+
+@-webkit-keyframes rotating /* Safari and Chrome */ {
+  from {
+    -webkit-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -webkit-transform: rotate(360deg);
+    -o-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@keyframes rotating {
+  from {
+    -ms-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -ms-transform: rotate(360deg);
+    -moz-transform: rotate(360deg);
+    -webkit-transform: rotate(360deg);
+    -o-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+.rotating {
+  -webkit-animation: rotating 2s linear infinite;
+  -moz-animation: rotating 2s linear infinite;
+  -ms-animation: rotating 2s linear infinite;
+  -o-animation: rotating 2s linear infinite;
+  animation: rotating 2s linear infinite;
+}

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

@@ -1,127 +1,120 @@
-var pro_timeout = false;
-
 class ProcessManager {
 
-  static start(clazz) {
+  static show(clazz) {
+    $("#processes").css("height","80px");
+    $("#processes .title").html(clazz);
+  }
 
+  static hide() {
+    $("#processes").css("height","0px");
   }
 
-  static getProcesses(clazz) {
-    $.ajax({
-      url: "/processes",
-      type: 'GET',
-      data: { class : clazz },
-      success: function(result) {
-        if (result != "") {
-          $("#processes ." + clazz + " .progress-bar").css("width",result.progress + "%");
-        }
-      },
-      error: function(error) {
-      }
-    });
+  static update(progress) {
+    if ($("#processes .progress").hasClass("active")) {
+      $("#processes .progress-bar").css("width",progress + "%");
+    }
   }
 
-  static cleanProcess() {
+  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 .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 monitor() {
-    this.#timeout = setTimeout(function() {
-      $.xhrPool.abortAll();
-      if (last_query != $.trim($('#header input').val())) {
-        last_query = $.trim($('#header input').val());
-        if (last_query.length > 2) {
-          Finder.find(last_query);
-        }
-      }
-    }, 5000);
+  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 find(query){
-    $.ajax({
-        url: "/find",
-        type: 'GET',
-        data: { query: query }
-    }).done(function(result) {
-      $("#header .results").html(result);
+  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.");
+  }
 
-      $('#header .results *').click(function() {
-        clearTimeout(hide_results_timeout);
-        $("#header input").focus();
-      });
+  static start(clazz) {
+    $.ajax({
+      url: "/process",
+      type: 'POST',
+      data: { class : clazz },
+      success: function(result) {
+        ProcessManager.init();
+      },
+      error: function(error) {
+        ProcessManager.error();
+      }
     });
   }
 
-  static do_find(url,query,html){
+  static start_with_map(clazz,map) {
+    map['class'] = clazz;
     $.ajax({
-        url: url,
-        type: 'GET',
-        data: { query: query }
-    }).done(function(result) {
-      $(html).html(result);
+      url: "/process",
+      type: 'POST',
+      data: map,
+      success: function(result) {
+        ProcessManager.init();
+      },
+      error: function(error) {
+        ProcessManager.error();
+      }
     });
   }
-}
-
-var last_query = null;
-var header_input_timeout = null;
-$.xhrPool = [];
 
-$.xhrPool.abortAll = function() {
-    $(this).each(function(idx, jqXHR) {
-        jqXHR.abort();
-    });
-    $(this).each(function(idx, jqXHR) {
-        var index = $.inArray(jqXHR, $.xhrPool);
-        if (index > -1) {
-            $.xhrPool.splice(index, 1);
+  static getProcesses(clazz) {
+    $.ajax({
+      url: "/processes",
+      type: 'GET',
+      data: { class : clazz },
+      success: function(result) {
+        if (result != "") {
+          if (result.progress >= 100.0) {
+            ProcessManager.complete()
+            ProcessManager.cleanProcess(clazz);
+          } else {
+            ProcessManager.show(result.name);
+          }
+          ProcessManager.update(result.progress);
         }
+      },
+      error: function(error) {
+        ProcessManager.error();
+      }
     });
-};
-
-$.ajaxSetup({
-    beforeSend: function(jqXHR) {
-        $.xhrPool.push(jqXHR);
-    },
-    complete: function(jqXHR) {
-        var index = $.inArray(jqXHR, $.xhrPool);
-        if (index > -1) {
-            $.xhrPool.splice(index, 1);
-        }
-    }
-});
-
-$(document).ready(function(){
-
-  $("#header input").focusin(function() {
-    $("#header .results").addClass("toggled");
-  })
-
-  $("#header input").focusout(function() {
-    hide_results_timeout = setTimeout(function() {
-      $("#header .results").removeClass("toggled"); 
-    },200);
-  });
-
-  $('#header .results *').click(function() {
-    clearTimeout(hide_results_timeout);
-    $("#header input").focus();
-  });
-
-  $('#header input').keyup(function() {
-      clearTimeout(header_input_timeout);
+  }
 
-      if($('#header input').val().length > 2 && $.trim($('#header input').val())) {
-        header_input_timeout = setTimeout(function() {
-          $.xhrPool.abortAll();
-          if (last_query != $.trim($('#header input').val())) {
-            last_query = $.trim($('#header input').val());
-            if (last_query.length > 2) {
-              Finder.find(last_query);
-            }
-          }
-        }, 1000);
+  static cleanProcess(clazz) {
+    $.ajax({
+      url: "/processes/" + clazz,
+      type: 'POST',
+      success: function(result) {
+        ProcessManager.cancel();
+      },
+      error: function(error) {
+         ProcessManager.error();
       }
-  });
-});
+    });
+  }
+}

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

@@ -0,0 +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-absolute
+          .media
+            .pull-left
+              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...
+
+
+javascript:
+  function clean_process() {
+    console.log("Override 'clean_process' function");
+  }

data/lib/sinatra/views/libraries/include_css.slim

@@ -29,7 +29,7 @@ link href="/sinatra-hexacta/vendors/daterangepicker/daterangepicker.css" rel="st
 link href="/sinatra-hexacta/vendors/fullcalendar/main.min.css" rel="stylesheet"
 
 /year calendar
-link href="/vendors/bootstrap-year-calendar/bootstrap-year-calendar.min.css" rel="stylesheet"
+link href="/sinatra-hexacta/vendors/bootstrap-year-calendar/bootstrap-year-calendar.min.css" rel="stylesheet"
 
 /general app
 link href="/sinatra-hexacta/css/app.min.1.css?version=#{settings.version}" rel="stylesheet"

data/lib/sinatra/views/libraries/include_js_before.slim

@@ -8,3 +8,4 @@ script src="/sinatra-hexacta/vendors/chartist/chartist-plugin-legend.js"
 
 script src="/sinatra-hexacta/js/app.js?ver=#{settings.version}" type='text/javascript'
 script src="/sinatra-hexacta/js/finder.js?ver=#{settings.version}" type='text/javascript'
+script src="/sinatra-hexacta/js/process.js?ver=#{settings.version}" type='text/javascript'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.7
 platform: ruby
 authors:
 - Marco Zanger
@@ -125,6 +125,7 @@ files:
 - lib/sinatra/public/fonts/roboto/Roboto-Thin-webfont.ttf
 - lib/sinatra/public/fonts/roboto/Roboto-Thin-webfont.woff
 - lib/sinatra/public/img/finder.jpg
+- lib/sinatra/public/img/noimage.jpg
 - lib/sinatra/public/img/select.png
 - lib/sinatra/public/img/select@2x.png
 - lib/sinatra/public/js/app.js
@@ -175,6 +176,7 @@ files:
 - lib/sinatra/views/alerts/empty.slim
 - lib/sinatra/views/alerts/error.slim
 - lib/sinatra/views/alerts/info.slim
+- lib/sinatra/views/alerts/process.slim
 - lib/sinatra/views/alerts/success.slim
 - lib/sinatra/views/alerts/warning.slim
 - lib/sinatra/views/charts/bar.slim