sinatra-hexacta 0.8.5 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6be02726f449dec366288a8e986cf950a350412e36138a0081faae3de4d85f
-  data.tar.gz: 4f7dcaeb8123ec8154b38a668cfb02205f44809583dd4d0eb39ee7dabcd447e7
+  metadata.gz: 2dada651b7cec1a5940f886d7c45529ec9bdab29c360e7dba9fe950eb1612997
+  data.tar.gz: 5e0c4fd134cb9e1067f4a81642562942f17f6a77441589e8d49e86d7606e3658
 SHA512:
-  metadata.gz: f343d242e5d4683f1ef4a6e218024125b2095bb12f3245e18ec0f4d2288497b6b686bfa4815dca14ddeef452733e76339b214e61c78dd13ec8a7755cea896667
-  data.tar.gz: 856b37635174175a17585071b60b5ac3151db247327afd8a44720876319cf0e2b5653209e1574756bbe25d1ae8a9659ab38074dc5330e2c4bd25618d107764b6
+  metadata.gz: 935449a6aa6763e9d572ee525c8c86f9b9864c430d72ceeddbe947711464fc05637a8c0801beb6b33e4d22257a903c99fd7cdf88ef4d9b2ef76100e4cdc5c35b
+  data.tar.gz: 0a43e306531dcea9a16e90201f43e0786e8acc0c0ceea015349855b5194233e99e72d2e0350ca3857942461fdfdb8758194c113e472e19c739f2bb937bc40dcb

data/lib/sinatra/extensions/init.rb

@@ -7,3 +7,4 @@ require_relative 'mail'
 require_relative 'generalmail'
 require_relative 'mailbuilder'
 require_relative 'processmanager'
+require_relative 'menu'

data/lib/sinatra/extensions/menu.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+class MenuBuilder
+
+  def initialize
+    @elements = []
+  end
+
+  def dropdown(text,icon,submenu)
+    @elements << { :type => 'dropdown' , :text => text, :icon => icon, :link => submenu }
+    return self
+  end
+
+  def link(text,icon,link,target)
+    @elements << { :type => 'dropdown' , :text => text, :icon => icon, :link => link, :target => target }
+    return self
+  end
+
+  def modal(text,icon,link)
+    @elements << { :type => 'modal' , :text => text, :icon => icon, :link => link }
+    return self
+  end
+
+  def build
+    @elements
+  end
+
+end

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/init.rb

@@ -6,3 +6,4 @@ require_relative 'cas'
 require_relative 'schedule'
 require_relative 'alerts'
 require_relative 'reports'
+require_relative 'menu'

data/lib/sinatra/helpers/menu.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+module Sinatra
+  module MenuHelper
+    extend Hexacta
+
+    def menu(option_hash)
+      slim "#{Hexacta::GEM_FILE_DIR}/menu/menu".to_sym, locals: option_hash
+    end
+
+    setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/menu")
+    copy_all_files("/lib/sinatra/views/menu","/app/views/#{Hexacta::GEM_FILE_DIR}/menu")
+  end
+
+  helpers MenuHelper
+end

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

@@ -10,43 +10,77 @@ 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) {
+    ProcessManager.show(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();
       }
     });
   }
 
   static start_with_map(clazz,map) {
+    ProcessManager.show(clazz);
     map['class'] = clazz;
     $.ajax({
       url: "/process",
       type: 'POST',
       data: map,
       success: function(result) {
-        ProcessManager.show('Cargando...');
-        ProcessManager.update(0);
+        ProcessManager.init();
       },
       error: function(error) {
+        ProcessManager.error();
       }
     });
   }
@@ -58,18 +92,28 @@ class ProcessManager {
       data: { class : clazz },
       success: function(result) {
         if (result != "") {
+          ProcessManager.show(result.name);
           if (result.progress >= 100.0) {
-            //ProcessManager.hide();
-            ProcessManager.complete()
-            ProcessManager.cleanProcess(clazz);
-          } else {
-            ProcessManager.show(result.name);
+            ProcessManager.completeProcess(clazz);
           }
           ProcessManager.update(result.progress);
-          
         }
       },
       error: function(error) {
+        ProcessManager.error();
+      }
+    });
+  }
+
+  static completeProcess(clazz) {
+    $.ajax({
+      url: "/processes/" + clazz,
+      type: 'POST',
+      success: function(result) {
+        ProcessManager.complete()
+      },
+      error: function(error) {
+        ProcessManager.error();
       }
     });
   }
@@ -79,8 +123,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");
+  }

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/menu/menu.slim

@@ -0,0 +1,42 @@
+.actions-menu.m-b-20
+  .btn-group.p-fixed style="border-radius: 5px;z-index:5;"
+    -for item in menu
+      -if item[:type] == 'dropdown'
+        .btn-group
+          a.btn.btn-default.dropdown-toggle.waves-effect.btn-icon-text aria-expanded="true" data-toggle="dropdown" type="button" 
+            i.zmdi class="zmdi-#{item[:icon]}"
+            | #{item[:text]}
+
+          ul.dropdown-menu role="menu" style="border-radius: 5px;"
+            -for subitem in item[:link]
+              -if subitem[:type] == 'link'
+                li
+                  a.btn-icon-text href="#{subitem[:link]}" target="#{subitem[:target]}"
+                    i.zmdi class="zmdi-#{subitem[:icon]}"
+                    | #{subitem[:text]}
+
+      -if item[:type] == 'link'
+        a.btn.btn-default.waves-effect.btn-icon-text type="button" href="#{item[:link]}" target="#{item[:target]}"
+          i.zmdi class="zmdi-#{item[:icon]}"
+          | #{item[:text]}
+
+      -if item[:type] == 'modal'
+        a.btn.btn-default.waves-effect.btn-icon-text type="button" data-toggle="modal" data-target="#{item[:link]}"
+          i.zmdi class="zmdi-#{item[:icon]}"
+          | #{item[:text]}
+
+
+css:
+  .actions-menu {
+    height: 38px;
+  }
+  .actions-menu a.btn {
+    padding: 10px;
+    border-radius: 5px;
+    border-left: 1px solid #eee;
+  }
+
+  .actions-menu a:hover {
+    background: #2196f3 !important;
+    color: white !important;
+  }

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.1
 platform: ruby
 authors:
 - Marco Zanger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-04 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sucker_punch
@@ -80,6 +80,7 @@ files:
 - lib/sinatra/extensions/mail.rb
 - lib/sinatra/extensions/mailbuilder.rb
 - lib/sinatra/extensions/mailsender.rb
+- lib/sinatra/extensions/menu.rb
 - lib/sinatra/extensions/notification.rb
 - lib/sinatra/extensions/processmanager.rb
 - lib/sinatra/handlers/errors.rb
@@ -94,6 +95,7 @@ files:
 - lib/sinatra/helpers/init.rb
 - lib/sinatra/helpers/inputs.rb
 - lib/sinatra/helpers/libraries.rb
+- lib/sinatra/helpers/menu.rb
 - lib/sinatra/helpers/reports.rb
 - lib/sinatra/helpers/schedule.rb
 - lib/sinatra/hexacta.rb
@@ -203,6 +205,7 @@ files:
 - lib/sinatra/views/libraries/include_css.slim
 - lib/sinatra/views/libraries/include_js_after.slim
 - lib/sinatra/views/libraries/include_js_before.slim
+- lib/sinatra/views/menu/menu.slim
 - lib/sinatra/views/notifications.slim
 - lib/sinatra/views/notifications/form.slim
 - lib/sinatra/views/notifications/item.slim