mike cullerton
bee58ec6d7
Coding style stuff
2022-04-12 13:38:38 -04:00
mike cullerton
0e3b467091
Modified FileSchema to match the new File
2022-04-12 13:38:12 -04:00
mike cullerton
22b3c8547f
FileModel => DocumentModel
2022-04-12 13:33:24 -04:00
mike cullerton
525491921f
from_models => from_document_model
2022-04-12 13:32:33 -04:00
mike cullerton
09e259f554
Moved file api methods to file_refactor
...
This is temporary
Not sure where they will end up
2022-04-12 13:31:33 -04:00
mike cullerton
89ab55ce6b
Removed unused imports
2022-04-12 13:28:49 -04:00
mike cullerton
556af3c425
Removed FileModel, FileDataModel imports
...
Added DocumentModel
2022-04-12 13:28:04 -04:00
mike cullerton
7c23d36d7c
Add DocumentModel that combines FileModel and FileDataModel
2022-04-12 13:23:50 -04:00
Dan Funk
bf898993c4
Merge pull request #514 from sartography/get-irb-info-issue-702
...
Get irb info issue #702
2022-04-12 08:14:14 -04:00
mike cullerton
e9ea95d1d7
The IRB Info API endpoint can return a dictionary--if the study is **not** yet uploaded, or a list with 1 dictionary if the study **is** uploaded
2022-04-07 14:38:32 -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
9ec1514267
Merge pull request #509 from sartography/chore/zip-file-update-688
...
Chore/zip file update #688
2022-03-29 09:41:32 -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
f92f9d64ea
Allow users to pass a doc_code to get_zipped_files script
2022-03-28 11:59:10 -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
5229cf457e
Modify scripts to use the changes in data_store_service validate methods
...
Make sure we return values in the validate methods
Minor cleanup
2022-03-25 10:03:12 -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
eaf8dace97
Process categories in get_study api call
2022-03-18 16:05:01 -04:00
mike cullerton
f4d6b07467
In get study, only process categories when we ask
2022-03-18 16:03:50 -04:00
Dan Funk
52c1f2f919
Merge pull request #498 from sartography/staging-500-error
...
Staging 500 error
2022-03-18 15:53:41 -04:00
Dan Funk
08e116515b
Merge pull request #496 from sartography/bug/cancel-notify-668
...
Fixes #668 - Cancel/Notify Called when loading last task
2022-03-18 15:31:18 -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
b9b8210f8a
rm pi id refs
2022-03-18 12:04:20 -04:00
alicia pritchett
f4cade1b44
remove pi id
2022-03-18 11:58:39 -04:00
alicia pritchett
b6b28ed127
fix tests remove pi id
2022-03-18 11:56:56 -04:00
mike cullerton
d4a1b8ad3b
We didn't return the value for do_task_validation_only
2022-03-18 11:32:37 -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
alicia pritchett
2ab96b16a0
Update the study model to include a progress (integer)
2022-03-17 17:20:42 -04:00
mike cullerton
890f849cf2
Only DATELASTMODIFIED can be empty, not DATECREATED
2022-03-17 15:54:21 -04:00
mike cullerton
15750beb10
Added a comment on why we moved the session.add(study) line
2022-03-17 15:18:49 -04:00
mike cullerton
db6f594ba9
Allow for missing data
2022-03-17 15:18:06 -04:00
