From f1149c8345449385f6b8ccabaf6e121b2dadfafc Mon Sep 17 00:00:00 2001
From: ramazanim <ramazanim@berea.edu>
Date: Thu, 13 Jun 2024 15:32:34 +0000
Subject: [PATCH 1/5] added graduation-flag branch

---
 app/templates/admin/cceMinor.html | 6 +++++-
 app/templates/eventNav.html       | 8 ++++----
 app/templates/eventView.html      | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/templates/admin/cceMinor.html b/app/templates/admin/cceMinor.html
index 1f46ed4b7..d462b7fe0 100644
--- a/app/templates/admin/cceMinor.html
+++ b/app/templates/admin/cceMinor.html
@@ -28,7 +28,11 @@ <h2>CCE Minor Progress</h2>
         {% for student in sustainedEngagement %}
         <tr>
             <td>
-                <a href="/profile/{{student.username}}/cceMinor" target="_blank">{{ student.firstName }} {{ student.lastName }}</a>
+                <a href="/profile/{{student.username}}/cceMinor" target="_blank">{{ student.firstName }} {{ student.lastName }} <svg width="20px" height="20px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-6">
+  <path d="M11.7 2.805a.75.75 0 0 1 .6 0A60.65 60.65 0 0 1 22.83 8.72a.75.75 0 0 1-.231 1.337 49.948 49.948 0 0 0-9.902 3.912l-.003.002c-.114.06-.227.119-.34.18a.75.75 0 0 1-.707 0A50.88 50.88 0 0 0 7.5 12.173v-.224c0-.131.067-.248.172-.311a54.615 54.615 0 0 1 4.653-2.52.75.75 0 0 0-.65-1.352 56.123 56.123 0 0 0-4.78 2.589 1.858 1.858 0 0 0-.859 1.228 49.803 49.803 0 0 0-4.634-1.527.75.75 0 0 1-.231-1.337A60.653 60.653 0 0 1 11.7 2.805Z" />
+  <path d="M13.06 15.473a48.45 48.45 0 0 1 7.666-3.282c.134 1.414.22 2.843.255 4.284a.75.75 0 0 1-.46.711 47.87 47.87 0 0 0-8.105 4.342.75.75 0 0 1-.832 0 47.87 47.87 0 0 0-8.104-4.342.75.75 0 0 1-.461-.71c.035-1.442.121-2.87.255-4.286.921.304 1.83.634 2.726.99v1.27a1.5 1.5 0 0 0-.14 2.508c-.09.38-.222.753-.397 1.11.452.213.901.434 1.346.66a6.727 6.727 0 0 0 .551-1.607 1.5 1.5 0 0 0 .14-2.67v-.645a48.549 48.549 0 0 1 3.44 1.667 2.25 2.25 0 0 0 2.12 0Z" />
+  <path d="M4.462 19.462c.42-.419.753-.89 1-1.395.453.214.902.435 1.347.662a6.742 6.742 0 0 1-1.286 1.794.75.75 0 0 1-1.06-1.06Z"/>
+</svg></a>
             </td>
             <td>{{ student.engagementCount }}/4 </td>
             <td>{{ student.hasSummer }}</td>
diff --git a/app/templates/eventNav.html b/app/templates/eventNav.html
index 6f92cceda..a271349c5 100644
--- a/app/templates/eventNav.html
+++ b/app/templates/eventNav.html
@@ -18,12 +18,12 @@
         {% 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 alertClass = "alert-danger" if isEventPast else "alert-warning"%}
+        {% set display = "" if isEventPast or event.isCanceled else "d-none"%}
         <div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
-        {% if eventPast and event.isCanceled %}
+        {% if isEventPast and event.isCanceled %} 
             This is a past event and it was canceled.
-        {% elif isEventPast %}
+        {% elif isEventPast %}   
             This is a past event.
         {% elif event.isCanceled %}
             This event has been canceled.
diff --git a/app/templates/eventView.html b/app/templates/eventView.html
index ef19c590a..b03a1389a 100644
--- a/app/templates/eventView.html
+++ b/app/templates/eventView.html
@@ -1,6 +1,6 @@
 {% set title = eventData.name %}
 {% set page_title = eventData.name %}
-{% set eventPast = event.isEventPast %} 
+{% set eventPast = event.isPast %} 
 {% set isEventPast = event.isEventPast %} 
 {% set tabName = 'view' %}
 {% extends "eventNav.html"%}

From 2e969ff76a95e3f79d409313bb03b62beac28ffb Mon Sep 17 00:00:00 2001
From: ramazanim <ramazanim@berea.edu>
Date: Thu, 13 Jun 2024 17:36:06 +0000
Subject: [PATCH 2/5] added hasGraduated attribute to User model

---
 app/models/user.py                | 1 +
 app/templates/admin/cceMinor.html | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/user.py b/app/models/user.py
index ba8c19ee3..f42d683b2 100644
--- a/app/models/user.py
+++ b/app/models/user.py
@@ -18,6 +18,7 @@ class User(baseModel):
     isCeltsStudentStaff = BooleanField(default = False)
     dietRestriction = TextField(null=True)
     minorInterest = BooleanField(default=False)
+    hasGraduated = BooleanField(default=False)  
 
     # override BaseModel's __init__ so that we can set up an instance attribute for cache
     def __init__(self,*args, **kwargs):
diff --git a/app/templates/admin/cceMinor.html b/app/templates/admin/cceMinor.html
index d462b7fe0..94af6ba89 100644
--- a/app/templates/admin/cceMinor.html
+++ b/app/templates/admin/cceMinor.html
@@ -28,11 +28,12 @@ <h2>CCE Minor Progress</h2>
         {% for student in sustainedEngagement %}
         <tr>
             <td>
-                <a href="/profile/{{student.username}}/cceMinor" target="_blank">{{ student.firstName }} {{ student.lastName }} <svg width="20px" height="20px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-6">
+                <a href="/profile/{{student.username}}/cceMinor" target="_blank">{{ student.firstName }} {{ student.lastName }} 
+                    {% if student.hasGraduated %} <svg width="20px" height="20px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-6">
   <path d="M11.7 2.805a.75.75 0 0 1 .6 0A60.65 60.65 0 0 1 22.83 8.72a.75.75 0 0 1-.231 1.337 49.948 49.948 0 0 0-9.902 3.912l-.003.002c-.114.06-.227.119-.34.18a.75.75 0 0 1-.707 0A50.88 50.88 0 0 0 7.5 12.173v-.224c0-.131.067-.248.172-.311a54.615 54.615 0 0 1 4.653-2.52.75.75 0 0 0-.65-1.352 56.123 56.123 0 0 0-4.78 2.589 1.858 1.858 0 0 0-.859 1.228 49.803 49.803 0 0 0-4.634-1.527.75.75 0 0 1-.231-1.337A60.653 60.653 0 0 1 11.7 2.805Z" />
   <path d="M13.06 15.473a48.45 48.45 0 0 1 7.666-3.282c.134 1.414.22 2.843.255 4.284a.75.75 0 0 1-.46.711 47.87 47.87 0 0 0-8.105 4.342.75.75 0 0 1-.832 0 47.87 47.87 0 0 0-8.104-4.342.75.75 0 0 1-.461-.71c.035-1.442.121-2.87.255-4.286.921.304 1.83.634 2.726.99v1.27a1.5 1.5 0 0 0-.14 2.508c-.09.38-.222.753-.397 1.11.452.213.901.434 1.346.66a6.727 6.727 0 0 0 .551-1.607 1.5 1.5 0 0 0 .14-2.67v-.645a48.549 48.549 0 0 1 3.44 1.667 2.25 2.25 0 0 0 2.12 0Z" />
   <path d="M4.462 19.462c.42-.419.753-.89 1-1.395.453.214.902.435 1.347.662a6.742 6.742 0 0 1-1.286 1.794.75.75 0 0 1-1.06-1.06Z"/>
-</svg></a>
+</svg>{% endif %}</a>
             </td>
             <td>{{ student.engagementCount }}/4 </td>
             <td>{{ student.hasSummer }}</td>

From 37efac9454b0f9fe22d03694df2ffcd0cdf5e646 Mon Sep 17 00:00:00 2001
From: CollegeStevenLN <156225590+CollegeStevenLN@users.noreply.github.com>
Date: Fri, 14 Jun 2024 19:53:30 +0000
Subject: [PATCH 3/5] Made adjustment to the html and model for graduation flag

---
 app/logic/minor.py                | 1 +
 app/templates/admin/cceMinor.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/logic/minor.py b/app/logic/minor.py
index a1068442d..9ca4d7e70 100644
--- a/app/logic/minor.py
+++ b/app/logic/minor.py
@@ -59,6 +59,7 @@ def getMinorProgress():
     engagedStudentsList = [{'username': student.username,
                             'firstName': student.firstName,
                             'lastName': student.lastName,
+                            'hasGraduated': student.hasGraduated, 
                             'engagementCount': student.engagementCount - student.hasSummer,
                             'hasCommunityEngagementRequest': student.hasCommunityEngagementRequest,
                             'hasSummer': "Completed" if student.hasSummer else "Incomplete"} for student in engagedStudentsWithCount]
diff --git a/app/templates/admin/cceMinor.html b/app/templates/admin/cceMinor.html
index 94af6ba89..80ef006da 100644
--- a/app/templates/admin/cceMinor.html
+++ b/app/templates/admin/cceMinor.html
@@ -26,6 +26,7 @@ <h2>CCE Minor Progress</h2>
     </thead>
     <tbody>
         {% for student in sustainedEngagement %}
+        {{student}}
         <tr>
             <td>
                 <a href="/profile/{{student.username}}/cceMinor" target="_blank">{{ student.firstName }} {{ student.lastName }} 

From 66afec59d51c1efd10b4ce7d6eac5983e55b58c5 Mon Sep 17 00:00:00 2001
From: ramazanim <ramazanim@berea.edu>
Date: Fri, 14 Jun 2024 22:39:00 +0000
Subject: [PATCH 4/5] fixed hasGraduated info coming from database

---
 app/logic/minor.py                | 1 +
 app/templates/admin/cceMinor.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/logic/minor.py b/app/logic/minor.py
index a1068442d..9ca4d7e70 100644
--- a/app/logic/minor.py
+++ b/app/logic/minor.py
@@ -59,6 +59,7 @@ def getMinorProgress():
     engagedStudentsList = [{'username': student.username,
                             'firstName': student.firstName,
                             'lastName': student.lastName,
+                            'hasGraduated': student.hasGraduated, 
                             'engagementCount': student.engagementCount - student.hasSummer,
                             'hasCommunityEngagementRequest': student.hasCommunityEngagementRequest,
                             'hasSummer': "Completed" if student.hasSummer else "Incomplete"} for student in engagedStudentsWithCount]
diff --git a/app/templates/admin/cceMinor.html b/app/templates/admin/cceMinor.html
index 94af6ba89..0695d5881 100644
--- a/app/templates/admin/cceMinor.html
+++ b/app/templates/admin/cceMinor.html
@@ -28,7 +28,7 @@ <h2>CCE Minor Progress</h2>
         {% for student in sustainedEngagement %}
         <tr>
             <td>
-                <a href="/profile/{{student.username}}/cceMinor" target="_blank">{{ student.firstName }} {{ student.lastName }} 
+                <a class="" href="/profile/{{student.username}}/cceMinor" target="_blank">{{ student.firstName }} {{ student.lastName }} 
                     {% if student.hasGraduated %} <svg width="20px" height="20px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-6">
   <path d="M11.7 2.805a.75.75 0 0 1 .6 0A60.65 60.65 0 0 1 22.83 8.72a.75.75 0 0 1-.231 1.337 49.948 49.948 0 0 0-9.902 3.912l-.003.002c-.114.06-.227.119-.34.18a.75.75 0 0 1-.707 0A50.88 50.88 0 0 0 7.5 12.173v-.224c0-.131.067-.248.172-.311a54.615 54.615 0 0 1 4.653-2.52.75.75 0 0 0-.65-1.352 56.123 56.123 0 0 0-4.78 2.589 1.858 1.858 0 0 0-.859 1.228 49.803 49.803 0 0 0-4.634-1.527.75.75 0 0 1-.231-1.337A60.653 60.653 0 0 1 11.7 2.805Z" />
   <path d="M13.06 15.473a48.45 48.45 0 0 1 7.666-3.282c.134 1.414.22 2.843.255 4.284a.75.75 0 0 1-.46.711 47.87 47.87 0 0 0-8.105 4.342.75.75 0 0 1-.832 0 47.87 47.87 0 0 0-8.104-4.342.75.75 0 0 1-.461-.71c.035-1.442.121-2.87.255-4.286.921.304 1.83.634 2.726.99v1.27a1.5 1.5 0 0 0-.14 2.508c-.09.38-.222.753-.397 1.11.452.213.901.434 1.346.66a6.727 6.727 0 0 0 .551-1.607 1.5 1.5 0 0 0 .14-2.67v-.645a48.549 48.549 0 0 1 3.44 1.667 2.25 2.25 0 0 0 2.12 0Z" />

From 1b2fceed83f116575d98efb037277955677efaf1 Mon Sep 17 00:00:00 2001
From: ramazanim <ramazanim@berea.edu>
Date: Mon, 17 Jun 2024 16:00:21 +0000
Subject: [PATCH 5/5] removed print statement

---
 app/templates/admin/cceMinor.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/templates/admin/cceMinor.html b/app/templates/admin/cceMinor.html
index 019e51aaf..0695d5881 100644
--- a/app/templates/admin/cceMinor.html
+++ b/app/templates/admin/cceMinor.html
@@ -26,7 +26,6 @@ <h2>CCE Minor Progress</h2>
     </thead>
     <tbody>
         {% for student in sustainedEngagement %}
-        {{student}}
         <tr>
             <td>
                 <a class="" href="/profile/{{student.username}}/cceMinor" target="_blank">{{ student.firstName }} {{ student.lastName }}