e Please enter the commit message for your changes. Lines starting

Author: MImran2002

app/controllers/main_routes/alterLSF.py

@@ -26,7 +26,6 @@ def alterLSF(laborStatusKey):
     if not currentUser.isLaborAdmin:       # Not an admin
         if currentUser.student and not currentUser.supervisor: # If a student is logged in and trying to get to this URL then send them back to their own page.
             return redirect("/laborHistory/" + currentUser.student.ID)
-
     currentDate = date.today()
     #If logged in....
     #Step 1: get form attached to the student (via labor history modal)
@@ -71,8 +70,7 @@ def alterLSF(laborStatusKey):
             (Department.ORG == form.department.ORG)
         )
     )
-    positions = [position for position in positions]
-    positions = set(positions)
+    positions = {position for position in positions}
     departments = Department.select()
     # supervisors from the old system WILL have a Supervisor record, but might not have a Tracy record
     oldSupervisor = Supervisor.get_or_none(ID = form.supervisor.ID)

app/controllers/main_routes/laborHistory.py

@@ -127,7 +127,6 @@ def populateModal(statusKey):
     to create the modal, and append all of the data gathered here form the database to the modal.  It also sets a button state which decides which buttons
     to put on the modal depending on what form is in the history.
     """
-    print("Status Key: ", statusKey)
     try:
         currentUser = require_login()
         if not currentUser:                    # Not logged in
@@ -161,7 +160,6 @@ def populateModal(statusKey):
                         .where(LaborStatusForm.POSN_CODE == newValue)
                         .first()
                     ) 
-                    print("wewewe", oldValue, "lolo")
                     try:
                         oldPosition = LaborStatusForm.get_or_none(
                             LaborStatusForm.POSN_CODE == oldValue

app/controllers/main_routes/laborStatusForm.py

@@ -118,24 +118,21 @@ def getDates(termcode):
 def getPositions(departmentOrg, departmentAcct):
     """ Get all of the positions that are in the selected department """
     currentUser = require_login()
-    print("ikikik", departmentAcct, "fefefe", departmentOrg, "lili")
-    positions = (
-        FormHistory
+    positions = set(
+        LaborStatusForm
         .select(FormHistory, LaborStatusForm, Department)
-        .join(LaborStatusForm, on=(FormHistory.formID == LaborStatusForm.laborStatusFormID))
+        .join(FormHistory, on=(FormHistory.formID == LaborStatusForm.laborStatusFormID))
+        .switch(LaborStatusForm)
         .join(Department, on=(LaborStatusForm.department == Department.departmentID))
         .where(
             (Department.ACCOUNT == departmentAcct) &
             (Department.ORG == departmentOrg)
         )
     )
-    positions = set(positions)
     positionDict = {}
     for position in positions:
-        print(position.formID.POSN_CODE, "positionsssssss")
-        if position.formID.POSN_CODE != "S12345" or currentUser.isLaborAdmin:
-            positionDict[position.formID.POSN_CODE] = {"position": position.formID.POSN_TITLE, "WLS":position.formID.WLS, "positionCode":position.formID.POSN_CODE}
-    print(positionDict, "seeeeeee")
+        if position.POSN_CODE != "S12345" or currentUser.isLaborAdmin:
+            positionDict[position.POSN_CODE] = {"position": position.POSN_TITLE, "WLS":position.WLS, "positionCode":position.POSN_CODE}
     return json.dumps(positionDict)
 
 @main_bp.route("/laborstatusform/getstudents/<termCode>/<student>", methods=["POST"])
@@ -170,7 +167,6 @@ def checkTotalHours(termCode, student, hours):
                                   ((FormHistory.status == "Approved") | (FormHistory.status == "Pending"))
                                   )
     term = Term.get(Term.termCode == termCode)
-    print("yeet", positions)
     totalHours = 0
     for item in positions:
         formID = item.formID
@@ -201,7 +197,6 @@ def releaseAndRehire():
 
         # Create new labor status form
         student = Student.get(Student.ID == studentDict['stuBNumber'])
-        print("## app/controllers/mainroutes/releaseandrehire##")
         supervisor = Supervisor.get(Supervisor.ID == studentDict['stuSupervisorID'])
         department, created = Department.get_or_create(DEPT_NAME = studentDict['stuDepartment'])
         term, created = Term.get_or_create(termCode = studentDict['stuTermCode'])

app/logic/adminManagement.py

@@ -11,8 +11,6 @@ def searchForAdmin(rsp):
     adminType = rsp[0]
     userList = []
     if adminType == "addlaborAdmin":
-        print("starts1")
-        print("##need to work on this there is a chance we need to strip the string app/logic/adminManagement/searchForAdmin##")
         databaseStudents = Student.select().where(Student.legal_name.contains(userInput) | Student.preferred_name.contains(userInput)| Student.LAST_NAME.contains(userInput)) 
         students = []
         for student in databaseStudents:
@@ -31,7 +29,6 @@ def searchForAdmin(rsp):
                             'lastName': student.LAST_NAME,
                             'type': 'Student'
                             })
-    print("#chapapa#need to work on this there is a chance we need to strip the string app/logic/adminManagement/searchForAdmin##")
     databaseSupervisors = Supervisor.select().where(Supervisor.legal_name.contains(userInput) | Supervisor.preferred_name.contains(userInput)| Supervisor.LAST_NAME.contains(userInput))
     supervisors = []
     for supervisor in databaseSupervisors:

app/logic/allPendingForms.py

@@ -90,7 +90,6 @@ def overrideOriginalStatusFormOnAdjustmentFormApproval(form, LSF):
 
     The only fields that will ever be changed in an adjustment form are: supervisor, department, position, and hours.
     """
-    print(form.adjustedForm.newValue, "heheee")
     currentUser = require_login()
     if not currentUser:        # Not logged in
             return render_template('errors/403.html'), 403
@@ -107,14 +106,9 @@ def overrideOriginalStatusFormOnAdjustmentFormApproval(form, LSF):
 
     if form.adjustedForm.fieldAdjusted == "position":
         LSF.POSN_CODE = form.adjustedForm.newValue
-        position = (
-                FormHistory
-                .select(FormHistory, LaborStatusForm, Department)
-                .join(LaborStatusForm, on=(FormHistory.formID == LaborStatusForm.laborStatusFormID))
-                .join(Department, on=(LaborStatusForm.department == Department.departmentID))
-                .where(LaborStatusForm.POSN_CODE == form.adjustedForm.newValue)   
-                .get_or_none()
-            )        
+        position = LaborStatusForm.get_or_none(
+            LaborStatusForm.POSN_CODE == fieldsChanged[fieldName]["newValue"]
+        )     
         LSF.POSN_TITLE = position.POSN_TITLE
         LSF.WLS = position.WLS
         LSF.save()
@@ -292,10 +286,10 @@ def checkAdjustment(allForms):
             newPositionCode = allForms.adjustedForm.newValue
             newPosition = (
                 LaborStatusForm
-                .select(LaborStatusForm.POSN_CODE, LaborStatusForm.WLS, LaborStatusForm.POSN_TITLE)
+                .select()
                 .where(LaborStatusForm.POSN_CODE == newPositionCode)
                 .first()
-            )           
+            )
             # temporarily storing the position code and wls in new value, and position name in old value
             # because we want to show these information in the hmtl template.
             allForms.adjustedForm.newValue = newPosition.POSN_CODE +" (" + newPosition.WLS+")"

app/logic/emailHandler.py

@@ -74,13 +74,13 @@ def __init__(self, formHistoryKey):
             elif self.formHistory.adjustedForm.fieldAdjusted == "position":
                 currentPosition = (
                     LaborStatusForm
-                    .select(LaborStatusForm.POSN_CODE, LaborStatusForm.POSN_TITLE, LaborStatusForm.WLS)
+                    .select()
                     .where(LaborStatusForm.POSN_CODE == self.formHistory.adjustedForm.oldValue)
                     .first()
                 )
                 newPosition = (
                     LaborStatusForm
-                    .select(LaborStatusForm.POSN_CODE, LaborStatusForm.POSN_TITLE, LaborStatusForm.WLS)
+                    .select()
                     .where(LaborStatusForm.POSN_CODE == self.formHistory.adjustedForm.newValue)
                     .first()
                 )