Added comment and made the changes on the banner to update the text a…

…dd the current time.
BCStudentSoftwareDevTeam · Jul 16, 2024 · ad4618c · ad4618c
1 parent 760853c
commit ad4618c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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 %}