From 984d215fc85bc1f5123b58d6171a549d2815bed2 Mon Sep 17 00:00:00 2001
From: dea <dea@bere.edu>
Date: Thu, 20 Jun 2024 19:07:54 +0000
Subject: [PATCH 01/12] Issue fixed

---
 app/controllers/admin/routes.py |  4 ++++
 app/templates/eventNav.html     | 13 ++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/routes.py b/app/controllers/admin/routes.py
index 5783f9c77..fe950a261 100644
--- a/app/controllers/admin/routes.py
+++ b/app/controllers/admin/routes.py
@@ -209,6 +209,8 @@ def renewEvent(eventId):
 @admin_bp.route('/event/<eventId>/edit', methods=['GET','POST'])
 def eventDisplay(eventId):
     pageViewsCount = EventView.select().where(EventView.event == eventId).count()
+    current_time = datetime.now().time()
+    current_date = datetime.now().date()
     if request.method == 'GET' and request.path == f'/event/{eventId}/view':
         viewer = g.current_user
         event = Event.get_by_id(eventId)
@@ -277,6 +279,8 @@ def eventDisplay(eventId):
     # Event Edit
     if 'edit' in rule.rule:
         return render_template("admin/createEvent.html",
+                                current_time = current_time,
+                                current_date = current_date,
                                 eventData = eventData,
                                 futureTerms=futureTerms,
                                 event = event,
diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index a9ae7318c..07cb4c5ec 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -18,15 +18,22 @@
         {% if g.current_user.isAdmin %}
             {{ eventheader(page_title, event, 'large', isNewEvent) }}
         {% endif %}
-        {% set alertClass = "alert-danger" if eventPast else "alert-warning"%}
-        {% set display = "" if eventPast or event.isCanceled else "d-none"%}
+        {% set isCurrentDate = current_date == event.startDate %}
+        {% set isCurrentTime = current_time < event.timeEnd and current_time > event.timeStart %}
+        {% set display = "" if eventPast or event.isCanceled or isCurrentDate or isCurrentTime else "d-none"%}
+        {% set alertClass = ("alert-success" if isCurrentTime else ( "alert-danger" if eventPast else "alert-warning")) %}
+
         <div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
         {% if eventPast and event.isCanceled %}
             This is a past event and it was canceled.
+        {% elif isCurrentDate and isCurrentTime %}
+            This event is happening right now 
         {% elif eventPast %}
-            This is a past event.
+            This is a past event and ended on {{ event.endDate }} at {{ event.timeEnd }}
         {% elif event.isCanceled %}
             This event has been canceled.
+        {% elif not eventPast %}
+            Event is in future
         {% endif %}
         </div>
     </div>

From 589b6126aa7810d67d7fd8f7b6a8bd9a97a323f9 Mon Sep 17 00:00:00 2001
From: dea <dea@bere.edu>
Date: Fri, 5 Jul 2024 08:44:57 -0400
Subject: [PATCH 02/12] Issues changed , dscssion to be had with Brian
 regarding future events section.

---
 app/templates/admin/createEvent.html |  2 +-
 app/templates/eventNav.html          | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/templates/admin/createEvent.html b/app/templates/admin/createEvent.html
index 22e88b3c6..14ba54b61 100644
--- a/app/templates/admin/createEvent.html
+++ b/app/templates/admin/createEvent.html
@@ -23,7 +23,7 @@
   {% extends "eventNav.html"%}
 {% endif %}
 
-{% set eventPast = event.isPastStart if not isNewEvent else False %}
+{% set eventPast = event.isPastEnd if not isNewEvent else False %}
 {% set tabName = 'edit' %}
 
 
diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index d408b2073..0f96f3265 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -18,17 +18,13 @@
         {% if g.current_user.isAdmin %}
             {{ eventheader(page_title, event, 'large', isNewEvent) }}
         {% endif %}
-        indicate_Event_In_Prog
-        {% set isCurrentDate = current_date == event.startDate %}
-        {% set isCurrentTime = current_time < event.timeEnd and current_time > event.timeStart %}
-        {% set display = "" if eventPast or event.isCanceled or isCurrentDate or isCurrentTime else "d-none"%}
+        {% set display = "" if eventPast or event.isCanceled else "d-none"%}
         {% set alertClass = ("alert-success" if isCurrentTime else ( "alert-danger" if eventPast else "alert-warning")) %}
+
         <div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
-        {% if isPastEnd and event.isCanceled %}
+        {% if eventPast and event.isCanceled %}
             This is a past event and it was canceled.
-        indicate_Event_In_Prog
-        {% elif isCurrentDate and isCurrentTime %}
-            This event is happening right now 
+        
         {% elif eventPast %}
             This is a past event and ended on {{ event.endDate }} at {{ event.timeEnd }}
         {% elif event.isCanceled %}

From 1bbe14b267dc044def8d2d798f381278a9b6fea7 Mon Sep 17 00:00:00 2001
From: dea <dea@bere.edu>
Date: Mon, 8 Jul 2024 10:59:33 -0400
Subject: [PATCH 03/12] Updated the banner to use pre existing function
 isPastEnd and isPastStart:

---
 app/templates/eventNav.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index 0f96f3265..202c76372 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -18,19 +18,19 @@
         {% if g.current_user.isAdmin %}
             {{ eventheader(page_title, event, 'large', isNewEvent) }}
         {% endif %}
-        {% set display = "" if eventPast or event.isCanceled else "d-none"%}
-        {% set alertClass = ("alert-success" if isCurrentTime else ( "alert-danger" if eventPast else "alert-warning")) %}
+        {% set isInProg = not event.isPastEnd and event.isPastStart %}
+        {% set display = "" if eventPast or event.isCanceled or isInProg else "d-none"%}
+        {% set alertClass = ("alert-success" if isInProg else ( "alert-danger" if eventPast else "alert-warning")) %}
 
         <div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
         {% if eventPast and event.isCanceled %}
             This is a past event and it was canceled.
-        
+        {% elif isInProg %}
+            This event is happening right now 
         {% elif eventPast %}
             This is a past event and ended on {{ event.endDate }} at {{ event.timeEnd }}
         {% elif event.isCanceled %}
             This event has been canceled.
-        {% elif not eventPast %}
-            Event is in future
         {% endif %}
         </div>
     </div>

From a29be8f3a7d581fa007ad043c91b4ad8b1fd6fd2 Mon Sep 17 00:00:00 2001
From: dea <dea@bere.edu>
Date: Mon, 8 Jul 2024 15:20:23 -0400
Subject: [PATCH 04/12] Updated the banner to appear in all tabs, for all
 conditions

---
 app/controllers/admin/routes.py | 6 ++++--
 app/templates/eventNav.html     | 4 ++--
 app/templates/eventView.html    | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/controllers/admin/routes.py b/app/controllers/admin/routes.py
index b4acbff00..8563b3105 100644
--- a/app/controllers/admin/routes.py
+++ b/app/controllers/admin/routes.py
@@ -217,6 +217,7 @@ def eventDisplay(eventId):
         viewer = g.current_user
         event = Event.get_by_id(eventId)
         addEventView(viewer,event) 
+        eventCountdown = getCountdownToEvent(event)
     # Validate given URL
     try:
         event = Event.get_by_id(eventId)
@@ -299,7 +300,7 @@ def eventDisplay(eventId):
         eventData['timeEnd'] = event.timeEnd.strftime("%-I:%M %p")
         eventData['startDate'] = event.startDate.strftime("%m/%d/%Y")
         eventCountdown = getCountdownToEvent(event)
-
+ 
 
         # Identify the next event in a recurring series
         if event.recurringId:
@@ -324,7 +325,8 @@ def eventDisplay(eventId):
                                 filepaths=filepaths,
                                 image=image,
                                 pageViewsCount=pageViewsCount,
-                                eventCountdown=eventCountdown)
+                                eventCountdown=eventCountdown
+                                )
                                 
 
 
diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index 202c76372..45bb43d94 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -21,7 +21,7 @@
         {% set isInProg = not event.isPastEnd and event.isPastStart %}
         {% set display = "" if eventPast or event.isCanceled or isInProg else "d-none"%}
         {% set alertClass = ("alert-success" if isInProg else ( "alert-danger" if eventPast else "alert-warning")) %}
-
+        {{eventPast}}
         <div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
         {% if eventPast and event.isCanceled %}
             This is a past event and it was canceled.
@@ -61,4 +61,4 @@
 
         {% endif %}
     {% endblock %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/eventView.html b/app/templates/eventView.html
index c6c66864d..975a77939 100644
--- a/app/templates/eventView.html
+++ b/app/templates/eventView.html
@@ -3,6 +3,7 @@
 {% set isPastEnd = event.isPastEnd %} 
 {% set tabName = 'view' %}
 {% extends "eventNav.html"%}
+{% set eventPast = event.isPastStart if not isNewEvent else False %}
 
 {% block scripts %}
     {{super()}}
@@ -128,7 +129,7 @@ <h3>Contact Information:</h3>
                     {% endif %}
                     <br>
                 </div>
-                <div class="col-md-6">
+                                <div class="col-md-6">
                     {% if programTrainings %}
                         {% if program or not eventData.isAllVolunteerTraining %}
                             <h3>Program Trainings:</h3>

From 51629fd7619110bc5ea51927380d37ceb48b1c13 Mon Sep 17 00:00:00 2001
From: dea <dea@bere.edu>
Date: Mon, 8 Jul 2024 15:28:23 -0400
Subject: [PATCH 05/12] Removed logs

---
 app/templates/eventNav.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index 45bb43d94..fa36c594e 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -21,7 +21,7 @@
         {% set isInProg = not event.isPastEnd and event.isPastStart %}
         {% set display = "" if eventPast or event.isCanceled or isInProg else "d-none"%}
         {% set alertClass = ("alert-success" if isInProg else ( "alert-danger" if eventPast else "alert-warning")) %}
-        {{eventPast}}
+        
         <div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
         {% if eventPast and event.isCanceled %}
             This is a past event and it was canceled.

From 3e8c2a87cb3b28ee1215c971a47034dd59085e28 Mon Sep 17 00:00:00 2001
From: dea <dea@bere.edu>
Date: Mon, 8 Jul 2024 17:03:04 -0400
Subject: [PATCH 06/12] Added formatting to date

---
 app/templates/eventNav.html                | 6 ++++--
 app/templates/events/manageVolunteers.html | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index fa36c594e..3c00e5704 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -21,14 +21,16 @@
         {% set isInProg = not event.isPastEnd and event.isPastStart %}
         {% set display = "" if eventPast or event.isCanceled or isInProg else "d-none"%}
         {% set alertClass = ("alert-success" if isInProg else ( "alert-danger" if eventPast else "alert-warning")) %}
-        
+        {% set event_year = event.endDate.strftime("%Y") | int %}
+        {{ number }}
+
         <div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
         {% if eventPast and event.isCanceled %}
             This is a past event and it was canceled.
         {% elif isInProg %}
             This event is happening right now 
         {% elif eventPast %}
-            This is a past event and ended on {{ event.endDate }} at {{ event.timeEnd }}
+            This event ended on {{ event.endDate.strftime("%B %d %Y") }} at {{ event.timeEnd.strftime("%I:%M %p") }}
         {% elif event.isCanceled %}
             This event has been canceled.
         {% endif %}
diff --git a/app/templates/events/manageVolunteers.html b/app/templates/events/manageVolunteers.html
index c0fcd06e0..60db6cc16 100644
--- a/app/templates/events/manageVolunteers.html
+++ b/app/templates/events/manageVolunteers.html
@@ -3,6 +3,7 @@
 {% set eventPast = event.isPastStart %}
 {% set tabName = 'manageVolunteers' %}
 {% extends "eventNav.html" %}
+{% include 'eventData' }
 
 
 {% block scripts %}

From d935db14e1fdb65e6543e724fc2d77af0141c853 Mon Sep 17 00:00:00 2001
From: dea <dea@bere.edu>
Date: Tue, 9 Jul 2024 09:26:05 -0400
Subject: [PATCH 07/12] Added global variable for tmie

---
 app/__init__.py             | 5 +++++
 app/templates/eventNav.html | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/__init__.py b/app/__init__.py
index af22e6334..6b494b33a 100755
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -84,6 +84,11 @@ def load_currentTerm():
         session['current_term'] = model_to_dict(term)
         g.current_term = term
 
+import datetime
+@app.before_request
+def load_currentDateTime():
+    g.currentTime = datetime.datetime.now()
+
 from flask import request
 @app.context_processor
 def load_visibleAccordion():
diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index 3c00e5704..8d0386997 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -22,7 +22,8 @@
         {% set display = "" if eventPast or event.isCanceled or isInProg else "d-none"%}
         {% set alertClass = ("alert-success" if isInProg else ( "alert-danger" if eventPast else "alert-warning")) %}
         {% set event_year = event.endDate.strftime("%Y") | int %}
-        {{ number }}
+        {% set currentTimeYear = g.currentTime.year | int %}
+        {{ currentTime }}
 
         <div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
         {% if eventPast and event.isCanceled %}

From d651208b7b8cf5d8fbff10b2f25f3fe75b3a4e24 Mon Sep 17 00:00:00 2001
From: Josh Wakin <wakinj@berea.edu>
Date: Tue, 9 Jul 2024 09:54:49 -0400
Subject: [PATCH 08/12] Added conditions that check if the event is older than
 a year, if so display year

---
 app/templates/eventNav.html                | 8 +++++---
 app/templates/events/manageVolunteers.html | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index 8d0386997..680df9639 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -22,16 +22,18 @@
         {% set display = "" if eventPast or event.isCanceled or isInProg else "d-none"%}
         {% set alertClass = ("alert-success" if isInProg else ( "alert-danger" if eventPast else "alert-warning")) %}
         {% set event_year = event.endDate.strftime("%Y") | int %}
-        {% set currentTimeYear = g.currentTime.year | int %}
-        {{ currentTime }}
+        {% set currentYear = g.currentTime.year | int %}
+        {{ g.currentTime.year }}
 
         <div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
         {% if eventPast and event.isCanceled %}
             This is a past event and it was canceled.
         {% elif isInProg %}
             This event is happening right now 
-        {% elif eventPast %}
+        {% elif eventPast and currentYear > event_year%}
             This event ended on {{ event.endDate.strftime("%B %d %Y") }} at {{ event.timeEnd.strftime("%I:%M %p") }}
+        {% elif currentYear == event_year %}
+            This event ended on {{ event.endDate.strftime("%B %d ") }} at {{ event.timeEnd.strftime("%I:%M %p") }}
         {% elif event.isCanceled %}
             This event has been canceled.
         {% endif %}
diff --git a/app/templates/events/manageVolunteers.html b/app/templates/events/manageVolunteers.html
index 60db6cc16..50d719b53 100644
--- a/app/templates/events/manageVolunteers.html
+++ b/app/templates/events/manageVolunteers.html
@@ -3,7 +3,7 @@
 {% set eventPast = event.isPastStart %}
 {% set tabName = 'manageVolunteers' %}
 {% extends "eventNav.html" %}
-{% include 'eventData' }
+
 
 
 {% block scripts %}

From 9b684443127a5eefdfae16c2b5305fab12843f54 Mon Sep 17 00:00:00 2001
From: dea <dea@bere.edu>
Date: Tue, 9 Jul 2024 10:10:16 -0400
Subject: [PATCH 09/12] Updated conditionals to make it more readable. Updated
 banner to not show the year if the event ended in the same year.

---
 app/templates/eventNav.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index 680df9639..3cdc42e45 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -23,17 +23,15 @@
         {% set alertClass = ("alert-success" if isInProg else ( "alert-danger" if eventPast else "alert-warning")) %}
         {% set event_year = event.endDate.strftime("%Y") | int %}
         {% set currentYear = g.currentTime.year | int %}
-        {{ g.currentTime.year }}
+        {% set formatted_date = event.endDate.strftime("%B %d %Y") if currentYear > event_year else event.endDate.strftime("%B %d") %}
 
         <div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
         {% if eventPast and event.isCanceled %}
             This is a past event and it was canceled.
         {% elif isInProg %}
             This event is happening right now 
-        {% elif eventPast and currentYear > event_year%}
-            This event ended on {{ event.endDate.strftime("%B %d %Y") }} at {{ event.timeEnd.strftime("%I:%M %p") }}
-        {% elif currentYear == event_year %}
-            This event ended on {{ event.endDate.strftime("%B %d ") }} at {{ event.timeEnd.strftime("%I:%M %p") }}
+        {% elif eventPast %}
+            This event ended on {{ formatted_date }} at {{ event.timeEnd.strftime("%I:%M %p") }}
         {% elif event.isCanceled %}
             This event has been canceled.
         {% endif %}

From 5f4c49df4a9d5845a9bb5ad713218b42f651d5f3 Mon Sep 17 00:00:00 2001
From: Arav De <112141316+Araxision@users.noreply.github.com>
Date: Tue, 9 Jul 2024 10:12:45 -0400
Subject: [PATCH 10/12] Removed Lines

---
 app/templates/events/manageVolunteers.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/templates/events/manageVolunteers.html b/app/templates/events/manageVolunteers.html
index 50d719b53..418dae3d4 100644
--- a/app/templates/events/manageVolunteers.html
+++ b/app/templates/events/manageVolunteers.html
@@ -12,10 +12,6 @@
   <script type="text/javascript" src="https://cdn.datatables.net/v/dt/dt-1.11.3/r-2.2.9/datatables.min.js"></script>
 {% endblock %}
 
-
-
-
-
 {% block styles %}
 
   {{super()}}
@@ -368,4 +364,4 @@ <h5 class="modal-title">{{modalTitle}}</h5>
     </div>
   </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 760853cd2e978ffef10ea3b9d2e517bd35f523e4 Mon Sep 17 00:00:00 2001
From: dea <dea@bere.edu>
Date: Tue, 9 Jul 2024 16:17:42 -0400
Subject: [PATCH 11/12] All conversations resolved and changes made. Ready for
 review.

---
 app/__init__.py                 | 2 +-
 app/controllers/admin/routes.py | 5 -----
 app/templates/eventNav.html     | 2 +-
 app/templates/eventView.html    | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 6b494b33a..aaac89445 100755
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -87,7 +87,7 @@ def load_currentTerm():
 import datetime
 @app.before_request
 def load_currentDateTime():
-    g.currentTime = datetime.datetime.now()
+    g.currentDateTime = datetime.datetime.now()
 
 from flask import request
 @app.context_processor
diff --git a/app/controllers/admin/routes.py b/app/controllers/admin/routes.py
index 8563b3105..d2a31d4ba 100644
--- a/app/controllers/admin/routes.py
+++ b/app/controllers/admin/routes.py
@@ -211,13 +211,10 @@ def renewEvent(eventId):
 @admin_bp.route('/event/<eventId>/edit', methods=['GET','POST'])
 def eventDisplay(eventId):
     pageViewsCount = EventView.select().where(EventView.event == eventId).count()
-    current_time = datetime.now().time()
-    current_date = datetime.now().date()
     if request.method == 'GET' and request.path == f'/event/{eventId}/view':
         viewer = g.current_user
         event = Event.get_by_id(eventId)
         addEventView(viewer,event) 
-        eventCountdown = getCountdownToEvent(event)
     # Validate given URL
     try:
         event = Event.get_by_id(eventId)
@@ -283,8 +280,6 @@ def eventDisplay(eventId):
     # Event Edit
     if 'edit' in rule.rule:
         return render_template("admin/createEvent.html",
-                                current_time = current_time,
-                                current_date = current_date,
                                 eventData = eventData,
                                 futureTerms=futureTerms,
                                 event = event,
diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index 3cdc42e45..dc132e996 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -22,7 +22,7 @@
         {% set display = "" if eventPast or event.isCanceled or isInProg else "d-none"%}
         {% set alertClass = ("alert-success" if isInProg else ( "alert-danger" if eventPast else "alert-warning")) %}
         {% set event_year = event.endDate.strftime("%Y") | int %}
-        {% set currentYear = g.currentTime.year | int %}
+        {% set currentYear = g.currentDateTime.year | int %}
         {% set formatted_date = event.endDate.strftime("%B %d %Y") if currentYear > event_year else event.endDate.strftime("%B %d") %}
 
         <div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
diff --git a/app/templates/eventView.html b/app/templates/eventView.html
index 59826a38f..794ce0258 100644
--- a/app/templates/eventView.html
+++ b/app/templates/eventView.html
@@ -67,7 +67,7 @@ <h5 id="location"style="margin: 0;">Location:</h5>
                     <br>
                     <div>
                         {% if eventData.isRsvpRequired %}
-                            {% if not eventPast %}
+                            {% if eventPast != event.isPastEnd %}
                                 {% if userHasRSVPed %}
                                     <button type="submit" class="btn btn-danger" value="{{eventData.id}}" id="removeRsvpBtn">Remove RSVP</button>
                                 {% elif eventData.isRsvpRequired %}

From ad4618ca70a6405a3d7716d1e50f5d939964a966 Mon Sep 17 00:00:00 2001
From: dea <dea@bere.edu>
Date: Tue, 16 Jul 2024 15:14:56 -0400
Subject: [PATCH 12/12] Added comment and made the changes on the banner to
 update the text add the current time.

---
 app/templates/eventNav.html  | 4 ++--
 app/templates/eventView.html | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index dc132e996..cf47c1ff3 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -29,9 +29,9 @@
         {% if eventPast and event.isCanceled %}
             This is a past event and it was canceled.
         {% elif isInProg %}
-            This event is happening right now 
+            This event is in-progress! It started at {{event.timeStart.strftime("%I:%M %p")}}.
         {% elif eventPast %}
-            This event ended on {{ formatted_date }} at {{ event.timeEnd.strftime("%I:%M %p") }}
+            This event ended on {{ formatted_date }} at {{ event.timeEnd.strftime("%I:%M %p") }}.
         {% elif event.isCanceled %}
             This event has been canceled.
         {% endif %}
diff --git a/app/templates/eventView.html b/app/templates/eventView.html
index 794ce0258..8168a0835 100644
--- a/app/templates/eventView.html
+++ b/app/templates/eventView.html
@@ -3,6 +3,7 @@
 {% set isPastEnd = event.isPastEnd %} 
 {% set tabName = 'view' %}
 {% extends "eventNav.html"%}
+<!-- Without eventPast view event cannot use it when called through eventNav -->
 {% set eventPast = event.isPastStart if not isNewEvent else False %}
 
 {% block scripts %}
@@ -67,7 +68,7 @@ <h5 id="location"style="margin: 0;">Location:</h5>
                     <br>
                     <div>
                         {% if eventData.isRsvpRequired %}
-                            {% if eventPast != event.isPastEnd %}
+                            {% if not event.isPastStart %}
                                 {% if userHasRSVPed %}
                                     <button type="submit" class="btn btn-danger" value="{{eventData.id}}" id="removeRsvpBtn">Remove RSVP</button>
                                 {% elif eventData.isRsvpRequired %}