#183 added the new request features

ePareto-Information-System · Jan 24, 2025 · 6c3d301 · 6c3d301
1 parent 19c3018
commit 6c3d301
Show file tree

Hide file tree

Showing 4 changed files with 149 additions and 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
@@ -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
@@ -16,23 +16,19 @@
 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;
 import de.symeda.sormas.app.databinding.FilterEbsListLayoutBinding;
 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());