From 08aa7a8bb4c00470366487c7e46dccfe934c8b54 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Thu, 16 Sep 2021 10:34:42 +0200
Subject: [PATCH] =?UTF-8?q?Ein=20Alle-Radio-Button=20wurde=20eingf=C3=BCgt?=
 =?UTF-8?q?=20und=20mit=20Funktion=20versehen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/CustomsAviso.aspx    | 30 +++++--------
 Customers/CustomsAviso.aspx.vb | 77 ++++++++++++++++------------------
 2 files changed, 46 insertions(+), 61 deletions(-)

diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 7fd08b4..2525c32 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -77,6 +77,7 @@
                                 </div>                            
                                 <div class="col-8" style="margin-left:8px" >
                                     <asp:RadioButtonList id="RadioButtonList1" runat="server" RepeatDirection="Horizontal" style="border-color:#fff">
+                                           <asp:ListItem ID="rbt_Alle" GroupName="radios" style="font-size:/*17px*/1.063em">Alle</asp:ListItem>
                                            <asp:ListItem ID="rbt_Erf" GroupName="radios" style="font-size:/*17px*/1.063em"> Erfasst</asp:ListItem>
                                            <asp:ListItem ID="rbt_Vorb"  GroupName="radios" style="font-size:/*17px*/1.063em">Vorbereitet</asp:ListItem>
                                            <asp:ListItem ID="rbt_Vorg"  GroupName="radios" style="font-size:/*17px*/1.063em"> Vorgeschrieben</asp:ListItem>
@@ -185,7 +186,8 @@
                                                                                      </div>
                                                                                 </div>--%>
 
-     
+     <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
+    
     <script>
         $('#accordion').on('shown.bs.collapse', function (e) {
             $(e.target).data('bs.collapse').$trigger.attr('src', 'https://s22.postimg.org/hkrauaofx/Mathematic_Minus2.png');
@@ -195,29 +197,19 @@
             $(e.target).data('bs.collapse').$trigger.attr('src', 'https://s22.postimg.org/9takvqkal/Mathematic_Plus2.png');
         });
     </script>
-    <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-    <script type='text/javascript'>
+   <script type='text/javascript'>
         $(document).ready(function () {
-            $("#container2").hide();
-
-            let htmlNodes = document.getElementsByName('status');
-            let radioButtonsArray = Array.from(htmlNodes);
-            let isAnyRadioButtonChecked = radioButtonsArray.some(element => element.checked);
-            if (isAnyRadioButtonChecked == false){
-                $("#container2").show();
-            } else {
-                $("#container2").hide();
-            }
-
-       
-
+            $("#container2").hide();      
+        
         $('#<%=RadioButtonList1.ClientID %> input[type="radio"]').change(function () {
             if ($(this).val() == "Freigabe") {
-                $("#container2").show();           
+                $("#container2").show(); 
+            } else if ($(this).val() == "Alle") {  
+                    $("#container2").show(); 
             }      else {
                     $("#container2").hide();                   
-                }
+              }
             });
-        });
+    });
     </script>
 </asp:Content>
\ No newline at end of file
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 7dac6f6..48639be 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -59,60 +59,52 @@ Partial Class Kundenbereich_Default
         End If
 
         'Dim tr
-        If rbt_Erf.Selected = True Then
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0},,, Absender, Empfaenger, LKWNR, KDNAFNR)
-        ElseIf rbt_Freig.Selected = True Then
-            If pickdate1.Text = Not "TT.MM.JJJJ" And pickdate2.Text = Not "TT.MM.JJJJ" Then
-                If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
+        If rbt_Alle.Selected = True Then
+            If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
+                MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
+                pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
+                pickdate2.Text = Date.ParseExact(Date.Now.Day.ToString + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
+            End If
+
+
+            If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
                     Try
-                        pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                         datevon = Date.Parse(pickdate1.Text)
-                        pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                         datebis = Date.Parse(pickdate2.Text)
                     Catch ex As Exception
                         MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
                     End Try
                 End If
-                dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
+
+                dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
+
+        ElseIf rbt_Erf.Selected = True Then
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0},,, Absender, Empfaenger, LKWNR, KDNAFNR)
+        ElseIf rbt_Freig.Selected = True Then
+
+            If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
+                Try
+                    pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+                    datevon = Date.Parse(pickdate1.Text)
+                    pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+                    datebis = Date.Parse(pickdate2.Text)
+                Catch ex As Exception
+                    MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
+                End Try
             Else
                 dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.ParseExact("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now)
             End If
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
+        ElseIf pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
+            MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
+
+
         ElseIf rbt_Ankunft.Selected = True Then
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3},,, Absender, Empfaenger, LKWNR, KDNAFNR)
         ElseIf rbt_Vorb.Selected = True Then
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4},,, Absender, Empfaenger, LKWNR, KDNAFNR)
         ElseIf rbt_Vorg.Selected = True Then
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5},,, Absender, Empfaenger, LKWNR, KDNAFNR)
-        ElseIf rbt_Erf.Selected = False And rbt_Freig.Selected = False And rbt_Ankunft.Selected = False And rbt_Vorb.Selected = False And rbt_Vorg.Selected = False Then
-            If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
-                MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
-            ElseIf pickdate1.Text = Not "TT.MM.JJJJ" And pickdate2.Text = Not "TT.MM.JJJJ" Then
-                pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
-                pickdate2.Text = Date.ParseExact(Date.Now.Day.ToString + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
-                datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing)
-                datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing)
-
-                If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
-                    Try
-                        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, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
-                End If
-            Else
-                If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
-                    Try
-                        datevon = Date.Parse(pickdate1.Text)
-                        datebis = Date.Parse(pickdate2.Text)
-                    Catch ex As Exception
-                        MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
-                    End Try
-                Else
-                End If
-                dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
-            End If
         End If
 
         If dt IsNot Nothing Then
@@ -202,7 +194,9 @@ Partial Class Kundenbereich_Default
                 tbl_CellInfo.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 tr.Cells.Add(tbl_CellInfo)
 
-                If rbt_Ankunft.Selected = True AndAlso tbl_CellStatus.Text = "Ankunft" Then
+                If rbt_Alle.Selected = True Then
+                    normaltable.Rows.Add(tr)
+                ElseIf rbt_Ankunft.Selected = True AndAlso tbl_CellStatus.Text = "Ankunft" Then
                     normaltable.Rows.Add(tr)
                 ElseIf rbt_Erf.Selected = True AndAlso tbl_CellStatus.Text = "Erfasst" Then
                     normaltable.Rows.Add(tr)
@@ -212,8 +206,6 @@ Partial Class Kundenbereich_Default
                     normaltable.Rows.Add(tr)
                 ElseIf rbt_Vorg.Selected = True AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
                     normaltable.Rows.Add(tr)
-                ElseIf rbt_Erf.Selected = False And rbt_Ankunft.Selected = False And rbt_Vorg.Selected = False And rbt_Freig.Selected = False And rbt_Vorb.Selected = False Then
-                    normaltable.Rows.Add(tr)
                 End If
 
                 i += 1
@@ -224,7 +216,8 @@ Partial Class Kundenbereich_Default
 
     End Sub
     Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
-
+        rbt_Alle.Selected = False
+        rbt_Alle.Enabled = True
         rbt_Ankunft.Selected = False
         rbt_Ankunft.Enabled = True
         rbt_Erf.Selected = False