From 0d6b31ed3121f04215811b66047398b16cc64d0d Mon Sep 17 00:00:00 2001
From: Rickard Natt och Dag <rickard@nattochdag.dev>
Date: Tue, 9 Jan 2024 18:17:44 +0100
Subject: [PATCH] feat: display stats this year with month names

---
 components/graphs.templ    | 2 +-
 components/graphs_templ.go | 2 +-
 db/queries.sql             | 2 +-
 handlers/stats.go          | 2 +-
 types/stats.go             | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/graphs.templ b/components/graphs.templ
index 6114d61..66cddd4 100644
--- a/components/graphs.templ
+++ b/components/graphs.templ
@@ -38,7 +38,7 @@ templ Graph(data []types.Bar, title string) {
  						x={ strconv.FormatFloat(bar.LabelX, 'f', 2, 64) }
  						y={ strconv.FormatFloat(bar.LabelY, 'f', 2, 64) }
 					>
-						{ strconv.Itoa(bar.Label) }
+						{ bar.Label }
 					</text>
 					<text
  						class="fill-neutral-400 dark:fill-neutral-500 opacity-0 transition-opacity text-sm tabular-nums"
diff --git a/components/graphs_templ.go b/components/graphs_templ.go
index f559bb9..39b2250 100644
--- a/components/graphs_templ.go
+++ b/components/graphs_templ.go
@@ -93,7 +93,7 @@ func Graph(data []types.Bar, title string) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var2 string = strconv.Itoa(bar.Label)
+			var templ_7745c5c3_Var2 string = bar.Label
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
diff --git a/db/queries.sql b/db/queries.sql
index 9c781f5..82d22cc 100644
--- a/db/queries.sql
+++ b/db/queries.sql
@@ -237,7 +237,7 @@ WITH months (
     SELECT
         generate_series(DATE_TRUNC('year', CURRENT_DATE), DATE_TRUNC('year', CURRENT_DATE) + INTERVAL '1 year' - INTERVAL '1 day', INTERVAL '1 month'))
 SELECT
-    EXTRACT(MONTH FROM months.month)::integer AS label,
+    TO_CHAR(months.month, 'Mon') AS label,
     COALESCE(count(seen.id), 0) AS value
 FROM
     months
diff --git a/handlers/stats.go b/handlers/stats.go
index f7266af..7279e10 100644
--- a/handlers/stats.go
+++ b/handlers/stats.go
@@ -144,7 +144,7 @@ func constructGraphFromData(data []types.GraphData) ([]types.Bar, error) {
 		// Position centered on the bar. Subtract 3.4 which is half the width of the text.
 		charWidth := 8.67 // Uses tabular nums so all characters are the same width
 		numberOfCharsInCount := len(strconv.Itoa(row.Value))
-		numberOfCharsInRating := len(strconv.Itoa(row.Label))
+		numberOfCharsInRating := len(row.Label)
 
 		halfWidthOfCount := charWidth * float64(numberOfCharsInCount) / 2
 		halfWidthOfRating := charWidth * float64(numberOfCharsInRating) / 2
diff --git a/types/stats.go b/types/stats.go
index 51f6273..5641541 100644
--- a/types/stats.go
+++ b/types/stats.go
@@ -22,12 +22,12 @@ type PersonStats struct {
 }
 
 type GraphData struct {
-	Label int `db:"label"`
-	Value int `db:"value"`
+	Label string `db:"label"`
+	Value int    `db:"value"`
 }
 
 type Bar struct {
-	Label     int
+	Label     string
 	Value     int
 	BarHeight int
 	BarWidth  int