diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx index f0a2e09..3fd5b23 100644 --- a/Customers/Invoices.aspx +++ b/Customers/Invoices.aspx @@ -184,7 +184,8 @@
- + +
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb index a6d6f84..99642f0 100644 --- a/Customers/Invoices.aspx.vb +++ b/Customers/Invoices.aspx.vb @@ -164,6 +164,7 @@ Partial Class Customers_Invoices Protected Sub btn_Send_Data_Click(sender As Object, e As EventArgs) dt = Nothing + valreq_pickdate1.Validate() valreq_pickdate2.Validate() If valreq_pickdate1.IsValid And valreq_pickdate2.IsValid And Kdnrtext = Not "" Then @@ -231,78 +232,76 @@ Partial Class Customers_Invoices regexval_txt_ReNr.Enabled = True regexval_txt_ReNr.Validate() Try - If regexval_txt_ReNr.IsValid = True Then - reNr = txt_ReNr.Text - Else - reNr = String.Empty - End If - Catch ex As FormatException - lbl_status.Text = ex.Message - End Try - End If + If regexval_txt_ReNr.IsValid = True Then + reNr = txt_ReNr.Text + Else + reNr = String.Empty + End If + Catch ex As FormatException + lbl_status.Text = ex.Message + End Try + End If + If Not String.IsNullOrEmpty(txt_Absender_M.Text) Then + txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled + Try + Absender = txt_Absender_M.Text + Catch ex As FormatException + lbl_status.Text = ex.Message + End Try + End If + If Not String.IsNullOrEmpty(txt_Empfaenger_M.Text) Then + txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled + Try + Empfaenger = txt_Empfaenger_M.Text + Catch ex As FormatException + lbl_status.Text = ex.Message + End Try + End If + If Not String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) Then + txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled + Try + KDNAFNR = txt_KdNrAuftrag_M.Text + Catch ex As FormatException + lbl_status.Text = ex.Message + End Try + End If + If Not String.IsNullOrEmpty(txt_LKWNr_M.Text) Then + txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled + Try + LKWNR = txt_LKWNr_M.Text + Catch ex As FormatException + lbl_status.Text = ex.Message + End Try + End If + If Not String.IsNullOrEmpty(txt_ReNr_M.Text) Then + txt_ReNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled + Try + reNr = txt_ReNr_M.Text + Catch ex As FormatException + lbl_status.Text = ex.Message + End Try + End If - If Not String.IsNullOrEmpty(txt_Absender_M.Text) Then - txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled - Try - Absender = txt_Absender_M.Text - Catch ex As FormatException - lbl_status.Text = ex.Message - End Try - End If - If Not String.IsNullOrEmpty(txt_Empfaenger_M.Text) Then - txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled - Try - Empfaenger = txt_Empfaenger_M.Text - Catch ex As FormatException - lbl_status.Text = ex.Message - End Try - End If - If Not String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) Then - txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled - Try - KDNAFNR = txt_KdNrAuftrag_M.Text - Catch ex As FormatException - lbl_status.Text = ex.Message - End Try - End If - If Not String.IsNullOrEmpty(txt_LKWNr_M.Text) Then - txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled - Try - LKWNR = txt_LKWNr_M.Text - Catch ex As FormatException - lbl_status.Text = ex.Message - End Try - End If - - If Not String.IsNullOrEmpty(txt_ReNr_M.Text) Then - txt_ReNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled - Try - reNr = txt_ReNr_M.Text - Catch ex As FormatException - lbl_status.Text = ex.Message - End Try - End If - - If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then - Try - Dim erster = New Date(Now().Year, Now().Month, 1) - Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString - ' lbl_status.Text=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 - Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year + If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then + Try + Dim erster = New Date(Now().Year, Now().Month, 1) + Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString + ' lbl_status.Text=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 + Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year lbl_status.Text = "Der gewählte Von-Zeitpunkt ist nicht gültig!" End Try - Else - Try - datevon = Date.Parse(pickdate1.Text) - datebis = Date.Parse(pickdate2.Text) - Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year + Else + Try + datevon = Date.Parse(pickdate1.Text) + datebis = Date.Parse(pickdate2.Text) + Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year lbl_status.Text = "Der gewählte Bis-Zeitpunkt ist nicht gültig!" End Try - End If + End If 'lbl_status.Text = Kdnrtext If String.IsNullOrEmpty(Kdnrtext) = False And String.IsNullOrEmpty(datevon.ToString) = False And String.IsNullOrEmpty(datebis.ToString) = False Then @@ -311,75 +310,76 @@ Partial Class Customers_Invoices lbl_status.Text = "Bitte alle fehlenden Felder ausfüllen!" valreq_pickdate1.Validate() valreq_pickdate2.Validate() - End If - - If dt IsNot Nothing AndAlso Not dt.Count = 0 Then - Dim i As Integer = 0 - For Each d In dt - Dim tr = New TableRow - Dim Cell = New TableCell - Dim tbl_CellIndex = New TableCell - Dim tbl_CellRENr = 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_CellRENr.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellRENr.Text = d.RechnungsNr.ToString - tr.Cells.Add(tbl_CellRENr) - tbl_CellLKWs.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellLKWs.Text = d.LKW_Kennzeichen.ToString - tr.Cells.Add(tbl_CellLKWs) - tbl_Cell_Auftragsdatum.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_Cell_Auftragsdatum.Text = d.RechnungsDatum.ToString - tr.Cells.Add(tbl_Cell_Auftragsdatum) - tbl_CellKundAuftNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellKundAuftNr.Text = d.KdAuftragsNr.ToString - tr.Cells.Add(tbl_CellKundAuftNr) - tbl_CellAbsender.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellAbsender.Text = d.AbsenderName_1.ToString + Space(1) + d.AbsenderName_2.ToString - tr.Cells.Add(tbl_CellAbsender) - tbl_CellEmpfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellEmpfaenger.Text = d.EmpfängerName_1.ToString + Space(1) + d.EmpfängerName_2.ToString - tr.Cells.Add(tbl_CellEmpfaenger) - - Dim btn As New ImageButton - btn.ViewStateMode = ViewStateMode.Enabled - 'btn.Text = "Text" - btn.CssClass = "btn btn-primary" - btn.ImageUrl = "../images/Icons/service/pdficon.gif" - 'btn.Attributes.Add("Text", ) - btn.Attributes.Add("href", "pdfviewer.aspx?P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.FilialenNr).ToString() + "&P2=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.AbfertigungsNr).ToString + "&P3=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.RK_ID).ToString) - btn.Attributes.Add("target", "_blank") - btn.PostBackUrl = "pdfviewer.aspx?P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.FilialenNr).ToString + "&P2=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.AbfertigungsNr).ToString + "&P3=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.RK_ID).ToString - tbl_CellInfo.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_CellInfo.Controls.Add(btn) - tr.Cells.Add(tbl_CellInfo) - 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) - normaltable.Rows.Add(tr) - - i += 1 - Next - Else - Dim tbl_cellNothing = New TableCell() - tbl_cellNothing.ColumnSpan = tbl_Header_row.Cells.Count - tbl_cellNothing.Style.Add("text-align", "center") - Dim tr = New TableRow() - tr.Style.Add("text-align", "center") - tbl_cellNothing.Text = Server.HtmlEncode("Keine Daten gefunden.") - tr.Cells.Add(tbl_cellNothing) - normaltable.Rows.Add(tr) - End If - Else - lbl_status.Text = "Error in valid date room" End If + + If dt IsNot Nothing AndAlso Not dt.Count = 0 Then + Dim i As Integer = 0 + For Each d In dt + Dim tr = New TableRow + Dim Cell = New TableCell + Dim tbl_CellIndex = New TableCell + Dim tbl_CellRENr = 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_CellRENr.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellRENr.Text = d.RechnungsNr.ToString + tr.Cells.Add(tbl_CellRENr) + tbl_CellLKWs.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellLKWs.Text = d.LKW_Kennzeichen.ToString + tr.Cells.Add(tbl_CellLKWs) + tbl_Cell_Auftragsdatum.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_Cell_Auftragsdatum.Text = d.RechnungsDatum.ToString + tr.Cells.Add(tbl_Cell_Auftragsdatum) + tbl_CellKundAuftNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellKundAuftNr.Text = d.KdAuftragsNr.ToString + tr.Cells.Add(tbl_CellKundAuftNr) + tbl_CellAbsender.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellAbsender.Text = d.AbsenderName_1.ToString + Space(1) + d.AbsenderName_2.ToString + tr.Cells.Add(tbl_CellAbsender) + tbl_CellEmpfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellEmpfaenger.Text = d.EmpfängerName_1.ToString + Space(1) + d.EmpfängerName_2.ToString + tr.Cells.Add(tbl_CellEmpfaenger) + + Dim btn As New ImageButton + btn.ViewStateMode = ViewStateMode.Enabled + 'btn.Text = "Text" + btn.CssClass = "btn btn-primary" + btn.ImageUrl = "../images/Icons/service/pdficon.gif" + 'btn.Attributes.Add("Text", ) + btn.Attributes.Add("href", "pdfviewer.aspx?P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.FilialenNr).ToString() + "&P2=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.AbfertigungsNr).ToString + "&P3=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.RK_ID).ToString) + btn.Attributes.Add("target", "_blank") + btn.PostBackUrl = "pdfviewer.aspx?P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.FilialenNr).ToString + "&P2=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.AbfertigungsNr).ToString + "&P3=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.RK_ID).ToString + tbl_CellInfo.ValidateRequestMode = UI.ValidateRequestMode.Enabled + tbl_CellInfo.Controls.Add(btn) + tr.Cells.Add(tbl_CellInfo) + 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) + normaltable.Rows.Add(tr) + + i += 1 + Next + Else + Dim tbl_cellNothing = New TableCell() + tbl_cellNothing.ColumnSpan = tbl_Header_row.Cells.Count + tbl_cellNothing.Style.Add("text-align", "center") + Dim tr = New TableRow() + tr.Style.Add("text-align", "center") + tbl_cellNothing.Text = Server.HtmlEncode("Keine Daten gefunden.") + tr.Cells.Add(tbl_cellNothing) + normaltable.Rows.Add(tr) + End If + Else + lbl_status.Text = "Error in valid date room" + End If 'End If End Sub + End Class diff --git a/Web.config b/Web.config index c5e1547..57936f6 100644 --- a/Web.config +++ b/Web.config @@ -1,4 +1,4 @@ - +