From 84a8ee5508737f4702f815620d9b86c5b8892f45 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Fri, 17 Sep 2021 12:02:40 +0200
Subject: [PATCH] =?UTF-8?q?Mobilversion=20wurde=20implementiert=20der=20Se?=
 =?UTF-8?q?itenmen=C3=BCs=20sowie=20Gestaltung=20der=20Seite=20insgesamt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/CustomsAviso.aspx    | 36 ++++++++++++++++++++++++++----
 Customers/CustomsAviso.aspx.vb | 40 ++++++++++++++++------------------
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index aabf73e..4285c91 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -92,7 +92,7 @@
                                            <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>
-                                   </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">
@@ -132,6 +132,7 @@
                                                      <div class="col-12" id="cont3">                                  
                                                          <div class="container" style="margin-left:2px">                                
                                                           <div id="Abstand"></div>     
+                                                              <div class="d-none d-md-block">
                                                                      <!-- Optionale Suchparameter-->
                                                          <div class="row">
                                                               <div id="rowcol1" class="col-12" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
@@ -149,6 +150,28 @@
                                                                     <asp:TextBox ID="txt_Empfaenger" runat="server" style="width:155px; margin-left:52px;"></asp:TextBox>
                                                             </div>                                   
                                                              </div>
+                                                                  </div>
+                                                              <div class="d-md-none"> 
+                                                                  <div id="rowcol3" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
+                                                                      <div class="row">
+                                                                    <asp:Label ID="lbl_LKWNr_M" runat="server" Text="LKW Nr"></asp:Label>                                        
+                                                                    <asp:TextBox ID="txt_LKWNr_M" runat="server" style="width:117px; margin-left:25px;"></asp:TextBox>
+                                                                    </div>
+                                                                  <div id="rowcol4" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
+                                                                    <asp:Label ID="lbl_KdNrAuftrag_M" runat="server" Text="Kunden Auftrags Nr" style="margin-left:45px"></asp:Label>                                                                  
+                                                                    <asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" style="width:117px; margin-left:6px;"></asp:TextBox>
+                                                             </div>
+
+                                                             <div  id="rowcol5" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
+                                                                    <asp:Label ID="lbl_Absender_M" runat="server" Text="Absender"></asp:Label>                              
+                                                                    <asp:TextBox ID="txt_Absender_M" runat="server" style="width:155px; margin-left:8px;"></asp:TextBox> 
+                                                                 </div>
+                                                            <div id="rowcol6" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
+                                                                     <asp:Label ID="lbl_Empfaenger_M" runat="server" Text="Empfänger" style="margin-left:9px"></asp:Label>                                         
+                                                                    <asp:TextBox ID="txt_Empfaenger_M" runat="server" style="width:155px; margin-left:52px;"></asp:TextBox>
+                                                            </div>                                   
+                                                             </div>
+                                                                  </div>
                                                          </div>
                                                         </div>  
                                                    </div>
@@ -223,7 +246,12 @@
             }      else {
                     $("#container2").hide();                   
               }
-        });
+        });           
+    });
+   </script>
+    <script type='text/javascript'>
+        $(document).ready(function () {
+            $("#container2").hide();
             $('#<%=RadioButtonList2.ClientID %> input[type="radio"]').change(function () {
                 if ($(this).val() == "Freigabe") {
                     $("#container2").show();
@@ -233,6 +261,6 @@
                     $("#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 1b2ac21..a57ec97 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -44,39 +44,37 @@ Partial Class Kundenbereich_Default
         Kdnrtext = Session.Item("CustomerID").ToString
 
         dt = Nothing
-        If txt_Absender.Text IsNot "" Then
+        If txt_Absender.Text IsNot "" Or txt_Absender_M.Text IsNot "" Then
             txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Absender = txt_Absender.Text
-        ElseIf txt_Empfaenger.Text IsNot "" Then
+            txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+            Absender = txt_Absender_M.Text
+        ElseIf txt_Empfaenger.Text IsNot "" Or txt_Empfaenger_M.Text IsNot "" Then
             txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Empfaenger = txt_Empfaenger.Text
-        ElseIf txt_KdNrAuftrag.Text IsNot "" Then
+            txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+            Empfaenger = txt_Empfaenger_M.Text
+        ElseIf txt_KdNrAuftrag.Text IsNot "" Or txt_KdNrAuftrag_M.Text IsNot "" Then
             txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             KDNAFNR = txt_KdNrAuftrag.Text
-        ElseIf txt_LKWNr.Text IsNot "" Then
+            txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+            KDNAFNR = txt_KdNrAuftrag_M.Text
+        ElseIf txt_LKWNr.Text IsNot "" Or txt_LKWNr_M.Text IsNot "" Then
             txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             LKWNR = txt_LKWNr.Text
+            txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+            LKWNR = txt_LKWNr_M.Text
         End If
 
         'Dim tr
         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!")
-
-                pickdate1.BackColor = Drawing.Color.Aqua
-                pickdate2.BackColor = Drawing.Color.Aqua
-                lbl_von.BackColor = Drawing.Color.Red
-                lbl_bis.BackColor = Drawing.Color.Red
-            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
-                End If
-                Return
+            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
             End If
 
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)