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

Commit a6f7888

Browse files
author
barnabartha
committed
Merge branch 'development' into feature-3368-SubTab
2 parents 5faf883 + dd6a458 commit a6f7888

145 files changed

Lines changed: 556 additions & 309 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/caze/CaseFacade.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Map<PresentCondition, Long> getCaseCountPerPersonCondition(
151151

152152
List<CaseReferenceDto> getRandomCaseReferences(CaseCriteria criteria, int count);
153153

154-
Boolean isCaseEditAllowed(String caseUuid);
154+
boolean isCaseEditAllowed(String caseUuid);
155155

156156
boolean exists(String uuid);
157157

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ public interface ExternalJournalFacade {
1111

1212
String getPatientDiaryAuthToken();
1313

14-
ExternalPatientDto getPatientDiaryPerson(String personUuid);
14+
PatientDiaryPersonDto getPatientDiaryPerson(String personUuid);
1515

16-
RegisterResult registerPatientDiaryPerson(PersonDto person);
16+
PatientDiaryRegisterResult registerPatientDiaryPerson(PersonDto person);
1717

18-
ExternalPersonValidation validatePatientDiaryPerson(PersonDto person);
18+
PatientDiaryPersonValidation validatePatientDiaryPerson(PersonDto person);
1919
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
public class PatientDiaryConfig implements Serializable, Cloneable {
77

8-
private static final long serialVersionUID = -2758495636275275828L;
8+
private static final long serialVersionUID = 9020437984638539380L;
99

1010
private String url;
11-
private String externalDataUrl;
11+
private String probandsUrl;
1212
private String authUrl;
1313
private String email;
1414
private String password;
@@ -22,12 +22,12 @@ public void setUrl(String url) {
2222
this.url = url;
2323
}
2424

25-
public String getExternalDataUrl() {
26-
return externalDataUrl;
25+
public String getProbandsUrl() {
26+
return probandsUrl;
2727
}
2828

29-
public void setExternalDataUrl(String externalDataUrl) {
30-
this.externalDataUrl = externalDataUrl;
29+
public void setProbandsUrl(String probandsUrl) {
30+
this.probandsUrl = probandsUrl;
3131
}
3232

3333
public String getAuthUrl() {
@@ -70,7 +70,7 @@ public boolean equals(Object o) {
7070
return false;
7171
PatientDiaryConfig that = (PatientDiaryConfig) o;
7272
return Objects.equals(url, that.url)
73-
&& Objects.equals(externalDataUrl, that.externalDataUrl)
73+
&& Objects.equals(probandsUrl, that.probandsUrl)
7474
&& Objects.equals(authUrl, that.authUrl)
7575
&& Objects.equals(email, that.email)
7676
&& Objects.equals(password, that.password)
@@ -79,7 +79,7 @@ public boolean equals(Object o) {
7979

8080
@Override
8181
public int hashCode() {
82-
return Objects.hash(url, externalDataUrl, authUrl, email, password, defaultUser);
82+
return Objects.hash(url, probandsUrl, authUrl, email, password, defaultUser);
8383
}
8484

8585
@Override

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

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

33
import java.io.Serializable;
44

5-
class ExternalPatientContactInformation implements Serializable {
5+
class PatientDiaryContactInformation implements Serializable {
66

77
private static final long serialVersionUID = -144631462985961640L;
88

99
private String email;
10-
private ExternalPatientPhone phone;
10+
private PatientDiaryPhone phone;
1111

1212
public String getEmail() {
1313
return email;
@@ -17,11 +17,11 @@ public void setEmail(String email) {
1717
this.email = email;
1818
}
1919

20-
public ExternalPatientPhone getPhone() {
20+
public PatientDiaryPhone getPhone() {
2121
return phone;
2222
}
2323

24-
public void setPhone(ExternalPatientPhone phone) {
24+
public void setPhone(PatientDiaryPhone phone) {
2525
this.phone = phone;
2626
}
2727
}

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package de.symeda.sormas.api.externaljournal;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
5+
import java.io.Serializable;
6+
7+
@JsonIgnoreProperties(ignoreUnknown = true)
8+
public class PatientDiaryPersonData implements Serializable {
9+
10+
private static final long serialVersionUID = -1036432520752506284L;
11+
12+
private String _id;
13+
// Other returned fields are ignored. Add as needed
14+
15+
public String get_id() {
16+
return _id;
17+
}
18+
19+
public void set_id(String _id) {
20+
this._id = _id;
21+
}
22+
}

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

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

33
import java.io.Serializable;
4-
import java.util.Date;
54

6-
public class ExternalPatientDto implements Serializable {
5+
public class PatientDiaryPersonDto implements Serializable {
76

87
private static final long serialVersionUID = 1300043011538769976L;
98

@@ -12,7 +11,7 @@ public class ExternalPatientDto implements Serializable {
1211
private String lastName;
1312
private String gender;
1413
private String birthday;
15-
private ExternalPatientContactInformation contactInformation;
14+
private PatientDiaryContactInformation contactInformation;
1615
private String endDate;
1716

1817
public String getPersonUUID() {
@@ -55,11 +54,11 @@ public void setBirthday(String birthday) {
5554
this.birthday = birthday;
5655
}
5756

58-
public ExternalPatientContactInformation getContactInformation() {
57+
public PatientDiaryContactInformation getContactInformation() {
5958
return contactInformation;
6059
}
6160

62-
public void setContactInformation(ExternalPatientContactInformation contactInformation) {
61+
public void setContactInformation(PatientDiaryContactInformation contactInformation) {
6362
this.contactInformation = contactInformation;
6463
}
6564

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package de.symeda.sormas.api.externaljournal;
2+
3+
import java.io.Serializable;
4+
import java.util.List;
5+
6+
public class PatientDiaryPersonQueryResponse implements Serializable {
7+
8+
private static final long serialVersionUID = -1089320137577059438L;
9+
10+
private int total;
11+
private int count;
12+
private List<PatientDiaryPersonData> results;
13+
14+
public int getTotal() {
15+
return total;
16+
}
17+
18+
public void setTotal(int total) {
19+
this.total = total;
20+
}
21+
22+
public int getCount() {
23+
return count;
24+
}
25+
26+
public void setCount(int count) {
27+
this.count = count;
28+
}
29+
30+
public List<PatientDiaryPersonData> getResults() {
31+
return results;
32+
}
33+
34+
public void setResults(List<PatientDiaryPersonData> results) {
35+
this.results = results;
36+
}
37+
}

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/ExternalPersonValidation.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/PatientDiaryPersonValidation.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 ExternalPersonValidation implements Serializable {
5+
public class PatientDiaryPersonValidation implements Serializable {
66

77
private boolean valid;
88
private String message;
99

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.io.Serializable;
44

5-
class ExternalPatientPhone implements Serializable {
5+
class PatientDiaryPhone implements Serializable {
66

77
private static final long serialVersionUID = -5111422297633793595L;
88

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/RegisterResult.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/PatientDiaryRegisterResult.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 RegisterResult implements Serializable {
5+
public class PatientDiaryRegisterResult implements Serializable {
66

77
private boolean success;
88
private String message;
99

10-
public RegisterResult(boolean success, String message) {
10+
public PatientDiaryRegisterResult(boolean success, String message) {
1111
this.success = success;
1212
this.message = message;
1313
}

0 commit comments

Comments
 (0)