sinatra-hexacta 1.7.6 → 1.7.10

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b3f9bae9416a233d6e2dc0113c4ab93bc4ff1d7142559fa8f9e623f77e522a88
4
- data.tar.gz: 5ca9530edf07753a6935839cb355d2442fad27da7ec0aba4303072763cbb80ea
3
+ metadata.gz: 6aeb241c647e255ee8aec5a86b062ad36c3fe912044e28744d9b4c35c026e426
4
+ data.tar.gz: 878fe63c4d30a8a55e67fbe8de65f9bbef592b2baa37d9f7d4b240eb3c6b35ae
5
5
  SHA512:
6
- metadata.gz: d51bb2d9928d7ceb756cf5570666d462e3b74dbb234ca8e3a390738cdccbba5bb4f250c50bd842167f12eae7c5465d9f4c69a5f7ecf8dd1c5394daa605c4b64f
7
- data.tar.gz: e8f5d62a2f81e69e4ec9ad0c86f9b0f1984009259cfceff77160113640db065a9544a203b19d650cc4e1a8f5c581baacde07a4cffd5301fa1e760767d01207f1
6
+ metadata.gz: cf6ab8bb97c0eabf2e2b6b3dc71e3d4b83995693b540a9bfa04b3f13203f7f806634f02e4db0e9bd621cc48ef56aca2451a0d85b4832c78cf7de1ba243d25105
7
+ data.tar.gz: d9af9427147429b6cf23f91ad3dec6f724f58cb9e29a01d0660b4757beb7cc94bc6b7d08a7bfaac89b8f6bbd6fd1f96d712f8efbece4ea5c9347a5d10a47c38a
@@ -26,13 +26,21 @@ class Date
26
26
  end
27
27
 
28
28
  def display
29
- "#{Configuration::DAYS[self.wday]} #{self.day} de #{Configuration::MONTHS[self.month-1]} #{self.year == Date.today.year ? '' : self.year}"
29
+ "#{Configuration::DAYS[self.wday]} #{self.day} de #{Configuration::MONTHS[self.month-1]}, #{self.year}"
30
30
  end
31
31
 
32
32
  def short_display
33
33
  self.strftime('%-d/%-m/%Y')
34
34
  end
35
35
 
36
+ def add_working_days(days=1)
37
+ new_date = self + days
38
+ while (new_date.wday % 7 == 0) or (new_date.wday % 7 == 6) do
39
+ new_date += 1
40
+ end
41
+ new_date
42
+ end
43
+
36
44
  def next_working_date
37
45
  add_working_days(1)
38
46
  end
@@ -1,7 +1,7 @@
1
1
  # encoding: utf-8
2
2
  require_relative 'antiquity'
3
3
  require_relative 'date'
4
- require_relative 'date_item'
4
+ require_relative 'date_time'
5
5
  require_relative 'mailbuilder'
6
6
  require_relative 'mailsender'
7
7
  require_relative 'mail'
@@ -658,7 +658,7 @@ function buildFilterMap(offset) {
658
658
  function advance_search(url,offset,format) {
659
659
  filter_map = buildFilterMap(offset);
660
660
  filter_map["format"] = format;
661
- if (format != 'xls') {
661
+ if (format != 'xls' && !format.includes('reports')) {
662
662
  window.location.href = url + "?" + encodeQueryData(filter_map);
663
663
  } else {
664
664
  window.open(
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sinatra-hexacta
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.6
4
+ version: 1.7.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marco Zanger