Commit Graph

964 Commits

Author SHA1 Message Date
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
Aaron Louie 7c8b7829ea Merge branch 'rrt/dev' into feature/approvals_enhancements 2020-06-01 00:41:51 -04:00
Aaron Louie 1702ab2576 Fixes decision tables that were causing failing tests 2020-06-01 00:36:25 -04:00
Aaron Louie ea441dbff5 More updates 2020-06-01 00:28:37 -04:00
Aaron Louie 8092bbe682 Wrong file in wrong place. 2020-06-01 00:17:20 -04:00
Aaron Louie 7351dc4a43 Updates RRT workflow spec files for reals this time 2020-06-01 00:14:09 -04:00
Aaron Louie 2d5eb740ef Updates RRTworkflow spec files 2020-06-01 00:07:50 -04:00
Carlos Lopez bec11980eb Fixing broken test by using proper FileSchema 2020-05-31 22:00:52 -06:00
Aaron Louie 311e180c65 Comments out failing test for now. Adds a placeholder test for study approvals 2020-05-31 23:16:14 -04:00
Carlos Lopez b2e56f797b Converting ApprovalModel to Approval in order to serialize properly the result 2020-05-31 21:02:47 -06:00
Aaron Louie cd16b984e0 Adds workflow spec title to workflow api schema 2020-05-31 22:46:56 -04:00
Aaron Louie f0bd8d4f9e Adds approvals to study schema. Adds approvals endpoint 2020-05-31 22:46:32 -04:00
Dan Funk 9c7de39b09 This adds additional file data details to the study model as well. 2020-05-31 21:15:40 -04:00
Carlos Lopez dd6c1d2b42 Renaming approval files 2020-05-31 18:16:42 -06:00
Carlos Lopez 2e54f07095 Adding more info to files and renaming approval waiting status 2020-05-31 17:24:23 -06:00
Aaron Louie c4a84ac509 Work in progress: Trying to get Swagger to use verify_token_admin to protect admin endpoints. Not working for some reason, though. 2020-05-31 18:01:08 -04:00
Dan Funk 73137d0858 If an assertion fails, the tests stop at that point, never reaching the last line in the test. You have to handle any tear down, in the tearDown method. 2020-05-31 17:18:07 -04:00
Aaron Louie be9b613bbb Refactors user authentication endpoints so we can use the Swagger UI in production mode 2020-05-31 16:49:39 -04:00
Carlos Lopez 26809d1470 Waiting status renaming 2020-05-31 13:35:42 -06:00