Feature 2978 occupations quarantine types for switzerland (SORMAS-Foundation#3033)

vidi42 · web-flow · commit 96b62e2ca9eb · 2020-10-08T16:07:11.000+03:00
* SORMAS-Foundation#2978 Add support for configuring enums visibility * SORMAS-Foundation#2978 Switzerland specific Occupation and Quarantine Type * SORMAS-Foundation#2978 removed unrequested translations * SORMAS-Foundation#2978 removed blank at end of files
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/contact/QuarantineType.java b/sormas-api/src/main/java/de/symeda/sormas/api/contact/QuarantineType.java
@@ -1,9 +1,17 @@
 package de.symeda.sormas.api.contact;
 
+import de.symeda.sormas.api.CountryHelper;
 import de.symeda.sormas.api.i18n.I18nProperties;
+import de.symeda.sormas.api.utils.HideForCountriesExcept;
 
 public enum QuarantineType {
 
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	HOSPITAL,
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	HOTEL,
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	ASYLUM_ACCOMMODATION,
 	INSTITUTIONELL,
 	HOME,
 	NONE,
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/OccupationType.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/OccupationType.java
@@ -17,10 +17,120 @@
  *******************************************************************************/
 package de.symeda.sormas.api.person;
 
+import de.symeda.sormas.api.CountryHelper;
 import de.symeda.sormas.api.i18n.I18nProperties;
+import de.symeda.sormas.api.utils.HideForCountriesExcept;
 
 public enum OccupationType {
 
+	// Switzerland NOGA specific Occupation Types
+	/**
+	 * G. WHOLESALE AND RETAIL TRADE; REPAIR OF MOTOR VEHICLES AND MOTORCYCLES
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	RETAIL_AND_REPAIR_SERVICE,
+	/**
+	 * C.MANUFACTURING
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	MANUFACTURING,
+	/**
+	 * F.CONSTRUCTION
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	CONSTRUCTION,
+	/**
+	 * H.TRANSPORTATION AND STORAGE
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	TRANSPORT_AND_STORAGE,
+	/**
+	 * Q.HUMAN HEALTH AND SOCIAL WORK ACTIVITIES
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	HEALTH_AND_SOCIAL,
+	/**
+	 * P.EDUCATION
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	EDUCATION,
+	/**
+	 * I.ACCOMMODATION AND FOOD SERVICE ACTIVITIES
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	ACCOMMODATION_AND_FOOD_SERVICES,
+	/**
+	 * R.ARTS, ENTERTAINMENT AND RECREATION
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	ARTS_ENTERTAINMENT_AND_RECREATION,
+	/**
+	 * O.PUBLIC ADMINISTRATION AND DEFENCE; COMPULSORY SOCIAL SECURITY
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	PUBLIC_ADMINISTRATION_AND_DEFENCE,
+	/**
+	 * K.FINANCIAL AND INSURANCE ACTIVITIES
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	FINANCE_AND_INSURANCE,
+	/**
+	 * J.INFORMATION AND COMMUNICATION
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	INFORMATION_AND_COMMUNICATION,
+	/**
+	 * M.PROFESSIONAL, SCIENTIFIC AND TECHNICAL ACTIVITIES
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	PROFESSIONAL_SCIENTIFIC_AND_TECHNICAL,
+	/**
+	 * N.ADMINISTRATIVE AND SUPPORT SERVICE ACTIVITIES
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	ADMINISTRATIVE_AND_SUPPORT,
+	/**
+	 * S.OTHER SERVICE ACTIVITIES
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	SERVICE_OTHER,
+	/**
+	 * L.REAL ESTATE ACTIVITIES
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	REAL_ESTATE,
+	/**
+	 * D.ELECTRICITY, GAS, STEAM AND AIR-CONDITIONING SUPPLY
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	ENERGY_SUPPLY,
+	/**
+	 * E.WATER SUPPLY; SEWERAGE, WASTE MANAGEMENT AND REMEDIATION ACTIVITIES
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	WATER_SUPPLY_AND_WASTE,
+	/**
+	 * U.ACTIVITIES OF EXTRATERRITORIAL ORGANISATIONS AND BODIES
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	EXTRATERRITORIAL_ORGANIZATIONS,
+	/**
+	 * A.AGRICULTURE, FORESTRY AND FISHING
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	AGRICULTURE,
+	/**
+	 * B.MINING AND QUARRYING
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	MINING,
+	/**
+	 * T.ACTIVITIES OF HOUSEHOLDS AS EMPLOYERS; UNDIFFERENTIATED GOODS- AND SERVICES-PRODUCING ACTIVITIES OF HOUSEHOLDS FOR OWN USE
+	 */
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_SWITZERLAND)
+	PRIVATE_HOUSEHOLD,
+
+	// Generic Occupation Types
 	FARMER,
 	BUTCHER,
 	HUNTER_MEAT_TRADER,
@@ -40,4 +150,5 @@ public enum OccupationType {
 	public String toString() {
 		return I18nProperties.getEnumCaption(this);
 	}
+
 }
diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties
@@ -585,6 +585,28 @@ OccupationType.TRANSPORTER = Transporter
 OccupationType.WORKING_WITH_ANIMALS = Working with animals
 OccupationType.LABORATORY_STAFF = Laboratory staff
 
+OccupationType.AGRICULTURE = A. Agriculture & forestry, fisheries
+OccupationType.MINING = B. Mining & quarrying
+OccupationType.MANUFACTURING = C. Manufacturing industry /manufacture of goods
+OccupationType.ENERGY_SUPPLY = D. Energy supply
+OccupationType.WATER_SUPPLY_AND_WASTE = E. Water supply; sewerage and waste management
+OccupationType.CONSTRUCTION = F. Construction industry /building
+OccupationType.RETAIL_AND_REPAIR_SERVICE = G. Wholesale and retail trade; repair services
+OccupationType.TRANSPORT_AND_STORAGE = H. Transport and storage
+OccupationType.ACCOMMODATION_AND_FOOD_SERVICES = I. Hotels and restaurants /accommodation & gastronomy
+OccupationType.INFORMATION_AND_COMMUNICATION = J. Information & communication
+OccupationType.FINANCE_AND_INSURANCE = K. Finance & insurance
+OccupationType.REAL_ESTATE = L. Real estate and housing
+OccupationType.PROFESSIONAL_SCIENTIFIC_AND_TECHNICAL = M. Service: freelance, scientific, technical
+OccupationType.ADMINISTRATIVE_AND_SUPPORT = N. Service: other economic activities
+OccupationType.PUBLIC_ADMINISTRATION_AND_DEFENCE = O. Public administration and defence; social services/security
+OccupationType.EDUCATION = P. Education & teaching
+OccupationType.HEALTH_AND_SOCIAL = Q. Health & social services
+OccupationType.ARTS_ENTERTAINMENT_AND_RECREATION = R. Arts, entertainment & recreation
+OccupationType.SERVICE_OTHER = S. Service: other
+OccupationType.PRIVATE_HOUSEHOLD = T. Private households with domestic staff
+OccupationType.EXTRATERRITORIAL_ORGANIZATIONS = U. Exterritorial organisations & bodies
+
 # PathogenTestResultType
 PathogenTestResultType.INDETERMINATE = Indeterminate
 PathogenTestResultType.NEGATIVE = Negative
@@ -658,6 +680,9 @@ QuarantineType.NONE = None
 QuarantineType.UNKNOWN = Unknown
 QuarantineType.OTHER = Other
 
+QuarantineType.HOSPITAL = Hospital
+QuarantineType.HOTEL = Hotel
+QuarantineType.ASYLUM_ACCOMMODATION = Asylum Accommodation
 
 # ReportingType
 ReportingType.NOT_RAISED = Not raised
@@ -1098,4 +1123,4 @@ EndOfIsolationReason.OTHER=Other
 EndOfQuarantineReason.ASYMPTOMATIC=Asymptomatic after 10 days
 EndOfQuarantineReason.ISOLATED_AS_CASE=Isolated as Case
 EndOfQuarantineReason.LOST_TO_FOLLOWUP=Lost to follow-up
-EndOfQuarantineReason.OTHER=Other
+EndOfQuarantineReason.OTHER=Other
diff --git a/sormas-api/src/main/resources/enum_de-CH.properties b/sormas-api/src/main/resources/enum_de-CH.properties
@@ -585,6 +585,28 @@ OccupationType.TRANSPORTER = Mithelfende*r Angehörige*r
 OccupationType.WORKING_WITH_ANIMALS = Arbeiten mit Tieren
 OccupationType.LABORATORY_STAFF = Laborpersonal
 
+OccupationType.AGRICULTURE = A. Land- & Forstwirtschaft, Fischerei
+OccupationType.MINING = B. Bergbau & Gewinnung von Steinen/Erden
+OccupationType.MANUFACTURING = C. Verarbeitendes Gewerbe/Herstellung von Waren
+OccupationType.ENERGY_SUPPLY = D. Energieversorgung
+OccupationType.WATER_SUPPLY_AND_WASTE = E. Wasserversorgung; Abwasser- und Abfallentsorgung	
+OccupationType.CONSTRUCTION = F. Baugewerbe/Bau
+OccupationType.RETAIL_AND_REPAIR_SERVICE = G. Handel; Reparaturgewerbe
+OccupationType.TRANSPORT_AND_STORAGE = H. Verkehr und Lagerei
+OccupationType.ACCOMMODATION_AND_FOOD_SERVICES = I. Gastgewerbe/Beherbergung & Gastronomie
+OccupationType.INFORMATION_AND_COMMUNICATION = J. Information & Kommunikation
+OccupationType.FINANCE_AND_INSURANCE = K. Finanz- & Versicherungswesen
+OccupationType.REAL_ESTATE = L. Grundstücks- und Wohnungswesen
+OccupationType.PROFESSIONAL_SCIENTIFIC_AND_TECHNICAL = M. Dienstleistung: freiberuflich, wissenschaftl., techn.
+OccupationType.ADMINISTRATIVE_AND_SUPPORT = N. Dienstleistung: sonstige wirtschaftliche
+OccupationType.PUBLIC_ADMINISTRATION_AND_DEFENCE = O. Öffentliche Verwaltung, Verteidigung; Sozialversicherung
+OccupationType.EDUCATION = P. Erziehung & Unterricht
+OccupationType.HEALTH_AND_SOCIAL = Q. Gesundheits- & Sozialwesen
+OccupationType.ARTS_ENTERTAINMENT_AND_RECREATION = R. Kunst, Unterhaltung & Erholung
+OccupationType.SERVICE_OTHER = S. Dienstleistung: sonstige
+OccupationType.PRIVATE_HOUSEHOLD = T. Private Haushalte mit Hauspersonal
+OccupationType.EXTRATERRITORIAL_ORGANIZATIONS = U. Exterritoriale Organisationen & Körperschaften
+
 # PathogenTestResultType
 PathogenTestResultType.INDETERMINATE = Unbestimmt
 PathogenTestResultType.NEGATIVE = Negativ
@@ -658,6 +680,9 @@ QuarantineType.NONE = Keine
 QuarantineType.UNKNOWN = Unbekannt
 QuarantineType.OTHER = Anderer
 
+QuarantineType.HOSPITAL = Spital
+QuarantineType.HOTEL = Hotel
+QuarantineType.ASYLUM_ACCOMMODATION = Asylzentrum
 
 # ReportingType
 ReportingType.NOT_RAISED = Nicht erhoben
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/person/edit/PersonEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/person/edit/PersonEditFragment.java
@@ -54,6 +54,7 @@
 import de.symeda.sormas.app.backend.caze.Case;
 import de.symeda.sormas.app.backend.common.AbstractDomainObject;
 import de.symeda.sormas.app.backend.common.DatabaseHelper;
+import de.symeda.sormas.app.backend.config.ConfigProvider;
 import de.symeda.sormas.app.backend.contact.Contact;
 import de.symeda.sormas.app.backend.location.Location;
 import de.symeda.sormas.app.backend.person.Person;
@@ -179,14 +180,15 @@ public static void setUpLayoutBinding(
 				(Integer) contentBinding.personBirthdateMM.getValue());
 		});
 		int year = Calendar.getInstance().get(Calendar.YEAR);
+		FieldVisibilityCheckers countryVisibilityChecker = FieldVisibilityCheckers.withCountry(ConfigProvider.getServerCountryCode());
 		contentBinding.personBirthdateYYYY.setSelectionOnOpen(year - 35);
 		contentBinding.personApproximateAgeType.initializeSpinner(approximateAgeTypeList);
 		contentBinding.personSex.initializeSpinner(sexList);
 		contentBinding.personCauseOfDeath.initializeSpinner(causeOfDeathList);
 		contentBinding.personCauseOfDeathDisease.initializeSpinner(diseaseList);
 		contentBinding.personDeathPlaceType.initializeSpinner(deathPlaceTypeList);
 		contentBinding.personBurialConductor.initializeSpinner(burialConductorList);
-		contentBinding.personOccupationType.initializeSpinner(DataUtils.getEnumItems(OccupationType.class, true));
+		contentBinding.personOccupationType.initializeSpinner(DataUtils.getEnumItems(OccupationType.class, true, countryVisibilityChecker));
 		contentBinding.personEducationType.initializeSpinner(DataUtils.getEnumItems(EducationType.class, true));
 		contentBinding.personPresentCondition.initializeSpinner(DataUtils.getEnumItems(PresentCondition.class, true));
 
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/util/DataUtils.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/util/DataUtils.java
@@ -21,6 +21,7 @@
 import de.symeda.sormas.api.Month;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.utils.DateHelper;
+import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
 import de.symeda.sormas.app.R;
 import de.symeda.sormas.app.backend.common.DatabaseHelper;
 import de.symeda.sormas.app.component.Item;
@@ -32,23 +33,33 @@
 
 public class DataUtils {
 
-	public static <E> List<Item> getEnumItems(Class<E> clazz) {
+	public static <E extends Enum<?>> List<Item> getEnumItems(Class<E> clazz) {
 		return getEnumItems(clazz, true);
 	}
 
-	public static <E> List<Item> getEnumItems(Class<E> clazz, boolean withNull) {
+	public static <E extends Enum<?>> List<Item> getEnumItems(Class<E> clazz, boolean withNull) {
+		return getEnumItems(clazz, withNull, null);
+	}
+
+	public static <E extends Enum<?>> List<Item> getEnumItems(Class<E> clazz, boolean withNull, FieldVisibilityCheckers checkers) {
 		E[] enumConstants = clazz.getEnumConstants();
 		if (!clazz.isEnum()) {
 			throw new IllegalArgumentException(clazz.toString() + " is not an enum");
 		}
-		List<Item> list = new ArrayList<Item>();
+		List<Item> list = new ArrayList<>();
 
 		if (withNull) {
 			list.add(new Item<E>("", null));
 		}
 
-		for (int i = 0; i < enumConstants.length; i++) {
-			list.add(new Item<E>(enumConstants[i].toString(), enumConstants[i]));
+		for (E enumConstant: enumConstants) {
+			boolean visible = true;
+			if (checkers != null) {
+				visible = checkers.isVisible(clazz, enumConstant.name());
+			}
+			if (visible) {
+				list.add(new Item<>(enumConstant.toString(), enumConstant));
+			}
 		}
 		return list;
 	}
diff --git a/sormas-app/app/src/test/java/de/symeda/sormas/app/util/DataUtilsTest.java b/sormas-app/app/src/test/java/de/symeda/sormas/app/util/DataUtilsTest.java
@@ -23,11 +23,6 @@ public void getEnumItems() {
 		assertThat(enumItems.size(), is(YesNoUnknown.values().length));
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void getEnumItemsIllegalArgument() {
-		DataUtils.getEnumItems(Object.class, false);
-	}
-
 	@Test(expected = NullPointerException.class)
 	public void getEnumItemsNullPointer() {
 		DataUtils.getEnumItems(null, false);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/FieldHelper.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/FieldHelper.java
@@ -41,6 +41,10 @@
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.symptoms.SymptomsDto;
 import de.symeda.sormas.api.utils.Diseases;
+import de.symeda.sormas.api.utils.fieldaccess.checkers.PersonalDataFieldAccessChecker;
+import de.symeda.sormas.api.utils.fieldaccess.checkers.SensitiveDataFieldAccessChecker;
+import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
+import de.symeda.sormas.ui.UserProvider;
 
 public final class FieldHelper {
 
@@ -590,4 +594,9 @@ public static Stream<Component> stream(Component parent) {
 	public static Stream<Field> streamFields(Component parent) {
 		return FieldHelper.stream(parent).filter(c -> c instanceof Field).map(c -> (Field) c);
 	}
+
+	public static Collection<Enum<?>> getVisibleEnumItems(Class<Enum<?>> enumClass, FieldVisibilityCheckers checkers) {
+		return Arrays.stream(enumClass.getEnumConstants()).filter(constant -> checkers.isVisible(enumClass, constant.name()))
+			.collect(Collectors.toList());
+	}
 }
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/SormasFieldGroupFieldFactory.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/SormasFieldGroupFieldFactory.java
@@ -1,6 +1,7 @@
 package de.symeda.sormas.ui.utils;
 
 import java.util.Date;
+import java.util.EnumSet;
 import java.util.List;
 
 import com.vaadin.ui.themes.ValoTheme;
@@ -177,4 +178,26 @@ protected void populateWithDiseaseData(ComboBox diseaseField) {
 			newItem.getItemProperty(CAPTION_PROPERTY_ID).setValue(r.toString());
 		}
 	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected void populateWithEnumData(AbstractSelect select, Class<? extends Enum> enumClass) {
+		select.removeAllItems();
+		for (Object p : select.getContainerPropertyIds()) {
+			select.removeContainerProperty(p);
+		}
+		select.addContainerProperty(CAPTION_PROPERTY_ID, String.class, "");
+		select.setItemCaptionPropertyId(CAPTION_PROPERTY_ID);
+		 EnumSet<?> enumSet = EnumSet.allOf(enumClass);
+		for (Object r : enumSet) {
+			boolean visible = true;
+			if (fieldVisibilityCheckers != null) {
+				visible = fieldVisibilityCheckers.isVisible(enumClass, ((Enum<?>) r).name());
+			}
+			if (visible) {
+				Item newItem = select.addItem(r);
+				newItem.getItemProperty(CAPTION_PROPERTY_ID).setValue(r.toString());
+			}
+		}
+	}
 }
