From 6682aac45520688a1df2ed6250d17b32f7fef073 Mon Sep 17 00:00:00 2001
From: Rob <rw@boogiedev.net>
Date: Sat, 21 Sep 2019 02:14:38 +0200
Subject: [PATCH] page 3

---
 css/ds19.css   |  2 +-
 index.php      | 37 ++++++++++++++++++++++---------------
 js/Schedule.js | 18 +++++++++++++++++-
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/css/ds19.css b/css/ds19.css
index b67c03a..9166635 100644
--- a/css/ds19.css
+++ b/css/ds19.css
@@ -22,4 +22,4 @@ body{
 .fullscreen{
     max-height: 100%;
     max-width: 100%;
-}
\ No newline at end of file
+}
diff --git a/index.php b/index.php
index ad97ce9..5b862d1 100644
--- a/index.php
+++ b/index.php
@@ -30,6 +30,8 @@
             </div>
         </div>
 
+        <!--  PAGE 1  !-->
+
         <div class="page page1">
             <div class="row">
                 <div class="col">
@@ -38,7 +40,7 @@
             </div>
             <div class="row">
                 <div class="col">
-                    <div class="card-deck talks"></div>
+                    <div class="card-deck talks talks_plan"></div>
                 </div>
             </div>
             <div class="row">
@@ -61,14 +63,13 @@
         <!--  PAGE 3  !-->
 
         <div class="page page3">
-            <div class="row">
-                <div class="col">
-                    <div class="card-deck talks_many"></div>
-                </div>
+        <div class="row">
+            <div class="col">
+                <h3>nächste Talks:</h3>
             </div>
         </div>
+        <div class="card-columns talks talks_overview"></div>
     </div>
-</div>
 
 
 <script>
@@ -82,8 +83,12 @@
         $('.page'+num).fadeIn(500);
     }
 
-    function event_view(event)
+    function event_view(event, noTitle = false)
     {
+        if (noTitle === true){
+            event.abstract = '';
+        }
+
         return `   <div class="card">
                         <div class="card-title">
                             <h2> ${event.title} </h2>
@@ -123,22 +128,24 @@
             $('.conf_start').html(s.getScheduleStart());
             $('.conf_end').html(s.getScheduleEnd());
 
+            // load events
             var events = s.getNextEvents(3);
             events.forEach(event => {
-                $('.talks').append( event_view(event));
-            });
-
-            var events = s.getEventsAllTracks(10);
-            events.forEach(event => {
-                $('.talks_many').append( event_view(event));
+                $('.talks_plan').append(event_view(event));
+            });
+            var eventObj = s.getEventsAllTracks(10);
+            console.log(eventObj);
+            eventObj.events.forEach(event => {
+                $('.talks_overview').append(event_view(event, true));
             });
 
+            // change screen after 20Sek and 40Sek
             setTimeout(function () {
-                setPage(1);
+                setPage(3);
             }, 1);
 
             setTimeout(function () {
-                setPage(2);
+                setPage(1);
             }, 20000);
 
             setTimeout(function () {
diff --git a/js/Schedule.js b/js/Schedule.js
index e2939d8..1d1c3dd 100644
--- a/js/Schedule.js
+++ b/js/Schedule.js
@@ -90,10 +90,11 @@ class Schedule {
             this.schedule.find('event').each( function(){
                 allEvents.push({
                     title:      $(this).children('title').text(),
+                    room:       $(this).children('room').text(),
                     date:       $(this).children('date').text(),
                     start:      $(this).children('start').text(),
                     duration:   $(this).children('duration').text(),
-                    abstract:   $(this).children('abstract').text(),
+                    abstract:   $(this).children('abstract').text().slice(0, 256),
                     persons:    $(this).children('persons').text(),
                 });
             });
@@ -101,6 +102,21 @@ class Schedule {
         return allEvents;
     }
 
+    getEventsAllTracks(count)
+    {
+        let roomlist = [];
+        let events = this.getNextEvents(count);
+        events.forEach( event => {
+            if (0 == roomlist.filter(item => event.room == item).length){
+                roomlist.push(event.room);
+            }
+        });
+        return {
+            events:     events,
+            roomlist:   roomlist
+        }
+    }
+
     /**
      * get next Events by time and room
      *