- Added a new method to reset filters after commit

- Modified FacadeProvider to resolve conflit during merge
ePareto-Information-System · Nov 21, 2023 · 36c819e · 36c819e
1 parent b45515e
commit 36c819e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java b/sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java
@@ -309,7 +309,7 @@ public static DiseaseConfigurationFacade getDiseaseConfigurationFacade() {
 		return get().lookupEjbRemote(DiseaseConfigurationFacade.class);
 	}
 
-	public static DiseaseConFacade getDiseaseFacade() {
+	public static DiseaseConFacade getDiseaseConFacade() {
 		return get().lookupEjbRemote(DiseaseConFacade.class);
 	}
 

diff --git a/...as-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/DiseaseEditForm.java b/...as-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/DiseaseEditForm.java
@@ -15,6 +15,7 @@
 import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
 import de.symeda.sormas.api.infrastructure.facility.*;
 import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto;
+import de.symeda.sormas.ui.ControllerProvider;
 import de.symeda.sormas.ui.ViewModelProviders;
 import de.symeda.sormas.ui.configuration.infrastructure.components.SearchField;
 import de.symeda.sormas.ui.utils.*;
@@ -181,9 +182,6 @@ public String apply(FacilityIndexDto facilityIndexDto) {
                 return facilityIndexDto.getName() + " (" + district + ", " + community + ")";
             }
         });
-
-
-
     }
 
 
@@ -228,4 +226,11 @@ public void updateDataProvider() {
         selectDiseaseFacilities.setRightColumnCaption(I18nProperties.getCaption(Captions.facilitiesSelected) + " (" + selectedFacilityIndexDtos.size() + ")");
     }
 
+    //reset filters
+    public void resetFilters() {
+        searchField.setValue("");
+        regionFilter.setValue(null);
+        districtFilter.setValue(null);
+    }
+
 }
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/DiseasesGrid.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/DiseasesGrid.java
@@ -62,7 +62,7 @@ public DiseasesGrid(DiseaseConCriteria criteria) {
 
     public void setLazyDataProvider() {
         DataProvider<DiseaseConIndexDto, DiseaseConCriteria> dataProvider = DataProvider.fromFilteringCallbacks(
-                query -> FacadeProvider.getDiseaseFacade()
+                query -> FacadeProvider.getDiseaseConFacade()
                         .getIndexList(
                                 query.getFilter().orElse(null),
                                 query.getOffset(),
@@ -72,15 +72,15 @@ public void setLazyDataProvider() {
                                         .map(sortOrder -> new SortProperty(sortOrder.getSorted(), sortOrder.getDirection() == SortDirection.ASCENDING))
                                         .collect(Collectors.toList()))
                         .stream(),
-                query -> (int) FacadeProvider.getDiseaseFacade().count(query.getFilter().orElse(null)));
+                query -> (int) FacadeProvider.getDiseaseConFacade().count(query.getFilter().orElse(null)));
         setDataProvider(dataProvider);
         setSelectionMode(SelectionMode.NONE);
     }
 
     public void setEagerDataProvider() {
 
         ListDataProvider<DiseaseConIndexDto> dataProvider =
-                DataProvider.fromStream(FacadeProvider.getDiseaseFacade().getIndexList(getCriteria(), null, null, null).stream());
+                DataProvider.fromStream(FacadeProvider.getDiseaseConFacade().getIndexList(getCriteria(), null, null, null).stream());
         setDataProvider(dataProvider);
     }
 

diff --git a/.../main/java/de/symeda/sormas/ui/configuration/infrastructure/InfrastructureController.java b/.../main/java/de/symeda/sormas/ui/configuration/infrastructure/InfrastructureController.java
@@ -78,7 +78,7 @@ public void editFacility(String uuid) {
 	}
 
 	public void editDisease(String uuid) {
-		DiseaseConDto diseaseConDto = FacadeProvider.getDiseaseFacade().getByUuid(uuid);
+		DiseaseConDto diseaseConDto = FacadeProvider.getDiseaseConFacade().getByUuid(uuid);
 		CommitDiscardWrapperComponent<DiseaseEditForm> editComponent = getEditDiseaseComponent(diseaseConDto);
 		String caption = I18nProperties.getString(Strings.edit) + " " + I18nProperties.getCaption(diseaseConDto.getDisease().toShortString());
 		VaadinUiUtil.showModalPopupWindow(editComponent, caption);
@@ -944,7 +944,8 @@ private CommitDiscardWrapperComponent<DiseaseEditForm> getEditDiseaseComponent(D
 
 			@Override
 			public void onCommit() {
-				FacadeProvider.getDiseaseFacade().save(editForm.getValue());
+				FacadeProvider.getDiseaseConFacade().save(editForm.getValue());
+				editForm.resetFilters();
 				Notification.show(I18nProperties.getString(Strings.messageEntryCreated), Type.ASSISTIVE_NOTIFICATION);
 				SormasUI.get().getNavigator().navigateTo(DiseasesView.VIEW_NAME);
 			}