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

Commit d7a0e1f

Browse files
Merge branch 'development' of https://github.com/hzi-braunschweig/SORMAS-Project into SORMAS-Foundation#3843-Bulk_editing_cases_takes_a_very_long_time
� Conflicts: � sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseFacade.java
2 parents 5681f3d + b65acf0 commit d7a0e1f

126 files changed

Lines changed: 1596 additions & 864 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/action/ActionDto.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class ActionDto extends EntityDto {
5656
private String title;
5757
private String description;
5858
private String reply;
59-
private UserReferenceDto replyingUser;
59+
private UserReferenceDto lastModifiedBy;
6060

6161
public static ActionDto build(ActionContext context, ReferenceDto entityRef) {
6262

@@ -146,12 +146,12 @@ public void setReply(String reply) {
146146
this.reply = reply;
147147
}
148148

149-
public UserReferenceDto getReplyingUser() {
150-
return replyingUser;
149+
public UserReferenceDto getLastModifiedBy() {
150+
return lastModifiedBy;
151151
}
152152

153-
public void setReplyingUser(UserReferenceDto replyingUser) {
154-
this.replyingUser = replyingUser;
153+
public void setLastModifiedBy(UserReferenceDto lastModifiedBy) {
154+
this.lastModifiedBy = lastModifiedBy;
155155
}
156156

157157
public ActionPriority getPriority() {

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseFacade.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ List<DashboardQuarantineDataDto> getQuarantineDataForDashBoard(
184184

185185
List<ManualMessageLogDto> getMessageLog(String caseUuid, MessageType messageType);
186186

187+
String getFirstCaseUuidWithOwnershipHandedOver(List<String> caseUuids);
188+
187189
void saveBulkCase(
188190
List<String> caseUuidList,
189191
CaseBulkEditData updatedCaseBulkEditData,

0 commit comments

Comments
 (0)