sartography/cr-connect-workflow
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-workflow.git synced 2025-02-24 13:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,983 Commits 14 Branches 0 Tags 9 MiB
Commit Graph

899 Commits

Author SHA1 Message Date
mike cullerton
8e6ca4c97f DocumentModel => FileModel 
document_id => file_id
 2022-04-19 14:56:34 -04:00
mike cullerton
196f314b16 Add size column back in 2022-04-19 11:37:41 -04:00
mike cullerton
fb5731ff23 Merge branch 'dev' into file-refactor-705 
# Conflicts:
#	crc/scripts/delete_task_data.py
#	crc/services/workflow_processor.py
#	tests/base_test.py
#	tests/files/test_delete_task_data.py
 2022-04-19 08:19:52 -04:00
mike cullerton
9262a53b58 DataStoreModel.file_id => DataStoreModel.document_id 2022-04-19 07:44:31 -04:00
mike cullerton
a1882c0615 delete_file no longer static method 2022-04-18 16:40:19 -04:00
Dan
5e54c90b47 "Reset" should not mean "re-start". Calling the reset_workflow script will now set the workflow to an "unstarted" state with no outstanding tasks, no json-state structure stored. The workflow is not yet running. 
Also:
* Assured that arguments are consistent (we always seem to use workflow_spec_id, so I made sure we use that consistently.
* Don't require named parameters - so it's cool to call it like: reset_workflow('my_workflow_id')
* Task Actions (ie create, assign, etc...) are now an enumeration in the models, and not static variables on Workflow Service, so we can reference them consistently from anywhere.
* Removed some repetitive code
* Always try to validate as much as possible in the scripts to save folks time debugging.
*
 2022-04-15 15:36:23 -04:00
mike cullerton
073ed44d51 file_id => document_id 2022-04-15 11:47:32 -04:00
mike cullerton
c2e39dfc95 Type is now a string, not an Enum 2022-04-15 11:45:59 -04:00
mike cullerton
ba2eef0ec9 Fixing failing tests 2022-04-14 18:07:23 -04:00
mike cullerton
70beba164b Merge branch 'dev' into file-refactor-705 2022-04-14 16:11:53 -04:00
mike cullerton
a21aea3348 Fixed a bug where we tried to delete a record that did not exist 2022-04-14 15:37:05 -04:00
mike cullerton
b304b4725b Merge branch 'dev' into file-refactor-705 2022-04-14 11:40:08 -04:00
mike cullerton
be24b598b8 Fix call to set_data_common - no longer have workflow_spec_id, add type of data set 2022-04-13 18:03:23 -04:00
mike cullerton
076eb8747f Finish bug fix for deleting data_stores when value is None or empty string 
Cleanup:
- Make sure workflow_spec_id has a value
- Change extra if conditionals to elif conditionals
 2022-04-13 18:01:52 -04:00
mike cullerton
916daf002c Clean up parameters for set_data_common 
Use key, value instead of args[0], args[1]
 2022-04-13 13:48:35 -04:00
mike cullerton
b1dca3f212 FileModel => DocumentModel 
Remove unused imports
 2022-04-13 08:34:10 -04:00
Dan
b455b73c7b Don't freak out if there are not files to delete. 2022-04-12 14:43:34 -04:00
mike cullerton
b732fee675 Merge branch 'dev' into file-refactor-705 2022-04-12 14:01:49 -04:00
mike cullerton
b7ee50a17f *** WIP *** 
Many changes related to FileModel => DocumentModel
 2022-04-12 13:56:54 -04:00
mike cullerton
fdea2d0cbc Remove unused imports 
Added TODO about imports for crc.models.workflow that aren't correct. I believe this was for files to the file system refactor, and we don't actually use this.
 2022-04-12 13:55:35 -04:00
mike cullerton
7d62c2dd18 FileModel => DocumentModel 
from_models => from_document_model
 2022-04-12 13:51:09 -04:00
mike cullerton
3f97de6430 from_models => from_document_model 2022-04-12 13:50:26 -04:00
mike cullerton
f8d6f0a6da No need for separate call to get file data 2022-04-12 13:50:04 -04:00
mike cullerton
0e5dcccfca Remove unused imports 2022-04-12 13:46:05 -04:00
mike cullerton
d04b447c8c Update data stores, rather than creating new ones 
Delete 'extra' data stores
 2022-04-05 18:15:58 -04:00
Dan Funk
6694dc6cb3
Merge pull request #510 from sartography/git-error-filenotfound-690 
Git error filenotfound #690
 2022-04-04 16:53:36 -04:00
Dan Funk
095105e3e6
Merge pull request #508 from sartography/validation-with-data-store-396 
Validation with data store #396
 2022-04-04 16:51:57 -04:00
Dan
e1f9dcded5 Assure we can associate the same person with a workflow under two different roles. 2022-04-04 16:01:48 -04:00
mike cullerton
dd26f8fef7 Update review types 
Remove review types 23, 24
Add review type 21
 2022-03-30 10:29:53 -04:00
mike cullerton
ae66934bf9 Fix bug where we tried to add files to the index that were removed from the repo 2022-03-29 09:49:05 -04:00
Mike Cullerton
6ff0cdbb9d
Merge pull request #507 from sartography/bug/validating_data_security 
Bug/validating data security #684
 2022-03-29 09:41:02 -04:00
mike cullerton
4abdc4920f There was a problem if validate_study_id was 0 (zero). It evaluated to False 2022-03-25 10:04:05 -04:00
mike cullerton
8c88de35cd Modify get_validate_common and set_validate_common methods to use the temporary validate_data_store list 
In get_validate_common, we first look in validate_data_store, then in the real data_store. This allows us the flexibility to use temp values for current workflow or real values set by previous workflows.

Also, lots of cleanup:
- we didn't use the dictionary returned by the set_data_common method, so removed it and only return the value we set.
- this allowed us to delete the `overwritten` method and some other code.
- renamed some variables to better represent what we are doing
 2022-03-25 10:01:31 -04:00
mike cullerton
5bf114b605 Initialize validation_data_store as empty list 2022-03-25 09:50:31 -04:00
mike cullerton
b884ce4c3a Remove debug print statement 2022-03-23 16:49:58 -04:00
mike cullerton
94abd7eebf *** WIP *** 
Add a temporary data store for validation
 2022-03-23 15:15:01 -04:00
Dan
7dfb0bbba9 assure we can use the right data when determining if a field is hidden. 2022-03-23 14:25:29 -04:00
alicia pritchett
487a1a3987 Fixes #667- Validate Lane Variables 2022-03-21 12:18:40 -04:00
Dan
befc299475 Merge branch 'dev' into chore/fix_validation_errors 2022-03-19 09:53:12 -04:00
mike cullerton
05c0e4f96c Put default back to False 2022-03-18 16:55:38 -04:00
Dan
e44ea6e13c merging in from dev. 2022-03-18 16:22:33 -04:00
mike cullerton
f4d6b07467 In get study, only process categories when we ask 2022-03-18 16:03:50 -04:00
Dan
a401c41b23 Setting a minimum date for which to import studies. 
Merging in code to improve performance of calculating percent complete for a study.
Assureing we have a primary investigator for the front page (another merge)
 2022-03-18 15:27:45 -04:00
Dan
b36ff02517 Merge remote-tracking branch 'origin/chore/study-progress' into staging-500-error 2022-03-18 15:07:14 -04:00
alicia pritchett
3c5a75c976 Change study progress resulting from a query 2022-03-18 14:42:03 -04:00
Dan
405c63aaef Merge remote-tracking branch 'origin/chore/study-progress' into staging-500-error 2022-03-18 12:59:31 -04:00
Dan
b7489aea43 merging in PI Name changes from Alicia's #499 PR. 2022-03-18 12:30:20 -04:00
alicia pritchett
12a0e26ee1 Include the PI name on the study model 2022-03-18 11:03:06 -04:00
Dan
ef5aca4fe4 ReviewType now comes back with the user studies, so we don't need to make an additional query to get it. 2022-03-18 09:59:10 -04:00
mike cullerton
276924960b Merge branch 'dev' into chore/fix_validation_errors 2022-03-18 08:36:03 -04:00