Änderung

This commit is contained in:
ja
2022-02-07 08:50:01 +01:00
parent c5e1ec94a9
commit 008f16306e
6 changed files with 170 additions and 234 deletions

View File

@@ -160,14 +160,13 @@ Partial Class LKWS
Else
Stringtemp = l2.Kategorie.ToString
End If
strstrstrstrtempSDL = l2.SDLNr.ToString
strstrstrstrtempCardno = l2.KartenNr.ToString
strstrstrstrtempKennz = l2.KfzKennzeichen.ToString
Dim tc_SDL As TableCell = New TableCell
Dim tc_Bez As TableCell = New TableCell
Dim tc_gueltigbis As TableCell = New TableCell
Dim tc_Karten_Nr As TableCell = New TableCell
strstrstrstrtempSDL = l2.SDLNr.ToString
strstrstrstrtempCardno = l2.KartenNr.ToString
strstrstrstrtempKennz = l2.KfzKennzeichen.ToString
tc_SDL.Text = l2.SDLNr.ToString
tc_Bez.Text = Stringtemp
tc_gueltigbis.Text = l2.GültigBis.ToString
@@ -193,7 +192,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 + """')")
cnt += 1
tbl_sidemenue.Rows.Add(tr1)
Next
@@ -371,58 +370,10 @@ Partial Class LKWS
Dim tc_Verk_M As TableCell = New TableCell()
Dim tc_KZ_Ab_M As TableCell = New TableCell()
Dim tc_Vermerk_M As TableCell = New TableCell()
Dim strstrstrstrtemp As String = String.Empty
Dim strstrstrstrtempCardno As String = String.Empty
Dim strstrstrstrtempKennz As String = String.Empty
Dim strstrstrstrtempKundNr As String = String.Empty
Dim strstrstrstrtempHistory As String = String.Empty
Dim strstrstrstrtempSDL As String = String.Empty
Dim strstrtemp As String = String.Empty
tc_KfzKennz_M.Text = l3.KfzKennzeichen
tr1_M.Cells.Add(tc_KfzKennz_M)
Dim strtemparr As String = String.Empty
Dim strtemp2 As String = String.Empty
Dim strarrtemp = String.Empty
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), l3.KfzKennzeichen)
Dim stringtemtr As String = String.Empty
Dim tr As TableRow = New TableRow
Dim list3 As List(Of String) = New List(Of String)
For Each l2 In list2
Dim String2 As String = String.Empty
If IsNothing(l2.Kategorie) = True Then
stringtemtr = "Keine Angabe"
Else
stringtemtr = l2.Kategorie.ToString
End If
Dim tc_SDL As TableCell = New TableCell
Dim tc_Bez As TableCell = New TableCell
Dim tc_gueltigbis As TableCell = New TableCell
Dim tc_Karten_Nr As TableCell = New TableCell
strstrstrstrtempSDL = l2.SDLNr.ToString
strstrstrstrtempCardno = l2.KartenNr.ToString
strstrstrstrtempKennz = l2.KfzKennzeichen.ToString
tc_SDL.Text = l2.SDLNr.ToString
tc_Bez.Text = stringtemtr
tc_gueltigbis.Text = l2.GültigBis.ToString
tc_Karten_Nr.Text = l2.KartenNr.ToString
strstrstrstrtempKundNr = l2.KundenNr.ToString
strstrstrstrtempHistory = l2.History.ToString
If String.Equals(l2.KfzKennzeichen.ToString, l3.KfzKennzeichen.ToString) = True Then
tr.Cells.Add(tc_SDL)
tr.Cells.Add(tc_Bez)
tr.Cells.Add(tc_gueltigbis)
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)
End If
list3.Add(strstrstrstrtemp)
'MsgBox(TableRows.Count.ToString)
Next
If IsNothing(l3.Nationalität) = True Then
tc_Nationalitaet_M.Text = String.Empty
ElseIf String.IsNullOrEmpty(l3.Nationalität.ToString) = True Then
@@ -460,14 +411,14 @@ Partial Class LKWS
initcells(tblhrow_M, tbhc_KFZKennz_M, tbhc_Nat_M, tbhc_Verk_M, tbhc_KZ_An_M, tbhc_Verm_M, tr1_M, tc_KfzKennz_M, tc_Nationalitaet_M, tc_Verk_M, tc_KZ_Ab_M, tc_Vermerk_M, cnt)
Dim Stringtemp_M As String = String.Empty
Dim strtemp2 As String = String.Empty
If String.IsNullOrEmpty(l3.Nationalität) Then
strtemp2 = "Keine Angabe"
Else
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 & """,""" & l3.KfzKennzeichen & """')")
cnt += 1
tbl_2.Rows.Add(tr1_M)
Next
@@ -627,8 +578,15 @@ Partial Class LKWS
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
Public Shared Function filltable2(Kennzeichen As String, Kundennr As String, SDLNr As String, History 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 strtemp As String = Kennzeichen.Remove(0, 1)
Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1)
Dim sdlnrstrtemp As String = SDLNr.Remove(0, 1)
Dim finalSDLNrstr As String = sdlnrstrtemp.Remove(sdlnrstrtemp.Length - 1, 1)
Dim strtempKundennr As String = Kundennr.Remove(0, 1)
Dim finalstrKundNr As String = Kundennr.Remove(strtempKundennr.Length - 1, 1)
Dim Historytemp As String = History.Remove(0, 1)
Dim finalhistory As String = Historytemp.Remove(Historytemp.Length - 1, 1)
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr)
Dim container As New List(Of List(Of String))
For Each l2 In list2
Dim strtempKat As String = String.Empty
@@ -648,15 +606,15 @@ Partial Class LKWS
' If String.Equals(finalSDLNrstr, l2.SDLNr.ToString) = True AndAlso String.Equals(finalstr, l2.KfzKennzeichen.ToString) = True AndAlso String.Equals(finalstrKundNr, l2.KundenNr.ToString) = True Then
Dim Entrytemp As New List(Of String)
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(l2.SDLNr.ToString)
Entrytemp.Add(strtempKat)
Entrytemp.Add(strtempGueltigBis)
Entrytemp.Add(strtempKartenNr)
Entrytemp.Add(finalstr)
Entrytemp.Add(finalstrKundNr)
Entrytemp.Add(finalSDLNrstr)
Entrytemp.Add(finalhistory)
container.Add(Entrytemp)
' End If
Next
@@ -668,8 +626,15 @@ Partial Class LKWS
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
Public Shared Function filltable2_M(Kennzeichen As String, Kundennr As String, SDLNr As String, History 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 strtemp As String = Kennzeichen.Remove(0, 1)
Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1)
Dim sdlnrstrtemp As String = SDLNr.Remove(0, 1)
Dim finalSDLNrstr As String = sdlnrstrtemp.Remove(sdlnrstrtemp.Length - 1, 1)
Dim strtempKundennr As String = Kundennr.Remove(0, 1)
Dim finalstrKundNr As String = Kundennr.Remove(strtempKundennr.Length - 1, 1)
Dim Historytemp As String = History.Remove(0, 1)
Dim finalhistory As String = Historytemp.Remove(Historytemp.Length - 1, 1)
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr)
Dim container As New List(Of List(Of String))
For Each l2 In list2
Dim strtempKat As String = String.Empty
@@ -687,15 +652,11 @@ Partial Class LKWS
End If
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
'If String.Equals(finalSDLNrstr, l2.SDLNr.ToString) = True AndAlso String.Equals(finalstr, l2.KfzKennzeichen.ToString) = True AndAlso String.Equals(finalstrKundNr, 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)
' End If
Next