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

Mahnlauf fix, Mitarbeiter, verwahrung, etc.

Browse Source
This commit is contained in:
d.breimaier
2026-04-17 13:27:13 +02:00
parent 368177a536
commit 30d9062ad5
4 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
UID/Mitarbeiter/frmMitarbDetails.vb
View File

@@ -1,5 +1,6 @@

Imports System.Text.RegularExpressions
Imports Confluent.Kafka
Imports VERAG_PROG_ALLGEMEIN
Public Class frmMitarbDetails
@@ -1873,22 +1874,22 @@ Public Class frmMitarbDetails
End Sub
Private Sub cbxeigeneFirma_CheckedChanged(sender As Object, e As EventArgs) Handles cbxeigeneFirma.CheckedChanged
If Not cbxeigeneFirma.Checked Then
'Private Sub cbxeigeneFirma_CheckedChanged(sender As Object, e As EventArgs) Handles cbxeigeneFirma.CheckedChanged
' If Not cbxeigeneFirma.Checked Then
If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then
loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value))
' If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then
' loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value))
Else
' Else
loadBenachrichtiungenListe()
' loadBenachrichtiungenListe()
End If
Else
loadBenachrichtiungenListe()
End If
' End If
' Else
' loadBenachrichtiungenListe()
' End If
End Sub
'End Sub
Private Sub loadBenachrichtiungenListe(Optional FIRMAID As Integer = -1)
@@ -1897,12 +1898,23 @@ Public Class frmMitarbDetails
CASE
WHEN mb_firmaID IS NULL THEN ' (ALLE)'
ELSE ' (' + [tblFirma].Firma_Bez + ')'
END as mb_object, mb_id
END as mb_object, mb_id, mb_firmaID
FROM [ADMIN].[dbo].[tblEMailbenachrichtigungen]
inner join [VERAG].[dbo].[tblFirma] on [mb_firmaID] = [tblFirma].Firma_ID" & IIf(FIRMAID > 0, " AND [tblFirma].Firma_ID = " & FIRMAID, "") & " order by mb_object,mb_firmaID", "ADMIN")
left join [VERAG].[dbo].[tblFirma] on [mb_firmaID] = [tblFirma].Firma_ID order by mb_object,mb_firmaID", "ADMIN")
For Each r As DataRow In dt_Bebachrichtigungen.Rows
Dim edit As Boolean = True
If FIRMAID > 0 Then
If Not IsDBNull(r.Item("mb_firmaID")) AndAlso IsNumeric(r.Item("mb_firmaID")) AndAlso FIRMAID <> CInt((r.Item("mb_firmaID"))) Then
edit = False
End If
End If
clInterneMailBenachrichtigungen.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(r.Item("mb_object"), r.Item("mb_id")))
Next
End Sub

4
UID/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.2.5.3")>
<Assembly: AssemblyFileVersion("1.2.5.3")>
<Assembly: AssemblyVersion("1.2.5.4")>
<Assembly: AssemblyFileVersion("1.2.5.4")>

26
UID/frmMain.Designer.vb generated
View File

@@ -33,6 +33,7 @@ Partial Class frmMain
Me.TableAdapterManager1 = New ADMIN.DataSetBerechtigungenTableAdapters.TableAdapterManager()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.btnInterneBenachrichtigungen = New System.Windows.Forms.Button()
Me.lblVersion = New System.Windows.Forms.Label()
Me.btnAuditFlow = New System.Windows.Forms.Button()
Me.btnMailroutine = New System.Windows.Forms.Button()
@@ -51,7 +52,6 @@ Partial Class frmMain
Me.btnMitarbeiter = New System.Windows.Forms.Button()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.btnInterneBenachrichtigungen = New System.Windows.Forms.Button()
Me.Panel3.SuspendLayout()
Me.Panel2.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -135,6 +135,18 @@ Partial Class frmMain
Me.Panel3.Size = New System.Drawing.Size(137, 801)
Me.Panel3.TabIndex = 32
'
'btnInterneBenachrichtigungen
'
Me.btnInterneBenachrichtigungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnInterneBenachrichtigungen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnInterneBenachrichtigungen.Location = New System.Drawing.Point(12, 220)
Me.btnInterneBenachrichtigungen.Name = "btnInterneBenachrichtigungen"
Me.btnInterneBenachrichtigungen.Size = New System.Drawing.Size(94, 38)
Me.btnInterneBenachrichtigungen.TabIndex = 46
Me.btnInterneBenachrichtigungen.Text = "interne Infomails"
Me.btnInterneBenachrichtigungen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnInterneBenachrichtigungen.UseVisualStyleBackColor = True
'
'lblVersion
'
Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -344,18 +356,6 @@ Partial Class frmMain
Me.PictureBox1.TabIndex = 31
Me.PictureBox1.TabStop = False
'
'btnInterneBenachrichtigungen
'
Me.btnInterneBenachrichtigungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnInterneBenachrichtigungen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnInterneBenachrichtigungen.Location = New System.Drawing.Point(12, 220)
Me.btnInterneBenachrichtigungen.Name = "btnInterneBenachrichtigungen"
Me.btnInterneBenachrichtigungen.Size = New System.Drawing.Size(94, 52)
Me.btnInterneBenachrichtigungen.TabIndex = 46
Me.btnInterneBenachrichtigungen.Text = "interne Mail-Benachr."
Me.btnInterneBenachrichtigungen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnInterneBenachrichtigungen.UseVisualStyleBackColor = True
'
'frmMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)