Commit 6c1cae86 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Primitive auto-refresh of current journey status 

Todo: Redirect user to destination station upon arrival
parent ffaa0c44

lib/Travelynx.pm

+1 −0
Original line number Diff line number Diff line
@@ -1505,6 +1505,7 @@ sub startup { 
	);



	$authed_r->get('/account')->to('account#account');

	$authed_r->get('/ajax/status_card.html')->to('traveling#status_card');

	$authed_r->get('/cancelled')->to('traveling#cancelled');

	$authed_r->get('/change_password')->to('account#password_form');

	$authed_r->get('/export.json')->to('account#json_export');

lib/Travelynx/Controller/Traveling.pm

+14 −0
Original line number Diff line number Diff line
@@ -19,6 +19,20 @@ sub homepage { 
	}

}



sub status_card {

	my ($self) = @_;

	my $status = $self->get_user_status;



	delete $self->stash->{layout};



	if ( $status->{checked_in} ) {

		$self->render( '_checked_in', status => $status );

	}

	else {

		$self->render( '_checked_out', status => $status );

	}

}



sub geolocation {

	my ($self) = @_;

public/static/js/travelynx-actions.js

+16 −1
Original line number Diff line number Diff line
@@ -17,7 +17,16 @@ function tvly_run(link, req, err_callback) { 
		}

	});

}

$(document).ready(function() {

function tvly_update() {

	$.get('/ajax/status_card.html', function(data) {

		$('.statuscol').html(data);

		tvly_reg_handlers();

		setTimeout(tvly_update, 15000);

	}).fail(function() {

		setTimeout(tvly_update, 15000);

	});

}

function tvly_reg_handlers() {

	$('.action-checkin').click(function() {

		var link = $(this);

		var req = {
@@ -78,4 +87,10 @@ $(document).ready(function() { 
			tvly_run(link, req);

		}

	});

}

$(document).ready(function() {

	tvly_reg_handlers();

	if ($('.statuscol .autorefresh').length) {

		setTimeout(tvly_update, 15000);

	}

});

public/static/js/travelynx-actions.min.js

+1 −1
Original line number Diff line number Diff line 
function tvly_run(t,n,a){var c='<i class="material-icons">error</i>',i=$('<div class="progress"><div class="indeterminate"></div></div>');t.hide(),t.after(i),$.post("/action",n,function(n){n.success?$(location).attr("href",n.redirect_to):(M.toast({html:c+" "+n.error}),i.remove(),a&&a(),t.append(" "+c),t.show())})}$(document).ready(function(){$(".action-checkin").click(function(){var t=$(this);tvly_run(t,{action:"checkin",station:t.data("station"),train:t.data("train")})}),$(".action-checkout").click(function(){var t=$(this),n={action:"checkout",station:t.data("station"),force:t.data("force")};tvly_run(t,n,function(){t.append(" – Ohne Echtzeitdaten auschecken?"),t.data("force",!0)})}),$(".action-undo").click(function(){var t=$(this);tvly_run(t,{action:"undo",undo_id:t.data("id")})}),$(".action-cancelled-from").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_from",station:t.data("station"),train:t.data("train")})}),$(".action-cancelled-to").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_to",station:t.data("station"),force:!0})}),$(".action-delete").click(function(){var t=$(this),n={action:"delete",id:t.data("id"),checkin:t.data("checkin"),checkout:t.data("checkout")};really_delete=confirm("Diese Zugfahrt wirklich löschen? Der Eintrag wird sofort aus der Datenbank entfernt und kann nicht wiederhergestellt werden."),really_delete&&tvly_run(t,n)})});
 
function tvly_run(t,a,n){var e='<i class="material-icons">error</i>',c=$('<div class="progress"><div class="indeterminate"></div></div>');t.hide(),t.after(c),$.post("/action",a,function(a){a.success?$(location).attr("href",a.redirect_to):(M.toast({html:e+" "+a.error}),c.remove(),n&&n(),t.append(" "+e),t.show())})}function tvly_update(){$.get("/ajax/status_card.html",function(t){$(".statuscol").html(t),tvly_reg_handlers(),setTimeout(tvly_update,15e3)}).fail(function(){setTimeout(tvly_update,15e3)})}function tvly_reg_handlers(){$(".action-checkin").click(function(){var t=$(this);tvly_run(t,{action:"checkin",station:t.data("station"),train:t.data("train")})}),$(".action-checkout").click(function(){var t=$(this),a={action:"checkout",station:t.data("station"),force:t.data("force")};tvly_run(t,a,function(){t.append(" – Ohne Echtzeitdaten auschecken?"),t.data("force",!0)})}),$(".action-undo").click(function(){var t=$(this);tvly_run(t,{action:"undo",undo_id:t.data("id")})}),$(".action-cancelled-from").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_from",station:t.data("station"),train:t.data("train")})}),$(".action-cancelled-to").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_to",station:t.data("station"),force:!0})}),$(".action-delete").click(function(){var t=$(this),a={action:"delete",id:t.data("id"),checkin:t.data("checkin"),checkout:t.data("checkout")};really_delete=confirm("Diese Zugfahrt wirklich löschen? Der Eintrag wird sofort aus der Datenbank entfernt und kann nicht wiederhergestellt werden."),really_delete&&tvly_run(t,a)})}$(document).ready(function(){tvly_reg_handlers(),$(".statuscol .autorefresh").length&&setTimeout(tvly_update,15e3)});

public/static/v5→public/static/v7

+0 −0

File moved.

View file