89 Commits

Author SHA1 Message Date
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
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
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
alicia pritchett
2ab96b16a0 Update the study model to include a progress (integer) 2022-03-17 17:20:42 -04:00
mike cullerton
a578cf2498 Some studies don't have a DATELASTMODIFIED, so we use DATECREATED instead 2022-03-17 14:50:47 -04:00
alicia pritchett
5b7e71d42d meta field for categories 2022-03-16 12:49:35 -04:00
alicia pritchett
37d92c6a5f WIP ~ adding a category metadata object 2022-03-15 10:49:41 -04:00
alicia pritchett
4f0b9e3c4f Adds 2 new study progress statuses 2022-03-11 15:40:13 -05:00
mike cullerton
3920444acf *** WIP ***
Need to create a migration and some tests.
2022-03-02 15:26:21 -05:00
Dan
7a99859108 fixing some failing test 2022-02-11 11:00:42 -05:00
Dan
3993297360 minor fixes to the study api to get things working locally when we pull down a database from testing. 2022-02-10 18:19:57 -05:00
Dan
cc915ac25a refactoring the study service. 2022-02-09 08:50:00 -05:00
Dan
4b8d193fb9 a few more tests passing 2022-02-07 14:58:25 -05:00
Dan
2383c7d76d WIP - lots of random changes, trying to swtich over 2022-02-04 14:50:31 -05:00
Dan
4ec6e403f5 1. Created a UserFileService, so it's clear what we use when for File Services, UserFiles, SpecFiles, and ReferenceFiles each function differently.
2. Reference Files and Spec Files are written to disk, they do not exist in the database at all.
2022-02-02 12:59:56 -05:00
mike cullerton
68820c67cb Removed (almost) all references to WorkflowSpecDependencyFile
(There is still a call in the lookup service, but we need to decide how to fix that)
2022-01-19 16:12:54 -05:00
alicia pritchett
cdaad5dcc0 Allow 'none' for progress_status
Well this fixes tests but also, I dont think you necessarily have this right off the bat if you havent done anything in a study, which i handle on the frontend. so null is fine
2021-12-13 12:34:32 -05:00
alicia pritchett
8b27423172 Updating study model schema to include Progress Status 2021-12-13 12:29:15 -05:00
mike cullerton
f748fa3db8 Removed unused imports 2021-12-10 16:48:28 -05:00
mike cullerton
6d09aa1817 We moved the new statuses to a new column and created a separate enum class for them.
They really are sub_statuses of the in_progress status
2021-12-10 15:57:02 -05:00
mike cullerton
6db9cdabc7 New study statuses 2021-12-08 10:50:30 -05:00
mike cullerton
db1f3ba6ab Model and schema for new StudyCreator api endpoint
Update StudyModel to use new model
2021-12-06 14:36:34 -05:00
mike cullerton
10abf51f70 Added workflow_spec_id to WorkflowMetadata model, because the id is the workflow id, not the workflow_spec id.
Then, we use workflow_spec_id in StudyService when looking for workflow status.
2021-10-07 10:02:13 -04:00
alicia pritchett
7b6beae9c1 fixes frontend bailing out
workflow id is workflow id
2021-10-06 14:33:09 -04:00
mike cullerton
572ca1db6b Fixes for backend code after removing name column from workflow_spec and workflow_spec_category tables 2021-10-05 14:17:41 -04:00
alicia pritchett
d5d4496cd0 Admin flag on category + migration + updated test 2021-09-29 16:53:59 -04:00
Dan Funk
e4add14193
Merge pull request #378 from sartography/bug/246_user_ldap_refactor
Bug/246 user ldap refactor
2021-09-22 15:31:34 -04:00
Dan
19104303de Refactor of the way we store and return details about users - All the details about a user, or individual associated with a study is returned within in an Ldap model. I've removed duplication between these models. This required some cleanup of the tests, and a migration that will drop the user details. 2021-09-22 13:16:25 -04:00
mike cullerton
8b8cfde6cb Add short_name and proposal_name to the study model 2021-09-17 11:53:45 -04:00
mike cullerton
1f82143aea Remove HSR Number from models 2021-08-16 12:50:09 -04:00
mike cullerton
46d7b13326 Start to remove HSR Number 2021-08-16 12:09:02 -04:00
Dan
848c2e622f Always use a schema to define what is being returned, it enforces consistency of the API and internally we can depend on well defined objects. 2021-08-10 16:16:08 -04:00
NWalker4483
4632c6374f Merge branch 'dev' into bug/missing_pi_name_246
# Conflicts:
#	crc/api.yml
#	crc/services/study_service.py
2021-07-20 11:44:11 -04:00
Dan
a1bb30e689 Switching from using "default" to "server_default" for all default time settings, and running migrations so that this is set at the database level rather than in python, to hopefully correct some issues with dates being 4 hours in the future. Having a very hard time replicating this issue locally. 2021-05-14 12:28:50 -04:00
Dan
b64b52e7cb Assure that we properly return the new status message over the api calls. 2021-03-26 19:47:31 -04:00
Nile Walker
a08c6b794f Updated Study Associate Endpoints 2021-03-22 17:30:49 -04:00
Kelly McDonald
06dedd8a32 Add short_title to study, change update_study task to use kw arguments and add the short_title to the update_study script 2021-03-02 10:03:53 -05:00
Kelly McDonald
c795dd7aea Merge branch 'dev' into 206-extend-study-access 2021-02-24 12:16:35 -05:00
Kelly McDonald
3dbe39c6fe initial checkin of changes for branch 2021-02-24 12:05:06 -05:00
Dan Funk
349c3d657a
Merge branch 'dev' into 201-changes-to-in-progress 2021-02-22 18:17:59 -05:00
Dan Funk
53fa49e668
Merge pull request #243 from sartography/183-remove-study-approval-code
Remove Approvals per ticket 183
2021-02-22 18:12:02 -05:00
Kelly McDonald
118cf62172 Merge remote-tracking branch 'origin/dev' into STG-181_frontend-ux-model-changes 2021-02-16 10:07:34 -05:00
Kelly McDonald
003bf2f9b9 Remove Approvals per ticket 183 2021-02-16 09:05:29 -05:00
Kelly McDonald
da0af14724 Changes to enable front-end changes
Added a human readable name to created user

added last updated task time and name,

added is_review on the workflow which is triggered by a swimlane with a name present.

Notably - it does NOT update or change any of the performance concerns that we were having with this.
2021-02-10 11:58:19 -05:00
mike cullerton
777cfbdecd We now test whether we have a valid StudyModel when getting a study by study model.
We raise an ApiError if the model is None or empty.
2021-02-09 17:37:55 -05:00
mike cullerton
ede5df4df5 Studies can now be put on hold in the dashboard. We were overriding the status in StudyModel.update_from_protocol_builder. 2020-12-30 17:49:59 -05:00
Dan Funk
85ad477b2b Some minor cleanup on the study status and automatic events. I wanted to avoid having one database model automatically generating other database models as a side effect. The study service now has full responsiblity to recording study events.
To help in running tests, adding __init__.py methods to all the test directories.
2020-08-17 14:56:00 -04:00