missed changes from merge conflict

Author: KarnaiahPesula

sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java

@@ -83,15 +83,12 @@
 import static de.symeda.sormas.api.Disease.WEST_NILE_FEVER;
 import static de.symeda.sormas.api.Disease.YAWS_ENDEMIC_SYPHILIS;
 import static de.symeda.sormas.api.Disease.YELLOW_FEVER;
-import static de.symeda.sormas.api.Disease.UNDEFINED;
-import static de.symeda.sormas.api.Disease.OTHER;
 
 import java.util.Date;
 
 import javax.validation.constraints.Size;
 
 import de.symeda.sormas.api.CountryHelper;
-import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.ImportIgnore;
 import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.i18n.Validations;
@@ -319,6 +316,14 @@ public class SymptomsDto extends PseudonymizableDto {
 	public static final String OTHER_CLINICAL_PRESENTATION = "otherClinicalPresentation";
 	public static final String OTHER_CLINICAL_PRESENTATION_TEXT = "otherClinicalPresentationText";
 
+	public static final String DIAGNOSIS = "diagnosis";
+	public static final String MAJOR_SITE = "majorSite";
+	public static final String OTHER_MAJOR_SITE_DETAILS = "otherMajorSiteDetails";
+	public static final String MINOR_SITE = "minorSite";
+	public static final String OTHER_MINOR_SITE_DETAILS = "otherMinorSiteDetails";
+	public static final String DATE_OF_ONSET_KNOWN = "dateOfOnsetKnown";
+	public static final String CLINICAL_PRESENTATION_STATUS = "clinicalPresentationStatus";
+
 	// Fields are declared in the order they should appear in the import template
 
 	public static SymptomsDto build() {

sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/Symptoms.java

@@ -209,6 +209,7 @@ public class Symptoms extends AbstractDomainObject {
 	private SymptomState shivering;
 	private SymptomState fastHeartRate;
 	private SymptomState oxygenSaturationLower94;
+	private SymptomState nocturnalCough;
 
 	private SymptomState feverishFeeling;
 	private SymptomState weakness;

sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java

@@ -470,6 +470,7 @@ public String getFormattedHtmlMessage() {
 			LOSS_OF_SMELL,
 			WHEEZING,
 			WHOOP_SOUND,
+			NOCTURNAL_COUGH,
 			SKIN_ULCERS,
 			INABILITY_TO_WALK,
 			IN_DRAWING_OF_CHEST_WALL,
@@ -762,7 +763,15 @@ public String getFormattedHtmlMessage() {
 			Arrays.asList(CongenitalHeartDiseaseType.OTHER),
 			true);
 
-		FieldHelper.setVisibleWhen(getFieldGroup(), OTHER_CLINICAL_PRESENTATION_TEXT, OTHER_CLINICAL_PRESENTATION, Arrays.asList(SymptomState.YES), true);
+		if (disease != Disease.TUBERCULOSIS) {
+			FieldHelper.setVisibleWhen(
+				getFieldGroup(),
+				OTHER_CLINICAL_PRESENTATION_TEXT,
+				OTHER_CLINICAL_PRESENTATION,
+				Arrays.asList(SymptomState.YES),
+				true);
+		}
+
 		if (isVisibleAllowed(getFieldGroup().getField(JAUNDICE_WITHIN_24_HOURS_OF_BIRTH))) {
 			FieldHelper.setVisibleWhen(getFieldGroup(), JAUNDICE_WITHIN_24_HOURS_OF_BIRTH, JAUNDICE, Arrays.asList(SymptomState.YES), true);
 		}
@@ -835,13 +844,16 @@ public String getFormattedHtmlMessage() {
 				Arrays.asList(SymptomState.YES),
 				disease);
 		}
-		if (isEditableAllowed(OTHER_CLINICAL_PRESENTATION)) {
-			FieldHelper.setRequiredWhen(
+
+		if (disease != Disease.TUBERCULOSIS) {
+			if (isEditableAllowed(OTHER_CLINICAL_PRESENTATION)) {
+				FieldHelper.setRequiredWhen(
 					getFieldGroup(),
 					getFieldGroup().getField(OTHER_CLINICAL_PRESENTATION),
 					Arrays.asList(OTHER_CLINICAL_PRESENTATION_TEXT),
 					Arrays.asList(SymptomState.YES),
 					disease);
+			}
 		}
 
 		FieldHelper.setRequiredWhen(getFieldGroup(), getFieldGroup().getField(LESIONS), lesionsFieldIds, Arrays.asList(SymptomState.YES), disease);