diff --git a/SDL/Fakturierung/frmRechnungenSuche.vb b/SDL/Fakturierung/frmRechnungenSuche.vb index 89f0bb9c..61e34cfb 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.vb @@ -373,7 +373,7 @@ Public Class frmRechnungenSuche End If End Sub - Private Sub DataGridView_CellContentClick(sender As Object, e As EventArgs) Handles DataGridView.DoubleClick, DataGridView.CellContentClick + Private Sub DataGridView_CellContentClick(sender As Object, e As EventArgs) Handles DataGridView.DoubleClick ', DataGridView.CellContentDoubleClick If DataGridView.SelectedRows.Count = 0 Then Exit Sub Dim f As New frmKundenUebersichtZollRgDetails(DataGridView.SelectedRows(0).Cells("RK_ID").Value) diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb b/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb index c3a21377..24eb36dc 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb @@ -104,8 +104,8 @@ Public Class rptKontrolleLKW_NCTSTR sqlStrSUB &= " order by cast(ncts_Eroeffnung as date),ncts_ObjectName" - 'MsgBox(sqlStr) - 'MsgBox(sqlStrSUB) + ' MsgBox(sqlStr) + ' MsgBox(sqlStrSUB) SUB_DATA = kundenSQL.loadDgvBySql(sqlStrSUB, "FMZOLL", 1000) diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 66b934af..5506ec51 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -215,7 +215,8 @@ Public Class cProgramFunctions If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat395] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat397] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") Else - docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].TheCat398 WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") + docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].TheCat889 WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") + If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat398] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat291] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat153] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat119] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb index 3485b6d5..a1f89c91 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_art]='STATUS' 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_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_art]='STATUS' 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_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_art]='STATUS' 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_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_art]='STATUS' 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 " + 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]='STATUS' " Return SQL.doSQL(sqlstr, "ADMIN") End Function @@ -588,6 +588,7 @@ Public Class cMessenger Property chatMgSt_chatMsgId As Integer Property chatMgSt_MaId As Integer + Property chatMgSt_art As String = "STATUS" Property chatMgSt_gelesen As Boolean = False Property chatMgSt_datetime As Date = Now @@ -616,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) " & + 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) " & " BEGIN " & getUpdateCmd() & " END " & " Else " & " BEGIN " & getInsertCmd() & " END " & @@ -628,9 +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 ", conn) + 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) cmd.Parameters.AddWithValue("@chatMgSt_chatMsgId", chatMgSt_chatMsgId) cmd.Parameters.AddWithValue("@chatMgSt_MaId", chatMgSt_MaId) + cmd.Parameters.AddWithValue("@chatMgSt_art", chatMgSt_art) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In getParameterList() @@ -665,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 ") + Return (" UPDATE tblMessenger_ChatMessages SET " & str & " WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art ") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -923,8 +925,10 @@ Public Class cMessenger Property chatMgSt_chatMsgId As Integer Property chatMgSt_MaId As Integer + Property chatMgSt_art As String = "STATUS" Property chatMgSt_datetime As Date = Now Property chatMgSt_gelesen As Boolean = False + Property chatMgSt_flag As Boolean = False Property chatMgSt_bestaetigt As Boolean = False Property chatMgSt_RM_Option As Object = Nothing Property chatMgSt_RM_Text As Object = Nothing @@ -939,10 +943,12 @@ Public Class cMessenger LOAD() End Sub - Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen) + Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen, Optional chatMgSt_art = "STAT", Optional chatMgSt_flag = False) Me.chatMgSt_chatMsgId = chatMgSt_chatMsgId Me.chatMgSt_MaId = chatMgSt_MaId Me.chatMgSt_gelesen = chatMgSt_gelesen + Me.chatMgSt_art = chatMgSt_art + Me.chatMgSt_flag = chatMgSt_flag Me.chatMgSt_bestaetigt = chatMgSt_bestaetigt End Sub @@ -960,7 +966,9 @@ 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_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)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_bestaetigt", chatMgSt_bestaetigt)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_RM_Option", chatMgSt_RM_Option)) @@ -982,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) " & + 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) " & " BEGIN " & getUpdateCmd() & " END " & " Else " & " BEGIN " & getInsertCmd() & " END " & @@ -990,13 +998,20 @@ Public Class cMessenger Return SQL.doSQLVarList(sqlstr, "ADMIN", , list) End Function + Public Function INSERT() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + MsgBox(getInsertCmd) + Return SQL.doSQLVarList(getInsertCmd, "ADMIN", , list) + End Function 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 ", conn) + 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) cmd.Parameters.AddWithValue("@chatMgSt_chatMsgId", chatMgSt_chatMsgId) cmd.Parameters.AddWithValue("@chatMgSt_MaId", chatMgSt_MaId) + cmd.Parameters.AddWithValue("@chatMgSt_art", chatMgSt_art) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In getParameterList() @@ -1031,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 ") + Return (" UPDATE tblMessenger_ChatMessageStatus SET " & str & " WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art ") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -1062,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 & " " + 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 & "' " 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 052449fe..71d97d2e 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -41,6 +41,7 @@ Partial Class frmMessenger Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() + Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox() Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel5 = New System.Windows.Forms.Panel() @@ -51,7 +52,6 @@ Partial Class frmMessenger Me.Button9 = New System.Windows.Forms.Button() Me.btnTEST = New System.Windows.Forms.Button() Me.Panel2 = New System.Windows.Forms.Panel() - Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChatsSpecial = New System.Windows.Forms.CheckBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() @@ -95,6 +95,7 @@ Partial Class frmMessenger 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() @@ -235,6 +236,20 @@ Partial Class frmMessenger Me.Panel6.Size = New System.Drawing.Size(275, 21) Me.Panel6.TabIndex = 7 ' + 'lblLKWChat_MsgCntInaktiv + ' + Me.lblLKWChat_MsgCntInaktiv.BackColor = System.Drawing.Color.Red + Me.lblLKWChat_MsgCntInaktiv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D + Me.lblLKWChat_MsgCntInaktiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) + Me.lblLKWChat_MsgCntInaktiv.ForeColor = System.Drawing.Color.White + Me.lblLKWChat_MsgCntInaktiv.Location = New System.Drawing.Point(104, -1) + Me.lblLKWChat_MsgCntInaktiv.Name = "lblLKWChat_MsgCntInaktiv" + Me.lblLKWChat_MsgCntInaktiv.Size = New System.Drawing.Size(26, 23) + Me.lblLKWChat_MsgCntInaktiv.TabIndex = 106 + Me.lblLKWChat_MsgCntInaktiv.Text = "99" + Me.lblLKWChat_MsgCntInaktiv.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.lblLKWChat_MsgCntInaktiv.Visible = False + ' 'cbxInaktiveChats ' Me.cbxInaktiveChats.AutoSize = True @@ -398,20 +413,6 @@ Partial Class frmMessenger Me.Panel2.Size = New System.Drawing.Size(275, 23) Me.Panel2.TabIndex = 6 ' - 'lblLKWChat_MsgCntInaktiv - ' - Me.lblLKWChat_MsgCntInaktiv.BackColor = System.Drawing.Color.Red - Me.lblLKWChat_MsgCntInaktiv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - Me.lblLKWChat_MsgCntInaktiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) - Me.lblLKWChat_MsgCntInaktiv.ForeColor = System.Drawing.Color.White - Me.lblLKWChat_MsgCntInaktiv.Location = New System.Drawing.Point(104, -1) - Me.lblLKWChat_MsgCntInaktiv.Name = "lblLKWChat_MsgCntInaktiv" - Me.lblLKWChat_MsgCntInaktiv.Size = New System.Drawing.Size(26, 23) - Me.lblLKWChat_MsgCntInaktiv.TabIndex = 106 - Me.lblLKWChat_MsgCntInaktiv.Text = "99" - Me.lblLKWChat_MsgCntInaktiv.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.lblLKWChat_MsgCntInaktiv.Visible = False - ' 'cbxInaktiveChatsSpecial ' Me.cbxInaktiveChatsSpecial.AutoSize = True @@ -935,16 +936,22 @@ Partial Class frmMessenger 'cntxt ' Me.cntxt.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ChatDeaktivierenToolStripMenuItem}) + Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ChatDeaktivierenToolStripMenuItem, Me.toolChatReminder}) Me.cntxt.Name = "cntxt" - Me.cntxt.Size = New System.Drawing.Size(167, 26) + Me.cntxt.Size = New System.Drawing.Size(181, 70) ' 'ChatDeaktivierenToolStripMenuItem ' Me.ChatDeaktivierenToolStripMenuItem.Name = "ChatDeaktivierenToolStripMenuItem" - Me.ChatDeaktivierenToolStripMenuItem.Size = New System.Drawing.Size(166, 22) + Me.ChatDeaktivierenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ChatDeaktivierenToolStripMenuItem.Text = "Chat deaktivieren" ' + 'toolChatReminder + ' + Me.toolChatReminder.Name = "toolChatReminder" + Me.toolChatReminder.Size = New System.Drawing.Size(180, 22) + Me.toolChatReminder.Text = "Reminder ein/aus" + ' 'DataGridViewTextBoxColumn1 ' Me.DataGridViewTextBoxColumn1.HeaderText = "Column1" @@ -1085,4 +1092,5 @@ Partial Class frmMessenger Friend WithEvents UsrCntlChat_Art_Btn_LKWCHAT As usrCntlChat_Art_Btn Friend WithEvents UsrCntlChat_Art_Btn_SNDCHAT As usrCntlChat_Art_Btn Friend WithEvents lblLKWChat_MsgCntInaktiv As Label + Friend WithEvents toolChatReminder As ToolStripMenuItem End Class diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb index 7a27c7f7..f45aab89 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb @@ -1,7 +1,10 @@ Imports System.Drawing Imports System.IO Imports System.Threading +Imports System.Web.UI.WebControls.WebParts Imports System.Windows.Forms +Imports Util +Imports VERAG_PROG_ALLGEMEIN.cMessenger Public Class frmMessenger Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -1310,4 +1313,31 @@ Public Class frmMessenger Private Sub UsrCntlChat_Art_snd_Load(ctl As usrCntlChat_Art_Btn) Handles UsrCntlChat_Art_Btn_SNDCHAT.CLICKED End Sub + + Private Sub toolChatReminder_Click(sender As Object, e As EventArgs) Handles toolChatReminder.Click + 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) + + 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() + + 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() + + intiDGVChats() + + End If + End If + + End If + End Sub End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb index 31b22f2a..a1d5999f 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb @@ -47,11 +47,11 @@ End Function - Public Shared Function genDatensatzCSV_Stammdaten(Optional OpenFile As Boolean = False) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean + Public Shared Function genDatensatzCSV_Stammdaten(Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean Try Dim bool_DatenVorhanden As Boolean = False - Dim Geschaeftsjahr = Now.Year 'If(Now.Month = 1, Now.Year - 1, Now.Year) --> Bei IMEX ist das GJ=Wirtschaftsjahr + If Geschaeftsjahr <= 0 Then Geschaeftsjahr = Now.Year 'If(Now.Month = 1, Now.Year - 1, Now.Year) --> Bei IMEX ist das GJ=Wirtschaftsjahr 'DATEIPFAD für Stammdaten '------------------------------------------------------------------------------------------- @@ -118,24 +118,24 @@ - Public Shared Function genDatensatzCSV_ALL(Optional OpenFile As Boolean = False, Optional boolKunden As Boolean = True, Optional boolBuchungen As Boolean = True) As Boolean + Public Shared Function genDatensatzCSV_ALL(Optional OpenFile As Boolean = False, Optional boolKunden As Boolean = True, Optional boolBuchungen As Boolean = True, Optional Geschaeftsjahr As Integer = -1) As Boolean genDatensatzCSV_ALL = True If boolKunden Then - If Not genDatensatzCSV_Stammdaten(OpenFile) Then genDatensatzCSV_ALL = False + If Not genDatensatzCSV_Stammdaten(OpenFile, Geschaeftsjahr) Then genDatensatzCSV_ALL = False End If If boolBuchungen Then - If Not genDatensatzCSV_Buchungen(21, OpenFile) Then genDatensatzCSV_ALL = False - If Not genDatensatzCSV_Buchungen(22, OpenFile) Then genDatensatzCSV_ALL = False - If Not genDatensatzCSV_Buchungen(23, OpenFile) Then genDatensatzCSV_ALL = False + If Not genDatensatzCSV_Buchungen(21, OpenFile, Geschaeftsjahr) Then genDatensatzCSV_ALL = False + If Not genDatensatzCSV_Buchungen(22, OpenFile, Geschaeftsjahr) Then genDatensatzCSV_ALL = False + If Not genDatensatzCSV_Buchungen(23, OpenFile, Geschaeftsjahr) Then genDatensatzCSV_ALL = False End If End Function - Public Shared Function genDatensatzCSV_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean + Public Shared Function genDatensatzCSV_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean Try Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(Firma_ID) Dim bool_DatenVorhanden As Boolean = False - Dim Geschaeftsjahr = Now.Year 'If(Now.Month = 1, Now.Year - 1, Now.Year) --> Bei IMEX ist das GJ=Wirtschaftsjahr + If Geschaeftsjahr <= 0 Then Geschaeftsjahr = Now.Year 'If(Now.Month = 1, Now.Year - 1, Now.Year) --> Bei IMEX ist das GJ=Wirtschaftsjahr 'nur UNISPED!! 'DATEIPFAD für Buchungsdaten diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb index b0a39d74..964357b8 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb @@ -18,7 +18,8 @@ Public Class cTherefore Case 1, 11, 20, 17 ', 15 ' Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import an Jänner 2019", "Import ab Jänner 2019", deleteFileAfterImport) 'Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2021", "Import ab Jänner 2021", deleteFileAfterImport) - Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2022", "Import ab Jänner 2022", deleteFileAfterImport) + 'Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2022", "Import ab Jänner 2022", deleteFileAfterImport) + Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2023", "Import ab Jänner 2023", deleteFileAfterImport) ' Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2020", "Import ab Jänner 2020", deleteFileAfterImport) Case Else Return False