From ff44d7e5123d60b530d785346abd8ef1a75d5af2 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 2 Oct 2025 09:12:45 +0200 Subject: [PATCH] Import Assistent --- .../frmSendungAnhangImport.Designer.vb | 345 +++++++++--------- Aviso/Anhänge/frmSendungAnhangImport.vb | 99 ++++- Aviso/Anhänge/usrCntlSendungAnhangElement.vb | 14 +- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/usrcntlAktDetails.Designer.vb | 203 ++++++----- Aviso/usrcntlAktDetails.vb | 35 ++ 6 files changed, 429 insertions(+), 271 deletions(-) diff --git a/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb b/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb index 78a3bc0..02d5cf1 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb @@ -26,26 +26,19 @@ Partial Class frmSendungAnhangImport Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungAnhangImport)) Me.lbl = New System.Windows.Forms.Label() Me.flpnlAviso = New System.Windows.Forms.FlowLayoutPanel() - Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement() - Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement() Me.flpnlSendungen = New System.Windows.Forms.FlowLayoutPanel() Me.lblSendungen = New System.Windows.Forms.Label() Me.lblImport = New System.Windows.Forms.Label() Me.pnlAnfuegen = New System.Windows.Forms.Panel() Me.cbxAlternativePDFAnsicht = New System.Windows.Forms.CheckBox() Me.Button1 = New System.Windows.Forms.Button() - Me.txtBezeichnung = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblBezeichnung = New System.Windows.Forms.Label() Me.btnSeitenLoeschen = New System.Windows.Forms.Button() Me.btnAnfuegenAll = New System.Windows.Forms.Button() - Me.txtDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblDatei = New System.Windows.Forms.Label() - Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblSendung = New System.Windows.Forms.Label() Me.lblArt = New System.Windows.Forms.Label() - Me.cboArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.btnAnfuegen = New System.Windows.Forms.Button() - Me.txtSeiten = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblSeiten = New System.Windows.Forms.Label() Me.cbxDelPDF = New System.Windows.Forms.CheckBox() Me.btnAdd = New System.Windows.Forms.Button() @@ -62,7 +55,6 @@ Partial Class frmSendungAnhangImport Me.btnSndDel = New System.Windows.Forms.Button() Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument() Me.btnAddSnd = New System.Windows.Forms.Button() - Me.cboSendungen = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblSendungsdetails = New System.Windows.Forms.Label() Me.lblWarenbeichnung = New System.Windows.Forms.Label() Me.btnSndEdit = New System.Windows.Forms.Button() @@ -72,6 +64,15 @@ Partial Class frmSendungAnhangImport Me.Button17 = New System.Windows.Forms.Button() Me.lblRgPreis = New System.Windows.Forms.Label() Me.pnlSendung = New System.Windows.Forms.Panel() + Me.txtBezeichnung = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cboArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtSeiten = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cboSendungen = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement() + Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement() + Me.Button2 = New System.Windows.Forms.Button() Me.flpnlAviso.SuspendLayout() Me.pnlAnfuegen.SuspendLayout() Me.cntxt.SuspendLayout() @@ -103,38 +104,6 @@ Partial Class frmSendungAnhangImport Me.flpnlAviso.Size = New System.Drawing.Size(253, 825) Me.flpnlAviso.TabIndex = 7 ' - 'UsrCntlSendungAnhangElement1 - ' - Me.UsrCntlSendungAnhangElement1.ACTIVE = False - Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White - Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing - Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing - Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False" - Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing - Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing - Me.UsrCntlSendungAnhangElement1.FILE_SIZE = "False" - Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing - Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1" - Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64) - Me.UsrCntlSendungAnhangElement1.TabIndex = 0 - ' - 'UsrCntlSendungAnhangElement2 - ' - Me.UsrCntlSendungAnhangElement2.ACTIVE = False - Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White - Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing - Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing - Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False" - Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing - Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing - Me.UsrCntlSendungAnhangElement2.FILE_SIZE = "False" - Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing - Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73) - Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2" - Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64) - Me.UsrCntlSendungAnhangElement2.TabIndex = 1 - ' 'flpnlSendungen ' Me.flpnlSendungen.AllowDrop = True @@ -216,31 +185,6 @@ Partial Class frmSendungAnhangImport Me.Button1.UseVisualStyleBackColor = False Me.Button1.Visible = False ' - 'txtBezeichnung - ' - Me.txtBezeichnung._DateTimeOnly = False - Me.txtBezeichnung._numbersOnly = False - Me.txtBezeichnung._numbersOnlyKommastellen = "" - Me.txtBezeichnung._numbersOnlyTrennzeichen = True - Me.txtBezeichnung._Prozent = False - Me.txtBezeichnung._ShortDateNew = False - Me.txtBezeichnung._ShortDateOnly = False - Me.txtBezeichnung._TimeOnly = False - Me.txtBezeichnung._TimeOnly_Seconds = False - Me.txtBezeichnung._value = "" - Me.txtBezeichnung._Waehrung = False - Me.txtBezeichnung._WaehrungZeichen = True - Me.txtBezeichnung.BackColor = System.Drawing.Color.White - Me.txtBezeichnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtBezeichnung.ForeColor = System.Drawing.Color.Black - Me.txtBezeichnung.Location = New System.Drawing.Point(68, 105) - Me.txtBezeichnung.MaxLineLength = -1 - Me.txtBezeichnung.MaxLines_Warning = "" - Me.txtBezeichnung.MaxLines_Warning_Label = Nothing - Me.txtBezeichnung.Name = "txtBezeichnung" - Me.txtBezeichnung.Size = New System.Drawing.Size(453, 26) - Me.txtBezeichnung.TabIndex = 7 - ' 'lblBezeichnung ' Me.lblBezeichnung.AutoSize = True @@ -272,30 +216,6 @@ Partial Class frmSendungAnhangImport Me.btnAnfuegenAll.Text = ">> Ganzes Dokument anfügen >>" Me.btnAnfuegenAll.UseVisualStyleBackColor = False ' - 'txtDateiname - ' - Me.txtDateiname._DateTimeOnly = False - Me.txtDateiname._numbersOnly = False - Me.txtDateiname._numbersOnlyKommastellen = "" - Me.txtDateiname._numbersOnlyTrennzeichen = True - Me.txtDateiname._Prozent = False - Me.txtDateiname._ShortDateNew = False - Me.txtDateiname._ShortDateOnly = False - Me.txtDateiname._TimeOnly = False - Me.txtDateiname._TimeOnly_Seconds = False - Me.txtDateiname._value = "" - Me.txtDateiname._Waehrung = False - Me.txtDateiname._WaehrungZeichen = True - Me.txtDateiname.ForeColor = System.Drawing.Color.Black - Me.txtDateiname.Location = New System.Drawing.Point(68, 11) - Me.txtDateiname.MaxLineLength = -1 - Me.txtDateiname.MaxLines_Warning = "" - Me.txtDateiname.MaxLines_Warning_Label = Nothing - Me.txtDateiname.Name = "txtDateiname" - Me.txtDateiname.ReadOnly = True - Me.txtDateiname.Size = New System.Drawing.Size(732, 20) - Me.txtDateiname.TabIndex = 1 - ' 'lblDatei ' Me.lblDatei.AutoSize = True @@ -305,30 +225,6 @@ Partial Class frmSendungAnhangImport Me.lblDatei.TabIndex = 0 Me.lblDatei.Text = "Datei:" ' - 'MyTextBox2 - ' - Me.MyTextBox2._DateTimeOnly = False - Me.MyTextBox2._numbersOnly = False - Me.MyTextBox2._numbersOnlyKommastellen = "" - Me.MyTextBox2._numbersOnlyTrennzeichen = True - Me.MyTextBox2._Prozent = False - Me.MyTextBox2._ShortDateNew = False - Me.MyTextBox2._ShortDateOnly = False - Me.MyTextBox2._TimeOnly = False - Me.MyTextBox2._TimeOnly_Seconds = False - Me.MyTextBox2._value = "" - Me.MyTextBox2._Waehrung = False - Me.MyTextBox2._WaehrungZeichen = True - Me.MyTextBox2.ForeColor = System.Drawing.Color.Black - Me.MyTextBox2.Location = New System.Drawing.Point(68, 137) - Me.MyTextBox2.MaxLineLength = -1 - Me.MyTextBox2.MaxLines_Warning = "" - Me.MyTextBox2.MaxLines_Warning_Label = Nothing - Me.MyTextBox2.Name = "MyTextBox2" - Me.MyTextBox2.ReadOnly = True - Me.MyTextBox2.Size = New System.Drawing.Size(453, 20) - Me.MyTextBox2.TabIndex = 13 - ' 'lblSendung ' Me.lblSendung.AutoSize = True @@ -347,20 +243,6 @@ Partial Class frmSendungAnhangImport Me.lblArt.TabIndex = 5 Me.lblArt.Text = "Art:" ' - 'cboArt - ' - Me.cboArt._allowedValuesFreiText = Nothing - Me.cboArt._allowFreiText = False - Me.cboArt._value = "" - Me.cboArt.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend - Me.cboArt.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems - Me.cboArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboArt.FormattingEnabled = True - Me.cboArt.Location = New System.Drawing.Point(68, 75) - Me.cboArt.Name = "cboArt" - Me.cboArt.Size = New System.Drawing.Size(242, 28) - Me.cboArt.TabIndex = 6 - ' 'btnAnfuegen ' Me.btnAnfuegen.BackColor = System.Drawing.Color.Wheat @@ -372,31 +254,6 @@ Partial Class frmSendungAnhangImport Me.btnAnfuegen.Text = ">> Anfügen >>" Me.btnAnfuegen.UseVisualStyleBackColor = False ' - 'txtSeiten - ' - Me.txtSeiten._DateTimeOnly = False - Me.txtSeiten._numbersOnly = False - Me.txtSeiten._numbersOnlyKommastellen = "" - Me.txtSeiten._numbersOnlyTrennzeichen = True - Me.txtSeiten._Prozent = False - Me.txtSeiten._ShortDateNew = False - Me.txtSeiten._ShortDateOnly = False - Me.txtSeiten._TimeOnly = False - Me.txtSeiten._TimeOnly_Seconds = False - Me.txtSeiten._value = "" - Me.txtSeiten._Waehrung = False - Me.txtSeiten._WaehrungZeichen = True - Me.txtSeiten.BackColor = System.Drawing.Color.White - Me.txtSeiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSeiten.ForeColor = System.Drawing.Color.Black - Me.txtSeiten.Location = New System.Drawing.Point(68, 47) - Me.txtSeiten.MaxLineLength = -1 - Me.txtSeiten.MaxLines_Warning = "" - Me.txtSeiten.MaxLines_Warning_Label = Nothing - Me.txtSeiten.Name = "txtSeiten" - Me.txtSeiten.Size = New System.Drawing.Size(242, 26) - Me.txtSeiten.TabIndex = 4 - ' 'lblSeiten ' Me.lblSeiten.AutoSize = True @@ -472,6 +329,7 @@ Partial Class frmSendungAnhangImport Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.Button2) Me.pnl.Controls.Add(Me.Button5) Me.pnl.Controls.Add(Me.PdfViewer) Me.pnl.Controls.Add(Me.WebBrowser) @@ -551,20 +409,6 @@ Partial Class frmSendungAnhangImport Me.btnAddSnd.Text = "+ NEU" Me.btnAddSnd.UseVisualStyleBackColor = True ' - 'cboSendungen - ' - Me.cboSendungen._allowedValuesFreiText = Nothing - Me.cboSendungen._allowFreiText = False - Me.cboSendungen._value = "" - Me.cboSendungen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cboSendungen.DropDownWidth = 450 - Me.cboSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboSendungen.FormattingEnabled = True - Me.cboSendungen.Location = New System.Drawing.Point(8, 28) - Me.cboSendungen.Name = "cboSendungen" - Me.cboSendungen.Size = New System.Drawing.Size(306, 28) - Me.cboSendungen.TabIndex = 9 - ' 'lblSendungsdetails ' Me.lblSendungsdetails.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -674,6 +518,174 @@ Partial Class frmSendungAnhangImport Me.pnlSendung.Size = New System.Drawing.Size(321, 860) Me.pnlSendung.TabIndex = 0 ' + 'txtBezeichnung + ' + Me.txtBezeichnung._DateTimeOnly = False + Me.txtBezeichnung._numbersOnly = False + Me.txtBezeichnung._numbersOnlyKommastellen = "" + Me.txtBezeichnung._numbersOnlyTrennzeichen = True + Me.txtBezeichnung._Prozent = False + Me.txtBezeichnung._ShortDateNew = False + Me.txtBezeichnung._ShortDateOnly = False + Me.txtBezeichnung._TimeOnly = False + Me.txtBezeichnung._TimeOnly_Seconds = False + Me.txtBezeichnung._value = "" + Me.txtBezeichnung._Waehrung = False + Me.txtBezeichnung._WaehrungZeichen = True + Me.txtBezeichnung.BackColor = System.Drawing.Color.White + Me.txtBezeichnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtBezeichnung.ForeColor = System.Drawing.Color.Black + Me.txtBezeichnung.Location = New System.Drawing.Point(68, 105) + Me.txtBezeichnung.MaxLineLength = -1 + Me.txtBezeichnung.MaxLines_Warning = "" + Me.txtBezeichnung.MaxLines_Warning_Label = Nothing + Me.txtBezeichnung.Name = "txtBezeichnung" + Me.txtBezeichnung.Size = New System.Drawing.Size(453, 26) + Me.txtBezeichnung.TabIndex = 7 + ' + 'txtDateiname + ' + Me.txtDateiname._DateTimeOnly = False + Me.txtDateiname._numbersOnly = False + Me.txtDateiname._numbersOnlyKommastellen = "" + Me.txtDateiname._numbersOnlyTrennzeichen = True + Me.txtDateiname._Prozent = False + Me.txtDateiname._ShortDateNew = False + Me.txtDateiname._ShortDateOnly = False + Me.txtDateiname._TimeOnly = False + Me.txtDateiname._TimeOnly_Seconds = False + Me.txtDateiname._value = "" + Me.txtDateiname._Waehrung = False + Me.txtDateiname._WaehrungZeichen = True + Me.txtDateiname.ForeColor = System.Drawing.Color.Black + Me.txtDateiname.Location = New System.Drawing.Point(68, 11) + Me.txtDateiname.MaxLineLength = -1 + Me.txtDateiname.MaxLines_Warning = "" + Me.txtDateiname.MaxLines_Warning_Label = Nothing + Me.txtDateiname.Name = "txtDateiname" + Me.txtDateiname.ReadOnly = True + Me.txtDateiname.Size = New System.Drawing.Size(732, 20) + Me.txtDateiname.TabIndex = 1 + ' + 'MyTextBox2 + ' + Me.MyTextBox2._DateTimeOnly = False + Me.MyTextBox2._numbersOnly = False + Me.MyTextBox2._numbersOnlyKommastellen = "" + Me.MyTextBox2._numbersOnlyTrennzeichen = True + Me.MyTextBox2._Prozent = False + Me.MyTextBox2._ShortDateNew = False + Me.MyTextBox2._ShortDateOnly = False + Me.MyTextBox2._TimeOnly = False + Me.MyTextBox2._TimeOnly_Seconds = False + Me.MyTextBox2._value = "" + Me.MyTextBox2._Waehrung = False + Me.MyTextBox2._WaehrungZeichen = True + Me.MyTextBox2.ForeColor = System.Drawing.Color.Black + Me.MyTextBox2.Location = New System.Drawing.Point(68, 137) + Me.MyTextBox2.MaxLineLength = -1 + Me.MyTextBox2.MaxLines_Warning = "" + Me.MyTextBox2.MaxLines_Warning_Label = Nothing + Me.MyTextBox2.Name = "MyTextBox2" + Me.MyTextBox2.ReadOnly = True + Me.MyTextBox2.Size = New System.Drawing.Size(453, 20) + Me.MyTextBox2.TabIndex = 13 + ' + 'cboArt + ' + Me.cboArt._allowedValuesFreiText = Nothing + Me.cboArt._allowFreiText = False + Me.cboArt._value = "" + Me.cboArt.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend + Me.cboArt.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems + Me.cboArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboArt.FormattingEnabled = True + Me.cboArt.Location = New System.Drawing.Point(68, 75) + Me.cboArt.Name = "cboArt" + Me.cboArt.Size = New System.Drawing.Size(242, 28) + Me.cboArt.TabIndex = 6 + ' + 'txtSeiten + ' + Me.txtSeiten._DateTimeOnly = False + Me.txtSeiten._numbersOnly = False + Me.txtSeiten._numbersOnlyKommastellen = "" + Me.txtSeiten._numbersOnlyTrennzeichen = True + Me.txtSeiten._Prozent = False + Me.txtSeiten._ShortDateNew = False + Me.txtSeiten._ShortDateOnly = False + Me.txtSeiten._TimeOnly = False + Me.txtSeiten._TimeOnly_Seconds = False + Me.txtSeiten._value = "" + Me.txtSeiten._Waehrung = False + Me.txtSeiten._WaehrungZeichen = True + Me.txtSeiten.BackColor = System.Drawing.Color.White + Me.txtSeiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSeiten.ForeColor = System.Drawing.Color.Black + Me.txtSeiten.Location = New System.Drawing.Point(68, 47) + Me.txtSeiten.MaxLineLength = -1 + Me.txtSeiten.MaxLines_Warning = "" + Me.txtSeiten.MaxLines_Warning_Label = Nothing + Me.txtSeiten.Name = "txtSeiten" + Me.txtSeiten.Size = New System.Drawing.Size(242, 26) + Me.txtSeiten.TabIndex = 4 + ' + 'cboSendungen + ' + Me.cboSendungen._allowedValuesFreiText = Nothing + Me.cboSendungen._allowFreiText = False + Me.cboSendungen._value = "" + Me.cboSendungen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cboSendungen.DropDownWidth = 450 + Me.cboSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboSendungen.FormattingEnabled = True + Me.cboSendungen.Location = New System.Drawing.Point(8, 28) + Me.cboSendungen.Name = "cboSendungen" + Me.cboSendungen.Size = New System.Drawing.Size(306, 28) + Me.cboSendungen.TabIndex = 9 + ' + 'UsrCntlSendungAnhangElement1 + ' + Me.UsrCntlSendungAnhangElement1.ACTIVE = False + Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White + Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing + Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing + Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False" + Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing + Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing + Me.UsrCntlSendungAnhangElement1.FILE_SIZE = "False" + Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing + Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1" + Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64) + Me.UsrCntlSendungAnhangElement1.TabIndex = 0 + ' + 'UsrCntlSendungAnhangElement2 + ' + Me.UsrCntlSendungAnhangElement2.ACTIVE = False + Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White + Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing + Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing + Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False" + Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing + Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing + Me.UsrCntlSendungAnhangElement2.FILE_SIZE = "False" + Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing + Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73) + Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2" + Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64) + Me.UsrCntlSendungAnhangElement2.TabIndex = 1 + ' + 'Button2 + ' + Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button2.Location = New System.Drawing.Point(696, 1) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(100, 34) + Me.Button2.TabIndex = 3 + Me.Button2.Text = "Zu ""Seiten"" hinzu" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Strg + Leertaste)" + Me.Button2.UseVisualStyleBackColor = True + ' 'frmSendungAnhangImport ' Me.AllowDrop = True @@ -754,4 +766,5 @@ Partial Class frmSendungAnhangImport Friend WithEvents cbxAlternativePDFAnsicht As CheckBox Friend WithEvents lblRgPreis As Label Friend WithEvents pnlSendung As Panel + Friend WithEvents Button2 As Button End Class diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index dd400f2..8d2a120 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -69,11 +69,75 @@ Public Class frmSendungAnhangImport End Function Sub initElement(USRCNTL As usrCntlSendungAnhangElement) - AddHandler USRCNTL.ME_CLICK, Sub(STRG_PRESSED) + AddHandler USRCNTL.ME_CLICK, Sub(STRG_PRESSED, SHIFT_PRESSED) ' If BrowserLoaded Then - If Not STRG_PRESSED Then + If SHIFT_PRESSED Then + 'prüfen, ob genau 1 Elemnt markeirt ist, dann kein neues Laden nötig + If USRCNTL.ACTIVE Then + If checkIf1isSelected() Then Exit Sub 'Bereits aktiv, aber nur wenn 1 markiert + End If + ' Hier Fehlt Code, der Shift abfängt + ' --- SHIFT-Bereichsauswahl (nur im gleichen Panel) --- + ' Anker = das (genau) eine bereits markierte Element suchen + Dim anchor As usrCntlSendungAnhangElement = Nothing + + For Each c As Control In flpnlAviso.Controls + Dim u = TryCast(c, usrCntlSendungAnhangElement) + If u IsNot Nothing AndAlso u.ACTIVE Then + anchor = u + Exit For + End If + Next + If anchor Is Nothing Then + For Each c As Control In flpnlSendungen.Controls + Dim u = TryCast(c, usrCntlSendungAnhangElement) + If u IsNot Nothing AndAlso u.ACTIVE Then + anchor = u + Exit For + End If + Next + End If + + If anchor IsNot Nothing Then + Dim pAnchor = TryCast(anchor.Parent, FlowLayoutPanel) + Dim pClick = TryCast(USRCNTL.Parent, FlowLayoutPanel) + + ' Nur wenn beide im selben FlowLayoutPanel liegen: + If pAnchor IsNot Nothing AndAlso pAnchor Is pClick Then + Dim i1 As Integer = pAnchor.Controls.IndexOf(anchor) + Dim i2 As Integer = pAnchor.Controls.IndexOf(USRCNTL) + Dim fromIdx As Integer = Math.Min(i1, i2) + Dim toIdx As Integer = Math.Max(i1, i2) + + ' Vorher alles deselektieren (beide Panels) + For Each c As Control In flpnlAviso.Controls + Dim u = TryCast(c, usrCntlSendungAnhangElement) + If u IsNot Nothing Then u.ACTIVE = False + Next + For Each c As Control In flpnlSendungen.Controls + Dim u = TryCast(c, usrCntlSendungAnhangElement) + If u IsNot Nothing Then u.ACTIVE = False + Next + + ' Bereich [fromIdx..toIdx] markieren (inklusive) + For i As Integer = fromIdx To toIdx + Dim u = TryCast(pAnchor.Controls(i), usrCntlSendungAnhangElement) + If u IsNot Nothing Then u.ACTIVE = True + Next + + ' Nichts weiter tun (kein neues Laden/Navigieren) + Exit Sub + End If + End If + ' --- Ende SHIFT-Bereichsauswahl --- + + ElseIf STRG_PRESSED Then + If checkIfSamePanel(USRCNTL) Then + USRCNTL.ACTIVE = Not USRCNTL.ACTIVE + End If + Else 'prüfen, ob genau 1 Elemnt markeirt ist, dann kein neues Laden nötig If USRCNTL.ACTIVE Then @@ -99,10 +163,6 @@ Public Class frmSendungAnhangImport txtDateiname.Text = USRCNTL.FILE_NAME txtSeiten.Focus() - Else - If checkIfSamePanel(USRCNTL) Then - USRCNTL.ACTIVE = Not USRCNTL.ACTIVE - End If End If End Sub @@ -1286,6 +1346,7 @@ Public Class frmSendungAnhangImport If e.KeyCode = Keys.Return Then btnAnfuegen.PerformClick() End If + End Sub Sub initSendungen() cboSendungen.Items.Clear() @@ -1742,6 +1803,12 @@ Public Class frmSendungAnhangImport btnSndEdit.PerformClick() e.IsInputKey = True ' Damit Event abgefangen ist, sonst steht "+" im Feld End If + ' Prüfen, ob STRG + " " gedrückt wurde + If e.Control AndAlso (e.KeyCode = Keys.Space) Then + AddCurrentPage() + e.IsInputKey = True ' Damit Event abgefangen ist, sonst steht " " im Feld + End If + ElseIf e.Modifiers = Keys.Shift Then ' PDFs durchlaufen If e.KeyCode = Keys.PageDown Then nextART() @@ -2182,6 +2249,26 @@ Public Class frmSendungAnhangImport Private Sub flpnlSnd_DragEnter(sender As Object, e As DragEventArgs) Handles flpnlSendungen.DragEnter e.Effect = DragDropEffects.All End Sub + + Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles Button2.Click + AddCurrentPage() + End Sub + + Sub AddCurrentPage() + Dim CurrentPageNumber = PdfViewer.CurrentPageNumber + If CurrentPageNumber > 0 Then + If txtSeiten.Text = "" Then + txtSeiten.Text = CurrentPageNumber.ToString.Trim + Else + txtSeiten.Text &= "," & CurrentPageNumber.ToString.Trim + End If + txtSeiten.Focus() + txtSeiten.SelectionStart = txtSeiten.TextLength + End If + End Sub + + + 'Private Sub flpnlSendungen_Paint(sender As Object, e As PaintEventArgs) Handles flpnlSendungen.Paint ' Dim files() As String = e.Data.GetData(DataFormats.FileDrop) ' For Each path In files diff --git a/Aviso/Anhänge/usrCntlSendungAnhangElement.vb b/Aviso/Anhänge/usrCntlSendungAnhangElement.vb index 7576c9e..c2e2b66 100644 --- a/Aviso/Anhänge/usrCntlSendungAnhangElement.vb +++ b/Aviso/Anhänge/usrCntlSendungAnhangElement.vb @@ -14,7 +14,7 @@ Public Class usrCntlSendungAnhangElement Property FILE_ANHID - Public Event ME_CLICK(STRG_PRESSED) + Public Event ME_CLICK(STRG_PRESSED, SHIFT_PRESSED) Public Event ME_DELETE(FILE_DOCID, FILE_ANHID) Public Event ME_COMPRESS(FILE_DOCID, FILE_ANHID) @@ -111,11 +111,11 @@ Public Class usrCntlSendungAnhangElement 'End Sub Private Sub pic_Click(sender As Object, e As MouseEventArgs) Handles pic.MouseClick, lbl.MouseClick, Me.MouseClick, lblSize.MouseClick If e.Button = MouseButtons.Left Then - RaiseEvent ME_CLICK((My.Computer.Keyboard.CtrlKeyDown Or My.Computer.Keyboard.ShiftKeyDown)) + RaiseEvent ME_CLICK(My.Computer.Keyboard.CtrlKeyDown, My.Computer.Keyboard.ShiftKeyDown) End If End Sub Public Sub CLICK_Me() - RaiseEvent ME_CLICK(False) 'My.Computer.Keyboard.CtrlKeyDown Or My.Computer.Keyboard.ShiftKeyDown)) + RaiseEvent ME_CLICK(False, False) 'My.Computer.Keyboard.CtrlKeyDown Or My.Computer.Keyboard.ShiftKeyDown)) End Sub Private Sub pic_doubleClick(sender As Object, e As EventArgs) Handles pic.DoubleClick, lbl.DoubleClick, Me.DoubleClick, lblSize.DoubleClick @@ -147,8 +147,14 @@ Public Class usrCntlSendungAnhangElement Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(FILE_ANHID) Dim f As New frmSendungAnhangUmbenennenUmkateg(FILE_NAME, ANH.anh_Art) If f.ShowDialog = DialogResult.OK Then + Dim ext As String = IO.Path.GetExtension(originalName) - ANH.anh_Name = f.txtBezeichnung.Text + Dim name As String = f.txtBezeichnung.Text + If String.IsNullOrWhiteSpace(IO.Path.GetExtension(name)) AndAlso ext <> "" Then ' prüfen ob Benutzer schon eine Endung eingegeben hat + name &= ext + End If + + ANH.anh_Name = name ANH.anh_Art = f.cboArt._value ANH.SAVE() FILE_NAME = f.txtBezeichnung.Text diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index baca222..18f3d6d 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.Designer.vb b/Aviso/usrcntlAktDetails.Designer.vb index 392d4ae..4711fba 100644 --- a/Aviso/usrcntlAktDetails.Designer.vb +++ b/Aviso/usrcntlAktDetails.Designer.vb @@ -23,16 +23,16 @@ Partial Class usrcntlAktDetails _ 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() - 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() - Dim DataGridViewCellStyle10 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 DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetails)) Me.pnlDetailsRechts = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() @@ -64,6 +64,7 @@ Partial Class usrcntlAktDetails Me.Panel7 = New System.Windows.Forms.Panel() Me.picArrowDown = New System.Windows.Forms.PictureBox() Me.Panel4 = New System.Windows.Forms.Panel() + Me.Button11 = New System.Windows.Forms.Button() Me.Button9 = New System.Windows.Forms.Button() Me.cbxLZDeFisk = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) @@ -186,7 +187,7 @@ Partial Class usrcntlAktDetails Me.btnÄndern = New System.Windows.Forms.Button() Me.btnTV = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() - Me.Button11 = New System.Windows.Forms.Button() + Me.Button12 = New System.Windows.Forms.Button() Me.pnlDetailsRechts.SuspendLayout() Me.Panel3.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() @@ -618,46 +619,46 @@ Partial Class usrcntlAktDetails Me.dgvSendungen.AllowUserToAddRows = False Me.dgvSendungen.AllowUserToDeleteRows = False Me.dgvSendungen.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle21.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSendungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - 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.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle22.Font = New System.Drawing.Font("Tahoma", 8.25!, 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.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 Me.dgvSendungen.ColumnHeadersHeight = 34 Me.dgvSendungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, 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.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle23 Me.dgvSendungen.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSendungen.Location = New System.Drawing.Point(0, 0) Me.dgvSendungen.MultiSelect = False Me.dgvSendungen.Name = "dgvSendungen" Me.dgvSendungen.ReadOnly = True - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, 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.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 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.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle24 Me.dgvSendungen.RowHeadersVisible = False Me.dgvSendungen.RowHeadersWidth = 62 Me.dgvSendungen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle25 Me.dgvSendungen.RowTemplate.Height = 20 Me.dgvSendungen.RowTemplate.ReadOnly = True Me.dgvSendungen.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -697,6 +698,7 @@ Partial Class usrcntlAktDetails Me.Panel4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel4.BackColor = System.Drawing.Color.PapayaWhip Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel4.Controls.Add(Me.Button12) Me.Panel4.Controls.Add(Me.Button11) Me.Panel4.Controls.Add(Me.Button9) Me.Panel4.Controls.Add(Me.cbxLZDeFisk) @@ -722,6 +724,21 @@ Partial Class usrcntlAktDetails Me.Panel4.TabIndex = 102 Me.Panel4.Visible = False ' + 'Button11 + ' + Me.Button11.BackColor = System.Drawing.Color.White + Me.Button11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button11.Image = Global.AVISO.My.Resources.Resources.beleg1 + Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button11.Location = New System.Drawing.Point(38, 131) + Me.Button11.Name = "Button11" + Me.Button11.Size = New System.Drawing.Size(92, 36) + Me.Button11.TabIndex = 120 + Me.Button11.Text = "Mark.Anh drucken" + Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button11.UseVisualStyleBackColor = False + ' 'Button9 ' Me.Button9.BackColor = System.Drawing.Color.White @@ -729,9 +746,9 @@ Partial Class usrcntlAktDetails Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button9.Image = Global.AVISO.My.Resources.Resources.beleg1 Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button9.Location = New System.Drawing.Point(5, 164) + Me.Button9.Location = New System.Drawing.Point(3, 164) Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(123, 36) + Me.Button9.Size = New System.Drawing.Size(127, 36) Me.Button9.TabIndex = 119 Me.Button9.Text = "ATILLA" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Aktendeckel" Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -821,10 +838,10 @@ Partial Class usrcntlAktDetails Me.btnSendungslisteUNISPED.ForeColor = System.Drawing.Color.Black Me.btnSendungslisteUNISPED.Image = Global.AVISO.My.Resources.Resources.spedbuch_small Me.btnSendungslisteUNISPED.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSendungslisteUNISPED.Location = New System.Drawing.Point(5, 94) + Me.btnSendungslisteUNISPED.Location = New System.Drawing.Point(3, 94) Me.btnSendungslisteUNISPED.Margin = New System.Windows.Forms.Padding(0) Me.btnSendungslisteUNISPED.Name = "btnSendungslisteUNISPED" - Me.btnSendungslisteUNISPED.Size = New System.Drawing.Size(123, 36) + Me.btnSendungslisteUNISPED.Size = New System.Drawing.Size(127, 36) Me.btnSendungslisteUNISPED.TabIndex = 110 Me.btnSendungslisteUNISPED.Text = "Alle Sendungen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "UNISPED" Me.btnSendungslisteUNISPED.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -883,10 +900,10 @@ Partial Class usrcntlAktDetails Me.btnDipoListe.ForeColor = System.Drawing.Color.Black Me.btnDipoListe.Image = Global.AVISO.My.Resources.Resources.pdf11 Me.btnDipoListe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnDipoListe.Location = New System.Drawing.Point(5, 22) + Me.btnDipoListe.Location = New System.Drawing.Point(3, 22) Me.btnDipoListe.Margin = New System.Windows.Forms.Padding(0) Me.btnDipoListe.Name = "btnDipoListe" - Me.btnDipoListe.Size = New System.Drawing.Size(123, 36) + Me.btnDipoListe.Size = New System.Drawing.Size(127, 36) Me.btnDipoListe.TabIndex = 4 Me.btnDipoListe.Text = "Dispoliste" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "alle Sendg." Me.btnDipoListe.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -953,10 +970,10 @@ Partial Class usrcntlAktDetails Me.btnDipoListeEmail.ForeColor = System.Drawing.Color.Black Me.btnDipoListeEmail.Image = Global.AVISO.My.Resources.Resources.email_big1 Me.btnDipoListeEmail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnDipoListeEmail.Location = New System.Drawing.Point(5, 57) + Me.btnDipoListeEmail.Location = New System.Drawing.Point(3, 57) Me.btnDipoListeEmail.Margin = New System.Windows.Forms.Padding(0) Me.btnDipoListeEmail.Name = "btnDipoListeEmail" - Me.btnDipoListeEmail.Size = New System.Drawing.Size(123, 36) + Me.btnDipoListeEmail.Size = New System.Drawing.Size(127, 36) Me.btnDipoListeEmail.TabIndex = 5 Me.btnDipoListeEmail.Text = "Dispoliste" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "alle Sendg." Me.btnDipoListeEmail.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -969,10 +986,10 @@ Partial Class usrcntlAktDetails Me.btnDispohaft.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnDispohaft.ForeColor = System.Drawing.Color.Black Me.btnDispohaft.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnDispohaft.Location = New System.Drawing.Point(5, 201) + Me.btnDispohaft.Location = New System.Drawing.Point(3, 201) Me.btnDispohaft.Margin = New System.Windows.Forms.Padding(0) Me.btnDispohaft.Name = "btnDispohaft" - Me.btnDispohaft.Size = New System.Drawing.Size(123, 36) + Me.btnDispohaft.Size = New System.Drawing.Size(127, 36) Me.btnDispohaft.TabIndex = 3 Me.btnDispohaft.Text = "Dispo.Haft" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(nur T1/T2)" Me.btnDispohaft.UseVisualStyleBackColor = False @@ -998,46 +1015,46 @@ Partial Class usrcntlAktDetails Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle6.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle26.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle7.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle27.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle27.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 Me.gridVermerke.ColumnHeadersHeight = 34 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle28 Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.gridVermerke.Location = New System.Drawing.Point(0, 30) Me.gridVermerke.MultiSelect = False Me.gridVermerke.Name = "gridVermerke" Me.gridVermerke.ReadOnly = True - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle29 Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidth = 62 Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle30 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -2438,21 +2455,20 @@ Partial Class usrcntlAktDetails Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button10.UseVisualStyleBackColor = False ' - 'Button11 + 'Button12 ' - Me.Button11.BackColor = System.Drawing.Color.White - Me.Button11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button11.Image = Global.AVISO.My.Resources.Resources.beleg1 - Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button11.Location = New System.Drawing.Point(5, 131) - Me.Button11.Name = "Button11" - Me.Button11.Size = New System.Drawing.Size(123, 36) - Me.Button11.TabIndex = 120 - Me.Button11.Text = "Markierte Anh. drucken" - Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button11.UseVisualStyleBackColor = False - Me.Button11.Visible = False + Me.Button12.BackColor = System.Drawing.Color.White + Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button12.ForeColor = System.Drawing.Color.Black + Me.Button12.Image = Global.AVISO.My.Resources.Resources.pdf11 + Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button12.Location = New System.Drawing.Point(3, 131) + Me.Button12.Margin = New System.Windows.Forms.Padding(0) + Me.Button12.Name = "Button12" + Me.Button12.Size = New System.Drawing.Size(37, 36) + Me.Button12.TabIndex = 121 + Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button12.UseVisualStyleBackColor = False ' 'usrcntlAktDetails ' @@ -2675,4 +2691,5 @@ Partial Class usrcntlAktDetails Friend WithEvents Button9 As Button Friend WithEvents pnlMaDetails As Panel Friend WithEvents Button11 As Button + Friend WithEvents Button12 As Button End Class diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 880bc62..99a72bd 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -6,6 +6,7 @@ Imports System.IO Imports System.Drawing Imports Microsoft.Office.Interop Imports System.Security.Cryptography +Imports GrapeCity.DataVisualization.TypeScript Public Class usrcntlAktDetails @@ -3991,5 +3992,39 @@ Public Class usrcntlAktDetails t.IsBackground = True End Sub + Shared Sub openAlleMarkierte(AvisoID) + Try + Dim files As New List(Of String) ' + + Dim ANH_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge) + VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_ByAviso(ANH_LIST, AvisoID) 'LÄDT alle Aviso-Anhänge + For Each ll In ANH_LIST + If ll.anh_MarkierungDruck Then + Select Case ll.anh_Typ + Case "PDF" : files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ll.anh_docId)) + ' Case Else : Process.Start(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ll.anh_docId)) + End Select + End If + Next + + If files.Count = 0 Then + MsgBox("Keine Anhänge gefunden!") + Exit Sub + End If + + Dim outputFile As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Merge.pdf", ".pdf", True,, "Merge") ' "result.pdf" + VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile) + Process.Start(outputFile) + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + + End Sub + + Private Sub Button12_Click_1(sender As Object, e As EventArgs) Handles Button12.Click + openAlleMarkierte(AvisoID) + End Sub End Class