Merge branch 'development' into bigfix-3259-CampaignDashboardEditNullValidation

Author: barnabartha

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactCriteria.java

@@ -56,6 +56,8 @@ public class ContactCriteria extends BaseCriteria implements Serializable {
 	public static final String BIRTHDATE_MM = "birthdateMM";
 	public static final String BIRTHDATE_DD = "birthdateDD";
 	public static final String RETURNING_TRAVELER = "returningTraveler";
+	public static final String EVENT_LIKE = "eventLike";
+	public static final String ONLY_CONTACTS_WITH_SOURCE_CASE_IN_EVENT = "onlyContactsWithSourceCaseInEvent";
 
 	private static final long serialVersionUID = 5114202107622217837L;
 
@@ -102,6 +104,9 @@ public class ContactCriteria extends BaseCriteria implements Serializable {
 	private Integer birthdateMM;
 	private Integer birthdateDD;
 	private YesNoUnknown returningTraveler;
+	private String eventLike;
+	private String eventUuid;
+	private Boolean onlyContactsWithSourceCaseInEvent;
 
 	public UserRole getReportingUserRole() {
 		return reportingUserRole;
@@ -464,4 +469,45 @@ public YesNoUnknown getReturningTraveler() {
 	public void setReturningTraveler(YesNoUnknown returningTraveler) {
 		this.returningTraveler = returningTraveler;
 	}
+
+	public void setEventLike(String eventLike) {
+		this.eventLike = eventLike;
+	}
+
+	@IgnoreForUrl
+	public String getEventLike() {
+		return eventLike;
+	}
+
+	public ContactCriteria eventLike(String eventLike) {
+		setEventLike(eventLike);
+		return this;
+	}
+
+	public void setEventUuid(String eventUuid) {
+		this.eventUuid = eventUuid;
+	}
+
+	public String getEventUuid() {
+		return eventUuid;
+	}
+
+	public ContactCriteria eventUuid(String eventUuid) {
+		setEventUuid(eventUuid);
+		return this;
+	}
+
+	public void setOnlyContactsWithSourceCaseInEvent(Boolean onlyContactsWithSourceCaseInEvent) {
+		this.onlyContactsWithSourceCaseInEvent = onlyContactsWithSourceCaseInEvent;
+	}
+
+	@IgnoreForUrl
+	public Boolean getOnlyContactsWithSourceCaseInEvent() {
+		return onlyContactsWithSourceCaseInEvent;
+	}
+
+	public ContactCriteria onlyContactsWithSourceCaseInEvent(Boolean onlyContactsWithSourceCaseInEvent) {
+		this.onlyContactsWithSourceCaseInEvent = onlyContactsWithSourceCaseInEvent;
+		return this;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactExportDto.java

@@ -136,6 +136,10 @@ public class ContactExportDto implements Serializable {
 
 	private ContactJurisdictionDto jurisdiction;
 
+	private final Long eventCount;
+	private String latestEventId;
+	private String latestEventTitle;
+
 	//@formatter:off
 	public ContactExportDto(long id, long personId, String uuid, String sourceCaseUuid, CaseClassification caseClassification, Disease disease, String diseaseDetails,
 							ContactClassification contactClassification, Date lastContactDate, String firstName, String lastName, Sex sex,
@@ -152,7 +156,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
 							String phone, String phoneOwner, OccupationType occupationType, String occupationDetails,
 							String region, String district, String community,
 							long epiDataId, YesNoUnknown traveled, YesNoUnknown burialAttended, YesNoUnknown directContactConfirmedCase, YesNoUnknown directContactProbableCase,
-							YesNoUnknown contactWithRodent, YesNoUnknown returningTraveler,
+							YesNoUnknown contactWithRodent, YesNoUnknown returningTraveler, long eventCount,
 							String reportingUserUuid, String regionUuid, String districtUuid, String communityUuid,
 							String caseReportingUserUuid, String caseRegionUui, String caseDistrictUud, String caseCommunityUuid, String caseHealthFacilityUuid, String casePointOfEntryUuid
 	) {
@@ -217,6 +221,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
 		this.directContactProbableCase = directContactProbableCase;
 		this.contactWithRodent = contactWithRodent;
 		this.returningTraveler = returningTraveler;
+		this.eventCount = eventCount;
 
 		CaseJurisdictionDto caseJurisdiction = caseReportingUserUuid != null
 			? null
@@ -596,6 +601,29 @@ public void setReturningTraveler(YesNoUnknown returningTraveler) {
 		this.returningTraveler = returningTraveler;
 	}
 
+	@Order(71)
+	public String getLatestEventId() {
+		return latestEventId;
+	}
+
+	public void setLatestEventId(String latestEventId) {
+		this.latestEventId = latestEventId;
+	}
+
+	@Order(72)
+	public String getLatestEventTitle() {
+		return latestEventTitle;
+	}
+
+	public void setLatestEventTitle(String latestEventTitle) {
+		this.latestEventTitle = latestEventTitle;
+	}
+
+	@Order(73)
+	public long getEventCount() {
+		return this.eventCount;
+	}
+
 	public void setId(long id) {
 		this.id = id;
 	}

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactIndexDetailedDto.java

@@ -25,6 +25,8 @@ public class ContactIndexDetailedDto extends ContactIndexDto {
 	public static final String POSTAL_CODE = "postalCode";
 	public static final String PHONE = "phone";
 	public static final String REPORTING_USER = "reportingUser";
+	public static final String LATEST_EVENT_ID = "latestEventId";
+	public static final String LATEST_EVENT_TITLE = "latestEventTitle";
 
 	private Sex sex;
 	private String approximateAge;
@@ -42,6 +44,9 @@ public class ContactIndexDetailedDto extends ContactIndexDto {
 	@SensitiveData
 	private String phone;
 	private UserReferenceDto reportingUser;
+	private String latestEventId;
+	private String latestEventTitle;
+	private Long eventCount;
 
 	//@formatter:off
 	public ContactIndexDetailedDto(String uuid, String personFirstName, String personLastName, String cazeUuid, Disease disease, String diseaseDetails,
@@ -51,18 +56,18 @@ public ContactIndexDetailedDto(String uuid, String personFirstName, String perso
 								   Date followUpUntil, String contactOfficerUuid, String reportingUserUuid, Date reportDateTime,
 								   CaseClassification caseClassification,
 								   String caseReportingUserUid, String caseRegionUuid, String caseDistrictUud, String caseCommunityUuid,
-								   String caseHealthFacilityUuid, String casePointOfEntryUuid,
+								   String caseHealthFacilityUuid, String casePointOfEntryUuid, Date changeDate,
 								   Sex sex, Integer approximateAge, ApproximateAgeType approximateAgeType,
 								   String districtName, String city, String street, String houseNumber, String postalCode, String phone,
-								   String reportingUserFirstName, String reportingUserLastName,
-								   int visitCount) {
+								   String reportingUserFirstName, String reportingUserLastName, int visitCount, long eventCount
+	) {
 	//@formatter:on
 
 		//@formatter:off
 		super(uuid, personFirstName, personLastName, cazeUuid, disease, diseaseDetails, caseFirstName, caseLastName, regionUuid, districtUuid, communityUuid,
 				lastContactDate, contactCategory, contactProximity, contactClassification, contactStatus, followUpStatus, followUpUntil,
 				contactOfficerUuid, reportingUserUuid, reportDateTime, caseClassification,
-				caseReportingUserUid, caseRegionUuid, caseDistrictUud, caseCommunityUuid, caseHealthFacilityUuid, casePointOfEntryUuid, visitCount);
+				caseReportingUserUid, caseRegionUuid, caseDistrictUud, caseCommunityUuid, caseHealthFacilityUuid, casePointOfEntryUuid, changeDate, visitCount);
 		//@formatter:on
 
 		this.sex = sex;
@@ -73,6 +78,7 @@ public ContactIndexDetailedDto(String uuid, String personFirstName, String perso
 		this.postalCode = postalCode;
 		this.phone = phone;
 		this.reportingUser = new UserReferenceDto(reportingUserUuid, reportingUserFirstName, reportingUserLastName, null);
+		this.eventCount = eventCount;
 	}
 
 	public Sex getSex() {
@@ -110,4 +116,24 @@ public UserReferenceDto getReportingUser() {
 	public void setReportingUser(UserReferenceDto reportingUser) {
 		this.reportingUser = reportingUser;
 	}
+
+	public Long getEventCount() {
+		return eventCount;
+	}
+
+	public String getLatestEventId() {
+		return latestEventId;
+	}
+
+	public void setLatestEventId(String latestEventId) {
+		this.latestEventId = latestEventId;
+	}
+
+	public String getLatestEventTitle() {
+		return latestEventTitle;
+	}
+
+	public void setLatestEventTitle(String latestEventTitle) {
+		this.latestEventTitle = latestEventTitle;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactIndexDto.java

@@ -80,6 +80,7 @@ public ContactIndexDto(String uuid, String personFirstName, String personLastNam
 						   Date followUpUntil, String contactOfficerUuid, String reportingUserUuid, Date reportDateTime,
 						   CaseClassification caseClassification,
 						   String caseReportingUserUid, String caseRegionUuid, String caseDistrictUud, String caseCommunityUuid, String caseHealthFacilityUuid, String casePointOfEntryUuid,
+						   Date changeDate, // XXX: unused, only here for TypedQuery mapping
 						   int visitCount) {
 	//@formatter:on
 

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

@@ -447,6 +447,8 @@ public interface Captions {
 	String Contact_immunosuppressiveTherapyBasicDiseaseDetails = "Contact.immunosuppressiveTherapyBasicDiseaseDetails";
 	String Contact_lastContactDate = "Contact.lastContactDate";
 	String Contact_lastName = "Contact.lastName";
+	String Contact_latestEventId = "Contact.latestEventId";
+	String Contact_latestEventTitle = "Contact.latestEventTitle";
 	String Contact_numberOfVisits = "Contact.numberOfVisits";
 	String Contact_overwriteFollowUpUntil = "Contact.overwriteFollowUpUntil";
 	String Contact_person = "Contact.person";
@@ -522,6 +524,7 @@ public interface Captions {
 	String contactOnlyQuarantineHelpNeeded = "contactOnlyQuarantineHelpNeeded";
 	String contactOnlyWithExtendedQuarantine = "contactOnlyWithExtendedQuarantine";
 	String contactOnlyWithReducedQuarantine = "contactOnlyWithReducedQuarantine";
+	String contactOnlyWithSourceCaseInEvent = "contactOnlyWithSourceCaseInEvent";
 	String contactOpenContactCase = "contactOpenContactCase";
 	String contactPersonPhoneNumber = "contactPersonPhoneNumber";
 	String contactPersonVisits = "contactPersonVisits";
@@ -832,6 +835,7 @@ public interface Captions {
 	String eventEventParticipants = "eventEventParticipants";
 	String eventEventsList = "eventEventsList";
 	String eventLinkToCases = "eventLinkToCases";
+	String eventLinkToContacts = "eventLinkToContacts";
 	String eventNewEvent = "eventNewEvent";
 	String eventNoEventLinkedToCase = "eventNoEventLinkedToCase";
 	String EventParticipant = "EventParticipant";

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

@@ -511,6 +511,7 @@ contactChooseSourceCase=Choose Source Case
 contactOnlyQuarantineHelpNeeded=Help needed in quarantine
 contactOnlyWithExtendedQuarantine=Only contacts with extended quarantine
 contactOnlyWithReducedQuarantine=Only contacts with reduced quarantine
+contactOnlyWithSourceCaseInEvent=Only contacts whose source case is linked to their latest event
 contactFollowUpDay=Day
 contactQuarantineNotOrdered=No quarantine ordered
 contactCreatePIAAccount = PIA
@@ -549,6 +550,8 @@ Contact.followUpStatus=Follow-up status
 Contact.followUpUntil=Follow-up until
 Contact.lastContactDate=Date of last contact
 Contact.lastName=Last name of contact person
+Contact.latestEventId=Latest event ID
+Contact.latestEventTitle=Latest event title
 Contact.numberOfVisits=Number of visits
 Contact.person=Contact person
 Contact.quarantine=Quarantine
@@ -926,6 +929,7 @@ Event.typeOfPlaceText=Specify other event place
 Event.uuid=Event ID
 eventNoEventLinkedToCase=No event linked to case
 eventLinkToCases=See cases for this event
+eventLinkToContacts=See contacts for this event
 
 # Event action
 EventAction.eventUuid=Event id

sormas-api/src/main/resources/captions_fr-FR.properties

@@ -511,6 +511,7 @@ contactChooseSourceCase=Choisir le cas source
 contactOnlyQuarantineHelpNeeded=Besoin d'aide en quarantaine
 contactOnlyWithExtendedQuarantine=Uniquement les contacts avec une quarantaine prolongée
 contactOnlyWithReducedQuarantine=Seuls les contact avec une quarantaine réduite
+contactOnlyWithSourceCaseInEvent=Uniquement les contacts dont le cas source est lié à leur dernier événement
 contactFollowUpDay=Jour
 contactQuarantineNotOrdered=Quarantaine non prescrite
 contactCreatePIAAccount = PIA
@@ -549,6 +550,8 @@ Contact.followUpStatus=Statut du suivi
 Contact.followUpUntil=Suivi jusqu’à
 Contact.lastContactDate=Date du dernier contact
 Contact.lastName=Nom du contact
+Contact.latestEventId=ID du dernier event
+Contact.latestEventTitle=Titre du dernier event
 Contact.numberOfVisits=Nombre de visites
 Contact.person=Personne (contact)
 Contact.quarantine=Quarantaine
@@ -926,6 +929,7 @@ Event.typeOfPlaceText=Spécifier le type de lieu
 Event.uuid=ID d’événement
 eventNoEventLinkedToCase=Aucun événement lié à ce cas
 eventLinkToCases=Voir les cas pour cet événement
+eventLinkToContacts=Voir les contacts pour cet événement
 
 # Event action
 EventAction.eventUuid=Id d’événement