From 4dd530cfbc051c5d8640adf5bbcfaa44694ff74b Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 20 Sep 2021 16:25:51 +0200 Subject: [PATCH] Fehler bei Status Julius wurde ausgebessert. --- Customers/CustomsAviso.aspx | 41 +++++++------- Customers/CustomsAviso.aspx.vb | 95 ++++++++++++++++++++------------- css/Customers/CustomerAVISO.css | 10 ++-- status_Julius.aspx | 3 +- 4 files changed, 86 insertions(+), 63 deletions(-) diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index cb97f0d..e70374f 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -76,29 +76,28 @@
-
+
- Alle - Erfasst - Vorbereitet - Vorgeschrieben - Ankunft - Freigabe + Alle + Erfasst + Vorbereitet + Vorgeschrieben + Ankunft +
- Alle - Erfasst - Vorbereitet - Vorgeschrieben - Ankunft - Freigabe + Alle + Erfasst + Vorbereitet + Vorgeschrieben + Ankunft + Freigabe -
- +
@@ -178,9 +177,9 @@ placeholder="Einen Begriff eingeben oder den Anfang davon ...">-->
- + Index-Nr - LKW_Nr + LKW-Nr Status Auftragsdatum Absender @@ -231,18 +230,18 @@ $(document).ready(function () { $("#container2").hide(); $('#<%=RadioButtonList1.ClientID %> input[type="radio"]').change(function () { - if ($(this).val() == "Freigabe") { + if ($(this).val() == HTMLSpanElement.val() == "Freigabe") { $("#container2").show(); - } else if ($(this).val() == "Alle") { + } else if ($(this).val() == HTMLSpanElement.val() == "Alle") { $("#container2").show(); } else { $("#container2").hide(); } }); $('#<%=RadioButtonList2.ClientID %> input[type="radio"]').change(function () { - if ($(this).val() == "Freigabe") { + if ($(this).val() == HTMLSpanElement.val()=="Freigabe") { $("#container2").show(); - } else if ($(this).val() == "Alle") { + } else if ($(this).val == HTMLSpanElement.val() == "Alle") { $("#container2").show(); } else { $("#container2").hide(); diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index 3c5e270..b7d3abd 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -12,7 +12,7 @@ Partial Class Kundenbereich_Default Dim LKWNR As String = "" Dim KDNAFNR As String = "" Dim dt As DataTable - Dim Art As String = Nothing + Dim Art As String = "" Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms DataBind() @@ -22,9 +22,11 @@ Partial Class Kundenbereich_Default If (Page.IsPostBack And normaltable.EnableViewState = False) Then Dim erster = New Date(Now().Year, Now().Month, 1) Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString + pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString ' MsgBox(ersterdat) datevon = ersterdat datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString + pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString Else datevon = Nothing datebis = Nothing @@ -40,19 +42,18 @@ Partial Class Kundenbereich_Default End Sub 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 Dim schwarz As Drawing.Color = Drawing.Color.Black Dim darkgrau As Drawing.Color = Drawing.Color.DarkGray Dim darkblue = Drawing.Color.FromArgb(4, 51, 129) - tr.BackColor = blau + tr.BackColor = white If t1.Text = "" Then - t1.BackColor = blau + t1.BackColor = white t1.ForeColor = schwarz Else - t1.BackColor = blau + t1.BackColor = white t1.ForeColor = schwarz End If If t2.Text = "Erfasst" Then @@ -71,7 +72,7 @@ Partial Class Kundenbereich_Default t2.BackColor = Drawing.Color.Purple t2.ForeColor = white ElseIf t2.Text = "Freigabe" Then - t2.BackColor = Drawing.Color.DarkOliveGreen + t2.BackColor = Drawing.Color.Green t2.ForeColor = white ElseIf t2.Text = "Undefiniert" Then t2.BackColor = Drawing.Color.DarkGray @@ -81,45 +82,45 @@ Partial Class Kundenbereich_Default t2.ForeColor = white End If If t3.Text = "" Then - t3.BackColor = blau + t3.BackColor = white t3.ForeColor = schwarz Else - t3.BackColor = blau + t3.BackColor = white t3.ForeColor = schwarz End If If t4.Text = "" Then - t4.BackColor = blau + t4.BackColor = white t4.ForeColor = schwarz Else - t4.BackColor = blau + t4.BackColor = white t4.ForeColor = schwarz End If If t5.Text = "" Then - t5.BackColor = blau + t5.BackColor = white t5.ForeColor = schwarz Else - t5.BackColor = blau + t5.BackColor = white t5.ForeColor = schwarz End If If t6.Text = "" Then - t6.BackColor = blau + t6.BackColor = white t6.ForeColor = schwarz Else - t6.BackColor = blau + t6.BackColor = white t6.ForeColor = schwarz End If If t7.Text = "" Then - t7.BackColor = blau + t7.BackColor = white t7.ForeColor = schwarz Else - t7.BackColor = blau + t7.BackColor = white t7.ForeColor = schwarz End If If t8.Text = "" Then - t8.BackColor = blau + t8.BackColor = white t8.ForeColor = schwarz Else - t8.BackColor = blau + t8.BackColor = white t8.ForeColor = schwarz End If th1.Font.Bold = True @@ -181,27 +182,49 @@ Partial Class Kundenbereich_Default End If If rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True Then - Try - datevon = Date.Parse(pickdate1.Text) - datebis = Date.Parse(pickdate2.Text) - Catch ex As Exception - MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) - End Try + pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled + pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled 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 + If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then + Dim erster = New Date(Now().Year, Now().Month, 1) + Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString + ' MsgBox(ersterdat) + datevon = ersterdat + pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString + datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString + pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString + Else + Try + datevon = Date.Parse(pickdate1.Text) + datebis = Date.Parse(pickdate2.Text) + Catch ex As Exception + MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) + End Try + End If + ElseIf rbt_Erf.Selected = True Or rbt_Erf_M.Selected = True Then 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 - 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(Art, Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) - + pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled + pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled + If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then + Dim erster = New Date(Now().Year, Now().Month, 1) + Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString + pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString + ' MsgBox(ersterdat) + datevon = ersterdat + datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString + pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString + Else + Try + datevon = Date.Parse(pickdate1.Text) + MsgBox(pickdate1.Text) + datebis = Date.Parse(pickdate2.Text) + MsgBox(pickdate2.Text) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) + Catch ex As Exception + MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) + End Try + End If ElseIf rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True Then 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 diff --git a/css/Customers/CustomerAVISO.css b/css/Customers/CustomerAVISO.css index 35a5d5f..45a3311 100644 --- a/css/Customers/CustomerAVISO.css +++ b/css/Customers/CustomerAVISO.css @@ -114,6 +114,10 @@ hr{ #rbt_Erf{ font-size:18px; } +.tbl_style { + background-color: #043381; + color: #fff; +} @media (max-width: 558.98px) { h1 { color: #043381; @@ -175,8 +179,7 @@ hr{ margin-left: /*14px*/ 3.0837004405286343vw; max-width: /*390px;*/ 85.90308370044053vw; overflow-x: auto; - } - + } } @media (min-width: 558.98px) { #txt_Absender { @@ -193,6 +196,5 @@ hr{ } #normaltable { width: 100%; - } - + } } diff --git a/status_Julius.aspx b/status_Julius.aspx index 89c8860..fd16f0b 100644 --- a/status_Julius.aspx +++ b/status_Julius.aspx @@ -459,9 +459,8 @@ <% Else %> - style="color:#043381;" style="color:#043381;" + <% End If Dim VERMERKE = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND SendungID=" & s.tblSnd_SendungID & " /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO") If VERMERKE IsNot Nothing Then