Fix notes,mobile and status

Fixes #8
IEEEKeralaSection · Aug 11, 2019 · 829b31e · 829b31e
1 parent 6841103
commit 829b31e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/app-release.apk b/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "xyz.appmaker.keralarescue.v2"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 10
-        versionName "1.3"
+        versionCode 11
+        versionName "1.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {

diff --git a/app/src/main/java/xyz/appmaker/keralarescue/Activities/FieldsActivity.java b/app/src/main/java/xyz/appmaker/keralarescue/Activities/FieldsActivity.java
@@ -151,6 +151,7 @@ public void onClick(View v) {
                             districtSelectedValue,
                             mobileEdt.getText().toString(),
                             notesEdt.getText().toString(),
+                            "new",
                             "0");
                     insetPersonDb(personDataModel);
                 }

diff --git a/app/src/main/java/xyz/appmaker/keralarescue/Room/PersonData/PersonDataEntity.java b/app/src/main/java/xyz/appmaker/keralarescue/Room/PersonData/PersonDataEntity.java
@@ -2,9 +2,12 @@
 
 import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
+import android.arch.persistence.room.Ignore;
 import android.arch.persistence.room.PrimaryKey;
 import android.support.annotation.NonNull;
 
+import com.google.gson.annotations.SerializedName;
+
 @Entity(tableName = "person_data")
 public class PersonDataEntity {
     @PrimaryKey(autoGenerate = true)
@@ -29,18 +32,25 @@ public class PersonDataEntity {
     public String district;
 
     @ColumnInfo(name = "mobile")
+    @SerializedName("phone")
     public String mobile;
 
     @ColumnInfo(name = "note")
+    @SerializedName("notes")
     public String note;
 
     @ColumnInfo(name = "status")
     public String syncStatus;
 
+    @Ignore
+    @SerializedName("status")
+    @ColumnInfo(name="person_status")
+    public String personStatus = "new";
+
     public PersonDataEntity() {
     }
 
-    public PersonDataEntity(String name, String campName, String age, String gender, String address, String district, String mobile, String note, String status) {
+    public PersonDataEntity(String name, String campName, String age, String gender, String address, String district, String mobile, String note, String personStatus,String syncStatus) {
         this.name = name;
         this.camped_at = campName;
         this.age = age;
@@ -49,7 +59,8 @@ public PersonDataEntity(String name, String campName, String age, String gender,
         this.district = district;
         this.mobile = mobile;
         this.note = note;
-        this.syncStatus = status;
+        this.personStatus = personStatus;
+        this.syncStatus = syncStatus;
     }