zotan/trainav
Archived
1
0
Fork 0
Code Issues 3 Pull requests Releases Wiki Activity

move plaintext view to different page

Browse source
This commit is contained in:
Laura Hausmann 2020-06-12 13:06:47 +02:00
parent 70d93299cd
commit 162144f4c8
Signed by: zotan
GPG key ID: 5EC1D38FFC321311
5 changed files with 74 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
bahnplan.web/Pages/Plain.cshtml Normal file
View file

@ -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();
}
<div>
<code>
@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)) {
<div>
&nbsp;
</div>
foreach (var leg in db.Legs.Where(p => p.TripId == trip.TripId).OrderBy(p => p.DepTime)) {
if (leg.TrainType == "placeholder") {
<div>
... &nbsp;&nbsp; ..:.. ... &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; - &nbsp; ... ... &nbsp; - ..:.. ... &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ...
</div>
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(" ", "&nbsp;");
var arrt = arrtime.ToString("HH:mm");
var arrst = leg.ArrStation.PadRight(20, ' ').Substring(0, 20).Replace(" ", "&nbsp;");
var line = leg.TrainType.PadLeft(5).Replace(" ", "&nbsp;") + "&nbsp;" + leg.TrainNr.ToString().PadRight(5).Replace(" ", "&nbsp;");
var comment = leg.Comment;
<div>
@dept @Html.Raw(depst) - @Html.Raw(line) - @arrt @Html.Raw(arrst) @(string.IsNullOrWhiteSpace(comment) ? "..." : comment)
</div>
}
}
</code>
</div>

20
bahnplan.web/Pages/Plain.cshtml.cs Normal file
View file

@ -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);
}
}
}

3
bahnplan.web/Pages/Shared/_Layout.cshtml
View file

@ -23,6 +23,9 @@
<a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
</li>
@if (Context.Session.GetString("authorized") == "true") {
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-page="/Plain">Plain</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-page="/Cards">Cards</a>
</li>

26
bahnplan.web/Pages/Trip.cshtml
View file

@ -35,33 +35,7 @@
<p>
Your Trip from <b>@dep</b> to <b>@arr</b>, starting @DateTime.Parse(Model.Legs.First().DepTime).ToString("yyyy-MM-dd HH:mm")
</p>
<code>
@foreach (var leg in Model.Legs) {
if (leg.TrainType == "placeholder") {
<div>
... &nbsp;&nbsp; ..:.. ... &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; - &nbsp; ... ... &nbsp; - ..:.. ... &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ...
</div>
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(" ", "&nbsp;");
var arrt = arrtime.ToString("HH:mm");
var arrst = leg.ArrStation.PadRight(20, ' ').Substring(0, 20).Replace(" ", "&nbsp;");
var line = leg.TrainType.PadLeft(5).Replace(" ", "&nbsp;") + "&nbsp;" + leg.TrainNr.ToString().PadRight(5).Replace(" ", "&nbsp;");
var comment = leg.Comment;
<div>
@dept @Html.Raw(depst) - @Html.Raw(line) - @arrt @Html.Raw(arrst) @(string.IsNullOrWhiteSpace(comment) ? "..." : comment)
</div>
}
</code>
</div>
<br/>
<div>
<table class="table table-striped">
<thead>

7
bahnplan.web/bahnplan.web.csproj
View file

@ -37,6 +37,10 @@
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Pages\Plain.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>
<ItemGroup>
@ -58,6 +62,9 @@
<Compile Update="Pages\Cards.cshtml.cs">
<DependentUpon>Cards.cshtml</DependentUpon>
</Compile>
<Compile Update="Pages\Plain.cshtml.cs">
<DependentUpon>Plain.cshtml</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>