From 2eab484a04f9f01cbd67bcdaa93fbffabe11e267 Mon Sep 17 00:00:00 2001 From: Halsted Larsson Date: Fri, 16 Nov 2018 01:16:57 +0000 Subject: [PATCH] Added support for graduation in 5+ years --- html-templates/baxter/legacy.tpl | 3 ++- html-templates/baxter/transcript.tpl | 19 +++++++++++++++++-- site-root/baxter/scripts/app.js | 5 +++-- site-root/baxter/transcript.php | 1 + 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/html-templates/baxter/legacy.tpl b/html-templates/baxter/legacy.tpl index 054d579..c865fdd 100644 --- a/html-templates/baxter/legacy.tpl +++ b/html-templates/baxter/legacy.tpl @@ -7,7 +7,8 @@ var currentYearStart = {$currentYear}; var studentYear = {$studentYear}; var STUDENT_START_YEAR = {$startYear}; - + var YEARS_AT_BAXTER = {$yearSpan}; + var allData = {$data}; diff --git a/html-templates/baxter/transcript.tpl b/html-templates/baxter/transcript.tpl index 23ddf4f..44101e7 100644 --- a/html-templates/baxter/transcript.tpl +++ b/html-templates/baxter/transcript.tpl @@ -95,15 +95,17 @@ {labeledField html=$studentsSelect type=select label=student class=auto-width}
- - + +
+

Transcripts

Paste Transcript JSON Here

+

Started at Baxter

+

Current Grade

+ +

Years At Baxter total

+
diff --git a/site-root/baxter/scripts/app.js b/site-root/baxter/scripts/app.js index adacc77..2ec108b 100644 --- a/site-root/baxter/scripts/app.js +++ b/site-root/baxter/scripts/app.js @@ -17,6 +17,7 @@ var deptOrdered = [ ]; + var otherClasses = { "Digital Photography I" : {division : 1}, "University of Maine: Intro to World Politics" : {division : 3}, @@ -432,7 +433,7 @@ function fixDesignProcess(standardsData){ // var ao = getStandardDataByName("Analyze and Optimize Solutions", standardsData); var designProReal = getStandardDataByName("Design", standardsData); var levels = []; - for(var i = 0; i < 4; i++){ + for(var i = 0; i < YEARS_AT_BAXTER; i++){ var dprealLevel = designProReal.levels[i]; levels.push(dprealLevel); } @@ -470,7 +471,7 @@ function makeDeptDiv(dept, courseData, standardsData){ deptContainer.append(deptEl); deptEl.append(bars); - for(var i = 1; i <= 4; i++){ + for(var i = 1; i <= YEARS_AT_BAXTER; i++){ var yearHead = $("
" + getYearSpan(i) + "
"); var coursesEl = $("
"); var classes = getClasses(courseData, i, null, dept).sort(function(a,b){ diff --git a/site-root/baxter/transcript.php b/site-root/baxter/transcript.php index d5f8654..f2c1dd2 100644 --- a/site-root/baxter/transcript.php +++ b/site-root/baxter/transcript.php @@ -29,6 +29,7 @@ 'studentYear' => $_POST['studentYear'], 'startYear' => $_POST['startYear'], 'currentYear' => $_POST['currentYear'], + 'yearSpan' => $_POST['studentSpan'], 'renderTranscript' => true ]); } elseif ($_POST['submitReportCard']) {