timas. Mitarbeiter, Ueberstunden, Messenger (gelesenAm)
This commit is contained in:
@@ -374,7 +374,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, chatMgSt_datetimeGelesen = GETDATE() 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
|
||||
|
||||
@@ -634,7 +634,6 @@ 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_gelesen", chatMgSt_gelesen))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_datetime", chatMgSt_datetime))
|
||||
|
||||
@@ -898,11 +897,12 @@ Public Class cMessenger
|
||||
If CHAT_MEMBERS IsNot Nothing Then
|
||||
For Each MB In CHAT_MEMBERS
|
||||
Dim gelesen = False
|
||||
Dim gelesenDatetime = Nothing
|
||||
If MB.chatMb_maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then
|
||||
gelesen = True
|
||||
gelesenDatetime = Now()
|
||||
End If
|
||||
Dim STAT As New cMessenger_ChatMessageStatus(Me.chatMg_id, MB.chatMb_maId, gelesen)
|
||||
|
||||
Dim STAT As New cMessenger_ChatMessageStatus(Me.chatMg_id, MB.chatMb_maId, gelesen, gelesenDatetime)
|
||||
STAT.SAVE()
|
||||
Next
|
||||
End If
|
||||
@@ -961,6 +961,7 @@ Public Class cMessenger
|
||||
Property chatMgSt_RM_Option As Object = Nothing
|
||||
Property chatMgSt_RM_Text As Object = Nothing
|
||||
Property chatMgSt_datetimeBestaetigt As Object = Nothing
|
||||
Property chatMgSt_datetimeGelesen As Object = Nothing
|
||||
|
||||
Dim SQL As New SQL
|
||||
|
||||
@@ -971,13 +972,14 @@ Public Class cMessenger
|
||||
LOAD()
|
||||
End Sub
|
||||
|
||||
Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen, Optional chatMgSt_art = "STAT", Optional chatMgSt_flag = False)
|
||||
Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen, chatMgSt_datetimeGelesen, Optional chatMgSt_art = "STAT", Optional chatMgSt_flag = False, Optional chatMgSt_bestaetigt = Nothing)
|
||||
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
|
||||
Me.chatMgSt_datetimeGelesen = IIf(chatMgSt_datetimeGelesen = Nothing, DBNull.Value, chatMgSt_datetimeGelesen)
|
||||
End Sub
|
||||
|
||||
Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen, chatMgSt_bestaetigt, chatMgSt_RM_Option, chatMgSt_RM_Text)
|
||||
@@ -1002,6 +1004,7 @@ Public Class cMessenger
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_RM_Option", chatMgSt_RM_Option))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_RM_Text", chatMgSt_RM_Text))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_datetimeBestaetigt", [chatMgSt_datetimeBestaetigt]))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_datetimeGelesen", chatMgSt_datetimeGelesen))
|
||||
|
||||
Return list
|
||||
End Function
|
||||
|
||||
@@ -24,6 +24,7 @@ Partial Class frmMessenger
|
||||
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
||||
<System.Diagnostics.DebuggerStepThrough()> _
|
||||
Private Sub InitializeComponent()
|
||||
Me.components = New System.ComponentModel.Container()
|
||||
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
@@ -38,12 +39,12 @@ Partial Class frmMessenger
|
||||
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger))
|
||||
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
|
||||
Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
|
||||
Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
|
||||
Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
|
||||
Me.Panel6 = New System.Windows.Forms.Panel()
|
||||
Me.Label3 = New System.Windows.Forms.Label()
|
||||
Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label()
|
||||
Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox()
|
||||
Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
|
||||
Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
|
||||
Me.Panel5 = New System.Windows.Forms.Panel()
|
||||
Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
|
||||
Me.PictureBox2 = New System.Windows.Forms.PictureBox()
|
||||
@@ -64,7 +65,7 @@ Partial Class frmMessenger
|
||||
Me.btnNeu = New System.Windows.Forms.Button()
|
||||
Me.Button1 = New System.Windows.Forms.Button()
|
||||
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
|
||||
Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel()
|
||||
Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
|
||||
Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement()
|
||||
Me.Panel3 = New System.Windows.Forms.Panel()
|
||||
Me.btnTeilnehmer = New System.Windows.Forms.Button()
|
||||
@@ -92,9 +93,9 @@ Partial Class frmMessenger
|
||||
Me.btnSendAtt = New System.Windows.Forms.Button()
|
||||
Me.btnSenden = New System.Windows.Forms.Button()
|
||||
Me.rtbChatMessage = New System.Windows.Forms.RichTextBox()
|
||||
Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer()
|
||||
Me.Timer_REFRESH = New System.Windows.Forms.Timer()
|
||||
Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
|
||||
Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components)
|
||||
Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
|
||||
Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
|
||||
@@ -492,9 +492,15 @@ Public Class frmUeberstundenauszahlen
|
||||
|
||||
If gesamt > 0 Then 'vom ldf Saldo, ev. über API Möglich monatliche Korrektur direkt zu befüllen, dann muss dieser If Zweig überarbeitet werden!!!!!!!!!!!!!!
|
||||
Dim row = dtsetEntries.NewRow
|
||||
row.Item("accountid") = 1598
|
||||
row.Item("value") = gesamt.ToString.Replace(",", ".")
|
||||
dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
|
||||
|
||||
row = dtsetEntries.NewRow
|
||||
row.Item("accountid") = 993
|
||||
row.Item("value") = gesamt.ToString.Replace(",", ".")
|
||||
dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
|
||||
|
||||
End If
|
||||
|
||||
Dim ues As New cUeberstunden(MA.mit_id, auszahlugsdatum.ToShortDateString, Now())
|
||||
@@ -546,6 +552,10 @@ Public Class frmUeberstundenauszahlen
|
||||
|
||||
|
||||
Dim rowNew = dtdeleteEntries.NewRow
|
||||
rowNew.Item("accountid") = 1598
|
||||
dtdeleteEntries.Rows.InsertAt(rowNew, dtdeleteEntries.Rows.Count)
|
||||
|
||||
rowNew = dtdeleteEntries.NewRow
|
||||
rowNew.Item("accountid") = 993
|
||||
dtdeleteEntries.Rows.InsertAt(rowNew, dtdeleteEntries.Rows.Count)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user