Ändernungen Code

Customers/Invoices.aspx

@@ -183,7 +183,7 @@
                                     <asp:HiddenField ID="hfAccordionIndex" runat="server" />
                                     <div id="collapseOne" class="accordion-collapse collapse hide" aria-lablledby="headingOne" data-bs-parent="#accordionExample">
                                         <div class="card card-body">
-                                            
+                                            <!--optionale paramter könnten hier kommen-->
                                         </div>
                                     </div>
                                 </div>

Customers/Invoices.aspx.vb

@@ -21,21 +21,7 @@ Partial Class Customers_Invoices
             normaltable.EnableViewState = True
             datevon = Date.Parse(pickdate1.Text)
             datebis = Date.Parse(pickdate2.Text)
-        Else
 
-            normaltable.EnableViewState = True
-            lbl_von.Visible = True
-            lbl_bis.Visible = True
-            valDateRange_1.Enabled = True
-            valDateRange_2.Enabled = True
-            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 = Now().ToShortDateString()
-            pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
             If String.IsNullOrEmpty(txt_Absender.Text) Then
                 regexval_txt_Absender.Enabled = False
             Else
@@ -87,7 +73,22 @@ Partial Class Customers_Invoices
             Else
                 regexval_txt_ReNr_M.Enabled = True
             End If
+        Else
+            normaltable.EnableViewState = True
+            lbl_von.Visible = True
+            lbl_bis.Visible = True
+            valDateRange_1.Enabled = True
+            valDateRange_2.Enabled = True
+            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 = 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)
@@ -181,7 +182,49 @@ 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
+        dt = Nothing
+        Kdnrtext = ""
+        Absender = ""
+        Empfaenger = ""
+        LKWNR = ""
+        KDNAFNR = ""
+        reNr = ""
     End Sub
 
     Protected Sub pickdate1_TextChanged(sender As Object, e As EventArgs)
@@ -232,8 +275,12 @@ Partial Class Customers_Invoices
 
     End Sub
 
-    Protected Sub btn_Rechnungen_Click(sender As Object, e As EventArgs)
 
+    Protected Sub txt_KundenNr_TextChanged(sender As Object, e As EventArgs)
+
+    End Sub
+
+    Protected Sub btn_Rechnungen_Click(sender As Object, e As EventArgs)
         dt = Nothing
 
         valreq_pickdate1.Validate()
@@ -378,7 +425,7 @@ Partial Class Customers_Invoices
             If String.IsNullOrEmpty(Kdnrtext) = False And String.IsNullOrEmpty(datevon.ToString) = False And String.IsNullOrEmpty(datebis.ToString) = False Then
                 dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR)
             ElseIf String.IsNullOrEmpty(Kdnrtext) = True Or String.IsNullOrEmpty(datevon.ToString) = True And String.IsNullOrEmpty(datebis.ToString) = True And String.IsNullOrEmpty(reNr) = True And String.IsNullOrEmpty(Absender) = False And String.IsNullOrEmpty(LKWNR) = False And String.IsNullOrEmpty(Empfaenger) = False And String.IsNullOrEmpty(KDNAFNR) = False Then
-
+                dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR)
                 valreq_pickdate1.Validate()
                 valreq_pickdate2.Validate()
             End If
@@ -451,7 +498,4 @@ Partial Class Customers_Invoices
         End If
     End Sub
 
-    Protected Sub txt_KundenNr_TextChanged(sender As Object, e As EventArgs)
-
-    End Sub
 End Class