Refactor Program Management section of Admin Settings

app/config/default.yml

@@ -25,9 +25,12 @@ ldap:
 
 files:
   base_path: 'app/static/files'
+  image_path: 'app/static/images'
+  landing_page_path: 'landingPage'
   email_attachment_path: 'emailattachments'
   event_attachment_path: 'eventattachments'
   course_attachment_path: 'courseattachments'
+  program_image_path: 'programimages'
 
 MAIL_ENABLED: True
 MAIL_SERVER: "smtp.gmail.com" # use smtp.gmail.com for gmail, mail.berea.edu for Berea

app/controllers/admin/userManagement.py

@@ -5,8 +5,11 @@
 from app.models.program import Program
 from app.logic.userManagement import addCeltsAdmin,addCeltsStudentStaff,removeCeltsAdmin,removeCeltsStudentStaff
 from app.logic.userManagement import changeProgramInfo
-from app.logic.utils import selectSurroundingTerms
+from app.logic.utils import selectSurroundingTerms, getFilesFromRequest
 from app.logic.term import addNextTerm, changeCurrentTerm
+from app.logic.fileHandler import FileHandler
+from app.models.attachmentUpload import AttachmentUpload
+
 
 @admin_bp.route('/admin/manageUsers', methods = ['POST'])
 def manageUsers():
@@ -52,7 +55,7 @@ def manageUsers():
 def addProgramManagers():
     eventData = request.form
     try:
-        return addProgramManager(eventData['username'],int(eventData['programID']))
+        return addProgramManagers(eventData['username'],int(eventData['programID']))
     except Exception as e:
         print(e)
         flash('Error while trying to add a manager.','warning')
@@ -62,29 +65,37 @@ def addProgramManagers():
 def removeProgramManagers():
     eventData = request.form
     try:
-        return removeProgramManager(eventData['username'],int(eventData['programID']))
+        return removeProgramManagers(eventData['username'],int(eventData['programID']))
     except Exception as e:
         print(e)
         flash('Error while removing a manager.','warning')
         abort(500,"Error while trying to remove a manager.")
 
+@admin_bp.route('/deleteProgramFile', methods=['POST'])
+def deleteProgramFile():
+    fileData= request.form
+    programFile=FileHandler(programId=fileData["databaseId"])
+    programFile.deleteFile(fileData["fileId"])
+    return ""
+
 @admin_bp.route('/admin/updateProgramInfo/<programID>', methods=['POST'])
 def updateProgramInfo(programID):
-    """Grabs info and then outputs it to logic function"""
-    programInfo = request.form # grabs user inputs
     if g.current_user.isCeltsAdmin:
         try:
-            changeProgramInfo(programInfo["programName"],  #calls logic function to add data to database
-                              programInfo["contactEmail"],
-                              programInfo["contactName"],
-                              programInfo["location"],
-                              programID)
+            programInfo = request.form # grabs user inputs
+            uploadedFile = request.files.get('modalProgramImage')
+            changeProgramInfo(programID, uploadedFile, **programInfo) 
 
+            associatedAttachments = list(AttachmentUpload.select().where(AttachmentUpload.program == programID).execute()) 
+
+            filePaths = FileHandler(programId=programID).retrievePath(associatedAttachments) 
+
+            file_paths = {filename: path_info[0] for filename, path_info in filePaths.items()} 
             flash("Program updated", "success")
             return redirect(url_for("admin.userManagement", accordion="program"))
         except Exception as e:
-            print(e)
-            flash('Error while updating program info.','warning')
+            print("error: ", e)
+            flash('Error while updating program info.','warning') 
             abort(500,'Error while updating program.')
     abort(403)
 

app/logic/fileHandler.py

@@ -2,18 +2,23 @@
 from flask import redirect, url_for
 from app import app
 from app.models.attachmentUpload import AttachmentUpload
+from app.models.program import Program
+import glob
 
 class FileHandler:
-    def __init__(self, files=None, courseId=None, eventId=None):
-        self.files = files
+    def __init__(self, files=None, courseId=None, eventId=None, programId=None):
+        self.files = files 
         self.path = app.config['files']['base_path']
+        self.image_path = app.config['files']['image_path']    
         self.courseId = courseId
         self.eventId = eventId
+        self.programId = programId
         if courseId:
             self.path = os.path.join(self.path, app.config['files']['course_attachment_path'], str(courseId))
         elif eventId:
             self.path = os.path.join(self.path, app.config['files']['event_attachment_path'])
-
+        elif programId:
+            self.image_path = os.path.join(self.image_path, app.config['files']['landing_page_path']) 
     def makeDirectory(self):
         try:
             extraDir = str(self.eventId) if self.eventId else ""
@@ -25,17 +30,25 @@ def makeDirectory(self):
 
     def getFileFullPath(self, newfilename=''):
         try:
-            filePath = (os.path.join(self.path, newfilename))
+            if self.eventId or self.courseId:
+                filePath = (os.path.join(self.path, newfilename))
+            elif self.programId:
+                filePath = (os.path.join(self.image_path, newfilename))
         except AttributeError:
             pass
         except FileExistsError:
             pass
         return filePath
 
     def saveFiles(self, saveOriginalFile=None):
-        try:
+
+        try: 
+            if not isinstance(self.files, list):
+                self.files = [self.files]          
             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,
@@ -49,11 +62,28 @@ def saveFiles(self, saveOriginalFile=None):
                     if not isFileInCourse:
                         AttachmentUpload.create(course=self.courseId, fileName=file.filename)
                         saveFileToFilesystem = file.filename
+                elif self.programId:
+                    isFileInProgram = AttachmentUpload.select().where(AttachmentUpload.program == self.programId, AttachmentUpload.fileName == file.filename).exists()
+                    if not  isFileInProgram:
+                        AttachmentUpload.create(program=self.programId, fileName=file.filename)                      
+                        name = Program.get(Program.id == self.programId)
+                        file_type = file.filename.split('.')[1] 
+                        current_programName = f"{str(name.programName)}.{file_type}"
+                        pattern = '*' + str(name.programName) + '*'
+
+                        full_pattern = os.path.join(self.image_path, pattern)
+                        files_to_delete = glob.glob(full_pattern)
+
+
+                        for  file_path in files_to_delete:
+                                os.remove(file_path)
+                        saveFileToFilesystem = current_programName
                 else:
                     saveFileToFilesystem = file.filename
                 if saveFileToFilesystem:
                     self.makeDirectory()
                     file.save(self.getFileFullPath(newfilename=saveFileToFilesystem))
+
         except AttributeError:
             pass
 

app/logic/userManagement.py

@@ -6,6 +6,7 @@
 from flask import g, session
 from app.logic.createLogs import createActivityLog
 from playhouse.shortcuts import model_to_dict
+from app.logic.fileHandler import FileHandler
 
 def addCeltsAdmin(user):
     user = User.get_by_id(user)
@@ -38,20 +39,45 @@ def removeCeltsStudentStaff(user):
     createActivityLog(f'Removed {user.firstName} {user.lastName} from a CELTS student staff member'+ 
                    (f', and as a manager of {programManagerRoles}.' if programManagerRoles else "."))
 
-
-def changeProgramInfo(newProgramName, newContactEmail, newContactName, newLocation, programId):
-    """Updates the program info with a new sender and email."""
+def changeProgramInfo(programId, attachment, programName= None, programDescription = None, partner = None, contactEmail=None, contactName= None, location = None,instagramUrl = None, facebookUrl = None, bereaUrl = None): 
+
+
+    """Updates the program info and logs that change"""
     program = Program.get_by_id(programId)
-    updatedProgram = Program.update({Program.programName:newProgramName, Program.contactEmail: newContactEmail, Program.contactName:newContactName, Program.defaultLocation:newLocation}).where(Program.id==programId)
+    coverImage = program.coverImage 
+    if attachment:
+        print(attachment)
+        addFile: FileHandler = FileHandler(attachment, programId=programId)
+        addFile.saveFiles()
+    updatedProgram = Program.update(
+        {Program.programName:programName,
+        Program.programDescription: programDescription, 
+        Program.partner: partner, 
+        Program.contactEmail: contactEmail, 
+        Program.contactName: contactName,
+    Program.defaultLocation: location,
+        Program.coverImage: attachment,
+        Program.instagramUrl:instagramUrl,
+        Program.facebookUrl: facebookUrl,
+    Program.bereaUrl: bereaUrl
+        }
+        ).where(Program.id==programId)    
     updatedProgram.execute()
-    if newProgramName != program.programName:
-        createActivityLog(f"{program.programName} Program Name was changed to: {newProgramName}")
-    if newContactEmail != program.contactEmail:
-        createActivityLog(f"{program.programName} Contact Email was changed to: {newContactEmail}")
-    if newContactName != program.contactName:
-        createActivityLog(f"{program.programName} Contact Name was changed to: {newContactName}")
-    if newLocation != program.defaultLocation:
-        createActivityLog(f"{program.programName} Location was changed to: {newLocation}")
+
+
+    if programName != program.programName:
+        createActivityLog(f"{program.programName} Program Name was changed to: {programName}")
+    if programDescription != program.programDescription:
+        createActivityLog(f"{program.programName} Description was changed to: {programDescription}")
+    if partner != program.partner:
+        createActivityLog(f"{program.programName} Program Partner was changed to: {partner}")
+    if contactEmail != program.contactEmail:
+        createActivityLog(f"{program.programName} Contact Email was changed to: {contactEmail}")
+    if contactName != program.contactName:
+        createActivityLog(f"{program.programName} Contact Name was changed to: {contactName}")
+    if location != program.defaultLocation:
+        createActivityLog(f"{program.programName} Location was changed to: {location}")
+
 
     return (f'Program email info updated')
 
@@ -69,4 +95,4 @@ def getAllowedTemplates(currentUser):
     if currentUser.isCeltsAdmin:
         return EventTemplate.select().where(EventTemplate.isVisible==True).order_by(EventTemplate.name)
     else:
-        return []
+        return []

app/models/attachmentUpload.py

@@ -1,12 +1,14 @@
 from app.models import*
 from app.models.event import Event
 from app.models.course import Course
+from app.models.program import Program
 from app.models.otherExperience import OtherExperience
 
 
 class AttachmentUpload(baseModel):
     event = ForeignKeyField(Event, null=True)
     course = ForeignKeyField(Course, null=True)
+    program = ForeignKeyField(Program, null=True)
     isDisplayed = BooleanField(default=False)
     fileName = CharField()
 

app/models/program.py

@@ -1,21 +1,21 @@
 from app.models import*
 from app.models.term import Term
 from app.models.courseStatus import CourseStatus
-from app.models.partner import Partner
 
 class Program(baseModel):
     programName = CharField()
     instagramUrl = TextField(null=True)
     facebookUrl = TextField(null=True)
     bereaUrl = TextField(null=True)
     programDescription = TextField()
-    partner = ForeignKeyField(Partner, null=True)
+    partner = CharField(null=True)
     isStudentLed = BooleanField(default=False)
     isBonnerScholars = BooleanField(default=False)
     isOtherCeltsSponsored = BooleanField(default=False)
     contactName = CharField(null=True,default='')
     contactEmail = CharField(null=True,default='')
     defaultLocation = CharField(null=True,default='')
+    coverImage = BlobField(null=True)
 
     @property
     def url(self):

app/static/css/base.css

@@ -17,7 +17,7 @@
 
 .toast-container{
   top: 0;
-  z-index: 11;
+  z-index: 1060;
 }
 
 .form-control.invalid,

app/static/css/programManagement.css

@@ -0,0 +1,57 @@
+.modal {
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  /* Removed incorrect translate */
+}
+
+.modal-dialog-scrollable {
+  max-height: calc(100vh - 200px);
+  overflow-y: auto;
+}
+
+
+.info {
+  overflow-y: auto;
+  margin-top: -20px;
+}
+
+.cellSpacing {
+  margin: 5px;
+  padding: 10px;
+}
+
+.programHeader {
+  border-bottom: 1px solid black;
+  font-weight: bold;
+}
+
+.borderless {
+  border: 0;
+}
+
+.rightJustify {
+  position: absolute;
+  right: 10px; /* Added px to right */
+}
+
+@media (max-width: 1500px) {
+  .btn {
+    height: 60px;
+  }
+  .step {
+    width: 13px;
+    height: 13px;
+  }
+}
+
+@media (max-width: 1100px) {
+  .btn {
+    height: 80px;
+  }
+  .step {
+    width: 10px;
+    height: 10px;
+  }
+}

app/static/js/base.js

@@ -191,6 +191,7 @@ function handleFileSelection(fileInputId){
         $(fullTrashId).data("file", file);
         $(fullTrashId).data("file-container-id", attachedObjectContainerId);
         $(fullTrashId).on("click", function() {
+          console.log("hehe")
           let elementFileNum = $(this).data('filenum');
           let attachedObjectContainerId = $(this).data('file-container-id');
           $("#"+ attachedObjectContainerId + " #attachedFilesRow" + elementFileNum).remove();