CCE Minor Core Functionality (Edit/View/Withdraw/Modify)

app/controllers/minor/routes.py

@@ -3,24 +3,35 @@
 
 from app.controllers.minor import minor_bp
 from app.models.user import User
-from app.models.attachmentUpload import AttachmentUpload
+from app.models.cceMinorProposal import CCEMinorProposal
 from app.models.term import Term
+from app.models.attachmentUpload import AttachmentUpload
 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, removeProposal, getMinorSpreadsheet
+from app.logic.minor import (
+    changeProposalStatus,
+    createOtherEngagement,
+    updateOtherEngagementRequest,
+    setCommunityEngagementForUser,
+    getEngagementTotal,
+    createSummerExperience,
+    updateSummerExperience,
+    getProgramEngagementHistory, 
+    getCourseInformation,
+    getCommunityEngagementByTerm,
+    getMinorSpreadsheet,
+    getCCEMinorProposals,
+    removeProposal
+)
 
 @minor_bp.route('/profile/<username>/cceMinor', methods=['GET'])
 def viewCceMinor(username):
     """
-        Load minor management page with community engagements and summer experience
+    Load minor management page with community engagements and summer experience
     """
-    if not (g.current_user.isAdmin):
-        return abort(403)
-
     sustainedEngagementByTerm = getCommunityEngagementByTerm(username)
 
     activeTab = request.args.get("tab", "sustainedCommunityEngagements")
-
     return render_template("minor/profile.html",
                             user = User.get_by_id(username),
                             proposalList = getCCEMinorProposals(username),
@@ -29,55 +40,94 @@ def viewCceMinor(username):
                             activeTab=activeTab)
 
 @minor_bp.route('/cceMinor/<username>/otherEngagement', methods=['GET', 'POST'])
-def requestOtherEngagement(username):
-    """
-        Load minor management page with community engagements and summer experience
-    """
+def createOtherEngagementRequest(username):
     if not (g.current_user.isAdmin or g.current_user.username == username):
         return abort(403)
 
-
     # once we submit the form for creation
     if request.method == "POST":
-        createdProposal = createOtherEngagementRequest(username, request.form)
-        attachment = request.files.get("attachmentObject")
-        if attachment:
-            addFile = FileHandler(getFilesFromRequest(request), proposalId=createdProposal.id)
-            addFile.saveFiles()
-
-        return redirect(url_for('minor.viewCceMinor', username=username))
+        createOtherEngagement(username, request)
+        flash("Proposal successfully created.", "success")
+        return redirect(url_for('minor.viewCceMinor', username=username, tab="manageProposals"))
 
     return render_template("minor/requestOtherEngagement.html",
+                            editable = True,
                             user = User.get_by_id(username),
                             selectableTerms = selectSurroundingTerms(g.current_term),
-                            allTerms = getSummerExperience(username))
+                            postRoute = f"/cceMinor/{username}/otherEngagement", # when form is submitted, what POST route is it being submitted to.
+                            attachmentFilePath = "",
+                            attachmentFileName = "",
+                            proposal = None)
+
+@minor_bp.route('/cceMinor/viewOtherEngagement/<proposalID>', methods=['GET'])
+@minor_bp.route('/cceMinor/viewSummerExperience/<proposalID>', methods=['GET'])
+@minor_bp.route('/cceMinor/editOtherEngagement/<proposalID>', methods=['GET', 'POST'])
+@minor_bp.route('/cceMinor/editSummerExperience/<proposalID>', methods=['GET', 'POST'])
+def editOrViewProposal(proposalID: int):
+    proposal = CCEMinorProposal.get_by_id(int(proposalID))
+    if not (g.current_user.isAdmin or g.current_user.username == proposal.student.username):
+        return abort(403)
+
+    editProposal = 'view' not in request.path
 
+    # if proposal is approved, only admins can edit, but not if the admin is the student
+    if proposal.isApproved and editProposal:
+        if g.current_user.username == proposal.student or not g.current_user.isAdmin:
+            return abort(403)
+
+    attachmentObject = AttachmentUpload.get_or_none(proposal=proposalID)
+    attachmentFilePath = ""
+    attachmentFileName = ""
+
+    if attachmentObject:
+        fileHandler = FileHandler(proposalId=proposalID)
+        attachmentFilePath = fileHandler.getFileFullPath(attachmentObject.fileName).lstrip("app/") # we need to remove app/ from the url because it prevents it from displaying
+        attachmentFileName = attachmentObject.fileName
+
+    if request.method == "GET":
+        selectedTerm = Term.get_by_id(proposal.term)
+        flash("Once approved, a proposal can only be edited by an admin.", 'warning')
+        return render_template("minor/requestOtherEngagement.html" if 'OtherEngagement' in request.path else "minor/summerExperience.html",
+                                editable = editProposal,
+                                selectedTerm = selectedTerm,
+                                contentAreas = proposal.contentAreas.split(", ") if proposal.contentAreas else [],
+                                selectableTerms = selectSurroundingTerms(g.current_term, summerOnly=False if 'OtherEngagement' else True),
+                                user = User.get_by_id(proposal.student),
+                                postRoute = f"/cceMinor/editSummerExperience/{proposal.id}" if "SummerExperience" in request.path else f"/cceMinor/editOtherEngagement/{proposal.id}",
+                                proposal = proposal,
+                                attachmentFilePath = attachmentFilePath,
+                                attachmentFileName = attachmentFileName
+        )
+
+    if "OtherEngagement" in request.path:
+        updateOtherEngagementRequest(proposalID, request)
+    else:
+        updateSummerExperience(proposalID, request.form)
+
+    flash("Proposal updated", "success")
+    return redirect(url_for('minor.viewCceMinor', username=proposal.student, tab='manageProposals'))
 
 @minor_bp.route('/cceMinor/<username>/summerExperience', methods=['GET', 'POST'])
-def requestSummerExperience(username):
-    """
-        Load minor management page with community engagements and summer experience
-    """
+def createSummerExperienceRequest(username):
     if not (g.current_user.isAdmin or g.current_user.username == username):
         return abort(403)
 
     # once we submit the form for creation
     if request.method == "POST":
         createSummerExperience(username, request.form)
-        return redirect(url_for('minor.viewCceMinor', username=username))
+        flash("Proposal successfully created.", "success")
+        return redirect(url_for('minor.viewCceMinor', username=username, tab="manageProposals"))
 
     summerTerms = selectSurroundingTerms(g.current_term, summerOnly=True)
 
     return render_template("minor/summerExperience.html",
-                            summerTerms = summerTerms,
+                            selectableTerms = summerTerms,
+                            contentAreas = [],
                             user = User.get_by_id(username),
                             )
 
 @minor_bp.route('/cceMinor/<username>/getEngagementInformation/<type>/<term>/<id>', methods=['GET'])
 def getEngagementInformation(username, type, id, term):
-    """
-        For a particular engagement activity (program or course), get the participation history or course information respectively.
-    """
     if type == "program":
         information = getProgramEngagementHistory(id, username, term)
     else:
@@ -86,19 +136,38 @@ def getEngagementInformation(username, type, id, term):
     return information
 
 
-@minor_bp.route('/cceMinor/withdraw/<username>/<proposalID>', methods = ['POST'])
-def withdrawProposal(username, proposalID):
+@minor_bp.route('/cceMinor/<action>/<username>/<proposalId>', methods=['POST'])
+def updateProposal(action, 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')
+        if not (g.current_user.isAdmin or g.current_user.isFaculty or g.current_user.username == username):
+            flash("Unauthorized to perform this action", "warning")
+            return ""
+
+        actionMap = {
+            "withdraw": ("Withdrawn", "Proposal successfully withdrawn"),
+            "complete": ("Completed", "Proposal successfully completed"),
+            "approve": ("Approved", "Proposal approved"),
+            "unapprove": ("Submitted", "Proposal unapproved"),
+        }
+
+        if action not in actionMap:
+            flash("Invalid action", "warning")
+            return ""
+
+        newStatus, message = actionMap[action]
+
+        if action == "withdraw":
+            removeProposal(proposalId)
         else:
-            flash("Unauthorized to perform this action", 'warning')
+            changeProposalStatus(proposalId, newStatus)
+        flash(message, "success")
+
     except Exception as e:
         print(e)
-        flash("Withdrawal Unsuccessful", 'warning')
+        flash("Proposal status could not be changed", "warning")
+
     return ""
-    
+
 
 @minor_bp.route('/cceMinor/getMinorSpreadsheet', methods=['GET'])
 def returnMinorSpreadsheet():

app/logic/events.py

@@ -175,7 +175,7 @@ def attemptSaveEvent(eventData, attachmentFiles = None, renewedEvent = False):
     if attachmentFiles:
         for event in events:
             addFile = FileHandler(attachmentFiles, eventId=event.id)
-            addFile.saveFiles(saveOriginalFile=events[0])
+            addFile.saveFiles(parentEvent=events[0])
     return events, ""
 
 

app/logic/fileHandler.py

@@ -24,11 +24,14 @@ def __init__(self, files=None, courseId=None, eventId=None, programId=None, prop
         elif programId:
             self.path = os.path.join(self.path, app.config['files']['program_attachment_path']) 
         elif proposalId:
-            self.path = os.path.join(self.path, app.config['files']['proposal_attachment_path']) 
+            self.path = os.path.join(self.path, app.config['files']['proposal_attachment_path'], str(proposalId)) 
 
     def makeDirectory(self):
         try:
-            extraDir = str(self.eventId) if self.eventId else ""
+            extraDir = ""
+            if self.eventId:
+                extraDir = str(self.eventId)
+
             os.makedirs(os.path.join(self.path, extraDir))
         except OSError as e:
             if e.errno != 17:
@@ -46,57 +49,53 @@ def getFileFullPath(self, newfilename=''):
 
         return filePath
 
-    def saveFiles(self, saveOriginalFile=None):
-        try:          
-            for file in self.files:
-                saveFileToFilesystem = None
-
-                if self.eventId:
-                    attachmentName = str(saveOriginalFile.id) + "/" + file.filename
-                    isFileInEvent = AttachmentUpload.select().where(AttachmentUpload.event_id == self.eventId,
-                                                                    AttachmentUpload.fileName == attachmentName).exists()
-                    if not isFileInEvent:
-                        AttachmentUpload.create(event=self.eventId, fileName=attachmentName)
-                        if saveOriginalFile and saveOriginalFile.id == self.eventId:
-                            saveFileToFilesystem = attachmentName
-                elif self.courseId:
-                    isFileInCourse = AttachmentUpload.select().where(AttachmentUpload.course == self.courseId, AttachmentUpload.fileName == file.filename).exists()
-                    if not isFileInCourse:
-                        AttachmentUpload.create(course=self.courseId, fileName=file.filename)
-                        saveFileToFilesystem = file.filename
-                elif self.programId:
-
-                    # remove the existing file
-                    deleteFileObject = AttachmentUpload.get_or_none(program=self.programId)
-                    if deleteFileObject:
-                        self.deleteFile(deleteFileObject.id)
-
-                    # add the new file
-                    fileType = file.filename.split('.')[-1]
-                    fileName = f"{self.programId}.{fileType}"
-                    AttachmentUpload.create(program=self.programId, fileName=fileName)
-                    currentProgramID = fileName
-                    saveFileToFilesystem = currentProgramID
-
-                elif self.proposalId:
-                    fileType = file.filename.split('.')[-1]
-                    fileName = f"{self.proposalId}.{fileType}"
-                    isFileInProposal = AttachmentUpload.select().where(AttachmentUpload.proposal == self.proposalId,
-                                                                    AttachmentUpload.fileName == fileName).exists()
-                    if not isFileInProposal:
-                        # add the new file
-                        AttachmentUpload.create(proposal=self.proposalId, fileName=fileName)
-                        saveFileToFilesystem = fileName
-
-                else:
-                    saveFileToFilesystem = file.filename
-
-                if saveFileToFilesystem:
-                    self.makeDirectory()
-                    file.save(self.getFileFullPath(newfilename=saveFileToFilesystem))
-
-        except AttributeError as e:
-            print(e)
+    def saveFiles(self, parentEvent=None):
+        """
+        Saves attachments for different types and creates DB record for stored attachment
+        """
+        for file in self.files:
+            saveFileToFilesystem = None
+
+            if self.eventId:
+                attachmentName = str(parentEvent.id) + "/" + file.filename
+                fileObject, created = AttachmentUpload.get_or_create(
+                    event_id = self.eventId,
+                    fileName = attachmentName
+                )
+
+                if created and parentEvent and parentEvent.id == self.eventId:
+                    saveFileToFilesystem = attachmentName
+
+            elif self.courseId or self.proposalId:
+                recordId = self.courseId if self.courseId else self.proposalId
+                fieldName = 'course' if self.courseId else 'proposal'
+                fileData = {
+                    fieldName: recordId,
+                    "fileName": file.filename
+                }
+                fileObject, created = AttachmentUpload.get_or_create(**fileData)
+                saveFileToFilesystem = file.filename if created else None
+
+            elif self.programId:
+
+                # remove the existing file
+                deleteFileObject = AttachmentUpload.get_or_none(program=self.programId)
+                if deleteFileObject:
+                    self.deleteFile(deleteFileObject.id)
+
+                # add the new file
+                fileType = file.filename.split('.')[-1]
+                fileName = f"{self.programId}.{fileType}"
+                AttachmentUpload.create(program=self.programId, fileName=fileName)
+                currentProgramID = fileName
+                saveFileToFilesystem = currentProgramID
+
+            else:
+                saveFileToFilesystem = file.filename
+
+            if saveFileToFilesystem:
+                self.makeDirectory()
+                file.save(self.getFileFullPath(newfilename=saveFileToFilesystem))
 
     def retrievePath(self, files):
         pathDict = {}