From fc6b3a7fa0c96b16212edbac371250874fb8bca7 Mon Sep 17 00:00:00 2001
From: Eden Kirin <eden.kirin@intis.hr>
Date: Thu, 16 May 2024 07:55:27 +0200
Subject: [PATCH] Validation

---
 .../main/components/inline_table_row.html     | 18 +++++++++++++----
 .../main/table_inline_table_row.html          |  2 +-
 project/main/views/table_inline_edit.py       | 20 +++++++++++++++----
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/project/main/templates/main/components/inline_table_row.html b/project/main/templates/main/components/inline_table_row.html
index b5e6733..0c11523 100644
--- a/project/main/templates/main/components/inline_table_row.html
+++ b/project/main/templates/main/components/inline_table_row.html
@@ -1,14 +1,24 @@
-{% macro inline_table_row(person, is_editing) %}
+{% macro inline_table_row(person, is_editing, errors={}) %}
+    {% macro render_input(field_name, value) %}
+        {% set has_error = field_name in errors %}
+        <input
+            class="form-control {% if has_error %}is-invalid{% endif %}"
+            name="{{ field_name }}"
+            value="{{ value }}"
+            {% if has_error %}title="{{ errors[field_name] }}"{% endif %}
+        >
+    {% endmacro %}
+
     {% if is_editing %}
         <tr id="person-row-{{ person.pk }}" hx-target="this" hx-swap="outerHTML">
             <td>
-                <input class="form-control" name="name" value="{{ person.name }}">
+                {{ render_input(field_name="name", value=person.name) }}
             </td>
             <td>
-                <input class="form-control" name="address" value="{{ person.address }}">
+                {{ render_input(field_name="address", value=person.address) }}
             </td>
             <td>
-                <input class="form-control" name="city" value="{{ person.city }}">
+                {{ render_input(field_name="city", value=person.city) }}
             </td>
             <td>
                 <button
diff --git a/project/main/templates/main/table_inline_table_row.html b/project/main/templates/main/table_inline_table_row.html
index 9264292..42b8039 100644
--- a/project/main/templates/main/table_inline_table_row.html
+++ b/project/main/templates/main/table_inline_table_row.html
@@ -1,3 +1,3 @@
 {% from "main/components/inline_table_row.html" import inline_table_row %}
 
-{{ inline_table_row(person, is_editing=is_editing) }}
+{{ inline_table_row(person, is_editing=is_editing, errors=errors) }}
diff --git a/project/main/views/table_inline_edit.py b/project/main/views/table_inline_edit.py
index a8e7e58..c40e424 100644
--- a/project/main/views/table_inline_edit.py
+++ b/project/main/views/table_inline_edit.py
@@ -1,7 +1,8 @@
-from typing import Any
+from typing import Any, Optional
 
+from django.core.exceptions import ValidationError
 from django.core.handlers.wsgi import WSGIRequest
-from django.http import Http404, HttpRequest, HttpResponse
+from django.http import Http404, HttpResponse
 from django.shortcuts import render
 
 from project.main.models import Person
@@ -51,16 +52,27 @@ class TableInlineEditRowView(DemoViewBase):
         return context_data
 
     def post(self, request: WSGIRequest, *args, **kwargs) -> HttpResponse:
+        errors: Optional[dict[str, str]] = None
+
         person = get_person(pk=kwargs.get("pk"))
         person.name = request.POST.get("name")
         person.address = request.POST.get("address")
         person.city = request.POST.get("city")
-        person.save()
+
+        try:
+            person.clean_fields()
+        except ValidationError as ex:
+            errors = {key: value[0].message for key, value in ex.error_dict.items()}
+        else:
+            person.save()
+
+        print(errors)
 
         return render(
             context={
                 "person": person,
-                "is_editing": False,
+                "errors": errors,
+                "is_editing": errors is not None,
             },
             template_name=self.template_name,
             request=request,