SORMAS-Foundation#2753 - filter region filter by area

Author: barnabartha

sormas-api/src/main/java/de/symeda/sormas/api/region/RegionFacade.java

@@ -29,6 +29,8 @@
 @Remote
 public interface RegionFacade {
 
+	List<RegionReferenceDto> getAllActiveByArea(String areaUuid);
+
 	List<RegionReferenceDto> getAllActiveAsReference();
 
 	List<RegionDto> getAllAfter(Date date);

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/data/CampaignFormDataFacadeEjb.java

@@ -325,6 +325,7 @@ public List<CampaignDiagramDataDto> getDiagramData(
 							+ " LEFT JOIN " + Region.TABLE_NAME + " ON " + CampaignFormData.REGION + "_id = " + Region.TABLE_NAME + "." + Region.ID
 							+ " LEFT JOIN " + Area.TABLE_NAME + " ON " + Region.AREA + "_id = " + Area.TABLE_NAME + "." + Area.ID
 							+ " LEFT JOIN " + District.TABLE_NAME + " ON " + CampaignFormData.DISTRICT + "_id = " + District.TABLE_NAME + "." + District.ID
+							+ " LEFT JOIN " + Community.TABLE_NAME + " ON " + CampaignFormData.COMMUNITY + "_id = " + Community.TABLE_NAME + "." + Community.ID
 							+ " LEFT JOIN " + Campaign.TABLE_NAME + " ON " + CampaignFormData.CAMPAIGN + "_id = " + Campaign.TABLE_NAME + "." + Campaign.ID
 							+ ", json_array_elements(" + CampaignFormData.FORM_VALUES + ") as jsonData"
 							+ ", json_array_elements(" + CampaignFormMeta.CAMPAIGN_FORM_ELEMENTS + ") as jsonMeta"

sormas-backend/src/main/java/de/symeda/sormas/backend/region/RegionFacadeEjb.java

@@ -48,6 +48,7 @@
 import de.symeda.sormas.api.region.RegionReferenceDto;
 import de.symeda.sormas.api.utils.SortProperty;
 import de.symeda.sormas.api.utils.ValidationRuntimeException;
+import de.symeda.sormas.backend.common.InfrastructureAdo;
 import de.symeda.sormas.backend.facility.Facility;
 import de.symeda.sormas.backend.infrastructure.PointOfEntry;
 import de.symeda.sormas.backend.infrastructure.PopulationDataFacadeEjb.PopulationDataFacadeEjbLocal;
@@ -74,6 +75,17 @@ public class RegionFacadeEjb implements RegionFacade {
 	@EJB
 	private AreaService areaService;
 
+	@Override
+	public List<RegionReferenceDto> getAllActiveByArea(String areaUuid) {
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<Region> cq = cb.createQuery(Region.class);
+		Root<Region> root = cq.from(Region.class);
+		cq.where(cb.and(cb.isFalse(root.get(InfrastructureAdo.ARCHIVED)), cb.equal(root.get(Region.AREA).get(Area.UUID), areaUuid)));
+		cq.orderBy(cb.asc(root.get(Region.NAME)));
+
+		return em.createQuery(cq).getResultList().stream().map(f -> toReferenceDto(f)).collect(Collectors.toList());
+	}
+
 	@Override
 	public List<RegionReferenceDto> getAllActiveAsReference() {
 		return regionService.getAllActive(Region.NAME, true).stream().map(f -> toReferenceDto(f)).collect(Collectors.toList());

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/campaigns/CampaignDashboardFilterLayout.java

@@ -83,7 +83,6 @@ private void createJurisdictionFilters() {
 		if (UserProvider.getCurrent().getUser().getRegion() == null) {
 			regionFilter.setWidth(200, Unit.PIXELS);
 			regionFilter.setInputPrompt(I18nProperties.getString(Strings.promptRegion));
-			regionFilter.addItems(FacadeProvider.getRegionFacade().getAllActiveAsReference());
 			regionFilter.addValueChangeListener(e -> {
 				final Object value = regionFilter.getValue();
 				dashboardDataProvider.setRegion((RegionReferenceDto) value);
@@ -95,11 +94,9 @@ private void createJurisdictionFilters() {
 		}
 
 		// District filter
-		if (UserProvider.getCurrent().getUser().getRegion() != null && UserProvider.getCurrent().getUser().getDistrict() == null) {
+		if (UserProvider.getCurrent().getUser().getDistrict() == null) {
 			districtFilter.setWidth(200, Unit.PIXELS);
 			districtFilter.setInputPrompt(I18nProperties.getString(Strings.promptDistrict));
-			districtFilter
-				.addItems(FacadeProvider.getDistrictFacade().getAllActiveByRegion(UserProvider.getCurrent().getUser().getRegion().getUuid()));
 			districtFilter.addValueChangeListener(e -> {
 				dashboardDataProvider.setDistrict((DistrictReferenceDto) districtFilter.getValue());
 				dashboardView.refreshDashboard();
@@ -112,6 +109,8 @@ private void createJurisdictionFilters() {
 	private void setFilterVisibilitiesBasedOnRegion(Object value) {
 		if (value != null) {
 			districtFilter.setVisible(true);
+			districtFilter.removeAllItems();
+			districtFilter.addItems(FacadeProvider.getDistrictFacade().getAllActiveByRegion(((RegionReferenceDto) value).getUuid()));
 		} else {
 			districtFilter.setVisible(false);
 			districtFilter.clear();
@@ -120,12 +119,13 @@ private void setFilterVisibilitiesBasedOnRegion(Object value) {
 
 	private void setFilterVisibilitiesBasedOnArea(Object value) {
 		if (value != null) {
+			regionFilter.removeAllItems();
+			regionFilter.addItems(FacadeProvider.getRegionFacade().getAllActiveByArea(((AreaReferenceDto) value).getUuid()));
 			regionFilter.setVisible(true);
-			districtFilter.setVisible(true);
 		} else {
 			regionFilter.setVisible(false);
-			districtFilter.setVisible(false);
 			regionFilter.clear();
+			districtFilter.setVisible(false);
 			districtFilter.clear();
 		}
 	}