From 7993ae8d0676d7e0320bce972ca0dab1499d6641 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Sat, 16 Jul 2022 01:25:01 +0200
Subject: [PATCH] Accomodate longer station names

---
 trainav.web/Pages/Index.cshtml      | 6 +++---
 trainav.web/Pages/SharedTrip.cshtml | 7 ++++---
 trainav.web/Pages/Trip.cshtml       | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/trainav.web/Pages/Index.cshtml b/trainav.web/Pages/Index.cshtml
index 5ff6225..d9aa7d4 100644
--- a/trainav.web/Pages/Index.cshtml
+++ b/trainav.web/Pages/Index.cshtml
@@ -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>
diff --git a/trainav.web/Pages/SharedTrip.cshtml b/trainav.web/Pages/SharedTrip.cshtml
index 3bdecbc..92a9de6 100644
--- a/trainav.web/Pages/SharedTrip.cshtml
+++ b/trainav.web/Pages/SharedTrip.cshtml
@@ -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>
\ No newline at end of file
+<a class="btn btn-sm btn-primary" href="/GenIcs?id=@Request.Query["id"]&user=@Model.User">Download ICS</a>
diff --git a/trainav.web/Pages/Trip.cshtml b/trainav.web/Pages/Trip.cshtml
index d21e358..b216d3f 100644
--- a/trainav.web/Pages/Trip.cshtml
+++ b/trainav.web/Pages/Trip.cshtml
@@ -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")) {