Commit Graph

1160 Commits

Author SHA1 Message Date
Kelly McDonald 2b0f1acb72 Merge branch 'dev' into cr-workflow-108 2020-08-12 10:40:54 -04:00
Aaron Louie b03e482eca
Merge pull request #170 from sartography/feature/update_study_status_latest
Update study status
2020-08-03 10:35:06 -04:00
Carlos Lopez 50b207307a Merge branch 'dev' into feature/update_study_status_latest 2020-07-31 14:26:24 -06:00
Aaron Louie 3146e429dd
Merge pull request #171 from sartography/feature/admin_impersonations
Feature/admin impersonations
2020-07-31 14:16:43 -04:00
Carlos Lopez 4fcba113b8 Fixing tests 2020-07-31 11:49:04 -06:00
Aaron Louie 864fd0ad40 Merge branch 'dev' into feature/admin_impersonations 2020-07-31 13:28:56 -04:00
Aaron Louie cb3f07b49a
Merge pull request #168 from sartography/feature/approvals_dashboard_prototype
Feature/approvals dashboard prototype
2020-07-31 13:27:43 -04:00
Carlos Lopez 2c2967e633 Normalizing enum values 2020-07-31 11:19:50 -06:00
Aaron Louie ca9ef332ba Fixes failing test. 2020-07-31 13:19:37 -04:00
Aaron Louie 438a31c9ec Updates packages 2020-07-31 13:19:26 -04:00
Aaron Louie c8881cbf91 Merge branch 'dev' into feature/approvals_dashboard_prototype 2020-07-31 12:17:22 -04:00
Carlos Lopez 5d23223e51 New study status update 2020-07-30 21:03:11 -06:00
Aaron Louie 73699e66bd Merge branch 'dev' into feature/admin_impersonations 2020-07-30 17:36:20 -04:00
Dan Funk 9112be548d Adding box as a direct dependency. Really uncertain how this is working everwhere but in the actual deployment. 2020-07-30 15:04:09 -04:00
Dan Funk 7004d9ba88 Bumping spiffworkflow version. 2020-07-30 13:56:57 -04:00
Dan Funk 5d8fee7bc7
Merge pull request #169 from sartography/cr-connect-106-augment-eval-methods
Cr connect 106 augment eval methods
2020-07-30 13:51:57 -04:00
Dan Funk 9704cbcb26 Modifications to the ldap scripts to bring them back in line with what Kelly is doing with the evaluation process. 2020-07-30 13:35:20 -04:00
Aaron Louie 28d3f835e8 Updates package hashes 2020-07-30 13:21:50 -04:00
Aaron Louie f8944da31f Merge branch 'dev' into feature/admin_impersonations 2020-07-30 13:01:46 -04:00
Aaron Louie faba0f55ab Adds AdminSession model and refactors impersonation methods to use it. 2020-07-30 12:40:53 -04:00
Dan Funk a6ec0c92c7 Merge remote-tracking branch 'origin/dev' into cr-connect-106-augment-eval-methods 2020-07-30 11:38:47 -04:00
Dan Funk 2a5f36254e
Merge pull request #163 from sartography/feature/improved_task_event_api
Add a few more details to the workflow metadata model.
2020-07-30 11:33:06 -04:00
Dan Funk 44deee12de Merge branch 'dev' into feature/improved_task_event_api 2020-07-30 11:28:52 -04:00
Dan Funk 37d1ba5d5a
Merge pull request #160 from sartography/feature/ldap_lookup_script
Ldap lookup script
2020-07-30 11:27:38 -04:00
Dan Funk bf4d882519 Merge branch 'dev' into feature/ldap_lookup_script 2020-07-30 11:19:24 -04:00
Dan Funk 2905fc6173 Merge branch 'feature/ldap_lookup_script' of github.com:sartography/cr-connect-workflow into feature/ldap_lookup_script 2020-07-30 11:17:48 -04:00
Dan Funk 0b5e5e065a
Merge pull request #153 from sartography/feature/documents_publishing
Github integration with admin (Documents publishing) - WIP
2020-07-30 11:15:46 -04:00
Aaron Louie aa0f24bd33 Fully deletes users from g in test tearDown 2020-07-30 10:40:06 -04:00
Dan Funk 31982f81ae Merge branch 'dev' into feature/documents_publishing
# Conflicts:
#	Pipfile.lock
2020-07-30 10:17:08 -04:00
Aaron Louie 1b0ebecbf4 Uses Flask session to store impersonation state. 2020-07-30 10:17:02 -04:00
Aaron Louie d301e9e6fa Adds list_users endpoint. Adds admin impersonate uid parameter to user endpoint. Adds some utility methods to user service. Refactors authentication tests. 2020-07-29 22:47:47 -04:00
Aaron Louie d9a91c891f Updates package hashes 2020-07-29 22:46:22 -04:00
Aaron Louie 63537d7765 Adds is_admin boolean flag to user schema 2020-07-29 22:45:56 -04:00
Carlos Lopez de49397549 Adjustings tests for protocol builder status changes 2020-07-29 10:51:34 -06:00
Carlos Lopez 73a6b7adf1 Fixing tests 2020-07-29 10:25:57 -06:00
Carlos Lopez 6aa21638de Updating properly study status & fixing tests 2020-07-29 10:25:57 -06:00
Aaron Louie f897ee3aea Merge branch 'feature/approvals_dashboard_prototype' into feature/admin_impersonations 2020-07-29 10:32:46 -04:00
Dan Funk 0ea4c13d09 Convert protocol builder status to always be in lower case in order to better match the front end. And also fixing an issue with the multi_instance that is oddly broken suddenly, and I don't know why. 2020-07-28 17:16:48 -04:00
Aaron Louie 79adb673f2 Fixes display_name custom properties 2020-07-28 14:04:18 -04:00
Dan Funk 4d11fc04a0 dropping the "read_only" flag in favor of a "do_engine_steps" flag, which more clearly defines what is happening. 2020-07-28 13:51:29 -04:00
Dan Funk f15626033d Allow the workflow to be requested without making changes to the workflow - requires that you specify a read_only flag of true, otherwise it assumes that you want a fully prepared workflow with the next ready task set to run. 2020-07-28 13:33:38 -04:00
Kelly McDonald d617af8565 All tests are passing - may need to refactor a bit, / remove comments 2020-07-28 11:02:49 -04:00
Dan Funk 300026cbc8 Expanding the task events endpoint to accept workflow and study ids as additional filters.
Removing events from the study endpoint, too noisy.
2020-07-28 10:16:48 -04:00
Dan Funk 0cb480801b Provide event data on the Study api endpoint.
Speed up the tests a little, because that got out of hand.  Need to dig into what is causing this problem.
2020-07-27 17:05:01 -04:00
Dan Funk 5ecd77655c Merge branch 'feature/approvals_dashboard_prototype' of github.com:sartography/cr-connect-workflow into feature/approvals_dashboard_prototype 2020-07-27 16:54:52 -04:00
Dan Funk 51d6d6a5fa Fixing failing tests around a notifications workflow. 2020-07-27 16:54:46 -04:00
Aaron Louie 30f4a2713c Updates package hashes 2020-07-27 16:41:44 -04:00
Dan Funk 58ba9ed478 Merge branch 'feature/approvals_dashboard_prototype' of github.com:sartography/cr-connect-workflow into feature/approvals_dashboard_prototype 2020-07-27 16:39:11 -04:00
Dan Funk 8d42d520a0 Adding events to the study that is returned via the api. 2020-07-27 16:32:23 -04:00
Carlos Lopez de0fe705c3 Wrapping LOCKED task update attempt into a try-catch block for tests 2020-07-27 14:00:44 -06:00