Sort Exs

aceberg · Dec 18, 2023 · 0afdd32 · 0afdd32
1 parent f326aa6
commit 0afdd32
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/internal/db/edit.go b/internal/db/edit.go
@@ -12,6 +12,7 @@ func Create(path string) {
 	sqlStatement := `CREATE TABLE IF NOT EXISTS exercises (
 		"ID"		INTEGER PRIMARY KEY,
 		"GR"		TEXT,
+		"PLACE"		TEXT,
 		"NAME"		TEXT,
 		"DESCR"		TEXT,
 		"IMAGE"		TEXT,
@@ -35,14 +36,14 @@ func Create(path string) {
 // InsertEx - insert one exercise into DB
 func InsertEx(path string, ex models.Exercise) {
 
-	sqlStatement := `INSERT INTO exercises (GR, NAME, DESCR, IMAGE, COLOR, WEIGHT, REPS) 
-	VALUES ('%s','%s','%s','%s','%s','%d','%d');`
+	sqlStatement := `INSERT INTO exercises (GR, PLACE, NAME, DESCR, IMAGE, COLOR, WEIGHT, REPS) 
+	VALUES ('%s','%s','%s','%s','%s','%s','%d','%d');`
 
 	ex.Group = quoteStr(ex.Group)
 	ex.Name = quoteStr(ex.Name)
 	ex.Descr = quoteStr(ex.Descr)
 
-	sqlStatement = fmt.Sprintf(sqlStatement, ex.Group, ex.Name, ex.Descr, ex.Image, ex.Color, ex.Weight, ex.Reps)
+	sqlStatement = fmt.Sprintf(sqlStatement, ex.Group, ex.Place, ex.Name, ex.Descr, ex.Image, ex.Color, ex.Weight, ex.Reps)
 
 	exec(path, sqlStatement)
 }

diff --git a/internal/models/models.go b/internal/models/models.go
@@ -17,6 +17,7 @@ type Conf struct {
 type Exercise struct {
 	ID     int    `db:"ID"`
 	Group  string `db:"GR"`
+	Place  string `db:"PLACE"`
 	Name   string `db:"NAME"`
 	Descr  string `db:"DESCR"`
 	Image  string `db:"IMAGE"`

diff --git a/internal/web/exercise.go b/internal/web/exercise.go
@@ -43,6 +43,7 @@ func saveExerciseHandler(c *gin.Context) {
 	var oneEx models.Exercise
 
 	oneEx.Group = c.PostForm("group")
+	oneEx.Place = c.PostForm("place")
 	oneEx.Name = c.PostForm("name")
 	oneEx.Descr = c.PostForm("descr")
 

diff --git a/internal/web/index.go b/internal/web/index.go
@@ -3,6 +3,7 @@ package web
 import (
 	"fmt"
 	"net/http"
+	"sort"
 
 	"github.com/gin-gonic/gin"
 
@@ -20,14 +21,18 @@ func indexHandler(c *gin.Context) {
 	guiData.ExData = exData
 	guiData.GroupMap = createGroupMap()
 
+	// Sort exercises by Place
+	sort.Slice(guiData.ExData.Exs, func(i, j int) bool {
+		return guiData.ExData.Exs[i].Place < guiData.ExData.Exs[j].Place
+	})
+
 	c.HTML(http.StatusOK, "header.html", guiData)
 	c.HTML(http.StatusOK, "index.html", guiData)
 }
 
 func createGroupMap() map[string]string {
-
-	grMap := make(map[string]string)
 	i := 0
+	grMap := make(map[string]string)
 
 	for _, ex := range exData.Exs {
 
@@ -37,6 +42,5 @@ func createGroupMap() map[string]string {
 			i = i + 1
 		}
 	}
-
 	return grMap
 }
diff --git a/internal/web/public/favicon.png b/internal/web/public/favicon.png
diff --git a/internal/web/templates/exercise.html b/internal/web/templates/exercise.html
@@ -14,6 +14,10 @@
                     <td>Group</td>
                     <td><input name="group" type="text" class="form-control" value="{{ .OneEx.Group }}"></td>
                 </tr>
+                <tr>
+                    <td>Place in group</td>
+                    <td><input name="place" type="number" class="form-control" value="{{ .OneEx.Place }}"></td>
+                </tr>
                 <tr>
                     <td>Name</td>
                     <td><input name="name" type="text" class="form-control" value="{{ .OneEx.Name }}"></td>

diff --git a/internal/web/templates/header.html b/internal/web/templates/header.html
@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!--Favicon-->
-    <link rel="icon" type="image/x-icon" href="/fs/public/favicon.ico">
+    <link rel="icon" type="image/x-icon" href="/fs/public/favicon.png">
     <!-- <link href="data:image/x-icon;base64, {{ .Config.Icon }}" rel="icon" type="image/x-icon" /> -->
     <!-- Font for icons -->
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">