From 6c1cae86f4fa343b4f165f80a4e42eba37fa917c Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Tue, 23 Apr 2019 22:27:13 +0200 Subject: Primitive auto-refresh of current journey status Todo: Redirect user to destination station upon arrival --- public/static/js/travelynx-actions.js | 17 ++++++++++++++++- public/static/js/travelynx-actions.min.js | 2 +- public/static/v5 | 1 - public/static/v7 | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) delete mode 120000 public/static/v5 create mode 120000 public/static/v7 (limited to 'public') diff --git a/public/static/js/travelynx-actions.js b/public/static/js/travelynx-actions.js index 583c806..b1e4d43 100644 --- a/public/static/js/travelynx-actions.js +++ b/public/static/js/travelynx-actions.js @@ -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); + } }); diff --git a/public/static/js/travelynx-actions.min.js b/public/static/js/travelynx-actions.min.js index db9fa1b..4dafe2f 100644 --- a/public/static/js/travelynx-actions.min.js +++ b/public/static/js/travelynx-actions.min.js @@ -1 +1 @@ -function tvly_run(t,n,a){var c='error',i=$('
');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='error',c=$('
');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)}); diff --git a/public/static/v5 b/public/static/v5 deleted file mode 120000 index 945c9b4..0000000 --- a/public/static/v5 +++ /dev/null @@ -1 +0,0 @@ -. \ No newline at end of file diff --git a/public/static/v7 b/public/static/v7 new file mode 120000 index 0000000..945c9b4 --- /dev/null +++ b/public/static/v7 @@ -0,0 +1 @@ +. \ No newline at end of file -- cgit v1.2.3