From 1e7bd63910816f1970970591997407c69c3d2a87 Mon Sep 17 00:00:00 2001
From: Wojciech Kwolek <wojciech@kwolek.xyz>
Date: Thu, 3 Sep 2020 12:53:50 +0200
Subject: [PATCH] allow adding accomplishments to previous days

---
 app/main.py                  | 55 +++++++++++++++++++++++++++++-------
 app/templates/main/app.html  | 10 ++++++-
 app/templates/main/edit.html | 12 ++++++--
 3 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/app/main.py b/app/main.py
index 865554d..caaadd3 100644
--- a/app/main.py
+++ b/app/main.py
@@ -1,5 +1,5 @@
 from . import timeutils
-from flask import Blueprint, render_template, redirect, url_for, abort
+from flask import Blueprint, render_template, redirect, url_for, abort, request
 from flask_login import current_user, login_required
 from flask_wtf import FlaskForm
 from wtforms import StringField, SubmitField, IntegerField
@@ -35,7 +35,7 @@ def handle_accomplishment_submission(form):
     return redirect(url_for('main.index'))
 
 
-def get_day_template_data(day_string):
+def parse_day(day_string):
     day_datetime = None
     if day_string == "today":
         day_datetime = timeutils.today()
@@ -43,6 +43,17 @@ def get_day_template_data(day_string):
         day_datetime = timeutils.from_str(day_string)
 
     day_string_clean = timeutils.as_str(day_datetime)
+    return {
+        "datetime": day_datetime,
+        "string": day_string_clean,
+        "fancy": timeutils.as_fancy_str(day_datetime),
+        "is_today": timeutils.is_today(day_datetime)
+    }
+
+
+def get_day_template_data(day_string):
+    day = parse_day(day_string)
+    day_datetime = day["datetime"]
 
     accomplishments = list(reversed(
         Accomplishment.get_day(current_user.id, day_datetime)))
@@ -54,18 +65,11 @@ def get_day_template_data(day_string):
         tomorrow = None
 
     return {
-        "day": {
-            "datetime": day_datetime,
-            "string": day_string_clean,
-            "fancy": timeutils.as_fancy_str(day_datetime),
-            "is_today": timeutils.is_today(day_datetime)
-        },
-
+        "day": day,
         "links": {
             "yesterday": url_for('main.index', day=timeutils.as_str(yesterday)),
             "tomorrow": url_for('main.index', day=timeutils.as_str(tomorrow)) if tomorrow is not None else None
         },
-
         "accomplishments": accomplishments,
         "total_xp": sum(a.difficulty for a in accomplishments),
     }
@@ -160,3 +164,34 @@ def edit_accomplishment(accomplishment_id):
         return redirect(back_url)
 
     return render_template('main/edit.html', form=form, cancel=back_url)
+
+
+@main.route('/day/<day>/add', methods=['GET', 'POST'])
+@login_required
+def add_day(day):
+    day_parsed = parse_day(day)
+    form = EditForm()
+
+    back_url = ""
+
+    from_top = ("from" in request.args) and ("top" in request.args["from"])
+    back_to_day = url_for('main.index', day=day_parsed["string"])
+    back_to_edit = url_for('main.edit_day', day=day_parsed["string"])
+
+    if form.validate_on_submit():
+        accomplishment = Accomplishment()
+        accomplishment.user_id = current_user.id
+        accomplishment.text = form.text.data
+        accomplishment.difficulty = form.difficulty.data
+        accomplishment.time = timeutils.from_str(day)
+        db.session.add(accomplishment)
+        db.session.commit()
+        return redirect(back_to_day)
+
+    return render_template(
+        'main/edit.html',
+        day=day_parsed,
+        form=form,
+        edit=True,
+        cancel=back_to_day if from_top else back_to_edit
+    )
diff --git a/app/templates/main/app.html b/app/templates/main/app.html
index 7e9fd2d..d6dee3d 100644
--- a/app/templates/main/app.html
+++ b/app/templates/main/app.html
@@ -13,7 +13,7 @@
     </form>
 </div>
 <div class="max-w-lg mx-auto card">
-    <div class="flex items-baseline justify-between mb-4">
+    <div class="flex items-center justify-between mb-4">
         <div>
             <h3 class="text-2xl">{{ day.fancy }}</h3>
         </div>
@@ -22,9 +22,17 @@
         {% else %}
         {% if accomplishments %}
         <div><a href="{{ url_for('main.edit_day', day=day.string) }}" class="link">edit</a></div>
+        {% else %}
+        <div><a href="{{ url_for('main.add_day', day=day.string, from="top") }}" class="link">add</a></div>
         {% endif %}
         {% endif %}
     </div>
+    {% if edit %}
+    <div class="my-1 ml-2 text-sm accomplishment">
+        <div><a href="{{ url_for('main.add_day', day=day.string) }}" class="link">Add accomplishment</a></div>
+    </div>
+    <hr>
+    {% endif %}
     {% for accomplishment in accomplishments %}
     <div class="flex ml-2 accomplishment">
         <div class="py-1 text">{{ accomplishment.text }}</div>
diff --git a/app/templates/main/edit.html b/app/templates/main/edit.html
index 0245ace..505404f 100644
--- a/app/templates/main/edit.html
+++ b/app/templates/main/edit.html
@@ -1,8 +1,16 @@
 {% extends "_skel.html" %}
-{% block title %}Edit accomplishment{% endblock %}
+{% block title %}{% if not day %}Edit{% else %}Add{% endif %} accomplishment{% endblock %}
 {% from "_formhelpers.html" import render_field %}
 {% block content %}
-<form method="POST" class="w-full max-w-lg mx-auto card">
+{% if day %}
+<div class="w-full max-w-lg mx-auto card">
+    <div class="text-xl text-center">
+        You're adding an accomplishment made on {{ day.fancy }}.
+    </div>
+</div>
+{% endif %}
+<form method="POST" class="w-full max-w-lg mx-auto card"
+    {% if day %}action="{{ url_for('main.add_day', day=day.string) }}" {% endif %}>
     {{ form.csrf_token }}
     {{ render_field(form.text) }}
     {{ render_field(form.difficulty) }}