sinatra-hexacta 1.7.6 → 1.7.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/sinatra/extensions/date.rb +9 -1
- data/lib/sinatra/extensions/init.rb +1 -1
- data/lib/sinatra/public/js/app.js +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6aeb241c647e255ee8aec5a86b062ad36c3fe912044e28744d9b4c35c026e426
|
4
|
+
data.tar.gz: 878fe63c4d30a8a55e67fbe8de65f9bbef592b2baa37d9f7d4b240eb3c6b35ae
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
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
|
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
|
@@ -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(
|