diff --git a/Aviso.sln b/Aviso.sln index 7bacedc..9235345 100644 --- a/Aviso.sln +++ b/Aviso.sln @@ -63,8 +63,8 @@ Global {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.ActiveCfg = Release|x86 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.Build.0 = Release|x86 {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Any CPU.ActiveCfg = Debug|x64 - {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Mixed Platforms.Build.0 = Debug|x64 {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|x64.ActiveCfg = Debug|x64 {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|x86.ActiveCfg = Debug|x86 {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|x86.Build.0 = Debug|x86 diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index e8ef1f9..9cfd475 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 4dd0144..6f882e3 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -1581,10 +1581,84 @@ Public Class usrcntlAktDetails End Sub + Private Sub dgvSendungen_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvSendungen.CellMouseClick + If e.Button = MouseButtons.Right Then + If dgvSendungen.Columns.Count > 0 Then + If dgvSendungen.Columns(e.ColumnIndex).Name = "SenungUebernehmen" Then + Exit Sub + + 'Dim LIST_FIRMEN() As String = {"VERAG", "UNISPED", "IMEX", "FRONTOFFICE"} + + 'Dim C As New ContextMenuStrip + + 'For Each FirmaTMP In LIST_FIRMEN + + ' Dim item_Firma As New ToolStripMenuItem + ' item_Firma.Text = FirmaTMP + + ' Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + ' Dim dt = sql.loadDgvBySql("SELECT TOP (1000) [mit_id],[mit_nname] + ' ' + [mit_vname] + ' (' + mit_niederlassung + ')' as MAname FROM [ADMIN].[dbo].[tblMitarbeiter] + ' where mit_firma IN ('" & FirmaTMP & "','BEIDE','ALLE','ALL') and mit_gekuendigt=0 + ' and mit_abteilung IN ('QS','ZOLL','DISPO') and [mit_TESTonly]=0 AND [mit_pseudoUser]=0 + ' order by mit_nname,mit_vname ", "AVISO") + + ' For Each r In dt.Rows + ' Dim item As New ToolStripMenuItem + ' item.Tag = r("mit_id") + ' item.Text = r("MAname") + ' AddHandler item.Click, Sub() + ' FUNC.SendungUebernehmen(dgvSendungen.Rows(e.RowIndex).Cells("tblSnd_SendungID").Value, AvisoID, item.Tag, True) + ' reload(AvisoID) + ' End Sub + ' item_Firma.DropDownItems.Add(item) + ' Next + ' C.Items.Add(item_Firma) + 'Next + 'C.Show(System.Cursor.Position) + Else - Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles gridVermerke.CellMouseClick, dgvSendungen.CellMouseClick + If AVISO.Abgeschlossen Then Exit Sub + + loaded = False + ' If dgvSendungen.SelectedRows.Count <= 0 Then Exit Sub + + ' dgvSendungen.ClearSelection() + dgvSendungen.Rows(e.RowIndex).Selected = True + VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value + + ' frmGrayOut.Opacity = 0.5 + ' frmGrayOut.WindowState = FormWindowState.Maximized + Dim tmpIndex = dgvSendungen.SelectedRows(0).Index + Dim tmpscroll = dgvSendungen.FirstDisplayedScrollingRowIndex + + Dim frmGrayOut = grayoutForm() + Dim sv As New frmAddSendungsvermerkShort(AvisoID, dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value) + sv.Location = Me.PointToClient(Cursor.Position) + sv.ShowDialog(frmGrayOut) + frmGrayOut.Close() + If tbcntlVermerke.SelectedIndex <> 2 Then tbcntlVermerke.SelectedIndex = 2 + + + initDgvSendungen() ' wg. Anzahl Vermerke + sv.Close() + + + If dgvSendungen.RowCount > tmpIndex Then + 'dgvSendungen.ClearSelection() + 'dgvSendungen.Rows(tmpIndex).Selected = True + dgvSendungen.FirstDisplayedScrollingRowIndex = tmpscroll + End If + loaded = True + Vermerke_anzeigen() + + End If + End If + End If + End Sub + + Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles gridVermerke.CellMouseClick If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt 'If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt 'gridMyAviso.ClearSelection() 'WARUM? @@ -2231,9 +2305,7 @@ Public Class usrcntlAktDetails End Sub - Private Sub dgvSendungen_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) - End Sub Private Sub lblHinweis_Click(sender As Object, e As EventArgs)