-Dynamic site

-Dynamic permit
-Fixing margin after scan

app/src/main/java/com/fusi24/rfid/MainActivity.java

@@ -2,21 +2,33 @@ package com.fusi24.rfid;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.Spinner;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.fusi24.rfid.data.model.DataCommon;
+import android.widget.Toast;
+
+import com.fusi24.rfid.base.BaseActivity;
+import com.fusi24.rfid.config.Constant;
+import com.fusi24.rfid.data.api.RestService;
+import com.fusi24.rfid.data.api.RestServiceFactory;
+import com.fusi24.rfid.data.entity.DataEntryPermit;
+import com.fusi24.rfid.data.entity.DataSite;
 import com.fusi24.rfid.ui.ScanActivity;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends BaseActivity {
 
     @BindView(R.id.btn_scan)
     Button btnScan;
@@ -25,50 +37,114 @@ public class MainActivity extends AppCompatActivity {
     @BindView(R.id.spinner_permit)
     Spinner spinnerPermit;
 
+    private DataSite dataSite;
+    private DataEntryPermit dataEntryPermit;
+    private List<DataSite> siteList;
+    private List<DataEntryPermit> entryPermitList;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         ButterKnife.bind(this);
 
-        setDataSite();
-        setDataPermit();
+        dataSite = new DataSite();
+        dataEntryPermit = new DataEntryPermit();
 
+        siteList = new ArrayList<>();
+        entryPermitList = new ArrayList<>();
+
+        getDataSite();
+        getDataPermit();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
         initEvent();
+
     }
 
-    private void initEvent(){
-        btnScan.setOnClickListener(v -> {
-            Intent intent = new Intent(this, ScanActivity.class);
-            startActivity(intent);
+    private void getDataSite() {
+        RestService restService = RestServiceFactory.create(Constant.JWT_TOKEN);
+        Call<List<DataSite>> call = restService.getDataSite(100);
+        call.enqueue(new Callback<List<DataSite>>() {
+            @Override
+            public void onResponse(@NotNull Call<List<DataSite>> call, @NotNull Response<List<DataSite>> response) {
+                if (response.body() != null){
+                    siteList.addAll(response.body());
+                    setDataSite();
+                }
+            }
+
+            @Override
+            public void onFailure(@NotNull Call<List<DataSite>> call, @NotNull Throwable t) {
+                Toast.makeText(MainActivity.this, "Failed to get data site", Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+
+    private void getDataPermit() {
+        RestService restService = RestServiceFactory.create(Constant.JWT_TOKEN);
+        Call<List<DataEntryPermit>> call = restService.getEntryPermit();
+        call.enqueue(new Callback<List<DataEntryPermit>>() {
+            @Override
+            public void onResponse(@NotNull Call<List<DataEntryPermit>> call, @NotNull Response<List<DataEntryPermit>> response) {
+                if (response.body() != null) {
+                    entryPermitList.addAll(response.body());
+                    setDataPermit();
+                }
+            }
+
+            @Override
+            public void onFailure(@NotNull Call<List<DataEntryPermit>> call, @NotNull Throwable t) {
+                Toast.makeText(MainActivity.this, "Failed to get data permit", Toast.LENGTH_SHORT).show();
+            }
         });
     }
 
     private void setDataSite(){
-        ArrayList<DataCommon> siteList = new ArrayList<>();
-
-        siteList.add(new DataCommon(111, "HO"));
-        siteList.add(new DataCommon(112, "BMO 1"));
-        siteList.add(new DataCommon(113, "BMO 2"));
-        siteList.add(new DataCommon(114, "LMO"));
-        siteList.add(new DataCommon(115, "SMO"));
-        siteList.add(new DataCommon(116, "MARINE"));
-        siteList.add(new DataCommon(117, "EKSPLORASI"));
-        siteList.add(new DataCommon(118, "JAKARTA"));
-
-        ArrayAdapter<DataCommon> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, siteList);
+        ArrayAdapter<DataSite> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, siteList);
         spinnerSite.setAdapter(adapter);
     }
 
     private void setDataPermit(){
-        ArrayList<DataCommon> permitList = new ArrayList<>();
+        ArrayAdapter<DataEntryPermit> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, entryPermitList);
+        spinnerPermit.setAdapter(adapter);
+    }
+
+    private void initEvent(){
 
-        permitList.add(new DataCommon(1, "ID CARD"));
-        permitList.add(new DataCommon(2, "VISITOR"));
-        permitList.add(new DataCommon(3, "MAGANG"));
+        spinnerSite.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                dataSite = (DataSite) parent.getItemAtPosition(position);
+            }
 
-        ArrayAdapter<DataCommon> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, permitList);
-        spinnerPermit.setAdapter(adapter);
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                dataSite = (DataSite) parent.getSelectedItem();
+            }
+        });
+
+        spinnerPermit.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                dataEntryPermit = (DataEntryPermit) parent.getItemAtPosition(position);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                dataEntryPermit = (DataEntryPermit) parent.getSelectedItem();
+            }
+        });
+
+        btnScan.setOnClickListener(v -> {
+            Intent intent = new Intent(this, ScanActivity.class);
+            intent.putExtra(ScanActivity.ID_SITE, String.valueOf(dataSite.getId()));
+            intent.putExtra(ScanActivity.ID_PERMIT, String.valueOf(dataEntryPermit.getId()));
+            startActivity(intent);
+        });
     }
 
 }

app/src/main/java/com/fusi24/rfid/adapter/ScanResultAdapter.java

@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.fusi24.rfid.R;
-import com.fusi24.rfid.data.model.DataProblems;
+import com.fusi24.rfid.data.entity.DataProblems;
 import com.fusi24.rfid.util.DateHelper;
 
 import java.util.ArrayList;

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

@@ -1,7 +1,7 @@
 package com.fusi24.rfid.data;
 
 import com.fusi24.rfid.data.api.RestService;
-import com.fusi24.rfid.data.model.DataResultRfid;
+import com.fusi24.rfid.data.entity.DataResultRfid;
 
 import io.reactivex.Observable;
 
@@ -13,8 +13,8 @@ public class DataManager {
         this.restService = restService;
     }
 
-    public Observable<DataResultRfid> checkRfidCard(String numberRfid, Integer permitId, String[] expand) {
-        return restService.checkRfidCard(numberRfid, permitId, expand);
+    public Observable<DataResultRfid> checkRfidCard(String numberRfid, Integer permitId, Integer siteId, String[] expand) {
+        return restService.checkRfidCard(numberRfid, permitId, siteId, expand);
     }
 
 }

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

@@ -1,17 +1,29 @@
 package com.fusi24.rfid.data.api;
 
 import com.fusi24.rfid.config.Constant;
-import com.fusi24.rfid.data.model.DataResultRfid;
+import com.fusi24.rfid.data.entity.DataEntryPermit;
+import com.fusi24.rfid.data.entity.DataResultRfid;
+import com.fusi24.rfid.data.entity.DataSite;
+
+import java.util.List;
 
 import io.reactivex.Observable;
+import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 public interface RestService {
 
+    @GET(Constant.BEATS2_ENDPOINT + "/api/location")
+    Call<List<DataSite>> getDataSite(@Query("filter[type.id]") Integer typeId);
+
+    @GET(Constant.SID2_ENDPOINT + "/api/entryPermit")
+    Call<List<DataEntryPermit>> getEntryPermit();
+
     @GET(Constant.SID2_ENDPOINT + Constant.RFID_ENDPOINT + "/permit/check/{number_rfid}")
     Observable<DataResultRfid> checkRfidCard(@Path("number_rfid") String numberRfid,
+                                             @Query("siteId") Integer siteId,
                                              @Query("entryPermitId") Integer permitId,
                                              @Query("expand") String[] expand);
 

app/src/main/java/com/fusi24/rfid/data/model/DataCommon.java

@@ -1,4 +1,4 @@
-package com.fusi24.rfid.data.model;
+package com.fusi24.rfid.data.entity;
 
 import org.jetbrains.annotations.NotNull;
 

app/src/main/java/com/fusi24/rfid/data/model/DataCompany.java

@@ -1,4 +1,4 @@
-package com.fusi24.rfid.data.model;
+package com.fusi24.rfid.data.entity;
 
 public class DataCompany {
 

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

@@ -1,4 +1,4 @@
-package com.fusi24.rfid.data.model;
+package com.fusi24.rfid.data.entity;
 
 public class DataDocumentType {
 

app/src/main/java/com/fusi24/rfid/data/model/DataEmployee.java

@@ -1,4 +1,4 @@
-package com.fusi24.rfid.data.model;
+package com.fusi24.rfid.data.entity;
 
 public class DataEmployee {
 

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

@@ -0,0 +1,49 @@
+package com.fusi24.rfid.data.entity;
+
+import org.jetbrains.annotations.NotNull;
+
+public class DataEntryPermit {
+
+    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;
+    }
+
+    @NotNull
+    @Override
+    public String toString() {
+        return getName();
+    }
+}

app/src/main/java/com/fusi24/rfid/data/model/DataFunctionalPosition.java

@@ -1,4 +1,4 @@
-package com.fusi24.rfid.data.model;
+package com.fusi24.rfid.data.entity;
 
 public class DataFunctionalPosition {
 

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

@@ -1,4 +1,4 @@
-package com.fusi24.rfid.data.model;
+package com.fusi24.rfid.data.entity;
 
 import java.io.Serializable;
 

app/src/main/java/com/fusi24/rfid/data/model/DataResultRfid.java

@@ -1,4 +1,4 @@
-package com.fusi24.rfid.data.model;
+package com.fusi24.rfid.data.entity;
 
 import java.util.List;
 

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

@@ -0,0 +1,49 @@
+package com.fusi24.rfid.data.entity;
+
+import org.jetbrains.annotations.NotNull;
+
+public class DataSite {
+
+    private Integer id;
+    private String name;
+    private String shortName;
+    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 getShortName() {
+        return shortName;
+    }
+
+    public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
+
+    public Boolean getActive() {
+        return isActive;
+    }
+
+    public void setActive(Boolean active) {
+        isActive = active;
+    }
+
+    @NotNull
+    @Override
+    public String toString() {
+        return getName();
+    }
+}

app/src/main/java/com/fusi24/rfid/data/model/DataStructuralPosition.java

@@ -1,4 +1,4 @@
-package com.fusi24.rfid.data.model;
+package com.fusi24.rfid.data.entity;
 
 public class DataStructuralPosition {
 

app/src/main/java/com/fusi24/rfid/ui/ScanActivity.java

@@ -15,17 +15,31 @@ import timber.log.Timber;
 
 public class ScanActivity extends LFScanProcessing {
 
+    public static final String ID_SITE = "id_site";
+    public static final String ID_PERMIT = "id_permit";
+
     @BindView(R.id.toggle_scan)
     ToggleButton toggleScan;
 
+    private String idSite;
+    private String idPermit;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_scan);
         ButterKnife.bind(this);
+        initView();
         initSound();
     }
 
+    private void initView() {
+        if (getIntent().getExtras() != null){
+            idSite = getIntent().getExtras().getString(ID_SITE);
+            idPermit = getIntent().getExtras().getString(ID_PERMIT);
+        }
+    }
+
     @OnCheckedChanged(R.id.toggle_scan)
     public void statusScanner(){
         if(toggleScan.isChecked()){
@@ -36,7 +50,9 @@ public class ScanActivity extends LFScanProcessing {
 
     void startInstance(String reception){
         Intent intent = new Intent(this, ScanResultActivity.class);
-        intent.putExtra("reception", reception); //Optional parameters
+        intent.putExtra(ScanResultActivity.ID_SITE, idSite);
+        intent.putExtra(ScanResultActivity.ID_PERMIT, idPermit);
+        intent.putExtra(ScanResultActivity.RFID_CARD_NUMBER, reception);
         startActivityForResult(intent, 1);
     }
 

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

@@ -19,8 +19,8 @@ import com.fusi24.rfid.R;
 import com.fusi24.rfid.adapter.ScanResultAdapter;
 import com.fusi24.rfid.base.BaseActivity;
 import com.fusi24.rfid.config.Constant;
-import com.fusi24.rfid.data.model.DataProblems;
-import com.fusi24.rfid.data.model.DataResultRfid;
+import com.fusi24.rfid.data.entity.DataProblems;
+import com.fusi24.rfid.data.entity.DataResultRfid;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,6 +31,10 @@ import de.hdodenhof.circleimageview.CircleImageView;
 
 public class ScanResultActivity extends BaseActivity implements ScanResultView {
 
+    public static final String ID_SITE = "id_site";
+    public static final String ID_PERMIT = "id_permit";
+    public static final String RFID_CARD_NUMBER = "rfid_card_number";
+
     @BindView(R.id.tv_rfid_number)
     TextView tvRfidNumber;
 
@@ -61,6 +65,8 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     private ScanResultPresenter presenter;
     private ScanResultAdapter adapter;
     private List<DataProblems> problemsList;
+    private String idSite;
+    private String idPermit;
     private String numberRfid;
 
     @Override
@@ -74,7 +80,9 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
         presenter.attachView(this);
 
         if (getIntent() != null){
-            numberRfid = "000" + getIntent().getStringExtra("reception");
+            idSite = getIntent().getStringExtra(ID_SITE);
+            idPermit = getIntent().getStringExtra(ID_PERMIT);
+            numberRfid = "000" + getIntent().getStringExtra(RFID_CARD_NUMBER);
         }
 
         initView();
@@ -99,7 +107,7 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     private void loadingdata(){
         problemsList.clear();
         String[] expand = {"employee.company, employee.structuralPosition, employee.functionalPosition"};
-        presenter.checkRfidCard(numberRfid, 1, expand);
+        presenter.checkRfidCard(numberRfid, Integer.valueOf(idPermit), Integer.valueOf(idSite), expand);
     }
 
     private void initEvent(){
@@ -109,9 +117,7 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
             startActivity(intent);
         });
 
-        btnScanAgain.setOnClickListener(v -> {
-            finish();
-        });
+        btnScanAgain.setOnClickListener(v -> finish());
     }
 
     @Override

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

@@ -5,7 +5,7 @@ import com.fusi24.rfid.data.DataManager;
 
 import io.reactivex.Scheduler;
 
-public class ScanResultPresenter extends BasePresenter<ScanResultView> {
+class ScanResultPresenter extends BasePresenter<ScanResultView> {
 
     private DataManager manager;
 
@@ -18,8 +18,8 @@ public class ScanResultPresenter extends BasePresenter<ScanResultView> {
         this.processScheduler = processScheduler;
     }
 
-    void checkRfidCard(String numberRfid, Integer permitId, String[] expand) {
-        disposable.add(manager.checkRfidCard(numberRfid, permitId, expand)
+    void checkRfidCard(String numberRfid, Integer permitId, Integer siteId, String[] expand) {
+        disposable.add(manager.checkRfidCard(numberRfid, siteId, permitId, expand)
                 .observeOn(androidScheduler)
                 .subscribeOn(processScheduler)
                 .subscribe(dataRfid -> {

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

@@ -1,7 +1,7 @@
 package com.fusi24.rfid.ui.scanresult;
 
 import com.fusi24.rfid.base.BaseView;
-import com.fusi24.rfid.data.model.DataResultRfid;
+import com.fusi24.rfid.data.entity.DataResultRfid;
 
 public interface ScanResultView extends BaseView {
 

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

@@ -44,7 +44,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:layout_margin="8dp"
+            android:layout_margin="2dp"
             tools:text="HADYAN EL AUFAR" />
 
         <TextView
@@ -53,7 +53,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:layout_margin="8dp"
+            android:layout_margin="2dp"
             tools:text="IT System Development Specialist" />
 
         <TextView
@@ -62,7 +62,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:layout_margin="8dp"
+            android:layout_margin="2dp"
             tools:text="Engineer/Specialist" />
 
         <TextView
@@ -71,7 +71,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:layout_margin="8dp"
+            android:layout_margin="2dp"
             tools:text="PT. Berau Coal Energy" />
 
     </LinearLayout>