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/controllers/main_routes/studentLaborEvaluation.py b/app/controllers/main_routes/studentLaborEvaluation.py index 1ca83af1b..01cee2de2 100644 --- a/app/controllers/main_routes/studentLaborEvaluation.py +++ b/app/controllers/main_routes/studentLaborEvaluation.py @@ -16,31 +16,24 @@ class SLEForm(FlaskForm): attendance = IntegerRangeField("Attendance", default = 15, render_kw={'class':'form-control slider'}) attendanceComments = TextAreaField("Comments about attendance:", [Length(max=65535)], render_kw={'class':'form-control'}) - attendanceCommentsMidyear = TextAreaField("Attendance comments from Midyear :", render_kw={'class':'form-control', 'readonly': True}) accountability = IntegerRangeField("Accountability", default = 7, render_kw={'class':'form-control slider'}) accountabilityComments = TextAreaField("Comments about accountability:", [Length(max=65535)], render_kw={'class':'form-control'}) - accountabilityCommentsMidyear = TextAreaField("Attendance comments from Midyear :", render_kw={'class':'form-control', 'readonly': True}) teamwork = IntegerRangeField("Teamwork", default = 7, render_kw={'class':'form-control slider'}) teamworkComments = TextAreaField("Comments about teamwork:", [Length(max=65535)], render_kw={'class':'form-control'}) - teamworkCommentsMidyear = TextAreaField("Attendance comments from Midyear :", render_kw={'class':'form-control', 'readonly': True}) initiative = IntegerRangeField("Initiative", default = 7, render_kw={'class':'form-control slider'}) initiativeComments = TextAreaField("Comments about initiative:", [Length(max=65535)], render_kw={'class':'form-control'}) - initiativeCommentsMidyear = TextAreaField("Attendance comments from Midyear :", render_kw={'class':'form-control', 'readonly': True}) respect = IntegerRangeField("Respect", default = 7, render_kw={'class':'form-control slider'}) respectComments = TextAreaField("Comments about respect:", [Length(max=65535)], render_kw={'class':'form-control'}) - respectCommentsMidyear = TextAreaField("Attendance comments from Midyear :", render_kw={'class':'form-control', 'readonly': True}) learning = IntegerRangeField("Learning", default = 15, render_kw={'class':'form-control slider'}) learningComments = TextAreaField("Comments about learning:", [Length(max=65535)], render_kw={'class':'form-control'}) - learningCommentsMidyear = TextAreaField("Attendance comments from Midyear :", render_kw={'class':'form-control', 'readonly': True}) jobSpecific = IntegerRangeField("Job Specific", default = 15, render_kw={'class':'form-control slider'}) jobSpecificComments = TextAreaField("Comments about this job, specifically:", [Length(max=65535)], render_kw={'class':'form-control'}) - jobSpecificCommentsMidyear = TextAreaField("Attendance comments from Midyear :", render_kw={'class':'form-control', 'readonly': True}) transcriptComments = TextAreaField("Labor Transcript comments:", [Length(max=65535)], render_kw={'class':'form-control'}) @@ -73,30 +66,15 @@ def sle(statusKey): return render_template('errors/403.html'), 403 sleForm = SLEForm() - existing_final_evaluation = StudentLaborEvaluation.get_or_none(formHistoryID = laborHistoryForm, is_midyear_evaluation = False, is_submitted = True) - existing_midyear_evaluation = StudentLaborEvaluation.get_or_none(formHistoryID = laborHistoryForm, is_midyear_evaluation = True, is_submitted = True) + existing_evaluation = (StudentLaborEvaluation.select() + .where(StudentLaborEvaluation.formHistoryID == laborHistoryForm, StudentLaborEvaluation.is_submitted == True) + .order_by(StudentLaborEvaluation.date_submitted.desc(nulls="LAST"), StudentLaborEvaluation.ID.desc()) + .first()) existing_saved_evaluation = StudentLaborEvaluation.select().where(StudentLaborEvaluation.formHistoryID == laborHistoryForm, StudentLaborEvaluation.is_submitted == False) if existing_saved_evaluation: existing_saved_evaluation = existing_saved_evaluation[-1] if not request.method == "POST": # Doesn't override submitted POST data! - if existing_midyear_evaluation: # TODO Or there's savedforlater data - sleForm.attendance.data = existing_midyear_evaluation.attendance_score - sleForm.accountability.data = existing_midyear_evaluation.accountability_score - sleForm.teamwork.data = existing_midyear_evaluation.teamwork_score - sleForm.initiative.data = existing_midyear_evaluation.initiative_score - sleForm.respect.data = existing_midyear_evaluation.respect_score - sleForm.learning.data = existing_midyear_evaluation.learning_score - sleForm.jobSpecific.data = existing_midyear_evaluation.jobSpecific_score - - sleForm.attendanceCommentsMidyear.data = "Midyear comments: \n" + existing_midyear_evaluation.attendance_comment - sleForm.accountabilityCommentsMidyear.data = "Midyear comments: \n" + existing_midyear_evaluation.accountability_comment - sleForm.teamworkCommentsMidyear.data = "Midyear comments: \n" + existing_midyear_evaluation.teamwork_comment - sleForm.initiativeCommentsMidyear.data = "Midyear comments: \n" + existing_midyear_evaluation.initiative_comment - sleForm.respectCommentsMidyear.data = "Midyear comments: \n" + existing_midyear_evaluation.respect_comment - sleForm.learningCommentsMidyear.data = "Midyear comments: \n" + existing_midyear_evaluation.learning_comment - sleForm.jobSpecificCommentsMidyear.data = "Midyear comments: \n" + existing_midyear_evaluation.jobSpecific_comment - if existing_saved_evaluation: sleForm.attendance.data = existing_saved_evaluation.attendance_score sleForm.accountability.data = existing_saved_evaluation.accountability_score @@ -115,48 +93,23 @@ def sle(statusKey): sleForm.jobSpecificComments.data = existing_saved_evaluation.jobSpecific_comment sleForm.transcriptComments.data = existing_saved_evaluation.transcript_comment - - if not (laborHistoryForm.formID.termCode.isFinalEvaluationOpen or laborHistoryForm.formID.termCode.isMidyearEvaluationOpen) and not existing_final_evaluation and not existing_midyear_evaluation: - return render_template('errors/403.html'), 403 - overall_score = 73 # The default value - if existing_final_evaluation: - overall_score = (existing_final_evaluation.attendance_score + - existing_final_evaluation.accountability_score + - existing_final_evaluation.teamwork_score + - existing_final_evaluation.initiative_score + - existing_final_evaluation.respect_score + - existing_final_evaluation.learning_score + - existing_final_evaluation.jobSpecific_score) - elif existing_midyear_evaluation: - overall_score = (existing_midyear_evaluation.attendance_score + - existing_midyear_evaluation.accountability_score + - existing_midyear_evaluation.teamwork_score + - existing_midyear_evaluation.initiative_score + - existing_midyear_evaluation.respect_score + - existing_midyear_evaluation.learning_score + - existing_midyear_evaluation.jobSpecific_score) + if existing_evaluation: + overall_score = (existing_evaluation.attendance_score + + existing_evaluation.accountability_score + + existing_evaluation.teamwork_score + + existing_evaluation.initiative_score + + existing_evaluation.respect_score + + existing_evaluation.learning_score + + existing_evaluation.jobSpecific_score) if sleForm.validate_on_submit(): - # Handling Booleanfields are tricky... - try: - submitAsFinal = True if request.form["submit_as_final"] else False - except BadRequestKeyError: - submitAsFinal = False - - # First delete any temporarily saved data (is_submitted = False) - if not laborHistoryForm.formID.termCode.isMidyearEvaluationOpen: # Final eval - is_midyear_evaluation = False - elif submitAsFinal: # Midyear submitted as final - is_midyear_evaluation = False - else: # Midyear - is_midyear_evaluation = True try: - sle = StudentLaborEvaluation.get(formHistoryID = laborHistoryForm, is_submitted = False, is_midyear_evaluation = is_midyear_evaluation) + sle = StudentLaborEvaluation.get(formHistoryID = laborHistoryForm, is_submitted = False) sle.delete_instance() except DoesNotExist: pass - # Then, save the new record + studentLaborEvaluation = StudentLaborEvaluation.create( formHistoryID = laborHistoryForm, attendance_score = sleForm.attendance.data, @@ -178,10 +131,7 @@ def sle(statusKey): submitted_by = currentUser, date_submitted = date.today() ) - if laborHistoryForm.formID.termCode.isMidyearEvaluationOpen and not submitAsFinal: - studentLaborEvaluation.is_midyear_evaluation = True studentLaborEvaluation.save() - # Use first and last (so preferred name works) msg = f"Thank you for submitting a labor evaluation for {laborHistoryForm.formID.studentSupervisee.FIRST_NAME} {laborHistoryForm.formID.studentSupervisee.LAST_NAME}!" flash(msg, "success") return redirect("/") @@ -190,18 +140,16 @@ def sle(statusKey): # Only approved evaluations get an SLE, so send them home. return redirect("/") - if existing_final_evaluation and existing_final_evaluation.date_submitted: - submittedDate = existing_final_evaluation.date_submitted.strftime("%m-%d-%Y") + if existing_evaluation and existing_evaluation.date_submitted: + submittedDate = existing_evaluation.date_submitted.strftime("%m-%d-%Y") else: submittedDate = None return render_template("main/studentLaborEvaluation.html", form = sleForm, laborHistoryForm = laborHistoryForm, - existing_final_evaluation = existing_final_evaluation, - existing_midyear_evaluation = existing_midyear_evaluation, + existing_evaluation = existing_evaluation, date_submitted = submittedDate, overall_score = overall_score, - isFinalEvaluationOpen = laborHistoryForm.formID.termCode.isFinalEvaluationOpen, currentUser = currentUser ) diff --git a/app/logic/download.py b/app/logic/download.py index b9532446d..ecb517263 100644 --- a/app/logic/download.py +++ b/app/logic/download.py @@ -43,7 +43,7 @@ def __init__(self, downloadName, requestedLSFs: ModelSelect, includeEvals = Fals @staticmethod def _validateAdditionalSpreadsheetFields(additionalFields): for additionalField in additionalFields: - if additionalField not in {'overloads', 'finalEvaluations', 'midYearEvaluations', 'allEvaluations'}: + if additionalField not in {'overloads', 'allEvaluations'}: raise ValueError(f'Invalid spreadsheet fields: {additionalField}') return additionalFields @@ -184,19 +184,11 @@ def addEvaluationData(self, formID): Adds data for SLE ''' multipleRows = [] - if "finalEvaluations" in self.additionalSpreadsheetFields: - finalEvaluation = StudentLaborEvaluation.get_or_none(StudentLaborEvaluation.formHistoryID == formID, StudentLaborEvaluation.is_midyear_evaluation == 0, StudentLaborEvaluation.is_submitted == True) - if finalEvaluation: - multipleRows.append(self.insertEvaluationData(finalEvaluation, "Final")) - elif "midYearEvaluations" in self.additionalSpreadsheetFields: - midyearEvaluation = StudentLaborEvaluation.get_or_none(StudentLaborEvaluation.formHistoryID == formID, StudentLaborEvaluation.is_midyear_evaluation == 1, StudentLaborEvaluation.is_submitted == True) - if midyearEvaluation: - multipleRows.append(self.insertEvaluationData(midyearEvaluation, "Midyear")) - elif self.includeEvals == True: + if self.includeEvals == True: anyEvaluation = StudentLaborEvaluation.select().where(StudentLaborEvaluation.formHistoryID == formID, StudentLaborEvaluation.is_submitted == True) if anyEvaluation: for evaluation in anyEvaluation: - multipleRows.append(self.insertEvaluationData(evaluation, "Midyear" if evaluation.is_midyear_evaluation else "Final")) + multipleRows.append(self.insertEvaluationData(evaluation, "Evaluation")) else: return [] diff --git a/app/models/studentLaborEvaluation.py b/app/models/studentLaborEvaluation.py index aa3021fb3..e0746abf3 100644 --- a/app/models/studentLaborEvaluation.py +++ b/app/models/studentLaborEvaluation.py @@ -20,7 +20,6 @@ class StudentLaborEvaluation(baseModel): jobSpecific_score = IntegerField(null=False) jobSpecific_comment = TextField(null=False) transcript_comment = TextField(null=True) - is_midyear_evaluation = BooleanField(default=False) is_submitted = BooleanField(default=False) submitted_by = CharField(null=False) date_submitted = DateField(null=False) 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/studentLaborEvaluation.js b/app/static/js/studentLaborEvaluation.js index 455eab37f..f955cbb71 100644 --- a/app/static/js/studentLaborEvaluation.js +++ b/app/static/js/studentLaborEvaluation.js @@ -79,12 +79,3 @@ function update_sum() { $("#finalSubmitButton").click(function() { $("#isSubmitted").val("True"); }); - -$('#submit_as_final').change(function() { - if (this.checked) { - $("#transcriptComments").attr("disabled", false); - } else { - $("#transcriptComments").attr("disabled", true); - $("#transcriptComments").val(null); - } -}) 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(''); - $("#flasher").delay(5000).fadeOut(); - } - }); -} +}; \ No newline at end of file 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 diff --git a/app/templates/main/studentLaborEvaluation.html b/app/templates/main/studentLaborEvaluation.html index 269fa95ce..1c6ade8d8 100644 --- a/app/templates/main/studentLaborEvaluation.html +++ b/app/templates/main/studentLaborEvaluation.html @@ -2,15 +2,6 @@ {% block scripts %} {{super()}} - {% endblock %} {% block styles %} @@ -51,9 +42,9 @@

Student Labor Evaluation - {{laborHistoryForm.formID.studentSupervisee.FIRS
{{laborHistoryForm.formID.jobType}} ({{laborHistoryForm.formID.weeklyHours}})
Position (WLS):
{{laborHistoryForm.formID.POSN_TITLE}} ({{laborHistoryForm.formID.WLS}})
- {% if existing_final_evaluation %} + {% if existing_evaluation %}
Date Submitted:
-
{{existing_final_evaluation.date_submitted}}
+
{{existing_evaluation.date_submitted}}
{% endif %} @@ -83,13 +74,11 @@

{{ form.attendance.label }}

- {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{ form.attendance(**{"min":1, "max":20}) }} - {% endif %} + {{ form.attendance(**{"min":1, "max":20}) }}

- {% if existing_final_evaluation %} - {{existing_final_evaluation.attendance_score}}/20 + {% if existing_evaluation %} + {{existing_evaluation.attendance_score}}/20 {% else %} {{form.attendance.data}} {% endif %} @@ -99,13 +88,9 @@

{{ form.attendance.label }}

{{form.attendanceComments.label}} - {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{form.attendanceComments}} - {% endif %} - {% if existing_midyear_evaluation and not existing_final_evaluation %} - {{form.attendanceCommentsMidyear}} - {% else %} -

{{existing_final_evaluation.attendance_comment}}

+ {{form.attendanceComments}} + {% if existing_evaluation %} +

{{existing_evaluation.attendance_comment}}

{% endif %}
{% if form.attendanceComments.errors %} @@ -139,13 +124,11 @@

{{ form.accountability.label }}

- {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{ form.accountability(**{"min":1, "max":10}) }} - {% endif %} + {{ form.accountability(**{"min":1, "max":10}) }}

- {% if existing_final_evaluation %} - {{existing_final_evaluation.accountability_score}}/10 + {% if existing_evaluation %} + {{existing_evaluation.accountability_score}}/10 {% else %} {{form.accountability.data}} {% endif %} @@ -155,13 +138,9 @@

{{ form.accountability.label }}

{{form.accountabilityComments.label}} - {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{form.accountabilityComments}} - {% endif %} - {% if existing_midyear_evaluation and not existing_final_evaluation %} - {{form.accountabilityCommentsMidyear}} - {% else %} -

{{existing_final_evaluation.accountability_comment}}

+ {{form.accountabilityComments}} + {% if existing_evaluation %} +

{{existing_evaluation.accountability_comment}}

{% endif %}
{% if form.accountabilityComments.errors %} @@ -194,13 +173,11 @@

{{ form.teamwork.label }}

- {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{ form.teamwork(**{"min":1, "max":10}) }} - {% endif %} + {{ form.teamwork(**{"min":1, "max":10}) }}

- {% if existing_final_evaluation %} - {{existing_final_evaluation.teamwork_score}}/10 + {% if existing_evaluation %} + {{existing_evaluation.teamwork_score}}/10 {% else %} {{form.teamwork.data}} {% endif %} @@ -210,13 +187,9 @@

{{ form.teamwork.label }}

{{form.teamworkComments.label}} - {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{form.teamworkComments}} - {% endif %} - {% if existing_midyear_evaluation and not existing_final_evaluation %} - {{form.teamworkCommentsMidyear}} - {% else %} -

{{existing_final_evaluation.teamwork_comment}}

+ {{form.teamworkComments}} + {% if existing_evaluation %} +

{{existing_evaluation.teamwork_comment}}

{% endif %}
{% if form.teamworkComments.errors %} @@ -248,13 +221,11 @@

{{ form.initiative.label }}

- {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{ form.initiative(**{"min":1, "max":10}) }} - {% endif %} + {{ form.initiative(**{"min":1, "max":10}) }}

- {% if existing_final_evaluation %} - {{existing_final_evaluation.initiative_score}}/10 + {% if existing_evaluation %} + {{existing_evaluation.initiative_score}}/10 {% else %} {{form.initiative.data}} {% endif %} @@ -264,13 +235,9 @@

{{ form.initiative.label }}

{{form.initiativeComments.label}} - {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{form.initiativeComments}} - {% endif %} - {% if existing_midyear_evaluation and not existing_final_evaluation %} - {{form.initiativeCommentsMidyear}} - {% else %} -

{{existing_final_evaluation.initiative_comment}}

+ {{form.initiativeComments}} + {% if existing_evaluation %} +

{{existing_evaluation.initiative_comment}}

{% endif %}
{% if form.initiativeComments.errors %} @@ -302,13 +269,11 @@

{{ form.respect.label }}

- {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{ form.respect(**{"min":1, "max":10}) }} - {% endif %} + {{ form.respect(**{"min":1, "max":10}) }}

- {% if existing_final_evaluation %} - {{existing_final_evaluation.respect_score}}/10 + {% if existing_evaluation %} + {{existing_evaluation.respect_score}}/10 {% else %} {{form.respect.data}} {% endif %} @@ -318,13 +283,9 @@

{{ form.respect.label }}

{{form.respectComments.label}} - {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{form.respectComments}} - {% endif %} - {% if existing_midyear_evaluation and not existing_final_evaluation %} - {{form.respectCommentsMidyear}} - {% else %} -

{{existing_final_evaluation.respect_comment}}

+ {{form.respectComments}} + {% if existing_evaluation %} +

{{existing_evaluation.respect_comment}}

{% endif %}
{% if form.respectComments.errors %} @@ -357,13 +318,11 @@

{{ form.learning.label }}

- {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{ form.learning(**{"min":1, "max":20}) }} - {% endif %} + {{ form.learning(**{"min":1, "max":20}) }}

- {% if existing_final_evaluation %} - {{existing_final_evaluation.learning_score}}/20 + {% if existing_evaluation %} + {{existing_evaluation.learning_score}}/20 {% else %} {{form.learning.data}} {% endif %} @@ -373,13 +332,9 @@

{{ form.learning.label }}

{{form.learningComments.label}} - {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{form.learningComments}} - {% endif %} - {% if existing_midyear_evaluation and not existing_final_evaluation %} - {{form.learningCommentsMidyear}} - {% else %} -

{{existing_final_evaluation.learning_comment}}

+ {{form.learningComments}} + {% if existing_evaluation %} +

{{existing_evaluation.learning_comment}}

{% endif %}
{% if form.learningComments.errors %} @@ -410,13 +365,11 @@

{{ form.jobSpecific.label }}

- {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{ form.jobSpecific(**{"min":1, "max":20}) }} - {% endif %} + {{ form.jobSpecific(**{"min":1, "max":20}) }}

- {% if existing_final_evaluation %} - {{existing_final_evaluation.jobSpecific_score}}/20 + {% if existing_evaluation %} + {{existing_evaluation.jobSpecific_score}}/20 {% else %} {{form.jobSpecific.data}} {% endif %} @@ -426,13 +379,9 @@

{{ form.jobSpecific.label }}

{{form.jobSpecificComments.label}} - {% if not existing_final_evaluation and not (existing_midyear_evaluation and not isFinalEvaluationOpen) %} - {{form.jobSpecificComments}} - {% endif %} - {% if existing_midyear_evaluation and not existing_final_evaluation %} - {{form.jobSpecificCommentsMidyear}} - {% else %} -

{{existing_final_evaluation.jobSpecific_comment}}

+ {{form.jobSpecificComments}} + {% if existing_evaluation %} +

{{existing_evaluation.jobSpecific_comment}}

{% endif %}
{% if form.jobSpecificComments.errors %} @@ -466,10 +415,9 @@

{{ form.transcriptComments.label }}

{{form.transcriptComments.label}} - {% if existing_final_evaluation %} -

{{existing_final_evaluation.transcript_comment}}

- {% else %} - {{form.transcriptComments}} + {{form.transcriptComments}} + {% if existing_evaluation %} +

{{existing_evaluation.transcript_comment}}

{% endif %}
{% if form.transcriptComments.errors %} @@ -497,19 +445,12 @@

{{ form.transcriptComments.label }}

- {% if not existing_final_evaluation and (not existing_midyear_evaluation or isFinalEvaluationOpen) %} + {% if not existing_evaluation %} {{form.isSubmitted}}
- {% if not isFinalEvaluationOpen %} -
- -
- {% endif %}
- +
{% else %} diff --git a/database/.DS_Store b/database/.DS_Store new file mode 100644 index 000000000..5008ddfcf Binary files /dev/null and b/database/.DS_Store differ diff --git a/database/fix-fall-positions/.DS_Store b/database/fix-fall-positions/.DS_Store new file mode 100644 index 000000000..5008ddfcf Binary files /dev/null and b/database/fix-fall-positions/.DS_Store differ diff --git a/database/prod-backup.sql b/database/prod-backup.sql index a68bbafa4..a3980e1f0 100755 --- a/database/prod-backup.sql +++ b/database/prod-backup.sql @@ -1111,8 +1111,6 @@ CREATE TABLE `term` ( `isBreak` tinyint(1) NOT NULL, `isSummer` tinyint(1) NOT NULL, `isAcademicYear` tinyint(1) NOT NULL DEFAULT '0', - `isFinalEvaluationOpen` tinyint(1) NOT NULL, - `isMidyearEvaluationOpen` tinyint(1) NOT NULL, PRIMARY KEY (`termCode`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1123,7 +1121,7 @@ CREATE TABLE `term` ( LOCK TABLES `term` WRITE; /*!40000 ALTER TABLE `term` DISABLE KEYS */; -INSERT INTO `term` VALUES (201500,'AY 2015-2016',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201501,'Thanksgiving Break 2015',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201502,'Christmas Break 2015',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201503,'Spring Break 2016',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201504,'Fall Break 2015',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201511,'Fall 2015',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201512,'Spring 2016',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201513,'Summer 2016',NULL,NULL,NULL,NULL,0,1,1,0,0,0),(201600,'AY 2016-2017',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201601,'Thanksgiving Break 2016',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201602,'Christmas Break 2016',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201603,'Spring Break 2017',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201604,'Fall Break 2016',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201611,'Fall 2016',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201612,'Spring 2017',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201613,'Summer 2017',NULL,NULL,NULL,NULL,0,1,1,0,0,0),(201700,'AY 2017-2018',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201701,'Thanksgiving Break 2017',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201702,'Christmas Break 2017',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201703,'Spring Break 2018',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201704,'Fall Break 2017',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201711,'Fall 2017',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201712,'Spring 2018',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201713,'Summer 2018',NULL,NULL,NULL,NULL,0,1,1,0,0,0),(201800,'AY 2018-2019',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201801,'Thanksgiving Break 2018',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201802,'Christmas Break 2018',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201803,'Spring Break 2019',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201804,'Fall Break 2018',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201811,'Fall 2018',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201812,'Spring 2019',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201813,'Summer 2019',NULL,NULL,NULL,NULL,0,1,1,0,0,0),(201900,'AY 2019-2020',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201901,'Thanksgiving Break 2019',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201902,'Christmas Break 2019',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201903,'Spring Break 2020',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201904,'Fall Break 2019',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201905,'Spring COVID-19 Closure 2020',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(201911,'Fall 2019',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201912,'Spring 2020',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(201913,'Summer 2020','2020-06-01','2020-08-07','2020-06-14','2020-06-28',0,1,1,0,0,0),(202000,'AY 2020-2021','2020-08-11','2021-05-22','2021-02-14','2021-02-15',0,0,0,0,0,0),(202001,'Thanksgiving Break 2020',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202002,'Christmas Break 2020','2020-11-25','2021-02-02','2021-01-11','2021-01-11',0,1,0,0,0,0),(202003,'Spring Break 2021',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202004,'Fall Break 2020',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202011,'Fall 2020','2020-08-11','2020-11-24','2020-11-04','2020-11-23',0,0,0,0,0,0),(202012,'Spring 2021','2021-02-02','2021-05-22','2021-03-03','2021-02-15',0,0,0,0,0,0),(202013,'Summer 2021','2021-05-23','2021-08-16','2021-08-15','2021-08-15',0,1,1,0,0,0),(202100,'AY 2021-2022','2021-08-17','2022-05-08','2022-01-21','2022-06-02',0,0,0,0,0,0),(202101,'Thanksgiving Break 2021','2021-11-24','2021-11-28','2021-11-25','2021-11-25',0,1,0,0,0,0),(202102,'Christmas Break 2021','2021-12-12','2022-01-09','2021-12-17','2022-01-08',0,1,0,0,0,0),(202103,'Spring Break 2022','2022-03-07','2022-03-13','2022-03-12','2022-03-12',0,1,0,0,0,0),(202104,'Fall Break 2021',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202111,'Fall 2021','2021-08-17','2021-12-11','2021-09-01','2021-08-23',0,0,0,0,0,0),(202112,'Spring 2022','2022-01-17','2022-05-08','2022-03-31','2022-01-21',0,0,0,0,0,0),(202113,'Summer 2022','2022-05-09','2022-08-22','2022-08-22','2022-08-22',0,1,1,0,0,0),(202200,'AY 2022-2023','2023-01-29','2023-05-07','2023-03-26','2023-05-21',0,0,0,0,0,0),(202201,'Thanksgiving Break 2022','2022-11-23','2022-11-27','2022-11-24','2022-11-24',0,1,0,0,0,0),(202202,'Christmas Break 2022','2022-12-18','2023-01-08','2022-12-20','2022-12-20',0,1,0,0,0,0),(202203,'Spring Break 2023','2023-03-06','2023-03-12','2023-03-07','2023-03-01',0,1,0,0,0,0),(202204,'Fall Break 2022',NULL,NULL,'2022-08-31','2023-03-03',0,1,0,0,0,0),(202211,'Fall 2022','2022-10-30','2023-05-07','2022-11-03','2022-11-03',0,0,0,0,0,0),(202212,'Spring 2023',NULL,NULL,'2023-01-04','2023-01-30',0,0,0,0,0,0),(202213,'Summer 2023','2023-05-08','2023-08-22','2023-08-21','2023-07-28',0,1,1,0,0,0),(202300,'AY 2023-2024','2024-01-08','2024-05-05','2024-04-26','2024-02-05',0,0,0,0,0,0),(202301,'Thanksgiving Break 2023','2023-11-22','2023-11-26',NULL,NULL,0,1,0,0,0,0),(202302,'Christmas Break 2023','2023-12-17','2024-01-07','2023-12-22','2023-12-11',0,1,0,0,0,0),(202303,'Spring Break 2024','2024-03-04','2024-03-10','2024-03-07','2024-03-07',0,1,0,0,0,0),(202304,'Fall Break 2023','2023-11-22','2023-11-26','2023-11-25','2023-11-25',0,1,0,0,0,0),(202311,'Fall 2023','2023-08-22',NULL,'2023-08-29','2023-08-29',0,0,0,0,0,0),(202312,'Spring 2024',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(202313,'Summer 2024','2024-05-06','2024-08-19','2024-08-18','2024-07-22',0,1,1,0,0,0),(202400,'AY 2024-2025','2025-01-06','2025-05-04','2025-03-03','2025-01-12',0,0,0,1,0,0),(202401,'Thanksgiving Break 2024','2024-11-27','2024-12-01','2024-11-28','2024-11-28',0,1,0,0,0,0),(202402,'Christmas Break 2024','2024-12-15','2025-01-05','2025-01-04','2024-12-16',0,1,0,0,0,0),(202403,'Spring Break 2025','2025-03-03','2025-03-09','2025-03-08','2025-03-04',0,1,0,0,0,0),(202404,'Fall Break 2024',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202411,'Fall 2024',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(202412,'Spring 2025',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(202413,'Summer 2025','2025-05-05','2025-08-18','2025-05-06','2025-05-06',1,1,1,0,0,0),(202500,'AY 2025-2026',NULL,NULL,NULL,NULL,0,0,0,1,0,0),(202501,'Thanksgiving Break 2025',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202502,'Christmas Break 2025',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202503,'Spring Break 2026',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202504,'Fall Break 2025',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202511,'Fall 2025',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(202512,'Spring 2026',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(202513,'Summer 2026',NULL,NULL,NULL,NULL,0,1,1,0,0,0),(202600,'AY 2026-2027',NULL,NULL,NULL,NULL,0,0,0,1,0,0),(202601,'Thanksgiving Break 2026',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202602,'Christmas Break 2026',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202603,'Spring Break 2027',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202604,'Fall Break 2026',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202611,'Fall 2026',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(202612,'Spring 2027',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(202613,'Summer 2027',NULL,NULL,NULL,NULL,0,1,1,0,0,0),(202700,'AY 2027-2028',NULL,NULL,NULL,NULL,0,0,0,1,0,0),(202701,'Thanksgiving Break 2027',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202702,'Christmas Break 2027',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202703,'Spring Break 2028',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202704,'Fall Break 2027',NULL,NULL,NULL,NULL,0,1,0,0,0,0),(202711,'Fall 2027',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(202712,'Spring 2028',NULL,NULL,NULL,NULL,0,0,0,0,0,0),(202713,'Summer 2028',NULL,NULL,NULL,NULL,0,1,1,0,0,0); +INSERT INTO `term` VALUES (201500,'AY 2015-2016',NULL,NULL,NULL,NULL,0,0,0,0),(201501,'Thanksgiving Break 2015',NULL,NULL,NULL,NULL,0,1,0,0),(201502,'Christmas Break 2015',NULL,NULL,NULL,NULL,0,1,0,0),(201503,'Spring Break 2016',NULL,NULL,NULL,NULL,0,1,0,0),(201504,'Fall Break 2015',NULL,NULL,NULL,NULL,0,1,0,0),(201511,'Fall 2015',NULL,NULL,NULL,NULL,0,0,0,0),(201512,'Spring 2016',NULL,NULL,NULL,NULL,0,0,0,0),(201513,'Summer 2016',NULL,NULL,NULL,NULL,0,1,1,0),(201600,'AY 2016-2017',NULL,NULL,NULL,NULL,0,0,0,0),(201601,'Thanksgiving Break 2016',NULL,NULL,NULL,NULL,0,1,0,0),(201602,'Christmas Break 2016',NULL,NULL,NULL,NULL,0,1,0,0),(201603,'Spring Break 2017',NULL,NULL,NULL,NULL,0,1,0,0),(201604,'Fall Break 2016',NULL,NULL,NULL,NULL,0,1,0,0),(201611,'Fall 2016',NULL,NULL,NULL,NULL,0,0,0,0),(201612,'Spring 2017',NULL,NULL,NULL,NULL,0,0,0,0),(201613,'Summer 2017',NULL,NULL,NULL,NULL,0,1,1,0),(201700,'AY 2017-2018',NULL,NULL,NULL,NULL,0,0,0,0),(201701,'Thanksgiving Break 2017',NULL,NULL,NULL,NULL,0,1,0,0),(201702,'Christmas Break 2017',NULL,NULL,NULL,NULL,0,1,0,0),(201703,'Spring Break 2018',NULL,NULL,NULL,NULL,0,1,0,0),(201704,'Fall Break 2017',NULL,NULL,NULL,NULL,0,1,0,0),(201711,'Fall 2017',NULL,NULL,NULL,NULL,0,0,0,0),(201712,'Spring 2018',NULL,NULL,NULL,NULL,0,0,0,0),(201713,'Summer 2018',NULL,NULL,NULL,NULL,0,1,1,0),(201800,'AY 2018-2019',NULL,NULL,NULL,NULL,0,0,0,0),(201801,'Thanksgiving Break 2018',NULL,NULL,NULL,NULL,0,1,0,0),(201802,'Christmas Break 2018',NULL,NULL,NULL,NULL,0,1,0,0),(201803,'Spring Break 2019',NULL,NULL,NULL,NULL,0,1,0,0),(201804,'Fall Break 2018',NULL,NULL,NULL,NULL,0,1,0,0),(201811,'Fall 2018',NULL,NULL,NULL,NULL,0,0,0,0),(201812,'Spring 2019',NULL,NULL,NULL,NULL,0,0,0,0),(201813,'Summer 2019',NULL,NULL,NULL,NULL,0,1,1,0),(201900,'AY 2019-2020',NULL,NULL,NULL,NULL,0,0,0,0),(201901,'Thanksgiving Break 2019',NULL,NULL,NULL,NULL,0,1,0,0),(201902,'Christmas Break 2019',NULL,NULL,NULL,NULL,0,1,0,0),(201903,'Spring Break 2020',NULL,NULL,NULL,NULL,0,1,0,0),(201904,'Fall Break 2019',NULL,NULL,NULL,NULL,0,1,0,0),(201905,'Spring COVID-19 Closure 2020',NULL,NULL,NULL,NULL,0,1,0,0),(201911,'Fall 2019',NULL,NULL,NULL,NULL,0,0,0,0),(201912,'Spring 2020',NULL,NULL,NULL,NULL,0,0,0,0),(201913,'Summer 2020','2020-06-01','2020-08-07','2020-06-14','2020-06-28',0,1,1,0),(202000,'AY 2020-2021','2020-08-11','2021-05-22','2021-02-14','2021-02-15',0,0,0,0),(202001,'Thanksgiving Break 2020',NULL,NULL,NULL,NULL,0,1,0,0),(202002,'Christmas Break 2020','2020-11-25','2021-02-02','2021-01-11','2021-01-11',0,1,0,0),(202003,'Spring Break 2021',NULL,NULL,NULL,NULL,0,1,0,0),(202004,'Fall Break 2020',NULL,NULL,NULL,NULL,0,1,0,0),(202011,'Fall 2020','2020-08-11','2020-11-24','2020-11-04','2020-11-23',0,0,0,0),(202012,'Spring 2021','2021-02-02','2021-05-22','2021-03-03','2021-02-15',0,0,0,0),(202013,'Summer 2021','2021-05-23','2021-08-16','2021-08-15','2021-08-15',0,1,1,0),(202100,'AY 2021-2022','2021-08-17','2022-05-08','2022-01-21','2022-06-02',0,0,0,0),(202101,'Thanksgiving Break 2021','2021-11-24','2021-11-28','2021-11-25','2021-11-25',0,1,0,0),(202102,'Christmas Break 2021','2021-12-12','2022-01-09','2021-12-17','2022-01-08',0,1,0,0),(202103,'Spring Break 2022','2022-03-07','2022-03-13','2022-03-12','2022-03-12',0,1,0,0),(202104,'Fall Break 2021',NULL,NULL,NULL,NULL,0,1,0,0),(202111,'Fall 2021','2021-08-17','2021-12-11','2021-09-01','2021-08-23',0,0,0,0),(202112,'Spring 2022','2022-01-17','2022-05-08','2022-03-31','2022-01-21',0,0,0,0),(202113,'Summer 2022','2022-05-09','2022-08-22','2022-08-22','2022-08-22',0,1,1,0),(202200,'AY 2022-2023','2023-01-29','2023-05-07','2023-03-26','2023-05-21',0,0,0,0),(202201,'Thanksgiving Break 2022','2022-11-23','2022-11-27','2022-11-24','2022-11-24',0,1,0,0),(202202,'Christmas Break 2022','2022-12-18','2023-01-08','2022-12-20','2022-12-20',0,1,0,0),(202203,'Spring Break 2023','2023-03-06','2023-03-12','2023-03-07','2023-03-01',0,1,0,0),(202204,'Fall Break 2022',NULL,NULL,'2022-08-31','2023-03-03',0,1,0,0),(202211,'Fall 2022','2022-10-30','2023-05-07','2022-11-03','2022-11-03',0,0,0,0),(202212,'Spring 2023',NULL,NULL,'2023-01-04','2023-01-30',0,0,0,0),(202213,'Summer 2023','2023-05-08','2023-08-22','2023-08-21','2023-07-28',0,1,1,0),(202300,'AY 2023-2024','2024-01-08','2024-05-05','2024-04-26','2024-02-05',0,0,0,0),(202301,'Thanksgiving Break 2023','2023-11-22','2023-11-26',NULL,NULL,0,1,0,0),(202302,'Christmas Break 2023','2023-12-17','2024-01-07','2023-12-22','2023-12-11',0,1,0,0),(202303,'Spring Break 2024','2024-03-04','2024-03-10','2024-03-07','2024-03-07',0,1,0,0),(202304,'Fall Break 2023','2023-11-22','2023-11-26','2023-11-25','2023-11-25',0,1,0,0),(202311,'Fall 2023','2023-08-22',NULL,'2023-08-29','2023-08-29',0,0,0,0),(202312,'Spring 2024',NULL,NULL,NULL,NULL,0,0,0,0),(202313,'Summer 2024','2024-05-06','2024-08-19','2024-08-18','2024-07-22',0,1,1,0),(202400,'AY 2024-2025','2025-01-06','2025-05-04','2025-03-03','2025-01-12',0,0,0,1),(202401,'Thanksgiving Break 2024','2024-11-27','2024-12-01','2024-11-28','2024-11-28',0,1,0,0),(202402,'Christmas Break 2024','2024-12-15','2025-01-05','2025-01-04','2024-12-16',0,1,0,0),(202403,'Spring Break 2025','2025-03-03','2025-03-09','2025-03-08','2025-03-04',0,1,0,0),(202404,'Fall Break 2024',NULL,NULL,NULL,NULL,0,1,0,0),(202411,'Fall 2024',NULL,NULL,NULL,NULL,0,0,0,0),(202412,'Spring 2025',NULL,NULL,NULL,NULL,0,0,0,0),(202413,'Summer 2025','2025-05-05','2025-08-18','2025-05-06','2025-05-06',1,1,1,0),(202500,'AY 2025-2026',NULL,NULL,NULL,NULL,0,0,0,1),(202501,'Thanksgiving Break 2025',NULL,NULL,NULL,NULL,0,1,0,0),(202502,'Christmas Break 2025',NULL,NULL,NULL,NULL,0,1,0,0),(202503,'Spring Break 2026',NULL,NULL,NULL,NULL,0,1,0,0),(202504,'Fall Break 2025',NULL,NULL,NULL,NULL,0,1,0,0),(202511,'Fall 2025',NULL,NULL,NULL,NULL,0,0,0,0),(202512,'Spring 2026',NULL,NULL,NULL,NULL,0,0,0,0),(202513,'Summer 2026',NULL,NULL,NULL,NULL,0,1,1,0),(202600,'AY 2026-2027',NULL,NULL,NULL,NULL,0,0,0,1),(202601,'Thanksgiving Break 2026',NULL,NULL,NULL,NULL,0,1,0,0),(202602,'Christmas Break 2026',NULL,NULL,NULL,NULL,0,1,0,0),(202603,'Spring Break 2027',NULL,NULL,NULL,NULL,0,1,0,0),(202604,'Fall Break 2026',NULL,NULL,NULL,NULL,0,1,0,0),(202611,'Fall 2026',NULL,NULL,NULL,NULL,0,0,0,0),(202612,'Spring 2027',NULL,NULL,NULL,NULL,0,0,0,0),(202613,'Summer 2027',NULL,NULL,NULL,NULL,0,1,1,0),(202700,'AY 2027-2028',NULL,NULL,NULL,NULL,0,0,0,1),(202701,'Thanksgiving Break 2027',NULL,NULL,NULL,NULL,0,1,0,0),(202702,'Christmas Break 2027',NULL,NULL,NULL,NULL,0,1,0,0),(202703,'Spring Break 2028',NULL,NULL,NULL,NULL,0,1,0,0),(202704,'Fall Break 2027',NULL,NULL,NULL,NULL,0,1,0,0),(202711,'Fall 2027',NULL,NULL,NULL,NULL,0,0,0,0),(202712,'Spring 2028',NULL,NULL,NULL,NULL,0,0,0,0),(202713,'Summer 2028',NULL,NULL,NULL,NULL,0,1,1,0); /*!40000 ALTER TABLE `term` ENABLE KEYS */; UNLOCK TABLES; diff --git a/tests/code/test_apiEndpoint.py b/tests/code/test_apiEndpoint.py index 4cc41aa6e..c211f67b2 100644 --- a/tests/code/test_apiEndpoint.py +++ b/tests/code/test_apiEndpoint.py @@ -47,9 +47,7 @@ def test_getLaborInformation(): termState = 1, isBreak = 0, isSummer = 0, - isAcademicyear = 0, - isFinalEvaluationOpen = 0, - isMidyearEvaluationOpen = 0) + isAcademicYear = 0) testLaborForm = LaborStatusForm.create(termCode_id = 202100, studentSupervisee_id = "B00841417", diff --git a/tests/code/test_studentEvaluation.py b/tests/code/test_studentEvaluation.py index d2dd287e0..436b544d6 100644 --- a/tests/code/test_studentEvaluation.py +++ b/tests/code/test_studentEvaluation.py @@ -27,8 +27,7 @@ def testCreateStudentEval(): termState=1, isBreak=0, isSummer=0, - isAcademicYear=0, - isFinalEvaluationOpen=1)) + isAcademicYear=0)) testingStudent = (Student.create( ID="B00000002", @@ -76,7 +75,6 @@ def testCreateStudentEval(): status = "Approved")) testCreation = {"isSubmitted": True, - "submit_as_final": True, "attendance": 15, "accountability": 7, "teamwork": 7,