From 2e06a7b6993441750c451a1b89607c8213c19aed Mon Sep 17 00:00:00 2001
From: Thomas Rusiecki <rusieckithomas@gmail.com>
Date: Sat, 14 Dec 2024 16:02:17 -0300
Subject: [PATCH] minor changes to states view

---
 admin/templates/states_panel.html          |  2 +-
 device/templates/tabs/general_details.html | 43 +++++++++++++++++++++-
 device/templates/tabs/log.html             | 39 ++------------------
 3 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/admin/templates/states_panel.html b/admin/templates/states_panel.html
index edcb5e8..c7a4d36 100644
--- a/admin/templates/states_panel.html
+++ b/admin/templates/states_panel.html
@@ -132,7 +132,7 @@
 <!-- delete state definition Modal -->
 {% for state_definition in state_definitions %}
 <div class="modal fade" id="deleteStateModal{{ state_definition.id }}" tabindex="-1" aria-labelledby="deleteStateModalLabel{{ state_definition.id }}" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-centered">
+  <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title fw-bold" id="deleteStateModalLabel{{ state_definition.id }}">
diff --git a/device/templates/tabs/general_details.html b/device/templates/tabs/general_details.html
index 63f9129..a38da58 100644
--- a/device/templates/tabs/general_details.html
+++ b/device/templates/tabs/general_details.html
@@ -101,8 +101,15 @@
               </td>
               <td>{{ device_states.0.user.responsable_person|default:device_states.0.user.username }}
               </td>
-              <td>{{ device_states.0.date|date:"SHORT_DATETIME_FORMAT" }}
+              <td>{{ device_states.0.date|date:"M j, Y, H:i" }}
               </td>
+              {% if device_states.0.date|timesince < '1 hour' %}
+              <td>
+                 <a href="#" data-bs-toggle="modal" data-bs-target="#deleteStateModal{{ device_states.0.id }}" title="{% trans 'Undo' %}">
+                  <i class="bi bi-trash text-danger"></i>
+                </a>
+              </td>
+              {% endif %}
             </tr>
             {% else %}
             <tr>
@@ -126,3 +133,37 @@
         </div>
       </div>
     </div>
+
+ <div class="modal fade" id="deleteStateModal{{ device_states.0.id }}" tabindex="-1" aria-labelledby="deleteStateModalLabel{{ state_change.id }}" aria-hidden="true">
+   <div class="modal-dialog">
+     <div class="modal-content">
+       <div class="modal-header">
+         <h5 class="modal-title" id="deleteStateModalLabel{{ device_states.0.id }}">{% trans 'Confirm Delete' %}</h5>
+         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
+       </div>
+       <div class="modal-body">
+         <p>{% trans 'Are you sure you want to undo this state?' %}</p>
+
+         <!-- TODO: check if usage of humanize django module is useful for date formatting -->
+         <div class="d-flex align-items-center border rounded p-3 mt-3">
+           <span
+             class="badge bg-secondary me-3 display-9">
+             {{ device_states.0.date|date:"M j, Y, H:i" }}
+           </span>
+           <p
+             class="mb-0 fw-bold">
+             {{ device_states.0.state }}
+           </p>
+         </div>
+
+       </div>
+       <div class="modal-footer">
+         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans 'Cancel' %}</button>
+         <form method="post" action="{% url 'action:undo_action' device_states.0.id %}">
+           {% csrf_token %}
+           <button type="submit" class="btn btn-danger">{% trans 'Delete' %}</button>
+         </form>
+       </div>
+     </div>
+   </div>
+ </div>
diff --git a/device/templates/tabs/log.html b/device/templates/tabs/log.html
index 3c25e20..1fd0b1b 100644
--- a/device/templates/tabs/log.html
+++ b/device/templates/tabs/log.html
@@ -7,48 +7,17 @@
         <table class="table table-striped table-bordered">
           <thead class="table">
             <tr>
-              <th scope="col">{% trans 'Date' %}</th>
-              <th scope="col">{% trans 'User' %}</th>
               <th scope="col">{% trans 'State' %}</th>
-              <th scope="col">{% trans 'Actions' %}</th>
+              <th scope="col">{% trans 'User' %}</th>
+              <th scope="col">{% trans 'Date' %}</th>
             </tr>
           </thead>
           <tbody>
             {% for state_change in device_states %}
             <tr {% if forloop.first %}class="table-success"{% endif %}>
-              <td>{{ state_change.date|date:"SHORT_DATETIME_FORMAT" }}</td>
-              <td>{{ state_change.user.responsable_person|default:state_change.user.username }}</td>
               <td><strong>{{ state_change.state }}</strong></td>
-              <td>
-                {% if state_change.date|timesince < '1 hour' %}
-                <a href="#" data-bs-toggle="modal" data-bs-target="#deleteStateModal{{ state_change.id }}" title="{% trans 'Delete State' %}">
-                  <i class="bi bi-trash text-danger"></i>
-                </a>
-
-                <!-- Delete Confirmation Modal -->
-                <div class="modal fade" id="deleteStateModal{{ state_change.id }}" tabindex="-1" aria-labelledby="deleteStateModalLabel{{ state_change.id }}" aria-hidden="true">
-                  <div class="modal-dialog">
-                    <div class="modal-content">
-                      <div class="modal-header">
-                        <h5 class="modal-title" id="deleteStateModalLabel{{ state_change.id }}">{% trans 'Confirm Delete' %}</h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
-                      </div>
-                      <div class="modal-body">
-                        <p>{% trans 'Are you sure you want to undo this state?' %}</p>
-                        <p><strong>{{ state_change.state }}</strong> - {{ state_change.date|date:"SHORT_DATETIME_FORMAT" }}</p>
-                      </div>
-                      <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans 'Cancel' %}</button>
-                        <form method="post" action="{% url 'action:undo_action' state_change.id %}">
-                          {% csrf_token %}
-                          <button type="submit" class="btn btn-danger">{% trans 'Delete' %}</button>
-                        </form>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                {% endif %}
-              </td>
+              <td>{{ state_change.user.responsable_person|default:state_change.user.username }}</td>
+              <td>{{ state_change.date|date:"M j, Y, H:i" }}</td>
             </tr>
             {% empty %}
             <tr>