From ea768c92a8e50b28ca10f5c9bcf0f06b6502562b Mon Sep 17 00:00:00 2001 From: May Jue Date: Wed, 9 Dec 2020 15:16:11 -0500 Subject: [PATCH 1/7] Spring and fall will no longer be displayed in the term selectpicker --- app/controllers/main_routes/laborStatusForm.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/main_routes/laborStatusForm.py b/app/controllers/main_routes/laborStatusForm.py index f988bc0b..a5501690 100755 --- a/app/controllers/main_routes/laborStatusForm.py +++ b/app/controllers/main_routes/laborStatusForm.py @@ -35,10 +35,18 @@ def laborStatusForm(laborStatusKey = None): # Logged in students = Tracy().getStudents() - terms = Term.select().where(Term.termState == "open") # changed to term state, open, closed, inactive + allTerms = Term.select().where(Term.termState == "open") # changed to term state, open, closed, inactive staffs = Tracy().getSupervisors() departments = Tracy().getDepartments() + springFallOnlyTerms = [] + terms = [] + for term in allTerms: + if str(term.termCode)[-2:] in ["11", "12"]: + springFallOnlyTerms.append(term) + else: + terms.append(term) + # Only prepopulate form if current user is the supervisor or creator of the form. if laborStatusKey != None: selectedLSForm = LaborStatusForm.get(LaborStatusForm.laborStatusFormID == laborStatusKey) From be8d31a21210370a940b5b67ce228217b722f448 Mon Sep 17 00:00:00 2001 From: May Jue Date: Thu, 17 Dec 2020 13:49:53 -0500 Subject: [PATCH 2/7] added checkbox for spring and fall --- .../main_routes/laborStatusForm.py | 10 ++- app/static/css/laborStatusForm.css | 4 +- app/static/js/laborStatusForm.js | 65 ++++++++++++++++--- app/templates/main/laborStatusForm.html | 14 +++- 4 files changed, 78 insertions(+), 15 deletions(-) diff --git a/app/controllers/main_routes/laborStatusForm.py b/app/controllers/main_routes/laborStatusForm.py index a5501690..c4b2b877 100755 --- a/app/controllers/main_routes/laborStatusForm.py +++ b/app/controllers/main_routes/laborStatusForm.py @@ -39,11 +39,14 @@ def laborStatusForm(laborStatusKey = None): staffs = Tracy().getSupervisors() departments = Tracy().getDepartments() - springFallOnlyTerms = [] + springFallOnlyTerms = {} terms = [] for term in allTerms: - if str(term.termCode)[-2:] in ["11", "12"]: - springFallOnlyTerms.append(term) + if str(term.termCode)[-2:] in ["11", "12"] and str(term.termCode)[:4] in springFallOnlyTerms: + springFallOnlyTerms[str(term.termCode)[:4]].append(term) + elif str(term.termCode)[-2:] in ["11", "12"]: + springFallOnlyTerms[str(term.termCode)[:4]]= [term] + print(springFallOnlyTerms) else: terms.append(term) @@ -65,6 +68,7 @@ def laborStatusForm(laborStatusKey = None): forms = forms, students = students, terms = terms, + springFallOnlyTerms = springFallOnlyTerms, staffs = staffs, departments = departments) diff --git a/app/static/css/laborStatusForm.css b/app/static/css/laborStatusForm.css index 339d6bfd..f1a9944b 100755 --- a/app/static/css/laborStatusForm.css +++ b/app/static/css/laborStatusForm.css @@ -20,13 +20,13 @@ .floatleft { float: left; width: 47%; -height: 310px; +height: 80%; } .floatright { float: right; width: 47%; -height: 310px; +height: 80%; } #mytable { diff --git a/app/static/js/laborStatusForm.js b/app/static/js/laborStatusForm.js index 5fa19426..f4a4f756 100755 --- a/app/static/js/laborStatusForm.js +++ b/app/static/js/laborStatusForm.js @@ -21,12 +21,18 @@ $(document).ready(function(){ for (i in parsedArrayOfStudentCookies) { createAndFillTable(parsedArrayOfStudentCookies[i]); } - $("#selectedTerm option[value=" + parsedArrayOfStudentCookies[0].stuTermCode + "]").attr('selected', 'selected'); + $("#term").val(parsedArrayOfStudentCookies[0].stuTermCode) + $("#selectedTerm option[value=" + parsedArrayOfStudentCookies[0].selectedTerm + "]").attr('selected', 'selected'); $("#selectedSupervisor option[value=" + parsedArrayOfStudentCookies[0].stuSupervisorID + "]").attr('selected', 'selected'); $("#selectedDepartment option[value=\"" + parsedArrayOfStudentCookies[0].stuDepartmentORG + "\"]").attr('selected', 'selected'); + if (parsedArrayOfStudentCookies[0].stuTermCode != parsedArrayOfStudentCookies[0].selectedTerm ){ + showCheckbox(parsedArrayOfStudentCookies[0].stuTermCode) + $("input[name=term][value='" + parsedArrayOfStudentCookies[0].stuTermCode + "']").prop('checked', true); + } + console.log($("#term").text()); getDepartment($("#selectedDepartment")); - preFilledDate($("#selectedTerm")); - showAccessLevel($("#selectedTerm")); + preFilledDate($("#term")); + showAccessLevel($("#term")); disableTermSupervisorDept(); } }); @@ -35,6 +41,34 @@ $("#laborStatusForm").submit(function(event) { event.preventDefault(); }); +$("#selectedTerm").change(function(){ + $("#term").val("") + var term =$(this).val(); + lastTwoDigit = term % 100; + $('input[name=term]').prop('checked', false); + $("#term").val(term) + if (lastTwoDigit == 0){ + showCheckbox(term); + } + else{ + $(".termCheckbox").hide() + } +}) + +$('input[type="checkbox"]').on('change', function() { + if ($(this).is(':checked')){ + $("#term").val(""); + $('input[name=term]').not(this).prop('checked', false); + $("#term").val($(this).val()); + } + else{ + $("#term").val(""); + $("#term").val($("#selectedTerm").find("option:selected").val()); + } + preFilledDate($("#term")); + showAccessLevel($("#term")); +}); + $("#calendarIcon1").click(function() { $("#dateTimePicker1").datepicker('show') // Shows the start date datepicker when glyphicon is clicked }); @@ -62,6 +96,12 @@ $("#jobType").change(function(){ // Pops up a modal for Seconday Postion } }); +function showCheckbox(term){ + termYear = term.toString().slice(0,4); + $(".termCheckbox").show() + $('.termCheckbox').not('#' + termYear).hide(); + } + function checkIfFreshman() { var jobType = $("#jobType").val(); var wls = $("#position :selected").attr("data-wls") @@ -89,6 +129,7 @@ function disableTermSupervisorDept() { $("#selectedDepartment").prop("disabled", "disabled"); $("#departmentInfo").show(); $("#selectedDepartment").selectpicker("refresh"); + $("input[name=term]").prop("disabled", "disabled"); } function preFilledDate(obj){ // get term start date and end date @@ -108,7 +149,7 @@ function fillDates(response) { // prefill term start and term end $("#primary-cutoff-date").text(""); $("#addMoreStudent").show(); - $("#selectedTerm").on("change", function(){ + $(".selectedTerm").on("change", function(){ $("#jobType").val(''); }); for (var key in response){ @@ -320,6 +361,7 @@ $("#JobTypes").hide(); $("#plus").hide(); $("#mytable").hide(); $("#failedTable").hide(); +$(".termCheckbox").hide() function showAccessLevel(){ // Make Table labels appear @@ -389,6 +431,7 @@ function deleteRow(glyphicon) { $("#selectedSupervisor").selectpicker("refresh"); $("#selectedDepartment").prop("disabled", false); $("#selectedDepartment").selectpicker("refresh"); + $("input[name=term]").prop("disabled", false); } } //END of glyphicons @@ -429,7 +472,8 @@ function createStuDict(){ var department = $("#selectedDepartment").find("option:selected").text(); var departmentORG = $("#selectedDepartment").find("option:selected").val(); var departmentAccount = $("#selectedDepartment").find("option:selected").data("account"); - var termCodeSelected = $("#selectedTerm").find("option:selected").val(); + var termCodeSelected = $("#term").val(); + var selectedTerm = $("#selectedTerm").find("option:selected").val(); var isBreak = $("#selectedTerm").find("option:selected").data("termbreak") var studentName = $("#student option:selected").text(); if (!studentName){ @@ -479,7 +523,8 @@ function createStuDict(){ stuDepartmentAccount: departmentAccount, stuSupervisorID: supervisorID, isItOverloadForm: "False", - isTermBreak: isBreak + isTermBreak: isBreak, + selectedTerm: selectedTerm }; return studentDict; } @@ -496,7 +541,8 @@ function checkDuplicate(studentDict) {// checks for duplicates in the table. Thi } function checkPrimaryPositionToCreateTheTable(studentDict) { - var term = $("#selectedTerm").val(); + var term = $("#term").val(); + console.log(term, "pri"); var url = "/laborstatusform/getstudents/" + term + "/" + studentDict.stuBNumber; var data = JSON.stringify(studentDict.stuJobType); $.ajax({ @@ -614,7 +660,7 @@ function createAndFillTable(studentDict) { function isOneLaborStatusForm(studentDict){ var isBreak = (studentDict).isTermBreak; - var term = $("#selectedTerm").val(); + var term = $("#term").val(); if(isBreak){ url = "/laborstatusform/getstudents/" + term + "/"+ studentDict.stuBNumber+ "/"+ 'isOneLSF'; // check whether student has multiple labor status forms over the break period. @@ -640,7 +686,8 @@ function isOneLaborStatusForm(studentDict){ } function checkTotalHours(studentDict) { - var termCode = $("#selectedTerm").val() + var termCode = $("#term").val() + console.log("total hours", termCode); var isBreak = $("#selectedTerm").find("option:selected").data("termbreak"); $.ajax({ url: "/laborstatusform/checktotalhours/" + termCode +"/"+ studentDict.stuBNumber +"/"+ studentDict.stuWeeklyHours +"/"+ studentDict.stuContractHours, diff --git a/app/templates/main/laborStatusForm.html b/app/templates/main/laborStatusForm.html index 24a44a9a..9e000846 100755 --- a/app/templates/main/laborStatusForm.html +++ b/app/templates/main/laborStatusForm.html @@ -106,7 +106,7 @@

Labor Status Form title="Forms can only be submitted to one term at a time" aria-hidden="false"> - + + +
+ {% for year in springFallOnlyTerms %} +
+ {% for term in springFallOnlyTerms[year]%} + {{term.termName}} only + {% endfor %} +
+ {% endfor %} +
+
From df9961ecfdf6162a01508af8ae8bfbd0c01c5f57 Mon Sep 17 00:00:00 2001 From: May Jue Date: Fri, 18 Dec 2020 09:19:46 -0500 Subject: [PATCH 3/7] made sure only one set of spring/fall only appears for each AY --- app/controllers/main_routes/laborStatusForm.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/main_routes/laborStatusForm.py b/app/controllers/main_routes/laborStatusForm.py index c4b2b877..cacc9156 100755 --- a/app/controllers/main_routes/laborStatusForm.py +++ b/app/controllers/main_routes/laborStatusForm.py @@ -46,7 +46,6 @@ def laborStatusForm(laborStatusKey = None): springFallOnlyTerms[str(term.termCode)[:4]].append(term) elif str(term.termCode)[-2:] in ["11", "12"]: springFallOnlyTerms[str(term.termCode)[:4]]= [term] - print(springFallOnlyTerms) else: terms.append(term) From 860e8c25c68abf10b54e63c01a70063b17ba18d2 Mon Sep 17 00:00:00 2001 From: May Jue Date: Fri, 18 Dec 2020 12:40:25 -0500 Subject: [PATCH 4/7] Release/rehire modal now shows the correct term --- app/static/js/laborStatusForm.js | 34 ++++++++++++------------- app/templates/main/laborStatusForm.html | 4 +-- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/app/static/js/laborStatusForm.js b/app/static/js/laborStatusForm.js index f4a4f756..baaacc7d 100755 --- a/app/static/js/laborStatusForm.js +++ b/app/static/js/laborStatusForm.js @@ -21,15 +21,14 @@ $(document).ready(function(){ for (i in parsedArrayOfStudentCookies) { createAndFillTable(parsedArrayOfStudentCookies[i]); } - $("#term").val(parsedArrayOfStudentCookies[0].stuTermCode) + $("#term").val(parsedArrayOfStudentCookies[0].stuTermCode).attr('name', parsedArrayOfStudentCookies[0].stuTermName) $("#selectedTerm option[value=" + parsedArrayOfStudentCookies[0].selectedTerm + "]").attr('selected', 'selected'); $("#selectedSupervisor option[value=" + parsedArrayOfStudentCookies[0].stuSupervisorID + "]").attr('selected', 'selected'); $("#selectedDepartment option[value=\"" + parsedArrayOfStudentCookies[0].stuDepartmentORG + "\"]").attr('selected', 'selected'); if (parsedArrayOfStudentCookies[0].stuTermCode != parsedArrayOfStudentCookies[0].selectedTerm ){ showCheckbox(parsedArrayOfStudentCookies[0].stuTermCode) - $("input[name=term][value='" + parsedArrayOfStudentCookies[0].stuTermCode + "']").prop('checked', true); + $(".termChecked[value='" + parsedArrayOfStudentCookies[0].stuTermCode + "']").prop('checked', true); } - console.log($("#term").text()); getDepartment($("#selectedDepartment")); preFilledDate($("#term")); showAccessLevel($("#term")); @@ -42,28 +41,28 @@ $("#laborStatusForm").submit(function(event) { }); $("#selectedTerm").change(function(){ - $("#term").val("") var term =$(this).val(); lastTwoDigit = term % 100; - $('input[name=term]').prop('checked', false); - $("#term").val(term) + $('.termChecked').prop('checked', false); if (lastTwoDigit == 0){ showCheckbox(term); } else{ $(".termCheckbox").hide() } +$("#term").val("") +$("#term").val(term).attr('name', $("#selectedTerm").find("option:selected").attr('name')) }) -$('input[type="checkbox"]').on('change', function() { +$('.termChecked').on('change', function() { if ($(this).is(':checked')){ $("#term").val(""); - $('input[name=term]').not(this).prop('checked', false); - $("#term").val($(this).val()); + $('.termChecked').not(this).prop('checked', false); + $('#term').attr('name', $(this).attr('name')).val($(this).val()); } else{ $("#term").val(""); - $("#term").val($("#selectedTerm").find("option:selected").val()); + $("#term").attr('name', $("#selectedTerm").find("option:selected").attr('name')).val($("#selectedTerm").find("option:selected").val()); } preFilledDate($("#term")); showAccessLevel($("#term")); @@ -129,7 +128,7 @@ function disableTermSupervisorDept() { $("#selectedDepartment").prop("disabled", "disabled"); $("#departmentInfo").show(); $("#selectedDepartment").selectpicker("refresh"); - $("input[name=term]").prop("disabled", "disabled"); + $(".termChecked").prop("disabled", "disabled"); } function preFilledDate(obj){ // get term start date and end date @@ -431,7 +430,7 @@ function deleteRow(glyphicon) { $("#selectedSupervisor").selectpicker("refresh"); $("#selectedDepartment").prop("disabled", false); $("#selectedDepartment").selectpicker("refresh"); - $("input[name=term]").prop("disabled", false); + $(".termChecked").prop("disabled", false); } } //END of glyphicons @@ -473,6 +472,7 @@ function createStuDict(){ var departmentORG = $("#selectedDepartment").find("option:selected").val(); var departmentAccount = $("#selectedDepartment").find("option:selected").data("account"); var termCodeSelected = $("#term").val(); + var termName = $("#term").attr('name') var selectedTerm = $("#selectedTerm").find("option:selected").val(); var isBreak = $("#selectedTerm").find("option:selected").data("termbreak") var studentName = $("#student option:selected").text(); @@ -515,6 +515,7 @@ function createStuDict(){ stuStartDate: startDate, stuEndDate: endDate, stuTermCode: termCodeSelected, + stuTermName: termName, stuNotes: "", stuLaborNotes: laborStatusFormNote, stuSupervisor: supervisor.trim(), @@ -522,9 +523,9 @@ function createStuDict(){ stuDepartmentORG: departmentORG, stuDepartmentAccount: departmentAccount, stuSupervisorID: supervisorID, + selectedTerm: selectedTerm, isItOverloadForm: "False", - isTermBreak: isBreak, - selectedTerm: selectedTerm + isTermBreak: isBreak }; return studentDict; } @@ -542,7 +543,6 @@ function checkDuplicate(studentDict) {// checks for duplicates in the table. Thi function checkPrimaryPositionToCreateTheTable(studentDict) { var term = $("#term").val(); - console.log(term, "pri"); var url = "/laborstatusform/getstudents/" + term + "/" + studentDict.stuBNumber; var data = JSON.stringify(studentDict.stuJobType); $.ajax({ @@ -570,7 +570,7 @@ function checkPrimaryPositionToCreateTheTable(studentDict) { $('#oldPosition').html(response['position']) $('#oldHours').html(response['hours']) - $('#newTerm').html($("#selectedTerm").find("option:selected").text()); + $('#newTerm').html(studentDict.stuTermName); $('#newSupervisor').html(studentDict.stuSupervisor) $('#newDepartment').html(studentDict.stuDepartment +" ("+ studentDict.stuDepartmentORG+"-"+studentDict.stuDepartmentAccount +")") $('#newPosition').html(studentDict.stuPositionCode +" - "+ studentDict.stuPosition +" ("+ studentDict.stuWLS+")") @@ -687,7 +687,6 @@ function isOneLaborStatusForm(studentDict){ function checkTotalHours(studentDict) { var termCode = $("#term").val() - console.log("total hours", termCode); var isBreak = $("#selectedTerm").find("option:selected").data("termbreak"); $.ajax({ url: "/laborstatusform/checktotalhours/" + termCode +"/"+ studentDict.stuBNumber +"/"+ studentDict.stuWeeklyHours +"/"+ studentDict.stuContractHours, @@ -738,7 +737,6 @@ $("#resetConfirmButton").click(function(){ globalArrayOfStudents = []; $("#tbodyid tr").remove(); document.cookie = JSON.stringify(globalArrayOfStudents) + ";max-age=0;"; - console.log(document.cookie); location.reload(); }); diff --git a/app/templates/main/laborStatusForm.html b/app/templates/main/laborStatusForm.html index 9e000846..e267b986 100755 --- a/app/templates/main/laborStatusForm.html +++ b/app/templates/main/laborStatusForm.html @@ -116,7 +116,7 @@

Labor Status Form onchange = "showAccessLevel(); preFilledDate(this); summerLaborWarning()"> {% for term in terms %} - + {% endfor %} @@ -126,7 +126,7 @@

Labor Status Form {% for year in springFallOnlyTerms %}
{% for term in springFallOnlyTerms[year]%} - {{term.termName}} only + {{term.termName}} only {% endfor %}
{% endfor %} From 86b48a5f068d4c1e76a488583c68e4e7d2d83244 Mon Sep 17 00:00:00 2001 From: May Jue Date: Fri, 20 Aug 2021 09:14:28 -0400 Subject: [PATCH 5/7] fix merge request and only store the AY in the database instead of spring or fall term --- app/controllers/main_routes/laborStatusForm.py | 15 ++++++++------- app/static/js/laborStatusForm.js | 10 +++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/controllers/main_routes/laborStatusForm.py b/app/controllers/main_routes/laborStatusForm.py index fde9e814..f069d05e 100755 --- a/app/controllers/main_routes/laborStatusForm.py +++ b/app/controllers/main_routes/laborStatusForm.py @@ -39,15 +39,16 @@ def laborStatusForm(laborStatusKey = None): staffs = Tracy().getSupervisors() departments = Tracy().getDepartments() + + + + + + springFallOnlyTerms = {} terms = [] - for term in allTerms: - if str(term.termCode)[-2:] in ["11", "12"] and str(term.termCode)[:4] in springFallOnlyTerms: - springFallOnlyTerms[str(term.termCode)[:4]].append(term) - elif str(term.termCode)[-2:] in ["11", "12"]: - springFallOnlyTerms[str(term.termCode)[:4]]= [term] - else: - terms.append(term) + [terms.append(term) if (term.isBreak or term.isAcademicYear) else springFallOnlyTerms[str(term.termCode)[:4]].append(term) if + str(term.termCode)[:4] in springFallOnlyTerms else springFallOnlyTerms.__setitem__(str(term.termCode)[:4], [term]) for term in allTerms] # Only prepopulate form if current user is the supervisor or creator of the form. if laborStatusKey != None: diff --git a/app/static/js/laborStatusForm.js b/app/static/js/laborStatusForm.js index 294369c7..677431f7 100755 --- a/app/static/js/laborStatusForm.js +++ b/app/static/js/laborStatusForm.js @@ -19,7 +19,7 @@ $(document).ready(function(){ for (i in parsedArrayOfStudentCookies) { createAndFillTable(parsedArrayOfStudentCookies[i]); } - $("#term").val(parsedArrayOfStudentCookies[0].stuTermCode).attr('name', parsedArrayOfStudentCookies[0].stuTermName) + $("#selectedTerm").val(parsedArrayOfStudentCookies[0].stuTermCode).attr('name', parsedArrayOfStudentCookies[0].stuTermName) $("#selectedTerm option[value=" + parsedArrayOfStudentCookies[0].selectedTerm + "]").attr('selected', 'selected'); $("#selectedSupervisor option[value=" + parsedArrayOfStudentCookies[0].stuSupervisorID + "]").attr('selected', 'selected'); $("#selectedDepartment option[value=\"" + parsedArrayOfStudentCookies[0].stuDepartmentORG + "\"]").attr('selected', 'selected'); @@ -494,7 +494,7 @@ function createStuDict(){ var department = $("#selectedDepartment").find("option:selected").text(); var departmentORG = $("#selectedDepartment").find("option:selected").val(); var departmentAccount = $("#selectedDepartment").find("option:selected").data("account"); - var termCodeSelected = $("#term").val(); + var termCodeSelected = $("#selectedTerm").val(); var termName = $("#term").attr('name') var selectedTerm = $("#selectedTerm").find("option:selected").val(); var isBreak = $("#selectedTerm").find("option:selected").data("termbreak") @@ -565,8 +565,8 @@ function checkDuplicate(studentDict) {// checks for duplicates in the table. Thi } function checkPrimaryPositionToCreateTheTable(studentDict) { - var term = $("#term").val(); - var termName = $("#term").attr('name'); + var term = $("#selectedTerm").val(); + var termName = $('#selectedTerm').find('option:selected').text(); var url = "/laborstatusform/getstudents/" + term + "/" + studentDict.stuBNumber; var data = JSON.stringify(studentDict.stuJobType); $.ajax({ @@ -684,7 +684,7 @@ function createAndFillTable(studentDict) { function isOneLaborStatusForm(studentDict){ var isBreak = (studentDict).isTermBreak; - var term = $("#term").val(); + var term = $("#selectedTerm").val(); if(isBreak){ url = "/laborstatusform/getstudents/" + term + "/"+ studentDict.stuBNumber+ "/"+ 'isOneLSF'; // check whether student has multiple labor status forms over the break period. From 487199718050887191f3209ec2d5c105707164a9 Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Thu, 18 Nov 2021 12:50:36 -0500 Subject: [PATCH 6/7] Changes to requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ddcf9467..e50b2218 100755 --- a/requirements.txt +++ b/requirements.txt @@ -58,7 +58,7 @@ python-editor==1.0.4 PyYAML==5.3 requests==2.24.0 selenium==3.141.0 -six==1.12.0 +six==1.14.0 SQLAlchemy==1.3.18 termcolor==1.1.0 urllib3==1.25.9 From 5fab668cb5e95d63cbf62cf77a3bd517b5ca5259 Mon Sep 17 00:00:00 2001 From: Scott Heggen Date: Mon, 11 Apr 2022 17:00:10 -0400 Subject: [PATCH 7/7] Removes Fall and Spring from term management UI --- app/templates/admin/termManagement.html | 211 +++++++++++++----------- 1 file changed, 113 insertions(+), 98 deletions(-) diff --git a/app/templates/admin/termManagement.html b/app/templates/admin/termManagement.html index bfbae74c..c30272fb 100755 --- a/app/templates/admin/termManagement.html +++ b/app/templates/admin/termManagement.html @@ -22,8 +22,7 @@

Term Management

- + {# This loop creates the panels for the accordion, they contain "Academic Year: year-year" #} {% for year,terms in listOfTerms.items() %}
Term Management

aria-expanded="true" aria-controls="{{year}}">

- Academic Year: {{(year|string)[:4]}}-{{(((year|string)[:4])|int)+1}} - + {# Gets the Academic year to show properly #} + Academic Year: {{(year|string)[:4]}}-{{(((year|string)[:4])|int)+1}}

@@ -48,12 +47,26 @@

- - - + + {% for term in terms %} - - - - - - + {# checks to see if the start date is not empty #} + + + + - - - - + + + + + + {% endif %} {% endfor %}
Term NameStart DateEnd DateStart Date + + + End Date + + + + Primary Forms Due
{{term.termName}} -
- - -
- 		-
- +
{{term.termName}} +
+ -
+ 		+
+ + +
+ 		+
+ + +
+ 		+
+ + -
- 		-
- - -
- 		-
- - -
- 		- -
+ +