Commit e6e3a246 authored by Ådne Karstad's avatar Ådne Karstad
Browse files

feat(M2T): display elective and mandatory courses in separate tables

parent d94f6fac
......@@ -18,7 +18,6 @@
[generateProgramSelection(university)/]
[for (program : Program | university.programs)]
[generateStudyPlans(program)/]
[/for]
......@@ -44,13 +43,17 @@
[/template]
[template public generateStudyPlans(program : Program)]
<div id="[nameToId(program.name)/]" class="spp-table">
<div class="main-section" id="[nameToId(program.name)/]">
<div class="spp-table">
<h2>[program.name/]</h2
<p>[program.name/] is taken over [program.numberOfSemesters/] semesters.</p>
[for (semester : Semester | program.semesters)]
<h3>Semester [semester.semester/]</h3>
<table style="width=80%">
<table>
<tr>
<th>Code</th>
<th>Name</th>
......@@ -58,16 +61,106 @@
<th>Level</th>
</tr>
[for (course : Course | semester.selectedCourses)]
[generateCourseRow(course)/]
[/for]
</table>
[/for]
</div>
[generateCourseTables(program)/]
</div>
[/template]
[template public generateSpecializationTables(specialization : Specialisation)]
<div class="specialization-container">
<h2>Courses for specialization: [specialization.name/]</h2>
<div class="spp-table">
<h3>Mandatory Courses for [specialization.name/]</h3>
<table>
<tr>
<td>[course.code/]</td>
<td>[course.name/]</td>
<td>[course.credits/]</td>
<td>[course.level/]</td>
<th>Code</th>
<th>Name</th>
<th>Credits</th>
<th>Level</th>
</tr>
[for (course : Course | specialization.mandatoryCourses)]
[generateCourseRow(course)/]
[/for]
</table>
</div>
<div class="spp-table">
<h3>Elective Courses for [specialization.name/]</h3>
<table>
<tr>
<th>Code</th>
<th>Name</th>
<th>Credits</th>
<th>Level</th>
</tr>
[for (course : Course | specialization.electiveCourses)]
[generateCourseRow(course)/]
[/for]
</table>
</div>
</div>
[/template]
[template public generateCourseTables(program : Program)]
<div class="spp-table">
<h2>Mandatory Courses</h2>
<table>
<tr>
<th>Code</th>
<th>Name</th>
<th>Credits</th>
<th>Level</th>
</tr>
[for (course : Course | program.mandatoryCourses.courses)]
[generateCourseRow(course)/]
[/for]
</table>
</div>
<div class="spp-table">
<h2>Elective Courses</h2>
<table>
<tr>
<th>Code</th>
<th>Name</th>
<th>Credits</th>
<th>Level</th>
</tr>
[for (course : Course | program.electiveCourses.courses)]
[generateCourseRow(course)/]
[/for]
</table>
</div>
[for (specialization : Specialisation | program.specialisation)]
[generateSpecializationTables(specialization)/]
[/for]
[/template]
[template public generateCourseRow(course : Course)]
<tr>
<td>[course.code/]</td>
<td>[course.name/]</td>
<td>[course.credits/]</td>
<td>[course.level/]</td>
</tr>
[/template]
......@@ -51,7 +51,8 @@
<programs
name="Master i informatikk"
duration="Master">
<semesters/>
<semesters
selectedCourses="//@institutes.0/@courses.2"/>
<semesters
semester="2"
season="Spring"/>
......@@ -65,7 +66,7 @@
mandatoryCourses="//@institutes.0/@courses.2 //@institutes.0/@courses.23 //@institutes.0/@courses.13 //@institutes.0/@courses.24"/>
<specialisation
name="Interaction Design, Game and Learning Technology"
mandatoryCourses="//@institutes.0/@courses.27 //@institutes.0/@courses.23 //@institutes.0/@courses.20 //@institutes.0/@courses.25"/>
mandatoryCourses="//@institutes.0/@courses.26 //@institutes.0/@courses.23 //@institutes.0/@courses.20 //@institutes.0/@courses.25"/>
<specialisation
name="Databases and Search"/>
<specialisation
......@@ -74,265 +75,274 @@
<institutes
name="Institutt for datateknologi og informatikk">
<courses
code="TDT4110"
name="Informasjonsteknologi, grunnkurs"
name="TDT4110"
code="Informasjonsteknologi, grunnkurs"
credits="7.5"/>
<courses
code="TDT4250"
name="Avansert programvaredesign"
name="TDT4250"
code="Avansert programvaredesign"
credits="7.5"
level="SecoundDegreeCourse"/>
<courses
code="TDT4175"
name="Informasjonssystemer"
name="TDT4175"
code="Informasjonssystemer"
credits="7.5"
level="ThirdYearCourse"/>
<courses
code="TDT4140"
name="Programvareutvikling"
name="TDT4140"
code="Programvareutvikling"
credits="7.5"
level="IntermediateCourse"
season="Spring"/>
<courses
code="TDT4100"
name="Objektorientert programmering"
name="TDT4100"
code="Objektorientert programmering"
credits="7.5"
season="Spring"/>
<courses
code="TDT4120"
name="Algoritmer og datastrukturer"
name="TDT4120"
code="Algoritmer og datastrukturer"
credits="7.5"
level="IntermediateCourse"/>
<courses
code="IT2810"
name="Webutvikling"
name="IT2810"
code="Webutvikling"
credits="7.5"
level="IntermediateCourse"/>
<courses
code="TDT4186"
name="Operativssystemer"
name="TDT4186"
code="Operativssystemer"
credits="7.5"
level="ThirdYearCourse"/>
<courses
code="TDT4145"
name="Datamodellering og databasesystemer"
name="TDT4145"
code="Datamodellering og databasesystemer"
credits="7.5"
level="IntermediateCourse"/>
<courses
code="TDT4180"
name="Menneskemaskin interkasjon"
name="TDT4180"
code="Menneskemaskin interkasjon"
credits="7.5"
level="IntermediateCourse"/>
<courses
code="IT1901"
name="Informatikk prosjektarbeid I"
name="IT1901"
code="Informatikk prosjektarbeid I"
credits="7.5"
level="IntermediateCourse"/>
<courses
code="IT2805"
name="Webteknologi"
name="IT2805"
code="Webteknologi"
credits="7.5"/>
<courses
code="TDT4160"
name="Datamaskiner og digitalteknikk"
name="TDT4160"
code="Datamaskiner og digitalteknikk"
credits="7.5"/>
<courses
code="TDT4240"
name="Programvarearkitektur"
name="TDT4240"
code="Programvarearkitektur"
credits="7.5"
level="ThirdYearCourse"/>
<courses
code="TDT4242"
name="Avansert programvareutvikling"
name="TDT4242"
code="Avansert programvareutvikling"
credits="7.5"
level="SecoundDegreeCourse"/>
<courses
code="IT2901"
name="Informatikk prosjektarbeid II"
name="IT2901"
code="Informatikk prosjektarbeid II"
credits="7.5"
level="ThirdYearCourse"/>
<courses
code="TDT4117"
name="Informasjonsgjenfinning"
name="TDT4117"
code="Informasjonsgjenfinning"
credits="7.5"
level="ThirdYearCourse"/>
<courses
code="TDT4136"
name="Introduksjon til kunstig intelligens"
name="TDT4136"
code="Introduksjon til kunstig intelligens"
credits="7.5"
level="ThirdYearCourse"/>
<courses
code="TDT4165"
name="Programmeringsspråk"
name="TDT4165"
code="Programmeringsspråk"
credits="7.5"
level="ThirdYearCourse"/>
<courses
code="TDT4237"
name="Programvaresikkerhet og personvern"
name="TDT4237"
code="Programvaresikkerhet og personvern"
credits="7.5"
level="SecoundDegreeCourse"
season="Both"/>
<courses
code="TDT4245"
name="Samhandlingsteknologi og sosiale medier"
name="TDT4245"
code="Samhandlingsteknologi og sosiale medier"
credits="7.5"
level="SecoundDegreeCourse"/>
<courses
code="IT3020"
name="Aktuelle emner i informatikk"
name="IT3020"
code="Aktuelle emner i informatikk"
credits="7.5"
level="SecoundDegreeCourse"
season="Both"/>
<courses
code="IT3950"
name="Masteroppgave i informatikk"
name="IT3950"
code="Masteroppgave i informatikk"
credits="30.0"
level="SecoundDegreeCourse"
season="Both"/>
<courses
code="IT3010"
name="Metoder for forskningsbasert innovasjon i IT"
name="IT3010"
code="Metoder for forskningsbasert innovasjon i IT"
credits="7.5"
level="SecoundDegreeCourse"
season="Spring"/>
<courses
code="IT3901"
name="Masteroppgave i informatikk: Programvaresystemer"
name="IT3901"
code="Masteroppgave i informatikk: Programvaresystemer"
credits="60.0"
level="SecoundDegreeCourse"
season="Both"/>
<courses
code="IT3402 "
name="Design av grafiske brukergrensesnitt"
name="IT3402 "
code="Design av grafiske brukergrensesnitt"
credits="7.5"
level="SecoundDegreeCourse"/>
<courses
code="TDT4245 "
name="Samhandlingsteknologi og sosiale medier"
credits="7.5"
level="SecoundDegreeCourse"
season="Spring"/>
<courses
code="IT3906 "
name="Masteroppgave i informatikk: Interaksjonsdesign, spill- og læringsteknologi"
name="IT3906 "
code="Masteroppgave i informatikk: Interaksjonsdesign, spill- og læringsteknologi"
credits="60.0"
level="SecoundDegreeCourse"
season="Both"/>
<courses
name="TDT4225 "
code="Store, distribuerte datamengder"
credits="7.5"
level="SecoundDegreeCourse"/>
<courses
name="TDT4200"
code="Parallelle beregninger"
credits="7.5"
level="SecoundDegreeCourse"/>
<courses
name="TDT4287"
code="Algoritmer for bioinformatikk"
credits="7.5"
level="SecoundDegreeCourse"/>
</institutes>
<institutes
name="Institutt for matematiske fag">
<courses
code="MA1101"
name="Grunnkurs i analyse I"
name="MA1101"
code="Grunnkurs i analyse I"
credits="7.5"/>
<courses
code="MA1102"
name="Grunnkurs i analyse II"
name="MA1102"
code="Grunnkurs i analyse II"
credits="7.5"
season="Spring"/>
<courses
code="TMA4135"
name="Matematikk 4D"
name="TMA4135"
code="Matematikk 4D"
credits="7.5"
level="ThirdYearCourse"/>
<courses
code="TMA4140"
name="Diskret matematikk"
name="TMA4140"
code="Diskret matematikk"
credits="7.5"/>
<courses
code="MA1201"
name="Lineær algebra og geometri"
name="MA1201"
code="Lineær algebra og geometri"
credits="7.5"/>
<courses
code="MA1103"
name="Flerdimensjonal analyse"
name="MA1103"
code="Flerdimensjonal analyse"
credits="7.5"
season="Spring"/>
<courses
code="TMA4240"
name="Statistikk"
name="TMA4240"
code="Statistikk"
credits="7.5"/>
<courses
code="MA2401"
name="Geometri"
name="MA2401"
code="Geometri"
credits="7.5"
level="IntermediateCourse"/>
<courses
code="TMA4120"
name="Matematikk 4K"
name="TMA4120"
code="Matematikk 4K"
credits="7.5"
level="ThirdYearCourse"/>
</institutes>
<institutes
name="Institutt for lærerutdanning">
<courses
code="PPU4601 "
name="Pedagogikk 1"
name="PPU4601 "
code="Pedagogikk 1"
credits="7.5"/>
<courses
code="PPU4611"
name="Praksis 1"/>
name="PPU4611"
code="Praksis 1"/>
<courses
code="PPU4612"
name="Pedagogikk 2"
name="PPU4612"
code="Pedagogikk 2"
credits="7.5"
level="IntermediateCourse"/>
<courses
code="PPU4602"
name="Praksis 2"
name="PPU4602"
code="Praksis 2"
level="IntermediateCourse"/>
<courses
code="PPU4613"
name="Praksis 3"
name="PPU4613"
code="Praksis 3"
level="ThirdYearCourse"/>
<courses
code="PPU4624"
name="Fagdidaktikk - informatikk"
name="PPU4624"
code="Fagdidaktikk - informatikk"
credits="7.5"
level="ThirdYearCourse"/>
<courses
code="PPU4628"
name="Fagdidaktikk - matematikk"
name="PPU4628"
code="Fagdidaktikk - matematikk"
credits="7.5"
level="ThirdYearCourse"/>
<courses
code="PPU4603"
name="Pedagogikk"
name="PPU4603"
code="Pedagogikk"
credits="15.0"
season="Spring"/>
<courses
code="PPU4625"
name="Fagdidaktikk 2 - informatikk"
name="PPU4625"
code="Fagdidaktikk 2 - informatikk"
credits="7.5"
level="SecoundDegreeCourse"
season="Spring"/>
<courses
code="PPU4629"
name="Fagdidaktikk 2 - matematikk"
name="PPU4629"
code="Fagdidaktikk 2 - matematikk"
credits="7.5"
level="SecoundDegreeCourse"
season="Spring"/>
<courses
code="RFEL3093"
name="Episoder fra naturvitenskapenes historie"
name="RFEL3093"
code="Episoder fra naturvitenskapenes historie"
credits="7.5"
level="SecoundDegreeCourse"/>
<courses
code="RFEL3100 "
name="Forskningsmetoder i matematikk- og realfagsdidaktikk"
name="RFEL3100 "
code="Forskningsmetoder i matematikk- og realfagsdidaktikk"
credits="7.5"
level="SecoundDegreeCourse"/>
<courses
code="PPU4614"
name="Praksis 4"
name="PPU4614"
code="Praksis 4"
level="SecoundDegreeCourse"
season="Spring"/>
</institutes>
<institutes
name="Institutt for filosofi og religionsvitenskap">
<courses
code="EXPH0300"
name="Examen philosophicum for naturvitenskap og teknologi"
name="EXPH0300"
code="Examen philosophicum for naturvitenskap og teknologi"
credits="7.5"
season="Both"/>
</institutes>
......
......@@ -15,13 +15,16 @@
<option value="master-i-informatikk">Master i informatikk</option>
</select>
<div class="main-section" id="lektor-i-realfag">
<div id="lektor-i-realfag" class="spp-table">
<div class="spp-table">
<h2>Lektor i Realfag</h2
<p>Lektor i Realfag is taken over 10 semesters.</p>
<h3>Semester 1</h3>
<table style="width=80%">
<table>
<tr>
<th>Code</th>
<th>Name</th>
......@@ -29,34 +32,34 @@
<th>Level</th>
</tr>
<tr>
<td>TDT4110</td>
<td>Informasjonsteknologi, grunnkurs</td>
<td>TDT4110</td>
<td>7.5</td>
<td>FoundationCourse</td>
</tr>
<tr>
<td>MA1101</td>
<td>Grunnkurs i analyse I</td>
<td>MA1101</td>
<td>7.5</td>
<td>FoundationCourse</td>
</tr>
<tr>
<td>TMA4140</td>
<td>Diskret matematikk</td>
<td>TMA4140</td>
<td>7.5</td>
<td>FoundationCourse</td>
</tr>
<tr>
<td>MA1201</td>
<td>Lineær algebra og geometri</td>
<td>MA1201</td>
<td>7.5</td>
<td>FoundationCourse</td>
</tr>
</table>
<h3>Semester 2</h3>
<table style="width=80%">
<table>
<tr>
<th>Code</th>
<th>Name</th>
......@@ -64,40 +67,40 @@
<th>Level</th>
</tr>
<tr>
<td>TDT4100</td>
<td>Objektorientert programmering</td>
<td>TDT4100</td>
<td>7.5</td>
<td>FoundationCourse</td>
</tr>
<tr>
<td>MA1103</td>