From c2ae98edb25a17b46430025f76149976b29e8d10 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 14 May 2024 15:16:17 +0200 Subject: [PATCH] =?UTF-8?q?Messenger,=20MautAT,=20Ticker=20f=C3=BCr=20Chat?= =?UTF-8?q?=20auf=2015sec=20hochgestellt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usrCntlSDLLeistungMautAT.Designer.vb | 119 +++++++++++++++--- .../usrCntlSDLLeistungMautAT.vb | 2 +- SDL/mdm/usrCntlKartenDaten.vb | 9 +- VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb | 6 +- VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb | 6 +- 5 files changed, 119 insertions(+), 23 deletions(-) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.Designer.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.Designer.vb index 340af73f..c9905f59 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.Designer.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.Designer.vb @@ -51,11 +51,13 @@ Partial Class usrCntlSDLLeistungMautAT Me.Label4 = New System.Windows.Forms.Label() Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() - Me.UsrCntlDetails = New SDL.usrCntlAllg() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.cbxErsatzkarte = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) Me.cbxArchiviert = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.UsrCntlDetails = New SDL.usrCntlAllg() + Me.txtCO2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label5 = New System.Windows.Forms.Label() Me.Panel2.SuspendLayout() Me.tbcntr.SuspendLayout() Me.TabPage1.SuspendLayout() @@ -64,14 +66,19 @@ Partial Class usrCntlSDLLeistungMautAT ' 'txtKategorie ' + Me.txtKategorie._DateTimeOnly = False Me.txtKategorie._numbersOnly = True + Me.txtKategorie._numbersOnlyKommastellen = "" + Me.txtKategorie._numbersOnlyTrennzeichen = True Me.txtKategorie._Prozent = False Me.txtKategorie._ShortDateNew = False Me.txtKategorie._ShortDateOnly = False Me.txtKategorie._TimeOnly = False - Me.txtKategorie._value = Nothing + Me.txtKategorie._TimeOnly_Seconds = False + Me.txtKategorie._value = "" Me.txtKategorie._Waehrung = False - Me.txtKategorie.Location = New System.Drawing.Point(270, 68) + Me.txtKategorie._WaehrungZeichen = True + Me.txtKategorie.Location = New System.Drawing.Point(106, 115) Me.txtKategorie.MaxLength = 1 Me.txtKategorie.MaxLineLength = -1 Me.txtKategorie.MaxLines_Warning = "" @@ -82,13 +89,18 @@ Partial Class usrCntlSDLLeistungMautAT ' 'txtBestellNr ' + Me.txtBestellNr._DateTimeOnly = False Me.txtBestellNr._numbersOnly = False + Me.txtBestellNr._numbersOnlyKommastellen = "" + Me.txtBestellNr._numbersOnlyTrennzeichen = True Me.txtBestellNr._Prozent = False Me.txtBestellNr._ShortDateNew = False Me.txtBestellNr._ShortDateOnly = False Me.txtBestellNr._TimeOnly = False + Me.txtBestellNr._TimeOnly_Seconds = False Me.txtBestellNr._value = Nothing Me.txtBestellNr._Waehrung = False + Me.txtBestellNr._WaehrungZeichen = True Me.txtBestellNr.Location = New System.Drawing.Point(106, 36) Me.txtBestellNr.MaxLength = 15 Me.txtBestellNr.MaxLineLength = -1 @@ -101,7 +113,7 @@ Partial Class usrCntlSDLLeistungMautAT 'Label13 ' Me.Label13.AutoSize = True - Me.Label13.Location = New System.Drawing.Point(209, 71) + Me.Label13.Location = New System.Drawing.Point(6, 119) Me.Label13.Name = "Label13" Me.Label13.Size = New System.Drawing.Size(55, 13) Me.Label13.TabIndex = 18 @@ -118,13 +130,18 @@ Partial Class usrCntlSDLLeistungMautAT ' 'txtOBUID ' + Me.txtOBUID._DateTimeOnly = False Me.txtOBUID._numbersOnly = False + Me.txtOBUID._numbersOnlyKommastellen = "" + Me.txtOBUID._numbersOnlyTrennzeichen = True Me.txtOBUID._Prozent = False Me.txtOBUID._ShortDateNew = False Me.txtOBUID._ShortDateOnly = False Me.txtOBUID._TimeOnly = False + Me.txtOBUID._TimeOnly_Seconds = False Me.txtOBUID._value = Nothing Me.txtOBUID._Waehrung = False + Me.txtOBUID._WaehrungZeichen = True Me.txtOBUID.Location = New System.Drawing.Point(106, 139) Me.txtOBUID.MaxLength = 18 Me.txtOBUID.MaxLineLength = -1 @@ -136,13 +153,18 @@ Partial Class usrCntlSDLLeistungMautAT ' 'txtKartenNr ' + Me.txtKartenNr._DateTimeOnly = False Me.txtKartenNr._numbersOnly = False + Me.txtKartenNr._numbersOnlyKommastellen = "" + Me.txtKartenNr._numbersOnlyTrennzeichen = True Me.txtKartenNr._Prozent = False Me.txtKartenNr._ShortDateNew = False Me.txtKartenNr._ShortDateOnly = False Me.txtKartenNr._TimeOnly = False + Me.txtKartenNr._TimeOnly_Seconds = False Me.txtKartenNr._value = Nothing Me.txtKartenNr._Waehrung = False + Me.txtKartenNr._WaehrungZeichen = True Me.txtKartenNr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtKartenNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtKartenNr.Location = New System.Drawing.Point(574, 4) @@ -205,13 +227,18 @@ Partial Class usrCntlSDLLeistungMautAT ' 'txtStatus ' + Me.txtStatus._DateTimeOnly = False Me.txtStatus._numbersOnly = False + Me.txtStatus._numbersOnlyKommastellen = "" + Me.txtStatus._numbersOnlyTrennzeichen = True Me.txtStatus._Prozent = False Me.txtStatus._ShortDateNew = False Me.txtStatus._ShortDateOnly = False Me.txtStatus._TimeOnly = False + Me.txtStatus._TimeOnly_Seconds = False Me.txtStatus._value = Nothing Me.txtStatus._Waehrung = False + Me.txtStatus._WaehrungZeichen = True Me.txtStatus.Location = New System.Drawing.Point(259, 90) Me.txtStatus.MaxLength = 2 Me.txtStatus.MaxLineLength = -1 @@ -246,13 +273,18 @@ Partial Class usrCntlSDLLeistungMautAT ' 'txtVermerk ' + Me.txtVermerk._DateTimeOnly = False Me.txtVermerk._numbersOnly = False + Me.txtVermerk._numbersOnlyKommastellen = "" + Me.txtVermerk._numbersOnlyTrennzeichen = True Me.txtVermerk._Prozent = False Me.txtVermerk._ShortDateNew = False Me.txtVermerk._ShortDateOnly = False Me.txtVermerk._TimeOnly = False + Me.txtVermerk._TimeOnly_Seconds = False Me.txtVermerk._value = Nothing Me.txtVermerk._Waehrung = False + Me.txtVermerk._WaehrungZeichen = True Me.txtVermerk.Location = New System.Drawing.Point(106, 162) Me.txtVermerk.MaxLength = 100 Me.txtVermerk.MaxLineLength = -1 @@ -260,7 +292,7 @@ Partial Class usrCntlSDLLeistungMautAT Me.txtVermerk.MaxLines_Warning_Label = Nothing Me.txtVermerk.Multiline = True Me.txtVermerk.Name = "txtVermerk" - Me.txtVermerk.Size = New System.Drawing.Size(183, 55) + Me.txtVermerk.Size = New System.Drawing.Size(183, 51) Me.txtVermerk.TabIndex = 7 ' 'Label6 @@ -326,13 +358,18 @@ Partial Class usrCntlSDLLeistungMautAT ' 'txtGueltigkeit2 ' + Me.txtGueltigkeit2._DateTimeOnly = False Me.txtGueltigkeit2._numbersOnly = False + Me.txtGueltigkeit2._numbersOnlyKommastellen = "" + Me.txtGueltigkeit2._numbersOnlyTrennzeichen = True Me.txtGueltigkeit2._Prozent = False Me.txtGueltigkeit2._ShortDateNew = True Me.txtGueltigkeit2._ShortDateOnly = False Me.txtGueltigkeit2._TimeOnly = False + Me.txtGueltigkeit2._TimeOnly_Seconds = False Me.txtGueltigkeit2._value = "" Me.txtGueltigkeit2._Waehrung = False + Me.txtGueltigkeit2._WaehrungZeichen = True Me.txtGueltigkeit2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtGueltigkeit2.ForeColor = System.Drawing.Color.Red Me.txtGueltigkeit2.Location = New System.Drawing.Point(389, 36) @@ -356,13 +393,18 @@ Partial Class usrCntlSDLLeistungMautAT ' 'txtUmstellungsdatum ' + Me.txtUmstellungsdatum._DateTimeOnly = False Me.txtUmstellungsdatum._numbersOnly = False + Me.txtUmstellungsdatum._numbersOnlyKommastellen = "" + Me.txtUmstellungsdatum._numbersOnlyTrennzeichen = True Me.txtUmstellungsdatum._Prozent = False Me.txtUmstellungsdatum._ShortDateNew = True Me.txtUmstellungsdatum._ShortDateOnly = False Me.txtUmstellungsdatum._TimeOnly = False + Me.txtUmstellungsdatum._TimeOnly_Seconds = False Me.txtUmstellungsdatum._value = "" Me.txtUmstellungsdatum._Waehrung = False + Me.txtUmstellungsdatum._WaehrungZeichen = True Me.txtUmstellungsdatum.ForeColor = System.Drawing.Color.Red Me.txtUmstellungsdatum.Location = New System.Drawing.Point(106, 68) Me.txtUmstellungsdatum.MaxLength = 10 @@ -375,13 +417,18 @@ Partial Class usrCntlSDLLeistungMautAT ' 'txtVertragabschlussdatum ' + Me.txtVertragabschlussdatum._DateTimeOnly = False Me.txtVertragabschlussdatum._numbersOnly = False + Me.txtVertragabschlussdatum._numbersOnlyKommastellen = "" + Me.txtVertragabschlussdatum._numbersOnlyTrennzeichen = True Me.txtVertragabschlussdatum._Prozent = False Me.txtVertragabschlussdatum._ShortDateNew = True Me.txtVertragabschlussdatum._ShortDateOnly = False Me.txtVertragabschlussdatum._TimeOnly = False + Me.txtVertragabschlussdatum._TimeOnly_Seconds = False Me.txtVertragabschlussdatum._value = "" Me.txtVertragabschlussdatum._Waehrung = False + Me.txtVertragabschlussdatum._WaehrungZeichen = True Me.txtVertragabschlussdatum.ForeColor = System.Drawing.Color.Red Me.txtVertragabschlussdatum.Location = New System.Drawing.Point(106, 90) Me.txtVertragabschlussdatum.MaxLength = 10 @@ -394,13 +441,18 @@ Partial Class usrCntlSDLLeistungMautAT ' 'txtSchadstoffklasse ' + Me.txtSchadstoffklasse._DateTimeOnly = False Me.txtSchadstoffklasse._numbersOnly = False + Me.txtSchadstoffklasse._numbersOnlyKommastellen = "" + Me.txtSchadstoffklasse._numbersOnlyTrennzeichen = True Me.txtSchadstoffklasse._Prozent = False Me.txtSchadstoffklasse._ShortDateNew = False Me.txtSchadstoffklasse._ShortDateOnly = False Me.txtSchadstoffklasse._TimeOnly = False + Me.txtSchadstoffklasse._TimeOnly_Seconds = False Me.txtSchadstoffklasse._value = Nothing Me.txtSchadstoffklasse._Waehrung = False + Me.txtSchadstoffklasse._WaehrungZeichen = True Me.txtSchadstoffklasse.Location = New System.Drawing.Point(270, 112) Me.txtSchadstoffklasse.MaxLength = 2 Me.txtSchadstoffklasse.MaxLineLength = -1 @@ -441,15 +493,6 @@ Partial Class usrCntlSDLLeistungMautAT Me.TabPage1.Text = "Details" Me.TabPage1.UseVisualStyleBackColor = True ' - 'UsrCntlDetails - ' - Me.UsrCntlDetails.BackColor = System.Drawing.Color.White - Me.UsrCntlDetails.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlDetails.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlDetails.Name = "UsrCntlDetails" - Me.UsrCntlDetails.Size = New System.Drawing.Size(250, 158) - Me.UsrCntlDetails.TabIndex = 18 - ' 'TabPage2 ' Me.TabPage2.Controls.Add(Me.scanSonstiges) @@ -468,6 +511,8 @@ Partial Class usrCntlSDLLeistungMautAT Me.scanSonstiges._DATENSERVER_UOrdner1 = "" Me.scanSonstiges._DATENSERVER_UOrdner2 = "" Me.scanSonstiges._DATENSERVER_UOrdner3 = "" + Me.scanSonstiges._OPEN_ORIGINAL = False + Me.scanSonstiges._TYPE = "PDF" Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.scanSonstiges.BackColor = System.Drawing.Color.White Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -504,11 +549,54 @@ Partial Class usrCntlSDLLeistungMautAT Me.cbxArchiviert.Text = "ARCHIVIERT" Me.cbxArchiviert.UseVisualStyleBackColor = True ' + 'UsrCntlDetails + ' + Me.UsrCntlDetails.BackColor = System.Drawing.Color.White + Me.UsrCntlDetails.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlDetails.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlDetails.Name = "UsrCntlDetails" + Me.UsrCntlDetails.Size = New System.Drawing.Size(250, 158) + Me.UsrCntlDetails.TabIndex = 18 + ' + 'txtCO2 + ' + Me.txtCO2._DateTimeOnly = False + Me.txtCO2._numbersOnly = False + Me.txtCO2._numbersOnlyKommastellen = "" + Me.txtCO2._numbersOnlyTrennzeichen = True + Me.txtCO2._Prozent = False + Me.txtCO2._ShortDateNew = False + Me.txtCO2._ShortDateOnly = False + Me.txtCO2._TimeOnly = False + Me.txtCO2._TimeOnly_Seconds = False + Me.txtCO2._value = Nothing + Me.txtCO2._Waehrung = False + Me.txtCO2._WaehrungZeichen = True + Me.txtCO2.Location = New System.Drawing.Point(270, 67) + Me.txtCO2.MaxLength = 2 + Me.txtCO2.MaxLineLength = -1 + Me.txtCO2.MaxLines_Warning = "" + Me.txtCO2.MaxLines_Warning_Label = Nothing + Me.txtCO2.Name = "txtCO2" + Me.txtCO2.Size = New System.Drawing.Size(19, 20) + Me.txtCO2.TabIndex = 94 + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(186, 70) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(76, 13) + Me.Label5.TabIndex = 95 + Me.Label5.Text = "CO2 Kategorie" + ' 'usrCntlSDLLeistungMautAT ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.txtCO2) + Me.Controls.Add(Me.Label5) Me.Controls.Add(Me.cbxArchiviert) Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.txtSchadstoffklasse) @@ -579,5 +667,6 @@ Partial Class usrCntlSDLLeistungMautAT Friend WithEvents scanSonstiges As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList Friend WithEvents cbxErsatzkarte As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue Friend WithEvents cbxArchiviert As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue - + Friend WithEvents txtCO2 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label5 As Label End Class diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.vb index d025794f..b3aa0f2b 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.vb @@ -90,7 +90,7 @@ Public Class usrCntlSDLLeistungMautAT UsrCntlDetails.lblAenderung.Text = SDL.Änderungsdatum UsrCntlDetails.lblSachbearb.Text = SDL.Sachbearbeiter - + txtCO2.Text = SDL.CO2Kategorie txtSchadstoffklasse.Text = SDL.Schadstoffklasse txtBestellNr.Text = SDL.BestellNr txtOBUID.Text = SDL.OBUID diff --git a/SDL/mdm/usrCntlKartenDaten.vb b/SDL/mdm/usrCntlKartenDaten.vb index 3544197a..699ba63c 100644 --- a/SDL/mdm/usrCntlKartenDaten.vb +++ b/SDL/mdm/usrCntlKartenDaten.vb @@ -510,7 +510,7 @@ Public Class usrCntlKartenDaten Case 100 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, (SELECT TOP 1 [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE [KdNrVERAG]=KundenNr AND KdNrAlt =0 ORDER BY Zeitstempel DESC) as [IDS-KdNr], KartenNr, GültigBis, PIN, Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=100" Case 101 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenSchlüsselNr, GültigBis, PIN, Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=101" Case 212 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, UTAKundenNr, KartenNr,[CARD-Nr], GültigBis, PIN, Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr WHERE SDLNr=212" - Case 200 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, [BestellNr],[Umstellungsdatum],KartenNr,OBUID, Vertragsabschlussdatum,Kategorie,Status,Schadstoffklasse, Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=200" + Case 200 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, [BestellNr],[Umstellungsdatum],KartenNr,OBUID, Vertragsabschlussdatum,Kategorie,Status,Schadstoffklasse,CO2Kategorie ,Nationalitaet as Nation ,Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=200" Case 201 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, Vermerk ,Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, LKWAbgemeldet, Partner,BenutzerNr,FlottenPIN,MasterPIN, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=201" Case 202 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [TELEPASS-Kd-Nr], VIACARD,[TELEPASS-Nr], Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Retourniert,TelepassErsatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=202" Case 203 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=203" @@ -546,6 +546,13 @@ Public Class usrCntlKartenDaten End With End If + If SDLNrTmp = 200 Then + With dgvSDL + .Columns("Kategorie").Visible = False + End With + End If + + initAllg() dgvSDL.Width = 100 dgvSDL.Height = 100 diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb index 16164c62..d775bb01 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb @@ -736,7 +736,6 @@ Public Class cMessenger Public Class cMessenger_ChatMessages Property chatMg_id As Integer ' INT Not NULL PRIMARY KEY IDENTITY, - Property chatMg_chatId As Integer ' INT Not NULL, Property chatMg_maId As Integer ' INT Not NULL, Property chatMg_datetime As Date = Now @@ -771,7 +770,6 @@ Public Class cMessenger list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_datetime", chatMg_datetime)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_maName", chatMg_maName)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_maFirma", chatMg_maFirma)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_type", chatMg_type)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_text", chatMg_text)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_anhang_docId", chatMg_anhang_docId)) @@ -920,7 +918,7 @@ Public Class cMessenger Try Me.CHAT_MESSAGES_STATUS_LIST.Clear() Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN() - Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMg_id ", conn) + Using cmd As New SqlCommand("SELECT chatMgSt_MaId FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMg_id ", conn) cmd.Parameters.AddWithValue("@chatMg_id", Me.chatMg_id) Dim dr = cmd.ExecuteReader() While dr.Read @@ -1021,7 +1019,7 @@ Public Class cMessenger Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ) " & + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT chatMgSt_chatMsgId FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ) " & " BEGIN " & getUpdateCmd() & " END " & " Else " & " BEGIN " & getInsertCmd() & " END " & diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb index d54b1bea..4e5cba49 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb @@ -61,11 +61,11 @@ Public Class cSDL Property Archiviert As Boolean = False Property LKWAbgemeldet As Boolean = False Property LKWAbgemeldetAM As Object = Nothing - Property Fahrer As Object = Nothing Property Kaution As Object = Nothing Property BelegNr As Object = Nothing - + Property Nationalitaet As Object = Nothing + Property CO2Kategorie As Object = Nothing Public hasentry Dim SQL As New SQL @@ -154,6 +154,8 @@ Public Class cSDL list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Fahrer", Fahrer)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kaution", Kaution)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BelegNr", BelegNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Nationalitaet", Nationalitaet)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CO2Kategorie", CO2Kategorie)) Return list End Function