diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 132e611..4a39db8 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -1419,6 +1419,7 @@ + diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 57b0e73..e0e5a25 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/Aviso/Resources/ZwAbEinfuegen.png b/Aviso/Resources/ZwAbEinfuegen.png new file mode 100644 index 0000000..ad9e91b Binary files /dev/null and b/Aviso/Resources/ZwAbEinfuegen.png differ diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 0e3457f..69367dc 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -270,6 +270,8 @@ Public Class frmHauptfenster If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then StandortWechselnToolStripMenuItem.Visible = True + ElseIf VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STANDORT_WECHSELN", "AVISO") Then + StandortWechselnToolStripMenuItem.Visible = True End If If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "QS" Then diff --git a/Aviso/usrcntlAktDetails.Designer.vb b/Aviso/usrcntlAktDetails.Designer.vb index 67ad520..984d85b 100644 --- a/Aviso/usrcntlAktDetails.Designer.vb +++ b/Aviso/usrcntlAktDetails.Designer.vb @@ -23,17 +23,17 @@ Partial Class usrcntlAktDetails _ 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() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetails)) - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlDetailsRechts = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() Me.SplitContainer = New System.Windows.Forms.SplitContainer() @@ -169,6 +169,8 @@ Partial Class usrcntlAktDetails Me.btnÄndern = New System.Windows.Forms.Button() Me.btnTV = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() + Me.Label1 = New System.Windows.Forms.Label() + Me.picAVISOMessenger = New System.Windows.Forms.PictureBox() Me.pnlDetailsRechts.SuspendLayout() Me.Panel3.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() @@ -204,6 +206,7 @@ Partial Class usrcntlAktDetails Me.conMenuVermerke.SuspendLayout() Me.cntxtFormulare.SuspendLayout() Me.pnlOptionen.SuspendLayout() + CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnlDetailsRechts @@ -597,46 +600,46 @@ Partial Class usrcntlAktDetails Me.dgvSendungen.AllowUserToAddRows = False Me.dgvSendungen.AllowUserToDeleteRows = False Me.dgvSendungen.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle11.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 Me.dgvSendungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle12.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvSendungen.ColumnHeadersHeight = 34 Me.dgvSendungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle13 Me.dgvSendungen.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSendungen.Location = New System.Drawing.Point(0, 0) Me.dgvSendungen.MultiSelect = False Me.dgvSendungen.Name = "dgvSendungen" Me.dgvSendungen.ReadOnly = True - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle14 Me.dgvSendungen.RowHeadersVisible = False Me.dgvSendungen.RowHeadersWidth = 62 Me.dgvSendungen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle15 Me.dgvSendungen.RowTemplate.Height = 20 Me.dgvSendungen.RowTemplate.ReadOnly = True Me.dgvSendungen.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -972,46 +975,46 @@ Partial Class usrcntlAktDetails Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle6.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle16.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle7.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle17.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle17 Me.gridVermerke.ColumnHeadersHeight = 34 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle18 Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.gridVermerke.Location = New System.Drawing.Point(0, 30) Me.gridVermerke.MultiSelect = False Me.gridVermerke.Name = "gridVermerke" Me.gridVermerke.ReadOnly = True - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle19 Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidth = 62 Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle20 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1282,7 +1285,9 @@ Partial Class usrcntlAktDetails 'Panel8 ' Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel8.Controls.Add(Me.Label1) Me.Panel8.Controls.Add(Me.lblBarZuKassierenSumme) + Me.Panel8.Controls.Add(Me.picAVISOMessenger) Me.Panel8.Controls.Add(Me.btnAktUebernehmen) Me.Panel8.Controls.Add(Me.Button7) Me.Panel8.Controls.Add(Me.btnLkwBeleg) @@ -1468,11 +1473,11 @@ Partial Class usrcntlAktDetails Me.txtAktMA.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtAktMA.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtAktMA.ForeColor = System.Drawing.Color.Black - Me.txtAktMA.Location = New System.Drawing.Point(172, 96) + Me.txtAktMA.Location = New System.Drawing.Point(214, 96) Me.txtAktMA.MaxLength = 0 Me.txtAktMA.Name = "txtAktMA" Me.txtAktMA.ReadOnly = True - Me.txtAktMA.Size = New System.Drawing.Size(247, 16) + Me.txtAktMA.Size = New System.Drawing.Size(199, 16) Me.txtAktMA.TabIndex = 97 Me.txtAktMA.TabStop = False ' @@ -1481,7 +1486,7 @@ Partial Class usrcntlAktDetails Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label3.ForeColor = System.Drawing.Color.Black - Me.Label3.Location = New System.Drawing.Point(169, 76) + Me.Label3.Location = New System.Drawing.Point(211, 76) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(59, 17) Me.Label3.TabIndex = 96 @@ -1609,9 +1614,9 @@ Partial Class usrcntlAktDetails Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAktUebernommen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAktUebernommen.ForeColor = System.Drawing.Color.Green - Me.lblAktUebernommen.Location = New System.Drawing.Point(166, 75) + Me.lblAktUebernommen.Location = New System.Drawing.Point(208, 75) Me.lblAktUebernommen.Name = "lblAktUebernommen" - Me.lblAktUebernommen.Size = New System.Drawing.Size(241, 38) + Me.lblAktUebernommen.Size = New System.Drawing.Size(205, 38) Me.lblAktUebernommen.TabIndex = 102 Me.lblAktUebernommen.Text = "Akt übernommen!" Me.lblAktUebernommen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2169,6 +2174,33 @@ Partial Class usrcntlAktDetails Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button10.UseVisualStyleBackColor = False ' + 'Label1 + ' + Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label1.BackColor = System.Drawing.Color.Red + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.0!, System.Drawing.FontStyle.Bold) + Me.Label1.ForeColor = System.Drawing.Color.White + Me.Label1.Location = New System.Drawing.Point(197, 105) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(20, 13) + Me.Label1.TabIndex = 104 + Me.Label1.Text = "99" + Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.Label1.Visible = False + ' + 'picAVISOMessenger + ' + Me.picAVISOMessenger.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.picAVISOMessenger.BackgroundImage = Global.AVISO.My.Resources.Resources.aviso_messenger + Me.picAVISOMessenger.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picAVISOMessenger.Cursor = System.Windows.Forms.Cursors.Hand + Me.picAVISOMessenger.Location = New System.Drawing.Point(168, 75) + Me.picAVISOMessenger.Name = "picAVISOMessenger" + Me.picAVISOMessenger.Size = New System.Drawing.Size(36, 40) + Me.picAVISOMessenger.TabIndex = 103 + Me.picAVISOMessenger.TabStop = False + Me.picAVISOMessenger.Visible = False + ' 'usrcntlAktDetails ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None @@ -2226,6 +2258,7 @@ Partial Class usrcntlAktDetails Me.conMenuVermerke.ResumeLayout(False) Me.cntxtFormulare.ResumeLayout(False) Me.pnlOptionen.ResumeLayout(False) + CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -2365,4 +2398,6 @@ Partial Class usrcntlAktDetails Friend WithEvents Button16 As Button Friend WithEvents picMAinfo_TRVorgeschrieben As PictureBox Friend WithEvents txtMAinfo_TRVorgeschrieben As TextBox + Friend WithEvents Label1 As Label + Friend WithEvents picAVISOMessenger As PictureBox End Class diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 782b3af..f90b380 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -203,6 +203,12 @@ Public Class usrcntlAktDetails If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me.FindForm) Then Button2.Visible = True End If + + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("LKW_CHAT") Then + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("LKW_CHAT", Me.FindForm) Then + picAVISOMessenger.Visible = True + End If + End If 'If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME <> "ADMIN" Then ' tbcntlVermerke.TabPages.Remove(tbAnhang) 'End If @@ -3503,5 +3509,46 @@ Public Class usrcntlAktDetails Private Sub Button16_Click(sender As Object, e As EventArgs) Handles Button16.Click Process.Start("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID)) End Sub + + Private Sub picAVISOMessenger_Click(sender As Object, e As EventArgs) Handles picAVISOMessenger.Click + Dim CHAT = New VERAG_PROG_ALLGEMEIN.cMessenger.cMessenger_Chat(AvisoID, -1) + + If CHAT.chat_id <= 0 Then + 'Neuer Chat + Dim chatName = "LKW CHAT: " & AVISO.LKW_Nr & " (LKW-Id: " & AVISO.AvisoID & ")" + + Dim MB_LIST As New List(Of Integer) + MB_LIST.Add(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID) + + VERAG_PROG_ALLGEMEIN.cMessenger.GEN_NEW_CHAT(chatName, MB_LIST, CHAT, "LKW_CHAT", AvisoID, -1) + + End If + If CHAT IsNot Nothing Then + + If Not CHAT.CHAT_MEMBERS.Exists(Function(x) x.chatMb_maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID) Then + If vbYes <> MsgBox("Möchten Sie dem LKW Chat beitreten?", vbYesNoCancel) Then + Exit Sub + Else 'weiter... + End If + End If + + Me.Cursor = Cursors.WaitCursor + 'For Each openForm In Application.OpenForms() + ' If TypeOf (openForm) Is VERAG_PROG_ALLGEMEIN.frmMessenger Then + ' CType(openForm, VERAG_PROG_ALLGEMEIN.frmMessenger).WindowState = FormWindowState.Normal + ' CType(openForm, VERAG_PROG_ALLGEMEIN.frmMessenger).BringToFront() + ' Me.Cursor = Cursors.Default : Exit Sub + ' End If + 'Next + + Dim f As New VERAG_PROG_ALLGEMEIN.frmMessenger() + f.Location = Cursor.Position + f.AvisoId = AvisoID + f.Show(Me) + Me.Cursor = Cursors.Default + End If + + + End Sub End Class