Features: #13810 & #13796

Summary:
Incorporated Malaria and Dengue disease changes to SORMAS.
Changes:
Included Malaria and Dengue specific Case form changes.
Included Symptoms and Case person form changes.

Author: KarnaiahPesula

sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java

@@ -369,7 +369,6 @@ public class SymptomsDto extends PseudonymizableDto {
 	public static final String OFFSET_DATE = "offsetDate";
 	public static final String CLINICAL_MANIFESTATION = "clinicalManifestation";
 	public static final String CLINICAL_MANIFESTATION_TEXT = "clinicalManifestationText";
-	public static final String CLINICALLY_EVIDENT = "clinicallyEvident";
 	public static final String CEREBRAL_MALARIA = "cerebralMalaria";
 	public static final String SCANT_HEMORRHAGE = "scantHemorrhage";
 	public static final String OTHER_NEUROLOCAL_SYMPTOM = "otherNeurolocalSymptom";
@@ -3035,14 +3034,6 @@ public static SymptomsDto build() {
 		MALARIA })
 	private SymptomState cerebralMalaria;
 
-	@Diseases({
-		MALARIA,
-		DENGUE })
-	@Outbreaks
-	@HideForCountriesExcept(countries = {
-		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
-	private YesNoUnknown clinicallyEvident;
-
 	@Diseases({
 		DENGUE })
 	@Outbreaks
@@ -3099,10 +3090,6 @@ public ClinicalManifestation getClinicalManifestation() {
 		return clinicalManifestation;
 	}
 
-	public YesNoUnknown getClinicallyEvident() {
-		return clinicallyEvident;
-	}
-
 	public String getClinicalManifestationText() {
 		return clinicalManifestationText;
 	}
@@ -4183,10 +4170,6 @@ public void setClinicalManifestation(ClinicalManifestation clinicalManifestation
 		this.clinicalManifestation = clinicalManifestation;
 	}
 
-	public void setClinicallyEvident(YesNoUnknown clinicallyEvident) {
-		this.clinicallyEvident = clinicallyEvident;
-	}
-
 	public void setClinicalManifestationText(String clinicalManifestationText) {
 		this.clinicalManifestationText = clinicalManifestationText;
 	}

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

@@ -3026,7 +3026,7 @@ Symptoms.severeAnemia=Severe anemia
 Symptoms.metabolicAcidosis=Metabolic acidosis
 Symptoms.acuteKidneyFailure=Acute kidney failure
 Symptoms.cerebralMalaria=Cerebral malaria
-Symptoms.offsetDate=Date of symptom offset
+Symptoms.offsetDate=End of symptoms date
 Symptoms.clinicallyEvident= The criteria for a clinical picture of the disease are met
 Symptoms.clinicalManifestation= Clinical manifestation of the disease according to EU case definition
 Symptoms.clinicalManifestationText=Specify clinical manifestation

sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/Symptoms.java

@@ -303,7 +303,6 @@ public class Symptoms extends AbstractDomainObject {
 	private SymptomState metabolicAcidosis;
 	private SymptomState acuteKidneyFailure;
 	private Date offsetDate;
-	private YesNoUnknown clinicallyEvident;
 	private ClinicalManifestation clinicalManifestation;
 	private String clinicalManifestationText;
 	private SymptomState cerebralMalaria;
@@ -2396,15 +2395,6 @@ public void setAcuteKidneyFailure(SymptomState acuteKidneyFailure) {
 		this.acuteKidneyFailure = acuteKidneyFailure;
 	}
 
-	@Enumerated(EnumType.STRING)
-	public YesNoUnknown getClinicallyEvident() {
-		return clinicallyEvident;
-	}
-
-	public void setClinicallyEvident(YesNoUnknown clinicallyEvident) {
-		this.clinicallyEvident = clinicallyEvident;
-	}
-
 	@Enumerated(EnumType.STRING)
 	public ClinicalManifestation getClinicalManifestation() {
 		return clinicalManifestation;

sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/SymptomsFacadeEjb.java

@@ -269,7 +269,6 @@ public Symptoms fillOrBuildEntity(SymptomsDto source, Symptoms target, boolean c
 		target.setAcuteKidneyFailure(source.getAcuteKidneyFailure());
 		target.setClinicalManifestation(source.getClinicalManifestation());
 		target.setClinicalManifestationText(source.getClinicalManifestationText());
-		target.setClinicallyEvident(source.getClinicallyEvident());
 		target.setCerebralMalaria(source.getCerebralMalaria());
 		target.setScantHemorrhage(source.getScantHemorrhage());
 		target.setOtherNeurolocalSymptom(source.getOtherNeurolocalSymptom());
@@ -526,7 +525,6 @@ public static SymptomsDto toSymptomsDto(Symptoms symptoms) {
 		target.setAcuteKidneyFailure(source.getAcuteKidneyFailure());
 		target.setClinicalManifestation(source.getClinicalManifestation());
 		target.setClinicalManifestationText(source.getClinicalManifestationText());
-		target.setClinicallyEvident(source.getClinicallyEvident());
 		target.setCerebralMalaria(source.getCerebralMalaria());
 		target.setScantHemorrhage(source.getScantHemorrhage());
 		target.setOtherNeurolocalSymptom(source.getOtherNeurolocalSymptom());

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -15311,7 +15311,6 @@ ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS severeanemia character varying(255
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS metabolicacidosis character varying(255);
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS acutekidneyfailure character varying(255);
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS offsetdate timestamp;
-ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS clinicallyevident character varying(255);
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS clinicalmanifestation character varying(255);
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS clinicalmanifestationtext character varying(255);
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS lethargy character varying(255);
@@ -15340,7 +15339,6 @@ ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS severeanemia character var
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS metabolicacidosis character varying(255);
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS acutekidneyfailure character varying(255);
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS offsetdate timestamp;
-ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS clinicallyevident character varying(255);
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS clinicalmanifestation character varying(255);
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS clinicalmanifestationtext character varying(255);
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS lethargy character varying(255);

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

@@ -91,7 +91,7 @@ public void refreshLayout() {
 		layout.setSpacing(false);
 		componentMap.keySet().forEach(symptom -> {
 			Component comp = componentMap.get(symptom);
-			comp.addStyleNames(CssStyles.LABEL_CRITICAL, CssStyles.LABEL_BOLD);
+			comp.addStyleNames(CssStyles.LABEL_PRIMARY, CssStyles.LABEL_BOLD);
 			layout.addComponent(comp);
 		});
 		if (componentMap.isEmpty()) {

sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java

@@ -416,8 +416,9 @@ protected void addFields() {
 		ComboBox occupationTypeField = addCustomizableEnumField(PersonDto.OCCUPATION_TYPE);
 		TextField occupationTypeDetailsField = addField(PersonDto.OCCUPATION_DETAILS, TextField.class);
 		occupationTypeDetailsField.setVisible(false);
-		FieldHelper
-			.updateItems(occupationTypeField, FacadeProvider.getCustomizableEnumFacade().getEnumValues(CustomizableEnumType.OCCUPATION_TYPE, null));
+		FieldHelper.updateItems(
+			occupationTypeField,
+			FacadeProvider.getCustomizableEnumFacade().getEnumValues(CustomizableEnumType.OCCUPATION_TYPE, disease));
 		occupationTypeField.addValueChangeListener(e -> {
 			OccupationType occupationType = (OccupationType) e.getProperty().getValue();
 			occupationTypeDetailsField.setVisible(occupationType != null && occupationType.matchPropertyValue(OccupationType.HAS_DETAILS, true));

sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java

@@ -134,8 +134,8 @@ public class SymptomsForm extends AbstractEditForm<SymptomsDto> {
 	private static final String TUBERCULOSIS_ONSET_DATE_LOC = "tuberculosisOnsetDateLoc";
 	private static final String TUBERCULOSIS_CLINICAL_PRESENTATION_DETAILS_LOC = "tuberculosisClinicalPresentationDetailsLoc";
 
-	private static final List<String> YES_NO_UNKNOWN_SYMPTOM_FIELD_IDS = Collections.unmodifiableList(
-		Arrays.asList(PARENT_TIME_OFF_WORK, JAUNDICE_WITHIN_24_HOURS_OF_BIRTH, DATE_OF_ONSET_KNOWN, CLINICALLY_EVIDENT, OTHER_NEUROLOCAL_SYMPTOM));
+	private static final List<String> YES_NO_UNKNOWN_SYMPTOM_FIELD_IDS = Collections
+		.unmodifiableList(Arrays.asList(PARENT_TIME_OFF_WORK, JAUNDICE_WITHIN_24_HOURS_OF_BIRTH, DATE_OF_ONSET_KNOWN, OTHER_NEUROLOCAL_SYMPTOM));
 	private static final List<String> COMBO_BOX_FIELDS = Collections.unmodifiableList(Arrays.asList(CLINICAL_MANIFESTATION));
 
 	private static Map<String, List<String>> symptomGroupMap = new HashMap<>();
@@ -182,7 +182,7 @@ public class SymptomsForm extends AbstractEditForm<SymptomsDto> {
 					fluidRowLocsCss(VSPACE_3, SYMPTOM_CURRENT_STATUS, DURATION_OF_SYMPTOMS) +
 					locsCss(VSPACE_3, PATIENT_ILL_LOCATION, SYMPTOMS_COMMENTS) +
 					fluidRowLocsCss(VSPACE_3, ONSET_SYMPTOM, ONSET_DATE) +
-					fluidRowLocsCss(VSPACE_3, OFFSET_DATE, CLINICALLY_EVIDENT) +
+					fluidRowLocsCss(VSPACE_3, OFFSET_DATE,"") +
 					fluidRowLocsCss(VSPACE_3, CLINICAL_MANIFESTATION,CLINICAL_MANIFESTATION_TEXT) ;
 	//@formatter:on
 
@@ -544,7 +544,6 @@ public String getFormattedHtmlMessage() {
 			DISSEMINATED_INTRA_VASCULAR_COAGULATION,
 			OFFSET_DATE,
 			CLINICAL_MANIFESTATION_TEXT,
-			CLINICALLY_EVIDENT,
 			CEREBRAL_MALARIA,
 			SCANT_HEMORRHAGE,
 			OTHER_NEUROLOCAL_SYMPTOM,
@@ -876,7 +875,6 @@ public String getFormattedHtmlMessage() {
 			ACUTE_KIDNEY_FAILURE,
 			METABOLIC_ACIDOSIS,
 			DISSEMINATED_INTRA_VASCULAR_COAGULATION,
-			CLINICALLY_EVIDENT,
 			CEREBRAL_MALARIA,
 			SCANT_HEMORRHAGE);