From c962ec3ad8dd258156dd5481037ddd6d4e8921cf Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 31 Mar 2026 08:53:56 +0200 Subject: [PATCH 1/8] FIX: 13788: fix menu system config value regexes --- .../src/main/resources/sql/sormas_schema.sql | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql index 50cdc690be6..3b74572bb3e 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema.sql @@ -15467,4 +15467,18 @@ ALTER TABLE exposures_protectivemeasures_history OWNER TO sormas_user; INSERT INTO schema_version (version_number, comment) VALUES (614, '#13887 - Exposure form redesign'); +-- updated regexes for MENU system config values +UPDATE systemconfigurationvalue +SET value_pattern = '^(default|red|green|indigo|gray)|(#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}))$' +WHERE config_key = 'MENU_BACKGROUND_COLOR'; + +UPDATE systemconfigurationvalue +SET value_pattern = '^[\w\s]{0,16}$' +WHERE config_key = 'MENU_SUBTITLE'; + +INSERT INTO schema_version (version_number, comment) VALUES (615, '#13552 - FIX menu regexes'); + + + + -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. *** From 6dc608d6a57d1ac21f05c37e7b41cba7cd49bc8c Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 31 Mar 2026 09:02:01 +0200 Subject: [PATCH 2/8] Hex color enhancements --- sormas-api/src/main/resources/validations.properties | 2 +- sormas-ui/src/main/java/de/symeda/sormas/ui/Menu.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sormas-api/src/main/resources/validations.properties b/sormas-api/src/main/resources/validations.properties index e4b5a628975..00c7618f90e 100644 --- a/sormas-api/src/main/resources/validations.properties +++ b/sormas-api/src/main/resources/validations.properties @@ -330,5 +330,5 @@ systemConfigurationValueValidationNotAValidEmailsenderName = Value is not a vali systemConfigurationValueValidationNotAValidSmsSenderName = Value is not a valid name. Name should contain only letters and numbers without spaces & special characters. For more info please see https://developer.vonage.com/en/messaging/sms/guides/custom-sender-id . smsAuthKeyValueValidation = SMS Auth key value is not valid smsAuthSecretValueValidation = SMS Auth secret value is not valid -systemConfigurationValueValidationInvalidBackgroundColor = Pre-defined values are: green, red, indigo, gray, default (case-sensitive) otherwise must match hexadecimal format, example: #dd2b0e or #4AA +systemConfigurationValueValidationInvalidBackgroundColor = Pre-defined values are: green, red, indigo, gray, default (case-sensitive) otherwise must match hexadecimal format (with or without hash "#"), example: #dd2b0e or #4AA or dd2b0e systemConfigurationValueValidationMenuSubtitle = Can be empty or up to 16 (any) characters. Can be used to define name of the environment: PRODUCTION - TEST etc. diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/Menu.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/Menu.java index 0dad140391f..177b24d8b11 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/Menu.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/Menu.java @@ -75,6 +75,8 @@ public class Menu extends CssLayout { private static final String COLOR_BACKGROUND_STYLE_NAME = "color-background"; private static final String MENU_SUBTITLE_STYLE_NAME = "menu-subtitle"; private static final String TOP_MENU_CONTAINER_STYLE_NAME = "top-menu-container"; + private static final String HASH = "#"; + private final Navigator navigator; private final Map viewButtons = new HashMap<>(); @@ -214,11 +216,18 @@ private static void defineMenuSubtitleIfSystemConfigured(VerticalLayout topConta actualColorBackgroundColor = "#737278"; break; default: - actualColorBackgroundColor = backgroundColor; + actualColorBackgroundColor = addHashIfMissing(backgroundColor); } return actualColorBackgroundColor; } + private static String addHashIfMissing(String backgroundColor) { + if (!StringUtils.startsWith(backgroundColor, HASH)) { + return HASH + backgroundColor; + } + return backgroundColor; + } + private void showSettingsPopup() { Window window = VaadinUiUtil.createPopupWindow(); From b3128cef8ebe1ccfdba56786e3c3545acf51af3d Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 31 Mar 2026 09:13:19 +0200 Subject: [PATCH 3/8] fixed regex allowing invalid values --- sormas-backend/src/main/resources/sql/sormas_schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql index 3b74572bb3e..bc44c49363b 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema.sql @@ -15469,7 +15469,7 @@ INSERT INTO schema_version (version_number, comment) VALUES (614, '#13887 - Expo -- updated regexes for MENU system config values UPDATE systemconfigurationvalue -SET value_pattern = '^(default|red|green|indigo|gray)|(#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}))$' +SET value_pattern = '^(default|red|green|indigo|gray)$|^(#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}))$' WHERE config_key = 'MENU_BACKGROUND_COLOR'; UPDATE systemconfigurationvalue From cfa042ed6be15c33795789e288cf387ac76bf630 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 22 Apr 2026 14:47:11 +0200 Subject: [PATCH 4/8] fixed wording / error message issues --- .../src/main/java/de/symeda/sormas/api/i18n/Strings.java | 7 +++++-- sormas-api/src/main/resources/strings.properties | 1 + sormas-backend/src/main/resources/sql/sormas_schema.sql | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java index ebc166eab95..77e93a89faa 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java @@ -1134,7 +1134,8 @@ public interface Strings { String infoPickOrCreatePathogenTest = "infoPickOrCreatePathogenTest"; String infoPickOrCreateSample = "infoPickOrCreateSample"; String infoPickOrCreateSuperordinateEventForEvent = "infoPickOrCreateSuperordinateEventForEvent"; - String infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent = "infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent"; + String infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent = + "infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent"; String infoPlaceOfStayInHospital = "infoPlaceOfStayInHospital"; String infoPopulationCollectionDate = "infoPopulationCollectionDate"; String infoPopulationDataView = "infoPopulationDataView"; @@ -1173,10 +1174,12 @@ public interface Strings { String infoSyncUsers = "infoSyncUsers"; String infoSystemConfigurationValueDescriptionEmailSenderAddress = "infoSystemConfigurationValueDescriptionEmailSenderAddress"; String infoSystemConfigurationValueDescriptionEmailSenderName = "infoSystemConfigurationValueDescriptionEmailSenderName"; + String infoSystemConfigurationValueDescriptionMenuBackgroundColor = "infoSystemConfigurationValueDescriptionMenuBackgroundColor"; String infoSystemConfigurationValueDescriptionSmsAuthKey = "infoSystemConfigurationValueDescriptionSmsAuthKey"; String infoSystemConfigurationValueDescriptionSmsAuthSecret = "infoSystemConfigurationValueDescriptionSmsAuthSecret"; String infoSystemConfigurationValueDescriptionSmsSenderName = "infoSystemConfigurationValueDescriptionSmsSenderName"; - String infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus = "infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus"; + String infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus = + "infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus"; String infoTasksWithMultipleJurisdictionsSelected = "infoTasksWithMultipleJurisdictionsSelected"; String infoUploadDocumentTemplate = "infoUploadDocumentTemplate"; String infoUsageOfEditableCampaignGrids = "infoUsageOfEditableCampaignGrids"; diff --git a/sormas-api/src/main/resources/strings.properties b/sormas-api/src/main/resources/strings.properties index 3d394e17124..d490292afa0 100644 --- a/sormas-api/src/main/resources/strings.properties +++ b/sormas-api/src/main/resources/strings.properties @@ -2018,6 +2018,7 @@ infoSystemConfigurationValueDescriptionSmsSenderName=Name that will be set as th infoSystemConfigurationValueDescriptionSmsAuthKey=SORMAS supports the delivery of SMS notifications via Vonage (https://www.vonage.com/communications-apis/). You need to specify a valid authentication key and secret in order to use this feature. SORMAS will not attempt to send out SMS if these properties are left empty. infoSystemConfigurationValueDescriptionSmsAuthSecret=Secret for SMS authentication. infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus=Use automatic vaccination status. The status will be derived from vaccination data. +infoSystemConfigurationValueDescriptionMenuBackgroundColor=Allows to change background color of the menu to distinguish between different SORMAS instances. notificationCannotCreate=Cannot Create Or Edit Notification notificationCreationNotAllowedWithoutSurveillanceReport=Notifier creation or modification is not allowed when a surveillance report already exists for this case. diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql index b99ab366ffe..5249d5441db 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema.sql @@ -15705,7 +15705,8 @@ INSERT INTO schema_version (version_number, comment) VALUES (620, '#13828 - Add -- updated regexes for MENU system config values UPDATE systemconfigurationvalue -SET value_pattern = '^(default|red|green|indigo|gray)$|^(#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}))$' +SET value_pattern = '^(default|red|green|indigo|gray)$|^(#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}))$', + value_description = 'i18n/systemConfigurationValueValidation.systemConfigurationValueValidationInvalidBackgroundColor', WHERE config_key = 'MENU_BACKGROUND_COLOR'; UPDATE systemconfigurationvalue From b02b534899e66ddcea045dcb46a6a878786fb17c Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 22 Apr 2026 14:52:32 +0200 Subject: [PATCH 5/8] merged develop --- .../src/main/resources/sql/sormas_schema.sql | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql index e960cc44903..4bb62e9098f 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema.sql @@ -15513,11 +15513,11 @@ ALTER TABLE testreport ADD COLUMN IF NOT EXISTS serotypetext varchar(255); UPDATE testreport SET serotypetext = serotype, serotype = 'OTHER' WHERE serotype IS NOT null and serotypetext is null; DO $$ BEGIN - IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotyperesult') + IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotyperesult') AND NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotype') THEN ALTER TABLE testreport RENAME COLUMN genotyperesult TO genotype; END IF; - IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotyperesulttext') + IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotyperesulttext') AND NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotypetext') THEN ALTER TABLE testreport RENAME COLUMN genotyperesulttext TO genotypetext; END IF; @@ -15527,11 +15527,11 @@ ALTER TABLE testreport_history ADD COLUMN IF NOT EXISTS serotypetext varchar(255 UPDATE testreport_history SET serotypetext = serotype, serotype = 'OTHER' WHERE serotype IS NOT null and serotypetext is null; DO $$ BEGIN - IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotyperesult') + IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotyperesult') AND NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotype') THEN ALTER TABLE testreport_history RENAME COLUMN genotyperesult TO genotype; END IF; - IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotyperesulttext') + IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotyperesulttext') AND NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotypetext') THEN ALTER TABLE testreport_history RENAME COLUMN genotyperesulttext TO genotypetext; END IF; @@ -15770,4 +15770,17 @@ UPDATE diseaseconfiguration SET exposurecategories = 'VECTOR_BORNE' WHERE diseas INSERT INTO schema_version (version_number, comment) VALUES (622, '#13887 default disease exposure category configuration'); +-- updated regexes for MENU system config values +UPDATE systemconfigurationvalue +SET value_pattern = '^(default|red|green|indigo|gray)$|^(#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}))$', +value_description = 'i18n/infoSystemConfigurationValueDescriptionMenuBackgroundColor', +validation_message = 'i18n/systemConfigurationValueValidationInvalidBackgroundColor' +WHERE config_key = 'MENU_BACKGROUND_COLOR'; + +UPDATE systemconfigurationvalue +SET value_pattern = '^[\w\s]{0,16}$' +WHERE config_key = 'MENU_SUBTITLE'; + +INSERT INTO schema_version (version_number, comment) VALUES (623, '#13552 - FIX menu regexes'); + -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. *** From e737546db8830f48c54ae2538f4af9eb096420d7 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 22 Apr 2026 14:55:16 +0200 Subject: [PATCH 6/8] revert SQL changes --- sormas-backend/src/main/resources/sql/sormas_schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql index 4bb62e9098f..f91b392abe6 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema.sql @@ -15783,4 +15783,4 @@ WHERE config_key = 'MENU_SUBTITLE'; INSERT INTO schema_version (version_number, comment) VALUES (623, '#13552 - FIX menu regexes'); --- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. *** +-- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. *** \ No newline at end of file From 28ed444aae92a042471d367ff29902ca41912978 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 22 Apr 2026 14:58:04 +0200 Subject: [PATCH 7/8] revert SQL format --- .../src/main/resources/sql/sormas_schema.sql | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql index f91b392abe6..145e21dbba8 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema.sql @@ -15513,11 +15513,11 @@ ALTER TABLE testreport ADD COLUMN IF NOT EXISTS serotypetext varchar(255); UPDATE testreport SET serotypetext = serotype, serotype = 'OTHER' WHERE serotype IS NOT null and serotypetext is null; DO $$ BEGIN - IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotyperesult') + IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotyperesult') AND NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotype') THEN ALTER TABLE testreport RENAME COLUMN genotyperesult TO genotype; END IF; - IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotyperesulttext') + IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotyperesulttext') AND NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport' AND column_name = 'genotypetext') THEN ALTER TABLE testreport RENAME COLUMN genotyperesulttext TO genotypetext; END IF; @@ -15527,11 +15527,11 @@ ALTER TABLE testreport_history ADD COLUMN IF NOT EXISTS serotypetext varchar(255 UPDATE testreport_history SET serotypetext = serotype, serotype = 'OTHER' WHERE serotype IS NOT null and serotypetext is null; DO $$ BEGIN - IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotyperesult') + IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotyperesult') AND NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotype') THEN ALTER TABLE testreport_history RENAME COLUMN genotyperesult TO genotype; END IF; - IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotyperesulttext') + IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotyperesulttext') AND NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'testreport_history' AND column_name = 'genotypetext') THEN ALTER TABLE testreport_history RENAME COLUMN genotyperesulttext TO genotypetext; END IF; @@ -15550,7 +15550,7 @@ alter table exposures_contactfactors add constraint exposures_contactfactors_pk DROP TRIGGER IF EXISTS delete_history_trigger ON exposures_contactfactors; alter table exposures_protectivemeasures drop constraint unq_exposures_protectivemeasures_0; -alter table exposures_protectivemeasures add constraint exposures_protectivemeasures_pk primary key (exposure_id, protectivemeasure); +alter table exposures_protectivemeasures add constraint exposures_protectivemeasures_pk primary key (exposure_id, protectivemeasure); DROP TRIGGER IF EXISTS delete_history_trigger ON exposures_protectivemeasures; INSERT INTO schema_version (version_number, comment) VALUES (617, '#13887 update keys and drop delete history triggers for new exposures tables'); @@ -15598,20 +15598,20 @@ CREATE TABLE IF NOT EXISTS customizablefieldmetadata ( change_user_id bigint, sys_period tstzrange NOT NULL, - + PRIMARY KEY (id), UNIQUE(name, contextClass) ); -CREATE INDEX idx_customizablefieldmetadata_uuid +CREATE INDEX idx_customizablefieldmetadata_uuid ON customizablefieldmetadata (uuid); -CREATE INDEX idx_customizablefieldmetadata_contextClass +CREATE INDEX idx_customizablefieldmetadata_contextClass ON customizablefieldmetadata (contextClass); -CREATE INDEX idx_customizablefieldmetadata_uiGroup +CREATE INDEX idx_customizablefieldmetadata_uiGroup ON customizablefieldmetadata (uiGroup); -CREATE INDEX idx_customizablefieldmetadata_active +CREATE INDEX idx_customizablefieldmetadata_active ON customizablefieldmetadata (active); -CREATE INDEX idx_customizablefieldmetadata_deleted +CREATE INDEX idx_customizablefieldmetadata_deleted ON customizablefieldmetadata (deleted); ALTER TABLE customizablefieldmetadata OWNER TO sormas_user; @@ -15662,20 +15662,20 @@ CREATE TABLE IF NOT EXISTS customizablefieldvalue ( change_user_id bigint, sys_period tstzrange NOT NULL, - + PRIMARY KEY (id), UNIQUE(customizablefieldmetadata_id, entityUuid, contextClass) ); -CREATE INDEX idx_customizablefieldvalue_uuid +CREATE INDEX idx_customizablefieldvalue_uuid ON customizablefieldvalue (uuid); -CREATE INDEX idx_customizablefieldvalue_entityUuid +CREATE INDEX idx_customizablefieldvalue_entityUuid ON customizablefieldvalue (entityUuid); -CREATE INDEX idx_customizablefieldvalue_contextEntity +CREATE INDEX idx_customizablefieldvalue_contextEntity ON customizablefieldvalue (contextClass, entityUuid); -CREATE INDEX idx_customizablefieldvalue_fieldMetadata +CREATE INDEX idx_customizablefieldvalue_fieldMetadata ON customizablefieldvalue (customizablefieldmetadata_id); -CREATE INDEX idx_customizablefieldvalue_deleted +CREATE INDEX idx_customizablefieldvalue_deleted ON customizablefieldvalue (deleted); ALTER TABLE customizablefieldvalue ADD CONSTRAINT fk_change_user_id FOREIGN KEY (change_user_id) REFERENCES users (id); From 9e8dfd80ef64eba9b7341d2bae6b8c678137ae47 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 22 Apr 2026 15:06:05 +0200 Subject: [PATCH 8/8] Formatting of Strings.java breaks CI --- .../src/main/java/de/symeda/sormas/api/i18n/Strings.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java index 77e93a89faa..950cfc14c65 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java @@ -1134,8 +1134,7 @@ public interface Strings { String infoPickOrCreatePathogenTest = "infoPickOrCreatePathogenTest"; String infoPickOrCreateSample = "infoPickOrCreateSample"; String infoPickOrCreateSuperordinateEventForEvent = "infoPickOrCreateSuperordinateEventForEvent"; - String infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent = - "infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent"; + String infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent = "infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent"; String infoPlaceOfStayInHospital = "infoPlaceOfStayInHospital"; String infoPopulationCollectionDate = "infoPopulationCollectionDate"; String infoPopulationDataView = "infoPopulationDataView"; @@ -1178,8 +1177,7 @@ public interface Strings { String infoSystemConfigurationValueDescriptionSmsAuthKey = "infoSystemConfigurationValueDescriptionSmsAuthKey"; String infoSystemConfigurationValueDescriptionSmsAuthSecret = "infoSystemConfigurationValueDescriptionSmsAuthSecret"; String infoSystemConfigurationValueDescriptionSmsSenderName = "infoSystemConfigurationValueDescriptionSmsSenderName"; - String infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus = - "infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus"; + String infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus = "infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus"; String infoTasksWithMultipleJurisdictionsSelected = "infoTasksWithMultipleJurisdictionsSelected"; String infoUploadDocumentTemplate = "infoUploadDocumentTemplate"; String infoUsageOfEditableCampaignGrids = "infoUsageOfEditableCampaignGrids";