sinatra-hexacta 1.7.8 → 1.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64aad875765320466eb0d85f6a1fc12d369d86d0483b1675878bfb6f770c9571
-  data.tar.gz: ac0ea17df7526a6d9b251d158aea06cd6dc613d876b912101cdbcb75e0a57441
+  metadata.gz: 4587ca3181eb451a3960b799cf333ca60765a5e51e16dc346511d1bdf985cbab
+  data.tar.gz: fc47b861237b1ec09fe4cf74212a0f4237a006a3d77a407d59922d5196e9bc9f
 SHA512:
-  metadata.gz: 3fa811da4467aa7db81acfb358f34e59074768478db1864b547433ddae3aed054b74bc65d42b099f70c1e852d93215e448ccab4ce984201eb04d14c0dc8a2955
-  data.tar.gz: 3d76123dea2ffb9e0bfc3cfdf31484a63bba67850a7e7111d7b33edfc5cb30a1bb247c7d0ce9156f94d6535a897601cd6bbd0bd6d2764d0ad3d1fa89e1513815
+  metadata.gz: ee70d0bc863fe250171158654a7d2f2f35f45792df1485c42a64838cd65c9295e8f9e76f50b75ef48a54b5ae696f4e64fde6b7190c9c9ab2df18de2a52a7f849
+  data.tar.gz: 57b153fb80898c27dc0d125722dc2491904067b6e4f91a01e8420a3d8a9dc3b58ae0e04d7f207d4edea9cc10d0440738c0e6dc93c36134a335f9927bb8e34c55

data/lib/sinatra/extensions/date.rb

@@ -35,7 +35,7 @@ class Date
 
   def add_working_days(days=1)
     new_date = self + days
-    while (new_date.wday % 7 == 0) or (new_date.wday % 7 == 6) or Holiday.date(new_date).count > 0 do
+    while (new_date.wday % 7 == 0) or (new_date.wday % 7 == 6) do
       new_date += 1
     end
     new_date

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

@@ -337,7 +337,7 @@ function update_html_elements() {
 
     if ($('.date-range')[0]) {
       // to_data_source method is compliant with the calendar library used in holidays
-      $('.date-range').daterangepicker({
+      $('.date-range').not('.initialized').daterangepicker({
           "parentEl" : $(this).id,
           "autoApply": true,
           "locale": {
@@ -355,6 +355,7 @@ function update_html_elements() {
         },
         opens: 'center'
       });
+      $('.date-range').addClass('initialized');
     }
 
     /*
@@ -658,7 +659,7 @@ function buildFilterMap(offset) {
 function advance_search(url,offset,format) {
   filter_map = buildFilterMap(offset);
   filter_map["format"] = format;
-  if (format != 'xls') {
+  if (format != 'xls' && !format.includes('reports')) {
     window.location.href = url + "?" + encodeQueryData(filter_map);
   } else {
     window.open(

metadata

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