Merge pull request #13259 from SORMAS-Foundation/feature-#13194-survey-card-on-case

#13194 Add a "Survey" Card to the case view

Author: leventegal-she

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.SurveyTokenFacade;
 import de.symeda.sormas.api.symptoms.SymptomsFacade;
 import de.symeda.sormas.api.systemevents.SystemEventFacade;
 import de.symeda.sormas.api.systemevents.sync.SyncFacade;
@@ -554,6 +555,10 @@ public static SelfReportImportFacade getSelfReportImportFacade() {
 		return get().lookupEjbRemote(SelfReportImportFacade.class);
 	}
 
+	public static SurveyTokenFacade getSurveyTokenFacade() {
+		return get().lookupEjbRemote(SurveyTokenFacade.class);
+	}
+
 	@SuppressWarnings("unchecked")
 	public <P> P lookupEjbRemote(Class<P> clazz) {
 		try {

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

@@ -2688,6 +2688,18 @@ public interface Captions {
 	String SurveillanceReport_uuid = "SurveillanceReport.uuid";
 	String surveillanceReportNewReport = "surveillanceReportNewReport";
 	String surveillanceReportNoReportsForCase = "surveillanceReportNoReportsForCase";
+	String surveyGenerate = "surveyGenerate";
+	String surveyNew = "surveyNew";
+	String surveySend = "surveySend";
+	String SurveyToken = "SurveyToken";
+	String SurveyToken_assignmentDate = "SurveyToken.assignmentDate";
+	String SurveyToken_caseAssignedTo = "SurveyToken.caseAssignedTo";
+	String SurveyToken_generatedDocument = "SurveyToken.generatedDocument";
+	String SurveyToken_recipientEmail = "SurveyToken.recipientEmail";
+	String SurveyToken_responseReceived = "SurveyToken.responseReceived";
+	String SurveyToken_survey = "SurveyToken.survey";
+	String SurveyToken_token = "SurveyToken.token";
+	String SurveyToken_uuid = "SurveyToken.uuid";
 	String symptomJournalOptionsButton = "symptomJournalOptionsButton";
 	String Symptoms = "Symptoms";
 	String Symptoms_abdominalPain = "Symptoms.abdominalPain";

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

@@ -484,6 +484,7 @@ public interface Strings {
 	String headingCasesRestored = "headingCasesRestored";
 	String headingCasesResultingFromContacts = "headingCasesResultingFromContacts";
 	String headingCaseStatusMap = "headingCaseStatusMap";
+	String headingCaseSurveyDetails = "headingCaseSurveyDetails";
 	String headingcasesWithReferenceDefinitionFulfilled = "headingcasesWithReferenceDefinitionFulfilled";
 	String headingCaution = "headingCaution";
 	String headingChangeCaseDisease = "headingChangeCaseDisease";
@@ -853,6 +854,7 @@ public interface Strings {
 	String headingSpecailCaseAccess = "headingSpecailCaseAccess";
 	String headingStoppedFollowUp = "headingStoppedFollowUp";
 	String headingSurveillanceReports = "headingSurveillanceReports";
+	String headingSurveySideComponent = "headingSurveySideComponent";
 	String headingSymptomJournalAccountCreation = "headingSymptomJournalAccountCreation";
 	String headingSyncUsers = "headingSyncUsers";
 	String headingTasksDeleted = "headingTasksDeleted";
@@ -1043,6 +1045,7 @@ public interface Strings {
 	String infoNoSourceCaseSelectedLineListing = "infoNoSourceCaseSelectedLineListing";
 	String infoNoSubordinateEvents = "infoNoSubordinateEvents";
 	String infoNoSuperordinateEvent = "infoNoSuperordinateEvent";
+	String infoNoSurveys = "infoNoSurveys";
 	String infoObserverMissingEmail = "infoObserverMissingEmail";
 	String infoObserverMissingEmailOrPhoneNumber = "infoObserverMissingEmailOrPhoneNumber";
 	String infoPersonMergeConfirmation = "infoPersonMergeConfirmation";
@@ -1098,6 +1101,8 @@ public interface Strings {
 	String infoStatisticsFilter = "infoStatisticsFilter";
 	String infoStatisticsResults = "infoStatisticsResults";
 	String infoSurveillanceDashboard = "infoSurveillanceDashboard";
+	String infoSurveyResponseNotReceived = "infoSurveyResponseNotReceived";
+	String infoSurveyResponseReceived = "infoSurveyResponseReceived";
 	String infoSyncUsers = "infoSyncUsers";
 	String infoTasksWithMultipleJurisdictionsSelected = "infoTasksWithMultipleJurisdictionsSelected";
 	String infoUploadDocumentTemplate = "infoUploadDocumentTemplate";

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

@@ -15,6 +15,7 @@
 
 package de.symeda.sormas.api.survey;
 
+import de.symeda.sormas.api.caze.CaseReferenceDto;
 import de.symeda.sormas.api.utils.criteria.BaseCriteria;
 
 public class SurveyTokenCriteria extends BaseCriteria {
@@ -23,6 +24,7 @@ public class SurveyTokenCriteria extends BaseCriteria {
 
 	private SurveyReferenceDto survey;
 	private String tokenLike;
+	private CaseReferenceDto caseAssignedTo;
 
 	public SurveyReferenceDto getSurvey() {
 		return survey;
@@ -49,4 +51,17 @@ public SurveyTokenCriteria tokenLike(String tokenLike) {
 		setTokenLike(tokenLike);
 		return this;
 	}
+
+	public CaseReferenceDto getCaseAssignedTo() {
+		return caseAssignedTo;
+	}
+
+	public void setCaseAssignedTo(CaseReferenceDto caseAssignedTo) {
+		this.caseAssignedTo = caseAssignedTo;
+	}
+
+	public SurveyTokenCriteria caseAssignedTo(CaseReferenceDto caseAssignedTo) {
+		setCaseAssignedTo(caseAssignedTo);
+		return this;
+	}
 }

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

@@ -18,6 +18,7 @@
 import java.util.Date;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import de.symeda.sormas.api.EntityDto;
@@ -35,7 +36,16 @@ public class SurveyTokenDto extends EntityDto {
 	private static final long serialVersionUID = -4598785341989656729L;
 
 	public static final String I18N_PREFIX = "SurveyToken";
-
+	public static final String SURVEY = "survey";
+	public static final String TOKEN = "token";
+	public static final String CASE_ASSIGNED_TO = "caseAssignedTo";
+	public static final String ASSIGNMENT_DATE = "assignmentDate";
+	public static final String RECIPIENT_EMAIL = "recipientEmail";
+	public static final String GENERATED_DOCUMENT = "generatedDocument";
+	public static final String RESPONSE_RECEIVED = "responseReceived";
+
+	@NotNull(message = Validations.requiredField)
+	private SurveyReferenceDto survey;
 	@NotBlank(message = Validations.requiredField)
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
 	private String token;
@@ -53,6 +63,14 @@ public static SurveyTokenDto build() {
 		return token;
 	}
 
+	public SurveyReferenceDto getSurvey() {
+		return survey;
+	}
+
+	public void setSurvey(SurveyReferenceDto survey) {
+		this.survey = survey;
+	}
+
 	public String getToken() {
 		return token;
 	}

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

@@ -15,22 +15,47 @@
 
 package de.symeda.sormas.api.survey;
 
+import java.util.Date;
+
 import de.symeda.sormas.api.caze.CaseReferenceDto;
-import de.symeda.sormas.api.uuid.AbstractUuidDto;
+import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableIndexDto;
 
-public class SurveyTokenIndexDto extends AbstractUuidDto {
+public class SurveyTokenIndexDto extends PseudonymizableIndexDto {
 
 	private static final long serialVersionUID = 4358173798026207265L;
 
+	private final String surveyUuid;
+	private final String surveyName;
 	private final String token;
 	private final CaseReferenceDto caseAssignedTo;
-	private final String assignmentDate;
+	private final Date assignmentDate;
+	private final String recipientEmail;
+	private final Boolean responseReceived;
 
-	public SurveyTokenIndexDto(String uuid, String token, CaseReferenceDto caseAssignedTo, String assignmentDate) {
+	public SurveyTokenIndexDto(
+            String uuid,
+            String surveyUuid,
+            String surveyName,
+            String token,
+            CaseReferenceDto caseAssignedTo,
+            Date assignmentDate,
+            String recipientEmail, Boolean responseReceived) {
 		super(uuid);
+		this.surveyUuid = surveyUuid;
+		this.surveyName = surveyName;
 		this.token = token;
 		this.caseAssignedTo = caseAssignedTo;
 		this.assignmentDate = assignmentDate;
+		this.recipientEmail = recipientEmail;
+        this.responseReceived = responseReceived;
+    }
+
+	public String getSurveyUuid() {
+		return surveyUuid;
+	}
+
+	public String getSurveyName() {
+		return surveyName;
 	}
 
 	public String getToken() {
@@ -41,7 +66,19 @@ public CaseReferenceDto getCaseAssignedTo() {
 		return caseAssignedTo;
 	}
 
-	public String getAssignmentDate() {
+	public Date getAssignmentDate() {
 		return assignmentDate;
 	}
+
+	public String getRecipientEmail() {
+		return recipientEmail;
+	}
+
+	public Boolean getResponseReceived() {
+		return responseReceived;
+	}
+
+	public SurveyTokenReferenceDto toReference() {
+		return new SurveyTokenReferenceDto(getUuid(), getSurveyName());
+	}
 }

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

@@ -3398,3 +3398,17 @@ selfReportProcess=Process
 confirmChangesField=Field:
 confirmChangesValue=Will be changed to:
 
+# Survey
+surveyNew=New Survey
+surveyGenerate=Generate Document
+surveySend=Send Document
+
+SurveyToken = Survey token
+SurveyToken.uuid = ID
+SurveyToken.survey = Survey
+SurveyToken.token = Token
+SurveyToken.caseAssignedTo = Case assigned to
+SurveyToken.assignmentDate = Assignment date
+SurveyToken.recipientEmail = Recipient email
+SurveyToken.generatedDocument = Generated document
+SurveyToken.responseReceived = Response received

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

@@ -910,6 +910,8 @@ headingAefiSelectPrimarySuspectVaccine=Select primary suspect vaccine
 headingAefiReportInvestigations=Investigations
 headingAefiInvestigationSelectConcernedVaccine=Select concerned vaccine
 headingAefiInvestigationFormSubHeading=(Only for Serious Adverse Events Following Immunization ? Death / Disability / Hospitalization / Cluster)
+headingSurveySideComponent=Surveys
+headingCaseSurveyDetails=Survey details
 
 # Info texts
 infoActivityAsCaseInvestigation = <i>Please document ALL relevant activities after infection:</i>
@@ -1117,6 +1119,9 @@ infoAefiSelectPrimarySuspectVaccine = The list below contains all vaccinations o
 infoArchivedAefiEntries = Adverse event entries are automatically archived after %d days without changes to the data.
 infoNoAefiInvestigations = No investigations have been created for this adverse event
 infoHeadingAefiDashboardMap=Adverse events are shown using the GPS coordinate of the facility or person's home address.
+infoNoSurveys=There are no surveys created or sent for this case
+infoSurveyResponseReceived=Response received
+infoSurveyResponseNotReceived=No response received yet
 
 # Messages
 messageActionOutsideJurisdictionDeletionDenied = The action outside user's jurisdiction cannot be deleted

sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java

@@ -41,6 +41,7 @@
 import de.symeda.sormas.api.survey.SurveyDto;
 import de.symeda.sormas.api.survey.SurveyFacade;
 import de.symeda.sormas.api.survey.SurveyIndexDto;
+import de.symeda.sormas.api.survey.SurveyReferenceDto;
 import de.symeda.sormas.api.user.UserRight;
 import de.symeda.sormas.api.utils.SortProperty;
 import de.symeda.sormas.backend.FacadeHelper;
@@ -193,7 +194,15 @@ private SurveyDto toDto(Survey source) {
 		return target;
 	}
 
-	@LocalBean
+	public SurveyReferenceDto convertToReferenceDto(Survey survey) {
+		return toSurveyReferenceDto(survey);
+	}
+
+	public static SurveyReferenceDto toSurveyReferenceDto(Survey survey) {
+		return new SurveyReferenceDto(survey.getUuid(), survey.getName());
+	}
+
+    @LocalBean
 	@Stateless
 	public static class SurveyFacadeEjbLocal extends SurveyFacadeEjb {
 

sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyToken.java

@@ -38,6 +38,8 @@ public class SurveyToken extends AbstractDomainObject {
 	public static final String SURVEY = "survey";
 	public static final String CASE_ASSIGNED_TO = "caseAssignedTo";
 	public static final String ASSIGNMENT_DATE = "assignmentDate";
+	public static final String RECIPIENT_EMAIL = "recipientEmail";
+	public static final String RESPONSE_RECEIVED = "responseReceived";
 
 	private String token;
 	private Survey survey;