Merge pull request SORMAS-Foundation#2719 from tabotkevin/2318-show_phone_number_of_contact_in_follow-up_visits

Show phone number of contact in follow-up visits

Author: MateStrysewske

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

@@ -488,6 +488,7 @@ public interface Captions {
 	String contactOnlyWithExtendedQuarantine = "contactOnlyWithExtendedQuarantine";
 	String contactOnlyWithReducedQuarantine = "contactOnlyWithReducedQuarantine";
 	String contactOpenContactCase = "contactOpenContactCase";
+	String contactPersonPhoneNumber = "contactPersonPhoneNumber";
 	String contactPersonVisits = "contactPersonVisits";
 	String contactPlusDays = "contactPlusDays";
 	String contactQuarantineNotOrdered = "contactQuarantineNotOrdered";

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

@@ -483,6 +483,7 @@ contactOnlyWithReducedQuarantine=Only contacts with reduced quarantine
 contactFollowUpDay=Day
 contactQuarantineNotOrdered=No quarantine ordered
 contactCreatePIAAccount = PIA
+contactPersonPhoneNumber = Contact Person's Phone Number
 
 Contact=Contact
 Contact.additionalDetails=General comment

sormas-ui/src/main/java/de/symeda/sormas/ui/visit/VisitEditForm.java

@@ -32,6 +32,7 @@
 import de.symeda.sormas.api.contact.ContactDto;
 import de.symeda.sormas.api.contact.ContactLogic;
 import de.symeda.sormas.api.followup.FollowUpLogic;
+import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.person.PersonDto;
@@ -48,9 +49,10 @@
 public class VisitEditForm extends AbstractEditForm<VisitDto> {
 
 	private static final long serialVersionUID = 4265377973842591202L;
+	private static final String CONTACT_PERSON_PHONE_NUMBER_LOC = "contactPersonPhoneNumberLoc";
 
 	private static final String HTML_LAYOUT =
-		fluidRowLocs(VisitDto.VISIT_STATUS) + fluidRowLocs(VisitDto.VISIT_DATE_TIME, VisitDto.VISIT_REMARKS) + fluidRowLocs(VisitDto.SYMPTOMS);
+		fluidRowLocs(VisitDto.VISIT_STATUS, CONTACT_PERSON_PHONE_NUMBER_LOC)  + fluidRowLocs(VisitDto.VISIT_DATE_TIME, VisitDto.VISIT_REMARKS) + fluidRowLocs(VisitDto.SYMPTOMS);
 
 	private final Disease disease;
 	private final ContactDto contact;
@@ -109,6 +111,13 @@ protected void addFields() {
 			return;
 		}
 
+		TextField textFieldPhone = new TextField(I18nProperties.getCaption(Captions.contactPersonPhoneNumber));
+		textFieldPhone.setWidth(100, Unit.PERCENTAGE);
+		textFieldPhone.setValue(this.person.getPhone());
+		textFieldPhone.setNullRepresentation("");
+		textFieldPhone.setReadOnly(true);
+		getContent().addComponent(textFieldPhone, CONTACT_PERSON_PHONE_NUMBER_LOC);
+
 		addField(VisitDto.VISIT_DATE_TIME, DateTimeField.class);
 		OptionGroup visitStatus = addField(VisitDto.VISIT_STATUS, OptionGroup.class);
 		addField(VisitDto.VISIT_REMARKS, TextField.class);