This commit is contained in:
2020-06-04 22:19:07 +02:00
parent bf4f36a8f2
commit 8f6eaaaba8
37 changed files with 515 additions and 318 deletions

View File

@@ -124,7 +124,7 @@ Public Class frmHauptfenster
Private Sub frmMain_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
'MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
Me.AutoScaleMode = Windows.Forms.AutoScaleMode.Dpi
Me.AutoScaleMode = AutoScaleMode.Dpi
hideErr.Interval = 3000
'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
@@ -775,7 +775,7 @@ Public Class frmHauptfenster
End If
hSQL += " ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC"
MsgBox(hSQL)
'If hSort = "" Then
'hSQL += " ORDER BY Ankunft DESC, AvisoEingang DESC, Datum DESC"
' Else
@@ -2077,12 +2077,12 @@ Public Class frmHauptfenster
End If
If e.Button = Windows.Forms.MouseButtons.Right Then
If e.Button = MouseButtons.Right Then
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
If sender Is gridAviso Then
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
sender.CurrentCell = sender.Rows(e.RowIndex).Cells(e.ColumnIndex)
conMenuAviso.Show(Windows.Forms.Cursor.Position)
conMenuAviso.Show(Cursor.Position)
End If
Else
setAkive_AuswahlID()
@@ -2098,13 +2098,13 @@ Public Class frmHauptfenster
Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
Dim sv As New frmAddAktenvermerkShort(tmpId)
sv.Location = Me.PointToClient(System.Windows.Forms.Cursor.Position)
sv.Location = Me.PointToClient(Cursor.Position)
' sv.ShowDialog()
sv.ShowDialog(frmGrayOut)
frmGrayOut.Close()
End If
ElseIf e.Button = Windows.Forms.MouseButtons.Left Then
ElseIf e.Button = MouseButtons.Left Then
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
avisoAktualisierenAktiveIdBehalten(tmpId, , False)
End If
@@ -3027,7 +3027,7 @@ Public Class frmHauptfenster
Private Sub NeuesPasswortToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeuesPasswortToolStripMenuItem.Click
Dim f As New frmChangePWD(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER)
If f.ShowDialog() = Windows.Forms.DialogResult.OK Then
If f.ShowDialog() = DialogResult.OK Then
MsgBox("Passwort geändert!", vbInformation)
'Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch()
'frmSecureLoginKassenbuch.openKB = True