sinatra-hexacta 1.6.0 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9dc56be12a60357e82d8279807d2553afc0ad376e430bcfbdf18efc49b74ca
-  data.tar.gz: 2bb9c311849b822ccbc6f36a92c3d989bf36a8a851df97793d01e91d7cafab67
+  metadata.gz: 67ece1e93fa8e42e82d62ebd4bcad15aef25ec59713d1b9cbbde415a0be80f5f
+  data.tar.gz: ed66036b2dc8631b661f8d8e635302b007379e3879d5b29e528bfee2727cfb69
 SHA512:
-  metadata.gz: 2d2d8812917f8d26437c9b461b7fe59ae7685922075e2cb29be86d7f3b684c5894c563162a86d915898d97075e861956acc9af8b43a3d17c1a240f401789dec0
-  data.tar.gz: c99a0226bf62c3b1408e4936197b3570e39ea5596a4b53b1fc3184fb519ce4a02397bc52c89eba104d1fabfc090158fe608ba46df5da479095a0e0dbecc05ee8
+  metadata.gz: 9934eae8636c78275b39eaaea8eb87757512464eddc0454011b6e0047e678bfeb3fd48a9fb04435c9b4d03689ae44ff971fa7267917f89212fe1dea908bfd3b6
+  data.tar.gz: 705a7593c2f566dd4b2318c5188add2b753aa47a7e19fff8ea5e979556136cb4940e6d83e08ab2bcfcf264ad5123bcc080ea42be9875e8a12a027b60a6c2c92b

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

@@ -25,7 +25,7 @@ $(document).ready(function(){
 
 function update_html_elements() {
 
-    $("form.async").submit(function(e){
+    $("form.async").unbind("submit").submit(function(e){
       e.preventDefault();
       var datastring = $(this).serialize();
       var url = $(this).attr('action');
@@ -33,15 +33,32 @@ function update_html_elements() {
       $('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');
       $.ajax({
+
         type: "POST",
         url: url,
         data: datastring,
         success: function(data) {
-          location.reload();
+          $('#loading-modal').modal('hide');
+          $('#loading-modal').remove();
+          $('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 () {
+            location.reload();
+          }, 1000)
+        },
+        error: function(error) {
+          $('#loading-modal').modal('hide');
+          $('#loading-modal').remove();
+          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');
         }
       });
     });
 
+
     // Fix modal inside other components
     $('.modal').appendTo("body");
 
@@ -563,8 +580,20 @@ function rm_object(object,id) {
   $.ajax({
     url: '/' + object + '/' + id,
     type: 'DELETE',
-    success: function(result) {
-      location.reload();
+    success: function(data) {
+      $('#loading-modal').modal('hide');
+      $('#loading-modal').remove();
+      $('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 () {
+        location.reload();
+      }, 1000)
+    },
+    error: function(data) {
+      $('#loading-modal').modal('hide');
+      $('#loading-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="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');
     }
   });
 }

metadata

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