Commit Graph

2906 Commits

Author SHA1 Message Date
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 d0007b67e8 *** WIP ***
Migrate file and file_data records to document table
Need to add a downgrade method
2022-04-12 13:25:08 -04:00
mike cullerton 7c23d36d7c Add DocumentModel that combines FileModel and FileDataModel 2022-04-12 13:23:50 -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
Mike Cullerton 65da5a34ce
Merge pull request #512 from sartography/bug/same_uid_different_roles
Study Associates Bug
2022-04-04 16:23:00 -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 0b4caae19f
Merge pull request #511 from sartography/review-type-updates-692
Review type updates #692
2022-03-30 10:49:25 -04:00
mike cullerton 51c6871d06 Update mock data to use new valid review type 2022-03-30 10:30:27 -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 70e8f6b35e Fix typo in test: delete -> remove 2022-03-29 12:34:05 -04:00
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
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 ee3217de62 Test for new feature 2022-03-28 11:59:53 -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 6b93d605d4 Test for new validation_data_store.
We set 3 `real` data_store values in the DB
The workflow sets 3 validation_data_store values
We assert that the correct values are returned.
We also assert that we get correct default values back if we pass in bad keys
2022-03-25 10:06:03 -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 51fa494d03 Assert we evaluate the hidden property correctly during validation. 2022-03-23 16:49:35 -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
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