Skip to content

#14143 - Added region/district inputs for quick immunization #14161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raulbob merged 1 commit into from
Jul 7, 2026
+45 −3
Merged

#14143 - Added region/district inputs for quick immunization #14161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 45 additions & 3 deletions .../java/de/symeda/sormas/ui/immunization/components/form/QuickImmunizationCreationForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.vaadin.data.converter.StringToIntegerConverter;
import com.vaadin.ui.ComboBox;
import com.vaadin.ui.DateField;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.TextField;
import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitEvent;
Expand All @@ -43,6 +44,8 @@
import de.symeda.sormas.api.i18n.Captions;
import de.symeda.sormas.api.i18n.I18nProperties;
import de.symeda.sormas.api.i18n.Validations;
import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto;
import de.symeda.sormas.api.immunization.ImmunizationDto;
import de.symeda.sormas.api.immunization.MeansOfImmunization;
import de.symeda.sormas.api.utils.Diseases;
Expand All @@ -51,12 +54,14 @@
import de.symeda.sormas.ui.utils.AbstractEditForm;
import de.symeda.sormas.ui.utils.CssStyles;
import de.symeda.sormas.ui.utils.DateFormatHelper;
import de.symeda.sormas.ui.utils.FieldHelper;
import de.symeda.sormas.ui.utils.FormComponent;

/**
* Simplified "Quick Immunization Entry" form showing only the 7 core fields (BR0070).
* Jurisdiction fields (responsibleRegion, responsibleDistrict) are not shown; they must be
* pre-set on the DTO before calling {@link #setValue(ImmunizationDto)}.
* Jurisdiction fields (responsibleRegion, responsibleDistrict) stay hidden when they are already
* pre-set on the DTO before calling {@link #setValue(ImmunizationDto)}. If either value is missing,
* Vaadin 8 jurisdiction inputs are shown so the immunization can still be created.
* <p>
* Extends {@link AbstractEditForm} for compatibility with
* {@link de.symeda.sormas.ui.utils.CommitDiscardWrapperComponent}.
Expand Down Expand Up @@ -131,6 +136,9 @@ private static final class FieldsComponent extends FormComponent<ImmunizationDto

private DateField reportDate;
private ComboBox<MeansOfImmunization> meansOfImmunization;
private ComboBox<RegionReferenceDto> responsibleRegion;
private ComboBox<DistrictReferenceDto> responsibleDistrict;
private HorizontalLayout jurisdictionRow;
private TextField numberOfDoses;
private DateField dateOfMostRecentDose;
private ComboBox<VaccinationInfoSource> vaccinationInfoSource;
Expand All @@ -150,8 +158,12 @@ private static final class FieldsComponent extends FormComponent<ImmunizationDto

@Override
public void setDto(ImmunizationDto dto) {
super.setDto(dto);
refreshMeansOfImmunizationOptions(dto != null ? dto.getDisease() : null);
// Populate district options before binding so a pre-set district can be displayed immediately.
refreshDistrictOptions(dto != null ? dto.getResponsibleRegion() : null);
super.setDto(dto);
refreshDistrictOptions(responsibleRegion.getValue());
updateJurisdictionFieldsVisibility(dto);
// binder.setBean() only fires value-change events when the value actually
// changes. If meansOfImmunization was already null (typical for a new DTO),
// no event fires and the listener never runs. Re-apply visibility and
Expand All @@ -171,6 +183,14 @@ private void buildLayout() {
meansOfImmunization.setItemCaptionGenerator(I18nProperties::getEnumCaption);
addRow(reportDate, meansOfImmunization);

responsibleRegion = createComboBox(ImmunizationDto.RESPONSIBLE_REGION, ImmunizationDto.I18N_PREFIX);
responsibleRegion.setItemCaptionGenerator(item -> item != null ? item.buildCaption() : "");
responsibleRegion.setItems(FacadeProvider.getRegionFacade().getAllActiveByServerCountry());

responsibleDistrict = createComboBox(ImmunizationDto.RESPONSIBLE_DISTRICT, ImmunizationDto.I18N_PREFIX);
responsibleDistrict.setItemCaptionGenerator(item -> item != null ? item.buildCaption() : "");
jurisdictionRow = addRow(responsibleRegion, responsibleDistrict);

numberOfDoses = createTextField(ImmunizationDto.NUMBER_OF_DOSES, ImmunizationDto.I18N_PREFIX);
addRow(numberOfDoses, null);

Expand Down Expand Up @@ -213,6 +233,14 @@ private void bindFields() {
.asRequired(I18nProperties.getValidationError(Validations.required, meansOfImmunization.getCaption()))
.bind(ImmunizationDto::getMeansOfImmunization, ImmunizationDto::setMeansOfImmunization);

binder.forField(responsibleRegion)
.asRequired(I18nProperties.getValidationError(Validations.required, responsibleRegion.getCaption()))
.bind(ImmunizationDto.RESPONSIBLE_REGION);

binder.forField(responsibleDistrict)
.asRequired(I18nProperties.getValidationError(Validations.required, responsibleDistrict.getCaption()))
.bind(ImmunizationDto.RESPONSIBLE_DISTRICT);

binder.forField(numberOfDoses)
.withNullRepresentation("")
.withConverter(new StringToIntegerConverter(I18nProperties.getValidationError(Validations.vaccineDosesFormat)))
Expand Down Expand Up @@ -243,6 +271,7 @@ private void bindFields() {
}

private void wireEvents() {
track(responsibleRegion.addValueChangeListener(e -> refreshDistrictOptions(e.getValue())));
track(meansOfImmunization.addValueChangeListener(e -> {
updateVaccinationFieldsVisibility(e.getValue());
if (e.getValue() != MeansOfImmunization.MATERNAL_VACCINATION) {
Expand All @@ -266,6 +295,19 @@ private void refreshMeansOfImmunizationOptions(Disease disease) {
}
}

private void refreshDistrictOptions(RegionReferenceDto region) {
FieldHelper.updateItems(
responsibleDistrict,
region != null ? FacadeProvider.getDistrictFacade().getAllActiveByRegion(region.getUuid()) : null);
}

private void updateJurisdictionFieldsVisibility(ImmunizationDto dto) {
boolean showJurisdictionFields = dto == null || dto.getResponsibleRegion() == null || dto.getResponsibleDistrict() == null;
responsibleRegion.setVisible(showJurisdictionFields);
responsibleDistrict.setVisible(showJurisdictionFields);
jurisdictionRow.setVisible(showJurisdictionFields);
}

private void updateVaccinationFieldsVisibility(MeansOfImmunization meansOfImmunization) {
boolean isVaccination = MeansOfImmunization.isVaccination(meansOfImmunization);
boolean isMaternalVaccination = meansOfImmunization == MeansOfImmunization.MATERNAL_VACCINATION;
Expand Down
Loading