Merge pull request #2 from chrischdi/goal-configuration

enable configuring multiple goals

Author: chrischdi

pkg/config/config.go

@@ -35,3 +35,14 @@ func UpdateTime(starth, startm, duration, pause int) {
 	ConfigData.GameDuration = time.Duration(duration) * time.Minute
 	ConfigData.KOPause = time.Duration(pause) * time.Minute
 }
+
+func UpdatePlaces(nr int) {
+	fmt.Printf("updating places to %d\n", nr)
+	places := []*string{}
+	for i := 1; i <= nr; i++ {
+		s := fmt.Sprintf("Tor %d", i)
+		fmt.Printf("adding places %s\n", s)
+		places = append(places, &s)
+	}
+	ConfigData.Places = places
+}

pkg/frontend/handlers.go

@@ -17,6 +17,7 @@ import (
 	"github.com/chrischdi/gotournament/pkg/matchday"
 	"github.com/chrischdi/gotournament/pkg/schedule"
 	"github.com/chrischdi/gotournament/pkg/team"
+	"github.com/chrischdi/gotournament/tpl"
 )
 
 func registerHandlers() {
@@ -62,7 +63,7 @@ func setup(w http.ResponseWriter, r *http.Request) {
 
 	fmt.Fprintf(w, "<h2>Time</h2>\n")
 	t = template.New("timeSetup")
-	t, err = template.ParseFiles(filepath.Join("tpl", "timeSetup.tmpl"))
+	t, err = template.ParseFS(tpl.Content, "timeSetup.tmpl")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "error: %v\n", err)
 	}
@@ -71,13 +72,14 @@ func setup(w http.ResponseWriter, r *http.Request) {
 			"Start":    fmt.Sprintf("%02d:%02d", config.ConfigData.Start.Hour(), config.ConfigData.Start.Minute()),
 			"Duration": config.ConfigData.GameDuration.Minutes(),
 			"Pause":    config.ConfigData.KOPause.Minutes(),
+			"NrPlaces": len(config.ConfigData.Places),
 		})
 
 	writeTemplate(w, "modifyGroups.tmpl", data.GetData())
 
 	fmt.Fprintf(w, "<h2>Add Groups</h2>\n")
 	t = template.New("addGroup")
-	t, err = template.ParseFiles(filepath.Join("tpl", "addGroup.tmpl"))
+	t, err = template.ParseFS(tpl.Content, "addGroup.tmpl")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "error: %v\n", err)
 	}
@@ -253,7 +255,13 @@ func setupUpdate(w http.ResponseWriter, r *http.Request) error {
 		data.SaveFile()
 		// Tournament().UpdateTime(starth, startm, duration, pause)
 		// Tournament().UpdateKOTime()
-
+	case "places":
+		nrPlaces, err := strconv.Atoi(r.FormValue("nrplaces"))
+		if err != nil {
+			return fmt.Errorf("error updating time: %v", err)
+		}
+		config.UpdatePlaces(nrPlaces)
+		schedule.CalculateGroupSchedule()
 	case "group":
 		for _, v := range strings.Split(r.FormValue("uuids"), ",") {
 			err := team.UpdateTeamName(v, r.FormValue(v))

pkg/frontend/template.go

@@ -3,11 +3,10 @@ package frontend
 import (
 	"fmt"
 	"net/http"
-	"os"
-	"path/filepath"
 	"text/template"
 
 	"github.com/chrischdi/gotournament/pkg/matchday"
+	"github.com/chrischdi/gotournament/tpl"
 
 	"github.com/chrischdi/gotournament/pkg/config"
 	"github.com/chrischdi/gotournament/pkg/game"
@@ -50,20 +49,11 @@ func allGroupGamesDone() bool {
 	return true
 }
 
-func writeTemplate(w http.ResponseWriter, tpl string, vars interface{}) error {
-	s, err := os.Executable()
-	if err != nil {
-		fmt.Printf("error: %v", err)
-		return err
-	}
-	dir, _ := filepath.Split(s)
-
-	path := filepath.Join(dir, "tpl", tpl)
-
-	t, err := template.New(tpl).Funcs(funcMap).ParseFiles(path)
+func writeTemplate(w http.ResponseWriter, tplName string, vars interface{}) error {
+	t, err := template.New(tplName).Funcs(funcMap).ParseFS(tpl.Content, tplName)
 	if err != nil {
 		fmt.Printf("error: %v\n", err)
-		return fmt.Errorf("error opening template %s: %v", tpl, err)
+		return fmt.Errorf("error opening template %s: %v", tplName, err)
 	}
 
 	err = t.Execute(w, vars)

tpl/embed.go

@@ -0,0 +1,8 @@
+package tpl
+
+import "embed"
+
+// content holds our static web server content.
+//
+//go:embed *.tmpl
+var Content embed.FS

tpl/timeSetup.tmpl

@@ -4,3 +4,8 @@
     <p>Pause to KO: <input type="number" name="pause" value="{{ .Pause }}" style="text-align: center; width: 3em;"/>minutes</p>
     <p><input type="submit" value="Update"/></p>
 </form>
+
+<form action="/setup/update/places">
+    <p>Nr Places/Goals: <input type="number" name="nrplaces" value="{{ .NrPlaces }}" style="text-align: center; width: 3em;"/>Goals</p>
+    <p><input type="submit" value="Update"/></p>
+</form>