From 01357e4a67b2573f6ebbc44828f7be6a0a64e994 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Sun, 12 Feb 2023 22:01:48 +0100 Subject: [PATCH] div. --- Aviso/Auswertung/usrctlStatVERIMEX.vb | 2 +- Aviso/CHMRC.vb | 2 +- Aviso/frmHauptfenster.Designer.vb | 297 +++++++++++++------------- Aviso/frmHauptfenster.vb | 84 +++++++- 4 files changed, 235 insertions(+), 150 deletions(-) diff --git a/Aviso/Auswertung/usrctlStatVERIMEX.vb b/Aviso/Auswertung/usrctlStatVERIMEX.vb index 155e74f..38800ff 100644 --- a/Aviso/Auswertung/usrctlStatVERIMEX.vb +++ b/Aviso/Auswertung/usrctlStatVERIMEX.vb @@ -53,7 +53,7 @@ Public Class usrctlStatVERIMEX " & whereFiliale & " group by mit_vname,mit_nname" 'früher: Datum statt tblSnd_AbfertigungTR - MsgBox(sqlstr) + ' MsgBox(sqlstr) dgvAbfertigungTR.DataSource = SQL.loadDgvBySql(sqlstr, "AVISO") End With diff --git a/Aviso/CHMRC.vb b/Aviso/CHMRC.vb index a07e8a2..210b5a0 100644 --- a/Aviso/CHMRC.vb +++ b/Aviso/CHMRC.vb @@ -34,8 +34,8 @@ Public Class cHMRC API_STRING = "https://api.service.hmrc.gov.uk" CLIENT_ID = "qO1kqyMtFnvHi9XpRVJBGTCrNpno " CLIENT_SECRET = "3169852a-afa5-4adb-837c-fbd4d0cd4c7e" - End If + End Sub Shared Function SEND_GVMS(GVMS As VERAG_PROG_ALLGEMEIN.cGVMS, Optional updateGMR As String = "") diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 07a0176..a15ea5f 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -217,29 +217,31 @@ Partial Class frmHauptfenster Me.btnHeute = New System.Windows.Forms.Button() Me.btnAlleAnzeigen = New System.Windows.Forms.Button() Me.pnlDetailsRechts = New System.Windows.Forms.Panel() + Me.lblMitarbeiter = New System.Windows.Forms.Label() Me.Label6 = New System.Windows.Forms.Label() Me.txtSuche = New System.Windows.Forms.TextBox() Me.Top = New System.Windows.Forms.Panel() + Me.lblFimaAviso = New System.Windows.Forms.Label() Me.Button11 = New System.Windows.Forms.Button() Me.btnMAVerzeichnis = New System.Windows.Forms.Button() Me.Button9 = New System.Windows.Forms.Button() + Me.Button2 = New System.Windows.Forms.Button() Me.Button5 = New System.Windows.Forms.Button() + Me.lblGrenzstelle = New System.Windows.Forms.Label() + Me.lblVersion = New System.Windows.Forms.Label() Me.btnFakturierung = New System.Windows.Forms.Button() Me.btnDienstplan = New System.Windows.Forms.Button() Me.btnRg = New System.Windows.Forms.Button() Me.btnKassenbuch = New System.Windows.Forms.Button() Me.btnRefresh = New System.Windows.Forms.Button() - Me.btnDrucken = New System.Windows.Forms.Button() + Me.lblDauer = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() - Me.btnAsd = New System.Windows.Forms.Button() Me.btnKunden = New System.Windows.Forms.Button() Me.btnSpedBuch = New System.Windows.Forms.Button() + Me.btnDrucken = New System.Windows.Forms.Button() Me.Button6 = New System.Windows.Forms.Button() Me.Button7 = New System.Windows.Forms.Button() Me.btnZollwebseiten = New System.Windows.Forms.Button() - Me.lblDauer = New System.Windows.Forms.Label() - Me.lblMitarbeiter = New System.Windows.Forms.Label() - Me.lblGrenzstelle = New System.Windows.Forms.Label() Me.lblZeit_aktuell = New System.Windows.Forms.Label() Me.dtpBis = New System.Windows.Forms.DateTimePicker() Me.dtpVon = New System.Windows.Forms.DateTimePicker() @@ -254,14 +256,12 @@ Partial Class frmHauptfenster Me.lblSuche = New System.Windows.Forms.Label() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() Me.pnlLinks = New System.Windows.Forms.Panel() - Me.lblFimaAviso = New System.Windows.Forms.Label() Me.Panel2 = New System.Windows.Forms.Panel() Me.Label7 = New System.Windows.Forms.Label() Me.lblErrVermerk = New System.Windows.Forms.Label() Me.lblHinweis = New System.Windows.Forms.Label() Me.Label20 = New System.Windows.Forms.Label() Me.picAVISOMessenger = New System.Windows.Forms.PictureBox() - Me.lblVersion = New System.Windows.Forms.Label() Me.pic = New System.Windows.Forms.PictureBox() Me.pnlLinksOben = New System.Windows.Forms.Panel() Me.Label22 = New System.Windows.Forms.Label() @@ -270,7 +270,6 @@ Partial Class frmHauptfenster Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer3 = New System.Windows.Forms.SplitContainer() - Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() Me.pnl = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) @@ -353,7 +352,6 @@ Partial Class frmHauptfenster Me.btnKasse_User = New System.Windows.Forms.Button() Me.btnKasse_LG = New System.Windows.Forms.Button() Me.btnTV = New System.Windows.Forms.Button() - Me.Button2 = New System.Windows.Forms.Button() Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BundesanzeigerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -370,9 +368,12 @@ Partial Class frmHauptfenster Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem() + Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() + Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() + Me.pnlDetailsRechts.SuspendLayout() Me.Top.SuspendLayout() CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer2.Panel1.SuspendLayout() @@ -1583,12 +1584,27 @@ Partial Class frmHauptfenster ' Me.pnlDetailsRechts.AutoSize = True Me.pnlDetailsRechts.BackColor = System.Drawing.SystemColors.ButtonFace + Me.pnlDetailsRechts.Controls.Add(Me.lblMitarbeiter) Me.pnlDetailsRechts.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0) Me.pnlDetailsRechts.Name = "pnlDetailsRechts" Me.pnlDetailsRechts.Size = New System.Drawing.Size(550, 599) Me.pnlDetailsRechts.TabIndex = 0 ' + 'lblMitarbeiter + ' + Me.lblMitarbeiter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.lblMitarbeiter.AutoSize = True + Me.lblMitarbeiter.BackColor = System.Drawing.SystemColors.Control + Me.lblMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.lblMitarbeiter.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.lblMitarbeiter.Location = New System.Drawing.Point(366, 15) + Me.lblMitarbeiter.Name = "lblMitarbeiter" + Me.lblMitarbeiter.Size = New System.Drawing.Size(126, 13) + Me.lblMitarbeiter.TabIndex = 1 + Me.lblMitarbeiter.Text = "Max Mustermann (Admin)" + Me.lblMitarbeiter.TextAlign = System.Drawing.ContentAlignment.MiddleRight + ' 'Label6 ' Me.Label6.AutoSize = True @@ -1612,18 +1628,20 @@ Partial Class frmHauptfenster 'Top ' Me.Top.BackColor = System.Drawing.Color.White + Me.Top.Controls.Add(Me.lblFimaAviso) Me.Top.Controls.Add(Me.Button11) Me.Top.Controls.Add(Me.btnMAVerzeichnis) Me.Top.Controls.Add(Me.Button9) + Me.Top.Controls.Add(Me.Button2) Me.Top.Controls.Add(Me.Button5) + Me.Top.Controls.Add(Me.lblGrenzstelle) + Me.Top.Controls.Add(Me.lblVersion) Me.Top.Controls.Add(Me.btnFakturierung) Me.Top.Controls.Add(Me.btnDienstplan) Me.Top.Controls.Add(Me.btnRg) Me.Top.Controls.Add(Me.btnKassenbuch) Me.Top.Controls.Add(Me.btnRefresh) - Me.Top.Controls.Add(Me.btnDrucken) Me.Top.Controls.Add(Me.Button3) - Me.Top.Controls.Add(Me.btnAsd) Me.Top.Controls.Add(Me.btnKunden) Me.Top.Controls.Add(Me.btnSpedBuch) Me.Top.Dock = System.Windows.Forms.DockStyle.Top @@ -1632,6 +1650,18 @@ Partial Class frmHauptfenster Me.Top.Size = New System.Drawing.Size(1372, 52) Me.Top.TabIndex = 6 ' + 'lblFimaAviso + ' + Me.lblFimaAviso.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblFimaAviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblFimaAviso.ForeColor = System.Drawing.Color.Black + Me.lblFimaAviso.Location = New System.Drawing.Point(1308, 20) + Me.lblFimaAviso.Name = "lblFimaAviso" + Me.lblFimaAviso.Size = New System.Drawing.Size(63, 13) + Me.lblFimaAviso.TabIndex = 11 + Me.lblFimaAviso.Text = "XXXXXXXX" + Me.lblFimaAviso.TextAlign = System.Drawing.ContentAlignment.MiddleRight + ' 'Button11 ' Me.Button11.Location = New System.Drawing.Point(687, 26) @@ -1650,7 +1680,7 @@ Partial Class frmHauptfenster Me.btnMAVerzeichnis.ForeColor = System.Drawing.Color.Black Me.btnMAVerzeichnis.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s Me.btnMAVerzeichnis.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnMAVerzeichnis.Location = New System.Drawing.Point(1025, 6) + Me.btnMAVerzeichnis.Location = New System.Drawing.Point(758, 6) Me.btnMAVerzeichnis.Name = "btnMAVerzeichnis" Me.btnMAVerzeichnis.Size = New System.Drawing.Size(107, 39) Me.btnMAVerzeichnis.TabIndex = 13 @@ -1668,7 +1698,7 @@ Partial Class frmHauptfenster Me.Button9.ForeColor = System.Drawing.Color.Black Me.Button9.Image = Global.AVISO.My.Resources.Resources.Telefonliste_small Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button9.Location = New System.Drawing.Point(1138, 6) + Me.Button9.Location = New System.Drawing.Point(869, 6) Me.Button9.Name = "Button9" Me.Button9.Size = New System.Drawing.Size(119, 39) Me.Button9.TabIndex = 12 @@ -1677,6 +1707,23 @@ Partial Class frmHauptfenster Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button9.UseVisualStyleBackColor = True ' + 'Button2 + ' + Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button2.BackColor = System.Drawing.Color.Gray + Me.Button2.FlatAppearance.BorderColor = System.Drawing.Color.White + Me.Button2.FlatAppearance.BorderSize = 0 + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button2.ForeColor = System.Drawing.Color.White + Me.Button2.Location = New System.Drawing.Point(1250, 3) + Me.Button2.Name = "Button2" + Me.Button2.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.Button2.Size = New System.Drawing.Size(45, 20) + Me.Button2.TabIndex = 85 + Me.Button2.Text = "< >" + Me.Button2.UseVisualStyleBackColor = False + ' 'Button5 ' Me.Button5.Cursor = System.Windows.Forms.Cursors.Default @@ -1684,7 +1731,7 @@ Partial Class frmHauptfenster Me.Button5.ForeColor = System.Drawing.Color.Black Me.Button5.Image = Global.AVISO.My.Resources.Resources.parkplatz Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button5.Location = New System.Drawing.Point(732, 6) + Me.Button5.Location = New System.Drawing.Point(609, 6) Me.Button5.Name = "Button5" Me.Button5.Size = New System.Drawing.Size(98, 39) Me.Button5.TabIndex = 8 @@ -1694,6 +1741,31 @@ Partial Class frmHauptfenster Me.Button5.UseVisualStyleBackColor = True Me.Button5.Visible = False ' + 'lblGrenzstelle + ' + Me.lblGrenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblGrenzstelle.BackColor = System.Drawing.Color.White + Me.lblGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.lblGrenzstelle.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.lblGrenzstelle.Location = New System.Drawing.Point(1311, 34) + Me.lblGrenzstelle.Name = "lblGrenzstelle" + Me.lblGrenzstelle.Size = New System.Drawing.Size(60, 13) + Me.lblGrenzstelle.TabIndex = 0 + Me.lblGrenzstelle.Text = "SUB" + Me.lblGrenzstelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight + ' + 'lblVersion + ' + Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblVersion.ForeColor = System.Drawing.Color.Black + Me.lblVersion.Location = New System.Drawing.Point(1303, 6) + Me.lblVersion.Name = "lblVersion" + Me.lblVersion.Size = New System.Drawing.Size(68, 13) + Me.lblVersion.TabIndex = 6 + Me.lblVersion.Text = "V1.0.0.0" + Me.lblVersion.TextAlign = System.Drawing.ContentAlignment.TopRight + ' 'btnFakturierung ' Me.btnFakturierung.Cursor = System.Windows.Forms.Cursors.Default @@ -1719,10 +1791,10 @@ Partial Class frmHauptfenster Me.btnDienstplan.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnDienstplan.ForeColor = System.Drawing.Color.Black Me.btnDienstplan.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnDienstplan.Location = New System.Drawing.Point(1260, 6) + Me.btnDienstplan.Location = New System.Drawing.Point(991, 6) Me.btnDienstplan.Margin = New System.Windows.Forms.Padding(0) Me.btnDienstplan.Name = "btnDienstplan" - Me.btnDienstplan.Size = New System.Drawing.Size(103, 39) + Me.btnDienstplan.Size = New System.Drawing.Size(87, 39) Me.btnDienstplan.TabIndex = 10 Me.btnDienstplan.Text = "Dienstplan" Me.btnDienstplan.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1770,7 +1842,7 @@ Partial Class frmHauptfenster Me.btnRefresh.ForeColor = System.Drawing.Color.Black Me.btnRefresh.Image = Global.AVISO.My.Resources.Resources.refresh Me.btnRefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnRefresh.Location = New System.Drawing.Point(854, 6) + Me.btnRefresh.Location = New System.Drawing.Point(710, 6) Me.btnRefresh.Margin = New System.Windows.Forms.Padding(0) Me.btnRefresh.Name = "btnRefresh" Me.btnRefresh.Size = New System.Drawing.Size(135, 39) @@ -1779,20 +1851,17 @@ Partial Class frmHauptfenster Me.btnRefresh.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnRefresh.UseVisualStyleBackColor = True ' - 'btnDrucken + 'lblDauer ' - Me.btnDrucken.Cursor = System.Windows.Forms.Cursors.Default - Me.btnDrucken.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDrucken.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.btnDrucken.ForeColor = System.Drawing.Color.Black - Me.btnDrucken.Location = New System.Drawing.Point(938, 6) - Me.btnDrucken.Name = "btnDrucken" - Me.btnDrucken.Size = New System.Drawing.Size(79, 39) - Me.btnDrucken.TabIndex = 0 - Me.btnDrucken.Text = "Logbuch" - Me.btnDrucken.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnDrucken.UseVisualStyleBackColor = True - Me.btnDrucken.Visible = False + Me.lblDauer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblDauer.BackColor = System.Drawing.Color.Transparent + Me.lblDauer.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.lblDauer.Location = New System.Drawing.Point(-2, 195) + Me.lblDauer.Name = "lblDauer" + Me.lblDauer.Size = New System.Drawing.Size(155, 17) + Me.lblDauer.TabIndex = 2 + Me.lblDauer.Text = "1111123 ms" + Me.lblDauer.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'Button3 ' @@ -1804,16 +1873,6 @@ Partial Class frmHauptfenster Me.Button3.UseVisualStyleBackColor = True Me.Button3.Visible = False ' - 'btnAsd - ' - Me.btnAsd.Location = New System.Drawing.Point(944, 3) - Me.btnAsd.Name = "btnAsd" - Me.btnAsd.Size = New System.Drawing.Size(75, 23) - Me.btnAsd.TabIndex = 4 - Me.btnAsd.Text = "asd" - Me.btnAsd.UseVisualStyleBackColor = True - Me.btnAsd.Visible = False - ' 'btnKunden ' Me.btnKunden.Cursor = System.Windows.Forms.Cursors.Default @@ -1846,6 +1905,21 @@ Partial Class frmHauptfenster Me.btnSpedBuch.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnSpedBuch.UseVisualStyleBackColor = True ' + 'btnDrucken + ' + Me.btnDrucken.Cursor = System.Windows.Forms.Cursors.Default + Me.btnDrucken.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDrucken.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.btnDrucken.ForeColor = System.Drawing.Color.Black + Me.btnDrucken.Location = New System.Drawing.Point(607, 214) + Me.btnDrucken.Name = "btnDrucken" + Me.btnDrucken.Size = New System.Drawing.Size(79, 39) + Me.btnDrucken.TabIndex = 0 + Me.btnDrucken.Text = "Logbuch" + Me.btnDrucken.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnDrucken.UseVisualStyleBackColor = True + Me.btnDrucken.Visible = False + ' 'Button6 ' Me.Button6.Cursor = System.Windows.Forms.Cursors.Default @@ -1892,46 +1966,6 @@ Partial Class frmHauptfenster Me.btnZollwebseiten.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnZollwebseiten.UseVisualStyleBackColor = True ' - 'lblDauer - ' - Me.lblDauer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblDauer.BackColor = System.Drawing.Color.White - Me.lblDauer.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblDauer.Location = New System.Drawing.Point(984, 5) - Me.lblDauer.Name = "lblDauer" - Me.lblDauer.Size = New System.Drawing.Size(212, 15) - Me.lblDauer.TabIndex = 2 - Me.lblDauer.Text = "Dauer Aufbau Ansicht: 1111123 ms" - Me.lblDauer.TextAlign = System.Drawing.ContentAlignment.MiddleRight - ' - 'lblMitarbeiter - ' - Me.lblMitarbeiter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.lblMitarbeiter.AutoSize = True - Me.lblMitarbeiter.BackColor = System.Drawing.SystemColors.Control - Me.lblMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.lblMitarbeiter.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblMitarbeiter.Location = New System.Drawing.Point(2, 184) - Me.lblMitarbeiter.Name = "lblMitarbeiter" - Me.lblMitarbeiter.Size = New System.Drawing.Size(126, 13) - Me.lblMitarbeiter.TabIndex = 1 - Me.lblMitarbeiter.Text = "Max Mustermann (Admin)" - Me.lblMitarbeiter.TextAlign = System.Drawing.ContentAlignment.MiddleRight - ' - 'lblGrenzstelle - ' - Me.lblGrenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.lblGrenzstelle.AutoSize = True - Me.lblGrenzstelle.BackColor = System.Drawing.SystemColors.Control - Me.lblGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.lblGrenzstelle.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblGrenzstelle.Location = New System.Drawing.Point(143, 199) - Me.lblGrenzstelle.Name = "lblGrenzstelle" - Me.lblGrenzstelle.Size = New System.Drawing.Size(29, 13) - Me.lblGrenzstelle.TabIndex = 0 - Me.lblGrenzstelle.Text = "SUB" - Me.lblGrenzstelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight - ' 'lblZeit_aktuell ' Me.lblZeit_aktuell.AutoSize = True @@ -2041,7 +2075,7 @@ Partial Class frmHauptfenster Me.btnMinimieren.Location = New System.Drawing.Point(1250, -1) Me.btnMinimieren.Name = "btnMinimieren" Me.btnMinimieren.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.btnMinimieren.Size = New System.Drawing.Size(63, 28) + Me.btnMinimieren.Size = New System.Drawing.Size(63, 25) Me.btnMinimieren.TabIndex = 5 Me.btnMinimieren.Text = "_" Me.btnMinimieren.UseVisualStyleBackColor = False @@ -2080,32 +2114,17 @@ Partial Class frmHauptfenster ' 'pnlLinks ' - Me.pnlLinks.Controls.Add(Me.lblFimaAviso) - Me.pnlLinks.Controls.Add(Me.Panel2) Me.pnlLinks.Controls.Add(Me.Label20) Me.pnlLinks.Controls.Add(Me.picAVISOMessenger) - Me.pnlLinks.Controls.Add(Me.lblVersion) Me.pnlLinks.Controls.Add(Me.pic) - Me.pnlLinks.Controls.Add(Me.lblMitarbeiter) - Me.pnlLinks.Controls.Add(Me.lblGrenzstelle) + Me.pnlLinks.Controls.Add(Me.lblDauer) + Me.pnlLinks.Controls.Add(Me.Panel2) Me.pnlLinks.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlLinks.Location = New System.Drawing.Point(0, 86) Me.pnlLinks.Name = "pnlLinks" Me.pnlLinks.Size = New System.Drawing.Size(164, 214) Me.pnlLinks.TabIndex = 0 ' - 'lblFimaAviso - ' - Me.lblFimaAviso.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.lblFimaAviso.AutoSize = True - Me.lblFimaAviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFimaAviso.ForeColor = System.Drawing.Color.Black - Me.lblFimaAviso.Location = New System.Drawing.Point(67, 199) - Me.lblFimaAviso.Name = "lblFimaAviso" - Me.lblFimaAviso.Size = New System.Drawing.Size(63, 13) - Me.lblFimaAviso.TabIndex = 11 - Me.lblFimaAviso.Text = "XXXXXXXX" - ' 'Panel2 ' Me.Panel2.Controls.Add(Me.Label7) @@ -2161,7 +2180,7 @@ Partial Class frmHauptfenster Me.Label20.BackColor = System.Drawing.Color.Red Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label20.ForeColor = System.Drawing.Color.White - Me.Label20.Location = New System.Drawing.Point(49, 160) + Me.Label20.Location = New System.Drawing.Point(49, 167) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(28, 19) Me.Label20.TabIndex = 9 @@ -2175,30 +2194,18 @@ Partial Class frmHauptfenster 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(1, 112) + Me.picAVISOMessenger.Location = New System.Drawing.Point(1, 119) Me.picAVISOMessenger.Name = "picAVISOMessenger" Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55) Me.picAVISOMessenger.TabIndex = 7 Me.picAVISOMessenger.TabStop = False Me.picAVISOMessenger.Visible = False ' - 'lblVersion - ' - Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.lblVersion.AutoSize = True - Me.lblVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblVersion.ForeColor = System.Drawing.Color.Black - Me.lblVersion.Location = New System.Drawing.Point(3, 199) - Me.lblVersion.Name = "lblVersion" - Me.lblVersion.Size = New System.Drawing.Size(47, 13) - Me.lblVersion.TabIndex = 6 - Me.lblVersion.Text = "V1.0.0.0" - ' 'pic ' Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.pic.Location = New System.Drawing.Point(69, 117) + Me.pic.Location = New System.Drawing.Point(69, 124) Me.pic.Name = "pic" Me.pic.Size = New System.Drawing.Size(59, 50) Me.pic.TabIndex = 5 @@ -2292,15 +2299,6 @@ Partial Class frmHauptfenster Me.SplitContainer3.SplitterDistance = 158 Me.SplitContainer3.TabIndex = 3 ' - 'UsrCntlBenachrichtigungen1 - ' - Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1" - Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300) - Me.UsrCntlBenachrichtigungen1.TabIndex = 0 - ' 'pnl ' Me.pnl.Controls.Add(Me.Button10) @@ -2529,7 +2527,7 @@ Partial Class frmHauptfenster Me.btnClose.Location = New System.Drawing.Point(1310, -1) Me.btnClose.Name = "btnClose" Me.btnClose.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.btnClose.Size = New System.Drawing.Size(63, 28) + Me.btnClose.Size = New System.Drawing.Size(63, 25) Me.btnClose.TabIndex = 4 Me.btnClose.Text = "X" Me.btnClose.UseVisualStyleBackColor = False @@ -2742,6 +2740,7 @@ Partial Class frmHauptfenster ' 'splitMain.Panel1 ' + Me.splitMain.Panel1.Controls.Add(Me.btnDrucken) Me.splitMain.Panel1.Controls.Add(Me.Button6) Me.splitMain.Panel1.Controls.Add(Me.Button8) Me.splitMain.Panel1.Controls.Add(Me.btnFertig) @@ -3401,23 +3400,6 @@ Partial Class frmHauptfenster Me.btnTV.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnTV.UseVisualStyleBackColor = False ' - 'Button2 - ' - Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button2.BackColor = System.Drawing.Color.Gray - Me.Button2.FlatAppearance.BorderColor = System.Drawing.Color.White - Me.Button2.FlatAppearance.BorderSize = 0 - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button2.ForeColor = System.Drawing.Color.White - Me.Button2.Location = New System.Drawing.Point(1199, -1) - Me.Button2.Name = "Button2" - Me.Button2.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.Button2.Size = New System.Drawing.Size(45, 25) - Me.Button2.TabIndex = 85 - Me.Button2.Text = "< >" - Me.Button2.UseVisualStyleBackColor = False - ' 'cntxt ' Me.cntxt.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3519,6 +3501,24 @@ Partial Class frmHauptfenster Me.ToolStripMenuItem21.Size = New System.Drawing.Size(121, 22) Me.ToolStripMenuItem21.Text = "GELB" ' + 'btnMitarbeiterKonto + ' + Me.btnMitarbeiterKonto.allowBorder = False + Me.btnMitarbeiterKonto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnMitarbeiterKonto.BackColor = System.Drawing.Color.White + Me.btnMitarbeiterKonto.FlatAppearance.BorderSize = 0 + Me.btnMitarbeiterKonto.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnMitarbeiterKonto.ForeColor = System.Drawing.Color.Black + Me.btnMitarbeiterKonto.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s + Me.btnMitarbeiterKonto.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(1109, 8) + Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto" + Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(137, 61) + Me.btnMitarbeiterKonto.TabIndex = 86 + Me.btnMitarbeiterKonto.Text = "Andreas Luxbauer" + Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False + ' 'UsrCntlTestsystem1 ' Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White @@ -3530,16 +3530,24 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) Me.UsrCntlTestsystem1.TabIndex = 8 ' + 'UsrCntlBenachrichtigungen1 + ' + Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1" + Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300) + Me.UsrCntlBenachrichtigungen1.TabIndex = 0 + ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1372, 677) - Me.Controls.Add(Me.Button2) + Me.Controls.Add(Me.btnMitarbeiterKonto) Me.Controls.Add(Me.pnlOptionen) Me.Controls.Add(Me.Label9) Me.Controls.Add(Me.UsrCntlTestsystem1) - Me.Controls.Add(Me.lblDauer) Me.Controls.Add(Me.SplitContainer1) Me.Controls.Add(Me.Top) Me.Controls.Add(Me.btnMinimieren) @@ -3555,13 +3563,14 @@ Partial Class frmHauptfenster Me.conMenuAviso.ResumeLayout(False) Me.MenuStrip1.ResumeLayout(False) Me.MenuStrip1.PerformLayout() + Me.pnlDetailsRechts.ResumeLayout(False) + Me.pnlDetailsRechts.PerformLayout() Me.Top.ResumeLayout(False) Me.SplitContainer2.Panel1.ResumeLayout(False) Me.SplitContainer2.Panel2.ResumeLayout(False) CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer2.ResumeLayout(False) Me.pnlLinks.ResumeLayout(False) - Me.pnlLinks.PerformLayout() Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).EndInit() @@ -3684,7 +3693,6 @@ Partial Class frmHauptfenster Public WithEvents pnlDetailsRechts As System.Windows.Forms.Panel Public WithEvents pnlDetailsLinks As System.Windows.Forms.Panel Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker - Friend WithEvents btnAsd As System.Windows.Forms.Button Friend WithEvents Button3 As System.Windows.Forms.Button Friend WithEvents timerStandzeit As System.Windows.Forms.Timer Friend WithEvents pnlTime As System.Windows.Forms.Panel @@ -3940,4 +3948,5 @@ Partial Class frmHauptfenster Friend WithEvents conAnIndonesien As ToolStripMenuItem Friend WithEvents AdministrationEssensbestellungenToolStripMenuItem As ToolStripMenuItem Friend WithEvents WarenorteToolStripMenuItem As ToolStripMenuItem + Friend WithEvents btnMitarbeiterKonto As VERAG_PROG_ALLGEMEIN.FlatButton End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 4a35dfc..bd93d9f 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -13,6 +13,7 @@ Imports Newtonsoft.Json Imports System.Reflection Imports System.Runtime.InteropServices Imports GrapeCity.Viewer.Common.Model +Imports System.Drawing.Drawing2D 'Imports UID @@ -194,7 +195,8 @@ Public Class frmHauptfenster ' transparentpnl.BackColor = Color.Transparent - + btnMitarbeiterKonto.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME + setProfileImage() TimerAkte.Enabled = True Grid_aktiv = False @@ -1007,11 +1009,78 @@ Public Class frmHauptfenster End If If chkFarben Then GridZeichnenAviso() Label8.Visible = False - lblDauer.Text = "Dauer Anzeige aufbauen: " & hDifferenz.ToString & " ms" + lblDauer.Text = "" & hDifferenz.ToString & " ms" + 'lblDauer.Text = "Dauer Anzeige aufbauen: " & hDifferenz.ToString & " ms" End Sub + Public Sub setProfileImage() + Try + If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId IsNot Nothing Then + 'Get the original image. + 'Dim originalImage = Image.FromFile("\\share01\Datenarchiv\DOKUMENTE\MITARBEITER\PERSONAL_FOTOS\20200419_000451_Hofer_375.jpg") 'My.Resources.Koerfez61 + 'Dim originalImage = Image.FromFile("\\share01\Datenarchiv\DOKUMENTE\MITARBEITER\PERSONAL_FOTOS\20220620_091930_Luxbauer_4.jpg") 'My.Resources.Koerfez61 + Dim originalImage = Image.FromFile(cDATENSERVER.GET_PDFPath_BY_DocID(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId)) 'My.Resources.Koerfez61 + 'Dim originalImage = Image.FromFile("C:\Users\DEVELOPER1\Desktop\grund.png") 'My.Resources.Koerfez61 + + ' MsgBox(cDATENSERVER.GET_PDFPath_BY_DocID(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId)) + + + Dim picSize = 35 + + Dim space_X As Integer = 0 + Dim space_Y As Integer = 0 + Dim picWidth As Integer = 0 + Dim picHheight As Integer = 0 + + Dim factor As Double = 1 + If originalImage.Height < originalImage.Width Then + factor = picSize / originalImage.Height + picWidth = originalImage.Width * factor + picHheight = originalImage.Height * factor + ' space_X = (picWidth - picHheight) / 2 + + Else + factor = picSize / originalImage.Width + picWidth = originalImage.Width * factor + picHheight = originalImage.Height * factor + ' space_X = (picHheight - picWidth) / 2 + End If + + ' MsgBox(picWidth & " - " & picHheight) + 'Create a new, blank image with the same dimensions. + Dim croppedImage As New Bitmap(picWidth, picHheight) + + 'Prepare to draw on the new image. + Using g = Graphics.FromImage(croppedImage) + Dim path As New GraphicsPath + + 'Create an ellipse that fills the image in both directions. + 'path.AddEllipse(0, 0, croppedImage.Width, croppedImage.Height) + path.AddEllipse(0, 0, picSize, picSize) + + Dim reg As New Region(path) + + 'Draw only within the specified ellipse. + g.Clip = reg + 'g.DrawImage(originalImage, 0, 0, picSize, picSize) + g.DrawImage(originalImage, 0, 0, picWidth, picHheight) + End Using + + 'Display the new image. + btnMitarbeiterKonto.Image = croppedImage + + Exit Sub + End If + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + + End Try + btnMitarbeiterKonto.Image = My.Resources.mitarbeiter_s + + End Sub + Function setAkive_AuswahlID() As Integer If gridAviso.SelectedRows.Count > 0 Then VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = CInt(gridAviso.Rows(gridAviso.SelectedRows(0).Index).Cells("AvisoID").Value) @@ -2843,7 +2912,7 @@ Public Class frmHauptfenster End Sub - Private Sub btnAsd_Click(sender As Object, e As EventArgs) Handles btnAsd.Click + Private Sub btnAsd_Click(sender As Object, e As EventArgs) newNotify(frmNotify.cNotify_ART.AVISO_2H, 1, gridMyAviso.Rows(0).Cells("LKW_Nr").Value, gridMyAviso.Rows(0).Cells("AvisoId").Value) End Sub @@ -4087,7 +4156,7 @@ Public Class frmHauptfenster End Sub Private Sub Button11_Click_1(sender As Object, e As EventArgs) Handles Button11.Click - cHMRC.VATTEST(InputBox("Token")) + setProfileImage() 'cHMRC.VATTEST(InputBox("Token")) End Sub Private Sub GVMSUKIMportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GVMSUKIMportToolStripMenuItem.Click @@ -4345,6 +4414,13 @@ Public Class frmHauptfenster Dim f As New frmWarenorte() f.ShowDialog(Me) End Sub + + Private Sub FlatButton1_Click(sender As Object, e As EventArgs) Handles btnMitarbeiterKonto.Click + Me.Cursor = Cursors.WaitCursor + Dim f As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID) + f.Show() + Me.Cursor = Cursors.Default + End Sub End Class Public Class AvisoStatusFunctions