From f334d15e912ce7732ebf2cc6ea5077e5d8980ef1 Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 20 Sep 2021 13:50:13 +0200 Subject: [PATCH] Verbesserung --- Customers/CustomsAviso.aspx | 7 +- Customers/CustomsAviso.aspx.vb | 192 ++++++++++++++++---------------- Customers/LKWs.aspx | 46 +++----- css/Customers/CustomerAVISO.css | 3 +- 4 files changed, 116 insertions(+), 132 deletions(-) diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 1726e24..cb97f0d 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -30,7 +30,6 @@ - @@ -85,7 +84,7 @@ Vorgeschrieben Ankunft Freigabe - +
@@ -143,7 +142,7 @@ -
+
@@ -163,7 +162,7 @@
-
+
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index f1e8976..652a1dd 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -12,6 +12,7 @@ Partial Class Kundenbereich_Default Dim LKWNR As String = "" Dim KDNAFNR As String = "" Dim dt As DataTable + Dim Art As String = Nothing Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms DataBind() @@ -38,14 +39,6 @@ Partial Class Kundenbereich_Default Response.Redirect("../login/Logout.aspx", True) End Sub - Enum ART - Frächter - Kunde - AVISIERER - VERAG - ZOLL - End Enum - Protected Sub initcells(tr As TableRow, t1 As TableCell, t2 As TableCell, t3 As TableCell, t4 As TableCell, t5 As TableCell, t6 As TableCell, t7 As TableCell, t8 As TableCell, th1 As TableHeaderCell, th2 As TableHeaderCell, th3 As TableHeaderCell, th4 As TableHeaderCell, th5 As TableHeaderCell, th6 As TableHeaderCell, th7 As TableHeaderCell, th8 As TableHeaderCell) Dim blau As Drawing.Color = Drawing.Color.LightBlue Dim white As Drawing.Color = Drawing.Color.White @@ -190,118 +183,117 @@ Partial Class Kundenbereich_Default Catch ex As Exception MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) End Try - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) ElseIf rbt_Erf.Selected = True Or rbt_Erf_M.Selected Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) ElseIf rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True Then Try pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled - datevon = Date.Parse(pickdate1.Text) pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled + datevon = Date.Parse(pickdate1.Text) datebis = Date.Parse(pickdate2.Text) Catch ex As Exception MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) End Try - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) ElseIf rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {3}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) ElseIf rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = True Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {4}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) ElseIf rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {5}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) End If If dt IsNot Nothing Then Dim i As Integer = 0 - For Each d In dt.Rows - Dim tr = New TableRow - Dim Cell = New TableCell - Dim tbl_CellIndex = New TableCell - Dim tbl_CellStatus = New TableCell - Dim tbl_Cell_Auftragsdatum = New TableCell - Dim tbl_CellAbsender = New TableCell - Dim tbl_CellEmpfaenger = New TableCell - Dim tbl_CellLKWs = New TableCell - Dim tbl_CellKundAuftNr = New TableCell - Dim tbl_CellInfo = New TableCell + Dim tr = New TableRow + Dim Cell = New TableCell + Dim tbl_CellIndex = New TableCell + Dim tbl_CellStatus = New TableCell + Dim tbl_Cell_Auftragsdatum = New TableCell + Dim tbl_CellAbsender = New TableCell + Dim tbl_CellEmpfaenger = New TableCell + Dim tbl_CellLKWs = New TableCell + Dim tbl_CellKundAuftNr = New TableCell + Dim tbl_CellInfo = New TableCell - Dim zahl = i + 1 - tbl_CellIndex.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellIndex.Text = zahl - tr.Cells.Add(tbl_CellIndex) - tbl_CellLKWs.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellLKWs.Text = d("LKW_Nr").ToString - tr.Cells.Add(tbl_CellLKWs) - tbl_CellStatus.ValidateRequestMode = UI.ValidateRequestMode.Enabled - Select Case d("Status") - Case 0 - tbl_CellStatus.Text = "Erfasst" - tr.Cells.Add(tbl_CellStatus) - Case 1 - tbl_CellStatus.Text = "Freigabe" - tr.Cells.Add(tbl_CellStatus) - Case 2 - tbl_CellStatus.Text = "Nicht eingetroffen" - tr.Cells.Add(Cell) - Case 3 - tbl_CellStatus.Text = "Ankunft" - tr.Cells.Add(tbl_CellStatus) - Case 4 - tbl_CellStatus.Text = "Vorbereitet" - tr.Cells.Add(tbl_CellStatus) - Case 5 - tbl_CellStatus.Text = "Vorgeschrieben" - tr.Cells.Add(tbl_CellStatus) - Case Nothing - tbl_CellStatus.Text = "Undefiniert" - tr.Cells.Add(tbl_CellStatus) - End Select - initcells(tr, tbl_CellIndex, tbl_CellStatus, tbl_Cell_Auftragsdatum, tbl_CellAbsender, tbl_CellEmpfaenger, tbl_CellLKWs, tbl_CellKundAuftNr, tbl_CellInfo, tbl_HeaderCellIndexNr, tbl_HeaderCell_Status, tbl_HeaderCell_Auftragsdatum, tbl_HeaderCell_Absender, tbl_HeaderCell_Empfaenger, tbl_HeaderCell_LKWs, tbl_HeaderCell_KundAuftNr, tbl_HeaderCell_Info) - tbl_Cell_Auftragsdatum.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_Cell_Auftragsdatum.Text = d("AvisoEingang").ToString - tr.Cells.Add(tbl_Cell_Auftragsdatum) - tbl_CellAbsender.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellAbsender.Text = d("Auftraggeber").ToString - tr.Cells.Add(tbl_CellAbsender) - tbl_CellEmpfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellEmpfaenger.Text = d("Auftraggeber").ToString - tr.Cells.Add(tbl_CellEmpfaenger) - tbl_CellKundAuftNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString - tr.Cells.Add(tbl_CellKundAuftNr) + Dim zahl = i + 1 + tbl_CellIndex.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellIndex.Text = zahl + tr.Cells.Add(tbl_CellIndex) + tbl_CellLKWs.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellLKWs.Text = d("LKW_Nr").ToString + tr.Cells.Add(tbl_CellLKWs) + tbl_CellStatus.ValidateRequestMode = UI.ValidateRequestMode.Enabled + Select Case d("Status") + Case 0 + tbl_CellStatus.Text = "Erfasst" + tr.Cells.Add(tbl_CellStatus) + Case 1 + tbl_CellStatus.Text = "Freigabe" + tr.Cells.Add(tbl_CellStatus) + Case 2 + tbl_CellStatus.Text = "Nicht eingetroffen" + tr.Cells.Add(Cell) + Case 3 + tbl_CellStatus.Text = "Ankunft" + tr.Cells.Add(tbl_CellStatus) + Case 4 + tbl_CellStatus.Text = "Vorbereitet" + tr.Cells.Add(tbl_CellStatus) + Case 5 + tbl_CellStatus.Text = "Vorgeschrieben" + tr.Cells.Add(tbl_CellStatus) + Case Nothing + tbl_CellStatus.Text = "Undefiniert" + tr.Cells.Add(tbl_CellStatus) + End Select + initcells(tr, tbl_CellIndex, tbl_CellStatus, tbl_Cell_Auftragsdatum, tbl_CellAbsender, tbl_CellEmpfaenger, tbl_CellLKWs, tbl_CellKundAuftNr, tbl_CellInfo, tbl_HeaderCellIndexNr, tbl_HeaderCell_Status, tbl_HeaderCell_Auftragsdatum, tbl_HeaderCell_Absender, tbl_HeaderCell_Empfaenger, tbl_HeaderCell_LKWs, tbl_HeaderCell_KundAuftNr, tbl_HeaderCell_Info) + tbl_Cell_Auftragsdatum.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_Cell_Auftragsdatum.Text = d("AvisoEingang").ToString + tr.Cells.Add(tbl_Cell_Auftragsdatum) + tbl_CellAbsender.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellAbsender.Text = d("Auftraggeber").ToString + tr.Cells.Add(tbl_CellAbsender) + tbl_CellEmpfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellEmpfaenger.Text = d("Auftraggeber").ToString + tr.Cells.Add(tbl_CellEmpfaenger) + tbl_CellKundAuftNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString + tr.Cells.Add(tbl_CellKundAuftNr) - Dim btn As New ImageButton - btn.ViewStateMode = ViewStateMode.Enabled - 'btn.Text = "Text" - btn.CssClass = "btn btn-primary" - btn.ImageUrl = "../images/Icons/service/hilfe_small.png" - 'btn.Attributes.Add("Text", ) - btn.Attributes.Add("href", "../status_Julius.aspx?AvisoId=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d("AvisoID")).ToString) - btn.Attributes.Add("target", "_blank") - btn.PostBackUrl = "../status_Julius.aspx?AvisoId=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d("AvisoID")).ToString - tbl_CellInfo.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellInfo.Controls.Add(btn) - tr.Cells.Add(tbl_CellInfo) + Dim btn As New ImageButton + btn.ViewStateMode = ViewStateMode.Enabled + 'btn.Text = "Text" + btn.CssClass = "btn btn-primary" + btn.ImageUrl = "../images/Icons/service/hilfe_small.png" + 'btn.Attributes.Add("Text", ) + btn.Attributes.Add("href", "../status_Julius.aspx?AvisoId=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d("AvisoID")).ToString) + btn.Attributes.Add("target", "_blank") + btn.PostBackUrl = "../status_Julius.aspx?AvisoId=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d("AvisoID")).ToString + tbl_CellInfo.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellInfo.Controls.Add(btn) + tr.Cells.Add(tbl_CellInfo) - If (rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True) Then - normaltable.Rows.Add(tr) - ElseIf (rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True) AndAlso tbl_CellStatus.Text = "Ankunft" Then - normaltable.Rows.Add(tr) - ElseIf (rbt_Erf.Selected = True Or rbt_Erf_M.Selected = True) AndAlso tbl_CellStatus.Text = "Erfasst" Then - normaltable.Rows.Add(tr) - ElseIf (rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True) AndAlso tbl_CellStatus.Text = "Freigegeben" Then - normaltable.Rows.Add(tr) - ElseIf (rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = True) AndAlso tbl_CellStatus.Text = "Vorbereitet" Then - normaltable.Rows.Add(tr) - ElseIf (rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True) AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then - normaltable.Rows.Add(tr) - End If - i += 1 - Next - End If + If (rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True) Then + normaltable.Rows.Add(tr) + ElseIf (rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True) AndAlso tbl_CellStatus.Text = "Ankunft" Then + normaltable.Rows.Add(tr) + ElseIf (rbt_Erf.Selected = True Or rbt_Erf_M.Selected = True) AndAlso tbl_CellStatus.Text = "Erfasst" Then + normaltable.Rows.Add(tr) + ElseIf (rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True) AndAlso tbl_CellStatus.Text = "Freigegeben" Then + normaltable.Rows.Add(tr) + ElseIf (rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = True) AndAlso tbl_CellStatus.Text = "Vorbereitet" Then + normaltable.Rows.Add(tr) + ElseIf (rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True) AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then + normaltable.Rows.Add(tr) + End If + i += 1 + Next + End If End Sub Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs) @@ -348,4 +340,8 @@ Partial Class Kundenbereich_Default dt = Nothing 'txt_KdNr.Focus() End Sub + + Protected Sub Dropdownlst_Selection_Change(sender As Object, e As EventArgs) + + End Sub End Class \ No newline at end of file diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx index 3b40978..ee76363 100644 --- a/Customers/LKWs.aspx +++ b/Customers/LKWs.aspx @@ -15,27 +15,21 @@ - - - + - - - +
-
- - +
Hier befindet sich eine Übersicht über alle LKWS
@@ -54,25 +48,21 @@
-
- -
- -
- - - - - - - - - - -
RechnungsnrRechnungsdatumLKWGrenzsztelleRechnungsbetragAbfertigungsdatumFilialeAbfertigungsnr.
04510011018.08.202114334234SUBEN509,21€18.08.2021SUBEN512
048711017.05.202114334234NEUHAUS A INN509,21€17.05.2021NICKELSDORF512
8880011019.10.201714334234SUBEN509,21€19.10.2017WAIDHAUS512
2510011029.02.202114334234SUBEN509,21€18.08.2021SUBEN512
54211029.02.202114334234SUBEN509,21€18.08.2021SUBEN512
- - - + +
+
+ + + + + + + + + +
RechnungsnrRechnungsdatumLKWGrenzsztelleRechnungsbetragAbfertigungsdatumFilialeAbfertigungsnr.
04510011018.08.202114334234SUBEN509,21€18.08.2021SUBEN512
048711017.05.202114334234NEUHAUS A INN509,21€17.05.2021NICKELSDORF512
8880011019.10.201714334234SUBEN509,21€19.10.2017WAIDHAUS512
2510011029.02.202114334234SUBEN509,21€18.08.2021SUBEN512
54211029.02.202114334234SUBEN509,21€18.08.2021SUBEN512
+
+ diff --git a/css/Customers/CustomerAVISO.css b/css/Customers/CustomerAVISO.css index e42d3fa..35a5d5f 100644 --- a/css/Customers/CustomerAVISO.css +++ b/css/Customers/CustomerAVISO.css @@ -42,7 +42,7 @@ hr{ border: none; border-radius: 0; transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,border-radius .15s ease; - height:7px; + height:6px; } #RadioButtonList1 { @@ -72,7 +72,6 @@ hr{ transition: none } } - .accordion-button:not(.collapsed) { color: #043381; background-color: #fff;