From aea74bef27efd322b3666716f9cbbd374af10a22 Mon Sep 17 00:00:00 2001
From: structix <janek@schoffit.net>
Date: Fri, 9 Oct 2020 16:06:31 +0200
Subject: [PATCH] Add migration fixes

---
 database/mainpage.go                                   |  4 ++++
 .../migrations/20100830203_washlistpersonint.down.psql |  3 +++
 .../migrations/20100830203_washlistpersonint.up.psql   |  3 +++
 .../20100830204_washlistpersondefault.down.psql        |  3 +++
 .../20100830204_washlistpersondefault.up.psql          |  2 ++
 html/mainpage/index.html                               | 10 ++++++----
 html/static/navbar.html                                |  3 +--
 models/washitem.go                                     |  2 +-
 8 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 database/migrations/20100830203_washlistpersonint.down.psql
 create mode 100644 database/migrations/20100830203_washlistpersonint.up.psql
 create mode 100644 database/migrations/20100830204_washlistpersondefault.down.psql
 create mode 100644 database/migrations/20100830204_washlistpersondefault.up.psql

diff --git a/database/mainpage.go b/database/mainpage.go
index 3229318..614f4f6 100644
--- a/database/mainpage.go
+++ b/database/mainpage.go
@@ -33,6 +33,10 @@ func DbMainpage(pool *pgxpool.Pool) gin.H {
 		log.Println(err.Error())
 	}
 
+	persons = append(persons, models.Person{
+		Id:   -1,
+		Name: "-- Auswählen --",
+	})
 	var person models.Person
 	for wperson.Next() {
 		err = wperson.Scan(&person.Id, &person.Name)
diff --git a/database/migrations/20100830203_washlistpersonint.down.psql b/database/migrations/20100830203_washlistpersonint.down.psql
new file mode 100644
index 0000000..5ae088a
--- /dev/null
+++ b/database/migrations/20100830203_washlistpersonint.down.psql
@@ -0,0 +1,3 @@
+--
+-- DROP/Reverse everything here
+--
\ No newline at end of file
diff --git a/database/migrations/20100830203_washlistpersonint.up.psql b/database/migrations/20100830203_washlistpersonint.up.psql
new file mode 100644
index 0000000..329abb0
--- /dev/null
+++ b/database/migrations/20100830203_washlistpersonint.up.psql
@@ -0,0 +1,3 @@
+ALTER TABLE public.washlist DROP COLUMN washed;
+ALTER TABLE public.washlist
+    ADD COLUMN washed integer;
diff --git a/database/migrations/20100830204_washlistpersondefault.down.psql b/database/migrations/20100830204_washlistpersondefault.down.psql
new file mode 100644
index 0000000..5ae088a
--- /dev/null
+++ b/database/migrations/20100830204_washlistpersondefault.down.psql
@@ -0,0 +1,3 @@
+--
+-- DROP/Reverse everything here
+--
\ No newline at end of file
diff --git a/database/migrations/20100830204_washlistpersondefault.up.psql b/database/migrations/20100830204_washlistpersondefault.up.psql
new file mode 100644
index 0000000..b8cb9cd
--- /dev/null
+++ b/database/migrations/20100830204_washlistpersondefault.up.psql
@@ -0,0 +1,2 @@
+ALTER TABLE public.washlist
+    ALTER COLUMN washed SET DEFAULT -1;
\ No newline at end of file
diff --git a/html/mainpage/index.html b/html/mainpage/index.html
index 683b55e..8079d37 100644
--- a/html/mainpage/index.html
+++ b/html/mainpage/index.html
@@ -15,7 +15,6 @@
         <tr>
             <th>Person</th>
             <th>Datum</th>
-            <th>Gewaschen?</th>
             <th>Waschperson</th>
         </tr>
         </thead>
@@ -26,15 +25,18 @@
             <tr>
                 <td>{{$item.Person}}</td>
                 <td>{{$item.Date}}</td>
-                <td>{{$item.Washed}}</td>
                 <td>
                     <div class="center">
                         <form class="ui form" action="/uploadname" method="POST">
                             <input type="hidden" id="washid" name="washid" value="{{ $item.Id}}">
                             <select name="names" id="names">
-                                <option value="-1" selected></option>
+                                    <!--<option value="-1" selected disabled hidden>Choose here</option>-->
                                 {{range $person := $persons}}
-                                <option value="{{$person.Id}}">{{$person.Name}}</option>
+                                    {{if eq $item.Washed $person.Id}}
+                                        <option value="{{$person.Id}}" selected>{{$person.Name}}</option>
+                                    {{else}}
+                                        <option value="{{$person.Id}}">{{$person.Name}}</option>
+                                    {{end}}
                                 {{end}}
                             </select>
                             <input type="submit" value="Speichern">
diff --git a/html/static/navbar.html b/html/static/navbar.html
index 4eaf322..0ac480c 100644
--- a/html/static/navbar.html
+++ b/html/static/navbar.html
@@ -1,10 +1,9 @@
 {{define "navbar"}}
 <div class="ui inverted menu">
     <a href="/"><div class="header item">Trikotwaschliste</div></a>
+    <a href="/"><div class="header item">Personen</div></a>
 
     <div class="right menu">
-        <a href="/querypage/create"><div class="item">Query</div></a>
-        <a href="/stats/interpret"><div class="item">Stats</div></a>
         <a href="/credits"><div class="item">Credits</div></a>
     </div>
 </div>
diff --git a/models/washitem.go b/models/washitem.go
index a2e63d6..f57e964 100644
--- a/models/washitem.go
+++ b/models/washitem.go
@@ -6,5 +6,5 @@ type Washlist struct {
 	Id int `json:"id"`
 	Person string `json:"person"`
 	Date time.Time `json:"date"`
-	Washed string `json:"iswashed"`
+	Washed int `json:"iswashed"`
 }