RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug again

Browse Source
This commit is contained in:
Alex
2026-04-09 15:37:24 -06:00
parent 01be4a7620
commit 83eda83671
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/AdoptionFragment.java
View File

@@ -210,7 +210,7 @@ public class AdoptionFragment extends Fragment implements AdoptionAdapter.OnAdop
if (status.equals("All Statuses")) status = null; if (status.equals("All Statuses")) status = null;
else status = status.toUpperCase(); else status = status.toUpperCase();
viewModel.loadAdoptions(true, query, status, storeId); viewModel.loadAdoptions(true, query, status, storeId, selectedDateString, null);
} }
private void openDetail(int position) { private void openDetail(int position) {

4
android/app/src/main/java/com/example/petstoremobile/viewmodels/AdoptionListViewModel.java
View File

@@ -42,7 +42,7 @@ public class AdoptionListViewModel extends ViewModel {
public LiveData<Boolean> getIsLoading() { return isLoading; } public LiveData<Boolean> getIsLoading() { return isLoading; }
public boolean isLastPage() { return isLastPage; } public boolean isLastPage() { return isLastPage; }
public void loadAdoptions(boolean reset, String query, String status, Long storeId) { public void loadAdoptions(boolean reset, String query, String status, Long storeId, String date, Long employeeId) {
if (isLoading.getValue() != null && isLoading.getValue() && !reset) return; if (isLoading.getValue() != null && isLoading.getValue() && !reset) return;
if (reset) { if (reset) {
@@ -53,7 +53,7 @@ public class AdoptionListViewModel extends ViewModel {
if ("All Statuses".equals(status)) status = null; if ("All Statuses".equals(status)) status = null;
isLoading.setValue(true); isLoading.setValue(true);
adoptionRepository.getAllAdoptions(currentPage, PAGE_SIZE, query, status, storeId, "adoptionDate,desc", null).observeForever(resource -> { adoptionRepository.getAllAdoptions(currentPage, PAGE_SIZE, query, status, storeId, date, employeeId).observeForever(resource -> {
if (resource != null) { if (resource != null) {
if (resource.status == Resource.Status.SUCCESS && resource.data != null) { if (resource.status == Resource.Status.SUCCESS && resource.data != null) {
List<AdoptionDTO> currentList = reset ? new ArrayList<>() : new ArrayList<>(adoptions.getValue()); List<AdoptionDTO> currentList = reset ? new ArrayList<>() : new ArrayList<>(adoptions.getValue());