Updated data models

.gitignore

@@ -5,4 +5,5 @@ logs/
 build/
 out/
 crashes/
-*.iml
+*.iml
+debug.json

src/main/java/fr/litarvan/sakado/server/data/CompleteFileUpload.java

@@ -0,0 +1,30 @@
+package fr.litarvan.sakado.server.data;
+
+public class CompleteFileUpload extends FileUpload
+{
+	private long time;
+	private String subject;
+
+	public CompleteFileUpload()
+	{
+		super();
+	}
+
+	public CompleteFileUpload(String name, String url, long time, String subject)
+	{
+		super(name, url);
+
+		this.time = time;
+		this.subject = subject;
+	}
+
+	public long getTime()
+	{
+		return time;
+	}
+
+	public String getSubject()
+	{
+		return subject;
+	}
+}

src/main/java/fr/litarvan/sakado/server/data/FileUpload.java

@@ -0,0 +1,27 @@
+package fr.litarvan.sakado.server.data;
+
+public class FileUpload
+{
+	private String name;
+	private String url;
+
+	public FileUpload()
+	{
+	}
+
+	public FileUpload(String name, String url)
+	{
+		this.name = name;
+		this.url = url;
+	}
+
+	public String getName()
+	{
+		return name;
+	}
+
+	public String getUrl()
+	{
+		return url;
+	}
+}

src/main/java/fr/litarvan/sakado/server/data/Homework.java

@@ -27,17 +27,19 @@ public class Homework implements Identifiable
     private String content;
     private long since;
     private long until;
+    private FileUpload[] files;
 
     public Homework()
     {
     }
 
-    public Homework(String subject, String content, long since, long until)
+    public Homework(String subject, String content, long since, long until, FileUpload[] files)
     {
         this.subject = subject;
         this.content = content;
         this.since = since;
         this.until = until;
+        this.files = files;
     }
 
     public String getSubject()
@@ -70,7 +72,12 @@ public Calendar getUntilAsCalendar()
         return CalendarUtils.fromTimestamp(until);
     }
 
-    @Override
+	public FileUpload[] getFiles()
+	{
+		return files;
+	}
+
+	@Override
     public String getId()
     {
         return "H" + since + "" + until + getSubject().substring(0, 2) + getContent().substring(0, 5);

src/main/java/fr/litarvan/sakado/server/data/Marks.java

@@ -0,0 +1,27 @@
+package fr.litarvan.sakado.server.data;
+
+public class Marks
+{
+	private SubjectMarks[] marks;
+	private Averages averages;
+
+	public Marks()
+	{
+	}
+
+	public Marks(SubjectMarks[] marks, Averages averages)
+	{
+		this.marks = marks;
+		this.averages = averages;
+	}
+
+	public SubjectMarks[] getMarks()
+	{
+		return marks;
+	}
+
+	public Averages getAverages()
+	{
+		return averages;
+	}
+}

src/main/java/fr/litarvan/sakado/server/data/Report.java

@@ -0,0 +1,121 @@
+package fr.litarvan.sakado.server.data;
+
+public class Report
+{
+	private ReportSubject[] subjects;
+	private Averages averages;
+	private Comment[] comments;
+
+	public Report()
+	{
+	}
+
+	public Report(ReportSubject[] subjects, Averages averages, Comment[] comments)
+	{
+		this.subjects = subjects;
+		this.averages = averages;
+		this.comments = comments;
+	}
+
+	public ReportSubject[] getSubjects()
+	{
+		return subjects;
+	}
+
+	public Averages getAverages()
+	{
+		return averages;
+	}
+
+	public Comment[] getComments()
+	{
+		return comments;
+	}
+
+	public static class ReportSubject
+	{
+		private String name;
+		private float average;
+		private float studentClassAverage;
+		private float maxAverage;
+		private float minAverage;
+		private String comment;
+		private int coefficient;
+
+		public ReportSubject()
+		{
+		}
+
+		public ReportSubject(String name, float average, float studentClassAverage, float maxAverage, float minAverage, String comment, int coefficient)
+		{
+			this.name = name;
+			this.average = average;
+			this.studentClassAverage = studentClassAverage;
+			this.maxAverage = maxAverage;
+			this.minAverage = minAverage;
+			this.comment = comment;
+			this.coefficient = coefficient;
+		}
+
+		public String getName()
+		{
+			return name;
+		}
+
+		public float getAverage()
+		{
+			return average;
+		}
+
+		public float getStudentClassAverage()
+		{
+			return studentClassAverage;
+		}
+
+		public float getMaxAverage()
+		{
+			return maxAverage;
+		}
+
+		public float getMinAverage()
+		{
+			return minAverage;
+		}
+
+		public String getComment()
+		{
+			return comment;
+		}
+
+		public int getCoefficient()
+		{
+			return coefficient;
+		}
+	}
+
+	public static class Comment
+	{
+		private String title;
+		private String value;
+
+		public Comment()
+		{
+		}
+
+		public Comment(String title, String value)
+		{
+			this.title = title;
+			this.value = value;
+		}
+
+		public String getTitle()
+		{
+			return title;
+		}
+
+		public String getValue()
+		{
+			return value;
+		}
+	}
+}

src/main/java/fr/litarvan/sakado/server/data/network/FetchResponse.java

@@ -17,10 +17,12 @@
  */
 package fr.litarvan.sakado.server.data.network;
 
+import java.util.Map;
+
+import fr.litarvan.sakado.server.data.CompleteFileUpload;
 import fr.litarvan.sakado.server.data.Homework;
-import fr.litarvan.sakado.server.data.Mark;
-import fr.litarvan.sakado.server.data.SubjectMarks;
-import fr.litarvan.sakado.server.data.Averages;
+import fr.litarvan.sakado.server.data.Marks;
+import fr.litarvan.sakado.server.data.Report;
 import fr.litarvan.sakado.server.data.Week;
 
 public class FetchResponse extends Response
@@ -33,29 +35,33 @@ public class FetchResponse extends Response
 
     private String[][] menu;
 
-    private SubjectMarks[] marks;
-    private Averages averages;
-
+    private Map<String, Marks> marks;
     private Homework[] homeworks;
+	private Map<String, Report> reports;
 
-    public FetchResponse()
-    {
-    }
+    private CompleteFileUpload[] files;
+
+    private int defaultPeriod;
 
-    public FetchResponse(String error, String studentClass, String name, String avatar, Week[] timetable, String[][] menu, SubjectMarks[] marks, Averages averages, Homework[] homeworks)
+    public FetchResponse()
     {
-        this.error = error;
-        this.studentClass = studentClass;
-        this.name = name;
-        this.avatar = avatar;
-        this.timetable = timetable;
-        this.menu = menu;
-        this.marks = marks;
-        this.averages = averages;
-        this.homeworks = homeworks;
     }
 
-    public String getStudentClass()
+	public FetchResponse(String studentClass, String name, String avatar, Week[] timetable, String[][] menu, Map<String, Marks> marks, Homework[] homeworks, Map<String, Report> reports, CompleteFileUpload[] files, int defaultPeriod)
+	{
+		this.studentClass = studentClass;
+		this.name = name;
+		this.avatar = avatar;
+		this.timetable = timetable;
+		this.menu = menu;
+		this.marks = marks;
+		this.homeworks = homeworks;
+		this.reports = reports;
+		this.files = files;
+		this.defaultPeriod = defaultPeriod;
+	}
+
+	public String getStudentClass()
     {
         return studentClass;
     }
@@ -80,18 +86,28 @@ public String[][] getMenu()
         return menu;
     }
 
-    public SubjectMarks[] getMarks()
-    {
-        return marks;
-    }
-
-    public Averages getAverages()
-    {
-        return averages;
-    }
+	public Map<String, Marks> getMarks()
+	{
+		return marks;
+	}
 
-    public Homework[] getHomeworks()
+	public Homework[] getHomeworks()
     {
         return homeworks;
     }
+
+	public Map<String, Report> getReports()
+	{
+		return reports;
+	}
+
+	public CompleteFileUpload[] getFiles()
+	{
+		return files;
+	}
+
+	public int getDefaultPeriod()
+	{
+		return defaultPeriod;
+	}
 }