From 8d8bbc644e9183c2c52a5c31618a27091b43f493 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 11 Feb 2026 16:10:41 +0100 Subject: [PATCH] Aviso, etc. --- .../frmEintragAviso.designer.vb | 43 ++-- Aviso/AktenErfassung/frmEintragAviso.vb | 37 +++- Aviso/frmAddSendungsvermerkShort.Designer.vb | 24 +- Aviso/frmHauptfenster.Designer.vb | 205 ++++++++---------- Aviso/frmHauptfenster.resx | 3 - Aviso/usrcntlAktDetails.vb | 2 +- 6 files changed, 164 insertions(+), 150 deletions(-) diff --git a/Aviso/AktenErfassung/frmEintragAviso.designer.vb b/Aviso/AktenErfassung/frmEintragAviso.designer.vb index ac4bb51..24622ed 100644 --- a/Aviso/AktenErfassung/frmEintragAviso.designer.vb +++ b/Aviso/AktenErfassung/frmEintragAviso.designer.vb @@ -152,9 +152,10 @@ Partial Class frmEintragAviso Me.clmnPfad = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label2 = New System.Windows.Forms.Label() + Me.lblErrErfasstDat = New System.Windows.Forms.Label() + Me.lblAnhaenge = New System.Windows.Forms.Label() Me.UsrCntlAviso_Vorpapiere1 = New AVISO.usrCntlAviso_Vorpapiere() Me.UsrCntlEintragAvisoAtilla = New AVISO.usrCntlEintragAvisoAtilla() - Me.lblErrErfasstDat = New System.Windows.Forms.Label() Me.panAdmin.SuspendLayout() Me.grpAviso.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1826,6 +1827,28 @@ Partial Class frmEintragAviso Me.Label2.TabIndex = 5 Me.Label2.Text = "FIRMA:" ' + 'lblErrErfasstDat + ' + Me.lblErrErfasstDat.AutoSize = True + Me.lblErrErfasstDat.ForeColor = System.Drawing.Color.Red + Me.lblErrErfasstDat.Location = New System.Drawing.Point(139, 5) + Me.lblErrErfasstDat.Name = "lblErrErfasstDat" + Me.lblErrErfasstDat.Size = New System.Drawing.Size(85, 26) + Me.lblErrErfasstDat.TabIndex = 52 + Me.lblErrErfasstDat.Text = "Darf nicht in der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zukunft liegen!" + Me.lblErrErfasstDat.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.lblErrErfasstDat.Visible = False + ' + 'lblAnhaenge + ' + Me.lblAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.lblAnhaenge.AutoSize = True + Me.lblAnhaenge.Location = New System.Drawing.Point(699, 641) + Me.lblAnhaenge.Name = "lblAnhaenge" + Me.lblAnhaenge.Size = New System.Drawing.Size(56, 13) + Me.lblAnhaenge.TabIndex = 56 + Me.lblAnhaenge.Text = "Anhänge: " + ' 'UsrCntlAviso_Vorpapiere1 ' Me.UsrCntlAviso_Vorpapiere1.BackColor = System.Drawing.Color.White @@ -1843,18 +1866,6 @@ Partial Class frmEintragAviso Me.UsrCntlEintragAvisoAtilla.TabIndex = 8 Me.UsrCntlEintragAvisoAtilla.Visible = False ' - 'lblErrErfasstDat - ' - Me.lblErrErfasstDat.AutoSize = True - Me.lblErrErfasstDat.ForeColor = System.Drawing.Color.Red - Me.lblErrErfasstDat.Location = New System.Drawing.Point(139, 5) - Me.lblErrErfasstDat.Name = "lblErrErfasstDat" - Me.lblErrErfasstDat.Size = New System.Drawing.Size(85, 26) - Me.lblErrErfasstDat.TabIndex = 52 - Me.lblErrErfasstDat.Text = "Darf nicht in der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zukunft liegen!" - Me.lblErrErfasstDat.TextAlign = System.Drawing.ContentAlignment.TopRight - Me.lblErrErfasstDat.Visible = False - ' 'frmEintragAviso ' Me.AcceptButton = Me.btnOK @@ -1862,6 +1873,7 @@ Partial Class frmEintragAviso Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.ClientSize = New System.Drawing.Size(792, 765) + Me.Controls.Add(Me.lblAnhaenge) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.cboFirma) Me.Controls.Add(Me.UsrCntlAviso_Vorpapiere1) @@ -1925,12 +1937,10 @@ Partial Class frmEintragAviso Friend WithEvents btnOK As System.Windows.Forms.Button Friend WithEvents lblErfAm As System.Windows.Forms.Label Friend WithEvents btnAbbruch As System.Windows.Forms.Button - Friend WithEvents txtInfo As System.Windows.Forms.TextBox Friend WithEvents Label3 As System.Windows.Forms.Label Friend WithEvents lblFraecher As System.Windows.Forms.Label Friend WithEvents lblAvisierer As System.Windows.Forms.Label Friend WithEvents lblLkwKennzeichen As System.Windows.Forms.Label - Friend WithEvents txtÄnderungen As System.Windows.Forms.TextBox Friend WithEvents lblAenderungen As System.Windows.Forms.Label Friend WithEvents txtLKW_Nr As System.Windows.Forms.TextBox Friend WithEvents txtDatum As System.Windows.Forms.TextBox @@ -2054,4 +2064,7 @@ Partial Class frmEintragAviso Friend WithEvents lblTeamAvisierer As Label Friend WithEvents cbxEintreffenAus As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents lblErrErfasstDat As Label + Public WithEvents lblAnhaenge As Label + Public WithEvents txtInfo As TextBox + Public WithEvents txtÄnderungen As TextBox End Class diff --git a/Aviso/AktenErfassung/frmEintragAviso.vb b/Aviso/AktenErfassung/frmEintragAviso.vb index 35bbc2f..91e7753 100644 --- a/Aviso/AktenErfassung/frmEintragAviso.vb +++ b/Aviso/AktenErfassung/frmEintragAviso.vb @@ -32,6 +32,8 @@ Public Class frmEintragAviso Dim PROG As New cProgramFunctions Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim INFO As String = "" + Public FIRMA_TMP As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA @@ -40,6 +42,14 @@ Public Class frmEintragAviso Icon = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.GetProgrammIcon End Sub + + Public Sub New(INFO As String) + InitializeComponent() + Icon = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.GetProgrammIcon + + Me.INFO = INFO + End Sub + Private Sub frmEintragAviso_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing If FIRMA_TMP = "ATILLA" And myAviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft Then If myAviso.Frächter = "" Then @@ -325,6 +335,9 @@ Public Class frmEintragAviso dtpAvisoEingangDatum.Value = Now.Date dtpAvisoEingangZeit.Value = LeerDatum txtÄnderungen.Text = "Neuanlage von " & cGlobal.AktiverMitarbeiter.Mitarbeiter + If INFO <> "" Then txtÄnderungen.Text &= vbNewLine & vbNewLine & INFO + + lblStatus.Text = "Neuanlage" optAvisoEingang.Checked = True kdAvisierer.Text = "" @@ -666,18 +679,18 @@ Public Class frmEintragAviso 'If Neuanlage Then ' If optAvisoEingang.Checked Then ' If optAvisoEingang.Checked Thensend - ' If dtpAvisoEingangDatum.Value < Now.Date Then + ' If dtpAvisoEingangDatum.Value "" Then + AvisoStatusFunctions.insertVermerkAllg(tmpId, INFO, 123) + End If + If myAviso.Warenort Then AvisoStatusFunctions.insertVermerkAllg(tmpId, "ATB-Nr. folgt", 80) End If diff --git a/Aviso/frmAddSendungsvermerkShort.Designer.vb b/Aviso/frmAddSendungsvermerkShort.Designer.vb index d0b786b..aa3655d 100644 --- a/Aviso/frmAddSendungsvermerkShort.Designer.vb +++ b/Aviso/frmAddSendungsvermerkShort.Designer.vb @@ -27,6 +27,7 @@ Partial Class frmAddSendungsvermerkShort Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.pnlMain = New System.Windows.Forms.Panel() Me.pnlSendungsVermker = New System.Windows.Forms.Panel() + Me.optDraft = New System.Windows.Forms.CheckBox() Me.optGewPackAngefordert = New System.Windows.Forms.CheckBox() Me.optKostenbestaetigungAngefordert = New System.Windows.Forms.CheckBox() Me.optZolltarifnummerAngefordert = New System.Windows.Forms.CheckBox() @@ -76,7 +77,6 @@ Partial Class frmAddSendungsvermerkShort Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.PictureBox4 = New System.Windows.Forms.PictureBox() Me.Panel4 = New System.Windows.Forms.Panel() - Me.optDraft = New System.Windows.Forms.CheckBox() Me.pnlMain.SuspendLayout() Me.pnlSendungsVermker.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -157,6 +157,16 @@ Partial Class frmAddSendungsvermerkShort Me.pnlSendungsVermker.Size = New System.Drawing.Size(454, 605) Me.pnlSendungsVermker.TabIndex = 0 ' + 'optDraft + ' + Me.optDraft.AutoSize = True + Me.optDraft.Location = New System.Drawing.Point(12, 262) + Me.optDraft.Name = "optDraft" + Me.optDraft.Size = New System.Drawing.Size(174, 17) + Me.optDraft.TabIndex = 102 + Me.optDraft.Text = "T1/T2 ""Draft"" OK - angefordert" + Me.optDraft.UseVisualStyleBackColor = True + ' 'optGewPackAngefordert ' Me.optGewPackAngefordert.AutoSize = True @@ -688,16 +698,6 @@ Partial Class frmAddSendungsvermerkShort Me.Panel4.Size = New System.Drawing.Size(454, 0) Me.Panel4.TabIndex = 1 ' - 'optDraft - ' - Me.optDraft.AutoSize = True - Me.optDraft.Location = New System.Drawing.Point(12, 262) - Me.optDraft.Name = "optDraft" - Me.optDraft.Size = New System.Drawing.Size(174, 17) - Me.optDraft.TabIndex = 102 - Me.optDraft.Text = "T1/T2 ""Draft"" OK - angefordert" - Me.optDraft.UseVisualStyleBackColor = True - ' 'frmAddSendungsvermerkShort ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -731,7 +731,6 @@ Partial Class frmAddSendungsvermerkShort Friend WithEvents optKontaktdatenAngefordert As System.Windows.Forms.CheckBox Friend WithEvents Label3 As System.Windows.Forms.Label Friend WithEvents lblErr240Zeichen As System.Windows.Forms.Label - Friend WithEvents txtDetail As System.Windows.Forms.TextBox Friend WithEvents lblZustzlFreitext As System.Windows.Forms.Label Friend WithEvents txtSendungSpedition As System.Windows.Forms.TextBox Friend WithEvents cbxNichtLeserlich As System.Windows.Forms.CheckBox @@ -772,4 +771,5 @@ Partial Class frmAddSendungsvermerkShort Friend WithEvents optKostenbestaetigungAngefordert As CheckBox Friend WithEvents optZolltarifnummerAngefordert As CheckBox Friend WithEvents optDraft As CheckBox + Public WithEvents txtDetail As TextBox End Class diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index cbdc460..0183d04 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -24,15 +24,15 @@ Partial Class frmHauptfenster Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster)) - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + 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 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() Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem() Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -248,13 +248,13 @@ Partial Class frmHauptfenster Me.Label6 = New System.Windows.Forms.Label() Me.txtSuche = New System.Windows.Forms.TextBox() Me.Top = New System.Windows.Forms.Panel() + Me.btnRefresh = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.lblUsrname = New System.Windows.Forms.Label() Me.lblFimaAviso = New System.Windows.Forms.Label() Me.Button11 = New System.Windows.Forms.Button() Me.btnMAVerzeichnis = New System.Windows.Forms.Button() Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.Label9 = New System.Windows.Forms.Label() Me.btnKontakt = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() @@ -265,10 +265,10 @@ Partial Class frmHauptfenster 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.Button3 = New System.Windows.Forms.Button() Me.btnKunden = New System.Windows.Forms.Button() Me.btnSpedBuch = New System.Windows.Forms.Button() + Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.lblDauer = New System.Windows.Forms.Label() Me.btnDrucken = New System.Windows.Forms.Button() Me.Button6 = New System.Windows.Forms.Button() @@ -420,7 +420,6 @@ Partial Class frmHauptfenster Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen() Me.Panel5 = New System.Windows.Forms.Panel() Me.Panel7 = New System.Windows.Forms.Panel() - Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -1863,7 +1862,6 @@ Partial Class frmHauptfenster Me.Top.Controls.Add(Me.Button11) Me.Top.Controls.Add(Me.btnMAVerzeichnis) Me.Top.Controls.Add(Me.btnMitarbeiterKonto) - Me.Top.Controls.Add(Me.Label9) Me.Top.Controls.Add(Me.btnKontakt) Me.Top.Controls.Add(Me.Button2) Me.Top.Controls.Add(Me.Button5) @@ -1883,6 +1881,23 @@ Partial Class frmHauptfenster Me.Top.Size = New System.Drawing.Size(1302, 63) Me.Top.TabIndex = 6 ' + 'btnRefresh + ' + Me.btnRefresh.Cursor = System.Windows.Forms.Cursors.Default + Me.btnRefresh.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnRefresh.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + 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(710, 6) + Me.btnRefresh.Margin = New System.Windows.Forms.Padding(0) + Me.btnRefresh.Name = "btnRefresh" + Me.btnRefresh.Size = New System.Drawing.Size(135, 39) + Me.btnRefresh.TabIndex = 1 + Me.btnRefresh.Text = "Aktualisieren" + Me.btnRefresh.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnRefresh.UseVisualStyleBackColor = True + ' 'Button1 ' Me.Button1.Location = New System.Drawing.Point(1028, 7) @@ -1964,17 +1979,6 @@ Partial Class frmHauptfenster Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False ' - 'UsrCntlTestsystem1 - ' - Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White - Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red - Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(633, 9) - Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) - Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1" - Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) - Me.UsrCntlTestsystem1.TabIndex = 8 - ' 'Label9 ' Me.Label9.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ @@ -1983,7 +1987,7 @@ Partial Class frmHauptfenster Me.Label9.BackColor = System.Drawing.Color.White Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) Me.Label9.ForeColor = System.Drawing.Color.Red - Me.Label9.Location = New System.Drawing.Point(905, 19) + Me.Label9.Location = New System.Drawing.Point(694, 2) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(438, 15) Me.Label9.TabIndex = 9 @@ -2135,23 +2139,6 @@ Partial Class frmHauptfenster Me.btnKassenbuch.UseVisualStyleBackColor = True Me.btnKassenbuch.Visible = False ' - 'btnRefresh - ' - Me.btnRefresh.Cursor = System.Windows.Forms.Cursors.Default - Me.btnRefresh.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnRefresh.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - 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(710, 6) - Me.btnRefresh.Margin = New System.Windows.Forms.Padding(0) - Me.btnRefresh.Name = "btnRefresh" - Me.btnRefresh.Size = New System.Drawing.Size(135, 39) - Me.btnRefresh.TabIndex = 1 - Me.btnRefresh.Text = "Aktualisieren" - Me.btnRefresh.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnRefresh.UseVisualStyleBackColor = True - ' 'Button3 ' Me.Button3.Location = New System.Drawing.Point(642, 14) @@ -2194,6 +2181,17 @@ Partial Class frmHauptfenster Me.btnSpedBuch.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnSpedBuch.UseVisualStyleBackColor = True ' + 'UsrCntlTestsystem1 + ' + Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White + Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red + Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(632, -1) + Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) + Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1" + Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) + Me.UsrCntlTestsystem1.TabIndex = 8 + ' 'lblDauer ' Me.lblDauer.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -2693,38 +2691,38 @@ Partial Class frmHauptfenster Me.gridMyAviso.AllowUserToDeleteRows = False Me.gridMyAviso.AllowUserToOrderColumns = True Me.gridMyAviso.AllowUserToResizeRows = False - DataGridViewCellStyle19.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + 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.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, 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.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3 Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridMyAviso.Location = New System.Drawing.Point(0, 21) Me.gridMyAviso.Name = "gridMyAviso" Me.gridMyAviso.ReadOnly = True - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, 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.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 Me.gridMyAviso.Size = New System.Drawing.Size(328, 279) @@ -3137,47 +3135,47 @@ Partial Class frmHauptfenster Me.gridAviso.AllowUserToAddRows = False Me.gridAviso.AllowUserToDeleteRows = False Me.gridAviso.AllowUserToResizeRows = False - DataGridViewCellStyle23.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle24.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 Me.gridAviso.ColumnHeadersHeight = 25 Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7 Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridAviso.Location = New System.Drawing.Point(0, 248) Me.gridAviso.MultiSelect = False Me.gridAviso.Name = "gridAviso" Me.gridAviso.ReadOnly = True - DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.gridAviso.RowHeadersVisible = False Me.gridAviso.RowHeadersWidth = 62 Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle27 + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9 Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -3951,6 +3949,7 @@ Partial Class frmHauptfenster ' 'Panel3 ' + Me.Panel3.Controls.Add(Me.Label9) Me.Panel3.Controls.Add(Me.MenuStrip1) Me.Panel3.Controls.Add(Me.Panel4) Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top @@ -4027,17 +4026,6 @@ Partial Class frmHauptfenster Me.Panel7.Size = New System.Drawing.Size(252, 51) Me.Panel7.TabIndex = 4 ' - 'UsrCntlTestsystem1 - ' - Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White - Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red - Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(632, -1) - Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) - Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1" - Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) - Me.UsrCntlTestsystem1.TabIndex = 8 - ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -4061,7 +4049,6 @@ Partial Class frmHauptfenster Me.pnlDetailsRechts.ResumeLayout(False) Me.pnlDetailsRechts.PerformLayout() Me.Top.ResumeLayout(False) - Me.Top.PerformLayout() Me.SplitContainer2.Panel1.ResumeLayout(False) Me.SplitContainer2.Panel2.ResumeLayout(False) CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index d87c31f..1ab7db9 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -257,9 +257,6 @@ sDvNfNUAAAAASUVORK5CYII= - - 560, 17 - 659, 17 diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 99a72bd..aa67d30 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -921,7 +921,7 @@ Public Class usrcntlAktDetails End Sub Public Shared vermerkehSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," & - " CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,14,25,28,29,30,35,46,47,59,94,78,101,102) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben, Datum as DatumValue" & + " CASE WHEN VermerkeCode IS NULL OR VermerkBezeichnungFixAnzeigen = 1 THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben, Datum as DatumValue" & " FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " & " LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " & " WHERE AvisoID = [[AvisoId]] [[sendwhere]] AND HintergrundVermerk =0 " &