add edit event feature

app.py

@@ -53,16 +53,17 @@ class Event(db.Model):
     def __repr__(self):
         return f'<Event "{self.id}">'
 
+def get_tasks():
+    return Task.query
 class TaskForm(FlaskForm):
     title = StringField('Title', validators=[InputRequired(),
                                              Length(min=5, max=100)])
     description = TextAreaField('Description', validators=[InputRequired(),
                                                            Length(max=200)])
 class EventForm(FlaskForm):
-    eventDate = DateField('Date', validators=[InputRequired()], format='m-%d-%Y')
-    period_num = IntegerField(validators=[InputRequired()])
-    selectedTask = QuerySelectField(label='Task', get_label='title' )
-
+    # eventDate = DateField('Date', validators=[InputRequired()], format='m-%d-%Y')
+    # period_num = IntegerField(validators=[InputRequired()])
+    selectedTask = QuerySelectField(label='New Task', query_factory=get_tasks, get_label='title', allow_blank=True, blank_text='(no task)')
 
 @app.route('/')
 def index():
@@ -71,12 +72,22 @@ def index():
 @app.route('/events')
 def events():
     events = Event.query.all()
-    tasks = Task.query.order_by('title')
     periods = Period.query.all()
 
-    form = EventForm(obj=tasks)
-    return render_template('events.html', events=events, periods=periods, datetime=datetime, date=date, form=form)
+    return render_template('events.html', events=events, periods=periods, datetime=datetime, date=date)
 
+@app.route('/event/edit/<int:event_id>/', methods=('GET', 'POST'))
+def editEvent(event_id):
+    event = Event.query.get_or_404(event_id)
+    form = EventForm(obj=event)
+    if form.validate_on_submit():
+        if hasattr(form.selectedTask.data, 'id'):
+            event.task_id = form.selectedTask.data.id
+        else:
+            event.task_id = None
+        db.session.commit()
+        return redirect('/events')
+    return render_template('editEvent.html', event=event, form=form, datetime=datetime)
 @app.route('/tasks')
 def tasks():
     tasks = Task.query.all()

templates/editEvent.html

@@ -0,0 +1,28 @@
+{% extends 'base.html' %}
+
+{% block content %}
+<span><h1>{% block title %} Edit Event {% endblock %}</h1></span>
+    {% set convertedTime = datetime.strptime(event.period.periodTime, "%H:%M:%S") %}
+    <p>
+        <b>Period {{ event.period.period }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }}
+    </p>
+    {% if event.task_id != None %}
+    <p>
+        <b><a href="/task/{{ event.tasks.id }}">
+            {{ event.tasks.title }}
+        </a></b> <br> {{ event.tasks.description }}
+    </p>
+    {% else %}
+      <div><p>(no task assigned... yet)</p></div>
+    {% endif %}
+<form method="post">
+    {{ form.csrf_token }}
+    <p>
+        {{ form.selectedTask.label }}
+        {{ form.selectedTask }}
+    </p>
+    <p>
+        <button class="btn btn-primary" type="submit">Submit</button>
+    </p>
+</form>
+{% endblock %}

templates/events.html

@@ -11,6 +11,8 @@
                 {% set convertedTime = datetime.strptime(period.periodTime, "%H:%M:%S") %}
                 <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 %}
+                <div class="float-right"><a type="button" class="btn btn-primary" href="/event/edit/{{ event.id }}">Edit</a></div>
+                {% if event.task_id != None %}
                 <b>
                         <a href="/task/{{ event.tasks.id }}">
                             {{ event.tasks.title }}
@@ -21,6 +23,7 @@
                 </div>
                 {% else %}
                     <div><p>(no task assigned... yet)</p></div>
+                {% endif %}
                 {% endfor %}
                 <hr>
             </div>