fix 2

admin.go

@@ -38,7 +38,6 @@ func adminLoginHandler(w http.ResponseWriter, r *http.Request) {
 				Value:    base64.StdEncoding.EncodeToString([]byte(username + ":" + hashPassword(password))),
 				Path:     "/admin/",
 				HttpOnly: true,
-				MaxAge:   3600,
 			})
 			http.Redirect(w, r, "/admin/", http.StatusSeeOther)
 		}
@@ -309,7 +308,7 @@ func AdminRouteHandler(w http.ResponseWriter, r *http.Request) {
 	var routes []AdminRouteTemplateS
 	for _, level := range difficultyLevels {
 		var route AdminRouteTemplateS
-		rows, err := db.Query("SELECT tasks.id, tasks.order_num, CIPHERS.assignment, CIPHERS.clue, tasks.end_clue, POSITIONS.gps, POSITIONS.clue, CIPHERS.solution FROM TASKS JOIN CIPHERS ON TASKS.cipher_id = ciphers.id JOIN POSITIONS on TASKS.position_id = POSITIONS.id WHERE TASKS.difficulty_level=? ORDER BY TASKS.order_num;", level.ID)
+		rows, err := db.Query("SELECT tasks.id, tasks.order_num, CIPHERS.assignment, CIPHERS.clue, tasks.end_clue, POSITIONS.gps, POSITIONS.clue, CIPHERS.solution, COALESCE(QR_CODES.uid, '') FROM TASKS JOIN CIPHERS ON TASKS.cipher_id = ciphers.id JOIN POSITIONS on TASKS.position_id = POSITIONS.id LEFT JOIN QR_CODES ON QR_CODES.position_id = POSITIONS.id WHERE TASKS.difficulty_level=? ORDER BY TASKS.order_num;", level.ID)
 		if err != nil {
 			http.Error(w, "Database error", http.StatusInternalServerError)
 			return
@@ -318,10 +317,11 @@ func AdminRouteHandler(w http.ResponseWriter, r *http.Request) {
 		route.Name = level.LevelName
 		for rows.Next() {
 			var cipher CipherTemplateS
-			if err := rows.Scan(&cipher.ID, &cipher.Order, &cipher.Assignment, &cipher.HelpText, &cipher.FinalClue, &cipher.Coordinates, &cipher.PositionHint, &cipher.Solution); err != nil {
+			if err := rows.Scan(&cipher.ID, &cipher.Order, &cipher.Assignment, &cipher.HelpText, &cipher.FinalClue, &cipher.Coordinates, &cipher.PositionHint, &cipher.Solution, &cipher.URL); err != nil {
 				http.Error(w, "Database error", http.StatusInternalServerError)
 				return
 			}
+			cipher.URL = domain + "/qr/" + cipher.URL
 			route.Ciphers = append(route.Ciphers, cipher)
 		}
 		if err := rows.Err(); err != nil {

klice.go

@@ -211,7 +211,7 @@ func qrHandler(w http.ResponseWriter, r *http.Request) {
 		}
 
 		CipherTemplateData := CipherTemplateS{
-			Order:       uint(cipherID),
+			Order:       uint(order),
 			Assignment:  template.HTML(assignment),
 			HelpText:    "",
 			FinalClue:   "",

templates.go

@@ -15,6 +15,7 @@ type CipherTemplateS struct {
 	Solution     string
 	Help         int
 	Wrong        bool
+	URL          string
 }
 
 type TeamTemplateS struct {

templates/adminQR.html

@@ -17,7 +17,7 @@
         </tr>
         {{range .QRs}}
         <tr>
-            <td>{{.URL}}</td>
+            <td><a href="{{.URL}}">{{.URL}}</a></td>
             <td>{{.Position}}</td>
             <td>{{.GPS}}</td>
             <td>

templates/adminRoutes.html

@@ -12,6 +12,7 @@
     <h2>{{.Name}}</h2>
     <table border="1">
         <tr>
+            <th>ID</th>
             <th>Pořadí</th>
             <th>Souřadnice</th>
             <th>Nápověda pozice</th>
@@ -19,10 +20,12 @@
             <th>Nápověda</th>
             <th>Řešení</th>
             <th>Cílová indicie</th>
+            <th>URL</th>
             <th>Smazat</th>
         </tr>
         {{range .Ciphers}}
         <tr>
+            <td>{{.ID}}</td>
             <td>{{.Order}}</td>
             <td>{{.Coordinates}}</td>
             <td>{{.PositionHint}}</td>
@@ -30,6 +33,7 @@
             <td>{{.HelpText}}</td>
             <td>{{.Solution}}</td>
             <td>{{.FinalClue}}</td>
+            <td><a href="{{.URL}}">{{.URL}}</a></td>
             <td>
                 <form action="/admin/routes" method="post">
                     <input type="hidden" name="delete" value="{{.ID}}">