From 357334959f42881b3bf94ad2b3a5871c984cc34a Mon Sep 17 00:00:00 2001 From: dea Date: Fri, 14 Jun 2024 13:44:18 +0000 Subject: [PATCH 1/7] Making a modal --- app/templates/admin/cceMinor.html | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/app/templates/admin/cceMinor.html b/app/templates/admin/cceMinor.html index 1f46ed4b7..7e772b00c 100644 --- a/app/templates/admin/cceMinor.html +++ b/app/templates/admin/cceMinor.html @@ -50,6 +50,7 @@

CCE Minor Progress

Interested Students

+
@@ -70,4 +71,31 @@

Interested Students

+ + + + {% endblock %} From d119f2d4537d8fdd147440623acec5c9304a000f Mon Sep 17 00:00:00 2001 From: dea Date: Fri, 14 Jun 2024 14:00:51 +0000 Subject: [PATCH 2/7] Making Modal --- app/templates/admin/cceMinor.html | 4 ++-- app/templates/events/manageVolunteers.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/admin/cceMinor.html b/app/templates/admin/cceMinor.html index 7e772b00c..6571ea087 100644 --- a/app/templates/admin/cceMinor.html +++ b/app/templates/admin/cceMinor.html @@ -50,7 +50,7 @@

CCE Minor Progress

Interested Students

- + {{modalTitle}}
@@ -79,7 +79,7 @@

Interested Students

{{modalTitle}}
- +
diff --git a/app/templates/events/manageVolunteers.html b/app/templates/events/manageVolunteers.html index 25225fab7..b0e4cdf15 100644 --- a/app/templates/events/manageVolunteers.html +++ b/app/templates/events/manageVolunteers.html @@ -36,7 +36,7 @@
- {{modalTitle}} + { }} Kiosk Entry
{% if rsvpFull %} From a9adb6dd13916fcdb251cba9ddd49df7317179ca Mon Sep 17 00:00:00 2001 From: Anupriya Dixit Date: Fri, 14 Jun 2024 20:08:39 +0000 Subject: [PATCH 3/7] almost working --- app/controllers/admin/routes.py | 8 ++ app/static/js/manageVolunteers.js | 3 +- app/static/js/minorAdminPage.js | 110 +++++++++++++++++++++ app/templates/admin/cceMinor.html | 21 +++- app/templates/events/manageVolunteers.html | 2 +- 5 files changed, 138 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/routes.py b/app/controllers/admin/routes.py index 5783f9c77..7652bca46 100644 --- a/app/controllers/admin/routes.py +++ b/app/controllers/admin/routes.py @@ -38,6 +38,7 @@ from app.logic.serviceLearningCourses import parseUploadedFile, saveCourseParticipantsToDatabase, unapprovedCourses, approvedCourses, getImportedCourses, getInstructorCourses, editImportedCourses from app.controllers.admin import admin_bp +from minorAdminPage.js import getInterestedStudents @admin_bp.route('/switch_user', methods=['POST']) def switchUser(): @@ -592,3 +593,10 @@ def displayEventFile(): eventfile=FileHandler(eventId=fileData["id"]) eventfile.changeDisplay(fileData['id']) return "" + + +@app.route('/interested_students') +def interested_students(): + + interestedStudentList = getInterestedStudents() + return render_template('cceMinor.html', interestedStudentList= interestedStudentList) diff --git a/app/static/js/manageVolunteers.js b/app/static/js/manageVolunteers.js index 5446f085e..693aa7968 100644 --- a/app/static/js/manageVolunteers.js +++ b/app/static/js/manageVolunteers.js @@ -91,7 +91,8 @@ $(document).ready(function() { url: `/addVolunteersToEvent/${eventId}`, type: "POST", data: {"selectedVolunteers": selectedVolunteers, "ajax": true}, - success: function(s){ + success: + function(s){ location.reload() }, error: function(request, status, error){ diff --git a/app/static/js/minorAdminPage.js b/app/static/js/minorAdminPage.js index fd0e03cb2..7aae1316e 100644 --- a/app/static/js/minorAdminPage.js +++ b/app/static/js/minorAdminPage.js @@ -1,3 +1,4 @@ +import searchUser from './searchUser.js' function emailAllInterested(){ // Read all student emails from the input as a string and put them in mailto format let interestedStudentEmails = $("#interestedStudentEmails").val(); @@ -15,6 +16,115 @@ function emailAllInterested(){ } } + + +function getInterestedStudents() { + // get all the checkboxes and return a list of users who's + // checkboxes are selected + let checkboxesDisplayedInModal = $("#addInterestedStudentsModal input[type=checkbox]") + let interestedStudentsList = [] + checkboxesDisplayedInModal.each(function(index, checkbox){ + if(checkbox["checked"]){ + interestedStudentsList.push(checkbox["value"]) + } + }) + return interestedStudentsList +} + + + +// Adding the interested student to the user database table +$("#addInterestedStudentsbtn").click(function(){ + $("#addInterestedStudentsbtn").prop("disabled", true) + let eventId = $("#eventID").val() + let interestedStudentList = getInterestedStudents() + $.ajax({ + url: `/addVolunteersToEvent/${eventId}`, + type: "POST", + data: {"interestedStudentList": interestedStudentList, "ajax": true}, + success: + function(s){ + location.reload() + }, + error: function(request, status, error){ + location.reload() + } + }) +}) + +function updateInterestedStudents(){ + let interestedStudentList = getInterestedStudents() + let buttonContent = $("#addInterestedStudentsbtn").html() + if (interestedStudentList.length > 1) { + if (buttonContent.charAt(buttonContent.length-1) != "s") { + // make the button text plural if there are multiple users selected + $("#addInterestedStudentsbtn").html(buttonContent + "s") + } + } else if (buttonContent.charAt(buttonContent.length-1) == "s") { + // remove the s if it is plural and we have less than 2 volunteers + $("#addInterestedStudentsbtn").html(buttonContent.slice(0, -1)) + } + // disable the submit button if there are no selectedCheckboxes + if (interestedStudentList.length == 0) { + + $("#addInterestedStudentsbtn").prop("disabled", true) + } else { + $("#addInterestedStudentsbtn").prop("disabled", false) + } + +} + + +var userlist = $(".interestedStudentList").map(function(){ + return $(this).val() +}).get() +function callback(selected) { + let user = $("#addStudentInput").val() + if (userlist.includes(selected["username"]) == false){ + userlist.push(user) + let i = userlist.length; + $("#interestedStudentList").prepend("
    • ") + $("#interestedStudentElement"+i).append(" ") + $("#interestedStudentElement"+i).append("") + //handleBanned(selected["username"], $("#eventID").val(), i) + $("#userlistCheckbox"+i).click(updateInterestedStudents) + updateInterestedStudents() + } + else { + msgFlash("User already selected.") + } +} +$("#addInterestedStudentsbtn").prop('disabled', true); ++ +$("#addInterestedStudentsModal").on("shown.bs.modal", function() { + $('#addStudentInput').focus(); +}); + +$("#addStudentInput").on("input", function() { +searchUser("addStudentInput", callback, true, "addInterestedStudentsModal"); +}); + + + +function removeVolunteer(){ + $(".removeVolunteer").prop("disabled", true) + let username = this.id; + let eventId = $('#eventID').val() + $.ajax({ + url: '/removeVolunteerFromEvent', + type: "POST", + data: {username: username, eventId: eventId}, + success: function(response) { + location.reload(); + }, + error: function(request, status, error) { + $(".removeVolunteer").prop("disabled", false) + } + }); +} + + + $(document).ready(function() { $('#engagedStudentsTable').DataTable(); $('#interestedStudentsTable').DataTable(); diff --git a/app/templates/admin/cceMinor.html b/app/templates/admin/cceMinor.html index 6571ea087..5aa73d285 100644 --- a/app/templates/admin/cceMinor.html +++ b/app/templates/admin/cceMinor.html @@ -13,6 +13,9 @@ {% endblock %} {% block app_content %} +{% set modalTitle = "Add Students" %} + +{% set buttonName = "Add Students" %}

    CCE Minor Management

    CCE Minor Progress

    @@ -50,7 +53,7 @@

    CCE Minor Progress

    Interested Students

    - {{modalTitle}} + {{modalTitle}}
    @@ -74,12 +77,12 @@

    Interested Students

    - From 0368b4e7259ee56b2706fd9a58ebdcbf2960efec Mon Sep 17 00:00:00 2001 From: dea Date: Mon, 17 Jun 2024 17:27:03 +0000 Subject: [PATCH 5/7] Form is not being retrieved properly --- app/controllers/admin/minor.py | 11 +++--- app/static/js/minorAdminPage.js | 58 ++++++++++--------------------- app/templates/admin/cceMinor.html | 2 +- 3 files changed, 26 insertions(+), 45 deletions(-) diff --git a/app/controllers/admin/minor.py b/app/controllers/admin/minor.py index 7705717c5..162b1e3d7 100644 --- a/app/controllers/admin/minor.py +++ b/app/controllers/admin/minor.py @@ -9,13 +9,14 @@ def manageMinor(): if not g.current_user.isAdmin: abort(403) - + if request.method == 'POST': - interested_students = request.form.getlist('interestedStudents[]') + interested_students = request.form.getlist('interestedStudent[]') + + print("###################################################") + print(interested_students) for i in interested_students: - toggleMinorInterest(i) - return redirect(url_for('admin.manageMinor')) - + toggleMinorInterest(i) interestedStudentsList = getMinorInterest() diff --git a/app/static/js/minorAdminPage.js b/app/static/js/minorAdminPage.js index 7aae1316e..651dff804 100644 --- a/app/static/js/minorAdminPage.js +++ b/app/static/js/minorAdminPage.js @@ -17,7 +17,6 @@ function emailAllInterested(){ } - function getInterestedStudents() { // get all the checkboxes and return a list of users who's // checkboxes are selected @@ -31,27 +30,6 @@ function getInterestedStudents() { return interestedStudentsList } - - -// Adding the interested student to the user database table -$("#addInterestedStudentsbtn").click(function(){ - $("#addInterestedStudentsbtn").prop("disabled", true) - let eventId = $("#eventID").val() - let interestedStudentList = getInterestedStudents() - $.ajax({ - url: `/addVolunteersToEvent/${eventId}`, - type: "POST", - data: {"interestedStudentList": interestedStudentList, "ajax": true}, - success: - function(s){ - location.reload() - }, - error: function(request, status, error){ - location.reload() - } - }) -}) - function updateInterestedStudents(){ let interestedStudentList = getInterestedStudents() let buttonContent = $("#addInterestedStudentsbtn").html() @@ -71,7 +49,9 @@ function updateInterestedStudents(){ } else { $("#addInterestedStudentsbtn").prop("disabled", false) } - + $('#addInterestedStudentbtn').click(function() { + $('#interestedStudentForm').submit(); + }); } @@ -106,22 +86,22 @@ searchUser("addStudentInput", callback, true, "addInterestedStudentsModal"); -function removeVolunteer(){ - $(".removeVolunteer").prop("disabled", true) - let username = this.id; - let eventId = $('#eventID').val() - $.ajax({ - url: '/removeVolunteerFromEvent', - type: "POST", - data: {username: username, eventId: eventId}, - success: function(response) { - location.reload(); - }, - error: function(request, status, error) { - $(".removeVolunteer").prop("disabled", false) - } - }); -} +// function removeVolunteer(){ +// $(".removeVolunteer").prop("disabled", true) +// let username = this.id; +// let eventId = $('#eventID').val() +// $.ajax({ +// url: '/removeVolunteerFromEvent', +// type: "POST", +// data: {username: username, eventId: eventId}, +// success: function(response) { +// location.reload(); +// }, +// error: function(request, status, error) { +// $(".removeVolunteer").prop("disabled", false) +// } +// }); +// } diff --git a/app/templates/admin/cceMinor.html b/app/templates/admin/cceMinor.html index 1803e0680..e7842fb5a 100644 --- a/app/templates/admin/cceMinor.html +++ b/app/templates/admin/cceMinor.html @@ -94,7 +94,7 @@
    {{modalTitle}}
    -
    +
      {%for participant in interestedStudentList%} From 1d34ca74a5f27a08c7b2a38992d738bd6b214364 Mon Sep 17 00:00:00 2001 From: dea Date: Mon, 17 Jun 2024 19:14:08 +0000 Subject: [PATCH 6/7] Issue Fixed --- app/controllers/admin/minor.py | 10 ++++------ app/logic/minor.py | 11 +++++++++++ app/static/js/minorAdminPage.js | 6 +++--- app/templates/admin/cceMinor.html | 23 ++++++++--------------- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/app/controllers/admin/minor.py b/app/controllers/admin/minor.py index 162b1e3d7..95e06a671 100644 --- a/app/controllers/admin/minor.py +++ b/app/controllers/admin/minor.py @@ -2,7 +2,7 @@ from app.controllers.admin import admin_bp -from app.logic.minor import getMinorInterest, getMinorProgress, toggleMinorInterest +from app.logic.minor import getMinorInterest, getMinorProgress, toggleMinorInterest, checkToggle @admin_bp.route('/admin/cceMinor', methods=['POST','GET']) def manageMinor(): @@ -11,12 +11,10 @@ def manageMinor(): abort(403) if request.method == 'POST': - interested_students = request.form.getlist('interestedStudent[]') - - print("###################################################") - print(interested_students) + interested_students = request.form.getlist('interestedStudents[]') for i in interested_students: - toggleMinorInterest(i) + if checkToggle(i) == False: + toggleMinorInterest(i) interestedStudentsList = getMinorInterest() diff --git a/app/logic/minor.py b/app/logic/minor.py index a1068442d..6601cefe0 100644 --- a/app/logic/minor.py +++ b/app/logic/minor.py @@ -72,6 +72,17 @@ def toggleMinorInterest(username): user.minorInterest = not user.minorInterest user.save() + +def checkToggle(username): + ''' + To check if a username is already selected as an interested student + ''' + user = User.get(username=username) + if user.minorInterest == 0: + return False + else: + return True + def getCourseInformation(id): """ diff --git a/app/static/js/minorAdminPage.js b/app/static/js/minorAdminPage.js index 651dff804..03355500e 100644 --- a/app/static/js/minorAdminPage.js +++ b/app/static/js/minorAdminPage.js @@ -49,8 +49,8 @@ function updateInterestedStudents(){ } else { $("#addInterestedStudentsbtn").prop("disabled", false) } - $('#addInterestedStudentbtn').click(function() { - $('#interestedStudentForm').submit(); + $('#addInterestedStudentsbtn').click(function() { + $('#interestedStudentForm').submit();s }); } @@ -64,7 +64,7 @@ function callback(selected) { userlist.push(user) let i = userlist.length; $("#interestedStudentList").prepend("
      • ") - $("#interestedStudentElement"+i).append(" ") + $("#interestedStudentElement"+i).append(" ") $("#interestedStudentElement"+i).append("") //handleBanned(selected["username"], $("#eventID").val(), i) $("#userlistCheckbox"+i).click(updateInterestedStudents) diff --git a/app/templates/admin/cceMinor.html b/app/templates/admin/cceMinor.html index e7842fb5a..489238acc 100644 --- a/app/templates/admin/cceMinor.html +++ b/app/templates/admin/cceMinor.html @@ -94,21 +94,14 @@
      {{modalTitle}}
      - -
        - - {%for participant in interestedStudentList%} -
      • - - - -
        • - {% endfor %} -
      -
      - - -
      + +
        +
      +
      + + +
      From 74ec573fb46f87465c2615d09c48f4b47d760b6b Mon Sep 17 00:00:00 2001 From: dea Date: Mon, 17 Jun 2024 21:12:26 +0000 Subject: [PATCH 7/7] Resolved the changes required --- app/controllers/admin/minor.py | 8 ++++-- app/logic/minor.py | 11 -------- app/static/js/minorAdminPage.js | 42 +++++-------------------------- app/templates/admin/cceMinor.html | 10 +++----- 4 files changed, 15 insertions(+), 56 deletions(-) diff --git a/app/controllers/admin/minor.py b/app/controllers/admin/minor.py index 95e06a671..bc66862b6 100644 --- a/app/controllers/admin/minor.py +++ b/app/controllers/admin/minor.py @@ -1,8 +1,10 @@ from flask import render_template, g, abort, request, redirect, url_for +from app.models.user import User + from app.controllers.admin import admin_bp -from app.logic.minor import getMinorInterest, getMinorProgress, toggleMinorInterest, checkToggle +from app.logic.minor import getMinorInterest, getMinorProgress, toggleMinorInterest @admin_bp.route('/admin/cceMinor', methods=['POST','GET']) def manageMinor(): @@ -12,8 +14,10 @@ def manageMinor(): if request.method == 'POST': interested_students = request.form.getlist('interestedStudents[]') + for i in interested_students: - if checkToggle(i) == False: + user = User.get(username=i) + if not user.minorInterest: toggleMinorInterest(i) diff --git a/app/logic/minor.py b/app/logic/minor.py index 6601cefe0..a1068442d 100644 --- a/app/logic/minor.py +++ b/app/logic/minor.py @@ -72,17 +72,6 @@ def toggleMinorInterest(username): user.minorInterest = not user.minorInterest user.save() - -def checkToggle(username): - ''' - To check if a username is already selected as an interested student - ''' - user = User.get(username=username) - if user.minorInterest == 0: - return False - else: - return True - def getCourseInformation(id): """ diff --git a/app/static/js/minorAdminPage.js b/app/static/js/minorAdminPage.js index 03355500e..b310439e1 100644 --- a/app/static/js/minorAdminPage.js +++ b/app/static/js/minorAdminPage.js @@ -20,12 +20,10 @@ function emailAllInterested(){ function getInterestedStudents() { // get all the checkboxes and return a list of users who's // checkboxes are selected - let checkboxesDisplayedInModal = $("#addInterestedStudentsModal input[type=checkbox]") + let checkboxesDisplayedInModal = $("#addInterestedStudentsModal input[type=checkbox]:checked") let interestedStudentsList = [] - checkboxesDisplayedInModal.each(function(index, checkbox){ - if(checkbox["checked"]){ - interestedStudentsList.push(checkbox["value"]) - } + checkboxesDisplayedInModal.each(function(index, checkbox){ + interestedStudentsList.push(checkbox["value"]) }) return interestedStudentsList } @@ -49,24 +47,17 @@ function updateInterestedStudents(){ } else { $("#addInterestedStudentsbtn").prop("disabled", false) } - $('#addInterestedStudentsbtn').click(function() { - $('#interestedStudentForm').submit();s - }); } - -var userlist = $(".interestedStudentList").map(function(){ - return $(this).val() -}).get() +var userlist = [] function callback(selected) { let user = $("#addStudentInput").val() if (userlist.includes(selected["username"]) == false){ userlist.push(user) let i = userlist.length; $("#interestedStudentList").prepend("
      • ") - $("#interestedStudentElement"+i).append(" ") - $("#interestedStudentElement"+i).append("") - //handleBanned(selected["username"], $("#eventID").val(), i) + $("#interestedStudentElement"+i).append(" ", + "") $("#userlistCheckbox"+i).click(updateInterestedStudents) updateInterestedStudents() } @@ -84,27 +75,6 @@ $("#addStudentInput").on("input", function() { searchUser("addStudentInput", callback, true, "addInterestedStudentsModal"); }); - - -// function removeVolunteer(){ -// $(".removeVolunteer").prop("disabled", true) -// let username = this.id; -// let eventId = $('#eventID').val() -// $.ajax({ -// url: '/removeVolunteerFromEvent', -// type: "POST", -// data: {username: username, eventId: eventId}, -// success: function(response) { -// location.reload(); -// }, -// error: function(request, status, error) { -// $(".removeVolunteer").prop("disabled", false) -// } -// }); -// } - - - $(document).ready(function() { $('#engagedStudentsTable').DataTable(); $('#interestedStudentsTable').DataTable(); diff --git a/app/templates/admin/cceMinor.html b/app/templates/admin/cceMinor.html index 489238acc..a6a728277 100644 --- a/app/templates/admin/cceMinor.html +++ b/app/templates/admin/cceMinor.html @@ -12,10 +12,6 @@ {% endblock %} {% endblock %} {% block app_content %} - -{% set modalTitle = "Add Students" %} - -{% set buttonName = "Add Students" %}

      CCE Minor Management

      CCE Minor Progress

    @@ -53,7 +49,7 @@

    CCE Minor Progress

    Interested Students

    - {{modalTitle}} + Add Students
    @@ -94,13 +90,13 @@
    {{modalTitle}}
    - +
    - +