#13084 - Linked SelfReporting message should be shown as side compone…

…nt in UI - changes after review
SORMAS-Foundation · Jun 3, 2024 · d75c072 · d75c072
1 parent c95618e
commit d75c072
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 49 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/selfreport/SelfReportListEntryDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/selfreport/SelfReportListEntryDto.java
@@ -1,61 +1,57 @@
 package de.symeda.sormas.api.selfreport;
 
-import de.symeda.sormas.api.Disease;
-import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableIndexDto;
-
 import java.io.Serializable;
 import java.util.Date;
 
-public class SelfReportListEntryDto extends PseudonymizableIndexDto implements Serializable {
-
-    public static final String I18N_PREFIX = "SelfReport";
-
-
+import de.symeda.sormas.api.Disease;
+import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableIndexDto;
 
+public class SelfReportListEntryDto extends PseudonymizableIndexDto implements Serializable {
 
-    private Date reportingDate;
-    private String caseReference;
-    private Disease disease;
-    private Date dateOfTest;
+	public static final String I18N_PREFIX = "SelfReport";
 
+	private Date reportingDate;
+	private String caseReference;
+	private Disease disease;
+	private Date dateOfTest;
 
-    public SelfReportListEntryDto(String uuid, Date reportingDate, String caseReference, Disease disease, Date dateOfTest) {
-        super(uuid);
-        this.reportingDate = reportingDate;
-        this.caseReference = caseReference;
-        this.disease = disease;
-        this.dateOfTest = dateOfTest;
-    }
+	public SelfReportListEntryDto(String uuid, Date reportingDate, String caseReference, Disease disease, Date dateOfTest) {
+		super(uuid);
+		this.reportingDate = reportingDate;
+		this.caseReference = caseReference;
+		this.disease = disease;
+		this.dateOfTest = dateOfTest;
+	}
 
-    public Date getReportingDate() {
-        return reportingDate;
-    }
+	public Date getReportingDate() {
+		return reportingDate;
+	}
 
-    public void setReportingDate(Date reportingDate) {
-        this.reportingDate = reportingDate;
-    }
+	public void setReportingDate(Date reportingDate) {
+		this.reportingDate = reportingDate;
+	}
 
-    public String getCaseReference() {
-        return caseReference;
-    }
+	public String getCaseReference() {
+		return caseReference;
+	}
 
-    public void setCaseReference(String caseReference) {
-        this.caseReference = caseReference;
-    }
+	public void setCaseReference(String caseReference) {
+		this.caseReference = caseReference;
+	}
 
-    public Disease getDisease() {
-        return disease;
-    }
+	public Disease getDisease() {
+		return disease;
+	}
 
-    public void setDisease(Disease disease) {
-        this.disease = disease;
-    }
+	public void setDisease(Disease disease) {
+		this.disease = disease;
+	}
 
-    public Date getDateOfTest() {
-        return dateOfTest;
-    }
+	public Date getDateOfTest() {
+		return dateOfTest;
+	}
 
-    public void setDateOfTest(Date dateOfTest) {
-        this.dateOfTest = dateOfTest;
-    }
+	public void setDateOfTest(Date dateOfTest) {
+		this.dateOfTest = dateOfTest;
+	}
 }
diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties
@@ -2962,7 +2962,7 @@ specailCaseAccessNoAccessGranted=No special access granted for this case
 SelfReport = Self report
 SelfReport.type = Type
 SelfReport.reportDate = Report date
-SelfReport.caseReference = Case Reference
+SelfReport.caseReference = Case reference number
 SelfReport.disease = Disease
 SelfReport.diseaseVariant = Disease variant
 SelfReport.firstName = First name

diff --git a/sormas-api/src/main/resources/strings.properties b/sormas-api/src/main/resources/strings.properties
@@ -672,7 +672,7 @@ headingSecurityAlert=Security Alert
 headingSelectCampaign = Select a campaign
 headingSetOutbreakStatus = Set status of all districts:
 headingShowExternalMessage = Message
-headingSelfReportSideComponent = Self reporting
+headingSelfReportSideComponent = Self reports
 headingSignsAndSymptoms = Clinical Signs and Symptoms
 headingSimilarImmunization = Similar immunizaton
 headingSyncUsers = Sync Users

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/selfreport/SelfReportFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/selfreport/SelfReportFacadeEjb.java
@@ -78,8 +78,6 @@ public class SelfReportFacadeEjb
 
 	@EJB
 	private LocationFacadeEjbLocal locationFacade;
-	@EJB
-	private SelfReportService selfReportService;
 
 	public SelfReportFacadeEjb() {
 	}
@@ -277,7 +275,7 @@ private List<Order> getOrderList(List<SortProperty> sortProperties, SelfReportQu
 
 	@Override
 	public List<SelfReportListEntryDto> getEntriesList(SelfReportCriteria selfReportCriteria, Integer first, Integer max) {
-		return selfReportService.getEntriesList(selfReportCriteria, first, max);
+		return service.getEntriesList(selfReportCriteria, first, max);
 	}
 
 	@Override

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/BulkOperationHandler.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/BulkOperationHandler.java
@@ -42,7 +42,7 @@ public class BulkOperationHandler<T extends HasUuid> {
 	/**
 	 * Amount of DTOs that have to be selected for the progress layout to be displayed.
 	 */
-	public static final int BULK_ACTION_PROGRESS_THRESHOLD = 3;
+	public static final int BULK_ACTION_PROGRESS_THRESHOLD = 40;
 	private boolean cancelAfterCurrentBatch;
 	private boolean cancelButtonClicked;
 	private final Lock cancelLock = new ReentrantLock();