From 5c9e5482f5b30e1225f393e32fe852e2b43cfb55 Mon Sep 17 00:00:00 2001
From: Vidir Valberg Gudmundsson <valberg@orn.li>
Date: Wed, 16 Aug 2017 22:39:48 +0200
Subject: [PATCH] Really fixing bordering events this time.

---
 schedule/src/Views/DayView.elm              | 6 ++++--
 src/program/static/js/elm_based_schedule.js | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/schedule/src/Views/DayView.elm b/schedule/src/Views/DayView.elm
index a7ee4b72..1d96af77 100644
--- a/schedule/src/Views/DayView.elm
+++ b/schedule/src/Views/DayView.elm
@@ -83,7 +83,9 @@ locationColumn columnWidth eventInstances offset minutes location =
 
         overlappingGroups =
             List.Extra.groupWhile
-                (\instanceA instanceB -> Date.Extra.isBetween instanceA.from instanceA.to instanceB.from)
+                (\instanceA instanceB ->
+                    (Date.Extra.isBetween instanceB.from instanceB.to instanceA.from) && not (Date.Extra.equal instanceA.from instanceB.to)
+                )
                 locationInstances
     in
         div
@@ -151,7 +153,7 @@ renderGroup offset group =
                         else if (Date.Extra.equal instanceB.from instanceA.from) && not (Date.Extra.equal instanceB.to instanceA.to) then
                             -- Set to 0 and then fix it further down in the code
                             0
-                        else if (Date.Extra.isBetween instanceB.from instanceB.to instanceA.from) && not (Date.Extra.equal instanceA.from instanceB.to) then
+                        else if (Date.Extra.isBetween instanceB.from instanceB.to instanceA.from) then
                             1
                         else
                             0
diff --git a/src/program/static/js/elm_based_schedule.js b/src/program/static/js/elm_based_schedule.js
index a5ef4896..f81c3f2e 100644
--- a/src/program/static/js/elm_based_schedule.js
+++ b/src/program/static/js/elm_based_schedule.js
@@ -15299,7 +15299,7 @@ var _user$project$Views_DayView$renderGroup = F2(
 					A2(
 						_elm_lang$core$List$map,
 						function (instanceB) {
-							return _elm_lang$core$Native_Utils.eq(instanceA, instanceB) ? 0 : ((A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.from, instanceA.from) && A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.to, instanceA.to)) ? 0 : ((A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.from, instanceA.from) && (!A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.to, instanceA.to))) ? 0 : ((A3(_justinmimbs$elm_date_extra$Date_Extra$isBetween, instanceB.from, instanceB.to, instanceA.from) && (!A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceA.from, instanceB.to))) ? 1 : 0)));
+							return _elm_lang$core$Native_Utils.eq(instanceA, instanceB) ? 0 : ((A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.from, instanceA.from) && A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.to, instanceA.to)) ? 0 : ((A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.from, instanceA.from) && (!A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.to, instanceA.to))) ? 0 : (A3(_justinmimbs$elm_date_extra$Date_Extra$isBetween, instanceB.from, instanceB.to, instanceA.from) ? 1 : 0)));
 						},
 						sortedGroup))
 			};
@@ -15378,7 +15378,7 @@ var _user$project$Views_DayView$locationColumn = F5(
 			_elm_community$list_extra$List_Extra$groupWhile,
 			F2(
 				function (instanceA, instanceB) {
-					return A3(_justinmimbs$elm_date_extra$Date_Extra$isBetween, instanceA.from, instanceA.to, instanceB.from);
+					return A3(_justinmimbs$elm_date_extra$Date_Extra$isBetween, instanceB.from, instanceB.to, instanceA.from) && (!A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceA.from, instanceB.to));
 				}),
 			locationInstances);
 		return A2(