Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 3eae064

Browse files
alexcaruntu-vitaalexcaruntu-vita
committed
SORMAS-Foundation#3590 - Extracted the retrieval of user dto into parent class
1 parent cb3c80f commit 3eae064

7 files changed

Lines changed: 22 additions & 32 deletions

File tree

‎sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormDataFilterForm.java‎

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

2020
import com.vaadin.v7.data.Property;
2121
import com.vaadin.v7.ui.ComboBox;
22-
2322
import com.vaadin.v7.ui.Field;
23+
2424
import de.symeda.sormas.api.FacadeProvider;
2525
import de.symeda.sormas.api.campaign.data.CampaignFormDataCriteria;
2626
import de.symeda.sormas.api.campaign.data.CampaignFormDataDto;
@@ -31,7 +31,6 @@
3131
import de.symeda.sormas.api.region.RegionReferenceDto;
3232
import de.symeda.sormas.api.user.UserDto;
3333
import de.symeda.sormas.api.utils.DataHelper;
34-
import de.symeda.sormas.ui.UserProvider;
3534
import de.symeda.sormas.ui.utils.AbstractFilterForm;
3635
import de.symeda.sormas.ui.utils.CssStyles;
3736
import de.symeda.sormas.ui.utils.FieldConfiguration;
@@ -75,7 +74,7 @@ protected void addFields() {
7574
});
7675
}
7776

78-
UserDto user = UserProvider.getCurrent().getUser();
77+
UserDto user = currentUserDto();
7978
if (user.getRegion() == null) {
8079
ComboBox cbRegion = addField(
8180
FieldConfiguration.withCaptionAndPixelSized(

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public void addMoreFilters(CustomLayout moreFiltersContainer) {
130130
ComboBox presentConditionField = addField(moreFiltersContainer, FieldConfiguration.pixelSized(CaseCriteria.PRESENT_CONDITION, 140));
131131
presentConditionField.setInputPrompt(I18nProperties.getPrefixCaption(PersonDto.I18N_PREFIX, PersonDto.PRESENT_CONDITION));
132132

133-
UserDto user = UserProvider.getCurrent().getUser();
133+
UserDto user = currentUserDto();
134134
ComboBox regionField = null;
135135
if (user.getRegion() == null) {
136136
regionField = addField(moreFiltersContainer, FieldConfiguration.pixelSized(CaseDataDto.REGION, 140));
@@ -294,7 +294,7 @@ protected void applyDependenciesOnFieldChange(String propertyId, Property.ValueC
294294
final ComboBox pointOfEntryField = getField(CaseDataDto.POINT_OF_ENTRY);
295295
final ComboBox caseOriginField = getField(CaseDataDto.CASE_ORIGIN);
296296

297-
final UserDto user = UserProvider.getCurrent().getUser();
297+
final UserDto user = currentUserDto();
298298
final DistrictReferenceDto currentDistrict =
299299
user.getDistrict() != null ? user.getDistrict() : (DistrictReferenceDto) districtField.getValue();
300300
final CaseOrigin currentCaseOrigin =
@@ -469,10 +469,10 @@ protected void applyDependenciesOnNewValue(CaseCriteria criteria) {
469469

470470
final ComboBox districtField = getField(CaseDataDto.DISTRICT);
471471
final ComboBox communityField = getField(CaseDataDto.COMMUNITY);
472-
472+
473473
disableFields(districtField, communityField);
474474

475-
final UserDto user = UserProvider.getCurrent().getUser();
475+
final UserDto user = currentUserDto();
476476

477477
if (user.getRegion() != null) {
478478
if (user.getDistrict() == null) {

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import de.symeda.sormas.api.utils.DateFilterOption;
4545
import de.symeda.sormas.api.utils.DateHelper;
4646
import de.symeda.sormas.api.utils.EpiWeek;
47-
import de.symeda.sormas.ui.UserProvider;
4847
import de.symeda.sormas.ui.utils.AbstractFilterForm;
4948
import de.symeda.sormas.ui.utils.CssStyles;
5049
import de.symeda.sormas.ui.utils.EpiWeekAndDateFilterComponent;
@@ -138,7 +137,7 @@ protected void addFields() {
138137
@Override
139138
public void addMoreFilters(CustomLayout moreFiltersContainer) {
140139

141-
UserDto user = currentUser();
140+
UserDto user = currentUserDto();
142141

143142
if (user.getRegion() == null) {
144143
ComboBox regionField = addField(
@@ -177,7 +176,7 @@ public void addMoreFilters(CustomLayout moreFiltersContainer) {
177176
ContactCriteria.CONTACT_OFFICER,
178177
I18nProperties.getPrefixCaption(ContactIndexDto.I18N_PREFIX, ContactIndexDto.CONTACT_OFFICER_UUID),
179178
140));
180-
officerField.addItems(fetchSurveillanceOfficersByRegion(currentUser().getRegion()));
179+
officerField.addItems(fetchSurveillanceOfficersByRegion(currentUserDto().getRegion()));
181180
addField(
182181
moreFiltersContainer,
183182
FieldConfiguration.withCaptionAndPixelSized(ContactCriteria.REPORTING_USER_ROLE, I18nProperties.getString(Strings.reportedBy), 140));
@@ -358,7 +357,7 @@ protected void applyDependenciesOnNewValue(ContactCriteria newValue) {
358357
final DistrictReferenceDto district = newValue.getDistrict();
359358
applyRegionAndDistrictFilterDependency(region, ContactCriteria.DISTRICT, district, ContactCriteria.COMMUNITY);
360359

361-
final UserDto user = currentUser();
360+
final UserDto user = currentUserDto();
362361

363362
ComboBox officerField = getField(ContactCriteria.CONTACT_OFFICER);
364363
if (user.getRegion() != null) {
@@ -501,7 +500,8 @@ public void setSearchFieldEnabled(boolean enabled) {
501500
}
502501

503502
private void populateSurveillanceOfficersForRegion(RegionReferenceDto regionReferenceDto) {
504-
List<UserReferenceDto> items = fetchSurveillanceOfficersByRegion(regionReferenceDto != null ? regionReferenceDto : currentUser().getRegion());
503+
List<UserReferenceDto> items =
504+
fetchSurveillanceOfficersByRegion(regionReferenceDto != null ? regionReferenceDto : currentUserDto().getRegion());
505505
populateSurveillanceOfficers(items);
506506
}
507507

@@ -525,8 +525,4 @@ private void populateSurveillanceOfficers(List<UserReferenceDto> items) {
525525
private List<UserReferenceDto> fetchSurveillanceOfficersByRegion(RegionReferenceDto regionReferenceDto) {
526526
return FacadeProvider.getUserFacade().getUsersByRegionAndRoles(regionReferenceDto, UserRole.SURVEILLANCE_OFFICER);
527527
}
528-
529-
private UserDto currentUser() {
530-
return UserProvider.getCurrent().getUser();
531-
}
532528
}

‎sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventsFilterForm.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@
2929
import de.symeda.sormas.api.location.LocationDto;
3030
import de.symeda.sormas.api.region.DistrictReferenceDto;
3131
import de.symeda.sormas.api.region.RegionReferenceDto;
32-
import de.symeda.sormas.api.user.UserDto;
3332
import de.symeda.sormas.api.user.UserReferenceDto;
3433
import de.symeda.sormas.api.user.UserRole;
3534
import de.symeda.sormas.api.utils.DateFilterOption;
3635
import de.symeda.sormas.api.utils.DateHelper;
3736
import de.symeda.sormas.api.utils.EpiWeek;
38-
import de.symeda.sormas.ui.UserProvider;
3937
import de.symeda.sormas.ui.utils.AbstractFilterForm;
4038
import de.symeda.sormas.ui.utils.EpiWeekAndDateFilterComponent;
4139
import de.symeda.sormas.ui.utils.FieldConfiguration;
@@ -94,7 +92,7 @@ protected void addFields() {
9492
addField(FieldConfiguration.pixelSized(EventIndexDto.DISEASE, 140));
9593
addField(FieldConfiguration.withCaptionAndPixelSized(EventCriteria.REPORTING_USER_ROLE, I18nProperties.getString(Strings.reportedBy), 140));
9694
ComboBox officerField = addField(FieldConfiguration.pixelSized(EventCriteria.SURVEILLANCE_OFFICER, 140));
97-
officerField.addItems(fetchSurveillanceOfficersByRegion(currentUser().getRegion()));
95+
officerField.addItems(fetchSurveillanceOfficersByRegion(currentUserDto().getRegion()));
9896
TextField searchField = addField(
9997
FieldConfiguration.withCaptionAndPixelSized(EventCriteria.FREE_TEXT, I18nProperties.getString(Strings.promptEventsSearchField), 200));
10098
searchField.setNullRepresentation("");
@@ -299,7 +297,8 @@ private void applyDateDependencyOnNewValue(String componentId, DateFilterOption
299297
}
300298

301299
private void populateSurveillanceOfficersForRegion(RegionReferenceDto regionReferenceDto) {
302-
List<UserReferenceDto> items = fetchSurveillanceOfficersByRegion(regionReferenceDto != null ? regionReferenceDto : currentUser().getRegion());
300+
List<UserReferenceDto> items =
301+
fetchSurveillanceOfficersByRegion(regionReferenceDto != null ? regionReferenceDto : currentUserDto().getRegion());
303302
populateSurveillanceOfficers(items);
304303
}
305304

@@ -324,10 +323,6 @@ private List<UserReferenceDto> fetchSurveillanceOfficersByRegion(RegionReference
324323
return FacadeProvider.getUserFacade().getUsersByRegionAndRoles(regionReferenceDto, UserRole.SURVEILLANCE_OFFICER);
325324
}
326325

327-
private UserDto currentUser() {
328-
return UserProvider.getCurrent().getUser();
329-
}
330-
331326
@Override
332327
protected String createMoreFiltersHtmlLayout() {
333328
return MORE_FILTERS_HTML_LAYOUT;

‎sormas-ui/src/main/java/de/symeda/sormas/ui/samples/SampleGridFilterForm.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import de.symeda.sormas.api.utils.DateFilterOption;
2828
import de.symeda.sormas.api.utils.DateHelper;
2929
import de.symeda.sormas.api.utils.EpiWeek;
30-
import de.symeda.sormas.ui.UserProvider;
3130
import de.symeda.sormas.ui.utils.AbstractFilterForm;
3231
import de.symeda.sormas.ui.utils.EpiWeekAndDateFilterComponent;
3332
import de.symeda.sormas.ui.utils.FieldConfiguration;
@@ -86,7 +85,7 @@ protected void addFields() {
8685
I18nProperties.getPrefixCaption(CaseDataDto.I18N_PREFIX, CaseDataDto.DISEASE),
8786
140));
8887

89-
UserDto user = UserProvider.getCurrent().getUser();
88+
UserDto user = currentUserDto();
9089
if (user.getRegion() == null) {
9190
ComboBox regionField = addField(
9291
FieldConfiguration.withCaptionAndPixelSized(
@@ -122,8 +121,7 @@ public void addMoreFilters(CustomLayout moreFiltersContainer) {
122121

123122
private HorizontalLayout buildWeekAndDateFilter() {
124123

125-
EpiWeekAndDateFilterComponent<DateFilterOption> weekAndDateFilter =
126-
new EpiWeekAndDateFilterComponent<>(false, false, null, this);
124+
EpiWeekAndDateFilterComponent<DateFilterOption> weekAndDateFilter = new EpiWeekAndDateFilterComponent<>(false, false, null, this);
127125

128126
weekAndDateFilter.getWeekFromFilter().setInputPrompt(I18nProperties.getString(Strings.promptSampleEpiWeekFrom));
129127
weekAndDateFilter.getWeekToFilter().setInputPrompt(I18nProperties.getString(Strings.promptSampleEpiWeekTo));
@@ -199,7 +197,7 @@ protected void applyDependenciesOnFieldChange(String propertyId, Property.ValueC
199197
@Override
200198
protected void applyDependenciesOnNewValue(SampleCriteria criteria) {
201199

202-
UserDto user = UserProvider.getCurrent().getUser();
200+
UserDto user = currentUserDto();
203201

204202
ComboBox districtField = (ComboBox) getField(SampleCriteria.DISTRICT);
205203
if (user.getRegion() != null) {

‎sormas-ui/src/main/java/de/symeda/sormas/ui/task/TaskGridFilterForm.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import de.symeda.sormas.api.utils.DateFilterOption;
2828
import de.symeda.sormas.api.utils.DateHelper;
2929
import de.symeda.sormas.api.utils.EpiWeek;
30-
import de.symeda.sormas.ui.UserProvider;
3130
import de.symeda.sormas.ui.utils.AbstractFilterForm;
3231
import de.symeda.sormas.ui.utils.EpiWeekAndDateFilterComponent;
3332
import de.symeda.sormas.ui.utils.FieldConfiguration;
@@ -66,7 +65,7 @@ protected void addFields() {
6665
addField(FieldConfiguration.pixelSized(TaskIndexDto.TASK_CONTEXT, 140));
6766
addField(FieldConfiguration.pixelSized(TaskIndexDto.TASK_STATUS, 140));
6867

69-
final UserDto user = UserProvider.getCurrent().getUser();
68+
final UserDto user = currentUserDto();
7069
if (user.getDistrict() == null) {
7170
if (user.getRegion() == null) {
7271
final ComboBox regionField = addField(FieldConfiguration.pixelSized(TaskIndexDto.REGION, 200));

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.vaadin.event.ShortcutAction;
1212
import com.vaadin.icons.VaadinIcons;
1313
import com.vaadin.ui.Button;
14-
import com.vaadin.ui.Component;
1514
import com.vaadin.ui.CustomLayout;
1615
import com.vaadin.ui.themes.ValoTheme;
1716
import com.vaadin.v7.data.Property;
@@ -93,6 +92,10 @@ protected String createHtmlLayout() {
9392

9493
protected abstract String[] getMainFilterLocators();
9594

95+
protected UserDto currentUserDto() {
96+
return UserProvider.getCurrent().getUser();
97+
}
98+
9699
protected String createMoreFiltersHtmlLayout() {
97100
return "";
98101
}

0 commit comments

Comments
 (0)