Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set new user default effective date to 12/31/2016 #135

Merged
merged 4 commits into from
Mar 21, 2018
Merged

Set new user default effective date to 12/31/2016 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aaf81c3
Set new user default effective date to 12/31/2016
raj209 Mar 21, 2018
e29aaee
Updating GemfileLock
raj209 Mar 21, 2018
2ed1130
Update Gemfile.lock
raj209 Mar 21, 2018
554c840
updating Effective date in test
raj209 Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ GIT
revision: 37f1cd58971f249994ca19bf231a909bcf2f807d
branch: mongoid5R2
specs:
health-data-standards (3.6.1)
health-data-standards (3.7.0)
activesupport (~> 4.2.0)
builder (~> 3.1)
erubis (~> 2.7.0)
Expand All @@ -12,12 +12,12 @@ GIT
memoist (~> 0.9.1)
mongoid (~> 5.0.0)
mongoid-tree (~> 2.0.0)
nokogiri (~> 1.6.8)
nokogiri (~> 1.8.1)
protected_attributes (~> 1.0.5)
rest-client (~> 1.8.0)
rubyzip (>= 1.0.0)
rubyzip (~> 1.2.1)
uuid (~> 2.3.7)
zip-zip
zip-zip (~> 0.3)

GIT
remote: https://github.com/OSEHRA/hqmf2js.git
Expand Down Expand Up @@ -89,18 +89,18 @@ GEM
apipie-rails (0.5.6)
rails (>= 4.1)
arel (6.0.4)
autoprefixer-rails (7.2.3)
autoprefixer-rails (8.1.0.1)
execjs
bcrypt (3.1.11)
bootstrap-datepicker-rails (1.3.0.2)
railties (>= 3.0)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
bson (4.2.2)
bson (4.3.0)
bson_ext (1.5.1)
builder (3.2.3)
byebug (9.1.0)
byebug (10.0.0)
cancan (1.6.10)
coderay (1.1.2)
coffee-rails (4.2.2)
Expand All @@ -113,23 +113,23 @@ GEM
concurrent-ruby (1.0.5)
crass (1.0.3)
daemons (1.2.6)
delayed_job (4.1.3)
delayed_job (4.1.4)
activesupport (>= 3.0, < 5.2)
devise (4.1.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.1)
responders
warden (~> 1.2.3)
docile (1.1.5)
docile (1.3.0)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
eventmachine (1.2.5)
execjs (2.7.0)
factory_girl (4.7.0)
activesupport (>= 3.0.0)
ffi (1.9.18)
ffi (1.9.23)
foreman (0.84.0)
thor (~> 0.19.1)
formtastic (3.1.5)
Expand All @@ -146,7 +146,7 @@ GEM
hquery-patient-api (1.0.4)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.9.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jasmine (2.0.1)
jasmine-core (~> 2.0.0)
Expand All @@ -166,10 +166,10 @@ GEM
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (2.1.0)
kgio (2.11.1)
kgio (2.11.2)
libv8 (3.16.14.19)
log4r (1.1.10)
loofah (2.1.1)
loofah (2.2.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
macaddr (1.7.1)
Expand All @@ -181,9 +181,9 @@ GEM
method_source (0.9.0)
mime-types (2.99.3)
mini_mime (1.0.0)
mini_portile2 (2.1.0)
minitest (5.10.3)
mocha (1.3.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
mocha (1.4.0)
metaclass (~> 0.0.1)
mongo (2.4.3)
bson (>= 4.2.1, < 5.0.0)
Expand All @@ -197,13 +197,13 @@ GEM
mongoid (>= 2.0)
mongoid-tree (2.0.1)
mongoid (>= 4.0, < 6.0)
multi_json (1.12.2)
multi_json (1.13.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
netrc (0.11.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
non-stupid-digest-assets (1.0.9)
sprockets (>= 2.0)
origin (2.3.1)
Expand All @@ -214,10 +214,10 @@ GEM
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.5.1)
byebug (~> 9.1)
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
rack (1.6.8)
rack (1.6.9)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.10)
Expand Down Expand Up @@ -246,7 +246,7 @@ GEM
thor (>= 0.18.1, < 2.0)
raindrops (0.19.0)
rake (12.3.0)
rb-fsevent (0.10.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ref (2.0.0)
Expand All @@ -258,8 +258,8 @@ GEM
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
ruby-ole (1.2.12.1)
rubyzip (1.2.0)
sass (3.5.4)
rubyzip (1.2.1)
sass (3.5.5)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -272,8 +272,8 @@ GEM
tilt (>= 1.1, < 3)
select2-rails (4.0.3)
thor (~> 0.14)
simplecov (0.15.1)
docile (~> 1.1.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-cobertura (1.3.0)
Expand All @@ -288,7 +288,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sshkit (1.15.1)
sshkit (1.16.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
systemu (2.6.5)
Expand All @@ -304,14 +304,14 @@ GEM
tilt (2.0.8)
turn (0.9.6)
ansi
tzinfo (1.2.4)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unf_ext (0.0.7.5)
unicorn (5.4.0)
kgio (~> 2.6)
raindrops (~> 0.7)
Expand Down Expand Up @@ -356,14 +356,14 @@ DEPENDENCIES
mongo (~> 2.4.1)
mongoid (~> 5.0.2)
net-ssh (= 2.9.1)
nokogiri (~> 1.6.8)
nokogiri (~> 1.8.1)
non-stupid-digest-assets
protected_attributes (~> 1.0.9)
pry
pry-byebug
quality-measure-engine!
rails (~> 4.2.7)
rubyzip (= 1.2.0)
rubyzip (= 1.2.1)
sass-rails (~> 5.0.4)
select2-rails
simplecov
Expand Down
4 changes: 2 additions & 2 deletions app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class User
before_save :denullify_arrays
before_create :set_defaults

DEFAULT_EFFECTIVE_DATE = Time.gm(2015, 12, 31)
DEFAULT_EFFECTIVE_DATE = Time.gm(2016, 12, 31)

devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable, :authentication_keys => [:username]
Expand Down Expand Up @@ -58,7 +58,7 @@ class User
field :tin, :type => String
field :agree_license, type: Boolean
field :effective_date, type: Integer, default: DEFAULT_EFFECTIVE_DATE.to_i
field :effective_start_date, type: Integer, default: (DEFAULT_EFFECTIVE_DATE.years_ago(1)).to_i
field :effective_start_date, type: Integer, default: (DEFAULT_EFFECTIVE_DATE.beginning_of_year).to_i
field :admin, type: Boolean
field :approved, type: Boolean
field :staff_role, type: Boolean
Expand Down
2 changes: 1 addition & 1 deletion test/functional/home_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class HomeControllerTest < ActionController::TestCase

test "default effective date for new user" do
sign_in @admin
time = Time.gm(2015,12,31).to_i
time = Time.gm(2016,12,31).to_i
user = User.new
assert_equal time, user.effective_date
end
Expand Down