From 33b69715587b772cecfc83d73e5c9ffe04972b72 Mon Sep 17 00:00:00 2001
From: Stefan Suhren <suhren.stefan@fh-swf.de>
Date: Mon, 30 Nov 2015 16:50:05 +0100
Subject: Add thesis and colloquium grade to grades

---
 .../in/inf/se/notepadMinusMinus/model/Grades.java  | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'src')

diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grades.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grades.java
index bd68c2c..dda5db8 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grades.java
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grades.java
@@ -1,16 +1,27 @@
 package de.fhswf.in.inf.se.notepadMinusMinus.model;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+
 @XmlRootElement(name = "grades")
 public class Grades
 {
    protected List<Grade> grades;
 
+   private ObjectProperty<BigDecimal> thesis = new SimpleObjectProperty<>(
+         new BigDecimal("0.0"));
+
+   private ObjectProperty<BigDecimal> colloquium = new SimpleObjectProperty<>(
+         new BigDecimal("0.0"));
+
    @XmlElement(name = "grade", required = true)
    public List<Grade> getGrades()
    {
@@ -26,4 +37,36 @@ public class Grades
       this.grades = consumption;
    }
 
+   public final ObjectProperty<BigDecimal> thesisProperty()
+   {
+      return this.thesis;
+   }
+
+   @XmlAttribute(name = "thesis")
+   public final BigDecimal getThesis()
+   {
+      return this.thesisProperty().get();
+   }
+
+   public final void setThesis(final BigDecimal thesis)
+   {
+      this.thesisProperty().set(thesis);
+   }
+
+   public final ObjectProperty<BigDecimal> colloquiumProperty()
+   {
+      return this.colloquium;
+   }
+
+   @XmlAttribute(name = "colloquium")
+   public final BigDecimal getColloquium()
+   {
+      return this.colloquiumProperty().get();
+   }
+
+   public final void setColloquium(final BigDecimal colloquium)
+   {
+      this.colloquiumProperty().set(colloquium);
+   }
+
 }
-- 
cgit v1.2.3-70-g09d2