bugfixes
This commit is contained in:
parent
c4eb5b3219
commit
a15aceb114
|
@ -11,7 +11,7 @@
|
|||
return;
|
||||
}
|
||||
|
||||
if (Model.Ticket.UserId != int.Parse(HttpContext.Session.GetString("uid"))) {
|
||||
if (Model.Leg.UserId != int.Parse(HttpContext.Session.GetString("uid"))) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -34,8 +34,8 @@
|
|||
<br/>
|
||||
@if (Model.Ticket.TicketInfo.Contains("BC 50")) {
|
||||
await using var db = new Database.DbConn();
|
||||
if (db.Cards.Any(p => p.Value == 50 && p.Traveller == Model.Ticket.Traveller)) {
|
||||
var card = db.Cards.First(p => p.Value == 50 && p.Traveller == Model.Ticket.Traveller);
|
||||
if (db.Cards.Any(p => p.Value == 50 && p.Traveller == Model.Ticket.Traveller && p.UserId == Model.Leg.UserId)) {
|
||||
var card = db.Cards.First(p => p.Value == 50 && p.Traveller == Model.Ticket.Traveller && p.UserId == Model.Leg.UserId);
|
||||
<div class="flex-grid">
|
||||
<div class="flex-col">
|
||||
<img src="@card.CardQr" alt="Ticketcode"/>
|
||||
|
@ -84,8 +84,8 @@
|
|||
}
|
||||
else if (Model.Ticket.TicketInfo.Contains("BC 25")) {
|
||||
await using var db = new Database.DbConn();
|
||||
if (db.Cards.Any(p => p.Value == 25 && p.Traveller == Model.Ticket.Traveller)) {
|
||||
var card = db.Cards.First(p => p.Value == 25 && p.Traveller == Model.Ticket.Traveller);
|
||||
if (db.Cards.Any(p => p.Value == 25 && p.Traveller == Model.Ticket.Traveller && p.UserId == Model.Leg.UserId)) {
|
||||
var card = db.Cards.First(p => p.Value == 25 && p.Traveller == Model.Ticket.Traveller && p.UserId == Model.Leg.UserId);
|
||||
<div class="flex-grid">
|
||||
<div class="flex-col">
|
||||
<img src="@card.CardQr" alt="Ticketcode"/>
|
||||
|
|
|
@ -14,8 +14,8 @@ namespace bahnplan.web.Pages {
|
|||
return;
|
||||
|
||||
using var db = new Database.DbConn();
|
||||
Ticket = db.Tickets.First(p => p.TicketId == int.Parse(Request.Query["id"]));
|
||||
Leg = db.Legs.First(p => p.LegId == int.Parse(Request.Query["leg"]));
|
||||
Ticket = db.Tickets.First(p => p.TicketId == Leg.TicketId);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,7 +1,6 @@
|
|||
@page
|
||||
@using Microsoft.AspNetCore.Http
|
||||
@using Microsoft.AspNetCore.Http.Extensions
|
||||
@using bahnplan.web.database
|
||||
@model TripModel
|
||||
@{
|
||||
ViewData["Title"] = "Trip";
|
||||
|
@ -104,7 +103,7 @@
|
|||
</td>
|
||||
<td>
|
||||
@if (leg.TicketId != 0) {
|
||||
<a class="btn btn-sm btn-danger" href="/Inspection?id=@leg.TicketId&leg=@leg.LegId" target="_blank">Ticket</a>
|
||||
<a class="btn btn-sm btn-danger" href="/Inspection?leg=@leg.LegId" target="_blank">Ticket</a>
|
||||
}
|
||||
else {
|
||||
<a class="btn btn-sm btn-danger disabled">Ticket</a>
|
||||
|
@ -122,8 +121,7 @@
|
|||
</td>
|
||||
<td>
|
||||
@{
|
||||
await using var db = new Database.DbConn();
|
||||
if (!db.Legs.Any(p => p.DepTime == leg.DepTime + "_placeholder") && Model.Legs.IndexOf(leg) != Model.Legs.Count - 1) {
|
||||
if (Model.Legs.All(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 {
|
||||
|
|
Reference in a new issue