From 79305ccdb2eb31c2707d90005c92357ab82ab908 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 27 Sep 2021 13:38:20 +0200
Subject: [PATCH] =?UTF-8?q?Die=20Art=20der=20abfrage=20wurde=20pr=C3=A4zis?=
 =?UTF-8?q?iert=20bie=20den=20Arten=20der=20auftr=C3=A4ge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/CustomsAviso.aspx | 94 ++++++++++++++++++++++++-------------
 1 file changed, 62 insertions(+), 32 deletions(-)

diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 097fe86..795ba22 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -76,10 +76,9 @@
                              <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="d-none d-md-block">                                  
                                 <div  style=" width:780px; margin-left:8px">            
                                     <fieldset>
                                          <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>                                       
@@ -110,7 +109,8 @@
                                             <asp:Label ID="lbl_von" runat="server" Text="Von:"></asp:Label>                                             
                                             <asp:TextBox id="pickdate1" Type="Date" ClientValidationFunction="validate" CssClass="classTarget" OnTextChanged="pickdate1_TextChanged" runat="server"></asp:TextBox>  
                                             <asp:RequiredFieldValidator ID="RequiredFieldValidatorvon" runat="server" ErrorMessage="Field required" ControlToValidate="pickdate1" Text="Required" ForeColor="White" Font-Strikeout="False" Font-Underline="False" Font-Overline="False" Font-Bold="True" BackColor="Red"></asp:RequiredFieldValidator>              
-                                            <asp:Label ID="lbl_bis" runat="server" Text="Bis:"></asp:Label> 
+                                            <asp:CustomValidator ValidateEmptyText="false" ClientValidationFunction=""></asp:CustomValidator>            
+                                <asp:Label ID="lbl_bis" runat="server" Text="Bis:"></asp:Label> 
                                             <asp:RequiredFieldValidator ID="RequiredFieldValidatorbis" ClientValidationFunction="validate" runat="server" ErrorMessage="Field required" ControlToValidate="pickdate2" Text="Required" ForeColor="White" Font-Strikeout="False" Font-Underline="False" Font-Overline="False" Font-Bold="True" BackColor="Red"></asp:RequiredFieldValidator>              
                                             <asp:TextBox id="pickdate2" Type="Date" CssClass="classTarget" OnTextChanged="pickdate2_TextChanged" runat="server"></asp:TextBox>
                                          </div>                                    
@@ -190,8 +190,7 @@
                                                             <asp:TableHeaderCell ID="tbl_HeaderCell_KundAuftNr" runat="server">Auftrags-Nr</asp:TableHeaderCell>
                                                             <asp:TableHeaderCell ID="tbl_HeaderCell_Info" runat="server">Info</asp:TableHeaderCell>
                                                         </asp:TableHeaderRow>
-                                                        </asp:Table>                                                  
-                                                                                            
+                                                        </asp:Table>                                                                                        
                                            </div> 
                             </div></div></div>
                        </div>                                              
@@ -202,8 +201,7 @@
                        Catch ex As Exception
                            Response.Write(ex.Message & ex.StackTrace)
                        End Try %>                                                                          
-                                                                                     <div></div></div>  </ContentTemplate></asp:UpdatePanel>
-                                                                                   
+                                                                                     <div></div></div>  </ContentTemplate></asp:UpdatePanel>                                                                                  
     
 <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
 <script src="http://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>   
@@ -214,44 +212,76 @@
         $('#accordion').on('hidden.bs.collapse', function (e, f) {
             $(e.target).data('bs.collapse').$trigger.attr('src', 'https://s22.postimg.org/9takvqkal/Mathematic_Plus2.png');
         });
-    </script>    
+    </script>
+<script src="https://cdn.jsdelivr.net/jquery.validation/1.16.0/jquery.validate.min.js"></script>
+<script src="https://cdn.jsdelivr.net/jquery.validation/1.16.0/additional-methods.min.js"></script>
 <script>       
     function GetSelectedVal(ele) {
+        
         $("#container2").hide();
-        var el = $(ele).closest('label').text();
-        if (el == "Alle") {
-            $("#container2").show();
-            ValidatorEnable(document.getElementById("RequiredFieldValidatorvon"), true);
-            ValidatorEnable(document.getElementById("RequiredFieldValidatorbis"), true);
-        } else if (el == "Alle_M") {
+        $('input:radio[name=art]:checked').change(function () {
+
+            if ($("input[name='art']:checked").val() == "Alle") {
                 $("#container2").show();
                 ValidatorEnable(document.getElementById("RequiredFieldValidatorvon"), true);
                 ValidatorEnable(document.getElementById("RequiredFieldValidatorbis"), true);
-        } else if (el == "Freigabe") {
-            $("#container2").show();
-            ValidatorEnable(document.getElementById("RequiredFieldValidatorvon"), true);
-            ValidatorEnable(document.getElementById("RequiredFieldValidatorbis"), true);
-        } else if (el == "Freigabe_M") {
-            $("#container2").show();
-            ValidatorEnable(document.getElementById("RequiredFieldValidatorvon"), true);
-            ValidatorEnable(document.getElementById("RequiredFieldValidatorbis"), true);
-        } else {
-            $("#container2").hide();
-            ValidatorEnable(document.getElementById("RequiredFieldValidatorvon"), false);
-            ValidatorEnable(document.getElementById("RequiredFieldValidatorbis"), false);
-        }           
+            } else if ($("input[name='art']:checked").val() == "Freigabe") {
+                $("#container2").show();
+                ValidatorEnable(document.getElementById("RequiredFieldValidatorvon"), true);
+                ValidatorEnable(document.getElementById("RequiredFieldValidatorbis"), true);
+            } else {
+                $("#container2").hide();
+                ValidatorEnable(document.getElementById("RequiredFieldValidatorvon"), false);
+                ValidatorEnable(document.getElementById("RequiredFieldValidatorbis"), false);
+            }
+        });
+            $('input:radio[name=art2]:checked').change(function () {
+
+            if ($("input[name='art2']:checked").val() == "Alle_M") {
+                $("#container2").show();
+                ValidatorEnable(document.getElementById("RequiredFieldValidatorvon"), true);
+                ValidatorEnable(document.getElementById("RequiredFieldValidatorbis"), true);
+            } else if ($("input[name='art2']:checked").val() == "Freigabe_M") {
+                $("#container2").show();
+                ValidatorEnable(document.getElementById("RequiredFieldValidatorvon"), true);
+                ValidatorEnable(document.getElementById("RequiredFieldValidatorbis"), true);
+            } else {
+                $("#container2").hide();
+                ValidatorEnable(document.getElementById("RequiredFieldValidatorvon"), false);
+                ValidatorEnable(document.getElementById("RequiredFieldValidatorbis"), false);
+            }
+        });
     }           
 </script>
-<script src="https://cdn.jsdelivr.net/jquery.validation/1.16.0/jquery.validate.min.js"></script>
-<script src="https://cdn.jsdelivr.net/jquery.validation/1.16.0/additional-methods.min.js"></script>
+
     <script type="text/javascript">
         $(document).ready(function () {
             Sys.WebForms.PageRequestManager.getInstance().add_endRequest(EndRequestHandler);
 
             function EndRequestHandler(sender, args) {
                 $('.classTarget).datepicker({ dateFormat: 'dd.MM.yyyy' });
-                    }
+            }
         });
     </script>  
-    
+    <script type="text/javascript">
+        var v1 = Date.parse(document.getElementById("pickdate1").text);
+        var v2 = Date.parse(document.getElementById("pickdate2").text);
+
+        If(compareDate(v1)=false) {
+            alert("Datum nicht im gültigen Rahmen!");       
+        }
+    </script>
+    <script type="text/javascript">
+        function (compareDate(str1, str2) as Boolean{
+            // str1 format should be dd/mm/yyyy. Separator can be anything e.g. / or -. It wont effect
+            var date1 = new Date(str1);
+            var date2 = new Date(str2);
+            var year0 = new Date('01.01.2001')
+            if (date1.getFullYear() < year0.getFullYear()){
+            return false;
+        } else {
+            return true
+        }                           
+        });
+    </script>
 </asp:Content>
\ No newline at end of file