diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 54a06a45..92096d24 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -1887,7 +1887,7 @@ Public Class cFakturierung Public Shared Function GET_SR_SQLDT(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Optional whereKdNr As String = "", Optional SB As String = "", Optional AvisoIds As List(Of Integer) = Nothing, Optional FakturierungsGruppe As String = "", Optional Abfertigungsart As String = "") As DataTable If whereKdNr <> "" Then whereKdNr = " AND RechnungsKundenNr IN(" & whereKdNr & ") " Dim whereAbfArt = "" - If Abfertigungsart <> "" Then whereAbfArt = " AND (SELECT Abfertigungsart FROM Speditionsbuch WHERE Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.SpeditionsbuchUnterNr)='" & Abfertigungsart & "' " + If Abfertigungsart <> "" Then whereAbfArt = " AND (SELECT TOP 1 Abfertigungsart FROM Speditionsbuch WHERE Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.SpeditionsbuchUnterNr)='" & Abfertigungsart & "' " Dim sqlStr = " SELECT Rechnungsausgang.RK_ID, Rechnungsausgang.Firma_ID, Rechnungsausgang.FilialenNr, Rechnungsausgang.RechnungsKundenNr, Rechnungsausgang.BelegartenNr, Rechnungsausgang.[Steuersatz %], Rechnungsausgang.Lastschrift, Rechnungsausgang.Währungscode, Rechnungsausgang.AvisoID, Rechnungsausgang.RechnungsNr, Rechnungsausgang.RechnungsDatum, Rechnungsausgang.DruckDatumZeit, Rechnungsausgang.Status, Rechnungsausgang.Sammelrechnung, Rechnungsausgang.Abfertigungsdatum, Rechnungsausgang.Buchungsjahr,Rechnungsausgang.AbfertigungsNr,Rechnungsausgang.SpeditionsbuchUnterNr,[SteuerpflichtigerGesamtbetrag],[SteuerfreierGesamtbetrag] From Rechnungsausgang @@ -1899,7 +1899,7 @@ Public Class cFakturierung Else sqlStr &= " ORDER BY Rechnungsausgang.Firma_ID, Rechnungsausgang.RechnungsKundenNr,Rechnungsausgang.FilialenNr,Rechnungsausgang.AbfertigungsNr, Rechnungsausgang.BelegartenNr, Rechnungsausgang.[Steuersatz %], Rechnungsausgang.Lastschrift, Rechnungsausgang.Währungscode, Rechnungsausgang.AvisoID " End If - + MsgBox(sqlStr) Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") Return dt End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb index cb602ddd..0f509385 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_art]='STAT' 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 ", "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_art]='STAT' 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 & "'", "ADMIN",,, 0) End Function Public Shared Function SET_LKWCHAT_INAKTIV(AvisoId) As Integer @@ -56,11 +56,11 @@ 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_art]='STAT' AND chatMgSt_gelesen=0 AND chat_art='" & chat_art & "'", "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 & "'", "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 - 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_art]='STAT' AND chatMgSt_gelesen=0 AND chat_aktiv=0 AND chat_art='" & chat_art & "'", "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_aktiv=0 AND chat_art='" & chat_art & "'", "ADMIN",,, 0) End Function Public Shared Function GET_NewMSG_COUNT_AVISOID(AvisoId As Integer) As Integer @@ -354,7 +354,7 @@ Public Class cMessenger End Function Public Function READ_ALL_MESSAGES() As Boolean - Dim sqlstr = "UPDATE tblMessenger_ChatMessageStatus SET chatMgSt_gelesen=1 FROM [tblMessenger_Chat] INNER JOIN tblMessenger_ChatMessages ON [chat_id]=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chat_id=" & Me.chat_id & " AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0 AND ([chatMgSt_art]='STAT' OR [chatMgSt_art]='STATUS') " + Dim sqlstr = "UPDATE tblMessenger_ChatMessageStatus SET chatMgSt_gelesen=1 FROM [tblMessenger_Chat] INNER JOIN tblMessenger_ChatMessages ON [chat_id]=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chat_id=" & Me.chat_id & " AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0 " Return SQL.doSQL(sqlstr, "ADMIN") End Function @@ -588,7 +588,7 @@ Public Class cMessenger Property chatMgSt_chatMsgId As Integer Property chatMgSt_MaId As Integer - Property chatMgSt_art As String = "STAT" + 'Property chatMgSt_art As String = "STAT" Property chatMgSt_gelesen As Boolean = False Property chatMgSt_datetime As Date = Now @@ -617,7 +617,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_ChatMessages WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art) " & + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMessenger_ChatMessages WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ) " & " BEGIN " & getUpdateCmd() & " END " & " Else " & " BEGIN " & getInsertCmd() & " END " & @@ -629,10 +629,10 @@ Public Class cMessenger Public Sub LOAD() Try Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN() - Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessages WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art ", conn) + Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessages WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ", conn) cmd.Parameters.AddWithValue("@chatMgSt_chatMsgId", chatMgSt_chatMsgId) cmd.Parameters.AddWithValue("@chatMgSt_MaId", chatMgSt_MaId) - cmd.Parameters.AddWithValue("@chatMgSt_art", chatMgSt_art) + 'cmd.Parameters.AddWithValue("@chatMgSt_art", chatMgSt_art) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In getParameterList() @@ -667,7 +667,7 @@ Public Class cMessenger End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE tblMessenger_ChatMessages SET " & str & " WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art ") + Return (" UPDATE tblMessenger_ChatMessages SET " & str & " WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -892,7 +892,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 and chatMgSt_art = 'STAT' ", conn) + Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMg_id ", conn) cmd.Parameters.AddWithValue("@chatMg_id", Me.chatMg_id) Dim dr = cmd.ExecuteReader() While dr.Read @@ -925,7 +925,7 @@ Public Class cMessenger Property chatMgSt_chatMsgId As Integer Property chatMgSt_MaId As Integer - Property chatMgSt_art As String = "STAT" + 'Property chatMgSt_art As String = "STAT" Property chatMgSt_datetime As Date = Now Property chatMgSt_gelesen As Boolean = False Property chatMgSt_flag As Boolean = False @@ -947,7 +947,7 @@ Public Class cMessenger Me.chatMgSt_chatMsgId = chatMgSt_chatMsgId Me.chatMgSt_MaId = chatMgSt_MaId Me.chatMgSt_gelesen = chatMgSt_gelesen - Me.chatMgSt_art = chatMgSt_art + ' Me.chatMgSt_art = chatMgSt_art Me.chatMgSt_flag = chatMgSt_flag Me.chatMgSt_bestaetigt = chatMgSt_bestaetigt End Sub @@ -966,7 +966,7 @@ Public Class cMessenger Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_chatMsgId", chatMgSt_chatMsgId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_MaId", chatMgSt_MaId)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_art", chatMgSt_art)) + ' list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_art", chatMgSt_art)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_datetime", chatMgSt_datetime)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_flag", chatMgSt_flag)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_gelesen", chatMgSt_gelesen)) @@ -990,7 +990,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 AND chatMgSt_art=@chatMgSt_art) " & + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ) " & " BEGIN " & getUpdateCmd() & " END " & " Else " & " BEGIN " & getInsertCmd() & " END " & @@ -1008,10 +1008,10 @@ Public Class cMessenger Public Sub LOAD() Try Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN() - Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art ", conn) + Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ", conn) cmd.Parameters.AddWithValue("@chatMgSt_chatMsgId", chatMgSt_chatMsgId) cmd.Parameters.AddWithValue("@chatMgSt_MaId", chatMgSt_MaId) - cmd.Parameters.AddWithValue("@chatMgSt_art", chatMgSt_art) + 'cmd.Parameters.AddWithValue("@chatMgSt_art", chatMgSt_art) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In getParameterList() @@ -1046,7 +1046,7 @@ Public Class cMessenger End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE tblMessenger_ChatMessageStatus SET " & str & " WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art ") + Return (" UPDATE tblMessenger_ChatMessageStatus SET " & str & " WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -1077,7 +1077,7 @@ Public Class cMessenger Public Function DELETE([chatMgSt_MaId]) As Boolean 'obj As Object, tablename As String, where As String) As Boolean - Dim sqlstr = " DELETE FROM tblMessenger_ChatMessageStatus WHERE [chatMgSt_chatMsgId]=" & Me.chatMgSt_chatMsgId & " AND [chatMgSt_MaId]=" & Me.chatMgSt_MaId & " AND chatMgSt_art=@chatMgSt_art= '" & Me.chatMgSt_art & "' " + Dim sqlstr = " DELETE FROM tblMessenger_ChatMessageStatus WHERE [chatMgSt_chatMsgId]=" & Me.chatMgSt_chatMsgId & " AND [chatMgSt_MaId]=" & Me.chatMgSt_MaId & " " Return SQL.doSQL(sqlstr, "ADMIN") End Function diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index b2852dbd..dd3c3b0c 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -24,17 +24,18 @@ Partial Class frmMessenger 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 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 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() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Me.components = New System.ComponentModel.Container() + Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + 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 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 DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() 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() @@ -78,22 +79,22 @@ 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() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview() - Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.UsrCntlChat_Art_Btn_MACHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() Me.UsrCntlChat_Art_Btn_LKWCHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() Me.UsrCntlChat_Art_Btn_SNDCHAT = New VERAG_PROG_ALLGEMEIN.usrCntlChat_Art_Btn() Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - 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.clmnMaId = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.clmnName = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -541,36 +542,36 @@ Partial Class frmMessenger Me.dgvChatMembers.AllowUserToResizeColumns = False Me.dgvChatMembers.AllowUserToResizeRows = False Me.dgvChatMembers.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvChatMembers.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvChatMembers.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle20 Me.dgvChatMembers.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvChatMembers.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnMaId, Me.clmnName, Me.clmnFirma}) - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvChatMembers.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvChatMembers.DefaultCellStyle = DataGridViewCellStyle21 Me.dgvChatMembers.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvChatMembers.Location = New System.Drawing.Point(0, 23) Me.dgvChatMembers.Name = "dgvChatMembers" Me.dgvChatMembers.ReadOnly = True - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvChatMembers.RowHeadersDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvChatMembers.RowHeadersDefaultCellStyle = DataGridViewCellStyle22 Me.dgvChatMembers.RowHeadersVisible = False Me.dgvChatMembers.RowHeadersWidth = 62 Me.dgvChatMembers.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -707,11 +708,12 @@ Partial Class frmMessenger ' 'TimerNEW_MESSAGE ' + Me.TimerNEW_MESSAGE.Interval = 1000 ' 'Timer_REFRESH ' Me.Timer_REFRESH.Enabled = True - Me.Timer_REFRESH.Interval = 10000 + Me.Timer_REFRESH.Interval = 30000 ' 'cntxt ' @@ -731,6 +733,7 @@ Partial Class frmMessenger Me.toolChatReminder.Name = "toolChatReminder" Me.toolChatReminder.Size = New System.Drawing.Size(167, 22) Me.toolChatReminder.Text = "Reminder ein/aus" + Me.toolChatReminder.Visible = False ' 'DataGridViewTextBoxColumn1 ' @@ -765,40 +768,40 @@ Partial Class frmMessenger Me.dgvChats.AllowUserToResizeColumns = False Me.dgvChats.AllowUserToResizeRows = False Me.dgvChats.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.dgvChats.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvChats.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvChats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvChats.ColumnHeadersVisible = False - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvChats.DefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvChats.DefaultCellStyle = DataGridViewCellStyle13 Me.dgvChats.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvChats.Location = New System.Drawing.Point(0, 0) Me.dgvChats.Name = "dgvChats" Me.dgvChats.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.dgvChats.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvChats.RowHeadersDefaultCellStyle = DataGridViewCellStyle14 Me.dgvChats.RowHeadersVisible = False Me.dgvChats.RowHeadersWidth = 62 - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvChats.RowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvChats.RowsDefaultCellStyle = DataGridViewCellStyle15 Me.dgvChats.RowTemplate.Height = 30 Me.dgvChats.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvChats.Size = New System.Drawing.Size(275, 773) @@ -812,40 +815,40 @@ Partial Class frmMessenger Me.DGVSonstige.AllowUserToResizeColumns = False Me.DGVSonstige.AllowUserToResizeRows = False Me.DGVSonstige.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DGVSonstige.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DGVSonstige.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16 Me.DGVSonstige.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DGVSonstige.ColumnHeadersVisible = False - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DGVSonstige.DefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DGVSonstige.DefaultCellStyle = DataGridViewCellStyle17 Me.DGVSonstige.Dock = System.Windows.Forms.DockStyle.Fill Me.DGVSonstige.Location = New System.Drawing.Point(0, 63) Me.DGVSonstige.Name = "DGVSonstige" Me.DGVSonstige.ReadOnly = True - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DGVSonstige.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DGVSonstige.RowHeadersDefaultCellStyle = DataGridViewCellStyle18 Me.DGVSonstige.RowHeadersVisible = False Me.DGVSonstige.RowHeadersWidth = 62 - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.DGVSonstige.RowsDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.DGVSonstige.RowsDefaultCellStyle = DataGridViewCellStyle19 Me.DGVSonstige.RowTemplate.Height = 30 Me.DGVSonstige.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.DGVSonstige.Size = New System.Drawing.Size(150, 0) diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb index 80fb60b0..fb032f2b 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb @@ -1300,30 +1300,30 @@ Public Class frmMessenger Private Sub toolChatReminder_Click(sender As Object, e As EventArgs) Handles toolChatReminder.Click - If dgvChats.SelectedRows.Count > 0 Then + 'If dgvChats.SelectedRows.Count > 0 Then - 'Prüfen, ob bereits ein Reminder aktiv ist.... - Dim RemidnerMsgId As Integer = SQL.getValueTxtBySql("SELECT TOP (1) [chatMg_id] FROM tblMessenger_Chat INNER JOIN tblMessenger_ChatMessages ON chat_id=chatMg_chatId INNER JOIN [tblMessenger_ChatMessageStatus] on chatmg_id=[chatMgSt_chatMsgId] where [chatMgSt_art]='REMINDER' AND [chatMgSt_MaId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "' AND [chatMgSt_flag]=0 and chat_id='" & dgvChats.SelectedRows(0).Cells("chat_id").Value & "'", "ADMIN",,, -1) + ' 'Prüfen, ob bereits ein Reminder aktiv ist.... + ' Dim RemidnerMsgId As Integer = SQL.getValueTxtBySql("SELECT TOP (1) [chatMg_id] FROM tblMessenger_Chat INNER JOIN tblMessenger_ChatMessages ON chat_id=chatMg_chatId INNER JOIN [tblMessenger_ChatMessageStatus] on chatmg_id=[chatMgSt_chatMsgId] where [chatMgSt_art]='REMINDER' AND [chatMgSt_MaId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "' AND [chatMgSt_flag]=0 and chat_id='" & dgvChats.SelectedRows(0).Cells("chat_id").Value & "'", "ADMIN",,, -1) - If RemidnerMsgId > 0 Then '...wenn JA, Reminder zurücksetzen + ' If RemidnerMsgId > 0 Then '...wenn JA, Reminder zurücksetzen - ' SQL.doSQL("UPDATE [tblMessenger_ChatMessageStatus] set [chatMgSt_flag]=1, [chatMgSt_gelesen]=1 WHERE [chatMgSt_chatMsgId] = '" & RemidnerMsgId & "' AND [chatMgSt_art]='REMINDER' AND [chatMgSt_MaId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN") - SQL.doSQL("DELETE [tblMessenger_ChatMessageStatus] WHERE [chatMgSt_chatMsgId] = '" & RemidnerMsgId & "' AND [chatMgSt_art]='REMINDER' AND [chatMgSt_MaId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN") - intiDGVChats() + ' ' SQL.doSQL("UPDATE [tblMessenger_ChatMessageStatus] set [chatMgSt_flag]=1, [chatMgSt_gelesen]=1 WHERE [chatMgSt_chatMsgId] = '" & RemidnerMsgId & "' AND [chatMgSt_art]='REMINDER' AND [chatMgSt_MaId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN") + ' SQL.doSQL("DELETE [tblMessenger_ChatMessageStatus] WHERE [chatMgSt_chatMsgId] = '" & RemidnerMsgId & "' AND [chatMgSt_art]='REMINDER' AND [chatMgSt_MaId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN") + ' intiDGVChats() - Else '...wenn NEIN, Reminder setzen + ' Else '...wenn NEIN, Reminder setzen - Dim MsgId As Integer = SQL.getValueTxtBySql("SELECT TOP (1) [chatMg_id] FROM [tblMessenger_ChatMessages] where chatMg_chatid='" & dgvChats.SelectedRows(0).Cells("chat_id").Value & "' order by [chatMg_datetime] desc", "ADMIN",,, -1) - If MsgId > 0 Then - Dim STAT As New cMessenger_ChatMessageStatus(MsgId, VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, False, "REMINDER", False) - STAT.SAVE() + ' Dim MsgId As Integer = SQL.getValueTxtBySql("SELECT TOP (1) [chatMg_id] FROM [tblMessenger_ChatMessages] where chatMg_chatid='" & dgvChats.SelectedRows(0).Cells("chat_id").Value & "' order by [chatMg_datetime] desc", "ADMIN",,, -1) + ' If MsgId > 0 Then + ' Dim STAT As New cMessenger_ChatMessageStatus(MsgId, VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, False, "REMINDER", False) + ' STAT.SAVE() - intiDGVChats() + ' intiDGVChats() - End If - End If + ' End If + ' End If - End If + 'End If End Sub Private Sub UsrCntlChat_Art_Btn1_Load(ctl As usrCntlChat_Art_Btn) Handles UsrCntlChat_Art_Btn_MACHAT.CLICKED diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb index 9d0a69f3..289821d3 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb @@ -22,11 +22,13 @@ Partial Class frmMitarbeitersuche 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMitarbeitersuche)) Me.pnlSrch = New System.Windows.Forms.Panel() Me.Button4 = New System.Windows.Forms.Button() Me.btnClose = New System.Windows.Forms.Button() Me.PictureBox2 = New System.Windows.Forms.PictureBox() + Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.pnlMain = New System.Windows.Forms.Panel() Me.pnl = New System.Windows.Forms.Panel() Me.btnSettings = New System.Windows.Forms.Button() @@ -53,8 +55,7 @@ Partial Class frmMitarbeitersuche Me.pnlGeburtstag = New System.Windows.Forms.Panel() Me.lblGeburtstag = New System.Windows.Forms.Label() Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.Panel1 = New System.Windows.Forms.Panel() - Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel() + Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.lblPosition = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() @@ -63,7 +64,7 @@ Partial Class frmMitarbeitersuche Me.lblFirma = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() - Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.Panel1 = New System.Windows.Forms.Panel() Me.pnlSrch.SuspendLayout() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlMain.SuspendLayout() @@ -133,6 +134,32 @@ Partial Class frmMitarbeitersuche Me.PictureBox2.TabIndex = 18 Me.PictureBox2.TabStop = False ' + 'sbMitarbeiter + ' + Me.sbMitarbeiter._allowFreitext = False + Me.sbMitarbeiter._AllowSetValue = False + Me.sbMitarbeiter._allowSpaceAsSplitter = True + Me.sbMitarbeiter._autoSizeGross = False + Me.sbMitarbeiter._hideIfListEmpty = True + Me.sbMitarbeiter._value = Nothing + Me.sbMitarbeiter.conn_art = "FMZOLL" + Me.sbMitarbeiter.dgvpos = "LEFT" + Me.sbMitarbeiter.DISPLAY_PARAM = Nothing + Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!) + Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing + Me.sbMitarbeiter.key_visible = False + Me.sbMitarbeiter.KEYPARAM = Nothing + Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11) + Me.sbMitarbeiter.Name = "sbMitarbeiter" + Me.sbMitarbeiter.searchActive = True + Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29) + Me.sbMitarbeiter.SQL_ORDER_BY = Nothing + Me.sbMitarbeiter.SQL_SELECT = Nothing + Me.sbMitarbeiter.SQL_WHERE = Nothing + Me.sbMitarbeiter.SQL_WhereParamList = Nothing + Me.sbMitarbeiter.TabIndex = 0 + Me.sbMitarbeiter.usrcntl = Nothing + ' 'pnlMain ' Me.pnlMain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -414,14 +441,6 @@ Partial Class frmMitarbeitersuche Me.PictureBox1.TabIndex = 13 Me.PictureBox1.TabStop = False ' - 'Panel1 - ' - Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Panel1.Location = New System.Drawing.Point(214, 230) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(553, 1) - Me.Panel1.TabIndex = 29 - ' 'MyPanel1 ' Me.MyPanel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(254, Byte), Integer), CType(CType(255, Byte), Integer)) @@ -526,31 +545,13 @@ Partial Class frmMitarbeitersuche Me.Label3.Text = "Niederlassung:" Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' - 'sbMitarbeiter + 'Panel1 ' - Me.sbMitarbeiter._allowFreitext = False - Me.sbMitarbeiter._AllowSetValue = False - Me.sbMitarbeiter._allowSpaceAsSplitter = True - Me.sbMitarbeiter._autoSizeGross = False - Me.sbMitarbeiter._hideIfListEmpty = True - Me.sbMitarbeiter._value = Nothing - Me.sbMitarbeiter.conn_art = "FMZOLL" - Me.sbMitarbeiter.dgvpos = "LEFT" - Me.sbMitarbeiter.DISPLAY_PARAM = Nothing - Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!) - Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing - Me.sbMitarbeiter.key_visible = False - Me.sbMitarbeiter.KEYPARAM = Nothing - Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11) - Me.sbMitarbeiter.Name = "sbMitarbeiter" - Me.sbMitarbeiter.searchActive = True - Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29) - Me.sbMitarbeiter.SQL_ORDER_BY = Nothing - Me.sbMitarbeiter.SQL_SELECT = Nothing - Me.sbMitarbeiter.SQL_WHERE = Nothing - Me.sbMitarbeiter.SQL_WhereParamList = Nothing - Me.sbMitarbeiter.TabIndex = 0 - Me.sbMitarbeiter.usrcntl = Nothing + Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Panel1.Location = New System.Drawing.Point(214, 230) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(553, 1) + Me.Panel1.TabIndex = 29 ' 'frmMitarbeitersuche ' diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb index de715349..8efa9aa7 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb @@ -207,4 +207,5 @@ Public Class frmMitarbeitersuche f.ShowDialog(Me) initMA() End Sub + End Class \ No newline at end of file