From aae68b929c95cc2feab46c93ad6c17902f802d25 Mon Sep 17 00:00:00 2001 From: ja Date: Thu, 28 Oct 2021 14:46:18 +0200 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Customers/Invoices.aspx.vb | 173 +++++++++++++++++-------------------- 1 file changed, 78 insertions(+), 95 deletions(-) diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb index b2e7db7..731ad52 100644 --- a/Customers/Invoices.aspx.vb +++ b/Customers/Invoices.aspx.vb @@ -17,64 +17,19 @@ Partial Class Customers_Invoices DataBind() tbl_Header_row.TableSection = TableRowSection.TableHeader - If (Page.IsPostBack And normaltable.EnableViewState = False) Then - normaltable.EnableViewState = True - datevon = Date.Parse(pickdate1.Text) - datebis = Date.Parse(pickdate2.Text) - - If String.IsNullOrEmpty(txt_Absender.Text) Then - regexval_txt_Absender.Enabled = False - Else - regexval_txt_Absender.Enabled = True + If (Page.IsPostBack) Then + valreq_pickdate1.Validate() + valreq_pickdate2.Validate() + If valreq_pickdate1.IsValid And valreq_pickdate2.IsValid Then + valDateRange_1.Validate() + valDateRange_2.Validate() + If valDateRange_1.IsValid AndAlso valDateRange_2.IsValid Then + datevon = Date.Parse(pickdate1.Text) + datebis = Date.Parse(pickdate2.Text) + End If End If - If String.IsNullOrEmpty(txt_Empfaenger.Text) Then - regexval_txt_Empfaenger.Enabled = False Else - regexval_txt_Empfaenger.Enabled = True - End If - If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) Then - regexval_txt_KdNrAuftrag.Enabled = False - Else - regexval_txt_KdNrAuftrag.Enabled = True - End If - If String.IsNullOrEmpty(txt_LKWNr.Text) Then - regexval_txt_LKW.Enabled = False - Else - regexval_txt_LKW.Enabled = True - End If - If String.IsNullOrEmpty(txt_ReNr.Text) Then - regexval_txt_ReNr.Enabled = False - Else - regexval_txt_ReNr.Enabled = False - End If - 'Mobile - If String.IsNullOrEmpty(txt_Absender_M.Text) Then - regexval_txt_Absender_M.Enabled = False - Else - regexval_txt_Absender_M.Enabled = True - End If - If String.IsNullOrEmpty(txt_Empfaenger_M.Text) Then - regexval_txt_Empfaenger_M.Enabled = False - Else - regexval_txt_Empfaenger_M.Enabled = True - End If - If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) Then - regexval_txt_KdNrAuftrag_M.Enabled = False - Else - regexval_txt_KdNrAuftrag_M.Enabled = True - End If - If String.IsNullOrEmpty(txt_LKWNr_M.Text) Then - regexval_txt_LKW_M.Enabled = False - Else - regexval_txt_LKW_M.Enabled = True - End If - If String.IsNullOrEmpty(txt_ReNr_M.Text) Then - regexval_txt_ReNr_M.Enabled = False - Else - regexval_txt_ReNr_M.Enabled = True - End If - Else - normaltable.EnableViewState = True + normaltable.EnableViewState = True lbl_von.Visible = True lbl_bis.Visible = True valDateRange_1.Enabled = True @@ -88,7 +43,6 @@ Partial Class Customers_Invoices pickdate2.Text = Now().ToShortDateString() pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString End If - 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) @@ -182,42 +136,20 @@ Partial Class Customers_Invoices Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs) - If String.IsNullOrEmpty(txt_Absender.Text) = False Then - txt_Absender.Text = String.Empty - End If - If String.IsNullOrEmpty(txt_Absender_M.Text) = False Then - txt_Absender_M.Text = String.Empty - End If - If String.IsNullOrEmpty(txt_Empfaenger.Text) = False Then - txt_Empfaenger.Text = String.Empty - End If - If String.IsNullOrEmpty(txt_Empfaenger_M.Text) = False Then - txt_Empfaenger_M.Text = String.Empty - End If - If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = False Then - txt_KdNrAuftrag.Text = String.Empty - End If - If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = False Then - txt_KdNrAuftrag_M.Text = String.Empty - End If - If String.IsNullOrEmpty(txt_LKWNr.Text) = False Then - txt_LKWNr.Text = String.Empty - End If - If String.IsNullOrEmpty(txt_LKWNr_M.Text) = False Then - txt_LKWNr_M.Text = String.Empty - End If - If String.IsNullOrEmpty(txt_ReNr.Text) = False Then - txt_ReNr.Text = String.Empty - End If - If String.IsNullOrEmpty(txt_ReNr_M.Text) = False Then - txt_ReNr_M.Text = String.Empty - End If - If String.IsNullOrEmpty(pickdate1.Text) = False Then - pickdate1.Text = String.Empty - End If - If String.IsNullOrEmpty(pickdate2.Text) = False Then - pickdate2.Text = String.Empty - End If + + txt_Absender.Text = String.Empty + txt_Absender_M.Text = String.Empty + txt_Empfaenger.Text = String.Empty + txt_Empfaenger_M.Text = String.Empty + txt_KdNrAuftrag.Text = String.Empty + txt_KdNrAuftrag_M.Text = String.Empty + txt_LKWNr.Text = String.Empty + txt_LKWNr_M.Text = String.Empty + txt_ReNr.Text = String.Empty + txt_ReNr_M.Text = String.Empty + pickdate1.Text = String.Empty + pickdate2.Text = String.Empty + dt = Nothing Kdnrtext = "" Absender = "" @@ -282,7 +214,57 @@ Partial Class Customers_Invoices Protected Sub btn_Rechnungen_Click(sender As Object, e As EventArgs) dt = Nothing - + If String.IsNullOrEmpty(txt_Absender.Text) Then + regexval_txt_Absender.Enabled = False + Else + regexval_txt_Absender.Enabled = True + End If + If String.IsNullOrEmpty(txt_Empfaenger.Text) Then + regexval_txt_Empfaenger.Enabled = False + Else + regexval_txt_Empfaenger.Enabled = True + End If + If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) Then + regexval_txt_KdNrAuftrag.Enabled = False + Else + regexval_txt_KdNrAuftrag.Enabled = True + End If + If String.IsNullOrEmpty(txt_LKWNr.Text) Then + regexval_txt_LKW.Enabled = False + Else + regexval_txt_LKW.Enabled = True + End If + If String.IsNullOrEmpty(txt_ReNr.Text) Then + regexval_txt_ReNr.Enabled = False + Else + regexval_txt_ReNr.Enabled = False + End If + 'Mobile + If String.IsNullOrEmpty(txt_Absender_M.Text) Then + regexval_txt_Absender_M.Enabled = False + Else + regexval_txt_Absender_M.Enabled = True + End If + If String.IsNullOrEmpty(txt_Empfaenger_M.Text) Then + regexval_txt_Empfaenger_M.Enabled = False + Else + regexval_txt_Empfaenger_M.Enabled = True + End If + If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) Then + regexval_txt_KdNrAuftrag_M.Enabled = False + Else + regexval_txt_KdNrAuftrag_M.Enabled = True + End If + If String.IsNullOrEmpty(txt_LKWNr_M.Text) Then + regexval_txt_LKW_M.Enabled = False + Else + regexval_txt_LKW_M.Enabled = True + End If + If String.IsNullOrEmpty(txt_ReNr_M.Text) Then + regexval_txt_ReNr_M.Enabled = False + Else + regexval_txt_ReNr_M.Enabled = True + End If valreq_pickdate1.Validate() valreq_pickdate2.Validate() If valreq_pickdate1.IsValid AndAlso valreq_pickdate2.IsValid Then @@ -448,13 +430,14 @@ Partial Class Customers_Invoices tbl_CellIndex.ValidateRequestMode = UI.ValidateRequestMode.Enabled tbl_CellIndex.Text = zahl tr.Cells.Add(tbl_CellIndex) + initcells(tr, tbl_CellIndex, tbl_CellRENr, tbl_CellLKWs, tbl_Cell_Auftragsdatum, tbl_CellKundAuftNr, tbl_CellAbsender, tbl_CellEmpfaenger, tbl_CellInfo, tbl_HeaderCellIndexNr, tbl_HeaderCell_ReNr, tbl_HeaderCell_LKWNr, tbl_HeaderCell_Auftragsdatum, tbl_HeaderCell_KundAuftrNr, tbl_HeaderCell_Absender, tbl_HeaderCell_Empfaenger, tbl_HeaderCell_Info) tbl_CellLKWs.ValidateRequestMode = UI.ValidateRequestMode.Enabled tbl_CellLKWs.Text = d.LKW_Kennzeichen.ToString tr.Cells.Add(tbl_CellLKWs) tbl_CellRENr.ValidateRequestMode = UI.ValidateRequestMode.Enabled tbl_CellRENr.Text = d.RechnungsNr.ToString tr.Cells.Add(tbl_CellRENr) - initcells(tr, tbl_CellIndex, tbl_CellRENr, tbl_CellLKWs, tbl_Cell_Auftragsdatum, tbl_CellKundAuftNr, tbl_CellAbsender, tbl_CellEmpfaenger, tbl_CellInfo, tbl_HeaderCellIndexNr, tbl_HeaderCell_ReNr, tbl_HeaderCell_LKWNr, tbl_HeaderCell_Auftragsdatum, tbl_HeaderCell_KundAuftrNr, tbl_HeaderCell_Absender, tbl_HeaderCell_Empfaenger, tbl_HeaderCell_Info) + tbl_Cell_Auftragsdatum.ValidateRequestMode = UI.ValidateRequestMode.Enabled tbl_Cell_Auftragsdatum.Text = d.RechnungsDatum.ToString tr.Cells.Add(tbl_Cell_Auftragsdatum)