Merge pull request #13309 from SORMAS-Foundation/feature-13303-enable-contact-tracing-for-measles-disease

#13303 enable default contract tracing for measles disease

Author: obinna-h-n

sormas-api/src/main/java/de/symeda/sormas/api/Disease.java

@@ -33,7 +33,7 @@ public enum Disease
 	EVD(true, true, true, false, true, 21, true, false, false),
 	GUINEA_WORM(true, true, true, false, false, 0, true, false, false),
 	LASSA(true, true, true, false, true, 21, true, false, false),
-	MEASLES(true, true, true, false, false, 21, true, true, false),
+	MEASLES(true, true, true, false, true, 21, true, true, false),
 	MONKEYPOX(true, true, true, false, true, 21, true, false, false),
 	NEW_INFLUENZA(true, true, true, false, true, 17, true, false, false),
 	PLAGUE(true, true, true, false, true, 7, true, false, false),

sormas-api/src/main/java/de/symeda/sormas/api/disease/DiseaseConfigurationFacade.java

@@ -67,4 +67,6 @@ List<DiseaseConfigurationIndexDto> getIndexList(
 		Integer first,
 		Integer max,
 		List<SortProperty> sortProperties);
+
+	void loadData();
 }

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -13836,4 +13836,10 @@ ALTER TABLE environments_history ADD COLUMN vectortype varchar(255);
 ALTER TABLE environmentsamples_history ADD COLUMN vectortype varchar(255);
 
 INSERT INTO schema_version (version_number, comment) VALUES (561, 'Added vectors to the environment #13267');
+
+-- 2025-03-17 add default disease configuration user rights for admin user role #13265
+INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'DISEASE_MANAGEMENT' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN');
+
+INSERT INTO schema_version (version_number, comment) VALUES (562, 'Disease configuration user interface #13265');
+
 -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***

sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/disease/DiseaseConfigurationController.java

@@ -36,6 +36,7 @@ public void editDiseaseConfiguration(String uuid) {
 			new CommitDiscardWrapperComponent<>(editForm, editForm.getFieldGroup());
 		cdw.addCommitListener(() -> {
 			FacadeProvider.getDiseaseConfigurationFacade().saveDiseaseConfiguration(editForm.getValue());
+			FacadeProvider.getDiseaseConfigurationFacade().loadData();
 			Notification.show(I18nProperties.getString(Strings.messageDiseaseConfigurationSaved), Notification.Type.ASSISTIVE_NOTIFICATION);
 			SormasUI.get().getNavigator().navigateTo(DiseaseConfigurationView.VIEW_NAME);
 		});

sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/disease/DiseaseConfigurationView.java

@@ -16,6 +16,8 @@
 package de.symeda.sormas.ui.configuration.disease;
 
 import java.util.Arrays;
+import java.util.Comparator;
+import java.util.stream.Collectors;
 
 import com.vaadin.navigator.ViewChangeListener;
 import com.vaadin.ui.Alignment;
@@ -25,7 +27,6 @@
 
 import de.symeda.sormas.api.ActiveRelevanceStatus;
 import de.symeda.sormas.api.Disease;
-import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.customizableenum.CustomizableEnumValueIndexDto;
 import de.symeda.sormas.api.disease.DiseaseConfigurationCriteria;
 import de.symeda.sormas.api.disease.DiseaseConfigurationFilterReportingType;
@@ -103,7 +104,7 @@ private HorizontalLayout createFilterBar() {
 
 		diseaseFilter = new ComboBox<>(
 			I18nProperties.getPrefixCaption(CustomizableEnumValueIndexDto.I18N_PREFIX, CustomizableEnumValueIndexDto.DISEASES),
-			FacadeProvider.getDiseaseConfigurationFacade().getAllDiseases(true, true, true));
+			Arrays.stream(Disease.values()).sorted(Comparator.comparing(Disease::toString)).collect(Collectors.toList()));
 		diseaseFilter.addValueChangeListener(e -> {
 			criteria.disease(e.getValue());
 			grid.reload();