sartography
/
cr-connect-workflow
mirror of https://github.com/sartography/cr-connect-workflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add `short_name` and `proposal_name` to the study model

This commit is contained in:
mike cullerton 2021-09-17 11:53:45 -04:00
parent 72349cacf5
commit 8b8cfde6cb
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crc/models/study.py
View File

@ -53,6 +53,8 @@ class StudyModel(db.Model):
enrollment_date = db.Column(db.DateTime(timezone=True), nullable=True) enrollment_date = db.Column(db.DateTime(timezone=True), nullable=True)
#events = db.relationship("TaskEventModel") #events = db.relationship("TaskEventModel")
events_history = db.relationship("StudyEvent", cascade="all, delete, delete-orphan") events_history = db.relationship("StudyEvent", cascade="all, delete, delete-orphan")
short_name = db.Column(db.String, nullable=True)
proposal_name = db.Column(db.String, nullable=True)
def update_from_protocol_builder(self, pbs: ProtocolBuilderStudy): def update_from_protocol_builder(self, pbs: ProtocolBuilderStudy):
self.title = pbs.TITLE self.title = pbs.TITLE
@ -168,7 +170,7 @@ class CategorySchema(ma.Schema):
class Study(object): class Study(object):
def __init__(self, title, short_title, last_updated, primary_investigator_id, user_uid, def __init__(self, title, short_title, last_updated, primary_investigator_id, user_uid,
id=None, status=None, irb_status=None, comment="", id=None, status=None, irb_status=None, short_name=None, proposal_name=None, comment="",
sponsor="", ind_number="", categories=[], sponsor="", ind_number="", categories=[],
files=[], approvals=[], enrollment_date=None, events_history=[], files=[], approvals=[], enrollment_date=None, events_history=[],
last_activity_user="",last_activity_date =None,create_user_display="", **argsv): last_activity_user="",last_activity_date =None,create_user_display="", **argsv):
@ -192,6 +194,8 @@ class Study(object):
self.files = files self.files = files
self.enrollment_date = enrollment_date self.enrollment_date = enrollment_date
self.events_history = events_history self.events_history = events_history
self.short_name = short_name
self.proposal_name = proposal_name
@classmethod @classmethod
def from_model(cls, study_model: StudyModel): def from_model(cls, study_model: StudyModel):
@ -253,13 +257,15 @@ class StudySchema(ma.Schema):
files = fields.List(fields.Nested(FileSchema), dump_only=True) files = fields.List(fields.Nested(FileSchema), dump_only=True)
enrollment_date = fields.Date(allow_none=True) enrollment_date = fields.Date(allow_none=True)
events_history = fields.List(fields.Nested('StudyEventSchema'), dump_only=True) events_history = fields.List(fields.Nested('StudyEventSchema'), dump_only=True)
short_name = fields.String(allow_none=True)
proposal_name = fields.String(allow_none=True)
class Meta: class Meta:
model = Study model = Study
additional = ["id", "title", "short_title", "last_updated", "primary_investigator_id", "user_uid", additional = ["id", "title", "short_title", "last_updated", "primary_investigator_id", "user_uid",
"sponsor", "ind_number", "files", "enrollment_date", "sponsor", "ind_number", "files", "enrollment_date",
"create_user_display", "last_activity_date","last_activity_user", "create_user_display", "last_activity_date", "last_activity_user",
"events_history"] "events_history", "short_name", "proposal_name"]
unknown = INCLUDE unknown = INCLUDE
@marshmallow.post_load @marshmallow.post_load

26
migrations/versions/9afbd55082a0_new_study_info_data_points.py Normal file
View File

@ -0,0 +1,26 @@
"""new study info data points
Revision ID: 9afbd55082a0
Revises: 981156283cb9
Create Date: 2021-09-17 10:31:05.094062
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '9afbd55082a0'
down_revision = '981156283cb9'
branch_labels = None
depends_on = None
def upgrade():
op.add_column('study', sa.Column('short_name', sa.String(), nullable=True))
op.add_column('study', sa.Column('proposal_name', sa.String(), nullable=True))
def downgrade():
op.drop_column('study', 'short_name')
op.drop_column('study', 'proposal_name')