diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb index 60617f9..70205a3 100644 --- a/Customers/LKWs.aspx.vb +++ b/Customers/LKWs.aspx.vb @@ -146,7 +146,7 @@ Partial Class LKWS Dim txt_LkwNr As TextBox = txt_lkw 'list = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB(401940, "COOPER8") list = VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401940) - Dim tbl_sidemenue2 As Table = FindControl("tbl_sidemenue") + Dim tbl_sidemenue As Table = FindControl("tbl_sidemenue") Dim tblhrow As TableHeaderRow = New TableHeaderRow() Dim tblheader_Cell1 As TableHeaderCell = FindControl("tbhc_KFZKennz") Dim tblheader_Cellnat As TableHeaderCell = FindControl("tbhc_Nat") @@ -160,31 +160,31 @@ Partial Class LKWS tblhrow.Cells.Add(tblheader_cell_Verm) Dim cnt As Integer = 0 - tbl_sidemenue2.Rows.Clear() - tbl_sidemenue2.Height = Unit.Pixel(150) - tbl_sidemenue2.Rows.Add(tblhrow) + tbl_sidemenue.Rows.Clear() + tbl_sidemenue.Height = Unit.Pixel(150) + tbl_sidemenue.Rows.Add(tblhrow) 'MsgBox("Test1") For Each l2 In list Dim tr2 As TableRow = New TableRow() - Dim tc_KfzKennz_M As TableCell = New TableCell() - Dim tc_Nationalitaet_M As TableCell = New TableCell() - Dim tc_Verk_M As TableCell = New TableCell() - Dim tc_KZ_An_M As TableCell = New TableCell() - Dim tc_Vermerk_M As TableCell = New TableCell() - tc_KfzKennz_M.Text = l2.KfzKennzeichen.ToString - tr2.Cells.Add(tc_KfzKennz_M) - tc_Nationalitaet_M.Text = String.Empty - tr2.Cells.Add(tc_Nationalitaet_M) + Dim tc_KfzKennz As TableCell = New TableCell() + Dim tc_Nationalitaet As TableCell = New TableCell() + Dim tc_Verk As TableCell = New TableCell() + Dim tc_KZ_An As TableCell = New TableCell() + Dim tc_Vermerk As TableCell = New TableCell() + tc_KfzKennz.Text = l2.KfzKennzeichen.ToString + tr2.Cells.Add(tc_KfzKennz) + tc_Nationalitaet.Text = String.Empty + tr2.Cells.Add(tc_Nationalitaet) Dim cbVerk_Such As CheckBox = New CheckBox() - tc_Verk_M.Controls.Add(cbVerk_Such) - tr2.Cells.Add(tc_Verk_M) + tc_Verk.Controls.Add(cbVerk_Such) + tr2.Cells.Add(tc_Verk) Dim cb_Kz_An As CheckBox = New CheckBox() - tc_KZ_An_M.Controls.Add(cb_Kz_An) - tc_Vermerk_M.Text = l2.Vermerk.ToString - tr2.Cells.Add(tc_Vermerk_M) - initcells(tblhrow, tblheader_Cell1, tblheader_Cellnat, tblheader_Cellverk, tblheader_cell_KZ, tblheader_cell_Verm, tr2, tc_KfzKennz_M, tc_Nationalitaet_M, tc_Verk_M, tc_KZ_An_M, tc_Vermerk_M, cnt) + tc_KZ_An.Controls.Add(cb_Kz_An) + tc_Vermerk.Text = l2.Vermerk.ToString + tr2.Cells.Add(tc_Vermerk) + initcells(tblhrow, tblheader_Cell1, tblheader_Cellnat, tblheader_Cellverk, tblheader_cell_KZ, tblheader_cell_Verm, tr2, tc_KfzKennz, tc_Nationalitaet, tc_Verk, tc_KZ_An, tc_Vermerk, cnt) - tbl_sidemenue2.Rows.Add(tr2) + tbl_sidemenue.Rows.Add(tr2) cnt += 1 Next 'MsgBox("Test2") @@ -200,7 +200,7 @@ Partial Class LKWS Else VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False End If - list = VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401940) + list_M = VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401940) Dim cnt As Integer = 0 headrow_M.Cells.Add(tbhc_KFZKennz_M) @@ -210,7 +210,7 @@ Partial Class LKWS headrow_M.Cells.Add(tbhc_Verm_M) tbl_2.Rows.Add(headrow_M) - For Each li_M In list + For Each li_M In list_M Dim tr2 As TableRow = New TableRow() Dim tc_KfZKennz_M As TableCell = New TableCell() Dim tc_Nationalitaet_M As TableCell = New TableCell() @@ -265,49 +265,49 @@ Partial Class LKWS 'tbl_sidemenue.Rows.Clear() 'MsgBox("Test2") - For Each l1 In list_M + For Each l3 In list_M Dim tr1 As TableRow = New TableRow() Dim tc_KfzKennz_M As TableCell = New TableCell() Dim tc_Nationalitaet_M As TableCell = New TableCell() 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 list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, l1.KfzKennzeichen) + Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, l3.KfzKennzeichen) Dim list3 As List(Of String) = New List(Of String) - tc_KfzKennz_M.Text = l1.KfzKennzeichen + tc_KfzKennz_M.Text = l3.KfzKennzeichen tr1.Cells.Add(tc_KfzKennz_M) - If IsNothing(l1.Nationalität) = True Then + If IsNothing(l3.Nationalität) = True Then tc_Nationalitaet_M.Text = String.Empty - ElseIf String.IsNullOrEmpty(l1.Nationalität.ToString) = True Then + ElseIf String.IsNullOrEmpty(l3.Nationalität.ToString) = True Then tc_Nationalitaet_M.Text = String.Empty Else - tc_Nationalitaet_M.Text = l1.Nationalität.ToString + tc_Nationalitaet_M.Text = l3.Nationalität.ToString End If tr1.Cells.Add(tc_Nationalitaet_M) Dim cbverk_M As CheckBox = New CheckBox() tc_Verk_M.Controls.Add(cbverk_M) cbverk_M.Enabled = False tr1.Cells.Add(tc_Verk_M) - If l1.Verkauft = True Then + If l3.Verkauft = True Then cbverk_M.Checked = True Else cbverk_M.Checked = False End If Dim chbx2_Kz_ab_M As CheckBox = New CheckBox() chbx2_Kz_ab_M.Enabled = False - If (l1.Abgemeldet = True) Then + If (l3.Abgemeldet = True) Then chbx2_Kz_ab_M.Checked = True Else chbx2_Kz_ab_M.Checked = False End If tc_KZ_Ab_M.Controls.Add(chbx2_Kz_ab_M) tr1.Cells.Add(tc_KZ_Ab_M) - If IsNothing(l1.Vermerk) = True Then + If IsNothing(l3.Vermerk) = True Then tc_Vermerk_M.Text = String.Empty - ElseIf String.IsNullOrEmpty(l1.Vermerk.ToString) = True Then + ElseIf String.IsNullOrEmpty(l3.Vermerk.ToString) = True Then tc_Vermerk_M.Text = String.Empty Else - tc_Vermerk_M.Text = l1.Vermerk.ToString + tc_Vermerk_M.Text = l3.Vermerk.ToString End If tr1.Cells.Add(tc_Vermerk_M) initcells(tblhrow_M, tbhc_KFZKennz_M, tbhc_Nat_M, tbhc_Verk_M, tbhc_KZ_An_M, tbhc_Verm_M, tr1, tc_KfzKennz_M, tc_Nationalitaet_M, tc_Verk_M, tc_KZ_Ab_M, tc_Vermerk_M, cnt) @@ -320,18 +320,18 @@ Partial Class LKWS Else Stringtemp_M = String.Empty End If - For Each l3 In list3 - list3.Add(l2.SDLNr.ToString + ";" + Stringtemp_M + ";" + l2.GültigBis.ToString + ";" + l2.KartenNr.ToString + ";" + l1.KfzKennzeichen + ";" + tc_Nationalitaet_M.Text) + For Each l4 In list3 + list3.Add(l2.SDLNr.ToString + ";" + Stringtemp_M + ";" + l2.GültigBis.ToString + ";" + l2.KartenNr.ToString + ";" + l3.KfzKennzeichen + ";" + tc_Nationalitaet_M.Text) Next Next Dim strtemp2 As String = String.Empty - If String.IsNullOrEmpty(l1.Nationalität) Then + If String.IsNullOrEmpty(l3.Nationalität) Then strtemp2 = "Keine Angabe" Else - strtemp2 = l1.Nationalität + strtemp2 = l3.Nationalität End If - tr1.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & list3.ToString & """,""" & l1.KfzKennzeichen & """,""" & strtemp2 & """)") + tr1.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & list3.ToString & """,""" & l3.KfzKennzeichen & """,""" & strtemp2 & """)") cnt += 1 tbl_2.Rows.Add(tr1) Next