diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 0b7b6f9b..c01c4e4e 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/kunden/usrCntlLKW.Designer.vb b/SDL/kunden/usrCntlLKW.Designer.vb index 968c358e..8687f1f4 100644 --- a/SDL/kunden/usrCntlLKW.Designer.vb +++ b/SDL/kunden/usrCntlLKW.Designer.vb @@ -23,7 +23,7 @@ Partial Class usrCntlLKW _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.btnPrevLKW = New System.Windows.Forms.Button() Me.btnNextLKW = New System.Windows.Forms.Button() Me.dgvSDLLeistungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) @@ -52,6 +52,8 @@ Partial Class usrCntlLKW Me.Label7 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.scanCIFDokument = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() + Me.scanCOCDokument = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.scanMietVertrag = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanZulassungsschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() @@ -91,17 +93,17 @@ Partial Class usrCntlLKW 'dgvSDLLeistungen ' Me.dgvSDLLeistungen.AKTUALISIERUNGS_INTERVALL = 1000 - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSDLLeistungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSDLLeistungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvSDLLeistungen.BackgroundColor = System.Drawing.Color.White Me.dgvSDLLeistungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvSDLLeistungen.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvSDLLeistungen.Location = New System.Drawing.Point(0, 76) + Me.dgvSDLLeistungen.Location = New System.Drawing.Point(0, 80) Me.dgvSDLLeistungen.MultiSelect = False Me.dgvSDLLeistungen.Name = "dgvSDLLeistungen" Me.dgvSDLLeistungen.ReadOnly = True Me.dgvSDLLeistungen.RowTemplate.Height = 20 - Me.dgvSDLLeistungen.Size = New System.Drawing.Size(848, 281) + Me.dgvSDLLeistungen.Size = New System.Drawing.Size(998, 277) Me.dgvSDLLeistungen.TabIndex = 145 ' 'cntxtSDLLeistungenOptions @@ -181,7 +183,7 @@ Partial Class usrCntlLKW Me.pnlSDLLeistungenDetails.Dock = System.Windows.Forms.DockStyle.Bottom Me.pnlSDLLeistungenDetails.Location = New System.Drawing.Point(0, 357) Me.pnlSDLLeistungenDetails.Name = "pnlSDLLeistungenDetails" - Me.pnlSDLLeistungenDetails.Size = New System.Drawing.Size(848, 220) + Me.pnlSDLLeistungenDetails.Size = New System.Drawing.Size(998, 220) Me.pnlSDLLeistungenDetails.TabIndex = 149 ' 'Label4 @@ -288,7 +290,7 @@ Partial Class usrCntlLKW Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(848, 76) + Me.pnl.Size = New System.Drawing.Size(998, 80) Me.pnl.TabIndex = 155 ' 'tbcntrLKW @@ -302,7 +304,7 @@ Partial Class usrCntlLKW Me.tbcntrLKW.Location = New System.Drawing.Point(278, 0) Me.tbcntrLKW.Name = "tbcntrLKW" Me.tbcntrLKW.SelectedIndex = 0 - Me.tbcntrLKW.Size = New System.Drawing.Size(570, 76) + Me.tbcntrLKW.Size = New System.Drawing.Size(720, 80) Me.tbcntrLKW.TabIndex = 156 ' 'TabPage1 @@ -319,7 +321,7 @@ Partial Class usrCntlLKW Me.TabPage1.Location = New System.Drawing.Point(4, 19) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(562, 53) + Me.TabPage1.Size = New System.Drawing.Size(712, 57) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Details" Me.TabPage1.UseVisualStyleBackColor = True @@ -353,6 +355,8 @@ Partial Class usrCntlLKW ' 'TabPage2 ' + Me.TabPage2.Controls.Add(Me.scanCIFDokument) + Me.TabPage2.Controls.Add(Me.scanCOCDokument) Me.TabPage2.Controls.Add(Me.scanMietVertrag) Me.TabPage2.Controls.Add(Me.scanSonstiges) Me.TabPage2.Controls.Add(Me.scanZulassungsschein) @@ -361,11 +365,51 @@ Partial Class usrCntlLKW Me.TabPage2.Location = New System.Drawing.Point(4, 19) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(562, 53) + Me.TabPage2.Size = New System.Drawing.Size(712, 57) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Dokumente" Me.TabPage2.UseVisualStyleBackColor = True ' + 'scanCIFDokument + ' + Me.scanCIFDokument._ARCHIV = True + Me.scanCIFDokument._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanCIFDokument._DATENSERVER_ORDNER = "MDM" + Me.scanCIFDokument._DATENSERVER_UOrdner1 = Nothing + Me.scanCIFDokument._DATENSERVER_UOrdner2 = Nothing + Me.scanCIFDokument._DATENSERVER_UOrdner3 = Nothing + Me.scanCIFDokument._MULTI_FILES = True + Me.scanCIFDokument._TEXT_PDF = "CIF-Dokument" + Me.scanCIFDokument.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanCIFDokument.BackColor = System.Drawing.Color.White + Me.scanCIFDokument.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanCIFDokument.Cursor = System.Windows.Forms.Cursors.Default + Me.scanCIFDokument.Enabled = False + Me.scanCIFDokument.Location = New System.Drawing.Point(270, 29) + Me.scanCIFDokument.Name = "scanCIFDokument" + Me.scanCIFDokument.Size = New System.Drawing.Size(126, 22) + Me.scanCIFDokument.TabIndex = 165 + ' + 'scanCOCDokument + ' + Me.scanCOCDokument._ARCHIV = True + Me.scanCOCDokument._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanCOCDokument._DATENSERVER_ORDNER = "MDM" + Me.scanCOCDokument._DATENSERVER_UOrdner1 = Nothing + Me.scanCOCDokument._DATENSERVER_UOrdner2 = Nothing + Me.scanCOCDokument._DATENSERVER_UOrdner3 = Nothing + Me.scanCOCDokument._MULTI_FILES = True + Me.scanCOCDokument._TEXT_PDF = "COC-Dokument" + Me.scanCOCDokument.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanCOCDokument.BackColor = System.Drawing.Color.White + Me.scanCOCDokument.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanCOCDokument.Cursor = System.Windows.Forms.Cursors.Default + Me.scanCOCDokument.Enabled = False + Me.scanCOCDokument.Location = New System.Drawing.Point(270, 6) + Me.scanCOCDokument.Name = "scanCOCDokument" + Me.scanCOCDokument.Size = New System.Drawing.Size(126, 22) + Me.scanCOCDokument.TabIndex = 164 + ' 'scanMietVertrag ' Me.scanMietVertrag._ARCHIV = True @@ -400,10 +444,10 @@ Partial Class usrCntlLKW Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.scanSonstiges.Cursor = System.Windows.Forms.Cursors.Default Me.scanSonstiges.Enabled = False - Me.scanSonstiges.Location = New System.Drawing.Point(267, 3) + Me.scanSonstiges.Location = New System.Drawing.Point(410, 0) Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0) Me.scanSonstiges.Name = "scanSonstiges" - Me.scanSonstiges.Size = New System.Drawing.Size(292, 48) + Me.scanSonstiges.Size = New System.Drawing.Size(299, 58) Me.scanSonstiges.TabIndex = 162 ' 'scanZulassungsschein @@ -478,7 +522,7 @@ Partial Class usrCntlLKW Me.Controls.Add(Me.pnlSDLLeistungenDetails) Me.MaximumSize = New System.Drawing.Size(1000, 1000) Me.Name = "usrCntlLKW" - Me.Size = New System.Drawing.Size(848, 577) + Me.Size = New System.Drawing.Size(998, 577) CType(Me.dgvSDLLeistungen, System.ComponentModel.ISupportInitialize).EndInit() Me.cntxtSDLLeistungenOptions.ResumeLayout(False) Me.pnlSDLLeistungenDetails.ResumeLayout(False) @@ -527,4 +571,6 @@ Partial Class usrCntlLKW Friend WithEvents TabPage1 As System.Windows.Forms.TabPage Friend WithEvents TabPage2 As System.Windows.Forms.TabPage Friend WithEvents scanMietVertrag As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan + Friend WithEvents scanCIFDokument As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan + Friend WithEvents scanCOCDokument As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan End Class diff --git a/SDL/kunden/usrCntlLKW.vb b/SDL/kunden/usrCntlLKW.vb index 713b5ff5..f7579284 100644 --- a/SDL/kunden/usrCntlLKW.vb +++ b/SDL/kunden/usrCntlLKW.vb @@ -83,6 +83,8 @@ Public Class usrCntlLKW scanLeasingVertrag.INIT(kdnr, Me.kz) scanMietVertrag.INIT(kdnr, Me.kz) scanSonstiges.INIT(kdnr, Me.kz) + scanCOCDokument.INIT(kdnr, Me.kz) + scanCIFDokument.INIT(kdnr, Me.kz) scanZulassungsschein.Enabled = True scanCEMT.Enabled = True @@ -90,6 +92,8 @@ Public Class usrCntlLKW scanMietVertrag.Enabled = True scanSonstiges.Enabled = True + scanCOCDokument.Enabled = True + scanCIFDokument.Enabled = True ' AddHandler btnNextSDL.Click, AddressOf nextLKW diff --git a/SDL/mdm/Bestellung/frmSDLBestellungEintrag.vb b/SDL/mdm/Bestellung/frmSDLBestellungEintrag.vb index 1164d56c..ac97ce7c 100644 --- a/SDL/mdm/Bestellung/frmSDLBestellungEintrag.vb +++ b/SDL/mdm/Bestellung/frmSDLBestellungEintrag.vb @@ -319,7 +319,7 @@ Public Class frmSDLBestellungEintrag Select Case If(IsNumeric(cboSDLNr._value), cboSDLNr._value, -1) Case 500 - Mail.To = If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "al@verag.ag", "office@mtruck.at") + Mail.To = If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "al@verag.ag", "david.reisinger@mtruck.at") 'office@mtruck.at Mail.HTMLBody = "" Mail.HTMLBody &= "Sehr geehrte Damen und Herren," diff --git a/SDL/mdm/SDLAbholung/frmSDLAbholung.Designer.vb b/SDL/mdm/SDLAbholung/frmSDLAbholung.Designer.vb index d2b736b0..6e1664ea 100644 --- a/SDL/mdm/SDLAbholung/frmSDLAbholung.Designer.vb +++ b/SDL/mdm/SDLAbholung/frmSDLAbholung.Designer.vb @@ -44,6 +44,7 @@ Partial Class frmSDLAbholung Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmSDLAbholung" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.WindowState = FormWindowState.Maximized Me.Text = "SDL Abholung" Me.ResumeLayout(False) diff --git a/SDL/mdm/SDLAbholung/usrCntlSDLAbholung.Designer.vb b/SDL/mdm/SDLAbholung/usrCntlSDLAbholung.Designer.vb index 2c08d9f9..ba1060a7 100644 --- a/SDL/mdm/SDLAbholung/usrCntlSDLAbholung.Designer.vb +++ b/SDL/mdm/SDLAbholung/usrCntlSDLAbholung.Designer.vb @@ -23,7 +23,7 @@ Partial Class usrCntlSDLAbholung _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlBH = New System.Windows.Forms.Panel() Me.Button1 = New System.Windows.Forms.Button() Me.btnBuchungAufheben = New System.Windows.Forms.Button() @@ -97,9 +97,10 @@ Partial Class usrCntlSDLAbholung ' 'pnlBH ' + Me.pnlBH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.pnlBH.BackColor = System.Drawing.SystemColors.Control Me.pnlBH.Controls.Add(Me.Button1) - Me.pnlBH.Location = New System.Drawing.Point(319, 0) + Me.pnlBH.Location = New System.Drawing.Point(397, 0) Me.pnlBH.Name = "pnlBH" Me.pnlBH.Size = New System.Drawing.Size(216, 56) Me.pnlBH.TabIndex = 2 @@ -119,11 +120,12 @@ Partial Class usrCntlSDLAbholung ' 'btnBuchungAufheben ' + Me.btnBuchungAufheben.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnBuchungAufheben.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnBuchungAufheben.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnBuchungAufheben.Image = Global.SDL.My.Resources.Resources.del_small Me.btnBuchungAufheben.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnBuchungAufheben.Location = New System.Drawing.Point(324, 56) + Me.btnBuchungAufheben.Location = New System.Drawing.Point(402, 56) Me.btnBuchungAufheben.Name = "btnBuchungAufheben" Me.btnBuchungAufheben.Size = New System.Drawing.Size(130, 21) Me.btnBuchungAufheben.TabIndex = 1 @@ -148,10 +150,12 @@ Partial Class usrCntlSDLAbholung Me.txtBemerkung._DateTimeOnly = False Me.txtBemerkung._numbersOnly = False Me.txtBemerkung._numbersOnlyKommastellen = "" + Me.txtBemerkung._numbersOnlyTrennzeichen = True Me.txtBemerkung._Prozent = False Me.txtBemerkung._ShortDateNew = False Me.txtBemerkung._ShortDateOnly = False Me.txtBemerkung._TimeOnly = False + Me.txtBemerkung._TimeOnly_Seconds = False Me.txtBemerkung._value = Nothing Me.txtBemerkung._Waehrung = False Me.txtBemerkung._WaehrungZeichen = True @@ -195,10 +199,12 @@ Partial Class usrCntlSDLAbholung Me.txtFirma._DateTimeOnly = False Me.txtFirma._numbersOnly = False Me.txtFirma._numbersOnlyKommastellen = "" + Me.txtFirma._numbersOnlyTrennzeichen = True Me.txtFirma._Prozent = False Me.txtFirma._ShortDateNew = False Me.txtFirma._ShortDateOnly = False Me.txtFirma._TimeOnly = False + Me.txtFirma._TimeOnly_Seconds = False Me.txtFirma._value = Nothing Me.txtFirma._Waehrung = False Me.txtFirma._WaehrungZeichen = True @@ -227,10 +233,12 @@ Partial Class usrCntlSDLAbholung Me.txtLKW._DateTimeOnly = False Me.txtLKW._numbersOnly = False Me.txtLKW._numbersOnlyKommastellen = "" + Me.txtLKW._numbersOnlyTrennzeichen = True Me.txtLKW._Prozent = False Me.txtLKW._ShortDateNew = False Me.txtLKW._ShortDateOnly = False Me.txtLKW._TimeOnly = False + Me.txtLKW._TimeOnly_Seconds = False Me.txtLKW._value = Nothing Me.txtLKW._Waehrung = False Me.txtLKW._WaehrungZeichen = True @@ -273,10 +281,12 @@ Partial Class usrCntlSDLAbholung Me.txtAbfertDatBis._DateTimeOnly = False Me.txtAbfertDatBis._numbersOnly = False Me.txtAbfertDatBis._numbersOnlyKommastellen = "" + Me.txtAbfertDatBis._numbersOnlyTrennzeichen = True Me.txtAbfertDatBis._Prozent = False Me.txtAbfertDatBis._ShortDateNew = True Me.txtAbfertDatBis._ShortDateOnly = False Me.txtAbfertDatBis._TimeOnly = False + Me.txtAbfertDatBis._TimeOnly_Seconds = False Me.txtAbfertDatBis._value = "" Me.txtAbfertDatBis._Waehrung = False Me.txtAbfertDatBis._WaehrungZeichen = True @@ -293,11 +303,12 @@ Partial Class usrCntlSDLAbholung ' 'Button3 ' + Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.Button3.Image = Global.SDL.My.Resources.Resources.del_small Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button3.Location = New System.Drawing.Point(538, 56) + Me.Button3.Location = New System.Drawing.Point(616, 56) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(141, 21) Me.Button3.TabIndex = 4 @@ -310,10 +321,12 @@ Partial Class usrCntlSDLAbholung Me.txtAbfertDat._DateTimeOnly = False Me.txtAbfertDat._numbersOnly = False Me.txtAbfertDat._numbersOnlyKommastellen = "" + Me.txtAbfertDat._numbersOnlyTrennzeichen = True Me.txtAbfertDat._Prozent = False Me.txtAbfertDat._ShortDateNew = True Me.txtAbfertDat._ShortDateOnly = False Me.txtAbfertDat._TimeOnly = False + Me.txtAbfertDat._TimeOnly_Seconds = False Me.txtAbfertDat._value = "" Me.txtAbfertDat._Waehrung = False Me.txtAbfertDat._WaehrungZeichen = True @@ -359,10 +372,12 @@ Partial Class usrCntlSDLAbholung Me.txtAuftragsnr._DateTimeOnly = False Me.txtAuftragsnr._numbersOnly = False Me.txtAuftragsnr._numbersOnlyKommastellen = "" + Me.txtAuftragsnr._numbersOnlyTrennzeichen = True Me.txtAuftragsnr._Prozent = False Me.txtAuftragsnr._ShortDateNew = False Me.txtAuftragsnr._ShortDateOnly = False Me.txtAuftragsnr._TimeOnly = False + Me.txtAuftragsnr._TimeOnly_Seconds = False Me.txtAuftragsnr._value = "" Me.txtAuftragsnr._Waehrung = False Me.txtAuftragsnr._WaehrungZeichen = True @@ -440,16 +455,17 @@ Partial Class usrCntlSDLAbholung Me.pnloptions.Controls.Add(Me.Label37) Me.pnloptions.Controls.Add(Me.txtMaxSrch) Me.pnloptions.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnloptions.Location = New System.Drawing.Point(0, 797) + Me.pnloptions.Location = New System.Drawing.Point(0, 782) Me.pnloptions.Name = "pnloptions" - Me.pnloptions.Size = New System.Drawing.Size(1111, 80) + Me.pnloptions.Size = New System.Drawing.Size(1111, 95) Me.pnloptions.TabIndex = 2 ' 'Panel2 ' + Me.Panel2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel2.BackColor = System.Drawing.SystemColors.Control Me.Panel2.Controls.Add(Me.Button8) - Me.Panel2.Location = New System.Drawing.Point(533, 0) + Me.Panel2.Location = New System.Drawing.Point(611, 0) Me.Panel2.Name = "Panel2" Me.Panel2.Size = New System.Drawing.Size(224, 56) Me.Panel2.TabIndex = 5 @@ -489,9 +505,9 @@ Partial Class usrCntlSDLAbholung Me.btnDel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnDel.Image = Global.SDL.My.Resources.Resources.del_small Me.btnDel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnDel.Location = New System.Drawing.Point(908, 4) + Me.btnDel.Location = New System.Drawing.Point(896, 4) Me.btnDel.Name = "btnDel" - Me.btnDel.Size = New System.Drawing.Size(106, 24) + Me.btnDel.Size = New System.Drawing.Size(118, 24) Me.btnDel.TabIndex = 0 Me.btnDel.Text = "Auftrag löschen" Me.btnDel.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -551,10 +567,12 @@ Partial Class usrCntlSDLAbholung Me.txtMaxSrch._DateTimeOnly = False Me.txtMaxSrch._numbersOnly = True Me.txtMaxSrch._numbersOnlyKommastellen = "" + Me.txtMaxSrch._numbersOnlyTrennzeichen = True Me.txtMaxSrch._Prozent = False Me.txtMaxSrch._ShortDateNew = False Me.txtMaxSrch._ShortDateOnly = False Me.txtMaxSrch._TimeOnly = False + Me.txtMaxSrch._TimeOnly_Seconds = False Me.txtMaxSrch._value = "" Me.txtMaxSrch._Waehrung = False Me.txtMaxSrch._WaehrungZeichen = True @@ -682,7 +700,7 @@ Partial Class usrCntlSDLAbholung Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel1.Location = New System.Drawing.Point(0, 172) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1111, 625) + Me.Panel1.Size = New System.Drawing.Size(1111, 610) Me.Panel1.TabIndex = 1 ' 'MyDatagridview1 @@ -693,19 +711,19 @@ Partial Class usrCntlSDLAbholung Me.MyDatagridview1.AllowUserToOrderColumns = True Me.MyDatagridview1.AllowUserToResizeRows = False Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.GradientInactiveCaption - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.MyDatagridview1.DefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.GradientInactiveCaption + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.MyDatagridview1.DefaultCellStyle = DataGridViewCellStyle2 Me.MyDatagridview1.Dock = System.Windows.Forms.DockStyle.Fill Me.MyDatagridview1.Location = New System.Drawing.Point(0, 0) Me.MyDatagridview1.Name = "MyDatagridview1" Me.MyDatagridview1.RowHeadersVisible = False - Me.MyDatagridview1.Size = New System.Drawing.Size(1111, 625) + Me.MyDatagridview1.Size = New System.Drawing.Size(1111, 610) Me.MyDatagridview1.TabIndex = 0 ' 'btnMonat @@ -899,10 +917,12 @@ Partial Class usrCntlSDLAbholung Me.txtFahrer._DateTimeOnly = False Me.txtFahrer._numbersOnly = False Me.txtFahrer._numbersOnlyKommastellen = "" + Me.txtFahrer._numbersOnlyTrennzeichen = True Me.txtFahrer._Prozent = False Me.txtFahrer._ShortDateNew = False Me.txtFahrer._ShortDateOnly = False Me.txtFahrer._TimeOnly = False + Me.txtFahrer._TimeOnly_Seconds = False Me.txtFahrer._value = Nothing Me.txtFahrer._Waehrung = False Me.txtFahrer._WaehrungZeichen = True diff --git a/SDL/mdm/SDLAbholung/usrCntlSDLAbholung.vb b/SDL/mdm/SDLAbholung/usrCntlSDLAbholung.vb index 399da393..c81a162e 100644 --- a/SDL/mdm/SDLAbholung/usrCntlSDLAbholung.vb +++ b/SDL/mdm/SDLAbholung/usrCntlSDLAbholung.vb @@ -148,7 +148,7 @@ Public Class usrCntlSDLAbholung Dim sqlstr As String = "" - sqlstr &= " SELECT " & TopMax & " [sdlAb_Id],[sdlAb_Erfasst],[sdlAb_ErfassungSachbearbeiter],[sdlAb_AbholungKdNr],[sdlAb_AbholungFirma],[sdlAb_AbholungVermerk],[sdlAb_AbholungLKWKz],[sdlAb_AbholungFahrername],[sdlAb_AbholungFahrerSMS],[sdlAb_Abholung],[sdlAb_AbholungSachbearbeiter],[sdlAb_AbholungSachbearbeiterId],[sdlAb_Storniert],[sdlAb_FahrerAbholAuftrag],[sdlAb_ErfassungSachbearbeiterId],[sdlAb_Abgeholt] FROM [tblSDLAbholung] WHERE 1=1 " + sqlstr &= " SELECT " & TopMax & " [sdlAb_Id],[sdlAb_Erfasst],[sdlAb_AbholungFirma],[sdlAb_AbholungKdNr],[sdlAb_AbholungVermerk],[sdlAb_AbholungLKWKz],[sdlAb_AbholungFahrername],[sdlAb_AbholungFahrerSMS],[sdlAb_Abholung],[sdlAb_AbholungSachbearbeiter],[sdlAb_AbholungSachbearbeiterId],[sdlAb_Storniert],[sdlAb_ErfassungSachbearbeiter],[sdlAb_FahrerAbholAuftrag],[sdlAb_ErfassungSachbearbeiterId],[sdlAb_Abgeholt] FROM [tblSDLAbholung] WHERE 1=1 " With MyDatagridview1 ' .DataSource = myTable @@ -575,5 +575,9 @@ Public Class usrCntlSDLAbholung Next End Sub + + Private Sub DataGridView_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) + + End Sub End Class