Merge remote-tracking branch 'Sormas-Project/development' into development

Author: SergiuPacurariu

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

@@ -103,6 +103,7 @@
 import de.symeda.sormas.api.sormastosormas.share.outgoing.ShareRequestInfoFacade;
 import de.symeda.sormas.api.sormastosormas.share.outgoing.SormasToSormasShareInfoFacade;
 import de.symeda.sormas.api.specialcaseaccess.SpecialCaseAccessFacade;
+import de.symeda.sormas.api.survey.SurveyFacade;
 import de.symeda.sormas.api.survey.SurveyTokenFacade;
 import de.symeda.sormas.api.symptoms.SymptomsFacade;
 import de.symeda.sormas.api.systemevents.SystemEventFacade;
@@ -555,6 +556,10 @@ public static SelfReportImportFacade getSelfReportImportFacade() {
 		return get().lookupEjbRemote(SelfReportImportFacade.class);
 	}
 
+	public static SurveyFacade getSurveyFacade() {
+		return get().lookupEjbRemote(SurveyFacade.class);
+	}
+
 	public static SurveyTokenFacade getSurveyTokenFacade() {
 		return get().lookupEjbRemote(SurveyTokenFacade.class);
 	}

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -2071,6 +2071,7 @@ public interface Captions {
 	String mainMenuSelfReports = "mainMenuSelfReports";
 	String mainMenuShareRequests = "mainMenuShareRequests";
 	String mainMenuStatistics = "mainMenuStatistics";
+	String mainMenuSurveys = "mainMenuSurveys";
 	String mainMenuTasks = "mainMenuTasks";
 	String mainMenuUsers = "mainMenuUsers";
 	String MaternalHistory_ageAtBirth = "MaternalHistory.ageAtBirth";
@@ -2690,7 +2691,9 @@ public interface Captions {
 	String surveillanceReportNoReportsForCase = "surveillanceReportNoReportsForCase";
 	String surveyGenerate = "surveyGenerate";
 	String surveyNew = "surveyNew";
+	String surveyNewSurvey = "surveyNewSurvey";
 	String surveySend = "surveySend";
+	String surveySurveyList = "surveySurveyList";
 	String SurveyToken = "SurveyToken";
 	String SurveyToken_assignmentDate = "SurveyToken.assignmentDate";
 	String SurveyToken_caseAssignedTo = "SurveyToken.caseAssignedTo";
@@ -3248,6 +3251,7 @@ public interface Captions {
 	String View_shareRequests = "View.shareRequests";
 	String View_statistics = "View.statistics";
 	String View_statistics_database_export = "View.statistics.database-export";
+	String View_surveys = "View.surveys";
 	String View_tasks = "View.tasks";
 	String View_tasks_archive = "View.tasks.archive";
 	String View_tasks_sub = "View.tasks.sub";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -549,6 +549,7 @@ public interface Strings {
 	String headingCreateNewPerson = "headingCreateNewPerson";
 	String headingCreateNewPrescription = "headingCreateNewPrescription";
 	String headingCreateNewSample = "headingCreateNewSample";
+	String headingCreateNewSurvey = "headingCreateNewSurvey";
 	String headingCreateNewTask = "headingCreateNewTask";
 	String headingCreateNewTaskQuestion = "headingCreateNewTaskQuestion";
 	String headingCreateNewTravelEntry = "headingCreateNewTravelEntry";
@@ -1544,6 +1545,8 @@ public interface Strings {
 	String messageSubcontinentDearchivingNotPossible = "messageSubcontinentDearchivingNotPossible";
 	String messageSubcontinentsArchived = "messageSubcontinentsArchived";
 	String messageSubcontinentsDearchived = "messageSubcontinentsDearchived";
+	String messageSurveyCreated = "messageSurveyCreated";
+	String messageSurveySaved = "messageSurveySaved";
 	String messageSymptomsHint = "messageSymptomsHint";
 	String messageSymptomsVisitHint = "messageSymptomsVisitHint";
 	String messageSyncUsersFromAuthProviderConfigurationError = "messageSyncUsersFromAuthProviderConfigurationError";
@@ -1789,6 +1792,7 @@ public interface Strings {
 	String promptSelfReportEpiWeekFrom = "promptSelfReportEpiWeekFrom";
 	String promptSelfReportEpiWeekTo = "promptSelfReportEpiWeekTo";
 	String promptSelfReportFreeTextSearch = "promptSelfReportFreeTextSearch";
+	String promptSurveyFreeTextSearch = "promptSurveyFreeTextSearch";
 	String promptTaskDateFrom = "promptTaskDateFrom";
 	String promptTaskDateTo = "promptTaskDateTo";
 	String promptTaskDateType = "promptTaskDateType";

sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyCriteria.java

@@ -19,14 +19,18 @@
 package de.symeda.sormas.api.survey;
 
 import de.symeda.sormas.api.Disease;
+import de.symeda.sormas.api.utils.IgnoreForUrl;
 import de.symeda.sormas.api.utils.criteria.BaseCriteria;
 
 public class SurveyCriteria extends BaseCriteria {
     private static final long serialVersionUID = -7237755677408791266L;
+    public static final String FREE_TEXT = "freeText";
+    public static final String DISEASE = "disease";
 
     private String freeText;
     private Disease disease;
 
+    @IgnoreForUrl
     public String getFreeText() {
         return freeText;
     }

sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyDto.java

@@ -35,6 +35,9 @@ public class SurveyDto extends EntityDto {
 
 	public static final String I18N_PREFIX = "Survey";
 
+	public static final String DISEASE = "disease";
+	public static final String SURVEY_NAME = "name";
+
 	@NotBlank(message = Validations.requiredField)
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
 	private String name;

sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java

@@ -34,4 +34,10 @@ public interface SurveyFacade {
     List<SurveyIndexDto> getIndexList(SurveyCriteria criteria, Integer first, Integer max, List<SortProperty> sortProperties);
 
     void deletePermanent(String uuid);
+
+    boolean exists(String uuid);
+
+    SurveyReferenceDto getReferenceByUuid(String uuid);
+
+    Boolean isEditAllowed(String uuid);
 }

sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyIndexDto.java

@@ -22,6 +22,9 @@ public class SurveyIndexDto extends AbstractUuidDto {
 
 	private static final long serialVersionUID = -5888585683689386052L;
 
+	public static final String DISEASE = "disease";
+	public static final String SURVEY_NAME = "name";
+
 	private final String name;
 	private final Disease disease;
 

sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyReferenceDto.java

@@ -1,29 +1,28 @@
 /*
  * SORMAS® - Surveillance Outbreak Response Management & Analysis System
  * Copyright © 2016-2025 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
+ * 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/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package de.symeda.sormas.api.survey;
 
 import de.symeda.sormas.api.ReferenceDto;
 
 public class SurveyReferenceDto extends ReferenceDto {
-    private static final long serialVersionUID = -8612115227784272980L;
 
-    public SurveyReferenceDto(String uuid, String caption) {
-        super(uuid, caption);
-    }
+	private static final long serialVersionUID = -8612115227784272980L;
+
+	public SurveyReferenceDto(String uuid, String surveyName) {
+		setUuid(uuid);
+		setCaption(surveyName != null ? surveyName : "");
+	}
 }

sormas-api/src/main/resources/captions.properties

@@ -1743,6 +1743,7 @@ mainMenuUsers=Users
 mainMenuAggregateReports=Aggregate
 mainMenuShareRequests=Shares
 mainMenuSelfReports=Self Reports
+mainMenuSurveys = Surveys
 MaternalHistory.childrenNumber=Total number of children
 MaternalHistory.ageAtBirth=Mother's age at birth of infant patient
 MaternalHistory.conjunctivitis=Conjunctivitis
@@ -3138,6 +3139,7 @@ View.users.sub=
 View.shareRequests=Share directory
 View.environments=Environment directory
 View.selfreports=Self reports directory
+View.surveys=Surveys directory
 # Visit
 visitNewVisit=New visit
 Visit=Visit
@@ -3249,6 +3251,8 @@ cancelExternalFollowUpButton=Cancel external follow-up
 createSymptomJournalAccountButton=Create PIA Account
 registerInPatientDiaryButton=Register in CLIMEDO eDiary
 symptomJournalOptionsButton=PIA eDiary
+surveyNewSurvey = New survey
+surveySurveyList = Survey list
 patientDiaryOptionsButton=CLIMEDO eDiary
 openInSymptomJournalButton=Open in PIA
 openInPatientDiaryButton=Open in CLIMEDO

sormas-api/src/main/resources/strings.properties

@@ -518,6 +518,7 @@ headingCreateNewImmunization = Create new immunization
 headingCreateNewPerson = Create new person
 headingCreateNewPrescription = Create new prescription
 headingCreateNewSample = Create new sample
+headingCreateNewSurvey = Create new survey
 headingCreateNewTask = Create new task
 headingCreateNewTaskQuestion = Create new task?
 headingCreateNewTreatment = Create new treatment
@@ -1448,6 +1449,8 @@ messageContinentsArchived = All selected continents have been archived
 messageContinentsDearchived = All selected continents have been de-archived
 messageSubcontinentsArchived = All selected subcontinents have been archived
 messageSubcontinentsDearchived = All selected subcontinents have been de-archived
+messageSurveySaved = Survey saved
+messageSurveyCreated = Survey created
 messageCountriesArchived = All selected countries have been archived
 messageCountriesDearchived = All selected regions have been de-archived
 messageRegionsArchived = All selected regions have been archived
@@ -1809,6 +1812,8 @@ promptCustomizableEnumTranslationLanguage = Language
 promptCustomizableEnumTranslationCaption = Translated caption
 promptCustomizableEnumSearchField = Search by value or caption...
 
+promptSurveyFreeTextSearch = Name
+
 # Unsaved changes
 unsavedChanges.warningTitle = Unsaved changes
 unsavedChanges.warningMessage = This form contains unsaved changes. Please decide whether you want to cancel the action you have just taken in order to review them, or save or discard the changes and continue.