This commit is contained in:
Dan Funk 2019-12-09 22:56:20 -05:00
parent 0de3e28ed7
commit 2d06bce020
7 changed files with 37 additions and 11 deletions

View File

@ -131,8 +131,8 @@ class EvaluationHistoryMixin(object):
"display_order": 5,
"type": "input",
"template_options": {
"label": "First diagnosed by",
"appearance": "standard",
"label": "Diagnosed by other?",
"placeholder": "Please Describe",
"required": True,
},
"hide_expression": who_diagnosed_other_hide_expression,
@ -197,7 +197,6 @@ class EvaluationHistoryMixin(object):
"type": "input",
"template_options": {
"label": "Where was this diagnosis made?",
"appearance": "standard",
"required": True,
},
"hide_expression": where_diagnosed_other_hide_expression,
@ -237,7 +236,6 @@ class EvaluationHistoryMixin(object):
"type": "radio",
"template_options": {
"label": "Permission to Link Data",
"appearance": "standard",
"required": False,
"options": [
{"value": True, "label": "Yes"},
@ -285,7 +283,6 @@ class EvaluationHistoryMixin(object):
"type": "number",
"max": 200,
"min": 0,
"appearance": "standard",
},
"hide_expression": "!(model.has_iq_test)",
},

View File

@ -17,6 +17,7 @@ class Resource(db.Model):
db.ForeignKey('organization.id'))
phone = db.Column(db.String)
website = db.Column(db.String)
video_link = db.Column(db.String)
ages = db.Column(db.ARRAY(db.String), default=[])
categories = db.relationship("ResourceCategory", back_populates="resource")

View File

@ -282,7 +282,7 @@ class ResourceSchema(ModelSchema):
class Meta:
model = Resource
fields = ('id', 'type', 'title', 'last_updated', 'description', 'organization_id', 'phone', 'website',
'organization', 'resource_categories', 'ages', '_links')
'video_link', 'organization', 'resource_categories', 'ages', '_links')
organization_id = fields.Integer(required=False, allow_none=True)
organization = fields.Nested(OrganizationSchema(), dump_only=True, allow_none=True)
resource_categories = fields.Nested(CategoriesOnResourceSchema(), many=True, dump_only=True)
@ -334,7 +334,7 @@ class EventSchema(ModelSchema):
model = Event
fields = ('id', 'type', 'title', 'last_updated', 'description', 'date', 'time', 'ticket_cost', 'organization_id',
'primary_contact', 'location_name', 'street_address1', 'street_address2', 'city', 'state', 'zip',
'phone', 'website', 'organization', 'resource_categories', 'latitude', 'longitude', 'ages', '_links')
'phone', 'website', 'video_link', 'organization', 'resource_categories', 'latitude', 'longitude', 'ages', '_links')
id = fields.Integer(required=False, allow_none=True)
organization_id = fields.Integer(required=False, allow_none=True)
organization = fields.Nested(OrganizationSchema(), dump_only=True, allow_none=True)
@ -387,7 +387,7 @@ class LocationSchema(ModelSchema):
model = Location
fields = ('id', 'type', 'title', 'last_updated', 'description', 'primary_contact', 'organization_id',
'street_address1', 'street_address2', 'city', 'state', 'zip', 'phone', 'email', 'website',
'organization', 'resource_categories', 'latitude', 'longitude', '_links', 'ages')
'video_link', 'organization', 'resource_categories', 'latitude', 'longitude', '_links', 'ages')
id = fields.Integer(required=False, allow_none=True)
organization_id = fields.Integer(required=False, allow_none=True)
organization = fields.Nested(OrganizationSchema(), dump_only=True, allow_none=True)

View File

@ -0,0 +1,28 @@
"""empty message
Revision ID: f955ff4cec32
Revises: 771d1705b043
Create Date: 2019-12-09 14:05:39.233075
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = 'f955ff4cec32'
down_revision = '771d1705b043'
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('resource', sa.Column('video_link', sa.String(), nullable=True))
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('resource', 'video_link')
# ### end Alembic commands ###

View File

@ -27,6 +27,6 @@
<body>
<app-root></app-root>
<script src="runtime-es2015.858f8dd898b75fe86926.js" type="module"></script><script src="polyfills-es2015.211cd011129c4b7c97a9.js" type="module"></script><script src="runtime-es5.741402d1d47331ce975c.js" nomodule></script><script src="polyfills-es5.04ebc2ff259f829c70dc.js" nomodule></script><script src="main-es2015.e3066e088d983cc0f9c9.js" type="module"></script><script src="main-es5.537fd77c4d25598a3911.js" nomodule></script></body>
<script src="runtime-es2015.858f8dd898b75fe86926.js" type="module"></script><script src="polyfills-es2015.211cd011129c4b7c97a9.js" type="module"></script><script src="runtime-es5.741402d1d47331ce975c.js" nomodule></script><script src="polyfills-es5.04ebc2ff259f829c70dc.js" nomodule></script><script src="main-es2015.2567beb08d200dc1a17b.js" type="module"></script><script src="main-es5.69c11a042c6db15f82b1.js" nomodule></script></body>
</html>

File diff suppressed because one or more lines are too long