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

Fix multi-ticket return trips

Browse source
This commit is contained in:
Laura Hausmann 2021-07-01 14:20:23 +02:00
parent 166283ca1f
commit 9c495e159f
Signed by: zotan
GPG key ID: D044E84C5BE01605
2 changed files with 74 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bahnplan.web/JSON/TicketResponse.cs
View file

@ -312,8 +312,8 @@ namespace bahnplan.web.JSON {
} }
public class Tcklist { public class Tcklist {
[J("tck", NullValueHandling = NV.Ignore)] [J("tck", NullValueHandling = NV.Ignore), JsonConverter(typeof(SingleOrArrayConverter<Tck>))]
public Tck Tck { get; set; } public List<Tck> Tck { get; set; }
} }
public class Tck { public class Tck {

87
bahnplan.web/Pages/Ticket.cshtml.cs
View file

@ -1,4 +1,5 @@
using System.Linq; using System;
using System.Linq;
using System.Net; using System.Net;
using System.Xml; using System.Xml;
using System.Xml.Linq; using System.Xml.Linq;
@ -29,6 +30,7 @@ namespace bahnplan.web.Pages {
? int.Parse(Request.Query["tripid"]) ? int.Parse(Request.Query["tripid"])
: db.InsertWithInt32Identity(new Trip {UserId = int.Parse(HttpContext.Session.GetString("uid"))}); : db.InsertWithInt32Identity(new Trip {UserId = int.Parse(HttpContext.Session.GetString("uid"))});
var ticketId = db.Tickets.First(p => p.OrderId == Request.Query["order"].ToString()).TicketId; var ticketId = db.Tickets.First(p => p.OrderId == Request.Query["order"].ToString()).TicketId;
var ticketId2 = db.Tickets.FirstOrDefault(p => p.OrderId == Request.Query["order"].ToString() + "_2")?.TicketId;
foreach (var leg in db.TicketLegs.Where(p => p.TicketId == ticketId).ToList()) foreach (var leg in db.TicketLegs.Where(p => p.TicketId == ticketId).ToList())
db.InsertWithInt32Identity(new Leg { db.InsertWithInt32Identity(new Leg {
@ -42,8 +44,25 @@ namespace bahnplan.web.Pages {
DepStation = leg.DepStation, DepStation = leg.DepStation,
DepStationId = leg.DepStationId, DepStationId = leg.DepStationId,
DepTime = leg.DepTime, DepTime = leg.DepTime,
TicketId = ticketId TicketId = leg.TicketId
}); });
if (ticketId2 != null) {
foreach (var leg in db.TicketLegs.Where(p => p.TicketId == ticketId2).ToList())
db.InsertWithInt32Identity(new Leg {
TripId = tripId,
UserId = int.Parse(HttpContext.Session.GetString("uid")),
TrainType = leg.TrainType,
TrainNr = leg.TrainNr,
ArrStation = leg.ArrStation,
ArrStationId = leg.ArrStationId,
ArrTime = leg.ArrTime,
DepStation = leg.DepStation,
DepStationId = leg.DepStationId,
DepTime = leg.DepTime,
TicketId = leg.TicketId
});
}
TripId = tripId; TripId = tripId;
} }
@ -65,17 +84,55 @@ namespace bahnplan.web.Pages {
? int.Parse(Request.Query["tripid"]) ? int.Parse(Request.Query["tripid"])
: db.InsertWithInt32Identity(new Trip {UserId = int.Parse(HttpContext.Session.GetString("uid"))}); : db.InsertWithInt32Identity(new Trip {UserId = int.Parse(HttpContext.Session.GetString("uid"))});
var ticketId = db.InsertWithInt32Identity(new Ticket { int ticketId;
OrderId = Request.Query["order"], int? ticketId2 = null;
TicketInfo = parsed.Rporderdetails.Order.Tcklist.Tck.Mtk.Txt,
TicketQr = parsed.Rporderdetails.Order.Tcklist.Tck.Htdata.Ht.First(p => p.Name == "barcode").Text, switch (parsed.Rporderdetails.Order.Tcklist.Tck.Count) {
TicketSecCode = parsed.Rporderdetails.Order.Tcklist.Tck.Htdata.Ht.First(p => p.Name == "sichtmerkmal").Text, case 1: {
UserId = int.Parse(HttpContext.Session.GetString("uid")), ticketId = db.InsertWithInt32Identity(new Ticket {
TicketPkPass = parsed.Rporderdetails.Order.Tcklist.Tck.Htdata.Ht.First(p => p.Name == "pass").Text, // application/vnd.apple.pkpass;base64 OrderId = Request.Query["order"],
Traveller = parsed.Rporderdetails.Order.Tcklist.Tck.Mtk.ReisenderVorname TicketInfo = parsed.Rporderdetails.Order.Tcklist.Tck[0].Mtk.Txt,
+ " " TicketQr = parsed.Rporderdetails.Order.Tcklist.Tck[0].Htdata.Ht.First(p => p.Name == "barcode").Text,
+ parsed.Rporderdetails.Order.Tcklist.Tck.Mtk.ReisenderNachname TicketSecCode = parsed.Rporderdetails.Order.Tcklist.Tck[0].Htdata.Ht.First(p => p.Name == "sichtmerkmal").Text,
}); UserId = int.Parse(HttpContext.Session.GetString("uid")),
TicketPkPass = parsed.Rporderdetails.Order.Tcklist.Tck[0].Htdata.Ht.First(p => p.Name == "pass").Text, // application/vnd.apple.pkpass;base64
Traveller = parsed.Rporderdetails.Order.Tcklist.Tck[0].Mtk.ReisenderVorname
+ " "
+ parsed.Rporderdetails.Order.Tcklist.Tck[0].Mtk.ReisenderNachname
});
break;
}
case 2: {
ticketId = db.InsertWithInt32Identity(new Ticket {
OrderId = Request.Query["order"],
TicketInfo = parsed.Rporderdetails.Order.Tcklist.Tck[0].Mtk.Txt,
TicketQr = parsed.Rporderdetails.Order.Tcklist.Tck[0].Htdata.Ht.First(p => p.Name == "barcode").Text,
TicketSecCode = parsed.Rporderdetails.Order.Tcklist.Tck[0].Htdata.Ht.First(p => p.Name == "sichtmerkmal").Text,
UserId = int.Parse(HttpContext.Session.GetString("uid")),
TicketPkPass = parsed.Rporderdetails.Order.Tcklist.Tck[0].Htdata.Ht.First(p => p.Name == "pass").Text, // application/vnd.apple.pkpass;base64
Traveller = parsed.Rporderdetails.Order.Tcklist.Tck[0].Mtk.ReisenderVorname
+ " "
+ parsed.Rporderdetails.Order.Tcklist.Tck[0].Mtk.ReisenderNachname
});
ticketId2 = db.InsertWithInt32Identity(new Ticket {
OrderId = Request.Query["order"] + "_2",
TicketInfo = parsed.Rporderdetails.Order.Tcklist.Tck[1].Mtk.Txt,
TicketQr = parsed.Rporderdetails.Order.Tcklist.Tck[1].Htdata.Ht.First(p => p.Name == "barcode").Text,
TicketSecCode = parsed.Rporderdetails.Order.Tcklist.Tck[1].Htdata.Ht.First(p => p.Name == "sichtmerkmal").Text,
UserId = int.Parse(HttpContext.Session.GetString("uid")),
TicketPkPass = parsed.Rporderdetails.Order.Tcklist.Tck[1].Htdata.Ht.First(p => p.Name == "pass").Text, // application/vnd.apple.pkpass;base64
Traveller = parsed.Rporderdetails.Order.Tcklist.Tck[1].Mtk.ReisenderVorname
+ " "
+ parsed.Rporderdetails.Order.Tcklist.Tck[1].Mtk.ReisenderNachname
});
break;
}
default: {
throw new Exception("Order contains zero or more than two tickets");
}
}
foreach (var leg in parsed.Rporderdetails.Order.Schedulelist.Out.Trainlist.Train) { foreach (var leg in parsed.Rporderdetails.Order.Schedulelist.Out.Trainlist.Train) {
db.InsertWithInt32Identity(new Leg { db.InsertWithInt32Identity(new Leg {
@ -118,11 +175,11 @@ namespace bahnplan.web.Pages {
DepStation = leg.Dep.Name, DepStation = leg.Dep.Name,
DepStationId = int.Parse(leg.Dep.BhfNr), DepStationId = int.Parse(leg.Dep.BhfNr),
DepTime = leg.Dep.Date.Replace("00:00:00", leg.Dep.Time), DepTime = leg.Dep.Date.Replace("00:00:00", leg.Dep.Time),
TicketId = ticketId TicketId = ticketId2 ?? ticketId
}); });
db.InsertWithInt32Identity(new TicketLeg { db.InsertWithInt32Identity(new TicketLeg {
TicketId = ticketId, TicketId = ticketId2 ?? ticketId,
TrainType = leg.Gattung, TrainType = leg.Gattung,
TrainNr = int.Parse(leg.Zugnummer), TrainNr = int.Parse(leg.Zugnummer),
ArrStation = leg.Arr.Name, ArrStation = leg.Arr.Name,