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 000000000..5008ddfcf Binary files /dev/null and b/app/static/js/ckeditor/.DS_Store differ diff --git a/app/static/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/.DS_Store b/app/static/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/.DS_Store new file mode 100644 index 000000000..5008ddfcf Binary files /dev/null and b/app/static/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/.DS_Store differ diff --git a/app/static/js/termManagement.js b/app/static/js/termManagement.js index 2d4d2c469..238a9a1fe 100755 --- a/app/static/js/termManagement.js +++ b/app/static/js/termManagement.js @@ -125,44 +125,4 @@ function termStatus(term) { $("#flasher").delay(5000).fadeOut(); } }) -}; - -function toggleEval(term, isMidyear) { - if (isMidyear) { - var clickedBtn = $("#midyear_eval_btn_" + term); - var otherBtn = $("#eval_btn_" + term); - } else { - var clickedBtn = $("#eval_btn_" + term); - var otherBtn = $("#midyear_eval_btn_" + term); - } - - $.ajax({ - method: "POST", - url: "/termManagement/manageEval", - dataType: "json", - contentType: "application/json", - data: JSON.stringify({"evalBtn": term, "isMidyear": isMidyear}), - processData: false, - success: function(response) { - otherBtn.removeClass("btn-success").addClass("btn-danger").text("Closed"); - if($(clickedBtn).hasClass("btn-success")) { - $(clickedBtn).removeClass("btn-success"); - $(clickedBtn).addClass("btn-danger"); - $(clickedBtn).text("Closed"); - category = "danger"; - state = "'Closed'."; - } - else { - $(clickedBtn).removeClass("btn-danger"); - $(clickedBtn).addClass("btn-success"); - $(clickedBtn).text("Open"); - category = "success"; - state = "'Open'."; - } - term = response['termChanged'] - message = "The "+ (isMidyear ? "midyear ":"final ") +"evaluations for "+ term +' is set to '+ state - $("#flash_container").html('