Unverified Commit ea7e691f authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'networkException-copy-checkin-the-third'

parents ae335033 cf63b447

lib/Travelynx/Command/database.pm

+55 −0
Original line number Diff line number Diff line
@@ -3615,6 +3615,61 @@ qq{select distinct checkout_station_id from in_transit where backend_id = 0;} 
			}

		);

	},



	# v70 -> v71

	# Include external_id's in follows_in_transit

	sub {

		my ($db) = @_;

		$db->query(

			qq{

				drop view follows_in_transit;

				create view follows_in_transit as select

					r1.subject_id as follower_id, user_id as followee_id,

					users.name as followee_name,

					train_type, train_line, train_no, train_id,

					backend.iris as is_iris, backend.hafas as is_hafas,

					backend.efa as is_efa, backend.dbris as is_dbris,

					backend.motis as is_motis,

					backend.name as backend_name, in_transit.backend_id as backend_id,

					extract(epoch from checkin_time) as checkin_ts,

					extract(epoch from sched_departure) as sched_dep_ts,

					extract(epoch from real_departure) as real_dep_ts,

					checkin_station_id as dep_eva,

					dep_station.ds100 as dep_ds100,

					dep_station.name as dep_name,

					dep_station.lat as dep_lat,

					dep_station.lon as dep_lon,

					dep_station_external_id.external_id as dep_external_id,

					extract(epoch from checkout_time) as checkout_ts,

					extract(epoch from sched_arrival) as sched_arr_ts,

					extract(epoch from real_arrival) as real_arr_ts,

					checkout_station_id as arr_eva,

					arr_station.ds100 as arr_ds100,

					arr_station.name as arr_name,

					arr_station.lat as arr_lat,

					arr_station.lon as arr_lon,

					arr_station_external_id.external_id as arr_external_id,

					polyline_id,

					polylines.polyline as polyline,

					visibility,

					coalesce(visibility, users.public_level & 127) as effective_visibility,

					cancelled, route, messages, user_data,

					dep_platform, arr_platform, data

					from in_transit

					left join polylines on polylines.id = polyline_id

					left join users on users.id = user_id

					left join relations as r1 on r1.predicate = 1 and r1.object_id = user_id

					left join stations as dep_station on checkin_station_id = dep_station.eva and in_transit.backend_id = dep_station.source

					left join stations as arr_station on checkout_station_id = arr_station.eva and in_transit.backend_id = arr_station.source

					left join stations_external_ids as dep_station_external_id on checkin_station_id = dep_station_external_id.eva and in_transit.backend_id = dep_station_external_id.backend_id

					left join stations_external_ids as arr_station_external_id on checkout_station_id = arr_station_external_id.eva and in_transit.backend_id = arr_station_external_id.backend_id

					left join backends as backend on in_transit.backend_id = backend.id

					order by checkin_time desc

					;

				update schema_version set version = 71;

			}

		);

	},

);



sub sync_dbdb {

lib/Travelynx/Model/InTransit.pm

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ sub get_timeline { 
		return $db->select(

			'follows_in_transit',

			[

				qw(followee_name train_type train_line train_no train_id dep_eva dep_name arr_eva arr_name)

				qw(followee_name train_type train_line train_no train_id dep_eva dep_external_id dep_name arr_eva arr_external_id arr_name)

			],

			$where

		)->hashes->each;

templates/_public_status_card.html.ep

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
						% }

						% if ( $journey->{is_motis} ) {

							data-station="<%= $journey->{dep_external_id} %>"

							data-dest="<%= $journey->{arr_external_id} %>"

							data-dest="<%= $journey->{arr_eva} %>"

						% }

						% else {

							data-station="<%= $journey->{dep_eva} %>"
@@ -39,7 +39,7 @@ 
						data-train="<%= $journey->{train_id} %>"

						data-ts="<%= ( $journey->{sched_departure} // $journey->{real_departure} )->epoch %>"

					>

						<i class="material-icons">person_add</i>

						<i class="material-icons right">person_add</i>

					</a>

				% }

				% else {
@@ -343,7 +343,7 @@ 
					% }

					% if ( $journey->{is_motis} ) {

						data-station="<%= $journey->{dep_external_id} %>"

						data-dest="<%= $journey->{arr_external_id} %>"

						data-dest="<%= $journey->{arr_eva} %>"

					% }

					% else {

						data-station="<%= $journey->{dep_eva} %>"
@@ -352,7 +352,7 @@ 
					data-train="<%= $journey->{train_id} %>"

					data-ts="<%= ( $journey->{sched_departure} // $journey->{real_departure} )->epoch %>"

				>

					<i class="material-icons left">send</i>

					<i class="material-icons left">person_add</i>

					%= L('status.copy-checkin')

				</a>

			</div>