Skip to content

Commit 5b4d498

Browse files
KarnaiahPesulaKarnaiahPesula
committed
Minar code reviews
1 parent 84ebedd commit 5b4d498

6 files changed

Lines changed: 14 additions & 23 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,6 +1043,7 @@ public interface Captions {
10431043
String Contact_followUpStatusChangeUser = "Contact.followUpStatusChangeUser";
10441044
String Contact_followUpUntil = "Contact.followUpUntil";
10451045
String Contact_highPriority = "Contact.highPriority";
1046+
String Contact_immuneGlobulinProposed = "Contact.immuneGlobulinProposed";
10461047
String Contact_immunosuppressiveTherapyBasicDisease = "Contact.immunosuppressiveTherapyBasicDisease";
10471048
String Contact_immunosuppressiveTherapyBasicDiseaseDetails = "Contact.immunosuppressiveTherapyBasicDiseaseDetails";
10481049
String Contact_internalToken = "Contact.internalToken";
@@ -1098,6 +1099,9 @@ public interface Captions {
10981099
String Contact_tracingApp = "Contact.tracingApp";
10991100
String Contact_tracingAppDetails = "Contact.tracingAppDetails";
11001101
String Contact_uuid = "Contact.uuid";
1102+
String Contact_vaccinationDoseOneDate = "Contact.vaccinationDoseOneDate";
1103+
String Contact_vaccinationDoseTwoDate = "Contact.vaccinationDoseTwoDate";
1104+
String Contact_vaccinationProposed = "Contact.vaccinationProposed";
11011105
String Contact_vaccinationStatus = "Contact.vaccinationStatus";
11021106
String Contact_visits = "Contact.visits";
11031107
String contactActiveContacts = "contactActiveContacts";
@@ -1991,7 +1995,6 @@ public interface Captions {
19911995
String HealthConditions_tuberculosis = "HealthConditions.tuberculosis";
19921996
String HealthConditions_tuberculosisInfectionYear = "HealthConditions.tuberculosisInfectionYear";
19931997
String humanSampleViewType = "humanSampleViewType";
1994-
String immuneGlobulinProposed = "immuneGlobulinProposed";
19951998
String Immunization = "Immunization";
19961999
String Immunization_additionalDetails = "Immunization.additionalDetails";
19972000
String Immunization_ageAndBirthDate = "Immunization.ageAndBirthDate";
@@ -3297,12 +3300,9 @@ public interface Captions {
32973300
String Vaccination_vaccineName = "Vaccination.vaccineName";
32983301
String Vaccination_vaccineType = "Vaccination.vaccineType";
32993302
String Vaccination_vaccineUniiCode = "Vaccination.vaccineUniiCode";
3300-
String vaccinationDoseOneDate = "vaccinationDoseOneDate";
3301-
String vaccinationDoseTwoDate = "vaccinationDoseTwoDate";
33023303
String vaccinationNewVaccination = "vaccinationNewVaccination";
33033304
String vaccinationNoVaccinationsForPerson = "vaccinationNoVaccinationsForPerson";
33043305
String vaccinationNoVaccinationsForPersonAndDisease = "vaccinationNoVaccinationsForPersonAndDisease";
3305-
String vaccinationProposed = "vaccinationProposed";
33063306
String versionIsMissing = "versionIsMissing";
33073307
String view = "view";
33083308
String View_actions = "View.actions";

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1892,7 +1892,7 @@ PathogenTest.seroTypingMethodText=Specify Sero Typing Method
18921892
PathogenTest.seroGroupSpecification=Serogroup Specification
18931893
PathogenTest.seroGroupSpecificationText=Specify Serogroup Specification Method
18941894
PathogenTest.genoTypeResult=Genotype result
1895-
PathogenTest.genoTypeResultText= Specify Genotype result text
1895+
PathogenTest.genoTypeResultText=Specify Genotype result text
18961896
# Person
18971897
personPersonsList=Person list
18981898
personCreateNew=Create a new person
@@ -3409,10 +3409,10 @@ userrole.main=User role
34093409
userrole.notifications=Notifications
34103410
userrole.applyUserRoleTemplate=Apply user role template
34113411

3412-
vaccinationProposed = Vaccination proposed
3413-
immuneGlobulinProposed = Immune globulin proposed
3414-
vaccinationDoseOneDate = Vaccination dose one date
3415-
vaccinationDoseTwoDate = Vaccination dose two date
3412+
Contact.vaccinationProposed = Vaccination proposed
3413+
Contact.immuneGlobulinProposed = Immune globulin proposed
3414+
Contact.vaccinationDoseOneDate = Vaccination dose one date
3415+
Contact.vaccinationDoseTwoDate = Vaccination dose two date
34163416

34173417
notificationType=Notification type
34183418
notificationType.group = Group

‎sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataForm.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,6 @@ protected void addFields() {
463463
ComboBox vaccinationStatusCB = addField(ContactDto.VACCINATION_STATUS);
464464
DateField vaccinationDose1DateDF = addField(ContactDto.VACCINATION_DOSE_ONE_DATE);
465465
DateField vaccinationDose2DateDF = addField(ContactDto.VACCINATION_DOSE_TWO_DATE);
466-
FieldHelper.setVisibleWhen(vaccinationStatusCB, Arrays.asList(vaccinationDose1DateDF, vaccinationDose2DateDF), Arrays.asList(VaccinationStatus.VACCINATED_TWO_DOSE, VaccinationStatus.VACCINATED_ONE_DOSE), true);
467466
FieldHelper.setVisibleWhen(vaccinationStatusCB, Arrays.asList(vaccinationDose1DateDF), Arrays.asList(VaccinationStatus.VACCINATED_ONE_DOSE), true);
468467
FieldHelper.setVisibleWhen(vaccinationStatusCB, Arrays.asList(vaccinationDose2DateDF), Arrays.asList(VaccinationStatus.VACCINATED_TWO_DOSE), true);
469468
addField(ContactDto.VACCINATION_PROPOSED, CheckBox.class);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
import java.util.concurrent.atomic.AtomicBoolean;
3939
import java.util.stream.Collectors;
4040

41-
import com.vaadin.v7.ui.CheckBox;
42-
import de.symeda.sormas.ui.utils.LayoutUtil;
4341
import org.apache.commons.lang3.StringUtils;
4442

4543
import com.vaadin.shared.ui.ErrorLevel;

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
package de.symeda.sormas.ui.symptoms;
1717

18-
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.COMPLIANCE_WITH_TREATMENT;
1918
import static de.symeda.sormas.api.symptoms.SymptomsDto.*;
2019
import static de.symeda.sormas.ui.utils.CssStyles.H3;
2120
import static de.symeda.sormas.ui.utils.CssStyles.H4;
@@ -28,16 +27,13 @@
2827
import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRowLocsCss;
2928
import static de.symeda.sormas.ui.utils.LayoutUtil.loc;
3029
import static de.symeda.sormas.ui.utils.LayoutUtil.locCss;
31-
import static de.symeda.sormas.ui.utils.LayoutUtil.locs;
3230
import static de.symeda.sormas.ui.utils.LayoutUtil.locsCss;
3331

3432
import java.util.ArrayList;
3533
import java.util.Arrays;
36-
import java.util.Collection;
3734
import java.util.Comparator;
3835
import java.util.Date;
3936
import java.util.HashMap;
40-
import java.util.HashSet;
4137
import java.util.List;
4238
import java.util.Map;
4339
import java.util.Optional;
@@ -159,7 +155,6 @@ public class SymptomsForm extends AbstractEditForm<SymptomsDto> {
159155
createSymptomGroupLayout(SymptomGroup.NERVOUS_SYSTEM, NERVOUS_SYSTEM_SIGNS_AND_SYMPTOMS_HEADING_LOC) +
160156
createSymptomGroupLayout(SymptomGroup.SKIN, SKIN_SIGNS_AND_SYMPTOMS_HEADING_LOC) +
161157
createSymptomGroupLayout(SymptomGroup.OTHER, OTHER_SIGNS_AND_SYMPTOMS_HEADING_LOC) +
162-
// fluidRow(fluidColumn(3, 0, locs(SKIN_RASH_ONSET_DATE)))+
163158
fluidRow(fluidColumn(6, 0, loc("LAYOUT_SKIN_RASH_ONSET_DATE"))) +
164159
locsCss(VSPACE_3, PATIENT_ILL_LOCATION, SYMPTOMS_COMMENTS) +
165160
fluidRowLocsCss(VSPACE_3, ONSET_SYMPTOM, ONSET_DATE) +
@@ -546,9 +541,8 @@ public String getFormattedHtmlMessage() {
546541
NullableOptionGroup asymptomaticNOG = addField(ASYMPTOMATIC);
547542

548543
asymptomaticNOG.addValueChangeListener(e -> {
549-
Set<SymptomState> set = new HashSet((Collection) e.getProperty().getValue());
550544
if (isConfiguredServer(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) {
551-
if (set.contains(SymptomState.YES)) {
545+
if (SymptomState.YES.equals(asymptomaticNOG.getNullableValue())) {
552546
editableAllowedFields().stream().filter(field -> !field.getId().equals(ASYMPTOMATIC)).forEach(field -> {
553547
field.clear();
554548
field.setEnabled(false);
@@ -581,7 +575,7 @@ public String getFormattedHtmlMessage() {
581575
skinRashDateLabel.setVisible(false);
582576
skinRashDateLayout.addComponent(skinRashDateLabel, "LBL_SKIN_RASH_ONSET_DATE");
583577

584-
skinRashDateLabel.setVisible(isConfiguredServer(CountryHelper.COUNTRY_CODE_LUXEMBOURG) && getField(SKIN_RASH).getValue() == YesNoUnknown.YES);
578+
skinRashDateLabel.setVisible(isConfiguredServer(CountryHelper.COUNTRY_CODE_LUXEMBOURG) && FieldHelper.getNullableSourceFieldValue(getField(SKIN_RASH)) == YesNoUnknown.YES);
585579
DateField skinRashOnsetDate = addField(skinRashDateLayout, SKIN_RASH_ONSET_DATE, DateField.class);
586580
skinRashOnsetDate.setId(SKIN_RASH_ONSET_DATE);
587581
skinRashOnsetDate.addStyleNames(ValoTheme.DATEFIELD_BORDERLESS, CssStyles.VIEW_SECTION_WIDTH_AUTO, VSPACE_3);

‎sormas-ui/src/main/java/de/symeda/sormas/ui/utils/AbstractEditForm.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import java.util.ArrayList;
2121
import java.util.Collection;
22+
import java.util.Collections;
2223
import java.util.List;
2324
import java.util.Optional;
2425
import java.util.stream.Collectors;
@@ -616,10 +617,9 @@ public void setHeading(String heading) {
616617

617618
/**
618619
* List of editable allowed fields,
619-
*
620620
* @return
621621
*/
622-
public List<Field<?>> editableAllowedFields() {
623-
return editableAllowedFields;
622+
public List<Field<?>> editableAllowedFields(){
623+
return Collections.unmodifiableList(editableAllowedFields);
624624
}
625625
}

0 commit comments

Comments
 (0)