diff --git a/SDL/kunden/usrcntlVertraege.Designer.vb b/SDL/kunden/usrcntlVertraege.Designer.vb index 38b9abca..34480f44 100644 --- a/SDL/kunden/usrcntlVertraege.Designer.vb +++ b/SDL/kunden/usrcntlVertraege.Designer.vb @@ -22,9 +22,9 @@ Partial Class usrcntlVertraege 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Me.dgvVertraege = New System.Windows.Forms.DataGridView() + Me.components = New System.ComponentModel.Container() Me.Panel1 = New System.Windows.Forms.Panel() + Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.Button11 = New System.Windows.Forms.Button() Me.Button12 = New System.Windows.Forms.Button() Me.txtVertragVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -33,31 +33,12 @@ Partial Class usrcntlVertraege Me.cboVertrag = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.datVertrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label4 = New System.Windows.Forms.Label() - Me.PictureBox1 = New System.Windows.Forms.PictureBox() - CType(Me.dgvVertraege, System.ComponentModel.ISupportInitialize).BeginInit() + Me.dgvVertraegeNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel1.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvVertraegeNew, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'dgvVertraege - ' - Me.dgvVertraege.AllowUserToAddRows = False - Me.dgvVertraege.AllowUserToDeleteRows = False - Me.dgvVertraege.AllowUserToOrderColumns = True - Me.dgvVertraege.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White - Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvVertraege.Location = New System.Drawing.Point(0, 0) - Me.dgvVertraege.MultiSelect = False - Me.dgvVertraege.Name = "dgvVertraege" - Me.dgvVertraege.ReadOnly = True - Me.dgvVertraege.RowHeadersVisible = False - Me.dgvVertraege.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvVertraege.Size = New System.Drawing.Size(495, 97) - Me.dgvVertraege.TabIndex = 9 - ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.White @@ -76,6 +57,17 @@ Partial Class usrcntlVertraege Me.Panel1.Size = New System.Drawing.Size(495, 46) Me.Panel1.TabIndex = 10 ' + 'PictureBox1 + ' + Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.Resources.pdf + Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox1.Location = New System.Drawing.Point(473, 0) + Me.PictureBox1.Name = "PictureBox1" + Me.PictureBox1.Size = New System.Drawing.Size(22, 19) + Me.PictureBox1.TabIndex = 8 + Me.PictureBox1.TabStop = False + Me.PictureBox1.Visible = False + ' 'Button11 ' Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -191,33 +183,34 @@ Partial Class usrcntlVertraege Me.Label4.TabIndex = 0 Me.Label4.Text = "Vertrag:" ' - 'PictureBox1 + 'dgvVertraegeNew ' - Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.Resources.pdf - Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox1.Location = New System.Drawing.Point(473, 0) - Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(22, 19) - Me.PictureBox1.TabIndex = 8 - Me.PictureBox1.TabStop = False - Me.PictureBox1.Visible = False + Me.dgvVertraegeNew.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvVertraegeNew.AllowUserToDeleteRows = False + Me.dgvVertraegeNew.AllowUserToOrderColumns = True + Me.dgvVertraegeNew.AllowUserToResizeRows = False + Me.dgvVertraegeNew.BackgroundColor = System.Drawing.Color.White + Me.dgvVertraegeNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvVertraegeNew.Location = New System.Drawing.Point(0, 0) + Me.dgvVertraegeNew.Name = "dgvVertraegeNew" + Me.dgvVertraegeNew.Size = New System.Drawing.Size(492, 97) + Me.dgvVertraegeNew.TabIndex = 11 ' 'usrcntlVertraege ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.dgvVertraegeNew) Me.Controls.Add(Me.Panel1) - Me.Controls.Add(Me.dgvVertraege) Me.Name = "usrcntlVertraege" Me.Size = New System.Drawing.Size(495, 146) - CType(Me.dgvVertraege, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvVertraegeNew, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub - Public WithEvents dgvVertraege As DataGridView Friend WithEvents Panel1 As Panel Public WithEvents Button11 As Button Friend WithEvents Button12 As Button @@ -228,4 +221,5 @@ Partial Class usrcntlVertraege Friend WithEvents datVertrag As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label4 As Label Friend WithEvents PictureBox1 As PictureBox + Public WithEvents dgvVertraegeNew As VERAG_PROG_ALLGEMEIN.MyDatagridview End Class diff --git a/SDL/kunden/usrcntlVertraege.vb b/SDL/kunden/usrcntlVertraege.vb index d57e2fc1..32678101 100644 --- a/SDL/kunden/usrcntlVertraege.vb +++ b/SDL/kunden/usrcntlVertraege.vb @@ -1,6 +1,4 @@ -Imports com.esendex.sdk.surveys.models -Imports sun.swing -Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN Public Class usrcntlVertraege @@ -10,18 +8,18 @@ Public Class usrcntlVertraege Public Vid = -1 Public Shared Event clickOK(ByVal sender As System.Object, ByVal e As System.EventArgs) - Private Sub dgvVertraege_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVertraege.CellContentDoubleClick - If dgvVertraege.SelectedRows.Count = 1 Then - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVertraege.SelectedRows(0).Cells("kv_datenarchivId").Value) + Private Sub dgvVertraege_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVertraegeNew.CellContentDoubleClick + If dgvVertraegeNew.SelectedRows.Count = 1 Then + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVertraegeNew.SelectedRows(0).Cells("kv_datenarchivId").Value) DS.OPEN_SINGLE() End If End Sub - Private Sub dgvVertraege_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvVertraege.CellMouseClick + Private Sub dgvVertraege_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvVertraegeNew.CellMouseClick If e.RowIndex < 0 Then Exit Sub DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True If e.Button = Windows.Forms.MouseButtons.Right Then - If dgvVertraege.SelectedRows.Count > 0 Then + If dgvVertraegeNew.SelectedRows.Count > 0 Then 'ContextMenuStrip4.Show(Cursor.Position) End If End If @@ -54,8 +52,8 @@ Public Class usrcntlVertraege If cboVertrag._value <> "" And datVertrag._value <> "" Then Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege If Button12.Visible Then - If dgvVertraege.SelectedRows.Count = 1 Then - KV = New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraege.SelectedRows(0).Cells("kv_id").Value) + If dgvVertraegeNew.SelectedRows.Count = 1 Then + KV = New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraegeNew.SelectedRows(0).Cells("kv_id").Value) Else Exit Sub End If @@ -69,7 +67,7 @@ Public Class usrcntlVertraege If KV.SAVEOBJECT Then If PDF_Attach_TMP <> "" Then - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & dgvVertraege.SelectedRows(0).Cells("kv_id").Value, kdnr) + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & dgvVertraegeNew.SelectedRows(0).Cells("kv_id").Value, kdnr) If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then KV.kv_datenarchivId = DS.da_id KV.SAVE() @@ -96,8 +94,8 @@ Public Class usrcntlVertraege If cboVertrag._value <> "" And datVertrag._value <> "" Then Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege If Button12.Visible Then - If dgvVertraege.SelectedRows.Count = 1 Then - KV = New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraege.SelectedRows(0).Cells("kv_id").Value) + If dgvVertraegeNew.SelectedRows.Count = 1 Then + KV = New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraegeNew.SelectedRows(0).Cells("kv_id").Value) Else Exit Sub End If @@ -125,7 +123,7 @@ Public Class usrcntlVertraege PictureBox1.Visible = PDF_Attach_TMP <> "" - With dgvVertraege + With dgvVertraegeNew .Columns.Clear() If kdnr = -1 Or kdnr Is Nothing Then Exit Sub @@ -179,10 +177,10 @@ Public Class usrcntlVertraege Private Sub markDGVVertraege(Optional vid As Integer = 0) - dgvVertraege.ClearSelection() + dgvVertraegeNew.ClearSelection() If vid > 0 Then - For Each row As DataGridViewRow In dgvVertraege.Rows + For Each row As DataGridViewRow In dgvVertraegeNew.Rows If row.Cells("kv_Id").Value = vid Then row.Selected = True End If diff --git a/SDL/usrcntlGestellungsgarantien.Designer.vb b/SDL/usrcntlGestellungsgarantien.Designer.vb index e0847bbe..5bffced6 100644 --- a/SDL/usrcntlGestellungsgarantien.Designer.vb +++ b/SDL/usrcntlGestellungsgarantien.Designer.vb @@ -22,8 +22,7 @@ Partial Class usrcntlGestellungsgarantien 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Me.dgvGestGarantie = New System.Windows.Forms.DataGridView() + Me.components = New System.ComponentModel.Container() Me.Panel2 = New System.Windows.Forms.Panel() Me.cbxGG = New System.Windows.Forms.CheckBox() Me.txtGGDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -31,29 +30,11 @@ Partial Class usrcntlGestellungsgarantien Me.Label11 = New System.Windows.Forms.Label() Me.Button8 = New System.Windows.Forms.Button() Me.Button9 = New System.Windows.Forms.Button() - CType(Me.dgvGestGarantie, System.ComponentModel.ISupportInitialize).BeginInit() + Me.dgvGestGarantieNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel2.SuspendLayout() + CType(Me.dgvGestGarantieNew, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'dgvGestGarantie - ' - Me.dgvGestGarantie.AllowUserToAddRows = False - Me.dgvGestGarantie.AllowUserToDeleteRows = False - Me.dgvGestGarantie.AllowUserToOrderColumns = True - Me.dgvGestGarantie.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White - Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvGestGarantie.Location = New System.Drawing.Point(3, 3) - Me.dgvGestGarantie.MultiSelect = False - Me.dgvGestGarantie.Name = "dgvGestGarantie" - Me.dgvGestGarantie.ReadOnly = True - Me.dgvGestGarantie.RowHeadersVisible = False - Me.dgvGestGarantie.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvGestGarantie.Size = New System.Drawing.Size(506, 102) - Me.dgvGestGarantie.TabIndex = 13 - ' 'Panel2 ' Me.Panel2.BackColor = System.Drawing.Color.White @@ -166,22 +147,33 @@ Partial Class usrcntlGestellungsgarantien Me.Button9.UseVisualStyleBackColor = True Me.Button9.Visible = False ' + 'dgvGestGarantieNew + ' + Me.dgvGestGarantieNew.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvGestGarantieNew.AllowUserToAddRows = False + Me.dgvGestGarantieNew.AllowUserToDeleteRows = False + Me.dgvGestGarantieNew.AllowUserToResizeRows = False + Me.dgvGestGarantieNew.BackgroundColor = System.Drawing.Color.White + Me.dgvGestGarantieNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvGestGarantieNew.Location = New System.Drawing.Point(0, 0) + Me.dgvGestGarantieNew.Name = "dgvGestGarantieNew" + Me.dgvGestGarantieNew.Size = New System.Drawing.Size(506, 105) + Me.dgvGestGarantieNew.TabIndex = 15 + ' 'usrcntlGestellungsgarantien ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.dgvGestGarantieNew) Me.Controls.Add(Me.Panel2) - Me.Controls.Add(Me.dgvGestGarantie) Me.Name = "usrcntlGestellungsgarantien" Me.Size = New System.Drawing.Size(509, 153) - CType(Me.dgvGestGarantie, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() + CType(Me.dgvGestGarantieNew, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub - - Public WithEvents dgvGestGarantie As DataGridView Friend WithEvents Panel2 As Panel Friend WithEvents cbxGG As CheckBox Friend WithEvents txtGGDatum As VERAG_PROG_ALLGEMEIN.MyTextBox @@ -189,4 +181,5 @@ Partial Class usrcntlGestellungsgarantien Friend WithEvents Label11 As Label Friend WithEvents Button8 As Button Friend WithEvents Button9 As Button + Public WithEvents dgvGestGarantieNew As VERAG_PROG_ALLGEMEIN.MyDatagridview End Class diff --git a/SDL/usrcntlGestellungsgarantien.vb b/SDL/usrcntlGestellungsgarantien.vb index 3416fe1c..cff6d133 100644 --- a/SDL/usrcntlGestellungsgarantien.vb +++ b/SDL/usrcntlGestellungsgarantien.vb @@ -13,7 +13,7 @@ kdnr = _kdnr - With dgvGestGarantie + With dgvGestGarantieNew .Columns.Clear() If kdnr = -1 Then Exit Sub @@ -54,8 +54,8 @@ If (txtT1VerzollungsadresseBestimmungszollstelle._value <> "" Or cbxGG.Checked) And txtGGDatum._value <> "" Then Dim GG As New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien If Button9.Visible Then - If dgvGestGarantie.SelectedRows.Count = 1 Then - GG = New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien(dgvGestGarantie.SelectedRows(0).Cells("gg_id").Value) + If dgvGestGarantieNew.SelectedRows.Count = 1 Then + GG = New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien(dgvGestGarantieNew.SelectedRows(0).Cells("gg_id").Value) Else Exit Sub End If @@ -108,9 +108,9 @@ End Sub - Private Sub dgvGestGarantie_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGestGarantie.CellContentDoubleClick - If dgvGestGarantie.SelectedRows.Count = 1 Then - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvGestGarantie.SelectedRows(0).Cells("gg_datenarchivId").Value) + Private Sub dgvGestGarantie_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGestGarantieNew.CellContentDoubleClick + If dgvGestGarantieNew.SelectedRows.Count = 1 Then + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvGestGarantieNew.SelectedRows(0).Cells("gg_datenarchivId").Value) DS.OPEN_SINGLE() End If End Sub @@ -118,10 +118,10 @@ Private Sub markDGVGestGarantie(Optional gid As Integer = 0) - dgvGestGarantie.ClearSelection() + dgvGestGarantieNew.ClearSelection() If gid > 0 Then - For Each row As DataGridViewRow In dgvGestGarantie.Rows + For Each row As DataGridViewRow In dgvGestGarantieNew.Rows If row.Cells("gg_Id").Value = gid Then row.Selected = True End If