sinatra-hexacta 1.6.3 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d706c95a77c81c7a7628ee52313a72c8f1cb6e66c3ca0212e59e8a11b3978eb
-  data.tar.gz: 79fa082bb9676a6ced1e03116e699b7533ce54e4a7885c399092e2da7bea7807
+  metadata.gz: dc107478ca07acf14ac42fe83c84514cc09d2e86a1526005f6d22db7d1d3ac51
+  data.tar.gz: 67fd0bb1d758f908c3379c4f29788213597b9d0f9ab6cf6ab839afe9961b6b58
 SHA512:
-  metadata.gz: 440b4b2efbbde161c1f2858cbcf726af44c1af507eed42f97ca9796a328a3f1e721abe9b20355fbb59369e92a4d7fd4e561f7a32e7ed12b748db38ab4623ab15
-  data.tar.gz: a8ac196c8d7cc02acc7f9fd143cbec972b0d4986f8dd7622f0c448d2696492886a3de51514d7634c603875f51bd8015f41867c683c4e9c9100432c0314e7bf99
+  metadata.gz: 866c5ad0b4a8e13dc2a2cb65f97589813ea885a021704fd6c80e8d76ad58f93b235e7e1fc6ac5e92d38d217e5571e0678520023b13f4418982633fbf6f9a737f
+  data.tar.gz: 85ac915c63faa7f36a4d5e117fbc440370ffd1772c9cf002628d123de0e0fd9ba65868681a955d32195347b196bdcd108ff6625153d7aefd815b32f2a1a1040d

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,10 @@ function update_html_elements() {
           }, 1000)
         },
         error: function(error) {
-          $('#loading-modal').modal('hide');
-          $('#loading-modal').remove();
+          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');
         }
@@ -549,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 () {
@@ -587,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.3
+  version: 1.7.3
 platform: ruby
 authors:
 - Marco Zanger