From 9886ea4fbe8725dbfb4c9e4756f09d2f20c776e0 Mon Sep 17 00:00:00 2001
From: Abhas Bhattacharya <abhasbhattacharya2@gmail.com>
Date: Tue, 20 Mar 2018 08:51:18 +0530
Subject: [PATCH] Calculate next closing only from events and not weekends

---
 src/Components/NextOpenCloseMini/Component.tsx | 3 ++-
 src/Utils/utils.ts                             | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Components/NextOpenCloseMini/Component.tsx b/src/Components/NextOpenCloseMini/Component.tsx
index 412c809..4753dfd 100644
--- a/src/Components/NextOpenCloseMini/Component.tsx
+++ b/src/Components/NextOpenCloseMini/Component.tsx
@@ -23,7 +23,8 @@ export class NextOpenCloseMini extends React.Component<NextOpenCloseMiniProps, {
         this.openOrClose = props.openOrClose;
         this.allHolidays = props.allHolidays;
 
-        this.nextOpenOrCloseDate = Utils.findNextOpenOrCloseFromDate(this.xDay, this.allHolidays, this.openOrClose);
+        this.nextOpenOrCloseDate = Utils.findNextOpenOrEventCloseFromDate(
+            this.xDay, this.allHolidays, this.openOrClose);
     }
 
     getOpeningClosingString() {
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index c6afc2b..a2b074d 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -81,7 +81,7 @@ export class Utils {
         }
     }
 
-    static findNextOpenOrCloseFromDate(
+    static findNextOpenOrEventCloseFromDate(
         xDay: moment.Moment,
         allHolidays: HolidayList,
         openOrClose: OpenOrClose): moment.Moment | undefined {
@@ -89,13 +89,13 @@ export class Utils {
         let currentDay = xDay.clone().add(1, "day");
 
         while (this.checkSameYearInSameTZ(currentDay, xDay)) {
-            var holidayAnswerOnCurrentDay = this.getHolidayAnswerOnDate(currentDay, allHolidays);
+            var holidayOnCurrentDay = this.getEventHolidayOnDate(currentDay, allHolidays);
 
-            if ((openOrClose === OpenOrClose.Open) && holidayAnswerOnCurrentDay.open) {
+            if ((openOrClose === OpenOrClose.Open) && (holidayOnCurrentDay === undefined)) {
                 return currentDay;
             }
 
-            if ((openOrClose === OpenOrClose.Close) && !holidayAnswerOnCurrentDay.open) {
+            if ((openOrClose === OpenOrClose.Close) && (holidayOnCurrentDay !== undefined)) {
                 return currentDay;
             }