diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx index 25c249d..b41883c 100644 --- a/Customers/LKWs.aspx +++ b/Customers/LKWs.aspx @@ -149,8 +149,7 @@ let natplaceholder = document.getElementById("<%=lbl_Placeholder.ClientID%>") Speditionslabel.textContent = Kennzeichen - natplaceholder.textContent = Nat - } + natplaceholder.textContent = Nat } function TableRow_Click_M(Nat,Kennzeichen) { let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder_M.ClientID%>") let natplaceholder = document.getElementById("<%=lbl_Placeholder_M.ClientID%>") @@ -158,41 +157,5 @@ Speditionslabel.textContent = Kennzeichen natplaceholder.textContent = Nat } - function addRow(table1,par1,par2,par3,par4) { - let tableRef = table1; - - let newRow = tableRef.insertRow(); - - let newCell = newRow.insertCell(); - let newCell1 = newRow.insertCell() - let newCell2 = newRow.insertCell() - let newCell3 = newRow.insertCell() - newCell.create - newCell1.create - newCell2.create - newCell3.create - newCell.innerHTML = par1 - newCell1.innerHTML = par2 - newCell2.innerHTML = par3 - newCell3.innerHTML = par4 - } - function addRow_tab2(tab1,par1, par2, par3, par4) { - let tableRef = tab1; - - let newRow = tableRef.insertRow(-1); - - let newCell = newRow.insertCell(0); - let newCell1 = newRow.insertCell(1) - let newCell2 = newRow.insertCell(2) - let newCell3 = newRow.insertCell(3) - newCell.create - newCell1.create - newCell2.create - newCell3.create - newCell.innerHTML = par1 - newCell1.innerHTML = par2 - newCell2.innerHTML = par3 - newCell3.innerHTML = par4 - } - + \ No newline at end of file diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb index d7f8e4c..9b1bfe7 100644 --- a/Customers/LKWs.aspx.vb +++ b/Customers/LKWs.aspx.vb @@ -70,7 +70,7 @@ Partial Class LKWS Dim tc_Verk As TableCell = New TableCell() Dim tc_KZ_Ab As TableCell = New TableCell() 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) + tc_KfzKennz.Text = l1.KfzKennzeichen tr1.Cells.Add(tc_KfzKennz) @@ -110,10 +110,21 @@ Partial Class LKWS tr1.Cells.Add(tc_Vermerk) initcells(tblhrow, tbhc_KFZKennz, tbhc_Nat, tblhc_Verk, tblhc_Kz, tblhc_Verm, tr1, tc_KfzKennz, tc_Nationalitaet, tc_Verk, tc_KZ_Ab, tc_Vermerk, cnt) Dim Stringtemp As String = String.Empty + TableRows.Clear() + Dim throw2 As TableHeaderRow = New TableHeaderRow + throw2.Cells.Add(tblhc_SDLNr) + throw2.Cells.Add(tblhc_Bez) + throw2.Cells.Add(tbl_gueltig) + throw2.Cells.Add(tblhc_KarteNr) + TableRows.Add(throw2) + tbl_mainpage.Rows.Add(throw2) + Dim strtemparr As String = String.Empty Dim strtemp2 As String = String.Empty Dim strarrtemp = String.Empty - tbl2mainpagetemp = New Table + Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, l1.KfzKennzeichen) + Dim stringtemtr As String + Dim tr As TableRow = New TableRow For Each l2 In list2 Dim String2 As String = String.Empty @@ -122,7 +133,7 @@ Partial Class LKWS Else Stringtemp = String.Empty End If - Dim tr As TableRow = New TableRow + Dim tc_SDL As TableCell = New TableCell Dim tc_Bez As TableCell = New TableCell Dim tc_gueltigbis As TableCell = New TableCell @@ -131,11 +142,15 @@ Partial Class LKWS tc_Bez.Text = Stringtemp tc_gueltigbis.Text = l2.GültigBis.ToString tc_Karten_Nr.Text = l2.KartenNr.ToString - tr.Cells.Add(tc_SDL) - tr.Cells.Add(tc_Bez) - tr.Cells.Add(tc_gueltigbis) - tr.Cells.Add(tc_Karten_Nr) - TableRows.Add(tr) + If String.Equals(l2.KfzKennzeichen, l1.KfzKennzeichen) = True Then + tr.Cells.Add(tc_SDL) + tr.Cells.Add(tc_Bez) + tr.Cells.Add(tc_gueltigbis) + tr.Cells.Add(tc_Karten_Nr) + strtemparr = "" + tc_SDL.Text + "" + tc_Bez.Text + "" + tc_gueltigbis.Text + "" + tc_Karten_Nr.Text + "" + tbl_mainpage.Rows.Add(tr) + TableRows.Add(tr) + End If 'MsgBox(TableRows.Count.ToString) Next If String.IsNullOrEmpty(l1.Nationalität) = True Then @@ -180,8 +195,8 @@ Partial Class LKWS tblhrow.Cells.Add(tblhc_Verm) tbl_sidemenue.Height = Unit.Pixel(150) - tbl_sidemenue.Rows.Clear() - tbl_sidemenue.Rows.Add(tblhrow) + + For Each l2 In list Dim tr2 As TableRow = New TableRow() @@ -225,8 +240,6 @@ Partial Class LKWS Next End Sub - - Protected Sub btn_Suchen_M_Click(sender As Object, e As EventArgs) If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True @@ -291,7 +304,8 @@ Partial Class LKWS Else VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False End If - tbl_2.Rows.Clear() + + tbl_mainpage_M.Rows.Clear() Dim cnt As Integer = 0 list_M = VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401940) Dim tblhrow_M As TableHeaderRow = New TableHeaderRow @@ -350,6 +364,7 @@ Partial Class LKWS 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 If IsNothing(l2.Schadstoffklasse) = False Then @@ -357,7 +372,23 @@ Partial Class LKWS Else Stringtemp_M = String.Empty End If - list3.Add(l2.SDLNr.ToString + ";" + Stringtemp_M + ";" + l2.GültigBis.ToString + ";" + l2.KartenNr.ToString) + Dim tr As TableRow = New TableRow + Dim tc_SDLNr As TableCell = New TableCell + Dim tc_Bez As TableCell = New TableCell + Dim tc_GueltigBis As TableCell = New TableCell + Dim tc_Kartennr As TableCell = New TableCell + + tc_SDLNr.Text = l2.SDLNr.ToString + tc_Bez.Text = Stringtemp_M + tc_GueltigBis.Text = l2.GültigBis.ToString + tc_Kartennr.Text = l2.KartenNr.ToString + tr.Cells.Add(tc_SDLNr) + tr.Cells.Add(tc_Bez) + tr.Cells.Add(tc_GueltigBis) + tr.Cells.Add(tc_Kartennr) + + tbl_mainpage_M.Rows.Add(tr) + TableRows_M.Add(tr) Next Dim strtemp2 As String = String.Empty If String.IsNullOrEmpty(l3.Nationalität) Then @@ -365,10 +396,7 @@ Partial Class LKWS Else strtemp2 = l3.Nationalität End If - Dim str2temptemp = String.Empty - For Each Ltenp In list2 - str2temptemp = String.Join("-", Ltenp) - Next + tbl_mainpage_M.Rows.Clear() tr1_M.Attributes.Add("OnClick", "Javascript:TableRow_Click_M(""" & strtemp2 & """,""" & l3.KfzKennzeichen & """)") tbl_2.Rows.Add(tr1_M) cnt += 1