Update cycle count regularly

api/quotes.go

@@ -10,11 +10,9 @@ import (
 
 func declareQuotesRoutes(cfg *config.Config, router *gin.RouterGroup) {
 	router.GET("/quoteoftheday", func(c *gin.Context) {
-
 	})
 
 	router.GET("/quotes", func(c *gin.Context) {
-
 	})
 	router.POST("/quotes", func(c *gin.Context) {
 

model/alarm.go

@@ -57,8 +57,9 @@ func GetNextAlarm(db *LevelDBStorage) (*time.Time, error) {
 		return nil, err
 	}
 
+	now := time.Now()
 	for _, alarm := range alarmsSingle {
-		if closestAlarm == nil || closestAlarm.After(alarm.Time) {
+		if closestAlarm == nil || (closestAlarm.After(alarm.Time) && alarm.Time.After(now)) {
 			closestAlarm = &alarm.Time
 		}
 	}

ui/src/components/CycleCounter.svelte

@@ -0,0 +1,35 @@
+<script>
+ import { createEventDispatcher, onMount, onDestroy } from 'svelte';
+
+ export let begins = null;
+ export let ends;
+
+ const dispatch = createEventDispatcher();
+
+ let interval;
+ onMount(() => {
+     if (!begins) {
+         interval = setInterval(() => {
+             begins = new Date();
+             if (begins > ends) {
+                 dispatch("reload")
+             }
+         }, 15000);
+         begins = new Date();
+     }
+ });
+ onDestroy(() => {
+     if (interval) {
+         clearInterval(interval);
+     }
+ });
+
+ export { className as class };
+ let className = 'text-muted';
+</script>
+
+{#if begins && ends}
+    <span class="{className}">
+        (dans {Math.trunc((ends.getTime()-begins.getTime())/5400000)}&nbsp;cycles + {Math.trunc(((ends.getTime()-begins.getTime())%5400000)/60000)}&nbsp;min)
+    </span>
+{/if}

ui/src/routes/+page.svelte

@@ -4,6 +4,7 @@
      Icon,
  } from 'sveltestrap';
 
+ import CycleCounter from '../components/CycleCounter.svelte';
  import DateFormat from '../components/DateFormat.svelte';
  import { getNextAlarm, newNCyclesAlarm } from '../lib/alarmsingle';
  import { alarmsSingle } from '../stores/alarmsingle';
@@ -11,11 +12,13 @@
 
  let nextAlarmP = getNextAlarm();
 
+ function reloadNextAlarm() {
+     nextAlarmP = getNextAlarm();
+     alarmsSingle.clear();
+ }
+
  function newCyclesAlarm(ncycles) {
-     newNCyclesAlarm(ncycles).then(() => {
-         nextAlarmP = getNextAlarm();
-         alarmsSingle.clear();
-     })
+     newNCyclesAlarm(ncycles).then(reloadNextAlarm);
  }
 </script>
 
@@ -44,12 +47,12 @@
                 aujourd'hui à
                 <DateFormat date={nextalarm} timeStyle="long" />
                 <br class="d-block d-md-none" />
-                <span class="text-muted">(dans {Math.trunc((nextalarm.getTime()-Date.now())/5400000)}&nbsp;cycles + {Math.trunc(((nextalarm.getTime()-Date.now())%5400000)/60000)}&nbsp;min)</span>
+                <CycleCounter ends={nextalarm} on:reload={reloadNextAlarm} />
             {:else if nextalarm.getDay() == new Date(Date.now() + 86400000).getDay() && nextalarm.getMonth() == new Date(Date.now() + 86400000).getMonth() && nextalarm.getFullYear() == new Date(Date.now() + 86400000).getFullYear()}
                 demain à
                 <DateFormat date={nextalarm} timeStyle="long" />
                 <br class="d-block d-md-none" />
-                <span class="text-muted">(dans {Math.trunc((nextalarm.getTime()-Date.now())/5400000)}&nbsp;cycles + {Math.trunc(((nextalarm.getTime()-Date.now())%5400000)/60000)}&nbsp;min)</span>
+                <CycleCounter ends={nextalarm} on:reload={reloadNextAlarm} />
             {:else if nextalarm.getTime() < Date.now() + 604800000}
                 <span title={nextalarm}>{nextalarm.toLocaleString('default', {weekday: 'long'})}</span>
                 à