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

Accomodate longer station names

Browse source
This commit is contained in:
Laura Hausmann 2022-07-16 01:25:01 +02:00
parent daf0e97da4
commit 7993ae8d06
Signed by: zotan
GPG key ID: D044E84C5BE01605
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trainav.web/Pages/Index.cshtml
View file

@ -41,15 +41,15 @@
var legs = db.Legs.Where(p => p.TripId == trip.TripId).OrderBy(p => p.DepTime).ToList();
<tr>
<td>
<b>@legs.First().DepStation.Delimit(30)</b>
<b>@legs.First().DepStation.Delimit(35)</b>
<br/>
<small>@DateTime.Parse(legs.First().DepTime).ToString("ddd dd.MM.yyyy, HH:mm")</small>
</td>
<td>
@((from index in from leg in legs where leg.TrainType == "placeholder" select legs.IndexOf(leg) select legs[index - 1].ArrStation.Delimit(30)).ToList().DefaultIfEmpty("-").Aggregate((s1, s2) => $"{s1}, {s2}"))
@((from index in from leg in legs where leg.TrainType == "placeholder" select legs.IndexOf(leg) select legs[index - 1].ArrStation.Delimit(35)).ToList().DefaultIfEmpty("-").Aggregate((s1, s2) => $"{s1}, {s2}"))
</td>
<td>
<b>@legs.Last().ArrStation.Delimit(30)</b>
<b>@legs.Last().ArrStation.Delimit(35)</b>
<br/>
<small>@DateTime.Parse(legs.Last().ArrTime).ToString("ddd dd.MM.yyyy, HH:mm")</small>
</td>

7
trainav.web/Pages/SharedTrip.cshtml
View file

@ -1,4 +1,5 @@
@page
@using trainav.web.Utils
@model SharedTripModel
@{
ViewData["Title"] = "Shared Trip";
@ -55,10 +56,10 @@
@date
</td>
<td>
<b>@dept</b> @Html.Raw(leg.DepStation.PadRight(30, ' ').Substring(0, 30).TrimEnd())
<b>@dept</b> @Html.Raw(leg.DepStation.Delimit(35))
</td>
<td>
<b>@arrt</b> @Html.Raw(leg.ArrStation.PadRight(30, ' ').Substring(0, 30).TrimEnd())
<b>@arrt</b> @Html.Raw(leg.ArrStation.Delimit(35))
</td>
<td>@leg.TrainType @leg.TrainNr</td>
<td>
@ -76,4 +77,4 @@
</table>
</div>
<a class="btn btn-sm btn-primary" href="/GenIcs?id=@Request.Query["id"]&user=@Model.User">Download ICS</a>
<a class="btn btn-sm btn-primary" href="/GenIcs?id=@Request.Query["id"]&user=@Model.User">Download ICS</a>

4
trainav.web/Pages/Trip.cshtml
View file

@ -84,10 +84,10 @@
@date
</td>
<td>
<b>@dept</b> @Html.Raw(leg.DepStation.PadRight(30, ' ').Substring(0, 30).TrimEnd())
<b>@dept</b> @Html.Raw(leg.DepStation.Delimit(35))
</td>
<td>
<b>@arrt</b> @Html.Raw(leg.ArrStation.PadRight(30, ' ').Substring(0, 30).TrimEnd())
<b>@arrt</b> @Html.Raw(leg.ArrStation.Delimit(35))
</td>
<td>@leg.TrainType @leg.TrainNr</td>
@if (!Request.Query.ContainsKey("edit")) {