Merge pull request #13905 from SORMAS-Foundation/13887-exposure-form-redesign

13887-exposure-form-redesign

Author: obinna-h-n

sormas-api/src/main/java/de/symeda/sormas/api/disease/DiseaseConfigurationDto.java

@@ -1,9 +1,11 @@
 package de.symeda.sormas.api.disease;
 
 import java.util.List;
+import java.util.Set;
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.EntityDto;
+import de.symeda.sormas.api.exposure.ExposureCategory;
 
 public class DiseaseConfigurationDto extends EntityDto {
 
@@ -28,6 +30,7 @@ public class DiseaseConfigurationDto extends EntityDto {
 	public static final String EXTENDED_CLASSIFICATION_MULTI = "extendedClassificationMulti";
 	public static final String AGE_GROUPS = "ageGroups";
 	public static final String AUTOMATIC_SAMPLE_ASSIGNMENT_THRESHOLD = "automaticSampleAssignmentThreshold";
+	public static final String EXPOSURE_CATEGORIES = "exposureCategories";
 
 	private Disease disease;
 	private Boolean active;
@@ -47,6 +50,8 @@ public class DiseaseConfigurationDto extends EntityDto {
 	private List<String> ageGroups;
 	private Integer automaticSampleAssignmentThreshold;
 
+	private Set<ExposureCategory> exposureCategories;
+
 	public Disease getDisease() {
 		return disease;
 	}
@@ -182,4 +187,12 @@ public Integer getAutomaticSampleAssignmentThreshold() {
 	public void setAutomaticSampleAssignmentThreshold(Integer automaticSampleAssignmentThreshold) {
 		this.automaticSampleAssignmentThreshold = automaticSampleAssignmentThreshold;
 	}
+
+	public Set<ExposureCategory> getExposureCategories() {
+		return exposureCategories;
+	}
+
+	public void setExposureCategories(Set<ExposureCategory> exposureCategories) {
+		this.exposureCategories = exposureCategories;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/disease/DiseaseConfigurationIndexDto.java

@@ -43,6 +43,7 @@ public class DiseaseConfigurationIndexDto extends EntityDto {
 	public static final String EXTENDED_CLASSIFICATION_MULTI = "extendedClassificationMulti";
 	public static final String AGE_GROUPS = "ageGroups";
 	public static final String AUTOMATIC_SAMPLE_ASSIGNMENT_THRESHOLD = "automaticSampleAssignmentThreshold";
+	public static final String EXPOSURE_CATEGORY_NAMES = "exposureCategoryNames";
 
 	private Disease disease;
 	private Boolean active;
@@ -61,6 +62,7 @@ public class DiseaseConfigurationIndexDto extends EntityDto {
 	private Boolean extendedClassificationMulti;
 	private List<String> ageGroups;
 	private Integer automaticSampleAssignmentThreshold;
+	private String exposureCategoryNames;
 
 	public Disease getDisease() {
 		return disease;
@@ -197,4 +199,12 @@ public Integer getAutomaticSampleAssignmentThreshold() {
 	public void setAutomaticSampleAssignmentThreshold(Integer automaticSampleAssignmentThreshold) {
 		this.automaticSampleAssignmentThreshold = automaticSampleAssignmentThreshold;
 	}
+
+	public String getExposureCategoryNames() {
+		return exposureCategoryNames;
+	}
+
+	public void setExposureCategoryNames(String exposureCategoryNames) {
+		this.exposureCategoryNames = exposureCategoryNames;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/exposure/ExposureCategory.java

@@ -15,6 +15,8 @@
 
 package de.symeda.sormas.api.exposure;
 
+import java.util.EnumSet;
+
 import de.symeda.sormas.api.i18n.I18nProperties;
 
 public enum ExposureCategory {
@@ -28,6 +30,14 @@ public enum ExposureCategory {
 	VERTICAL_TRANSMISSION,
 	WATER_BORNE;
 
+	public boolean hasNoSetting() {
+		return EnumSet.of(ANIMAL_CONTACT, FOMITE_TRANSMISSION, FOOD_BORNE).contains(this);
+	}
+
+	public boolean hasNoSubSetting() {
+		return EnumSet.of(ANIMAL_CONTACT, FOMITE_TRANSMISSION).contains(this);
+	}
+
 	@Override
 	public String toString() {
 		return I18nProperties.getEnumCaption(this);

sormas-api/src/main/java/de/symeda/sormas/api/exposure/ExposureDto.java

@@ -129,6 +129,7 @@ public class ExposureDto extends PseudonymizableDto {
 	public static final String CONTACT_FACTOR_DETAILS = "contactFactorDetails";
 	public static final String PROTECTIVE_MEASURE_DETAILS = "protectiveMeasureDetails";
 	public static final String EXPOSURE_COMMENT = "exposureComment";
+	public static final String CONDITION_OF_ANIMAL = "conditionOfAnimal";
 	public static final String ANIMAL_CATEGORY = "animalCategory";
 	public static final String ANIMAL_CATEGORY_DETAILS = "animalCategoryDetails";
 	public static final String FOMITE_TRANSMISSION_LOCATION = "fomiteTransmissionLocation";

sormas-api/src/main/java/de/symeda/sormas/api/exposure/ExposureSubSetting.java

@@ -65,13 +65,15 @@ public ExposureSetting getSetting() {
 		return setting;
 	}
 
-	/**
-	 * Returns sub-settings for a given category and setting combination.
-	 * UNKNOWN and OTHER are included when the combination has specific sub-settings.
-	 * Returns empty list if no specific sub-settings exist for the combination.
-	 */
 	public static List<ExposureSubSetting> getValues(ExposureCategory category, ExposureSetting setting) {
-		if (category == null || setting == null) {
+		if (category == null) {
+			return Collections.emptyList();
+		}
+
+		if (category.hasNoSubSetting()) {
+			return Collections.emptyList();
+		}
+		if (setting == null) {
 			return Collections.emptyList();
 		}
 		boolean hasSpecific = Arrays.stream(values()).anyMatch(s -> s.category == category && s.setting == setting);
@@ -83,6 +85,25 @@ public static List<ExposureSubSetting> getValues(ExposureCategory category, Expo
 			.collect(Collectors.toList());
 	}
 
+	public static List<ExposureSubSetting> getValuesForCategoryOnly(ExposureCategory category) {
+		if (category == null) {
+			return Collections.emptyList();
+		}
+
+		if (category.hasNoSubSetting()) {
+			return Collections.emptyList();
+		}
+
+		// Check if this category has subsettings with null setting
+		boolean hasCategoryOnlySubSettings = Arrays.stream(values()).anyMatch(s -> s.category == category && s.setting == null);
+
+		if (!hasCategoryOnlySubSettings) {
+			return Collections.emptyList();
+		}
+
+		return Arrays.stream(values()).filter(s -> (s.category == category && s.setting == null) || s.category == null).collect(Collectors.toList());
+	}
+
 	@Override
 	public String toString() {
 		return I18nProperties.getEnumCaption(this);

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -1427,6 +1427,8 @@ public interface Captions {
 	String DiseaseConfiguration_caseSurveillanceEnabled = "DiseaseConfiguration.caseSurveillanceEnabled";
 	String DiseaseConfiguration_disease = "DiseaseConfiguration.disease";
 	String DiseaseConfiguration_eventParticipantFollowUpDuration = "DiseaseConfiguration.eventParticipantFollowUpDuration";
+	String DiseaseConfiguration_exposureCategories = "DiseaseConfiguration.exposureCategories";
+	String DiseaseConfiguration_exposureCategoryNames = "DiseaseConfiguration.exposureCategoryNames";
 	String DiseaseConfiguration_extendedClassification = "DiseaseConfiguration.extendedClassification";
 	String DiseaseConfiguration_extendedClassificationMulti = "DiseaseConfiguration.extendedClassificationMulti";
 	String DiseaseConfiguration_followUpDuration = "DiseaseConfiguration.followUpDuration";
@@ -1584,6 +1586,7 @@ public interface Captions {
 	String EpiData_largeOutbreaksArea = "EpiData.largeOutbreaksArea";
 	String EpiData_modeOfTransmission = "EpiData.modeOfTransmission";
 	String EpiData_modeOfTransmissionType = "EpiData.modeOfTransmissionType";
+	String EpiData_otherDetails = "EpiData.otherDetails";
 	String epiDataNoSourceContacts = "epiDataNoSourceContacts";
 	String epipulseActiveExports = "epipulseActiveExports";
 	String epipulseAllExports = "epipulseAllExports";
@@ -1827,6 +1830,8 @@ public interface Captions {
 	String exportSormasData = "exportSormasData";
 	String exportUserRoles = "exportUserRoles";
 	String Exposure = "Exposure";
+	String Exposure_animalCategory = "Exposure.animalCategory";
+	String Exposure_animalCategoryDetails = "Exposure.animalCategoryDetails";
 	String Exposure_animalCondition = "Exposure.animalCondition";
 	String Exposure_animalContactType = "Exposure.animalContactType";
 	String Exposure_animalContactTypeDetails = "Exposure.animalContactTypeDetails";
@@ -1837,6 +1842,8 @@ public interface Captions {
 	String Exposure_bodyOfWater = "Exposure.bodyOfWater";
 	String Exposure_childcareFacilityDetails = "Exposure.childcareFacilityDetails";
 	String Exposure_connectionNumber = "Exposure.connectionNumber";
+	String Exposure_contactFactorDetails = "Exposure.contactFactorDetails";
+	String Exposure_contactFactors = "Exposure.contactFactors";
 	String Exposure_contactToBodyFluids = "Exposure.contactToBodyFluids";
 	String Exposure_contactToCase = "Exposure.contactToCase";
 	String Exposure_deceasedPersonIll = "Exposure.deceasedPersonIll";
@@ -1845,10 +1852,16 @@ public interface Captions {
 	String Exposure_domesticSwimming = "Exposure.domesticSwimming";
 	String Exposure_eatingRawAnimalProducts = "Exposure.eatingRawAnimalProducts";
 	String Exposure_endDate = "Exposure.endDate";
+	String Exposure_exposureCategory = "Exposure.exposureCategory";
+	String Exposure_exposureComment = "Exposure.exposureComment";
 	String Exposure_exposureDate = "Exposure.exposureDate";
 	String Exposure_exposureRole = "Exposure.exposureRole";
+	String Exposure_exposureSetting = "Exposure.exposureSetting";
+	String Exposure_exposureSettingDetails = "Exposure.exposureSettingDetails";
+	String Exposure_exposureSubSettingDetails = "Exposure.exposureSubSettingDetails";
 	String Exposure_exposureType = "Exposure.exposureType";
 	String Exposure_exposureTypeDetails = "Exposure.exposureTypeDetails";
+	String Exposure_fomiteTransmissionLocation = "Exposure.fomiteTransmissionLocation";
 	String Exposure_gatheringDetails = "Exposure.gatheringDetails";
 	String Exposure_gatheringType = "Exposure.gatheringType";
 	String Exposure_habitationDetails = "Exposure.habitationDetails";
@@ -1872,6 +1885,8 @@ public interface Captions {
 	String Exposure_probableInfectionEnvironment = "Exposure.probableInfectionEnvironment";
 	String Exposure_prophylaxis = "Exposure.prophylaxis";
 	String Exposure_prophylaxisDate = "Exposure.prophylaxisDate";
+	String Exposure_protectiveMeasureDetails = "Exposure.protectiveMeasureDetails";
+	String Exposure_protectiveMeasures = "Exposure.protectiveMeasures";
 	String Exposure_protectiveMeasuresDetails = "Exposure.protectiveMeasuresDetails";
 	String Exposure_rawFoodContact = "Exposure.rawFoodContact";
 	String Exposure_rawFoodContactText = "Exposure.rawFoodContactText";
@@ -1880,6 +1895,7 @@ public interface Captions {
 	String Exposure_sexualExposureText = "Exposure.sexualExposureText";
 	String Exposure_shortDistance = "Exposure.shortDistance";
 	String Exposure_startDate = "Exposure.startDate";
+	String Exposure_subSettings = "Exposure.subSettings";
 	String Exposure_swimmingLocation = "Exposure.swimmingLocation";
 	String Exposure_swimmingLocationType = "Exposure.swimmingLocationType";
 	String Exposure_symptomaticIndividualText = "Exposure.symptomaticIndividualText";
@@ -3273,6 +3289,9 @@ public interface Captions {
 	String titleDiseaseConfigurationAgeGroup = "titleDiseaseConfigurationAgeGroup";
 	String titleDiseaseConfigurationCaseDefinition = "titleDiseaseConfigurationCaseDefinition";
 	String titleDiseaseConfigurationGeneral = "titleDiseaseConfigurationGeneral";
+	String titleExposureActivitySection = "titleExposureActivitySection";
+	String titleExposureLocationSection = "titleExposureLocationSection";
+	String titleExposuresSection = "titleExposuresSection";
 	String titleNoComplications = "titleNoComplications";
 	String to = "to";
 	String total = "total";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -650,6 +650,7 @@ public interface Strings {
 	String headingEnvironmentSamplesRestored = "headingEnvironmentSamplesRestored";
 	String headingEpiConclusion = "headingEpiConclusion";
 	String headingEpiCurve = "headingEpiCurve";
+	String headingEpiDataOtherInformation = "headingEpiDataOtherInformation";
 	String headingEpiDataSourceCaseContacts = "headingEpiDataSourceCaseContacts";
 	String headingEpipulseExportCreated = "headingEpipulseExportCreated";
 	String headingErrorReportNotAvailable = "headingErrorReportNotAvailable";
@@ -675,6 +676,7 @@ public interface Strings {
 	String headingExportUserRightsFailed = "headingExportUserRightsFailed";
 	String headingExposureDetails = "headingExposureDetails";
 	String headingExposureInvestigation = "headingExposureInvestigation";
+	String headingExposures = "headingExposures";
 	String headingExtendFollowUp = "headingExtendFollowUp";
 	String headingExtendQuarantine = "headingExtendQuarantine";
 	String headingExternalEmailDetails = "headingExternalEmailDetails";

sormas-api/src/main/resources/captions.properties

@@ -1159,6 +1159,7 @@ EpiData.infectionSource= Suspected vehicle or source of infection
 EpiData.infectionSourceText= Specify source of infection
 EpiData.importedCase= Imported Case
 EpiData.country= Country of contamination
+EpiData.otherDetails= General comment
 #Therapy
 Therapy.directlyObservedTreatment = Directly observed treatment
 Therapy.mdrXdrTuberculosis = MDR/XDR tuberculosis
@@ -1588,6 +1589,25 @@ Exposure.sexualExposureText= Specify sexual exposure
 Exposure.rawFoodContact= Contact with raw pet food
 Exposure.rawFoodContactText= Specify contact with raw pet food
 Exposure.symptomaticIndividualText= Specify contact with symptomatic individual
+
+Exposure.exposureCategory=Exposure category
+Exposure.exposureSetting=Exposure setting
+Exposure.exposureSettingDetails=Other setting details
+Exposure.subSettings=Sub-settings
+Exposure.exposureSubSettingDetails=Other sub-settings details
+Exposure.conditionOfAnimal=Condition of animal
+Exposure.animalCategory=Animal category
+Exposure.animalCategoryDetails=Details of the animal
+Exposure.fomiteTransmissionLocation=Fomite transmission location
+Exposure.contactFactors=Contact factors
+Exposure.contactFactorDetails=Other contact factors details
+Exposure.protectiveMeasures=Protective measures
+Exposure.protectiveMeasureDetails=Other protective measures details
+Exposure.exposureComment=Comment
+titleExposuresSection=Exposure details
+titleExposureActivitySection=Activity details
+titleExposureLocationSection=Location of exposure
+
 # Facility
 facilityActiveFacilities=Active facilities
 facilityArchivedFacilities=Archived facilities
@@ -3674,6 +3694,8 @@ DiseaseConfiguration.automaticSampleAssignmentThreshold=Automatic sample assignm
 DiseaseConfiguration.incubationPeriodEnabled=Incubation period enabled
 DiseaseConfiguration.minIncubationPeriod=Minimum incubation period
 DiseaseConfiguration.maxIncubationPeriod=Maximum incubation period 
+DiseaseConfiguration.exposureCategories=Exposure categories
+DiseaseConfiguration.exposureCategoryNames=Exposure categories
 titleDiseaseConfigurationGeneral=General
 titleDiseaseConfigurationCaseDefinition=Case definition
 titleDiseaseConfigurationAgeGroup=Age groups

sormas-api/src/main/resources/enum.properties

@@ -3052,3 +3052,11 @@ ExposureProtectiveMeasure.WASHED=Washed
 ExposureProtectiveMeasure.MEDICATION=Medication
 ExposureProtectiveMeasure.C_SECTION=C-Section
 ExposureProtectiveMeasure.OTHER=Other
+
+# AnimalCategory
+AnimalCategory.DOMESTIC=Domestic
+AnimalCategory.WILD=Wild
+
+# FomiteTransmissionLocation
+FomiteTransmissionLocation.INSIDE_HOME=Inside home
+FomiteTransmissionLocation.OUTSIDE=Outside

sormas-api/src/main/resources/strings.properties

@@ -832,7 +832,9 @@ headingAdjustQuarantine = Adjust quarantine
 headingExtendFollowUp = Extend follow-up period
 headingExposureInvestigation = Exposure Investigation
 headingEpiDataSourceCaseContacts = Contacts with Source Case
+headingExposures = Exposures
 headingExposureDetails = Exposure Details
+headingEpiDataOtherInformation = Other information
 headingEpiConclusion = Conclusion
 headingClusterType = Cluster Type
 headingAnimalContactDetails = Animal Contact Details