diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb index ba6b36d3..22781010 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb @@ -257,7 +257,7 @@ Public Class usrCntlATLAS_EXGestellung 'EXG.exg_ObjectName = AVISO.AvisoID & "_EXP_" & EXG.exg_MRN Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - FIRMA_DY = DAKOSY_Worker.cDakosyFunftions.getFirma_DY(SENDUNG.FilialenNr, Me.FindForm) + FIRMA_DY = DAKOSY_Worker.cDakosyFunftions.getFirma_DY(SENDUNG.FilialenNr, Me.FindForm, "EXG") Dim saveFile = "" If EXG.SAVE_ALL Then diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb index acb81e6c..9fc3f710 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb @@ -123,16 +123,16 @@ Public Class usrCntlATLAS_NCTS004 Shared Function getBezugsnr(FIRMA_DY As String, SENDUNG As cSendungen, ByRef BezugsNr As String, ByRef zusatz As String) Dim BezugsNrTmp = "" Select Case FIRMA_DY - Case "UNISPED" - If If(SENDUNG.tblSnd_DakosyRef, "") <> "" Then - BezugsNrTmp = SENDUNG.tblSnd_DakosyRef - Else - BezugsNrTmp = SENDUNG.FilialenNr & "/" & SENDUNG.AbfertigungsNr - End If - Case Else - BezugsNrTmp = SENDUNG.FilialenNr & "/" & SENDUNG.AbfertigungsNr '& If(zusatz <> "", "/" & zusatz, "") 'zusatz ' & "/" & Jahr2Stellig - End Select - BezugsNr = BezugsNrTmp + Case "UNISPED" + If If(SENDUNG.tblSnd_DakosyRef, "") <> "" Then + BezugsNrTmp = SENDUNG.tblSnd_DakosyRef + Else + BezugsNrTmp = SENDUNG.FilialenNr & "/" & SENDUNG.AbfertigungsNr + End If + Case Else + BezugsNrTmp = SENDUNG.FilialenNr & "/" & SENDUNG.AbfertigungsNr '& If(zusatz <> "", "/" & zusatz, "") 'zusatz ' & "/" & Jahr2Stellig + End Select + BezugsNr = BezugsNrTmp zusatz = "A" 'Soloagne bis die Bezugsnummer noch nicht existiert While DAKOSY_Worker.cDakosy_Zollanmeldungen.ExistsBezugsNr(BezugsNr) 'IsNot Nothing @@ -177,8 +177,12 @@ Public Class usrCntlATLAS_NCTS004 ' Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME" ' Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO" 'End Select + If SENDUNG IsNot Nothing Then + FIRMA_DY = cDakosyFunftions.getFirma_DY(SENDUNG.FilialenNr.ToString, Me.FindForm, "NCTS") + MsgBox(SENDUNG.FilialenNr) + End If - ' FIRMA_DY = cDakosyFunftions.getFirma_DY(FilialenNr.ToString, Me)? + ' MsgBox(FIRMA_DY) txtDyMandant.Text = cDakosyFunftions.getIOPartner(FIRMA_DY, "NCTS") txtDyNiederlassung.Text = cDakosyFunftions.getDivision(FIRMA_DY, "NCTS") diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb index 4339f331..ef88eacf 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb @@ -110,7 +110,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige ' dim FilialenNr Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - FIRMA_DY = DAKOSY_Worker.cDakosyFunftions.getFirma_DY(SENDUNG.FilialenNr, Me.FindForm) + FIRMA_DY = DAKOSY_Worker.cDakosyFunftions.getFirma_DY(SENDUNG.FilialenNr, Me.FindForm, "AA") If txtDyMandant.Text = "VERG" And FIRMA_DY = "IMEX" Then 'IMEX verwendet VERAG-Gestellungskonto!!! FIRMA_DY = "VERAG" diff --git a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb index e0c95c1e..8db9937d 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb @@ -115,7 +115,7 @@ Public Class frmZollanmeldung Private Sub frmZollanmeldung_Load(sender As Object, e As EventArgs) Handles Me.Load - FIRMA_DY = cDakosyFunftions.getFirma_DY(FilialenNr, Me) + FIRMA_DY = cDakosyFunftions.getFirma_DY(FilialenNr, Me, ART.Replace("T1", "NCTS").Replace("T2", "NCTS")) Select Case ZOLL_SYSTEM Case "SGS" diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cGlobal.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cGlobal.vb index e08636c6..d2fca314 100644 --- a/VERAG_PROG_ALLGEMEIN/AVISO/cGlobal.vb +++ b/VERAG_PROG_ALLGEMEIN/AVISO/cGlobal.vb @@ -36,6 +36,13 @@ Public Class cGlobal Public Const Status_ATILLA_VERIMEX = 6 Public Const Status_ATILLA_INDONESIEN = 7 + Public Const SND_Status_Erfasst = 0 + Public Const SND_Status_InBearbeitung = 4 + Public Const SND_Status_Eingereicht = 5 '? + Public Const SND_Status_Ueberlassen = 1 + Public Const SND_Status_NichtEingetroffen = 2 + + Public Const SND_Status_Ankunft = 3 '? Shared Function getStatusText(i As Integer) As String Select Case i @@ -51,6 +58,18 @@ Public Class cGlobal Case Else : Return "" End Select End Function + + Shared Function getSNDStatusText(i As Integer) As String + Select Case i + Case 0 : Return "Erfasst" + Case 1 : Return "Überlassen" + Case 2 : Return "Nicht Eingetroffen" + Case 3 : Return "Ankunft" + Case 4 : Return "In Bearbeitung" + Case 5 : Return "Eingereicht" + Case Else : Return "" + End Select + End Function End Class Public Enum AufrufenderProzess diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index 01e0a751..ec52704b 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -24,7 +24,6 @@ Partial Class frmMessenger 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. 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() @@ -39,12 +38,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.components) + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview() 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.components) + Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.Panel5 = New System.Windows.Forms.Panel() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() @@ -65,7 +64,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.components) + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel() Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() Me.Panel3 = New System.Windows.Forms.Panel() Me.btnTeilnehmer = New System.Windows.Forms.Button() @@ -93,9 +92,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.components) - Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) - Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer() + Me.Timer_REFRESH = New System.Windows.Forms.Timer() + Me.cntxt = New System.Windows.Forms.ContextMenuStrip() Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb index 1863cce6..e3cbd889 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb @@ -1449,4 +1449,8 @@ Public Class frmMessenger Private Sub UsrCntlChat_Art_snd_Load(ctl As usrCntlChat_Art_Btn) Handles UsrCntlChat_Art_Btn_SNDCHAT.CLICKED End Sub + + Private Sub dgvChats_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvChats.CellContentClick + + End Sub End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/usrCntlMessenger_ListNewChats.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/usrCntlMessenger_ListNewChats.Designer.vb new file mode 100644 index 00000000..5a5a03fc --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Messenger/usrCntlMessenger_ListNewChats.Designer.vb @@ -0,0 +1,101 @@ + _ +Partial Class usrCntlMessenger_ListNewChats + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + '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. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + 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 DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components) + CType(Me.dgvChats, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'dgvChats + ' + Me.dgvChats.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvChats.AllowUserToAddRows = False + Me.dgvChats.AllowUserToDeleteRows = False + Me.dgvChats.AllowUserToResizeColumns = False + Me.dgvChats.AllowUserToResizeRows = False + Me.dgvChats.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvChats.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13 + Me.dgvChats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvChats.ColumnHeadersVisible = False + DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvChats.DefaultCellStyle = DataGridViewCellStyle14 + Me.dgvChats.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvChats.Location = New System.Drawing.Point(0, 0) + Me.dgvChats.Name = "dgvChats" + Me.dgvChats.ReadOnly = True + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvChats.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 + Me.dgvChats.RowHeadersVisible = False + Me.dgvChats.RowHeadersWidth = 62 + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvChats.RowsDefaultCellStyle = DataGridViewCellStyle16 + Me.dgvChats.RowTemplate.Height = 30 + Me.dgvChats.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvChats.Size = New System.Drawing.Size(307, 374) + Me.dgvChats.TabIndex = 1 + ' + 'TimerNEW_MESSAGE + ' + Me.TimerNEW_MESSAGE.Enabled = True + Me.TimerNEW_MESSAGE.Interval = 5000 + ' + 'usrCntlMessenger_ListNewChats + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.dgvChats) + Me.Name = "usrCntlMessenger_ListNewChats" + Me.Size = New System.Drawing.Size(307, 374) + CType(Me.dgvChats, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents dgvChats As MyDatagridview + Friend WithEvents TimerNEW_MESSAGE As Windows.Forms.Timer +End Class diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/usrCntlMessenger_ListNewChats.resx b/VERAG_PROG_ALLGEMEIN/Messenger/usrCntlMessenger_ListNewChats.resx new file mode 100644 index 00000000..a1f34eff --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Messenger/usrCntlMessenger_ListNewChats.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/usrCntlMessenger_ListNewChats.vb b/VERAG_PROG_ALLGEMEIN/Messenger/usrCntlMessenger_ListNewChats.vb new file mode 100644 index 00000000..68c7ad9e --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Messenger/usrCntlMessenger_ListNewChats.vb @@ -0,0 +1,167 @@ +Imports System.Drawing +Imports System.Windows.Forms +Imports com.sun.xml.internal.ws.resources + +Public Class usrCntlMessenger_ListNewChats + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Sub intiDGVChats(Optional dgv_ChatID = -1, Optional reloadChat = True, Optional selFirst = False) + + + + With dgvChats + 'Dim loadedTmp = loaded + 'If Not reloadChat Then + ' loaded = False + 'End If + + Dim whereName = "" + 'If MyTextBox1.Text.Trim <> String.Empty Then + ' whereName = " WHERE y.chat_name LIKE '%" & MyTextBox1.Text.Trim & "%' " + 'End If + + Dim where = "" + 'Select Case toggle_CHAT_ART + ' Case "CHAT" + ' where = " AND chat_art IN ('CHAT') " + ' 'Case "LKW_CHAT" + ' ' where = " AND chat_art IN ('LKW_CHAT') " + ' Case Else + ' where = " AND chat_art IN ('" & toggle_CHAT_ART & "') " + 'End Select + + Dim sqlQery_optimiced As String = " SELECT * FROM (SELECT TOP 200 + c.chat_id, + c.chat_art, + CASE + WHEN ISNULL(c.chat_name, '') <> '' THEN c.chat_name + ELSE names.chat_name + END AS chat_name, + + ISNULL(unread.ungelesen, 0) AS ungelesen, + + c.chat_lastMsg + + FROM tblMessenger_Chat c + + -- ensure current user is member + INNER JOIN tblMessenger_ChatMembers m + ON m.chatMb_chatId = c.chat_id + AND m.chatMb_maId = " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " + + -- 🔹 get participant names (distinct!) + OUTER APPLY ( + SELECT STRING_AGG(name, ', ') AS chat_name + FROM ( + SELECT DISTINCT + mit.mit_vname + ' ' + mit.mit_nname AS name + FROM tblMessenger_ChatMembers m2 + INNER JOIN tblMitarbeiter mit + ON mit.mit_id = m2.chatMb_maId + WHERE m2.chatMb_chatId = c.chat_id + AND m2.chatMb_maId <> " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " + ) x + ) names + + -- 🔹 unread count separated (no duplication!) + OUTER APPLY ( + SELECT COUNT(*) AS ungelesen + FROM tblMessenger_ChatMessages msg + INNER JOIN tblMessenger_ChatMessageStatus s + ON s.chatMgSt_chatMsgId = msg.chatMg_id + WHERE msg.chatMg_chatId = c.chat_id + AND s.chatMgSt_MaId = " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " + AND s.chatMgSt_gelesen = 0 + ) unread WHERE c.chat_aktiv = 1 + AND ISNULL(unread.ungelesen, 0) > 0 + " & where & " ORDER BY c.chat_lastMsg DESC) y " & whereName + + + + .DataSource = SQL.loadDgvBySql(sqlQery_optimiced, "ADMIN") + + If .Columns.Count = 0 Then Exit Sub + + .Columns("chat_id").Visible = False + .Columns("chat_lastMsg").Visible = False + .Columns("chat_name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("chat_art").HeaderText = "ART" + .Columns("ungelesen").Width = 30 + .Columns("ungelesen").HeaderText = "neu" + .Columns("ungelesen").DefaultCellStyle.ForeColor = Color.White + .Columns("ungelesen").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns("ungelesen").DefaultCellStyle.Font = New Font(.Font.FontFamily, 7, FontStyle.Bold) + + dgvChats.GetOrder() + + If selFirst Then + + 'dgvChats.ClearSelection() + 'SplitContainer1.Enabled = False + + 'If .Rows.Count > 0 Then + ' loaded = True + ' SplitContainer1.Enabled = True + ' .Rows(0).Selected = True + 'End If + 'loaded = loadedTmp + Else + + + + dgvChats.ClearSelection() + 'If dgv_ChatID > 0 Then + ' For Each r As DataGridViewRow In .Rows + ' If r.Cells("chat_id").Value = dgv_ChatID Then + ' dgvChats.ClearSelection() + ' r.Selected = True : Exit For + ' End If + ' Next + 'End If + 'loaded = loadedTmp + + End If + dgvChats.SetOrder() + If dgvChats.SelectedRows.Count > 0 Then dgvChats.FirstDisplayedCell = dgvChats.SelectedRows(0).Cells("chat_name") + 'dgvChats.ClearSelection() + 'SplitContainer1.Enabled = False + + 'If dgv_ChatID > 0 Then + ' For Each r As DataGridViewRow In .Rows + ' If r.Cells("chat_id").Value = dgv_ChatID Then + ' dgvChats.ClearSelection() + ' SplitContainer1.Enabled = True + ' r.Selected = True : Exit For + ' End If + ' Next + 'End If + + + End With + ' If Not selFirst Then rtbChatMessage.Focus() + + End Sub + + Private Sub usrCntlMessenger_ListNewChats_Load(sender As Object, e As EventArgs) Handles Me.Load + intiDGVChats() + TimerNEW_MESSAGE.Enabled = True + End Sub + + Private Sub TimerNEW_MESSAGE_Tick(sender As Object, e As EventArgs) Handles TimerNEW_MESSAGE.Tick + intiDGVChats() + End Sub + Private Sub MyDatagridview1_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvChats.CellDoubleClick '.CellContentClick + 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() + Exit Sub + End If + Next + + Dim f As New VERAG_PROG_ALLGEMEIN.frmMessenger() + f.Location = Cursor.Position + f.Show() + End Sub +End Class diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb index e8dae14e..b95b0000 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb @@ -275,7 +275,7 @@ Public Class cRelayHub Case "Ursprungszeugnis", "CoO" : fileType = "origin" Case "Lieferschein" : fileType = "delivery_note" Case "Packliste" : fileType = "packaging_list" - Case "FFFFFFFFFFFFFFFFFF" : fileType = "ftz" + Case "Freihandelszone", "FTZ" : fileType = "ftz" Case Else : fileType = "unknown" '"other" End Select diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index fd4a7706..7145d084 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -411,6 +411,12 @@ Form + + usrCntlMessenger_ListNewChats.vb + + + UserControl + @@ -878,6 +884,9 @@ usrCntlMessenger_ChatElementUmfrage.vb + + usrCntlMessenger_ListNewChats.vb + usrCntlMessenger_Mitteilung.vb