From 7712435b9a2b64a46fb79b015c7860678b3441f0 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Fri, 17 Sep 2021 11:23:45 +0200
Subject: [PATCH] Mobilvariante der Button-List wurde implementiert.

---
 Customers/CustomsAviso.aspx     | 56 +++++++++++++++++++++++----------
 Customers/CustomsAviso.aspx.vb  | 42 ++++++++++++++++---------
 css/Customers/CustomerAVISO.css | 18 +++++++++++
 3 files changed, 86 insertions(+), 30 deletions(-)

diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index f075904..aabf73e 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -13,7 +13,9 @@
     font-size: 0;
     visibility: hidden;
     color: #043381;
-    }        
+    }       
+        }
+
     </style>    
      <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
@@ -25,10 +27,9 @@
     <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
     <link rel="stylesheet" type="text/css" href="../css/Dropdown.css"/>
       <!--   <link rel="stylesheet" type="text/css" href="../css/style.css"/>-->
-    <link rel="stylesheet" type="text/css" href="../css/Customers/MasterpageCustomers.css"/> 
-    <link rel="stylesheet" type="text/css" href="../css/Customers/CustomsAVISO.css"/>    
+    <link rel="stylesheet" type="text/css" href="../css/Customers/MasterpageCustomers.css"/>       
     <link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/>      
-       
+    <link rel="stylesheet" type="text/css" href="../css/Customers/CustomsAVISO.css"/>     
 </asp:Content> 
 
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
@@ -79,7 +80,8 @@
                              <div style="height:0.936768149882904vh"></div>                            
                                 <div class="col-12" style="margin-left:8px" >
                                             <asp:Label ID="lbl_ArtderAuftraege" runat="server" Text="Auftrags-Status:" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn nichts angewählt ist, bitte das Datum eingrenzen."></asp:Label> 
-                                </div>                            
+                                </div>                  
+                               <div class="d-none d-md-block">
                                 <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>
@@ -88,8 +90,21 @@
                                            <asp:ListItem ID="rbt_Vorg"  GroupName="radios" style="font-size:/*17px*/1.063em"> Vorgeschrieben</asp:ListItem>
                                            <asp:ListItem  ID="rbt_Ankunft"  GroupName="radios" style="font-size:/*17px*/1.063em">Ankunft</asp:ListItem>
                                            <asp:ListItem ID="rbt_Freig" GroupName="radios" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="font-size:/*17px*/1.063em">Freigabe</asp:ListItem>
-                                </asp:RadioButtonList>
-                                </div>
+                                    </asp:RadioButtonList> 
+                                 </div>
+                                   </div>
+                                   <div class="d-md-none"> 
+                                    <div class="col-8" style="margin-left:8px" >
+                                    <asp:RadioButtonList id="RadioButtonList2" runat="server" RepeatDirection="Vertical" style="border-color:#fff">
+                                           <asp:ListItem ID="rbt_Alle_M" GroupName="radios" style="font-size:/*17px*/1.063em">Alle</asp:ListItem>
+                                           <asp:ListItem ID="rbt_Erf_M" GroupName="radios" style="font-size:/*17px*/1.063em"> Erfasst</asp:ListItem>
+                                           <asp:ListItem ID="rbt_Vorb_M"  GroupName="radios" style="font-size:/*17px*/1.063em">Vorbereitet</asp:ListItem>
+                                           <asp:ListItem ID="rbt_Vorg_M"  GroupName="radios" style="font-size:/*17px*/1.063em"> Vorgeschrieben</asp:ListItem>
+                                           <asp:ListItem  ID="rbt_Ankunft_M"  GroupName="radios" style="font-size:/*17px*/1.063em">Ankunft</asp:ListItem>
+                                           <asp:ListItem ID="rbt_Freig_M" GroupName="radios" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="font-size:/*17px*/1.063em">Freigabe</asp:ListItem>
+                                </asp:RadioButtonList>      
+                                </div>   
+                               
                             </div> 
                                 </div>
                              <div style="height:0.936768149882904vh"></div>           
@@ -102,7 +117,7 @@
                                             <asp:TextBox id="pickdate2" Type="Date" runat="server"></asp:TextBox>
                                          </div>                                                                 
                                     
-                             <div style="height:/*12px*/0.936768149882904vh"></div>  
+                             <div id="Abstand"></div>  
                               <hr>
                                 <div id="accordion">
                                  <div class="accordion" id="accordionExample">
@@ -116,17 +131,17 @@
                                                     <div class="card card-body">
                                                      <div class="col-12" id="cont3">                                  
                                                          <div class="container" style="margin-left:2px">                                
-                                                          <div style="height:/*12px*/0.936768149882904vh"></div>     
+                                                          <div id="Abstand"></div>     
                                                                      <!-- Optionale Suchparameter-->
                                                          <div class="row">
-                                                              <div class="col-12" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
+                                                              <div id="rowcol1" class="col-12" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
                                                                     <asp:Label ID="lbl_LKWNr" runat="server" Text="LKW Nr"></asp:Label>                                        
                                                                     <asp:TextBox ID="txt_LKWNr" runat="server" style="width:117px; margin-left:25px;"></asp:TextBox>
                                     
                                                                     <asp:Label ID="lbl_KdNrAuftrag" runat="server" Text="Kunden Auftrags Nr" style="margin-left:45px"></asp:Label>                                                                  
                                                                     <asp:TextBox ID="txt_KdNrAuftrag" runat="server" style="width:117px; margin-left:6px;"></asp:TextBox>
                                                              </div>
-                                                             <div class="col-12" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
+                                                             <div  id="rowcol2" class="col-12" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
                                                                     <asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label>                              
                                                                     <asp:TextBox ID="txt_Absender" runat="server" style="width:155px; margin-left:8px;"></asp:TextBox>                                     
                                  
@@ -139,14 +154,14 @@
                                                    </div>
                                         </div>
                         </div>
-                                <div style="height:/*24px*/1.873536299765808vh"></div>     
+                                <div id="Abstand_laenger" style="height: /*24px*/ 1.873536299765808vh;"></div>     
                                     <asp:Button ID="btn_Auftraege" class="btn-primary" runat="server" Text="Erhalte Aufträge" OnClick="btn_Auftraege_Click" style="margin-left:18px" />
-                              <div style="height:/*32px*/2.498048399687744vh"></div> 
-                            <div class="g-3" style="border:/*1.8px*/0.0706436420722135vw #808080 ridge; margin-left:12px">
+                              <div id="Abstand_lang" style="height: /*32px*/ 2.498048399687744vh;"></div> 
+                            <div class="g-3">
                                              <!-- <input class="form-control mb-4" id="tableSearch" type="text"
                                                 placeholder="Einen Begriff eingeben oder den Anfang davon ...">-->
                                              <div id="conovertab" style="overflow-x:auto;"margin-left="-2px"> 
-                                                   <asp:Table id="normaltable" runat="server" Width="100%" EnableViewState="false" >
+                                                   <asp:Table id="normaltable" runat="server" EnableViewState="false" >
                                                     <asp:TableHeaderRow ID="tbl_Header_row" runat="server">                                                        
                                                             <asp:TableHeaderCell ID="tbl_HeaderCellIndexNr" runat="server">Index-Nr</asp:TableHeaderCell>   
                                                             <asp:TableHeaderCell ID="tbl_HeaderCell_LKWs" runat="server">LKW_Nr</asp:TableHeaderCell>
@@ -208,7 +223,16 @@
             }      else {
                     $("#container2").hide();                   
               }
+        });
+            $('#<%=RadioButtonList2.ClientID %> input[type="radio"]').change(function () {
+                if ($(this).val() == "Freigabe") {
+                    $("#container2").show();
+                } else if ($(this).val() == "Alle") {
+                    $("#container2").show();
+                } else {
+                    $("#container2").hide();
+                }
             });
     });
-    </script>
+   </script>
 </asp:Content>
\ No newline at end of file
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 1a9f2e5..1b2ac21 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -59,7 +59,7 @@ Partial Class Kundenbereich_Default
         End If
 
         'Dim tr
-        If rbt_Alle.Selected = True Then
+        If rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True Then
             If pickdate1.Text = Nothing AndAlso pickdate2.Text = Nothing Then
                 MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
 
@@ -81,9 +81,9 @@ Partial Class Kundenbereich_Default
 
             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
+        ElseIf rbt_Erf.Selected = True Or rbt_Erf_M.Selected Then
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0},,, Absender, Empfaenger, LKWNR, KDNAFNR)
-        ElseIf rbt_Freig.Selected = True Then
+        ElseIf rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True Then
 
             If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
                 Try
@@ -94,17 +94,17 @@ Partial Class Kundenbereich_Default
                 Catch ex As Exception
                     MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
                 End Try
+            ElseIf pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
+                MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
             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
+        ElseIf rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True Then
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3},,, Absender, Empfaenger, LKWNR, KDNAFNR)
-        ElseIf rbt_Vorb.Selected = True Then
+        ElseIf rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = True Then
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4},,, Absender, Empfaenger, LKWNR, KDNAFNR)
-        ElseIf rbt_Vorg.Selected = True Then
+        ElseIf rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True Then
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5},,, Absender, Empfaenger, LKWNR, KDNAFNR)
         End If
 
@@ -195,17 +195,17 @@ Partial Class Kundenbereich_Default
                 tbl_CellInfo.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 tr.Cells.Add(tbl_CellInfo)
 
-                If rbt_Alle.Selected = True Then
+                If (rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True) Then
                     normaltable.Rows.Add(tr)
-                ElseIf rbt_Ankunft.Selected = True AndAlso tbl_CellStatus.Text = "Ankunft" Then
+                ElseIf (rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True) AndAlso tbl_CellStatus.Text = "Ankunft" Then
                     normaltable.Rows.Add(tr)
-                ElseIf rbt_Erf.Selected = True AndAlso tbl_CellStatus.Text = "Erfasst" Then
+                ElseIf (rbt_Erf.Selected = True Or rbt_Erf_M.Selected = True) AndAlso tbl_CellStatus.Text = "Erfasst" Then
                     normaltable.Rows.Add(tr)
-                ElseIf rbt_Freig.Selected = True AndAlso tbl_CellStatus.Text = "Freigegeben" Then
+                ElseIf (rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True) AndAlso tbl_CellStatus.Text = "Freigegeben" Then
                     normaltable.Rows.Add(tr)
-                ElseIf rbt_Vorb.Selected = True AndAlso tbl_CellStatus.Text = "Vorbereitet" Then
+                ElseIf (rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = True) AndAlso tbl_CellStatus.Text = "Vorbereitet" Then
                     normaltable.Rows.Add(tr)
-                ElseIf rbt_Vorg.Selected = True AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
+                ElseIf (rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True) AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
                     normaltable.Rows.Add(tr)
                 End If
 
@@ -215,6 +215,20 @@ Partial Class Kundenbereich_Default
     End Sub
 
     Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
+        'Mobil
+        rbt_Alle_M.Selected = False
+        rbt_Alle_M.Enabled = True
+        rbt_Ankunft_M.Selected = False
+        rbt_Ankunft_M.Enabled = True
+        rbt_Erf_M.Selected = False
+        rbt_Erf_M.Enabled = True
+        rbt_Freig_M.Selected = False
+        rbt_Freig_M.Enabled = True
+        rbt_Vorg_M.Selected = False
+        rbt_Vorg_M.Enabled = True
+        rbt_Vorb_M.Selected = False
+        rbt_Vorb_M.Enabled = True
+        'Desktop
         rbt_Alle.Selected = False
         rbt_Alle.Enabled = True
         rbt_Ankunft.Selected = False
diff --git a/css/Customers/CustomerAVISO.css b/css/Customers/CustomerAVISO.css
index fc984cf..f7284cb 100644
--- a/css/Customers/CustomerAVISO.css
+++ b/css/Customers/CustomerAVISO.css
@@ -59,6 +59,22 @@ hr{
 #btn_resetForm {
     margin-right: 2px;
 }
+#Abstand{
+    height: /*12px*/ 0.936768149882904vh;
+}
+#Abstand_lang{
+    height: /*24px*/ 1.873536299765808vh;
+}
+#Abstand_laenger{
+    height: /*32px*/ 2.498048399687744vh;
+}
+.g-3 {
+    border: /*1.8px*/ 0.0706436420722135vw #808080 ridge;
+    margin-left: 12px
+}
+#normaltable{
+    width:100%;
+}
 @media (prefers-reduced-motion:reduce) {
     .accordion-button {
         transition: none
@@ -168,6 +184,7 @@ hr{
         max-width: /*390px;*/ 85.90308370044053vw;
         overflow-x: auto;
     }
+    
 }
 @media (min-width: 558.98px) {
     #txt_Absender {
@@ -185,4 +202,5 @@ hr{
     #normaltable {
         width: 100%;
     }
+    
 }