sinatra-hexacta 0.8.3 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ede22a821385a22e70895f2e4983779a24b40018bcae60a04bb0041be745fda1
-  data.tar.gz: f3e1be8a928f82adc9b053e86625e7f525c84ca752992ebdf557b050a2da1c36
+  metadata.gz: b0dd060b73a298d6478e00bcbb9bdc8d756941ea0f8bd4722f6fc1b5391d81e0
+  data.tar.gz: 3a52a4a4698b47f2f6f7fa5fcfced960744dba7e92c6e25e1d330986a89ed68a
 SHA512:
-  metadata.gz: 4e7be98dc8b45776c71eab44679cd6f86e6fea7b59d8d905f8957c5370e0f9758a6ceb407501d56702c4185e9b33957d0c4c0266c91bf383e9be724a9284e5cb
-  data.tar.gz: 8d6eaaae0a76bed3ddc5431f1c592ad9a68407ae9bd9ecd1b52302ea68feaf89198c6ed38691e8a5b93ab4aa374cfe742cc8b15ced4d724410c263f949aa68bd
+  metadata.gz: 030ceff7353e3653f0077dd2c0176fb6200c8a38db4d29a5f62f892c188f2a7165aff6e2949fb12cd864911dce32a51ccf59df6d5b2b9ca132372932cb213d08
+  data.tar.gz: a487d657ce41bf225bf1681bfb4948e328340b60482d4f8eca570dbf861bfbd09c8ba12e31422f026c6877ae1ca3ef8e8653a996ed2e1f086acd57548a9ae22c

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/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,133 @@
-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) {
+  static update(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 .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) {
+    ProcessManager.show(clazz);
     $.ajax({
-      url: "/processes",
-      type: 'GET',
+      url: "/process",
+      type: 'POST',
       data: { class : clazz },
       success: function(result) {
-        if (result != "") {
-          $("#processes ." + clazz + " .progress-bar").css("width",result.progress + "%");
-        }
+        ProcessManager.init();
       },
       error: function(error) {
+        ProcessManager.error();
       }
     });
   }
 
-  static cleanProcess() {
-
+  static start_with_map(clazz,map) {
+    ProcessManager.show(clazz);
+    map['class'] = clazz;
+    $.ajax({
+      url: "/process",
+      type: 'POST',
+      data: map,
+      success: function(result) {
+        ProcessManager.init();
+      },
+      error: function(error) {
+        ProcessManager.error();
+      }
+    });
   }
 
-  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);
+  static getProcesses(clazz) {
+    $.ajax({
+      url: "/processes",
+      type: 'GET',
+      data: { class : clazz },
+      success: function(result) {
+        if (result != "") {
+          ProcessManager.show(result.name);
+          if (result.progress >= 100.0) {
+            ProcessManager.completeProcess(clazz);
+          }
+          ProcessManager.update(result.progress);
         }
+      },
+      error: function(error) {
+        ProcessManager.error();
       }
-    }, 5000);
+    });
   }
-}
 
-  static find(query){
+  static completeProcess(clazz) {
     $.ajax({
-        url: "/find",
-        type: 'GET',
-        data: { query: query }
-    }).done(function(result) {
-      $("#header .results").html(result);
-
-      $('#header .results *').click(function() {
-        clearTimeout(hide_results_timeout);
-        $("#header input").focus();
-      });
+      url: "/processes/" + clazz,
+      type: 'POST',
+      success: function(result) {
+        ProcessManager.complete()
+      },
+      error: function(error) {
+        ProcessManager.error();
+      }
     });
   }
 
-  static do_find(url,query,html){
+  static cleanProcess(clazz) {
     $.ajax({
-        url: url,
-        type: 'GET',
-        data: { query: query }
-    }).done(function(result) {
-      $(html).html(result);
+      url: "/processes/" + clazz,
+      type: 'POST',
+      success: function(result) {
+        ProcessManager.cancel();
+      },
+      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);
-        }
-    });
-};
-
-$.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);
-      }
-  });
-});
+}

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'

data/lib/sinatra/views/notifications/item.slim

@@ -1,7 +1,7 @@
 a.lv-item style="padding:10px 15px;#{notification.pending?? 'background-color: #ECF9FF;' : ''}" role="button" onclick="#{notification.pending?? "read_notify(#{notification.id},'#{notification.link}');this.onclick=\'\'" : ''}" href="#{notification.pending?? '#' : notification.link}"
   .media
     .pull-left.text-center.p-r-15
-      img.lv-img-sm alt="" src="#{Configuration::USER_PHOTO_URL}#{notification.creator.hxt_id}" title="#{notification.creator.full_name}"
+      img.lv-img-sm alt="" src="#{Configuration::USER_PHOTO_URL}#{notification.creator.hxt_id}" title="#{notification.creator.full_name}" onError="this.onerror=null;this.src='/sinatra-hexacta/img/noimage.jpg';"
       br
       -if notification.label == 'error'
         .btn.btn-link.bgm-red.btn-xs style="font-size:6pt" #{notification.label}

data/lib/sinatra/views/notifications/modal.slim

@@ -5,7 +5,7 @@
         .card-header
           .media
             .pull-left
-              img.lv-img alt="" src="#{Configuration::USER_PHOTO_URL}#{notification.creator.hxt_id}" title="#{notification.creator.full_name}"
+              img.lv-img alt="" src="#{Configuration::USER_PHOTO_URL}#{notification.creator.hxt_id}" title="#{notification.creator.full_name}" onError="this.onerror=null;this.src='/sinatra-hexacta/img/noimage.jpg';"
             .media-body.m-t-5
               h2
                 | #{notification.title}

data/lib/sinatra/views/notifications/view.slim

@@ -10,7 +10,7 @@
   .col-xs-2
     .card.profile-view 
       .pv-header.bgm-teal style="height:70px;"
-        img.pv-main style="width: 100px;height: 100px;bottom: -50px;margin-left: -50px;" alt="" src="#{Configuration::USER_PHOTO_URL}#{user.hxt_id}"
+        img.pv-main style="width: 100px;height: 100px;bottom: -50px;margin-left: -50px;" alt="" src="#{Configuration::USER_PHOTO_URL}#{user.hxt_id}" onError="this.onerror=null;this.src='/sinatra-hexacta/img/noimage.jpg';"
       .pv-body style="padding: 0 20px 10px;"
         h2 style="font-size:14px;font-weight: 500;"
           | #{user.first_name}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.8
 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