CCE Minor Withdrawal Functionality

app/controllers/minor/routes.py

@@ -7,7 +7,7 @@
 from app.models.term import Term
 from app.logic.fileHandler import FileHandler
 from app.logic.utils import selectSurroundingTerms, getFilesFromRequest
-from app.logic.minor import createOtherEngagementRequest, setCommunityEngagementForUser, getSummerExperience, getEngagementTotal, createSummerExperience, getProgramEngagementHistory, getCourseInformation, getCommunityEngagementByTerm, getCCEMinorProposals, createOtherEngagementRequest, getMinorSpreadsheet
+from app.logic.minor import createOtherEngagementRequest, setCommunityEngagementForUser, getSummerExperience, getEngagementTotal, createSummerExperience, getProgramEngagementHistory, getCourseInformation, getCommunityEngagementByTerm, getCCEMinorProposals, createOtherEngagementRequest, removeProposal, getMinorSpreadsheet
 
 @minor_bp.route('/profile/<username>/cceMinor', methods=['GET'])
 def viewCceMinor(username):
@@ -85,6 +85,21 @@ def getEngagementInformation(username, type, id, term):
 
     return information
 
+
+@minor_bp.route('/cceMinor/withdraw/<username>/<proposalID>', methods = ['POST'])
+def withdrawProposal(username, proposalID):
+    try:
+        if g.current_user.isAdmin or g.current_user.isFaculty or g.current_user == username:
+            removeProposal(proposalID)
+            flash("Experience successfully withdrawn", 'success')
+        else:
+            flash("Unauthorized to perform this action", 'warning')
+    except Exception as e:
+        print(e)
+        flash("Withdrawal Unsuccessful", 'warning')
+    return ""
+
+
 @minor_bp.route('/cceMinor/getMinorSpreadsheet', methods=['GET'])
 def returnMinorSpreadsheet():
     """

app/logic/fileHandler.py

@@ -2,6 +2,7 @@
 from flask import redirect, url_for
 from app import app
 from app.models.attachmentUpload import AttachmentUpload
+from app.models.cceMinorProposal import CCEMinorProposal
 from app.models.program import Program
 import glob
 
@@ -14,7 +15,8 @@ def __init__(self, files=None, courseId=None, eventId=None, programId=None, prop
         self.courseId = courseId
         self.eventId = eventId
         self.programId = programId
-        self.proposalId = proposalId
+        self.proposalId = proposalId 
+
         if courseId:
             self.path = os.path.join(self.path, app.config['files']['course_attachment_path'], str(courseId))
         elif eventId:
@@ -41,6 +43,7 @@ def getFileFullPath(self, newfilename=''):
             pass
         except FileExistsError:
             pass
+
         return filePath
 
     def saveFiles(self, saveOriginalFile=None):
@@ -74,8 +77,7 @@ def saveFiles(self, saveOriginalFile=None):
                     AttachmentUpload.create(program=self.programId, fileName=fileName)
                     currentProgramID = fileName
                     saveFileToFilesystem = currentProgramID
-
-
+
                 elif self.proposalId:
                     fileType = file.filename.split('.')[-1]
                     fileName = f"{self.proposalId}.{fileType}"

app/logic/minor.py

@@ -18,6 +18,10 @@
 from app.models.individualRequirement import IndividualRequirement
 from app.models.certificationRequirement import CertificationRequirement
 from app.models.cceMinorProposal import CCEMinorProposal
+from app.logic.createLogs import createActivityLog
+from app.logic.fileHandler import FileHandler
+from app.logic.serviceLearningCourses import deleteCourseObject
+from app.models.attachmentUpload import AttachmentUpload
 
 
 def createSummerExperience(username, formData):
@@ -393,3 +397,17 @@ def removeSummerExperience(username):
     """
     term, summerExperienceToDelete = getSummerExperience(username)
     IndividualRequirement.delete().where(IndividualRequirement.username == username, IndividualRequirement.description == summerExperienceToDelete).execute()
+
+def removeProposal(proposalID) -> None:
+    """
+    Delete summer experience or other engagement objects from the CCEMinorProposal table. 
+    File objects attached to the CCEMinorProposal object are also deleted. 
+    """
+    proposalID = int(proposalID)
+
+    proposalAttachment = AttachmentUpload.get_or_none(proposal=proposalID)
+    if proposalAttachment:
+        proposalFileHandler = FileHandler(proposalId=proposalID)
+        proposalFileHandler.deleteFile(proposalAttachment.id)
+
+    CCEMinorProposal.delete().where(CCEMinorProposal.id == proposalID).execute()

app/models/attachmentUpload.py

@@ -2,7 +2,7 @@
 from app.models.event import Event
 from app.models.course import Course
 from app.models.program import Program
-from app.models.cceMinorProposal import CCEMinorProposal 
+from app.models.cceMinorProposal import CCEMinorProposal
 
 class AttachmentUpload(baseModel):
     event = ForeignKeyField(Event, null=True)

app/static/js/minorProfilePage.js

@@ -2,13 +2,53 @@ import { validateEmail } from "./emailValidation.mjs";
 
 $(document).ready(function() {
   $("#supervisorEmail").on('input', validateEmail);
+  $("#withdrawBtn").on("click", withdrawProposal);
+
+function changeAction(action){
+      let proposalID = action.id;
+      let proposalAction = action.value;
+      // decides what to do based on selection
+    if (proposalAction == "Withdraw"){
+        $('#proposalID').val(proposalID);
+        $('#withdrawModal').modal('show');
+
+      }
+      resetAllSelections()
+    }
+
+
+ function resetAllSelections() {
+      $('.form-select').val('---');
+ }
+
+
+  function withdrawProposal(){
+      // uses hidden label to withdraw course
+      let proposalID = $("#proposalID").val();
+      let username = $("#username").val()
+      $.ajax({
+        url: `/cceMinor/withdraw/${username}/${proposalID}`,
+        type: "POST",
+        success: function(s){
+          window.location.href = `/profile/${username}/cceMinor?tab=manageProposals`
+        },  
+        error: function(request, status, error) {
+            console.log(status, error);
+        }
+      })
+      resetAllSelections()
+    };
+
+
+  window.changeAction = changeAction;
 
   $('input.phone-input').inputmask('(999)-999-9999')
   $('input.phone-input').on('input', function(){
       let matches = $(this).val().match(/\d/g);
       let digits = matches?matches.length:0;
       if (digits == 0 || digits == 10){
           this.setCustomValidity('')
+
       }
       else{
           this.setCustomValidity('Please enter a valid phone number.')    
@@ -24,6 +64,7 @@ $(document).ready(function() {
       e.stopPropagation()
 
       let engagementData = $(this).parents('.engagement-row').data('engagement-data');
+
       toggleEngagementCredit($(this).is(':checked'), engagementData, this)
   });
 

app/static/js/slcManagement.js

@@ -127,7 +127,7 @@ function renew(){
       }
     })
     resetAllSelections()
-}
+  }
 function withdraw(){
   // uses hidden label to withdraw course
   let courseID = $("#courseID").val();

app/templates/minor/cceMinorProposalManagement.html

@@ -1,6 +1,4 @@
-
 <div class="tab-pane fade show {{ 'active' if activeTab == 'manageProposals' else '' }}" id="pills-manageProposals" role="tabpanel" aria-labelledby="manageProposals">
-
     <div class="table-responsive" id="proposalTable">
     <table class="table table-striped">
         <thead>
@@ -38,6 +36,7 @@
 
         </tbody>
     </table>
+    <input id="proposalID" type="hidden">
     {% if not proposalList %}
         <p class="text-center">{{user.firstName}} {{user.lastName}} has no associated CCE Minor proposals.</p>
     {% endif %}
@@ -64,6 +63,7 @@ <h5 class="modal-title" id="withdrawModalLabel">Withdraw Proposal</h5>
             <button type="button" class="btn btn-primary" id="withdrawBtn">Withdraw</button>
         </div>
         </div>
+    </input>
     </div>
     </div>
     <div class="modal fade" id="renewModal" tabindex="-1" aria-labelledby="renewModalLabel" aria-hidden="true">
@@ -105,4 +105,6 @@ <h5 class="modal-title" id="renewModalLabel">Renew Course</h5>
         </div>
     </div>
   </div>
-</div>
+</div>
+
+

app/templates/minor/companyOrganizationInformation.html

@@ -5,26 +5,26 @@ <h4>Company/Organization Information</h4>
 </div>
 
 <div class="form-group">
-    <label class="form-label" for="orgName"><strong>Name</strong></label>
+    <label class="required form-label" for="orgName"><strong>Name</strong></label>
     <input class="form-control" id="orgName" name="orgName" placeholder="Company or organization's name" required/>
 </div>
 
 <br>
 
 <div class="form-group">
-    <label class="form-label" for="orgAddress"><strong>Address</strong></label>
+    <label class="required form-label" for="orgAddress"><strong>Address</strong></label>
     <input class="form-control" id="orgAddress" name="orgAddress" placeholder="Company or organization's physical address" required/>
 </div>
 
 <br>
 
 <div class="row">
     <div class="form-group col-6">
-        <label class="form-label" for="orgPhone"><strong>Phone Number</strong></label>
+        <label class="required form-label" for="orgPhone"><strong>Phone Number</strong></label>
         <input class="form-control phone-input" type="text" id="orgPhone" name="orgPhone" placeholder="Company or organization's phone number" required/>
     </div>
     <div class="form-group col-6">
-        <label class="form-label" for="orgWebsite"><strong>Website</strong></label>
+        <label class="required form-label" for="orgWebsite"><strong>Website</strong></label>
         <input class="form-control" id="orgWebsite" name="orgWebsite" placeholder="Company or organization's website" required/>
     </div>
 </div>

app/templates/minor/requestOtherEngagement.html

@@ -32,7 +32,7 @@ <h4 class='form-label' for='studentUser'> Proposal for Other Community Engaged E
           </div>
 
           <div class="form-group">
-              <label class="form-label" for="term"><strong>Term</strong></label>
+              <label class="required form-label" for="term"><strong>Term</strong></label>
               <select class="form-select" name="term" id="term" required {% if other_experience %}disabled{% endif %}>
                 <option value="" disabled selected>Select Year</option> 
                 {% for term in selectableTerms %}
@@ -44,7 +44,7 @@ <h4 class='form-label' for='studentUser'> Proposal for Other Community Engaged E
           <br>
 
           <div class="form-group">
-              <label class="form-label" for="experienceName"><strong>Experience Title</strong></label>
+              <label class="required form-label" for="experienceName"><strong>Experience Title</strong></label>
               <input class="form-control" id="experienceName" placeholder="Enter a name for your experience" name="experienceName" required value="{{ other_experience.activity if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
           </div>
 
@@ -55,7 +55,7 @@ <h4 class='form-label' for='studentUser'> Proposal for Other Community Engaged E
           {% include "minor/supervisorInformation.html" %} 
 
           <div class="form-group">
-              <label class="mb-2" for="supervisorAttachment"><strong>Upload Confirmation of Participation</strong> (From Supervisor)</label>
+              <label class="mb-2 required" for="supervisorAttachment"><strong>Upload Confirmation of Participation</strong> (From Supervisor)</label>
               <input class="form-control" id="supervisorAttachment" name="attachmentObject" type="file" multiple accept=".png, .jpg, .pdf, .jpeg, .docx, .xlsx" {% if other_experience %}disabled{% endif %}/>
           </div>
 
@@ -66,21 +66,21 @@ <h4>Experience Information</h4>
           </div>
 
           <div class="form-group">
-              <label class="form-label" for="totalHours"><strong>Total Hours</strong></label>
+              <label class="required form-label" for="totalHours"><strong>Total Hours</strong></label>
               <input class="form-control" id="totalHours" placeholder="Enter the total hours worked" required type="number" name="totalHours" value="{{ other_experience.hours if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
           </div>
 
           <br>
 
           <div class="form-group">
-              <label class="form-label" for="totalWeeks"><strong>Weeks Worked</strong></label>
+              <label class="required form-label" for="totalWeeks"><strong>Weeks Worked</strong></label>
               <input class="form-control" id="totalWeeks" placeholder="Enter total number of weeks worked" required type="number" name="totalWeeks" value="{{ other_experience.weeks if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
           </div>
 
           <br>
 
           <div class="form-group">
-              <label class="form-label" for="experienceDescription"><strong>Experience Description</strong></label>
+              <label class="required form-label" for="experienceDescription"><strong>Experience Description</strong></label>
               <textarea class="form-control" rows="5" cols="72" id="experienceDescription" placeholder="Please describe your experience" name="experienceDescription" {% if other_experience %}disabled{% endif %}>{{ other_experience.service if other_experience else '' }}</textarea>
           </div>
 

app/templates/minor/summerExperience.html

@@ -30,10 +30,10 @@ <h4>Proposal for Community-Engaged Summer Experience</h4>
                 </div>
 
                 <div class="form-group">
-                    <label class="form-label" for="term"><strong>Summer Year</strong></label>
+                    <label class="required form-label" for="term"><strong>Summer Term</strong></label>
                     <select class="form-select" id="term" name="term" required>
                         <option value="" disabled selected>Select Year</option>
-                        {% for term in terms %}
+                        {% for term in summerTerms %}
                                 <option value="{{ term }}">{{ term.description }}</option>
                         {% endfor %}
                     </select>
@@ -52,14 +52,14 @@ <h4>Experience Information</h4>
                 </div>
 
                 <div class="form-group">
-                    <label class="form-label" for="roleDescription"><strong>Briefly describe your role and scope of work with this organization during your community-engaged experience. 
+                    <label class="required form-label" for="roleDescription"><strong>Briefly describe your role and scope of work with this organization during your community-engaged experience. 
                         Your experience should focus on applied work with a public-facing institution (non-profit, community-based, governmental, or private sector)
                         that is responsive to community-identified initiatives or needs:</strong></label>
                     <textarea class="form-control" rows="4" cols="72" id="roleDescription" name="roleDescription" placeholder="Enter your role description" required></textarea><br>
                 </div>
 
                 <div class="form-group col">
-                    <label class="form-label"><strong>Which of the following existing community-based experiences will you take part in during the summer? Please select one.</strong></label><br>
+                    <label class="required form-label"><strong>Which of the following existing community-based experiences will you take part in during the summer? Please select one.</strong></label><br>
                     <input type="radio" id="internship" name="experienceType" value="Internship" required>
                     <label for="internship">Internship</label><br>
                     <input type="radio" id="cbr" name="experienceType" value="Community-based research" required>
@@ -75,7 +75,7 @@ <h4>Experience Information</h4>
                     <input type="text" class="form-control" id="otherExperienceDescription" name="otherExperienceDescription" placeholder="Enter your summer experience description."></input><br>
                 </div>
                 <div class="form-group">
-                    <label class="form-label"><strong>Which of the four key content areas of the Community and Civic Engagement Minor will your Community-Engaged Summer Experience address? Please select all that apply.</strong></label><br>
+                    <label class="required form-label"><strong>Which of the four key content areas of the Community and Civic Engagement Minor will your Community-Engaged Summer Experience address? Please select all that apply.</strong></label><br>
                     <input type="checkbox" id="powerInequality" required name="contentArea" value="Power and inequality">
                     <label for="powerInequality">Power and inequality</label><br>
                     <input type="checkbox" id="communityIdentity" required name="contentArea" value="Community and identity">
@@ -87,19 +87,19 @@ <h4>Experience Information</h4>
                 </div>
 
                 <div class="form-group">
-                    <label class="form-label" for="experienceHoursOver300"><strong>Will your experience include at least 300 hours of work over the span of at least 8 weeks?</strong></label><br>
+                    <label class="required form-label" for="experienceHoursOver300"><strong>Will your experience include at least 300 hours of work over the span of at least 8 weeks?</strong></label><br>
                     <input type="radio" id="yes300hours" name="experienceHoursOver300" required value="Yes">
                     <label for="yes300hours">Yes</label><br>
                     <input type="radio" id="no300hours" name="experienceHoursOver300" value="No">
                     <label for="no300hours">No</label>
 
                     <div id="hoursBelow300Container" class="row mt-2">
                         <div class="form-group col-6">
-                            <label for="totalHours"><b>Hours</b></label><br>
+                            <label class="required" for="totalHours"><b>Hours</b></label><br>
                             <input class="form-control" type="text" id="totalHours" name="totalHours" placeholder="Enter the total hours."></input>
                         </div>
                         <div class="form-group col-6">
-                            <label for="totalWeeks"><b>Weeks</b></label><br>
+                            <label class="required" for="totalWeeks"><b>Weeks</b></label><br>
                             <input class="form-control" type="text" id="totalWeeks" name="totalWeeks" placeholder="Enter the number of weeks."></input>
                         </div>
                     </div>

app/templates/minor/supervisorInformation.html

@@ -5,7 +5,7 @@ <h4> Supervisor Information </h4>
 </div>
 <div class="row">
     <div class="form-group col-12">
-        <label class="form-label" for="supervisorName"> <strong>Direct Supervisor Name (or "Yet to be determined")</strong> </label>
+        <label class="required form-label" for="supervisorName"> <strong>Direct Supervisor Name (or "Yet to be determined")</strong> </label>
         <input class="form-control" id="supervisorName" placeholder="Name of direct supervisor" name="supervisorName" required>
     </div>
 </div>
@@ -14,11 +14,11 @@ <h4> Supervisor Information </h4>
 
 <div class="row">
     <div class="form-group col-6">
-        <label class="form-label" for="supervisorPhone"><strong>Phone Number</strong></label>
+        <label class="required form-label" for="supervisorPhone"><strong>Phone Number</strong></label>
         <input class="form-control phone-input" id="supervisorPhone" name="supervisorPhone" placeholder="Supervisor's phone number" required/>
     </div>
     <div class="form-group col-6">
-        <label class="form-label" for="supervisorEmail"><strong>Email</strong></label>
+        <label class="required form-label" for="supervisorEmail"><strong>Email</strong></label>
         <input class="form-control email-input" id="supervisorEmail" name="supervisorEmail" placeholder="Supervisor's email" required/>
         <br>
     </div>