From f80eb6d791f35aa96249ef783e56164db85c8278 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 18 Nov 2021 11:18:34 +0200 Subject: [PATCH] 2 new falgs for UI indicators --- .../iqser/red/service/redaction/v1/model/RedactionLogEntry.java | 2 ++ .../v1/server/redaction/service/RedactionLogMergeService.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java index 7a7610e1..dd24c0d4 100644 --- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java +++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java @@ -30,6 +30,8 @@ public class RedactionLogEntry { private boolean redacted; private boolean isHint; private boolean isRecommendation; + private boolean hasBeenResized; + private boolean hasBeenRecategorized; private String section; private float[] color; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java index 16697736..702fa22c 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java @@ -117,6 +117,7 @@ public class RedactionLogMergeService { if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) { redactionLogEntry.setStatus(AnnotationStatus.APPROVED); redactionLogEntry.setType(imageRecategorization.getType()); + redactionLogEntry.setHasBeenRecategorized(true); manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override"); } else if (imageRecategorization.getStatus().equals(AnnotationStatus.REQUESTED)) { manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize"); @@ -220,6 +221,7 @@ public class RedactionLogMergeService { .isRedacted(), false)); redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions())); redactionLogEntry.setValue(manualResizeRedact.getValue()); + redactionLogEntry.setHasBeenResized(true); manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", resized by manual override"); } else if (manualResizeRedact.getStatus().equals(AnnotationStatus.REQUESTED)) { manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to resize redact");