Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
dff58e0
Removed evaluation column from term management page
Jonimz Mar 16, 2026
ebe4036
Removed Evaluations column from term management table, including
Jonimz Mar 30, 2026
1ec26c2
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
JohnCox2211 Mar 31, 2026
3a158a7
Merge branch '522-remove-evaluation-buttons-from-term-management' of …
JohnCox2211 Mar 31, 2026
3d68c86
updated student labor evaluation form/controller/template after remov…
Jonimz Apr 8, 2026
4c65401
Remove midyear/final evaluation branching from student labor evaluation
Jonimz Apr 8, 2026
74b9422
Merge branch 'development' into 522-remove-evaluation-buttons-from-te…
Jonimz Apr 8, 2026
d94f939
Merge branch '522-remove-evaluation-buttons-from-term-management' of …
JohnCox2211 Apr 9, 2026
56ffec8
Add default boolean fields isFinalEvaluationOpen and isMidyearEvaluat…
Jonimz Apr 13, 2026
1450021
Remove unused evaluation status fields to match the database schema.
Jonimz May 2, 2026
6c03a95
Merge branch 'development' into 522-remove-evaluation-buttons-from-te…
MImran2002 Jun 12, 2026
d78a67f
removed extension"
MImran2002 Jun 12, 2026
2696bcd
Delete app/static/js/ckeditor/samples/toolbarconfigurator/lib/codemir…
MImran2002 Jun 12, 2026
d492600
Delete app/static/js/ckeditor/.DS_Store
MImran2002 Jun 12, 2026
f1e1f1c
Delete database/fix-fall-positions/.DS_Store
MImran2002 Jun 12, 2026
73b636a
Delete database/.DS_Store
MImran2002 Jun 12, 2026
207c7c8
removed unncessary files
MImran2002 Jun 12, 2026
297f32e
some backend functions remove for stud evals
MImran2002 Jun 12, 2026
41a8550
talked with Brian the model are kept to make sure data is not removed
MImran2002 Jun 12, 2026
353eed7
talked with Brian the model are kept to make sure data is not removed
MImran2002 Jun 12, 2026
d8540e8
make sure all the download button are working
MImran2002 Jun 12, 2026
2ec575c
Merge branch 'development' into 522-remove-evaluation-buttons-from-te…
MImran2002 Aug 19, 2026
0a197bf
Updated the term table.
Jonimz Aug 31, 2026
2b8ecb7
Delete scripts/.DS_Store
BrianRamsay Sep 9, 2026
258a4d4
readded existing comments
fritzj2 Sep 14, 2026
79b12a5
removed existing_evaluation from SLE HTML
fritzj2 Sep 14, 2026
4ae738f
removed labor eval files
fritzj2 Sep 14, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/admin_routes/allPendingForms.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def downloadAllPendingForms():
additionalSpreadsheetFields=additionalSpreadsheetFields
)

return send_file(excel.relativePath, as_attachment=True, attachment_filename=excel.relativePath.split('/').pop())
return send_file(excel.relativePath, as_attachment=True, download_name=excel.relativePath.split('/').pop())

@admin.route('/admin/checkedForms', methods=['POST'])
def approved_and_denied_Forms():
Expand Down
19 changes: 0 additions & 19 deletions app/controllers/admin_routes/termManagement.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,22 +115,3 @@ def termStatusCheck():
except Exception as e:
print(e)
return jsonify({"Success": False})

Comment thread
Jonimz marked this conversation as resolved.
@admin.route('/termManagement/manageEval', methods=['POST'])
def manageEval():
try:
rsp = eval(request.data.decode("utf-8")) # This fixes byte indices must be integers or slices error
if rsp:
term = Term.get(rsp['evalBtn'])
if rsp["isMidyear"]:
term.isMidyearEvaluationOpen = not term.isMidyearEvaluationOpen
term.isFinalEvaluationOpen = False
else:
term.isFinalEvaluationOpen = not term.isFinalEvaluationOpen
term.isMidyearEvaluationOpen = False
term.save()
flasherInfo = {'termChanged': term.termName}
return jsonify(flasherInfo)
except Exception as e:
print(e)
return jsonify({}, 500)
3 changes: 1 addition & 2 deletions app/controllers/main_routes/laborHistory.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,8 @@ def downloadFormHistory():
formSearchResults.searchType,
requestedLSFs=formHistories,
additionalSpreadsheetFields=[],
includeEvals=False
)
return send_file(excel.relativePath, mimetype='text/csv', as_attachment=True, attachment_filename=excel.relativePath.split('/').pop())
return send_file(excel.relativePath, mimetype='text/csv', as_attachment=True, download_name=excel.relativePath.split('/').pop())

@main_bp.route('/laborHistory/modal/<statusKey>', methods=['GET'])
def populateModal(statusKey):
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/main_routes/main_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,8 @@ def downloadSupervisorPortalResults():
formSearchResults.searchType,
requestedLSFs=formHistories,
additionalSpreadsheetFields=[],
includeEvals=False
)
return send_file(excel.relativePath, as_attachment=True, attachment_filename=excel.relativePath.split('/').pop())
return send_file(excel.relativePath, as_attachment=True, download_name=excel.relativePath.split('/').pop())
Comment thread
bakobagassas marked this conversation as resolved.

@main_bp.route('/supervisorPortal/liveSearch', methods=['GET'])
def SupervisorPortalSearch():
Expand Down
207 changes: 0 additions & 207 deletions app/controllers/main_routes/studentLaborEvaluation.py

This file was deleted.

Loading