Now item order changes, added UI and fixed scheduling

Author: PinkSylvie

controller/queue_item.py

@@ -78,16 +78,18 @@ 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
+            if self.email is not None:
+                if self.user.is_admin():
+                    queue_dao = QueueItemDAO()
+                    response = queue_dao.update_item_order(queue_id, new_order)
+                    if response == 0:
+                        return jsonify("Order updated"), 200
+                    else:
+                        return jsonify(error="Couldn't update Order"), 500
                 else:
-                    return jsonify(error="Couldn't update approval"), 500
-            else:
-                return jsonify(error="Unauthorized."), 403
+                    return jsonify(error="Unauthorized."),
+
+            return jsonify(error="Unauthorized. No token."), 401
 
         def deleteQueueItemById(self, queue_id):
             dao = QueueItemDAO()

model/queue_item.py

@@ -85,7 +85,7 @@ 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"]
+        old_order = self.getQueueItemById(queue_id)[5]
         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:
@@ -154,10 +154,10 @@ def getScheduledDesigns(self):
                    d.updated_at
             FROM queue_item q
             JOIN design d ON q.design_id = d.design_id
-            WHERE d.is_approved = 1
-            ORDER BY 
-                CASE WHEN q.scheduled = 1 THEN q.start_time ELSE '9999-12-31 23:59:59' END ASC,
-                q.display_order ASC;
+            WHERE d.is_approved = 1 AND q.scheduled = 1 
+            AND strftime('%Y-%m-%d %H:%M:%S', q.start_time) <= strftime('%Y-%m-%d %H:%M:%S', 'now')
+            AND strftime('%Y-%m-%d %H:%M:%S', q.end_time)   >= strftime('%Y-%m-%d %H:%M:%S', 'now')
+            ORDER BY q.display_order ASC;
         """
         try:
             cursor.execute(query)
@@ -185,9 +185,7 @@ def get_all_items_paginated(self, page, page_size):
                    d.is_approved
             FROM queue_item q
             JOIN design d ON q.design_id = d.design_id
-            ORDER BY 
-                CASE WHEN q.scheduled = 1 THEN q.start_time ELSE '9999-12-31 23:59:59' END ASC,
-                q.display_order ASC
+            ORDER BY q.display_order ASC
             LIMIT ? OFFSET ?;
             """
             cursor.execute(query, (page_size, offset))

view/src/pages/QueueAdminPage.jsx

@@ -135,13 +135,15 @@ function QueueAdminPage() {
                     <div className="text-base">
                       <strong>Order:</strong> {" "}
                       <select
+                        className="order-select"
                         value={item.display_order}
-                        onChange={(e) =>
+                          onChange={(e) => {
+                          const newPos = Number(e.target.value);
                           showConfirm(
-                            `Move item to position ${e.target.value}?`,
-                            () => handleOrderUpdate(item.queue_id, Number(e.target.value))
-                          )
-                        }
+                            `Move item to position ${newPos}?`,
+                            () => handleOrderUpdate(item.queue_id, newPos)
+                          );
+                        }}
                       >
                         {Array.from({ length: total }).map((_, idx) => (
                           <option key={idx + 1} value={idx + 1}>

view/src/pages/UploadPage.jsx

@@ -208,8 +208,9 @@ function UploadPage() {
             // Otherwise, compute the next available slot.
             const now = new Date();
             const nextAvailableStart = new Date(now.getTime() + 60 * 1000); // 1 minute from now
-            const defaultDurationSeconds = 60; // default duration (60 seconds)
-            const nextAvailableEnd = new Date(nextAvailableStart.getTime() + defaultDurationSeconds * 1000);
+            // const defaultDurationSeconds = 60; // default duration (60 seconds)
+            const oneDayMs        = 24 * 60 * 60 * 1000; // If not given a schedule items will stay one day in the active queue
+            const nextAvailableEnd = new Date(nextAvailableStart.getTime() + oneDayMs);
             finalStart = nextAvailableStart.toISOString().substring(0, 19);
             finalEnd = nextAvailableEnd.toISOString().substring(0, 19);
         }
@@ -231,7 +232,7 @@ function UploadPage() {
                 showAlert("Image successfully added to queue.");
             }
         } catch (error) {
-            showAlert("Error adding image to queue.");
+            showAlert("Error adding image to queue.", error);
         }
     };
 

view/src/pages/styles/QueueAdmin.css

@@ -1,3 +1,26 @@
+
+.order-select {
+  appearance: none;
+  -webkit-appearance: none;
+  padding-right: 2rem;
+  padding-left: .5rem;
+  min-height: 28px;
+  border: 1px solid black;
+  border-radius: 6px;
+  background-color: #fff;
+
+  background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 8 5' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M0 0l4 5 4-5z' fill='%23000000'/%3E%3C/svg%3E");
+  background-repeat: no-repeat;
+  background-position: right .5rem center;
+  background-size: 8px 5px;
+}
+
+.order-select:focus {
+  outline: none;
+  border-color: #2563eb;
+  box-shadow: 0 0 0 2px rgba(37,99,235,.3);
+}
+
 .approval-label {
   font-family: "Pixelify Sans", sans-serif;
   border-radius: 24px;