Merge pull request #13683 from SORMAS-Foundation/bugfix-13651-official-sormas-website-link

Defect fixes

Author: KarnaiahPesula

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

@@ -28,7 +28,7 @@ public enum Disease
 	AFP(true, true, true, false, true, 60, true, false, false),
 	CHOLERA(true, true, true, false, true, 5, true, false, false),
 	CONGENITAL_RUBELLA(true, true, true, false, true, 21, true, false, false),
-	CSM(true, true, true, false, false, 10, true, false, false),
+	CSM(true, true, true, false, true, 10, true, false, false),
 	DENGUE(true, true, true, false, false, 14, true, false, false),
 	EVD(true, true, true, false, true, 21, true, false, false),
 	GUINEA_WORM(true, true, true, false, false, 0, true, false, false),
@@ -37,7 +37,7 @@ public enum Disease
 	MONKEYPOX(true, true, true, false, true, 21, true, false, false),
 	NEW_INFLUENZA(true, true, true, false, true, 17, true, false, false),
 	PLAGUE(true, true, true, false, true, 7, true, false, false),
-	POLIO(true, true, true, false, false, 0, true, false, false),
+	POLIO(true, true, true, false, true, 60, true, false, false),
 	UNSPECIFIED_VHF(true, true, true, false, true, 21, true, false, false),
 	WEST_NILE_FEVER(true, false, true, false, false, 0, true, false, false),
 	YELLOW_FEVER(true, true, true, false, false, 6, true, false, false),
@@ -57,8 +57,8 @@ public enum Disease
 	DIARRHEA_BLOOD(true, false, false, true, false, 0, true, false, false),
 	SNAKE_BITE(true, false, false, true, false, 0, true, false, false),
 	RUBELLA(true, false, false, true, false, 0, true, false, false),
-	TUBERCULOSIS(false, true, true, true, false, 0, true, false, false),
-	LATENT_TUBERCULOSIS(false, true, true, true, false, 0, true, false, false),
+	TUBERCULOSIS(false, true, true, true, true, 365, true, false, false),
+	LATENT_TUBERCULOSIS(false, true, true, true, true, 30, true, false, false),
 	LEPROSY(true, false, false, true, false, 0, true, false, false),
 	LYMPHATIC_FILARIASIS(true, false, false, true, false, 0, true, false, false),
 	BURULI_ULCER(true, false, false, true, false, 0, true, false, false),

sormas-ui/src/main/java/de/symeda/sormas/ui/AboutView.java

@@ -161,8 +161,7 @@ private VerticalLayout createInfoSection() {
 		whatsNewLink.setTargetName("_blank");
 		infoLayout.addComponent(whatsNewLink);
 
-		Link sormasWebsiteLink =
-			new Link(I18nProperties.getCaption(Captions.aboutSormasWebsite), new ExternalResource("https://sormasorg.helmholtz-hzi.de/"));
+		Link sormasWebsiteLink = new Link(I18nProperties.getCaption(Captions.aboutSormasWebsite), new ExternalResource("https://sormas.org/"));
 		sormasWebsiteLink.setTargetName("_blank");
 		infoLayout.addComponent(sormasWebsiteLink);
 

sormas-ui/src/main/java/de/symeda/sormas/ui/epidata/EpiDataForm.java

@@ -251,6 +251,7 @@ private void addHeadingsAndInfoTexts() {
 		getContent().addComponent(
 			new MultilineLabel(h3(I18nProperties.getString(Strings.headingEpiConclusion)) + divsCss(VSPACE_3), ContentMode.HTML),
 			LOC_CONCLUSION_HEADING);
+		getContent().getComponent(LOC_CONCLUSION_HEADING).setVisible(Arrays.asList(Disease.CRYPTOSPORIDIOSIS, Disease.GIARDIASIS).contains(disease));
 
 		getContent().addComponent(
 			new MultilineLabel(

sormas-ui/src/main/java/de/symeda/sormas/ui/samples/AbstractSampleForm.java

@@ -132,7 +132,7 @@ protected void addCommonFields() {
 		addField(SampleDto.SAMPLE_MATERIAL_TEXT, TextField.class);
 		addField(SampleDto.SAMPLE_SOURCE, ComboBox.class);
 		addField(SampleDto.FIELD_SAMPLE_ID, TextField.class);
-		addDateField(SampleDto.SHIPMENT_DATE, DateField.class, 7);
+		addDateField(SampleDto.SHIPMENT_DATE, DateField.class, 0);
 		addField(SampleDto.SHIPMENT_DETAILS, TextField.class);
 		addField(SampleDto.RECEIVED_DATE, DateField.class);
 		final ComboBox lab = addInfrastructureField(SampleDto.LAB);
@@ -285,7 +285,7 @@ protected void addValidators() {
 			new DateComparisonValidator(
 				shipmentDate,
 				sampleDateField,
-				true,
+				false,
 				false,
 				I18nProperties.getValidationError(Validations.afterDate, shipmentDate.getCaption(), sampleDateField.getCaption())));
 		shipmentDate.addValidator(