small fixes

This commit is contained in:
Laura Hausmann 2020-06-12 13:20:20 +02:00
parent 162144f4c8
commit 21e4b08cf6
Signed by: zotan
GPG Key ID: 5EC1D38FFC321311
2 changed files with 2 additions and 2 deletions

View File

@ -42,7 +42,7 @@
trips = db.Trips.Where(p => p.UserId == Model.AuthorizedUser.UserId).ToList();
}
foreach (var trip in trips.OrderBy(p => db.Legs.First(a => a.TripId == p.TripId).ArrTime)) {
foreach (var trip in trips.OrderBy(p => db.Legs.First(a => a.TripId == p.TripId).DepTime)) {
var legs = db.Legs.Where(p => p.TripId == trip.TripId).OrderBy(p => p.DepTime).ToList();
var dates = DateTime.Parse(legs.First().DepTime).Date == DateTime.Parse(legs.Last().DepTime).Date ? legs.First().DepTime.Substring(0, 10) : legs.First().DepTime.Substring(0, 10) + "<br/>" + legs.Last().DepTime.Substring(0, 10);
<tr>

View File

@ -114,7 +114,7 @@
<td>
@{
await using var db = new Database.DbConn();
if (!db.Legs.Any(p => p.DepTime == leg.DepTime + "_placeholder")) {
if (!db.Legs.Any(p => p.DepTime == leg.DepTime + "_placeholder") && Model.Legs.IndexOf(leg) != Model.Legs.Count - 1) {
<a class="btn btn-sm btn-outline-secondary" href="?separator=true&legid=@leg.LegId&id=@leg.TripId&redir=@Request.GetDisplayUrl().UrlEncode()">+ Separator</a>
}
else {