Skip to content

Commit

Permalink
Added support for graduation in 5+ years
Browse files Browse the repository at this point in the history
  • Loading branch information
Halsted Larsson committed Nov 16, 2018
1 parent e1f39ea commit 2eab484
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 5 deletions.
3 changes: 2 additions & 1 deletion html-templates/baxter/legacy.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
var currentYearStart = {$currentYear};
var studentYear = {$studentYear};
var STUDENT_START_YEAR = {$startYear};
var YEARS_AT_BAXTER = {$yearSpan};
var allData = {$data};
</script>
<script src="scripts/app.js"></script>
Expand Down
19 changes: 17 additions & 2 deletions html-templates/baxter/transcript.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -95,29 +95,44 @@
{labeledField html=$studentsSelect type=select label=student class=auto-width}

<br/>
<input type="submit" name="submitProgress" value="Generate Progress Report">
<input type="submit" name="submitReportCard" value="Generate Report Card">
<input type="submit" name="submitProgress" value="Generate Progress Report">
<input type="submit" name="submitReportCard" value="Generate Report Card">
<hr/>

<div>
<h2>Transcripts</h2>
<div>
<h3>Paste Transcript JSON Here</h3>
<textarea name="studentData" value=""></textarea>
</div>

<div>
<h3>Started at Baxter</h3>
<select class="field-control inline medium" name="startYear">
<option selected value=1>9th</option>
<option value=2>10th</option>
<option value=3>11th</option>
<option value=4>12th</option>
<option value=5>12th+</option>
<option value=612th++</option>
</select>

<h3>Current Grade</h3>
<select class="field-control inline medium" name="studentYear">
<option selected value=4>12th</option>
<option value=3>11th</option>
<option value=2>10th</option>
<option value=1>9th</option>
<option value=5>12th+</option>
<option value=6>12th++</option>
</select>

<h3>Years At Baxter total</h3>
<select class="field-control inline medium" name="studentSpan">
<option selected value=4>4</option>
<option value=5>5</option>
<option value=6>6</option>
<option value=3>3</option>
</select>

</div>
Expand Down
5 changes: 3 additions & 2 deletions site-root/baxter/scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ var deptOrdered = [
];



var otherClasses = {
"Digital Photography I" : {division : 1},
"University of Maine: Intro to World Politics" : {division : 3},
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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 = $("<div class='deptYearHead'>" + getYearSpan(i) + "</div>");
var coursesEl = $("<div class='deptYear'></div>");
var classes = getClasses(courseData, i, null, dept).sort(function(a,b){
Expand Down
1 change: 1 addition & 0 deletions site-root/baxter/transcript.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
'studentYear' => $_POST['studentYear'],
'startYear' => $_POST['startYear'],
'currentYear' => $_POST['currentYear'],
'yearSpan' => $_POST['studentSpan'],
'renderTranscript' => true
]);
} elseif ($_POST['submitReportCard']) {
Expand Down

0 comments on commit 2eab484

Please sign in to comment.