From c260e6a4657ca8b218fccf2133aa3d5d86004852 Mon Sep 17 00:00:00 2001 From: mike cullerton Date: Tue, 30 Mar 2021 10:56:23 -0400 Subject: [PATCH] Added new fields for study_details Changed some field types Removed 2 unused documents from required documents list Changed the name of required documents from Required to Documents --- pb/forms.py | 6 +++--- pb/models.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pb/forms.py b/pb/forms.py index 69c48ce..e5ea96e 100644 --- a/pb/forms.py +++ b/pb/forms.py @@ -10,7 +10,7 @@ class StudyForm(FlaskForm): STUDYID = HiddenField() TITLE = StringField('Title', [validators.DataRequired()]) NETBADGEID = StringField('User UVA Computing Id', [validators.DataRequired()]) - requirements = SelectMultipleField("Requirements", + requirements = SelectMultipleField("Documents", render_kw={'class': 'multi'}, choices=[(rd.AUXDOCID, rd.AUXDOC) for rd in RequiredDocument.all()]) HSRNUMBER = StringField('HSR Number') @@ -55,7 +55,7 @@ class StudyDetailsForm(ModelForm, FlaskForm): 'IS_CODED_RESEARCH', 'IS_OUTSIDE_SPONSOR', 'IS_PI_INITIATED', 'IS_ENGAGED_RESEARCH', 'IS_APPROVED_DEVICE', 'IS_FINANCIAL_CONFLICT', 'IS_NOT_CONSENT_WAIVER', 'IS_FOR_CANCER_CENTER', 'IS_REVIEW_BY_CENTRAL_IRB', - 'IRBREVIEWERADMIN', 'IS_UVA_COLLABANALYSIS'] + 'IRBREVIEWERADMIN', 'IS_UVA_COLLABANALYSIS', 'REVIEW_TYPE', 'REVIEWTYPENAME'] class ConfirmDeleteForm(FlaskForm): @@ -120,7 +120,7 @@ class StudyTable(Table): NETBADGEID = Col('User') DATE_MODIFIED = DatetimeCol('Last Update', "medium") Q_COMPLETE = BoolCol('Complete?') - requirements = NestedTableCol('Requirements', RequirementsTable) + requirements = NestedTableCol('Documents', RequirementsTable) investigators = NestedTableCol('Investigators', InvestigatorsTable) sponsors = NestedTableCol('Sponsors', SponsorsTable) delete = LinkCol( diff --git a/pb/models.py b/pb/models.py index 2b17bc7..bb99a90 100644 --- a/pb/models.py +++ b/pb/models.py @@ -136,11 +136,9 @@ class RequiredDocument(db.Model): RequiredDocument(AUXDOCID=21, AUXDOC="New Medical Device Form"), RequiredDocument(AUXDOCID=22, AUXDOC="SOM CTO Review regarding need for IDE"), RequiredDocument(AUXDOCID=23, AUXDOC="SOM CTO Review regarding need for IND"), - RequiredDocument(AUXDOCID=24, AUXDOC="InfoSec Approval"), RequiredDocument(AUXDOCID=25, AUXDOC="Scientific Pre-review Documentation"), RequiredDocument(AUXDOCID=26, AUXDOC="IBC Number"), RequiredDocument(AUXDOCID=32, AUXDOC="IDS - Investigational Drug Service Approval"), - RequiredDocument(AUXDOCID=33, AUXDOC="Data Security Plan"), RequiredDocument(AUXDOCID=36, AUXDOC="RDRC Approval "), RequiredDocument(AUXDOCID=40, AUXDOC="SBS/IRB Approval-FERPA"), RequiredDocument(AUXDOCID=41, AUXDOC="HIRE Standard Radiation Language"), @@ -190,7 +188,7 @@ class StudyDetails(db.Model): IS_SPONSOR = db.Column(db.Integer, nullable=True) IS_GRANT = db.Column(db.Integer, nullable=True) IS_COMMITTEE_CONFLICT = db.Column(db.Integer, nullable=True) - DSMB = db.Column(db.Integer, nullable=True) + DSMB = db.Column(db.String, nullable=True) DSMB_FREQUENCY = db.Column(db.Integer, nullable=True) IS_DB = db.Column(db.Integer, nullable=True) IS_UVA_DB = db.Column(db.Integer, nullable=True) @@ -239,6 +237,8 @@ class StudyDetails(db.Model): IS_CODED_RESEARCH = db.Column(db.Integer, nullable=True) IS_OUTSIDE_SPONSOR = db.Column(db.Integer, nullable=True) IS_UVA_COLLABANALYSIS = db.Column(db.Integer, nullable=True) + REVIEW_TYPE = db.Column(db.Integer, nullable=True) + REVIEWTYPENAME = db.Column(db.String, nullable=True)