882 Commits

Author SHA1 Message Date
Dan Funk
3e1d492bb1 Merge branch 'rrt/production' of github.com:sartography/cr-connect-workflow into rrt/production 2020-06-03 08:09:58 -04:00
Dan Funk
00a1902c71 Merge branch 'rrt/dev' into rrt/production 2020-06-03 07:59:05 -04:00
Dan Funk
299ad4fc8b Adding more details to the csv output, and assuring we don't miss people with outstanding approvals that were cancelled. 2020-06-03 07:58:48 -04:00
Aaron Louie
6bd2b65500 Merge branch 'rrt/dev' into dev 2020-06-03 00:02:52 -04:00
Aaron Louie
1c25e58900 Merge branch 'rrt/testing' into rrt/staging 2020-06-03 00:02:37 -04:00
Aaron Louie
09558984d1 Merge branch 'rrt/dev' into rrt/testing 2020-06-03 00:02:24 -04:00
Dan Funk
7b8c797996
Merge pull request #103 from sartography/rrt/dev
Rrt/dev
2020-06-02 22:10:18 -04:00
Dan Funk
4bf13b0718 Doing everything I can imagine to get a CSV dump out tomorrow. 2020-06-02 22:01:49 -04:00
Dan Funk
e7c130054d Fixing a test. 2020-06-02 20:07:56 -04:00
Dan Funk
2424b9d78c Don't overwrite the approval, just allow minor changes. 2020-06-02 19:36:06 -04:00
Dan Funk
2cd6311666 as always, forgot the migration. 2020-06-02 18:17:51 -04:00
Dan Funk
c7484267e1 For the main approval endpoints - we now group the approvals by study. So you get one record back for each study, but it may have other approvals along with it as "related_approvals".
We now cache the LDAP records - so we look in our own database for the record before calling out to ldap for the details when given a straight up computing id like dhf8r.

Added "date_approved" to the approval model.

And moved the approver and primary investigator into real associated models to make it easier to dump.

Fixed a problem with the validation that was causing it to throw incorrect errors on valid workflows. Getting it to behave a little more like the front end behaves, and respecting the read-only fields.  But it was mainly to do with always returning all the data with each form submission.
2020-06-02 18:17:00 -04:00
Aaron Louie
a2696faa36 Merge branch 'rrt/dev' into dev 2020-06-02 08:51:18 -04:00
Aaron Louie
7cbcdc0dcd Merge branch 'rrt/staging' into rrt/production 2020-06-02 08:50:37 -04:00
Aaron Louie
761d70eaf3 Merge branch 'rrt/testing' into rrt/staging 2020-06-02 08:50:27 -04:00
Aaron Louie
211797b843 Merge branch 'rrt/dev' into rrt/testing 2020-06-02 08:49:56 -04:00
Dan Funk
59e91ec414 Don't add an empty approval record. 2020-06-02 08:35:19 -04:00
Dan Funk
33a3a40586
Merge pull request #100 from sartography/rrt/dev
Rrt/dev
2020-06-02 07:52:41 -04:00
Dan Funk
d8329e9eff I completely missed pushing up my changes last night before handing back over to Carlos. Sorry about that.
Added checks to assure the approver matches g.uid of the current user - otherwise don't modify the approval record.
2020-06-02 07:43:19 -04:00
Dan Funk
4090667a5d Missed committing a pile of changes last night. 2020-06-02 07:08:29 -04:00
Dan Funk
a78db8834c
Merge pull request #99 from sartography/feature/sentry
Enabling Sentry for boxes with the flag set
2020-06-02 06:28:06 -04:00
Dan Funk
d0918e9ed3
Merge pull request #98 from sartography/fix/approvals-info
Approval info addition
2020-06-02 06:26:56 -04:00
Carlos Lopez
95a3b22bf0 Enabling Sentry for boxes with the flag set 2020-06-01 19:59:55 -06:00
Dan Funk
059c9f2aad Merge branch 'feature/approvals_enhancements' of github.com:sartography/cr-connect-workflow into feature/approvals_enhancements 2020-06-01 21:49:40 -04:00
Dan Funk
c2a1b0175a Tweaks to approvals 2020-06-01 21:49:30 -04:00
Dan Funk
f866a4a06b Tweaks to approvals 2020-06-01 21:45:09 -04:00
Dan Funk
1db9401166 Don't put all the data into Spiff Tasks on a reload or backtrack, just store the data that gets submitted each time in the task log, and use that.
This should correct issues with parallel tasks and other complex areas - so we don't have tasks seeing data that isn't along their path.
2020-06-01 17:42:39 -04:00
Carlos Lopez
3c2849f40d Approval info addition 2020-06-01 15:29:59 -06:00
Aaron Louie
22446a71c3 Merge branch 'rrt/staging' into rrt/production 2020-06-01 13:38:39 -04:00
Aaron Louie
d661eca34f Merge branch 'rrt/testing' into rrt/staging 2020-06-01 13:38:27 -04:00
Aaron Louie
09a531d9f4 Merge branch 'rrt/dev' into rrt/testing 2020-06-01 13:38:19 -04:00
Aaron Louie
8e9b847e1b Merge branch 'dev' into rrt/dev 2020-06-01 13:38:08 -04:00
Aaron Louie
51accc350c Updates doc template 2020-06-01 13:37:44 -04:00
Aaron Louie
c7f739215d Merge branch 'rrt/dev' into dev 2020-06-01 13:31:06 -04:00
Aaron Louie
6d4c477213 Merge branch 'rrt/staging' into rrt/production 2020-06-01 13:30:52 -04:00
Aaron Louie
08bf87b317 Merge branch 'rrt/testing' into rrt/staging 2020-06-01 13:30:24 -04:00
Aaron Louie
bf999bd056 Merge branch 'rrt/dev' into rrt/testing 2020-06-01 13:30:12 -04:00
Aaron Louie
885ce5668e Updates RRT workflow spec files 2020-06-01 13:29:57 -04:00
Dan Funk
7b7cb25c67
Merge pull request #97 from sartography/rrt/dev
The complete_template script might not grab the correct document when…
2020-06-01 12:43:00 -04:00
Dan Funk
c790737bf0 The complete_template script might not grab the correct document when validating, fixed.
Updated to latest RRT files, and passing.
2020-06-01 12:33:58 -04:00
Aaron Louie
62d22a3fc4 Merge branch 'rrt/dev' into dev 2020-06-01 12:23:29 -04:00
Aaron Louie
a77b168e30 Merge branch 'rrt/staging' into rrt/production 2020-06-01 12:22:57 -04:00
Aaron Louie
f420c0119a Merge branch 'rrt/testing' into rrt/staging 2020-06-01 12:22:46 -04:00
Dan Funk
199cd2cded
Merge pull request #96 from sartography/rrt/dev
used 'name' rather than 'value' in the lookup options during validati…
2020-06-01 11:14:53 -04:00
Dan Funk
b6bf843f6e used 'name' rather than 'value' in the lookup options during validation, causing a disconnect with how this is processed on the front end. 2020-06-01 11:00:56 -04:00
Aaron Louie
5ab59087b8
Merge pull request #95 from sartography/rrt/staging
Rrt/staging
2020-06-01 01:26:25 -04:00
Aaron Louie
58ffe741af
Merge pull request #94 from sartography/rrt/testing
Rrt/testing
2020-06-01 01:25:53 -04:00
Aaron Louie
ba14867811
Merge pull request #93 from sartography/rrt/dev
Rrt/dev
2020-06-01 01:06:42 -04:00
Aaron Louie
bc26589e77
Merge pull request #92 from sartography/rrt/dev
Rrt/dev
2020-06-01 01:06:29 -04:00
Aaron Louie
bb32bd7090
Merge pull request #91 from sartography/feature/approvals_enhancements
Approvals enhancements
2020-06-01 00:46:59 -04:00