db now in models; modules.

2 files changed, 15 insertions, 13 deletions

diff --git a/app/modules/ferti/forms.py b/app/modules/ferti/forms.py
index d926931..1e25ec3 100644
--- a/app/modules/ferti/forms.py
+++ b/app/modules/ferti/forms.py
@@ -12,13 +12,10 @@ from wtforms import (
 )
 from wtforms.validators import InputRequired, Length, NumberRange
 
+from ...models import FertiLog
+
 
 class AddFertiLog(FlaskForm):
-    target = SelectField(
-        "Type",
-        choices=[("False", "Log"), ("True", "Target")],
-        validators=[InputRequired()],
-    )
     nno3 = FloatField("NNO3", default=0)
     p = FloatField("P", default=0)
     k = FloatField("K", default=0)
@@ -39,9 +36,15 @@ class AddFertiLog(FlaskForm):
 
 
 class AddFertiTarget(AddFertiLog):
-    targeted_log = SelectField(
-        "Log to target",
-        choices=[("value1", "Last"), ("value2", "Named")],
+    target_id = SelectField(
+        "Target log",
+        choices=[],
         validators=[InputRequired()],
     )
-    submit = SubmitField("Add/Update Log")
+    submit = SubmitField("Add target")
+
+    def __init__(self, **kwargs):
+        super().__init__()
+        self.target_id.choices = [
+            (target.primary_key, target.date_time_created) for target in FertiLog.query.all()
+        ]
diff --git a/app/modules/ferti/routes.py b/app/modules/ferti/routes.py
index b3bb03f..c0f3ab5 100644
--- a/app/modules/ferti/routes.py
+++ b/app/modules/ferti/routes.py
@@ -21,7 +21,7 @@ import inspect
 
 
 
-from ... import db
+# from ... import db
 from ...models import *
 from .forms import *
 
@@ -34,11 +34,10 @@ ferti = Blueprint("ferti", __name__)
 @login_required
 def view():
     modules = Module.query.all()
-    logs = Fertilog.query.order_by(Fertilog.primary_key.desc()).all()
-    targets = Fertitarget.query.all()
+    logs = FertiLog.query.order_by(FertiLog.primary_key.desc()).all()
+    targets = FertiTarget.query.all()
     module = "ferti"
     flash(f"Latest target is {targets}.", "info")
-    flash(f"Still fighting against styling in {module}.", "error")
     return render_template(
         f"modules/{module}.html",
         modules=modules,