From d5c7f379652a6d345c1a28db6404d80be07121fe Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 13 Dec 2021 10:10:02 +0100 Subject: [PATCH] =?UTF-8?q?Codedesign=C3=A4nderungen=20und=20Codelogik?= =?UTF-8?q?=C3=A4nderungen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Customers/LKWs.aspx.vb | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb index 70205a3..7c088f6 100644 --- a/Customers/LKWs.aspx.vb +++ b/Customers/LKWs.aspx.vb @@ -40,13 +40,11 @@ Partial Class LKWS list = VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401940) Dim tblhrow As TableHeaderRow = New TableHeaderRow - tblhrow.Cells.Add(tbhc_KFZKennz) tblhrow.Cells.Add(tbhc_Nat) tblhrow.Cells.Add(tblhc_Verk) tblhrow.Cells.Add(tblhc_Kz) tblhrow.Cells.Add(tblhc_Verm) - tbl_sidemenue.Rows.Add(tblhrow) 'tbl_sidemenue.Rows.Clear() @@ -60,6 +58,7 @@ Partial Class LKWS Dim tc_Vermerk 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 list3 As List(Of String) = New List(Of String) + tc_KfzKennz.Text = l1.KfzKennzeichen tr1.Cells.Add(tc_KfzKennz) If IsNothing(l1.Nationalität) = True Then @@ -153,13 +152,15 @@ Partial Class LKWS Dim tblheader_Cellverk As TableHeaderCell = FindControl("tbhc_Verk") Dim tblheader_cell_KZ As TableHeaderCell = FindControl("tblhc_Kz") Dim tblheader_cell_Verm As TableHeaderCell = FindControl("tblhc_Verm") + Dim cnt As Integer = 0 + tblhrow.Cells.Add(tblheader_Cell1) tblhrow.Cells.Add(tblheader_Cellnat) tblhrow.Cells.Add(tblheader_Cellverk) tblhrow.Cells.Add(tblheader_cell_KZ) tblhrow.Cells.Add(tblheader_cell_Verm) - Dim cnt As Integer = 0 + tbl_sidemenue.Rows.Clear() tbl_sidemenue.Height = Unit.Pixel(150) tbl_sidemenue.Rows.Add(tblhrow) @@ -200,6 +201,7 @@ Partial Class LKWS Else VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False End If + list_M = VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401940) Dim cnt As Integer = 0 @@ -251,7 +253,6 @@ Partial Class LKWS End If Dim cnt As Integer = 0 - list_M = VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401940) Dim tblhrow_M As TableHeaderRow = New TableHeaderRow @@ -260,13 +261,12 @@ Partial Class LKWS tblhrow_M.Cells.Add(tbhc_Verk_M) tblhrow_M.Cells.Add(tbhc_KZ_An_M) tblhrow_M.Cells.Add(tbhc_Verm_M) - tbl_2.Rows.Add(tblhrow_M) 'tbl_sidemenue.Rows.Clear() 'MsgBox("Test2") For Each l3 In list_M - Dim tr1 As TableRow = New TableRow() + Dim tr1_M 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() @@ -275,7 +275,7 @@ Partial Class LKWS 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 = l3.KfzKennzeichen - tr1.Cells.Add(tc_KfzKennz_M) + tr1_M.Cells.Add(tc_KfzKennz_M) If IsNothing(l3.Nationalität) = True Then tc_Nationalitaet_M.Text = String.Empty ElseIf String.IsNullOrEmpty(l3.Nationalität.ToString) = True Then @@ -283,11 +283,11 @@ Partial Class LKWS Else tc_Nationalitaet_M.Text = l3.Nationalität.ToString End If - tr1.Cells.Add(tc_Nationalitaet_M) + tr1_M.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) + tr1_M.Cells.Add(tc_Verk_M) If l3.Verkauft = True Then cbverk_M.Checked = True Else @@ -301,7 +301,7 @@ Partial Class LKWS 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) + tr1_M.Cells.Add(tc_KZ_Ab_M) If IsNothing(l3.Vermerk) = True Then tc_Vermerk_M.Text = String.Empty ElseIf String.IsNullOrEmpty(l3.Vermerk.ToString) = True Then @@ -309,8 +309,8 @@ Partial Class LKWS Else 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) + tr1_M.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_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 For Each l2 In list2 Dim String2 As String = String.Empty @@ -325,18 +325,15 @@ Partial Class LKWS Next Next Dim strtemp2 As String = String.Empty - If String.IsNullOrEmpty(l3.Nationalität) Then strtemp2 = "Keine Angabe" Else strtemp2 = l3.Nationalität End If - tr1.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & list3.ToString & """,""" & l3.KfzKennzeichen & """,""" & strtemp2 & """)") + tr1_M.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & list3.ToString & """,""" & l3.KfzKennzeichen & """,""" & strtemp2 & """)") + tbl_2.Rows.Add(tr1_M) cnt += 1 - tbl_2.Rows.Add(tr1) Next 'MsgBox("Test3") End Sub - - End Class