sinatra-hexacta 1.6.4 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67ece1e93fa8e42e82d62ebd4bcad15aef25ec59713d1b9cbbde415a0be80f5f
-  data.tar.gz: ed66036b2dc8631b661f8d8e635302b007379e3879d5b29e528bfee2727cfb69
+  metadata.gz: 35a5abe8c678f588839389b8b76c45c6849c90678054e5c9ee6d725bdaea6bb4
+  data.tar.gz: 9bb209941df45a2f736cf559c85e6bb8c695bf5e9a0da54008020b1d42b741ac
 SHA512:
-  metadata.gz: 9934eae8636c78275b39eaaea8eb87757512464eddc0454011b6e0047e678bfeb3fd48a9fb04435c9b4d03689ae44ff971fa7267917f89212fe1dea908bfd3b6
-  data.tar.gz: 705a7593c2f566dd4b2318c5188add2b753aa47a7e19fff8ea5e979556136cb4940e6d83e08ab2bcfcf264ad5123bcc080ea42be9875e8a12a027b60a6c2c92b
+  metadata.gz: 3d53304326eeb461dc0f7276461b80241a06fbbc84468250b1bd65e2cea9a2f37f805414a5d6b3492576e69fda15548eeb84c9c2ec475b4886df8bb3f8b12eb2
+  data.tar.gz: 332e75bb6823fe6c40a50aeb3b89f5e42d3f15ad60a953b71a4abb08fdacfd9f81c5d8d209f217d4ac94660b2ecbc75e8f93040bb54c544b05759b83e8ec6dd1

data/lib/sinatra/extensions/date.rb

@@ -30,7 +30,7 @@ class Date
   end
 
   def short_display
-    self.strftime('%-d/%-m/%y')
+    self.strftime('%-d/%-m/%Y')
   end
 
   def next_working_date

data/lib/sinatra/public/js/app.js

@@ -30,16 +30,14 @@ function update_html_elements() {
       var datastring = $(this).serialize();
       var url = $(this).attr('action');
       $(this).closest('.modal').modal('hide');
-      $('body').append('<div aria-labelledby="loading" class="modal bounceIn animated" id="loading-modal" role="dialog" tabindex="-1" data-backdrop="static" data-keyboard="false"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><div class="preloader pl-lg"><svg class="pl-circular" viewBox="25 25 50 50"><circle class="plc-path" cx="50" cy="50" r="20"></circle></svg></div></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Espere...</div></div></div></div></div>');
-      $('#loading-modal').modal('show');
+      start_load();
       $.ajax({
 
         type: "POST",
         url: url,
         data: datastring,
         success: function(data) {
-          $('#loading-modal').modal('hide');
-          $('#loading-modal').remove();
+          stop_load();
           $('body').append('<div aria-labelledby="ok" class="modal bounceIn animated" id="ok-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-check-circle c-green"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">¡Listo!</div></div></div></div></div>');
           $('#ok-modal').modal('show');
           setTimeout(function () {
@@ -47,8 +45,7 @@ function update_html_elements() {
           }, 1000)
         },
         error: function(error) {
-          $('#loading-modal').modal('hide');
-          $('#loading-modal').remove();
+          stop_load();
           if ($('#error-modal')[0]) {
             $('#error-modal').remove();
           }
@@ -552,37 +549,25 @@ if (elementToObserve != null) {
 
 
 function start_load() {
-  if (!$("#loader")[0]) {
-    $("html").append('<div id="loader" style="position: fixed;z-index: 100000000;padding:5px;top: 0;"><div class="preloader pl-lg pls-white"  style="left: 10px; top: 5px;"><svg class="pl-circular" viewBox="25 25 50 50"><circle class="plc-path" cx="50" cy="50" r="20"></circle></svg></div></div>');
+  if (!$("#loading-modal")[0]) {
+    $('body').append('<div aria-labelledby="loading" class="modal bounceIn animated" id="loading-modal" role="dialog" tabindex="-1" data-backdrop="static" data-keyboard="false"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><div class="preloader pl-lg"><svg class="pl-circular" viewBox="25 25 50 50"><circle class="plc-path" cx="50" cy="50" r="20"></circle></svg></div></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Espere...</div></div></div></div></div>');
+    $('#loading-modal').modal('show');
   }
 }
 
 function stop_load() {
-  $("#loader").remove();
+  $('#loading-modal').modal('hide');
+  $('#loading-modal').remove();
 }
 
-
-$( document ).ajaxSend(function( event, jqxhr, settings )  {
-  if (!settings.url.includes(".json")) {
-    start_load();
-  }
-});
-
-$( document ).ajaxStop(function() {
-  stop_load();
-});
-
-
 function rm_object(object,id) {
   $(".modal").modal('hide');
-  $('body').append('<div aria-labelledby="loading" class="modal bounceIn animated" id="loading-modal" role="dialog" tabindex="-1" data-backdrop="static" data-keyboard="false"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><div class="preloader pl-lg"><svg class="pl-circular" viewBox="25 25 50 50"><circle class="plc-path" cx="50" cy="50" r="20"></circle></svg></div></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Espere...</div></div></div></div></div>');
-  $('#loading-modal').modal('show');
+  start_load();
   $.ajax({
     url: '/' + object + '/' + id,
     type: 'DELETE',
     success: function(data) {
-      $('#loading-modal').modal('hide');
-      $('#loading-modal').remove();
+      stop_load();
       $('body').append('<div aria-labelledby="ok" class="modal bounceIn animated" id="ok-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-check-circle c-green"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">¡Listo!</div></div></div></div></div>');
       $('#ok-modal').modal('show');
       setTimeout(function () {
@@ -590,8 +575,7 @@ function rm_object(object,id) {
       }, 1000)
     },
     error: function(data) {
-      $('#loading-modal').modal('hide');
-      $('#loading-modal').remove();
+      stop_load();
       $('body').append('<div aria-labelledby="error" class="modal bounceIn animated" id="error-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-alert-polygon c-red"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Oops...</div></div></div></div></div>');
       $('#error-modal').modal('show');
     }

data/lib/sinatra/public/js/view.js

@@ -1,15 +1,41 @@
 class View {
 
-  static get(url,params,destination){
-    $(destination).html('<div class="text-center" style="padding:100px;"><div class="preloader pls-teal bgm-none"><svg class="pl-circular" viewBox="25 25 50 50"><circle class="plc-path" cx="50" cy="50" r="20"></circle></svg></div><h5>Cargando...</h5></div>');
+  static get(url,data,destination,callback = function() {}){
+    start_load();
     $.ajax({
         url: url,
         type: 'GET',
-        data: params
+        data: data,
     }).done(function(result) {
+      stop_load();
       $(destination).html(result);
+      update_html_elements();
+      callback();
     }).error(function(result) {
+      stop_load();
       $(destination).html('<div class="lv-item p-20 bgm-red m-b-5 animated fadeIn"><div class="media"><div class="pull-left"><i class="zmdi zmdi-hc-3x zmdi-alert-octagon c-white"></i></div><div class="media-body"><div class="lv-title c-white">Algo salió mal</div><small class="lv-small c-white">Los administradores acaban de ser informados de este error, ni bien tengan una solución se te notificará. Disculpá las molestias.</small></div></div></div>');
     });
   }
-}
+
+  static append(url,data,destination,callback = function() {}){
+    start_load();
+    $.ajax({
+        url: url,
+        type: 'GET',
+        data: data,
+    }).done(function(result) {
+      stop_load();
+      $(destination).append(result);
+      update_html_elements();
+      callback();
+    }).error(function(error) {
+      stop_load();
+      if ($('#error-modal')[0]) {
+        $('#error-modal').remove();
+      }
+      $('body').append('<div aria-labelledby="error" class="modal bounceIn animated" id="error-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="min-width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-alert-polygon c-red"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="f-900 c-gray">' + error.responseText + '</div></div></div></div></div>');
+      $('#error-modal').modal('show');
+    });
+  }
+}
+

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

@@ -8,6 +8,7 @@ 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'
+script src="/sinatra-hexacta/js/view.js?ver=#{settings.version}" type='text/javascript'
 
 javascript:
   const storeScroll = () => {

metadata

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