sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added instructions to assignments

Browse Source
This commit is contained in:
Caesar2011
2018-07-10 10:56:14 +02:00
parent 0f0efa4d57
commit 2cde3e83d5
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentAdapter.java
View File

@@ -20,10 +20,12 @@ public class ModDetailAssignmentAdapter extends BaseExpandableListAdapter {
@Override @Override
public String getChild(int groupPosition, int childPosititon) { public String getChild(int groupPosition, int childPosititon) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(this.getGroup(groupPosition).getInstructions());
sb.append("\n\n");
for (String s : this.getGroup(groupPosition).getUrls()) for (String s : this.getGroup(groupPosition).getUrls())
{ {
sb.append(s); sb.append(s);
sb.append("\n"); sb.append("\n\n");
} }
return sb.toString(); return sb.toString();
} }

4
app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
View File

@@ -267,6 +267,8 @@ public class KVVModuleList extends HTTPService {
JSONObject site = sites.getJSONObject(i); JSONObject site = sites.getJSONObject(i);
String id = site.getString("id"); String id = site.getString("id");
String title = site.getString("title"); String title = site.getString("title");
String instructions = site.getString("instructions");
instructions = new Source(instructions).getRenderer().toString();
long dueTime = site.getJSONObject("dueTime").getLong("time"); long dueTime = site.getJSONObject("dueTime").getLong("time");
String gradebookItemName = site.optString("gradebookItemName", null); String gradebookItemName = site.optString("gradebookItemName", null);
String gradeScale = site.getString("gradeScale"); String gradeScale = site.getString("gradeScale");
@@ -282,7 +284,7 @@ public class KVVModuleList extends HTTPService {
//log.d("Assignment:", id, dueTime, gradebookItemName, gradeScale); //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) { } catch (JSONException e) {
errorCallback.onError(new NetworkError(101302, 403, "Cannot parse announcements!")); errorCallback.onError(new NetworkError(101302, 403, "Cannot parse announcements!"));

8
app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java
View File

@@ -10,8 +10,9 @@ public class Assignment implements Serializable {
private final String gradebookItemName; private final String gradebookItemName;
private final String gradeScale; private final String gradeScale;
private final ArrayList<String> urls; 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.id = id;
this.title = title; this.title = title;
this.dueTime = dueTime; this.dueTime = dueTime;
@@ -19,6 +20,7 @@ public class Assignment implements Serializable {
this.gradeScale = gradeScale; this.gradeScale = gradeScale;
this.urls = urls; this.urls = urls;
//this.grade = grade; //this.grade = grade;
this.instructions = instructions;
} }
public String getId() { public String getId() {
@@ -48,4 +50,8 @@ public class Assignment implements Serializable {
public ArrayList<String> getUrls() { public ArrayList<String> getUrls() {
return urls; return urls;
} }
public String getInstructions() {
return instructions;
}
} }