From 41b0a88f2577e440a9b9be271cbd0d96d69f995f Mon Sep 17 00:00:00 2001
From: Caesar2011 <mail@sebse.de>
Date: Tue, 10 Jul 2018 11:58:36 +0200
Subject: [PATCH] Comment removed

---
 .../fuplanner/services/KVV/KVVModuleList.java  |  2 +-
 .../services/KVV/types/Assignment.java         | 18 +++++++++---------
 .../fuplanner/services/KVV/types/Event.java    | 16 ++++++++--------
 .../services/KVV/types/Gradebook.java          | 13 +++++++------
 app/src/main/res/layout/list_all_no_items.xml  | 15 +++++++++++++++
 5 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/res/layout/list_all_no_items.xml

diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
index e33174a..927d190 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
@@ -388,7 +388,7 @@ public class KVVModuleList extends HTTPService {
 
                 for (int i = 0; i < sites.length(); i++) {
                     JSONObject site = sites.getJSONObject(i);
-                    String grade = site.optString("grade", null);
+                    double grade = site.optDouble("grade", 0);
                     String itemName = site.optString("itemName", null);
                     double maxPoints = site.optDouble("points", -1);
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java
index a8de104..b427ea4 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java
@@ -27,20 +27,12 @@ public class Assignment implements Serializable {
         return id;
     }
 
-    @Override
-    public String toString() {
-        return "ID: "+getId();
-    }
-
     public String getTitle() {
         return title;
     }
 
     public boolean isOpen() {
-        if (dueTime>System.currentTimeMillis()){
-            return true;
-        }
-        return false;
+        return dueTime > System.currentTimeMillis();
     }
 
     public long getDueDate() {
@@ -54,4 +46,12 @@ public class Assignment implements Serializable {
     public String getInstructions() {
         return instructions;
     }
+
+    @Override
+    public String toString() {
+        return "ID: "+getId()+
+                "\nTitle: "+getTitle()+
+                "\nDue date: "+getDueDate()+
+                "\nInstuctions: "+getInstructions().substring(0, Math.min(getInstructions().length(), 100));
+    }
 }
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java
index 0a0d07f..a18bb7d 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java
@@ -21,14 +21,6 @@ public class Event implements Serializable {
         return id;
     }
 
-    @Override
-    public String toString() {
-        return "ID: "+getId()+
-                "\nType: "+getType()+
-                "\nStart Date: "+getStartDate()+
-                "\nEnd date: "+getEndDate();
-    }
-
     public String getTitle() {
         return this.title;
     }
@@ -44,4 +36,12 @@ public class Event implements Serializable {
     public long getEndDate() {
         return this.firstTime+this.duration;
     }
+
+    @Override
+    public String toString() {
+        return "ID: "+getId()+
+                "\nType: "+getType()+
+                "\nStart Date: "+getStartDate()+
+                "\nEnd date: "+getEndDate();
+    }
 }
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Gradebook.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Gradebook.java
index 1f4f094..bf636cd 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Gradebook.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Gradebook.java
@@ -4,12 +4,12 @@ import java.io.Serializable;
 
 public class Gradebook implements Serializable {
     private final String itemName;
-    private final String grade;
+    private final double grade;
     private final double maxPoints;
 
-    public Gradebook(String itemName, String grade, double maxPoints) {
+    public Gradebook(String itemName, double points, double maxPoints) {
         this.itemName = itemName;
-        this.grade = grade;
+        this.grade = points;
         this.maxPoints = maxPoints;
     }
 
@@ -17,7 +17,7 @@ public class Gradebook implements Serializable {
         return maxPoints;
     }
 
-    public String getGrade() {
+    public double getPoints() {
         return grade;
     }
 
@@ -27,7 +27,8 @@ public class Gradebook implements Serializable {
 
     @Override
     public String toString() {
-        // TODO
-        return super.toString();
+        return "Name: "+getItemName()+
+                "\nPoints: "+ getPoints()+
+                "\nMax points: "+getMaxPoints();
     }
 }
diff --git a/app/src/main/res/layout/list_all_no_items.xml b/app/src/main/res/layout/list_all_no_items.xml
new file mode 100644
index 0000000..8c85d35
--- /dev/null
+++ b/app/src/main/res/layout/list_all_no_items.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/text_margin"
+        android:text="@string/no_items_available"
+        android:gravity="center"
+        />
+</LinearLayout>