Skip to content

Commit 475a02d

Browse files
KarnaiahPesulaKarnaiahPesula
committed
Dengue review comments
1 parent a982c41 commit 475a02d

11 files changed

Lines changed: 16 additions & 39 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,6 +1021,7 @@ public interface Captions {
10211021
String Contact_contactIdentificationSourceDetails = "Contact.contactIdentificationSourceDetails";
10221022
String Contact_contactOfficer = "Contact.contactOfficer";
10231023
String Contact_contactOfficerUuid = "Contact.contactOfficerUuid";
1024+
String Contact_contactProximities = "Contact.contactProximities";
10241025
String Contact_contactProximity = "Contact.contactProximity";
10251026
String Contact_contactProximityDetails = "Contact.contactProximityDetails";
10261027
String Contact_contactProximityLongForm = "Contact.contactProximityLongForm";
@@ -2942,7 +2943,6 @@ public interface Captions {
29422943
String Symptoms_conjunctivalInjection = "Symptoms.conjunctivalInjection";
29432944
String Symptoms_conjunctivitis = "Symptoms.conjunctivitis";
29442945
String Symptoms_convulsion = "Symptoms.convulsion";
2945-
String Symptoms_convulsions = "Symptoms.convulsions";
29462946
String Symptoms_cough = "Symptoms.cough";
29472947
String Symptoms_coughingBlood = "Symptoms.coughingBlood";
29482948
String Symptoms_coughingBouts = "Symptoms.coughingBouts";

‎sormas-api/src/main/java/de/symeda/sormas/api/i18n/Descriptions.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public interface Descriptions {
3131
String CaseHospitalization_isolated = "CaseHospitalization.isolated";
3232
String CasePreviousHospitalization_admissionDate = "CasePreviousHospitalization.admissionDate";
3333
String Contact_community = "Contact.community";
34+
String Contact_contactProximities = "Contact.contactProximities";
3435
String Contact_contactProximity = "Contact.contactProximity";
3536
String Contact_district = "Contact.district";
3637
String Contact_followUpStatus = "Contact.followUpStatus";

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public interface Strings {
2020
String between = "between";
2121
String bpm = "bpm";
2222
String by = "by";
23+
String caseDefinitionForDisease = "caseDefinitionForDisease";
2324
String checkboxSetTickAnAnswerForAll = "checkboxSetTickAnAnswerForAll";
2425
String classificationAllOf = "classificationAllOf";
2526
String classificationClassificationRules = "classificationClassificationRules";

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

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,6 @@ public class SymptomsDto extends PseudonymizableDto {
352352
public static final String GUILLAIN_BARRE_SYNDROME = "guillainBarreSyndrome";
353353
public static final String LETHARGY = "lethargy";
354354
public static final String CONFUSION = "confusion";
355-
public static final String CONVULSIONS = "convulsions";
356355
public static final String PERSISTENT_VOMITING = "persistentVomiting";
357356
public static final String RESTLESSNESS = "restlessness";
358357
public static final String ACUTE_BLEEDING = "acuteBleeding";
@@ -483,9 +482,12 @@ public static SymptomsDto build() {
483482
POLIO,
484483
YELLOW_FEVER,
485484
ANTHRAX,
485+
DENGUE,
486486
UNSPECIFIED_VHF,
487487
UNDEFINED,
488488
OTHER })
489+
@Complication(value = {
490+
DENGUE })
489491
@HideForCountries
490492
@SymptomGrouping(SymptomGroup.GASTROINTESTINAL)
491493
private SymptomState bloodInStool;
@@ -2197,6 +2199,8 @@ public static SymptomsDto build() {
21972199
@Diseases({
21982200
ANTHRAX,
21992201
DENGUE })
2202+
@Complication({
2203+
DENGUE })
22002204
@HideForCountries
22012205
@SymptomGrouping(SymptomGroup.NERVOUS_SYSTEM)
22022206
private SymptomState convulsion;
@@ -2922,12 +2926,6 @@ public static SymptomsDto build() {
29222926

29232927
private SymptomState confusion;
29242928

2925-
@Diseases({
2926-
DENGUE })
2927-
@Complication({
2928-
DENGUE })
2929-
private SymptomState convulsions;
2930-
29312929
@Diseases({
29322930
DENGUE })
29332931
@SymptomGrouping(SymptomGroup.OTHER)
@@ -5042,14 +5040,6 @@ public void setConfusion(SymptomState confusion) {
50425040
this.confusion = confusion;
50435041
}
50445042

5045-
public SymptomState getConvulsions() {
5046-
return convulsions;
5047-
}
5048-
5049-
public void setConvulsions(SymptomState convulsions) {
5050-
this.convulsions = convulsions;
5051-
}
5052-
50535043
public SymptomState getPersistentVomiting() {
50545044
return persistentVomiting;
50555045
}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2829,7 +2829,7 @@ Symptoms.fever=Fever
28292829
Symptoms.firstSymptom=First symptom
28302830
Symptoms.fluidInLungCavity=Fluid in the lung cavity
28312831
Symptoms.glasgowComaScale=Glasgow coma scale
2832-
Symptoms.gumsBleeding=Bleeding of the gums
2832+
Symptoms.gumsBleeding=Gums bleeding
28332833
Symptoms.headache=Headache
28342834
Symptoms.hearingloss=Acute hearing loss
28352835
Symptoms.heartRate=Heart rate (bpm)
@@ -2935,7 +2935,7 @@ Symptoms.tremor=Tremor
29352935
Symptoms.unexplainedBleeding=Bleeding or bruising
29362936
Symptoms.unilateralCataracts=Unilateral cataracts
29372937
Symptoms.vomiting=Vomiting
2938-
Symptoms.convulsion=Convulsion
2938+
Symptoms.convulsion=Convulsions
29392939
Symptoms.weight=Weight (kg)
29402940
Symptoms.hydrophobia=Hydrophobia
29412941
Symptoms.opisthotonus=Opisthotonus
@@ -3022,7 +3022,6 @@ Symptoms.encephalitis=Encephalitis
30223022
Symptoms.guillainBarreSyndrome=Guillain-barré syndrome
30233023
Symptoms.lethargy=Lethargy
30243024
Symptoms.confusion=Confusion
3025-
Symptoms.convulsions=Convulsions
30263025
Symptoms.persistentVomiting=Persistent vomiting
30273026
Symptoms.restlessness=Restlessness
30283027
Symptoms.acuteBleeding=Acute bleeding
@@ -3042,8 +3041,8 @@ Symptoms.clinicalManifestation= Clinical manifestation of the disease according
30423041
Symptoms.clinicalManifestationText=Specify clinical manifestation
30433042
Symptoms.disseminatedIntraVascularCoagulation=Disseminated intra-vascular coagulation
30443043
Symptoms.scantHemorrhage=Other minor bleeding
3045-
Symptoms.otherNeurolocalSymptom=Other neurological symptom
3046-
Symptoms.otherNeurolocalSymptomText= Specify other neurological symptom
3044+
Symptoms.otherNeurolocalSymptom=Neurological symptom
3045+
Symptoms.otherNeurolocalSymptomText= Specify neurological symptom
30473046
titleComplications=Complications
30483047
titleNoComplications=No complications
30493048

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ classificationPersonAged = Person aged
116116
classificationNotACase = Not a case Classification
117117
classificationProbable = Probable Classification
118118
classificationRulesFor = Classification Rules For
119+
caseDefinitionForDisease = Case definition for disease
119120
classificationSymptomsAllOf = All symptoms
120121
classificationSymptomsAnyOf = Any symptom
121122
classificationSuspect = Possible Classification

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ public class Symptoms extends AbstractDomainObject {
289289
private SymptomState guillainBarreSyndrome;
290290
private SymptomState lethargy;
291291
private SymptomState confusion;
292-
private SymptomState convulsions;
293292
private SymptomState persistentVomiting;
294293
private SymptomState restlessness;
295294
private SymptomState acuteBleeding;
@@ -2279,15 +2278,6 @@ public void setConfusion(SymptomState confusion) {
22792278
this.confusion = confusion;
22802279
}
22812280

2282-
@Enumerated(EnumType.STRING)
2283-
public SymptomState getConvulsions() {
2284-
return convulsions;
2285-
}
2286-
2287-
public void setConvulsions(SymptomState convulsions) {
2288-
this.convulsions = convulsions;
2289-
}
2290-
22912281
@Enumerated(EnumType.STRING)
22922282
public SymptomState getPersistentVomiting() {
22932283
return persistentVomiting;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ public Symptoms fillOrBuildEntity(SymptomsDto source, Symptoms target, boolean c
254254
target.setGuillainBarreSyndrome(source.getGuillainBarreSyndrome());
255255
target.setLethargy(source.getLethargy());
256256
target.setConfusion(source.getConfusion());
257-
target.setConvulsions(source.getConvulsions());
258257
target.setPersistentVomiting(source.getPersistentVomiting());
259258
target.setRestlessness(source.getRestlessness());
260259
target.setAcuteBleeding(source.getAcuteBleeding());
@@ -511,7 +510,6 @@ public static SymptomsDto toSymptomsDto(Symptoms symptoms) {
511510
target.setGuillainBarreSyndrome(source.getGuillainBarreSyndrome());
512511
target.setLethargy(source.getLethargy());
513512
target.setConfusion(source.getConfusion());
514-
target.setConvulsions(source.getConvulsions());
515513
target.setPersistentVomiting(source.getPersistentVomiting());
516514
target.setRestlessness(source.getRestlessness());
517515
target.setAcuteBleeding(source.getAcuteBleeding());

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15308,7 +15308,6 @@ ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS coldskin character varying(255);
1530815308
ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS encephalitis character varying(255);
1530915309
ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS guillainbarresyndrome character varying(255);
1531015310
ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS confusion character varying(255);
15311-
ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS convulsions character varying(255);
1531215311
ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS persistentvomiting character varying(255);
1531315312
ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS restlessness character varying(255);
1531415313
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
1533715336
ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS encephalitis character varying(255);
1533815337
ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS guillainbarresyndrome character varying(255);
1533915338
ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS confusion character varying(255);
15340-
ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS convulsions character varying(255);
1534115339
ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS persistentvomiting character varying(255);
1534215340
ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS restlessness character varying(255);
1534315341
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‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,8 @@ protected void addFields() {
11131113
FieldVisibilityCheckers.withDisease(disease)
11141114
.add(new CountryFieldVisibilityChecker(FacadeProvider.getConfigFacade().getCountryLocale())),
11151115
UiFieldAccessCheckers.getDefault(true, FacadeProvider.getConfigFacade().getCountryLocale()),
1116-
new PersonReferenceDto(person.getUuid()))).setCaption(null);
1116+
new PersonReferenceDto(person.getUuid())))
1117+
.setCaption(null);
11171118

11181119
//diagnosis criteria
11191120
if ((FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) && disease == Disease.TUBERCULOSIS) {
@@ -1562,7 +1563,7 @@ private void getManualCaseDefinition() {
15621563
});
15631564
popupWindow.setWidth(860, Unit.PIXELS);
15641565
popupWindow.setHeight(80, Unit.PERCENTAGE);
1565-
popupWindow.setCaption(I18nProperties.getString(Strings.classificationRulesFor) + " " + disease);
1566+
popupWindow.setCaption(I18nProperties.getString(Strings.caseDefinitionForDisease) + " " + disease);
15661567
}, ValoTheme.BUTTON_PRIMARY, FORCE_CAPTION);
15671568

15681569
getContent().addComponent(caseDefinitionButton, CLASSIFICATION_RULES_LOC);

0 commit comments

Comments
 (0)