mike cullerton
81e3da043c
Fix tests
2022-03-18 16:05:16 -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
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
5f802a3e79
oops
2022-03-18 12:09:56 -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
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
Dan Funk
ed94241069
Merge pull request #495 from sartography/chore/cat-metadata-679
...
Chore/cat metadata 679
2022-03-17 22:03:48 -04:00
alicia pritchett
2ab96b16a0
Update the study model to include a progress (integer)
2022-03-17 17:20:42 -04:00
mike cullerton
199fe0626a
Assert that if we get null for DATELASTMODIFIED, we use the value in DATECREATED
2022-03-17 15:56:44 -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
mike cullerton
a578cf2498
Some studies don't have a DATELASTMODIFIED, so we use DATECREATED instead
2022-03-17 14:50:47 -04:00
mike cullerton
be2b7c07ef
add the new study to the session after we run update_from_protocol_builder
2022-03-17 14:29:38 -04:00
alicia pritchett
c18bc6f876
fix study service
2022-03-16 16:21:02 -04:00
alicia pritchett
5b7e71d42d
meta field for categories
2022-03-16 12:49:35 -04:00
alicia pritchett
829c810807
wip
2022-03-15 13:21:58 -04:00
alicia pritchett
37d92c6a5f
WIP ~ adding a category metadata object
2022-03-15 10:49:41 -04:00
Dan Funk
791ab20f8c
Merge pull request #494 from sartography/chore/fix_validation_errors
...
Chore/fix validation errors
2022-03-14 16:51:27 -04:00
Dan Funk
8ea8993421
Merge pull request #493 from sartography/jinja-included-includes-670
...
Jinja included includes #670
2022-03-14 16:49:56 -04:00
Dan Funk
562ad1ac27
Merge pull request #492 from sartography/columns-missing-from-logs-678
...
Columns missing from logs #678
2022-03-14 16:48:50 -04:00
Dan
483d7e858b
Improved Errors - Pick up on the new task_trace information in WorkflowException and pass it on through the api.
...
Also: All script tasks should raise WorkflowTaskExecExceptions - NOT APIExceptions - this is because our scripts are executed by Spiff (not the other way around) so the errors need to pass fluidly through spiff, and come back to use THEN we can convert them to APIErrors. Otherwise we lose all kinds of good information about the error.
2022-03-14 16:00:53 -04:00
mike cullerton
4a626afa7d
Added comment about the test
2022-03-14 14:01:13 -04:00
mike cullerton
eb615012af
Cleanup - remove unused import, print statement
2022-03-14 13:56:38 -04:00
mike cullerton
238840822d
Included template test from hell
2022-03-14 13:54:46 -04:00
mike cullerton
416adcbe69
Recursively parse the included templates
2022-03-14 13:51:41 -04:00
mike cullerton
a974b65333
Remove unused code
2022-03-14 12:03:11 -04:00
mike cullerton
3b049e358d
Remove unused imports
2022-03-14 12:02:48 -04:00
mike cullerton
ace988d551
assert we get category and workflow in all the places
2022-03-14 12:02:11 -04:00
mike cullerton
a6a98bed10
Include workflow_spec_id when adding a log
2022-03-14 11:56:36 -04:00
Dan
90bfbed6fd
Merge branch 'dev' into chore/fix_validation_errors
2022-03-14 10:58:01 -04:00
Dan Funk
a926c9c85a
Merge pull request #490 from sartography/chore/log-changes-661
...
Chore/log changes 661
2022-03-12 16:23:17 -05:00
Dan
0510db38f1
Dealing with merge of migrations.
2022-03-12 16:22:45 -05:00
Dan
3189b07446
Merge branch 'dev' into chore/log-changes-661
2022-03-12 16:20:22 -05:00
Dan
dec63839f3
Merge remote-tracking branch 'origin/dev' into chore/log-changes-661
2022-03-12 16:19:23 -05:00
Dan
2fc4b44ef3
Create a path to directly download the spreadsheet file (and avoid the weird dance on the front end of making an API call to get file data.)
...
Fixing pagination. Seems the front end uses a page_index that is 0 based, and sqlAlchemy prefers to start at 1.
2022-03-12 16:19:07 -05:00
Dan Funk
ceb817bb75
Merge pull request #491 from sartography/chore/new-progress-stats-673
...
migration
2022-03-12 16:15:20 -05:00
alicia pritchett
be6a6bcf2e
migration
2022-03-12 15:20:14 -05:00
mike cullerton
a536a79e87
Test for downloading logs
2022-03-12 14:29:02 -05:00
mike cullerton
e7b9c2ed31
Merge branch 'chore/log-changes-661' of https://github.com/sartography/cr-connect-workflow into chore/log-changes-661
2022-03-12 14:25:16 -05:00
mike cullerton
015eeccb54
Change API endpoint to a GET
2022-03-12 14:23:22 -05:00
Dan
4e9fe3a6bb
Merge branch 'dev' into chore/fix_validation_errors
2022-03-12 14:09:40 -05:00
Dan
4ab314c7b8
Be sure to delete the data store items when you delete a study.
2022-03-12 13:38:09 -05:00
Dan
00a99579c9
Revert "Be sure to delete the data store items when you delete a study."
...
This reverts commit c8e987cd3974a2efa54472fbdf18762152b4e7a7.
2022-03-12 13:36:13 -05:00
Dan
c8e987cd39
Be sure to delete the data store items when you delete a study.
2022-03-12 13:35:04 -05:00
