commercial_weeks 0.1.0 → 0.2.0
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/commercial_weeks/version.rb +1 -1
- data/lib/commercial_weeks.rb +2 -5
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 46044af207665e2d5f670efd868b5ba9713fb905
|
|
4
|
+
data.tar.gz: 7893a6d5d56d240d216342f90fab7b7cf9a8338f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8ba3cd607124858829e46d7c8b38047368ae04fa656ea4c06c455d7948c190fc1526731db6b00fd57c51f59e09a57067f47744b8ae67ed0f89331a39ce6ff8ce
|
|
7
|
+
data.tar.gz: 4dfba2e37b7e6b4011375c6d69f1eb84b08961e7dbd038892fdd75ebfd3e7b779c209fdc19b51d5595c0928ab96efa9940f96ad03575fb3d7a0abf690ae35b68
|
data/lib/commercial_weeks.rb
CHANGED
|
@@ -8,6 +8,8 @@ module CommercialWeeks
|
|
|
8
8
|
def self.week_dates(week_num, year)
|
|
9
9
|
week_start = Date.commercial(year, week_num, 1)
|
|
10
10
|
week_end = Date.commercial(year, week_num, 7)
|
|
11
|
+
p week_start
|
|
12
|
+
p week_end
|
|
11
13
|
week_end = Date.new(year).end_of_year if week_end.year > week_start.year
|
|
12
14
|
[week_start.strftime('%d %b, %Y'), week_end.strftime('%d %b, %Y')].join(' - ')
|
|
13
15
|
end
|
|
@@ -51,11 +53,6 @@ module CommercialWeeks
|
|
|
51
53
|
[start_date, end_date].join(' - ')
|
|
52
54
|
end
|
|
53
55
|
|
|
54
|
-
def self.selected_week(worklog)
|
|
55
|
-
date = @worklog.date.present? ? @worklog.date : start_date_of_week(Date.today)
|
|
56
|
-
current_week date
|
|
57
|
-
end
|
|
58
|
-
|
|
59
56
|
def self.start_date_of_week(date)
|
|
60
57
|
date.year == date.monday.year ? date.monday : date.beginning_of_year
|
|
61
58
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: commercial_weeks
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.2.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- usman
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-04-
|
|
11
|
+
date: 2017-04-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|