Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -3019,23 +3019,4 @@ Public Class usrCntlKundenuebersicht
         Dim webAddress As String = "https://wiki.verag.ag/software/aviso/howtos/Creditsafe"
         Process.Start(webAddress)
     End Sub
-
-    Private Sub rtbAbf_Besonderheiten_VScroll(sender As Object, e As EventArgs) Handles rtbAbf_Besonderheiten.HScroll, rtbAbf_Besonderheiten.VScroll
-        With rtbAbf_Besonderheiten
-            .ReadOnly = True
-            .Text = .Text & vbCrLf
-            .SelectionStart = .Text.Length
-            .ScrollToCaret()
-        End With
-
-    End Sub
-
-    Private Sub rtbAbf_Besonderheiten_TextChanged(sender As Object, e As EventArgs) Handles rtbAbf_Besonderheiten.TextChanged
-        With rtbAbf_Besonderheiten
-            .ReadOnly = True
-            .Text = .Text & vbCrLf
-            .SelectionStart = .Text.Length
-            .ScrollToCaret()
-        End With
-    End Sub
 End Class

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -469,9 +469,9 @@ Public Class frmMDMDatenverarbetiung
             'MsgBox(.sql)
 
             .SET_SQL(" SELECT dbo.TTRBody.OBUID,dbo.TTRBody.CardNumber,dbo.TTRBody.receiptNumber,dbo.TTRBody.receiptNumber,dbo.TTRBody.VATAmount,dbo.TTRBody.amountInclVAT,dbo.TTRBody.abrechnungsdatum, dbo.tblWarenarten.WarenartDE, dbo.CLFArchiv.vehicleLicensePlate
-                            FROM dbo.CLFArchiv RIGHT OUTER JOIN
+                            FROM dbo.CLFArchiv 
-                                dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.InfoField LEFT OUTER JOIN
+                            RIGHT OUTER JOIN dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.OBUID 
-                                dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode
+                            LEFT OUTER JOIN dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode
                             WHERE (dbo.TTRBody.PKHistory = 0) AND (dbo.TTRBody.PKFileName LIKE N'" & checkifTestfiles() & ".%')" & sqlString & "
                             ORDER BY dbo.TTRBody.CardNumber, dbo.TTRBody.FileCreationDate, dbo.TTRBody.PKHistory, dbo.TTRBody.PKFileName, dbo.TTRBody.PKLine", "ASFINAG")
             .LOAD()

SDL/mdm/rptASFINAG_Mautbericht.resx

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="$this.ScriptEditorPositionForUndo" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>0, 0</value>
+  </metadata>
+  <metadata name="$this.ScriptEditorPositionForRedo" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>0, 0</value>
+  </metadata>
+</root>

SDL/mdm/rptASFINAG_Mautbericht.vb

@@ -0,0 +1,9 @@
+Imports GrapeCity.ActiveReports 
+Imports GrapeCity.ActiveReports.Document
+
+Public Class rptASFINAG_Mautbericht
+    Private Sub Detail_Format(sender As Object, e As EventArgs) Handles Detail.Format
+
+    End Sub
+
+End Class

SDL/mdm/usrCntlMDMAuswertungen.Designer.vb

@@ -154,20 +154,20 @@ Partial Class usrCntlMDMAuswertungen
         Me.Label53 = New System.Windows.Forms.Label()
         Me.GroupBox16 = New System.Windows.Forms.GroupBox()
         Me.Label54 = New System.Windows.Forms.Label()
-        Me.Button20 = New System.Windows.Forms.Button()
+        Me.btnKartenpruefung = New System.Windows.Forms.Button()
         Me.Label49 = New System.Windows.Forms.Label()
         Me.GroupBox15 = New System.Windows.Forms.GroupBox()
         Me.lblDatletzteMaut = New System.Windows.Forms.Label()
         Me.Label52 = New System.Windows.Forms.Label()
         Me.cbxTestdaten = New System.Windows.Forms.CheckBox()
         Me.dat_Sum_Bis = New System.Windows.Forms.DateTimePicker()
-        Me.Button19 = New System.Windows.Forms.Button()
+        Me.bntGesamtsummen = New System.Windows.Forms.Button()
         Me.Label51 = New System.Windows.Forms.Label()
-        Me.Button17 = New System.Windows.Forms.Button()
+        Me.btnMautbericht = New System.Windows.Forms.Button()
         Me.Label48 = New System.Windows.Forms.Label()
         Me.GroupBox14 = New System.Windows.Forms.GroupBox()
         Me.Label50 = New System.Windows.Forms.Label()
-        Me.Button16 = New System.Windows.Forms.Button()
+        Me.btnContractdaten = New System.Windows.Forms.Button()
         Me.Button15 = New System.Windows.Forms.Button()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.GroupBox1.SuspendLayout()
@@ -1655,7 +1655,7 @@ Partial Class usrCntlMDMAuswertungen
         'GroupBox16
         '
         Me.GroupBox16.Controls.Add(Me.Label54)
-        Me.GroupBox16.Controls.Add(Me.Button20)
+        Me.GroupBox16.Controls.Add(Me.btnKartenpruefung)
         Me.GroupBox16.Location = New System.Drawing.Point(6, 257)
         Me.GroupBox16.Name = "GroupBox16"
         Me.GroupBox16.Size = New System.Drawing.Size(697, 94)
@@ -1667,20 +1667,20 @@ Partial Class usrCntlMDMAuswertungen
         Me.Label54.AutoSize = True
         Me.Label54.Location = New System.Drawing.Point(147, 19)
         Me.Label54.Name = "Label54"
-        Me.Label54.Size = New System.Drawing.Size(152, 13)
+        Me.Label54.Size = New System.Drawing.Size(153, 13)
         Me.Label54.TabIndex = 6
-        Me.Label54.Text = "Prüft die Daten auf inkonistenz"
+        Me.Label54.Text = "Prüft die Daten auf Inkonistenz"
         '
-        'Button20
+        'btnKartenpruefung
         '
-        Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnKartenpruefung.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button20.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.btnKartenpruefung.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Button20.Location = New System.Drawing.Point(6, 19)
+        Me.btnKartenpruefung.Location = New System.Drawing.Point(6, 19)
-        Me.Button20.Name = "Button20"
+        Me.btnKartenpruefung.Name = "btnKartenpruefung"
-        Me.Button20.Size = New System.Drawing.Size(121, 49)
+        Me.btnKartenpruefung.Size = New System.Drawing.Size(121, 49)
-        Me.Button20.TabIndex = 4
+        Me.btnKartenpruefung.TabIndex = 4
-        Me.Button20.Text = "Karten prüfen"
+        Me.btnKartenpruefung.Text = "Karten prüfen"
-        Me.Button20.UseVisualStyleBackColor = True
+        Me.btnKartenpruefung.UseVisualStyleBackColor = True
         '
         'Label49
         '
@@ -1699,9 +1699,9 @@ Partial Class usrCntlMDMAuswertungen
         Me.GroupBox15.Controls.Add(Me.Label52)
         Me.GroupBox15.Controls.Add(Me.cbxTestdaten)
         Me.GroupBox15.Controls.Add(Me.dat_Sum_Bis)
-        Me.GroupBox15.Controls.Add(Me.Button19)
+        Me.GroupBox15.Controls.Add(Me.bntGesamtsummen)
         Me.GroupBox15.Controls.Add(Me.Label51)
-        Me.GroupBox15.Controls.Add(Me.Button17)
+        Me.GroupBox15.Controls.Add(Me.btnMautbericht)
         Me.GroupBox15.Location = New System.Drawing.Point(8, 137)
         Me.GroupBox15.Name = "GroupBox15"
         Me.GroupBox15.Size = New System.Drawing.Size(697, 94)
@@ -1746,16 +1746,16 @@ Partial Class usrCntlMDMAuswertungen
         Me.dat_Sum_Bis.Size = New System.Drawing.Size(103, 20)
         Me.dat_Sum_Bis.TabIndex = 25
         '
-        'Button19
+        'bntGesamtsummen
         '
-        Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.bntGesamtsummen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button19.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.bntGesamtsummen.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Button19.Location = New System.Drawing.Point(133, 19)
+        Me.bntGesamtsummen.Location = New System.Drawing.Point(133, 19)
-        Me.Button19.Name = "Button19"
+        Me.bntGesamtsummen.Name = "bntGesamtsummen"
-        Me.Button19.Size = New System.Drawing.Size(121, 49)
+        Me.bntGesamtsummen.Size = New System.Drawing.Size(121, 49)
-        Me.Button19.TabIndex = 6
+        Me.bntGesamtsummen.TabIndex = 6
-        Me.Button19.Text = "Gesamtsummen"
+        Me.bntGesamtsummen.Text = "Gesamtsummen"
-        Me.Button19.UseVisualStyleBackColor = True
+        Me.bntGesamtsummen.UseVisualStyleBackColor = True
         '
         'Label51
         '
@@ -1766,16 +1766,16 @@ Partial Class usrCntlMDMAuswertungen
         Me.Label51.TabIndex = 5
         Me.Label51.Text = "Berichte"
         '
-        'Button17
+        'btnMautbericht
         '
-        Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnMautbericht.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button17.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.btnMautbericht.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Button17.Location = New System.Drawing.Point(6, 19)
+        Me.btnMautbericht.Location = New System.Drawing.Point(6, 19)
-        Me.Button17.Name = "Button17"
+        Me.btnMautbericht.Name = "btnMautbericht"
-        Me.Button17.Size = New System.Drawing.Size(121, 49)
+        Me.btnMautbericht.Size = New System.Drawing.Size(121, 49)
-        Me.Button17.TabIndex = 4
+        Me.btnMautbericht.TabIndex = 4
-        Me.Button17.Text = "Mautbericht"
+        Me.btnMautbericht.Text = "Mautbericht"
-        Me.Button17.UseVisualStyleBackColor = True
+        Me.btnMautbericht.UseVisualStyleBackColor = True
         '
         'Label48
         '
@@ -1791,7 +1791,7 @@ Partial Class usrCntlMDMAuswertungen
         'GroupBox14
         '
         Me.GroupBox14.Controls.Add(Me.Label50)
-        Me.GroupBox14.Controls.Add(Me.Button16)
+        Me.GroupBox14.Controls.Add(Me.btnContractdaten)
         Me.GroupBox14.Location = New System.Drawing.Point(6, 20)
         Me.GroupBox14.Name = "GroupBox14"
         Me.GroupBox14.Size = New System.Drawing.Size(697, 94)
@@ -1807,16 +1807,16 @@ Partial Class usrCntlMDMAuswertungen
         Me.Label50.TabIndex = 5
         Me.Label50.Text = "Liefert eine Liste der aktuellen Contractdaten"
         '
-        'Button16
+        'btnContractdaten
         '
-        Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnContractdaten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button16.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.btnContractdaten.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Button16.Location = New System.Drawing.Point(6, 19)
+        Me.btnContractdaten.Location = New System.Drawing.Point(6, 19)
-        Me.Button16.Name = "Button16"
+        Me.btnContractdaten.Name = "btnContractdaten"
-        Me.Button16.Size = New System.Drawing.Size(121, 49)
+        Me.btnContractdaten.Size = New System.Drawing.Size(121, 49)
-        Me.Button16.TabIndex = 4
+        Me.btnContractdaten.TabIndex = 4
-        Me.Button16.Text = "anzeigen"
+        Me.btnContractdaten.Text = "anzeigen"
-        Me.Button16.UseVisualStyleBackColor = True
+        Me.btnContractdaten.UseVisualStyleBackColor = True
         '
         'Button15
         '
@@ -2041,12 +2041,12 @@ Partial Class usrCntlMDMAuswertungen
     Friend WithEvents Label48 As Label
     Friend WithEvents GroupBox14 As GroupBox
     Friend WithEvents Label50 As Label
-    Friend WithEvents Button16 As Button
+    Friend WithEvents btnContractdaten As Button
     Friend WithEvents Label49 As Label
     Friend WithEvents GroupBox15 As GroupBox
     Friend WithEvents Label51 As Label
-    Friend WithEvents Button17 As Button
+    Friend WithEvents btnMautbericht As Button
-    Friend WithEvents Button19 As Button
+    Friend WithEvents bntGesamtsummen As Button
     Friend WithEvents dat_Sum_Bis As DateTimePicker
     Friend WithEvents cbxTestdaten As CheckBox
     Friend WithEvents Label52 As Label
@@ -2054,5 +2054,5 @@ Partial Class usrCntlMDMAuswertungen
     Friend WithEvents Label53 As Label
     Friend WithEvents GroupBox16 As GroupBox
     Friend WithEvents Label54 As Label
-    Friend WithEvents Button20 As Button
+    Friend WithEvents btnKartenpruefung As Button
 End Class

SDL/mdm/usrCntlMDMAuswertungen.vb

@@ -976,7 +976,7 @@ Public Class usrCntlMDMAuswertungen
         End If
     End Sub
 
-    Private Sub Button16_Click(sender As Object, e As EventArgs) Handles Button16.Click
+    Private Sub Button16_Click(sender As Object, e As EventArgs) Handles btnContractdaten.Click
 
         Try
 
@@ -1024,7 +1024,7 @@ Public Class usrCntlMDMAuswertungen
 
     End Sub
 
-    Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click
+    Private Sub Button19_Click(sender As Object, e As EventArgs) Handles bntGesamtsummen.Click
         Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
         Dim displayFilter = False
         Dim sqlstr As String = ""
@@ -1160,13 +1160,10 @@ Public Class usrCntlMDMAuswertungen
         End If
     End Sub
 
-    Private Sub Button17_Click(sender As Object, e As EventArgs) Handles Button17.Click
+    Private Sub Button17_Click(sender As Object, e As EventArgs) Handles btnKartenpruefung.Click
 
         Try
 
-            MsgBox("Funktion noch nicht implementiert!")
-            Exit Sub
-
             Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
             Dim dtAsfinagKartenpruef As DataTable = SQL.loadDgvBySql("
                         SELECT cardnumber, Kreditkarten.KartenNr, Kreditkarten.AdressenNr, (SELECT Offerten.OffertenNr FROM [VERAG].[dbo].[Offerten] WHERE (((Offerten.KundenNr)=isnull([Kreditkarten].[AdressenNr],0)) AND ((Offerten.OffertenNr)=11))) AS Offerte_11
@@ -1177,7 +1174,22 @@ Public Class usrCntlMDMAuswertungen
                             ORDER BY cardnumber", "FMZOLL")
 
             If dtAsfinagKartenpruef.Rows.Count = 0 Then
-                MsgBox("Keine Daten vorhanden")
+                MsgBox("Prüfung abgeschlossen" & vbNewLine & "Daten in Ordnung!")
+            Else
+                Dim frm As New Form
+                Dim dgv As New DataGridView()
+                dgv.DataSource = dtAsfinagKartenpruef
+                If dgv IsNot Nothing Then
+                    frm.Size = New Size(1400, 1000)
+                    dgv.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50)
+                    dgv.Dock = DockStyle.Fill
+                    dgv.Anchor = AnchorStyles.Left
+                    dgv.Anchor = AnchorStyles.Top
+                    dgv.ReadOnly = True
+                    frm.Controls.Add(dgv)
+                    frm.StartPosition = FormStartPosition.CenterScreen
+                    frm.ShowDialog()
+                End If
             End If
 
 
@@ -1187,7 +1199,7 @@ Public Class usrCntlMDMAuswertungen
 
     End Sub
 
-    Private Sub Button20_Click(sender As Object, e As EventArgs) Handles Button20.Click
+    Private Sub Button20_Click(sender As Object, e As EventArgs) Handles btnMautbericht.Click
         MsgBox("Funktion noch nicht implementiert!")
 
         'Try