#183 ebs resolved merge conflicts

ePareto-Information-System · Dec 11, 2024 · 2c273b9 · 2c273b9
1 parent 024ef70
commit 2c273b9
Show file tree

Hide file tree

Showing 52 changed files with 5,046 additions and 6,334 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java b/sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java
@@ -108,13 +108,13 @@
 import de.symeda.sormas.api.sormastosormas.share.incoming.SormasToSormasShareRequestFacade;
 import de.symeda.sormas.api.sormastosormas.share.outgoing.ShareRequestInfoFacade;
 import de.symeda.sormas.api.sormastosormas.share.outgoing.SormasToSormasShareInfoFacade;
-import de.symeda.sormas.api.sormastosormas.caze.SormasToSormasCaseFacade;
-import de.symeda.sormas.api.sormastosormas.contact.SormasToSormasContactFacade;
-import de.symeda.sormas.api.sormastosormas.event.SormasToSormasEventFacade;
-import de.symeda.sormas.api.sormastosormas.externalmessage.SormasToSormasExternalMessageFacade;
-import de.symeda.sormas.api.sormastosormas.shareinfo.SormasToSormasShareInfoFacade;
-import de.symeda.sormas.api.sormastosormas.sharerequest.SormasToSormasShareRequestFacade;
-import de.symeda.sormas.api.sormastosormas.entities.ebs.SormasToSormasEbsFacade;
+//import de.symeda.sormas.api.sormastosormas.caze.SormasToSormasCaseFacade;
+//import de.symeda.sormas.api.sormastosormas.contact.SormasToSormasContactFacade;
+//import de.symeda.sormas.api.sormastosormas.event.SormasToSormasEventFacade;
+//import de.symeda.sormas.api.sormastosormas.externalmessage.SormasToSormasExternalMessageFacade;
+//import de.symeda.sormas.api.sormastosormas.shareinfo.SormasToSormasShareInfoFacade;
+//import de.symeda.sormas.api.sormastosormas.sharerequest.SormasToSormasShareRequestFacade;
+//import de.symeda.sormas.api.sormastosormas.entities.ebs.SormasToSormasEbsFacade;
 import de.symeda.sormas.api.symptoms.SymptomsFacade;
 import de.symeda.sormas.api.systemevents.SystemEventFacade;
 import de.symeda.sormas.api.systemevents.sync.SyncFacade;

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
@@ -788,8 +788,6 @@ public interface Captions {
 	String Configuration_Disease = "Configuration.Disease";
 //	FormType
 	String Configuration_FormType = "Configuration.FormType";
-	String Configuration_Diseases = "Configuration.Diseases";
-	String Configuration_Disease = "Configuration.Disease";
 	String Configuration_Outbreaks = "Configuration.Outbreaks";
 	String Configuration_PointsOfEntry = "Configuration.PointsOfEntry";
 	String Contact = "Contact";
@@ -3506,6 +3504,7 @@ public interface Captions {
 	String travelEntryOpenResultingCase = "travelEntryOpenResultingCase";
 	String travelEntryPointOfEntry = "travelEntryPointOfEntry";
 	String travelEntryTravelEntriesList = "travelEntryTravelEntriesList";
+	String Triaging_animalLaboratoryCategoryDetails = "Triaging.animalFacilityCategoryDetails";
 	String Treatment = "Treatment";
 	String Treatment_additionalNotes = "Treatment.additionalNotes";
 	String Treatment_dose = "Treatment.dose";
@@ -3776,5 +3775,6 @@ public interface Captions {
 	String years = "years";
 	String dashboardLastReportedDistrict = "Last Reported District";
 	String exportDownloadMergeFile ="exportDownloadMergeFile" ;
+
 }
 
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java
@@ -647,15 +647,6 @@ public interface Strings {
 	String headingFillThis = "headingFillThis";
 	String healthStaffDetailsLabel = "healthStaffDetailsLabel";
 	String headingChildSeek = "headingChildSeek";
-	String headingSignalInformation = "headingSignalInformation";
-	String headingSignalVerification = "headingSignalVerification";
-	String headingRiskAssessment = "headingRiskAssessment";
-	String headingEventDetails = "headingEventDetails";
-	String headingRiskDetails = "headingRiskDetails";
-	String headingTriagingDecision = "headingTriagingDecision";
-	String headingSixtyDay = "headingSixtyDay";
-	String headingFillThis = "headingFillThis";
-	String headingChildSeek = "headingChildSeek";
 	String headingHowToMergeCases = "headingHowToMergeCases";
 	String headingHowToMergeContacts = "headingHowToMergeContacts";
 	String headingImmunizationsRestored = "headingImmunizationsRestored";
@@ -1778,29 +1769,4 @@ public interface Strings {
 	String messageTriagingSavedShort = "messageTriagingSavedShort";
 	String messageAlertSavedShort = "messageAlertSavedShort";
 	String messageSignalVerificationSavedShort = "messageSignalVerificationSavedShort";
-	String LowRiskReccomendation = "LowRiskReccomendation";
-	String LowRiskNotificationTYpe = "LowRiskNotificationTYpe";
-	String LowRiskNotificationAction = "LowRiskNotificationAction";
-	String messageRiskAssessmentSavedShort = "messageRiskAssessmentSavedShort";
-	String messageTriagingSavedShort = "messageTriagingSavedShort";
-	String messageAlertSavedShort = "messageAlertSavedShort";
-	String messageSignalVerificationSavedShort = "messageSignalVerificationSavedShort";
-	String VeryHighRisk = "VeryHighRisk";
-	String HighRisk = "HighRisk";
-	String ModerateRisk = "ModerateRisk";
-	String LowRisk = "LowRisk";
-	String RecommendedActions = "RecommendedActions";
-	String NotificationType = "NotificationType";
-	String NotificationAction = "NotificationAction";
-	String VeryHighRiskRecommendation = "VeryHighRiskRecommendation";
-	String VeryHighRiskNotificationType = "VeryHighRiskNotificationType";
-	String VeryHighRiskNotificationAction = "VeryHighRiskNotificationAction";
-	String HighRiskRecommendation = "HighRiskRecommendation";
-	String HighRiskNotificationType = "HighRiskNotificationType";
-	String HighRiskNotificationAction = "HighRiskNotificationAction";
-	String ModerateRiskRecommendation = "ModerateRiskRecommendation";
-	String ModerateRiskNotifcationType = "ModerateRiskNotifcationType";
-	String ModerateRiskNotificationAction = "ModerateRiskNotificationAction";
-	String headingCreateNewAssessment = "headingCreateNewAssessment";
-	String headingCreateNewAlert = "headingCreateNewAlert";
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestFacade.java
@@ -67,7 +67,5 @@ public interface PathogenTestFacade {
 
 	List<PathogenTestDto> getByPersonNames(List<PersonNameDto> personUuid);
 
-	Boolean checkIfPathogenTestIsTheFirst(String sampleUuid, String pathogenTestUuid);
-
 
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/share/ExternalShareInfoCriteria.java b/sormas-api/src/main/java/de/symeda/sormas/api/share/ExternalShareInfoCriteria.java
@@ -34,7 +34,6 @@ public class ExternalShareInfoCriteria implements Serializable {
 	@AuditIncludeProperty
 	private EbsReferenceDto ebs;
 
-	private EbsReferenceDto ebs;
 
 	public CaseReferenceDto getCaze() {
 		return caze;

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/CaseDtoHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/CaseDtoHelper.java
@@ -69,6 +69,15 @@ public class CaseDtoHelper extends PersonDependentDtoHelper<Case, CaseDataDto> {
 	private SormasToSormasOriginInfoDtoHelper sormasToSormasOriginInfoDtoHelper = new SormasToSormasOriginInfoDtoHelper();
 	private HealthConditionsDtoHelper healthConditionsDtoHelper = new HealthConditionsDtoHelper();
 
+	public static CaseReferenceDto toReferenceDto(Case ado) {
+		if (ado == null) {
+			return null;
+		}
+		CaseReferenceDto dto = new CaseReferenceDto(ado.getUuid());
+
+		return dto;
+	}
+
 	@Override
 	protected Class<Case> getAdoClass() {
 		return Case.class;
@@ -80,7 +89,7 @@ protected Class<CaseDataDto> getDtoClass() {
 	}
 
 	@Override
-	protected Call<List<CaseDataDto>> pullAllSince(long since, Integer size, String lastSynchronizedUuid)  throws NoConnectionException {
+	protected Call<List<CaseDataDto>> pullAllSince(long since, Integer size, String lastSynchronizedUuid) throws NoConnectionException {
 		return RetroProvider.getCaseFacade().pullAllSince(since, size, lastSynchronizedUuid);
 	}
 
@@ -501,15 +510,6 @@ protected long getApproximateJsonSizeInBytes() {
 		return CaseDataDto.APPROXIMATE_JSON_SIZE_IN_BYTES;
 	}
 
-	public static CaseReferenceDto toReferenceDto(Case ado) {
-		if (ado == null) {
-			return null;
-		}
-		CaseReferenceDto dto = new CaseReferenceDto(ado.getUuid());
-
-		return dto;
-	}
-
 	@Override
 	protected PersonReferenceDto getPerson(CaseDataDto dto) {
 		return dto.getPerson();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -67,7 +67,5 @@ public interface PathogenTestFacade {

		List<PathogenTestDto> getByPersonNames(List<PersonNameDto> personUuid);

		Boolean checkIfPathogenTestIsTheFirst(String sampleUuid, String pathogenTestUuid);


		}