Commit Graph

493 Commits

Author SHA1 Message Date
Dan Funk 53255ef35e massive overhaul of the Workflow API endpoint.
No Previous Task, No Last Task, No Task List.  Just the current task, and the Navigation.
Use the token endpoint to set the current task, even if it is a "READY" task in the api.
Previous Task can be set by identifying the prior task in the Navigation (I'm hoping)
Prefering camel case to snake case on all new apis.  Maybe clean the rest up later.
2020-05-15 15:54:53 -04:00
Dan Funk b63ee8159e We now only return the ready user tasks, not all tasks, and even then the ready user tasks don't come back with the forms and details, just the bare minimum. Speeds things up considerably, and most of this information wasn't used anyway. 2020-05-14 17:13:47 -04:00
Dan Funk 6d4348d644 Fixing some failing tests. Moved the task properties into a dictionary, but moving the form field properties to a dictionary will be a larger effort that we don't want to get into on either the back or front end right this moment. 2020-05-14 14:39:14 -04:00
Dan Funk 9022077576 Merge branch 'master' into feature/navigation 2020-05-14 13:46:01 -04:00
Dan Funk 55a1850e7c adding a navigation component to the Workflow Model.
running all extension/properties through the Jinja template processor so you can have custom display names using data, very helpful for building multi-instance displays.
Properties was returned as an array of key/value pairs, which is just mean.  Switched this to a dictionary.
2020-05-14 13:43:23 -04:00
Dan Funk 13c16ec179
Merge pull request #43 from sartography/feature/bug_fixes
Found a number of bugs with the parallel multi-instance - pulling in …
2020-05-12 14:39:52 -04:00
Dan Funk e723992fde Found a number of bugs with the parallel multi-instance - pulling in some recent changes from Spiffworkflow to open things up a bit more to allow functional jumping between tasks. 2020-05-12 12:23:43 -04:00
Dan Funk e043a5ff63
Merge pull request #38 from sartography/feature/investigators_reference_file
Adding a new reference file that provides greater details about the i…
2020-05-12 10:01:48 -04:00
Dan Funk e3573bb7df Really just flailing now as I try to get tests to pass in Jenkins when they all work just fine on my box. 2020-05-12 08:48:26 -04:00
Dan Funk 99503fb832 missed a file in the last commit. 2020-05-11 17:42:24 -04:00
Dan Funk b7c11fd893 Merge branch 'master' into feature/investigators_reference_file 2020-05-11 17:36:37 -04:00
Dan Funk 420d4af5b5 Merge branch 'master' into feature/investigators_reference_file 2020-05-11 17:10:57 -04:00
Dan Funk 182162540a
Merge pull request #42 from sartography/feature/new_script_engine
Updated to use the latest script engine / evaluation engine that crea…
2020-05-11 17:09:54 -04:00
Dan Funk 02f8764056 Updated to use the latest script engine / evaluation engine that creates a single location where all values used in BPMN/DMN are processed. Right now this is a python based interpreter, but we will eventually base this on FEEL expressions.
The validation process needs to take the api model into account so we catch errors with bad file names.
2020-05-11 17:04:05 -04:00
Aaron Louie 27d8e0b51b
Merge pull request #41 from sartography/staging
Staging
2020-05-08 20:37:46 -04:00
Aaron Louie b27cad8233
Merge pull request #40 from sartography/testing
Testing
2020-05-08 18:09:36 -04:00
Aaron Louie 9cb1a23a28
Merge pull request #39 from sartography/chore/github_branches_to_docker_tags
Chore/GitHub branches to docker tags
2020-05-07 16:47:45 -04:00
Dan Funk c34000d369
Merge branch 'master' into feature/investigators_reference_file 2020-05-07 16:47:24 -04:00
Aaron Louie a1ad11c07d Cleans up debugging stuff 2020-05-07 14:27:32 -04:00
Aaron Louie 06f14daa86 Fixes commit substring syntax 2020-05-07 14:24:15 -04:00
Aaron Louie fceda2c796 Tries defining commit in deploy script 2020-05-07 14:14:25 -04:00
Dan Funk da7cae51b8 Adding a new reference file that provides greater details about the investigators related to a study.
Improving the study_info script documentation to provide detailed examples of values returned based on arguments.
Making the tests a little more targetted and less subject to breaking through better mocks.
Allow all tests to pass even when ther protocol builder mock isn't running locally.
Removing the duplication of reference files in tests and static, as this seems silly to me at the moment.
2020-05-07 13:57:24 -04:00
Aaron Louie 9af91bed8b Printing out some stuff for debugging 2020-05-07 13:49:17 -04:00
Aaron Louie 7463664ae0
Merge pull request #37 from sartography/chore/github_branches_to_docker_tags
Chore/GitHub branches to docker tags
2020-05-07 11:43:04 -04:00
Aaron Louie 5c510c5a9a Moves PB_BASE_URL into matrix env var 2020-05-07 10:56:09 -04:00
Aaron Louie 559494aee2 Fails build if any docker or aws command errors out 2020-05-07 10:47:24 -04:00
Aaron Louie 9ba00c1320 Moves commit var back up to global 2020-05-07 10:42:19 -04:00
Aaron Louie f4e293e8fa
Merge pull request #36 from sartography/chore/github_branches_to_docker_tags
Builds and deploys Docker image if build passes on testing, staging, …
2020-05-07 10:35:37 -04:00
Aaron Louie 26251a199f Moves commit variable into deploy script 2020-05-07 10:25:06 -04:00
Aaron Louie 827e840103 Builds and deploys Docker image if build passes on testing, staging, or master branches 2020-05-07 10:15:14 -04:00
Aaron Louie 9afcd753c4 No longer requires task_id 2020-05-06 14:27:28 -04:00
Dan Funk 1eb52ed268 Removing duplicate migration. 2020-05-06 13:28:41 -04:00
Dan Funk 1571986c0e I had to give up and live with the idea that we can only render documentation on the current task, not on the previous or next tasks. I think this is ok. If you want to view a task, you need to make it the active task to assure all the parts and pieces are in place. 2020-05-06 13:01:38 -04:00
Dan Funk 8ded625c7d Merge remote-tracking branch 'origin/chore/update_specs' into feature/previous_task
# Conflicts:
#	Pipfile.lock

Assuring that all documents from the xls spreadsheet are loaded when doing validations.
Fixing some failed tests.
2020-05-06 11:46:19 -04:00
Dan Funk 07e58e923d Merge remote-tracking branch 'origin/chore/update_specs' into feature/previous_task
# Conflicts:
#	Pipfile.lock

Assuring that all documents from the xls spreadsheet are loaded when doing validations.
2020-05-06 11:25:50 -04:00
Dan Funk 9629b36e92 Setting JSON_SORT_KEYS to false, assuring that Flask does not resort all data returned to the front end.
Updating Spiff Workflow which has some critical behavioral changes around MultiInstance.
2020-05-06 10:59:49 -04:00
Aaron Louie 6c36a32411 Adds DSP 2020-05-06 10:37:43 -04:00
Aaron Louie a8827d78c4 Fixes typo 2020-05-05 20:49:07 -04:00
Aaron Louie 4ecb0cb3a3 Updates BPMN files 2020-05-05 16:15:38 -04:00
Dan Funk ce76b0d3e8 Merge branch 'feature/protocol_status' into feature/previous_task 2020-05-04 11:12:12 -04:00
Dan Funk 714b5f3be0 Merge branch 'feature/protocol_status' into feature/previous_task
# Conflicts:
#	crc/services/study_service.py
2020-05-04 11:08:36 -04:00
Dan Funk 2699f5c65c Refactor the stats models, and assure they are very correct across all tests with the workflow api.
I noticed we were saving the workflow every time we loaded it up, rather than only when we were making changes to it.  Refactored this to be a little more careful.
Centralized the saving of the workflow into one location in the processor, so we can make sure we update all the details about that workflow every time we save.
The workflow service has a method that will log any task action taken in a consistent way.
The stats models were removed from the API completely.  Will wait for a use case for dealing with this later.
2020-05-04 10:57:09 -04:00
Aaron Louie 28d5727851 Merge branch 'master' into feature/protocol_status 2020-05-01 22:55:59 -04:00
Aaron Louie 098cf10926 Fixes Jinja code to match new structure of StudyInfo documents 2020-05-01 22:49:52 -04:00
Aaron Louie 6a96ccffa2 Updates pipenv hashes. Fixes typo in SpiffWorkflow file name 2020-05-01 21:54:01 -04:00
Dan Funk 1f5002680a Initial work on a "Previous" task. 2020-05-01 12:11:39 -04:00
Dan Funk 7c743d65ed Adding tests around parallel which pass great, but ran into a bug down in Spiff that I'm passing back to Kelly with a test in that repo. More coming on this. 2020-04-30 15:39:11 -04:00
Dan Funk bec59a71d7 Deleteing stuff is a damn mess, but this is a little cleaner. 2020-04-29 16:07:39 -04:00
Dan Funk f1f8b91c9c Refactor the document details scripts. Now there is one script, it returns data in a consistent format, and has all the details required. The script is located in StudyInfo, with the argument documents. Make note that it returns a dictionary of ALL the documents, with a field to mark which ones are required according to the protocol builder. Others may become required if a workflow determines such, in which case the workflow will enforce this, and the document will have a count > 0, and additional details in a list of files within the document. I modified the XLS file to use lower case variable names, because it disturbed me, and we have to reference them frequently. Removed devious "as_object" variable on get_required_docs, so it behaves like the other methods all the time, and returns a dictionary. All the core business logic for finding the documents list now resides in the StudyService.
Because this changes the endpoint for all existing document details, I've modified all the test and static bpmn files to use the new format.
Shorting up the SponsorsList.xls file makes for slightly faster tests. seems senseless to load 5000 everytime we reset the data.
Tried to test all of this carefully in the test_study_details_documents.py test.
2020-04-29 15:08:11 -04:00
Aaron Louie beb86f0453 Adds protocol script to study service 2020-04-29 10:21:24 -04:00