Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit cdda220

Browse files
author
Martin Wahnschaffe
committed
Merge branch 'development' into 3520-campaign-refinements
2 parents 3111b2a + 4adc1c6 commit cdda220

55 files changed

Lines changed: 919 additions & 367 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ public class ContactDto extends PseudonymizableDto {
5555
public static final String CAZE = "caze";
5656
public static final String REPORT_DATE_TIME = "reportDateTime";
5757
public static final String REPORTING_USER = "reportingUser";
58+
public static final String MULTI_DAY_CONTACT = "multiDayContact";
59+
public static final String FIRST_CONTACT_DATE = "firstContactDate";
5860
public static final String LAST_CONTACT_DATE = "lastContactDate";
5961
public static final String CONTACT_IDENTIFICATION_SOURCE = "contactIdentificationSource";
6062
public static final String CONTACT_IDENTIFICATION_SOURCE_DETAILS = "contactIdentificationSourceDetails";
@@ -138,6 +140,9 @@ public class ContactDto extends PseudonymizableDto {
138140
private DistrictReferenceDto district;
139141
private CommunityReferenceDto community;
140142
@Required
143+
private boolean multiDayContact;
144+
private Date firstContactDate;
145+
@Required
141146
private Date lastContactDate;
142147
@HideForCountriesExcept
143148
private ContactIdentificationSource contactIdentificationSource;
@@ -320,6 +325,22 @@ public void setReportingUser(UserReferenceDto reportingUser) {
320325
this.reportingUser = reportingUser;
321326
}
322327

328+
public boolean isMultiDayContact() {
329+
return multiDayContact;
330+
}
331+
332+
public void setMultiDayContact(boolean multiDayContact) {
333+
this.multiDayContact = multiDayContact;
334+
}
335+
336+
public Date getFirstContactDate() {
337+
return firstContactDate;
338+
}
339+
340+
public void setFirstContactDate(Date firstContactDate) {
341+
this.firstContactDate = firstContactDate;
342+
}
343+
323344
public Date getLastContactDate() {
324345
return lastContactDate;
325346
}

‎sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/ExternalJournalFacade.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import javax.ejb.Remote;
44

5+
import de.symeda.sormas.api.externaljournal.patientdiary.PatientDiaryPersonDto;
6+
import de.symeda.sormas.api.externaljournal.patientdiary.PatientDiaryRegisterResult;
57
import de.symeda.sormas.api.person.PersonDto;
68

79
@Remote
@@ -15,5 +17,5 @@ public interface ExternalJournalFacade {
1517

1618
PatientDiaryRegisterResult registerPatientDiaryPerson(PersonDto person);
1719

18-
PatientDiaryPersonValidation validatePatientDiaryPerson(PersonDto person);
20+
ExternalJournalValidation validatePatientDiaryPerson(PersonDto person);
1921
}

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/PatientDiaryPersonValidation.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/ExternalJournalValidation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import java.io.Serializable;
44

5-
public class PatientDiaryPersonValidation implements Serializable {
5+
public class ExternalJournalValidation implements Serializable {
66

77
private boolean valid;
88
private String message;
99

10-
public PatientDiaryPersonValidation(boolean valid, String message) {
10+
public ExternalJournalValidation(boolean valid, String message) {
1111
this.valid = valid;
1212
this.message = message;
1313
}

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/PatientDiaryContactInformation.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryContactInformation.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
package de.symeda.sormas.api.externaljournal;
1+
package de.symeda.sormas.api.externaljournal.patientdiary;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
24

35
import java.io.Serializable;
46

5-
class PatientDiaryContactInformation implements Serializable {
7+
@JsonIgnoreProperties(ignoreUnknown = true)
8+
public class PatientDiaryContactInformation implements Serializable {
69

710
private static final long serialVersionUID = -144631462985961640L;
811

‎sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryIdatId.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package de.symeda.sormas.api.externaljournal.patientdiary;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
5+
import java.io.Serializable;
6+
7+
@JsonIgnoreProperties(ignoreUnknown = true)
8+
public class PatientDiaryIdatId implements Serializable {
9+
private static final long serialVersionUID = -2785744892381447672L;
10+
11+
private PatientDiaryPersonDto idat;
12+
13+
public PatientDiaryPersonDto getIdat() {
14+
return idat;
15+
}
16+
17+
public void setIdat(PatientDiaryPersonDto idat) {
18+
this.idat = idat;
19+
}
20+
}

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/PatientDiaryPersonData.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryPersonData.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.symeda.sormas.api.externaljournal;
1+
package de.symeda.sormas.api.externaljournal.patientdiary;
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44

@@ -10,6 +10,7 @@ public class PatientDiaryPersonData implements Serializable {
1010
private static final long serialVersionUID = -1036432520752506284L;
1111

1212
private String _id;
13+
private PatientDiaryIdatId idatId;
1314
// Other returned fields are ignored. Add as needed
1415

1516
public String get_id() {
@@ -19,4 +20,12 @@ public String get_id() {
1920
public void set_id(String _id) {
2021
this._id = _id;
2122
}
23+
24+
public PatientDiaryIdatId getIdatId() {
25+
return idatId;
26+
}
27+
28+
public void setIdatId(PatientDiaryIdatId idatId) {
29+
this.idatId = idatId;
30+
}
2231
}

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/PatientDiaryPersonDto.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryPersonDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.symeda.sormas.api.externaljournal;
1+
package de.symeda.sormas.api.externaljournal.patientdiary;
22

33
import java.io.Serializable;
44

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/PatientDiaryPhone.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryPhone.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.symeda.sormas.api.externaljournal;
1+
package de.symeda.sormas.api.externaljournal.patientdiary;
22

33
import java.io.Serializable;
44

@@ -51,4 +51,4 @@ public String getDialCode() {
5151
public void setDialCode(String dialCode) {
5252
this.dialCode = dialCode;
5353
}
54-
}
54+
}

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/PatientDiaryPersonQueryResponse.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryQueryResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package de.symeda.sormas.api.externaljournal;
1+
package de.symeda.sormas.api.externaljournal.patientdiary;
22

33
import java.io.Serializable;
44
import java.util.List;
55

6-
public class PatientDiaryPersonQueryResponse implements Serializable {
6+
public class PatientDiaryQueryResponse implements Serializable {
77

88
private static final long serialVersionUID = -1089320137577059438L;
99

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/PatientDiaryRegisterResult.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/patientdiary/PatientDiaryRegisterResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.symeda.sormas.api.externaljournal;
1+
package de.symeda.sormas.api.externaljournal.patientdiary;
22

33
import java.io.Serializable;
44

0 commit comments

Comments
 (0)