2947 type of place details in events entities (SORMAS-Foundation#4079)

sergiupacurariu · web-flow · commit a18c2e6ab5ea · 2021-01-19T17:17:52.000+01:00
* SORMAS-Foundation#2947 - Type of place details in events entities Android part * SORMAS-Foundation#2947 - Type of place details in events entities - remove seatNumber
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/event/EventDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/event/EventDto.java
@@ -57,7 +57,6 @@ public class EventDto extends PseudonymizableDto {
 	public static final String MEANS_OF_TRANSPORT = "meansOfTransport";
 	public static final String MEANS_OF_TRANSPORT_DETAILS = "meansOfTransportDetails";
 	public static final String CONNECTION_NUMBER = "connectionNumber";
-	public static final String SEAT_NUMBER = "seatNumber";
 	public static final String TRAVEL_DATE = "travelDate";
 	public static final String SRC_TYPE = "srcType";
 	public static final String SRC_INSTITUTIONAL_PARTNER_TYPE = "srcInstitutionalPartnerType";
@@ -105,8 +104,6 @@ public class EventDto extends PseudonymizableDto {
 	private String meansOfTransportDetails;
 	@SensitiveData
 	private String connectionNumber;
-	@SensitiveData
-	private String seatNumber;
 	private Date travelDate;
 
 	private EventSourceType srcType;
@@ -294,14 +291,6 @@ public void setConnectionNumber(String connectionNumber) {
 		this.connectionNumber = connectionNumber;
 	}
 
-	public String getSeatNumber() {
-		return seatNumber;
-	}
-
-	public void setSeatNumber(String seatNumber) {
-		this.seatNumber = seatNumber;
-	}
-
 	public Date getTravelDate() {
 		return travelDate;
 	}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
@@ -813,7 +813,6 @@ public interface Captions {
 	String Event_reportDateTime = "Event.reportDateTime";
 	String Event_reportingUser = "Event.reportingUser";
 	String Event_riskLevel = "Event.riskLevel";
-	String Event_seatNumber = "Event.seatNumber";
 	String Event_srcEmail = "Event.srcEmail";
 	String Event_srcFirstName = "Event.srcFirstName";
 	String Event_srcInstitutionalPartnerType = "Event.srcInstitutionalPartnerType";
diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties
@@ -916,7 +916,6 @@ Event.informationSource=Source of information
 Event.meansOfTransport=Means of transport
 Event.meansOfTransportDetails=Means of transport details
 Event.connectionNumber=Connection number
-Event.seatNumber=Seat number
 Event.travelDate=Travel date
 Event.numberOfPendingTasks=Pending tasks
 Event.reportDateTime=Date of report
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java
@@ -151,7 +151,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 = 263;
+	public static final int DATABASE_VERSION = 264;
 
 	private static DatabaseHelper instance = null;
 
@@ -1867,6 +1867,11 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 					"UPDATE exposures SET typeOfPlace = 'FACILITY' "
 						+ "WHERE (SELECT facilityType FROM location WHERE id = exposures.location_id) IS NOT NULL;");
 
+			case 263:
+				currentVersion = 263;
+				getDao(Event.class).executeRaw("ALTER TABLE events ADD COLUMN connectionNumber varchar(512);");
+				getDao(Event.class).executeRaw("ALTER TABLE events ADD COLUMN travelDate timestamp;");
+
 				// ATTENTION: break should only be done after last version
 				break;
 
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/event/Event.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/event/Event.java
@@ -78,6 +78,8 @@ public class Event extends PseudonymizableAdo {
 	public static final String DISEASE_DETAILS = "diseaseDetails";
 	public static final String SURVEILLANCE_OFFICER = "surveillanceOfficer";
 	public static final String TYPE_OF_PLACE_TEXT = "typeOfPlaceText";
+	public static final String CONNECTION_NUMBER = "connectionNumber";
+	public static final String TRAVEL_DATE = "travelDate";
 
 	@DatabaseField
 	private String superordinateEventUuid;
@@ -140,6 +142,12 @@ public class Event extends PseudonymizableAdo {
 	@Column(columnDefinition = "text")
 	private String meansOfTransportDetails;
 
+	@Column(length = COLUMN_LENGTH_DEFAULT)
+	private String connectionNumber;
+
+	@DatabaseField(dataType = DataType.DATE_LONG)
+	private Date travelDate;
+
 	@Enumerated(EnumType.STRING)
 	private EventSourceType srcType;
 
@@ -490,6 +498,22 @@ public void setSuperordinateEventUuid(String superordinateEventUuid) {
 		this.superordinateEventUuid = superordinateEventUuid;
 	}
 
+	public String getConnectionNumber() {
+		return connectionNumber;
+	}
+
+	public void setConnectionNumber(String connectionNumber) {
+		this.connectionNumber = connectionNumber;
+	}
+
+	public Date getTravelDate() {
+		return travelDate;
+	}
+
+	public void setTravelDate(Date travelDate) {
+		this.travelDate = travelDate;
+	}
+
 	@Override
 	public String toString() {
 		return EventReferenceDto.buildCaption(getDisease(), getDiseaseDetails(), getEventStatus(), getEventInvestigationStatus(), getStartDate());
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/event/EventDtoHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/event/EventDtoHelper.java
@@ -86,6 +86,8 @@ public void fillInnerFromDto(Event target, EventDto source) {
 		target.setTypeOfPlace(source.getTypeOfPlace());
 		target.setTypeOfPlaceText(source.getTypeOfPlaceText());
 		target.setMeansOfTransport(source.getMeansOfTransport());
+		target.setConnectionNumber(source.getConnectionNumber());
+		target.setTravelDate(source.getTravelDate());
 		target.setMeansOfTransportDetails(source.getMeansOfTransportDetails());
 
 		target.setSrcType(source.getSrcType());
@@ -153,6 +155,8 @@ public void fillInnerFromAdo(EventDto target, Event source) {
 
 		target.setTypeOfPlace(source.getTypeOfPlace());
 		target.setMeansOfTransport(source.getMeansOfTransport());
+		target.setConnectionNumber(source.getConnectionNumber());
+		target.setTravelDate(source.getTravelDate());
 		target.setMeansOfTransportDetails(source.getMeansOfTransportDetails());
 
 		target.setSrcType(source.getSrcType());
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/event/edit/EventEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/event/edit/EventEditFragment.java
@@ -165,6 +165,7 @@ public void onAfterLayoutBinding(FragmentEventEditLayoutBinding contentBinding)
 
 		contentBinding.eventEventInvestigationStartDate.initializeDateField(getFragmentManager());
 		contentBinding.eventEventInvestigationEndDate.initializeDateField(getFragmentManager());
+		contentBinding.eventTravelDate.initializeDateField(getFragmentManager());
 
 		setFieldVisibilitiesAndAccesses(EventDto.class, contentBinding.mainContent);
 	}
diff --git a/sormas-app/app/src/main/res/layout/fragment_event_edit_layout.xml b/sormas-app/app/src/main/res/layout/fragment_event_edit_layout.xml
@@ -240,6 +240,8 @@
 
             </LinearLayout>
 
+
+
             <de.symeda.sormas.app.component.controls.ControlTextPopupField
                 android:id="@+id/event_eventLocation"
                 style="@style/ControlSingleColumnStyle"
@@ -263,6 +265,30 @@
                 app:softRequired="true"
                 app:value="@={data.meansOfTransportDetails}" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <de.symeda.sormas.app.component.controls.ControlTextEditField
+                android:id="@+id/event_connectionNumber"
+                style="@style/ControlFirstOfTwoColumnsStyle"
+                app:dependencyParentField="@{eventTypeOfPlace}"
+                app:dependencyParentValue="@{TypeOfPlace.MEANS_OF_TRANSPORT}"
+                app:softRequired="true"
+                app:value="@={data.connectionNumber}" />
+
+            <de.symeda.sormas.app.component.controls.ControlDateField
+                android:id="@+id/event_travelDate"
+                style="@style/ControlSecondOfTwoColumnsStyle"
+                app:dependencyParentField="@{eventTypeOfPlace}"
+                app:dependencyParentValue="@{TypeOfPlace.MEANS_OF_TRANSPORT}"
+                app:softRequired="true"
+                app:value="@={data.travelDate}" />
+
+        </LinearLayout>
+
+
             <ImageView style="@style/FullHorizontalDividerStyle"/>
 
             <TextView
diff --git a/sormas-app/app/src/main/res/layout/fragment_event_read_layout.xml b/sormas-app/app/src/main/res/layout/fragment_event_read_layout.xml
@@ -248,6 +248,28 @@
                     app:dependencyParentField="@{eventMeansOfTransport}"
                     app:dependencyParentValue="@{MeansOfTransport.OTHER}" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <de.symeda.sormas.app.component.controls.ControlTextReadField
+                android:id="@+id/event_connectionNumber"
+                style="@style/ControlFirstOfTwoColumnsStyle"
+                app:value="@{data.connectionNumber}"
+                app:dependencyParentField="@{eventTypeOfPlace}"
+                app:dependencyParentValue="@{TypeOfPlace.MEANS_OF_TRANSPORT}" />
+
+            <de.symeda.sormas.app.component.controls.ControlTextReadField
+                android:id="@+id/event_travelDate"
+                style="@style/ControlSecondOfTwoColumnsStyle"
+                app:value="@{data.travelDate}"
+                app:dependencyParentField="@{eventTypeOfPlace}"
+                app:dependencyParentValue="@{TypeOfPlace.MEANS_OF_TRANSPORT}" />
+
+        </LinearLayout>
+
+
             <ImageView style="@style/FullHorizontalDividerStyle"/>
 
             <TextView
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/event/Event.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/event/Event.java
@@ -81,7 +81,6 @@ public class Event extends CoreAdo {
 	public static final String MEANS_OF_TRANSPORT = "meansOfTransport";
 	public static final String MEANS_OF_TRANSPORT_DETAILS = "meansOfTransportDetails";
 	public static final String CONNECTION_NUMBER = "connectionNumber";
-	public static final String SEAT_NUMBER = "seatNumber";
 	public static final String TRAVEL_DATE = "travelDate";
 	public static final String SRC_TYPE = "srcType";
 	public static final String SRC_INSTITUTIONAL_PARTNER_TYPE = "srcInstitutionalPartnerType";
@@ -129,7 +128,6 @@ public class Event extends CoreAdo {
 	private MeansOfTransport meansOfTransport;
 	private String meansOfTransportDetails;
 	private String connectionNumber;
-	private String seatNumber;
 	private Date travelDate;
 	private EventSourceType srcType;
 	private InstitutionalPartnerType srcInstitutionalPartnerType;
@@ -341,15 +339,6 @@ public void setConnectionNumber(String connectionNumber) {
 		this.connectionNumber = connectionNumber;
 	}
 
-	@Column(length = COLUMN_LENGTH_DEFAULT)
-	public String getSeatNumber() {
-		return seatNumber;
-	}
-
-	public void setSeatNumber(String seatNumber) {
-		this.seatNumber = seatNumber;
-	}
-
 	public Date getTravelDate() {
 		return travelDate;
 	}
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventFacadeEjb.java
@@ -628,7 +628,6 @@ public Event fromDto(@NotNull EventDto source, boolean checkChangeDate) {
 		target.setMeansOfTransport(source.getMeansOfTransport());
 		target.setMeansOfTransportDetails(source.getMeansOfTransportDetails());
 		target.setConnectionNumber(source.getConnectionNumber());
-		target.setSeatNumber(source.getSeatNumber());
 		target.setTravelDate(source.getTravelDate());
 		target.setSrcType(source.getSrcType());
 		target.setSrcInstitutionalPartnerType(source.getSrcInstitutionalPartnerType());
@@ -717,7 +716,6 @@ public static EventDto toDto(Event source) {
 		target.setMeansOfTransport(source.getMeansOfTransport());
 		target.setMeansOfTransportDetails(source.getMeansOfTransportDetails());
 		target.setConnectionNumber(source.getConnectionNumber());
-		target.setSeatNumber(source.getSeatNumber());
 		target.setTravelDate(source.getTravelDate());
 		target.setSrcType(source.getSrcType());
 		target.setSrcInstitutionalPartnerType(source.getSrcInstitutionalPartnerType());
diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql
@@ -6165,8 +6165,6 @@ INSERT INTO schema_version (version_number, comment) VALUES (299, 'Add index for
 -- 2021-01-05 Type of place details in events entities #2947
 ALTER TABLE events ADD COLUMN connectionNumber varchar(512);
 ALTER TABLE events_history ADD COLUMN connectionNumber varchar(512);
-ALTER TABLE events ADD COLUMN seatNumber varchar(512);
-ALTER TABLE events_history ADD COLUMN seatNumber varchar(512);
 ALTER TABLE events ADD COLUMN travelDate timestamp without time zone;
 ALTER TABLE events_history ADD COLUMN travelDate timestamp without time zone;
 
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventDataForm.java
@@ -102,7 +102,7 @@ public class EventDataForm extends AbstractEditForm<EventDto> {
 			fluidRowLocs(EventDto.TRANSREGIONAL_OUTBREAK, "") +
 			fluidRowLocs(EventDto.TYPE_OF_PLACE, EventDto.TYPE_OF_PLACE_TEXT) +
 			fluidRowLocs(EventDto.MEANS_OF_TRANSPORT, EventDto.MEANS_OF_TRANSPORT_DETAILS) + 
-			fluidRowLocs(4, EventDto.CONNECTION_NUMBER, 4, EventDto.SEAT_NUMBER, 4, EventDto.TRAVEL_DATE) +
+			fluidRowLocs(4, EventDto.CONNECTION_NUMBER, 4, EventDto.TRAVEL_DATE) +
 			fluidRowLocs(EventDto.EVENT_LOCATION) +
 			fluidRowLocs("", EventDto.SURVEILLANCE_OFFICER);
 	//@formatter:on
@@ -199,7 +199,6 @@ protected void addFields() {
 
 		ComboBox meansOfTransport = addField(EventDto.MEANS_OF_TRANSPORT);
 		TextField connectionNumber = addField(EventDto.CONNECTION_NUMBER);
-		TextField seatNumber = addField(EventDto.SEAT_NUMBER);
 		DateField travelDate = addField(EventDto.TRAVEL_DATE);
 
 		FieldHelper.setVisibleWhen(
@@ -219,7 +218,7 @@ protected void addFields() {
 
 		FieldHelper.setVisibleWhen(
 			getFieldGroup(),
-			Arrays.asList(EventDto.CONNECTION_NUMBER, EventDto.SEAT_NUMBER, EventDto.TRAVEL_DATE),
+			Arrays.asList(EventDto.CONNECTION_NUMBER, EventDto.TRAVEL_DATE),
 			EventDto.TYPE_OF_PLACE,
 			Collections.singletonList(TypeOfPlace.MEANS_OF_TRANSPORT),
 			true);
@@ -339,7 +338,6 @@ protected void addFields() {
 			meansOfTransport,
 			meansOfTransportDetails,
 			connectionNumber,
-			seatNumber,
 			travelDate,
 			surveillanceOfficerField,
 			srcType,

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,7 @@ public void onAfterLayoutBinding(FragmentEventEditLayoutBinding contentBinding)`
`165`	`165`
`166`	`166`	`contentBinding.eventEventInvestigationStartDate.initializeDateField(getFragmentManager());`
`167`	`167`	`contentBinding.eventEventInvestigationEndDate.initializeDateField(getFragmentManager());`
	`168`	`+ contentBinding.eventTravelDate.initializeDateField(getFragmentManager());`
`168`	`169`
`169`	`170`	`setFieldVisibilitiesAndAccesses(EventDto.class, contentBinding.mainContent);`
`170`	`171`	`}`