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

Added KVV projects

Browse Source
This commit is contained in:
Caesar2011
2019-01-30 15:12:33 +01:00
parent 9fe2cf32fd
commit c544adbd4b
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/de/sebse/fuplanner/fragments/ModulesAdapter.java
View File

@@ -40,12 +40,10 @@ class ModulesAdapter extends RecyclerView.Adapter<CustomViewHolder> {
public void setModules(Modules modules) { public void setModules(Modules modules) {
mValues = modules; mValues = modules;
mPositionalData.clear(); mPositionalData.clear();
Semester lastSemester = null; Semester lastSemester = new Semester(Semester.SEM_WS, 0);
for (Modules.Module module : mValues) { for (Modules.Module module : mValues) {
Semester semester = module.semester; Semester semester = module.semester;
if (semester == null) if (semester != null && !semester.equals(lastSemester) || semester == null && lastSemester != null) {
continue;
if (!semester.equals(lastSemester)) {
mPositionalData.add(new Pair<>(TYPE_HEADER, semester)); mPositionalData.add(new Pair<>(TYPE_HEADER, semester));
lastSemester = semester; lastSemester = semester;
} }
@@ -80,7 +78,9 @@ class ModulesAdapter extends RecyclerView.Adapter<CustomViewHolder> {
StringViewHolder sHolder = (StringViewHolder) holder; StringViewHolder sHolder = (StringViewHolder) holder;
String localizedSemester; String localizedSemester;
Semester semester = (Semester) pair.second; Semester semester = (Semester) pair.second;
if (semester.getType() == Semester.SEM_WS) if (semester == null)
localizedSemester = holder.mView.getResources().getString(R.string.others);
else if (semester.getType() == Semester.SEM_WS)
localizedSemester = holder.mView.getResources().getString(R.string.winter_semester, semester.getYear(), semester.getYear()+1); localizedSemester = holder.mView.getResources().getString(R.string.winter_semester, semester.getYear(), semester.getYear()+1);
else else
localizedSemester = holder.mView.getResources().getString(R.string.summer_semester, semester.getYear()); localizedSemester = holder.mView.getResources().getString(R.string.summer_semester, semester.getYear());

11
app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java
View File

@@ -186,12 +186,15 @@ public class ModulesList extends HTTPService {
try { try {
JSONObject site = sites.getJSONObject(i); JSONObject site = sites.getJSONObject(i);
String semester_string = site.getJSONObject("props").optString("term_eid", null); String semester_string = site.getJSONObject("props").optString("term_eid", null);
Semester semester;
if (semester_string == null) if (semester_string == null)
continue; semester = null;
Semester semester = new Semester(semester_string); else
semester = new Semester(semester_string);
HashSet<String> lvNumbers = new HashSet<>(); HashSet<String> lvNumbers = new HashSet<>();
String kvv_lvnumbers = site.getJSONObject("props").optString("kvv_lvnumbers", null); String kvv_lvnumbers = site.getJSONObject("props").optString("kvv_lvnumbers", null);
if (kvv_lvnumbers != null) for (MatchResult matchResult : Regex.allMatches("[0-9]+", kvv_lvnumbers)) { if (kvv_lvnumbers != null)
for (MatchResult matchResult : Regex.allMatches("[0-9]+", kvv_lvnumbers)) {
lvNumbers.add(matchResult.group()); lvNumbers.add(matchResult.group());
} }
String title = site.getString("entityTitle"); String title = site.getString("entityTitle");
@@ -283,11 +286,9 @@ public class ModulesList extends HTTPService {
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
errorCallback.onError(new NetworkError(101125, 403, "Cannot parse module list!")); errorCallback.onError(new NetworkError(101125, 403, "Cannot parse module list!"));
return;
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
errorCallback.onError(new NetworkError(101127, 403, "Cannot parse module list!")); errorCallback.onError(new NetworkError(101127, 403, "Cannot parse module list!"));
return;
} }
}, error -> errorCallback.onError(new NetworkError(101126, error.networkResponse.statusCode, "Cannot get module list!"))); }, error -> errorCallback.onError(new NetworkError(101126, error.networkResponse.statusCode, "Cannot get module list!")));
} catch (JSONException e) { } catch (JSONException e) {