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

Commit 5d24bf4

Browse files
alexandre-gillealexandre-gille
authored
* Modifies a filter's label SORMAS-Foundation#3314 * Modify event filter behaviour in contact directory SORMAS-Foundation#3314
1 parent 44220dc commit 5d24bf4

41 files changed

Lines changed: 40 additions & 57 deletions

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/contact/ContactCriteria.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class ContactCriteria extends BaseCriteria implements Serializable {
5959
public static final String BIRTHDATE_DD = "birthdateDD";
6060
public static final String RETURNING_TRAVELER = "returningTraveler";
6161
public static final String EVENT_LIKE = "eventLike";
62-
public static final String ONLY_CONTACTS_WITH_SOURCE_CASE_IN_EVENT = "onlyContactsWithSourceCaseInEvent";
62+
public static final String ONLY_CONTACTS_SHARING_EVENT_WITH_SOURCE_CASE = "onlyContactsSharingEventWithSourceCase";
6363

6464
private static final long serialVersionUID = 5114202107622217837L;
6565

@@ -109,7 +109,7 @@ public class ContactCriteria extends BaseCriteria implements Serializable {
109109
private YesNoUnknown returningTraveler;
110110
private String eventLike;
111111
private String eventUuid;
112-
private Boolean onlyContactsWithSourceCaseInEvent;
112+
private Boolean onlyContactsSharingEventWithSourceCase;
113113

114114
public UserRole getReportingUserRole() {
115115
return reportingUserRole;
@@ -508,17 +508,17 @@ public ContactCriteria eventUuid(String eventUuid) {
508508
return this;
509509
}
510510

511-
public void setOnlyContactsWithSourceCaseInEvent(Boolean onlyContactsWithSourceCaseInEvent) {
512-
this.onlyContactsWithSourceCaseInEvent = onlyContactsWithSourceCaseInEvent;
511+
public void setOnlyContactsSharingEventWithSourceCase(Boolean onlyContactsSharingEventWithSourceCase) {
512+
this.onlyContactsSharingEventWithSourceCase = onlyContactsSharingEventWithSourceCase;
513513
}
514514

515515
@IgnoreForUrl
516-
public Boolean getOnlyContactsWithSourceCaseInEvent() {
517-
return onlyContactsWithSourceCaseInEvent;
516+
public Boolean getOnlyContactsSharingEventWithSourceCase() {
517+
return onlyContactsSharingEventWithSourceCase;
518518
}
519519

520-
public ContactCriteria onlyContactsWithSourceCaseInEvent(Boolean onlyContactsWithSourceCaseInEvent) {
521-
this.onlyContactsWithSourceCaseInEvent = onlyContactsWithSourceCaseInEvent;
520+
public ContactCriteria onlyContactsSharingEventWithSourceCase(Boolean onlyContactsSharingEventWithSourceCase) {
521+
this.onlyContactsSharingEventWithSourceCase = onlyContactsSharingEventWithSourceCase;
522522
return this;
523523
}
524524
}

‎sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ public interface Captions {
533533
String contactOnlyQuarantineHelpNeeded = "contactOnlyQuarantineHelpNeeded";
534534
String contactOnlyWithExtendedQuarantine = "contactOnlyWithExtendedQuarantine";
535535
String contactOnlyWithReducedQuarantine = "contactOnlyWithReducedQuarantine";
536-
String contactOnlyWithSourceCaseInEvent = "contactOnlyWithSourceCaseInEvent";
536+
String contactOnlyWithSharedEventWithSourceCase = "contactOnlyWithSharedEventWithSourceCase";
537537
String contactOpenContactCase = "contactOpenContactCase";
538538
String contactPersonPhoneNumber = "contactPersonPhoneNumber";
539539
String contactPersonVisits = "contactPersonVisits";

‎sormas-api/src/main/resources/captions.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ contactChooseSourceCase=Choose Source Case
519519
contactOnlyQuarantineHelpNeeded=Help needed in quarantine
520520
contactOnlyWithExtendedQuarantine=Only contacts with extended quarantine
521521
contactOnlyWithReducedQuarantine=Only contacts with reduced quarantine
522-
contactOnlyWithSourceCaseInEvent=Only contacts whose source case is linked to their latest event
522+
contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked to the specified event
523523
contactFollowUpDay=Day
524524
contactQuarantineNotOrdered=No quarantine ordered
525525
contactCreatePIAAccount = PIA

‎sormas-api/src/main/resources/captions_de-CH.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,6 @@ contactChooseSourceCase=Indexfall wählen
511511
contactOnlyQuarantineHelpNeeded=Maßnahmen zur Gewährleistung der Versorgung
512512
contactOnlyWithExtendedQuarantine=Nur Kontakte mit verlängerter Quarantäne
513513
contactOnlyWithReducedQuarantine=Nur Kontakte mit verkürzter Quarantäne
514-
contactOnlyWithSourceCaseInEvent=Nur Kontakte, deren Fall mit ihrem letzten Ereignis verknüpft ist
515514
contactFollowUpDay=Tag
516515
contactQuarantineNotOrdered=Keine Isolation angeordnet
517516
contactCreatePIAAccount = Symptomtagebuch

‎sormas-api/src/main/resources/captions_de-DE.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,6 @@ contactChooseSourceCase=Indexfall wählen
512512
contactOnlyQuarantineHelpNeeded=Maßnahmen zur Gewährleistung der Versorgung
513513
contactOnlyWithExtendedQuarantine=Nur Kontakte mit verlängerter Quarantäne
514514
contactOnlyWithReducedQuarantine=Nur Kontakte mit verkürzter Quarantäne
515-
contactOnlyWithSourceCaseInEvent=Nur Kontakte, deren Indexfall mit ihrem neuesten Ereignis verknüpft ist
516515
contactFollowUpDay=Tag
517516
contactQuarantineNotOrdered=Keine Quarantäne verordnet
518517
contactCreatePIAAccount = Symptomtagebuch

‎sormas-api/src/main/resources/captions_en-AF.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,6 @@ contactChooseSourceCase=Choose Source Case
514514
contactOnlyQuarantineHelpNeeded=Help needed in quarantine
515515
contactOnlyWithExtendedQuarantine=Only contacts with extended quarantine
516516
contactOnlyWithReducedQuarantine=Only contacts with reduced quarantine
517-
contactOnlyWithSourceCaseInEvent=Only contacts whose source case is linked to their latest event
518517
contactFollowUpDay=Day
519518
contactQuarantineNotOrdered=No quarantine ordered
520519
contactCreatePIAAccount = PIA

‎sormas-api/src/main/resources/captions_es-CU.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,6 @@ contactChooseSourceCase=Elegir caso de origen
511511
contactOnlyQuarantineHelpNeeded=Ayuda necesaria en cuarentena
512512
contactOnlyWithExtendedQuarantine=Sólo contactos con cuarentena extendida
513513
contactOnlyWithReducedQuarantine=Sólo contactos con cuarentena reducida
514-
contactOnlyWithSourceCaseInEvent=Sólo contactos cuyo caso de origen está vinculado a su último evento
515514
contactFollowUpDay=Día
516515
contactQuarantineNotOrdered=No hay cuarentena ordenada
517516
contactCreatePIAAccount = PIA

‎sormas-api/src/main/resources/captions_es-EC.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,6 @@ contactChooseSourceCase=Escoger caso de origen
511511
contactOnlyQuarantineHelpNeeded=Ayuda necesaria en cuarentena
512512
contactOnlyWithExtendedQuarantine=Only contacts with extended quarantine
513513
contactOnlyWithReducedQuarantine=Only contacts with reduced quarantine
514-
contactOnlyWithSourceCaseInEvent=Only contacts whose source case is linked to their latest event
515514
contactFollowUpDay=Día
516515
contactQuarantineNotOrdered=No hay cuarentena ordenada
517516
contactCreatePIAAccount = PIA

‎sormas-api/src/main/resources/captions_es-ES.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,6 @@ contactChooseSourceCase=Choose Source Case
511511
contactOnlyQuarantineHelpNeeded=Help needed in quarantine
512512
contactOnlyWithExtendedQuarantine=Only contacts with extended quarantine
513513
contactOnlyWithReducedQuarantine=Only contacts with reduced quarantine
514-
contactOnlyWithSourceCaseInEvent=Only contacts whose source case is linked to their latest event
515514
contactFollowUpDay=Day
516515
contactQuarantineNotOrdered=No quarantine ordered
517516
contactCreatePIAAccount = PIA

‎sormas-api/src/main/resources/captions_fa-AF.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,6 @@ contactChooseSourceCase=Choose Source Case
511511
contactOnlyQuarantineHelpNeeded=Help needed in quarantine
512512
contactOnlyWithExtendedQuarantine=Only contacts with extended quarantine
513513
contactOnlyWithReducedQuarantine=Only contacts with reduced quarantine
514-
contactOnlyWithSourceCaseInEvent=Only contacts whose source case is linked to their latest event
515514
contactFollowUpDay=Day
516515
contactQuarantineNotOrdered=No quarantine ordered
517516
contactCreatePIAAccount = PIA

0 commit comments

Comments
 (0)