convert to proper time db object, get rid of the 'str' messes

This commit is contained in:
2022-11-17 17:53:19 -05:00
parent ce1e8ed68c
commit f27749009c
5 changed files with 7 additions and 10 deletions

6
app.py
View File

@@ -25,7 +25,7 @@ app.register_blueprint(auth_blueprint)
class Period(db.Model): class Period(db.Model):
period = db.Column(db.Integer, primary_key=True) period = db.Column(db.Integer, primary_key=True)
periodTime = db.Column(db.Integer) periodTime = db.Column(db.Time)
weekendSchedule = db.Column(db.Boolean) weekendSchedule = db.Column(db.Boolean)
def __repr__(self): def __repr__(self):
@@ -90,7 +90,7 @@ def editPeriod(periodNum):
period = Period.query.get_or_404(periodNum) period = Period.query.get_or_404(periodNum)
form = PeriodForm(obj=period) form = PeriodForm(obj=period)
if form.validate_on_submit(): if form.validate_on_submit():
period.periodTime = str(form.periodTime.data) period.periodTime = form.periodTime.data
period.weekendSchedule = form.weekendSchedule.data period.weekendSchedule = form.weekendSchedule.data
db.session.commit() db.session.commit()
return redirect(f'/period/edit/{periodNum}') return redirect(f'/period/edit/{periodNum}')
@@ -107,7 +107,7 @@ def delete_period(periodNum):
def newPeriod(): def newPeriod():
form = PeriodForm() form = PeriodForm()
if form.validate_on_submit(): if form.validate_on_submit():
period = Period(periodTime=str(form.periodTime.data), period = Period(periodTime=form.periodTime.data,
weekendSchedule=form.weekendSchedule.data weekendSchedule=form.weekendSchedule.data
) )
print(period.periodTime) print(period.periodTime)

View File

@@ -2,9 +2,8 @@
{% block content %} {% block content %}
<span><h1>{% block title %} Edit Event {% endblock %}</h1></span> <span><h1>{% block title %} Edit Event {% endblock %}</h1></span>
{% set convertedTime = datetime.strptime(event.period.periodTime, "%H:%M:%S") %}
<p> <p>
<b>Period {{ event.period.period }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }} <b>Period {{ event.period.period }}</b> <br> Time: {{ event.period.periodTime.strftime("%I:%M %p") }}
</p> </p>
{% if event.task_id != None %} {% if event.task_id != None %}
<p> <p>

View File

@@ -10,7 +10,7 @@
{{ form.csrf_token }} {{ form.csrf_token }}
<p> <p>
{{ form.periodTime.label }} {{ form.periodTime.label }}
{{ form.periodTime(value=period.periodTime) }} {{ form.periodTime }}
</p> </p>
<p> <p>
{{ form.weekendSchedule.label }} {{ form.weekendSchedule.label }}

View File

@@ -8,8 +8,7 @@
<div> <div>
{% for period in periods %} {% for period in periods %}
<div> <div>
{% set convertedTime = datetime.strptime(period.periodTime, "%H:%M:%S") %} <p><b>Period {{ period.period }}</b> <br> Time: {{ period.periodTime.strftime("%I:%M %p") }} </p>
<p><b>Period {{ period.period }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }} </p>
{% for event in events if event.scheduled_date == currDay and event.period == period %} {% for event in events if event.scheduled_date == currDay and event.period == period %}
<div class="float-right"><a type="button" class="btn btn-primary" href="/event/edit/{{ event.id }}">Edit</a></div> <div class="float-right"><a type="button" class="btn btn-primary" href="/event/edit/{{ event.id }}">Edit</a></div>
{% if event.task_id != None %} {% if event.task_id != None %}

View File

@@ -4,7 +4,6 @@
<span><h1>{% block title %} Periods {% endblock %}</h1></span> <a class="btn btn-primary" href="/period/new" role="button">New Period </a> <br> <br> <span><h1>{% block title %} Periods {% endblock %}</h1></span> <a class="btn btn-primary" href="/period/new" role="button">New Period </a> <br> <br>
<div> <div>
{% for period in periods %} {% for period in periods %}
{% set convertedTime = datetime.strptime(period.periodTime, "%H:%M:%S") %}
<div class="float-right"> <div class="float-right">
<form method="post" <form method="post"
action="{{url_for('delete_period', action="{{url_for('delete_period',
@@ -15,7 +14,7 @@
<div class="float-right"><a type="button" class="btn btn-primary mr-1" href="/period/edit/{{ period.period }}">Edit</a> <div class="float-right"><a type="button" class="btn btn-primary mr-1" href="/period/edit/{{ period.period }}">Edit</a>
</div> </div>
<div> <div>
<p><b>Period {{ period.period }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }} </p> <p><b>Period {{ period.period }}</b> <br> Time: {{ period.periodTime.strftime("%I:%M %p") }} </p>
</div> </div>
<hr> <hr>
{% endfor %} {% endfor %}