Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"github.copilot"
]
}
Empty file added FETCH_HEAD
Empty file.
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})

@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)
2 changes: 0 additions & 2 deletions app/models/term.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file added app/static/js/ckeditor/.DS_Store
Binary file not shown.
Binary file not shown.
42 changes: 1 addition & 41 deletions app/static/js/termManagement.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('<div class="alert alert-'+ category +'" role="alert" id="flasher">' + message + '</div>');
$("#flasher").delay(5000).fadeOut();
}
});
}
};
38 changes: 1 addition & 37 deletions app/templates/admin/termManagement.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,6 @@ <h4 class="mb-0">
class="glyphicon glyphicon-bookmark"
tabindex="0">
</span>
</th>
<th>Evaluations <br />(Midyear | Final)
<span data-toggle="tooltip"
title="Toggle the midyear/final student labor evaluation (SLE) states."
data-placement="right"
class="glyphicon glyphicon-bookmark"
tabindex="0">
</span>
</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -166,33 +157,6 @@ <h4 class="mb-0">
onclick="termStatus({{term.termCode}})"
value="{{term.termState}}">{% if term.termState == True %} Open {% elif term.termState == False %} Closed {% endif %}
</button>
</td>
<td style="text-align:center">
<div class="btn-group" role="group" aria-label="button group for evaluations">
{% if (term.termCode|string)[-2:] == "00" %}
<button
id="midyear_eval_btn_{{term.termCode}}"
name="midyearEvalBtn"
style='width: 50%'
type="button"
class="btn btn-med {% if term.isMidyearEvaluationOpen == True %} btn-success {% elif term.isMidyearEvaluationOpen == False %} btn-danger {% endif %}"
onclick="toggleEval({{term.termCode}}, 1)"
value="{{term.isMidyearEvaluationOpen}}">{% if term.isMidyearEvaluationOpen == True %} Open {% elif term.isMidyearEvaluationOpen == False %} Closed {% endif %}
</button>
{% endif %}
{% if (term.termCode|string)[-2:] == "00" or (term.termCode|string)[-2:] == "13" %} {# AY and Summer only #}
<button
id="eval_btn_{{term.termCode}}"
name="evalBtn"
{% if (term.termCode|string)[-2:] == "00" %} style='width: 50%' {% else %} style='width: auto;' {% endif %}
type="button"
class="btn btn-med {% if term.isFinalEvaluationOpen == True %} btn-success {% elif term.isFinalEvaluationOpen == False %} btn-danger {% endif %}"
onclick="toggleEval({{term.termCode}}, 0)"
value="{{term.isFinalEvaluationOpen}}">{% if term.isFinalEvaluationOpen == True %} Open {% elif term.isFinalEvaluationOpen == False %} Closed {% endif %}
</button>
{% endif %}
</div>
</td>
</tr>
{% endfor %}
</tbody>
Expand All @@ -202,4 +166,4 @@ <h4 class="mb-0">
{% endfor %}
</div>
</div>
{% endblock %}
{% endblock %}
Binary file added database/.DS_Store
Binary file not shown.
Binary file added database/fix-fall-positions/.DS_Store
Binary file not shown.