Skip to content

Commit 6c9f438

Browse files
author
SergiuPacurariu
committed
#13181 - Enhance National Health ID Search Functionality Across Modules and Address Duplication Issues - changes after review
1 parent 89685ea commit 6c9f438

File tree

10 files changed

+20
-32
lines changed

10 files changed

+20
-32
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ headingShowExternalMessage = Message
697697
headingSelfReportSideComponent = Self reports
698698
headingSignsAndSymptoms = Clinical Signs and Symptoms
699699
headingSimilarImmunization = Similar immunizaton
700-
headingSimilarPerson = Similar persons found based on person introduced data
700+
headingSimilarPerson = There are other persons with similar national health Id
701701
headingSyncUsers = Sync Users
702702
headingTasksDeleted = Tasks deleted
703703
headingTasksNotDeleted = None of the tasks were deleted

‎sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@
152152

153153
public class CaseController {
154154

155-
CommitDiscardWrapperComponent<CaseCreateForm> caseCreateComponent;
156-
boolean caseSaveTriggered;
155+
private CommitDiscardWrapperComponent<CaseCreateForm> caseCreateComponent;
156+
private boolean caseSaveTriggered;
157157

158158
public CaseController() {
159159

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@
111111
public class ContactController {
112112

113113
protected final Logger logger = LoggerFactory.getLogger(getClass());
114-
boolean contactSaveTriggered;
115-
CommitDiscardWrapperComponent<ContactCreateForm> createComponent;
114+
private boolean contactSaveTriggered;
115+
private CommitDiscardWrapperComponent<ContactCreateForm> createComponent;
116116

117117
public ContactController() {
118118

‎sormas-ui/src/main/java/de/symeda/sormas/ui/immunization/ImmunizationController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141

4242
public class ImmunizationController {
4343

44-
boolean immunizationSaveTriggered;
45-
CommitDiscardWrapperComponent<ImmunizationCreationForm> immunizationCreateComponent;
44+
private boolean immunizationSaveTriggered;
45+
private CommitDiscardWrapperComponent<ImmunizationCreationForm> immunizationCreateComponent;
4646

4747
public void registerViews(Navigator navigator) {
4848
navigator.addView(ImmunizationsView.VIEW_NAME, ImmunizationsView.class);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
import de.symeda.sormas.ui.utils.FieldHelper;
6767
import de.symeda.sormas.ui.utils.PhoneNumberValidator;
6868
import de.symeda.sormas.ui.utils.VaadinUiUtil;
69-
import de.symeda.sormas.ui.utils.components.TextFieldCustom;
69+
import de.symeda.sormas.ui.utils.components.SormasTextField;
7070

7171
public class PersonCreateForm extends AbstractEditForm<PersonDto> {
7272

@@ -88,7 +88,7 @@ public class PersonCreateForm extends AbstractEditForm<PersonDto> {
8888
private final boolean showPresentCondition;
8989
private final boolean showSymptomsOnsetDate;
9090
private final boolean showPersonSearchButton;
91-
private TextFieldCustom nationalHealthIdField;
91+
private SormasTextField nationalHealthIdField;
9292
private Window warningSimilarPersons;
9393

9494
private static final String HTML_LAYOUT =
@@ -191,7 +191,7 @@ protected void addFields() {
191191

192192
addField(PersonDto.PASSPORT_NUMBER, TextField.class);
193193

194-
nationalHealthIdField = addField(PersonDto.NATIONAL_HEALTH_ID, TextFieldCustom.class);
194+
nationalHealthIdField = addField(PersonDto.NATIONAL_HEALTH_ID, SormasTextField.class);
195195
nationalHealthIdField.setNullRepresentation("");
196196

197197
ComboBox presentCondition = addField(PersonDto.PRESENT_CONDITION, ComboBox.class);
@@ -509,7 +509,7 @@ public Window getWarningSimilarPersons() {
509509
return warningSimilarPersons;
510510
}
511511

512-
public TextFieldCustom getNationalHealthIdField() {
512+
public SormasTextField getNationalHealthIdField() {
513513
return nationalHealthIdField;
514514
}
515515
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
import de.symeda.sormas.ui.utils.SormasFieldGroupFieldFactory;
9797
import de.symeda.sormas.ui.utils.ValidationUtils;
9898
import de.symeda.sormas.ui.utils.ViewMode;
99-
import de.symeda.sormas.ui.utils.components.TextFieldCustom;
99+
import de.symeda.sormas.ui.utils.components.SormasTextField;
100100

101101
public class PersonEditForm extends AbstractEditForm<PersonDto> {
102102

@@ -187,7 +187,7 @@ public class PersonEditForm extends AbstractEditForm<PersonDto> {
187187
private boolean isPseudonymized;
188188
private LocationEditForm addressForm;
189189
private PresentConditionChangeListener presentConditionChangeListener;
190-
private TextFieldCustom nationalHealthIdField;
190+
private SormasTextField nationalHealthIdField;
191191
private Window warningSimilarPersons;
192192
//@formatter:on
193193

@@ -372,7 +372,7 @@ protected void addFields() {
372372

373373
addField(PersonDto.PASSPORT_NUMBER);
374374

375-
nationalHealthIdField = addField(PersonDto.NATIONAL_HEALTH_ID, TextFieldCustom.class);
375+
nationalHealthIdField = addField(PersonDto.NATIONAL_HEALTH_ID, SormasTextField.class);
376376
nationalHealthIdField.setNullRepresentation("");
377377
Label nationalHealthIdWarningLabel = new Label(I18nProperties.getString(Strings.messagePersonNationalHealthIdInvalid));
378378
nationalHealthIdWarningLabel.addStyleNames(VSPACE_3, LABEL_WHITE_SPACE_NORMAL);

‎sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/TravelEntryController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545

4646
public class TravelEntryController {
4747

48-
boolean travelEntrySaveTriggered;
49-
CommitDiscardWrapperComponent<TravelEntryCreateForm> travelEntryCreateComponent;
48+
private boolean travelEntrySaveTriggered;
49+
private CommitDiscardWrapperComponent<TravelEntryCreateForm> travelEntryCreateComponent;
5050

5151
public void registerViews(Navigator navigator) {
5252
navigator.addView(TravelEntriesView.VIEW_NAME, TravelEntriesView.class);

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@
2121
import java.util.Collection;
2222
import java.util.List;
2323
import java.util.Optional;
24-
import java.util.Set;
2524
import java.util.stream.Collectors;
2625
import java.util.stream.Stream;
2726

28-
import com.vaadin.navigator.ViewLeaveAction;
29-
import com.vaadin.ui.Window;
3027
import com.vaadin.ui.themes.ValoTheme;
3128
import com.vaadin.v7.data.Item;
3229
import com.vaadin.v7.data.Validator;
@@ -48,17 +45,10 @@
4845
import de.symeda.sormas.api.i18n.Captions;
4946
import de.symeda.sormas.api.i18n.I18nProperties;
5047
import de.symeda.sormas.api.i18n.Strings;
51-
import de.symeda.sormas.api.person.PersonDto;
52-
import de.symeda.sormas.api.person.PersonSimilarityCriteria;
53-
import de.symeda.sormas.api.person.Sex;
54-
import de.symeda.sormas.api.person.SimilarPersonDto;
5548
import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
5649
import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
5750
import de.symeda.sormas.ui.clinicalcourse.HealthConditionsForm;
58-
import de.symeda.sormas.ui.person.PersonSelectionGrid;
5951
import de.symeda.sormas.ui.utils.components.NotBlankTextValidator;
60-
import org.apache.commons.lang3.ObjectUtils;
61-
import org.apache.commons.lang3.StringUtils;
6252

6353
public abstract class AbstractEditForm<DTO> extends AbstractForm<DTO> implements FieldGroup.CommitHandler {// implements DtoEditForm<DTO> {
6454

@@ -623,6 +613,4 @@ protected boolean isEditableAllowed(String propertyId) {
623613
public void setHeading(String heading) {
624614
throw new RuntimeException("setHeading should be implemented in " + getClass().getSimpleName());
625615
}
626-
627-
628616
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import de.symeda.sormas.ui.utils.components.JsonForm;
4444
import de.symeda.sormas.ui.utils.components.MultiSelect;
4545
import de.symeda.sormas.ui.utils.components.MultiSelectFiles;
46-
import de.symeda.sormas.ui.utils.components.TextFieldCustom;
46+
import de.symeda.sormas.ui.utils.components.SormasTextField;
4747
import de.symeda.sormas.ui.vaccination.VaccinationsField;
4848

4949
public class SormasFieldGroupFieldFactory extends DefaultFieldGroupFieldFactory {
@@ -192,8 +192,8 @@ public <T extends Field> T createField(Class<?> type, Class<T> fieldType) {
192192
return (T) new CheckBoxTree<>();
193193
} else if (RichTextArea.class.isAssignableFrom(fieldType)) {
194194
return (T) new RichTextArea();
195-
}else if (TextFieldCustom.class.isAssignableFrom(fieldType)) {
196-
return (T) new TextFieldCustom();
195+
}else if (SormasTextField.class.isAssignableFrom(fieldType)) {
196+
return (T) new SormasTextField();
197197
}
198198
return super.createField(type, fieldType);
199199
}

sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/TextFieldCustom.java renamed to sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/SormasTextField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.vaadin.v7.data.Property;
77
import com.vaadin.v7.ui.TextField;
88

9-
public class TextFieldCustom extends TextField {
9+
public class SormasTextField extends TextField {
1010

1111
/* Value change events */
1212

0 commit comments

Comments
 (0)