diff --git a/SDL/UsrCntlEssensbestellungen.vb b/SDL/UsrCntlEssensbestellungen.vb index 74277ff9..f909094c 100644 --- a/SDL/UsrCntlEssensbestellungen.vb +++ b/SDL/UsrCntlEssensbestellungen.vb @@ -314,9 +314,9 @@ Public Class UsrCntlessensbestellungen If rbMenu_montag.Checked Then essen.eb_montag = menu setWarning(False) - Else - If txtAlt_montag.Text.ToString.Replace(" ", "") <> "" Then - essen.eb_montag = txtAlt_montag.Text.ToString + ElseIf rbMenuAlt_montag.Checked Then + If cbxAlt_montag.Text.ToString.Replace(" ", "") <> "" Then + essen.eb_montag = cbxAlt_montag.Text.ToString 'txtAlt_montag setWarning(False) Else setWarning(True) @@ -334,9 +334,9 @@ Public Class UsrCntlessensbestellungen If rbMenu_dienstag.Checked Then essen.eb_dienstag = menu setWarning(False) - Else - If txtAlt_dienstag.Text.ToString.Replace(" ", "") <> "" Then - essen.eb_dienstag = txtAlt_dienstag.Text.ToString + ElseIf rbMenuAlt_dienstag.Checked Then + If cbxAlt_dienstag.Text.ToString.Replace(" ", "") <> "" Then + essen.eb_dienstag = cbxAlt_dienstag.Text.ToString 'txtAlt_dienstag.Text.ToString setWarning(False) Else setWarning(True) @@ -352,9 +352,9 @@ Public Class UsrCntlessensbestellungen If rbMenu_mittwoch.Checked Then essen.eb_mittwoch = menu setWarning(False) - Else - If txtAlt_mittwoch.Text.ToString.Replace(" ", "") <> "" Then - essen.eb_mittwoch = txtAlt_mittwoch.Text.ToString + ElseIf rbMenuAlt_mittwoch.Checked Then + If cbxAlt_mittwoch.Text.ToString.Replace(" ", "") <> "" Then + essen.eb_mittwoch = cbxAlt_mittwoch.Text.ToString 'txtAlt_mittwoch.Text.ToString setWarning(False) Else setWarning(True) @@ -370,9 +370,9 @@ Public Class UsrCntlessensbestellungen If rbMenu_donnerstag.Checked Then essen.eb_donnerstag = menu setWarning(False) - Else - If txtAlt_donnerstag.Text.ToString.Replace(" ", "") <> "" Then - essen.eb_donnerstag = txtAlt_donnerstag.Text.ToString + ElseIf rbMenuAlt_donnerstag.Checked Then + If cbxAlt_donnerstag.Text.ToString.Replace(" ", "") <> "" Then + essen.eb_donnerstag = cbxAlt_donnerstag.Text.ToString 'txtAlt_donnerstag.Text.ToString setWarning(False) Else setWarning(True) @@ -388,9 +388,9 @@ Public Class UsrCntlessensbestellungen If rbMenu__freitag.Checked Then essen.eb_freitag = menu setWarning(False) - Else - If txtAlt_freitag.Text.ToString.Replace(" ", "") <> "" Then - essen.eb_freitag = txtAlt_freitag.Text.ToString + ElseIf rbMenuAlt_freitag.Checked Then + If cbxAlt_freitag.Text.ToString.Replace(" ", "") <> "" Then + essen.eb_freitag = cbxAlt_freitag.Text.ToString 'txtAlt_freitag.Text.ToString setWarning(False) Else setWarning(True) diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb index 23e9f3c5..351bce0c 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb @@ -77,7 +77,7 @@ Partial Class frmBU_Mahnlauf Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1107, 127) + Me.Panel1.Size = New System.Drawing.Size(1287, 127) Me.Panel1.TabIndex = 0 ' 'cbxNurFaellig @@ -86,7 +86,7 @@ Partial Class frmBU_Mahnlauf Me.cbxNurFaellig.AutoSize = True Me.cbxNurFaellig.Checked = True Me.cbxNurFaellig.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxNurFaellig.Location = New System.Drawing.Point(565, 63) + Me.cbxNurFaellig.Location = New System.Drawing.Point(568, 63) Me.cbxNurFaellig.Name = "cbxNurFaellig" Me.cbxNurFaellig.Size = New System.Drawing.Size(94, 17) Me.cbxNurFaellig.TabIndex = 38 @@ -124,6 +124,7 @@ Partial Class frmBU_Mahnlauf Me.KdSearchBox1._displayWoelflKd = False Me.KdSearchBox1._hideIfListEmpty = True Me.KdSearchBox1._loadKdData = False + Me.KdSearchBox1._searchName1 = True Me.KdSearchBox1._UseFIRMA = "" Me.KdSearchBox1._ValueKdAndName = True Me.KdSearchBox1.dgvpos = "LEFT" @@ -156,7 +157,7 @@ Partial Class frmBU_Mahnlauf Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSuche.Image = Global.SDL.My.Resources.Resources.search Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSuche.Location = New System.Drawing.Point(912, 56) + Me.btnSuche.Location = New System.Drawing.Point(1092, 56) Me.btnSuche.Name = "btnSuche" Me.btnSuche.Size = New System.Drawing.Size(162, 52) Me.btnSuche.TabIndex = 29 @@ -188,6 +189,7 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox1._DateTimeOnly = False Me.MyTextBox1._numbersOnly = False Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True Me.MyTextBox1._Prozent = False Me.MyTextBox1._ShortDateNew = False Me.MyTextBox1._ShortDateOnly = False @@ -223,7 +225,7 @@ Partial Class frmBU_Mahnlauf Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top Me.pnlTop.Location = New System.Drawing.Point(0, 0) Me.pnlTop.Name = "pnlTop" - Me.pnlTop.Size = New System.Drawing.Size(1107, 48) + Me.pnlTop.Size = New System.Drawing.Size(1287, 48) Me.pnlTop.TabIndex = 4 ' 'Label4 @@ -243,7 +245,7 @@ Partial Class frmBU_Mahnlauf Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(0, 127) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1107, 572) + Me.Panel2.Size = New System.Drawing.Size(1287, 572) Me.Panel2.TabIndex = 1 ' 'MyDatagridview1 @@ -259,7 +261,7 @@ Partial Class frmBU_Mahnlauf Me.MyDatagridview1.ReadOnly = True Me.MyDatagridview1.RowHeadersVisible = False Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.MyDatagridview1.Size = New System.Drawing.Size(1107, 572) + Me.MyDatagridview1.Size = New System.Drawing.Size(1287, 572) Me.MyDatagridview1.TabIndex = 0 ' 'Panel3 @@ -281,7 +283,7 @@ Partial Class frmBU_Mahnlauf Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom Me.Panel3.Location = New System.Drawing.Point(0, 699) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1107, 147) + Me.Panel3.Size = New System.Drawing.Size(1287, 147) Me.Panel3.TabIndex = 1 ' 'cbxMahnstufeErh @@ -290,7 +292,7 @@ Partial Class frmBU_Mahnlauf Me.cbxMahnstufeErh.AutoSize = True Me.cbxMahnstufeErh.Checked = True Me.cbxMahnstufeErh.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxMahnstufeErh.Location = New System.Drawing.Point(900, 11) + Me.cbxMahnstufeErh.Location = New System.Drawing.Point(1080, 11) Me.cbxMahnstufeErh.Name = "cbxMahnstufeErh" Me.cbxMahnstufeErh.Size = New System.Drawing.Size(118, 17) Me.cbxMahnstufeErh.TabIndex = 44 @@ -301,7 +303,7 @@ Partial Class frmBU_Mahnlauf ' Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(789, 121) + Me.Label8.Location = New System.Drawing.Point(969, 121) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(81, 13) Me.Label8.TabIndex = 42 @@ -313,7 +315,7 @@ Partial Class frmBU_Mahnlauf Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button6.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button6.Location = New System.Drawing.Point(792, 81) + Me.Button6.Location = New System.Drawing.Point(972, 81) Me.Button6.Name = "Button6" Me.Button6.Size = New System.Drawing.Size(222, 38) Me.Button6.TabIndex = 40 @@ -326,7 +328,7 @@ Partial Class frmBU_Mahnlauf Me.btnExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo Me.btnExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnExcel.Location = New System.Drawing.Point(1033, 30) + Me.btnExcel.Location = New System.Drawing.Point(1213, 30) Me.btnExcel.Name = "btnExcel" Me.btnExcel.Size = New System.Drawing.Size(41, 34) Me.btnExcel.TabIndex = 39 @@ -385,7 +387,7 @@ Partial Class frmBU_Mahnlauf ' Me.CheckBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.CheckBox1.AutoSize = True - Me.CheckBox1.Location = New System.Drawing.Point(565, 119) + Me.CheckBox1.Location = New System.Drawing.Point(745, 119) Me.CheckBox1.Name = "CheckBox1" Me.CheckBox1.Size = New System.Drawing.Size(147, 17) Me.CheckBox1.TabIndex = 33 @@ -398,7 +400,7 @@ Partial Class frmBU_Mahnlauf Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(789, 14) + Me.Label3.Location = New System.Drawing.Point(969, 14) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(101, 13) Me.Label3.TabIndex = 30 @@ -423,7 +425,7 @@ Partial Class frmBU_Mahnlauf Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button2.Image = Global.SDL.My.Resources.Resources.mahn Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(792, 30) + Me.Button2.Location = New System.Drawing.Point(972, 30) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(222, 45) Me.Button2.TabIndex = 31 @@ -448,6 +450,7 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox2._DateTimeOnly = False Me.MyTextBox2._numbersOnly = False Me.MyTextBox2._numbersOnlyKommastellen = "" + Me.MyTextBox2._numbersOnlyTrennzeichen = True Me.MyTextBox2._Prozent = False Me.MyTextBox2._ShortDateNew = True Me.MyTextBox2._ShortDateOnly = False @@ -458,7 +461,7 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox2._WaehrungZeichen = False Me.MyTextBox2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.MyTextBox2.ForeColor = System.Drawing.Color.Black - Me.MyTextBox2.Location = New System.Drawing.Point(876, 118) + Me.MyTextBox2.Location = New System.Drawing.Point(1056, 118) Me.MyTextBox2.MaxLength = 10 Me.MyTextBox2.MaxLineLength = -1 Me.MyTextBox2.MaxLines_Warning = "" @@ -473,7 +476,7 @@ Partial Class frmBU_Mahnlauf 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(1107, 846) + Me.ClientSize = New System.Drawing.Size(1287, 846) Me.Controls.Add(Me.Panel2) Me.Controls.Add(Me.Panel3) Me.Controls.Add(Me.Panel1) diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 60897c5a..28d3de76 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -26,10 +26,10 @@ Public Class frmBU_Mahnlauf 'Dim sqlStr = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,KTO.c_plz + ' ' + KTO.c_ort Ort,isnull(KTO.c_email,'') Email, count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum - Dim sqlStr = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,KTO.c_plz + ' ' + KTO.c_ort Ort,/*isnull(KTO.c_email,'') Email, */ - isnull(( SELECT TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email, - count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum - " & If(cbxNurFaellig.Checked, "", ",SUM(CASE WHEN op.d_netto'" & MyTextBox1._value & "' " & If(MyComboBox1._value > 0, " and max(si_mahnstufe)>='" & MyComboBox1._value & "'", "") & " ORDER BY KTO.c_name" + + Dim sqlStringVerag360 = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,/*KTO.c_plz + ' ' + KTO.c_ort Ort,isnull(KTO.c_email,'') Email, */ " & + "isnull(( SELECT TOP 1 [Zahlungsinformationen] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Kunden where KundenNr=i_personenkonto ) ,'') Zahlungsinfo, cast(min (OWNFIELD_Belegdatum)as date) as 'ältesteRg'," & + "count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum, max(replace(KTO.c_zahlziel,'0/0/','')) ZZ, + + case + when max(si_mahnstufe) = 1 and max((replace(KTO.c_zahlziel,'0/0/',''))) = 20 Then 'telefonisch' + when max(si_mahnstufe) = 1 and max((replace(KTO.c_zahlziel,'0/0/',''))) = 30 Then 'ZZ 30 Tage' + when max(si_mahnstufe) = 1 and cast(MAX(d_mahnung)as date) < (GETDATE()- 60) Then 'Sperre Donnerstag' + when max(si_mahnstufe) = 2 and max((replace(KTO.c_zahlziel,'0/0/',''))) = 20 Then 'Sperre Freitag' + when max(si_mahnstufe) = 2 and max((replace(KTO.c_zahlziel,'0/0/',''))) = 30 Then 'ZZ 30 Tage' + when max(si_mahnstufe) >= 3 Then 'Sperre Donnerstag' + else '-' + End as sperre" & If(cbxNurFaellig.Checked, "", ",SUM(CASE WHEN op.d_netto(1) ", "") & " + " & If(KdNr > 0, " AND i_personenkonto ='" & KdNr & "'", "") & " + " & If(KdTxt <> "", " AND KTO.c_name LIKE '" & KdTxt.Replace("*", "%") & "'", "") & " + group by i_personenkonto ,KTO.c_name,KTO.c_landid,KTO.c_ort,KTO.c_plz,KTO.c_email + HAVING sum(eur_bruttobetrag+eur_zahlung)>'" & MyTextBox1._value & "' + " & If(MyComboBox1._value > 0, " and max(si_mahnstufe)>='" & MyComboBox1._value & "'", "") & " + ORDER BY KTO.c_name" + 'MsgBox(sqlStr) - Dim dt_OP As DataTable = SQL.loadDgvBySql(sqlStr, "FIBU") + Dim dt_OP As DataTable = SQL.loadDgvBySql(If(Firma_ID = 19, sqlStringVerag360, sqlStr), "FIBU") .DataSource = dt_OP If .Columns.Count = 0 Then Exit Sub @@ -50,9 +75,18 @@ Public Class frmBU_Mahnlauf .Columns("c_name").AutoSizeMode = DataGridViewAutoSizeColumnsMode.Fill .Columns("Land").Width = 40 - .Columns("Ort").Width = 150 + .Columns("Anzahl").Width = 40 - .Columns("Email").Width = 150 + + If Firma_ID = 19 Then + .Columns("Zahlungsinfo").Width = 300 + .Columns("ältesteRg").Width = 75 + Else + .Columns("Email").Width = 150 + .Columns("Ort").Width = 150 + + End If + .Columns("Faelligkeit").Width = 75 .Columns("Faelligkeit").HeaderText = "Fälligkeit" diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index a49a77d7..2f8c0818 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -23,6 +23,7 @@ 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() @@ -37,14 +38,21 @@ Partial Class frmKundenblatt Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenblatt)) Me.pnlInfo = New System.Windows.Forms.Panel() Me.txtInfotext = New System.Windows.Forms.Label() Me.tbFirmendaten = New System.Windows.Forms.TabPage() Me.Panel4 = New System.Windows.Forms.Panel() + Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() + Me.btnReloadOP = New System.Windows.Forms.Button() + Me.Label11 = New System.Windows.Forms.Label() + Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label10 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() + Me.dgvOffenePosten = New System.Windows.Forms.DataGridView() + Me.btnOP = New System.Windows.Forms.Button() Me.Label17 = New System.Windows.Forms.Label() Me.dgvOfferte = New System.Windows.Forms.DataGridView() Me.picLogo = New System.Windows.Forms.PictureBox() @@ -117,8 +125,10 @@ Partial Class frmKundenblatt Me.lblLetzterSA_SDL = New System.Windows.Forms.Label() Me.rtbVermerke = New System.Windows.Forms.RichTextBox() Me.tbSDLKarten = New System.Windows.Forms.TabPage() + Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.tbLKW = New System.Windows.Forms.TabPage() Me.pnlLKWRight = New System.Windows.Forms.Panel() + Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.pnlLKW = New System.Windows.Forms.Panel() Me.dgvLKW = New System.Windows.Forms.DataGridView() Me.pnlLKWBottom = New System.Windows.Forms.Panel() @@ -149,6 +159,7 @@ Partial Class frmKundenblatt Me.scanVertragVeragKd = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.tbBesuchsberichte = New System.Windows.Forms.TabPage() Me.tbOfferte = New System.Windows.Forms.TabPage() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbUSTV = New System.Windows.Forms.TabPage() Me.tbcntrUSTV = New System.Windows.Forms.TabControl() Me.tbUSTVDokumente = New System.Windows.Forms.TabPage() @@ -159,6 +170,7 @@ Partial Class frmKundenblatt Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() + Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() @@ -184,23 +196,12 @@ 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.btnOP = New System.Windows.Forms.Button() - Me.dgvOffenePosten = New System.Windows.Forms.DataGridView() - Me.Label9 = New System.Windows.Forms.Label() - Me.Label10 = New System.Windows.Forms.Label() - Me.btnReloadOP = New System.Windows.Forms.Button() - Me.Label11 = New System.Windows.Forms.Label() - Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() - Me.usrcntlKarten = New SDL.usrCntlKartenDaten() - Me.UsrCntlLKW1 = New SDL.usrCntlLKW() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() - Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() Me.tbcntrMain.SuspendLayout() Me.tbAllgemein.SuspendLayout() + CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() @@ -241,7 +242,6 @@ Partial Class frmKundenblatt Me.ContextMenuStrip3.SuspendLayout() Me.mne.SuspendLayout() Me.pnl.SuspendLayout() - CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnlInfo @@ -285,6 +285,16 @@ Partial Class frmKundenblatt Me.Panel4.Size = New System.Drawing.Size(1624, 874) Me.Panel4.TabIndex = 0 ' + 'UsrcntlKundeBearbeitenFull1 + ' + Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White + Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 874) + Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 + ' 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -344,6 +354,93 @@ Partial Class frmKundenblatt Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' + 'btnReloadOP + ' + Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance + Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnReloadOP.FlatAppearance.BorderSize = 0 + Me.btnReloadOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnReloadOP.Location = New System.Drawing.Point(240, 563) + Me.btnReloadOP.Name = "btnReloadOP" + Me.btnReloadOP.Size = New System.Drawing.Size(25, 25) + Me.btnReloadOP.TabIndex = 180 + Me.btnReloadOP.UseVisualStyleBackColor = True + Me.btnReloadOP.Visible = False + ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label11.Location = New System.Drawing.Point(271, 570) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(82, 13) + Me.Label11.TabIndex = 178 + Me.Label11.Text = "Daten für Firma:" + ' + 'cboFirmaFMZOLL + ' + Me.cboFirmaFMZOLL._allowedValuesFreiText = Nothing + Me.cboFirmaFMZOLL._allowFreiText = False + Me.cboFirmaFMZOLL._value = "" + Me.cboFirmaFMZOLL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboFirmaFMZOLL.FormattingEnabled = True + Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(354, 567) + Me.cboFirmaFMZOLL.Name = "cboFirmaFMZOLL" + Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(184, 21) + Me.cboFirmaFMZOLL.TabIndex = 179 + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(544, 570) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(149, 13) + Me.Label10.TabIndex = 177 + Me.Label10.Text = "Zahlungserinnerung/OP-Liste:" + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Location = New System.Drawing.Point(9, 575) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(78, 13) + Me.Label9.TabIndex = 176 + Me.Label9.Text = "Offene Posten:" + ' + 'dgvOffenePosten + ' + Me.dgvOffenePosten.AllowUserToAddRows = False + Me.dgvOffenePosten.AllowUserToDeleteRows = False + Me.dgvOffenePosten.AllowUserToResizeRows = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvOffenePosten.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White + Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvOffenePosten.Location = New System.Drawing.Point(12, 591) + Me.dgvOffenePosten.MultiSelect = False + Me.dgvOffenePosten.Name = "dgvOffenePosten" + Me.dgvOffenePosten.ReadOnly = True + Me.dgvOffenePosten.RowHeadersVisible = False + Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 281) + Me.dgvOffenePosten.TabIndex = 175 + ' + 'btnOP + ' + Me.btnOP.BackgroundImage = Global.SDL.My.Resources.Resources.mahn + Me.btnOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnOP.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnOP.FlatAppearance.BorderSize = 0 + Me.btnOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnOP.Location = New System.Drawing.Point(702, 564) + Me.btnOP.Name = "btnOP" + Me.btnOP.Size = New System.Drawing.Size(24, 24) + Me.btnOP.TabIndex = 174 + Me.btnOP.UseVisualStyleBackColor = True + ' 'Label17 ' Me.Label17.AutoSize = True @@ -1309,11 +1406,21 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(1616, 848) + Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True ' + 'usrcntlKarten + ' + Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default + Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.usrcntlKarten.Name = "usrcntlKarten" + Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33) + Me.usrcntlKarten.TabIndex = 0 + ' 'tbLKW ' Me.tbLKW.Controls.Add(Me.pnlLKWRight) @@ -1321,7 +1428,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(1616, 848) + Me.tbLKW.Size = New System.Drawing.Size(178, 39) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1333,9 +1440,22 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(1304, 842) + Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) Me.pnlLKWRight.TabIndex = 2 ' + 'UsrCntlLKW1 + ' + Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White + Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) + Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.Name = "UsrCntlLKW1" + Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) + Me.UsrCntlLKW1.TabIndex = 0 + ' 'pnlLKW ' Me.pnlLKW.Controls.Add(Me.dgvLKW) @@ -1344,7 +1464,7 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 842) + Me.pnlLKW.Size = New System.Drawing.Size(306, 33) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW @@ -1385,7 +1505,7 @@ Partial Class frmKundenblatt Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 668) + Me.dgvLKW.Size = New System.Drawing.Size(306, 0) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1397,7 +1517,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 730) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -1538,7 +1658,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(1616, 848) + Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -1550,7 +1670,7 @@ Partial Class frmKundenblatt Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1610, 842) + Me.Panel3.Size = New System.Drawing.Size(172, 33) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -1568,7 +1688,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(1616, 848) + Me.tbDokumente.Size = New System.Drawing.Size(178, 39) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -1766,7 +1886,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(1616, 848) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -1782,6 +1902,16 @@ Partial Class frmKundenblatt Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 880) + Me.UsrCntlOfferte1.TabIndex = 0 + ' 'tbUSTV ' Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) @@ -1912,11 +2042,19 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22) Me.tbUSTVAntrage.Name = "tbUSTVAntrage" Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3) - Me.tbUSTVAntrage.Size = New System.Drawing.Size(1622, 854) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45) Me.tbUSTVAntrage.TabIndex = 9 Me.tbUSTVAntrage.Text = "USTV-Anträge" Me.tbUSTVAntrage.UseVisualStyleBackColor = True ' + 'UsrCntlUSTV + ' + Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlUSTV.Name = "UsrCntlUSTV" + Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39) + Me.UsrCntlUSTV.TabIndex = 0 + ' 'cntxtExcel ' Me.cntxtExcel.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2059,7 +2197,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -2193,144 +2331,6 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' - 'btnOP - ' - Me.btnOP.BackgroundImage = Global.SDL.My.Resources.Resources.mahn - Me.btnOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnOP.Cursor = System.Windows.Forms.Cursors.Hand - Me.btnOP.FlatAppearance.BorderSize = 0 - Me.btnOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOP.Location = New System.Drawing.Point(702, 564) - Me.btnOP.Name = "btnOP" - Me.btnOP.Size = New System.Drawing.Size(24, 24) - Me.btnOP.TabIndex = 174 - Me.btnOP.UseVisualStyleBackColor = True - ' - 'dgvOffenePosten - ' - Me.dgvOffenePosten.AllowUserToAddRows = False - Me.dgvOffenePosten.AllowUserToDeleteRows = False - Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvOffenePosten.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White - Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvOffenePosten.Location = New System.Drawing.Point(12, 591) - Me.dgvOffenePosten.MultiSelect = False - Me.dgvOffenePosten.Name = "dgvOffenePosten" - Me.dgvOffenePosten.ReadOnly = True - Me.dgvOffenePosten.RowHeadersVisible = False - Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 281) - Me.dgvOffenePosten.TabIndex = 175 - ' - 'Label9 - ' - Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(9, 575) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(78, 13) - Me.Label9.TabIndex = 176 - Me.Label9.Text = "Offene Posten:" - ' - 'Label10 - ' - Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(544, 570) - Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(149, 13) - Me.Label10.TabIndex = 177 - Me.Label10.Text = "Zahlungserinnerung/OP-Liste:" - ' - 'btnReloadOP - ' - Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance - Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand - Me.btnReloadOP.FlatAppearance.BorderSize = 0 - Me.btnReloadOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnReloadOP.Location = New System.Drawing.Point(240, 563) - Me.btnReloadOP.Name = "btnReloadOP" - Me.btnReloadOP.Size = New System.Drawing.Size(25, 25) - Me.btnReloadOP.TabIndex = 180 - Me.btnReloadOP.UseVisualStyleBackColor = True - Me.btnReloadOP.Visible = False - ' - 'Label11 - ' - Me.Label11.AutoSize = True - Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label11.Location = New System.Drawing.Point(271, 570) - Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(82, 13) - Me.Label11.TabIndex = 178 - Me.Label11.Text = "Daten für Firma:" - ' - 'cboFirmaFMZOLL - ' - Me.cboFirmaFMZOLL._allowedValuesFreiText = Nothing - Me.cboFirmaFMZOLL._allowFreiText = False - Me.cboFirmaFMZOLL._value = "" - Me.cboFirmaFMZOLL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboFirmaFMZOLL.FormattingEnabled = True - Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(354, 567) - Me.cboFirmaFMZOLL.Name = "cboFirmaFMZOLL" - Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(184, 21) - Me.cboFirmaFMZOLL.TabIndex = 179 - ' - 'UsrcntlKundeBearbeitenFull1 - ' - Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White - Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 874) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' - 'usrcntlKarten - ' - Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(1610, 842) - Me.usrcntlKarten.TabIndex = 0 - ' - 'UsrCntlLKW1 - ' - Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White - Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) - Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 842) - Me.UsrCntlLKW1.TabIndex = 0 - ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 880) - Me.UsrCntlOfferte1.TabIndex = 0 - ' - 'UsrCntlUSTV - ' - Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlUSTV.Name = "UsrCntlUSTV" - Me.UsrCntlUSTV.Size = New System.Drawing.Size(1616, 848) - Me.UsrCntlUSTV.TabIndex = 0 - ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2357,6 +2357,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.ResumeLayout(False) Me.tbAllgemein.ResumeLayout(False) Me.tbAllgemein.PerformLayout() + CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit() @@ -2409,7 +2410,6 @@ Partial Class frmKundenblatt Me.mne.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() - CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index c1f4433b..8e4ab1d7 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -339,6 +339,9 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.tbZahlungsinfo = New System.Windows.Forms.TabPage() + Me.rtb_Zahlungsinfo = New System.Windows.Forms.RichTextBox() + Me.Label102 = New System.Windows.Forms.Label() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -371,6 +374,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage10.SuspendLayout() Me.TabPage11.SuspendLayout() Me.pnlNeukunde.SuspendLayout() + Me.tbZahlungsinfo.SuspendLayout() Me.SuspendLayout() ' 'tbcntrDetails @@ -385,6 +389,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbcntrDetails.Controls.Add(Me.tbUmsatzsteuer) Me.tbcntrDetails.Controls.Add(Me.tbSonstiges) Me.tbcntrDetails.Controls.Add(Me.tbSchnittstellen) + Me.tbcntrDetails.Controls.Add(Me.tbZahlungsinfo) Me.tbcntrDetails.Location = New System.Drawing.Point(462, 3) Me.tbcntrDetails.Name = "tbcntrDetails" Me.tbcntrDetails.SelectedIndex = 0 @@ -560,6 +565,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'UsrCntlKundenAvisoMailBenachrichtigung1 ' + Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6) Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" @@ -4557,6 +4563,35 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' + 'tbZahlungsinfo + ' + Me.tbZahlungsinfo.Controls.Add(Me.Label102) + Me.tbZahlungsinfo.Controls.Add(Me.rtb_Zahlungsinfo) + Me.tbZahlungsinfo.Location = New System.Drawing.Point(4, 22) + Me.tbZahlungsinfo.Name = "tbZahlungsinfo" + Me.tbZahlungsinfo.Size = New System.Drawing.Size(672, 458) + Me.tbZahlungsinfo.TabIndex = 11 + Me.tbZahlungsinfo.Text = "Zahlungsinfo" + Me.tbZahlungsinfo.UseVisualStyleBackColor = True + ' + 'rtb_Zahlungsinfo + ' + Me.rtb_Zahlungsinfo.Location = New System.Drawing.Point(6, 35) + Me.rtb_Zahlungsinfo.Name = "rtb_Zahlungsinfo" + Me.rtb_Zahlungsinfo.Size = New System.Drawing.Size(660, 412) + Me.rtb_Zahlungsinfo.TabIndex = 40 + Me.rtb_Zahlungsinfo.Text = "" + ' + 'Label102 + ' + Me.Label102.AutoSize = True + Me.Label102.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label102.Location = New System.Drawing.Point(3, 18) + Me.Label102.Name = "Label102" + Me.Label102.Size = New System.Drawing.Size(66, 13) + Me.Label102.TabIndex = 132 + Me.Label102.Text = "Zahlunginfo:" + ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -4642,6 +4677,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage11.ResumeLayout(False) Me.pnlNeukunde.ResumeLayout(False) Me.pnlNeukunde.PerformLayout() + Me.tbZahlungsinfo.ResumeLayout(False) + Me.tbZahlungsinfo.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -4947,4 +4984,7 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents PictureBox5 As PictureBox Friend WithEvents Label101 As Label Friend WithEvents txtAbwZZVL As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents tbZahlungsinfo As TabPage + Friend WithEvents Label102 As Label + Friend WithEvents rtb_Zahlungsinfo As RichTextBox End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.resx b/SDL/kunden/usrcntlKundeBearbeitenFull.resx index 279a4474..1af7de15 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.resx +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index f81b8c5a..193e1acc 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -287,6 +287,7 @@ Public Class usrcntlKundeBearbeitenFull txtVers_Bankgarantiebetrag._value = loadValue(KUNDE.BankgarantieBetrag, "") txtVers_BankgarantiebetragGueltigBis._value = loadValue(KUNDE.BankgarantieGültigBis, "") txtVers_Information.Text = loadValue(KUNDE.Info, "") + rtb_Zahlungsinfo.Text = loadValue(KUNDE.Zahlungsinformationen, "") txtVers_Saldo._value = loadValue(KUNDE.LfdSaldo, "") cbxDeckungsstopp.Checked = KUNDE_ERW.kde_Versicherung_Deckungsstopp txtDeckungsstoppDatum._value = loadValue(KUNDE_ERW.kde_Versicherung_DeckungsstoppDatum, "") @@ -578,6 +579,7 @@ Public Class usrcntlKundeBearbeitenFull KUNDE.BankgarantieBetrag = isLeerNothingDbl(txtVers_Bankgarantiebetrag._value) KUNDE.BankgarantieGültigBis = isLeerNothing(txtVers_BankgarantiebetragGueltigBis._value) KUNDE.Info = isLeerNothing(txtVers_Information.Text) + KUNDE.Zahlungsinformationen = isLeerNothing(rtb_Zahlungsinfo.Text) KUNDE.LfdSaldo = isLeerNothingDbl(txtVers_Saldo._value) KUNDE_ERW.kde_Versicherung_Deckungsstopp = cbxDeckungsstopp.Checked KUNDE_ERW.kde_Versicherung_DeckungsstoppDatum = isLeerNothing(txtDeckungsstoppDatum._value) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb index a19af3c3..6e9a1c2f 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb @@ -43,11 +43,11 @@ Public Class cMessenger Public Shared Function GET_NewMSG_COUNT(Optional maId = -1) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0 ", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0 and chatMg_chatId in (SELECT [chatMb_chatId] FROM [tblMessenger_ChatMembers] where [chatMb_maId] = " & maId & ")", "ADMIN",,, 0) End Function Public Shared Function GET_NewMSG_COUNT_CHATID(maId, chat_Id) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chatMg_chatId='" & chat_Id & "'", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chatMg_chatId='" & chat_Id & "' AND (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId='" & chat_Id & "'AND chatMB_maId=" & maId & ")>0", "ADMIN",,, 0) End Function Public Shared Function SET_LKWCHAT_INAKTIV(AvisoId) As Integer @@ -56,7 +56,8 @@ Public Class cMessenger Public Shared Function GET_NewMSG_COUNT_ART(maId, chat_art) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chat_art='" & chat_art & "' AND (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & maId & ")>0", "ADMIN",,, 0) + 'Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chat_art='" & chat_art & "' AND (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & maId & ")>0", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chat_art='" & chat_art & "' AND chatMg_chatId in (SELECT [chatMb_chatId] FROM [tblMessenger_ChatMembers] where [chatMb_maId] = " & maId & " and chatMB_chatId=chat_id)", "ADMIN",,, 0) End Function Public Shared Function GET_NewMSG_COUNT_ART_INAKTIV(maId, chat_art) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb index 8ce9ed19..115ddd7b 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb @@ -65,6 +65,8 @@ Public Class cMitarbeiter Property mit_FirmaHaupt As Object = Nothing Property mit_ChatEasteregg As Boolean = False + Property mit_ChatEasteregg2 As Boolean = False + Property mit_MAVerzeichnis_SettingsTstmp As Object = Nothing @@ -181,6 +183,7 @@ Public Class cMitarbeiter list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ChatBenutzer", mit_ChatBenutzer)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_FirmaHaupt", mit_FirmaHaupt)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ChatEasteregg", mit_ChatEasteregg)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ChatEasteregg2", mit_ChatEasteregg2)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_SettingsTstmp", mit_MAVerzeichnis_SettingsTstmp)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_allowGebDat", mit_MAVerzeichnis_allowGebDat)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_allowWohnadresse", mit_MAVerzeichnis_allowWohnadresse)) @@ -377,6 +380,7 @@ Public Class cMitarbeiter Me.mit_ChatBenutzer = dr.Item("mit_ChatBenutzer") Me.mit_ChatEasteregg = dr.Item("mit_ChatEasteregg") + Me.mit_ChatEasteregg2 = dr.Item("mit_ChatEasteregg2") If Not dr.Item("mit_FirmaHaupt") Is DBNull.Value Then Me.mit_FirmaHaupt = dr.Item("mit_FirmaHaupt") diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index 5054035b..5f430869 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -24,6 +24,7 @@ Partial Class frmMessenger 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. 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() @@ -38,12 +39,12 @@ Partial Class frmMessenger Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger)) Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() - Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() Me.Label3 = New System.Windows.Forms.Label() Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox() - Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel5 = New System.Windows.Forms.Panel() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() @@ -64,7 +65,7 @@ Partial Class frmMessenger Me.btnNeu = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel() + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() Me.Panel3 = New System.Windows.Forms.Panel() Me.btnTeilnehmer = New System.Windows.Forms.Button() @@ -92,9 +93,9 @@ Partial Class frmMessenger Me.btnSendAtt = New System.Windows.Forms.Button() Me.btnSenden = New System.Windows.Forms.Button() Me.rtbChatMessage = New System.Windows.Forms.RichTextBox() - Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer() - Me.Timer_REFRESH = New System.Windows.Forms.Timer() - Me.cntxt = New System.Windows.Forms.ContextMenuStrip() + Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components) + Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) + Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb index c7b40745..36a06010 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb @@ -5,7 +5,6 @@ Imports System.Security.Policy Imports System.Threading Imports System.Web.UI.WebControls.WebParts Imports System.Windows.Forms -Imports Util Imports VERAG_PROG_ALLGEMEIN.cMessenger Public Class frmMessenger @@ -21,6 +20,7 @@ Public Class frmMessenger Public SendungID As Integer = -1 Dim alloweasteregg = False + Dim hiddemEmojis = False Dim toggle_CHAT_ART = "CHAT" Public Sub New() @@ -123,6 +123,7 @@ Public Class frmMessenger MyFlowLayoutPanel1.Controls.Clear() 'loaded = True alloweasteregg = cAllgemein.MITARBEITER.mit_ChatEasteregg + hiddemEmojis = cAllgemein.MITARBEITER.mit_ChatEasteregg2 initEmojis() VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me) End Sub @@ -131,8 +132,6 @@ Public Class frmMessenger FlowLayoutPanel.Controls.Clear() If alloweasteregg Then pic.Visible = False - - ' If IO.Directory.Exists(My.Application.roo "") Then Dim spezialEmoji = False @@ -140,24 +139,27 @@ Public Class frmMessenger If IO.Directory.Exists(EMOJI_PATH) Then For Each aa In IO.Directory.GetFiles(EMOJI_PATH) '.OrderBy(Function(f) f) - If alloweasteregg Or Not aa.Contains("easteregg") Then + If (alloweasteregg Or Not aa.Contains("easteregg")) Then If IO.File.Exists(aa) And aa.Contains(".png") And (aa.Contains("emoji_") Or spezialEmoji) Then + If hiddemEmojis Or Not aa.Contains("_hidden") Then + Dim p As New PictureBox + p.Size = New Size(40, 40) + p.BackgroundImage = Image.FromFile(aa) + p.BackgroundImageLayout = ImageLayout.Zoom + p.Cursor = Cursors.Hand + AddHandler p.Click, Sub() + If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub + If CHAT IsNot Nothing Then + saveEmoji(aa) + End If + End Sub - Dim p As New PictureBox - p.Size = New Size(40, 40) - p.BackgroundImage = Image.FromFile(aa) - p.BackgroundImageLayout = ImageLayout.Zoom - p.Cursor = Cursors.Hand - AddHandler p.Click, Sub() - If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub - If CHAT IsNot Nothing Then - saveEmoji(aa) - End If - End Sub + FlowLayoutPanel.Controls.Add(p) + End If - FlowLayoutPanel.Controls.Add(p) End If End If + 'MsgBox(a) Next End If