sinatra-hexacta 1.7.7 → 1.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aedcbf3c2bb769f1f78b351b42f5f65e0171624401e1fb136cc1d198635344e4
-  data.tar.gz: 9fe730e6c6acd693bebab4559366dcf7992ff1f6cd3ec935632fdfee27b0a1fd
+  metadata.gz: 1d23ddb19a38d2cefa5216e105ed4f711d63d3bf2d8705bc08dcf63f8751cd9b
+  data.tar.gz: 01c3509f1a2a77db598809ac2cd3255b83127f22a14f2eaa1c4c29a6d4bc5eb7
 SHA512:
-  metadata.gz: e5ad947c31a166651792b67ef220958d3c7384c576a8c010db018877102d14fd6dc5736788e0545cca6c6613c73730cd5c4691fc065421f7a77f2e514512ee01
-  data.tar.gz: 0f785d4d9da08111214c39f34d066729aaf329815163a3b17e2d60bc1f73e7081dd0eefead30d786ded60caabd98271a04bbff8dcab3293ecf701ed20a44d3dd
+  metadata.gz: 565a078491d820acf854bbb6b691dbc11a760a029fd0d827a69556d617a5757cc05290f85d1e150b6fd63e7240b1713a486df5cd51c555a0ab563f659353f79f
+  data.tar.gz: aa35f18b6cf5cf4664f42653885b1fed01a79c3a8f2f2bbc0be327320f66f8d981ef42f65b33ed7bdc54d188c425e54c14092f4f95c9d9469e6a6f32912cb8be

data/lib/sinatra/extensions/date.rb

@@ -26,13 +26,21 @@ class Date
   end
 
   def display
-    "#{Configuration::DAYS[self.wday]} #{self.day} de #{Configuration::MONTHS[self.month-1]} #{self.year == Date.today.year ? '' : self.year}"
+    "#{Configuration::DAYS[self.wday]} #{self.day} de #{Configuration::MONTHS[self.month-1]}, #{self.year}"
   end
 
   def short_display
     self.strftime('%-d/%-m/%Y')
   end
 
+  def add_working_days(days=1)
+    new_date = self + days
+    while (new_date.wday % 7 == 0) or (new_date.wday % 7 == 6) do
+      new_date += 1
+    end
+    new_date
+  end
+
   def next_working_date
     add_working_days(1)
   end

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.7
+  version: 1.7.11
 platform: ruby
 authors:
 - Marco Zanger
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: caxlsx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
 description: A gem to support general functionality accross all apps
 email: mzanger@hexacta.com
 executables: []