Added barcode to food sample testing for Mpox

ePareto-Information-System · Jan 24, 2025 · 5b1d8d7 · 5b1d8d7
1 parent 4a21423
commit 5b1d8d7
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 3 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
@@ -2882,6 +2882,7 @@ public interface Captions {
 	String SixtyDay_specifySources = "specifySources";
 	String SixtyDay_productName = "productName";
 	String SixtyDay_batchNumber = "batchNumber";
+	String SixtyDay_barcode = "barcode";
 	String SixtyDay_dateOfManufacture = "dateOfManufacture";
 	String SixtyDay_expirationDate = "expirationDate";
 	String SixtyDay_packageSize = "packageSize";

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/sixtyday/SixtyDayDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/sixtyday/SixtyDayDto.java
@@ -46,6 +46,7 @@ public class SixtyDayDto extends PseudonymizableDto {
     public static final String SPECIFY_SOURCES = "specifySources";
     public static final String PRODUCT_NAME = "productName";
     public static final String BATCH_NUMBER = "batchNumber";
+    public static final String BARCODE = "barcode";
     public static final String DATE_OF_MANUFACTURE = "dateOfManufacture";
     public static final String EXPIRATION_DATE = "expirationDate";
     public static final String PACKAGE_SIZE = "packageSize";
@@ -91,6 +92,7 @@ public class SixtyDayDto extends PseudonymizableDto {
     private String specifySources;
     private String productName;
     private String batchNumber;
+    private String barcode;
     private Date dateOfManufacture;
     private Date expirationDate;
     private String packageSize;
@@ -405,4 +407,12 @@ public String getSpecifySources() {
     public void setSpecifySources(String specifySources) {
         this.specifySources = specifySources;
     }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
 }
diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties
@@ -2702,6 +2702,7 @@ specifyFoodsSources =If Yes, specify food(s)
 specifySources =If Yes, specify sources(s)
 productName =Product Name
 batchNumber =Batch/ Lot Number
+barcode =Barcode
 dateOfManufacture =Date Of Manufacture
 expirationDate =Expiration Date
 packageSize =Package Size  (Grams/ Milliliters)

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/sixtyday/SixtyDay.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/sixtyday/SixtyDay.java
@@ -81,6 +81,7 @@ public class SixtyDay extends AbstractDomainObject {
     private String address;
     private String foodTel;
     private String specifySources;
+    private String barcode;
 
 
     public String getPersonExamineCase() {
@@ -407,4 +408,12 @@ public String getSpecifySources() {
     public void setSpecifySources(String specifySources) {
         this.specifySources = specifySources;
     }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
 }
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/sixtyday/SixtyDayFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/sixtyday/SixtyDayFacadeEjb.java
@@ -96,6 +96,7 @@ public SixtyDay fillOrBuildEntity(SixtyDayDto source, SixtyDay target, boolean c
         target.setAddress(source.getAddress());
         target.setFoodTel(source.getFoodTel());
         target.setSpecifySources(source.getSpecifySources());
+        target.setBarcode(source.getBarcode());
 
         return target;
     }
@@ -150,6 +151,7 @@ public static SixtyDayDto toDto(SixtyDay sixtyDay) {
         target.setAddress(source.getAddress());
         target.setFoodTel(source.getFoodTel());
         target.setSpecifySources(source.getSpecifySources());
+        target.setBarcode(source.getBarcode());
 
 
         return target;

diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql
@@ -15227,4 +15227,7 @@ ALTER TABLE afpimmunization ADD COLUMN lastdose DATE;
 ALTER TABLE afpimmunization ADD COLUMN dateLastOpvDosesReceivedThroughSia DATE;
 ALTER TABLE afpimmunization ADD COLUMN dateLastIpvDosesReceivedThroughSia DATE;
 
-INSERT INTO schema_version(version_number, comment) VALUES (722, 'Dropped and added columns in afpimmunization to change types to date');
+INSERT INTO schema_version(version_number, comment) VALUES (722, 'Dropped and added columns in afpimmunization to change types to date');
+
+ALTER TABLE sixtyday ADD COLUMN barcode VARCHAR(255);
+INSERT INTO schema_version(version_number, comment) VALUES (723, 'Added barcode to sixtyday(food sample testing)');
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/sixtydayfollowup/SixtyDayForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/sixtydayfollowup/SixtyDayForm.java
@@ -78,6 +78,7 @@ public class SixtyDayForm extends AbstractEditForm<SixtyDayDto>{
                     loc(PROVIDE_HEADING_LOC)+
                     fluidRowLocs(SixtyDayDto.SPECIFY_FOODS_SOURCES, SixtyDayDto.SPECIFY_SOURCES) +
                     fluidRowLocs(SixtyDayDto.PRODUCT_NAME, SixtyDayDto.BATCH_NUMBER) +
+                    fluidRowLocs(6, SixtyDayDto.BARCODE) +
                     fluidRowLocs(SixtyDayDto.DATE_OF_MANUFACTURE, SixtyDayDto.EXPIRATION_DATE) +
                     fluidRowLocs(SixtyDayDto.PACKAGE_SIZE, SixtyDayDto.PACKAGING_TYPE, SixtyDayDto.PACKAGING_TYPE_OTHER) +
                     fluidRowLocs(SixtyDayDto.PLACE_OF_PURCHASE, SixtyDayDto.NAME_OF_MANUFACTURER) +
@@ -164,6 +165,7 @@ protected void addFields() {
         TextField sources =  addField(SixtyDayDto.SPECIFY_SOURCES, TextField.class);
         TextField productName = addField(SixtyDayDto.PRODUCT_NAME, TextField.class);
         TextField batchNumber = addField(SixtyDayDto.BATCH_NUMBER, TextField.class);
+        TextField barcode = addField(SixtyDayDto.BARCODE, TextField.class);
         DateField dateOfManufacture = addField(SixtyDayDto.DATE_OF_MANUFACTURE, DateField.class);
         DateField expirationDate = addField(SixtyDayDto.EXPIRATION_DATE, DateField.class);
         TextField packageSize = addField(SixtyDayDto.PACKAGE_SIZE, TextField.class);
@@ -175,7 +177,7 @@ protected void addFields() {
         TextField foodTel = addField(SixtyDayDto.FOOD_TEL, TextField.class);
 
         setVisible(false,
-                SixtyDayDto.FOOD_AVAILABLE_TESTING, SixtyDayDto.LAB_TEST_CONDUCTED, SixtyDayDto.SPECIFY_FOODS_SOURCES, SixtyDayDto.SPECIFY_SOURCES, SixtyDayDto.PRODUCT_NAME, SixtyDayDto.BATCH_NUMBER, SixtyDayDto.DATE_OF_MANUFACTURE, SixtyDayDto.EXPIRATION_DATE, SixtyDayDto.PACKAGE_SIZE, SixtyDayDto.PACKAGING_TYPE, SixtyDayDto.PACKAGING_TYPE_OTHER, SixtyDayDto.PLACE_OF_PURCHASE, SixtyDayDto.NAME_OF_MANUFACTURER, SixtyDayDto.ADDRESS, SixtyDayDto.FOOD_TEL);
+                SixtyDayDto.FOOD_AVAILABLE_TESTING, SixtyDayDto.LAB_TEST_CONDUCTED, SixtyDayDto.SPECIFY_FOODS_SOURCES, SixtyDayDto.SPECIFY_SOURCES, SixtyDayDto.PRODUCT_NAME, SixtyDayDto.BATCH_NUMBER, SixtyDayDto.BARCODE, SixtyDayDto.DATE_OF_MANUFACTURE, SixtyDayDto.EXPIRATION_DATE, SixtyDayDto.PACKAGE_SIZE, SixtyDayDto.PACKAGING_TYPE, SixtyDayDto.PACKAGING_TYPE_OTHER, SixtyDayDto.PLACE_OF_PURCHASE, SixtyDayDto.NAME_OF_MANUFACTURER, SixtyDayDto.ADDRESS, SixtyDayDto.FOOD_TEL);
 
 
         initializeVisibilitiesAndAllowedVisibilities();
@@ -206,7 +208,7 @@ protected void addFields() {
         FieldHelper.setVisibleWhen(
                 foodAvailable,
                 Arrays.asList(food, sources, productName, batchNumber, dateOfManufacture, expirationDate, packageSize, packagingType, placeOfPurchase, nameOfManufacturer,
-                        address, foodTel),Arrays.asList(YesNoUnknown.YES),true);
+                        address, foodTel, barcode),Arrays.asList(YesNoUnknown.YES),true);
         packagingType.addValueChangeListener(event -> {
             boolean isOther = event.getProperty().getValue() == PackagingType.OTHER;
             packagingTypeOther.setVisible(isOther);