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

Commit b9d4605

Browse files
lgallgal
lgal
authored and
lgal
committed
3409 added prohibition to work fields to case and contact
1 parent 33e295e commit b9d4605

23 files changed

Lines changed: 408 additions & 6 deletions

File tree

‎sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ public class CaseDataDto extends PseudonymizableDto {
165165
public static final String END_OF_ISOLATION_REASON = "endOfIsolationReason";
166166
public static final String END_OF_ISOLATION_REASON_DETAILS = "endOfIsolationReasonDetails";
167167

168+
public static final String PROHIBITION_TO_WORK = "prohibitionToWork";
169+
public static final String PROHIBITION_TO_WORK_FROM = "prohibitionToWorkFrom";
170+
public static final String PROHIBITION_TO_WORK_UNTIL = "prohibitionToWorkUntil";
171+
168172
// Fields are declared in the order they should appear in the import template
169173

170174
@Outbreaks
@@ -444,6 +448,10 @@ public class CaseDataDto extends PseudonymizableDto {
444448
@SensitiveData
445449
private String endOfIsolationReasonDetails;
446450

451+
private YesNoUnknown prohibitionToWork;
452+
private Date prohibitionToWorkFrom;
453+
private Date prohibitionToWorkUntil;
454+
447455
public static CaseDataDto build(PersonReferenceDto person, Disease disease) {
448456
return build(person, disease, null);
449457
}
@@ -1296,6 +1304,30 @@ public void setSormasToSormasOriginInfo(SormasToSormasOriginInfoDto sormasToSorm
12961304
this.sormasToSormasOriginInfo = sormasToSormasOriginInfo;
12971305
}
12981306

1307+
public YesNoUnknown getProhibitionToWork() {
1308+
return prohibitionToWork;
1309+
}
1310+
1311+
public void setProhibitionToWork(YesNoUnknown prohibitionToWork) {
1312+
this.prohibitionToWork = prohibitionToWork;
1313+
}
1314+
1315+
public Date getProhibitionToWorkFrom() {
1316+
return prohibitionToWorkFrom;
1317+
}
1318+
1319+
public void setProhibitionToWorkFrom(Date prohibitionToWorkFrom) {
1320+
this.prohibitionToWorkFrom = prohibitionToWorkFrom;
1321+
}
1322+
1323+
public Date getProhibitionToWorkUntil() {
1324+
return prohibitionToWorkUntil;
1325+
}
1326+
1327+
public void setProhibitionToWorkUntil(Date prohibitionToWorkUntil) {
1328+
this.prohibitionToWorkUntil = prohibitionToWorkUntil;
1329+
}
1330+
12991331
public boolean isOwnershipHandedOver() {
13001332
return ownershipHandedOver;
13011333
}

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ public class ContactDto extends PseudonymizableDto {
114114
public static final String END_OF_QUARANTINE_REASON_DETAILS = "endOfQuarantineReasonDetails";
115115
public static final String RETURNING_TRAVELER = "returningTraveler";
116116

117+
public static final String PROHIBITION_TO_WORK = "prohibitionToWork";
118+
public static final String PROHIBITION_TO_WORK_FROM = "prohibitionToWorkFrom";
119+
public static final String PROHIBITION_TO_WORK_UNTIL = "prohibitionToWorkUntil";
120+
117121
private CaseReferenceDto caze;
118122
private String caseIdExternalSystem;
119123
@SensitiveData
@@ -247,6 +251,10 @@ public class ContactDto extends PseudonymizableDto {
247251
@SensitiveData
248252
private String endOfQuarantineReasonDetails;
249253

254+
private YesNoUnknown prohibitionToWork;
255+
private Date prohibitionToWorkFrom;
256+
private Date prohibitionToWorkUntil;
257+
250258
public static ContactDto build() {
251259
final ContactDto contact = new ContactDto();
252260
contact.setUuid(DataHelper.createUuid());
@@ -796,6 +804,30 @@ public void setEndOfQuarantineReasonDetails(String endOfQuarantineReasonDetails)
796804
this.endOfQuarantineReasonDetails = endOfQuarantineReasonDetails;
797805
}
798806

807+
public YesNoUnknown getProhibitionToWork() {
808+
return prohibitionToWork;
809+
}
810+
811+
public void setProhibitionToWork(YesNoUnknown prohibitionToWork) {
812+
this.prohibitionToWork = prohibitionToWork;
813+
}
814+
815+
public Date getProhibitionToWorkFrom() {
816+
return prohibitionToWorkFrom;
817+
}
818+
819+
public void setProhibitionToWorkFrom(Date prohibitionToWorkFrom) {
820+
this.prohibitionToWorkFrom = prohibitionToWorkFrom;
821+
}
822+
823+
public Date getProhibitionToWorkUntil() {
824+
return prohibitionToWorkUntil;
825+
}
826+
827+
public void setProhibitionToWorkUntil(Date prohibitionToWorkUntil) {
828+
this.prohibitionToWorkUntil = prohibitionToWorkUntil;
829+
}
830+
799831
public YesNoUnknown getReturningTraveler() {
800832
return returningTraveler;
801833
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ public interface Captions {
244244
String CaseData_portHealthInfo = "CaseData.portHealthInfo";
245245
String CaseData_postpartum = "CaseData.postpartum";
246246
String CaseData_pregnant = "CaseData.pregnant";
247+
String CaseData_prohibitionToWork = "CaseData.prohibitionToWork";
248+
String CaseData_prohibitionToWorkFrom = "CaseData.prohibitionToWorkFrom";
249+
String CaseData_prohibitionToWorkUntil = "CaseData.prohibitionToWorkUntil";
247250
String CaseData_quarantine = "CaseData.quarantine";
248251
String CaseData_quarantineExtended = "CaseData.quarantineExtended";
249252
String CaseData_quarantineFrom = "CaseData.quarantineFrom";
@@ -465,6 +468,9 @@ public interface Captions {
465468
String Contact_numberOfVisits = "Contact.numberOfVisits";
466469
String Contact_overwriteFollowUpUntil = "Contact.overwriteFollowUpUntil";
467470
String Contact_person = "Contact.person";
471+
String Contact_prohibitionToWork = "Contact.prohibitionToWork";
472+
String Contact_prohibitionToWorkFrom = "Contact.prohibitionToWorkFrom";
473+
String Contact_prohibitionToWorkUntil = "Contact.prohibitionToWorkUntil";
468474
String Contact_quarantine = "Contact.quarantine";
469475
String Contact_quarantineExtended = "Contact.quarantineExtended";
470476
String Contact_quarantineFrom = "Contact.quarantineFrom";

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,9 @@ CaseData.quarantineReasonBeforeIsolationDetails=Other reason
390390
CaseData.endOfIsolationReason=Reason for end of isolation
391391
CaseData.endOfIsolationReasonDetails=Other reason
392392
CaseData.sormasToSormasOriginInfo=Shared by
393+
CaseData.prohibitionToWork=Prohibition to work
394+
CaseData.prohibitionToWorkFrom=Prohibition to work from
395+
CaseData.prohibitionToWorkUntil=Prohibition to work until
393396

394397
# CaseExport
395398
CaseExport.address=Address
@@ -620,6 +623,9 @@ Contact.quarantineOfficialOrderSent=Official quarantine order sent?
620623
Contact.quarantineOfficialOrderSentDate=Date official quarantine order was sent
621624
Contact.endOfQuarantineReason=Reason for end of quarantine
622625
Contact.endOfQuarantineReasonDetails=Other reason
626+
Contact.prohibitionToWork=Prohibition to work
627+
Contact.prohibitionToWorkFrom=Prohibition to work from
628+
Contact.prohibitionToWorkUntil=Prohibition to work until
623629

624630
# ContactExport
625631
ContactExport.address=Address

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,9 @@ CaseData.quarantineReasonBeforeIsolationDetails=Anderer Grund
390390
CaseData.endOfIsolationReason=Grund für das Ende der Isolation
391391
CaseData.endOfIsolationReasonDetails=Anderer Grund
392392
CaseData.sormasToSormasOriginInfo=Geteilt von
393+
CaseData.prohibitionToWork=Tätigkeitsverbot
394+
CaseData.prohibitionToWorkFrom=Arbeitsverbot von
395+
CaseData.prohibitionToWorkUntil=Arbeitsverbot bis
393396

394397
# CaseExport
395398
CaseExport.address=Adresse
@@ -620,6 +623,9 @@ Contact.quarantineOfficialOrderSent=Offizieller Quarantänebescheid versendet?
620623
Contact.quarantineOfficialOrderSentDate=Offizieller Quarantänebescheid wurde versendet am
621624
Contact.endOfQuarantineReason=Grund für das Ende der Quarantäne
622625
Contact.endOfQuarantineReasonDetails=Anderer Grund
626+
Contact.prohibitionToWork=Tätigkeitsverbot
627+
Contact.prohibitionToWorkFrom=Arbeitsverbot von
628+
Contact.prohibitionToWorkUntil=Arbeitsverbot bis
623629

624630
# ContactExport
625631
ContactExport.address=Adresse

‎sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/Case.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,14 @@ public class Case extends PseudonymizableAdo {
334334
@Column(length = COLUMN_LENGTH_DEFAULT)
335335
private String endOfIsolationReasonDetails;
336336

337+
@Enumerated(EnumType.STRING)
338+
private YesNoUnknown prohibitionToWork;
339+
@DatabaseField
340+
private Date prohibitionToWorkFrom;
341+
@DatabaseField
342+
private Date prohibitionToWorkUntil;
343+
344+
337345
@DatabaseField(foreign = true, foreignAutoRefresh = true)
338346
private SormasToSormasOriginInfo sormasToSormasOriginInfo;
339347
@DatabaseField
@@ -1103,6 +1111,30 @@ public void setEndOfIsolationReasonDetails(String endOfIsolationReasonDetails) {
11031111
this.endOfIsolationReasonDetails = endOfIsolationReasonDetails;
11041112
}
11051113

1114+
public YesNoUnknown getProhibitionToWork() {
1115+
return prohibitionToWork;
1116+
}
1117+
1118+
public void setProhibitionToWork(YesNoUnknown prohibitionToWork) {
1119+
this.prohibitionToWork = prohibitionToWork;
1120+
}
1121+
1122+
public Date getProhibitionToWorkFrom() {
1123+
return prohibitionToWorkFrom;
1124+
}
1125+
1126+
public void setProhibitionToWorkFrom(Date prohibitionToWorkFrom) {
1127+
this.prohibitionToWorkFrom = prohibitionToWorkFrom;
1128+
}
1129+
1130+
public Date getProhibitionToWorkUntil() {
1131+
return prohibitionToWorkUntil;
1132+
}
1133+
1134+
public void setProhibitionToWorkUntil(Date prohibitionToWorkUntil) {
1135+
this.prohibitionToWorkUntil = prohibitionToWorkUntil;
1136+
}
1137+
11061138
public SormasToSormasOriginInfo getSormasToSormasOriginInfo() {
11071139
return sormasToSormasOriginInfo;
11081140
}

‎sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/CaseDtoHelper.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@ public void fillInnerFromDto(Case target, CaseDataDto source) {
197197
target.setEndOfIsolationReason(source.getEndOfIsolationReason());
198198
target.setEndOfIsolationReasonDetails(source.getEndOfIsolationReasonDetails());
199199

200+
target.setProhibitionToWork(source.getProhibitionToWork());
201+
target.setProhibitionToWorkFrom(source.getProhibitionToWorkFrom());
202+
target.setProhibitionToWorkUntil(source.getProhibitionToWorkUntil());
203+
200204
target.setSormasToSormasOriginInfo(
201205
sormasToSormasOriginInfoDtoHelper.fillOrCreateFromDto(target.getSormasToSormasOriginInfo(), source.getSormasToSormasOriginInfo()));
202206
target.setOwnershipHandedOver(source.isOwnershipHandedOver());
@@ -400,6 +404,10 @@ public void fillInnerFromAdo(CaseDataDto target, Case source) {
400404
target.setEndOfIsolationReason(source.getEndOfIsolationReason());
401405
target.setEndOfIsolationReasonDetails(source.getEndOfIsolationReasonDetails());
402406

407+
target.setProhibitionToWork(source.getProhibitionToWork());
408+
target.setProhibitionToWorkFrom(source.getProhibitionToWorkFrom());
409+
target.setProhibitionToWorkUntil(source.getProhibitionToWorkUntil());
410+
403411
if (source.getSormasToSormasOriginInfo() != null) {
404412
target.setSormasToSormasOriginInfo(sormasToSormasOriginInfoDtoHelper.adoToDto(source.getSormasToSormasOriginInfo()));
405413
}

‎sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
152152
public static final String DATABASE_NAME = "sormas.db";
153153
// any time you make changes to your database objects, you may have to increase the database version
154154

155-
public static final int DATABASE_VERSION = 247;
155+
public static final int DATABASE_VERSION = 248;
156156

157157
private static DatabaseHelper instance = null;
158158

@@ -1774,6 +1774,17 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
17741774
+ "FROM tmp_epidata;");
17751775
getDao(EpiData.class).executeRaw("DROP TABLE tmp_epidata;");
17761776

1777+
case 247:
1778+
currentVersion = 247;
1779+
1780+
getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN prohibitionToWork varchar(255);");
1781+
getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN prohibitionToWorkFrom timestamp;");
1782+
getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN prohibitionToWorkUntil timestamp;");
1783+
1784+
getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD COLUMN prohibitionToWork varchar(255);");
1785+
getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD COLUMN prohibitionToWorkFrom timestamp;");
1786+
getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD COLUMN prohibitionToWorkUntil timestamp;");
1787+
17771788
// ATTENTION: break should only be done after last version
17781789
break;
17791790
default:

‎sormas-app/app/src/main/java/de/symeda/sormas/app/backend/contact/Contact.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,13 @@ public class Contact extends PseudonymizableAdo {
228228
@Column(length = COLUMN_LENGTH_DEFAULT)
229229
private String endOfQuarantineReasonDetails;
230230

231+
@Enumerated(EnumType.STRING)
232+
private YesNoUnknown prohibitionToWork;
233+
@DatabaseField
234+
private Date prohibitionToWorkFrom;
235+
@DatabaseField
236+
private Date prohibitionToWorkUntil;
237+
231238

232239
public Person getPerson() {
233240
return person;
@@ -764,4 +771,28 @@ public String getEndOfQuarantineReasonDetails() {
764771
public void setEndOfQuarantineReasonDetails(String endOfQuarantineReasonDetails) {
765772
this.endOfQuarantineReasonDetails = endOfQuarantineReasonDetails;
766773
}
774+
775+
public YesNoUnknown getProhibitionToWork() {
776+
return prohibitionToWork;
777+
}
778+
779+
public void setProhibitionToWork(YesNoUnknown prohibitionToWork) {
780+
this.prohibitionToWork = prohibitionToWork;
781+
}
782+
783+
public Date getProhibitionToWorkFrom() {
784+
return prohibitionToWorkFrom;
785+
}
786+
787+
public void setProhibitionToWorkFrom(Date prohibitionToWorkFrom) {
788+
this.prohibitionToWorkFrom = prohibitionToWorkFrom;
789+
}
790+
791+
public Date getProhibitionToWorkUntil() {
792+
return prohibitionToWorkUntil;
793+
}
794+
795+
public void setProhibitionToWorkUntil(Date prohibitionToWorkUntil) {
796+
this.prohibitionToWorkUntil = prohibitionToWorkUntil;
797+
}
767798
}

‎sormas-app/app/src/main/java/de/symeda/sormas/app/backend/contact/ContactDtoHelper.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ public void fillInnerFromDto(Contact target, ContactDto source) {
155155

156156
target.setPseudonymized(source.isPseudonymized());
157157
target.setReturningTraveler(source.getReturningTraveler());
158+
159+
target.setProhibitionToWork(source.getProhibitionToWork());
160+
target.setProhibitionToWorkFrom(source.getProhibitionToWorkFrom());
161+
target.setProhibitionToWorkUntil(source.getProhibitionToWorkUntil());
158162
}
159163

160164
@Override
@@ -284,6 +288,10 @@ public void fillInnerFromAdo(ContactDto target, Contact source) {
284288

285289
target.setPseudonymized(source.isPseudonymized());
286290
target.setReturningTraveler(source.getReturningTraveler());
291+
292+
target.setProhibitionToWork(source.getProhibitionToWork());
293+
target.setProhibitionToWorkFrom(source.getProhibitionToWorkFrom());
294+
target.setProhibitionToWorkUntil(source.getProhibitionToWorkUntil());
287295
}
288296

289297
public static ContactReferenceDto toReferenceDto(Contact ado) {

0 commit comments

Comments
 (0)