Queue Item Order Update - WIP

Author: PinkSylvie

app.py

@@ -262,7 +262,14 @@ def get_queue_paginated():
 
     except Exception as e:
         return jsonify({'error': str(e)}), 500
-    
+
+@app.route("/queue_item/<int:queue_id>/order", methods=['PUT'])
+@jwt_required()
+def update_item_order(queue_id):
+    data = request.get_json()
+    new_order = data.get('new_order')
+    handler = QueueItem(email=get_jwt_identity())
+    return handler.update_item_order(queue_id=queue_id, new_order=new_order)
 
 @app.route("/queue_item", methods=['GET', 'POST'])
 def handleQueueItem():

controller/queue_item.py

@@ -74,6 +74,21 @@ def updateQueueItemById(self, queue_id, data):
                 result = self.make_json_one(queue_item)
                 return result
 
+        def update_item_order(self, queue_id, new_order):
+
+            if queue_id is None:
+                return jsonify(error="No id provided."), 400
+
+            if self.user.is_admin():
+                queue_dao = QueueItemDAO()
+                response = queue_dao.update_item_order(queue_id, new_order)
+                if response == 0:
+                    return jsonify("Approval updated"), 200
+                else:
+                    return jsonify(error="Couldn't update approval"), 500
+            else:
+                return jsonify(error="Unauthorized."), 403
+
         def deleteQueueItemById(self, queue_id):
             dao = QueueItemDAO()
             queue_item = dao.deleteQueueItemById(queue_id)

model/queue_item.py

@@ -79,7 +79,29 @@ def updateQueueItemById(self, queue_id, data):
         cursor.execute(query, (queue_id,))
         result = cursor.fetchone()
         cursor.close()
-        return result
+        return
+
+    def update_item_order(self, queue_id: int, new_order: int):
+        status = 1
+        query = None
+        cursor = self.conn.cursor()
+        old_order = self.getQueueItemById(queue_id)["display_order"]
+        if new_order < old_order:
+            query = "UPDATE queue_item SET display_order = display_order + 1 WHERE display_order >= ? AND display_order < ?"
+        elif new_order > old_order:
+            query = "UPDATE queue_item SET display_order = display_order - 1 WHERE display_order <= ? AND display_order > ?"
+        try:
+            if query:
+                cursor.execute(query, (new_order, old_order))
+            shift = "UPDATE queue_item SET display_order = ? WHERE queue_id = ?"
+            cursor.execute(shift,(new_order, queue_id))
+            self.conn.commit()
+            status = 0
+        except sqlite3.Error:
+            status = 1
+        finally:
+            cursor.close()
+            return status
 
     def deleteQueueItemById(self, queue_id):
 
@@ -96,6 +118,16 @@ def deleteQueueItemById(self, queue_id):
             status = 0
             try:
                 cursor.execute(query, (queue_id,))
+
+                query = "SELECT queue_id FROM queue_item ORDER BY display_order ASC"
+
+                cursor.execute(query)
+                items = cursor.fetchall()
+
+                for index, item in enumerate(items):
+                    query = "UPDATE queue_item SET display_order = ? WHERE queue_id = ?"
+                    cursor.execute(query, (index + 1, item[0]))
+
                 self.conn.commit()
             except sqlite3.Error:
                 status = 1

utilities/create.py

@@ -1,6 +1,6 @@
 import sqlite3
 
-con = sqlite3.connect('data.db')
+con = sqlite3.connect('../data.db')
 cur = con.cursor()
 
 cur.execute("""

view/src/auth/AuthProvider.jsx

@@ -202,6 +202,19 @@ export const AuthProvider = ({ children }) => {
       };
     }
   };
+  // Update order of queue item
+  const updateorder = async (queueId, newOrder)  => {
+    try {
+      await axios.put(`/queue_item/${queueId}/order`, { new_order: newOrder });
+      return { success: true };
+    } catch (error) {
+      console.error('Order update error:', error);
+      return {
+        success: false,
+        error: error.response?.data?.error || 'Failed to update admin status'
+      };
+    }
+  };
 
   const deletequeueitem = async (queueId) => {
     try {
@@ -236,6 +249,7 @@ export const AuthProvider = ({ children }) => {
     toggleadmin,
     getpageimages,
     toggleapproval,
+    updateorder,
     deletequeueitem,
     logout,
     hasRole, 

view/src/pages/QueueAdminPage.jsx

@@ -12,7 +12,8 @@ function QueueAdminPage() {
   const [items, setItems] = useState([]);
   const [page, setPage] = useState(1);
   const [pages, setPages] = useState(1);
-  const { getpageimages, deletequeueitem, toggleapproval } = useAuth();
+  const [total, setTotal] = useState(0);
+  const { getpageimages, deletequeueitem, toggleapproval, updateorder } = useAuth();
 
   const [modalState, setModalState] = useState({
     isOpen: false,
@@ -54,6 +55,7 @@ function QueueAdminPage() {
       setItems(transformed);
       setPage(data.page);
       setPages(data.pages);
+      setTotal(data.total)
     } catch (err) {
       console.error("Failed to load queue images:", err);
     }
@@ -72,6 +74,15 @@ function QueueAdminPage() {
     }
   };
 
+  const handleOrderUpdate = async (queueId, newOrder) => {
+    try {
+      await updateorder(queueId, newOrder);
+      fetchImages(page);
+    } catch (err) {
+      console.error("Order update failed:", err);
+    }
+  };
+
   const handleToggleApproval = async (designId, isApproved) => {
     try {
       await toggleapproval(designId, !isApproved);
@@ -122,7 +133,22 @@ function QueueAdminPage() {
                       <strong>Scheduled at:</strong> { formatDateTime(item?.start_time) || 'Unscheduled'}
                     </div>
                     <div className="text-base">
-                      <strong>Order:</strong> {item.display_order}
+                      <strong>Order:</strong> {" "}
+                      <select
+                        value={item.display_order}
+                        onChange={(e) =>
+                          showConfirm(
+                            `Move item to position ${e.target.value}?`,
+                            () => handleOrderUpdate(item.queue_id, Number(e.target.value))
+                          )
+                        }
+                      >
+                        {Array.from({ length: total }).map((_, idx) => (
+                          <option key={idx + 1} value={idx + 1}>
+                            {idx + 1}
+                          </option>
+                        ))}
+                      </select>
                     </div>
                   </div>
                   <div className="user-buttons">