Commit fb7cd75e authored by Ådne Karstad's avatar Ådne Karstad

[patch] Fix level of courses to use EEnum

Levels are separated into Bachelor degree with consists of Level I - III, and
Master's which is Secondary Level, or IV.
parent 9f3e74f2
......@@ -9,6 +9,20 @@
<programs
name="Lektor i realfag"
duration="IntegratedMasters">
<semesters
year="1"
selectedCourses="//@institutes.0/@courses.0"/>
<semesters
season="Spring"
year="1"
selectedCourses="//@institutes.0/@courses.4 //@institutes.1/@courses.1"/>
<semesters
season="Spring"
year="2"
selectedCourses="//@institutes.0/@courses.3"/>
<semesters
year="4"
selectedCourses="//@institutes.0/@courses.1 //@institutes.0/@courses.2"/>
<mandatoryCourses
courses="//@institutes.0/@courses.0 //@institutes.0/@courses.3"/>
</programs>
......@@ -17,20 +31,39 @@
<courses
code="TDT4110"
name="Informasjonsteknologi, grunnkurs"
credits="7.5"
level="1"/>
credits="7.5"/>
<courses
code="TDT4250"
name="Avansert programvaredesign"
credits="7.5"/>
credits="7.5"
level="SecoundDegreeCourse"/>
<courses
code="TDT4175"
name="Informasjonssystemer"
credits="7.5"/>
credits="7.5"
level="ThirdYearCourse"/>
<courses
code="TDT4140"
name="Programvareutvikling"
credits="7.5"
level="IntermediateCourse"
season="Spring"/>
<courses
code="TDT4100"
name="Objektorientert programmering"
credits="7.5"
season="Spring"/>
</institutes>
<institutes
name="Institutt for matematiske fag">
<courses
code="MA1101"
name="Grunnkurs i analyse I"
credits="7.5"/>
<courses
code="MA1102"
name="Grunnkurs i analyse II"
credits="7.5"
season="Spring"/>
</institutes>
</spp:University>
......@@ -29,9 +29,9 @@
eType="#//ElectiveCourses" containment="true" eOpposite="#//ElectiveCourses/program"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Semester">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="season" eType="#//SeasonType"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="year" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral=""/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="season" eType="#//SeasonType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="program" eType="#//Program"
eOpposite="#//Program/semesters"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="selectedCourses" upperBound="-1"
......@@ -41,7 +41,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="code" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="credits" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="level" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="level" eType="#//CourseLevelType"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="season" eType="#//SeasonType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="responsibleUnit" eType="#//Institute"
eOpposite="#//Institute/courses"/>
......@@ -73,4 +73,10 @@
<eLiterals name="Spring" value="1"/>
<eLiterals name="Both" value="2"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="CourseLevelType">
<eLiterals name="FoundationCourse" value="1" literal="FoundationCourse"/>
<eLiterals name="IntermediateCourse" value="2" literal="IntermediateCourse"/>
<eLiterals name="ThirdYearCourse" value="3"/>
<eLiterals name="SecoundDegreeCourse" value="4"/>
</eClassifiers>
</ecore:EPackage>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment