Merge pull request #310 from jogrimst/master

Added timeCreated to Student

pom.xml

@@ -9,7 +9,7 @@
     <properties>
     	<java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <literacyapp.model.version>1.1.30</literacyapp.model.version>
+        <literacyapp.model.version>1.1.31</literacyapp.model.version>
         <hibernate.version>4.3.9.Final</hibernate.version>
         <jetty.version>8.1.14.v20131031</jetty.version>
         <spring.version>4.2.6.RELEASE</spring.version>

src/main/java/org/literacyapp/model/Student.java

@@ -1,12 +1,15 @@
 package org.literacyapp.model;
 
+import java.util.Calendar;
 import java.util.Set;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
 import javax.persistence.ManyToMany;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.literacyapp.model.enums.Locale;
@@ -22,6 +25,10 @@ public class Student extends BaseEntity {
     @ManyToMany(fetch = FetchType.EAGER)
     private Set<Device> devices;
 
+    @NotNull
+    @Temporal(TemporalType.TIMESTAMP)
+    private Calendar timeCreated; // Time created on Device
+
     // TODO: avatar
 
     @NotNull
@@ -36,6 +43,14 @@ public void setUniqueId(String uniqueId) {
         this.uniqueId = uniqueId;
     }
 
+    public Calendar getTimeCreated() {
+        return timeCreated;
+    }
+
+    public void setTimeCreated(Calendar timeCreated) {
+        this.timeCreated = timeCreated;
+    }
+
     public Set<Device> getDevices() {
         return devices;
     }

src/main/java/org/literacyapp/rest/v1/JavaToGsonConverter.java

@@ -159,6 +159,7 @@ public static StudentGson getStudentGson(Student student) {
             StudentGson studentGson = new StudentGson();
 
             studentGson.setUniqueId(student.getUniqueId());
+            studentGson.setTimeCreated(student.getTimeCreated());
 //            studentGson.setAvatar(null);
 //            studentGson.setDevices(null);