Comment removed
This commit is contained in:
@@ -388,7 +388,7 @@ public class KVVModuleList extends HTTPService {
|
||||
|
||||
for (int i = 0; i < sites.length(); i++) {
|
||||
JSONObject site = sites.getJSONObject(i);
|
||||
String grade = site.optString("grade", null);
|
||||
double grade = site.optDouble("grade", 0);
|
||||
String itemName = site.optString("itemName", null);
|
||||
double maxPoints = site.optDouble("points", -1);
|
||||
|
||||
|
||||
@@ -27,20 +27,12 @@ public class Assignment implements Serializable {
|
||||
return id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ID: "+getId();
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public boolean isOpen() {
|
||||
if (dueTime>System.currentTimeMillis()){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return dueTime > System.currentTimeMillis();
|
||||
}
|
||||
|
||||
public long getDueDate() {
|
||||
@@ -54,4 +46,12 @@ public class Assignment implements Serializable {
|
||||
public String getInstructions() {
|
||||
return instructions;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ID: "+getId()+
|
||||
"\nTitle: "+getTitle()+
|
||||
"\nDue date: "+getDueDate()+
|
||||
"\nInstuctions: "+getInstructions().substring(0, Math.min(getInstructions().length(), 100));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,14 +21,6 @@ public class Event implements Serializable {
|
||||
return id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ID: "+getId()+
|
||||
"\nType: "+getType()+
|
||||
"\nStart Date: "+getStartDate()+
|
||||
"\nEnd date: "+getEndDate();
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return this.title;
|
||||
}
|
||||
@@ -44,4 +36,12 @@ public class Event implements Serializable {
|
||||
public long getEndDate() {
|
||||
return this.firstTime+this.duration;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ID: "+getId()+
|
||||
"\nType: "+getType()+
|
||||
"\nStart Date: "+getStartDate()+
|
||||
"\nEnd date: "+getEndDate();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,12 +4,12 @@ import java.io.Serializable;
|
||||
|
||||
public class Gradebook implements Serializable {
|
||||
private final String itemName;
|
||||
private final String grade;
|
||||
private final double grade;
|
||||
private final double maxPoints;
|
||||
|
||||
public Gradebook(String itemName, String grade, double maxPoints) {
|
||||
public Gradebook(String itemName, double points, double maxPoints) {
|
||||
this.itemName = itemName;
|
||||
this.grade = grade;
|
||||
this.grade = points;
|
||||
this.maxPoints = maxPoints;
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ public class Gradebook implements Serializable {
|
||||
return maxPoints;
|
||||
}
|
||||
|
||||
public String getGrade() {
|
||||
public double getPoints() {
|
||||
return grade;
|
||||
}
|
||||
|
||||
@@ -27,7 +27,8 @@ public class Gradebook implements Serializable {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
// TODO
|
||||
return super.toString();
|
||||
return "Name: "+getItemName()+
|
||||
"\nPoints: "+ getPoints()+
|
||||
"\nMax points: "+getMaxPoints();
|
||||
}
|
||||
}
|
||||
|
||||
15
app/src/main/res/layout/list_all_no_items.xml
Normal file
15
app/src/main/res/layout/list_all_no_items.xml
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/caption"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/text_margin"
|
||||
android:text="@string/no_items_available"
|
||||
android:gravity="center"
|
||||
/>
|
||||
</LinearLayout>
|
||||
Reference in New Issue
Block a user