diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx
index 67cbd29..ae10c3e 100644
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -520,6 +520,7 @@
data['CardNo'] = id.split(',')[3];
data['SDLNr'] = id.split(',')[4];
data['History'] = id.split(',')[5];
+ data['GueltigBis'] = id.split(',')[6];
$.ajax({
type: "POST",
@@ -552,6 +553,7 @@
let cardno = result[i]["3"];
let Kennz = result[i]["4"];
let History = result[i]["7"];
+ let GueltigBis = result[i]["2"];
//alert(SDLNr + 'SDLnummer' + id.split(',')[4]);
//alert(Kundennr + 'Kundennummer' + id.split(',')[2]);
//alert(cardno + 'Kartenummer'+id.split(',')[3]);
@@ -564,7 +566,7 @@
iframe = '';
strHTML4 = '| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 100 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
- iframe = ' ';
+ iframe = ' ';
strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 101 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
@@ -603,7 +605,7 @@
iframe = ' ';
strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 212 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4]){
- iframe = ' ';
+ iframe = ' ';
strHTML4 = '
| ' + result[i]["0"] + ' | ' + result[i]["1"] + ' | ' + result[i]["2"] + ' | ' + result[i]["3"] + ' |
| ' + iframe + ' |
'
} else if (result[i]["0"] == 213 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){
iframe = ' ';
diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb
index f44e6d7..769c601 100644
--- a/Customers/LKWs.aspx.vb
+++ b/Customers/LKWs.aspx.vb
@@ -152,6 +152,7 @@ Partial Class LKWS
Dim strstrstrstrtempKundNr As String = String.Empty
Dim strstrstrstrtempHistory As String = String.Empty
Dim strstrstrstrtempSDL As String = String.Empty
+ Dim strstrstrstrtempGueltigBis As String = String.Empty
For Each l2 In list2
Dim String2 As String = String.Empty
@@ -174,6 +175,7 @@ Partial Class LKWS
tc_Karten_Nr.Text = l2.KartenNr.ToString
strstrstrstrtempKundNr = l2.KundenNr.ToString
strstrstrstrtempHistory = l2.History.ToString
+ strstrstrstrtempGueltigBis = l2.GültigBis.ToString
If String.Equals(l2.KfzKennzeichen.ToString, l1.KfzKennzeichen.ToString) = True Then
tr.Cells.Add(tc_SDL)
tr.Cells.Add(tc_Bez)
@@ -181,7 +183,7 @@ Partial Class LKWS
tr.Cells.Add(tc_Karten_Nr)
'tbl_mainpage.Rows.Add(tr)
TableRows.Add(tr)
- strstrstrstrtemp += String.Join("-", tc_SDL.Text + "," + tc_Bez.Text + "," + tc_gueltigbis.Text + "," + tc_Karten_Nr.Text)
+ strstrstrstrtemp += String.Join("-", tc_SDL.Text + "," + tc_Bez.Text + "," + tc_gueltigbis.Text + "," + strstrstrstrtempCardno)
End If
list3.Add(strstrstrstrtemp)
@@ -193,7 +195,7 @@ Partial Class LKWS
strtemp2 = l1.Nationalität
End If
- tr1.Attributes.Add("onclick", "Javascript:doPostBack('" + tr1.Cells.Item(0).Text + "," + strtemp2 + "," + Kdnrtext + "," + strstrstrstrtempCardno + "," + strstrstrstrtempSDL + "," + strstrstrstrtempHistory + "')")
+ tr1.Attributes.Add("onclick", "Javascript:doPostBack('" + tr1.Cells.Item(0).Text + "," + strtemp2 + "," + Kdnrtext + "," + strstrstrstrtempCardno + "," + strstrstrstrtempSDL + "," + strstrstrstrtempHistory + "," + strstrstrstrtempGueltigBis + "')")
cnt += 1
tbl_sidemenue.Rows.Add(tr1)
Next
@@ -377,6 +379,7 @@ Partial Class LKWS
Dim strstrstrstrtempKundNr As String = String.Empty
Dim strstrstrstrtempHistory As String = String.Empty
Dim strstrstrstrtempSDL As String = String.Empty
+ Dim strstrstrstrtempGueltigBis As String = String.Empty
Dim strstrtemp As String = String.Empty
tc_KfzKennz_M.Text = l3.KfzKennzeichen
tr1_M.Cells.Add(tc_KfzKennz_M)
@@ -410,6 +413,7 @@ Partial Class LKWS
tc_Karten_Nr.Text = l2.KartenNr.ToString
strstrstrstrtempKundNr = l2.KundenNr.ToString
strstrstrstrtempHistory = l2.History.ToString
+ strstrstrstrtempGueltigBis = l2.GültigBis.ToString.Substring(0, 10)
If String.Equals(l2.KfzKennzeichen.ToString, l3.KfzKennzeichen.ToString) = True Then
tr.Cells.Add(tc_SDL)
tr.Cells.Add(tc_Bez)
@@ -467,7 +471,7 @@ Partial Class LKWS
strtemp2 = l3.Nationalität
End If
tbl_mainpage_M.Rows.Clear()
- tr1_M.Attributes.Add("onclick", "Javascript:doPostBack_M('" + tr1_M.Cells.Item(0).Text + "," + strtemp2 + "," + Kdnrtext + "," + strstrstrstrtempCardno + "," + strstrstrstrtempSDL + "," + strstrstrstrtempHistory + "')")
+ tr1_M.Attributes.Add("onclick", "Javascript:doPostBack_M('" + tr1_M.Cells.Item(0).Text + "," + strtemp2 + "," + Kdnrtext + "," + strstrstrstrtempCardno + "," + strstrstrstrtempSDL + "," + strstrstrstrtempHistory + "," + strstrstrstrtempGueltigBis + "')")
cnt += 1
tbl_2.Rows.Add(tr1_M)
Next
@@ -625,7 +629,7 @@ Partial Class LKWS
End Class
- Public Shared Function filltable2(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String) As FormattedList
+ Public Shared Function filltable2(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String, GueltigBis As String) As FormattedList
Dim list As List(Of String) = New List(Of String)
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kundennr), Kennzeichen)
@@ -639,7 +643,7 @@ Partial Class LKWS
strtempKat = l2.Kategorie.ToString
End If
If IsNothing(l2.GültigBis) = False Then
- strtempGueltigBis = l2.GültigBis.ToString
+ strtempGueltigBis = l2.GültigBis.ToString.Substring(0, 10)
End If
If IsNothing(l2.KartenNr) = False Then
strtempKartenNr = l2.KartenNr.ToString
@@ -679,7 +683,7 @@ Partial Class LKWS
strtempKat = l2.Kategorie.ToString
End If
If IsNothing(l2.GültigBis) = False Then
- strtempGueltigBis = l2.GültigBis.ToString
+ strtempGueltigBis = l2.GültigBis.ToString.Substring(0, 10)
End If
If IsNothing(l2.KartenNr) = False Then
strtempKartenNr = l2.KartenNr.ToString
@@ -688,14 +692,14 @@ Partial Class LKWS
Dim Entrytemp As New List(Of String)
' If String.Equals(SDLNr, l2.SDLNr.ToString) = True AndAlso String.Equals(Kennzeichen, l2.KfzKennzeichen.ToString) = True AndAlso String.Equals(Kundennr, l2.KundenNr.ToString) = True Then
Entrytemp.Add(l2.SDLNr.ToString)
- Entrytemp.Add(strtempKat)
- Entrytemp.Add(strtempGueltigBis)
- Entrytemp.Add(strtempKartenNr)
- Entrytemp.Add(Kennzeichen)
- Entrytemp.Add(Kdnrtext)
- Entrytemp.Add(SDLNr)
- Entrytemp.Add(History)
- container.Add(Entrytemp)
+ Entrytemp.Add(strtempKat)
+ Entrytemp.Add(strtempGueltigBis)
+ Entrytemp.Add(strtempKartenNr)
+ Entrytemp.Add(Kennzeichen)
+ Entrytemp.Add(Kdnrtext)
+ Entrytemp.Add(SDLNr)
+ Entrytemp.Add(History)
+ container.Add(Entrytemp)
' End If
Next
diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx b/Customers/SDL/Formtemplate IDS Tankkarte.aspx
index 5b4edb3..beb2346 100644
--- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx
+++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx
@@ -122,12 +122,13 @@
var param4 = getParamValue('CustomerNo');
var param5 = getParamValue('SDLNr');
var param6 = getParamValue('History');
+ var param7 = getParamValue('GueltigBis');
$('txt_ClientNr').val(param1);
- detailtabelle(param1, param2, param3, param4, param5, param6);
+ detailtabelle(param1, param2, param3, param4, param5, param6, param7);
//alert(param1)
- function detailtabelle(id,CustomerID,Cardnummer,CustomerNo,SDLNr,History) {
+ function detailtabelle(id,CustomerID,Cardnummer,CustomerNo,SDLNr,History,GueltigBis) {
// alert("Testdata:" + id)
let data = {};
@@ -136,7 +137,8 @@
data['CardNo'] = Cardnummer;
data['CustomerNo'] = CustomerNo;
data['SDLNr'] = SDLNr;
- data['History'] = History;
+ data['History'] = History;
+ data['GueltigBis'] = GueltigBis;
$.ajax({
type: "POST",
diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb
index fe9b6cf..b6ab40c 100644
--- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb
+++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb
@@ -73,7 +73,7 @@ Partial Class Customers_Default3
- Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, CardNo As String, SDLNr As String, History As String) As FormattedList
+ Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, CardNo As String, SDLNr As String, History As String, GueltigBis As String) As FormattedList
Dim list As List(Of String) = New List(Of String)
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kundennr), Kennzeichen)
Dim listdetails As New List(Of List(Of String))
@@ -98,9 +98,9 @@ Partial Class Customers_Default3
If IsNothing(l2.Lieferdatum) = False Then
strtempLieferdatum = l2.Lieferdatum.ToString.Substring(0, 10)
End If
- If l2.KartenNr.ToString = CardNo Then
- strtempKartenNr = l2.KartenNr.ToString
- End If
+
+ strtempKartenNr = CardNo
+
If IsNothing(l2.PIN) = False Then
strtempPin = l2.PIN.ToString
End If
@@ -108,7 +108,7 @@ Partial Class Customers_Default3
strtempVermerk = l2.Vermerk.ToString
End If
If IsNothing(l2.GültigBis) = False Then
- strtempGueltigBis = l2.GültigBis.ToString.Substring(0, 10)
+ strtempGueltigBis = GueltigBis
End If
If IsNothing(l2.Ersatzkarte) = False Then
strtempErsatzKarte = l2.Ersatzkarte.ToString