Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

2023-03-28 16:48:28 +02:00
parent ad459e0765 53f4ec87bd
commit 30f380d9af
13 changed files with 122 additions and 14 deletions
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
@@ -206,7 +206,7 @@ Public Class cMessenger

            If CHAT.chat_id <= 0 Then
                'Neuer Chat
-                Dim chatName = Sendung.AbfertigungsNr & "/" & Sendung.FilialenNr & " (" & Aviso.LKW_Nr & ")"
+                Dim chatName = Sendung.FilialenNr & "/" & Sendung.AbfertigungsNr & " (" & Aviso.LKW_Nr & ")"
                '"SND CHAT: " &

                Dim MB_LIST As New List(Of Integer)
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.Designer.vb
@@ -38,8 +38,13 @@ Partial Class frmMessenger_NeuerChat
        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.dgvChatgruppe = New System.Windows.Forms.DataGridView()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.grpID = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.grpName = New System.Windows.Forms.DataGridViewTextBoxColumn()
        CType(Me.dgvMitarbeiter, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvChatMembers, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dgvChatgruppe, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'dgvMitarbeiter
@@ -55,7 +60,7 @@ Partial Class frmMessenger_NeuerChat
        Me.dgvMitarbeiter.Name = "dgvMitarbeiter"
        Me.dgvMitarbeiter.RowHeadersVisible = False
        Me.dgvMitarbeiter.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvMitarbeiter.Size = New System.Drawing.Size(304, 393)
+        Me.dgvMitarbeiter.Size = New System.Drawing.Size(304, 330)
        Me.dgvMitarbeiter.TabIndex = 1
        '
        'dgvChatMembers
@@ -69,7 +74,7 @@ Partial Class frmMessenger_NeuerChat
        Me.dgvChatMembers.ReadOnly = True
        Me.dgvChatMembers.RowHeadersVisible = False
        Me.dgvChatMembers.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvChatMembers.Size = New System.Drawing.Size(327, 323)
+        Me.dgvChatMembers.Size = New System.Drawing.Size(327, 314)
        Me.dgvChatMembers.TabIndex = 2
        '
        'clmnMaId
@@ -206,12 +211,54 @@ Partial Class frmMessenger_NeuerChat
        Me.MyTextBox1.Size = New System.Drawing.Size(228, 20)
        Me.MyTextBox1.TabIndex = 0
        '
+        'dgvChatgruppe
+        '
+        Me.dgvChatgruppe.AllowUserToAddRows = False
+        Me.dgvChatgruppe.AllowUserToDeleteRows = False
+        Me.dgvChatgruppe.AllowUserToResizeColumns = False
+        Me.dgvChatgruppe.AllowUserToResizeRows = False
+        Me.dgvChatgruppe.BackgroundColor = System.Drawing.Color.White
+        Me.dgvChatgruppe.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvChatgruppe.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.grpID, Me.grpName})
+        Me.dgvChatgruppe.Location = New System.Drawing.Point(13, 392)
+        Me.dgvChatgruppe.MultiSelect = False
+        Me.dgvChatgruppe.Name = "dgvChatgruppe"
+        Me.dgvChatgruppe.RowHeadersVisible = False
+        Me.dgvChatgruppe.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvChatgruppe.Size = New System.Drawing.Size(304, 47)
+        Me.dgvChatgruppe.TabIndex = 9
+        Me.dgvChatgruppe.Visible = False
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(12, 379)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(65, 13)
+        Me.Label3.TabIndex = 10
+        Me.Label3.Text = "Chatgruppe:"
+        Me.Label3.Visible = False
+        '
+        'grpID
+        '
+        Me.grpID.HeaderText = "grpID"
+        Me.grpID.Name = "grpID"
+        Me.grpID.Visible = False
+        '
+        'grpName
+        '
+        Me.grpName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.grpName.HeaderText = "Name"
+        Me.grpName.Name = "grpName"
+        '
        'frmMessenger_NeuerChat
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
        Me.ClientSize = New System.Drawing.Size(662, 451)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.dgvChatgruppe)
        Me.Controls.Add(Me.MyComboBox1)
        Me.Controls.Add(Me.Label2)
        Me.Controls.Add(Me.MyTextBox2)
@@ -227,6 +274,7 @@ Partial Class frmMessenger_NeuerChat
        Me.Text = "Neuer Chat"
        CType(Me.dgvMitarbeiter, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.dgvChatMembers, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dgvChatgruppe, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -247,4 +295,8 @@ Partial Class frmMessenger_NeuerChat
    Friend WithEvents DataGridViewTextBoxColumn1 As Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents DataGridViewTextBoxColumn2 As Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents DataGridViewTextBoxColumn3 As Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents dgvChatgruppe As Windows.Forms.DataGridView
+    Friend WithEvents Label3 As Windows.Forms.Label
+    Friend WithEvents grpID As Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents grpName As Windows.Forms.DataGridViewTextBoxColumn
 End Class
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.resx
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.resx
@@ -126,6 +126,12 @@
  <metadata name="clmnFirma.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="grpID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="grpName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.vb
@@ -53,6 +53,12 @@ Public Class frmMessenger_NeuerChat
        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
        MyComboBox1.changeItem("")
+
+        dgvChatgruppe.Rows.Clear()
+        dgvChatgruppe.Rows.Add({"BUCHHALTUNG", "BUCHHALTUNG"})
+
+
+
        loaded = True
        initDGV()
        If CHAT IsNot Nothing Then
@@ -60,6 +66,12 @@ Public Class frmMessenger_NeuerChat
            Me.MyTextBox2.Text = CHAT.chat_name
            Me.MyTextBox2.Enabled = False
            btn.Text = "Hinzufügen"
+
+            Select Case CHAT.chat_art
+                Case "SND_CHAT", "LKW_CHAT"
+                    Label3.Visible = True
+                    dgvChatgruppe.Visible = True
+            End Select
        End If
    End Sub

@@ -103,6 +115,22 @@ Public Class frmMessenger_NeuerChat
        End If
    End Sub

+    Sub addSelMAGruppe()
+        If dgvChatgruppe.SelectedRows.Count > 0 Then
+            Select Case dgvChatgruppe.SelectedRows(0).Cells(0).Value
+                Case "BUCHHALTUNG"
+                    dgvChatMembers.Rows.Add(405, "Anna Stockenhuber", "VERAG")
+                    dgvChatMembers.Rows.Add(599, "Isabella Miesenbeck", "VERAG")
+                    dgvChatMembers.Rows.Add(170, "Kerstin Bauböck", "VERAG")
+            End Select
+
+            initAddRemoveDGV()
+            MyTextBox1.Text = ""
+            MyTextBox1.Focus()
+            dgvChatgruppe.ClearSelection()
+        End If
+    End Sub
+
    Sub initAddRemoveDGV()
        If dgvChatMembers.Rows.Count = 1 Then
            MyTextBox2.Text = dgvChatMembers.Rows(0).Cells("clmnName").Value 'dgvMitarbeiter.SelectedRows(0).Cells("MAname").Value
@@ -174,7 +202,16 @@ Public Class frmMessenger_NeuerChat
    End Sub


+    Private Sub dgvChatgruppe_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvChatgruppe.CellDoubleClick
+        addSelMAGruppe()
+    End Sub
+
+
    Private Sub dgvChatMembers_RowsRemoved(sender As Object, e As DataGridViewRowsRemovedEventArgs) Handles dgvChatMembers.RowsRemoved
        initAddRemoveDGV()
    End Sub
+
+    Private Sub frmMessenger_NeuerChat_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        dgvChatgruppe.ClearSelection()
+    End Sub
 End Class
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -67,7 +67,7 @@
    <PlatformTarget>x64</PlatformTarget>
  </PropertyGroup>
  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
  </PropertyGroup>
  <PropertyGroup>
    <AssemblyOriginatorKeyFile>ProgAllg.pfx</AssemblyOriginatorKeyFile>