From 6c3d3010be4a5f4c40d5d9795d9b03cb3cbcaa66 Mon Sep 17 00:00:00 2001
From: anthony4m <amoahanthony41@gmail.com>
Date: Fri, 24 Jan 2025 17:15:46 +0000
Subject: [PATCH] #183 added the new request features

---
 .../java/de/symeda/sormas/api/ebs/EbsDto.java |   1 +
 .../sormas/app/ebs/list/EbsListActivity.java  |  22 +-
 .../res/layout/fragment_ebs_edit_layout.xml   | 230 +++++++++++-------
 .../sormas/ui/ebs/TriagingDataForm.java       |   2 +
 4 files changed, 149 insertions(+), 106 deletions(-)

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/ebs/EbsDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/ebs/EbsDto.java
index 703342d5282..0c7ec37d6c0 100644
--- a/sormas-api/src/main/java/de/symeda/sormas/api/ebs/EbsDto.java
+++ b/sormas-api/src/main/java/de/symeda/sormas/api/ebs/EbsDto.java
@@ -126,6 +126,7 @@ public class EbsDto extends PseudonymizableDto {
 	private SignalVerificationDto signalVerification;
 	private RiskAssessmentDto riskAssessment;
 	private EbsAlertDto alert;
+	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String otherInformant;
 
 
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/ebs/list/EbsListActivity.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/ebs/list/EbsListActivity.java
index 4d17ba015ec..4de949d508c 100644
--- a/sormas-app/app/src/main/java/de/symeda/sormas/app/ebs/list/EbsListActivity.java
+++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/ebs/list/EbsListActivity.java
@@ -16,15 +16,12 @@
 import de.symeda.sormas.api.ebs.EbsTriagingDecision;
 import de.symeda.sormas.api.ebs.SignalCategory;
 import de.symeda.sormas.api.ebs.SignalOutcome;
-import de.symeda.sormas.api.user.JurisdictionLevel;
 import de.symeda.sormas.api.user.UserRight;
 import de.symeda.sormas.app.BaseListActivity;
 import de.symeda.sormas.app.PagedBaseListActivity;
 import de.symeda.sormas.app.PagedBaseListFragment;
 import de.symeda.sormas.app.R;
 import de.symeda.sormas.app.backend.config.ConfigProvider;
-import de.symeda.sormas.app.backend.region.District;
-import de.symeda.sormas.app.backend.region.Region;
 import de.symeda.sormas.app.backend.user.User;
 import de.symeda.sormas.app.component.Item;
 import de.symeda.sormas.app.component.menu.PageMenuItem;
@@ -32,7 +29,6 @@
 import de.symeda.sormas.app.ebs.edit.EbsNewActivity;
 import de.symeda.sormas.app.util.Callback;
 import de.symeda.sormas.app.util.DataUtils;
-import de.symeda.sormas.app.util.InfrastructureDaoHelper;
 
 public class EbsListActivity extends PagedBaseListActivity {
 
@@ -158,15 +154,15 @@ public void addFiltersToPageMenu() {
 		filterBinding.ebsSourceInformationFilter.initializeSpinner(sourceInformation);
 		filterBinding.triagingSignalCategoryFilter.initializeSpinner(signalCategory);
 		filterBinding.triagingTriagingDecisionFilter.initializeSpinner(triagingDecision);
-		if (currentUser.getJurisdictionLevel() == JurisdictionLevel.NATION) {
-			filterBinding.ebsRegionFilter.initializeSpinner(InfrastructureDaoHelper.loadRegionsByServerCountry());
-			filterBinding.ebsRegionFilter.addValueChangedListener(e -> {
-				filterBinding.ebsDistrictFilter.initializeSpinner(InfrastructureDaoHelper.loadDistricts((Region) e.getValue()));
-			});
-			filterBinding.ebsDistrictFilter.addValueChangedListener(e -> {
-				filterBinding.ebsCommunityFilter.initializeSpinner(InfrastructureDaoHelper.loadCommunities((District) e.getValue()));
-			});
-		}
+//		if (currentUser.getJurisdictionLevel() == JurisdictionLevel.NATION) {
+//			filterBinding.ebsRegionFilter.initializeSpinner(InfrastructureDaoHelper.loadRegionsByServerCountry());
+//			filterBinding.ebsRegionFilter.addValueChangedListener(e -> {
+//				filterBinding.ebsDistrictFilter.initializeSpinner(InfrastructureDaoHelper.loadDistricts((Region) e.getValue()));
+//			});
+//			filterBinding.ebsDistrictFilter.addValueChangedListener(e -> {
+//				filterBinding.ebsCommunityFilter.initializeSpinner(InfrastructureDaoHelper.loadCommunities((District) e.getValue()));
+//			});
+//		}
 
 		filterBinding.ebsReportDateTimeFilter.initializeDateField(getSupportFragmentManager());
 		filterBinding.triagingDecisionDateFilter.initializeDateField(getSupportFragmentManager());
diff --git a/sormas-app/app/src/main/res/layout/fragment_ebs_edit_layout.xml b/sormas-app/app/src/main/res/layout/fragment_ebs_edit_layout.xml
index 3625798075b..4aa512ce8ce 100644
--- a/sormas-app/app/src/main/res/layout/fragment_ebs_edit_layout.xml
+++ b/sormas-app/app/src/main/res/layout/fragment_ebs_edit_layout.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ SORMAS® - Surveillance Outbreak Response Management & Analysis System
   ~ Copyright © 2016-2021 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
   ~
@@ -20,26 +19,50 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="contentDescription"
+    android:id="@+id/base_layout"
     android:descendantFocusability="beforeDescendants"
-    android:id="@+id/base_layout">
+    tools:ignore="contentDescription">
 
 
     <data>
+
         <import type="android.view.View" />
-        <import type="de.symeda.sormas.api.ebs.EbsSourceType"/>
-        <import type="de.symeda.sormas.api.ebs.PersonReporting"/>
-        <import type="de.symeda.sormas.api.ebs.ManualScanningType"/>
-        <import type="de.symeda.sormas.api.ebs.MediaScannningType"/>
-        <import type="de.symeda.sormas.api.ebs.AutomaticScanningType"/>
-
-
-        <variable name="data" type="de.symeda.sormas.app.backend.ebs.Ebs"/>
-        <variable name="ebsSourceTypeClass" type="Class" />
-        <variable name="manualScanningTypeClass" type="Class" />
-        <variable name="mediaScannningTypeClass" type="Class" />
-        <variable name="mobileScannningTypeClass" type="Class" />
-        <variable name="automaticScanningTypeClass" type="Class" />
+
+        <import type="de.symeda.sormas.api.ebs.EbsSourceType" />
+
+        <import type="de.symeda.sormas.api.ebs.PersonReporting" />
+
+        <import type="de.symeda.sormas.api.ebs.ManualScanningType" />
+
+        <import type="de.symeda.sormas.api.ebs.MediaScannningType" />
+
+        <import type="de.symeda.sormas.api.ebs.AutomaticScanningType" />
+
+
+        <variable
+            name="data"
+            type="de.symeda.sormas.app.backend.ebs.Ebs" />
+
+        <variable
+            name="ebsSourceTypeClass"
+            type="Class" />
+
+        <variable
+            name="manualScanningTypeClass"
+            type="Class" />
+
+        <variable
+            name="mediaScannningTypeClass"
+            type="Class" />
+
+        <variable
+            name="mobileScannningTypeClass"
+            type="Class" />
+
+        <variable
+            name="automaticScanningTypeClass"
+            type="Class" />
+
         <import type="de.symeda.sormas.app.component.controls.ControlButtonType" />
     </data>
 
@@ -66,76 +89,84 @@
 
             </LinearLayout>
 
-            <ImageView style="@style/FullHorizontalDividerStyle"/>
+            <ImageView style="@style/FullHorizontalDividerStyle" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
+
                 <de.symeda.sormas.app.component.controls.ControlSpinnerField
                     android:id="@+id/ebs_sourceInformation"
                     style="@style/ControlFirstOfTwoColumnsStyle"
                     app:required="true"
-                    app:value="@={data.sourceInformation}"/>
+                    app:value="@={data.sourceInformation}" />
 
                 <de.symeda.sormas.app.component.controls.ControlSpinnerField
                     android:id="@+id/ebs_categoryOfInformant"
                     style="@style/ControlSecondOfTwoColumnsStyle"
                     app:required="true"
-                    app:value="@={data.categoryOfInformant}"/>
+                    app:value="@={data.categoryOfInformant}" />
             </LinearLayout>
 
             <de.symeda.sormas.app.component.controls.ControlDateField
                 android:id="@+id/ebs_reportDateTime"
-                app:required="true"
                 style="@style/ControlSingleColumnStyle"
                 app:allowedDaysInFuture="0"
+                app:required="true"
                 app:value="@={data.reportDateTime}" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="horizontal"
-                >
+                android:orientation="horizontal">
+
                 <de.symeda.sormas.app.component.controls.ControlTextEditField
                     android:id="@+id/ebs_informantTel"
                     style="@style/ControlFirstOfTwoColumnsStyle"
-                    app:required="true"
                     app:inputType="number"
+                    app:required="true"
                     app:value="@={data.informantTel}" />
 
                 <de.symeda.sormas.app.component.controls.ControlTextEditField
                     android:id="@+id/ebs_informantName"
                     style="@style/ControlSecondOfTwoColumnsStyle"
                     app:value="@={data.informantName}" />
+
                 <de.symeda.sormas.app.component.controls.ControlTextEditField
                     android:id="@+id/ebs_otherInformant"
+                    style="@style/ControlSecondOfTwoColumnsStyle"
                     app:dependencyParentField="@{ebsCategoryOfInformant}"
                     app:dependencyParentValue="@{PersonReporting.OTHER}"
-                    style="@style/ControlSecondOfTwoColumnsStyle"
+                    app:required="true"
                     app:value="@={data.otherInformant}" />
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="horizontal"
-                >
+                android:orientation="horizontal">
+
                 <de.symeda.sormas.app.component.controls.ControlSpinnerField
                     android:id="@+id/ebs_scanningType"
                     style="@style/ControlFirstOfTwoColumnsStyle"
                     app:dependencyParentField="@{ebsSourceInformation}"
                     app:dependencyParentValue="@{EbsSourceType.MEDIA_NEWS}"
-                    app:value="@={data.scanningType}"/>
+                    app:value="@={data.scanningType}" />
 
                 <de.symeda.sormas.app.component.controls.ControlSpinnerField
                     android:id="@+id/ebs_automaticScanningType"
                     style="@style/ControlSecondOfTwoColumnsStyle"
                     app:dependencyParentField="@{ebsScanningType}"
                     app:dependencyParentValue="@{MediaScannningType.AUTOMATIC}"
-                    app:value="@={data.automaticScanningType}"/>
+                    app:value="@={data.automaticScanningType}" />
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
+
                 <de.symeda.sormas.app.component.controls.ControlTextEditField
                     android:id="@+id/ebs_sourceName"
                     style="@style/ControlFirstOfTwoColumnsStyle"
@@ -148,7 +179,7 @@
                     style="@style/ControlFirstOfTwoColumnsStyle"
                     app:dependencyParentField="@{ebsScanningType}"
                     app:dependencyParentValue="@{MediaScannningType.MANUAL}"
-                    app:value="@={data.manualScanningType}"/>
+                    app:value="@={data.manualScanningType}" />
 
                 <de.symeda.sormas.app.component.controls.ControlTextEditField
                     android:id="@+id/ebs_sourceUrl"
@@ -157,6 +188,7 @@
                     app:dependencyParentValue="@{ManualScanningType.ONLINE}"
                     app:inputType="textUri"
                     app:value="@={data.sourceUrl}" />
+
                 <de.symeda.sormas.app.component.controls.ControlTextEditField
                     android:id="@+id/ebs_other"
                     style="@style/ControlSecondOfTwoColumnsStyle"
@@ -164,6 +196,7 @@
                     app:dependencyParentValue="@{ManualScanningType.OTHER}"
                     app:value="@={data.other}" />
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -176,100 +209,111 @@
 
                     <de.symeda.sormas.app.component.controls.InfrastructureSpinnerField
                         android:id="@+id/ebs_region"
-                        app:value="@={data.ebsLocation.region}"
+                        style="@style/ControlFirstOfTwoColumnsStyle"
                         app:required="true"
-                        style="@style/ControlFirstOfTwoColumnsStyle" />
+                        app:value="@={data.ebsLocation.region}" />
 
                     <de.symeda.sormas.app.component.controls.InfrastructureSpinnerField
                         android:id="@+id/ebs_district"
-                        app:value="@={data.ebsLocation.district}"
+                        style="@style/ControlSecondOfTwoColumnsStyle"
                         app:required="true"
-                        style="@style/ControlSecondOfTwoColumnsStyle" />
+                        app:value="@={data.ebsLocation.district}" />
+
                     <de.symeda.sormas.app.component.controls.InfrastructureSpinnerField
                         android:id="@+id/ebs_community"
-                        app:value="@={data.ebsLocation.community}"
-                        style="@style/ControlSecondOfTwoColumnsStyle" />
+                        style="@style/ControlSecondOfTwoColumnsStyle"
+                        app:value="@={data.ebsLocation.community}" />
+
                     <de.symeda.sormas.app.component.controls.ControlTextEditField
                         android:id="@+id/ebs_city"
-                        app:value="@={data.ebsLocation.city}"
-                        style="@style/ControlSecondOfTwoColumnsStyle" />
+                        style="@style/ControlSecondOfTwoColumnsStyle"
+                        app:value="@={data.ebsLocation.city}" />
 
                 </LinearLayout>
             </LinearLayout>
+
             <de.symeda.sormas.app.component.controls.ControlButton
                 android:id="@+id/pick_gps_coordinates"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/buttonControlMarginBottom"
-                app:slim="true"
-                app:iconStart="@drawable/ic_gps_fixed_black_24dp"
+                android:text="@string/action_pick_gps"
                 app:buttonType="@{ControlButtonType.SECONDARY}"
-                android:text="@string/action_pick_gps" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <de.symeda.sormas.app.component.controls.ControlTextEditField
-                android:id="@+id/ebs_ebsLatitude"
-                style="@style/ControlFirstOfTwoColumnsStyle"
-                app:inputType="numberDecimal"
-                app:value="@={data.ebsLatitude}" />
+                app:iconStart="@drawable/ic_gps_fixed_black_24dp"
+                app:slim="true" />
 
-            <de.symeda.sormas.app.component.controls.ControlTextEditField
-                android:id="@+id/ebs_ebsLongitude"
-                style="@style/ControlSecondOfTwoColumnsStyle"
-                app:inputType="numberDecimal"
-                app:value="@={data.ebsLongitude}" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <de.symeda.sormas.app.component.controls.ControlTextEditField
+                    android:id="@+id/ebs_ebsLatitude"
+                    style="@style/ControlFirstOfTwoColumnsStyle"
+                    app:inputType="numberDecimal"
+                    app:value="@={data.ebsLatitude}" />
+
+                <de.symeda.sormas.app.component.controls.ControlTextEditField
+                    android:id="@+id/ebs_ebsLongitude"
+                    style="@style/ControlSecondOfTwoColumnsStyle"
+                    app:inputType="numberDecimal"
+                    app:value="@={data.ebsLongitude}" />
+
+                <de.symeda.sormas.app.component.controls.ControlTextEditField
+                    android:id="@+id/ebs_ebsLatLon"
+                    style="@style/ControlSecondOfTwoColumnsStyle"
+                    app:inputType="numberDecimal"
+                    app:value="@={data.ebsLatLon}" />
+            </LinearLayout>
 
-            <de.symeda.sormas.app.component.controls.ControlTextEditField
-                android:id="@+id/ebs_ebsLatLon"
-                style="@style/ControlSecondOfTwoColumnsStyle"
-                app:inputType="numberDecimal"
-                app:value="@={data.ebsLatLon}" />
-        </LinearLayout>
             <de.symeda.sormas.app.component.controls.ControlDateTimeField
                 android:id="@+id/ebs_dateOnset"
                 style="@style/ControlSingleColumnStyle"
                 app:allowedDaysInFuture="0"
                 app:value="@={data.dateOnset}" />
+
             <de.symeda.sormas.app.component.controls.ControlTextEditField
                 android:id="@+id/ebs_descriptionOccurrence"
-                app:inputType="textMultiLine"
-                app:textAlignment="gravity"
+                style="@style/ControlSingleColumnStyle"
                 app:gravity="top|start"
-                app:textArea="true"
-                app:singleLine="false"
-                app:required="true"
+                app:inputType="textMultiLine"
                 app:maxLines="5"
-                app:value="@={data.descriptionOccurrence}"
-                style="@style/ControlSingleColumnStyle" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <de.symeda.sormas.app.component.controls.ControlTextEditField
-                android:id="@+id/ebs_personDesignation"
-                style="@style/ControlFirstOfTwoColumnsStyle"
                 app:required="true"
-                app:value="@={data.personDesignation}" />
+                app:singleLine="false"
+                app:textAlignment="gravity"
+                app:textArea="true"
+                app:value="@={data.descriptionOccurrence}" />
 
-            <de.symeda.sormas.app.component.controls.ControlTextEditField
-                android:id="@+id/ebs_personRegistering"
-                style="@style/ControlSecondOfTwoColumnsStyle"
-                app:required="true"
-                app:value="@={data.personRegistering}" />
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <de.symeda.sormas.app.component.controls.ControlTextEditField
-                android:id="@+id/ebs_personPhone"
-                style="@style/ControlFirstOfTwoColumnsStyle"
-                app:required="true"
-                app:inputType="number"
-                app:value="@={data.personPhone}" />
-        </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <de.symeda.sormas.app.component.controls.ControlTextEditField
+                    android:id="@+id/ebs_personDesignation"
+                    style="@style/ControlFirstOfTwoColumnsStyle"
+                    app:required="true"
+                    app:value="@={data.personDesignation}" />
+
+                <de.symeda.sormas.app.component.controls.ControlTextEditField
+                    android:id="@+id/ebs_personRegistering"
+                    style="@style/ControlSecondOfTwoColumnsStyle"
+                    app:required="true"
+                    app:value="@={data.personRegistering}" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <de.symeda.sormas.app.component.controls.ControlTextEditField
+                    android:id="@+id/ebs_personPhone"
+                    style="@style/ControlFirstOfTwoColumnsStyle"
+                    app:inputType="number"
+                    app:required="true"
+                    app:value="@={data.personPhone}" />
+            </LinearLayout>
         </LinearLayout>
 
     </ScrollView>
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/ebs/TriagingDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/ebs/TriagingDataForm.java
index d0c03ff162f..cbaeffbf8bb 100644
--- a/sormas-ui/src/main/java/de/symeda/sormas/ui/ebs/TriagingDataForm.java
+++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/ebs/TriagingDataForm.java
@@ -51,6 +51,7 @@
 import de.symeda.sormas.ui.utils.CssStyles;
 import de.symeda.sormas.ui.utils.EbsDateValidator;
 import de.symeda.sormas.ui.utils.FieldHelper;
+import de.symeda.sormas.ui.utils.FutureDateValidator;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
 import de.symeda.sormas.ui.utils.VaadinUiUtil;
 
@@ -623,6 +624,7 @@ public void validateDateFields(EbsDto selectedEbs) {
 		} else {
 			dateDecision.removeAllValidators();
 		}
+		dateOfDecision.addValidator(new FutureDateValidator(dateOfDecision, 0, I18nProperties.getCaption(Captions.Triaging_decisionDate)));
 	}
 
 	private Date clearTime(Date date) {