From dff58e0ad4642840b5652b948a11a507fdf30a8f Mon Sep 17 00:00:00 2001 From: Joyce J Nimely Date: Mon, 16 Mar 2026 18:43:46 +0000 Subject: [PATCH 1/2] Removed evaluation column from term management page --- app/templates/admin/termManagement.html | 38 +------------------------ 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/app/templates/admin/termManagement.html b/app/templates/admin/termManagement.html index 05bac23e3..64ad9ba5c 100755 --- a/app/templates/admin/termManagement.html +++ b/app/templates/admin/termManagement.html @@ -72,15 +72,6 @@

class="glyphicon glyphicon-bookmark" tabindex="0"> - - Evaluations
(Midyear | Final) - - - @@ -166,33 +157,6 @@

onclick="termStatus({{term.termCode}})" value="{{term.termState}}">{% if term.termState == True %} Open {% elif term.termState == False %} Closed {% endif %} - - -
- {% if (term.termCode|string)[-2:] == "00" %} - - {% endif %} - {% if (term.termCode|string)[-2:] == "00" or (term.termCode|string)[-2:] == "13" %} {# AY and Summer only #} - - {% endif %} -
- {% endfor %} @@ -202,4 +166,4 @@

{% endfor %} -{% endblock %} +{% endblock %} \ No newline at end of file From ebe40367834b728418c625988933be749f676ab0 Mon Sep 17 00:00:00 2001 From: Joyce J Nimely Date: Mon, 30 Mar 2026 22:22:49 +0000 Subject: [PATCH 2/2] Removed Evaluations column from term management table, including the manageEval Flask route, toggleEval JS function, and isMidyearEvaluationOpen/isFinalEvaluationOpen model fields. --- .vscode/extensions.json | 5 +++ FETCH_HEAD | 0 .../admin_routes/termManagement.py | 19 -------- app/models/term.py | 2 - app/static/js/ckeditor/.DS_Store | Bin 0 -> 6148 bytes .../lib/codemirror/.DS_Store | Bin 0 -> 6148 bytes app/static/js/termManagement.js | 42 +----------------- database/.DS_Store | Bin 0 -> 6148 bytes database/fix-fall-positions/.DS_Store | Bin 0 -> 6148 bytes 9 files changed, 6 insertions(+), 62 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 FETCH_HEAD create mode 100644 app/static/js/ckeditor/.DS_Store create mode 100644 app/static/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/.DS_Store create mode 100644 database/.DS_Store create mode 100644 database/fix-fall-positions/.DS_Store diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000..174a5cca3 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "github.copilot" + ] +} \ No newline at end of file diff --git a/FETCH_HEAD b/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/admin_routes/termManagement.py b/app/controllers/admin_routes/termManagement.py index 69c6373d4..76638f2ae 100644 --- a/app/controllers/admin_routes/termManagement.py +++ b/app/controllers/admin_routes/termManagement.py @@ -115,22 +115,3 @@ def termStatusCheck(): except Exception as e: print(e) return jsonify({"Success": False}) - -@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) diff --git a/app/models/term.py b/app/models/term.py index bc4c7420e..1fe500211 100755 --- a/app/models/term.py +++ b/app/models/term.py @@ -13,8 +13,6 @@ class Term(baseModel): isBreak = BooleanField(default=False) isSummer = BooleanField(default=False) isAcademicYear = BooleanField(default=False) - isFinalEvaluationOpen = BooleanField(default=False) - isMidyearEvaluationOpen = BooleanField(default=False) @staticmethod diff --git a/app/static/js/ckeditor/.DS_Store b/app/static/js/ckeditor/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0' + message + ''); - $("#flasher").delay(5000).fadeOut(); - } - }); -} +}; \ No newline at end of file diff --git a/database/.DS_Store b/database/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0