Merge branch 'development' into feature-13965-shigellosis-lab-messages

# Conflicts:
#	sormas-backend/src/main/resources/sql/sormas_schema.sql

Author: KarnaiahPesula

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java

@@ -137,6 +137,7 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	public static final String EPI_DATA = "epiData";
 	public static final String THERAPY = "therapy";
 	public static final String CLINICAL_COURSE = "clinicalCourse";
+	public static final String LAB_RESULTS = "labResults";
 	public static final String MATERNAL_HISTORY = "maternalHistory";
 	public static final String PORT_HEALTH_INFO = "portHealthInfo";
 	public static final String HEALTH_CONDITIONS = "healthConditions";
@@ -166,6 +167,9 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	public static final String POINT_OF_ENTRY = "pointOfEntry";
 	public static final String POINT_OF_ENTRY_DETAILS = "pointOfEntryDetails";
 	public static final String ADDITIONAL_DETAILS = "additionalDetails";
+	public static final String DATE_OTHER = "dateOther";
+	public static final String DATE_OTHER_DETAILS = "dateOtherDetails";
+	public static final String EXTERNAL_COMMENTS = "externalComments";
 	public static final String EXTERNAL_ID = "externalID";
 	public static final String EXTERNAL_TOKEN = "externalToken";
 	public static final String INTERNAL_TOKEN = "internalToken";
@@ -484,6 +488,15 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
 	private String additionalDetails;
+	@S2SIgnoreProperty(configProperty = SormasToSormasConfig.SORMAS2SORMAS_IGNORE_ADDITIONAL_DETAILS)
+	private Date dateOther;
+	@S2SIgnoreProperty(configProperty = SormasToSormasConfig.SORMAS2SORMAS_IGNORE_ADDITIONAL_DETAILS)
+	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
+	private String dateOtherDetails;
+	@S2SIgnoreProperty(configProperty = SormasToSormasConfig.SORMAS2SORMAS_IGNORE_ADDITIONAL_DETAILS)
+	@SensitiveData
+	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
+	private String externalComments;
 	@HideForCountriesExcept(countries = {
 		COUNTRY_CODE_GERMANY,
 		COUNTRY_CODE_SWITZERLAND })
@@ -1383,6 +1396,30 @@ public void setAdditionalDetails(String additionalDetails) {
 		this.additionalDetails = additionalDetails;
 	}
 
+	public Date getDateOther() {
+		return dateOther;
+	}
+
+	public void setDateOther(Date dateOther) {
+		this.dateOther = dateOther;
+	}
+
+	public String getDateOtherDetails() {
+		return dateOtherDetails;
+	}
+
+	public void setDateOtherDetails(String dateOtherDetails) {
+		this.dateOtherDetails = dateOtherDetails;
+	}
+
+	public String getExternalComments() {
+		return externalComments;
+	}
+
+	public void setExternalComments(String externalComments) {
+		this.externalComments = externalComments;
+	}
+
 	public String getExternalID() {
 		return externalID;
 	}

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

@@ -682,6 +682,8 @@ public interface Captions {
 	String CaseData_contactTracingFirstContactDate = "CaseData.contactTracingFirstContactDate";
 	String CaseData_contactTracingFirstContactType = "CaseData.contactTracingFirstContactType";
 	String CaseData_creationDate = "CaseData.creationDate";
+	String CaseData_dateOther = "CaseData.dateOther";
+	String CaseData_dateOtherDetails = "CaseData.dateOtherDetails";
 	String CaseData_deletionReason = "CaseData.deletionReason";
 	String CaseData_dengueFeverType = "CaseData.dengueFeverType";
 	String CaseData_department = "CaseData.department";
@@ -700,6 +702,7 @@ public interface Captions {
 	String CaseData_epidNumber = "CaseData.epidNumber";
 	String CaseData_eventCount = "CaseData.eventCount";
 	String CaseData_expectedFollowUpUntil = "CaseData.expectedFollowUpUntil";
+	String CaseData_externalComments = "CaseData.externalComments";
 	String CaseData_externalData = "CaseData.externalData";
 	String CaseData_externalID = "CaseData.externalID";
 	String CaseData_externalToken = "CaseData.externalToken";
@@ -720,6 +723,7 @@ public interface Captions {
 	String CaseData_investigatedDate = "CaseData.investigatedDate";
 	String CaseData_investigationStatus = "CaseData.investigationStatus";
 	String CaseData_laboratoryDiagnosticConfirmation = "CaseData.laboratoryDiagnosticConfirmation";
+	String CaseData_labResults = "CaseData.labResults";
 	String CaseData_latestEventId = "CaseData.latestEventId";
 	String CaseData_latestEventStatus = "CaseData.latestEventStatus";
 	String CaseData_latestEventTitle = "CaseData.latestEventTitle";
@@ -918,9 +922,23 @@ public interface Captions {
 	String caseImportMergeCase = "caseImportMergeCase";
 	String caseInfrastructureDataChanged = "caseInfrastructureDataChanged";
 	String caseJurisdictionType = "caseJurisdictionType";
+	String caseLabResultsAntibiotic = "caseLabResultsAntibiotic";
+	String caseLabResultsClinicalInterpretation = "caseLabResultsClinicalInterpretation";
+	String caseLabResultsComments = "caseLabResultsComments";
+	String caseLabResultsDateCollected = "caseLabResultsDateCollected";
+	String caseLabResultsDrugSusceptibilityHeading = "caseLabResultsDrugSusceptibilityHeading";
+	String caseLabResultsMethod = "caseLabResultsMethod";
+	String caseLabResultsMicValue = "caseLabResultsMicValue";
+	String caseLabResultsSample = "caseLabResultsSample";
+	String caseLabResultsSamplesHeading = "caseLabResultsSamplesHeading";
+	String caseLabResultsSurveillanceInterpretation = "caseLabResultsSurveillanceInterpretation";
+	String caseLabResultsTestsHeading = "caseLabResultsTestsHeading";
+	String caseLabResultsTestsPerformed = "caseLabResultsTestsPerformed";
+	String caseLabResultsZoneDiameter = "caseLabResultsZoneDiameter";
 	String caseLinkToSamples = "caseLinkToSamples";
 	String caseMergeDuplicates = "caseMergeDuplicates";
 	String caseMinusDays = "caseMinusDays";
+	String caseNegativeCase = "caseNegativeCase";
 	String caseNewCase = "caseNewCase";
 	String caseNewCaseDate = "caseNewCaseDate";
 	String caseNoDiseaseVariant = "caseNoDiseaseVariant";

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

@@ -1102,6 +1102,8 @@ public interface Strings {
 	String infoNoAccessToPersonEntities = "infoNoAccessToPersonEntities";
 	String infoNoAdditionalTests = "infoNoAdditionalTests";
 	String infoNoAefiInvestigations = "infoNoAefiInvestigations";
+	String infoNoCaseLabResultsSamples = "infoNoCaseLabResultsSamples";
+	String infoNoCaseLabResultsTests = "infoNoCaseLabResultsTests";
 	String infoNoCasesFoundStatistics = "infoNoCasesFoundStatistics";
 	String infoNoCustomizableEnumTranslations = "infoNoCustomizableEnumTranslations";
 	String infoNoCustomizableFieldOptions = "infoNoCustomizableFieldOptions";
@@ -1554,6 +1556,7 @@ public interface Strings {
 	String messageMissingDateFilter = "messageMissingDateFilter";
 	String messageMissingEpiWeekFilter = "messageMissingEpiWeekFilter";
 	String messageMultipleSampleReports = "messageMultipleSampleReports";
+	String messageNegativeCaseAfterPathogenTest = "messageNegativeCaseAfterPathogenTest";
 	String messageNoCaseFound = "messageNoCaseFound";
 	String messageNoCaseFoundToLinkImmunization = "messageNoCaseFoundToLinkImmunization";
 	String messageNoCasesSelected = "messageNoCasesSelected";

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

@@ -358,6 +358,19 @@ CampaignFormData.edit=Edit
 # CaseData
 caseCasesList=Cases list
 caseInfrastructureDataChanged=Infrastructure data has changed
+caseLabResultsTestsHeading=Tests
+caseLabResultsSamplesHeading=Samples
+caseLabResultsDrugSusceptibilityHeading=Drug susceptibility tests
+caseLabResultsSample=Sample
+caseLabResultsDateCollected=Date collected
+caseLabResultsTestsPerformed=Tests performed
+caseLabResultsAntibiotic=Antibiotic
+caseLabResultsMethod=Method
+caseLabResultsMicValue=MIC value (mg/l)
+caseLabResultsZoneDiameter=Zone (mm)
+caseLabResultsClinicalInterpretation=Clinical interpretation
+caseLabResultsSurveillanceInterpretation=Surveillance interpretation
+caseLabResultsComments=Comments
 caseCloneCaseWithNewDisease=Generate new case for
 caseContacts=Contacts
 caseDocuments=Case Documents
@@ -409,6 +422,7 @@ caseCalculateCompleteness=Calculate completeness
 caseClassificationCalculationButton=Calculate case classification
 caseNumberOfDuplicatesDetected=%d potential duplicates detected
 caseConfirmCase=Confirm case
+caseNegativeCase=Negative case
 convertEventParticipantToCase=Create case from event participant with positive test result?
 convertContactToCase=Create case from contact with positive test result?
 caseSearchSpecificCase=Search specific case
@@ -440,6 +454,8 @@ CaseData.clinicianName=Name of responsible clinician
 CaseData.clinicianPhone=Phone number of responsible clinician
 CaseData.clinicianEmail=Email address of responsible clinician
 CaseData.contactOfficer=Contact officer
+CaseData.dateOther=Date other
+CaseData.dateOtherDetails=Date other details
 CaseData.dengueFeverType=Dengue fever type
 CaseData.diseaseVariant=Disease variant
 CaseData.diseaseDetails=Disease name
@@ -448,8 +464,10 @@ CaseData.districtLevelDate=Date received at district level
 CaseData.doses=How many doses
 CaseData.epiData=Epidemiological data
 CaseData.epidNumber=EPID number
+CaseData.labResults=Laboratory results
 CaseData.postMortem=Post Mortem
 CaseData.department=Facility Department
+CaseData.externalComments=External comments
 CaseData.externalID=External ID
 CaseData.externalToken=External Token
 CaseData.internalToken=Internal Token

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

@@ -1037,6 +1037,8 @@ infoCaseIncidenceNotPossible = The following regions have missing population dat
 infoCaseIncidenceMissingPopulationData = The following regions and/or districts have missing population data:<br/><br/>%s.<br/><br/>Incidence proportion cannot be calculated for these regions and/or districts.
 infoCaseIncidenceIncompatible = No population data is available for communities and facilities. Case incidence cannot be calculated and case counts are displayed instead. If you want to view case incidence, please remove any community and facilitiy filters and groupings.
 infoNoPathogenTests = No pathogen tests have been created for this sample
+infoNoCaseLabResultsTests = No tests have been performed for this case
+infoNoCaseLabResultsSamples = No samples have been collected for this case
 infoPickOrCreateCase = There are existing cases in the database that seem very similar to the one you are about to create. Please have a look at the list of existing cases and verify that the case you want to create is not a duplicate of one of them. If you find a case that is most likely the same as yours, please <b>click on it in the list</b> and confirm.
 infoPickOrCreateCaseNewCase = Newly added case information
 infoPickOrCreateImmunization = The system already contains at least one immunization for %s for this person and means of immunization that overlaps with the specified immunziation period. Please compare the most recent existing immunization with the one you created and decide whether to discard the new immunization, use its information to update the existing one, or create it anyway.
@@ -1176,7 +1178,7 @@ infoRestrictDiseasesDescription=Mark all diseases that the user is supposed to h
 infoNoCustomizableEnumTranslations = Click on the + button below to add translations to this customizable enum value.
 infoNoCustomizableFieldTranslations = Click on the + button below to add translations for this field.
 infoNoCustomizableFieldOptions = Click on the + button below to add options for this field.
-infoCustomizableEnumConfigurationInfo = Customizable enums are value sets that can be customized in order to react to the individual needs of your country or a specific epidemiological situation. The table on this screen contains all customizable enum values in the database. Each value is associated with a data type, e.g. disease variants or occupation types. Some of these data types have default values that are automatically added to the database when SORMAS is set up or new data types are added to the system.<br/><br/>You can add new enum values or edit existing ones, add translations for languages supported by SORMAS, select the diseases that the value should be visible for (by default, customizable enum values are visible for all diseases), and configure additional properties.<br/><br/>Properties are used to further control the behaviour of customizable enum values. E.g. the "has details" property that is supported by most enum values toggles whether selecting this enum value would bring up an additional text field that users can add more information to.
+infoCustomizableEnumConfigurationInfo = Customizable enums are value sets that can be customized in order to react to the individual needs of your country or a specific epidemiological situation. The table on this screen contains all customizable enum values in the database. Each value is associated with a data type, e.g. disease variants or occupation types. Some of these data types have default values that are automatically added to the database when SORMAS is set up or new data types are added to the system.<br/><br/>You can add new enum values or edit existing ones, add translations for languages supported by SORMAS, select the diseases that the value should be visible for (by default, customizable enum values are visible for all diseases), and configure additional properties.<br/><br/>Properties are used to further control the behaviour of customizable enum values. E.g. the "has details" property that is supported by most enum values toggles whether selecting this enum value would bring up an additional text field that users can add more information to.<br/><br/><font color="red"><b>Changing customizable enum may require a server restart to take effect.</b></font>
 infoNoImmunizationAdverseEvents = No adverse events have been created for this immunization
 infoAefiSelectPrimarySuspectVaccine = The list below contains all vaccinations of the immunization. Please select the suspect vaccination related to this adverse event.
 infoArchivedAefiEntries = Adverse event entries are automatically archived after %d days without changes to the data.
@@ -1243,6 +1245,7 @@ messageCloneCaseWithNewDisease = You have just created a positive pathogen test
 messageUpdateCaseWithNewDiseaseVariant = You have saved a positive pathogen test of a different disease variant than the variant specified in the case. Do you want to update the disease variant of the case? The case's current disease variant is %s, the pathogen test's disease variant is %s.
 messageCompletenessValuesUpdated = Completeness values have been updated.
 messageConfirmCaseAfterPathogenTest=The final laboratory result of the sample the saved pathogen test belongs to is positive. However, the case cannot be automatically classified as a confirmed case because it is missing some information. Do you want to set the case classification to confirmed anyway?
+messageNegativeCaseAfterPathogenTest=The final laboratory result of the sample the saved pathogen test belongs to is negative. However, the case cannot be automatically classified as not a case because it is missing some information. Do you want to set the case classification to not a case anyway?
 messageConvertContactToCase=You have just saved a positive laboratory result for the contact disease. Do you want to create a case for the contact person? The case will be set as the resulting case of this contact, and the final laboratory result of the sample will automatically be set to positive.
 messageConvertContactToCaseDifferentDiseases=You have just saved a positive laboratory result for a different disease than the contact disease. Do you want to create a case with this disease for the contact person? The case will not be set as the resulting case of this contact.
 messageConvertEventParticipantToCase=You have just saved a positive laboratory result for the event disease. Do you want to create a case for the event participant person? The case will automatically be linked to the event participant, and the final laboratory result of the sample will be set to positive.

sormas-api/src/main/resources/strings_ar-SA.properties

@@ -1106,7 +1106,7 @@ infoBulkUnresponsiveWindowHint = <b>Hint\:</b> If the progress bar seems to be u
 infoNoEnvironmentSamples = No samples have been created for this environment
 infoRestrictDiseasesDescription=Mark all diseases that the user is supposed to have access to
 infoNoCustomizableEnumTranslations = Click on the + button below to add translations to this customizable enum value.
-infoCustomizableEnumConfigurationInfo = Customizable enums are value sets that can be customized in order to react to the individual needs of your country or a specific epidemiological situation. The table on this screen contains all customizable enum values in the database. Each value is associated with a data type, e.g. disease variants or occupation types. Some of these data types have default values that are automatically added to the database when SORMAS is set up or new data types are added to the system.<br/><br/>You can add new enum values or edit existing ones, add translations for languages supported by SORMAS, select the diseases that the value should be visible for (by default, customizable enum values are visible for all diseases), and configure additional properties.<br/><br/>Properties are used to further control the behaviour of customizable enum values. E.g. the "has details" property that is supported by most enum values toggles whether selecting this enum value would bring up an additional text field that users can add more information to.
+infoCustomizableEnumConfigurationInfo = Customizable enums are value sets that can be customized in order to react to the individual needs of your country or a specific epidemiological situation. The table on this screen contains all customizable enum values in the database. Each value is associated with a data type, e.g. disease variants or occupation types. Some of these data types have default values that are automatically added to the database when SORMAS is set up or new data types are added to the system.<br/><br/>You can add new enum values or edit existing ones, add translations for languages supported by SORMAS, select the diseases that the value should be visible for (by default, customizable enum values are visible for all diseases), and configure additional properties.<br/><br/>Properties are used to further control the behaviour of customizable enum values. E.g. the "has details" property that is supported by most enum values toggles whether selecting this enum value would bring up an additional text field that users can add more information to.<br/><br/><font color="red"><b>Changing customizable enum may require a server restart to take effect.</b></font>
 infoNoImmunizationAdverseEvents = No adverse events have been created for this immunization
 infoAefiSelectPrimarySuspectVaccine = The list below contains all vaccinations of the immunization. Please select the suspect vaccination related to this adverse event.
 infoArchivedAefiEntries = Adverse event entries are automatically archived after %d days without changes to the data.