Änderungen JSON

Customers/LKWs.aspx

@@ -367,7 +367,8 @@
                 dtData.push([
                     this.SDL,
                     this.Bez,
-                    this.Gueltigbis                    
+                    this.Gueltigbis,
+                    this.kart
                 ]);
             });
 
@@ -380,11 +381,12 @@
             var dtData = [];
             // Data tables requires all data to be stuffed into a generic jagged array, so loop through our
             // typed object and create one.
-            $.each(result, function () {
+            $.each(result.d, function () {
                 dtData.push([
                     this.SDL,
                     this.Bez,
-                    this.Gueltigbis                    
+                    this.Gueltigbis,
+                    this.Kartnr
                 ]);
             });
 
@@ -394,7 +396,43 @@
             });
         }
     </script>
-    <script type="text/javascript">            
+    <script type="text/javascript">    
+        $("#<%=tablemain.ClientID%>").dataTable({
+            "bJQueryUI": true,
+            "sPaginationType": "full_numbers",
+            "bServerSide": true,
+            "sAjaxSource": "LKWs.aspx/filltable2",
+            "fnServerData": function (sSource, aoData, fnCallback) {
+                $.ajax({
+                    "type": "POST",
+                    "dataType": 'json',
+                    "contentType": "application/json; charset=utf-8",
+                    "url": sSource,
+                    "data": "{'sEcho': '" + aoData[0].value + "'}",
+                    "success": function (msg) {
+                        fnCallback(msg.d);
+                    }
+                });
+            }
+        });
+        $("#<%=tablemain_m.ClientID%>").dataTable({
+            "bJQueryUI": true,
+            "sPaginationType": "full_numbers",
+            "bServerSide": true,
+            "sAjaxSource": "LKWs.aspx/filltable2_M",
+            "fnServerData": function (sSource, aoData, fnCallback) {
+                $.ajax({
+                    "type": "POST",
+                    "dataType": 'json',
+                    "contentType": "application/json; charset=utf-8",
+                    "url": sSource,
+                    "data": "{'sEcho': '" + aoData[0].value + "'}",
+                    "success": function (msg) {
+                        fnCallback(msg.d);
+                    }
+                });
+            }
+        });
         function doPostBack(id) {            
             let Speditionslabel = document.getElementById('<%=lbl_sped_Placeholder.ClientID%>');
             let natplaceholder = document.getElementById('<%=lbl_Placeholder.ClientID%>');
@@ -443,8 +481,7 @@
                 error: function (jqXHR, textStatus, errorThrown) {
                     alert("Status:" + jqXHR.status + "\nStatusText: " + textStatus + "\nError:" + errorThrown);
                 }
-            });
+            });                
-                
             //filltable2(id.split(',')[0])
         }
         function doPostBack_M(id_M) {
@@ -481,13 +518,13 @@
                 data: JSON.stringify(data_m),
                 async: true,
                 success: function (data_m) {
-                    result = data_m.d;
+                    result = data_m;
                    // addheader();
                   //  let strHeader_M = '<tr style="background-color:#043381;color:#fff"><th><td style="font-weight:600; color:white">SDL-Nr</td></th><th><td style="font-weight:600; color:white">Bezeichnung</td></th><th><td style="font-weight:600; color:white">Gueltig bis</td></th><th><td style="font-weight:600; color:white">Karten-Nummer</td></th></tr>';
                   //  let strHTML = ''
                     alert('Horray! 200 status code!');
                     
-                   renderTable_m(result)
+                   renderTable_m(result.d)
                      //alert(strHTML)   
                     //$('#<%'=tablemain_m.ClientID%>').append(strHeader_M);
                    // $('#<%'=tablemain_m.ClientID%>').append(strHTML);

Customers/LKWs.aspx.vb

@@ -6,6 +6,8 @@ Imports System.Web.Script.Services
 Imports System.Web.Security
 Imports System.Web.Services
 Imports System.Web.UI.WebControls
+Imports LKWS.Entry
+Imports Newtonsoft.Json
 
 Partial Class LKWS
     Inherits System.Web.UI.Page
@@ -464,6 +466,7 @@ Partial Class LKWS
             Me.GueltigBis = GueltigBis
             Me.Kartnr = KartNr
         End Sub
+
         Public Sub New(ByVal SDL As String, Bez As String, ByVal GueltigBis As String, ByVal KartNr As String, ByVal Kaut As String, ByVal Archivt As String, ByVal BelegNr As String, ByVal Ersatzkarte As String, ByVal DefektAm As String, ByVal Fahrer As String, ByVal GesperrtAm As String,
                        ByVal History As String, ByVal HasEntry As String, ByVal FlottenPIN As String, ByVal FREJUS_CARD_Nr As String, ByVal GestohlenAm As String, ByVal LKWAbgemeldet As String, ByVal LKWAbgemeldetAM As String, ByVal Lieferdatum As String, ByVal MasterPIN As String,
                        ByVal MOTORWAY_CARD_Nr As String, ByVal MSE_Kd_Nr As String, ByVal OBUID As String, ByVal PAN_Nr As String, ByVal Partner As String, ByVal PIN As String, ByVal RefKundenNr As String, ByVal Retourniert As String, ByVal RetourniertAm As String, ByVal Sachbearbeiter As String,
@@ -519,7 +522,6 @@ Partial Class LKWS
     <ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
     Public Shared Function filltable2(Kennzeichen As String) As List(Of Entry)
         Dim list As List(Of Entry) = New List(Of Entry)
-        Dim listdetails As List(Of Entry) = New List(Of Entry)
         Dim strtemp As String = Kennzeichen.Remove(0, 1)
         Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1)
         Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr)
@@ -532,17 +534,15 @@ Partial Class LKWS
             If IsNothing(l2.Kategorie) = False Then
                 strtempKat = l2.Kategorie.ToString
             End If
-
             If IsNothing(l2.hasentry) = False Then
                 strtempGueltigBis = l2.GültigBis.ToString
             End If
             If IsNothing(l2.KartenNr) = False Then
                 strtempKartenNr = l2.KartenNr.ToString
             End If
-
+            Dim Entrytemp As Entry = New Entry(l2.SDLNr.ToString, strtempKat, strtempGueltigBis, strtempKartenNr)
-            list.Add(New Entry(l2.SDLNr.ToString, strtempKat, strtempGueltigBis, strtempKartenNr))
+            list.Add(Entrytemp)
         Next
-
         Return list
     End Function
 
@@ -553,11 +553,11 @@ Partial Class LKWS
         Dim strtemp As String = Kennzeichen.Remove(0, 1)
         Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1)
         Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr)
+
         For Each l2 In list2
             Dim strtempKat As String = String.Empty
             Dim strtempKartenNr As String = String.Empty
             Dim strtempGueltigBis As String = String.Empty
-            Dim strtempVermerk As String = String.Empty
 
             If IsNothing(l2.Kategorie) = False Then
                 strtempKat = l2.Kategorie.ToString
@@ -568,11 +568,8 @@ Partial Class LKWS
             If IsNothing(l2.KartenNr) = False Then
                 strtempKartenNr = l2.KartenNr.ToString
             End If
-            If IsNothing(l2.Vermerk) = False Then
+            Dim Entrytemp As Entry = New Entry(l2.SDLNr.ToString, strtempKat, strtempGueltigBis, strtempKartenNr)
-                strtempVermerk = l2.Vermerk.ToString
+            list.Add(Entrytemp)
-            End If
-
-            list.Add(New Entry(l2.SDLNr.ToString, strtempKat, strtempGueltigBis, strtempKartenNr))
         Next
         Return list
     End Function
@@ -943,6 +940,6 @@ Partial Class LKWS
             listdetails_M.Add(New Entry(l2.SDLNr.ToString, strtempKat, strtempGueltigBis, strtempKartenNr, strtempKaut, strtempArchivt, strtempBelegNr, strtempErsatzkarte, strtempDefektAm, strtempFahrer, strtempGesperrtAm, strtempHistory, strtempHasEntry, strtempFlottenPIN, strtempFREJUS_CARD_Nr, strtempGestohlenAm, strtempLKWAbgemeldet, strtempLKWAbgemeldetAM, strtempLieferdatum, strtempMasterPIN, strtempMOTORWAY_CARD_Nr, strtempMSE_Kd_Nr, strtempOBUID, strtempPAN_Nr, strtempPartner, strtempPIN, strtempRefKundenNr, strtempRetourniert, strtempRetourniertAm, strtempSachbearbeiter, strtempSERIE_Nr, strtempStatus, strtempTelepassErsatzkarte, strtempTelepassErsatzkarteAm, strtempTELEPASS_Kd_Nr, strtempTELEPASS_Nr, strtempUmstellungsdatum, strtempVerloren, strtempVertragsabschlussdatum, strtempVertragsNr, strtempVIACARD, strtempAenderungsdatum, strtempVermerk))
         Next
 
-        Return listdetails_m
+        Return listdetails_M
     End Function
 End Class