From f83a2ae152d60c56724b7842110f71908852b932 Mon Sep 17 00:00:00 2001
From: winet <tolya.bogomolov2019@gmail.com>
Date: Sat, 3 Feb 2024 14:51:01 +0000
Subject: [PATCH] Changed date and time representation for tasks

---
 .../api/tasks/templates/tasks_cards.j2        | 56 ++++++++++---------
 app/models/task.py                            |  2 +-
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/app/blueprints/api/tasks/templates/tasks_cards.j2 b/app/blueprints/api/tasks/templates/tasks_cards.j2
index 9f3442d..3cd02b5 100644
--- a/app/blueprints/api/tasks/templates/tasks_cards.j2
+++ b/app/blueprints/api/tasks/templates/tasks_cards.j2
@@ -3,34 +3,33 @@
         <div class="card">
             <div class="card-body">
                 <h3 class="card-title">{{ task.name }}</h3>
-                <ul class="list-group list-group-flush">
-                    <li class="list-group-item">Дата и время: {{ task.datetime }}</li>
-                    <li class="list-group-item">Статус: {{ task.status }}</li>
-                    <li class="list-group-item">Сообщение: {{ task.status_message }}</li>
-                    <li class="list-group-item">Действие: {{ task.type }}</li>
-                    
-                    <li class="list-group-item">
-                        <label class="form-label">Сессия:</label>
-                        <select
-                            name="session"
-                            hx-put="/api/tasks/{{task.id}}/change"
-                            hx-trigger="change"
-                            hx-confirm="Вы уверены, что хотите поменять сессию?"
-                            hx-swap="none"
-                            class="form-select form-select-lg mb-3"
-                        >
-                            {% for session in sessions %}
-                                {% if task.session.name == session.name %}
-                                    <option selected value="{{ session.id }}">{{ session.name }}</option>
-                                {% else %}
-                                    <option value="{{ session.id }}">{{ session.name }}</option>
-                                {% endif %}
-                            {% endfor %}
-                        </select>
-                    </li>
-                </ul>
             </div>
-            <div class="card-footer">
+            <ul class="list-group list-group-flush">
+                <li class="list-group-item">Статус: {{ task.status }}</li>
+                <li class="list-group-item">Сообщение: {{ task.status_message }}</li>
+                <li class="list-group-item">Действие: {{ task.type }}</li>
+                
+                <li class="list-group-item">
+                    <label class="form-label">Сессия:</label>
+                    <select
+                        name="session"
+                        hx-put="/api/tasks/{{task.id}}/change"
+                        hx-trigger="change"
+                        hx-confirm="Вы уверены, что хотите поменять сессию?"
+                        hx-swap="none"
+                        class="form-select form-select-lg mb-3"
+                    >
+                        {% for session in sessions %}
+                            {% if task.session.name == session.name %}
+                                <option selected value="{{ session.id }}">{{ session.name }}</option>
+                            {% else %}
+                                <option value="{{ session.id }}">{{ session.name }}</option>
+                            {% endif %}
+                        {% endfor %}
+                    </select>
+                </li>
+            </ul>
+            <div class="card-body">
                 <div class="btn-group mx-2" role="group">
                     <button
                         hx-delete="/api/tasks/{{task.id}}"
@@ -49,6 +48,9 @@
                     </button>
                 </div>
             </div>
+            <div class="card-footer">
+                <small class="text-body-secondary">Создано {{ task.datetime.strftime("%d.%m.%y") }} в {{ task.datetime.strftime("%H:%M") }}</small>
+            </div>
         </div>
     </div>
 {% else %}
diff --git a/app/models/task.py b/app/models/task.py
index ca4c755..71756d0 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -13,7 +13,7 @@ class Task(db.Model):
 
     session_id = Column(Integer, ForeignKey("session.id"))
     session: Mapped['Session'] = relationship("Session", back_populates="tasks")
-    datetime: Mapped[DateTime] = Column(DateTime, default=datetime.datetime.utcnow().strftime("%d.%m.%y %H:%M"))
+    datetime: Mapped[DateTime] = Column(DateTime, default=datetime.datetime.utcnow())
     status: Mapped[str]
     status_message: Mapped[str]
     type: Mapped[str]