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

Aufgaben URLs für PDFs hinzugefügt

Browse Source
This commit is contained in:
Joshua
2018-06-12 16:53:40 +02:00
parent 6fb1c013e8
commit 281722b404
5 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java
View File

@@ -148,7 +148,10 @@ public class ModDetailOverviewAdapter extends RecyclerView.Adapter<RecyclerView.
case SECTION_ASSIGNMENT: case SECTION_ASSIGNMENT:
Assignment assignment = mValue.assignments.get(index); Assignment assignment = mValue.assignments.get(index);
i.mTitle.setText(assignment.getTitle()); i.mTitle.setText(assignment.getTitle());
i.mSubLeft.setText(assignment.getStatus()); if(assignment.isOpen())
i.mSubLeft.setText(i.mView.getResources().getText(R.string.open));
else
i.mSubLeft.setText(i.mView.getResources().getText(R.string.close));
i.mSubRight.setText(Conversion.getModifiedDate(assignment.getDueDate())); i.mSubRight.setText(Conversion.getModifiedDate(assignment.getDueDate()));
i.mView.setOnClickListener(view -> log.d("Reference to:", SECTION_ASSIGNMENT, index)); i.mView.setOnClickListener(view -> log.d("Reference to:", SECTION_ASSIGNMENT, index));
break; break;

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

@@ -1,22 +1,24 @@
package de.sebse.fuplanner.services.KVV; package de.sebse.fuplanner.services.KVV;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
public class Assignment { public class Assignment {
private final String id; private final String id;
private String title; private final String title;
private long dueTime; private final long dueTime;
private int gradeScaleMaxPoints; private final String gradebookItemName;
private String gradebookItemName; private final String gradeScale;
private String gradeScale; private final ArrayList<String> urls;
private String grade;
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<String> urls) {//, String grade
this.id = id; this.id = id;
this.title = title; this.title = title;
this.dueTime = dueTime; this.dueTime = dueTime;
this.gradebookItemName = gradebookItemName; this.gradebookItemName = gradebookItemName;
this.gradeScale = gradeScale; this.gradeScale = gradeScale;
this.urls = urls;
//this.grade = grade; //this.grade = grade;
} }
@@ -33,11 +35,18 @@ public class Assignment {
return title; return title;
} }
public String getStatus() { public boolean isOpen() {
return "Assignment Status"; if (dueTime>System.currentTimeMillis()){
return true;
}
return false;
} }
public long getDueDate() { public long getDueDate() {
return dueTime; return dueTime;
} }
public ArrayList<String> getUrls() {
return urls;
}
} }

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

@@ -173,15 +173,17 @@ public class KVVModuleList extends HTTPService {
String id = site.getString("id"); String id = site.getString("id");
String title = site.getString("title"); String title = site.getString("title");
long dueTime = site.getJSONObject("dueTime").getLong("time"); long dueTime = site.getJSONObject("dueTime").getLong("time");
String gradebookItemName = site.getString("gradebookItemName"); String gradebookItemName = site.optString("gradebookItemName", null);
String gradeScale = site.getString("gradeScale"); String gradeScale = site.getString("gradeScale");
//ToDO PDFs links rausziehen
//JSONObject attachments = site.getJSONObject("attachments"); //PDFs links rausziehen
//JSONArray urls = json.getJSONArray("attachments"); JSONArray attachments = site.getJSONArray("attachments");
/*for (int j =0; j<urls.length(); i++){ ArrayList<String> urls = new ArrayList<>();
log.d("URL:", urls.getString(j)); for (int j =0; j<attachments.length(); j++){
}*/ urls.add(attachments.getJSONObject(j).optString("url",null));
log.d("URL:", attachments.getJSONObject(j).optString("url",null));
}
log.d("Assignment:", id, dueTime, gradebookItemName, gradeScale ); log.d("Assignment:", id, dueTime, gradebookItemName, gradeScale );
@@ -190,7 +192,7 @@ public class KVVModuleList extends HTTPService {
//Für Punkte //Für Punkte
//AtomicReference<String> comment = null;//ToDO Sebasian Fragen ???????????????????????? //AtomicReference<String> comment = null;//ToDO Sebasian Fragen ????????????????????????
//AtomicReference<String> grade = null; //Variable used in lambda expression should be final or effectively final //AtomicReference<String> 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 //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 ->{ get(String.format("https://kvv.imp.fu-berlin.de/direct/gradebook/item/%s/%s.json", ID, gradebookItemName ), token.getCookies(), response2 ->{
String bodygradebook = response2.getParsed(); String bodygradebook = response2.getParsed();
@@ -211,11 +213,11 @@ public class KVVModuleList extends HTTPService {
return; return;
} }
}, error -> errorCallback.onError(new NetworkError(101305, error.networkResponse.statusCode, "Cannot get gradebook for assignments!"))); }, 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) { } catch (JSONException e) {
errorCallback.onError(new NetworkError(101306, 403, "Cannot parse announcements!")); 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<ArrayList<Assignment>> callback, final NetworkErrorCallback errorCallback) {
// }

1
app/src/main/res/values-de/strings.xml
View File

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="navigation_drawer_open">Navigationsmenü öffnen</string> <string name="navigation_drawer_open">Navigationsmenü öffnen</string>
<string name="action_settings">Einstellungen</string>
</resources> </resources>

2
app/src/main/res/values/strings.xml
View File

@@ -29,4 +29,6 @@
<string name="upcoming_events_count">Upcoming Events (%1$d)</string> <string name="upcoming_events_count">Upcoming Events (%1$d)</string>
<string name="upcoming_events">Upcoming Events</string> <string name="upcoming_events">Upcoming Events</string>
<string name="date_scale">%1$s - %2$s</string> <string name="date_scale">%1$s - %2$s</string>
<string name="open">Open</string>
<string name="close">Close</string>
</resources> </resources>