Merge pull request #13474 from SORMAS-Foundation/bugfix-13430-error-occurred-after-clicking-the-adverse-events-menu

bugfix 13430-error-occurred-after-clicking-the-adverse-events-menu

Author: obinna-h-n

sormas-api/src/main/java/de/symeda/sormas/api/adverseeventsfollowingimmunization/AefiCriteria.java

@@ -71,8 +71,8 @@ public class AefiCriteria extends BaseCriteria implements Serializable {
 	private Date toDate;
 	private EntityRelevanceStatus relevanceStatus;
 
-	private boolean showSeriousAefiForMap;
-	private boolean showNonSeriousAefiForMap;
+	private Boolean showSeriousAefiForMap = false;
+	private Boolean showNonSeriousAefiForMap = false;
 
 	public Disease getDisease() {
 		return disease;
@@ -230,21 +230,21 @@ public AefiCriteria aefiType(AefiType aefiType) {
 		return this;
 	}
 
-	public AefiCriteria showSeriousAefiForMap(boolean showSeriousAefi) {
+	public AefiCriteria showSeriousAefiForMap(Boolean showSeriousAefi) {
 		this.showSeriousAefiForMap = showSeriousAefi;
 		return this;
 	}
 
-	public AefiCriteria showNonSeriousAefiForMap(boolean showNonSeriousAefi) {
+	public AefiCriteria showNonSeriousAefiForMap(Boolean showNonSeriousAefi) {
 		this.showNonSeriousAefiForMap = showNonSeriousAefi;
 		return this;
 	}
 
-	public boolean isShowSeriousAefiForMap() {
+	public Boolean isShowSeriousAefiForMap() {
 		return showSeriousAefiForMap;
 	}
 
-	public boolean isShowNonSeriousAefiForMap() {
+	public Boolean isShowNonSeriousAefiForMap() {
 		return showNonSeriousAefiForMap;
 	}
 }

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

@@ -13862,11 +13862,7 @@ DROP TRIGGER IF EXISTS versioning_trigger ON events_environments;
 CREATE TRIGGER versioning_trigger BEFORE INSERT OR UPDATE OR DELETE ON events_environments
     FOR EACH ROW EXECUTE PROCEDURE versioning('sys_period', 'events_environments_history','true');
 
-INSERT INTO userroles_userrights
-(userright, sys_period, userrole_id)
-VALUES('ENVIRONMENT_LINK', tstzrange(
-                CURRENT_TIMESTAMP, CURRENT_TIMESTAMP + INTERVAL '1 hour', '[)'
-                           ), 1);
+INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'ENVIRONMENT_LINK' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN','NATIONAL_USER');
 
 INSERT INTO schema_version (version_number, comment) VALUES (563, 'Events and environment linkage #13266');
 

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/gis/GisDashboardMapComponent.java

@@ -182,14 +182,31 @@ protected void addComponents() {
 	}
 
 	protected void updateEntityLoadingStatus() {
-		loadCases = showCasesCheckBox.getValue();
-		loadContacts = showContactsCheckBox.getValue();
-		loadSamples = showCaseSamplesCheckBox.getValue()
-			|| showContactSamplesCheckBox.getValue()
-			|| showEventParticipantSamplesCheckBox.getValue()
-			|| showEnvironmentSamplesCheckBox.getValue();
-		loadAefi = showSeriousAefiCheckBox.getValue() || showNonSeriousAefiCheckBox.getValue();
-		loadEvents = showEventsCheckBox.getValue();
+		if (showCasesCheckBox != null) {
+			loadCases = showCasesCheckBox.getValue();
+		}
+
+		if (showContactsCheckBox != null) {
+			loadContacts = showContactsCheckBox.getValue();
+		}
+
+		if (showCaseSamplesCheckBox != null
+			&& showContactSamplesCheckBox != null
+			&& showEventParticipantSamplesCheckBox != null
+			&& showEnvironmentSamplesCheckBox != null) {
+			loadSamples = showCaseSamplesCheckBox.getValue()
+				|| showContactSamplesCheckBox.getValue()
+				|| showEventParticipantSamplesCheckBox.getValue()
+				|| showEnvironmentSamplesCheckBox.getValue();
+		}
+
+		if (showSeriousAefiCheckBox != null && showNonSeriousAefiCheckBox != null) {
+			loadAefi = showSeriousAefiCheckBox.getValue() || showNonSeriousAefiCheckBox.getValue();
+		}
+
+		if (showEventsCheckBox != null) {
+			loadEvents = showEventsCheckBox.getValue();
+		}
 	}
 
 	@Override