diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 5a973f3a..84a95185 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/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 5336da99..cfd163ad 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -23,6 +23,9 @@ Partial Class frmKundenblatt 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() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -38,9 +41,6 @@ Partial Class frmKundenblatt Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -58,6 +58,10 @@ Partial Class frmKundenblatt Me.Panel4 = New System.Windows.Forms.Panel() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() + Me.GroupBox5 = New System.Windows.Forms.GroupBox() + Me.lblStat_Lkws = New System.Windows.Forms.Label() + Me.dgvLeistungen = New System.Windows.Forms.DataGridView() + Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.txtAnsprechp = New System.Windows.Forms.TextBox() Me.txtEmailRE2 = New System.Windows.Forms.TextBox() Me.txtEmailRE = New System.Windows.Forms.TextBox() @@ -99,13 +103,6 @@ Partial Class frmKundenblatt Me.lblFirmenname2 = New System.Windows.Forms.TextBox() Me.lblFirmenname1 = New System.Windows.Forms.TextBox() Me.PictureBox4 = New System.Windows.Forms.PictureBox() - Me.GroupBox5 = New System.Windows.Forms.GroupBox() - Me.lblStat_SdlLeistungen_Maut = New System.Windows.Forms.Label() - Me.lblStat_SdlLeistungen_Diesel = New System.Windows.Forms.Label() - Me.lblStat_SdlLeistungen = New System.Windows.Forms.Label() - Me.lblStat_Lkws = New System.Windows.Forms.Label() - Me.dgvLeistungen = New System.Windows.Forms.DataGridView() - Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.dgvSperrliste = New System.Windows.Forms.DataGridView() Me.PictureBox2 = New System.Windows.Forms.PictureBox() @@ -251,6 +248,10 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() + Me.txtRisiko = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label20 = New System.Windows.Forms.Label() + Me.txt3470Betrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label21 = New System.Windows.Forms.Label() Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.UsrCntlLKW1 = New SDL.usrCntlLKW() @@ -262,6 +263,9 @@ Partial Class frmKundenblatt Me.Panel4.SuspendLayout() Me.tbcntrMain.SuspendLayout() Me.tbAllgemein.SuspendLayout() + Me.GroupBox5.SuspendLayout() + CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabControl1.SuspendLayout() @@ -274,9 +278,6 @@ Partial Class frmKundenblatt CType(Me.dgvUmsatzNachLeistngsNr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox5.SuspendLayout() - CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvSperrliste, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -383,6 +384,10 @@ Partial Class frmKundenblatt 'tbAllgemein ' Me.tbAllgemein.BackColor = System.Drawing.Color.White + Me.tbAllgemein.Controls.Add(Me.txtRisiko) + Me.tbAllgemein.Controls.Add(Me.Label20) + Me.tbAllgemein.Controls.Add(Me.txt3470Betrag) + Me.tbAllgemein.Controls.Add(Me.Label21) Me.tbAllgemein.Controls.Add(Me.GroupBox5) Me.tbAllgemein.Controls.Add(Me.txtAnsprechp) Me.tbAllgemein.Controls.Add(Me.txtEmailRE2) @@ -427,6 +432,81 @@ Partial Class frmKundenblatt Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' + 'GroupBox5 + ' + Me.GroupBox5.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GroupBox5.Controls.Add(Me.lblStat_Lkws) + Me.GroupBox5.Controls.Add(Me.dgvLeistungen) + Me.GroupBox5.Controls.Add(Me.PictureBox5) + Me.GroupBox5.Location = New System.Drawing.Point(738, 501) + Me.GroupBox5.Name = "GroupBox5" + Me.GroupBox5.Size = New System.Drawing.Size(543, 489) + Me.GroupBox5.TabIndex = 22 + Me.GroupBox5.TabStop = False + Me.GroupBox5.Text = "Statistik Boxen/Karten" + Me.GroupBox5.Visible = False + ' + 'lblStat_Lkws + ' + Me.lblStat_Lkws.AutoSize = True + Me.lblStat_Lkws.Cursor = System.Windows.Forms.Cursors.Hand + Me.lblStat_Lkws.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblStat_Lkws.Location = New System.Drawing.Point(15, 16) + Me.lblStat_Lkws.Name = "lblStat_Lkws" + Me.lblStat_Lkws.Size = New System.Drawing.Size(30, 16) + Me.lblStat_Lkws.TabIndex = 0 + Me.lblStat_Lkws.Text = "Lkw" + ' + 'dgvLeistungen + ' + Me.dgvLeistungen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dgvLeistungen.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLeistungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvLeistungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + 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.Color.Black + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLeistungen.DefaultCellStyle = DataGridViewCellStyle2 + Me.dgvLeistungen.Location = New System.Drawing.Point(6, 54) + Me.dgvLeistungen.Name = "dgvLeistungen" + Me.dgvLeistungen.ReadOnly = True + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLeistungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 + Me.dgvLeistungen.Size = New System.Drawing.Size(531, 429) + Me.dgvLeistungen.TabIndex = 197 + ' + 'PictureBox5 + ' + Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.statistik + Me.PictureBox5.Location = New System.Drawing.Point(449, 9) + Me.PictureBox5.Name = "PictureBox5" + Me.PictureBox5.Size = New System.Drawing.Size(38, 39) + Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox5.TabIndex = 144 + Me.PictureBox5.TabStop = False + ' 'txtAnsprechp ' Me.txtAnsprechp.BackColor = System.Drawing.Color.White @@ -497,7 +577,7 @@ Partial Class frmKundenblatt Me.FlatButton6.FlatAppearance.BorderSize = 0 Me.FlatButton6.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.FlatButton6.ForeColor = System.Drawing.Color.Black - Me.FlatButton6.Location = New System.Drawing.Point(700, 451) + Me.FlatButton6.Location = New System.Drawing.Point(702, 410) Me.FlatButton6.Name = "FlatButton6" Me.FlatButton6.Size = New System.Drawing.Size(15, 12) Me.FlatButton6.TabIndex = 191 @@ -535,7 +615,7 @@ Partial Class frmKundenblatt Me.lblBonitaet.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblBonitaet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblBonitaet.ForeColor = System.Drawing.Color.Black - Me.lblBonitaet.Location = New System.Drawing.Point(640, 450) + Me.lblBonitaet.Location = New System.Drawing.Point(642, 409) Me.lblBonitaet.MaxLineLength = -1 Me.lblBonitaet.MaxLines_Warning = "" Me.lblBonitaet.MaxLines_Warning_Label = Nothing @@ -549,7 +629,7 @@ Partial Class frmKundenblatt ' Me.Label39.AutoSize = True Me.Label39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label39.Location = New System.Drawing.Point(583, 450) + Me.Label39.Location = New System.Drawing.Point(585, 409) Me.Label39.Name = "Label39" Me.Label39.Size = New System.Drawing.Size(43, 13) Me.Label39.TabIndex = 188 @@ -563,7 +643,7 @@ Partial Class frmKundenblatt Me.btnBonitaetBearbeiten.FlatAppearance.BorderSize = 0 Me.btnBonitaetBearbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnBonitaetBearbeiten.ForeColor = System.Drawing.Color.Black - Me.btnBonitaetBearbeiten.Location = New System.Drawing.Point(560, 450) + Me.btnBonitaetBearbeiten.Location = New System.Drawing.Point(562, 409) Me.btnBonitaetBearbeiten.Name = "btnBonitaetBearbeiten" Me.btnBonitaetBearbeiten.Size = New System.Drawing.Size(15, 12) Me.btnBonitaetBearbeiten.TabIndex = 187 @@ -1075,117 +1155,6 @@ Partial Class frmKundenblatt Me.PictureBox4.TabIndex = 157 Me.PictureBox4.TabStop = False ' - 'GroupBox5 - ' - Me.GroupBox5.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.GroupBox5.Controls.Add(Me.lblStat_SdlLeistungen_Maut) - Me.GroupBox5.Controls.Add(Me.lblStat_SdlLeistungen_Diesel) - Me.GroupBox5.Controls.Add(Me.lblStat_SdlLeistungen) - Me.GroupBox5.Controls.Add(Me.lblStat_Lkws) - Me.GroupBox5.Controls.Add(Me.dgvLeistungen) - Me.GroupBox5.Controls.Add(Me.PictureBox5) - Me.GroupBox5.Location = New System.Drawing.Point(738, 501) - Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(543, 489) - Me.GroupBox5.TabIndex = 22 - Me.GroupBox5.TabStop = False - Me.GroupBox5.Text = "Statistik" - Me.GroupBox5.Visible = False - ' - 'lblStat_SdlLeistungen_Maut - ' - Me.lblStat_SdlLeistungen_Maut.AutoSize = True - Me.lblStat_SdlLeistungen_Maut.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblStat_SdlLeistungen_Maut.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_SdlLeistungen_Maut.Location = New System.Drawing.Point(15, 48) - Me.lblStat_SdlLeistungen_Maut.Name = "lblStat_SdlLeistungen_Maut" - Me.lblStat_SdlLeistungen_Maut.Size = New System.Drawing.Size(27, 16) - Me.lblStat_SdlLeistungen_Maut.TabIndex = 3 - Me.lblStat_SdlLeistungen_Maut.Text = "Sdl" - ' - 'lblStat_SdlLeistungen_Diesel - ' - Me.lblStat_SdlLeistungen_Diesel.AutoSize = True - Me.lblStat_SdlLeistungen_Diesel.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblStat_SdlLeistungen_Diesel.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_SdlLeistungen_Diesel.Location = New System.Drawing.Point(15, 32) - Me.lblStat_SdlLeistungen_Diesel.Name = "lblStat_SdlLeistungen_Diesel" - Me.lblStat_SdlLeistungen_Diesel.Size = New System.Drawing.Size(27, 16) - Me.lblStat_SdlLeistungen_Diesel.TabIndex = 2 - Me.lblStat_SdlLeistungen_Diesel.Text = "Sdl" - ' - 'lblStat_SdlLeistungen - ' - Me.lblStat_SdlLeistungen.AutoSize = True - Me.lblStat_SdlLeistungen.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblStat_SdlLeistungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_SdlLeistungen.Location = New System.Drawing.Point(15, 64) - Me.lblStat_SdlLeistungen.Name = "lblStat_SdlLeistungen" - Me.lblStat_SdlLeistungen.Size = New System.Drawing.Size(27, 16) - Me.lblStat_SdlLeistungen.TabIndex = 1 - Me.lblStat_SdlLeistungen.Text = "Sdl" - ' - 'lblStat_Lkws - ' - Me.lblStat_Lkws.AutoSize = True - Me.lblStat_Lkws.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblStat_Lkws.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_Lkws.Location = New System.Drawing.Point(15, 16) - Me.lblStat_Lkws.Name = "lblStat_Lkws" - Me.lblStat_Lkws.Size = New System.Drawing.Size(30, 16) - Me.lblStat_Lkws.TabIndex = 0 - Me.lblStat_Lkws.Text = "Lkw" - ' - 'dgvLeistungen - ' - Me.dgvLeistungen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.dgvLeistungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLeistungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvLeistungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - 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.Color.Black - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvLeistungen.DefaultCellStyle = DataGridViewCellStyle2 - Me.dgvLeistungen.Location = New System.Drawing.Point(6, 92) - Me.dgvLeistungen.Name = "dgvLeistungen" - Me.dgvLeistungen.ReadOnly = True - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLeistungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 - Me.dgvLeistungen.Size = New System.Drawing.Size(531, 391) - Me.dgvLeistungen.TabIndex = 197 - ' - 'PictureBox5 - ' - Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.statistik - Me.PictureBox5.Location = New System.Drawing.Point(449, 9) - Me.PictureBox5.Name = "PictureBox5" - Me.PictureBox5.Size = New System.Drawing.Size(38, 39) - Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox5.TabIndex = 144 - Me.PictureBox5.TabStop = False - ' 'PictureBox3 ' Me.PictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None @@ -2128,7 +2097,6 @@ Partial Class frmKundenblatt 'tbDokumente ' Me.tbDokumente.Controls.Add(Me.Label19) - Me.tbDokumente.Controls.Add(Me.UsrCntlKundenlogin1) Me.tbDokumente.Controls.Add(Me.Label7) Me.tbDokumente.Controls.Add(Me.Label3) Me.tbDokumente.Controls.Add(Me.lblSonstigeDokumente) @@ -2140,6 +2108,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanPersonalAusweisGF) Me.tbDokumente.Controls.Add(Me.scanBankGarantie) Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) + Me.tbDokumente.Controls.Add(Me.UsrCntlKundenlogin1) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" Me.tbDokumente.Size = New System.Drawing.Size(1667, 964) @@ -3099,6 +3068,76 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' + 'txtRisiko + ' + Me.txtRisiko._DateTimeOnly = False + Me.txtRisiko._numbersOnly = False + Me.txtRisiko._numbersOnlyKommastellen = "" + Me.txtRisiko._numbersOnlyTrennzeichen = True + Me.txtRisiko._Prozent = False + Me.txtRisiko._ShortDateNew = False + Me.txtRisiko._ShortDateOnly = False + Me.txtRisiko._TimeOnly = False + Me.txtRisiko._TimeOnly_Seconds = False + Me.txtRisiko._value = "" + Me.txtRisiko._Waehrung = True + Me.txtRisiko._WaehrungZeichen = True + Me.txtRisiko.BackColor = System.Drawing.Color.IndianRed + Me.txtRisiko.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtRisiko.ForeColor = System.Drawing.Color.Black + Me.txtRisiko.Location = New System.Drawing.Point(614, 450) + Me.txtRisiko.MaxLineLength = -1 + Me.txtRisiko.MaxLines_Warning = "" + Me.txtRisiko.MaxLines_Warning_Label = Nothing + Me.txtRisiko.Name = "txtRisiko" + Me.txtRisiko.ReadOnly = True + Me.txtRisiko.Size = New System.Drawing.Size(103, 20) + Me.txtRisiko.TabIndex = 200 + ' + 'Label20 + ' + Me.Label20.AutoSize = True + Me.Label20.Location = New System.Drawing.Point(563, 453) + Me.Label20.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(36, 13) + Me.Label20.TabIndex = 199 + Me.Label20.Text = "Risiko" + ' + 'txt3470Betrag + ' + Me.txt3470Betrag._DateTimeOnly = False + Me.txt3470Betrag._numbersOnly = False + Me.txt3470Betrag._numbersOnlyKommastellen = "" + Me.txt3470Betrag._numbersOnlyTrennzeichen = True + Me.txt3470Betrag._Prozent = False + Me.txt3470Betrag._ShortDateNew = False + Me.txt3470Betrag._ShortDateOnly = False + Me.txt3470Betrag._TimeOnly = False + Me.txt3470Betrag._TimeOnly_Seconds = False + Me.txt3470Betrag._value = "" + Me.txt3470Betrag._Waehrung = True + Me.txt3470Betrag._WaehrungZeichen = True + Me.txt3470Betrag.BackColor = System.Drawing.Color.LightGreen + Me.txt3470Betrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txt3470Betrag.ForeColor = System.Drawing.Color.Black + Me.txt3470Betrag.Location = New System.Drawing.Point(614, 429) + Me.txt3470Betrag.MaxLineLength = -1 + Me.txt3470Betrag.MaxLines_Warning = "" + Me.txt3470Betrag.MaxLines_Warning_Label = Nothing + Me.txt3470Betrag.Name = "txt3470Betrag" + Me.txt3470Betrag.ReadOnly = True + Me.txt3470Betrag.Size = New System.Drawing.Size(103, 20) + Me.txt3470Betrag.TabIndex = 198 + ' + 'Label21 + ' + Me.Label21.AutoSize = True + Me.Label21.Location = New System.Drawing.Point(563, 436) + Me.Label21.Name = "Label21" + Me.Label21.Size = New System.Drawing.Size(31, 13) + Me.Label21.TabIndex = 197 + Me.Label21.Text = "3470" + ' 'UsrcntlKundeBearbeitenFull1 ' Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White @@ -3183,6 +3222,10 @@ Partial Class frmKundenblatt Me.tbcntrMain.ResumeLayout(False) Me.tbAllgemein.ResumeLayout(False) Me.tbAllgemein.PerformLayout() + Me.GroupBox5.ResumeLayout(False) + Me.GroupBox5.PerformLayout() + CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).EndInit() Me.TabControl1.ResumeLayout(False) @@ -3197,10 +3240,6 @@ Partial Class frmKundenblatt CType(Me.dgvUmsatzNachLeistngsNr, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox5.ResumeLayout(False) - Me.GroupBox5.PerformLayout() - CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvSperrliste, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit() @@ -3271,9 +3310,6 @@ Partial Class frmKundenblatt Friend WithEvents GroupBox5 As System.Windows.Forms.GroupBox Friend WithEvents PictureBox5 As System.Windows.Forms.PictureBox Friend WithEvents lblStat_Lkws As System.Windows.Forms.Label - Friend WithEvents lblStat_SdlLeistungen As System.Windows.Forms.Label - Friend WithEvents lblStat_SdlLeistungen_Maut As System.Windows.Forms.Label - Friend WithEvents lblStat_SdlLeistungen_Diesel As System.Windows.Forms.Label Friend WithEvents Button4 As System.Windows.Forms.Button Friend WithEvents PictureBox4 As System.Windows.Forms.PictureBox Friend WithEvents PictureBox3 As System.Windows.Forms.PictureBox @@ -3463,4 +3499,8 @@ Partial Class frmKundenblatt Friend WithEvents dgvLeistungen As DataGridView Friend WithEvents Label19 As Label Friend WithEvents UsrCntlKundenlogin1 As usrCntlKundenlogin + Friend WithEvents txtRisiko As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label20 As Label + Friend WithEvents txt3470Betrag As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label21 As Label End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index b80ea417..69336663 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -643,82 +643,109 @@ Public Class frmKundenblatt Sub initStat() lblStat_Lkws.Text = SQL.getSqlCount("SELECT Count(KfzKennzeichen) FROM LKW WHERE KundenNr=" & kdNr & " and isnull(Verkauft,0) <> 1 and isnull(Abgemeldet,0) <> 1 ") & " aktive LKWs registriert" 'OK - - lblStat_SdlLeistungen.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr) FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr ") & " aktive SDL Leistungen" - - With dgvLeistungen - .DataSource = SQL.loadDgvBySql(" SELECT Count(SDL.SDLNr) as Anzahl , SDLBez as Leistung FROM SDL, Speditionsdienstleistungen - WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 - AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr group by SDLBez order by Count(SDL.SDLNr) desc ") - .Columns(1).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - - .RowTemplate.Height = 20 - .AllowUserToAddRows = False - .AllowUserToDeleteRows = False - .AllowUserToOrderColumns = False - .AllowUserToResizeColumns = False - .AllowUserToResizeRows = False - .RowTemplate.ReadOnly = True - .RowHeadersVisible = False + Dim dt = SQL.loadDgvBySql("SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR + FROM Kunden + WHERE Kunden.KundenNr = " & kdNr, "FMZOLL") - End With + Dim GesamtUSteuer As Double = 0 + Dim GesamtErstattung As Double = 0 + Dim Differnezbetrag As Double = 0 + Dim Gesamt3470 As Double = 0 + Dim GesamtVZBetrag As Double = 0 + Dim VorschaubetrGes As Double = 0 + Dim OPSaldo As Double = 0 + Dim Risiko As Double = 0 - Dim SQL_Diesel As String = " FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " AND ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr AND SDL.SDLNr IN (100,101)" - Dim dt_Diesel As DataTable = SQL.loadDgvBySql("SELECT SDL.SDLNr,Count(SDL.SDLNr) as Anzahl" & SQL_Diesel & " Group by SDL.SDLNr", "SDL") - lblStat_SdlLeistungen_Diesel.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr)" & SQL_Diesel) & " aktive Tankkarten" + OPSaldo = CDbl((New SQL).getValueTxtBySql("SELECT isnull(sum(Gesamtausstand),0) FROM [Offene Posten] WHERE [Kontonummer]=" & kdNr, "FMZOLL")) - 'If dt_Diesel.Rows.Count > 0 Then - ' lblStat_SdlLeistungen_Diesel.Text &= " ( " - ' For Each r In dt_Diesel.Rows - ' Dim Lieferant As String = "" - ' Select Case r.Item("SDLNr") - ' Case "100" : Lieferant = r.Item("Anzahl") & "x IDS " - ' Case "101" : Lieferant = r.Item("Anzahl") & "x RMC " - ' End Select + If dt.Rows.Count = 1 Then + Gesamt3470 = dt.Rows(0).Item("UStV_Summe3470BetragEUR") + GesamtVZBetrag = dt.Rows(0).Item("UStV_SummeVZBetragEUR") + VorschaubetrGes = dt.Rows(0).Item("UStV_SummeVorschaubetragEUR") + End If - ' lblStat_SdlLeistungen_Diesel.Text &= Lieferant - ' Next - ' lblStat_SdlLeistungen_Diesel.Text &= ")" - 'End If + Risiko = OPSaldo - Differnezbetrag - Gesamt3470 + GesamtVZBetrag - VorschaubetrGes + + txt3470Betrag.Text = Gesamt3470.ToString("C2") + txtRisiko.Text = Risiko.ToString("C2") + + 'lblStat_SdlLeistungen.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr) FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr ") & " aktive SDL Leistungen" + + 'With dgvLeistungen + ' .DataSource = SQL.loadDgvBySql(" SELECT Count(SDL.SDLNr) as Anzahl , SDLBez as Leistung FROM SDL, Speditionsdienstleistungen + ' WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 + ' AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr group by SDLBez order by Count(SDL.SDLNr) desc ") + ' .Columns(1).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + + ' .RowTemplate.Height = 20 + ' .AllowUserToAddRows = False + ' .AllowUserToDeleteRows = False + ' .AllowUserToOrderColumns = False + ' .AllowUserToResizeColumns = False + ' .AllowUserToResizeRows = False + ' .RowTemplate.ReadOnly = True + ' .RowHeadersVisible = False + + + 'End With + + + 'Dim SQL_Diesel As String = " FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " AND ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr AND SDL.SDLNr IN (100,101)" + 'Dim dt_Diesel As DataTable = SQL.loadDgvBySql("SELECT SDL.SDLNr,Count(SDL.SDLNr) as Anzahl" & SQL_Diesel & " Group by SDL.SDLNr", "SDL") + 'lblStat_SdlLeistungen_Diesel.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr)" & SQL_Diesel) & " aktive Tankkarten" + + ''If dt_Diesel.Rows.Count > 0 Then + '' lblStat_SdlLeistungen_Diesel.Text &= " ( " + '' For Each r In dt_Diesel.Rows + '' Dim Lieferant As String = "" + '' Select Case r.Item("SDLNr") + '' Case "100" : Lieferant = r.Item("Anzahl") & "x IDS " + '' Case "101" : Lieferant = r.Item("Anzahl") & "x RMC " + '' End Select + + '' lblStat_SdlLeistungen_Diesel.Text &= Lieferant + '' Next + '' lblStat_SdlLeistungen_Diesel.Text &= ")" + ''End If - Dim SQL_Maut As String = " FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " AND ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr AND SDL.SDLNr BETWEEN 200 AND 218" - Dim dt_Maut As DataTable = SQL.loadDgvBySql("SELECT SDL.SDLNr,Count(SDL.SDLNr) as Anzahl" & SQL_Maut & " Group by SDL.SDLNr", "SDL") - lblStat_SdlLeistungen_Maut.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr)" & SQL_Maut) & " aktive Mautboxen/-karten" + 'Dim SQL_Maut As String = " FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " AND ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr AND SDL.SDLNr BETWEEN 200 AND 218" + 'Dim dt_Maut As DataTable = SQL.loadDgvBySql("SELECT SDL.SDLNr,Count(SDL.SDLNr) as Anzahl" & SQL_Maut & " Group by SDL.SDLNr", "SDL") + 'lblStat_SdlLeistungen_Maut.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr)" & SQL_Maut) & " aktive Mautboxen/-karten" - 'If dt_Maut.Rows.Count > 0 Then - ' lblStat_SdlLeistungen_Maut.Text &= " ( " - ' For Each r As DataRow In dt_Maut.Rows - ' Dim Lieferant As String = "" - ' Select Case r.Item("SDLNr") - ' Case "200" : Lieferant = r.Item("Anzahl") & "x AT " - ' Case "201" : Lieferant = r.Item("Anzahl") & "x DE " - ' Case "202" : Lieferant = r.Item("Anzahl") & "x TELEPASS " - ' Case "203" : Lieferant = r.Item("Anzahl") & "x CZ " - ' Case "205" : Lieferant = r.Item("Anzahl") & "x MotorWay " - ' Case "206" : Lieferant = r.Item("Anzahl") & "x DouBox " - ' Case "208" : Lieferant = r.Item("Anzahl") & "x MSE " - ' Case "209" : Lieferant = r.Item("Anzahl") & "x PL " - ' Case "210" : Lieferant = r.Item("Anzahl") & "x SI " - ' Case "211" : Lieferant = r.Item("Anzahl") & "x MSE-MP " - ' Case "212" : Lieferant = r.Item("Anzahl") & "x UTA " - ' Case "213" : Lieferant = r.Item("Anzahl") & "x HUGO " - ' Case "214" : Lieferant = r.Item("Anzahl") & "x PLOSE-RM " - ' Case "215" : Lieferant = r.Item("Anzahl") & "x PLOSE-IT " - ' Case "216" : Lieferant = r.Item("Anzahl") & "x PLOSE-CZ " - ' Case "217" : Lieferant = r.Item("Anzahl") & "x PLOSE-MP " - ' Case "218" : Lieferant = r.Item("Anzahl") & "x PLOSE-TM " + ''If dt_Maut.Rows.Count > 0 Then + '' lblStat_SdlLeistungen_Maut.Text &= " ( " + '' For Each r As DataRow In dt_Maut.Rows + '' Dim Lieferant As String = "" + '' Select Case r.Item("SDLNr") + '' Case "200" : Lieferant = r.Item("Anzahl") & "x AT " + '' Case "201" : Lieferant = r.Item("Anzahl") & "x DE " + '' Case "202" : Lieferant = r.Item("Anzahl") & "x TELEPASS " + '' Case "203" : Lieferant = r.Item("Anzahl") & "x CZ " + '' Case "205" : Lieferant = r.Item("Anzahl") & "x MotorWay " + '' Case "206" : Lieferant = r.Item("Anzahl") & "x DouBox " + '' Case "208" : Lieferant = r.Item("Anzahl") & "x MSE " + '' Case "209" : Lieferant = r.Item("Anzahl") & "x PL " + '' Case "210" : Lieferant = r.Item("Anzahl") & "x SI " + '' Case "211" : Lieferant = r.Item("Anzahl") & "x MSE-MP " + '' Case "212" : Lieferant = r.Item("Anzahl") & "x UTA " + '' Case "213" : Lieferant = r.Item("Anzahl") & "x HUGO " + '' Case "214" : Lieferant = r.Item("Anzahl") & "x PLOSE-RM " + '' Case "215" : Lieferant = r.Item("Anzahl") & "x PLOSE-IT " + '' Case "216" : Lieferant = r.Item("Anzahl") & "x PLOSE-CZ " + '' Case "217" : Lieferant = r.Item("Anzahl") & "x PLOSE-MP " + '' Case "218" : Lieferant = r.Item("Anzahl") & "x PLOSE-TM " - ' End Select + '' End Select - ' lblStat_SdlLeistungen_Maut.Text &= Lieferant - ' Next - ' lblStat_SdlLeistungen_Maut.Text &= ")" - 'End If + '' lblStat_SdlLeistungen_Maut.Text &= Lieferant + '' Next + '' lblStat_SdlLeistungen_Maut.Text &= ")" + ''End If End Sub diff --git a/SDL/kunden/frmKundenlogin.Designer.vb b/SDL/kunden/frmKundenlogin.Designer.vb index e7044a11..68f4f3e9 100644 --- a/SDL/kunden/frmKundenlogin.Designer.vb +++ b/SDL/kunden/frmKundenlogin.Designer.vb @@ -26,14 +26,16 @@ Partial Class frmKundenlogin Me.btn = New System.Windows.Forms.Button() Me.lbl = New System.Windows.Forms.Label() Me.pnlKontakt = New System.Windows.Forms.Panel() + Me.link = New System.Windows.Forms.LinkLabel() Me.lblPW = New System.Windows.Forms.TextBox() Me.lblUser = New System.Windows.Forms.TextBox() Me.pnlMain = New System.Windows.Forms.Panel() - Me.Label1 = New System.Windows.Forms.Label() - Me.txtPortal = New System.Windows.Forms.TextBox() - Me.cboLieferant = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.link = New System.Windows.Forms.LinkLabel() Me.lblWarning = New System.Windows.Forms.Label() + Me.txtPortal = New System.Windows.Forms.TextBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.cboLieferant = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() Me.pnlKontakt.SuspendLayout() Me.pnlMain.SuspendLayout() Me.SuspendLayout() @@ -61,6 +63,8 @@ Partial Class frmKundenlogin 'pnlKontakt ' Me.pnlKontakt.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.pnlKontakt.Controls.Add(Me.Label3) + Me.pnlKontakt.Controls.Add(Me.Label2) Me.pnlKontakt.Controls.Add(Me.link) Me.pnlKontakt.Controls.Add(Me.lblPW) Me.pnlKontakt.Controls.Add(Me.lblUser) @@ -69,14 +73,25 @@ Partial Class frmKundenlogin Me.pnlKontakt.Size = New System.Drawing.Size(323, 103) Me.pnlKontakt.TabIndex = 10 ' + 'link + ' + Me.link.AutoSize = True + Me.link.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.link.Location = New System.Drawing.Point(3, 67) + Me.link.Name = "link" + Me.link.Size = New System.Drawing.Size(42, 20) + Me.link.TabIndex = 255 + Me.link.TabStop = True + Me.link.Text = "Link" + ' 'lblPW ' Me.lblPW.BackColor = System.Drawing.Color.White Me.lblPW.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.lblPW.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblPW.Location = New System.Drawing.Point(5, 38) + Me.lblPW.Location = New System.Drawing.Point(66, 38) Me.lblPW.Name = "lblPW" - Me.lblPW.Size = New System.Drawing.Size(279, 26) + Me.lblPW.Size = New System.Drawing.Size(254, 26) Me.lblPW.TabIndex = 219 Me.lblPW.Text = "Passwort" ' @@ -85,9 +100,9 @@ Partial Class frmKundenlogin Me.lblUser.BackColor = System.Drawing.Color.White Me.lblUser.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.lblUser.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblUser.Location = New System.Drawing.Point(5, 14) + Me.lblUser.Location = New System.Drawing.Point(66, 15) Me.lblUser.Name = "lblUser" - Me.lblUser.Size = New System.Drawing.Size(279, 26) + Me.lblUser.Size = New System.Drawing.Size(254, 26) Me.lblUser.TabIndex = 218 Me.lblUser.Text = "Username" ' @@ -105,14 +120,15 @@ Partial Class frmKundenlogin Me.pnlMain.Size = New System.Drawing.Size(344, 189) Me.pnlMain.TabIndex = 12 ' - 'Label1 + 'lblWarning ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(142, 0) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(34, 13) - Me.Label1.TabIndex = 11 - Me.Label1.Text = "Portal" + Me.lblWarning.AutoSize = True + Me.lblWarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblWarning.ForeColor = System.Drawing.Color.Red + Me.lblWarning.Location = New System.Drawing.Point(9, 166) + Me.lblWarning.Name = "lblWarning" + Me.lblWarning.Size = New System.Drawing.Size(0, 20) + Me.lblWarning.TabIndex = 255 ' 'txtPortal ' @@ -121,9 +137,18 @@ Partial Class frmKundenlogin Me.txtPortal.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtPortal.Location = New System.Drawing.Point(145, 18) Me.txtPortal.Name = "txtPortal" - Me.txtPortal.Size = New System.Drawing.Size(147, 26) + Me.txtPortal.Size = New System.Drawing.Size(183, 26) Me.txtPortal.TabIndex = 254 ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(142, 0) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(34, 13) + Me.Label1.TabIndex = 11 + Me.Label1.Text = "Portal" + ' 'cboLieferant ' Me.cboLieferant._allowedValuesFreiText = Nothing @@ -136,26 +161,25 @@ Partial Class frmKundenlogin Me.cboLieferant.Size = New System.Drawing.Size(106, 28) Me.cboLieferant.TabIndex = 1 ' - 'link + 'Label2 ' - Me.link.AutoSize = True - Me.link.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.link.Location = New System.Drawing.Point(3, 67) - Me.link.Name = "link" - Me.link.Size = New System.Drawing.Size(42, 20) - Me.link.TabIndex = 255 - Me.link.TabStop = True - Me.link.Text = "Link" + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label2.Location = New System.Drawing.Point(1, 17) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(55, 20) + Me.Label2.TabIndex = 256 + Me.Label2.Text = "USER" ' - 'lblWarning + 'Label3 ' - Me.lblWarning.AutoSize = True - Me.lblWarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblWarning.ForeColor = System.Drawing.Color.Red - Me.lblWarning.Location = New System.Drawing.Point(9, 166) - Me.lblWarning.Name = "lblWarning" - Me.lblWarning.Size = New System.Drawing.Size(0, 20) - Me.lblWarning.TabIndex = 255 + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label3.Location = New System.Drawing.Point(3, 40) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(34, 20) + Me.Label3.TabIndex = 257 + Me.Label3.Text = "PW" ' 'frmKundenlogin ' @@ -189,4 +213,6 @@ Partial Class frmKundenlogin Friend WithEvents Label1 As Label Friend WithEvents link As LinkLabel Friend WithEvents lblWarning As Label + Friend WithEvents Label3 As Label + Friend WithEvents Label2 As Label End Class diff --git a/SDL/kunden/frmKundenlogin.vb b/SDL/kunden/frmKundenlogin.vb index b4511448..936c3d94 100644 --- a/SDL/kunden/frmKundenlogin.vb +++ b/SDL/kunden/frmKundenlogin.vb @@ -27,7 +27,8 @@ Public Class frmKundenlogin cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MSE", "MSTSTTOLLS")) cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TELEPASS", "HUB4TRUCKS")) cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UTA", "EDENRED-CONNECT")) - cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("PLOSE", "PLOSE")) + cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("PLOSE", "PLOSE APR")) + cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UTA-INTERN", "UTA-INTERN")) If cboLieferant.Items.Count > 0 Then cboLieferant.SelectedIndex = 0 @@ -37,6 +38,7 @@ Public Class frmKundenlogin Else KUNDENPORTAL = Nothing End If + setvalue() End Sub @@ -44,13 +46,20 @@ Public Class frmKundenlogin If KUNDENPORTAL Is Nothing Then KUNDENPORTAL = New VERAG_PROG_ALLGEMEIN.cKundenportal(kdNr, Portal) + + txtPortal.Text = KUNDENPORTAL.Portal + cboLieferant.Text = KUNDENPORTAL.Lieferant + kdNr = KUNDENPORTAL.KundenNr + Else + txtPortal.Text = KUNDENPORTAL.Portal + cboLieferant.Text = KUNDENPORTAL.Lieferant + kdNr = KUNDENPORTAL.KundenNr + lblUser.Text = KUNDENPORTAL.Username + lblPW.Text = KUNDENPORTAL.Password + End If - txtPortal.Text = KUNDENPORTAL.Portal - cboLieferant.Text = KUNDENPORTAL.Lieferant - kdNr = KUNDENPORTAL.KundenNr - lblUser.Text = KUNDENPORTAL.Username - lblPW.Text = KUNDENPORTAL.Password + @@ -62,12 +71,12 @@ Public Class frmKundenlogin lblWarning.Text = "" If lblUser.Text = "" OrElse lblUser.Text = "Username" Then - lblWarning.Text = "User ausfüllen!" + lblWarning.Text = "Username ausfüllen!" Return False End If If lblPW.Text = "" OrElse lblPW.Text = "Passwort" Then - lblWarning.Text = "PW ausfüllen!" + lblWarning.Text = "Passwort ausfüllen!" Return False End If @@ -98,12 +107,22 @@ Public Class frmKundenlogin Private Sub cboLieferant_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboLieferant.SelectedIndexChanged txtPortal.Text = cboLieferant._value + If cboLieferant.Text = "UTA-INTERN" Then + 'cboLieferant.BackColor = Color.IndianRed + txtPortal.BackColor = Color.IndianRed + Else + txtPortal.BackColor = SystemColors.Window + 'cboLieferant.BackColor = SystemColors.Window + End If + Select Case txtPortal.Text Case "Q8-TRUCK" : link.AccessibleDescription = "https://iaccount.q8.com/" : link.Text = cboLieferant.Text & "-Link" Case "EDENRED-CONNECT" : link.AccessibleDescription = "https://meinedenred.at/login" : link.Text = cboLieferant.Text & "-Link" - Case "PLOSE" : link.AccessibleDescription = "https://www.apr.plose.it/login" : link.Text = cboLieferant.Text & "-Link" + Case "PLOSE APR" : link.AccessibleDescription = "https://www.apr.plose.it/login" : link.Text = cboLieferant.Text & "-Link" Case "MSTSTTOLLS" : link.AccessibleDescription = "https://iaccount.q8.com/" : link.Text = cboLieferant.Text & "-Link" Case "HUB4TRUCKS" : link.AccessibleDescription = "https://truck.telepass.com/api/uaa/login" : link.Text = cboLieferant.Text & "-Link" + Case Else : link.AccessibleDescription = "" : link.Text = cboLieferant.Text & "" + End Select @@ -111,7 +130,6 @@ Public Class frmKundenlogin End Sub Private Sub link_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles link.LinkClicked - - Process.Start(link.AccessibleDescription) + If link.AccessibleDescription <> "" Then Process.Start(link.AccessibleDescription) End Sub End Class diff --git a/SDL/kunden/usrCntlKundenlogin.vb b/SDL/kunden/usrCntlKundenlogin.vb index 5843a1e7..382fe1a1 100644 --- a/SDL/kunden/usrCntlKundenlogin.vb +++ b/SDL/kunden/usrCntlKundenlogin.vb @@ -34,11 +34,11 @@ Public Class usrCntlKundenlogin If kdNr > 0 Then With dgvKundenlogins - .DataSource = SQL.loadDgvBySql("SELECT KundenNr, Username, Password, Lieferant, Portal FROM [tblKundenlogin] where [KundenNr]=" & kdNr, "FMZOLL") + .DataSource = SQL.loadDgvBySql("SELECT KundenNr, Username, Password as Passwort, Lieferant, Portal FROM [tblKundenlogin] where [KundenNr]=" & kdNr, "FMZOLL") .Columns("KundenNr").Visible = False .Columns("Username").Width = 120 - .Columns("Password").Width = 100 + .Columns("Passwort").Width = 100 .Columns("Portal").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("Lieferant").Width = 100 .SelectionMode = DataGridViewSelectionMode.FullRowSelect @@ -127,21 +127,26 @@ Public Class usrCntlKundenlogin Dim TextHTMLtable As String = "" TextHTMLtable &= "" - TextHTMLtable &= "" + TextHTMLtable &= "" For Each r As DataGridViewRow In dgvKundenlogins.SelectedRows - TextHTMLtable &= "" - TextHTMLtable &= "" - TextHTMLtable &= "" - TextHTMLtable &= "" - TextHTMLtable &= "" + If r.Cells("Portal").Value <> "UTA-INTERN" Then ' überspringen! - Dim Link As String = getLink(r.Cells("Portal").Value) + TextHTMLtable &= "" + TextHTMLtable &= "" + TextHTMLtable &= "" + TextHTMLtable &= "" + TextHTMLtable &= "" - TextHTMLtable &= "" + Dim Link As String = getLink(r.Cells("Portal").Value) + + TextHTMLtable &= "" + + TextHTMLtable &= "" + + End If - TextHTMLtable &= "" Next diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index daea78b2..6e881b92 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -2590,8 +2590,8 @@ Public Class usrcntlKundeBearbeitenFull End Sub Private Sub btnBnkExcel_Click(sender As Object, e As EventArgs) Handles btnBnkExcel.Click - Dim SQL As String = "SELECT [bnk_KundenNr] as KdNr,[bnk_iban] as IBAN,[bnk_bic] as BIC,[bnk_anschrift] as Name,isnull([bnk_hauptkonto],0) as HK,isnull([bnk_archiv],0) as geschlossen ,cast([bnk_Datum] as Date) as Datum - FROM tblBankverbindungen order by bnk_KundenNr" + Dim SQL As String = "SELECT [bnk_KundenNr] as KdNr, Adressen.[Name 1] as Kundenname ,[bnk_iban] as IBAN,[bnk_bic] as BIC,[bnk_anschrift] as Bankname,isnull([bnk_hauptkonto],0) as HK,isnull([bnk_archiv],0) as geschlossen ,cast([bnk_Datum] as Date) as Datum + FROM tblBankverbindungen inner join Adressen on Adressen.AdressenNr = bnk_KundenNr order by bnk_KundenNr" Dim dt_Bank As DataTable = (New SQL).loadDgvBySql(SQL, "FMZOLL") VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt_Bank,,,,,,,, True)
SupplierPortalUsernamePasswortLink
SupplierPortalUsernamePasswordLink
" & r.Cells("Lieferant").Value & "" & r.Cells("Portal").Value & "" & r.Cells("Username").Value & "" & r.Cells("Password").Value & "
" & r.Cells("Lieferant").Value & "" & r.Cells("Portal").Value & "" & r.Cells("Username").Value & "" & r.Cells("Passwort").Value & "" & Link & "" & Link & "