222 Commits

Author SHA1 Message Date
mike cullerton
1c36e470ba Fixed failing test.
Added event and status data to irb_info section.
2021-06-21 14:50:46 -04:00
mike cullerton
abfd127aa1 Trying marshmallow_sqlalchemy.SQLAlchemySchema instead of Marshmallow.Schema 2021-06-21 12:59:31 -04:00
mike cullerton
f097b394b6 Migration script for DB changes.
Create new relationship tables for IRBEVENT and IRB_STATUS.
Change columns to relationships
2021-06-18 14:51:06 -04:00
mike cullerton
495537f2c1 Modify the edit_irb_info route to handle to new relationship tables for IRBEVENT and IRB_STATUS.
Have to explicitly seed the form data for some form fields.
2021-06-18 14:49:08 -04:00
mike cullerton
4809a52c99 Modify _update_irb_info to handle the new relationship for IRBEVENT and IRB_STATUS. 2021-06-18 14:46:13 -04:00
mike cullerton
f2040461d0 Modify IRBInfoForm to use the new IRBEVENT and IRB_STATUS relationships.
Have to define the form explicitly now, instead of automagically from the model.
2021-06-18 14:43:59 -04:00
mike cullerton
adc6954f9d Modify irb_info table to use new IRBEVENT and IRB_STATUS table relationship
Remove IRBEVENT and IRB_STATUS from API schema. (Need to figure out how to get this to work)
2021-06-18 14:42:09 -04:00
mike cullerton
c0f2ca1d38 Adding classes to support the new IRB Post Submission States and Events 2021-06-18 14:40:11 -04:00
Dan
d65eb51284 Merge branch 'dev' of github.com:sartography/protocol-builder-mock into dev 2021-05-18 11:24:15 -04:00
Dan
ec5add3b55 allow setting production configuration. 2021-05-18 11:24:09 -04:00
Dan Funk
b90a224249
Merge pull request #57 from sartography/testing-bug-fix-study-details
Fix for study_details bug on testing
2021-05-17 10:17:56 -04:00
mike cullerton
326ed53395 Fix for study_details bug on testing 2021-05-17 09:32:55 -04:00
Dan
8ca8c9ad85 Fixing an icon. 2021-05-14 17:36:22 -04:00
Dan
fdfab68bb2 Fixing yet another stupid. 2021-05-14 17:26:51 -04:00
Dan
8e9db15b74 Fixing a stupid. 2021-05-14 17:23:24 -04:00
Dan
40efc6b043 Merge branch 'dev' of github.com:sartography/protocol-builder-mock into dev 2021-05-14 17:21:22 -04:00
Dan
0f3800bb92 use url_for rather than relying on base_href which can result in dubious nare-do-well paths that cause all of us headaches on a friday afternoon. 2021-05-14 17:20:44 -04:00
Dan Funk
7ced4d19ca
Merge pull request #56 from sartography/clean-up-pb-mock-init-328
Clean up pb mock init #328
2021-05-14 14:52:39 -04:00
Dan
77adaffb58 fixing some merge conflicts. 2021-05-14 14:52:22 -04:00
Dan
295008304a Just a little prettier. 2021-05-14 14:44:48 -04:00
Dan Funk
2770125025
Merge pull request #55 from sartography/persist-selected-user-319
Persist selected user #319
2021-05-14 14:18:18 -04:00
mike cullerton
2ff6814bd4 __init__.py cleanup
- moved routes to new `routes.py` file
- moved helper functions to new `pb_mock.py` file
2021-05-12 11:54:46 -04:00
mike cullerton
be9484760a Fixed test.
The /user_studies route now returns a 200
2021-05-11 17:00:43 -04:00
mike cullerton
6c11a04614 PB Mock now retains the selected_user filter when returning to the study listings page.
Modified the / and /user_studies routes
The / route now redirects to the /user_studies route
The /user_studies route updates the selected_user table.

Added methods `_is_production` and `_get_request_ids` to get uva uid from header on production.

Added `get_current_user`, `get_selected_user`, and `update_selected_user` to help the process.
2021-05-11 16:42:36 -04:00
mike cullerton
f9b254c518 We now pass all in the user_studies url.
We use this to turn off selected_user
2021-05-11 16:34:49 -04:00
mike cullerton
688023a248 Added table selected_user for ticket 319.
We now store a user's selected_user so they see a filtered list of studies when returning to the PB Mock homepage
2021-05-11 16:33:44 -04:00
Dan Funk
5fa0ae8958
Merge pull request #53 from sartography/irb-pro-api-endpoints-275
Irb pro api endpoints #275
2021-04-16 17:34:17 -04:00
mike cullerton
650cd5c40a Changed column name in irb_info from RB_OF_RECORD to IRB_OF_RECORD 2021-04-16 16:39:36 -04:00
mike cullerton
584807bb43 Fixed issue with Study Sponsors.
Was using Sponsor IDs that were only available locally.
Now we load test sponsors, and use them.
2021-04-13 12:47:42 -04:00
mike cullerton
d8552b4955 Turned off CSRF token for testing 2021-04-13 12:08:03 -04:00
mike cullerton
feff3f4e6b Added a big test for deleting a study.
We add a study and then add all the different types of information to the study.
We then delete the study and make sure all the associated information is also deleted.
2021-04-13 12:07:34 -04:00
mike cullerton
d7ca809968 Delete the IRB Info when deleting a study 2021-04-09 12:05:27 -04:00
mike cullerton
d3818debb4 Added API endpoint for the new irb_info data 2021-04-09 12:04:46 -04:00
mike cullerton
4ddf47314d Merge branch 'dev' into irb-pro-api-endpoints-275 2021-04-09 10:16:29 -04:00
mike cullerton
84b3d455c1 Moved the API methods to a separate file.
Note that I had to move the `connexion_app.add_api()` call so that it happened *after* db.session was defined, so I could import the session into the api.py file
2021-04-09 10:00:24 -04:00
Dan
fb99357431 don't depend on dockerhub for nothin, ever. 2021-04-09 09:53:56 -04:00
mike cullerton
40f45202df Ticket 275 - adding new API endpoint for IRB Study Info
models.py
 - Added new IRBInfo model
 - Added relationship to Study table

forms.py
 - Added form to edit the data
 - Added column in Study table for link to edit new info

__init__.py
 - Added route for new form page
 - Added method to update the db
2021-04-08 17:35:24 -04:00
Dan
bd4bd3e49f Allow deletes even with new model. 2021-04-08 16:11:17 -04:00
Dan Funk
128945d0b3
Merge pull request #49 from sartography/irb-api-endpoints-273
Irb api endpoints #273
2021-04-08 12:44:48 -04:00
mike cullerton
2c780c9028 Q_COMPLETE is not a column in the study table anymore. Removed Q_COMPLETE from the API Study component schema 2021-04-06 12:25:21 -04:00
mike cullerton
4e2b79741f Tests were failing because forms were not sending Q_COMPLETE data.
Added mocked Q_COMPLETE data to `add_study` and `test_add_and_edit_study`.
2021-04-06 12:23:13 -04:00
Dan Funk
60da05df4e
Merge pull request #46 from sartography/update-study-details-fields-257
Update study details fields 257
2021-04-02 18:56:26 -04:00
Dan
3a8a0fba25 Merge remote-tracking branch 'origin/dev' into update-study-details-fields-257 2021-04-02 12:43:53 -04:00
Dan Funk
81b33ca6f5
Merge pull request #44 from sartography/dependabot/pip/urllib3-1.26.3
Bump urllib3 from 1.26.2 to 1.26.3
2021-04-02 12:43:06 -04:00
Dan Funk
4180fbd433
Merge branch 'dev' into dependabot/pip/urllib3-1.26.3 2021-04-02 12:42:59 -04:00
Dan Funk
23d4bf4457
Merge pull request #45 from sartography/dependabot/pip/jinja2-2.11.3
Bump jinja2 from 2.11.2 to 2.11.3
2021-04-02 12:36:41 -04:00
Dan
c9ddfe6be4 Fixing an error in the API.yml file that started showing up with the pip update. 2021-04-02 12:32:23 -04:00
Dan Funk
cc1b602e34
Merge pull request #43 from sartography/user-lookup-fix
Two bug fixes:
2021-04-02 12:20:11 -04:00
mike cullerton
15dc53f957 Removed Q_COMPLETE from the StudySchema fields, because it is no longer a column. It is a relationship now. 2021-04-02 11:48:09 -04:00
mike cullerton
f23e4e307f removed commented line 2021-04-01 14:12:23 -04:00