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

Commit 0d32d96

Browse files
xavier-callandxavier-calland
authored
Add event title (SORMAS-Foundation#2926)
* Issue SORMAS-Foundation#2904 Adds field title in event in database - sql script - DTO - Entity * Issue SORMAS-Foundation#2904 Adds field title in event form * Issue SORMAS-Foundation#2904 Use event title in event grid and list * Issue SORMAS-Foundation#2904 Use event title in event filter * Issue SORMAS-Foundation#2904 add event title in event detailed export * Issue SORMAS-Foundation#2904 add event title in event participant export # Conflicts: # sormas-api/src/main/java/de/symeda/sormas/api/event/EventParticipantExportDto.java * Issue SORMAS-Foundation#2904 add event title in the android app
1 parent f44a68d commit 0d32d96

33 files changed

Lines changed: 182 additions & 56 deletions

‎sormas-api/src/main/java/de/symeda/sormas/api/event/EventDto.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public class EventDto extends PseudonymizableDto {
3939
public static final String PARTICIPANTS_COUNT = "participantCount";
4040
public static final String EVENT_ACTIONS = "eventActions";
4141
public static final String EXTERNAL_ID = "externalId";
42+
public static final String EVENT_TITLE = "eventTitle";
4243
public static final String EVENT_DESC = "eventDesc";
4344
public static final String NOSOCOMIAL = "nosocomial";
4445
public static final String START_DATE = "startDate";
@@ -66,6 +67,7 @@ public class EventDto extends PseudonymizableDto {
6667
@Required
6768
private EventStatus eventStatus;
6869
private String externalId;
70+
private String eventTitle;
6971
@Required
7072
private String eventDesc;
7173
private YesNoUnknown nosocomial;
@@ -121,6 +123,14 @@ public void setExternalId(String externalId) {
121123
this.externalId = externalId;
122124
}
123125

126+
public String getEventTitle() {
127+
return eventTitle;
128+
}
129+
130+
public void setEventTitle(String eventTitle) {
131+
this.eventTitle = eventTitle;
132+
}
133+
124134
public String getEventDesc() {
125135
return eventDesc;
126136
}

‎sormas-api/src/main/java/de/symeda/sormas/api/event/EventExportDto.java‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class EventExportDto implements Serializable {
3434
private String diseaseDetails;
3535
private Date startDate;
3636
private Date endDate;
37+
private String eventTitle;
3738
private String eventDesc;
3839
private YesNoUnknown nosocomial;
3940
private String region;
@@ -64,6 +65,7 @@ public EventExportDto(
6465
String diseaseDetails,
6566
Date startDate,
6667
Date endDate,
68+
String eventTitle,
6769
String eventDesc,
6870
YesNoUnknown nosocomial,
6971
String regionUuid,
@@ -95,6 +97,7 @@ public EventExportDto(
9597
this.diseaseDetails = diseaseDetails;
9698
this.startDate = startDate;
9799
this.endDate = endDate;
100+
this.eventTitle = eventTitle;
98101
this.eventDesc = eventDesc;
99102
this.nosocomial = nosocomial;
100103
this.region = region;
@@ -172,6 +175,15 @@ public Date getEndDate() {
172175
}
173176

174177
@Order(7)
178+
public String getEventTitle() {
179+
return eventTitle;
180+
}
181+
182+
public void setEventTitle(String eventTitle) {
183+
this.eventTitle = eventTitle;
184+
}
185+
186+
@Order(8)
175187
public String getEventDesc() {
176188
return eventDesc;
177189
}
@@ -180,12 +192,12 @@ public void setEventDesc(String eventDesc) {
180192
this.eventDesc = eventDesc;
181193
}
182194

183-
@Order(8)
195+
@Order(9)
184196
public YesNoUnknown getNosocomial() {
185197
return nosocomial;
186198
}
187199

188-
@Order(9)
200+
@Order(10)
189201
public String getRegion() {
190202
return region;
191203
}
@@ -194,7 +206,7 @@ public void setRegion(String region) {
194206
this.region = region;
195207
}
196208

197-
@Order(10)
209+
@Order(11)
198210
public String getDistrict() {
199211
return district;
200212
}
@@ -203,7 +215,7 @@ public void setDistrict(String district) {
203215
this.district = district;
204216
}
205217

206-
@Order(11)
218+
@Order(12)
207219
public String getCommunity() {
208220
return community;
209221
}
@@ -212,7 +224,7 @@ public void setCommunity(String community) {
212224
this.community = community;
213225
}
214226

215-
@Order(12)
227+
@Order(13)
216228
public String getCity() {
217229
return city;
218230
}
@@ -221,7 +233,7 @@ public void setCity(String city) {
221233
this.city = city;
222234
}
223235

224-
@Order(13)
236+
@Order(14)
225237
public String getStreet() {
226238
return street;
227239
}
@@ -230,7 +242,7 @@ public void setStreet(String street) {
230242
this.street = street;
231243
}
232244

233-
@Order(14)
245+
@Order(15)
234246
public String getHouseNumber() {
235247
return houseNumber;
236248
}
@@ -239,7 +251,7 @@ public void setHouseNumber(String houseNumber) {
239251
this.houseNumber = houseNumber;
240252
}
241253

242-
@Order(15)
254+
@Order(16)
243255
public String getAdditionalInformation() {
244256
return additionalInformation;
245257
}
@@ -248,12 +260,12 @@ public void setAdditionalInformation(String additionalInformation) {
248260
this.additionalInformation = additionalInformation;
249261
}
250262

251-
@Order(16)
263+
@Order(17)
252264
public EventSourceType getSrcType() {
253265
return srcType;
254266
}
255267

256-
@Order(17)
268+
@Order(18)
257269
public String getSrcFirstName() {
258270
return srcFirstName;
259271
}
@@ -262,7 +274,7 @@ public void setSrcFirstName(String srcFirstName) {
262274
this.srcFirstName = srcFirstName;
263275
}
264276

265-
@Order(18)
277+
@Order(19)
266278
public String getSrcLastName() {
267279
return srcLastName;
268280
}
@@ -271,7 +283,7 @@ public void setSrcLastName(String srcLastName) {
271283
this.srcLastName = srcLastName;
272284
}
273285

274-
@Order(19)
286+
@Order(20)
275287
public String getSrcTelNo() {
276288
return srcTelNo;
277289
}
@@ -280,27 +292,27 @@ public void setSrcTelNo(String srcTelNo) {
280292
this.srcTelNo = srcTelNo;
281293
}
282294

283-
@Order(20)
295+
@Order(21)
284296
public String getSrcEmail() {
285297
return srcEmail;
286298
}
287299

288-
@Order(21)
300+
@Order(22)
289301
public String getSrcMediaWebsite() {
290302
return srcMediaWebsite;
291303
}
292304

293-
@Order(22)
305+
@Order(23)
294306
public String getSrcMediaName() {
295307
return srcMediaName;
296308
}
297309

298-
@Order(23)
310+
@Order(24)
299311
public String getSrcMediaDetails() {
300312
return srcMediaDetails;
301313
}
302314

303-
@Order(24)
315+
@Order(25)
304316
public Date getReportDateTime() {
305317
return reportDateTime;
306318
}
@@ -309,7 +321,7 @@ public void setReportDateTime(Date reportDateTime) {
309321
this.reportDateTime = reportDateTime;
310322
}
311323

312-
@Order(25)
324+
@Order(26)
313325
public long getParticipantsCount() {
314326
return participantsCount;
315327
}

‎sormas-api/src/main/java/de/symeda/sormas/api/event/EventIndexDto.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class EventIndexDto implements WithJurisdiction<EventJurisdictionDto>, Se
3737
public static final String DISEASE_DETAILS = "diseaseDetails";
3838
public static final String START_DATE = "startDate";
3939
public static final String END_DATE = "endDate";
40-
public static final String EVENT_DESC = "eventDesc";
40+
public static final String EVENT_TITLE = "eventTitle";
4141
public static final String EVENT_LOCATION = "eventLocation";
4242
public static final String SRC_TYPE = "srcType";
4343
public static final String SRC_FIRST_NAME = "srcFirstName";
@@ -52,7 +52,7 @@ public class EventIndexDto implements WithJurisdiction<EventJurisdictionDto>, Se
5252
private String diseaseDetails;
5353
private Date startDate;
5454
private Date endDate;
55-
private String eventDesc;
55+
private String eventTitle;
5656
private EventIndexLocation eventLocation;
5757
private EventSourceType srcType;
5858
private String srcFirstName;
@@ -71,7 +71,7 @@ public EventIndexDto(
7171
String diseaseDetails,
7272
Date startDate,
7373
Date endDate,
74-
String eventDesc,
74+
String eventTitle,
7575
String regionUuid,
7676
String regionName,
7777
String districtUuid,
@@ -98,7 +98,7 @@ public EventIndexDto(
9898
this.diseaseDetails = diseaseDetails;
9999
this.startDate = startDate;
100100
this.endDate = endDate;
101-
this.eventDesc = eventDesc;
101+
this.eventTitle = eventTitle;
102102
this.eventLocation = new EventIndexLocation(regionName, districtName, communityName, city, street, houseNumber, additionalInformation);
103103
this.srcType = srcType;
104104
this.srcFirstName = srcFirstName;
@@ -159,12 +159,12 @@ public void setEndDate(Date endDate) {
159159
this.endDate = endDate;
160160
}
161161

162-
public String getEventDesc() {
163-
return eventDesc;
162+
public String getEventTitle() {
163+
return eventTitle;
164164
}
165165

166-
public void setEventDesc(String eventDesc) {
167-
this.eventDesc = eventDesc;
166+
public void setEventTitle(String eventTitle) {
167+
this.eventTitle = eventTitle;
168168
}
169169

170170
public EventIndexLocation getEventLocation() {

‎sormas-api/src/main/java/de/symeda/sormas/api/event/EventParticipantExportDto.java‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public class EventParticipantExportDto implements Serializable {
4848
public static final String EVENT_TYPE_OF_PLACE = "eventTypeOfPlace";
4949
public static final String EVENT_START_DATE = "eventStartDate";
5050
public static final String EVENT_END_DATE = "eventEndDate";
51+
public static final String EVENT_TITLE = "eventTitle";
5152
public static final String EVENT_DESCRIPTION = "eventDescription";
5253
public static final String EVENT_REGION = "eventRegion";
5354
public static final String EVENT_DISTRICT = "eventDistrict";
@@ -76,6 +77,7 @@ public class EventParticipantExportDto implements Serializable {
7677
private TypeOfPlace typeOfPlace;
7778
private final Date eventStartDate;
7879
private final Date eventEndDate;
80+
private final String eventTitle;
7981
private final String eventDesc;
8082

8183
private final String eventRegion;
@@ -138,7 +140,7 @@ public class EventParticipantExportDto implements Serializable {
138140
//@formatter:off
139141
public EventParticipantExportDto(long id, long personId, String personUuid, String eventParticipantUuid, String personNationalHealthId, long personAddressId, String reportingUserUuid, String eventUuid,
140142

141-
EventStatus eventStatus, Disease eventDisease, TypeOfPlace typeOfPlace, Date eventStartDate, Date eventEndDate, String eventDesc,
143+
EventStatus eventStatus, Disease eventDisease, TypeOfPlace typeOfPlace, Date eventStartDate, Date eventEndDate, String eventTitle, String eventDesc,
142144
String eventRegion, String eventDistrict, String eventCommunity, String eventCity, String eventStreet, String eventHouseNumber,
143145
String firstName, String lastName, Sex sex, String involvmentDescription, Integer approximateAge, ApproximateAgeType approximateAgeType,
144146
Integer birthdateDD, Integer birthdateMM, Integer birthdateYYYY, PresentCondition presentCondition, Date deathDate, Date burialDate,
@@ -159,6 +161,7 @@ public EventParticipantExportDto(long id, long personId, String personUuid, Stri
159161
this.typeOfPlace = typeOfPlace;
160162
this.eventStartDate = eventStartDate;
161163
this.eventEndDate = eventEndDate;
164+
this.eventTitle = eventTitle;
162165
this.eventDesc = eventDesc;
163166
this.eventRegion = eventRegion;
164167
this.eventDistrict = eventDistrict;
@@ -367,42 +370,48 @@ public Date getEventEndDate() {
367370
}
368371

369372
@Order(56)
373+
@ExportProperty(EventParticipantExportDto.EVENT_TITLE)
374+
public String getEventTitle() {
375+
return eventTitle;
376+
}
377+
378+
@Order(57)
370379
@ExportProperty(EventParticipantExportDto.EVENT_DESCRIPTION)
371380
public String getEventDesc() {
372381
return eventDesc;
373382
}
374383

375-
@Order(57)
384+
@Order(58)
376385
@ExportProperty(EventParticipantExportDto.EVENT_REGION)
377386
public String getEventRegion() {
378387
return eventRegion;
379388
}
380389

381-
@Order(58)
390+
@Order(59)
382391
@ExportProperty(EventParticipantExportDto.EVENT_DISTRICT)
383392
public String getEventDistrict() {
384393
return eventDistrict;
385394
}
386395

387-
@Order(59)
396+
@Order(60)
388397
@ExportProperty(EventParticipantExportDto.EVENT_COMMUNITY)
389398
public String getEventCommunity() {
390399
return eventCommunity;
391400
}
392401

393-
@Order(60)
402+
@Order(61)
394403
@ExportProperty(EventParticipantExportDto.EVENT_CITY)
395404
public String getEventCity() {
396405
return eventCity;
397406
}
398407

399-
@Order(61)
408+
@Order(62)
400409
@ExportProperty(EventParticipantExportDto.EVENT_STREET)
401410
public String getEventStreet() {
402411
return eventStreet;
403412
}
404413

405-
@Order(62)
414+
@Order(63)
406415
@ExportProperty(EventParticipantExportDto.EVENT_HOUSE_NUMBER)
407416
public String getEventHouseNumber() {
408417
return eventHouseNumber;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,7 @@ public interface Captions {
760760
String Event_eventParticipants = "Event.eventParticipants";
761761
String Event_eventPersons = "Event.eventPersons";
762762
String Event_eventStatus = "Event.eventStatus";
763+
String Event_eventTitle = "Event.eventTitle";
763764
String Event_eventType = "Event.eventType";
764765
String Event_externalId = "Event.externalId";
765766
String Event_informationSource = "Event.informationSource";
@@ -819,6 +820,7 @@ public interface Captions {
819820
String EventParticipantExport_eventRegion = "EventParticipantExport.eventRegion";
820821
String EventParticipantExport_eventStartDate = "EventParticipantExport.eventStartDate";
821822
String EventParticipantExport_eventStreet = "EventParticipantExport.eventStreet";
823+
String EventParticipantExport_eventTitle = "EventParticipantExport.eventTitle";
822824
String EventParticipantExport_eventTypeOfPlace = "EventParticipantExport.eventTypeOfPlace";
823825
String EventParticipantExport_personNationalHealthId = "EventParticipantExport.personNationalHealthId";
824826
String EventParticipantExport_sampleInformation = "EventParticipantExport.sampleInformation";

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,7 @@ Event.eventActions=Event actions
863863
Event.endDate=End date
864864
Event.multiDayEvent=Multi-day event
865865
Event.externalId=External ID
866+
Event.eventTitle=Title
866867
Event.eventDesc=Description
867868
Event.nosocomial=Nosocomial
868869
Event.eventLocation=Event location
@@ -911,6 +912,7 @@ EventParticipantExport.eventDisease=Event disease
911912
EventParticipantExport.eventTypeOfPlace=Event type
912913
EventParticipantExport.eventStartDate=Event start date
913914
EventParticipantExport.eventEndDate=Event end date
915+
EventParticipantExport.eventTitle=Event title
914916
EventParticipantExport.eventDescription=Event description
915917
EventParticipantExport.eventRegion=Event region
916918
EventParticipantExport.eventDistrict=Event district

‎sormas-api/src/main/resources/captions_fr-FR.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,7 @@ Event.eventActions=Actions de l'événement
863863
Event.endDate=Date de fin
864864
Event.multiDayEvent=Événement de plusieurs jours
865865
Event.externalId=ID externe
866+
Event.eventTitle=Titre
866867
Event.eventDesc=Description
867868
Event.nosocomial=Nosocomiale
868869
Event.eventLocation=Lieu de l’événement

0 commit comments

Comments
 (0)