edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hashfunktion und Saltgenerierung funktionieren wieder wie angenommen.

Browse Source
This commit is contained in:
ja
2021-12-22 11:23:55 +01:00
parent 7e52a02586
commit a833f5a7f6
13 changed files with 137 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Customers/LKWs.aspx
View File

@@ -167,9 +167,9 @@
GueltBs = arrtemp[j];
j++;
KartNr = arrtemp[j];
Pagemethods.filltable2(SDLNr, Bez, GueltBs, KartNr, onerror);
Pagemethods.filltable2(table,SDLNr, Bez, GueltBs, KartNr);
}
addNewRow()
addNewRow();
}
function onFailure(error) {
alert(error);
@@ -186,10 +186,18 @@
for (let i = rowCount - 1; i > 0; i--) {
table_M.deleteRow(i);
}
let arrtemp = tempstrarr_M.split(",")
for (let j = 0; j < arrtemp.length; j++) {
alert(arrtemp[j])
}
let arrtemp_M = tempstrarr_M.split(",");
for (let j = 0; j < arrtemp_M.length; j++) {
SDLNr = arrtemp_M[j];
j++;
Bez = arrtemp_M[j];
j++;
GueltBs = arrtemp_M[j];
j++;
KartNr = arrtemp_M[j];
Pagemethods.filltable_M(table_M,SDLNr, Bez, GueltBs, KartNr, onerror);
}
addNewRow_M();
}
function buildtable_M(n, SDL,Bez, Dtguelt, KartNr) {
@@ -300,12 +308,32 @@
CardNr: KartNr,
};
}
</script>
<script type="text/javascript">
function doPostBack(id, strtemp) {
function doPostBack(id,strtemp) {
}
</script>
const obj = JSON.parse(strtemp);
for (let i = 0; i <= obj.length; i++) {
let SDL = obj[i].result;
let Bez = obj[i++].result;
let Datguenstig = obj[i++].result;
let KartNr = obj[i++].result;
Pagemethods.filltable2(<%=tbl_mainpage%>, SDL, Bez, Datguenstig, KartNr)
}
}
function doPostBack_M(id, strtemp) {
let obj = JSON.parse(strtemp)
alert(obj.result)
for (let i = 0; i <= obj.length; i++) {
let SDL = obj[i].result;
let Bez = obj[i++].result;
let Datguenstig = obj[i++].result;
let KartNr = obj[i++].result;
Pagemethods.filltable2_M(<%=tbl_mainpage_M%>, SDL, Bez, Datguenstig, KartNr)
}
}
</script>
</asp:Content>

46
Customers/LKWs.aspx.vb
View File

@@ -198,11 +198,11 @@ Partial Class LKWS
Protected Sub btn_Suchen_Click(sender As Object, e As EventArgs)
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 tblhrow As TableHeaderRow = New TableHeaderRow()
Dim cnt As Integer = 0
Dim list3 As List(Of String) = New List(Of String)
tblhrow.Cells.Add(tbhc_KFZKennz)
tblhrow.Cells.Add(tbhc_Nat)
tblhrow.Cells.Add(tblhc_Verk)
@@ -220,6 +220,7 @@ Partial Class LKWS
Dim tc_Vermerk As TableCell = New TableCell()
tc_KfzKennz.Text = l2.KfzKennzeichen.ToString
tr2.Cells.Add(tc_KfzKennz)
Dim list5 = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, l2.KfzKennzeichen)
tc_Nationalitaet.Text = String.Empty
tr2.Cells.Add(tc_Nationalitaet)
Dim cbVerk_Such As CheckBox = New CheckBox()
@@ -246,11 +247,21 @@ Partial Class LKWS
tc_Vermerk.Text = l2.Vermerk.ToString
End If
tr2.Cells.Add(tc_Vermerk)
initcells(tblhrow, tbhc_KFZKennz, tbhc_Nat, tblhc_Verk, tblhc_Kz, tblhc_Verm, tr2, tc_KfzKennz, tc_Nationalitaet, tc_Verk, tc_KZ_An, tc_Vermerk, cnt)
tbl_sidemenue.Rows.Add(tr2)
cnt += 1
Next
For Each l5 In list5
Dim strstrtemp As String = String.Empty
If IsNothing(l5.Schadstoffklasse.ToString) = True Then
strstrtemp = "Keine Angabe!"
Else
strstrtemp = l5.Schadstoffklasse.ToString
End If
list3.Add(l5.SDLNr.ToString + "," + strstrtemp + "," + l5.GültigBis.ToString + "," + l5.KartenNr)
Next
initcells(tblhrow, tbhc_KFZKennz, tbhc_Nat, tblhc_Verk, tblhc_Kz, tblhc_Verm, tr2, tc_KfzKennz, tc_Nationalitaet, tc_Verk, tc_KZ_An, tc_Vermerk, cnt)
tr2.Attributes.Add("onclick", "Javascript:doPostBack('""" & tr2.Cells.Item(0).Text & """,""" & ConvertToJSON(list3) & """')")
tbl_sidemenue.Rows.Add(tr2)
cnt += 1
Next
End Sub
Protected Sub btn_Suchen_M_Click(sender As Object, e As EventArgs)
@@ -412,14 +423,14 @@ Partial Class LKWS
End If
tbl_mainpage_M.Rows.Clear()
list3.Add(strstrtemp)
tr1_M.Attributes.Add("OnClick", "Javascript:TableRow_Click_M(""" & strtemp2 & """,""" & l3.KfzKennzeichen & """,""" & ConvertToJSON(list3) & """);")
tr1_M.Attributes.Add("OnClick", "Javascript:doPostBack_M('""" & tr1_M.Cells.Item(0).Text & """,""" & ConvertToJSON(list3) & """')")
tbl_2.Rows.Add(tr1_M)
cnt += 1
Next
End Sub
<WebMethod>
Public Sub filltable2(SDLNr As String, Bezeichnung As String, GueltigBis As String, KartNr As String)
Public Sub filltable2(Tbl As Table, SDLNr As String, Bezeichnung As String, GueltigBis As String, KartNr As String)
Dim tc_SDLNr As TableCell = New TableCell
Dim tc_Bezeichnung As TableCell = New TableCell
Dim tc_GueltigBis As TableCell = New TableCell
@@ -433,6 +444,23 @@ Partial Class LKWS
tr.Cells.Add(tc_Bezeichnung)
tr.Cells.Add(tc_GueltigBis)
tr.Cells.Add(tc_KartNr)
tbl_2.Rows.Add(tr)
Tbl.Rows.Add(tr)
End Sub
<WebMethod>
Public Sub filltable_M(Tbl As Table, SDLNr As String, Bezeichnung As String, GueltigBis As String, KartNr As String)
Dim tc_SDLNr As TableCell = New TableCell
Dim tc_Bezeichnung As TableCell = New TableCell
Dim tc_GueltigBis As TableCell = New TableCell
Dim tc_KartNr As TableCell = New TableCell
Dim tr_M As TableRow = New TableRow
tc_SDLNr.Text = SDLNr
tc_Bezeichnung.Text = Bezeichnung
tc_GueltigBis.Text = GueltigBis
tc_KartNr.Text = KartNr
tr_M.Cells.Add(tc_SDLNr)
tr_M.Cells.Add(tc_Bezeichnung)
tr_M.Cells.Add(tc_GueltigBis)
tr_M.Cells.Add(tc_KartNr)
Tbl.Rows.Add(tr_M)
End Sub
End Class