edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-03-20 22:05:23 +01:00
parent 8c7eb4751e 61753531d1
commit ce24856bac
19 changed files with 699 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
View File

@@ -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

4
VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
View File

@@ -306,8 +306,8 @@ Public Class cMitarbeiter
'End Sub
Public Function LOAD(ByVal id As Integer) As Boolean
Dim sqlstr As String = "SELECT * FROM tblMitarbeiter WHERE mit_id = " & id & ""
Public Function LOAD(ByVal id As Integer, Optional isTimas As Boolean = False) As Boolean
Dim sqlstr As String = "SELECT * FROM tblMitarbeiter WHERE " & IIf(isTimas, "mit_timasId = " & id & "", "mit_id = " & id & "")
' adasdas()
' Dim d As VERAG_PROG_ALLGEMEIN.cMitarbeiter = Nothing
Try

4
VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.vb
View File

@@ -1,11 +1,9 @@
Public Class frmVorlagenUpload
Private Sub btnUpload_Click(sender As Object, e As EventArgs) Handles btnUpload.Click
Try
Dim cDATENSERVER As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(tzxtKategorie.Text, txtOrdner.Text, txtUnterordner1._value, txtUnterordner2._value, "", txtName.Text)
cDATENSERVER.da_vorlage = True
If cDATENSERVER.uploadDataToDATENSERVERFileDialog() <> "" Then Me.Close()
Catch ex As Exception
MsgBox(ex.Message)

4
VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb generated
View File

@@ -5,7 +5,7 @@ Partial Class frmMessenger
Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _
<System.Diagnostics.DebuggerNonUserCode()>
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try
If disposing AndAlso components IsNot Nothing Then
@@ -22,7 +22,7 @@ Partial Class frmMessenger
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()

108
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
View File

@@ -2,6 +2,8 @@
Imports System.Text
Imports System.Threading
Imports System.Windows.Forms
Imports DocumentFormat.OpenXml.EMMA
Public Class frmUeberstundenauszahlen
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -33,44 +35,18 @@ Public Class frmUeberstundenauszahlen
customFields = timas.getEmployeecustomFields(MA.mit_timasId)
timas.getTimeaccountList(dt)
Dim dv = New DataView(dt)
dv.RowFilter = "accountid = 65 Or accountid = 69 Or accountid = 70 Or accountid = 72 Or accountid = 73 Or accountid = 1209 Or accountid = 1235 Or accountid = 1550 Or accountid = 1551 Or accountid = 1553"
'65;"01-Lfd Saldo"
'66;02-Krank
'67;03-Urlaub
'69;"10-Na 22-06"
'70;"11-Sa 00-24"
'72;"13-So 00-24"
'73;"14-FtN 00-24"
'438;04-Sonstige
'986;Stundenlohn
'987;FT-Ersatzzeit
'993;"Ausz. ÜS"
'1209;Mehrarbeit
'1210;"Script hilfskonto WSaldo"
'1227;Schichtzulage
'1231;Urlaubsstunden
'1235;"Überstunden 100% gesamt"
'1257;Zuschlag
'1272;"unbezahlter Urlaub"
'1366;"Mehrarbeit am 25. des Monats gesamt"
'1393;"Urlaub (Stunden)"
'1550;"AUSZ ÜS 100%"
'1551;"AUSZ ÜS 50%"
'65
'69
'70
'72
'73
'1209
'1235
'1550
'1551
'1553
Dim dv = New DataView(dt)
dv.RowFilter = "accountid = 65 Or accountid = 69 Or accountid = 70 Or accountid = 72 Or accountid = 73 Or accountid = 1209 Or accountid = 1235 Or accountid = 1550 Or accountid = 1551 Or accountid = 1553"
'1553;"AUSZ ÜS MA 25%"
timeaccountdt = dv.ToTable
getUeberstunden(False)
@@ -447,6 +423,30 @@ Public Class frmUeberstundenauszahlen
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
'65;"01-Lfd Saldo"
'66;02-Krank
'67;03-Urlaub
'69;"10-Na 22-06"
'70;"11-Sa 00-24"
'72;"13-So 00-24"
'73;"14-FtN 00-24"
'438;04-Sonstige
'986;Stundenlohn
'987;FT-Ersatzzeit
'993;"Ausz. ÜS"
'1209;Mehrarbeit
'1210;"Script hilfskonto WSaldo"
'1227;Schichtzulage
'1231;Urlaubsstunden
'1235;"Überstunden 100% gesamt"
'1257;Zuschlag
'1272;"unbezahlter Urlaub"
'1366;"Mehrarbeit am 25. des Monats gesamt"
'1393;"Urlaub (Stunden)"
'1550;"AUSZ ÜS 100%"
'1551;"AUSZ ÜS 50%"
'1598; Korrektur MJ - ÜBER API ansprechen!
Dim sum100, sum50, sum0, gesamt As Double
sum100 = RoundOfDigits(CDbl(txtAusz100.Text) * 100 / 200, 2) 'Übergabe in ZE-System als heruntergerechnete 100%ige bzw. 50%ige ÜS!
@@ -476,25 +476,41 @@ Public Class frmUeberstundenauszahlen
dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
End If
If sum50 > 0 Then
If (sum50 > 0 Or sum0 > 0) And Not istTeilzeit Then
Dim row = dtsetEntries.NewRow
row.Item("accountid") = 1551
row.Item("value") = sum50.ToString.Replace(",", ".")
row.Item("value") = (sum50 + sum0).ToString.Replace(",", ".")
dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
End If
If istTeilzeit Then
If sum50 > 0 Then
Dim row = dtsetEntries.NewRow
row.Item("accountid") = 1551
row.Item("value") = sum50.ToString.Replace(",", ".")
dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
End If
If sum0 > 0 Then
Dim row = dtsetEntries.NewRow
row.Item("accountid") = 1553
row.Item("value") = sum0.ToString.Replace(",", ".")
dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
End If
End If
If sum0 > 0 Then
Dim row = dtsetEntries.NewRow
row.Item("accountid") = IIf(istTeilzeit, 1553, 1551)
row.Item("value") = sum0.ToString.Replace(",", ".")
dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
End If
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(",", ".") * (-1)
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())
@@ -535,7 +551,7 @@ Public Class frmUeberstundenauszahlen
txtAusgabe.Append("100% ÜS: " & txtberAusz100.Text & vbNewLine)
txtAusgabe.Append("50% ÜS: " & txtberAusz50.Text + IIf(Not istTeilzeit, CDbl(txtberAusz25.Text), 0) & vbNewLine)
If istTeilzeit Then txtAusgabe.Append("25% ÜS: " & CDbl(txtberAusz25.Text) & vbNewLine)
txtAusgabe.Append("ÜS gesamt: " & CDbl(txtberAusz100.Text) + CDbl(txtberAusz50.Text) + CDbl(txtberAusz25.Text))
'txtAusgabe.Append("ÜS gesamt: " & CDbl(txtberAusz100.Text) + CDbl(txtberAusz50.Text) + CDbl(txtberAusz25.Text))
Dim aksAuszahlung As MsgBoxResult = MsgBox(txtAusgabe.ToString, vbYesNo)
@@ -546,6 +562,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)
@@ -568,6 +588,18 @@ Public Class frmUeberstundenauszahlen
End If
If timas.deleteTimeAccounts(auszahlugsdatum, auszahlugsdatum, MA.mit_timasId, dtdeleteEntries) Then
'Dim dtEntriesset0 As New DataTable
'dtEntriesset0.Columns.Add("accountid", GetType(Integer))
'dtEntriesset0.Columns.Add("value", GetType(Double))
'Dim row0 = dtEntriesset0.NewRow
'row0.Item("accountid") = 1598
'row0.Item("value") = -0.000001 'darf nicht 0 sein!!!!
'dtEntriesset0.Rows.InsertAt(row0, dtEntriesset0.Rows.Count)
'timas.setTimeAccountEntries(MA, dtEntriesset0, auszahlugsdatum, "")
Dim ues As New cUeberstunden(MA.mit_id, auszahlugsdatum.ToString("dd/MM/yyyy"))
ues.uest_deleted = True
ues.uest_lastChanged = Now()