Merge pull request #13899 from SORMAS-Foundation/bugfix-dengue-symptoms-review-comments

Dengue review comments

Author: KarnaiahPesula

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

@@ -2943,7 +2943,6 @@ public interface Captions {
 	String Symptoms_conjunctivalInjection = "Symptoms.conjunctivalInjection";
 	String Symptoms_conjunctivitis = "Symptoms.conjunctivitis";
 	String Symptoms_convulsion = "Symptoms.convulsion";
-	String Symptoms_convulsions = "Symptoms.convulsions";
 	String Symptoms_cough = "Symptoms.cough";
 	String Symptoms_coughingBlood = "Symptoms.coughingBlood";
 	String Symptoms_coughingBouts = "Symptoms.coughingBouts";

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

@@ -20,6 +20,7 @@ public interface Strings {
 	String between = "between";
 	String bpm = "bpm";
 	String by = "by";
+	String caseDefinitionForDisease = "caseDefinitionForDisease";
 	String checkboxSetTickAnAnswerForAll = "checkboxSetTickAnAnswerForAll";
 	String classificationAllOf = "classificationAllOf";
 	String classificationClassificationRules = "classificationClassificationRules";

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

@@ -352,7 +352,6 @@ public class SymptomsDto extends PseudonymizableDto {
 	public static final String GUILLAIN_BARRE_SYNDROME = "guillainBarreSyndrome";
 	public static final String LETHARGY = "lethargy";
 	public static final String CONFUSION = "confusion";
-	public static final String CONVULSIONS = "convulsions";
 	public static final String PERSISTENT_VOMITING = "persistentVomiting";
 	public static final String RESTLESSNESS = "restlessness";
 	public static final String ACUTE_BLEEDING = "acuteBleeding";
@@ -483,9 +482,12 @@ public static SymptomsDto build() {
 		POLIO,
 		YELLOW_FEVER,
 		ANTHRAX,
+		DENGUE,
 		UNSPECIFIED_VHF,
 		UNDEFINED,
 		OTHER })
+	@Complication(value = {
+		DENGUE })
 	@HideForCountries
 	@SymptomGrouping(SymptomGroup.GASTROINTESTINAL)
 	private SymptomState bloodInStool;
@@ -2197,6 +2199,8 @@ public static SymptomsDto build() {
 	@Diseases({
 		ANTHRAX,
 		DENGUE })
+	@Complication({
+		DENGUE })
 	@HideForCountries
 	@SymptomGrouping(SymptomGroup.NERVOUS_SYSTEM)
 	private SymptomState convulsion;
@@ -2922,12 +2926,6 @@ public static SymptomsDto build() {
 
 	private SymptomState confusion;
 
-	@Diseases({
-		DENGUE })
-	@Complication({
-		DENGUE })
-	private SymptomState convulsions;
-
 	@Diseases({
 		DENGUE })
 	@SymptomGrouping(SymptomGroup.OTHER)
@@ -5042,14 +5040,6 @@ public void setConfusion(SymptomState confusion) {
 		this.confusion = confusion;
 	}
 
-	public SymptomState getConvulsions() {
-		return convulsions;
-	}
-
-	public void setConvulsions(SymptomState convulsions) {
-		this.convulsions = convulsions;
-	}
-
 	public SymptomState getPersistentVomiting() {
 		return persistentVomiting;
 	}

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

@@ -2829,7 +2829,7 @@ Symptoms.fever=Fever
 Symptoms.firstSymptom=First symptom
 Symptoms.fluidInLungCavity=Fluid in the lung cavity
 Symptoms.glasgowComaScale=Glasgow coma scale
-Symptoms.gumsBleeding=Bleeding of the gums
+Symptoms.gumsBleeding=Gums bleeding
 Symptoms.headache=Headache
 Symptoms.hearingloss=Acute hearing loss
 Symptoms.heartRate=Heart rate (bpm)
@@ -2935,7 +2935,7 @@ Symptoms.tremor=Tremor
 Symptoms.unexplainedBleeding=Bleeding or bruising
 Symptoms.unilateralCataracts=Unilateral cataracts
 Symptoms.vomiting=Vomiting
-Symptoms.convulsion=Convulsion
+Symptoms.convulsion=Convulsions
 Symptoms.weight=Weight (kg)
 Symptoms.hydrophobia=Hydrophobia
 Symptoms.opisthotonus=Opisthotonus
@@ -3022,7 +3022,6 @@ Symptoms.encephalitis=Encephalitis
 Symptoms.guillainBarreSyndrome=Guillain-barré syndrome
 Symptoms.lethargy=Lethargy
 Symptoms.confusion=Confusion
-Symptoms.convulsions=Convulsions
 Symptoms.persistentVomiting=Persistent vomiting
 Symptoms.restlessness=Restlessness
 Symptoms.acuteBleeding=Acute bleeding
@@ -3042,8 +3041,8 @@ Symptoms.clinicalManifestation= Clinical manifestation of the disease according
 Symptoms.clinicalManifestationText=Specify clinical manifestation
 Symptoms.disseminatedIntraVascularCoagulation=Disseminated intra-vascular coagulation
 Symptoms.scantHemorrhage=Other minor bleeding
-Symptoms.otherNeurolocalSymptom=Other neurological symptom
-Symptoms.otherNeurolocalSymptomText= Specify other neurological symptom
+Symptoms.otherNeurolocalSymptom=Neurological symptom
+Symptoms.otherNeurolocalSymptomText= Specify neurological symptom
 titleComplications=Complications
 titleNoComplications=No complications
 

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

@@ -116,6 +116,7 @@ classificationPersonAged = Person aged
 classificationNotACase = Not a case Classification
 classificationProbable = Probable Classification
 classificationRulesFor = Classification Rules For
+caseDefinitionForDisease = Case definition for disease
 classificationSymptomsAllOf = All symptoms
 classificationSymptomsAnyOf = Any symptom
 classificationSuspect = Possible Classification

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

@@ -289,7 +289,6 @@ public class Symptoms extends AbstractDomainObject {
 	private SymptomState guillainBarreSyndrome;
 	private SymptomState lethargy;
 	private SymptomState confusion;
-	private SymptomState convulsions;
 	private SymptomState persistentVomiting;
 	private SymptomState restlessness;
 	private SymptomState acuteBleeding;
@@ -2279,15 +2278,6 @@ public void setConfusion(SymptomState confusion) {
 		this.confusion = confusion;
 	}
 
-	@Enumerated(EnumType.STRING)
-	public SymptomState getConvulsions() {
-		return convulsions;
-	}
-
-	public void setConvulsions(SymptomState convulsions) {
-		this.convulsions = convulsions;
-	}
-
 	@Enumerated(EnumType.STRING)
 	public SymptomState getPersistentVomiting() {
 		return persistentVomiting;

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

@@ -254,7 +254,6 @@ public Symptoms fillOrBuildEntity(SymptomsDto source, Symptoms target, boolean c
 		target.setGuillainBarreSyndrome(source.getGuillainBarreSyndrome());
 		target.setLethargy(source.getLethargy());
 		target.setConfusion(source.getConfusion());
-		target.setConvulsions(source.getConvulsions());
 		target.setPersistentVomiting(source.getPersistentVomiting());
 		target.setRestlessness(source.getRestlessness());
 		target.setAcuteBleeding(source.getAcuteBleeding());
@@ -511,7 +510,6 @@ public static SymptomsDto toSymptomsDto(Symptoms symptoms) {
 		target.setGuillainBarreSyndrome(source.getGuillainBarreSyndrome());
 		target.setLethargy(source.getLethargy());
 		target.setConfusion(source.getConfusion());
-		target.setConvulsions(source.getConvulsions());
 		target.setPersistentVomiting(source.getPersistentVomiting());
 		target.setRestlessness(source.getRestlessness());
 		target.setAcuteBleeding(source.getAcuteBleeding());

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

@@ -15308,7 +15308,6 @@ ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS coldskin character varying(255);
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS encephalitis character varying(255);
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS guillainbarresyndrome character varying(255);
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS confusion character varying(255);
-ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS convulsions character varying(255);
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS persistentvomiting character varying(255);
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS restlessness character varying(255);
 ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS acutebleeding character varying(255);
@@ -15337,7 +15336,6 @@ ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS coldskin character varying
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS encephalitis character varying(255);
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS guillainbarresyndrome character varying(255);
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS confusion character varying(255);
-ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS convulsions character varying(255);
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS persistentvomiting character varying(255);
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS restlessness character varying(255);
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS acutebleeding character varying(255);

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

@@ -1113,7 +1113,8 @@ protected void addFields() {
 				FieldVisibilityCheckers.withDisease(disease)
 					.add(new CountryFieldVisibilityChecker(FacadeProvider.getConfigFacade().getCountryLocale())),
 				UiFieldAccessCheckers.getDefault(true, FacadeProvider.getConfigFacade().getCountryLocale()),
-				new PersonReferenceDto(person.getUuid()))).setCaption(null);
+				new PersonReferenceDto(person.getUuid())))
+			.setCaption(null);
 
 		//diagnosis criteria
 		if ((FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) && disease == Disease.TUBERCULOSIS) {
@@ -1562,7 +1563,7 @@ private void getManualCaseDefinition() {
 			});
 			popupWindow.setWidth(860, Unit.PIXELS);
 			popupWindow.setHeight(80, Unit.PERCENTAGE);
-			popupWindow.setCaption(I18nProperties.getString(Strings.classificationRulesFor) + " " + disease);
+			popupWindow.setCaption(I18nProperties.getString(Strings.caseDefinitionForDisease) + " " + disease);
 		}, ValoTheme.BUTTON_PRIMARY, FORCE_CAPTION);
 
 		getContent().addComponent(caseDefinitionButton, CLASSIFICATION_RULES_LOC);

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

@@ -530,7 +530,6 @@ public String getFormattedHtmlMessage() {
 			GUILLAIN_BARRE_SYNDROME,
 			LETHARGY,
 			CONFUSION,
-			CONVULSIONS,
 			PERSISTENT_VOMITING,
 			RESTLESSNESS,
 			ACUTE_BLEEDING,
@@ -865,7 +864,6 @@ public String getFormattedHtmlMessage() {
 			GUILLAIN_BARRE_SYNDROME,
 			LETHARGY,
 			CONFUSION,
-			CONVULSIONS,
 			PERSISTENT_VOMITING,
 			RESTLESSNESS,
 			SEVERE_ORGAN_IMPAIRMENT,