9d1c495c90
Fix RRT Data added to docker run
2020-06-19 08:44:02 -04:00
898cf43093
Merge pull request #126 from sartography/dev
...
Data Refactor going from dev to rrt/dev
2020-06-19 08:32:25 -04:00
2c315b8db0
Merge pull request #125 from sartography/feature/refactor_data_loading
...
Feature/refactor data loading
2020-06-19 08:31:01 -04:00
6aec15cc7c
Shifting to a different model, where the TaskEvents store ONLY the form data submitted for that task.
...
In order to allow proper deletion of tasks, we no longer merge data returned from the front end, we set it directly as the task_data.
When returning data to the front end, we take any previous form submission and merge it into the current task data, allowing users to keep their previous submissions.
There is now an "extract_form_data" method that does it's best job to calculate what form data might have changed from the front end.
2020-06-19 08:22:53 -04:00
da048d358e
Merge branch 'dev' into feature/refactor_data_loading
2020-06-17 17:14:30 -04:00
3b57adb84c
Continuing a major refactor. Some important points:
...
* TaskEvents now contain the data for each event as it was when the task was completed.
* When loading a task for the front end, if the task was completed previously, we take that data, and overwrite it with the lastest data, allowing users to see previously entered values.
* Pulling in the Admin branch, as there are changes in that branch that are critical to seeing what is happening when we do this thing.
* Moved code for converting a workflow to an API ready data stricture into the Workflow service where it belongs, and out of the API.
* Hard resets just convert to using the latest spec, they don't try to keep the data from the last task. There is a better way.
* Moving to a previous task does not attept to keep the data from the last completed task.
* Added a function that will fix all the existing RRT data by adding critical data into the TaskEvent model. This can be called with from the flask command line tool.
2020-06-17 17:11:15 -04:00
cf09d986ea
Merge branch 'feature/admin' into feature/refactor_data_loading
2020-06-17 16:48:43 -04:00
769bdbeb46
Merge branch 'dev' into rrt/dev
2020-06-17 11:11:39 -04:00
720435113b
Fixes typo in Alex's uid
2020-06-17 08:54:43 -04:00
afd86e56ee
Goes back to python base
2020-06-16 22:41:02 -04:00
40ff3b5fcb
Uses mock LDAP if LDAP_URL environment variable is 'mock'
2020-06-16 21:43:20 -04:00
1b124a7503
Merge branch 'dev' into rrt/dev
2020-06-16 16:38:13 -04:00
64cecfba07
Installs pytest and coverage as dev dependencies
2020-06-16 15:56:09 -04:00
388f667cde
Updates package hashes.
2020-06-16 14:46:38 -04:00
db42a9128d
Removes dependence on cr-connect-python-base for now
2020-06-16 14:23:13 -04:00
1b9166dcb7
Cleaning up the merge, which resulted in some lost code.
2020-06-16 13:34:21 -04:00
c7d8eaff30
Merge branch 'dev' into feature/refactor_data_loading
2020-06-16 13:15:43 -04:00
bd1321baf0
Merge branch 'dev' into feature/admin
2020-06-16 12:29:43 -04:00
0608ffa08a
Restricting the admin endpoints to be admin only, and adding a bit of configuration.
2020-06-16 12:26:25 -04:00
7e1bc6062c
Merge branch 'dev' into rrt/dev
2020-06-16 11:44:57 -04:00
14d68f40df
Disables AWS SQS message to refresh DCOS
2020-06-16 11:09:48 -04:00
7723862530
Merge branch 'dev' of https://github.com/sartography/cr-connect-workflow into dev
2020-06-15 16:30:17 -04:00
672ed367e0
Merge branch 'rrt/dev' into feature/admin
2020-06-15 16:13:57 -04:00
43e73c9b08
Merge branch 'testing' into dev
2020-06-15 13:59:17 -04:00
610a317af2
Merge branch 'dev' into rrt/dev
2020-06-15 13:30:21 -04:00
cda024409b
Merge branch 'rrt/production' into dev
2020-06-15 13:29:17 -04:00
ffadc8e1b7
Merge branch 'rrt/staging' into rrt/production
2020-06-15 13:28:55 -04:00
6e6d34425e
Merge branch 'rrt/testing' into rrt/staging
2020-06-15 13:27:19 -04:00
f3999ab362
Merge branch 'rrt/dev' into rrt/testing
2020-06-15 13:26:59 -04:00
8ce8f05321
Merge branch 'dev' into rrt/dev
2020-06-15 12:54:52 -04:00
706c4afda5
Create a parameter 'lane' since we are using the output from the nav-list as the input to the NavigationItem initializer.
...
NB - this doesn't do anything with the lane designation, it just keeps it from blowing up.
2020-06-15 12:33:51 -04:00
0d3105fe7e
Make changes to the workflow names so that they are placed in the correct order - I made workflows go in order of the name rather than in the order they appear in the XML to allow more control over the way the nav list is displayed.
2020-06-15 12:32:19 -04:00
92580ee867
adding an additional error check for invalid json returned from the Protocol builder.
2020-06-15 12:26:53 -04:00
fae80cd3d0
Merge branch 'dev' into rrt/dev
2020-06-15 11:52:43 -04:00
eec4b579a7
Don't error out if we don't have a valid study id when doing validation.
2020-06-15 11:27:28 -04:00
a78b23f108
Merge branch 'rrt/dev' into dev
2020-06-13 23:46:10 -04:00
3a1b36d564
Adds database URI
2020-06-13 23:46:00 -04:00
f171d88bf4
Merge branch 'dev' into rrt/dev
2020-06-13 23:34:23 -04:00
81b6fc1490
Removes unnecessary extra config file
2020-06-13 23:34:12 -04:00
bca58ed578
Merge branch 'rrt/dev' into dev
2020-06-13 11:56:12 -04:00
c664a77beb
Updates default Protocol Builder base URL
2020-06-13 11:56:00 -04:00
6ba5b8f272
Merge branch 'master' into dev
2020-06-12 16:56:53 -04:00
bee7165ff1
Trying to speed up Docker builds
2020-06-12 16:53:35 -04:00
d6e7f4939b
Merge branch 'staging' into dev
2020-06-12 16:51:08 -04:00
17b36a81f2
Merge pull request #85 from sartography/dev
...
Dev --> Testing
2020-06-12 16:05:31 -04:00
2a54a5cc05
Merge branch 'testing' into dev
2020-06-12 15:56:30 -04:00
7e3378b4a6
Merge branch 'rrt/dev' into dev
2020-06-12 14:35:34 -04:00
a4a367cb22
Merge pull request #116 from sartography/chore/test_coverage
...
Chore/test coverage
2020-06-12 14:34:47 -04:00
8d84775896
Merge branch 'rrt/dev' into dev
2020-06-12 14:31:58 -04:00
2a84d5196a
filter, not filter_by
2020-06-12 14:13:27 -04:00
Dan Funk
Aaron Louie
Kelly McDonald
Aaron Louie