Fix Sorting in List view

Inform user that entries are closed when big button on main page is pressed and disabled

backend/app.py

@@ -248,7 +248,6 @@ def admin():
 def activate_job():
     helpers.load_dbconfig(app)
     helpers.load_version(app)
-    helpers.create_data_directory()
     database.create_entry_table()
     database.create_song_table()
     database.create_done_song_table()

backend/database.py

@@ -75,7 +75,9 @@ def create_list_view():
         stmt = text("""CREATE OR REPLACE VIEW `Liste` AS
                  SELECT Name, Title, Artist, entries.Id AS entry_ID, songs.Id AS song_ID, entries.Transferred
                  FROM entries, songs
-                 WHERE entries.Song_Id=songs.Id""")
+                 WHERE entries.Song_Id=songs.Id
+                 ORDER BY entries.Id ASC
+                 """)
         conn.execute(stmt)
         conn.commit()
 

backend/helpers.py

@@ -8,15 +8,6 @@ from functools import wraps, update_wrapper
 from datetime import datetime
 import database
 
-data_directory = "data"
-config_file = data_directory+"/config.json"
-
-
-def create_data_directory():
-    if not os.path.exists(data_directory):
-        os.makedirs(data_directory)
-
-
 def get_catalog_url():
     r = requests.get('https://www.karafun.de/karaoke-song-list.html')
     soup = BeautifulSoup(r.content, 'html.parser')

backend/static/css/style.css

@@ -154,6 +154,10 @@ body {
     border-color: var(--table-border-color)
 }
 
+table td.buttoncell {
+    text-align: end;
+}
+
 .close {
     color: var(--text-color)
 }

backend/templates/main.html

@@ -29,6 +29,9 @@ $.getJSON("/api/entries/accept", (data) => {
         $("#bfb").addClass("disabled")
         $("#bfb").prop("aria-disabled",true);
         $("#bfb").prop("tabindex","-1");
+        $("#bfb").wrap("<span class='tooltip-span' tabindex='0' data-toggle='tooltip' data-placement='bottom'></span>");
+                $(".tooltip-span").prop("title", "Eintragungen sind leider momentan nicht möglich.")
+                $('[data-toggle="tooltip"]').tooltip()
     }
 })
 </script>

backend/templates/songlist.html

@@ -118,7 +118,7 @@
                 $(".enqueueButton").prop("disabled", true)
                 $(".enqueueButton").prop("style", "pointer-events: none;")
                 $(".enqueueButton").wrap("<span class='tooltip-span' tabindex='0' data-toggle='tooltip' data-placement='top'></span>");
-                $(".tooltip-span").prop("title", "Eintragungen sind leider nicht mehr möglich.")
+                $(".tooltip-span").prop("title", "Eintragungen sind leider momentan nicht möglich.")
                 $('[data-toggle="tooltip"]').tooltip()
             } else {
                 $(".enqueueButton").prop("disabled", false)

docker-compose.prod.yml

@@ -6,7 +6,7 @@ secrets:
 
 services:
   karaoqueue:
-    image: "ghcr.io/phoenixtwofive/karaoqueue:v2023.03"
+    image: "ghcr.io/phoenixtwofive/karaoqueue:v2023.03.2"
     build: .
     restart: always
     ports: