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

Commit 5bd1726

Browse files
Add an event component in contact data view SORMAS-Foundation#3133 (SORMAS-Foundation#3371)
* Move eventLink from case folder to the event one SORMAS-Foundation#3133 Because this component no longer is only for cases, and will be made more generic (It will at least be used for contacts) * Add event component in contact data view SORMAS-Foundation#3133 * Modify the notification type of the contact based eventCreateForm SORMAS-Foundation#3133 * Fix EventController's create method from contact SORMAS-Foundation#3133 * Handle the situation where getByEventAndPerson woudln't return an EventParticipant SORMAS-Foundation#3133 * Add an EventJoins class SORMAS-Foundation#3133 * Avoid caption overflow inside the event list component SORMAS-Foundation#3133 * Revert "Add an EventJoins class SORMAS-Foundation#3133" This reverts commit c9bad8e.
1 parent 1722be1 commit 5bd1726

56 files changed

Lines changed: 330 additions & 60 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/event/EventCriteria.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import de.symeda.sormas.api.EntityRelevanceStatus;
2626
import de.symeda.sormas.api.action.ActionStatus;
2727
import de.symeda.sormas.api.caze.CaseReferenceDto;
28+
import de.symeda.sormas.api.person.PersonReferenceDto;
2829
import de.symeda.sormas.api.region.CommunityReferenceDto;
2930
import de.symeda.sormas.api.region.DistrictReferenceDto;
3031
import de.symeda.sormas.api.region.RegionReferenceDto;
@@ -65,6 +66,7 @@ public class EventCriteria extends BaseCriteria implements Serializable {
6566
private CaseReferenceDto caze;
6667
private Boolean userFilterIncluded = true;
6768
private TypeOfPlace typeOfPlace;
69+
private PersonReferenceDto person;
6870

6971
// Actions criterias
7072
private ActionStatus actionStatus;
@@ -376,4 +378,18 @@ public enum DateType {
376378
EVENT,
377379
ACTION,
378380
}
381+
382+
public PersonReferenceDto getPerson() {
383+
return person;
384+
}
385+
386+
public void setPerson(PersonReferenceDto person) {
387+
this.person = person;
388+
}
389+
390+
public EventCriteria person(PersonReferenceDto person) {
391+
this.person = person;
392+
return this;
393+
}
394+
379395
}

sormas-api/src/main/java/de/symeda/sormas/api/event/EventParticipantDto.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ public static EventParticipantDto buildFromCase(
6969
return eventParticipantDto;
7070
}
7171

72+
public static EventParticipantDto buildFromPerson(PersonDto person, EventReferenceDto event, UserReferenceDto reportingUser) {
73+
EventParticipantDto eventParticipantDto = build(event, reportingUser);
74+
75+
eventParticipantDto.setPerson(person);
76+
77+
return eventParticipantDto;
78+
}
79+
7280
public UserReferenceDto getReportingUser() {
7381
return reportingUser;
7482
}

sormas-api/src/main/java/de/symeda/sormas/api/event/EventParticipantFacade.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ List<EventParticipantIndexDto> getIndexList(
6060

6161
EventParticipantReferenceDto getReferenceByUuid(String uuid);
6262

63+
EventParticipantReferenceDto getReferenceByEventAndPerson(String eventUuid, String personUuid);
64+
6365
List<String> getDeletedUuidsSince(Date date);
6466

6567
boolean isEventParticipantEditAllowed(String uuid);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,6 +870,8 @@ public interface Captions {
870870
String eventLinkToContacts = "eventLinkToContacts";
871871
String eventNewEvent = "eventNewEvent";
872872
String eventNoEventLinkedToCase = "eventNoEventLinkedToCase";
873+
String eventNoEventLinkedToContact = "eventNoEventLinkedToContact";
874+
String eventOnlyWithContactSourceCaseInvolved = "eventOnlyWithContactSourceCaseInvolved";
873875
String EventParticipant = "EventParticipant";
874876
String EventParticipant_approximateAge = "EventParticipant.approximateAge";
875877
String EventParticipant_caseUuid = "EventParticipant.caseUuid";
@@ -1004,7 +1006,7 @@ public interface Captions {
10041006
String lineListingNewCasesList = "lineListingNewCasesList";
10051007
String lineListingSetEndDateForAll = "lineListingSetEndDateForAll";
10061008
String lineListingSharedInformation = "lineListingSharedInformation";
1007-
String linkEventToCase = "linkEventToCase";
1009+
String linkEvent = "linkEvent";
10081010
String Location = "Location";
10091011
String Location_additionalInformation = "Location.additionalInformation";
10101012
String Location_addressType = "Location.addressType";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ public interface Strings {
482482
String infoPickOrCreateCase = "infoPickOrCreateCase";
483483
String infoPickOrCreateCaseNewCase = "infoPickOrCreateCaseNewCase";
484484
String infoPickOrCreateEventForCase = "infoPickOrCreateEventForCase";
485+
String infoPickOrCreateEventForContact = "infoPickOrCreateEventForContact";
485486
String infoPopulationCollectionDate = "infoPopulationCollectionDate";
486487
String infoPopulationDataView = "infoPopulationDataView";
487488
String infoPopulationReferenceYear = "infoPopulationReferenceYear";

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ eventEventsList=Events list
912912
eventNewEvent=New event
913913
eventSearchEvent=Search event
914914
eventSearchSpecificEvent=Search specific Event
915-
linkEventToCase=Link event
915+
linkEvent=Link event
916916
eventSelect=Select event
917917
eventDefaultView=Events
918918
eventActionsView=Actions
@@ -955,6 +955,8 @@ Event.typeOfPlace=Type of place
955955
Event.typeOfPlaceText=Specify other event place
956956
Event.uuid=Event ID
957957
eventNoEventLinkedToCase=No event linked to case
958+
eventNoEventLinkedToContact=No event linked to contact
959+
eventOnlyWithContactSourceCaseInvolved=Only events in which the contact's source case is involved
958960
eventLinkToCases=See cases for this event
959961
eventLinkToContacts=See contacts for this event
960962

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ eventEventsList=Ereignisliste
910910
eventNewEvent=Neues Ereignis
911911
eventSearchEvent=Ereignis suchen
912912
eventSearchSpecificEvent=Nach einem bestimmten Ereignis suchen
913-
linkEventToCase=Ereignis verknüpfen
913+
linkEvent=Ereignis verknüpfen
914914
eventSelect=Ereignis auswählen
915915
eventDefaultView=Ereignisse
916916
eventActionsView=Aktionen

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ eventEventsList=Ereignisliste
910910
eventNewEvent=Neues Ereignis
911911
eventSearchEvent=Ereignis suchen
912912
eventSearchSpecificEvent=Nach einem bestimmten Ereignis suchen
913-
linkEventToCase=Ereignis verknüpfen
913+
linkEvent=Ereignis verknüpfen
914914
eventSelect=Ereignis wählen
915915
eventDefaultView=Ereignisse
916916
eventActionsView=Aktionen

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ eventEventsList=Events list
910910
eventNewEvent=New event
911911
eventSearchEvent=Search event
912912
eventSearchSpecificEvent=Search specific Event
913-
linkEventToCase=Link event
913+
linkEvent=Link event
914914
eventSelect=Select event
915915
eventDefaultView=Events
916916
eventActionsView=Actions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ eventEventsList=Lista de eventos
910910
eventNewEvent=Nuevo evento
911911
eventSearchEvent=Buscar evento
912912
eventSearchSpecificEvent=Buscar evento específico
913-
linkEventToCase=Vincular evento
913+
linkEvent=Vincular evento
914914
eventSelect=Seleccionar evento
915915
eventDefaultView=Eventos
916916
eventActionsView=Acciones

0 commit comments

Comments
 (0)