From 394e1394e0e73f82cfb340d8ae90942b98a240e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Engl=C3=B6f=20Ytterstr=C3=B6m?= <yttan@fastmail.se>
Date: Thu, 6 Feb 2025 13:04:37 +0100
Subject: [PATCH] Solve Diet view not showing excluded days

---
 data/default-state.js       | 15 ++++++---------
 src/lib/DietProgress.svelte | 10 +++++-----
 src/lib/Summary.svelte      |  5 +++--
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/data/default-state.js b/data/default-state.js
index b1bb430..40a4bcf 100644
--- a/data/default-state.js
+++ b/data/default-state.js
@@ -381,8 +381,7 @@ const gym = [
   },
 ];
 
-const diet = {
-  days: [
+const diet = [
     { date: "2025-02-10", completed: false },
     { date: "2025-02-11", completed: false },
     { date: "2025-02-12", completed: false },
@@ -405,6 +404,7 @@ const diet = {
     { date: "2025-03-01", completed: false },
     { date: "2025-03-02", completed: false },
     { date: "2025-03-03", completed: false },
+    { date: "2025-03-04", excluded: true, because: "Semmeldagen" },
     { date: "2025-03-05", completed: false },
     { date: "2025-03-06", completed: false },
     { date: "2025-03-07", completed: false },
@@ -429,6 +429,7 @@ const diet = {
     { date: "2025-03-26", completed: false },
     { date: "2025-03-27", completed: false },
     { date: "2025-03-28", completed: false },
+    { date: "2025-03-29", excluded: true, because: "Födelsedag" },
     { date: "2025-03-30", completed: false },
     { date: "2025-03-31", completed: false },
     { date: "2025-04-01", completed: false },
@@ -447,6 +448,7 @@ const diet = {
     { date: "2025-04-14", completed: false },
     { date: "2025-04-15", completed: false },
     { date: "2025-04-16", completed: false },
+    { date: "2025-04-17", excluded: true, because: "Påsk" },
     { date: "2025-04-18", completed: false },
     { date: "2025-04-19", completed: false },
     { date: "2025-04-10", completed: false },
@@ -491,13 +493,8 @@ const diet = {
     { date: "2025-05-29", completed: false },
     { date: "2025-05-30", completed: false },
     { date: "2025-05-31", completed: false },
-  ],
-  reds: {
-    "2025-03-04": "Semmeldagen",
-    "2025-03-29": "Födelsedag",
-    "2025-04-17": "Påsk",
-  },
-};
+  ]
+;
 
 export default {
   cardio,
diff --git a/src/lib/DietProgress.svelte b/src/lib/DietProgress.svelte
index 5fa5648..2dcd468 100644
--- a/src/lib/DietProgress.svelte
+++ b/src/lib/DietProgress.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import { diet } from "./store";
     import { dm, back } from "./common";
-    const dayscount = $diet.days.length;
-    let done = $derived($diet.days.filter((c) => c.completed).length);
+    const dayscount = $derived($diet.filter((c) => !c.excluded).length);
+    let done = $derived($diet.filter((c) => c.completed).length);
 </script>
 
     <header>
@@ -15,11 +15,11 @@
     <progress max={dayscount} hidden value={done}></progress>
 
     <div class="calendar">
-        {#each $diet.days as day, i}
+        {#each $diet as day, i}
             <article class="clickable">
-                {#if day.date in $diet.reds}
+                {#if day.excluded}
                     <div class="red">
-                        {$diet.reds[day.date]}
+                        {day.because}
                     </div>
                 {:else}
                     <label>
diff --git a/src/lib/Summary.svelte b/src/lib/Summary.svelte
index b9be592..d077a3a 100644
--- a/src/lib/Summary.svelte
+++ b/src/lib/Summary.svelte
@@ -2,7 +2,8 @@
   import { gym, cardio, diet, currentView } from "./store";
   let gymProgress = $derived($gym.filter((c) => c.completed).length);
   let cardioProgress = $derived($cardio.filter((c) => c.completed).length);
-  let dietProgress = $derived($diet.days.filter((c) => c.completed).length);
+  let dietProgress = $derived($diet.filter((c) => c.completed).length);
+  let dietTotal = $derived($diet.filter((c) => !c.excluded).length);
 
   const navigate = (v: 0 | 1 | 2 | 3 | 4) => {
     currentView.update((_) => v);
@@ -20,7 +21,7 @@
     <span>Konditionsträning</span>
   </button>
   <button class="clickable diet" onclick={() => navigate(3)}>
-    <i>{dietProgress}</i> / {$diet.days.length}
+    <i>{dietProgress}</i> / {dietTotal}
     <span>Dietdagar</span>
   </button>
   <button class="clickable info" onclick={() => navigate(4)}>