From 268aff914a424672f7b5bfc9759572b052585fad Mon Sep 17 00:00:00 2001
From: tree <tree@hidden.cz>
Date: Thu, 19 May 2022 08:05:53 +0200
Subject: [PATCH] Update

---
 src/routes/casova-osa.svelte | 50 +++++++++++++++++++++++++-----------
 src/routes/index.svelte      | 15 ++++++++++-
 src/routes/udalosti.svelte   |  2 +-
 3 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/routes/casova-osa.svelte b/src/routes/casova-osa.svelte
index 6961e4b..aa33688 100644
--- a/src/routes/casova-osa.svelte
+++ b/src/routes/casova-osa.svelte
@@ -6,7 +6,7 @@
 <script>
 
   import { onMount, onDestroy } from "svelte";
-  import { format, compareAsc } from "date-fns"
+  import { format, compareAsc, compareDesc } from "date-fns"
   import { bundle, userData, loadInfo, schedulePref } from "$lib/stores.js";
   import { cs } from "date-fns/locale/index.js";
 
@@ -29,6 +29,18 @@
       .filter(i => i.stage === stageId)
   }
 
+  function findSegment (bundle, stage, period) {
+    for (const st of stage.times) {
+      const p = parsePeriod(bundle, st)
+      if (compareAsc(period.start, p.period.end) !== -1 && compareDesc(period.end, p.period.start) !== 1) {
+        continue
+      }
+      return p
+    }
+
+    return null
+  }
+
   function dateSlots (pl, period, bundle, schedulePref = null) {
     let time = period.start
     const endTime = period.end
@@ -46,8 +58,9 @@
         if (schedulePref && !schedulePref.stages.includes(stage.id)) {
           continue
         }
-        const si = pl.schedule.find(pi => (new Date(pi.period.start).getTime() === new Date(time).getTime()) && pi.stage === stage.id)
+        let si = pl.schedule.find(pi => (new Date(pi.period.start).getTime() === new Date(time).getTime()) && pi.stage === stage.id)
         stages[stage.id] = si
+
         if (si) {
           const span = Math.floor((new Date(si.period.end).getTime() - new Date(si.period.start).getTime())/(1000 * 60) / 30)
           si.span = span
@@ -63,28 +76,35 @@
   }
 
   function showSpeakers (bundle, ev) {
-    return ev.speakers.map(sp => bundle.spec.speakers.find(s => s.id === sp).name).join(', ')
+    return ev.speakers.map(sId => {
+      const sp = bundle.spec.speakers.find(s => s.id === sId)
+      return sp.name + (sp.nickname ? ` (${sp.nickname})` : '')
+    }).join(', ')
   }
 
   function showEventDetail (bundle, ev) {
     if (ev.type === 'lightning-series') {
-      return bundle.spec.events.filter(e => e.parent === ev.id).map(e => `${e.name} (${showSpeakers(bundle, e)})`).join(', ')
+      return bundle.spec.events.filter(e => e.parent === ev.id).map(e => `<span class="font-semibold"><a href="/udalosti?id=${e.id}">${e.name}</a></span> - ${showSpeakers(bundle, e) || 'TBD'}`).join('<br>')
     }
     return showSpeakers(bundle, ev)
   }
 
+  function parsePeriod (bundle, str) {
+    const [ dayNumber, times ] = str.split('/')
+    const [ start, end ] = times.split('-')
+    const date = bundle.dates[dayNumber-1]
+    return {
+      date,
+      period: {
+        start: new Date(`${date}T${start}`),
+        end: new Date(`${date}T${end}`)
+      }
+    }
+  }
+
   function scheduleTimes (bundle) {
     return bundle.scheduleTimes.map(item => {
-      const [ dayNumber, times ] = item.split('/')
-      const [ start, end ] = times.split('-')
-      const date = bundle.dates[dayNumber-1]
-      return {
-        date,
-        period: {
-          start: new Date(`${date}T${start}`),
-          end: new Date(`${date}T${end}`)
-        }
-      }
+      return parsePeriod(bundle, item)
     })
   }
 
@@ -195,7 +215,7 @@
                             <div class="text-xs">{format(new Date(si.period.start), 'HH:mm')}-{format(new Date(si.period.end), 'HH:mm')} {#if event.track}[{#each [$bundle.spec.tracks.find(t => t.id === event.track)] as track}{track.shortname || track.name}{/each}]{/if}</div>
                             <div class="font-semibold mt-1"><a href="/udalosti?id={event.id}">{event.name}</a></div>
                             <div class="text-xs mt-1">
-                              {showEventDetail($bundle, event)}
+                              {@html showEventDetail($bundle, event)}
                             </div>
                             <div class="text-xs mt-2 text-blue-web/50">
                               {event.tags.map(t => `#${t}`).join(', ')}
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 24dc15b..55766b6 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <script>
-  import { bundle, userData } from "$lib/stores.js";
+  import { bundle, userData, apiStatus } from "$lib/stores.js";
   import Avatar from "$lib/Avatar.svelte";
   import SvelteMarkdown from "svelte-markdown";
   import Link from "$lib/Link.svelte";
@@ -40,6 +40,8 @@
       return ud;
     });
   }
+
+  let separator = '<i class="fa-solid fa-angle-right text-lg align-middle px-4"></i>'
 </script>
 
 <svelte:head>
@@ -47,6 +49,17 @@
 </svelte:head>
 
 {#if $bundle}
+  {#if $apiStatus}
+    <section class="bg-blue-web-light">
+      <div class="pb-2 pt-2 lg:pt-4 lg:pb-4 mx-auto sm:px-2 lg:px-6 2xl:px-16">
+        <div class="text-center text-xl sm:text-xl lg:text-2xl font-semibold text-blue-web px-8">
+          {$bundle.spec.speakers.length}&nbsp;přednášejících {@html separator}
+          {$bundle.spec.events.length}&nbsp;události {@html separator}
+          {$apiStatus.global.tickets}&nbsp;návstěvníků
+        </div>
+      </div>
+    </section>
+  {/if}
   <section class="relative mx-auto pt-6 sm:pt-10 px-6 max-w-6xl">
     <div
       class="flex flex-wrap gap-1.5 sm:gap-3 text-xs uppercase font-bold text-blue-web justify-left"
diff --git a/src/routes/udalosti.svelte b/src/routes/udalosti.svelte
index 531f6bf..0c21c24 100644
--- a/src/routes/udalosti.svelte
+++ b/src/routes/udalosti.svelte
@@ -94,7 +94,7 @@
           <div class="flex gap-2">
             <Avatar speaker={s} size="semi-small" />
             <div class="m-auto">
-              <a href="/lide?id={s.id}" class="text-xl">{s.name}</a>
+              <a href="/lide?id={s.id}" class="text-xl">{s.name} {#if s.nickname} ({s.nickname}){/if}</a>
             </div>
           </div>
         {/each}