SORMAS-Foundation#3409 change prohibition to work interval date type + fix labels

Author: lgal

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

@@ -448,8 +448,11 @@ public class CaseDataDto extends PseudonymizableDto {
 	@SensitiveData
 	private String endOfIsolationReasonDetails;
 
+	@HideForCountriesExcept
 	private YesNoUnknown prohibitionToWork;
+	@HideForCountriesExcept
 	private Date prohibitionToWorkFrom;
+	@HideForCountriesExcept
 	private Date prohibitionToWorkUntil;
 
 	public static CaseDataDto build(PersonReferenceDto person, Disease disease) {

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

@@ -256,8 +256,11 @@ public class ContactDto extends PseudonymizableDto {
 	@SensitiveData
 	private String endOfQuarantineReasonDetails;
 
+	@HideForCountriesExcept
 	private YesNoUnknown prohibitionToWork;
+	@HideForCountriesExcept
 	private Date prohibitionToWorkFrom;
+	@HideForCountriesExcept
 	private Date prohibitionToWorkUntil;
 
 	public static ContactDto build() {

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

@@ -391,8 +391,8 @@ CaseData.endOfIsolationReason=Grund für das Ende der Isolation
 CaseData.endOfIsolationReasonDetails=Anderer Grund
 CaseData.sormasToSormasOriginInfo=Geteilt von
 CaseData.prohibitionToWork=Tätigkeitsverbot
-CaseData.prohibitionToWorkFrom=Arbeitsverbot von
-CaseData.prohibitionToWorkUntil=Arbeitsverbot bis
+CaseData.prohibitionToWorkFrom=Tätigkeitsverbot von
+CaseData.prohibitionToWorkUntil=Tätigkeitsverbot bis
 
 # CaseExport
 CaseExport.address=Adresse

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

@@ -152,7 +152,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 	public static final String DATABASE_NAME = "sormas.db";
 	// any time you make changes to your database objects, you may have to increase the database version
 
-	public static final int DATABASE_VERSION = 248;
+	public static final int DATABASE_VERSION = 249;
 
 	private static DatabaseHelper instance = null;
 
@@ -1779,8 +1779,8 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD column multidaycontact boolean default false;");
 				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD column firstcontactdate timestamp;");
 
-			case 247:
-				currentVersion = 247;
+			case 248:
+				currentVersion = 248;
 
 				getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN  prohibitionToWork varchar(255);");
 				getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN  prohibitionToWorkFrom timestamp;");

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

@@ -1358,7 +1358,7 @@ public void setProhibitionToWork(YesNoUnknown prohibitionToWork) {
 		this.prohibitionToWork = prohibitionToWork;
 	}
 
-	@Temporal(TemporalType.TIMESTAMP)
+	@Temporal(TemporalType.DATE)
 	public Date getProhibitionToWorkFrom() {
 		return prohibitionToWorkFrom;
 	}
@@ -1367,7 +1367,7 @@ public void setProhibitionToWorkFrom(Date prohibitionToWorkFrom) {
 		this.prohibitionToWorkFrom = prohibitionToWorkFrom;
 	}
 
-	@Temporal(TemporalType.TIMESTAMP)
+	@Temporal(TemporalType.DATE)
 	public Date getProhibitionToWorkUntil() {
 		return prohibitionToWorkUntil;
 	}

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

@@ -887,7 +887,7 @@ public void setProhibitionToWork(YesNoUnknown prohibitionToWork) {
 		this.prohibitionToWork = prohibitionToWork;
 	}
 
-	@Temporal(TemporalType.TIMESTAMP)
+	@Temporal(TemporalType.DATE)
 	public Date getProhibitionToWorkFrom() {
 		return prohibitionToWorkFrom;
 	}
@@ -896,7 +896,7 @@ public void setProhibitionToWorkFrom(Date prohibitionToWorkFrom) {
 		this.prohibitionToWorkFrom = prohibitionToWorkFrom;
 	}
 
-	@Temporal(TemporalType.TIMESTAMP)
+	@Temporal(TemporalType.DATE)
 	public Date getProhibitionToWorkUntil() {
 		return prohibitionToWorkUntil;
 	}