diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index 6aa52502..00742519 100644 Binary files a/API_NetFramework/bin/DOCGEN.dll and b/API_NetFramework/bin/DOCGEN.dll differ diff --git a/API_NetFramework/bin/DOCGEN.pdb b/API_NetFramework/bin/DOCGEN.pdb index b9e716cf..7ddfd298 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/Logging.dll b/API_NetFramework/bin/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/API_NetFramework/bin/Logging.dll and b/API_NetFramework/bin/Logging.dll differ diff --git a/API_NetFramework/bin/Logging.pdb b/API_NetFramework/bin/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/API_NetFramework/bin/Logging.pdb and b/API_NetFramework/bin/Logging.pdb differ diff --git a/API_NetFramework/bin/OnDocOffice.dll b/API_NetFramework/bin/OnDocOffice.dll index d3d90f53..7237ca85 100644 Binary files a/API_NetFramework/bin/OnDocOffice.dll and b/API_NetFramework/bin/OnDocOffice.dll differ diff --git a/API_NetFramework/bin/OnDocOffice.pdb b/API_NetFramework/bin/OnDocOffice.pdb index 057660e0..cbc634ef 100644 Binary files a/API_NetFramework/bin/OnDocOffice.pdb and b/API_NetFramework/bin/OnDocOffice.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index 4acafbb2..5224f4d0 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index 739e917f..f7ae1707 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index ae77ea08..a51b7b70 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -12298,3 +12298,7 @@ done 2025-04-21 12:31:19.1871|DEBUG|OnDoc| 2025-04-21 12:31:19.2156|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal 2025-04-21 12:31:19.2181|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-04-30 16:35:21.0998|DEBUG|OnDoc| +2025-04-30 16:35:21.1521|DEBUG|OnDoc| +2025-04-30 16:35:21.1797|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-04-30 16:35:21.1797|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 5deb9bae..5471a9b6 100644 Binary files a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll index 4acafbb2..5224f4d0 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb index 739e917f..f7ae1707 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/BarcodeLib/bin/Debug/Logging.dll b/BarcodeLib/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/BarcodeLib/bin/Debug/Logging.dll and b/BarcodeLib/bin/Debug/Logging.dll differ diff --git a/BarcodeLib/bin/Debug/Logging.pdb b/BarcodeLib/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/BarcodeLib/bin/Debug/Logging.pdb and b/BarcodeLib/bin/Debug/Logging.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index 11c86acf..86edca05 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/BarcodeLibVBDatamatrix/bin/Debug/Model.dll b/BarcodeLibVBDatamatrix/bin/Debug/Model.dll index b8d36e01..1c761410 100644 Binary files a/BarcodeLibVBDatamatrix/bin/Debug/Model.dll and b/BarcodeLibVBDatamatrix/bin/Debug/Model.dll differ diff --git a/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb b/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb index a7c18ed9..e486e05e 100644 Binary files a/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb and b/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache index 83be9ba9..938fc219 100644 Binary files a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache and b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache differ diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index e68c37d6..ac96a215 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -60,11 +60,12 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(150, 330); + this.label2.Location = new System.Drawing.Point(161, 330); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(146, 26); + this.label2.Size = new System.Drawing.Size(125, 26); this.label2.TabIndex = 2; - this.label2.Text = "23. April 2025"; + this.label2.Text = "1. Mai 2025"; + this.label2.Click += new System.EventHandler(this.label2_Click); // // SplashScreen // diff --git a/Client/Diverses/SplashScreen.cs b/Client/Diverses/SplashScreen.cs index 8bcd089a..8a5ea4a1 100644 --- a/Client/Diverses/SplashScreen.cs +++ b/Client/Diverses/SplashScreen.cs @@ -36,5 +36,10 @@ namespace OnDoc.Diverses tmr.Stop(); this.Hide(); } + + private void label2_Click(object sender, EventArgs e) + { + + } } } diff --git a/Client/Klassen/clsAppParams.cs b/Client/Klassen/clsAppParams.cs index ddffa139..aacbe675 100644 --- a/Client/Klassen/clsAppParams.cs +++ b/Client/Klassen/clsAppParams.cs @@ -13,6 +13,7 @@ using System.Security.Policy; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Windows.Devices.Bluetooth.Advertisement; using Windows.Media.Streaming.Adaptive; using static System.Net.WebRequestMethods; namespace OnDoc.Klassen @@ -61,6 +62,8 @@ namespace OnDoc.Klassen public static string SignaturePassword { get; set; } = ""; + public static string Environment { get; set; } = ""; + public static bool versandstrassewindows_open { get; set; } = false; static AppParams() { @@ -98,6 +101,7 @@ namespace OnDoc.Klassen SignatureWidth = db.dsdaten.Tables[0].Rows[0][18].ToString(); SignatureColor = db.dsdaten.Tables[0].Rows[0][19].ToString(); SignaturePassword = db.dsdaten.Tables[0].Rows[0][20].ToString(); + Environment = db.dsdaten.Tables[0].Rows[0][21].ToString(); } else { diff --git a/Client/Properties/Settings.Designer.cs b/Client/Properties/Settings.Designer.cs index 69b38720..3a593c07 100644 --- a/Client/Properties/Settings.Designer.cs +++ b/Client/Properties/Settings.Designer.cs @@ -182,25 +182,25 @@ namespace OnDoc.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("5000")] - public string OfficeWatchTimerIntervall { + [global::System.Configuration.DefaultSettingValueAttribute("E:\\Software-Projekte\\OnDoc\\TKB-Vorlagen\\")] + public string NativVorlagen { get { - return ((string)(this["OfficeWatchTimerIntervall"])); + return ((string)(this["NativVorlagen"])); } set { - this["OfficeWatchTimerIntervall"] = value; + this["NativVorlagen"] = value; } } [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("E:\\Software-Projekte\\OnDoc\\TKB-Vorlagen\\")] - public string NativVorlagen { + [global::System.Configuration.DefaultSettingValueAttribute("20000")] + public string OfficeWatchTimerIntervall { get { - return ((string)(this["NativVorlagen"])); + return ((string)(this["OfficeWatchTimerIntervall"])); } set { - this["NativVorlagen"] = value; + this["OfficeWatchTimerIntervall"] = value; } } } diff --git a/Client/Start.Designer.cs b/Client/Start.Designer.cs index 20d98fdf..64dcb3b5 100644 --- a/Client/Start.Designer.cs +++ b/Client/Start.Designer.cs @@ -118,9 +118,9 @@ namespace OnDoc this.labelTest.ForeColor = System.Drawing.Color.IndianRed; this.labelTest.Location = new System.Drawing.Point(3, 3); this.labelTest.Name = "labelTest"; - this.labelTest.Size = new System.Drawing.Size(35, 13); + this.labelTest.Size = new System.Drawing.Size(96, 15); this.labelTest.TabIndex = 0; - this.labelTest.Text = "label1"; + this.labelTest.Text = "Test-Umgebung"; // // openFileDialog1 // @@ -134,6 +134,7 @@ namespace OnDoc // // menuStrip1 // + this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.dateiToolStripMenuItem, this.nativVorlagenToolStripMenuItem}); @@ -150,13 +151,13 @@ namespace OnDoc this.profilEinstellungenToolStripMenuItem, this.beendenToolStripMenuItem}); this.dateiToolStripMenuItem.Name = "dateiToolStripMenuItem"; - this.dateiToolStripMenuItem.Size = new System.Drawing.Size(46, 20); + this.dateiToolStripMenuItem.Size = new System.Drawing.Size(59, 20); this.dateiToolStripMenuItem.Text = "&Datei"; // // profilEinstellungenToolStripMenuItem // this.profilEinstellungenToolStripMenuItem.Name = "profilEinstellungenToolStripMenuItem"; - this.profilEinstellungenToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.profilEinstellungenToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.profilEinstellungenToolStripMenuItem.Text = "Profil-Einstellungen"; this.profilEinstellungenToolStripMenuItem.ToolTipText = "Anpassungen von Profilen"; this.profilEinstellungenToolStripMenuItem.Visible = false; @@ -165,7 +166,7 @@ namespace OnDoc // beendenToolStripMenuItem // this.beendenToolStripMenuItem.Name = "beendenToolStripMenuItem"; - this.beendenToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.beendenToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.beendenToolStripMenuItem.Text = "&Beenden"; this.beendenToolStripMenuItem.ToolTipText = "Anwendung beenden"; this.beendenToolStripMenuItem.Click += new System.EventHandler(this.beendenToolStripMenuItem_Click); @@ -173,13 +174,14 @@ namespace OnDoc // nativVorlagenToolStripMenuItem // this.nativVorlagenToolStripMenuItem.Name = "nativVorlagenToolStripMenuItem"; - this.nativVorlagenToolStripMenuItem.Size = new System.Drawing.Size(98, 20); + this.nativVorlagenToolStripMenuItem.Size = new System.Drawing.Size(123, 20); this.nativVorlagenToolStripMenuItem.Text = "&Nativ-Vorlagen"; this.nativVorlagenToolStripMenuItem.Visible = false; this.nativVorlagenToolStripMenuItem.Click += new System.EventHandler(this.nativVorlagenToolStripMenuItem_Click); // // contextMenuStrip1 // + this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // @@ -194,6 +196,8 @@ namespace OnDoc this.dokList1.mitarbeiternr = 0; this.dokList1.Name = "dokList1"; this.dokList1.partnernr = 0; + this.dokList1.personbezeichnung = ""; + this.dokList1.personnr = 0; this.dokList1.profilnr = 0; this.dokList1.runmacros = false; this.dokList1.Search_Docid = ""; diff --git a/Client/Start.cs b/Client/Start.cs index 9f39d12b..c83c6f9e 100644 --- a/Client/Start.cs +++ b/Client/Start.cs @@ -136,6 +136,7 @@ namespace OnDoc } else { System.Environment.Exit(1); } } + if (AppParams.Environment != "PROD") { this.panel1.Visible = true; } Logging.Logging.Debug("Mitarbeiter", "OnDoc", AppParams.CurrentMitarbeiter.ToString()); //partnerTree1.OnStrukturClicked += new PartnerTree.StrukturHandler(testhandler1); diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 88b84a15..aee8e08e 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -2961,7 +2961,15 @@ namespace OnDoc.UICintrols private void ctxMenuDokList_Opening(object sender, CancelEventArgs e) { - if (AppParams.versandstrassewindows_open) { this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = true; } else { this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = false; } + if (AppParams.versandstrassewindows_open) { + this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = true; + if (ribbonButtonVersandstrasse.Enabled==true) { this.zumVersandpaketHinzufügenToolStripMenuItem.Enabled = true; } + else + { + this.zumVersandpaketHinzufügenToolStripMenuItem.Enabled = false; + } + } + else { this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = false; } if (this.sfDataGrid1.GroupColumnDescriptions.Count > 0) { diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx index df6718bb..c61769f6 100644 --- a/Client/UIControls/DokList.resx +++ b/Client/UIControls/DokList.resx @@ -190,7 +190,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM @@ -205,7 +205,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM @@ -220,7 +220,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM diff --git a/Client/Versandstrasse/Versandstrasse.Designer.cs b/Client/Versandstrasse/Versandstrasse.Designer.cs index 6436abb7..86407381 100644 --- a/Client/Versandstrasse/Versandstrasse.Designer.cs +++ b/Client/Versandstrasse/Versandstrasse.Designer.cs @@ -30,15 +30,15 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Versandstrasse)); - Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings15 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); - Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings15 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); - Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings15 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); - Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); - Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); - Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings16 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); - Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings16 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); - Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings16 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); + Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings3 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); + Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings3 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); + Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings3 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); + Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); + Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings4 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); + Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings4 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); + Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings4 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); + Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.imageList1 = new System.Windows.Forms.ImageList(this.components); @@ -117,6 +117,7 @@ this.lblprieveiwbezeichnung = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.lblerror = new System.Windows.Forms.Label(); this.pnlpostkorb = new System.Windows.Forms.Panel(); this.lblpostausgang = new System.Windows.Forms.Label(); @@ -128,9 +129,8 @@ this.label2 = new System.Windows.Forms.Label(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.ribbonButton3 = new System.Windows.Forms.RibbonButton(); - - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.lblserienbrief = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); this.contextMenuStrip1.SuspendLayout(); this.panelPrepare.SuspendLayout(); this.GrpPaketDetails.SuspendLayout(); @@ -159,14 +159,14 @@ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.löschenToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(119, 26); + this.contextMenuStrip1.Size = new System.Drawing.Size(132, 28); this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); this.contextMenuStrip1.Click += new System.EventHandler(this.contextMenuStrip1_Click); // // löschenToolStripMenuItem // this.löschenToolStripMenuItem.Name = "löschenToolStripMenuItem"; - this.löschenToolStripMenuItem.Size = new System.Drawing.Size(118, 22); + this.löschenToolStripMenuItem.Size = new System.Drawing.Size(131, 24); this.löschenToolStripMenuItem.Text = "Löschen"; this.löschenToolStripMenuItem.Click += new System.EventHandler(this.löschenToolStripMenuItem_Click); // @@ -195,7 +195,7 @@ // this.panelPrepare.BackColor = System.Drawing.Color.Silver; this.panelPrepare.Controls.Add(this.label4); - this.panelPrepare.Location = new System.Drawing.Point(308, 205); + this.panelPrepare.Location = new System.Drawing.Point(308, 284); this.panelPrepare.Name = "panelPrepare"; this.panelPrepare.Size = new System.Drawing.Size(832, 69); this.panelPrepare.TabIndex = 14; @@ -207,7 +207,7 @@ this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.Location = new System.Drawing.Point(198, 28); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(437, 20); + this.label4.Size = new System.Drawing.Size(525, 25); this.label4.TabIndex = 0; this.label4.Text = "Versand wird vorbereit - bitte einen Moment warten...."; this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -223,17 +223,17 @@ this.pdfViewerControl1.IsTextSearchEnabled = true; this.pdfViewerControl1.IsTextSelectionEnabled = true; this.pdfViewerControl1.Location = new System.Drawing.Point(908, 54); - messageBoxSettings15.EnableNotification = true; - this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings15; + messageBoxSettings3.EnableNotification = true; + this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings3; this.pdfViewerControl1.MinimumZoomPercentage = 50; this.pdfViewerControl1.Name = "pdfViewerControl1"; this.pdfViewerControl1.PageBorderThickness = 1; - pdfViewerPrinterSettings15.Copies = 1; - pdfViewerPrinterSettings15.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; - pdfViewerPrinterSettings15.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; - pdfViewerPrinterSettings15.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings15.PrintLocation"))); - pdfViewerPrinterSettings15.ShowPrintStatusDialog = true; - this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings15; + pdfViewerPrinterSettings3.Copies = 1; + pdfViewerPrinterSettings3.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; + pdfViewerPrinterSettings3.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; + pdfViewerPrinterSettings3.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings3.PrintLocation"))); + pdfViewerPrinterSettings3.ShowPrintStatusDialog = true; + this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings3; this.pdfViewerControl1.ReferencePath = null; this.pdfViewerControl1.ScrollDisplacementValue = 0; this.pdfViewerControl1.ShowHorizontalScrollBar = true; @@ -243,10 +243,10 @@ this.pdfViewerControl1.SpaceBetweenPages = 8; this.pdfViewerControl1.TabIndex = 10; this.pdfViewerControl1.Text = "pdfViewerControl1"; - textSearchSettings15.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); - textSearchSettings15.HighlightAllInstance = true; - textSearchSettings15.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); - this.pdfViewerControl1.TextSearchSettings = textSearchSettings15; + textSearchSettings3.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); + textSearchSettings3.HighlightAllInstance = true; + textSearchSettings3.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); + this.pdfViewerControl1.TextSearchSettings = textSearchSettings3; this.pdfViewerControl1.ThemeName = "Default"; this.pdfViewerControl1.VerticalScrollOffset = 0; this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; @@ -283,6 +283,7 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.label5); this.groupBox3.Controls.Add(this.label6); this.groupBox3.Controls.Add(this.txtadresse); this.groupBox3.Controls.Add(this.treeViewAdvAdresse); @@ -297,34 +298,34 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(266, 25); + this.label6.Location = new System.Drawing.Point(267, 41); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(93, 13); + this.label6.Size = new System.Drawing.Size(106, 15); this.label6.TabIndex = 10; this.label6.Text = "Gewählte Adresse"; // // txtadresse // - this.txtadresse.Location = new System.Drawing.Point(268, 44); + this.txtadresse.Location = new System.Drawing.Point(270, 59); this.txtadresse.Multiline = true; this.txtadresse.Name = "txtadresse"; this.txtadresse.ReadOnly = true; - this.txtadresse.Size = new System.Drawing.Size(163, 97); + this.txtadresse.Size = new System.Drawing.Size(164, 97); this.txtadresse.TabIndex = 12; // // treeViewAdvAdresse // this.treeViewAdvAdresse.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window); - treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black; + treeNodeAdvStyleInfo4.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo4.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo4.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo4.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo4.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo4.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo4.TextColor = System.Drawing.Color.Black; this.treeViewAdvAdresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)}); - this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(259, 193); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo4)}); + this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(259, 174); // // // @@ -336,11 +337,11 @@ this.treeViewAdvAdresse.HelpTextControl.Visible = true; this.treeViewAdvAdresse.HideSelection = false; this.treeViewAdvAdresse.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; - this.treeViewAdvAdresse.Location = new System.Drawing.Point(6, 44); + this.treeViewAdvAdresse.Location = new System.Drawing.Point(5, 59); this.treeViewAdvAdresse.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220))))); this.treeViewAdvAdresse.Name = "treeViewAdvAdresse"; this.treeViewAdvAdresse.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText; - this.treeViewAdvAdresse.Size = new System.Drawing.Size(259, 193); + this.treeViewAdvAdresse.Size = new System.Drawing.Size(259, 174); this.treeViewAdvAdresse.TabIndex = 3; this.treeViewAdvAdresse.Text = "treeViewAdv2"; this.treeViewAdvAdresse.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; @@ -360,11 +361,11 @@ // chkGAS // this.chkGAS.AutoSize = true; - this.chkGAS.Location = new System.Drawing.Point(3, 21); + this.chkGAS.Location = new System.Drawing.Point(6, 21); this.chkGAS.Name = "chkGAS"; - this.chkGAS.Size = new System.Drawing.Size(178, 17); + this.chkGAS.Size = new System.Drawing.Size(203, 19); this.chkGAS.TabIndex = 0; - this.chkGAS.Text = "Frankiertes Rückantwortcouvert"; + this.chkGAS.Text = "Frankiertes Rückantwortcouvert "; this.chkGAS.UseVisualStyleBackColor = true; this.chkGAS.CheckedChanged += new System.EventHandler(this.chkGAS_CheckedChanged); // @@ -396,7 +397,7 @@ this.txtAnzahlSeiten.Location = new System.Drawing.Point(151, 152); this.txtAnzahlSeiten.Name = "txtAnzahlSeiten"; this.txtAnzahlSeiten.ReadOnly = true; - this.txtAnzahlSeiten.Size = new System.Drawing.Size(265, 13); + this.txtAnzahlSeiten.Size = new System.Drawing.Size(265, 16); this.txtAnzahlSeiten.TabIndex = 17; // // txtAnzahlDokumente @@ -406,7 +407,7 @@ this.txtAnzahlDokumente.Location = new System.Drawing.Point(151, 133); this.txtAnzahlDokumente.Name = "txtAnzahlDokumente"; this.txtAnzahlDokumente.ReadOnly = true; - this.txtAnzahlDokumente.Size = new System.Drawing.Size(265, 13); + this.txtAnzahlDokumente.Size = new System.Drawing.Size(265, 16); this.txtAnzahlDokumente.TabIndex = 16; // // label15 @@ -415,7 +416,7 @@ this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label15.Location = new System.Drawing.Point(10, 152); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(89, 13); + this.label15.Size = new System.Drawing.Size(113, 17); this.label15.TabIndex = 15; this.label15.Text = "Anzahl Seiten:"; // @@ -425,7 +426,7 @@ this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label14.Location = new System.Drawing.Point(9, 133); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(117, 13); + this.label14.Size = new System.Drawing.Size(148, 17); this.label14.TabIndex = 14; this.label14.Text = "Anzahl Dokumente:"; // @@ -459,7 +460,7 @@ this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label7.Location = new System.Drawing.Point(5, 14); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(72, 13); + this.label7.Size = new System.Drawing.Size(93, 17); this.label7.TabIndex = 10; this.label7.Text = "Versandart:"; // @@ -479,7 +480,7 @@ this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label8.Location = new System.Drawing.Point(5, 40); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(132, 13); + this.label8.Size = new System.Drawing.Size(167, 17); this.label8.TabIndex = 11; this.label8.Text = "Rückantwort-Adresse:"; // @@ -490,7 +491,7 @@ this.txtVersandoption.Location = new System.Drawing.Point(151, 14); this.txtVersandoption.Name = "txtVersandoption"; this.txtVersandoption.ReadOnly = true; - this.txtVersandoption.Size = new System.Drawing.Size(265, 13); + this.txtVersandoption.Size = new System.Drawing.Size(265, 16); this.txtVersandoption.TabIndex = 12; // // lblprueftext @@ -498,7 +499,7 @@ this.lblprueftext.AutoSize = true; this.lblprueftext.Location = new System.Drawing.Point(10, 174); this.lblprueftext.Name = "lblprueftext"; - this.lblprueftext.Size = new System.Drawing.Size(43, 13); + this.lblprueftext.Size = new System.Drawing.Size(48, 15); this.lblprueftext.TabIndex = 6; this.lblprueftext.Text = "Prüftext"; // @@ -542,7 +543,7 @@ this.lblprueftextsb2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblprueftextsb2.Location = new System.Drawing.Point(9, 184); this.lblprueftextsb2.Name = "lblprueftextsb2"; - this.lblprueftextsb2.Size = new System.Drawing.Size(51, 13); + this.lblprueftextsb2.Size = new System.Drawing.Size(64, 17); this.lblprueftextsb2.TabIndex = 20; this.lblprueftextsb2.Text = "Prüftext"; // @@ -553,7 +554,7 @@ this.txtAnzahlDokumetneSB.Location = new System.Drawing.Point(151, 126); this.txtAnzahlDokumetneSB.Name = "txtAnzahlDokumetneSB"; this.txtAnzahlDokumetneSB.ReadOnly = true; - this.txtAnzahlDokumetneSB.Size = new System.Drawing.Size(265, 13); + this.txtAnzahlDokumetneSB.Size = new System.Drawing.Size(265, 16); this.txtAnzahlDokumetneSB.TabIndex = 19; // // txtRückantwortSB @@ -573,7 +574,7 @@ this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label16.Location = new System.Drawing.Point(9, 126); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(117, 13); + this.label16.Size = new System.Drawing.Size(148, 17); this.label16.TabIndex = 18; this.label16.Text = "Anzahl Dokumente:"; // @@ -583,7 +584,7 @@ this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label9.Location = new System.Drawing.Point(6, 7); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(72, 13); + this.label9.Size = new System.Drawing.Size(93, 17); this.label9.TabIndex = 14; this.label9.Text = "Versandart:"; // @@ -593,7 +594,7 @@ this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label10.Location = new System.Drawing.Point(6, 33); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(132, 13); + this.label10.Size = new System.Drawing.Size(167, 17); this.label10.TabIndex = 15; this.label10.Text = "Rückantwort-Adresse:"; // @@ -604,7 +605,7 @@ this.txtversandartsb.Location = new System.Drawing.Point(152, 7); this.txtversandartsb.Name = "txtversandartsb"; this.txtversandartsb.ReadOnly = true; - this.txtversandartsb.Size = new System.Drawing.Size(265, 13); + this.txtversandartsb.Size = new System.Drawing.Size(265, 16); this.txtversandartsb.TabIndex = 16; // // btnsendserienbrief @@ -637,7 +638,7 @@ this.lblprueftextSB.AutoSize = true; this.lblprueftextSB.Location = new System.Drawing.Point(9, 154); this.lblprueftextSB.Name = "lblprueftextSB"; - this.lblprueftextSB.Size = new System.Drawing.Size(43, 13); + this.lblprueftextSB.Size = new System.Drawing.Size(48, 15); this.lblprueftextSB.TabIndex = 6; this.lblprueftextSB.Text = "Prüftext"; // @@ -663,7 +664,7 @@ this.rbb1post.Checked = true; this.rbb1post.Location = new System.Drawing.Point(74, 21); this.rbb1post.Name = "rbb1post"; - this.rbb1post.Size = new System.Drawing.Size(62, 17); + this.rbb1post.Size = new System.Drawing.Size(71, 19); this.rbb1post.TabIndex = 5; this.rbb1post.TabStop = true; this.rbb1post.Text = "B1-Post"; @@ -675,7 +676,7 @@ this.rbb2post.AutoSize = true; this.rbb2post.Location = new System.Drawing.Point(6, 21); this.rbb2post.Name = "rbb2post"; - this.rbb2post.Size = new System.Drawing.Size(62, 17); + this.rbb2post.Size = new System.Drawing.Size(71, 19); this.rbb2post.TabIndex = 4; this.rbb2post.Text = "B2-Post"; this.rbb2post.UseVisualStyleBackColor = true; @@ -686,7 +687,7 @@ this.rbversandoption3.AutoSize = true; this.rbversandoption3.Location = new System.Drawing.Point(222, 21); this.rbversandoption3.Name = "rbversandoption3"; - this.rbversandoption3.Size = new System.Drawing.Size(207, 17); + this.rbversandoption3.Size = new System.Drawing.Size(238, 19); this.rbversandoption3.TabIndex = 2; this.rbversandoption3.Text = "Hauptadresse, Postversand erzwingen"; this.rbversandoption3.UseVisualStyleBackColor = true; @@ -697,7 +698,7 @@ this.rbapost.AutoSize = true; this.rbapost.Location = new System.Drawing.Point(142, 21); this.rbapost.Name = "rbapost"; - this.rbapost.Size = new System.Drawing.Size(56, 17); + this.rbapost.Size = new System.Drawing.Size(63, 19); this.rbapost.TabIndex = 3; this.rbapost.Text = "A-Post"; this.rbapost.UseVisualStyleBackColor = true; @@ -708,7 +709,7 @@ this.rbversandoption2.AutoSize = true; this.rbversandoption2.Location = new System.Drawing.Point(222, 21); this.rbversandoption2.Name = "rbversandoption2"; - this.rbversandoption2.Size = new System.Drawing.Size(197, 17); + this.rbversandoption2.Size = new System.Drawing.Size(228, 19); this.rbversandoption2.TabIndex = 1; this.rbversandoption2.Text = "Hauptadresse, E-Banking erzwingen"; this.rbversandoption2.UseVisualStyleBackColor = true; @@ -719,7 +720,7 @@ this.rbversandoption1.AutoSize = true; this.rbversandoption1.Location = new System.Drawing.Point(222, 21); this.rbversandoption1.Name = "rbversandoption1"; - this.rbversandoption1.Size = new System.Drawing.Size(166, 17); + this.rbversandoption1.Size = new System.Drawing.Size(191, 19); this.rbversandoption1.TabIndex = 0; this.rbversandoption1.Text = "Hauptadresse und Versandart"; this.rbversandoption1.UseVisualStyleBackColor = true; @@ -741,16 +742,16 @@ this.treeViewAdv1.AllowDrop = true; this.treeViewAdv1.BackColor = System.Drawing.Color.White; this.treeViewAdv1.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))); - treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo3.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); + treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)}); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(462, 530); this.treeViewAdv1.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat; this.treeViewAdv1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -765,7 +766,7 @@ this.treeViewAdv1.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdv1.HelpTextControl.Location = new System.Drawing.Point(732, 0); this.treeViewAdv1.HelpTextControl.Name = "helpText"; - this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(49, 15); + this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(55, 17); this.treeViewAdv1.HelpTextControl.TabIndex = 0; this.treeViewAdv1.HelpTextControl.Text = "help text"; this.treeViewAdv1.HideSelection = false; @@ -802,7 +803,7 @@ this.treeViewAdv1.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdv1.ToolTipControl.Location = new System.Drawing.Point(642, 0); this.treeViewAdv1.ToolTipControl.Name = "toolTip"; - this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(41, 15); + this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(46, 17); this.treeViewAdv1.ToolTipControl.TabIndex = 1; this.treeViewAdv1.ToolTipControl.Text = "toolTip"; this.treeViewAdv1.TransparentControls = true; @@ -824,17 +825,17 @@ this.pdfViewerControl2.IsTextSearchEnabled = true; this.pdfViewerControl2.IsTextSelectionEnabled = true; this.pdfViewerControl2.Location = new System.Drawing.Point(482, 0); - messageBoxSettings16.EnableNotification = true; - this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings16; + messageBoxSettings4.EnableNotification = true; + this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings4; this.pdfViewerControl2.MinimumZoomPercentage = 50; this.pdfViewerControl2.Name = "pdfViewerControl2"; this.pdfViewerControl2.PageBorderThickness = 1; - pdfViewerPrinterSettings16.Copies = 1; - pdfViewerPrinterSettings16.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; - pdfViewerPrinterSettings16.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; - pdfViewerPrinterSettings16.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings16.PrintLocation"))); - pdfViewerPrinterSettings16.ShowPrintStatusDialog = true; - this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings16; + pdfViewerPrinterSettings4.Copies = 1; + pdfViewerPrinterSettings4.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; + pdfViewerPrinterSettings4.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; + pdfViewerPrinterSettings4.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings4.PrintLocation"))); + pdfViewerPrinterSettings4.ShowPrintStatusDialog = true; + this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings4; this.pdfViewerControl2.ReferencePath = null; this.pdfViewerControl2.ScrollDisplacementValue = 0; this.pdfViewerControl2.ShowHorizontalScrollBar = true; @@ -844,10 +845,10 @@ this.pdfViewerControl2.SpaceBetweenPages = 8; this.pdfViewerControl2.TabIndex = 11; this.pdfViewerControl2.Text = "pdfViewerControl2"; - textSearchSettings16.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); - textSearchSettings16.HighlightAllInstance = true; - textSearchSettings16.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); - this.pdfViewerControl2.TextSearchSettings = textSearchSettings16; + textSearchSettings4.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); + textSearchSettings4.HighlightAllInstance = true; + textSearchSettings4.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); + this.pdfViewerControl2.TextSearchSettings = textSearchSettings4; this.pdfViewerControl2.ThemeName = "Default"; this.pdfViewerControl2.VerticalScrollOffset = 0; this.pdfViewerControl2.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; @@ -891,7 +892,7 @@ this.textBox4.Location = new System.Drawing.Point(156, 165); this.textBox4.Name = "textBox4"; this.textBox4.ReadOnly = true; - this.textBox4.Size = new System.Drawing.Size(265, 13); + this.textBox4.Size = new System.Drawing.Size(265, 16); this.textBox4.TabIndex = 25; // // label17 @@ -900,7 +901,7 @@ this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label17.Location = new System.Drawing.Point(12, 165); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(89, 13); + this.label17.Size = new System.Drawing.Size(113, 17); this.label17.TabIndex = 24; this.label17.Text = "Anzahl Seiten:"; // @@ -911,7 +912,7 @@ this.textBox3.Location = new System.Drawing.Point(156, 141); this.textBox3.Name = "textBox3"; this.textBox3.ReadOnly = true; - this.textBox3.Size = new System.Drawing.Size(265, 13); + this.textBox3.Size = new System.Drawing.Size(265, 16); this.textBox3.TabIndex = 23; // // label13 @@ -920,7 +921,7 @@ this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label13.Location = new System.Drawing.Point(12, 141); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(117, 13); + this.label13.Size = new System.Drawing.Size(148, 17); this.label13.TabIndex = 22; this.label13.Text = "Anzahl Dokumente:"; // @@ -941,7 +942,7 @@ this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label11.Location = new System.Drawing.Point(10, 19); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(72, 13); + this.label11.Size = new System.Drawing.Size(93, 17); this.label11.TabIndex = 18; this.label11.Text = "Versandart:"; // @@ -951,7 +952,7 @@ this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label12.Location = new System.Drawing.Point(10, 45); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(132, 13); + this.label12.Size = new System.Drawing.Size(167, 17); this.label12.TabIndex = 19; this.label12.Text = "Rückantwort-Adresse:"; // @@ -962,7 +963,7 @@ this.textBox2.Location = new System.Drawing.Point(156, 19); this.textBox2.Name = "textBox2"; this.textBox2.ReadOnly = true; - this.textBox2.Size = new System.Drawing.Size(265, 13); + this.textBox2.Size = new System.Drawing.Size(265, 16); this.textBox2.TabIndex = 20; // // treeViewAdvCouverts @@ -971,16 +972,16 @@ this.treeViewAdvCouverts.AllowMouseBasedSelection = true; this.treeViewAdvCouverts.BackColor = System.Drawing.Color.White; this.treeViewAdvCouverts.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))); - treeNodeAdvStyleInfo4.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo4.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo4.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo4.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - treeNodeAdvStyleInfo4.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo4.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo4.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); + treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo2.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); this.treeViewAdvCouverts.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo4)}); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)}); this.treeViewAdvCouverts.BeforeTouchSize = new System.Drawing.Size(476, 397); this.treeViewAdvCouverts.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat; this.treeViewAdvCouverts.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -995,7 +996,7 @@ this.treeViewAdvCouverts.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdvCouverts.HelpTextControl.Location = new System.Drawing.Point(732, 0); this.treeViewAdvCouverts.HelpTextControl.Name = "helpText"; - this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(49, 15); + this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(55, 17); this.treeViewAdvCouverts.HelpTextControl.TabIndex = 0; this.treeViewAdvCouverts.HelpTextControl.Text = "help text"; this.treeViewAdvCouverts.HideSelection = false; @@ -1032,7 +1033,7 @@ this.treeViewAdvCouverts.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdvCouverts.ToolTipControl.Location = new System.Drawing.Point(642, 0); this.treeViewAdvCouverts.ToolTipControl.Name = "toolTip"; - this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(41, 15); + this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(46, 17); this.treeViewAdvCouverts.ToolTipControl.TabIndex = 1; this.treeViewAdvCouverts.ToolTipControl.Text = "toolTip"; this.treeViewAdvCouverts.TransparentControls = true; @@ -1045,19 +1046,19 @@ this.versandCouvertLöschenToolStripMenuItem, this.versandCouvertÖffnenbearbeitenToolStripMenuItem}); this.contextMenuStrip2.Name = "contextMenuStrip2"; - this.contextMenuStrip2.Size = new System.Drawing.Size(262, 48); + this.contextMenuStrip2.Size = new System.Drawing.Size(313, 52); // // versandCouvertLöschenToolStripMenuItem // this.versandCouvertLöschenToolStripMenuItem.Name = "versandCouvertLöschenToolStripMenuItem"; - this.versandCouvertLöschenToolStripMenuItem.Size = new System.Drawing.Size(261, 22); + this.versandCouvertLöschenToolStripMenuItem.Size = new System.Drawing.Size(312, 24); this.versandCouvertLöschenToolStripMenuItem.Text = "Versand-Couvert löschen"; this.versandCouvertLöschenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertLöschenToolStripMenuItem_Click); // // versandCouvertÖffnenbearbeitenToolStripMenuItem // this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Name = "versandCouvertÖffnenbearbeitenToolStripMenuItem"; - this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Size = new System.Drawing.Size(261, 22); + this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Size = new System.Drawing.Size(312, 24); this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Text = "Versand-Couvert öffnen/bearbeiten"; this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertÖffnenbearbeitenToolStripMenuItem_Click); // @@ -1194,7 +1195,7 @@ this.lblprieveiwbezeichnung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblprieveiwbezeichnung.Location = new System.Drawing.Point(7, 16); this.lblprieveiwbezeichnung.Name = "lblprieveiwbezeichnung"; - this.lblprieveiwbezeichnung.Size = new System.Drawing.Size(0, 20); + this.lblprieveiwbezeichnung.Size = new System.Drawing.Size(0, 25); this.lblprieveiwbezeichnung.TabIndex = 0; // // panel2 @@ -1218,6 +1219,17 @@ this.panel3.Size = new System.Drawing.Size(462, 138); this.panel3.TabIndex = 8; // + // richTextBox1 + // + this.richTextBox1.BackColor = System.Drawing.Color.LightGray; + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.richTextBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.richTextBox1.Location = new System.Drawing.Point(3, 0); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(453, 132); + this.richTextBox1.TabIndex = 1; + this.richTextBox1.Text = ""; + // // lblerror // this.lblerror.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -1241,7 +1253,7 @@ this.lblpostausgang.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblpostausgang.Location = new System.Drawing.Point(1238, 49); this.lblpostausgang.Name = "lblpostausgang"; - this.lblpostausgang.Size = new System.Drawing.Size(135, 20); + this.lblpostausgang.Size = new System.Drawing.Size(166, 25); this.lblpostausgang.TabIndex = 24; this.lblpostausgang.Text = "labelpostausgang"; this.lblpostausgang.Visible = false; @@ -1266,7 +1278,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(9, 22); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(143, 13); + this.label1.Size = new System.Drawing.Size(163, 15); this.label1.TabIndex = 21; this.label1.Text = "Fortschritt Dokumentversand"; // @@ -1300,7 +1312,7 @@ this.lblProgressTitel.AutoSize = true; this.lblProgressTitel.Location = new System.Drawing.Point(12, 9); this.lblProgressTitel.Name = "lblProgressTitel"; - this.lblProgressTitel.Size = new System.Drawing.Size(0, 13); + this.lblProgressTitel.Size = new System.Drawing.Size(0, 15); this.lblProgressTitel.TabIndex = 19; // // label3 @@ -1308,7 +1320,7 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(435, 78); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(25, 13); + this.label3.Size = new System.Drawing.Size(28, 15); this.label3.TabIndex = 18; this.label3.Text = "100"; // @@ -1317,7 +1329,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 78); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(13, 13); + this.label2.Size = new System.Drawing.Size(14, 15); this.label2.TabIndex = 17; this.label2.Text = "0"; // @@ -1336,32 +1348,26 @@ this.ribbonButton3.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton3.SmallImage"))); this.ribbonButton3.Text = "Anzeige Adressposition"; // - // htmlParser1 - // - - // - // richTextBox1 - // - this.richTextBox1.BackColor = System.Drawing.Color.LightGray; - this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.richTextBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.richTextBox1.Location = new System.Drawing.Point(3, 0); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(453, 132); - this.richTextBox1.TabIndex = 1; - this.richTextBox1.Text = ""; - // // lblserienbrief // this.lblserienbrief.AutoSize = true; this.lblserienbrief.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblserienbrief.Location = new System.Drawing.Point(1236, 48); this.lblserienbrief.Name = "lblserienbrief"; - this.lblserienbrief.Size = new System.Drawing.Size(101, 20); + this.lblserienbrief.Size = new System.Drawing.Size(125, 25); this.lblserienbrief.TabIndex = 26; this.lblserienbrief.Text = "lblSerienbrief"; this.lblserienbrief.Visible = false; // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(24, 41); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(167, 15); + this.label5.TabIndex = 13; + this.label5.Text = "(Rückversand: max. 5 Blätter)"; + // // Versandstrasse // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1510,5 +1516,6 @@ private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.Label lblserienbrief; + private System.Windows.Forms.Label label5; } } \ No newline at end of file diff --git a/Client/Versandstrasse/Versandstrasse.cs b/Client/Versandstrasse/Versandstrasse.cs index ce7ccfa1..ca9ef772 100644 --- a/Client/Versandstrasse/Versandstrasse.cs +++ b/Client/Versandstrasse/Versandstrasse.cs @@ -109,7 +109,7 @@ namespace OnDoc.Versandstrasse treeViewAdvAdresse.Nodes.Add(node); } - treeViewAdvAdresse.SelectedNode = treeViewAdvAdresse.Nodes[0]; + //treeViewAdvAdresse.SelectedNode = 0; treeViewAdvAdresse.Enabled = false; db = null; @@ -224,6 +224,11 @@ namespace OnDoc.Versandstrasse { if (node.Level == 1) { Verify_Couvert(node); } } + try + { + treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0]; + } + catch { } } private void set_nodeimage(TreeNodeAdv node, int img) @@ -363,14 +368,34 @@ namespace OnDoc.Versandstrasse { if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0) { - if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; add_errormessage(2,"Im Versand-Couvert liegt an erstes Position ein Dokument, welches nicht als vorderstes Dokument tauglich ist."); } + if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; add_errormessage(2,"Im Versand-Couvert liegt an erster Position ein Dokument, welches nicht als vorderstes Dokument tauglich ist"); } else { set_nodeimage(dokumentnode, 5); } + db.Get_Tabledata("Select unterschriftlinks, unterschriftrechts, signiert from dokument where dokumentid='" + dokumentnode.Tag + "'", false, true); + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) != 0 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) != 0){ + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0) + { + set_nodeimage(dokumentnode, 4); + versandbereit = false; + add_errormessage(7, "Im Versand-Couvert sind Dokumente mit fehlender faksimiler Unterschrift"); + } + } } + else + { + db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='"+dokumentnode.Tag + "'", false, true); + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) >1 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) >1 ){ + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0){ + set_nodeimage(dokumentnode, 2); + versandbereit = false; + add_errormessage(7, "Im Versand-Couvert sind Dokumente mit fehlender faksimiler Unterschrift"); + } + } + } } if (node.Nodes.Count == 0) { @@ -475,6 +500,10 @@ namespace OnDoc.Versandstrasse TreeViewDropPositions dropPosition = this.treeViewDragHighlightTracker.DropPosition; this.treeViewDragHighlightTracker.ClearHighlightNode(); this.currentSourceNode = null; + if (sourceNode.Level == 0) { + return; + } + if (destinationNode != null) { switch (dropPosition) @@ -486,11 +515,11 @@ namespace OnDoc.Versandstrasse sourceNode.Move(destinationNode, NodePositions.Next); break; case TreeViewDropPositions.OnNode: + Versandpaket sourcepaket = sourceNode.Parent.TagObject as Versandpaket; TreeNodeAdv savenode = sourceNode.Parent; sourceNode.Move(destinationNode.Nodes); - //gaga - + //Versanddokument dem neuen Versandpaket zuordnen Versandpaket paket = destinationNode.TagObject as Versandpaket; Versanddokument vd = sourceNode.TagObject as Versanddokument; @@ -552,6 +581,8 @@ namespace OnDoc.Versandstrasse TreeNodeAdv xdestinationNode = this.treeViewDragHighlightTracker.HighlightNode; TreeViewDropPositions dropPosition = this.treeViewDragHighlightTracker.DropPosition; + if (sourceNode.Level==1) { return false; } + if (destinationNode == null || destinationNode == sourceNode) return false; @@ -744,6 +775,7 @@ namespace OnDoc.Versandstrasse paket.finaldoc = stapel; + var finalestream = new MemoryStream(Convert.FromBase64String(stapel)); this.pdfViewerControl1.Load(finalestream); @@ -762,12 +794,13 @@ namespace OnDoc.Versandstrasse this.txtAnzahlDokumente.Text = paket.Dokument.Count().ToString(); lblprieveiwbezeichnung.Text = "Aufbereitetes PDF"; } - catch { } + catch (Exception ex) { MessageBox.Show(ex.Message); + } panelPrepare.Visible = false; Cursor = Cursors.Default; Application.DoEvents(); - } + } private string save_stapel(ref Stream[] streams) { @@ -1141,7 +1174,7 @@ namespace OnDoc.Versandstrasse GrpPaketDetails.Enabled = false; } } - catch { } + catch (Exception ex) { } finally { Cursor.Current=Cursors.Default; } } @@ -1305,6 +1338,8 @@ namespace OnDoc.Versandstrasse Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket; pakete.Remove(vp); treeViewAdv1.SelectedNode.Remove(); + this.pdfViewerControl1.Unload(); + } } diff --git a/Client/Versandstrasse/Versandstrasse.resx b/Client/Versandstrasse/Versandstrasse.resx index 0b5f0df5..51d845f8 100644 --- a/Client/Versandstrasse/Versandstrasse.resx +++ b/Client/Versandstrasse/Versandstrasse.resx @@ -127,63 +127,63 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADy - DAAAAk1TRnQBSQFMAgEBBgIAAQEBAAEBARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA - AUADAAEgAwABAQEAAQgGAAEIGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA - AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA - AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm - AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ - AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm - AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz - AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm - AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm - AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA - ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm - AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm - ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm - AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA - AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ - AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz - AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/ - AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA - AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM - AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm - ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ - AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/ - ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM - ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm - AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM - AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA - AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA - ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7 - Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/8CAAHzAeMKRwHzAwAB8gGS - CuwB8yIAAfMDRwkXAfQCAAHyA+wJ7QHzIgAB4wFHAb0B9AvzAf8BkgHsAbwB8wvyAf8gAAJHAfQMRwEX - AuwB8wzsAe0gAAFHARcB8wVHAxcFRwHsAe0B8wXsA+0F7CAAAUcBFwHzA0cBlAH/AwAB/wEXA0cB7AHt - AfMD7AHvAf8DAAH/Ae0D7CAAAUcBFwHzA0cBmQEAAf8C8wEbBEcB7AHtAfMD7AG8AQAB/wLzAfEE7CAA - AUcBFwHzA0cBBwEAAfMHRwHsAe0B8wPsAQcBAAHzB+wgAAFHARcB8wNHARcB/wEAAfMBFgVHAewB7QHz - A+wB7QH/AQAB8wHvBewgAAFHARcB8wRHARcB8wL/Ab0ERwHsAe0B8wTsAe0B8wL/AQcE7CAAAUcBFwHz - A0cBFgEbARcBFgL/BEcB7AHtAfMD7AHvAfIB7QGSAv8E7CAAAUcBFwHzA0cBvQEAAb0BRwH0AQABFwNH - AewB7QHzA+wB8AEAAQcB7AH0AQAB7QPsIAABRwEXAfMDRwEWA/8BAAH0BEcB7AHtAfMD7AH3A/8BAAHz - BOwgAAHzAfQB8wRHARYC8wG9ARcERwPzBOwB7wHyAfMB8AHtBOwiAAHzDUcCAAHzDewiAAH/ARcLRwGU - AgAB/wHtC+wB7yQAAf8BvQEWARcBjwGxAb0B/wgAAfQBvAGSAuwBkgG8AfQEAAH0DpQB8wH0AQcM7wEH - AfMCAAH/Ab0BFwKPAm8BagKPAb0B/wQAAf8BBwjsAQcB/wIAAZQPRwHvD+wBAAH/AbcDjwGOARYCbwFq - Ao8BtwH/AgAB/wHvCuwB7wH/AQABFg9HAe8P7AEAAb0DjwIXAhYBbwEXAWoCjwG9AgABBwPsAe0BBwfs - AQcBAAEWBkcBFwEWARcGRwHvBuwB7QHvAZIG7AH/ARcBjwEXAfMB/wG9ARcBFgG9Af8B8wFqAo8B/wH0 - BOwB8wH/AbwH7AH0ARYGRwHjAf8BtwZHAe8G7AH3Af8BvAbsAb0CjwHjA/8CvQP/ARcBagGPAb0BvAPs - AfID/wHwBuwBvAEWBkcB4wH/AbcGRwHvBuwB9wH/AbwG7AEWA48BvQb/Ab0CbwFqAbEBkgLsAfEC/wEH - Av8B8QXsAZIBFgZHAeMB/wG3BkcB7wbsAfcB/wG8BuwBFwOPARcBvQT/Ab0CFgJvAY8C7AEHAv8B9wHs - Ae8C/wHyBewBFgZHAeMB/wG3BkcB7wbsAfcB/wG8BuwBFwOPARcBvQT/Ab0BFwIWAW8BFwLsAQcB/wHv - A+wB9wL/AfMB7QPsARYGRwHjAf8BtwZHAe8G7AH3Af8BvAbsARYDjwG9Bv8BvQEXAY4BjwEWAZII7AGS - AfQB/wHzAe0B7AGSARYGRwHjAf8BtwZHAe8G7AH3Af8BvAbsAb0CjwHjA/8CvQP/ARcCjwG9AbwJ7AHt - AfQB/wEHAewBvAEWBkcB4wH/AbcGRwHvBuwB9wH/AbwG7AH/ARcBjwEXAfMB/wG9AhcBvQH/AfMCjwEX - Af8B9ArsAe0BBwHtAewB9AEWBEcBFwG3Ab0B/wG3BkcB7wTsAe0BvAHxAf8BvAbsAQABvQKPARcB4wSP - AeMBFwKPAb0CAAEHDOwBBwEAARYERwEXA/8BtwZHAe8E7AGSA/8BvAbsAQAB/wG3Co8BtwH/AgAB/wHv - CuwB7wH/AQABFgVHA+MBFwZHAe8E7AHtA/cBkgbsAgAB/wG9ARcGjwEXAb0B/wQAAf8BBwjsAQcB/wIA - ARYPRwHvD+wEAAH/Ab0BFgIXARYBvQH/CAAB9AG8AZIC7AGSAbwB9AQAARsORwG9AfIO7AEHAUIBTQE+ - BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/8BAAGAAQMBgAEDBQABAwEAAQMdAAHgAQAB4AQA - AQEBAAEBBQABAQEAAQEGAAGAAQABgBQAAQEBEAEBARAFAAEgAQABIAwAAcABAAHABQABwAEAAcAFAAHw - AQ8B8AEPBAABwAEDAcABAwQAAYABAQGAAQEEAAGAAQEBgAEBRAABgAEBAYABAQQAAYABAQGAAQEEAAHA - AQMBwAEDBAAB8AEPAfABDwQACw== + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0 + DAAAAk1TRnQBSQFMAgEBBgEAARgBAQEYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wIAAfMB4wpHAfMDAAHy + AZIK7AHzIgAB8wNHCRcB9AIAAfID7AntAfMiAAHjAUcBvQH0C/MB/wGSAewBvAHzC/IB/yAAAkcB9AxH + ARcC7AHzDOwB7SAAAUcBFwHzBUcDFwVHAewB7QHzBewD7QXsIAABRwEXAfMDRwGUAf8DAAH/ARcDRwHs + Ae0B8wPsAe8B/wMAAf8B7QPsIAABRwEXAfMDRwGZAQAB/wLzARsERwHsAe0B8wPsAbwBAAH/AvMB8QTs + IAABRwEXAfMDRwEHAQAB8wdHAewB7QHzA+wBBwEAAfMH7CAAAUcBFwHzA0cBFwH/AQAB8wEWBUcB7AHt + AfMD7AHtAf8BAAHzAe8F7CAAAUcBFwHzBEcBFwHzAv8BvQRHAewB7QHzBOwB7QHzAv8BBwTsIAABRwEX + AfMDRwEWARsBFwEWAv8ERwHsAe0B8wPsAe8B8gHtAZIC/wTsIAABRwEXAfMDRwG9AQABvQFHAfQBAAEX + A0cB7AHtAfMD7AHwAQABBwHsAfQBAAHtA+wgAAFHARcB8wNHARYD/wEAAfQERwHsAe0B8wPsAfcD/wEA + AfME7CAAAfMB9AHzBEcBFgLzAb0BFwRHA/ME7AHvAfIB8wHwAe0E7CIAAfMNRwIAAfMN7CIAAf8BFwtH + AZQCAAH/Ae0L7AHvJAAB/wG9ARYBFwGPAbEBvQH/CAAB9AG8AZIC7AGSAbwB9AQAAfQOlAHzAfQBBwzv + AQcB8wIAAf8BvQEXAo8CbwFqAo8BvQH/BAAB/wEHCOwBBwH/AgABlA9HAe8P7AEAAf8BtwOPAY4BFgJv + AWoCjwG3Af8CAAH/Ae8K7AHvAf8BAAEWD0cB7w/sAQABvQOPAhcCFgFvARcBagKPAb0CAAEHA+wB7QEH + B+wBBwEAARYGRwEXARYBFwZHAe8G7AHtAe8BkgbsAf8BFwGPARcB8wH/Ab0BFwEWAb0B/wHzAWoCjwH/ + AfQE7AHzAf8BvAfsAfQBFgZHAeMB/wG3BkcB7wbsAfcB/wG8BuwBvQKPAeMD/wK9A/8BFwFqAY8BvQG8 + A+wB8gP/AfAG7AG8ARYGRwHjAf8BtwZHAe8G7AH3Af8BvAbsARYDjwG9Bv8BvQJvAWoBsQGSAuwB8QL/ + AQcC/wHxBewBkgEWBkcB4wH/AbcGRwHvBuwB9wH/AbwG7AEXA48BFwG9BP8BvQIWAm8BjwLsAQcC/wH3 + AewB7wL/AfIF7AEWBkcB4wH/AbcGRwHvBuwB9wH/AbwG7AEXA48BFwG9BP8BvQEXAhYBbwEXAuwBBwH/ + Ae8D7AH3Av8B8wHtA+wBFgZHAeMB/wG3BkcB7wbsAfcB/wG8BuwBFgOPAb0G/wG9ARcBjgGPARYBkgjs + AZIB9AH/AfMB7QHsAZIBFgZHAeMB/wG3BkcB7wbsAfcB/wG8BuwBvQKPAeMD/wK9A/8BFwKPAb0BvAns + Ae0B9AH/AQcB7AG8ARYGRwHjAf8BtwZHAe8G7AH3Af8BvAbsAf8BFwGPARcB8wH/Ab0CFwG9Af8B8wKP + ARcB/wH0CuwB7QEHAe0B7AH0ARYERwEXAbcBvQH/AbcGRwHvBOwB7QG8AfEB/wG8BuwBAAG9Ao8BFwHj + BI8B4wEXAo8BvQIAAQcM7AEHAQABFgRHARcD/wG3BkcB7wTsAZID/wG8BuwBAAH/AbcKjwG3Af8CAAH/ + Ae8K7AHvAf8BAAEWBUcD4wEXBkcB7wTsAe0D9wGSBuwCAAH/Ab0BFwaPARcBvQH/BAAB/wEHCOwBBwH/ + AgABFg9HAe8P7AQAAf8BvQEWAhcBFgG9Af8IAAH0AbwBkgLsAZIBvAH0BAABGw5HAb0B8g7sAQcBQgFN + AT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/wEAAYABAwGAAQMFAAEDAQABAx0AAeABAAHg + BAABAQEAAQEFAAEBAQABAQYAAYABAAGAFAABAQEQAQEBEAUAASABAAEgDAABwAEAAcAFAAHAAQABwAUA + AfABDwHwAQ8EAAHAAQMBwAEDBAABgAEBAYABAQQAAYABAQGAAQFEAAGAAQEBgAEBBAABgAEBAYABAQQA + AcABAwHAAQMEAAHwAQ8B8AEPBAAL @@ -194,7 +194,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU - DAAAAk1TRnQBSQFMAgEBBQEAAQgBAQEIAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBQEAASABAQEgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -248,7 +248,7 @@ AYABAQIAAeABBwHAAQMBwAEDAgAB8AEPAfABDwHwAQ8BgAEBCw== - + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh @@ -337,7 +337,7 @@ /wM19F1wo1uqCAAAAABJRU5ErkJggg== - + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh @@ -355,7 +355,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq - CQAAAk1TRnQBSQFMAgEBAwEAAcgBAAHIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAAeABAAHgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -414,71 +414,6 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== - - - 763, 17 - - - <?xml version="1.0" encoding="utf-16"?> -<LexScheme xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <Author>AlterNET Software</Author> - <Copyright>Copyright (c) 2016-2023 Alternet Software</Copyright> - <FileType>html</FileType> - <Version>1.5</Version> - <Styles> - <Style> - <Name>idents</Name> - <ForeColor>ControlText</ForeColor> - </Style> - <Style> - <Name>numbers</Name> - <ForeColor>ControlText</ForeColor> - </Style> - <Style> - <Name>reswords</Name> - <ForeColor>Blue</ForeColor> - </Style> - <Style> - <Name>comments</Name> - <ForeColor>Green</ForeColor> - <PlainText>true</PlainText> - </Style> - <Style> - <Name>xmlcomments</Name> - <ForeColor>Gray</ForeColor> - </Style> - <Style> - <Name>symbols</Name> - <ForeColor>ControlText</ForeColor> - </Style> - <Style> - <Name>whitespace</Name> - <ForeColor>WindowText</ForeColor> - </Style> - <Style> - <Name>strings</Name> - <ForeColor>Maroon</ForeColor> - <PlainText>true</PlainText> - </Style> - <Style> - <Name>directives</Name> - <ForeColor>Blue</ForeColor> - </Style> - <Style> - <Name>htmlparams</Name> - <ForeColor>Red</ForeColor> - </Style> - <Style> - <Name>syntax errors</Name> - <ForeColor>Red</ForeColor> - </Style> - <Style> - <Name>code snippets</Name> - <ForeColor>Black</ForeColor> - <BackColor>255:255:231:160</BackColor> - </Style> - </Styles> -</LexScheme> diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index 6aa52502..00742519 100644 Binary files a/Client/bin/Debug/DOCGEN.dll and b/Client/bin/Debug/DOCGEN.dll differ diff --git a/Client/bin/Debug/DOCGEN.pdb b/Client/bin/Debug/DOCGEN.pdb index b9e716cf..7ddfd298 100644 Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ diff --git a/Client/bin/Debug/Images/Exemplar_für_die_Bank.jpg b/Client/bin/Debug/Images/Exemplar_für_die_Bank.jpg new file mode 100644 index 00000000..4ed10bab Binary files /dev/null and b/Client/bin/Debug/Images/Exemplar_für_die_Bank.jpg differ diff --git a/Client/bin/Debug/Images/Exemplar_für_die_Bank1.png b/Client/bin/Debug/Images/Exemplar_für_die_Bank1.png new file mode 100644 index 00000000..c137d301 Binary files /dev/null and b/Client/bin/Debug/Images/Exemplar_für_die_Bank1.png differ diff --git a/Client/bin/Debug/Images/tkb_logo_ohne_claim_4c_c1.jpg b/Client/bin/Debug/Images/tkb_logo_ohne_claim_4c_c1.jpg new file mode 100644 index 00000000..1525d578 Binary files /dev/null and b/Client/bin/Debug/Images/tkb_logo_ohne_claim_4c_c1.jpg differ diff --git a/Client/bin/Debug/Logging.dll b/Client/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/Client/bin/Debug/Logging.dll and b/Client/bin/Debug/Logging.dll differ diff --git a/Client/bin/Debug/Logging.pdb b/Client/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/Client/bin/Debug/Logging.pdb and b/Client/bin/Debug/Logging.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 9ccbb91c..f6cff9cb 100644 Binary files a/Client/bin/Debug/OnDoc.exe and b/Client/bin/Debug/OnDoc.exe differ diff --git a/Client/bin/Debug/OnDoc.pdb b/Client/bin/Debug/OnDoc.pdb index e77c761f..7d0a4297 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/OnDocClient.zip b/Client/bin/Debug/OnDocClient.zip index 1ef1959d..8c2cec8c 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/OnDocOffice.dll b/Client/bin/Debug/OnDocOffice.dll index d3d90f53..7237ca85 100644 Binary files a/Client/bin/Debug/OnDocOffice.dll and b/Client/bin/Debug/OnDocOffice.dll differ diff --git a/Client/bin/Debug/OnDocOffice.pdb b/Client/bin/Debug/OnDocOffice.pdb index 057660e0..cbc634ef 100644 Binary files a/Client/bin/Debug/OnDocOffice.pdb and b/Client/bin/Debug/OnDocOffice.pdb differ diff --git a/Client/bin/Debug/Versandstrasse.dll b/Client/bin/Debug/Versandstrasse.dll index e55f65aa..5bb758ff 100644 Binary files a/Client/bin/Debug/Versandstrasse.dll and b/Client/bin/Debug/Versandstrasse.dll differ diff --git a/Client/bin/Debug/Versandstrasse.pdb b/Client/bin/Debug/Versandstrasse.pdb index ce27e3f9..3b80a4f4 100644 Binary files a/Client/bin/Debug/Versandstrasse.pdb and b/Client/bin/Debug/Versandstrasse.pdb differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index 59e836d2..0ac8812e 100644 Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index 4cc66eb2..8b1642e8 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt index a647cb4c..de881d3b 100644 --- a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt +++ b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt @@ -269,7 +269,6 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Tools.Windows.dll E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.TreeMap.Windows.dll E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.XlsIO.Base.dll E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\VBFileManagement.dll -E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Versandstrasse.dll E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\WinSign.dll E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.dll E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\VBOffice.dll @@ -379,3 +378,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.pdb E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.FrmDokumentwerte.resources E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.FrmExternalDocEdit.resources +E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Versandstrasse.dll diff --git a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources index 2031307b..b72f7eba 100644 Binary files a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources and b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources differ diff --git a/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources index 1d043032..b805fa5c 100644 Binary files a/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources and b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 9ccbb91c..f6cff9cb 100644 Binary files a/Client/obj/Debug/OnDoc.exe and b/Client/obj/Debug/OnDoc.exe differ diff --git a/Client/obj/Debug/OnDoc.pdb b/Client/obj/Debug/OnDoc.pdb index e77c761f..7d0a4297 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index c443da5f..0c91142a 100644 Binary files a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index 59e836d2..0ac8812e 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/Klassen/SyncFWord.cs b/DOCGEN/Klassen/SyncFWord.cs index d224d4ad..c894e6d9 100644 --- a/DOCGEN/Klassen/SyncFWord.cs +++ b/DOCGEN/Klassen/SyncFWord.cs @@ -546,8 +546,14 @@ namespace DOCGEN.Klassen if (document.ProtectionType == ProtectionType.NoProtection) { WParagraph paragraph = document.Sections[0].Paragraphs[0] as WParagraph; + //BookmarkStart bookmarkStart = new BookmarkStart(document, dm.BookMark); + //paragraph.Items.Insert(0, bookmarkStart); + BookmarkStart bookmarkStart = new BookmarkStart(document, dm.BookMark); + BookmarkEnd bookmarkEnd = new BookmarkEnd(document, dm.BookMark); paragraph.Items.Insert(0, bookmarkStart); + paragraph.Items.Insert(2, bookmarkEnd); + } else { @@ -901,11 +907,13 @@ namespace DOCGEN.Klassen if (docData.barcode_horizontal == 0) { barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 300, 50, docData.barcode_zusatz, "Futur Book", 8,270); + //barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 429, 52, docData.barcode_zusatz, "Futur Book", 8, 270); } else { barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 300, 50, docData.barcode_zusatz, "Futur Book", 8, 0); + //barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 429, 52, docData.barcode_zusatz, "Futur Book", 8, 0); } diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index 6aa52502..00742519 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.dll and b/DOCGEN/bin/Debug/DOCGEN.dll differ diff --git a/DOCGEN/bin/Debug/DOCGEN.pdb b/DOCGEN/bin/Debug/DOCGEN.pdb index b9e716cf..7ddfd298 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/bin/Debug/Logging.dll b/DOCGEN/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/DOCGEN/bin/Debug/Logging.dll and b/DOCGEN/bin/Debug/Logging.dll differ diff --git a/DOCGEN/bin/Debug/Logging.pdb b/DOCGEN/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/DOCGEN/bin/Debug/Logging.pdb and b/DOCGEN/bin/Debug/Logging.pdb differ diff --git a/DOCGEN/bin/Debug/OnDocOffice.dll b/DOCGEN/bin/Debug/OnDocOffice.dll index d3d90f53..7237ca85 100644 Binary files a/DOCGEN/bin/Debug/OnDocOffice.dll and b/DOCGEN/bin/Debug/OnDocOffice.dll differ diff --git a/DOCGEN/bin/Debug/OnDocOffice.pdb b/DOCGEN/bin/Debug/OnDocOffice.pdb index 057660e0..cbc634ef 100644 Binary files a/DOCGEN/bin/Debug/OnDocOffice.pdb and b/DOCGEN/bin/Debug/OnDocOffice.pdb differ diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index 6aa52502..00742519 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.dll and b/DOCGEN/obj/Debug/DOCGEN.dll differ diff --git a/DOCGEN/obj/Debug/DOCGEN.pdb b/DOCGEN/obj/Debug/DOCGEN.pdb index b9e716cf..7ddfd298 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.pdb and b/DOCGEN/obj/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index 29b8c9a7..59f4cf9e 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/Database/bin/Debug/Logging.dll b/Database/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/Database/bin/Debug/Logging.dll and b/Database/bin/Debug/Logging.dll differ diff --git a/Database/bin/Debug/Logging.pdb b/Database/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/Database/bin/Debug/Logging.pdb and b/Database/bin/Debug/Logging.pdb differ diff --git a/Database/obj/Debug/Database.csproj.AssemblyReference.cache b/Database/obj/Debug/Database.csproj.AssemblyReference.cache index fb3188ed..09b5b46f 100644 Binary files a/Database/obj/Debug/Database.csproj.AssemblyReference.cache and b/Database/obj/Debug/Database.csproj.AssemblyReference.cache differ diff --git a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache index 706eb1a2..d66b1c70 100644 Binary files a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache and b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache differ diff --git a/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache b/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache index c3b45089..9234e2fa 100644 Binary files a/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache and b/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache differ diff --git a/Logging/Logging.cs b/Logging/Logging.cs index 390952dd..d386ddba 100644 --- a/Logging/Logging.cs +++ b/Logging/Logging.cs @@ -191,4 +191,101 @@ namespace Logging return false; } } + + public class VersandstrasseLog + { + + private static readonly NLog.Logger Logger = NLog.LogManager.GetLogger("Versandstrasse"); + + public static string connectionstring { get; set; } = ""; + public static string IntLogLevel { get; set; } = ""; + public static string IntUserID { get; set; } = "*"; + + public static void init_logger() + { + var dbTarget = LogManager.Configuration.FindTargetByName("Versandstrasse"); + dbTarget.ConnectionString = connectionstring; + } + + public static void Info(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Info") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paketid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Info(message); + + } + public static void Warning(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Warning") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paketid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Warn(message); + } + public static void Error(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Error") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paektid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Error(message); + } + + public static void Fatal(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Fatal") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paketid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Fatal(message); + } + public static void Trance(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Trace") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paketid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Trace(message); + } + public static void Debug(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Debug") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paketid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Debug(message); + } + + + private static Boolean DoLogging(string Loglevel) + { + if (IntUserID != "*") + { + if (IntUserID.Contains(System.Security.Principal.WindowsIdentity.GetCurrent().Name)) + { + if (IntLogLevel.Contains(Loglevel)) + { + return true; + } + } + } + else + { + if (IntLogLevel.Contains(Loglevel)) + { + return true; + } + } + return false; + } + } + } diff --git a/Logging/bin/Debug/Logging.dll b/Logging/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/Logging/bin/Debug/Logging.dll and b/Logging/bin/Debug/Logging.dll differ diff --git a/Logging/bin/Debug/Logging.pdb b/Logging/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/Logging/bin/Debug/Logging.pdb and b/Logging/bin/Debug/Logging.pdb differ diff --git a/Logging/obj/Debug/Logging.dll b/Logging/obj/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/Logging/obj/Debug/Logging.dll and b/Logging/obj/Debug/Logging.dll differ diff --git a/Logging/obj/Debug/Logging.pdb b/Logging/obj/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/Logging/obj/Debug/Logging.pdb and b/Logging/obj/Debug/Logging.pdb differ diff --git a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache index c2355c3a..251f8832 100644 Binary files a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache and b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/bin/Debug/DOCGEN.dll b/OnDocOffice/bin/Debug/DOCGEN.dll index 6aa52502..00742519 100644 Binary files a/OnDocOffice/bin/Debug/DOCGEN.dll and b/OnDocOffice/bin/Debug/DOCGEN.dll differ diff --git a/OnDocOffice/bin/Debug/DOCGEN.pdb b/OnDocOffice/bin/Debug/DOCGEN.pdb index b9e716cf..7ddfd298 100644 Binary files a/OnDocOffice/bin/Debug/DOCGEN.pdb and b/OnDocOffice/bin/Debug/DOCGEN.pdb differ diff --git a/OnDocOffice/bin/Debug/Logging.dll b/OnDocOffice/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/OnDocOffice/bin/Debug/Logging.dll and b/OnDocOffice/bin/Debug/Logging.dll differ diff --git a/OnDocOffice/bin/Debug/Logging.pdb b/OnDocOffice/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/OnDocOffice/bin/Debug/Logging.pdb and b/OnDocOffice/bin/Debug/Logging.pdb differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.dll b/OnDocOffice/bin/Debug/OnDocOffice.dll index d3d90f53..7237ca85 100644 Binary files a/OnDocOffice/bin/Debug/OnDocOffice.dll and b/OnDocOffice/bin/Debug/OnDocOffice.dll differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.pdb b/OnDocOffice/bin/Debug/OnDocOffice.pdb index 057660e0..cbc634ef 100644 Binary files a/OnDocOffice/bin/Debug/OnDocOffice.pdb and b/OnDocOffice/bin/Debug/OnDocOffice.pdb differ diff --git a/OnDocOffice/clsoffice.cs b/OnDocOffice/clsoffice.cs index 910bd40d..7e13a769 100644 --- a/OnDocOffice/clsoffice.cs +++ b/OnDocOffice/clsoffice.cs @@ -1988,19 +1988,37 @@ namespace OnDocOffice clsFileHelper fh = new clsFileHelper(); string filename=tempdir+ DateTime.Now.ToString("yyyyMMddhhmmss")+"_"+dokumentid+dok.extension; string outputfile = filename + ".pdf"; - fh.SaveBase64ToFile(dok.dokument, filename); - Microsoft.Office.Interop.Word.Application word = new Microsoft.Office.Interop.Word.Application(); - Microsoft.Office.Interop.Word.Document worddoc = new Microsoft.Office.Interop.Word.Document(); - worddoc= word.Documents.Open(filename); - word.ActiveDocument.EmbedTrueTypeFonts = true; - worddoc.EmbedTrueTypeFonts= true; - worddoc.ExportAsFixedFormat(outputfile.ToString(), Microsoft.Office.Interop.Word.WdExportFormat.wdExportFormatPDF, false, Microsoft.Office.Interop.Word.WdExportOptimizeFor.wdExportOptimizeForPrint, Microsoft.Office.Interop.Word.WdExportRange.wdExportAllDocument,0,99, Microsoft.Office.Interop.Word.WdExportItem.wdExportDocumentContent, true, true, Microsoft.Office.Interop.Word.WdExportCreateBookmarks.wdExportCreateNoBookmarks, true, true, false); + try + { + fh.SaveBase64ToFile(dok.dokument, filename); + Microsoft.Office.Interop.Word.Application word = new Microsoft.Office.Interop.Word.Application(); + Microsoft.Office.Interop.Word.Document worddoc = new Microsoft.Office.Interop.Word.Document(); + worddoc = word.Documents.Open(filename); + word.ActiveDocument.EmbedTrueTypeFonts = true; + worddoc.EmbedTrueTypeFonts = true; + worddoc.ExportAsFixedFormat(outputfile.ToString(), Microsoft.Office.Interop.Word.WdExportFormat.wdExportFormatPDF, false, Microsoft.Office.Interop.Word.WdExportOptimizeFor.wdExportOptimizeForPrint, Microsoft.Office.Interop.Word.WdExportRange.wdExportAllDocument, 0, 99, Microsoft.Office.Interop.Word.WdExportItem.wdExportDocumentContent, true, true, Microsoft.Office.Interop.Word.WdExportCreateBookmarks.wdExportCreateNoBookmarks, true, true, false); + + worddoc.Close(false); + word.Quit(false); + worddoc = null; + word = null; + return fh.Base64FromFile(outputfile); + } + catch { return ""; } + finally + { + try + { + System.IO.File.Delete(filename); + } + catch { } + try + { + System.IO.File.Delete(outputfile.ToString()); + } + catch { }; + } - worddoc.Close(false); - word.Quit(false); - worddoc = null; - word = null; - return fh.Base64FromFile(outputfile); } diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index d82ce915..867c258c 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.dll b/OnDocOffice/obj/Debug/OnDocOffice.dll index d3d90f53..7237ca85 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.dll and b/OnDocOffice/obj/Debug/OnDocOffice.dll differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.pdb b/OnDocOffice/obj/Debug/OnDocOffice.pdb index 057660e0..cbc634ef 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.pdb and b/OnDocOffice/obj/Debug/OnDocOffice.pdb differ diff --git a/OnDoc_Paketversand/App.config b/OnDoc_Paketversand/App.config index ac3c5675..40a75975 100644 --- a/OnDoc_Paketversand/App.config +++ b/OnDoc_Paketversand/App.config @@ -22,6 +22,12 @@ Data source=shu01\shu00;initial catalog=edoka_journale;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + dm@tkb.ch + + + INT: + diff --git a/OnDoc_Paketversand/Logging.cs b/OnDoc_Paketversand/Logging.cs new file mode 100644 index 00000000..d386ddba --- /dev/null +++ b/OnDoc_Paketversand/Logging.cs @@ -0,0 +1,291 @@ +using NLog; +using NLog.Targets; +using NLog.Time; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading.Tasks; + +namespace Logging +{ + public class Logging + { + + private static readonly NLog.Logger Logger = NLog.LogManager.GetLogger("OnDoc"); + public static string connectionstring { get; set; } = ""; + public static string IntLogLevel { get; set; } = ""; + public static string IntUserID { get; set; } = "*"; + + + public static void init_logger() + { + var dbTarget = LogManager.Configuration.FindTargetByName("OnDoc"); + dbTarget.ConnectionString = connectionstring; + } + + public static void Info(string message, string herkunft, string zusatz) + { + if (DoLogging("Info") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Zusatz", zusatz); + Logger.Info(message); + } + public static void Warning(string message, string herkunft, string zusatz) + { + if (DoLogging("Warning") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Zusatz", zusatz); + Logger.Warn(message); + } + public static void Error(string message, string herkunft, string zusatz) + { + if (DoLogging("Error") != true) { return; } + + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Zusatz", zusatz); + Logger.Error(message); + } + + public static void Fatal(string message, string herkunft, string zusatz) + { + if (DoLogging("Fatal") != true) { return; } + + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Zusatz", zusatz); + Logger.Fatal(message); + } + public static void Trance(string message, string herkunft, string zusatz) + { + if (DoLogging("Trace") != true) { return; } + + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Zusatz", zusatz); + Logger.Trace(message); + } + public static void Debug(string message, string herkunft, string zusatz) + { + if (DoLogging("Debug") != true) { return; } + + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Zusatz", zusatz); + Logger.Debug(message); + } + + + private static Boolean DoLogging(string Loglevel) + { + if (IntUserID != "*") + { + if (IntUserID.Contains(System.Security.Principal.WindowsIdentity.GetCurrent().Name)) + { + if (IntLogLevel.Contains(Loglevel)) + { + return true; + } + } + } + else + { + if (IntLogLevel.Contains(Loglevel)) + { + return true; + } + } + return false; + } + } + public class DocLog + { + + private static readonly NLog.Logger Logger = NLog.LogManager.GetLogger("DocLog"); + + public static string connectionstring { get; set; } = ""; + public static string IntLogLevel { get; set; } = ""; + public static string IntUserID { get; set; } = "*"; + + public static void init_logger() + { + var dbTarget = LogManager.Configuration.FindTargetByName("DocLog"); + dbTarget.ConnectionString = connectionstring; + } + + public static void Info(string message, string herkunft, string dokumentid, string partnernr, string aktion) + { + if (DoLogging("Info") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Dokumentid", dokumentid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Info(message); + + } + public static void Warning(string message, string herkunft, string dokumentid, string partnernr, string aktion) + { + if (DoLogging("Warning") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Dokumentid", dokumentid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Warn(message); + } + public static void Error(string message, string herkunft, string dokumentid, string partnernr, string aktion) + { + if (DoLogging("Error") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Dokumentid", dokumentid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Error(message); + } + + public static void Fatal(string message, string herkunft, string dokumentid, string partnernr, string aktion) + { + if (DoLogging("Fatal") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Dokumentid", dokumentid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Fatal(message); + } + public static void Trance(string message, string herkunft, string dokumentid, string partnernr, string aktion) + { + if (DoLogging("Trace") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Dokumentid", dokumentid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Trace(message); + } + public static void Debug(string message, string herkunft, string dokumentid, string partnernr, string aktion) + { + if (DoLogging("Debug") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Dokumentid", dokumentid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Debug(message); + } + + + private static Boolean DoLogging(string Loglevel) + { + if (IntUserID != "*") + { + if (IntUserID.Contains(System.Security.Principal.WindowsIdentity.GetCurrent().Name)) + { + if (IntLogLevel.Contains(Loglevel)) + { + return true; + } + } + } + else + { + if (IntLogLevel.Contains(Loglevel)) + { + return true; + } + } + return false; + } + } + + public class VersandstrasseLog + { + + private static readonly NLog.Logger Logger = NLog.LogManager.GetLogger("Versandstrasse"); + + public static string connectionstring { get; set; } = ""; + public static string IntLogLevel { get; set; } = ""; + public static string IntUserID { get; set; } = "*"; + + public static void init_logger() + { + var dbTarget = LogManager.Configuration.FindTargetByName("Versandstrasse"); + dbTarget.ConnectionString = connectionstring; + } + + public static void Info(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Info") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paketid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Info(message); + + } + public static void Warning(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Warning") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paketid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Warn(message); + } + public static void Error(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Error") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paektid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Error(message); + } + + public static void Fatal(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Fatal") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paketid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Fatal(message); + } + public static void Trance(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Trace") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paketid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Trace(message); + } + public static void Debug(string message, string herkunft, string paketid, string partnernr, string aktion) + { + if (DoLogging("Debug") != true) { return; } + GlobalDiagnosticsContext.Set("Herkunft", herkunft); + GlobalDiagnosticsContext.Set("Paketid", paketid); + GlobalDiagnosticsContext.Set("Partnernr", partnernr); + GlobalDiagnosticsContext.Set("Aktion", aktion); + Logger.Debug(message); + } + + + private static Boolean DoLogging(string Loglevel) + { + if (IntUserID != "*") + { + if (IntUserID.Contains(System.Security.Principal.WindowsIdentity.GetCurrent().Name)) + { + if (IntLogLevel.Contains(Loglevel)) + { + return true; + } + } + } + else + { + if (IntLogLevel.Contains(Loglevel)) + { + return true; + } + } + return false; + } + } + +} diff --git a/OnDoc_Paketversand/OnDoc_Paketversand.csproj b/OnDoc_Paketversand/OnDoc_Paketversand.csproj index 26186c40..946d3b67 100644 --- a/OnDoc_Paketversand/OnDoc_Paketversand.csproj +++ b/OnDoc_Paketversand/OnDoc_Paketversand.csproj @@ -37,8 +37,9 @@ ..\Logger\bin\Debug\EDOKA_Logger.dll - - ..\Logging\bin\Debug\Logging.dll + + False + ..\Client\bin\Debug\Newtonsoft.Json.dll ..\Logger\bin\Debug\NLog.dll @@ -56,6 +57,8 @@ + + @@ -63,6 +66,7 @@ True Settings.settings + diff --git a/OnDoc_Paketversand/Program.cs b/OnDoc_Paketversand/Program.cs index 292e055e..01f52709 100644 --- a/OnDoc_Paketversand/Program.cs +++ b/OnDoc_Paketversand/Program.cs @@ -9,11 +9,15 @@ using System.IO; using System.Data.SqlClient; using System.Data; using System.Security.Cryptography; +using Newtonsoft.Json; +using System.Net.Mail; +using System.Net.Http; namespace OnDoc_Paketversand { + internal class Program { private static string connectionstring { get; set; } = ""; @@ -27,28 +31,39 @@ namespace OnDoc_Paketversand public static void InitLogging() { - - Get_Tabledata("Select * from nlog_parameter WHERE ID=4", false, true); - Logging.Logging.IntLogLevel = dsdaten.Tables[0].Rows[0]["LogLevel"].ToString(); - Logging.Logging.IntUserID = dsdaten.Tables[0].Rows[0]["LogUserID"].ToString(); - Logging.Logging.connectionstring = Properties.Settings.Default.LogConnectionstring; - Logging.Logging.init_logger(); - + Logging.VersandstrasseLog.IntLogLevel = dsdaten.Tables[0].Rows[0]["LogLevel"].ToString(); + Logging.VersandstrasseLog.IntUserID = dsdaten.Tables[0].Rows[0]["LogUserID"].ToString(); + Logging.VersandstrasseLog.connectionstring = Properties.Settings.Default.LogConnectionstring; + Logging.VersandstrasseLog.init_logger(); } - private static void run(){ + private static void run() + { connectionstring = Properties.Settings.Default.Connectionstring; - Console.WriteLine(connectionstring); + InitLogging(); + Logging.VersandstrasseLog.Info("Start OnDocPaketversand", "OnDoc-Paketversand", "", "", ""); string URLBase = Properties.Settings.Default.RESTURI + "api/Send_Versandstrasse?paketid="; - Console.WriteLine(URLBase); - Get_Tabledata("Select id,paket from ondoc_versandstrasse_paket where versendet=0 and geloescht=0 and aktiv=1 order by versandoption", false, true); + + string sql = "SELECT dbo.Ondoc_Versandstrasse_Paket.id, dbo.Ondoc_Versandstrasse_Paket.paket, dbo.Ondoc_Versandstrasse_Paket.ersteller, dbo.mitarbeiter.email"; + sql = sql + " FROM dbo.Ondoc_Versandstrasse_Paket INNER JOIN dbo.mitarbeiter ON dbo.Ondoc_Versandstrasse_Paket.ersteller = dbo.mitarbeiter.mitarbeiternr"; + sql = sql + " where (dbo.Ondoc_Versandstrasse_Paket.versendet = 0) AND (dbo.Ondoc_Versandstrasse_Paket.geloescht = 0) AND (dbo.Ondoc_Versandstrasse_Paket.aktiv = 1)"; + sql = sql + " ORDER BY dbo.Ondoc_Versandstrasse_Paket.Versandoption"; + Get_Tabledata(sql, false, true); + int total = 0; + int ok = 0; + int error = 0; foreach (System.Data.DataRow dr in dsdaten.Tables[0].Rows) { - Console.WriteLine("PaketID:"+ dr[0].ToString()); + string paketid = ""; + string ersteller = ""; + ersteller = dr[3].ToString(); + paketid = dr[0].ToString(); + Model.Versandpaket vp = JsonConvert.DeserializeObject(dr[1].ToString()); + Logging.VersandstrasseLog.Info("Paket-Verarbeitung", "OnDoc-Paketversand", paketid, vp.partnernr.ToString(), "Start Versand"); string jsonstring = dr[1].ToString(); - string URL = URLBase+ dr[0].ToString(); + string URL = URLBase + dr[0].ToString(); WebRequest request; var data = Encoding.UTF8.GetBytes(jsonstring); request = WebRequest.Create(URL); @@ -57,6 +72,7 @@ namespace OnDoc_Paketversand request.Method = "POST"; request.Headers["Authorization"] = "Bearer " + Properties.Settings.Default.APIKey; string response; + total = total + 1; try { @@ -73,22 +89,41 @@ namespace OnDoc_Paketversand } if (response.ToString().Contains("archiviert")) { - + Logging.VersandstrasseLog.Info("Paket-Verarbeitung", "OnDoc-Paketversand", paketid, vp.partnernr.ToString(), "Ende Versand"); + ok = ok + 1; + } + else + { + string message = "Das Versand-Couvert Nr. " + paketid + " / Partner-Nr " + vp.partnernr + " konnte nicht versendet werden."; + sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand Fehler", message); + + sendmail(ersteller, "OnDoc-Paketversand: Dokument nicht Versandcouvert nicht versendet", message); + + Logging.VersandstrasseLog.Error("Paket-Verarbeitung", "OnDoc-Paketversand", paketid, vp.partnernr.ToString(), "Ende Versand"); + error = error + 1; } } } } - catch { } + catch (Exception ex) + { + Logging.VersandstrasseLog.Error("Paket-Verarbeitung", "OnDoc-Paketversand", dr[0].ToString(), vp.partnernr.ToString(), "Ende Versand - " + ex.Message); + sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand Fehler", ex.Message); + error = error + 1; + } } + Logging.VersandstrasseLog.Info("Ende OnDocPaketversand", "OnDoc-Paketversand", "", "", ""); + string msg = "OnDok Paketversand durchgeführt" + Environment.NewLine + "Total Pakete:" + total.ToString() + Environment.NewLine + "OK: " + ok.ToString() + Environment.NewLine + "Fehler: " + error.ToString(); + sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand abgeschlossen", msg); } - private static DataTable Get_Tabledata(string Tablename, bool StoredProc = false, bool is_SQL_String = false, DataTable sp_params = null) + private static DataTable Get_Tabledata(string Tablename, bool StoredProc = false, bool is_SQL_String = false, DataTable sp_params = null) { try { - + if (sp_params == null && SP_Parameters.Rows.Count > 0) { sp_params = SP_Parameters.Copy(); @@ -135,15 +170,41 @@ namespace OnDoc_Paketversand sqlconnect.Open(); da.Fill(dsdaten, "Daten1"); sqlconnect.Close(); - + return dsdaten.Tables[0]; } catch (Exception ex) { Console.WriteLine(ex.Message); - + return null; } } + private static void sendmail(string empfaenger, string betreff, string message) + { + MailMessage mail = new MailMessage(); + SmtpClient SmtpServer = new SmtpClient(); + mail.To.Add(empfaenger); + mail.From = new MailAddress("OnDoc@tkb.ch"); + mail.Subject = Properties.Settings.Default.prefix_betreff + betreff; + mail.IsBodyHtml = true; + mail.Body = message; + SmtpServer.Host = "smtp.tgcorp.ch"; + SmtpServer.Port = 25; + SmtpServer.DeliveryMethod = System.Net.Mail.SmtpDeliveryMethod.Network; + try + { + SmtpServer.Send(mail); + Logging.VersandstrasseLog.Info("Mailversand and " + empfaenger + " erfolgt", "OnDoc-Paketversand", "", "", ""); + } + catch (Exception ex) + { + Logging.VersandstrasseLog.Error("Mailversand and " + empfaenger + " nicht erfolgt", "OnDoc-Paketversand", "", "", ""); + + } + mail = null; + SmtpServer = null; + } } + } diff --git a/OnDoc_Paketversand/Properties/Settings.Designer.cs b/OnDoc_Paketversand/Properties/Settings.Designer.cs index 31ebc835..9230f181 100644 --- a/OnDoc_Paketversand/Properties/Settings.Designer.cs +++ b/OnDoc_Paketversand/Properties/Settings.Designer.cs @@ -74,5 +74,29 @@ namespace OnDoc_Paketversand.Properties { this["LogConnectionstring"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("dm@tkb.ch")] + public string adminmail { + get { + return ((string)(this["adminmail"])); + } + set { + this["adminmail"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("INT: ")] + public string prefix_betreff { + get { + return ((string)(this["prefix_betreff"])); + } + set { + this["prefix_betreff"] = value; + } + } } } diff --git a/OnDoc_Paketversand/Properties/Settings.settings b/OnDoc_Paketversand/Properties/Settings.settings index 6dee5207..087e5a45 100644 --- a/OnDoc_Paketversand/Properties/Settings.settings +++ b/OnDoc_Paketversand/Properties/Settings.settings @@ -14,5 +14,11 @@ Data source=shu01\shu00;initial catalog=edoka_journale;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + dm@tkb.ch + + + INT: + \ No newline at end of file diff --git a/OnDoc_Paketversand/VersandstrassePaket.cs b/OnDoc_Paketversand/VersandstrassePaket.cs new file mode 100644 index 00000000..117df0c7 --- /dev/null +++ b/OnDoc_Paketversand/VersandstrassePaket.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + public class Versandpaket + { + public string bezeichnung { get; set; } + public string PaketNr { get; set; } + public string Versandoption { get; set; } + public string Mitteilung { get; set; } + public string GAS { get; set; } + public string GASAdresse { get; set; } + public bool verified { get; set; } = false; + public int partnernr { get; set; } = 0; + public bool send_onbase_doc { get; set; } + public string handle { get; set; } = ""; + + public string finaldoc { get; set; } = ""; + + public serienbrief sb { get; set; } = null; + public bool isSerienbrief { get; set; } = false; + + public int protokollid { get; set; } = 0; + + public string bemerkung { get; set; } = ""; + public List Dokument { get; set; } + + } + + public class Versanddokument + { + public string DokumentID { get; set; } + public string Bezeichnung { get; set; } + public string Partnernr { get; set; } + + public string dokument { get; set; } = ""; + + + + public int inteintragnr = 0; + + public Versanddokument(string dokumentID, string bezeichnung, string partnernr) + { + DokumentID = dokumentID; + Bezeichnung = bezeichnung; + Partnernr = partnernr; + + } + + + } + + public class OnBase_Attributes + { + public string Dokumenttyp { get; set; } = "TECH Versandstrasse SendDoc"; + public string BPNummer { get; set; } = ""; + public string DocumentHandle { get; set; } = ""; + public string DistributionOption { get; set; } = ""; + public string GASCouvert { get; set; } = ""; + public string Returnaddress { get; set; } = ""; + public string O2ODochandle { get; set; } = ""; + public string Status { get; set; } = ""; + } + +} + diff --git a/OnDoc_Paketversand/bin/Debug/NLog.config b/OnDoc_Paketversand/bin/Debug/NLog.config index ff4de7e1..7a6426e2 100644 --- a/OnDoc_Paketversand/bin/Debug/NLog.config +++ b/OnDoc_Paketversand/bin/Debug/NLog.config @@ -14,36 +14,22 @@ subject="NLog message from system X on ${machinename}" to="Username@DomainName.com" from="Username@DomainName.com" /> - + - sp_insert_nlog @Origin,@Message,@LogLevel, @UserID, @Div + sp_insert_nlog_Versandstrasse @Origin,@Message,@LogLevel, @UserID, @paketid,@partnernr,@aktion - - - - - sp_insert_nlog_DOC @Origin,@Message,@LogLevel, @UserID, @docid,@partnernr,@aktion - - - - - - + - - - + \ No newline at end of file diff --git a/OnDoc_Paketversand/bin/Debug/Newtonsoft.Json.dll b/OnDoc_Paketversand/bin/Debug/Newtonsoft.Json.dll new file mode 100644 index 00000000..341d08fc Binary files /dev/null and b/OnDoc_Paketversand/bin/Debug/Newtonsoft.Json.dll differ diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe index 8e1033b7..89664cb4 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe differ diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe.config b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe.config index b92f6f4b..40a75975 100644 --- a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe.config +++ b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe.config @@ -19,6 +19,15 @@ pZkuG6l6ORCEckqQimPK58PO1A9EnkMtL5oCgRX9WiWnD4xeH7ikGzhWnTBy/vk8J4Iiz8gCSx9uFHA4+DvITG0roO97sk82d/0BCjVlwLWINpXlJfGYEF3X96AdoCQvb3ruwv/tVqEHsSU5aNfyxBAe+EhLTHQ8t7ysgJZWh98= + + Data source=shu01\shu00;initial catalog=edoka_journale;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + + dm@tkb.ch + + + INT: + diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb index 899389b6..a103e5a8 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb differ diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip index 442d28cf..2e8a57f8 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip differ diff --git a/OnDoc_Paketversand/clsSerienbrief.cs b/OnDoc_Paketversand/clsSerienbrief.cs new file mode 100644 index 00000000..806296b5 --- /dev/null +++ b/OnDoc_Paketversand/clsSerienbrief.cs @@ -0,0 +1,91 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + + public class serienbrief + { + public int serienbriefnr { get; set; } = 0; + public string bezeichnung { get; set; } = ""; + public int verantwortlich { get; set; } = 0; + public int postzustellung { get; set; } = 0; + public DateTime dokumentdatum { get; set; } = DateTime.Now; + public int zustaendig { get; set; } = 0; + public int unterschriftlinks { get; set; } = 0; + public int unterschriftrechts { get; set; } = 0; + + public string ohne_unterschrift { get; set; } = "False"; + public string faksimile_unterschrfit { get; set; } = "False"; + + public int team { get; set; } = 0; + public DateTime archivdatum { get; set; } = DateTime.Now; + public DateTime termin { get; set; } = DateTime.Now; + public string bemerkung { get; set; } = ""; + public DateTime erstellt_am { get; set; } = DateTime.Now; + public DateTime mutiert_am { get; set; } = DateTime.Now; + public int mutierer { get; set; } = 0; + public bool aktiv { get; set; } = true; + public int status { get; set; } = 0; + public int dokumenttypnr { get; set; } = 0; + public int windowwidth { get; set; } = 0; + public int windowheight { get; set; } = 0; + public int treewidth { get; set; } = 0; + public int fehlerhaft { get; set; } = 0; + public int inBearbeitung { get; set; } = 0; + public int erstellt { get; set; } = 0; + public int gedruckt { get; set; } = 0; + public int bestaetigt { get; set; } = 0; + public int ausgeloest { get; set; } = 0; + public int bldossier { get; set; } = 0; + public int vertrag { get; set; } = 0; + + public int ppfaktura { get; set; } = 0; + + public int officevorlagenr { get; set; } = 0; + public string filename { get; set; } + public DataSet dsempfaenger { get; set; } + public List DocValues { get; set; } + public string VorlageBase64 { get; set; } = ""; + public string img_unterschriftlinks { get; set; } = ""; + public string img_unterschrfitrechts { get; set; } = ""; + public string img_faktura { get; set; } = ""; + + public int barcode_height { get; set; } = 0; + public int barcode_width { get; set; } = 0; + public int barcode_top { get; set; } = 0; + public int barcode_left { get; set; } = 0; + public int barcode_horizontal { get; set; } = 0; + public string barcode_font { get; set; } = ""; + public string barcode_fontsize { get; set; } = ""; + public string barcode_textposition { get; set; } = ""; + public string barcode_zusatz { get; set; } + public string barcode_type { get; set; } = ""; + public string barcode_content { get; set; } = ""; + public string barcode_text { get; set; } = ""; + + public int toapproval { get; set; } = 0; + public int approved { get; set; } = 0; + public int approval1 { get; set; } = 0; + public int approval2 { get; set; } = 0; + public int faksimile { get; set; } = 0; + public int ohneunterschrift { get; set; } = 0; + + + } + public class clsDocValue + { + public string TMBeginn { get; set; } + public string TMEnd { get; set; } + public string FieldName { get; set; } + public string Value { get; set; } + + public int used { get; set; } = 1; + } + + +} diff --git a/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 43039db2..b07f4dab 100644 Binary files a/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d43503d9..ab5f78ac 100644 Binary files a/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.AssemblyReference.cache b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.AssemblyReference.cache index 75ee24f9..4f3b02c2 100644 Binary files a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.AssemblyReference.cache and b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.AssemblyReference.cache differ diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.CoreCompileInputs.cache b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.CoreCompileInputs.cache index b713b0c0..bf4e1d17 100644 --- a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.CoreCompileInputs.cache +++ b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -20d3dffcd02ed3e2ec4429f07a7e079a2e6563c9ec3e76cfd4c61c69ec8e735f +382bb1d817d4a0bac471cc26dd096c2a9b45f957631a812cdc386fb918223e4c diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.FileListAbsolute.txt b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.FileListAbsolute.txt index 263a4010..290612f8 100644 --- a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.FileListAbsolute.txt +++ b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.FileListAbsolute.txt @@ -1,12 +1,13 @@ -E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\obj\Debug\OnDoc_Paketversand.csproj.AssemblyReference.cache -E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\obj\Debug\OnDoc_Paketversand.csproj.CoreCompileInputs.cache E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\bin\Debug\OnDoc_Paketversand.exe.config E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\bin\Debug\OnDoc_Paketversand.exe E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\bin\Debug\OnDoc_Paketversand.pdb -E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\obj\Debug\OnDoc_Paketversand.exe -E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\obj\Debug\OnDoc_Paketversand.pdb +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\bin\Debug\Newtonsoft.Json.dll E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\bin\Debug\NLog.Database.dll E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\bin\Debug\NLog.dll E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\bin\Debug\NLog.xml E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\bin\Debug\NLog.Database.xml +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\obj\Debug\OnDoc_Paketversand.csproj.AssemblyReference.cache +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\obj\Debug\OnDoc_Paketversand.csproj.CoreCompileInputs.cache E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\obj\Debug\OnDoc_Pa.40443EF6.Up2Date +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\obj\Debug\OnDoc_Paketversand.exe +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_Paketversand\obj\Debug\OnDoc_Paketversand.pdb diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe index 8e1033b7..89664cb4 100644 Binary files a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe and b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe differ diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb index 899389b6..a103e5a8 100644 Binary files a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb and b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb differ diff --git a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache index 969da589..804d1ce3 100644 Binary files a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache and b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache differ diff --git a/VBOffice/bin/Debug/Database.dll b/VBOffice/bin/Debug/Database.dll index 1ce81ad9..7280b31e 100644 Binary files a/VBOffice/bin/Debug/Database.dll and b/VBOffice/bin/Debug/Database.dll differ diff --git a/VBOffice/bin/Debug/Database.pdb b/VBOffice/bin/Debug/Database.pdb index 569b3817..18e13af0 100644 Binary files a/VBOffice/bin/Debug/Database.pdb and b/VBOffice/bin/Debug/Database.pdb differ diff --git a/VBOffice/bin/Debug/Logging.dll b/VBOffice/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/VBOffice/bin/Debug/Logging.dll and b/VBOffice/bin/Debug/Logging.dll differ diff --git a/VBOffice/bin/Debug/Logging.pdb b/VBOffice/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/VBOffice/bin/Debug/Logging.pdb and b/VBOffice/bin/Debug/Logging.pdb differ diff --git a/VBOffice/bin/Debug/Model.dll b/VBOffice/bin/Debug/Model.dll index b8d36e01..1c761410 100644 Binary files a/VBOffice/bin/Debug/Model.dll and b/VBOffice/bin/Debug/Model.dll differ diff --git a/VBOffice/bin/Debug/Model.pdb b/VBOffice/bin/Debug/Model.pdb index a7c18ed9..e486e05e 100644 Binary files a/VBOffice/bin/Debug/Model.pdb and b/VBOffice/bin/Debug/Model.pdb differ diff --git a/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache b/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache index 065a84f4..604e4b60 100644 Binary files a/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache and b/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache differ diff --git a/Versandstrasse/Class1.cs b/Versandstrasse/Class1.cs index 032e3ad3..8be8f3d4 100644 --- a/Versandstrasse/Class1.cs +++ b/Versandstrasse/Class1.cs @@ -1,9 +1,13 @@ using System; using System.Collections.Generic; +using System.Data.SqlClient; using System.Data.SqlTypes; using System.Drawing; +using System.Drawing.Drawing2D; +using System.Drawing.Imaging; using System.IO; using System.Linq; +using System.Linq.Expressions; using System.Net; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -17,6 +21,7 @@ using edoka_dms; using Model; using Syncfusion.Pdf; using Syncfusion.Pdf.Graphics; +using Syncfusion.Pdf.Graphics.Fonts; using Syncfusion.Pdf.Parsing; using Syncfusion.XPS; @@ -58,11 +63,11 @@ namespace Versandstrasse string resturi = ""; string apikey = ""; - public string Prepare_PDF(string dokumentid, string tempdir, string connectionstring, string resturi, string apikey, string startuppath, versandscript vs = null, serienbrief sb = null, string sbsourcedok="", bool couvertpos = false) + public string Prepare_PDF(string dokumentid, string tempdir, string connectionstring, string resturi, string apikey, string startuppath, versandscript vs = null, serienbrief sb = null, string sbsourcedok = "", bool couvertpos = false) { Lic(); - this.resturi=resturi; - this.apikey=apikey; + this.resturi = resturi; + this.apikey = apikey; clsdok dok = new clsdok("", "", "", ""); if (sbsourcedok != "") @@ -82,7 +87,8 @@ namespace Versandstrasse Database.DB db = new Database.DB(connectionstring); db.clear_parameter(); db.add_parameter("@dokumentid", dokumentid); - if (sb != null) { + if (sb != null) + { db.add_parameter("@doktyp", sb.dokumenttypnr.ToString()); } db.Get_Tabledata("ondoc_get_versandstrasse_parameter", true, false); @@ -114,9 +120,9 @@ namespace Versandstrasse { } - if (vscript.Split_Doc !="") + if (vscript.Split_Doc != "") { - split_doc(ref vscript,dok.dokument); + split_doc(ref vscript, dok.dokument); } if (vscript.PartCopies != "") @@ -144,11 +150,11 @@ namespace Versandstrasse PdfLoadedDocument loadedDocument = new PdfLoadedDocument(stream); if (vdok.Logo) { - Add_Logo(ref loadedDocument, vdok.LogoColor, vdok.LogoLeft, vdok.LogoTop, vdok.LogoWidth, vdok.LogoHeigth, vdok.LogoOnPages,this.resturi,this.apikey,startuppath); + Add_Logo(ref loadedDocument, vdok.LogoColor, vdok.LogoLeft, vdok.LogoTop, vdok.LogoWidth, vdok.LogoHeigth, vdok.LogoOnPages, this.resturi, this.apikey, startuppath); } - if (couvertpos) - { + if (couvertpos) + { drawcouvert(ref loadedDocument); } if (vdok.TextReplaces.Count > 0) @@ -157,18 +163,48 @@ namespace Versandstrasse { if (tr.TextToReplace.Trim() != "") { - Replace_Text(ref loadedDocument, tr.TextToReplace, tr.NewText, tr.Fontname, tr.Fontsize); + Replace_Text(ref loadedDocument, tr.TextToReplace, tr.NewText, tr.Fontname, tr.Fontsize, startuppath); } } //loadedDocument.Save(@"x:\r1.pdf"); } - if (loadedDocument.Pages.Count % 2 == 0) { } else { Add_EmptyPage(ref loadedDocument); } - MemoryStream outputStream = new MemoryStream(); + if (loadedDocument.Pages.Count % 2 == 0) { } else { Add_EmptyPage(ref loadedDocument); } + + MemoryStream outputStream = new MemoryStream(); + try + { + //db.Get_Tabledata("Select * from Ondoc_PDF_CompressionOptions where aktiv=1", false, true); + //if (db.dsdaten.Tables[0].Rows.Count > 0) + //{ + // PdfCompressionOptions options = new PdfCompressionOptions(); + // options.CompressImages = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][2]); + // options.ImageQuality = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][3]); + // options.OptimizeFont = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][4]); + // options.OptimizePageContents = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][5]); + // options.RemoveMetadata = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][6]); + // loadedDocument.CompressionOptions = options; + //} + loadedDocument.Save(outputStream); + + //outputStream.Position = 0; + //outputStream.WriteTo(filestream); + //loadedDocument.Close(true); + //loadedDocument = new PdfLoadedDocument(filename); + //loadedDocument.ConvertToPDFA(PdfConformanceLevel.Pdf_A1B); + //loadedDocument.Save(outputStream); + //filestream.Close(); + byte[] bytes; bytes = outputStream.ToArray(); vdok.pdfdokument = Convert.ToBase64String(bytes); - + + } + catch + { + + } + } if (vscript.dokuments.Count > 1) { @@ -180,12 +216,47 @@ namespace Versandstrasse var stream = new MemoryStream(Convert.FromBase64String(vdoc.pdfdokument)); streams[i] = stream; i++; - + } PdfDocument finalDoc = new PdfDocument(); + PdfDocumentBase.Merge(finalDoc, streams); MemoryStream outputStream = new MemoryStream(); - finalDoc.Save(outputStream); + string filename = tempdir + Guid.NewGuid().ToString() + ".pdf"; + //FileStream filestream = new FileStream(filename, FileMode.OpenOrCreate, FileAccess.ReadWrite); + + //finalDoc.Save(filestream,; + finalDoc.Save(filename); + //filestream.Close(); + + PdfLoadedDocument loadeddoc = new PdfLoadedDocument(filename); + + //db.Get_Tabledata("Select * from Ondoc_PDF_CompressionOptions where aktiv=1", false, true); + //if (db.dsdaten.Tables[0].Rows.Count > 0) + //{ + // PdfCompressionOptions options = new PdfCompressionOptions(); + // options.CompressImages = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][2]); + // options.ImageQuality = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][3]); + // options.OptimizeFont = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][4]); + // options.OptimizePageContents = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][5]); + // options.RemoveMetadata = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][6]); + // loadeddoc.CompressionOptions = options; + //} + + loadeddoc.ConvertToPDFA(PdfConformanceLevel.Pdf_A1B); + + + + loadeddoc.Save(outputStream); + + System.IO.File.Delete(filename); + //loadedDocument = new PdfLoadedDocument(filename); + //loadedDocument.ConvertToPDFA(PdfConformanceLevel.Pdf_A1B); + //loadedDocument.Save(outputStream); + //finalDoc.Save(outputStream); + + + byte[] bytes; bytes = outputStream.ToArray(); dok.dokument = Convert.ToBase64String(bytes); @@ -197,7 +268,7 @@ namespace Versandstrasse } else { - vscript.FinalDoc = vscript.dokuments[0].pdfdokument.ToString(); + vscript.FinalDoc = vscript.dokuments[0].pdfdokument.ToString(); } @@ -222,28 +293,27 @@ namespace Versandstrasse if (matchedTextbounds[index].Count > 0) { newdoc.ImportPage(loadedDocument, index); - newdoc2.ImportPageRange(loadedDocument, index + 1, loadedDocument.Pages.Count - (index+1)); + newdoc2.ImportPageRange(loadedDocument, index + 1, loadedDocument.Pages.Count - (index + 1)); } } - //newdoc.Save(@"x:\nf1.pdf"); - //newdoc2.Save(@"x:\nf2.pdf"); + MemoryStream outputStream = new MemoryStream(); newdoc.Save(outputStream); byte[] bytes; byte[] bytes1; bytes = outputStream.ToArray(); vscript.dokuments[0].sourcedokument = Convert.ToBase64String(bytes); - + outputStream.Close(); outputStream = null; - + MemoryStream outputStream2 = new MemoryStream(); newdoc2.Save(outputStream2); bytes1 = outputStream2.ToArray(); - + vscript.dokuments[1].sourcedokument = Convert.ToBase64String(bytes1); - + outputStream2.Close(); outputStream2 = null; @@ -259,7 +329,7 @@ namespace Versandstrasse //if (vsd.LogoHeigth == 0) { vsd.LogoHeigth = height; } //if (vsd.LogoWidth == 0) { vsd.LogoWidth = width; } //vsd.sourcedokument = dokument; - if (vscript.dokuments[0].sourcedokument=="") { vscript.dokuments[0].sourcedokument=dokument; } + if (vscript.dokuments[0].sourcedokument == "") { vscript.dokuments[0].sourcedokument = dokument; } int i = 1; List copyparts = vscript.PartCopies.Split(';').ToList(); foreach (string cp in copyparts) @@ -267,23 +337,107 @@ namespace Versandstrasse string[] part = cp.Split(':'); int part1 = Convert.ToInt32(part[0]); int part2 = Convert.ToInt32(part[1]); - vscript.dokuments[part2-1].sourcedokument = vscript.dokuments[part1-1].sourcedokument; + vscript.dokuments[part2 - 1].sourcedokument = vscript.dokuments[part1 - 1].sourcedokument; //vsdokument source = vscript.dokuments[part1 - 1]; //if (vscript.dokuments.Count > part2) { vscript.dokuments[i] = source; } else { vscript.dokuments.Add(source); } } } - private void Replace_Text(ref PdfLoadedDocument document, string texttoreplace, string newtext, string fontname, string fontsize) + + private Syncfusion.Pdf.Graphics.Fonts.PdfUsedFont get_font(ref PdfLoadedDocument document) { + PdfUsedFont[] usedFonts = document.UsedFonts; + foreach (PdfUsedFont font in usedFonts) + { + if (font.Name.Contains("Futura")) + { + return font; + } + } + return null; + } + private PdfUsedFont get_fontname(ref PdfLoadedDocument document) + { + PdfUsedFont[] usedFonts = document.UsedFonts; + + // Iterate through the fonts and check if they are embedded + foreach (PdfUsedFont font in usedFonts) + { + if (font.Name.Contains("Futura")) { return font; } + + //if (font.Type == PdfFontType.TrueType) + //{ + // if (font.Name.Contains("Futura")) { return font; } + // break; + // Console.WriteLine($"Font '{font.Name}' is embedded."); + //} + //else + //{ + // return font; + // Console.WriteLine($"Font '{font.Name}' is not embedded."); + //} + } + return null; + } + private void Replace_Text(ref PdfLoadedDocument document, string texttoreplace, string newtext, string fontname, string fontsize, string startuppath) + { + + //string imagefile = ""; + //string texttol = newtext.Trim().Replace(" ", "_"); + //texttol = texttol + ".jpg"; + //imagefile = startuppath + @"\images\"+texttol; + //PdfBitmap image; + //if (System.IO.File.Exists(imagefile)) + //{ + // System.Drawing.Image img = System.Drawing.Image.FromFile(imagefile); + // img = ResizeImage(img, new Size(86, 12)); + // image = new PdfBitmap(img); + + // PdfLoadedPage loadedPage = document.Pages[0] as PdfLoadedPage; + // Dictionary> matchedTextbounds = new Dictionary>(); + // document.FindText(texttoreplace, out matchedTextbounds); + + // List imachedrect = new List(); + // int ipageindex = 0; + + // for (int i = 0; i < document.Pages.Count; i++) + // { + // document.FindText(texttoreplace, ipageindex, out imachedrect); + // loadedPage = (PdfLoadedPage)document.Pages[i]; + // foreach (RectangleF rectangle in matchedTextbounds[i]) + // { + + // RectangleF rect = rectangle; + // rect.X = rect.X - 5; + // rect.Y = rect.Y - 5; + // rect.Height = rect.Height + 5; + // loadedPage.Graphics.DrawRectangle(PdfBrushes.White, rectangle); + // loadedPage.Graphics.DrawRectangle(PdfBrushes.White, rect); + // PdfGraphics graphics = loadedPage.Graphics; + + // graphics.DrawImage(image, rect.X, rect.Y); + + // } + + // } + + //} + //else + //{ + PdfLoadedPage loadedPage = document.Pages[0] as PdfLoadedPage; - string fname = "Futura Book"; - string fsize = "9"; + + string fname = "Futura"; + string fsize = "8"; if (fontname != "") { fname = fontname; fsize = fontsize; } + + PdfUsedFont usedfont = get_fontname(ref document); PdfFont font = new PdfTrueTypeFont(new Font(fname, Convert.ToInt32(fsize))); + PdfFont fnt = new PdfStandardFont(PdfFontFamily.Helvetica, 8); Dictionary> matchedTextbounds = new Dictionary>(); document.FindText(texttoreplace, out matchedTextbounds); @@ -303,42 +457,34 @@ namespace Versandstrasse rect.Height = rect.Height + 5; loadedPage.Graphics.DrawRectangle(PdfBrushes.White, rectangle); loadedPage.Graphics.DrawRectangle(PdfBrushes.White, rect); - loadedPage.Graphics.DrawString(newtext, font, PdfBrushes.Black, rectangle.X - 2, rectangle.Y - 3); - } + loadedPage.Graphics.DrawString(newtext, fnt, PdfBrushes.Black, rectangle.X - 2, rectangle.Y - 3); + //if (newtext != "") + //{ + // System.Drawing.Image img = DrawText(System.Drawing.Color.Black, System.Drawing.Color.White, "Futura Book", 14, newtext, (int)rect.Width, (int)rect.Height, "", "", 0, 0); + // PdfGraphics graphics = loadedPage.Graphics; + // PdfBitmap pdfimg = new PdfBitmap(img); + // graphics.DrawImage(pdfimg, rect.X, rect.Y); + //} + } } + + - //for (int i = 0; i < matchedTextbounds.Count; i++) - //{ - // for (int i1 = 0; i1 < document.Pages.Count; i1++) - // { - // loadedPage = (PdfLoadedPage)document.Pages[i1]; - // foreach (RectangleF rectangle in matchedTextbounds[i]) - // { - // RectangleF rect = rectangle; - // rect.X = rect.X - 5; - // rect.Y = rect.Y - 5; - // rect.Height = rect.Height + 5; - // loadedPage.Graphics.DrawRectangle(PdfBrushes.White, rectangle); - // loadedPage.Graphics.DrawRectangle(PdfBrushes.White, rect); - // loadedPage.Graphics.DrawString(newtext, font, PdfBrushes.Black, rectangle.X - 2, rectangle.Y - 3); - // } - // } - //} } private string get_logo(bool color, string resturi, string apikey) { - + int imageid = 0; if (color) { imageid = 4; } else { imageid = 5; } - - return get_image(imageid,-1,-1,resturi,apikey); - + + return get_image(imageid, -1, -1, resturi, apikey); + } private string get_image(int imageid, int width, int heigh, string resturi, string apikey) { @@ -427,7 +573,7 @@ namespace Versandstrasse { PdfLoadedPage loadedPage = document.Pages[i] as PdfLoadedPage; PdfGraphics graphics = loadedPage.Graphics; - graphics.DrawImage(image,left,top); + graphics.DrawImage(image, left, top); } } @@ -452,12 +598,130 @@ namespace Versandstrasse document.Pages.Add(); } + public Image DrawText(Color foreColor, Color backColor, string fontName, int fontSize, string txt, int width, int height, string zusatz, string zusatzfontname, int zusatzfontsize, int rotation) + { + //width = 320; + //height = 50; + + string barcodetext = txt; + barcodetext = txt; + Bitmap img = new Bitmap(width, height); + Graphics Gimg = Graphics.FromImage(img); + Font imgFont = new Font(fontName, fontSize); + PointF imgPoint = new PointF(0, 0); + SolidBrush bForeColor = new SolidBrush(foreColor); + SolidBrush bBackColor = new SolidBrush(backColor); + Gimg.FillRectangle(bBackColor, 0, 0, width, height); + Gimg.DrawString(barcodetext, imgFont, bForeColor, imgPoint); + + + + //Font fzFont = new Font(zusatzfontname, zusatzfontsize); + + //SizeF textSize = Gimg.MeasureString(zusatz, fzFont, 30); + + //PointF imgPointZusatz = new PointF(width - textSize.Width, 25); + //Gimg.DrawString(zusatz, fzFont, bForeColor, imgPointZusatz); + + return RotateImage(img, rotation, true, true, Color.White); + //img.Save(imagePath, ImageFormat.Jpeg); + } + + private static System.Drawing.Image ResizeImage(System.Drawing.Image imgToResize, Size size) + { + // Get the image current width + int sourceWidth = imgToResize.Width; + // Get the image current height + int sourceHeight = imgToResize.Height; + float nPercent = 0; + float nPercentW = 0; + float nPercentH = 0; + // Calculate width and height with new desired size + nPercentW = ((float)size.Width / (float)sourceWidth); + nPercentH = ((float)size.Height / (float)sourceHeight); + nPercent = Math.Min(nPercentW, nPercentH); + // New Width and Height + int destWidth = (int)(sourceWidth * nPercent); + int destHeight = (int)(sourceHeight * nPercent); + Bitmap b = new Bitmap(destWidth, destHeight); + Graphics g = Graphics.FromImage((System.Drawing.Image)b); + g.InterpolationMode = InterpolationMode.HighQualityBicubic; + // Draw image with new width and height + g.DrawImage(imgToResize, 0, 0, destWidth, destHeight); + g.Dispose(); + return (System.Drawing.Image)b; + } + public static Bitmap RotateImage(Image inputImage, float angleDegrees, bool upsizeOk, + bool clipOk, Color backgroundColor) + { + // Test for zero rotation and return a clone of the input image + if (angleDegrees == 0f) + return (Bitmap)inputImage.Clone(); + + // Set up old and new image dimensions, assuming upsizing not wanted and clipping OK + int oldWidth = inputImage.Width; + int oldHeight = inputImage.Height; + int newWidth = oldWidth; + int newHeight = oldHeight; + float scaleFactor = 1f; + + // If upsizing wanted or clipping not OK calculate the size of the resulting bitmap + if (upsizeOk || !clipOk) + { + double angleRadians = angleDegrees * Math.PI / 180d; + + double cos = Math.Abs(Math.Cos(angleRadians)); + double sin = Math.Abs(Math.Sin(angleRadians)); + newWidth = (int)Math.Round(oldWidth * cos + oldHeight * sin); + newHeight = (int)Math.Round(oldWidth * sin + oldHeight * cos); + } + + // If upsizing not wanted and clipping not OK need a scaling factor + if (!upsizeOk && !clipOk) + { + scaleFactor = Math.Min((float)oldWidth / newWidth, (float)oldHeight / newHeight); + newWidth = oldWidth; + newHeight = oldHeight; + } + + // Create the new bitmap object. If background color is transparent it must be 32-bit, + // otherwise 24-bit is good enough. + Bitmap newBitmap = new Bitmap(newWidth, newHeight, backgroundColor == Color.Transparent ? + PixelFormat.Format32bppArgb : PixelFormat.Format24bppRgb); + newBitmap.SetResolution(inputImage.HorizontalResolution, inputImage.VerticalResolution); + + // Create the Graphics object that does the work + using (Graphics graphicsObject = Graphics.FromImage(newBitmap)) + { + graphicsObject.InterpolationMode = InterpolationMode.HighQualityBicubic; + graphicsObject.PixelOffsetMode = PixelOffsetMode.HighQuality; + graphicsObject.SmoothingMode = SmoothingMode.HighQuality; + + // Fill in the specified background color if necessary + if (backgroundColor != Color.Transparent) + graphicsObject.Clear(backgroundColor); + // Set up the built-in transformation matrix to do the rotation and maybe scaling + graphicsObject.TranslateTransform(newWidth / 2f, newHeight / 2f); + + if (scaleFactor != 1f) + graphicsObject.ScaleTransform(scaleFactor, scaleFactor); + + graphicsObject.RotateTransform(angleDegrees); + graphicsObject.TranslateTransform(-oldWidth / 2f, -oldHeight / 2f); + + // Draw the result + graphicsObject.DrawImage(inputImage, 0, 0); + } + + return newBitmap; + } } public class versandscript { public string bezeichnung { get; set; } = "Versandstrassenparaemter"; public int dokumenttypnr { get; set; } = 0; + public string Split_Doc { get; set; } = ""; public string PartCopies { get; set; } = ""; diff --git a/Versandstrasse/bin/Debug/DOCGEN.dll b/Versandstrasse/bin/Debug/DOCGEN.dll index 6aa52502..00742519 100644 Binary files a/Versandstrasse/bin/Debug/DOCGEN.dll and b/Versandstrasse/bin/Debug/DOCGEN.dll differ diff --git a/Versandstrasse/bin/Debug/DOCGEN.pdb b/Versandstrasse/bin/Debug/DOCGEN.pdb index b9e716cf..7ddfd298 100644 Binary files a/Versandstrasse/bin/Debug/DOCGEN.pdb and b/Versandstrasse/bin/Debug/DOCGEN.pdb differ diff --git a/Versandstrasse/bin/Debug/Database.dll b/Versandstrasse/bin/Debug/Database.dll index 1ce81ad9..7280b31e 100644 Binary files a/Versandstrasse/bin/Debug/Database.dll and b/Versandstrasse/bin/Debug/Database.dll differ diff --git a/Versandstrasse/bin/Debug/Database.pdb b/Versandstrasse/bin/Debug/Database.pdb index 569b3817..18e13af0 100644 Binary files a/Versandstrasse/bin/Debug/Database.pdb and b/Versandstrasse/bin/Debug/Database.pdb differ diff --git a/Versandstrasse/bin/Debug/Logging.dll b/Versandstrasse/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/Versandstrasse/bin/Debug/Logging.dll and b/Versandstrasse/bin/Debug/Logging.dll differ diff --git a/Versandstrasse/bin/Debug/Logging.pdb b/Versandstrasse/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/Versandstrasse/bin/Debug/Logging.pdb and b/Versandstrasse/bin/Debug/Logging.pdb differ diff --git a/Versandstrasse/bin/Debug/Versandstrasse.dll b/Versandstrasse/bin/Debug/Versandstrasse.dll index e55f65aa..5bb758ff 100644 Binary files a/Versandstrasse/bin/Debug/Versandstrasse.dll and b/Versandstrasse/bin/Debug/Versandstrasse.dll differ diff --git a/Versandstrasse/bin/Debug/Versandstrasse.pdb b/Versandstrasse/bin/Debug/Versandstrasse.pdb index ce27e3f9..3b80a4f4 100644 Binary files a/Versandstrasse/bin/Debug/Versandstrasse.pdb and b/Versandstrasse/bin/Debug/Versandstrasse.pdb differ diff --git a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache index ae4828be..7f75fe99 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache and b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache differ diff --git a/Versandstrasse/obj/Debug/Versandstrasse.dll b/Versandstrasse/obj/Debug/Versandstrasse.dll index e55f65aa..5bb758ff 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.dll and b/Versandstrasse/obj/Debug/Versandstrasse.dll differ diff --git a/Versandstrasse/obj/Debug/Versandstrasse.pdb b/Versandstrasse/obj/Debug/Versandstrasse.pdb index ce27e3f9..3b80a4f4 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.pdb and b/Versandstrasse/obj/Debug/Versandstrasse.pdb differ diff --git a/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache b/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache index 88837a54..d3734723 100644 Binary files a/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache and b/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache differ diff --git a/ZZPDFTest/bin/Debug/DOCGEN.dll b/ZZPDFTest/bin/Debug/DOCGEN.dll index 6aa52502..00742519 100644 Binary files a/ZZPDFTest/bin/Debug/DOCGEN.dll and b/ZZPDFTest/bin/Debug/DOCGEN.dll differ diff --git a/ZZPDFTest/bin/Debug/DOCGEN.pdb b/ZZPDFTest/bin/Debug/DOCGEN.pdb index b9e716cf..7ddfd298 100644 Binary files a/ZZPDFTest/bin/Debug/DOCGEN.pdb and b/ZZPDFTest/bin/Debug/DOCGEN.pdb differ diff --git a/ZZPDFTest/bin/Debug/Database.dll b/ZZPDFTest/bin/Debug/Database.dll index 1ce81ad9..7280b31e 100644 Binary files a/ZZPDFTest/bin/Debug/Database.dll and b/ZZPDFTest/bin/Debug/Database.dll differ diff --git a/ZZPDFTest/bin/Debug/Database.pdb b/ZZPDFTest/bin/Debug/Database.pdb index 569b3817..18e13af0 100644 Binary files a/ZZPDFTest/bin/Debug/Database.pdb and b/ZZPDFTest/bin/Debug/Database.pdb differ diff --git a/ZZPDFTest/bin/Debug/Logging.dll b/ZZPDFTest/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/ZZPDFTest/bin/Debug/Logging.dll and b/ZZPDFTest/bin/Debug/Logging.dll differ diff --git a/ZZPDFTest/bin/Debug/Logging.pdb b/ZZPDFTest/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/ZZPDFTest/bin/Debug/Logging.pdb and b/ZZPDFTest/bin/Debug/Logging.pdb differ diff --git a/ZZPDFTest/bin/Debug/Model.dll b/ZZPDFTest/bin/Debug/Model.dll index b8d36e01..1c761410 100644 Binary files a/ZZPDFTest/bin/Debug/Model.dll and b/ZZPDFTest/bin/Debug/Model.dll differ diff --git a/ZZPDFTest/bin/Debug/Model.pdb b/ZZPDFTest/bin/Debug/Model.pdb index a7c18ed9..e486e05e 100644 Binary files a/ZZPDFTest/bin/Debug/Model.pdb and b/ZZPDFTest/bin/Debug/Model.pdb differ diff --git a/ZZPDFTest/bin/Debug/Versandstrasse.dll b/ZZPDFTest/bin/Debug/Versandstrasse.dll index fc8c7828..0d5c71ed 100644 Binary files a/ZZPDFTest/bin/Debug/Versandstrasse.dll and b/ZZPDFTest/bin/Debug/Versandstrasse.dll differ diff --git a/ZZPDFTest/bin/Debug/Versandstrasse.pdb b/ZZPDFTest/bin/Debug/Versandstrasse.pdb index f83fbbc3..f05906d6 100644 Binary files a/ZZPDFTest/bin/Debug/Versandstrasse.pdb and b/ZZPDFTest/bin/Debug/Versandstrasse.pdb differ diff --git a/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache b/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache index 9f57d410..c251d3fe 100644 Binary files a/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache and b/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Database.dll b/ZZ_BarcpdeFromFont/bin/Debug/Database.dll index 1ce81ad9..7280b31e 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Database.dll and b/ZZ_BarcpdeFromFont/bin/Debug/Database.dll differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb b/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb index 569b3817..18e13af0 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb and b/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Logging.dll b/ZZ_BarcpdeFromFont/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Logging.dll and b/ZZ_BarcpdeFromFont/bin/Debug/Logging.dll differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Logging.pdb b/ZZ_BarcpdeFromFont/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Logging.pdb and b/ZZ_BarcpdeFromFont/bin/Debug/Logging.pdb differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Model.dll b/ZZ_BarcpdeFromFont/bin/Debug/Model.dll index b8d36e01..1c761410 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Model.dll and b/ZZ_BarcpdeFromFont/bin/Debug/Model.dll differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb b/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb index a7c18ed9..e486e05e 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb and b/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb differ diff --git a/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache b/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache index 501d6e04..d64680e8 100644 Binary files a/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache and b/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache differ diff --git a/ZZ_Signature_C/bin/Debug/DOCGEN.dll b/ZZ_Signature_C/bin/Debug/DOCGEN.dll index 6aa52502..00742519 100644 Binary files a/ZZ_Signature_C/bin/Debug/DOCGEN.dll and b/ZZ_Signature_C/bin/Debug/DOCGEN.dll differ diff --git a/ZZ_Signature_C/bin/Debug/DOCGEN.pdb b/ZZ_Signature_C/bin/Debug/DOCGEN.pdb index b9e716cf..7ddfd298 100644 Binary files a/ZZ_Signature_C/bin/Debug/DOCGEN.pdb and b/ZZ_Signature_C/bin/Debug/DOCGEN.pdb differ diff --git a/ZZ_Signature_C/bin/Debug/Database.dll b/ZZ_Signature_C/bin/Debug/Database.dll index 1ce81ad9..7280b31e 100644 Binary files a/ZZ_Signature_C/bin/Debug/Database.dll and b/ZZ_Signature_C/bin/Debug/Database.dll differ diff --git a/ZZ_Signature_C/bin/Debug/Database.pdb b/ZZ_Signature_C/bin/Debug/Database.pdb index 569b3817..18e13af0 100644 Binary files a/ZZ_Signature_C/bin/Debug/Database.pdb and b/ZZ_Signature_C/bin/Debug/Database.pdb differ diff --git a/ZZ_Signature_C/bin/Debug/Logging.dll b/ZZ_Signature_C/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/ZZ_Signature_C/bin/Debug/Logging.dll and b/ZZ_Signature_C/bin/Debug/Logging.dll differ diff --git a/ZZ_Signature_C/bin/Debug/Logging.pdb b/ZZ_Signature_C/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/ZZ_Signature_C/bin/Debug/Logging.pdb and b/ZZ_Signature_C/bin/Debug/Logging.pdb differ diff --git a/ZZ_Signature_C/bin/Debug/Model.dll b/ZZ_Signature_C/bin/Debug/Model.dll index b8d36e01..1c761410 100644 Binary files a/ZZ_Signature_C/bin/Debug/Model.dll and b/ZZ_Signature_C/bin/Debug/Model.dll differ diff --git a/ZZ_Signature_C/bin/Debug/Model.pdb b/ZZ_Signature_C/bin/Debug/Model.pdb index a7c18ed9..e486e05e 100644 Binary files a/ZZ_Signature_C/bin/Debug/Model.pdb and b/ZZ_Signature_C/bin/Debug/Model.pdb differ diff --git a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache index b1a65780..cae4f7f9 100644 Binary files a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache and b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache differ diff --git a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.FileListAbsolute.txt b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.FileListAbsolute.txt index a3a6daf5..849c20bf 100644 --- a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.FileListAbsolute.txt +++ b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.FileListAbsolute.txt @@ -76,4 +76,3 @@ E:\Software-Projekte\OnDoc\OnDoc\ZZ_Signature_C\bin\Debug\Syncfusion.XlsIO.Base. E:\Software-Projekte\OnDoc\OnDoc\ZZ_Signature_C\bin\Debug\Syncfusion.ExcelToPDFConverter.Base.xml E:\Software-Projekte\OnDoc\OnDoc\ZZ_Signature_C\bin\Debug\OfficePrinter.pdb E:\Software-Projekte\OnDoc\OnDoc\ZZ_Signature_C\bin\Debug\Syncfusion.Presentation.Base.xml -E:\Software-Projekte\OnDoc\OnDoc\ZZ_Signature_C\bin\Debug\vbBarcodes.xml diff --git a/vbBarcodes/bin/Debug/Database.dll b/vbBarcodes/bin/Debug/Database.dll index 1ce81ad9..7280b31e 100644 Binary files a/vbBarcodes/bin/Debug/Database.dll and b/vbBarcodes/bin/Debug/Database.dll differ diff --git a/vbBarcodes/bin/Debug/Database.pdb b/vbBarcodes/bin/Debug/Database.pdb index 569b3817..18e13af0 100644 Binary files a/vbBarcodes/bin/Debug/Database.pdb and b/vbBarcodes/bin/Debug/Database.pdb differ diff --git a/vbBarcodes/bin/Debug/Logging.dll b/vbBarcodes/bin/Debug/Logging.dll index 6e5b17fd..2d6fd322 100644 Binary files a/vbBarcodes/bin/Debug/Logging.dll and b/vbBarcodes/bin/Debug/Logging.dll differ diff --git a/vbBarcodes/bin/Debug/Logging.pdb b/vbBarcodes/bin/Debug/Logging.pdb index 049e0f64..8834ecd5 100644 Binary files a/vbBarcodes/bin/Debug/Logging.pdb and b/vbBarcodes/bin/Debug/Logging.pdb differ diff --git a/vbBarcodes/bin/Debug/Model.dll b/vbBarcodes/bin/Debug/Model.dll index b8d36e01..1c761410 100644 Binary files a/vbBarcodes/bin/Debug/Model.dll and b/vbBarcodes/bin/Debug/Model.dll differ diff --git a/vbBarcodes/bin/Debug/Model.pdb b/vbBarcodes/bin/Debug/Model.pdb index a7c18ed9..e486e05e 100644 Binary files a/vbBarcodes/bin/Debug/Model.pdb and b/vbBarcodes/bin/Debug/Model.pdb differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache index e8ce2048..ab67e652 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache and b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache differ