Änderungen Rechnugen, Chat, cAllgemeint

2024-09-30 14:11:36 +02:00
parent d0c24e7ac0
commit a5921c5faf
9 changed files with 106 additions and 77 deletions
--- a/SDL/Fakturierung/rptRechnungDruck.Designer.vb
+++ b/SDL/Fakturierung/rptRechnungDruck.Designer.vb
--- a/SDL/Fakturierung/rptRechnungDruck.resx
+++ b/SDL/Fakturierung/rptRechnungDruck.resx
--- a/SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb
+++ b/SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb
--- a/SDL/Fakturierung/rptSammelRechnungDruck.resx
+++ b/SDL/Fakturierung/rptSammelRechnungDruck.resx
--- a/SDL/mdm/frmMDMDatenverarbetiung.vb
+++ b/SDL/mdm/frmMDMDatenverarbetiung.vb
@@ -16,6 +16,7 @@ Public Class frmMDMDatenverarbetiung
    Dim ProduktCode_NOT_IN = "'9020'"
    Dim datum As Date = Nothing
    Dim test As Boolean = False
+
    Private Sub frmPloseDatenverarbetiung_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        Me.Top = 0
        Me.Height = My.Computer.Screen.WorkingArea.Height
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
@@ -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()
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
@@ -14,8 +14,8 @@ Public Class frmMessenger
    Dim topMessages As String = "20"
    Dim topMessagesDateHistory As Object = Nothing
    Dim loaded = False
-    Public EMOJI_PATH_MAIN = DATENVERVER_OPTIONS.getRootDir & "\DOKUMENTE\CHAT_EMOJIS\"
-    Public EMOJI_PATH = cAllgemein.EMOJI_PATH
+    'Public EMOJI_PATH_MAIN = DATENVERVER_OPTIONS.getRootDir & "\DOKUMENTE\CHAT_EMOJIS\"
+    Public EMOJI_PATH_LOCAL = cAllgemein.EMOJI_PATH
    Public AvisoId As Integer = -1
    Public SendungID As Integer = -1

@@ -39,34 +39,34 @@ Public Class frmMessenger

    Sub initEMOJI_PATH()

-        EMOJI_PATH = EMOJI_PATH_MAIN
-        Try
-            Dim IPADDR As System.Net.IPAddress
-            IPADDR = System.Net.Dns.GetHostByName(System.Net.Dns.GetHostName()).AddressList(0)
+        'EMOJI_PATH_LOCAL = EMOJI_PATH_MAIN
+        'Try
+        '    Dim IPADDR As System.Net.IPAddress
+        '    IPADDR = System.Net.Dns.GetHostByName(System.Net.Dns.GetHostName()).AddressList(0)

-            If IPADDR.ToString.Contains("172.16.1.") Then 'WAIDHAUS
-                EMOJI_PATH = "\\172.16.1.100\f\PROGRAMME\CHAT_EMOJIS\"
-            End If
+        '    If IPADDR.ToString.Contains("172.16.1.") Then 'WAIDHAUS
+        '        EMOJI_PATH = "\\172.16.1.100\f\PROGRAMME\CHAT_EMOJIS\"
+        '    End If

-            If IPADDR.ToString.Contains("192.168.133.") Then 'SALZBURG
-                EMOJI_PATH = "\\192.168.133.98\f\Programme\CHAT_EMOJIS\"
-            End If
+        '    If IPADDR.ToString.Contains("192.168.133.") Then 'SALZBURG
+        '        EMOJI_PATH = "\\192.168.133.98\f\Programme\CHAT_EMOJIS\"
+        '    End If

-            If IPADDR.ToString.Contains("192.168.32.") Then 'NICKELSDORF
-                EMOJI_PATH = "\\192.168.32.253\Files\Programme\CHAT_EMOJIS\"
-            End If
+        '    If IPADDR.ToString.Contains("192.168.32.") Then 'NICKELSDORF
+        '        EMOJI_PATH = "\\192.168.32.253\Files\Programme\CHAT_EMOJIS\"
+        '    End If

-            If IPADDR.ToString.Contains("192.168.100") Then 'NEUHAUS
-                EMOJI_PATH = "\\192.168.100.20\Share\Programme\CHAT_EMOJIS\"
-            End If
+        '    If IPADDR.ToString.Contains("192.168.100") Then 'NEUHAUS
+        '        EMOJI_PATH = "\\192.168.100.20\Share\Programme\CHAT_EMOJIS\"
+        '    End If

-            If Not System.IO.Directory.Exists(EMOJI_PATH) Then
-                EMOJI_PATH = EMOJI_PATH_MAIN
-            End If
+        '    If Not System.IO.Directory.Exists(EMOJI_PATH) Then
+        '        EMOJI_PATH = EMOJI_PATH_MAIN
+        '    End If

-        Catch ex As Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
-        End Try
+        'Catch ex As Exception
+        '    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        'End Try

    End Sub
    Private Sub MyDatagridview1_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvChats.CellContentClick, dgvChats.CellClick
@@ -138,8 +138,8 @@ Public Class frmMessenger
        Dim spezialEmoji = False
        If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Then spezialEmoji = True

-        If System.IO.Directory.Exists(EMOJI_PATH) Then
-            For Each aa In System.IO.Directory.GetFiles(EMOJI_PATH) '.OrderBy(Function(f) f)
+        If System.IO.Directory.Exists(EMOJI_PATH_LOCAL) Then
+            For Each aa In System.IO.Directory.GetFiles(EMOJI_PATH_LOCAL) '.OrderBy(Function(f) f)
                If (alloweasteregg Or Not aa.Contains("easteregg")) Then
                    If System.IO.File.Exists(aa) And aa.Contains(".png") And (aa.Contains("emoji_") Or spezialEmoji) Then
                        If hiddemEmojis Or Not aa.Contains("_hidden") Then
--- a/VERAG_PROG_ALLGEMEIN/Messenger/usrCntlMessenger_ChatEmoji.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/usrCntlMessenger_ChatEmoji.vb
@@ -1,4 +1,5 @@
 Imports System.Drawing
+Imports System.IO

 Public Class usrCntlMessenger_ChatEmoji
    Property BG_COLOR As Color = Color.FromArgb(192, 255, 192) ' Color.Azure
@@ -43,11 +44,20 @@ Public Class usrCntlMessenger_ChatEmoji
                ' txtChatmessage.Text = CHAT_MSG.chatMg_text

                Dim imgPath = CHAT_MSG.chatMg_text
+                Dim filename = New FileInfo(imgPath).Name
+                Dim imgPathLocal = imgPath.Replace(filename, "")
                Try
                    'Dim frmM As frmMessenger = DirectCast(Me.Parent, frmMessenger)
-                    If frmM.EMOJI_PATH <> frmM.EMOJI_PATH_MAIN Then
-                        If System.IO.File.Exists(imgPath.Replace(frmM.EMOJI_PATH_MAIN, frmM.EMOJI_PATH)) Then
-                            imgPath = imgPath.Replace(frmM.EMOJI_PATH_MAIN, frmM.EMOJI_PATH)
+
+                    'If frmM.EMOJI_PATH_LOCAL <> frmM.EMOJI_PATH_MAIN Then
+                    '    If System.IO.File.Exists(imgPath.Replace(frmM.EMOJI_PATH_MAIN, frmM.EMOJI_PATH_LOCAL)) Then
+                    '        imgPath = imgPath.Replace(frmM.EMOJI_PATH_MAIN, frmM.EMOJI_PATH_LOCAL)
+                    '     '    End If
+                    'End If
+
+                    If frmM.EMOJI_PATH_LOCAL <> imgPathLocal Then
+                        If System.IO.File.Exists(imgPath.Replace(imgPathLocal, frmM.EMOJI_PATH_LOCAL)) Then
+                            imgPath = imgPath.Replace(imgPathLocal, frmM.EMOJI_PATH_LOCAL)
                        End If
                    End If
                Catch ex As Exception
--- a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb
+++ b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb
@@ -1,5 +1,6 @@
 Imports GrapeCity.ActiveReports
 Imports GrapeCity.ActiveReports.Document
+Imports System.ComponentModel
 Imports System.Data.SqlClient

 Public Class cAllgemein
@@ -159,6 +160,7 @@ Public Class cAllgemein
    Public Shared Sub LOAD_CHAT_EMOJIS()

        Dim EMOJI_SOURCEPATH = DATENVERVER_OPTIONS.getRootDir & "\DOKUMENTE\CHAT_EMOJIS\"
+        Dim EMOJI_SOURCELIST = System.IO.Directory.GetFiles(EMOJI_SOURCEPATH).ToList

        EMOJI_PATH = System.IO.Path.GetFullPath(My.Application.Info.DirectoryPath & "\Resources\CHAT_EMOJIS\")

@@ -169,9 +171,12 @@ Public Class cAllgemein


            For Each f In System.IO.Directory.GetFiles(EMOJI_PATH)
-                System.IO.File.Delete(f)
-            Next
+                Dim fi As New System.IO.FileInfo(f)
+                If Not System.IO.Directory.GetFiles(EMOJI_PATH).Any(Function(c) c.Equals(fi.Name, StringComparison.OrdinalIgnoreCase)) Then
+                    System.IO.File.Delete(f)
+                End If

+            Next

            For Each f In System.IO.Directory.GetFiles(EMOJI_SOURCEPATH)
                Dim fi As New System.IO.FileInfo(f)