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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Caesar2011
2018-07-15 20:11:35 +02:00
parent 792807154e eb72dcf8c1
commit 6f3816e469
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,8 +84,9 @@ public class ModDetailGradebookAdapter extends RecyclerView.Adapter<RecyclerView
switch (data.first) { switch (data.first) {
case TYPE_TOTAL: case TYPE_TOTAL:
HeaderViewHolder h = (HeaderViewHolder) holder; HeaderViewHolder h = (HeaderViewHolder) holder;
h.mCaption.setText(R.string.hello_blank_fragment); //String s = R.string.Current_percentage; +": "+String.format("%.2f", mValue.getGradebookPercent()*100) +" %";
break; h.mCaption.setText(String.format("%.2f", mValue.getGradebookPercent()*100) +" %");//R.string.gradebook +": "+String.format("%.2f", mValue.getGradebookPercent()*100) +" %"
break;
case TYPE_GRADE: case TYPE_GRADE:
int index = data.second / 1024; int index = data.second / 1024;
GradebookViewHolder i = (GradebookViewHolder) holder; GradebookViewHolder i = (GradebookViewHolder) holder;

10
app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
View File

@@ -199,6 +199,16 @@ public class Modules implements Iterable<Modules.Module>, Serializable {
throw new AssertionError("Do not use this constructor!"); throw new AssertionError("Do not use this constructor!");
}*/ }*/
public float getGradebookPercent(){
float maxPoint = 0;
float userPoint = 0;
for (Gradebook g : gradebook){
maxPoint += g.getMaxPoints();
userPoint += g.getPoints();
}
return userPoint/maxPoint;
}
private Module(String semester, HashSet<String> lvNumber, String title, HashSet<Lecturer> lecturer, String type, String description, String ID) { private Module(String semester, HashSet<String> lvNumber, String title, HashSet<Lecturer> lecturer, String type, String description, String ID) {
semester = semester.replace("SS", "S"); semester = semester.replace("SS", "S");
semester = semester.replaceAll("[0-9]{2}([0-9]{2})", "$1"); semester = semester.replaceAll("[0-9]{2}([0-9]{2})", "$1");

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

@@ -31,4 +31,5 @@
<string name="past_events">Vergangene Veranstaltungen</string> <string name="past_events">Vergangene Veranstaltungen</string>
<string name="events">Veranstaltungen</string> <string name="events">Veranstaltungen</string>
<string name="gradebook">Noten</string> <string name="gradebook">Noten</string>
<string name="Current_percentage">Aktuelle Prozentzahl</string>
</resources> </resources>

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

@@ -37,4 +37,5 @@
<string name="past_events">Past Events</string> <string name="past_events">Past Events</string>
<string name="events">Events</string> <string name="events">Events</string>
<string name="gradebook">Gradebook</string> <string name="gradebook">Gradebook</string>
<string name="Current_percentage">Current Percentage</string>
</resources> </resources>