Commit Graph

1274 Commits

Author SHA1 Message Date
Carlos Lopez e947f40ec7 Merge branch 'rrt/dev' into feature/emails-enhancement 2020-06-17 20:10:11 -06:00
Carlos Lopez 5ce279b663 Dropping silly pdb statement 2020-06-17 17:36:15 -06:00
Carlos Lopez 896ba6b377 Email relies now on markdown content 2020-06-17 17:00:16 -06:00
Carlos Lopez ddf1f4640c Re-organizing tests file structure 2020-06-17 16:10:06 -06:00
Carlos Lopez 2ce2dc73b5 Rendering proper content & organizing file structure for email tests 2020-06-17 16:09:38 -06:00
Dan Funk da048d358e Merge branch 'dev' into feature/refactor_data_loading 2020-06-17 17:14:30 -04:00
Dan Funk 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
Dan Funk cf09d986ea Merge branch 'feature/admin' into feature/refactor_data_loading 2020-06-17 16:48:43 -04:00
Aaron Louie 515073103c
Merge pull request #124 from sartography/staging
Staging
2020-06-17 14:47:33 -04:00
Aaron Louie 91e4170d9f
Merge pull request #123 from sartography/testing
Testing
2020-06-17 14:37:28 -04:00
Aaron Louie 1f41587e40
Merge pull request #121 from sartography/dev
Dev --> Testing
2020-06-17 14:11:21 -04:00
Kelly McDonald 1844c93919 STG-26 - basic test case for a looping task
Criteria :
task.multi_instance_type == 'looping'

to terminate, use the standard endpoint for submitting form data with a query variable of terminate_loop=true

Will likely need two buttons:
"Submit and quit"
"Submit and add another"
or something similar
2020-06-17 11:35:06 -04:00
Aaron Louie 489ab62e08 Merge branch 'rrt/staging' into rrt/production 2020-06-17 11:15:00 -04:00
Aaron Louie 4db8a10b6f Merge branch 'rrt/testing' into rrt/staging 2020-06-17 11:14:52 -04:00
Aaron Louie 120c97c963 Merge branch 'rrt/dev' into rrt/testing 2020-06-17 11:14:43 -04:00
Aaron Louie 769bdbeb46 Merge branch 'dev' into rrt/dev 2020-06-17 11:11:39 -04:00
Carlos Lopez c730a7b1ec Sending subject and using default sender 2020-06-17 08:53:02 -06:00
Aaron Louie 720435113b Fixes typo in Alex's uid 2020-06-17 08:54:43 -04:00
Aaron Louie afd86e56ee Goes back to python base 2020-06-16 22:41:02 -04:00
Aaron Louie 40ff3b5fcb Uses mock LDAP if LDAP_URL environment variable is 'mock' 2020-06-16 21:43:20 -04:00
Carlos Lopez 2ff836019f Sonarcloud fix 2020-06-16 18:55:18 -06:00
Carlos Lopez d4a285883f Email script 2020-06-16 18:42:36 -06:00
Aaron Louie 1b124a7503 Merge branch 'dev' into rrt/dev 2020-06-16 16:38:13 -04:00
Aaron Louie 64cecfba07 Installs pytest and coverage as dev dependencies 2020-06-16 15:56:09 -04:00
Carlos Lopez 59d66be10f Handling empty task state 2020-06-16 13:13:30 -06:00
Aaron Louie 388f667cde Updates package hashes. 2020-06-16 14:46:38 -04:00
Aaron Louie db42a9128d Removes dependence on cr-connect-python-base for now 2020-06-16 14:23:13 -04:00
Dan Funk 1b9166dcb7 Cleaning up the merge, which resulted in some lost code. 2020-06-16 13:34:21 -04:00
Aaron Louie 3f3be6bda0
Merge pull request #119 from sartography/staging
Staging --> Master
2020-06-16 13:26:19 -04:00
Aaron Louie b1d6403f84 Merge branch 'rrt/staging' into rrt/production 2020-06-16 13:25:44 -04:00
Aaron Louie 2ec68cd62b Merge branch 'rrt/testing' into rrt/staging 2020-06-16 13:25:34 -04:00
Aaron Louie 958474fb19 Merge branch 'rrt/dev' into rrt/testing 2020-06-16 13:25:24 -04:00
Dan Funk c7d8eaff30 Merge branch 'dev' into feature/refactor_data_loading 2020-06-16 13:15:43 -04:00
Aaron Louie bbc4406696
Merge pull request #118 from sartography/testing
Testing --> Staging
2020-06-16 13:10:37 -04:00
Aaron Louie ee669d30d2
Merge pull request #120 from sartography/dev
Disables AWS SQS message to refresh DCOS
2020-06-16 12:57:39 -04:00
Dan Funk bd1321baf0 Merge branch 'dev' into feature/admin 2020-06-16 12:29:43 -04:00
Dan Funk 0608ffa08a Restricting the admin endpoints to be admin only, and adding a bit of configuration. 2020-06-16 12:26:25 -04:00
Aaron Louie 7e1bc6062c Merge branch 'dev' into rrt/dev 2020-06-16 11:44:57 -04:00
Aaron Louie 14d68f40df Disables AWS SQS message to refresh DCOS 2020-06-16 11:09:48 -04:00
Aaron Louie bd79ced0d1
Merge pull request #117 from sartography/dev
Dev --> Testing
2020-06-16 08:59:58 -04:00
Kelly McDonald 7723862530 Merge branch 'dev' of https://github.com/sartography/cr-connect-workflow into dev 2020-06-15 16:30:17 -04:00
Dan Funk 672ed367e0 Merge branch 'rrt/dev' into feature/admin 2020-06-15 16:13:57 -04:00
Aaron Louie 43e73c9b08
Merge branch 'testing' into dev 2020-06-15 13:59:17 -04:00
Aaron Louie 8f14661822 Merge branch 'rrt/staging' into rrt/production 2020-06-15 13:31:09 -04:00
Aaron Louie 6e5c778ab8 Merge branch 'rrt/testing' into rrt/staging 2020-06-15 13:31:01 -04:00
Aaron Louie 5a312a2b2f Merge branch 'rrt/dev' into rrt/testing 2020-06-15 13:30:49 -04:00
Aaron Louie 610a317af2 Merge branch 'dev' into rrt/dev 2020-06-15 13:30:21 -04:00
Aaron Louie cda024409b Merge branch 'rrt/production' into dev 2020-06-15 13:29:17 -04:00
Aaron Louie ffadc8e1b7 Merge branch 'rrt/staging' into rrt/production 2020-06-15 13:28:55 -04:00
Aaron Louie 6e6d34425e Merge branch 'rrt/testing' into rrt/staging 2020-06-15 13:27:19 -04:00