From 0858961410e3e97a353d1bbdbf0bf2b28d7e1b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=BE=D1=88=D0=BA=D0=B8=D0=BD=20=D0=A1=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= <ckoshkin@yandex.ru>
Date: Mon, 10 Nov 2025 16:15:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BA=D1=83=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=BA=D1=83=D0=B1=D1=81=D0=B0=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/mainapp/objitem_form.html       | 14 ++++-----
 .../templates/mainapp/objitem_list.html       | 29 ++++++++++++-------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/dbapp/mainapp/templates/mainapp/objitem_form.html b/dbapp/mainapp/templates/mainapp/objitem_form.html
index 88905a5..f059be6 100644
--- a/dbapp/mainapp/templates/mainapp/objitem_form.html
+++ b/dbapp/mainapp/templates/mainapp/objitem_form.html
@@ -62,6 +62,12 @@
         <div class="col-12 d-flex justify-content-between align-items-center">
             <h2>{% if object %}Редактировать объект: {{ object.name }}{% else %}Создать объект{% endif %}</h2>
             <div>
+                {% if user.customuser.role == 'admin' or user.customuser.role == 'moderator' %}
+                <button type="submit" class="btn btn-primary btn-action">Сохранить</button>
+                {% if object %}
+                <a href="{% url 'mainapp:objitem_delete' object.id %}{% if request.GET.urlencode %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-action">Удалить</a>
+                {% endif %}
+                {% endif %}
                 <a href="{% url 'mainapp:objitem_list' %}{% if request.GET.urlencode %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-secondary btn-action">Назад</a>
             </div>
         </div>
@@ -329,14 +335,6 @@
             </div>
             {% endif %}
         </div>
-        {% if user.customuser.role == 'admin' or user.customuser.role == 'moderator' %}
-        <div class="d-flex justify-content-end mt-4">
-            <button type="submit" class="btn btn-primary btn-action">Сохранить</button>
-            {% if object %}
-            <a href="{% url 'mainapp:objitem_delete' object.id %}{% if request.GET.urlencode %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-action">Удалить</a>
-            {% endif %}
-        </div>
-        {% endif %}
     </form>
 </div>
 {% endblock %}
diff --git a/dbapp/mainapp/templates/mainapp/objitem_list.html b/dbapp/mainapp/templates/mainapp/objitem_list.html
index e52e3fd..132fb17 100644
--- a/dbapp/mainapp/templates/mainapp/objitem_list.html
+++ b/dbapp/mainapp/templates/mainapp/objitem_list.html
@@ -976,7 +976,7 @@
         }
 
         // Function to save selected items to localStorage
-        function saveSelectedItemsToStorage() {
+        window.saveSelectedItemsToStorage = function() {
             try {
                 localStorage.setItem('selectedItems', JSON.stringify(window.selectedItems));
             } catch (e) {
@@ -984,9 +984,6 @@
             }
         }
 
-        // Load selected items from localStorage on page load
-        loadSelectedItemsFromStorage();
-
         // Function to update the selected items counter
         window.updateSelectedCounter = function() {
             const counterElement = document.getElementById('selectedCounter');
@@ -1004,6 +1001,12 @@
             }
         }
 
+        // Load selected items from localStorage on page load
+        loadSelectedItemsFromStorage();
+
+        // Update counters after loading items from localStorage
+        updateSelectedCounter();
+
         // Function to add selected items to the list
         window.addSelectedToList = function() {
             const checkedCheckboxes = document.querySelectorAll('.item-checkbox:checked');
@@ -1037,10 +1040,10 @@
                         geo_coords: row.cells[11].textContent,
                         kupsat_coords: row.cells[12].textContent,
                         valid_coords: row.cells[13].textContent,
-                        updated_at: row.cells[14].textContent,
-                        updated_by: row.cells[15].textContent,
-                        created_at: row.cells[16].textContent,
-                        created_by: row.cells[17].textContent
+                        updated_at: row.cells[17].textContent,
+                        updated_by: row.cells[18].textContent,
+                        created_at: row.cells[19].textContent,
+                        created_by: row.cells[20].textContent
                     };
                     
                     window.selectedItems.push(rowData);
@@ -1052,6 +1055,9 @@
                 updateSelectedCounter();
             }
 
+            // Save selected items to localStorage
+            saveSelectedItemsToStorage();
+
             // Clear selections in the main table
             const itemCheckboxes = document.querySelectorAll('.item-checkbox');
             itemCheckboxes.forEach(checkbox => {
@@ -1061,9 +1067,7 @@
             if (selectAllCheckbox) {
                 selectAllCheckbox.checked = false;
             }
-
-            // Show success message
-            alert(`Добавлено ${checkedCheckboxes.length} элемент(ов) в список. Всего: ${window.selectedItems.length} элемент(ов).`);
+            //alert(`Добавлено ${checkedCheckboxes.length} элемент(ов) в список. Всего: ${window.selectedItems.length} элемент(ов).`);
         }
 
         setTimeout(initColumnVisibility, 100);
@@ -1120,6 +1124,9 @@
         // Remove items from the selectedItems array
         window.selectedItems = window.selectedItems.filter(item => !idsToRemove.includes(item.id));
         
+        // Save selected items to localStorage
+        saveSelectedItemsToStorage();
+
         // Update the counter and table
         if (typeof updateSelectedCounter === 'function') {
             updateSelectedCounter();