Skip to content

Bugfix 14089 sample directory filtering by case classification #14277

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

Open
KarnaiahPesula wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Bugfix 14089 sample directory filtering by case classification #14277

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad072ff
CONFIRMED_NO_SYMPTOMS and CONFIRMED_UNKNOWN_SYMPTOMS case classificat…
KarnaiahPesula Aug 13, 2026
ba30490
Updated the comment in detail
KarnaiahPesula Aug 14, 2026
1501642
minor fix
KarnaiahPesula Aug 14, 2026
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
12 changes: 11 additions & 1 deletion sormas-ui/src/main/java/de/symeda/sormas/ui/samples/humansample/SampleGridFilterForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
import com.vaadin.v7.ui.Field;
import com.vaadin.v7.ui.TextField;

import de.symeda.sormas.api.CountryHelper;
import de.symeda.sormas.api.FacadeProvider;
import de.symeda.sormas.api.caze.CaseClassification;
import de.symeda.sormas.api.caze.CaseDataDto;
import de.symeda.sormas.api.i18n.I18nProperties;
import de.symeda.sormas.api.i18n.Strings;
Expand Down Expand Up @@ -88,11 +90,19 @@ protected void addFields() {
SampleCriteria.SPECIMEN_CONDITION,
I18nProperties.getPrefixCaption(SampleDto.I18N_PREFIX, SampleDto.SPECIMEN_CONDITION),
140));
addField(
// removing the CONFIRMED_NO_SYMPTOMS & CONFIRMED_UNKNOWN_SYMPTOMS case classifications
// from samples filter grid of other countries.
// It's valid only for Germany.
ComboBox caseClassification = addField(
FieldConfiguration.withCaptionAndPixelSized(
SampleCriteria.CASE_CLASSIFICATION,
I18nProperties.getPrefixCaption(CaseDataDto.I18N_PREFIX, CaseDataDto.CASE_CLASSIFICATION),
140));
if (!isConfiguredServer(CountryHelper.COUNTRY_CODE_GERMANY)) {
caseClassification.removeItem(CaseClassification.CONFIRMED_NO_SYMPTOMS);
caseClassification.removeItem(CaseClassification.CONFIRMED_UNKNOWN_SYMPTOMS);
}

addField(
FieldConfiguration.withCaptionAndPixelSized(
SampleCriteria.DISEASE,
Expand Down
Loading