mike cullerton
689aa54d50
Modified tests to work with the bug fix
2022-03-29 09:49:29 -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
Dan Funk
244fced84d
Merge pull request #506 from sartography/chore/unchecked-checkbox-default-671
...
Unchecked checkbox default #671
2022-03-23 10:59:47 -04:00
Dan Funk
147f9a8176
Merge pull request #503 from sartography/dependabot/pip/deploy/waitress-2.1.1
...
Bump waitress from 1.4.4 to 2.1.1 in /deploy
2022-03-23 10:57:09 -04:00
Dan Funk
61f2a2eff9
Merge pull request #502 from sartography/bug/validate-lanes-667
...
Fixes #667- Validate Lane Variables
2022-03-23 10:56:55 -04:00
mike cullerton
1969e0b051
Make sure we don't get null/None back from a boolean checkbox.
...
This is not a comprehensive test, because we can't have an unchecked checkbox in validation.
We really need a frontend test for this.
2022-03-23 09:48:13 -04:00
dependabot[bot]
8d52f67357
Bump waitress from 1.4.4 to 2.1.1 in /deploy
...
Bumps [waitress](https://github.com/Pylons/waitress ) from 1.4.4 to 2.1.1.
- [Release notes](https://github.com/Pylons/waitress/releases )
- [Changelog](https://github.com/Pylons/waitress/blob/master/CHANGES.txt )
- [Commits](https://github.com/Pylons/waitress/compare/v1.4.4...v2.1.1 )
---
updated-dependencies:
- dependency-name: waitress
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-21 22:18:45 +00:00
alicia pritchett
487a1a3987
Fixes #667- Validate Lane Variables
2022-03-21 12:18:40 -04:00
Dan Funk
5486b30db3
Merge pull request #501 from sartography/chore/fix_validation_errors
...
Chore/fix validation errors
2022-03-19 09:54:49 -04:00
Dan
befc299475
Merge branch 'dev' into chore/fix_validation_errors
2022-03-19 09:53:12 -04:00
mike cullerton
27c2b95f31
Pass update_status=True in the test when calling the get_study api endpoint
...
This allows master_workflow_results to be set, which allows categories to be processed in StudyService.get_study()
2022-03-18 17:01:36 -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
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 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
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
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
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
9b1a7ff286
Fixes #668 - Cancel/Notify Called when loading last task
...
don't call cancel notify if its an end event
2022-03-17 10:58:25 -04:00
mike cullerton
69b5d80b23
Included templates wrapped by if clause don't always exist
...
Don't raise an error here
2022-03-16 16:57:26 -04:00
mike cullerton
9a345da763
typo
2022-03-16 16:54:36 -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
Dan
1506952df7
task_trace was a little mixed up in the errors.
2022-03-16 10:18:50 -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