From 5fb6728043d595aa0942d6dc40398c673c2c54ed Mon Sep 17 00:00:00 2001 From: douglasderrick Date: Wed, 22 Jan 2025 15:52:28 +0000 Subject: [PATCH 1/6] Added barcode to guinea word layout --- .../java/de/symeda/sormas/ui/person/PersonEditForm.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java index 899fb2b686c..7d614728225 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java @@ -182,6 +182,7 @@ public class PersonEditForm extends AbstractEditForm { fluidRowLocs(PersonDto.UUID, "") + fluidRowLocs(PersonDto.FIRST_NAME, PersonDto.LAST_NAME, PersonDto.OTHER_NAME, PersonDto.FATHERS_NAME) + fluidRowLocs(PersonDto.APPROXIMATE_AGE, PersonDto.SEX, PersonDto.OCCUPATION_DETAILS, PersonDto.ETHNICITY) + + fluidRowLocs(4, PersonDto.PASSPORT_NUMBER) + loc(ADDRESS_HEADER) + fluidRowLocs(PersonDto.ADDRESS) + fluidRowLocs(PersonDto.PLACE_OF_RESIDENCE_SAME_AS_REPORTING_VILLAGE, PersonDto.RESIDENCE_SINCE_WHEN_IN_MONTHS) + @@ -837,9 +838,13 @@ protected void addFields() { setVisible(true, PersonDto.GHANA_CARD, PersonDto.NATIONAL_HEALTH_ID); } + if (caseOrigin == CaseOrigin.POINT_OF_ENTRY) { + setVisible(true, PersonDto.PASSPORT_NUMBER); + } + if (disease == Disease.GUINEA_WORM) { generalCommentLabel.setVisible(false); - setVisible(false, PersonDto.PRESENT_CONDITION, PersonDto.NATIONAL_HEALTH_ID, PersonDto.GHANA_CARD, PersonDto.PASSPORT_NUMBER, PersonDto.BIRTH_DATE_YYYY, + setVisible(false, PersonDto.PRESENT_CONDITION, PersonDto.NATIONAL_HEALTH_ID, PersonDto.GHANA_CARD, PersonDto.BIRTH_DATE_YYYY, PersonDto.BIRTH_DATE_MM, PersonDto.BIRTH_DATE_DD, PersonDto.ADDITIONAL_DETAILS, PersonDto.EDUCATION_TYPE, PersonDto.EDUCATION_DETAILS, PersonDto.MOTHERS_NAME); setVisible(true, PersonDto.PLACE_OF_RESIDENCE_SAME_AS_REPORTING_VILLAGE, PersonDto.ETHNICITY); } From da2b75e191f2c2dfcdfd5b421155d2dc366ab079 Mon Sep 17 00:00:00 2001 From: douglasderrick Date: Wed, 22 Jan 2025 15:52:56 +0000 Subject: [PATCH 2/6] Fix: Added barcode to guinea word layout --- .../java/de/symeda/sormas/ui/samples/AbstractSampleForm.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/AbstractSampleForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/AbstractSampleForm.java index 6c4df04d955..588970f8f8c 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/AbstractSampleForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/AbstractSampleForm.java @@ -241,6 +241,7 @@ public abstract class AbstractSampleForm extends AbstractEditForm { fluidRowLocs(SampleDto.LAB_LOCAL) + fluidRowLocs(6, SampleDto.LAB_LOCAL_DETAILS) + fluidRowLocs(SampleDto.LAB, SampleDto.LAB_DETAILS) + + fluidRowLocs(4, SampleDto.FIELD_SAMPLE_ID) + // fluidRowLocs(6, SampleDto.SAMPLE_MATERIAL) + loc(HEADING_SPECIMEN_HANDLING) + fluidRowLocs(SampleDto.SPECIMEN_SAVED_AND_PRESEVED_IN_ALCOHOL) + From 3a66be72c10494a8dc92594878b0bda1c05ce998 Mon Sep 17 00:00:00 2001 From: douglasderrick Date: Wed, 22 Jan 2025 16:41:01 +0000 Subject: [PATCH 3/6] Fix: Removed last vaccination on web and updated conditional statement --- .../main/java/de/symeda/sormas/ui/caze/CaseDataForm.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java index 88d03b5c5ac..e4106cc757e 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java @@ -1824,14 +1824,12 @@ public String getFormattedHtmlMessage() { if (disease == Disease.MEASLES) { vaccinationStatus.setRequired(true); outcome.setVisible(false); - FieldHelper.setVisibleWhen(vaccinationStatus, Arrays.asList(numberOfDoses, vaccinationRoutine, lastVaccinationDate), Arrays.asList(VaccinationStatus.VACCINATED), true); - } - - //measles - if (disease == Disease.MEASLES) { + FieldHelper.setVisibleWhen(vaccinationStatus, Arrays.asList(numberOfDoses, vaccinationRoutine), Arrays.asList(VaccinationStatus.VACCINATED), true); FieldHelper.setEnabledWhen(vaccinationStatus, Arrays.asList(VaccinationStatus.VACCINATED), Collections.singletonList( vaccinatedByCardOrHistory ), false); + FieldHelper.setVisibleWhen(vaccinatedByCardOrHistory, Arrays.asList(cardDateField), Arrays.asList(CardOrHistory.CARD), true); + lastVaccinationDate.setVisible(false); setVaccinatedByCardOrHistoryVisibility(); From 6002b513cdd7918691d64d8f04bb771c7d0a0985 Mon Sep 17 00:00:00 2001 From: douglasderrick Date: Wed, 22 Jan 2025 16:47:39 +0000 Subject: [PATCH 4/6] Fix: made vaccination status mandatory --- sormas-app/app/src/main/res/layout/fragment_case_edit_layout.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sormas-app/app/src/main/res/layout/fragment_case_edit_layout.xml b/sormas-app/app/src/main/res/layout/fragment_case_edit_layout.xml index 21f84ba51f1..c61ec38c08d 100644 --- a/sormas-app/app/src/main/res/layout/fragment_case_edit_layout.xml +++ b/sormas-app/app/src/main/res/layout/fragment_case_edit_layout.xml @@ -944,6 +944,7 @@ Date: Wed, 22 Jan 2025 17:39:59 +0000 Subject: [PATCH 5/6] Fix: Fixed occupation error for measles --- .../main/java/de/symeda/sormas/ui/person/PersonEditForm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java index 7d614728225..c7f95a907b6 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java @@ -834,7 +834,7 @@ protected void addFields() { generalCommentLabel.setVisible(false); setVisible(false, PersonDto.ADDITIONAL_DETAILS); setVisible(false, PersonDto.MOTHERS_MAIDEN_NAME); - setVisible(false, PersonDto.NICKNAME, OCCUPATION_HEADER); + setVisible(false, PersonDto.NICKNAME); setVisible(true, PersonDto.GHANA_CARD, PersonDto.NATIONAL_HEALTH_ID); } From c6160d228f7fe0d235be4e97cf5b20acc1a4242e Mon Sep 17 00:00:00 2001 From: douglasderrick Date: Thu, 23 Jan 2025 09:19:48 +0000 Subject: [PATCH 6/6] Fix: Hide SPUTUM sample Material for SPUTUM --- .../main/java/de/symeda/sormas/api/sample/SampleMaterial.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java b/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java index 35936581aef..b7898fe5099 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java @@ -89,6 +89,9 @@ public enum SampleMaterial { @Diseases(value = { Disease.CORONAVIRUS, MEASLES }, hide = true) NUCHAL_SKIN_BIOPSY, + @Diseases(value = { + MEASLES, + }, hide = true) SPUTUM, @Diseases(value = { MEASLES,