nå regnes tidene til de nye subeventene ut, og det viseses

Kristianrosland · Oct 12, 2020 · 802807d · 802807d
1 parent cf02a7f
commit 802807d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 5 deletions.
diff --git a/src/Frontend/Mainscreen/Event.jsx b/src/Frontend/Mainscreen/Event.jsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import * as SolidIcons from '@fortawesome/free-solid-svg-icons';
 import IconLabel from './IconLabel';
 import { AppContext } from '../App';
-import { eventTimeComparator, selectField, selectTime, selectGroups } from '../utils';
+import { eventTimeComparator, selectField, selectTime, selectGroups, mapTimeOnPosts } from '../utils';
 import Posts from "./Posts";
 import './event.scss';
 
@@ -43,7 +43,11 @@ const Event = ({ data, group }) => {
     const link = data.link;
     const linkText = selectField(event, 'linkText', lang);
     const chevron = open ? SolidIcons["faChevronUp"] : SolidIcons["faChevronDown"];
-
+
+    const sortedPosts = !posts ? [] : posts.sort((p1, p2) => p1.order.indexOf(group.value) - p2.order.indexOf(group.value));
+
+    const postsWithTime = mapTimeOnPosts(event, sortedPosts);
+
     return (
         <div className="event-wrapper">
             <div className="event">
@@ -67,7 +71,7 @@ const Event = ({ data, group }) => {
 
                 { open && posts && (
                     <div className="sub-event-wrapper">
-                        { event.posts.map( e => <Posts key={e.id} post={e} lang={lang}/>) }
+                        { postsWithTime.map( e => <Posts key={e.id} post={e} lang={lang}/>) }
                     </div>
                 )}
                 <div className="event-chevron" onClick={() => setOpen(!open)}>

diff --git a/src/Frontend/Mainscreen/Posts.jsx b/src/Frontend/Mainscreen/Posts.jsx
@@ -1,17 +1,20 @@
 import React from 'react';
+import { selectTime } from "../utils";
 
 const Posts = ({ post, lang }) => {
 
     const showUrl = post.googleMaps && post.googleMaps.startsWith('https');
     const google_maps = post.googleMaps;
 
+
+
     return (
         <div className="sub-event">
             <div className="sub-event-time-and-title">
-                <p className="sub-event-time"> rrrrrrr </p>
+                <p className="sub-event-time"> { selectTime(post) } </p>
                 <p className="sub-event-title"> { post.title } </p>
             </div>
-            {  showUrl && <a className="sub-event-address" href={google_maps} rel="noopener noreferrer" target="_blank"> { lang === 'NO' ? '(kart)' : '(map)' } </a> }
+            { showUrl && <a className="sub-event-address" href={google_maps} rel="noopener noreferrer" target="_blank"> { lang === 'NO' ? '(kart)' : '(map)' } </a> }
 
         </div>
     )

diff --git a/src/Frontend/utils.jsx b/src/Frontend/utils.jsx
@@ -92,3 +92,34 @@ export const selectGroups = ({ groups }, lang) => {
   const prefix = language === "NO" ? "Gruppe " : "Group ";
   return `${prefix} ${groups.join(", ")}`;
 };
+
+const calculateEndTime = (startTime, minUsed) => {
+  const arr = startTime.split(":");
+  let hours = Math.floor(parseInt(minUsed) / 60);
+
+  let min = parseInt(arr[1]) + parseInt(minUsed);
+  if (!(min < 60)) {
+      min -= 60;
+  }
+  if (min < 10){
+      min = "0" + min
+  }
+
+  const final_hours = parseInt(arr[0]) + hours;
+  const final = final_hours + ":" + min;
+
+  return final;
+
+}
+
+export const mapTimeOnPosts = (event, sortedPosts) => {
+  let start_time = event.start_time;
+  const post_time = event.post_time;
+
+  return sortedPosts.map(post => {
+      const end_time = calculateEndTime(start_time, post_time);
+      const updatedPost = { ...post, start_time: start_time, end_time: end_time }
+      start_time = end_time;
+      return updatedPost
+  })
+}