Merge pull request #9950 from hzi-braunschweig/bugfix-9921-event-part…

…icipant-navigation fix person Uuid navigation in event participant grid #9921
SORMAS-Foundation · Jul 27, 2022 · 96a943e · 96a943e
2 parents 586f7a7 + 81000b3
commit 96a943e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventParticipantsGrid.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventParticipantsGrid.java
@@ -1,20 +1,18 @@
-/*******************************************************************************
+/*
  * SORMAS® - Surveillance Outbreak Response Management & Analysis System
- * Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
- *
+ * Copyright © 2016-2022 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *******************************************************************************/
+ */
+
 package de.symeda.sormas.ui.events;
 
 import java.util.Date;
@@ -28,6 +26,7 @@
 import de.symeda.sormas.api.event.EventParticipantCriteria;
 import de.symeda.sormas.api.event.EventParticipantDto;
 import de.symeda.sormas.api.event.EventParticipantIndexDto;
+import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.sample.PathogenTestResultType;
@@ -124,6 +123,13 @@ public EventParticipantsGrid(EventParticipantCriteria criteria) {
 				ControllerProvider.getCaseController().createFromEventParticipant(eventParticipant);
 			}
 		}));
+		addItemClickListener(new ShowDetailsListener<>(EventParticipantIndexDto.PERSON_UUID, e -> {
+			if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.PERSON_MANAGEMENT)) {
+				ControllerProvider.getPersonController().navigateToPerson(e.getPersonUuid());
+			} else {
+				ControllerProvider.getEventParticipantController().navigateToData(e.getUuid());
+			}
+		}));
 		addItemClickListener(
 			new ShowDetailsListener<>(
 				EventParticipantIndexDto.UUID,

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/immunization/ImmunizationController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/immunization/ImmunizationController.java
@@ -61,7 +61,11 @@ public void create(PersonReferenceDto person, Disease disease) {
 	}
 
 	public void navigateToImmunization(String uuid) {
-		final String navigationState = ImmunizationDataView.VIEW_NAME + "/" + uuid;
+		navigateToView(ImmunizationDataView.VIEW_NAME, uuid);
+	}
+
+	public void navigateToView(String viewName, String uuid) {
+		final String navigationState = viewName + "/" + uuid;
 		SormasUI.get().getNavigator().navigateTo(navigationState);
 	}
 
@@ -131,9 +135,12 @@ private CommitDiscardWrapperComponent<ImmunizationCreationForm> getImmunizationC
 		return null;
 	}
 
-	public CommitDiscardWrapperComponent<ImmunizationDataForm> getImmunizationDataEditComponent(ImmunizationDto immunizationDto, Consumer<Runnable> actionCallback) {
+	public CommitDiscardWrapperComponent<ImmunizationDataForm> getImmunizationDataEditComponent(
+		ImmunizationDto immunizationDto,
+		Consumer<Runnable> actionCallback) {
 
-		ImmunizationDataForm immunizationDataForm = new ImmunizationDataForm(immunizationDto.isPseudonymized(), immunizationDto.getRelatedCase(), actionCallback);
+		ImmunizationDataForm immunizationDataForm =
+			new ImmunizationDataForm(immunizationDto.isPseudonymized(), immunizationDto.getRelatedCase(), actionCallback);
 		immunizationDataForm.setValue(immunizationDto);
 
 		UserProvider currentUserProvider = UserProvider.getCurrent();

diff --git a/...s-ui/src/main/java/de/symeda/sormas/ui/immunization/components/grid/ImmunizationGrid.java b/...s-ui/src/main/java/de/symeda/sormas/ui/immunization/components/grid/ImmunizationGrid.java
@@ -10,13 +10,15 @@
 
 import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.caze.AgeAndBirthDateDto;
+import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.immunization.ImmunizationCriteria;
 import de.symeda.sormas.api.immunization.ImmunizationIndexDto;
 import de.symeda.sormas.api.person.PersonDto;
 import de.symeda.sormas.api.person.PersonHelper;
 import de.symeda.sormas.api.utils.SortProperty;
 import de.symeda.sormas.ui.ControllerProvider;
+import de.symeda.sormas.ui.immunization.ImmunizationPersonView;
 import de.symeda.sormas.ui.utils.DateFormatHelper;
 import de.symeda.sormas.ui.utils.FieldAccessColumnStyleGenerator;
 import de.symeda.sormas.ui.utils.FilteredGrid;
@@ -31,6 +33,13 @@ public ImmunizationGrid(ImmunizationCriteria criteria) {
 		setLazyDataProvider();
 		setCriteria(criteria);
 		initColumns();
+		addItemClickListener(new ShowDetailsListener<>(ImmunizationIndexDto.PERSON_UUID, e -> {
+			if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.PERSON_MANAGEMENT)) {
+				ControllerProvider.getPersonController().navigateToPerson(e.getPersonUuid());
+			} else {
+				ControllerProvider.getImmunizationController().navigateToView(ImmunizationPersonView.VIEW_NAME, e.getUuid());
+			}
+		}));
 		addItemClickListener(
 			new ShowDetailsListener<>(
 				ImmunizationIndexDto.UUID,