Merge pull request 'Make recent activity cards dynamic' (#45) from make-recent-activity-last-sleep-dynamic into main
Reviewed-on: https://gitea.lille-vemmelund.dk/brian/baby-monitor/pulls/45
This commit was merged in pull request #45.
This commit is contained in:
@@ -414,7 +414,7 @@
|
||||
if (feedings.length > 0) {
|
||||
// Calculate the most recent feeding session
|
||||
let sessionStart = feedings[0].start_time;
|
||||
let sessionEnd = feedings[0].end_time || feedings[0].start_time;
|
||||
let sessionEnd = feedings[0].end_time;
|
||||
let sessionChildId = feedings[0].child_id;
|
||||
let sessionEntries = [feedings[0]];
|
||||
|
||||
@@ -649,7 +649,7 @@
|
||||
<a href="/feedings.html" class="activity-card" style="text-decoration:none; color:inherit;">
|
||||
<div class="icon">🍼</div>
|
||||
<div class="type">Last Feeding Session</div>
|
||||
<div class="time">${formatTime(lastFeeding.start_time)}</div>
|
||||
<div class="time">${lastFeeding.end_time ? `stopped ${formatTime(lastFeeding.end_time)}` : `started ${formatTime(lastFeeding.start_time)}`}</div>
|
||||
<div class="details">
|
||||
${lastFeeding.feeding_types_string ? `${lastFeeding.feeding_types_string}` : ""}
|
||||
${lastFeeding.feeding_types_string && lastFeeding.accumulated_minutes ? " • " : ""}
|
||||
@@ -671,7 +671,7 @@
|
||||
<a href="/sleep.html" class="activity-card" style="text-decoration:none; color:inherit;">
|
||||
<div class="icon">😴</div>
|
||||
<div class="type">Last Sleep</div>
|
||||
<div class="time">${formatTime(lastSleep.start_time)}</div>
|
||||
<div class="time">${lastSleep.end_time ? `stopped ${formatTime(lastSleep.end_time)}` : `started ${formatTime(lastSleep.start_time)}`}</div>
|
||||
<div class="details">
|
||||
Duration: ${lastSleep.end_time ? calculateDuration(lastSleep.start_time, lastSleep.end_time) : "ongoing"}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user