diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java index bd183a4..cef2d39 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java @@ -148,7 +148,10 @@ public class ModDetailOverviewAdapter extends RecyclerView.Adapter log.d("Reference to:", SECTION_ASSIGNMENT, index)); break; diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Assignment.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/Assignment.java index 01f9fc3..bf8703c 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Assignment.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/Assignment.java @@ -1,22 +1,24 @@ package de.sebse.fuplanner.services.KVV; +import java.lang.reflect.Array; +import java.util.ArrayList; import java.util.Date; public class Assignment { private final String id; - private String title; - private long dueTime; - private int gradeScaleMaxPoints; - private String gradebookItemName; - private String gradeScale; - private String grade; + private final String title; + private final long dueTime; + private final String gradebookItemName; + private final String gradeScale; + private final ArrayList urls; - Assignment(String id, String title, long dueTime, String gradebookItemName, String gradeScale) {//, String grade + Assignment(String id, String title, long dueTime, String gradebookItemName, String gradeScale, ArrayList urls) {//, String grade this.id = id; this.title = title; this.dueTime = dueTime; this.gradebookItemName = gradebookItemName; this.gradeScale = gradeScale; + this.urls = urls; //this.grade = grade; } @@ -33,11 +35,18 @@ public class Assignment { return title; } - public String getStatus() { - return "Assignment Status"; + public boolean isOpen() { + if (dueTime>System.currentTimeMillis()){ + return true; + } + return false; } public long getDueDate() { return dueTime; } + + public ArrayList getUrls() { + return urls; + } } 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 794e1f2..129385b 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 @@ -173,15 +173,17 @@ public class KVVModuleList extends HTTPService { String id = site.getString("id"); String title = site.getString("title"); long dueTime = site.getJSONObject("dueTime").getLong("time"); - String gradebookItemName = site.getString("gradebookItemName"); + String gradebookItemName = site.optString("gradebookItemName", null); String gradeScale = site.getString("gradeScale"); - //ToDO PDFs links rausziehen - //JSONObject attachments = site.getJSONObject("attachments"); - //JSONArray urls = json.getJSONArray("attachments"); - /*for (int j =0; j urls = new ArrayList<>(); + for (int j =0; j comment = null;//ToDO Sebasian Fragen ???????????????????????? //AtomicReference grade = null; //Variable used in lambda expression should be final or effectively final - if ( !gradebookItemName.equals("null") ){//Wenn gradebookItemName vorhanden dann erhaltene Punkte nachschauen + /*if ( !gradebookItemName.equals("null") ){//Wenn gradebookItemName vorhanden dann erhaltene Punkte nachschauen //https://kvv.imp.fu-berlin.de/direct/gradebook/item/{ModulID}/{gradebookItemName}.json get(String.format("https://kvv.imp.fu-berlin.de/direct/gradebook/item/%s/%s.json", ID, gradebookItemName ), token.getCookies(), response2 ->{ String bodygradebook = response2.getParsed(); @@ -211,11 +213,11 @@ public class KVVModuleList extends HTTPService { return; } }, error -> errorCallback.onError(new NetworkError(101305, error.networkResponse.statusCode, "Cannot get gradebook for assignments!"))); - } + }*/ - assignments.add(new Assignment(id, title, dueTime, gradebookItemName, gradeScale)); + assignments.add(0, new Assignment(id, title, dueTime, gradebookItemName, gradeScale, urls)); } } catch (JSONException e) { errorCallback.onError(new NetworkError(101306, 403, "Cannot parse announcements!")); @@ -227,7 +229,9 @@ public class KVVModuleList extends HTTPService { } + // private void getGradebookUpgrade(String ID, final NetworkCallback> callback, final NetworkErrorCallback errorCallback) { + // } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 777eb0d..ba3f9bf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,4 +1,5 @@ Navigationsmenü öffnen + Einstellungen \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e1ebc8a..bf9724d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -29,4 +29,6 @@ Upcoming Events (%1$d) Upcoming Events %1$s - %2$s + Open + Close