1660 CCE minor students not showing

app/controllers/admin/minor.py

@@ -4,7 +4,7 @@
 
 from app.controllers.admin import admin_bp
 
-from app.logic.minor import getMinorInterest, getMinorProgress, toggleMinorInterest, getMinorSpreadsheet, getDeclaredMinorStudents
+from app.logic.minor import getDeclaredMinorStudents, getMinorInterest, getMinorProgress, toggleMinorInterest, getMinorSpreadsheet
 
 @admin_bp.route('/admin/cceMinor', methods=['GET','POST'])
 def manageMinor():
@@ -20,20 +20,19 @@ def manageMinor():
 
         return redirect(url_for("admin.manageMinor"))
 
-
-
     interestedStudentsList = getMinorInterest()
     interestedStudentEmailString = ';'.join([student['email'] for student in interestedStudentsList])
-    sustainedEngagement = getMinorProgress()
-    declaredStudentsList = getDeclaredMinorStudents()
-    declaredStudentEmailString = ';'.join([student['email'] for student in declaredStudentsList])    
+    declaredStudentsDict = getDeclaredMinorStudents()
+    declaredStudentEmailString = ';'.join([student['email'] for student in declaredStudentsDict])  
+
+    cceMinorStudents = declaredStudentsDict
+
 
     return render_template('/admin/cceMinor.html',
+                            cceMinorStudents = cceMinorStudents,
                             interestedStudentsList = interestedStudentsList,
-                            declaredStudentsList = declaredStudentsList,
                             interestedStudentEmailString = interestedStudentEmailString,
                             declaredStudentEmailString = declaredStudentEmailString,
-                            sustainedEngagement = sustainedEngagement,
                             )
 
 @admin_bp.route("/admin/cceMinor/download")

app/logic/minor.py

@@ -97,7 +97,10 @@ def getMinorProgress():
             .join(IndividualRequirement, on=(User.username == IndividualRequirement.username))
             .join(CertificationRequirement, on=(IndividualRequirement.requirement_id == CertificationRequirement.id))
             .switch(User).join(CCEMinorProposal, JOIN.LEFT_OUTER, on= (User.username == CCEMinorProposal.student))
-            .where(CertificationRequirement.certification_id == Certification.CCE)
+            .where(
+                (CertificationRequirement.certification_id == Certification.CCE) &
+                (User.declaredMinor == True)
+            )
             .group_by(User.firstName, User.lastName, User.username)
             .order_by(SQL("engagementCount").desc())
     )
@@ -184,13 +187,71 @@ def declareMinorInterest(username):
 
 def getDeclaredMinorStudents():
     """
-    Get a list of the students who have declared minor
+    This function retrieves a list of students who have declared the CCE minor along with their engagement progress.
+    It returns a list of dictionaries containing student information and their engagement details and adds students who have no requirements but have declared the minor with 0 engagements.
     """
-    declaredStudents = User.select().where(User.isStudent & User.declaredMinor)
+    summerEngagementCount = fn.COUNT(
+        fn.DISTINCT(
+            Case(
+                None,
+                [(CCEMinorProposal.proposalType == "Summer Experience", CCEMinorProposal.id)],
+                None
+            )
+        )
+    ).alias("summerEngagementCount")
+
+    # this returns the count of distinct engagements that have a certification requirement id.
+    # this is important because our join clause specifically joins individualrequirements with the certifications that match to CCE
+    # while leaving the rest as null
+    cceEngagementCount = fn.COUNT(
+        fn.DISTINCT(
+            Case(
+                None,
+                [(CertificationRequirement.id.is_null(False), IndividualRequirement.id)],
+                None
+            )
+        )
+    ).alias("allEngagementCount")
+
+    q = (
+        User
+        .select(
+            User,
+            cceEngagementCount,
+            summerEngagementCount,
+            fn.IF(fn.COUNT(fn.DISTINCT(CCEMinorProposal.id)) > 0, True, False).alias("hasCCEMinorProposal"),
+        )
+        .join(IndividualRequirement, JOIN.LEFT_OUTER, on=(User.username == IndividualRequirement.username))
+        .join(CertificationRequirement, JOIN.LEFT_OUTER, on=(
+            (IndividualRequirement.requirement_id == CertificationRequirement.id) &
+            (CertificationRequirement.certification_id == Certification.CCE)    # only cce minor certs are populated with non-null
+            ))
+        .switch(User)
+        .join(CCEMinorProposal, JOIN.LEFT_OUTER, on=(User.username == CCEMinorProposal.student))
+        .where(
+            (User.declaredMinor == True) & 
+            (User.isStudent == True)
+            )
+        .group_by(User.username)
+        .order_by(SQL("allEngagementCount").desc())
+    )
 
-    interestedStudentList = [model_to_dict(student) for student in declaredStudents]
+    result = []
+    for s in q:
+        engagementCount = int(s.allEngagementCount or 0)
+        result.append({
+            "firstName": s.firstName,
+            "lastName": s.lastName,
+            "username": s.username,
+            "B-Number": s.bnumber,
+            "email": s.email,
+            "hasGraduated": s.hasGraduated,
+            "engagementCount": engagementCount,
+            "hasCCEMinorProposal": bool(s.hasCCEMinorProposal),
+            "hasSummer": "Completed" if (s.summerEngagementCount and int(s.summerEngagementCount) > 0) else "Incomplete",
+        })
 
-    return interestedStudentList
+    return result
 
 def getCourseInformation(id):
     """
@@ -269,6 +330,7 @@ def setCommunityEngagementForUser(action, engagementData, currentUser):
                                            "requirement": requirement.get(),
                                            "addedBy": currentUser,
                                         })
+
         # Thrown if there are no available engagement requirements left. Handled elsewhere.
         except DoesNotExist as e:
             raise e 
@@ -279,6 +341,7 @@ def setCommunityEngagementForUser(action, engagementData, currentUser):
                 IndividualRequirement.username == engagementData['username'],
                 IndividualRequirement.term == engagementData['term']
             ).execute()
+
     else:
         raise Exception(f"Invalid action '{action}' sent to setCommunityEngagementForUser")
 
@@ -374,6 +437,7 @@ def saveSummerExperience(username, summerExperience, currentUser):
                                     "requirement": requirement.get(),
                                     "addedBy": currentUser,
                                 })
+
     return ""
 
 def getSummerExperience(username):

app/static/js/minorAdminPage.js

@@ -43,9 +43,9 @@ $('.remove_minor_candidate').on('click', function() {
     emailMinorCandidates($("#declaredStudentEmails").val())
   });
 
-  $('#emailAll').on('click', emailAll);
-
-  $(".updateMinorInterestButton").on("click", function(e){
+  $('#emailAll').on('click', emailAll); 
+  // this was done to fix a bug where the declare student button would not work on the second page.
+  $(document).on("click", ".updateMinorInterestButton", function(e){
     e.preventDefault();
     let interestForm = $("#updateMinorInterestForm");
     let url = $(this).data("url");

app/templates/admin/cceMinor.html

@@ -30,10 +30,11 @@ <h2>CCE Minor Progress</h2>
             <th>Sustained Engagements</th>
             <th>Summer Experience</th>
             <th>Requested Other Engagement</th>
+            <th>Remove from Minor</th>
         </tr>
     </thead>
     <tbody>
-        {% for student in sustainedEngagement %}
+        {% for student in cceMinorStudents %}
         <tr>
             <td>
                 {% from 'macros/graduationIconMacro.html' import graduationIcon %}
@@ -57,6 +58,12 @@ <h2>CCE Minor Progress</h2>
                 No
             {% endif %}
             </td>
+            <td>
+                <button class="btn btn-danger btn-sm remove_minor_candidate" 
+                        id="{{student.username}}" 
+                        aria-label="remove minor candidate">Remove
+                </button>
+            </td>
         </tr>
         {% endfor %}
     </tbody>
@@ -90,23 +97,17 @@ <h2>CCE Minor Candidates</h2>
       'id': 'interested',
       'label': 'Interested',
       'students': interestedStudentsList,
-      'emailString': interestedStudentEmailString,
       'actionLabel': 'Declare Student',
       'alwaysShow': true
-    },
-    {
-      'id': 'declared',
-      'label': 'Declared',
-      'students': declaredStudentsList,
-      'emailString': declaredStudentEmailString,
-      'actionLabel': 'Move To Interested',
-      'alwaysShow': true
     }
   ] %}
   {% set activeTab = request.args.get('tab', 'interested') %}
   {{ minorCandidatesTab(tabsInfo, defaultActiveTab=activeTab )}}
 </div>
 
+<input type="hidden" id="interestedStudentEmails"  value="{{ interestedStudentEmailString }}">
+
+<input type="hidden"  id="declaredStudentEmails"  value="{{ declaredStudentEmailString }}">
 <!-- #################  Modal  ################# -->
 
 <div class="modal fade" id="addInterestedStudentsModal" tabindex="-1" aria-labelledby="addInterestedStudentsLbl" aria-hidden="true">

app/templates/macros/minorCandidatesTabsMacro.html

@@ -44,16 +44,10 @@
                             data-url="/profile/{{student.username}}/updateMinorDeclaration" 
                             id="{{student.username}}" 
                             data-username="{{student.username}}">{{ tab.actionLabel }}
-                    </button>
-                    <button type="button" 
-                            class="remove_minor_candidate btn btn-danger btn-sm" 
-                            id="{{student.username}}" 
-                            aria-label="remove minor candidate">Remove
-                    </button>
+                  </button>
                   </td>
                 </tr>
               {% endfor %}
-              <input id="{{ tab.id }}StudentEmails" hidden value="{{ tab.emailString }}"/>
             </tbody>
           </table>
         </div>

database/test_data.py

@@ -243,6 +243,21 @@
         "rawClassLevel": "Senior",
         "minorInterest": None,
     },
+    {
+        "username" : "glek",
+        "bnumber" : "B00792345",
+        "email": "glek@berea.edu",
+        "phoneNumber": "(555)579-5555",
+        "firstName" : "Kafui",
+        "lastName" : "Gle",
+        "isStudent": True,
+        "isFaculty": False,
+        "isCeltsAdmin": False,
+        "isCeltsStudentStaff": False,
+        "major": "Computer Science",
+        "rawClassLevel": "Junior",
+        "minorInterest": None,
+    },
     {
         "username" : "michels",
         "bnumber" : "B00781963",
@@ -1027,7 +1042,14 @@
 ]
 
 IndividualRequirement.insert_many(individualReqs).on_conflict_replace().execute()
+# This ensures every user with an individual requirement has declaredMinor set to True so that when our query runs it can find users with  a "declaredMinor = True"
+req_usernames = {r["username"] for r in individualReqs if r.get("username")}
 
+(User
+ .update({User.declaredMinor: True})
+ .where(User.username.in_(req_usernames))
+ .execute()
+)
 
 courseInstructorRecords = [
     {

tests/code/test_graduationManagement.py

@@ -133,6 +133,8 @@ def test_getGraduationManagementUsers():
 
         IndividualRequirement.create(**sustainedEngagement)
 
+        testUser3.declaredMinor = True
+        testUser3.save()
         actualResult = getGraduationManagementUsers()
 
         # testUser4 is not a senior, graduating so they should not be shown.