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.

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

JM - Study Level Activities Export #393

Closed
wants to merge 44 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
825256b
ignore 'list' and 'actions' columns [#108497196]
jwiel86 Oct 17, 2018
ce70766
change export file format to xlsx [#108497196]
jwiel86 Oct 17, 2018
45fe125
adding notes and docs col [#108497196]
jwiel86 Oct 24, 2018
4e925ba
Merge branch 'v2.8.5' into jm-sla-export
Stuart-Johnson Dec 13, 2018
98ade94
Adding invoiced column to invoice report [#162323934]
royyesud Jan 9, 2019
6b8ff42
added negative value validation
Jan 18, 2019
93af596
minor changes to entry model, fixed typo [#158777020]
Feb 5, 2019
bdf5a7d
changed tooltip [#163909683]
Feb 13, 2019
e5eb0e0
changed tooltip [#163909683]
Feb 13, 2019
5dbbd54
Merge pull request #407 from sparc-request/ml-klok_negative_validation
Stuart-Johnson Feb 14, 2019
74b1843
Merge pull request #410 from sparc-request/ml-change_tooltip_wording
Stuart-Johnson Feb 14, 2019
eda21b9
changed sorting to last_name [#160935544]
Feb 14, 2019
ddc5e31
adding blue highlight when document is added, also some code cleanup …
Stuart-Johnson Feb 20, 2019
6886cbe
fixes for spec suite
Stuart-Johnson Feb 22, 2019
03a1a8e
[Security] Bump bootstrap-sass from 3.3.7 to 3.4.1
dependabot-support Feb 22, 2019
c4abd86
Merge pull request #413 from sparc-request/sj-spec_updates
Stuart-Johnson Feb 22, 2019
8edcd3c
Merge branch 'v2.9.0' into sry-adding_invoiced_column_to_invoice_report
Stuart-Johnson Feb 22, 2019
f14ea29
Merge pull request #411 from sparc-request/ml-invoice_rpt_sort_pi_by_…
Stuart-Johnson Feb 22, 2019
31453ad
Merge pull request #412 from sparc-request/sj-ie_documents_indicator
Stuart-Johnson Feb 22, 2019
222948b
Merge pull request #399 from sparc-request/sry-adding_invoiced_column…
Stuart-Johnson Feb 25, 2019
096c352
Adding modified rate column to invoice report [#156286625]
royyesud Feb 27, 2019
4c858a0
Adding Other to Incomplete Procedure Reason List[#164118170]
royyesud Mar 1, 2019
4e21859
Merge pull request #417 from sparc-request/sry-adding_modified_rate_c…
Stuart-Johnson Mar 1, 2019
c9747a5
Merge pull request #420 from sparc-request/sry-incomplete_procedure_r…
Stuart-Johnson Mar 1, 2019
e88d500
hotfix for double loading issue [#164121508]
Stuart-Johnson Mar 4, 2019
c2b65f1
Merge pull request #415 from sparc-request/dependabot/bundler/bootstr…
Stuart-Johnson Mar 8, 2019
924c135
fixes for fulfillments document creation [#163792322]
Stuart-Johnson Mar 11, 2019
6906718
Rake task for fixing one time fee line items [#161688951]
royyesud Mar 11, 2019
a23739a
Merge pull request #423 from sparc-request/sj-fulfillment_documents
Stuart-Johnson Mar 11, 2019
1b79959
fixes for query slowness [#164121508]
Stuart-Johnson Mar 11, 2019
2a8150b
trying gem fix
Stuart-Johnson Mar 11, 2019
2639b8f
adding more details to the generated report
royyesud Mar 13, 2019
5db5673
[Security] Bump rails from 5.2.1.1 to 5.2.2.1
dependabot-support Mar 13, 2019
30c9086
[Security] Bump rails from 5.2.1.1 to 5.2.2.1
dependabot-support Mar 13, 2019
452abb2
Merge pull request #429 from sparc-request/dependabot/bundler/rails-5…
dependabot[bot] Mar 14, 2019
fc5acfd
Bump acts_as_list from 0.9.16 to 0.9.19
dependabot-support Mar 14, 2019
e49c4e9
Merge pull request #424 from sparc-request/sry-script_to_fix_one_time…
Stuart-Johnson Mar 14, 2019
1cb498c
Merge pull request #425 from sparc-request/sj-query_changes
Stuart-Johnson Mar 14, 2019
a41484b
Merge pull request #428 from sparc-request/dependabot/bundler/v2.8.5/…
Stuart-Johnson Mar 14, 2019
3915822
Merge pull request #430 from sparc-request/dependabot/bundler/acts_as…
Stuart-Johnson Mar 14, 2019
bcc0585
Merge branch 'v2.9.0' into testing
Stuart-Johnson Mar 14, 2019
ff2535e
Merge branch 'v2.9.0' into jm-sla-export
jwiel86 Mar 25, 2019
531dd5a
Merge branch 'jm-sla-export' of https://github.com/sparc-request/spar…
jwiel86 Apr 4, 2019
24805e3
[#108497196]
jwiel86 Apr 4, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ gem 'autoprefixer-rails', '7.2.2'
gem 'axlsx', git: 'https://github.com/randym/axlsx.git', ref: '776037c0fc799bb09da8c9ea47980bd3bf296874'
gem 'axlsx_rails'
gem 'bootstrap-sass'
gem 'sassc-rails', '>= 2.1.0'
gem 'bootstrap-select-rails'
gem 'bootstrap-toggle-rails'
gem 'bootstrap3-datetimepicker-rails', '~> 4.17.37'
Expand All @@ -35,7 +36,7 @@ gem 'paper_trail', '~> 10.0.1'
gem 'paranoia', '~> 2.4'
gem 'progress_bar'
gem 'puma'
gem 'rails', '5.2.1.1'
gem 'rails', '5.2.2.1'
gem 'remotipart'
gem 'rest-client'
gem 'rubyzip', '>= 1.2.1'
Expand Down
114 changes: 62 additions & 52 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,37 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.1.1)
actionpack (= 5.2.1.1)
actioncable (5.2.2.1)
actionpack (= 5.2.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.1.1)
actionpack (= 5.2.1.1)
actionview (= 5.2.1.1)
activejob (= 5.2.1.1)
actionmailer (5.2.2.1)
actionpack (= 5.2.2.1)
actionview (= 5.2.2.1)
activejob (= 5.2.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.1.1)
actionview (= 5.2.1.1)
activesupport (= 5.2.1.1)
actionpack (5.2.2.1)
actionview (= 5.2.2.1)
activesupport (= 5.2.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.1.1)
activesupport (= 5.2.1.1)
actionview (5.2.2.1)
activesupport (= 5.2.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.1.1)
activesupport (= 5.2.1.1)
activejob (5.2.2.1)
activesupport (= 5.2.2.1)
globalid (>= 0.3.6)
activemodel (5.2.1.1)
activesupport (= 5.2.1.1)
activerecord (5.2.1.1)
activemodel (= 5.2.1.1)
activesupport (= 5.2.1.1)
activemodel (5.2.2.1)
activesupport (= 5.2.2.1)
activerecord (5.2.2.1)
activemodel (= 5.2.2.1)
activesupport (= 5.2.2.1)
arel (>= 9.0)
activerecord-import (0.25.0)
activerecord (>= 3.2)
Expand All @@ -52,16 +52,16 @@ GEM
multi_json (~> 1.11, >= 1.11.2)
rack (>= 1.5.2, < 3)
railties (>= 4.0)
activestorage (5.2.1.1)
actionpack (= 5.2.1.1)
activerecord (= 5.2.1.1)
activestorage (5.2.2.1)
actionpack (= 5.2.2.1)
activerecord (= 5.2.2.1)
marcel (~> 0.3.1)
activesupport (5.2.1.1)
activesupport (5.2.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
acts_as_list (0.9.16)
acts_as_list (0.9.19)
activerecord (>= 3.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
Expand All @@ -80,9 +80,9 @@ GEM
actionpack (>= 3.1)
axlsx (>= 2.0.1)
bcrypt (3.1.12)
bootstrap-sass (3.3.7)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
sassc (>= 2.0.0)
bootstrap-select-rails (1.12.4)
bootstrap-toggle-rails (2.2.1.0)
bootstrap3-datetimepicker-rails (4.17.47)
Expand Down Expand Up @@ -129,7 +129,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.3)
concurrent-ruby (1.1.5)
cookiejar (0.3.3)
crack (0.4.3)
safe_yaml (~> 1.0.0)
Expand Down Expand Up @@ -167,7 +167,7 @@ GEM
em-socksify (0.3.2)
eventmachine (>= 1.0.0.beta.4)
equalizer (0.0.11)
erubi (1.7.1)
erubi (1.8.0)
erubis (2.7.0)
eventmachine (1.2.7)
execjs (2.7.0)
Expand All @@ -194,7 +194,7 @@ GEM
thor (~> 0.19.1)
geckodriver-helper (0.21.0)
archive-zip (~> 0.7)
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
gon (6.2.1)
actionpack (>= 3.0)
Expand Down Expand Up @@ -230,7 +230,7 @@ GEM
http-cookie (1.0.3)
domain_name (~> 0.5)
http_parser.rb (0.6.0)
i18n (1.1.1)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
io-like (0.3.0)
Expand Down Expand Up @@ -258,9 +258,9 @@ GEM
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mimemagic (0.3.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
momentjs-rails (2.20.1)
railties (>= 3.1)
Expand All @@ -275,8 +275,8 @@ GEM
net-ssh (5.0.2)
netrc (0.11.0)
nio4r (2.3.1)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
omniauth (1.8.1)
hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3)
Expand Down Expand Up @@ -310,18 +310,18 @@ GEM
rack (>= 1.2.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1.1)
actioncable (= 5.2.1.1)
actionmailer (= 5.2.1.1)
actionpack (= 5.2.1.1)
actionview (= 5.2.1.1)
activejob (= 5.2.1.1)
activemodel (= 5.2.1.1)
activerecord (= 5.2.1.1)
activestorage (= 5.2.1.1)
activesupport (= 5.2.1.1)
rails (5.2.2.1)
actioncable (= 5.2.2.1)
actionmailer (= 5.2.2.1)
actionpack (= 5.2.2.1)
actionview (= 5.2.2.1)
activejob (= 5.2.2.1)
activemodel (= 5.2.2.1)
activerecord (= 5.2.2.1)
activestorage (= 5.2.2.1)
activesupport (= 5.2.2.1)
bundler (>= 1.3.0)
railties (= 5.2.1.1)
railties (= 5.2.2.1)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
Expand All @@ -337,16 +337,16 @@ GEM
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.1.1)
actionpack (= 5.2.1.1)
activesupport (= 5.2.1.1)
railties (5.2.2.1)
actionpack (= 5.2.2.1)
activesupport (= 5.2.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-inotify (0.10.0)
ffi (~> 1.0)
rdoc (6.0.4)
ref (2.0.0)
regexp_parser (1.3.0)
Expand Down Expand Up @@ -387,7 +387,7 @@ GEM
sexp_processor (~> 4.9)
rubyzip (1.2.2)
safe_yaml (1.0.4)
sass (3.6.0)
sass (3.7.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -398,6 +398,15 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.0.0)
ffi (~> 1.9.6)
rake
sassc-rails (2.1.0)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sdoc (1.0.0)
rdoc (>= 5.0)
selenium-webdriver (3.141.0)
Expand Down Expand Up @@ -526,7 +535,7 @@ DEPENDENCIES
pry
puma
rack-mini-profiler
rails (= 5.2.1.1)
rails (= 5.2.2.1)
rails-controller-testing
rails-erd
remotipart
Expand All @@ -536,6 +545,7 @@ DEPENDENCIES
rspec-rails
rubyzip (>= 1.2.1)
sass-rails
sassc-rails (>= 2.1.0)
sdoc (~> 1.0.0)
selenium-webdriver
shoulda-callback-matchers
Expand Down
1 change: 1 addition & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
//= require bootstrap-toggle
//= require bootstrap-table-export
//= require bootstrap-table-custom
//= require xlsx.core.min
//= require tableExport
//= require jquery.base64
//= require moment
Expand Down