-add textview for message

-change model and expand

app/src/main/java/com/fusi24/rfid/data/entity/DataCategory.java

@@ -0,0 +1,41 @@
+package com.fusi24.rfid.data.entity;
+
+public class DataCategory {
+
+    private Integer id;
+    private String name;
+    private String description;
+    private String updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+}

app/src/main/java/com/fusi24/rfid/data/entity/DataDocumentType.java

@@ -3,6 +3,8 @@ package com.fusi24.rfid.data.entity;
 public class DataDocumentType {
 
     private Integer id;
+    private DataCategory category;
+    private DataGroup group;
     private String name;
     private String description;
     private String updateDate;
@@ -15,6 +17,22 @@ public class DataDocumentType {
         this.id = id;
     }
 
+    public DataCategory getCategory() {
+        return category;
+    }
+
+    public void setCategory(DataCategory category) {
+        this.category = category;
+    }
+
+    public DataGroup getGroup() {
+        return group;
+    }
+
+    public void setGroup(DataGroup group) {
+        this.group = group;
+    }
+
     public String getName() {
         return name;
     }

app/src/main/java/com/fusi24/rfid/data/entity/DataGroup.java

@@ -0,0 +1,41 @@
+package com.fusi24.rfid.data.entity;
+
+public class DataGroup {
+
+    private Integer id;
+    private String name;
+    private String description;
+    private boolean isActive;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public boolean isActive() {
+        return isActive;
+    }
+
+    public void setActive(boolean active) {
+        isActive = active;
+    }
+}

app/src/main/java/com/fusi24/rfid/data/entity/DataProblems.java

@@ -5,6 +5,7 @@ import java.io.Serializable;
 public class DataProblems implements Serializable {
 
     private DataDocumentType documentType;
+    private String alertType;
     private String reason;
     private String expiryDate;
 
@@ -16,6 +17,14 @@ public class DataProblems implements Serializable {
         this.documentType = documentType;
     }
 
+    public String getAlertType() {
+        return alertType;
+    }
+
+    public void setAlertType(String alertType) {
+        this.alertType = alertType;
+    }
+
     public String getReason() {
         return reason;
     }

app/src/main/java/com/fusi24/rfid/ui/scanresult/ScanResultActivity.java

@@ -108,7 +108,7 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
 
     private void loadingdata() {
         problemsList.clear();
-        String[] expand = {"employee.company, employee.structuralPosition, employee.functionalPosition"};
+        String[] expand = {"employee.company, employee.structuralPosition, employee.functionalPosition, problems.documentType.category,problems.documentType.group"};
         presenter.checkRfidCard(numberRfid, Integer.valueOf(idPermit), idDevice, Integer.valueOf(idCheckType), longLat, expand);
     }
 
@@ -180,7 +180,10 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
         }
 
         if (dataResultRfid.getMessage() != null) {
-            Toast.makeText(this, dataResultRfid.getMessage(), Toast.LENGTH_SHORT).show();
+            binding.tvMessage.setVisibility(View.VISIBLE);
+            binding.tvMessage.setText(dataResultRfid.getMessage());
+        } else {
+            binding.tvMessage.setVisibility(View.GONE);
         }
 
         problemsList = dataResultRfid.getProblems();

app/src/main/res/layout/activity_scan_result_new.xml

@@ -136,12 +136,25 @@
 
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/tv_message"
+                style="@style/CommonText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/colorBlack"
+                android:layout_below="@id/ll_profile_status"
+                android:layout_margin="16dp"
+                android:padding="8dp"
+                android:gravity="center"
+                android:visibility="gone"
+                tools:text="Karyawan ini sudah login pada pukul 16.32 WIB" />
+
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_document_problem"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp"
-                android:layout_below="@+id/ll_profile_status"
+                android:layout_margin="8dp"
+                android:layout_below="@+id/tv_message"
                 tools:listitem="@layout/row_document"
                 tools:itemCount="2"/>