SORMAS-Foundation#2137 - Only display cases and contacts from the user's jurisdiction by default

Author: sergiupacurariu

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseFilterForm.java

@@ -274,14 +274,16 @@ public void addMoreFilters(CustomLayout moreFiltersContainer) {
 				I18nProperties.getDescription(Descriptions.descCaseFilterRelatedToEvent),
 				CssStyles.CHECKBOX_FILTER_INLINE));
 
-		addField(
-			moreFiltersContainer,
-			CheckBox.class,
-			FieldConfiguration.withCaptionAndStyle(
-				CaseCriteria.INCLUDE_CASES_FROM_OTHER_JURISDICTIONS,
-				I18nProperties.getCaption(Captions.caseFilterInludeCasesFromOtherJurisdictions),
-				I18nProperties.getDescription(Descriptions.descCaseFilterIncludeCasesFromOtherJurisdictions),
-				CssStyles.CHECKBOX_FILTER_INLINE));
+		if (!UserProvider.getCurrent().hasUserRole(UserRole.NATIONAL_USER)) {
+			addField(
+				moreFiltersContainer,
+				CheckBox.class,
+				FieldConfiguration.withCaptionAndStyle(
+					CaseCriteria.INCLUDE_CASES_FROM_OTHER_JURISDICTIONS,
+					I18nProperties.getCaption(Captions.caseFilterInludeCasesFromOtherJurisdictions),
+					I18nProperties.getDescription(Descriptions.descCaseFilterIncludeCasesFromOtherJurisdictions),
+					CssStyles.CHECKBOX_FILTER_INLINE));
+		}
 
 		moreFiltersContainer.addComponent(buildWeekAndDateFilter(), WEEK_AND_DATE_FILTER);
 	}

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactsFilterForm.java

@@ -293,14 +293,16 @@ public void addMoreFilters(CustomLayout moreFiltersContainer) {
 				null,
 				CHECKBOX_STYLE));
 
-		addField(
-			moreFiltersContainer,
-			CheckBox.class,
-			FieldConfiguration.withCaptionAndStyle(
-				ContactCriteria.INCLUDE_CONTACTS_FROM_OTHER_JURISDICTIONS,
-				I18nProperties.getCaption(Captions.contactInludeContactsFromOtherJurisdictions),
-				I18nProperties.getDescription(Descriptions.descContactIncludeContactsFromOtherJurisdictions),
-				CHECKBOX_STYLE));
+		if (!UserProvider.getCurrent().hasUserRole(UserRole.NATIONAL_USER)) {
+			addField(
+				moreFiltersContainer,
+				CheckBox.class,
+				FieldConfiguration.withCaptionAndStyle(
+					ContactCriteria.INCLUDE_CONTACTS_FROM_OTHER_JURISDICTIONS,
+					I18nProperties.getCaption(Captions.contactInludeContactsFromOtherJurisdictions),
+					I18nProperties.getDescription(Descriptions.descContactIncludeContactsFromOtherJurisdictions),
+					CHECKBOX_STYLE));
+		}
 
 		moreFiltersContainer.addComponent(buildWeekAndDateFilter(), WEEK_AND_DATE_FILTER);
 	}