From 162144f4c865e205a3fc7e31f7dd44653a5f45d0 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Fri, 12 Jun 2020 13:06:47 +0200 Subject: [PATCH] move plaintext view to different page --- bahnplan.web/Pages/Plain.cshtml | 44 ++++++++++++++++++++++++ bahnplan.web/Pages/Plain.cshtml.cs | 20 +++++++++++ bahnplan.web/Pages/Shared/_Layout.cshtml | 3 ++ bahnplan.web/Pages/Trip.cshtml | 26 -------------- bahnplan.web/bahnplan.web.csproj | 7 ++++ 5 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 bahnplan.web/Pages/Plain.cshtml create mode 100644 bahnplan.web/Pages/Plain.cshtml.cs diff --git a/bahnplan.web/Pages/Plain.cshtml b/bahnplan.web/Pages/Plain.cshtml new file mode 100644 index 0000000..b0178f3 --- /dev/null +++ b/bahnplan.web/Pages/Plain.cshtml @@ -0,0 +1,44 @@ +@page +@using Microsoft.AspNetCore.Http +@using Microsoft.AspNetCore.Http.Extensions +@using bahnplan.web.database +@model PlainModel +@{ + ViewData["Title"] = "Plain"; + + if (HttpContext.Session.GetString("authorized") != "true") { + Response.Redirect($"/Login?&redir={Request.GetDisplayUrl().UrlEncode()}"); + return; + } + await using var db = new Database.DbConn(); +} + +
+ + @foreach (var trip in db.Trips.Where(p => p.UserId == Model.AuthorizedUser.UserId).ToList().OrderBy(p => db.Legs.Where(l => l.TripId == p.TripId).OrderBy(l => l.DepTime).First().DepTime)) { +
+   +
+ foreach (var leg in db.Legs.Where(p => p.TripId == trip.TripId).OrderBy(p => p.DepTime)) { + if (leg.TrainType == "placeholder") { +
+ ...    ..:.. ...                  -   ... ...   - ..:.. ...                  ... +
+ continue; + } + var deptime = DateTime.Parse(leg.DepTime); + var arrtime = DateTime.Parse(leg.ArrTime); + var date = DateTime.Parse(leg.DepTime).ToString("dd.MM."); + var dept = date + " " + deptime.ToString("HH:mm"); + var depst = leg.DepStation.PadRight(20, ' ').Substring(0, 20).Replace(" ", " "); + var arrt = arrtime.ToString("HH:mm"); + var arrst = leg.ArrStation.PadRight(20, ' ').Substring(0, 20).Replace(" ", " "); + var line = leg.TrainType.PadLeft(5).Replace(" ", " ") + " " + leg.TrainNr.ToString().PadRight(5).Replace(" ", " "); + var comment = leg.Comment; +
+ @dept @Html.Raw(depst) - @Html.Raw(line) - @arrt @Html.Raw(arrst) @(string.IsNullOrWhiteSpace(comment) ? "..." : comment) +
+ } + } +
+
\ No newline at end of file diff --git a/bahnplan.web/Pages/Plain.cshtml.cs b/bahnplan.web/Pages/Plain.cshtml.cs new file mode 100644 index 0000000..be9863b --- /dev/null +++ b/bahnplan.web/Pages/Plain.cshtml.cs @@ -0,0 +1,20 @@ +using System.Linq; +using bahnplan.web.database; +using bahnplan.web.database.Tables; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace bahnplan.web.Pages { + public class PlainModel : PageModel { + public User AuthorizedUser; + + public void OnGet() { + if (HttpContext.Session.GetString("authorized") != "true") + return; + + var uid = int.Parse(HttpContext.Session.GetString("uid")); + using var db = new Database.DbConn(); + AuthorizedUser = db.Users.FirstOrDefault(p => p.UserId == uid); + } + } +} \ No newline at end of file diff --git a/bahnplan.web/Pages/Shared/_Layout.cshtml b/bahnplan.web/Pages/Shared/_Layout.cshtml index 33c7c7f..4263991 100644 --- a/bahnplan.web/Pages/Shared/_Layout.cshtml +++ b/bahnplan.web/Pages/Shared/_Layout.cshtml @@ -23,6 +23,9 @@ Home @if (Context.Session.GetString("authorized") == "true") { + diff --git a/bahnplan.web/Pages/Trip.cshtml b/bahnplan.web/Pages/Trip.cshtml index fe04ae2..1246a4a 100644 --- a/bahnplan.web/Pages/Trip.cshtml +++ b/bahnplan.web/Pages/Trip.cshtml @@ -35,33 +35,7 @@

Your Trip from @dep to @arr, starting @DateTime.Parse(Model.Legs.First().DepTime).ToString("yyyy-MM-dd HH:mm")

- - - @foreach (var leg in Model.Legs) { - if (leg.TrainType == "placeholder") { -
- ...    ..:.. ...                  -   ... ...   - ..:.. ...                  ... -
- continue; - } - var deptime = DateTime.Parse(leg.DepTime); - var arrtime = DateTime.Parse(leg.ArrTime); - var date = DateTime.Parse(leg.DepTime).ToString("dd.MM."); - var dept = date + " " + deptime.ToString("HH:mm"); - var depst = leg.DepStation.PadRight(20, ' ').Substring(0, 20).Replace(" ", " "); - var arrt = arrtime.ToString("HH:mm"); - var arrst = leg.ArrStation.PadRight(20, ' ').Substring(0, 20).Replace(" ", " "); - var line = leg.TrainType.PadLeft(5).Replace(" ", " ") + " " + leg.TrainNr.ToString().PadRight(5).Replace(" ", " "); - var comment = leg.Comment; -
- @dept @Html.Raw(depst) - @Html.Raw(line) - @arrt @Html.Raw(arrst) @(string.IsNullOrWhiteSpace(comment) ? "..." : comment) -
- } -
- -
-
diff --git a/bahnplan.web/bahnplan.web.csproj b/bahnplan.web/bahnplan.web.csproj index 4cf606c..20f7722 100644 --- a/bahnplan.web/bahnplan.web.csproj +++ b/bahnplan.web/bahnplan.web.csproj @@ -37,6 +37,10 @@ truePreserveNewest + + true + PreserveNewest + @@ -58,6 +62,9 @@ Cards.cshtml + + Plain.cshtml +