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

bugfixes

Browse source
This commit is contained in:
Laura Hausmann 2020-07-06 01:25:22 +02:00
parent c4eb5b3219
commit a15aceb114
Signed by: zotan
GPG key ID: 5EC1D38FFC321311
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bahnplan.web/Pages/Inspection.cshtml
View file

@ -11,7 +11,7 @@
return; return;
} }
if (Model.Ticket.UserId != int.Parse(HttpContext.Session.GetString("uid"))) { if (Model.Leg.UserId != int.Parse(HttpContext.Session.GetString("uid"))) {
return; return;
} }
} }
@ -34,8 +34,8 @@
<br/> <br/>
@if (Model.Ticket.TicketInfo.Contains("BC 50")) { @if (Model.Ticket.TicketInfo.Contains("BC 50")) {
await using var db = new Database.DbConn(); await using var db = new Database.DbConn();
if (db.Cards.Any(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); 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-grid">
<div class="flex-col"> <div class="flex-col">
<img src="@card.CardQr" alt="Ticketcode"/> <img src="@card.CardQr" alt="Ticketcode"/>
@ -84,8 +84,8 @@
} }
else if (Model.Ticket.TicketInfo.Contains("BC 25")) { else if (Model.Ticket.TicketInfo.Contains("BC 25")) {
await using var db = new Database.DbConn(); await using var db = new Database.DbConn();
if (db.Cards.Any(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); 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-grid">
<div class="flex-col"> <div class="flex-col">
<img src="@card.CardQr" alt="Ticketcode"/> <img src="@card.CardQr" alt="Ticketcode"/>

2
bahnplan.web/Pages/Inspection.cshtml.cs
View file

@ -14,8 +14,8 @@ namespace bahnplan.web.Pages {
return; return;
using var db = new Database.DbConn(); 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"])); Leg = db.Legs.First(p => p.LegId == int.Parse(Request.Query["leg"]));
Ticket = db.Tickets.First(p => p.TicketId == Leg.TicketId);
} }
} }
} }

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

@ -1,7 +1,6 @@
@page @page
@using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Http
@using Microsoft.AspNetCore.Http.Extensions @using Microsoft.AspNetCore.Http.Extensions
@using bahnplan.web.database
@model TripModel @model TripModel
@{ @{
ViewData["Title"] = "Trip"; ViewData["Title"] = "Trip";
@ -104,7 +103,7 @@
</td> </td>
<td> <td>
@if (leg.TicketId != 0) { @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 { else {
<a class="btn btn-sm btn-danger disabled">Ticket</a> <a class="btn btn-sm btn-danger disabled">Ticket</a>
@ -122,8 +121,7 @@
</td> </td>
<td> <td>
@{ @{
await using var db = new Database.DbConn(); if (Model.Legs.All(p => p.DepTime != leg.DepTime + "_placeholder") && Model.Legs.IndexOf(leg) != Model.Legs.Count - 1) {
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> <a class="btn btn-sm btn-outline-secondary" href="?separator=true&legid=@leg.LegId&id=@leg.TripId&redir=@Request.GetDisplayUrl().UrlEncode()">+ Separator</a>
} }
else { else {