SORMAS-Foundation#2890 - disable area field in case current user jurisdiction level is region or below

Author: barnabartha

sormas-api/src/main/java/de/symeda/sormas/api/user/UserDto.java

@@ -72,7 +72,6 @@ public class UserDto extends EntityDto {
 
 	private Set<UserRole> userRoles;
 
-	private AreaReferenceDto area;
 	private RegionReferenceDto region;
 	private DistrictReferenceDto district;
 	// community of community informant
@@ -180,14 +179,6 @@ public void setAssociatedOfficer(UserReferenceDto associatedOfficer) {
 		this.associatedOfficer = associatedOfficer;
 	}
 
-	public AreaReferenceDto getArea() {
-		return area;
-	}
-
-	public void setArea(AreaReferenceDto area) {
-		this.area = area;
-	}
-
 	public RegionReferenceDto getRegion() {
 		return region;
 	}

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormDataEditForm.java

@@ -22,11 +22,6 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRowLocs;
-import static de.symeda.sormas.ui.utils.LayoutUtil.loc;
-
-import java.util.Objects;
-
 import com.vaadin.ui.GridLayout;
 import com.vaadin.v7.data.Validator;
 import com.vaadin.v7.data.util.converter.Converter;
@@ -101,6 +96,9 @@ protected void addFields() {
 		addInfrastructureListeners(cbRegion, cbDistrict, cbCommunity);
 		cbRegion.addItems(FacadeProvider.getRegionFacade().getAllActiveAsReference());
 
+		final UserDto currentUser = UserProvider.getCurrent().getUser();
+		final RegionReferenceDto currentUserRegion = currentUser.getRegion();
+
 		if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.INFRASTRUCTURE_TYPE_AREA)) {
 			ComboBox cbArea = addCustomField(CampaignFormDataEditForm.AREA, AreaReferenceDto.class, ComboBox.class);
 			cbArea.setCaption(I18nProperties.getCaption(Captions.CampaignFormData_area));
@@ -117,7 +115,7 @@ protected void addFields() {
 							.stream()
 							.sorted(Comparator.comparing(RegionReferenceDto::getCaption))
 							.collect(Collectors.toList()));
-				} else if(Objects.isNull(area)){
+				} else if (Objects.isNull(area)) {
 					cbRegion.addItems(FacadeProvider.getRegionFacade().getAllActiveAsReference());
 				} else {
 					cbRegion.setValue(null);
@@ -136,12 +134,17 @@ protected void addFields() {
 					cbArea.setValue(FacadeProvider.getRegionFacade().getRegionByUuid(region.getUuid()).getArea());
 				}
 			});
+			if (currentUserRegion != null) {
+				final AreaReferenceDto area = FacadeProvider.getRegionFacade().getRegionByUuid(currentUserRegion.getUuid()).getArea();
+				cbArea.setValue(area);
+				if (currentUserRegion != null) {
+					cbArea.setEnabled(false);
+				}
+			}
 		}
 
-		final UserDto currentUser = UserProvider.getCurrent().getUser();
-
-		if (currentUser.getRegion() != null) {
-			cbRegion.setValue(currentUser.getRegion());
+		if (currentUserRegion != null) {
+			cbRegion.setValue(currentUserRegion);
 			cbRegion.setEnabled(false);
 		}
 		if (currentUser.getDistrict() != null) {

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

@@ -71,8 +71,8 @@ private void createCampaignFilter() {
 
 	@SuppressWarnings("deprecation")
 	private void createJurisdictionFilters() {
-		final AreaReferenceDto userArea = UserProvider.getCurrent().getUser().getArea();
 		final RegionReferenceDto userRegion = UserProvider.getCurrent().getUser().getRegion();
+		final AreaReferenceDto userArea = FacadeProvider.getRegionFacade().getRegionByUuid(userRegion.getUuid()).getArea();
 		final DistrictReferenceDto userDistrict = UserProvider.getCurrent().getUser().getDistrict();
 
 		dashboardDataProvider.setArea(userArea);