zusätzlich Position Zollbeschau, Suchfunktion in frmVorlagen. Frohe Weihnachten!

SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlZollbeschau.vb

@@ -1,4 +1,5 @@
-Public Class usrCntlZollbeschau
+
+Public Class usrCntlZollbeschau
     Implements FormualrInterface
 
     Public Event CHANGED(name, value)
@@ -137,15 +138,14 @@
 
     Private Sub usrCntlZollbeschau_Load(sender As Object, e As EventArgs) Handles Me.Load
         Label16.Text = Rolle.ToString
-        txtTimeZoll1.Text = "00:00"
+        txtDurationZoll1.Enabled = False
-        txtTimeZoll2.Text = "00:00"
+        txtDurationZoll2.Enabled = False
-        txtTimeZoll1.Enabled = False
-        txtTimeZoll2.Enabled = False
         initControlsHandler()
         txtAnsprechpartnerVERAG.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
         txtBeschauDat.Text = Date.Today.ToString("dd.MM.yyyy")
         txtVZDatum.Text = Date.Today.ToString("dd.MM.yyyy")
 
+
         If IsNumeric(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl) Then
             txtDW.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl
         End If
@@ -158,8 +158,6 @@
     End Sub
 
 
-
-
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         If KdNR > 0 Then
             Dim f As New frmKundenUebersichtZOLL(KdNR)
@@ -170,20 +168,11 @@
 
     Private Sub DateTimePicker1_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker1.ValueChanged
         txtZoll1Date._value = CDate(sender.value).ToShortDateString
-        If txtZoll1Date._value <> "" Then
+
-            txtTimeZoll1.Enabled = True
-        Else
-            txtTimeZoll1.Enabled = False
-        End If
     End Sub
 
     Private Sub DateTimePicker2_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker2.ValueChanged
         txtZoll2Date._value = CDate(sender.value).ToShortDateString
-        If txtZoll2Date._value <> "" Then
-            txtTimeZoll2.Enabled = True
-        Else
-            txtTimeZoll2.Enabled = False
-        End If
     End Sub
 
     Private Sub dtpBeschauDat_ValueChanged(sender As Object, e As EventArgs) Handles dtpBeschauDat.ValueChanged
@@ -195,4 +184,49 @@
     Private Sub DateTimePicker3_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker3.ValueChanged
         txtVZDatum._value = CDate(sender.value).ToShortDateString
     End Sub
+
+    Private Sub txtZoll1Date_ValueChanged() Handles txtZoll1Date.ValueChanged
+        If txtZoll1Date._value <> "" Then
+            txtDurationZoll1.Enabled = True
+            txtTimeZoll1.Enabled = True
+            If txtTimeZoll1.Text = "" Then txtTimeZoll1.Text = Date.Now.ToString("HH:mm")
+            If txtDurationZoll1.Text = "" Then txtDurationZoll1.Text = "00:00"
+        Else
+            txtDurationZoll1.Enabled = False
+            txtTimeZoll1.Enabled = False
+            txtTimeZoll1.Text = ""
+            txtDurationZoll1.Text = ""
+        End If
+    End Sub
+
+    Private Sub txtZoll2Date_ValueChanged() Handles txtZoll2Date.ValueChanged
+        If txtZoll2Date._value <> "" Then
+            txtDurationZoll2.Enabled = True
+            txtTimeZoll2.Enabled = True
+            If txtTimeZoll2.Text = "" Then txtTimeZoll2.Text = Date.Now.ToString("HH:mm")
+            If txtDurationZoll2.Text = "" Then txtDurationZoll2.Text = "00:00"
+        Else
+
+            txtDurationZoll2.Enabled = False
+            txtTimeZoll2.Enabled = False
+            txtTimeZoll2.Text = ""
+            txtDurationZoll2.Text = ""
+        End If
+    End Sub
+
+
+
+    Private Sub cbxzusätzlichePosition_CheckedChanged(sender As Object, e As EventArgs) Handles cbxzusätzlichePosition.CheckedChanged
+        If cbxzusätzlichePosition.Checked Then
+
+            txtzusPosPreis.Enabled = True
+            txtzusPosText.Enabled = True
+        Else
+            txtzusPosPreis.Enabled = False
+            txtzusPosText.Enabled = False
+            txtzusPosPreis.Text = ""
+            txtzusPosText.Text = ""
+        End If
+
+    End Sub
 End Class

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -3588,6 +3588,7 @@ Public Class FormularManagerNEU
 
         Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
         Dim top = 3
+        Dim preisStandard As Double = 60
         listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartnerVERAG.Text, 145, 47 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
         listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFilialNr.Text & "/" & usrCntl.txtAbfNr.Text, 40, 47 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
         listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtT1.Text, 145, 52 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
@@ -3606,19 +3607,45 @@ Public Class FormularManagerNEU
         listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtLKWKennz.Text, 135, 88 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
         listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 135, 93 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
 
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(IIf(usrCntl.txtZoll1Date.Text <> "", usrCntl.txtZoll1Date.Text & " " & usrCntl.txtTimeZoll1.Text, ""), 135, 97 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        Dim newTimeZoll1 As DateTime
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(IIf(usrCntl.txtZoll2Date.Text <> "", usrCntl.txtZoll2Date.Text & " " & usrCntl.txtTimeZoll2.Text, ""), 135, 102 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        If usrCntl.txtDurationZoll1.Text <> "" Then
+            newTimeZoll1 = DateTime.ParseExact(usrCntl.txtTimeZoll1.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
+            Dim newDuration As DateTime
+            newDuration = DateTime.ParseExact(usrCntl.txtDurationZoll1.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
+            newTimeZoll1 = newTimeZoll1.AddHours(newDuration.ToString("HH"))
+            newTimeZoll1 = newTimeZoll1.AddMinutes(newDuration.ToString("mm"))
+        End If
+
+        Dim newTimeZoll2 As DateTime
+        If usrCntl.txtDurationZoll2.Text <> "" Then
+            newTimeZoll2 = DateTime.ParseExact(usrCntl.txtTimeZoll2.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
+            Dim newDuration As DateTime
+            newDuration = DateTime.ParseExact(usrCntl.txtDurationZoll2.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
+            newTimeZoll2 = newTimeZoll2.AddHours(newDuration.ToString("HH"))
+            newTimeZoll2 = newTimeZoll2.AddMinutes(newDuration.ToString("mm"))
+        End If
+
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(IIf(usrCntl.txtZoll1Date.Text <> "", usrCntl.txtZoll1Date.Text & " ", "") & IIf(usrCntl.txtTimeZoll1.Text <> "" AndAlso usrCntl.txtDurationZoll1.Text <> "", usrCntl.txtTimeZoll1.Text & " - " & newTimeZoll1.ToString("HH:mm"), ""), 135, 98 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(IIf(usrCntl.txtZoll1Date.Text <> "", usrCntl.txtZoll2Date.Text & " ", "") & IIf(usrCntl.txtTimeZoll2.Text <> "" AndAlso usrCntl.txtDurationZoll2.Text <> "", usrCntl.txtTimeZoll2.Text & " - " & newTimeZoll2.ToString("HH:mm"), ""), 135, 103 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
 
         'Sendungsdaten
 
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnzVerp.Text, 130, 130 + top, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnzVerp.Text, 130, 131 + top, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtGewicht.Text, 160, 130 + top, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtGewicht.Text, 157, 131 + top, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtWarenbez.Text, 42, 146 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtWarenbez.Text, 41, 146 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
 
 
         'Tabelle
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("60 €", 122, 151 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(preisStandard & " €", 122, 151 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("60 €", 122, 199 + top, 200, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
+
+        If usrCntl.cbxzusätzlichePosition.Checked Then
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("10", 27, 199 + top, 110, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(IIf(usrCntl.txtzusPosText.Text <> "", usrCntl.txtzusPosText.Text, ""), 41, 199 + top, 110, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
+            listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(IIf(usrCntl.txtzusPosPreis.Text <> "", usrCntl.txtzusPosPreis.Text & " €", ""), 122, 199 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
+
+        End If
+
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(IIf(usrCntl.txtzusPosPreis.Text <> "", usrCntl.txtzusPosPreis.Text + preisStandard & " €", preisStandard & " €"), 122, 203 + top, 200, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
 
         Dim ort As String = ""
 

VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagen.Designer.vb

@@ -26,8 +26,11 @@ Partial Class frmVorlagen
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmVorlagen))
         Me.Label1 = New System.Windows.Forms.Label()
         Me.btnUpload = New System.Windows.Forms.Button()
-        Me.dgvVolagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Button1 = New System.Windows.Forms.Button()
+        Me.txtSuche = New System.Windows.Forms.TextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.lblCount = New System.Windows.Forms.Label()
+        Me.dgvVolagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         CType(Me.dgvVolagen, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -51,19 +54,6 @@ Partial Class frmVorlagen
         Me.btnUpload.Text = "Neue Vorlage"
         Me.btnUpload.UseVisualStyleBackColor = True
         '
-        'dgvVolagen
-        '
-        Me.dgvVolagen.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvVolagen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvVolagen.Location = New System.Drawing.Point(11, 31)
-        Me.dgvVolagen.MultiSelect = False
-        Me.dgvVolagen.Name = "dgvVolagen"
-        Me.dgvVolagen.ReadOnly = True
-        Me.dgvVolagen.RowHeadersVisible = False
-        Me.dgvVolagen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvVolagen.Size = New System.Drawing.Size(1094, 572)
-        Me.dgvVolagen.TabIndex = 9
-        '
         'Button1
         '
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -74,12 +64,56 @@ Partial Class frmVorlagen
         Me.Button1.Text = "Vorlage Ändern"
         Me.Button1.UseVisualStyleBackColor = True
         '
+        'txtSuche
+        '
+        Me.txtSuche.Location = New System.Drawing.Point(996, 8)
+        Me.txtSuche.Name = "txtSuche"
+        Me.txtSuche.Size = New System.Drawing.Size(109, 20)
+        Me.txtSuche.TabIndex = 11
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.BackColor = System.Drawing.Color.White
+        Me.Label2.Location = New System.Drawing.Point(924, 11)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(64, 13)
+        Me.Label2.TabIndex = 12
+        Me.Label2.Text = "Suchbegriff:"
+        '
+        'lblCount
+        '
+        Me.lblCount.AutoSize = True
+        Me.lblCount.BackColor = System.Drawing.Color.White
+        Me.lblCount.Location = New System.Drawing.Point(1077, 609)
+        Me.lblCount.Name = "lblCount"
+        Me.lblCount.Size = New System.Drawing.Size(28, 13)
+        Me.lblCount.TabIndex = 13
+        Me.lblCount.Text = "Text"
+        Me.lblCount.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'dgvVolagen
+        '
+        Me.dgvVolagen.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvVolagen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvVolagen.Location = New System.Drawing.Point(11, 34)
+        Me.dgvVolagen.MultiSelect = False
+        Me.dgvVolagen.Name = "dgvVolagen"
+        Me.dgvVolagen.ReadOnly = True
+        Me.dgvVolagen.RowHeadersVisible = False
+        Me.dgvVolagen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvVolagen.Size = New System.Drawing.Size(1094, 569)
+        Me.dgvVolagen.TabIndex = 9
+        '
         'frmVorlagen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
         Me.ClientSize = New System.Drawing.Size(1117, 665)
+        Me.Controls.Add(Me.lblCount)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.txtSuche)
         Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.dgvVolagen)
         Me.Controls.Add(Me.btnUpload)
@@ -97,4 +131,7 @@ Partial Class frmVorlagen
     Friend WithEvents btnUpload As System.Windows.Forms.Button
     Friend WithEvents dgvVolagen As VERAG_PROG_ALLGEMEIN.MyDatagridview
     Friend WithEvents Button1 As System.Windows.Forms.Button
+    Friend WithEvents txtSuche As Windows.Forms.TextBox
+    Friend WithEvents Label2 As Windows.Forms.Label
+    Friend WithEvents lblCount As Windows.Forms.Label
 End Class

VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagen.vb

@@ -2,29 +2,29 @@
 
 Public Class frmVorlagen
 
-
-
-
     Private Sub btnUpload_Click(sender As Object, e As EventArgs) Handles btnUpload.Click
         Dim vu As New VERAG_PROG_ALLGEMEIN.frmVorlagenUpload
         vu.ShowDialog()
 
-
-
     End Sub
 
     Private Sub frmVorlagenUpload_Load(sender As Object, e As EventArgs) Handles Me.Load
         initDGV()
     End Sub
-    Sub initDGV()
+    Sub initDGV(Optional searchstring As String = "")
+        Dim SQLString = ""
+        If searchstring <> "" Then
+            SQLString = " AND ([da_kategorie] like '%" & searchstring & "%' OR [da_vorlage]  like '%" & searchstring & "%' OR [da_ordner] like '%" & searchstring & "%' OR [da_uOrdner1]  like '%" & searchstring & "%' OR [da_uOrdner2]like '%" & searchstring & "%' OR [da_uOrdner3]like '%" & searchstring & "%' OR [da_name]  like '%" & searchstring & "%')"
+        End If
         With dgvVolagen
             .Columns.Clear()
-            .SET_SQL("SELECT [da_id],[da_kategorie],[da_ordner] ,[da_name],da_uOrdner1,da_uOrdner2,da_uOrdner3   FROM [tblDatenarchiv]  where da_vorlage=1", "FMZOLL")
+            .SET_SQL("SELECT [da_id],[da_kategorie],[da_ordner] ,[da_name],da_uOrdner1,da_uOrdner2,da_uOrdner3   FROM [tblDatenarchiv]  where da_vorlage=1" & SQLString, "FMZOLL")
             .LOAD()
             If .ColumnCount > 0 Then
                 '.Columns("da_uOrdner1").Visible = False
                 .Columns("da_name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
             End If
+            lblCount.Text = "Anzahl Datensätze" & dgvVolagen.Rows.Count
         End With
     End Sub
 
@@ -53,4 +53,17 @@ Public Class frmVorlagen
             MsgBox(ex.Message)
         End Try
     End Sub
+
+    Private Sub txtSuche_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSuche.KeyDown
+        If e.KeyCode = Keys.Enter Then
+            If txtSuche.Text <> "" Then
+                Me.initDGV(txtSuche.Text)
+                e.Handled = True
+            Else
+                Me.initDGV()
+                e.Handled = True
+            End If
+
+        End If
+    End Sub
 End Class