Skip to content

Commit 4c14b2e

Browse files
gasscgassc
committed
new fish fry attributes
drive_thru, procedures (for COVID), and eco
1 parent b5faac1 commit 4c14b2e

4 files changed

Lines changed: 66 additions & 26 deletions

File tree

‎core/__init__.py‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,17 @@
1515
import logging
1616
# depedencies
1717
from dateutil.parser import parse
18-
from flask import Flask, render_template, redirect, request, url_for, flash, Markup, session
18+
from flask import (
19+
Flask,
20+
render_template,
21+
redirect,
22+
request,
23+
url_for,
24+
flash,
25+
Markup,
26+
session,
27+
send_from_directory
28+
)
1929
import flask_sqlalchemy
2030
from marshmallow import pprint, ValidationError
2131
# application
@@ -207,11 +217,14 @@ def submit_fishfry():
207217
"email": form.email.data,
208218
"phone": form.phone.data,
209219
"etc": form.etc.data,
220+
"procedures": form.procedures.data,
221+
"eco": form.eco.data,
210222
"handicap": postbool(form.handicap.data),
211223
"alcohol": postbool(form.alcohol.data),
212224
"homemade_pierogies": postbool(form.homemade_pierogies.data),
213225
"lunch": postbool(form.lunch.data),
214226
"take_out": postbool(form.take_out.data),
227+
"drive_thru": postbool(form.drive_thru.data),
215228
"validated": form.validated.data,
216229
"publish": form.publish.data,
217230
"menu": {
@@ -368,3 +381,8 @@ def not_found_error(error):
368381
# Error handler 404
369382
"""
370383
return render_template('errors/404.html'), 404
384+
385+
@application.route('/favicon.ico')
386+
def favicon():
387+
return send_from_directory(os.path.join(app.root_path, 'static'),
388+
'favicon.ico', mimetype='image/vnd.microsoft.icon')

‎core/forms.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ class FishFryForm(FlaskForm):
7272
('Fire Department', 'Fire Department'),
7373
('Community Organization', 'Community Organization'),
7474
('VFW', 'VFW'),
75+
("Veteran's Organization", "Veteran's Organization"),
7576
('Market', 'Market'),
7677
('Food Truck', 'Food Truck'),
7778
('Restaurant', 'Restaurant'),
@@ -82,15 +83,17 @@ class FishFryForm(FlaskForm):
8283
website = StringField('Venue Website') # , validators=[Optional(), URL()])
8384
email = StringField('E-Mail') # , validators=[Optional(), Email()])
8485
phone = StringField('Phone')
85-
homemade_pierogies = SelectField(
86-
"Homemade Pierogies", choices=boolean_choices)
86+
homemade_pierogies = SelectField("Homemade Pierogies", choices=boolean_choices)
8787
lunch = SelectField("Lunch Served", choices=boolean_choices)
8888
handicap = SelectField("Handicap Accessible", choices=boolean_choices)
8989
take_out = SelectField("Take-Out Available", choices=boolean_choices)
90+
drive_thru = SelectField("Drive-Thru Available", choices=boolean_choices)
9091
alcohol = SelectField("Alcohol Served", choices=boolean_choices)
9192
menu_url = StringField('URL to Menu') # , validators=[Optional(), URL()])
9293
menu_txt = TextAreaField('Menu Text')
9394
etc = TextAreaField('Misc. Details')
95+
procedures = TextAreaField('Special Procedures for COVID-19')
96+
eco = TextAreaField('Notes on Eco-Friendliness')
9497
publish = BooleanField("Published")
9598
validated = BooleanField("Validated")
9699
# publish = SelectField(

‎core/models.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ class FishFryProperties(Schema):
4444
lunch = fields.Bool(allow_none=True)
4545
handicap = fields.Bool(allow_none=True)
4646
take_out = fields.Bool(allow_none=True)
47+
drive_thru = fields.Bool(allow_none=True)
4748
alcohol = fields.Bool(allow_none=True)
4849
etc = fields.Str(allow_none=True)
50+
procedures = fields.Str(allow_none=True)
51+
eco = fields.Str(allow_none=True)
4952
publish = fields.Bool(allow_none=True)
5053
validated = fields.Bool(allow_none=True)
5154
events = fields.List(fields.Nested(FishFryEvent))

‎core/templates/pages/fishfryform.html‎

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -163,46 +163,58 @@ <h3>Venue/Event</h3>
163163
<div class="form-group">
164164
{{ macros.render_field(form.venue_notes, placeholder="e.g., 'entrance is on the side', 'parking is across the street'; etc.") }}
165165
</div>
166+
<div class="form-group">
167+
{{ macros.render_field(form.procedures, placeholder="Any notes about procedures in place related to COVID-19.") }}
168+
</div>
166169
</div>
167170
</div>
168171

169172
</div>
173+
<hr>
170174
<!-- WHAT -->
171175
<div id="event-details-col" class="col-sm-12">
172176
<h3>Fish Fry Details</h3>
173177
<div class="row">
174178
<div class="col-md-6">
175179
<div class="form-group">
176-
{{ macros.render_field(form.homemade_pierogies) }}
177-
</div>
178-
<div class="form-group">
179-
{{ macros.render_field(form.alcohol) }}
180+
{{ macros.render_field(form.menu_url, placeholder="Link directly to the *menu* on the website (text or image)") }}
180181
</div>
182+
{% if menu_website %}
183+
<p class="small"><a href="{{menu_website}}" target="_blank"><i class="fa fa-link"></i>
184+
{{menu_website}}</a></p>
185+
{% endif %}
181186
<div class="form-group">
182-
{{ macros.render_field(form.lunch) }}
187+
{{ macros.render_field(form.menu_txt, placeholder="menu text, e.g., 'a-la-carte; dinner is $7.95'") }}
183188
</div>
184189
<div class="form-group">
185-
{{ macros.render_field(form.take_out) }}
190+
{{ macros.render_field(form.homemade_pierogies) }}
186191
</div>
187192
<div class="form-group">
188-
{{ macros.render_field(form.handicap) }}
193+
{{ macros.render_field(form.alcohol) }}
189194
</div>
190-
</div>
195+
</div>
191196
<div class="col-md-6">
192197
<div class="form-group">
193-
{{ macros.render_field(form.menu_url, placeholder="Link directly to the *menu* on the website (text or image)") }}
198+
{{ macros.render_field(form.take_out) }}
194199
</div>
195-
{% if menu_website %}
196-
<p class="small"><a href="{{menu_website}}" target="_blank"><i class="fa fa-link"></i>
197-
{{menu_website}}</a></p>
198-
{% endif %}
199200
<div class="form-group">
200-
{{ macros.render_field(form.menu_txt, placeholder="menu text, e.g., 'a-la-carte; dinner is $7.95'") }}
201+
{{ macros.render_field(form.drive_thru) }}
202+
</div>
203+
<div class="form-group">
204+
{{ macros.render_field(form.handicap) }}
201205
</div>
206+
<hr>
207+
<div class="form-group">
208+
{{ macros.render_field(form.lunch) }}
209+
</div>
202210
</div>
203211
</div>
212+
<hr>
204213
<div class="row">
205214
<div class="col-sm-12">
215+
<div class="form-group">
216+
{{ macros.render_field(form.eco, placeholder="Notes about eco-friendly practices (e.g., take-out containers, recycling, bagging)") }}
217+
</div>
206218
<div class="form-group">
207219
{{ macros.render_field(form.etc, placeholder="Things about the events that don't fit elsewhere, e.g., on the 2nd Friday of Lent, come meet Sauerkraut Saul and the rest of the Pirates Pierogies") }}
208220
</div>
@@ -237,22 +249,22 @@ <h4>Add Fish Fry Dates/Times</h4>
237249
<div class="col-sm-5">
238250
<div class="form-inline">
239251
<div class="form-group">
240-
<label for="events-bulk-t_start" class="control-label">
241-
<label for="events-bulk-t_start">Start Time</label>
252+
<label for="bulk-t_start" class="control-label">
253+
<label for="bulk-t_start">Start Time</label>
242254
</label>
243-
<input class="form-control input-sm" id="events-bulk-t_start"
244-
name="events-bulk-t_start" value="4:00 PM" type="text">
255+
<input class="form-control input-sm" id="bulk-t_start"
256+
name="bulk-t_start" value="4:00 PM" type="text">
245257
</div>
246258
</div>
247259
</div>
248260
<div class="col-sm-5">
249261
<div class="form-inline">
250262
<div class="form-group">
251-
<label for="events-bulk-t_end" class="control-label">
252-
<label for="events-bulk-t_end">End Time</label>
263+
<label for="bulk-t_end" class="control-label">
264+
<label for="bulk-t_end">End Time</label>
253265
</label>
254-
<input class="form-control input-sm" id="events-bulk-t_end"
255-
name="events-bulk-t_end" value="7:00 PM" type="text">
266+
<input class="form-control input-sm" id="bulk-t_end"
267+
name="bulk-t_end" value="7:00 PM" type="text">
256268
</div>
257269
</div>
258270
</div>
@@ -297,7 +309,11 @@ <h4>Add Fish Fry Dates/Times</h4>
297309
+ Append to the event list
298310
</button>
299311
</div>
300-
312+
<div class="row">
313+
<div class="col-sm-12">
314+
<p class="small">Dates/times will appear in the list below</p>
315+
</div>
316+
</div>
301317
</div>
302318
</div>
303319
</div>

0 commit comments

Comments
 (0)