From 01d8f7386ef1979587e45c9df5db619e9044988c Mon Sep 17 00:00:00 2001
From: Caesar2011 <mail@sebse.de>
Date: Tue, 10 Jul 2018 10:56:14 +0200
Subject: [PATCH] Added instructions to assignments

---
 .../fragments/moddetails/ModDetailAssignmentAdapter.java  | 4 +++-
 .../de/sebse/fuplanner/services/KVV/KVVModuleList.java    | 4 +++-
 .../de/sebse/fuplanner/services/KVV/types/Assignment.java | 8 +++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentAdapter.java
index 9ecc73e..ddcb985 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentAdapter.java
@@ -20,10 +20,12 @@ public class ModDetailAssignmentAdapter extends BaseExpandableListAdapter {
     @Override
     public String getChild(int groupPosition, int childPosititon) {
         StringBuilder sb = new StringBuilder();
+        sb.append(this.getGroup(groupPosition).getInstructions());
+        sb.append("\n\n");
         for (String s : this.getGroup(groupPosition).getUrls())
         {
             sb.append(s);
-            sb.append("\n");
+            sb.append("\n\n");
         }
         return sb.toString();
     }
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 a3f4179..e33174a 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
@@ -267,6 +267,8 @@ public class KVVModuleList extends HTTPService {
                     JSONObject site = sites.getJSONObject(i);
                     String id = site.getString("id");
                     String title = site.getString("title");
+                    String instructions = site.getString("instructions");
+                    instructions = new Source(instructions).getRenderer().toString();
                     long dueTime = site.getJSONObject("dueTime").getLong("time");
                     String gradebookItemName = site.optString("gradebookItemName", null);
                     String gradeScale = site.getString("gradeScale");
@@ -282,7 +284,7 @@ public class KVVModuleList extends HTTPService {
 
 
                     //log.d("Assignment:", id, dueTime, gradebookItemName, gradeScale);
-                    assignments.add(0, new Assignment(id, title, dueTime, gradebookItemName, gradeScale, urls));
+                    assignments.add(0, new Assignment(id, title, dueTime, gradebookItemName, gradeScale, urls, instructions));
                 }
             } catch (JSONException e) {
                 errorCallback.onError(new NetworkError(101302, 403, "Cannot parse announcements!"));
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 b7f1d3b..a8de104 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
@@ -10,8 +10,9 @@ public class Assignment implements Serializable {
     private final String gradebookItemName;
     private final String gradeScale;
     private final ArrayList<String> urls;
+    private final String instructions;
 
-    public Assignment(String id, String title, long dueTime, String gradebookItemName, String gradeScale, ArrayList<String> urls) {//, String grade
+    public Assignment(String id, String title, long dueTime, String gradebookItemName, String gradeScale, ArrayList<String> urls, String instructions) {//, String grade
         this.id = id;
         this.title = title;
         this.dueTime = dueTime;
@@ -19,6 +20,7 @@ public class Assignment implements Serializable {
         this.gradeScale = gradeScale;
         this.urls = urls;
         //this.grade = grade;
+        this.instructions = instructions;
     }
 
     public String getId() {
@@ -48,4 +50,8 @@ public class Assignment implements Serializable {
     public ArrayList<String> getUrls() {
         return urls;
     }
+
+    public String getInstructions() {
+        return instructions;
+    }
 }