Penambahan kategori pekerjaan di status working permit (API Baru)

.idea/codeStyles/Project.xml

@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />

app/src/main/java/com/fusi24/entryPermitScanner/adapter/ProblemWorkingAdapter.java

@@ -0,0 +1,116 @@
+package com.fusi24.entryPermitScanner.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.annimon.stream.Collectors;
+import com.annimon.stream.Stream;
+import com.fusi24.entryPermitScanner.R;
+import com.fusi24.entryPermitScanner.data.entity.DataGroup;
+import com.fusi24.entryPermitScanner.data.entity.workingpermit.DataResultPermit;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class ProblemWorkingAdapter extends RecyclerView.Adapter<ProblemWorkingAdapter.ViewHolder>{
+
+    private Context context;
+    private List<DataResultPermit> resultPermits;
+    private List<DataGroup> groupList;
+    private RecyclerView.RecycledViewPool viewPool = new RecyclerView.RecycledViewPool();
+
+    public ProblemWorkingAdapter(Context context) {
+        this.context = context;
+        this.resultPermits = new ArrayList<>();
+        this.groupList = new ArrayList<>();
+    }
+
+    public List<DataResultPermit> getResultPermits() {
+        return resultPermits;
+    }
+
+    public void setResultPermits(List<DataResultPermit> resultPermits) {
+        this.resultPermits = resultPermits;
+    }
+
+    public void updateResultPermits(List<DataResultPermit> resultPermits){
+        setResultPermits(resultPermits);
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+
+        private com.fusi24.entryPermitScanner.databinding.RowGroupBinding binding;
+
+        ViewHolder(com.fusi24.entryPermitScanner.databinding.RowGroupBinding itemBinding) {
+            super(itemBinding.getRoot());
+            this.binding = itemBinding;
+        }
+    }
+
+
+    @NonNull
+    @Override
+    public ProblemWorkingAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        com.fusi24.entryPermitScanner.databinding.RowGroupBinding itemBinding = com.fusi24.entryPermitScanner.databinding.
+                RowGroupBinding.inflate(LayoutInflater.from(context), parent, false);
+        return new ViewHolder(itemBinding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ProblemWorkingAdapter.ViewHolder holder, int position) {
+
+        DataResultPermit permit = resultPermits.get(position);
+        holder.binding.tvGroupName.setText(permit.getWorkingType().getName());
+
+        if (permit.getProblems().size() == 0){
+            holder.binding.tvMessage.setVisibility(View.VISIBLE);
+            holder.binding.tvMessage.setText(permit.getMessage());
+        }
+
+        groupList = Stream.of(permit.getProblems())
+                .map(v -> v.getDataDocumentType().getGroup())
+                .distinctBy(DataGroup::getId)
+                .collect(Collectors.toList());
+
+        // Create layout manager with initial prefetch item count
+        LinearLayoutManager layoutManager = new LinearLayoutManager(
+                holder.binding.rvSubGroup.getContext(),
+                LinearLayoutManager.VERTICAL, false);
+
+        layoutManager.setInitialPrefetchItemCount(groupList.size());
+
+        //Create Sub Item View Adapter
+        ProblemGroupAdapter groupAdapter = new ProblemGroupAdapter(context);
+        holder.binding.rvSubGroup.setLayoutManager(layoutManager);
+        holder.binding.rvSubGroup.setAdapter(groupAdapter);
+        holder.binding.rvSubGroup.setRecycledViewPool(viewPool);
+
+        groupAdapter.updateGroupList(groupList);
+        groupAdapter.updateProblemList(permit.getProblems());
+        groupAdapter.notifyDataSetChanged();
+
+        holder.binding.ivIconGroup.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_person_hand_right_up));
+        holder.binding.rlGroup.setOnClickListener(v -> {
+            // Set Layout
+            if(holder.binding.rvSubGroup.getVisibility() == View.GONE){
+                holder.binding.rvSubGroup.setVisibility(View.VISIBLE);
+                holder.binding.ivChevron.setImageDrawable(context.getDrawable(R.drawable.chevron_up));
+            } else {
+                holder.binding.rvSubGroup.setVisibility(View.GONE);
+                holder.binding.ivChevron.setImageDrawable(context.getDrawable(R.drawable.chevron_down));
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return resultPermits.size();
+    }
+}

app/src/main/java/com/fusi24/entryPermitScanner/data/DataManager.java

@@ -7,6 +7,7 @@ import com.fusi24.entryPermitScanner.data.entity.DataDevice;
 import com.fusi24.entryPermitScanner.data.entity.DataEntryPermit;
 import com.fusi24.entryPermitScanner.data.entity.DataResultRfid;
 import com.fusi24.entryPermitScanner.data.entity.DataUser;
+import com.fusi24.entryPermitScanner.data.entity.workingpermit.DataWorkingPermit;
 
 import java.util.List;
 
@@ -40,4 +41,8 @@ public class DataManager {
         return restService.checkRfidCard(numberRfid, permitId, rfidDeviceId, checkTypeId, longLat, userId, expand);
     }
 
+    public Observable<DataWorkingPermit> checkPermitCard(String numberRfid, Integer permitId, String rfidDeviceId, Integer checkTypeId, String longLat, Integer userId, String[] expand) {
+        return restService.checkPermitCard(numberRfid, permitId, rfidDeviceId, checkTypeId, longLat, userId, expand);
+    }
+
 }

app/src/main/java/com/fusi24/entryPermitScanner/data/api/RestService.java

@@ -8,6 +8,7 @@ import com.fusi24.entryPermitScanner.data.entity.DataEntryPermit;
 import com.fusi24.entryPermitScanner.data.entity.DataResultRfid;
 import com.fusi24.entryPermitScanner.data.entity.DataSite;
 import com.fusi24.entryPermitScanner.data.entity.DataUser;
+import com.fusi24.entryPermitScanner.data.entity.workingpermit.DataWorkingPermit;
 
 import java.util.List;
 
@@ -46,4 +47,13 @@ public interface RestService {
                                              @Query("checkedBy") Integer userId,
                                              @Query("expand") String[] expand);
 
+    @GET(Constant.SID2_ENDPOINT + "/employee/permit/check/rfid/{number_rfid}")
+    Observable<DataWorkingPermit> checkPermitCard(@Path("number_rfid") String numberRfid,
+                                                  @Query("entryPermitId") Integer permitId,
+                                                  @Query("rfidDeviceId") String rfidDeviceId,
+                                                  @Query("checkTypeId") Integer checkTypeId,
+                                                  @Query("longLat") String longLat,
+                                                  @Query("checkedBy") Integer userId,
+                                                  @Query("expand") String[] expand);
+
 }

app/src/main/java/com/fusi24/entryPermitScanner/data/entity/DataCompany.java

@@ -1,6 +1,9 @@
 package com.fusi24.entryPermitScanner.data.entity;
 
-public class DataCompany {
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class DataCompany implements Parcelable {
 
     private Integer id;
     private String code;
@@ -29,4 +32,38 @@ public class DataCompany {
     public void setName(String name) {
         this.name = name;
     }
+
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeValue(this.id);
+        dest.writeString(this.code);
+        dest.writeString(this.name);
+    }
+
+    public DataCompany() {
+    }
+
+    protected DataCompany(Parcel in) {
+        this.id = (Integer) in.readValue(Integer.class.getClassLoader());
+        this.code = in.readString();
+        this.name = in.readString();
+    }
+
+    public static final Parcelable.Creator<DataCompany> CREATOR = new Parcelable.Creator<DataCompany>() {
+        @Override
+        public DataCompany createFromParcel(Parcel source) {
+            return new DataCompany(source);
+        }
+
+        @Override
+        public DataCompany[] newArray(int size) {
+            return new DataCompany[size];
+        }
+    };
 }

app/src/main/java/com/fusi24/entryPermitScanner/data/entity/DataEmployee.java

@@ -1,6 +1,9 @@
 package com.fusi24.entryPermitScanner.data.entity;
 
-public class DataEmployee {
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class DataEmployee implements Parcelable {
 
     private Integer id;
     private String code;
@@ -74,4 +77,48 @@ public class DataEmployee {
     public void setFunctionalPosition(DataFunctionalPosition functionalPosition) {
         this.functionalPosition = functionalPosition;
     }
+
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeValue(this.id);
+        dest.writeString(this.code);
+        dest.writeString(this.sidCode);
+        dest.writeString(this.name);
+        dest.writeString(this.urlPhoto);
+        dest.writeParcelable(this.company, flags);
+        dest.writeParcelable(this.structuralPosition, flags);
+        dest.writeParcelable(this.functionalPosition, flags);
+    }
+
+    public DataEmployee() {
+    }
+
+    protected DataEmployee(Parcel in) {
+        this.id = (Integer) in.readValue(Integer.class.getClassLoader());
+        this.code = in.readString();
+        this.sidCode = in.readString();
+        this.name = in.readString();
+        this.urlPhoto = in.readString();
+        this.company = in.readParcelable(DataCompany.class.getClassLoader());
+        this.structuralPosition = in.readParcelable(DataStructuralPosition.class.getClassLoader());
+        this.functionalPosition = in.readParcelable(DataFunctionalPosition.class.getClassLoader());
+    }
+
+    public static final Parcelable.Creator<DataEmployee> CREATOR = new Parcelable.Creator<DataEmployee>() {
+        @Override
+        public DataEmployee createFromParcel(Parcel source) {
+            return new DataEmployee(source);
+        }
+
+        @Override
+        public DataEmployee[] newArray(int size) {
+            return new DataEmployee[size];
+        }
+    };
 }

app/src/main/java/com/fusi24/entryPermitScanner/data/entity/DataFunctionalPosition.java

@@ -1,6 +1,9 @@
 package com.fusi24.entryPermitScanner.data.entity;
 
-public class DataFunctionalPosition {
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class DataFunctionalPosition implements Parcelable {
 
     private Integer id;
     private String name;
@@ -29,4 +32,38 @@ public class DataFunctionalPosition {
     public void setDescription(String description) {
         this.description = description;
     }
+
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeValue(this.id);
+        dest.writeString(this.name);
+        dest.writeString(this.description);
+    }
+
+    public DataFunctionalPosition() {
+    }
+
+    protected DataFunctionalPosition(Parcel in) {
+        this.id = (Integer) in.readValue(Integer.class.getClassLoader());
+        this.name = in.readString();
+        this.description = in.readString();
+    }
+
+    public static final Parcelable.Creator<DataFunctionalPosition> CREATOR = new Parcelable.Creator<DataFunctionalPosition>() {
+        @Override
+        public DataFunctionalPosition createFromParcel(Parcel source) {
+            return new DataFunctionalPosition(source);
+        }
+
+        @Override
+        public DataFunctionalPosition[] newArray(int size) {
+            return new DataFunctionalPosition[size];
+        }
+    };
 }

app/src/main/java/com/fusi24/entryPermitScanner/data/entity/DataStructuralPosition.java

@@ -1,6 +1,9 @@
 package com.fusi24.entryPermitScanner.data.entity;
 
-public class DataStructuralPosition {
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class DataStructuralPosition implements Parcelable {
 
     private Integer id;
     private String name;
@@ -29,4 +32,38 @@ public class DataStructuralPosition {
     public void setDescription(String description) {
         this.description = description;
     }
+
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeValue(this.id);
+        dest.writeString(this.name);
+        dest.writeString(this.description);
+    }
+
+    public DataStructuralPosition() {
+    }
+
+    protected DataStructuralPosition(Parcel in) {
+        this.id = (Integer) in.readValue(Integer.class.getClassLoader());
+        this.name = in.readString();
+        this.description = in.readString();
+    }
+
+    public static final Parcelable.Creator<DataStructuralPosition> CREATOR = new Parcelable.Creator<DataStructuralPosition>() {
+        @Override
+        public DataStructuralPosition createFromParcel(Parcel source) {
+            return new DataStructuralPosition(source);
+        }
+
+        @Override
+        public DataStructuralPosition[] newArray(int size) {
+            return new DataStructuralPosition[size];
+        }
+    };
 }

app/src/main/java/com/fusi24/entryPermitScanner/data/entity/workingpermit/DataResultPermit.java

@@ -0,0 +1,97 @@
+package com.fusi24.entryPermitScanner.data.entity.workingpermit;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.fusi24.entryPermitScanner.data.entity.DataProblems;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DataResultPermit implements Parcelable {
+
+    private Boolean passed;
+    private String alertType;
+    private String message;
+    private DataWorkingType workingType;
+    private List<DataProblems> problems;
+
+    public Boolean getPassed() {
+        return passed;
+    }
+
+    public void setPassed(Boolean passed) {
+        this.passed = passed;
+    }
+
+    public String getAlertType() {
+        return alertType;
+    }
+
+    public void setAlertType(String alertType) {
+        this.alertType = alertType;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public DataWorkingType getWorkingType() {
+        return workingType;
+    }
+
+    public void setWorkingType(DataWorkingType workingType) {
+        this.workingType = workingType;
+    }
+
+    public List<DataProblems> getProblems() {
+        return problems;
+    }
+
+    public void setProblems(List<DataProblems> problems) {
+        this.problems = problems;
+    }
+
+    public DataResultPermit() {
+    }
+
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeValue(this.passed);
+        dest.writeString(this.alertType);
+        dest.writeString(this.message);
+        dest.writeParcelable(this.workingType, flags);
+        dest.writeList(this.problems);
+    }
+
+    protected DataResultPermit(Parcel in) {
+        this.passed = (Boolean) in.readValue(Boolean.class.getClassLoader());
+        this.alertType = in.readString();
+        this.message = in.readString();
+        this.workingType = in.readParcelable(DataWorkingType.class.getClassLoader());
+        this.problems = new ArrayList<DataProblems>();
+        in.readList(this.problems, DataProblems.class.getClassLoader());
+    }
+
+    public static final Creator<DataResultPermit> CREATOR = new Creator<DataResultPermit>() {
+        @Override
+        public DataResultPermit createFromParcel(Parcel source) {
+            return new DataResultPermit(source);
+        }
+
+        @Override
+        public DataResultPermit[] newArray(int size) {
+            return new DataResultPermit[size];
+        }
+    };
+}

app/src/main/java/com/fusi24/entryPermitScanner/data/entity/workingpermit/DataWorkingPermit.java

@@ -0,0 +1,95 @@
+package com.fusi24.entryPermitScanner.data.entity.workingpermit;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.fusi24.entryPermitScanner.data.entity.DataEmployee;
+
+import java.util.List;
+
+public class DataWorkingPermit implements Parcelable {
+
+    private Boolean passed;
+    private String alertType;
+    private String message;
+    private DataEmployee employee;
+    private List<DataResultPermit> results;
+
+    public Boolean getPassed() {
+        return passed;
+    }
+
+    public void setPassed(Boolean passed) {
+        this.passed = passed;
+    }
+
+    public String getAlertType() {
+        return alertType;
+    }
+
+    public void setAlertType(String alertType) {
+        this.alertType = alertType;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public DataEmployee getEmployee() {
+        return employee;
+    }
+
+    public void setEmployee(DataEmployee employee) {
+        this.employee = employee;
+    }
+
+    public List<DataResultPermit> getResults() {
+        return results;
+    }
+
+    public void setResults(List<DataResultPermit> results) {
+        this.results = results;
+    }
+
+    public DataWorkingPermit() {
+    }
+
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeValue(this.passed);
+        dest.writeString(this.alertType);
+        dest.writeString(this.message);
+        dest.writeParcelable(this.employee, flags);
+        dest.writeTypedList(this.results);
+    }
+
+    protected DataWorkingPermit(Parcel in) {
+        this.passed = (Boolean) in.readValue(Boolean.class.getClassLoader());
+        this.alertType = in.readString();
+        this.message = in.readString();
+        this.employee = in.readParcelable(DataEmployee.class.getClassLoader());
+        this.results = in.createTypedArrayList(DataResultPermit.CREATOR);
+    }
+
+    public static final Creator<DataWorkingPermit> CREATOR = new Creator<DataWorkingPermit>() {
+        @Override
+        public DataWorkingPermit createFromParcel(Parcel source) {
+            return new DataWorkingPermit(source);
+        }
+
+        @Override
+        public DataWorkingPermit[] newArray(int size) {
+            return new DataWorkingPermit[size];
+        }
+    };
+}

app/src/main/java/com/fusi24/entryPermitScanner/data/entity/workingpermit/DataWorkingType.java

@@ -0,0 +1,79 @@
+package com.fusi24.entryPermitScanner.data.entity.workingpermit;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class DataWorkingType implements Parcelable {
+
+    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 getActive() {
+        return isActive;
+    }
+
+    public void setActive(Boolean active) {
+        isActive = active;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeValue(this.id);
+        dest.writeString(this.name);
+        dest.writeString(this.description);
+        dest.writeValue(this.isActive);
+    }
+
+    public DataWorkingType() {
+    }
+
+    protected DataWorkingType(Parcel in) {
+        this.id = (Integer) in.readValue(Integer.class.getClassLoader());
+        this.name = in.readString();
+        this.description = in.readString();
+        this.isActive = (Boolean) in.readValue(Boolean.class.getClassLoader());
+    }
+
+    public static final Parcelable.Creator<DataWorkingType> CREATOR = new Parcelable.Creator<DataWorkingType>() {
+        @Override
+        public DataWorkingType createFromParcel(Parcel source) {
+            return new DataWorkingType(source);
+        }
+
+        @Override
+        public DataWorkingType[] newArray(int size) {
+            return new DataWorkingType[size];
+        }
+    };
+}

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

@@ -11,16 +11,14 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.annimon.stream.Collectors;
-import com.annimon.stream.Stream;
 import com.bumptech.glide.Glide;
 import com.fusi24.entryPermitScanner.R;
-import com.fusi24.entryPermitScanner.adapter.ProblemGroupAdapter;
+import com.fusi24.entryPermitScanner.adapter.ProblemWorkingAdapter;
 import com.fusi24.entryPermitScanner.base.BaseActivity;
 import com.fusi24.entryPermitScanner.config.Constant;
-import com.fusi24.entryPermitScanner.data.entity.DataGroup;
-import com.fusi24.entryPermitScanner.data.entity.DataProblems;
 import com.fusi24.entryPermitScanner.data.entity.DataResultRfid;
+import com.fusi24.entryPermitScanner.data.entity.workingpermit.DataResultPermit;
+import com.fusi24.entryPermitScanner.data.entity.workingpermit.DataWorkingPermit;
 import com.fusi24.entryPermitScanner.databinding.ActivityScanResultNewBinding;
 import com.fusi24.entryPermitScanner.ui.home.HomeActivity;
 import com.fusi24.entryPermitScanner.util.SoundUtil;
@@ -41,8 +39,8 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     public static final String LOCATION = "location";
 
     private ScanResultPresenter presenter;
-    private ProblemGroupAdapter adapter;
-    private List<DataProblems> problemsList;
+    private ProblemWorkingAdapter adapter;
+    private List<DataResultPermit> resultPermitList;
     private String dataUrl, numberRfid, numberRfidTemp, idPermit, idDevice, idCheckType, checkTypeName, longLat;
     private ActivityScanResultNewBinding binding;
 
@@ -102,8 +100,8 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     private void initView() {
         binding.tvRfidNumber.setText(numberRfid);
 
-        problemsList = new ArrayList<>();
-        adapter = new ProblemGroupAdapter(this);
+        resultPermitList = new ArrayList<>();
+        adapter = new ProblemWorkingAdapter(this);
 
         LinearLayoutManager layoutManager = new LinearLayoutManager(this);
         binding.rvGroupProblem.setLayoutManager(layoutManager);
@@ -112,13 +110,14 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     }
 
     private void loadingdata() {
-        problemsList.clear();
+        resultPermitList.clear();
         String[] expand = {"employee.company, employee.structuralPosition, employee.functionalPosition, problems.documentType.category,problems.documentType.group"};
 
         String bebas = "Location = " + longLat;
         Timber.i(bebas);
 
-        presenter.checkRfidCard(numberRfid, Integer.valueOf(idPermit), idDevice, Integer.valueOf(idCheckType), longLat, getSessionManager().getUserId(), expand);
+        //presenter.checkRfidCard(numberRfid, Integer.valueOf(idPermit), idDevice, Integer.valueOf(idCheckType), longLat, getSessionManager().getUserId(), expand);
+        presenter.checkPermitCard(numberRfid, Integer.valueOf(idPermit), idDevice, Integer.valueOf(idCheckType), longLat, getSessionManager().getUserId(), expand);
     }
 
     private void initEvent() {
@@ -147,7 +146,7 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     @Override
     public void showDataRfid(DataResultRfid dataResultRfid) {
 
-        if (dataResultRfid.getEmployee() != null) {
+        /*if (dataResultRfid.getEmployee() != null) {
             if (getSessionManager().isDevelopment()){
                 dataUrl = Constant.BASE_URL_DEV + Constant.URL_PHOTO + dataResultRfid.getEmployee().getUrlPhoto().substring(14);
             } else {
@@ -222,6 +221,66 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
 
         adapter.updateGroupList(groupList);
         adapter.updateProblemList(problemsList);
+        adapter.notifyDataSetChanged();*/
+    }
+
+    @Override
+    public void showDataPermit(DataWorkingPermit dataWorkingPermit) {
+        if (dataWorkingPermit.getEmployee() != null) {
+            if (getSessionManager().isDevelopment()){
+                dataUrl = Constant.BASE_URL_DEV + Constant.URL_PHOTO + dataWorkingPermit.getEmployee().getUrlPhoto().substring(14);
+            } else {
+                dataUrl = Constant.BASE_URL_PROD + Constant.URL_PHOTO + dataWorkingPermit.getEmployee().getUrlPhoto().substring(14);
+            }
+
+            binding.tvProfileName.setText(dataWorkingPermit.getEmployee().getName());
+            binding.tvStructuralPosition.setText(dataWorkingPermit.getEmployee().getStructuralPosition().getName());
+            binding.tvFunctionalPosition.setText(dataWorkingPermit.getEmployee().getFunctionalPosition().getName());
+            binding.tvCompanyName.setText(dataWorkingPermit.getEmployee().getCompany().getName());
+        } else {
+            binding.tvProfileName.setText("-");
+            binding.tvStructuralPosition.setText("-");
+            binding.tvFunctionalPosition.setText("-");
+            binding.tvCompanyName.setText("-");
+        }
+
+        Glide.with(this)
+                .load(dataUrl)
+                .placeholder(R.drawable.ic_profile_default)
+                .error(R.drawable.ic_profile_default)
+                .into(binding.ivProfileImage);
+
+        if (dataWorkingPermit.getPassed()) {
+            binding.tvProfileStatus.setText(R.string.label_status_passed);
+            binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.greenPassed));
+        } else {
+            SoundUtil.playSound();
+            if (dataWorkingPermit.getAlertType() != null) {
+                if (dataWorkingPermit.getAlertType().equalsIgnoreCase("ERROR")) {
+                    binding.tvProfileStatus.setText(R.string.label_status_not_passed);
+                    binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.redNotPassed));
+                }
+
+                if (dataWorkingPermit.getAlertType().equalsIgnoreCase("WARNING")) {
+                    binding.tvProfileStatus.setText(R.string.label_status_not_valid);
+                    binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.redNotPassed));
+                }
+
+            } else {
+                binding.tvProfileStatus.setText(R.string.label_status_not_passed);
+                binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.redNotPassed));
+            }
+        }
+
+        if (dataWorkingPermit.getMessage() != null) {
+            binding.tvMessage.setVisibility(View.VISIBLE);
+            binding.tvMessage.setText(dataWorkingPermit.getMessage());
+        } else {
+            binding.tvMessage.setVisibility(View.GONE);
+        }
+
+        resultPermitList = dataWorkingPermit.getResults();
+        adapter.updateResultPermits(resultPermitList);
         adapter.notifyDataSetChanged();
     }
 

app/src/main/java/com/fusi24/entryPermitScanner/ui/scanresult/ScanResultPresenter.java

@@ -33,4 +33,19 @@ class ScanResultPresenter extends BasePresenter<ScanResultView> {
                 }));
     }
 
+    void checkPermitCard(String numberRfid, Integer permitId, String rfidDeviceId, Integer checkTypeId, String longLat, Integer userId, String[] expand) {
+        disposable.add(manager.checkPermitCard(numberRfid, permitId, rfidDeviceId, checkTypeId, longLat, userId, expand)
+                .observeOn(androidScheduler)
+                .subscribeOn(processScheduler)
+                .subscribe(dataRfid -> {
+                    if (isViewAttached()) {
+                        getView().showDataPermit(dataRfid);
+                    }
+                }, throwable -> {
+                    if (isViewAttached()) {
+                        getView().showError(throwable);
+                    }
+                }));
+    }
+
 }

app/src/main/java/com/fusi24/entryPermitScanner/ui/scanresult/ScanResultView.java

@@ -2,9 +2,11 @@ package com.fusi24.entryPermitScanner.ui.scanresult;
 
 import com.fusi24.entryPermitScanner.base.BaseView;
 import com.fusi24.entryPermitScanner.data.entity.DataResultRfid;
+import com.fusi24.entryPermitScanner.data.entity.workingpermit.DataWorkingPermit;
 
 public interface ScanResultView extends BaseView {
 
     void showDataRfid(DataResultRfid dataResultRfid);
+    void showDataPermit(DataWorkingPermit dataWorkingPermit);
 
 }

app/src/main/res/drawable/ic_person_hand_right_up.xml

@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#27AE5D"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+    <path android:fillColor="@android:color/white" android:pathData="M15.89,8.11C15.5,7.72 14.83,7 13.53,7c-0.21,0 -1.42,0 -2.54,0C8.24,6.99 6,4.75 6,2H4c0,3.16 2.11,5.84 5,6.71V22h2v-6h2v6h2V10.05L18.95,14l1.41,-1.41L15.89,8.11z"/>
+</vector>

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

@@ -29,6 +29,7 @@
                 android:layout_alignParentStart="true">
 
                 <ImageView
+                    android:id="@+id/iv_icon_group"
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_marginStart="4dp"
@@ -68,6 +69,14 @@
                 tools:listitem="@layout/row_document"
                 tools:itemCount="2"/>
 
+            <TextView
+                android:id="@+id/tv_message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/rv_sub_group"
+                android:visibility="gone"
+                tools:text="There is a problem: Working Permit Mapping is Empty"/>
+
         </RelativeLayout>
 
     </androidx.cardview.widget.CardView>