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

refactor(semester): count per semester rather than per year

Before two semester had the same year value, for example (season=fall, year=1) and (season=spring, year=1). Now it will be (season=fall, semester=1) and (season=spring, semester=2)
parent 26286a9e
......@@ -11,10 +11,10 @@
<semesters
selectedCourses="//@institutes.0/@courses.0 //@institutes.0/@courses.12"/>
<semesters
season="Spring"
semester="Spring"
selectedCourses="//@institutes.0/@courses.4 //@institutes.1/@courses.5"/>
<semesters
year="2"
season="2"
selectedCourses="//@institutes.0/@courses.5 //@institutes.1/@courses.2"/>
<mandatoryCourses
courses="//@institutes.0/@courses.0 //@institutes.0/@courses.3 //@institutes.0/@courses.4 //@institutes.0/@courses.5 //@institutes.0/@courses.12"/>
......
......@@ -45,9 +45,9 @@
<details key="coursesNeedsToBeMandatoryOrElectiveCourses" value="((self.selectedCourses->intersection(self.eContainer().mandatoryCourses.courses))->notEmpty() or (self.selectedCourses->intersection(self.eContainer().electiveCourses.courses))->notEmpty()) or self.selectedCourses -> isEmpty()"/>
</eAnnotations>
<eOperations name="getCredits" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
<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#//EIntegerObject"
<eStructuralFeatures xsi:type="ecore:EAttribute" name="semester" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"
defaultValueLiteral="1"/>
<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"
......
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