diff --git a/API_NetFramework/bin/Model.dll b/API_NetFramework/bin/Model.dll index 3a9c2e9b..b8d36e01 100644 Binary files a/API_NetFramework/bin/Model.dll and b/API_NetFramework/bin/Model.dll differ diff --git a/API_NetFramework/bin/Model.pdb b/API_NetFramework/bin/Model.pdb index 518b4770..a7c18ed9 100644 Binary files a/API_NetFramework/bin/Model.pdb and b/API_NetFramework/bin/Model.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index 6ac7504d..3cbd1837 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 4cc6f874..d3ccad5c 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 8448a73e..fe5d984a 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 6ac7504d..3cbd1837 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 4cc6f874..d3ccad5c 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/Model.dll b/BarcodeLib/bin/Debug/Model.dll index 3a9c2e9b..b8d36e01 100644 Binary files a/BarcodeLib/bin/Debug/Model.dll and b/BarcodeLib/bin/Debug/Model.dll differ diff --git a/BarcodeLib/bin/Debug/Model.pdb b/BarcodeLib/bin/Debug/Model.pdb index 518b4770..a7c18ed9 100644 Binary files a/BarcodeLib/bin/Debug/Model.pdb and b/BarcodeLib/bin/Debug/Model.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index 2f3d4b2a..2298c0f7 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index 012071d1..2613a44c 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -64,7 +64,7 @@ this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(134, 26); this.label2.TabIndex = 2; - this.label2.Text = "6. April 2025"; + this.label2.Text = "7. April 2025"; // // SplashScreen // diff --git a/Client/DocMgmt/DokTypSelect.resx b/Client/DocMgmt/DokTypSelect.resx index 8c784107..04fdf5dd 100644 --- a/Client/DocMgmt/DokTypSelect.resx +++ b/Client/DocMgmt/DokTypSelect.resx @@ -283,7 +283,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACo - DQAAAk1TRnQBSQFMAgEBBwEAAWgBAQFoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DQAAAk1TRnQBSQFMAgEBBwEAAXABAQFwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 40547527..b533ac07 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -287,7 +287,7 @@ namespace OnDoc.UICintrols if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][1])) { RibbonPartnerSaldiert.Visible = true; } else { RibbonPartnerSaldiert.Visible = false; ribbonPersonSaldiert.Visible = false; } - if (this.partnernr < 10000000) + if (this.partnernr < 100000000) { refresh_person(); } @@ -1632,6 +1632,17 @@ namespace OnDoc.UICintrols return false; } + + private void reserve_vs_dokument(string dokumentid,int fnkt) + { + DB db = new DB(AppParams.connectionstring); + db.clear_parameter(); + db.add_parameter("@dokumentid", dokumentid); + db.add_parameter("@mitarbeiter", AppParams.CurrentMitarbeiter.ToString()); + db.add_parameter("@fnkt", fnkt.ToString()); + db.Get_Tabledata("Ondoc_Handle_Versandstrasse_Reserved_Dokcuments", true, false); + db = null; + } private void ribbonButtonVersandstrasse_Click(object sender, EventArgs e) { @@ -1643,7 +1654,7 @@ namespace OnDoc.UICintrols foreach (var record in records) { var datarow = record as DataRowView; - + if (check_versandpaket_bp(ref versandpakete, Convert.ToInt32(datarow["partner-nr"]))) { foreach(Versandpaket versandpaket in versandpakete) @@ -1651,6 +1662,7 @@ namespace OnDoc.UICintrols if (versandpaket.partnernr== Convert.ToInt32(datarow["partner-nr"])) { versandpaket.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString())); + reserve_vs_dokument(datarow["dokumentid"].ToString(), 1); } } } @@ -1665,6 +1677,8 @@ namespace OnDoc.UICintrols vp.GASAdresse = ""; vp.PaketNr = i.ToString(); vp.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString())); + + reserve_vs_dokument(datarow["dokumentid"].ToString(), 1); i++; versandpakete.Add(vp); diff --git a/Client/Versandstrasse/Versandstrasse.Designer.cs b/Client/Versandstrasse/Versandstrasse.Designer.cs index 45427e49..75cdd67a 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 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.PdfViewer.MessageBoxSettings messageBoxSettings1 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); + Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings1 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); + Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings1 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = 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.PdfViewer.MessageBoxSettings messageBoxSettings2 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); + Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings2 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); + Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings2 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); + Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = 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); @@ -51,47 +51,53 @@ this.label4 = new System.Windows.Forms.Label(); this.pdfViewerControl1 = new Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl(); this.GrpPaketDetails = new System.Windows.Forms.GroupBox(); - this.button1 = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.rbversandoption1 = new System.Windows.Forms.RadioButton(); - this.rbversandoption2 = new System.Windows.Forms.RadioButton(); - this.rbapost = new System.Windows.Forms.RadioButton(); - this.rbversandoption3 = new System.Windows.Forms.RadioButton(); - this.rbb2post = new System.Windows.Forms.RadioButton(); - this.rbb1post = new System.Windows.Forms.RadioButton(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.chkGAS = new System.Windows.Forms.CheckBox(); - this.treeViewAdvAdresse = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); - this.btnPrepare = new System.Windows.Forms.Button(); this.panelVerify = new System.Windows.Forms.Panel(); - this.btnSendFinal = new System.Windows.Forms.Button(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.button3 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.btnSendFinal = new System.Windows.Forms.Button(); + this.btnPrepare = new System.Windows.Forms.Button(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.treeViewAdvAdresse = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); + this.chkGAS = new System.Windows.Forms.CheckBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.rbb1post = new System.Windows.Forms.RadioButton(); + this.rbb2post = new System.Windows.Forms.RadioButton(); + this.rbversandoption3 = new System.Windows.Forms.RadioButton(); + this.rbapost = new System.Windows.Forms.RadioButton(); + this.rbversandoption2 = new System.Windows.Forms.RadioButton(); + this.rbversandoption1 = new System.Windows.Forms.RadioButton(); + this.button1 = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); + this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); this.TabControlDokuments = new Syncfusion.Windows.Forms.Tools.TabControlAdv(); this.tabPageAdv1 = new Syncfusion.Windows.Forms.Tools.TabPageAdv(); this.tabPageAdv2 = new Syncfusion.Windows.Forms.Tools.TabPageAdv(); - this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); + this.pdfViewerControl2 = new Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl(); this.treeViewAdvCouverts = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); this.imageList2 = new System.Windows.Forms.ImageList(this.components); - this.pdfViewerControl2 = new Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl(); - this.button3 = new System.Windows.Forms.Button(); + this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.versandCouvertLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.versandCouvertÖffnenbearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); this.contextMenuStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.panelPrepare.SuspendLayout(); this.GrpPaketDetails.SuspendLayout(); - this.groupBox1.SuspendLayout(); + this.panelVerify.SuspendLayout(); this.groupBox3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).BeginInit(); - this.panelVerify.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.TabControlDokuments)).BeginInit(); this.TabControlDokuments.SuspendLayout(); this.tabPageAdv1.SuspendLayout(); this.tabPageAdv2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvCouverts)).BeginInit(); + this.contextMenuStrip2.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // contextMenuStrip1 @@ -100,14 +106,15 @@ 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(181, 48); 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(180, 22); this.löschenToolStripMenuItem.Text = "Löschen"; + this.löschenToolStripMenuItem.Click += new System.EventHandler(this.löschenToolStripMenuItem_Click); // // imageList1 // @@ -200,17 +207,17 @@ this.pdfViewerControl1.IsTextSearchEnabled = true; this.pdfViewerControl1.IsTextSelectionEnabled = true; this.pdfViewerControl1.Location = new System.Drawing.Point(888, 46); - messageBoxSettings3.EnableNotification = true; - this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings3; + messageBoxSettings1.EnableNotification = true; + this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings1; this.pdfViewerControl1.MinimumZoomPercentage = 50; this.pdfViewerControl1.Name = "pdfViewerControl1"; this.pdfViewerControl1.PageBorderThickness = 1; - 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; + pdfViewerPrinterSettings1.Copies = 1; + pdfViewerPrinterSettings1.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; + pdfViewerPrinterSettings1.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; + pdfViewerPrinterSettings1.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings1.PrintLocation"))); + pdfViewerPrinterSettings1.ShowPrintStatusDialog = true; + this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings1; this.pdfViewerControl1.ReferencePath = null; this.pdfViewerControl1.ScrollDisplacementValue = 0; this.pdfViewerControl1.ShowHorizontalScrollBar = true; @@ -220,10 +227,10 @@ this.pdfViewerControl1.SpaceBetweenPages = 8; this.pdfViewerControl1.TabIndex = 10; this.pdfViewerControl1.Text = "pdfViewerControl1"; - 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; + textSearchSettings1.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); + textSearchSettings1.HighlightAllInstance = true; + textSearchSettings1.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); + this.pdfViewerControl1.TextSearchSettings = textSearchSettings1; this.pdfViewerControl1.ThemeName = "Default"; this.pdfViewerControl1.VerticalScrollOffset = 0; this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; @@ -243,100 +250,80 @@ this.GrpPaketDetails.TabStop = false; this.GrpPaketDetails.Text = "Details zum Couvert"; // - // button1 - // - this.button1.Location = new System.Drawing.Point(27, 337); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 3; - this.button1.Text = "Speichern"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Visible = false; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // groupBox1 + // panelVerify // - this.groupBox1.Controls.Add(this.rbb1post); - this.groupBox1.Controls.Add(this.rbb2post); - this.groupBox1.Controls.Add(this.rbversandoption3); - this.groupBox1.Controls.Add(this.rbapost); - this.groupBox1.Controls.Add(this.rbversandoption2); - this.groupBox1.Controls.Add(this.rbversandoption1); - this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.groupBox1.Location = new System.Drawing.Point(3, 16); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(440, 61); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Versandart"; + this.panelVerify.Controls.Add(this.button3); + this.panelVerify.Controls.Add(this.button2); + this.panelVerify.Controls.Add(this.label3); + this.panelVerify.Controls.Add(this.label2); + this.panelVerify.Controls.Add(this.btnSendFinal); + this.panelVerify.Location = new System.Drawing.Point(9, 386); + this.panelVerify.Name = "panelVerify"; + this.panelVerify.Size = new System.Drawing.Size(431, 100); + this.panelVerify.TabIndex = 6; + this.panelVerify.Visible = false; // - // rbversandoption1 + // button3 // - 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.TabIndex = 0; - this.rbversandoption1.Text = "Hauptadresse und Versandart"; - this.rbversandoption1.UseVisualStyleBackColor = true; - this.rbversandoption1.Visible = false; + this.button3.BackColor = System.Drawing.Color.Salmon; + this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button3.Location = new System.Drawing.Point(232, 21); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(196, 35); + this.button3.TabIndex = 8; + this.button3.Text = "Direkt versenden (Tests)"; + this.button3.UseVisualStyleBackColor = false; + this.button3.Click += new System.EventHandler(this.button3_Click); // - // rbversandoption2 + // button2 // - 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.TabIndex = 1; - this.rbversandoption2.Text = "Hauptadresse, E-Banking erzwingen"; - this.rbversandoption2.UseVisualStyleBackColor = true; - this.rbversandoption2.Visible = false; + this.button2.Location = new System.Drawing.Point(3, 68); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(123, 23); + this.button2.TabIndex = 7; + this.button2.Text = "Abbrechen"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); // - // rbapost + // label3 // - this.rbapost.AutoSize = true; - this.rbapost.Location = new System.Drawing.Point(142, 21); - this.rbapost.Name = "rbapost"; - this.rbapost.Size = new System.Drawing.Size(211, 17); - this.rbapost.TabIndex = 3; - this.rbapost.Text = "A-Post (Versand tagfertig bis 16:00 Uhr)"; - this.rbapost.UseVisualStyleBackColor = true; - this.rbapost.CheckedChanged += new System.EventHandler(this.rbapost_CheckedChanged); + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(4, 17); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(141, 13); + this.label3.TabIndex = 7; + this.label3.Text = "der Druckaufgrag ausgelöst."; // - // rbversandoption3 + // label2 // - 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.TabIndex = 2; - this.rbversandoption3.Text = "Hauptadresse, Postversand erzwingen"; - this.rbversandoption3.UseVisualStyleBackColor = true; - this.rbversandoption3.Visible = false; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(4, 4); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(310, 13); + this.label2.TabIndex = 6; + this.label2.Text = "Das aufbereitete PDF prüfen. Sofern \"geprüft\" betätigt wird, wird"; // - // rbb2post + // btnSendFinal // - 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.TabIndex = 4; - this.rbb2post.Text = "B2-Post"; - this.rbb2post.UseVisualStyleBackColor = true; - this.rbb2post.CheckedChanged += new System.EventHandler(this.rbapost_CheckedChanged); + this.btnSendFinal.BackColor = System.Drawing.Color.Salmon; + this.btnSendFinal.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnSendFinal.Location = new System.Drawing.Point(232, 62); + this.btnSendFinal.Name = "btnSendFinal"; + this.btnSendFinal.Size = new System.Drawing.Size(196, 35); + this.btnSendFinal.TabIndex = 5; + this.btnSendFinal.Text = "Versenden (Queue)"; + this.btnSendFinal.UseVisualStyleBackColor = false; + this.btnSendFinal.Click += new System.EventHandler(this.btnSendFinal_Click); // - // rbb1post + // btnPrepare // - this.rbb1post.AutoSize = true; - 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.TabIndex = 5; - this.rbb1post.TabStop = true; - this.rbb1post.Text = "B1-Post"; - this.rbb1post.UseVisualStyleBackColor = true; - this.rbb1post.CheckedChanged += new System.EventHandler(this.rbapost_CheckedChanged); + this.btnPrepare.Location = new System.Drawing.Point(6, 337); + this.btnPrepare.Name = "btnPrepare"; + this.btnPrepare.Size = new System.Drawing.Size(181, 23); + this.btnPrepare.TabIndex = 4; + this.btnPrepare.Text = "Versand-Couvert püfen"; + this.btnPrepare.UseVisualStyleBackColor = true; + this.btnPrepare.Click += new System.EventHandler(this.btnSend_Click); // // groupBox3 // @@ -349,29 +336,18 @@ this.groupBox3.TabIndex = 2; this.groupBox3.TabStop = false; // - // chkGAS - // - this.chkGAS.AutoSize = true; - this.chkGAS.Location = new System.Drawing.Point(3, 21); - this.chkGAS.Name = "chkGAS"; - this.chkGAS.Size = new System.Drawing.Size(178, 17); - this.chkGAS.TabIndex = 0; - this.chkGAS.Text = "Frankiertes Rückantwortcouvert"; - this.chkGAS.UseVisualStyleBackColor = true; - this.chkGAS.CheckedChanged += new System.EventHandler(this.chkGAS_CheckedChanged); - // // treeViewAdvAdresse // this.treeViewAdvAdresse.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window); - 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; + treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; + 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.Black; this.treeViewAdvAdresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo4)}); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(417, 193); // // @@ -404,68 +380,111 @@ this.treeViewAdvAdresse.AfterSelect += new System.EventHandler(this.treeViewAdvAdresse_AfterSelect); this.treeViewAdvAdresse.NodeMouseClick += new Syncfusion.Windows.Forms.Tools.TreeNodeAdvMouseClickArgs(this.treeViewAdvAdresse_NodeMouseClick); // - // btnPrepare - // - this.btnPrepare.Location = new System.Drawing.Point(6, 337); - this.btnPrepare.Name = "btnPrepare"; - this.btnPrepare.Size = new System.Drawing.Size(181, 23); - this.btnPrepare.TabIndex = 4; - this.btnPrepare.Text = "Versand-Couvert püfen"; - this.btnPrepare.UseVisualStyleBackColor = true; - this.btnPrepare.Click += new System.EventHandler(this.btnSend_Click); + // chkGAS // - // panelVerify + this.chkGAS.AutoSize = true; + this.chkGAS.Location = new System.Drawing.Point(3, 21); + this.chkGAS.Name = "chkGAS"; + this.chkGAS.Size = new System.Drawing.Size(178, 17); + this.chkGAS.TabIndex = 0; + this.chkGAS.Text = "Frankiertes Rückantwortcouvert"; + this.chkGAS.UseVisualStyleBackColor = true; + this.chkGAS.CheckedChanged += new System.EventHandler(this.chkGAS_CheckedChanged); // - this.panelVerify.Controls.Add(this.button3); - this.panelVerify.Controls.Add(this.button2); - this.panelVerify.Controls.Add(this.label3); - this.panelVerify.Controls.Add(this.label2); - this.panelVerify.Controls.Add(this.btnSendFinal); - this.panelVerify.Location = new System.Drawing.Point(9, 386); - this.panelVerify.Name = "panelVerify"; - this.panelVerify.Size = new System.Drawing.Size(431, 100); - this.panelVerify.TabIndex = 6; - this.panelVerify.Visible = false; + // groupBox1 // - // btnSendFinal + this.groupBox1.Controls.Add(this.rbb1post); + this.groupBox1.Controls.Add(this.rbb2post); + this.groupBox1.Controls.Add(this.rbversandoption3); + this.groupBox1.Controls.Add(this.rbapost); + this.groupBox1.Controls.Add(this.rbversandoption2); + this.groupBox1.Controls.Add(this.rbversandoption1); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; + this.groupBox1.Location = new System.Drawing.Point(3, 16); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(440, 61); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Versandart"; // - this.btnSendFinal.BackColor = System.Drawing.Color.Salmon; - this.btnSendFinal.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnSendFinal.Location = new System.Drawing.Point(232, 62); - this.btnSendFinal.Name = "btnSendFinal"; - this.btnSendFinal.Size = new System.Drawing.Size(196, 35); - this.btnSendFinal.TabIndex = 5; - this.btnSendFinal.Text = "Versenden (Queue)"; - this.btnSendFinal.UseVisualStyleBackColor = false; - this.btnSendFinal.Click += new System.EventHandler(this.btnSendFinal_Click); + // rbb1post // - // label2 + this.rbb1post.AutoSize = true; + 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.TabIndex = 5; + this.rbb1post.TabStop = true; + this.rbb1post.Text = "B1-Post"; + this.rbb1post.UseVisualStyleBackColor = true; + this.rbb1post.CheckedChanged += new System.EventHandler(this.rbapost_CheckedChanged); // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(4, 4); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(310, 13); - this.label2.TabIndex = 6; - this.label2.Text = "Das aufbereitete PDF prüfen. Sofern \"geprüft\" betätigt wird, wird"; + // rbb2post // - // label3 + 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.TabIndex = 4; + this.rbb2post.Text = "B2-Post"; + this.rbb2post.UseVisualStyleBackColor = true; + this.rbb2post.CheckedChanged += new System.EventHandler(this.rbapost_CheckedChanged); // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(4, 17); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(141, 13); - this.label3.TabIndex = 7; - this.label3.Text = "der Druckaufgrag ausgelöst."; + // rbversandoption3 // - // button2 + 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.TabIndex = 2; + this.rbversandoption3.Text = "Hauptadresse, Postversand erzwingen"; + this.rbversandoption3.UseVisualStyleBackColor = true; + this.rbversandoption3.Visible = false; // - this.button2.Location = new System.Drawing.Point(3, 68); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(123, 23); - this.button2.TabIndex = 7; - this.button2.Text = "Abbrechen"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); + // rbapost + // + this.rbapost.AutoSize = true; + this.rbapost.Location = new System.Drawing.Point(142, 21); + this.rbapost.Name = "rbapost"; + this.rbapost.Size = new System.Drawing.Size(211, 17); + this.rbapost.TabIndex = 3; + this.rbapost.Text = "A-Post (Versand tagfertig bis 16:00 Uhr)"; + this.rbapost.UseVisualStyleBackColor = true; + this.rbapost.CheckedChanged += new System.EventHandler(this.rbapost_CheckedChanged); + // + // rbversandoption2 + // + 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.TabIndex = 1; + this.rbversandoption2.Text = "Hauptadresse, E-Banking erzwingen"; + this.rbversandoption2.UseVisualStyleBackColor = true; + this.rbversandoption2.Visible = false; + // + // rbversandoption1 + // + 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.TabIndex = 0; + this.rbversandoption1.Text = "Hauptadresse und Versandart"; + this.rbversandoption1.UseVisualStyleBackColor = true; + this.rbversandoption1.Visible = false; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(27, 337); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 3; + this.button1.Text = "Speichern"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Visible = false; + this.button1.Click += new System.EventHandler(this.button1_Click); // // panel3 // @@ -477,62 +496,21 @@ this.panel3.Size = new System.Drawing.Size(888, 556); this.panel3.TabIndex = 13; // - // TabControlDokuments - // - this.TabControlDokuments.BorderVisible = true; - this.TabControlDokuments.Controls.Add(this.tabPageAdv1); - this.TabControlDokuments.Controls.Add(this.tabPageAdv2); - this.TabControlDokuments.Dock = System.Windows.Forms.DockStyle.Fill; - this.TabControlDokuments.Location = new System.Drawing.Point(2, 2); - this.TabControlDokuments.Name = "TabControlDokuments"; - this.TabControlDokuments.Size = new System.Drawing.Size(1519, 632); - this.TabControlDokuments.TabIndex = 20; - this.TabControlDokuments.ThemeStyle.PrimitiveButtonStyle.DisabledNextPageImage = null; - this.TabControlDokuments.SelectedIndexChanged += new System.EventHandler(this.TabControlDokuments_SelectedIndexChanged); - // - // tabPageAdv1 - // - this.tabPageAdv1.Controls.Add(this.panelPrepare); - this.tabPageAdv1.Controls.Add(this.pdfViewerControl1); - this.tabPageAdv1.Controls.Add(this.panel3); - this.tabPageAdv1.Controls.Add(this.toolStrip1); - this.tabPageAdv1.Image = null; - this.tabPageAdv1.ImageSize = new System.Drawing.Size(16, 16); - this.tabPageAdv1.Location = new System.Drawing.Point(5, 25); - this.tabPageAdv1.Name = "tabPageAdv1"; - this.tabPageAdv1.ShowCloseButton = true; - this.tabPageAdv1.Size = new System.Drawing.Size(1509, 602); - this.tabPageAdv1.Text = "Versand-Couvert erstellen"; - this.tabPageAdv1.ThemesEnabled = false; - // - // tabPageAdv2 - // - this.tabPageAdv2.Controls.Add(this.pdfViewerControl2); - this.tabPageAdv2.Controls.Add(this.treeViewAdvCouverts); - this.tabPageAdv2.Image = null; - this.tabPageAdv2.ImageSize = new System.Drawing.Size(16, 16); - this.tabPageAdv2.Location = new System.Drawing.Point(5, 25); - this.tabPageAdv2.Name = "tabPageAdv2"; - this.tabPageAdv2.ShowCloseButton = true; - this.tabPageAdv2.Size = new System.Drawing.Size(1509, 602); - this.tabPageAdv2.Text = "Bereitgestellte Versand-Couverts"; - this.tabPageAdv2.ThemesEnabled = false; - // // treeViewAdv1 // 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)))))); - 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))))); + 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.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)}); this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(433, 556); this.treeViewAdv1.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat; this.treeViewAdv1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -594,26 +572,108 @@ this.treeViewAdv1.DragOver += new System.Windows.Forms.DragEventHandler(this.treeViewAdv1_DragOver); this.treeViewAdv1.DragLeave += new System.EventHandler(this.treeViewAdv1_DragLeave); // + // TabControlDokuments + // + this.TabControlDokuments.BorderVisible = true; + this.TabControlDokuments.Controls.Add(this.tabPageAdv1); + this.TabControlDokuments.Controls.Add(this.tabPageAdv2); + this.TabControlDokuments.Dock = System.Windows.Forms.DockStyle.Fill; + this.TabControlDokuments.Location = new System.Drawing.Point(2, 2); + this.TabControlDokuments.Name = "TabControlDokuments"; + this.TabControlDokuments.Size = new System.Drawing.Size(1519, 632); + this.TabControlDokuments.TabIndex = 20; + this.TabControlDokuments.ThemeStyle.PrimitiveButtonStyle.DisabledNextPageImage = null; + this.TabControlDokuments.SelectedIndexChanged += new System.EventHandler(this.TabControlDokuments_SelectedIndexChanged); + // + // tabPageAdv1 + // + this.tabPageAdv1.Controls.Add(this.panelPrepare); + this.tabPageAdv1.Controls.Add(this.pdfViewerControl1); + this.tabPageAdv1.Controls.Add(this.panel3); + this.tabPageAdv1.Controls.Add(this.toolStrip1); + this.tabPageAdv1.Image = null; + this.tabPageAdv1.ImageSize = new System.Drawing.Size(16, 16); + this.tabPageAdv1.Location = new System.Drawing.Point(5, 25); + this.tabPageAdv1.Name = "tabPageAdv1"; + this.tabPageAdv1.ShowCloseButton = true; + this.tabPageAdv1.Size = new System.Drawing.Size(1509, 602); + this.tabPageAdv1.Text = "Versand-Couvert erstellen"; + this.tabPageAdv1.ThemesEnabled = false; + // + // tabPageAdv2 + // + this.tabPageAdv2.Controls.Add(this.pdfViewerControl2); + this.tabPageAdv2.Controls.Add(this.groupBox2); + this.tabPageAdv2.Image = null; + this.tabPageAdv2.ImageSize = new System.Drawing.Size(16, 16); + this.tabPageAdv2.Location = new System.Drawing.Point(5, 25); + this.tabPageAdv2.Name = "tabPageAdv2"; + this.tabPageAdv2.ShowCloseButton = true; + this.tabPageAdv2.Size = new System.Drawing.Size(1509, 602); + this.tabPageAdv2.Text = "Bereitgestellte Versand-Couverts"; + this.tabPageAdv2.ThemesEnabled = false; + // + // pdfViewerControl2 + // + this.pdfViewerControl2.CursorMode = Syncfusion.Windows.Forms.PdfViewer.PdfViewerCursorMode.SelectTool; + this.pdfViewerControl2.Dock = System.Windows.Forms.DockStyle.Fill; + this.pdfViewerControl2.EnableContextMenu = true; + this.pdfViewerControl2.EnableNotificationBar = true; + this.pdfViewerControl2.HorizontalScrollOffset = 0; + this.pdfViewerControl2.IsBookmarkEnabled = true; + this.pdfViewerControl2.IsTextSearchEnabled = true; + this.pdfViewerControl2.IsTextSelectionEnabled = true; + this.pdfViewerControl2.Location = new System.Drawing.Point(482, 0); + messageBoxSettings2.EnableNotification = true; + this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings2; + this.pdfViewerControl2.MinimumZoomPercentage = 50; + this.pdfViewerControl2.Name = "pdfViewerControl2"; + this.pdfViewerControl2.PageBorderThickness = 1; + pdfViewerPrinterSettings2.Copies = 1; + pdfViewerPrinterSettings2.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; + pdfViewerPrinterSettings2.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; + pdfViewerPrinterSettings2.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings2.PrintLocation"))); + pdfViewerPrinterSettings2.ShowPrintStatusDialog = true; + this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings2; + this.pdfViewerControl2.ReferencePath = null; + this.pdfViewerControl2.ScrollDisplacementValue = 0; + this.pdfViewerControl2.ShowHorizontalScrollBar = true; + this.pdfViewerControl2.ShowToolBar = true; + this.pdfViewerControl2.ShowVerticalScrollBar = true; + this.pdfViewerControl2.Size = new System.Drawing.Size(1027, 602); + this.pdfViewerControl2.SpaceBetweenPages = 8; + this.pdfViewerControl2.TabIndex = 11; + this.pdfViewerControl2.Text = "pdfViewerControl2"; + textSearchSettings2.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); + textSearchSettings2.HighlightAllInstance = true; + textSearchSettings2.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); + this.pdfViewerControl2.TextSearchSettings = textSearchSettings2; + this.pdfViewerControl2.ThemeName = "Default"; + this.pdfViewerControl2.VerticalScrollOffset = 0; + this.pdfViewerControl2.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; + this.pdfViewerControl2.ZoomMode = Syncfusion.Windows.Forms.PdfViewer.ZoomMode.Default; + // // treeViewAdvCouverts // this.treeViewAdvCouverts.AllowDrop = true; + 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)))))); - 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))))); + 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))))); this.treeViewAdvCouverts.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)}); - this.treeViewAdvCouverts.BeforeTouchSize = new System.Drawing.Size(550, 602); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)}); + this.treeViewAdvCouverts.BeforeTouchSize = new System.Drawing.Size(476, 583); this.treeViewAdvCouverts.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat; this.treeViewAdvCouverts.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.treeViewAdvCouverts.ContextMenuStrip = this.contextMenuStrip1; - this.treeViewAdvCouverts.Dock = System.Windows.Forms.DockStyle.Left; + this.treeViewAdvCouverts.ContextMenuStrip = this.contextMenuStrip2; + this.treeViewAdvCouverts.Dock = System.Windows.Forms.DockStyle.Fill; this.treeViewAdvCouverts.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.treeViewAdvCouverts.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); // @@ -631,7 +691,7 @@ this.treeViewAdvCouverts.ItemHeight = 25; this.treeViewAdvCouverts.LeftImageList = this.imageList2; this.treeViewAdvCouverts.LineColor = System.Drawing.Color.FromArgb(((int)(((byte)(94)))), ((int)(((byte)(94)))), ((int)(((byte)(94))))); - this.treeViewAdvCouverts.Location = new System.Drawing.Point(0, 0); + this.treeViewAdvCouverts.Location = new System.Drawing.Point(3, 16); this.treeViewAdvCouverts.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(158)))), ((int)(((byte)(218))))); this.treeViewAdvCouverts.MetroScrollBars = true; this.treeViewAdvCouverts.Name = "treeViewAdvCouverts"; @@ -639,7 +699,7 @@ this.treeViewAdvCouverts.SelectedNodeBackground = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(197)))), ((int)(((byte)(197)))))); this.treeViewAdvCouverts.SelectedNodeForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); this.treeViewAdvCouverts.ShowFocusRect = false; - this.treeViewAdvCouverts.Size = new System.Drawing.Size(550, 602); + this.treeViewAdvCouverts.Size = new System.Drawing.Size(476, 583); this.treeViewAdvCouverts.Style = Syncfusion.Windows.Forms.Tools.TreeStyle.Office2016Colorful; this.treeViewAdvCouverts.TabIndex = 8; this.treeViewAdvCouverts.Text = "treeViewAdv2"; @@ -673,57 +733,38 @@ this.imageList2.Images.SetKeyName(1, "B1.png"); this.imageList2.Images.SetKeyName(2, "B2.png"); // - // pdfViewerControl2 + // contextMenuStrip2 // - this.pdfViewerControl2.CursorMode = Syncfusion.Windows.Forms.PdfViewer.PdfViewerCursorMode.SelectTool; - this.pdfViewerControl2.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfViewerControl2.EnableContextMenu = true; - this.pdfViewerControl2.EnableNotificationBar = true; - this.pdfViewerControl2.HorizontalScrollOffset = 0; - this.pdfViewerControl2.IsBookmarkEnabled = true; - this.pdfViewerControl2.IsTextSearchEnabled = true; - this.pdfViewerControl2.IsTextSelectionEnabled = true; - this.pdfViewerControl2.Location = new System.Drawing.Point(550, 0); - messageBoxSettings4.EnableNotification = true; - this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings4; - this.pdfViewerControl2.MinimumZoomPercentage = 50; - this.pdfViewerControl2.Name = "pdfViewerControl2"; - this.pdfViewerControl2.PageBorderThickness = 1; - 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; - this.pdfViewerControl2.ShowToolBar = true; - this.pdfViewerControl2.ShowVerticalScrollBar = true; - this.pdfViewerControl2.Size = new System.Drawing.Size(959, 602); - this.pdfViewerControl2.SpaceBetweenPages = 8; - this.pdfViewerControl2.TabIndex = 11; - this.pdfViewerControl2.Text = "pdfViewerControl2"; - 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; - this.pdfViewerControl2.ZoomMode = Syncfusion.Windows.Forms.PdfViewer.ZoomMode.Default; + this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.versandCouvertLöschenToolStripMenuItem, + this.versandCouvertÖffnenbearbeitenToolStripMenuItem}); + this.contextMenuStrip2.Name = "contextMenuStrip2"; + this.contextMenuStrip2.Size = new System.Drawing.Size(262, 48); // - // button3 + // versandCouvertLöschenToolStripMenuItem // - this.button3.BackColor = System.Drawing.Color.Salmon; - this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button3.Location = new System.Drawing.Point(232, 21); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(196, 35); - this.button3.TabIndex = 8; - this.button3.Text = "Direkt versenden (Tests)"; - this.button3.UseVisualStyleBackColor = false; - this.button3.Click += new System.EventHandler(this.button3_Click); + this.versandCouvertLöschenToolStripMenuItem.Name = "versandCouvertLöschenToolStripMenuItem"; + this.versandCouvertLöschenToolStripMenuItem.Size = new System.Drawing.Size(261, 22); + 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.Text = "Versand-Couvert öffnen/bearbeiten"; + this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertÖffnenbearbeitenToolStripMenuItem_Click); + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.treeViewAdvCouverts); + this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left; + this.groupBox2.Location = new System.Drawing.Point(0, 0); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(482, 602); + this.groupBox2.TabIndex = 12; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Couverts"; // // Versandstrasse // @@ -744,20 +785,22 @@ this.panelPrepare.ResumeLayout(false); this.panelPrepare.PerformLayout(); this.GrpPaketDetails.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); + this.panelVerify.ResumeLayout(false); + this.panelVerify.PerformLayout(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).EndInit(); - this.panelVerify.ResumeLayout(false); - this.panelVerify.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.TabControlDokuments)).EndInit(); this.TabControlDokuments.ResumeLayout(false); this.tabPageAdv1.ResumeLayout(false); this.tabPageAdv2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvCouverts)).EndInit(); + this.contextMenuStrip2.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); this.ResumeLayout(false); } @@ -801,5 +844,9 @@ private System.Windows.Forms.ImageList imageList2; private Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl pdfViewerControl2; private System.Windows.Forms.Button button3; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip2; + private System.Windows.Forms.ToolStripMenuItem versandCouvertLöschenToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem versandCouvertÖffnenbearbeitenToolStripMenuItem; + private System.Windows.Forms.GroupBox groupBox2; } } \ No newline at end of file diff --git a/Client/Versandstrasse/Versandstrasse.cs b/Client/Versandstrasse/Versandstrasse.cs index 3582450a..ab04d226 100644 --- a/Client/Versandstrasse/Versandstrasse.cs +++ b/Client/Versandstrasse/Versandstrasse.cs @@ -22,6 +22,7 @@ using Database; using System.Net; using Newtonsoft.Json; using Windows.Media.Capture; +using Syncfusion.Olap.MDXQueryParser; namespace OnDoc.Versandstrasse { @@ -72,11 +73,12 @@ namespace OnDoc.Versandstrasse } private void Versandstrasse_Load(object sender, EventArgs e) { - + Reload_Tree(); load_adressen(); } - private void Reload_Tree() { + private void Reload_Tree() + { if (serienbrief) { @@ -129,15 +131,25 @@ namespace OnDoc.Versandstrasse } private bool Verify_Couvert(TreeNodeAdv node) { + DB db = new DB(AppParams.connectionstring); + Versandpaket vp = node.TagObject as Versandpaket; + if (vp.partnernr == 0 && node.Nodes.Count==1) + { + TreeNodeAdv tn = node.Nodes[0]; + db.Get_Tabledata("SELECT dbo.Partner.NRPAR00, dbo.Partner.BKPAR00 FROM dbo.dokument INNER JOIN dbo.Partner ON dbo.dokument.nrpar00 = dbo.Partner.NRPAR00 WHERE dbo.dokument.dokumentid='" + tn.Tag + "'", false, true); + node.Text = node.Text + " - " + db.dsdaten.Tables[0].Rows[0][0].ToString() + " " + db.dsdaten.Tables[0].Rows[0][0].ToString(); + vp.partnernr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]); + + } + int currentbp = vp.partnernr; - DB db = new DB(AppParams.connectionstring); //node.LeftImageIndices = new int[] { 0 }; int nodecounter = 0; int anzbp = 1; - + bool versandbereit = true; - + foreach (TreeNodeAdv dokumentnode in node.Nodes) { //node.LeftImageIndices = new int[] { 0 }; @@ -154,14 +166,14 @@ namespace OnDoc.Versandstrasse if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0) { set_nodeimage(dokumentnode, 0); - + versandbereit = false; } else { if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0) { - if (nodecounter == 0) { set_nodeimage(dokumentnode, 4); } + if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; } else { set_nodeimage(dokumentnode, 5); @@ -178,11 +190,12 @@ namespace OnDoc.Versandstrasse } if (node.Nodes.Count < 1) { versandbereit = false; } if (anzbp > 1) { versandbereit = false; } - if (versandbereit == true) + if (versandbereit == true) { set_nodeimage(node, 1); return true; - } else + } + else { set_nodeimage(node, 0); return false; @@ -192,7 +205,7 @@ namespace OnDoc.Versandstrasse private void populate_serienbriefe() { DB db = new DB(AppParams.connectionstring); - db.Get_Tabledata("Select dokumentid, dbo.BinaryToBase64(dokument) as dokument from edex_sb_serienbrief_dokument where serienbriefnr=" + sb.serienbriefnr.ToString() + "order by inteintragnr", false,true); + db.Get_Tabledata("Select dokumentid, dbo.BinaryToBase64(dokument) as dokument from edex_sb_serienbrief_dokument where serienbriefnr=" + sb.serienbriefnr.ToString() + "order by inteintragnr", false, true); foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows) { TreeNodeAdv tn = new TreeNodeAdv(); @@ -209,27 +222,29 @@ namespace OnDoc.Versandstrasse for (int i = 0; i < paket.Dokument.Count; i++) { dokumentnode = new TreeNodeAdv(); - dokumentnode.Text = paket.Dokument[i].Bezeichnung+" (" + paket.Dokument[i].Partnernr+")"; + dokumentnode.Text = paket.Dokument[i].Bezeichnung + " (" + paket.Dokument[i].Partnernr + ")"; dokumentnode.Tag = paket.Dokument[i].DokumentID; - dokumentnode.TagObject= paket.Dokument[i]; + dokumentnode.TagObject = paket.Dokument[i]; db.Get_Tabledata("SELECT dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc FROM dbo.dokument INNER JOIN " + " dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr where dbo.dokument.dokumentid='" + dokumentnode.Tag + "'", false, true); - if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0) + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0) { set_nodeimage(dokumentnode, 5); - } else + } + else { set_nodeimage(dokumentnode, 3); } - if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) ==0) + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0) { set_nodeimage(dokumentnode, 0); - } else - { + } + else + { //dokumentnode.LeftImageIndices = new int[] { 3}; } - + parentnode.Nodes.Add(dokumentnode); } @@ -238,31 +253,35 @@ namespace OnDoc.Versandstrasse #region "Treeview" private void treeViewAdv1_DragDrop(object sender, DragEventArgs e) { - TreeViewAdv treeView = sender as TreeViewAdv; - TreeNodeAdv sourceNode = (TreeNodeAdv)e.Data.GetData(typeof(TreeNodeAdv)); - TreeNodeAdv destinationNode = this.treeViewDragHighlightTracker.HighlightNode; - TreeViewDropPositions dropPosition = this.treeViewDragHighlightTracker.DropPosition; - this.treeViewDragHighlightTracker.ClearHighlightNode(); - this.currentSourceNode = null; - if (destinationNode != null) + try { - switch (dropPosition) + TreeViewAdv treeView = sender as TreeViewAdv; + TreeNodeAdv sourceNode = (TreeNodeAdv)e.Data.GetData(typeof(TreeNodeAdv)); + TreeNodeAdv destinationNode = this.treeViewDragHighlightTracker.HighlightNode; + TreeViewDropPositions dropPosition = this.treeViewDragHighlightTracker.DropPosition; + this.treeViewDragHighlightTracker.ClearHighlightNode(); + this.currentSourceNode = null; + if (destinationNode != null) { - case TreeViewDropPositions.AboveNode: - sourceNode.Move(destinationNode, NodePositions.Previous); - break; - case TreeViewDropPositions.BelowNode: - sourceNode.Move(destinationNode, NodePositions.Next); - break; - case TreeViewDropPositions.OnNode: - sourceNode.Move(destinationNode.Nodes); - destinationNode.Expand(); - break; + switch (dropPosition) + { + case TreeViewDropPositions.AboveNode: + sourceNode.Move(destinationNode, NodePositions.Previous); + break; + case TreeViewDropPositions.BelowNode: + sourceNode.Move(destinationNode, NodePositions.Next); + break; + case TreeViewDropPositions.OnNode: + sourceNode.Move(destinationNode.Nodes); + destinationNode.Expand(); + break; + } } + treeView.SelectedNode = sourceNode; + Verify_Couverts(); } - treeView.SelectedNode = sourceNode; - Verify_Couverts(); - + catch { } + } private void treeViewAdv1_DragLeave(object sender, EventArgs e) @@ -287,7 +306,7 @@ namespace OnDoc.Versandstrasse } else droppable = false; - + if (droppable) e.Effect = DragDropEffects.Move; else @@ -298,25 +317,26 @@ namespace OnDoc.Versandstrasse { TreeNodeAdv xdestinationNode = this.treeViewDragHighlightTracker.HighlightNode; TreeViewDropPositions dropPosition = this.treeViewDragHighlightTracker.DropPosition; - - + + if (destinationNode == null || destinationNode == sourceNode) return false; else - { + { try { - + if (xdestinationNode.Level == 1 && dropPosition != TreeViewDropPositions.OnNode) { return false; } - if (xdestinationNode.Level == 2 ) { return true; } - } + if (xdestinationNode.Level == 2) { return true; } + } catch { } - return true; } + return true; + } } private void treeViewAdv1_ItemDrag(object sender, ItemDragEventArgs e) @@ -333,7 +353,7 @@ namespace OnDoc.Versandstrasse int i = -1; bool numeric = int.TryParse(node.Tag.ToString(), out i); if (node.Tag.ToString() == "Druckpaket") { return true; } else { return false; } - + } private void treeViewDragHighlightTracker_QueryDragInsertInfo(object sender, QueryDragInsertInfoEventArgs args) { @@ -363,18 +383,18 @@ namespace OnDoc.Versandstrasse private void tsbtnDruckPaketNew_Click(object sender, EventArgs e) { Versandpaket newpaket = new Versandpaket(); - newpaket.PaketNr= (treeViewAdv1.Nodes.Count + 1).ToString(); + newpaket.PaketNr = (treeViewAdv1.Nodes.Count + 1).ToString(); newpaket.Versandoption = "B2_POST"; newpaket.GAS = ""; newpaket.GASAdresse = ""; newpaket.Mitteilung = ""; newpaket.Dokument = new List(); - string NodeText = "Druckpaket " + (treeViewAdv1.Nodes.Count + 1).ToString(); - TreeNodeAdv drucknode = new TreeNodeAdv(); + string NodeText = "Versand-Couvert " + (treeViewAdv1.Nodes.Count + 1).ToString(); + TreeNodeAdv drucknode = new TreeNodeAdv(); drucknode.Text = NodeText; drucknode.Tag = "Druckpaket"; - drucknode.TagObject=newpaket; + drucknode.TagObject = newpaket; pakete.Add(newpaket); treeViewAdv1.Nodes.Add(drucknode); @@ -382,22 +402,22 @@ namespace OnDoc.Versandstrasse private void treeViewAdv1_NodeMouseClick(object sender, TreeViewAdvMouseClickEventArgs e) { - + } private void button1_Click(object sender, EventArgs e) { - Versandpaket paket = treeViewAdv1.SelectedNode.TagObject as Versandpaket; + Versandpaket paket = treeViewAdv1.SelectedNode.TagObject as Versandpaket; //if (rbversandoption1.Checked) { paket.Versandoption = "1"; } //if (rbversandoption2.Checked) { paket.Versandoption = "2"; } //if (rbversandoption3.Checked) { paket.Versandoption = "3"; } - + //if (chkGAS.Checked) { paket.GAS = "1"; } else { paket.GAS = "0"; } //try { paket.GASAdresse = lbgasadresse.SelectedIndex.ToString(); } catch { paket.GASAdresse= "0"; } - // paket.verified = true; + // paket.verified = true; //treeViewAdv1.SelectedNode.TagObject = paket; //pakete.paket.Add(paket); - // Reload_Tree(); + // Reload_Tree(); } @@ -409,7 +429,7 @@ namespace OnDoc.Versandstrasse clsVersandstrasse vs = new clsVersandstrasse(); foreach (TreeNodeAdv tn in treeViewAdv1.Nodes[0].Nodes) { - tn.TagObject = vs.Prepare_PDF(tn.Text.ToString(), AppParams.tempdir, AppParams.connectionstring,AppParams.RESTURI,AppParams.apikey,Application.StartupPath,null,sb, tn.Tag.ToString()); + tn.TagObject = vs.Prepare_PDF(tn.Text.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, sb, tn.Tag.ToString()); } vs = null; panelVerify.Visible = true; @@ -424,7 +444,7 @@ namespace OnDoc.Versandstrasse foreach (TreeNodeAdv tn in treeViewAdv1.SelectedNode.Nodes) { - foreach(Versanddokument vsdok in paket.Dokument) + foreach (Versanddokument vsdok in paket.Dokument) { if (vsdok.DokumentID == tn.Tag.ToString()) { @@ -465,8 +485,8 @@ namespace OnDoc.Versandstrasse string stapel = save_stapel(ref streams); - - paket.finaldoc=stapel; + + paket.finaldoc = stapel; var finalestream = new MemoryStream(Convert.FromBase64String(stapel)); this.pdfViewerControl1.Load(finalestream); @@ -511,7 +531,7 @@ namespace OnDoc.Versandstrasse { if (chkGAS.Checked) { - treeViewAdvAdresse.Enabled= true; + treeViewAdvAdresse.Enabled = true; Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket; vp.GAS = "1"; treeViewAdv1.SelectedNode.TagObject = vp; @@ -536,18 +556,18 @@ namespace OnDoc.Versandstrasse { if (serienbrief) { - Versandpaket svp = treeViewAdv1.Nodes[0].TagObject as Versandpaket ; + Versandpaket svp = treeViewAdv1.Nodes[0].TagObject as Versandpaket; foreach (TreeNodeAdv node in treeViewAdv1.Nodes[0].Nodes) { svp.finaldoc = node.TagObject.ToString(); svp.send_onbase_doc = true; - string _sqlWhere = @"dokumentid = '"+node.Text+"'"; + string _sqlWhere = @"dokumentid = '" + node.Text + "'"; DataTable _newDataTable = sb.dsempfaenger.Tables[0].Select(_sqlWhere, "").CopyToDataTable(); svp.partnernr = Convert.ToInt32(_newDataTable.Rows[0]["partnernr"].ToString()); - - Versanddokument vd = new Versanddokument(node.Text,"",svp.partnernr.ToString()); - + + Versanddokument vd = new Versanddokument(node.Text, "", svp.partnernr.ToString()); + vd.dokument = node.TagObject.ToString(); vd.inteintragnr = Convert.ToInt32(_newDataTable.Rows[0]["inteintragnr"].ToString()); svp.Dokument.Add(vd); @@ -557,12 +577,12 @@ namespace OnDoc.Versandstrasse db.add_parameter("@partnernr", svp.partnernr.ToString()); db.add_parameter("@gasadresse", svp.GASAdresse); db.add_parameter("@versandoption", svp.Versandoption); - db.add_parameter("@dokumente", node.Text+" / "+sb.serienbriefnr.ToString()+"_"+_newDataTable.Rows[0]["inteintragnr"].ToString()); + db.add_parameter("@dokumente", node.Text + " / " + sb.serienbriefnr.ToString() + "_" + _newDataTable.Rows[0]["inteintragnr"].ToString()); db.Get_Tabledata("Ondoc_Insert_Versandprotokoll", true, false); svp.protokollid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]); db = null; - send_vs(ref svp,false); + send_vs(ref svp, false); } return; } @@ -604,22 +624,40 @@ namespace OnDoc.Versandstrasse send_vs(ref vp); } - private void send_vs(ref Versandpaket vp, bool showmessage = true, bool direktversenden = false) { + private void send_vs(ref Versandpaket vp, bool showmessage = true, bool direktversenden = false) + { string jsonstring = JsonConvert.SerializeObject(vp); //vp.send_onbase_doc = true; if (!direktversenden) { - - DB db = new DB(AppParams.connectionstring); - db.Get_Tabledata_for_Update("Select top 1 * from Ondoc_Versandstrasse_Paket where id=1", false, true); - DataRow dr = db.daten.Tables[0].NewRow(); - dr[1] = AppParams.CurrentMitarbeiter.ToString(); - dr[2] = jsonstring; - dr[3] = DateTime.Now; - - db.daten.Tables[0].Rows.Add(dr); - db.Update_Data(); + + DB db = new DB(AppParams.connectionstring); + db.clear_parameter(); + db.add_parameter("@ersteller", AppParams.CurrentMitarbeiter.ToString()); + db.Get_Tabledata("ondoc_create_versandpaket", true, false); + int paketid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]); + + + db.Get_Tabledata_for_Update("Select top 1 * from Ondoc_Versandstrasse_Paket where id=" + paketid.ToString(), false, true); + DataRow dr = db.daten.Tables[0].Rows[0]; + dr[2] = jsonstring; + dr["aktiv"] = 1; + // db.daten.Tables[0].Rows.Add(dr); + db.Update_Data(); + + db.daten.Tables.Clear(); + db.Get_Tabledata_for_Update("Select * from ondoc_versandstrasse_paket_dokumentid where couvert_id = -1", false, true); + foreach (Versanddokument vd in vp.Dokument) + { + DataRow dr1 = db.daten.Tables[0].NewRow(); + dr1[1] = paketid; + dr1[2] = vd.DokumentID; + dr1[3] = 1; + db.daten.Tables[0].Rows.Add(dr1); + } + db.Update_Data(); + treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode); return; } @@ -657,7 +695,7 @@ namespace OnDoc.Versandstrasse treeViewAdv1.SelectedNode.Remove(); } } - + } } @@ -665,7 +703,7 @@ namespace OnDoc.Versandstrasse return; } catch { } - + } private void rbapost_CheckedChanged(object sender, EventArgs e) @@ -711,67 +749,71 @@ namespace OnDoc.Versandstrasse private void treeViewAdv1_AfterSelect(object sender, EventArgs e) { - TreeNodeAdv node = treeViewAdv1.SelectedNode; - if (node.Level == 1) + try { - if (Verify_Couvert(node)==false) - { - GrpPaketDetails.Enabled = false; - return; - } - GrpPaketDetails.Enabled = true; - Versandpaket paket = node.TagObject as Versandpaket; ; - - switch (paket.Versandoption) - { - case "A_POST": - rbapost.Checked = true; break; - case "B1_POST": - rbb1post.Checked = true; break; - case "B2_POST": - rbb2post.Checked = true; break; - default: - rbb2post.Checked = true; break; - } - - if (paket.GAS != "") - { - this.chkGAS.Checked = true; - } - else - { this.chkGAS.Checked = false; } - - if (paket.GASAdresse.ToString() != "") + TreeNodeAdv node = treeViewAdv1.SelectedNode; + if (node.Level == 1) { - foreach (TreeNodeAdv tn in treeViewAdvAdresse.Nodes) + if (Verify_Couvert(node) == false) { - if (tn.Text == paket.GASAdresse) { treeViewAdvAdresse.SelectedNode = tn; } + GrpPaketDetails.Enabled = false; + return; } - } + GrpPaketDetails.Enabled = true; + Versandpaket paket = node.TagObject as Versandpaket; ; - } - else - { - if (tscheckboxpreview.Checked) - { - clsVersandstrasse vs = new clsVersandstrasse(); - string dok = ""; - if (serienbrief) + switch (paket.Versandoption) { - dok = vs.Prepare_PDF(node.Text.ToString(), AppParams.tempdir, AppParams.connectionstring,AppParams.RESTURI,AppParams.apikey, Application.StartupPath, null, sb, node.Tag.ToString()); + case "A_POST": + rbapost.Checked = true; break; + case "B1_POST": + rbb1post.Checked = true; break; + case "B2_POST": + rbb2post.Checked = true; break; + default: + rbb2post.Checked = true; break; + } + if (paket.GAS != "") + { + this.chkGAS.Checked = true; } else + { this.chkGAS.Checked = false; } + + if (paket.GASAdresse.ToString() != "") { - dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath); + foreach (TreeNodeAdv tn in treeViewAdvAdresse.Nodes) + { + if (tn.Text == paket.GASAdresse) { treeViewAdvAdresse.SelectedNode = tn; } + } } - - var stream = new MemoryStream(Convert.FromBase64String(dok)); - this.pdfViewerControl1.Load(stream); + } + else + { + if (tscheckboxpreview.Checked) + { + clsVersandstrasse vs = new clsVersandstrasse(); + string dok = ""; + if (serienbrief) + { + dok = vs.Prepare_PDF(node.Text.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, sb, node.Tag.ToString()); + + } + else + { + dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath); + } + + var stream = new MemoryStream(Convert.FromBase64String(dok)); + this.pdfViewerControl1.Load(stream); + } - GrpPaketDetails.Enabled = false; + GrpPaketDetails.Enabled = false; + } } + catch { } } private void button2_Click(object sender, EventArgs e) @@ -781,19 +823,7 @@ namespace OnDoc.Versandstrasse private void contextMenuStrip1_Click(object sender, EventArgs e) { - try - { - TreeNodeAdv node = treeViewAdv1.SelectedNode; - if (node.Level > 1) { - node = node.Parent; - treeViewAdv1.SelectedNode.Remove(); - Verify_Couvert(node); - } - else { - treeViewAdv1.SelectedNode.Remove(); - } - } - catch { } + } private void toolStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e) @@ -805,10 +835,16 @@ namespace OnDoc.Versandstrasse { if (TabControlDokuments.SelectedIndex == 1) { + Refresh_VersandCouverts(); + } + } + private void Refresh_VersandCouverts() + { + DB db = new DB(AppParams.connectionstring); DB db2 = new DB(AppParams.connectionstring); - db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true); + db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true); treeViewAdvCouverts.Nodes.Clear(); foreach (DataRow dr in db.dsdaten.Tables[0].Rows) { @@ -833,18 +869,73 @@ namespace OnDoc.Versandstrasse } db = null; db2 = null; - } + } private void treeViewAdvCouverts_AfterSelect(object sender, EventArgs e) { - TreeNodeAdv node = treeViewAdvCouverts.SelectedNode; + try + { + TreeNodeAdv node = treeViewAdvCouverts.SelectedNode; + + var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString())); + this.pdfViewerControl2.Load(stream); + stream = null; + } + catch { } + } + + private void versandCouvertLöschenToolStripMenuItem_Click(object sender, EventArgs e) + { + DB db = new DB(AppParams.connectionstring); + foreach (TreeNodeAdv tn in treeViewAdvCouverts.SelectedNodes) + { + db.Exec_SQL("Update ondoc_versandstrasse_paket set geloescht=getdate(), aktiv=0, geloescht_durch=" + AppParams.CurrentMitarbeiter.ToString() + " where id=" + tn.Tag.ToString()); + + } + db = null; + Refresh_VersandCouverts(); + } + + private void versandCouvertÖffnenbearbeitenToolStripMenuItem_Click(object sender, EventArgs e) + { - var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString())); - this.pdfViewerControl2.Load(stream); - stream = null; } + private void löschenToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + TreeNodeAdv node = treeViewAdv1.SelectedNode; + if (node.Level > 1) + { + node = node.Parent; + treeViewAdv1.SelectedNode.Remove(); + reserve_vs_dokument(node.Tag.ToString(), 2); + Verify_Couvert(node); + } + else + { + foreach (TreeNodeAdv tn in node.Nodes) + { + reserve_vs_dokument(tn.Tag.ToString(), 2); + } + + treeViewAdv1.SelectedNode.Remove(); + } + } + catch { } + } + private void reserve_vs_dokument(string dokumentid, int fnkt) + { + DB db = new DB(AppParams.connectionstring); + db.clear_parameter(); + db.add_parameter("@dokumentid", dokumentid); + db.add_parameter("@mitarbeiter", AppParams.CurrentMitarbeiter.ToString()); + db.add_parameter("@fnkt", fnkt.ToString()); + db.Get_Tabledata("Ondoc_Handle_Versandstrasse_Reserved_Dokcuments", true, false); + db = null; + } } } diff --git a/Client/Versandstrasse/Versandstrasse.resx b/Client/Versandstrasse/Versandstrasse.resx index 70c29fac..e20044f9 100644 --- a/Client/Versandstrasse/Versandstrasse.resx +++ b/Client/Versandstrasse/Versandstrasse.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 157, 24 + 819, 0 387, 17 @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0 - DAAAAk1TRnQBSQFMAgEBBgEAAUABAAFAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBgEAAUgBAAFIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -194,7 +194,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU - DAAAAk1TRnQBSQFMAgEBBQEAAUgBAAFIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBQEAAVABAAFQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -251,13 +251,23 @@ 17, 17 - + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh d2luZy5Qb2ludEYCAAAAAXgBeQAACwsCAAAAAAAAAAAAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 + dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh + d2luZy5Qb2ludEYCAAAAAXgBeQAACwsCAAAAAAAAAAAAAAAL + + + + 609, 17 + 498, 17 @@ -265,8 +275,8 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACK - CQAAAk1TRnQBSQFMAgEBAwEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq + CQAAAk1TRnQBSQFMAgEBAwEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -294,26 +304,18 @@ AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wIAAfQB7wHsCPgB7AHv - AfQCAAH/AfEBkgHsBvgB7AGSAfEB/wIAAf8B8QGSAewG+AHsAZIB8QH/EQAB9AHsDPgB7AH0Af8B7wz4 - Ae8C/wHvDPgB7wH/EAAB7w74Ae8B8Q74AvEO+AHxEAAB7A74AewBkg74ApIO+AGSEAAE+AHwAf8B7wL4 - Ae8B/wHwBPgB7A/4AewP+BAABPgB7wEAAfEC+AHxAQAB7wf4AewC8AEHAe0B7AG8AfABvAHtBvgB7ALw - AQcB7QGSA7wB7QP4EAAE+AHsAv8C8wL/AewH+AHsAfEB+AGSAfAC+AHwAe0H+AHsAfEB+AGSAfAB7QHx - Ae0C7AP4EAAF+AHzAQAC9AEAAfMI+AHsAfEB+AGSAfAC+AHwAe0H+AHsAfEB+AGSAfAB+AHtAfEB7AT4 - EAAF+AG8AQACBwEAAbwI+AHsAfQBvAHzAe0C+AHwAe0H+AHsAfQBvAHzAe0C+AGSAbwE+BAABfgBkgEA - AvIBAAGSCPgB7AHxAfgC7wHsAe0B8AHtB/gB7AHxAfgC7wP4AfIE+BAABvgE/wn4AewB8wEHAfIB7QHs - AQcB9AHtB/gB7AHzAQcB8gLtAgcB8QT4EAAG+AG8Av8BvAb4AewD+ALtAewD+AHtAewE+AHsA/gC7QHs - AvgB7QH3AewE+BAAAewO+AHsAZIO+AKSDvgBkhAAAe8O+AHvAfEO+ALxDvgB8RAAAfQB7Az4AewB9AH/ - Ae8M+AHvAv8B7wz4Ae8B/xEAAfQB7wHsCPgB7AHvAfQCAAH/AfEBkgHsBvgB7AGSAfEB/wIAAf8B8QGS - AewG+AHsAZIB8QH/EQABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAYABAQGA - AQEBgAEBIgABBAEgDgABAgFABgABAgFABgABAgFALgABgAEBAYABAQGAAQECAAs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 - dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh - d2luZy5Qb2ludEYCAAAAAXgBeQAACwsCAAAAAAAAAAAAAAAL + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wIAAfQB7wrsAe8B9AIA + Af8B8QGSCOwBkgHxAf8CAAH/AfEBkgjsAZIB8QH/EQAB9A7sAfQB/wHvDOwB7wL/Ae8M7AHvAf8QAAHv + DuwB7wHxDuwC8Q7sAfEQABDsAZIO7AKSDuwBkhAABOwB8AH/Ae8C7AHvAf8B8CTsEAAE7AHvAQAB8QLs + AfEBAAHvCOwC8AEHAe0B7AG8AfABvAHtB+wC8AEHAe0BkgO8Ae0D7BAABewC/wLzAv8J7AHxAewBkgHw + AuwB8AHtCOwB8QHsAZIB8AHtAfEB7QXsEAAF7AHzAQAC9AEAAfMJ7AHxAewBkgHwAuwB8AHtCOwB8QHs + AZIB8AHsAe0B8QXsEAAF7AG8AQACBwEAAbwJ7AH0AbwB8wHtAuwB8AHtCOwB9AG8AfMB7QLsAZIBvATs + EAAF7AGSAQAC8gEAAZIJ7AHxAewC7wHsAe0B8AHtCOwB8QHsAu8D7AHyBOwQAAbsBP8K7AHzAQcB8gHt + AewBBwH0Ae0I7AHzAQcB8gLtAgcB8QTsEAAG7AG8Av8BvArsAu0E7AHtCewC7QPsAe0B9wXsEAAQ7AGS + DuwCkg7sAZIQAAHvDuwB7wHxDuwC8Q7sAfEQAAH0DuwB9AH/Ae8M7AHvAv8B7wzsAe8B/xEAAfQB7wrs + Ae8B9AIAAf8B8QGSCOwBkgHxAf8CAAH/AfEBkgjsAZIB8QH/EQABQgFNAT4HAAE+AwABKAMAAUADAAEQ + AwABAQEAAQEFAAGAFwAD/wEAAYABAQGAAQEBgAEBIgABBAEgDgABAgFABgABAgFABgABAgFALgABgAEB + AYABAQGAAQECAAs= diff --git a/Client/bin/Debug/Model.dll b/Client/bin/Debug/Model.dll index 3a9c2e9b..b8d36e01 100644 Binary files a/Client/bin/Debug/Model.dll and b/Client/bin/Debug/Model.dll differ diff --git a/Client/bin/Debug/Model.pdb b/Client/bin/Debug/Model.pdb index 518b4770..a7c18ed9 100644 Binary files a/Client/bin/Debug/Model.pdb and b/Client/bin/Debug/Model.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index ed14277d..c049d65a 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 79b6bcc2..aa44323a 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 f7bf7698..7af25d30 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/Versandstrasse.dll b/Client/bin/Debug/Versandstrasse.dll index 62fc5dd9..ceb2b378 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 7928a933..bdbd2625 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 3d72a336..27659400 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 cafa417d..59c8e28e 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/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 728d53c8..cc5e2352 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources b/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources index 3d5715a1..c1cffffd 100644 Binary files a/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources and b/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources differ diff --git a/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources index d162d856..6661cb3c 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 ed14277d..c049d65a 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 79b6bcc2..aa44323a 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index 3d72a336..27659400 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/bin/Debug/Model.dll b/DOCGEN/bin/Debug/Model.dll index 3a9c2e9b..b8d36e01 100644 Binary files a/DOCGEN/bin/Debug/Model.dll and b/DOCGEN/bin/Debug/Model.dll differ diff --git a/DOCGEN/bin/Debug/Model.pdb b/DOCGEN/bin/Debug/Model.pdb index 518b4770..a7c18ed9 100644 Binary files a/DOCGEN/bin/Debug/Model.pdb and b/DOCGEN/bin/Debug/Model.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index fb1406ef..974ebd38 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/Model.dll b/Database/bin/Debug/Model.dll index 3a9c2e9b..b8d36e01 100644 Binary files a/Database/bin/Debug/Model.dll and b/Database/bin/Debug/Model.dll differ diff --git a/Database/bin/Debug/Model.pdb b/Database/bin/Debug/Model.pdb index 518b4770..a7c18ed9 100644 Binary files a/Database/bin/Debug/Model.pdb and b/Database/bin/Debug/Model.pdb differ diff --git a/Database/obj/Debug/Database.csproj.AssemblyReference.cache b/Database/obj/Debug/Database.csproj.AssemblyReference.cache index 86b45534..bce51d3b 100644 Binary files a/Database/obj/Debug/Database.csproj.AssemblyReference.cache and b/Database/obj/Debug/Database.csproj.AssemblyReference.cache differ diff --git a/Model/VersandstrassePaket.cs b/Model/VersandstrassePaket.cs index 2242e9e2..ef95a380 100644 --- a/Model/VersandstrassePaket.cs +++ b/Model/VersandstrassePaket.cs @@ -47,6 +47,8 @@ namespace Model Partnernr = partnernr; } + + } public class OnBase_Attributes diff --git a/Model/bin/Debug/Model.dll b/Model/bin/Debug/Model.dll index 3a9c2e9b..b8d36e01 100644 Binary files a/Model/bin/Debug/Model.dll and b/Model/bin/Debug/Model.dll differ diff --git a/Model/bin/Debug/Model.pdb b/Model/bin/Debug/Model.pdb index 518b4770..a7c18ed9 100644 Binary files a/Model/bin/Debug/Model.pdb and b/Model/bin/Debug/Model.pdb differ diff --git a/Model/obj/Debug/Model.dll b/Model/obj/Debug/Model.dll index 3a9c2e9b..b8d36e01 100644 Binary files a/Model/obj/Debug/Model.dll and b/Model/obj/Debug/Model.dll differ diff --git a/Model/obj/Debug/Model.pdb b/Model/obj/Debug/Model.pdb index 518b4770..a7c18ed9 100644 Binary files a/Model/obj/Debug/Model.pdb and b/Model/obj/Debug/Model.pdb differ diff --git a/OnDocOffice/bin/Debug/Model.dll b/OnDocOffice/bin/Debug/Model.dll index 3a9c2e9b..b8d36e01 100644 Binary files a/OnDocOffice/bin/Debug/Model.dll and b/OnDocOffice/bin/Debug/Model.dll differ diff --git a/OnDocOffice/bin/Debug/Model.pdb b/OnDocOffice/bin/Debug/Model.pdb index 518b4770..a7c18ed9 100644 Binary files a/OnDocOffice/bin/Debug/Model.pdb and b/OnDocOffice/bin/Debug/Model.pdb differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index dcd67b88..347941ee 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/Versandstrasse/Class1.cs b/Versandstrasse/Class1.cs index f65e4d3c..8e882dd3 100644 --- a/Versandstrasse/Class1.cs +++ b/Versandstrasse/Class1.cs @@ -254,7 +254,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; } int i = 1; List copyparts = vscript.PartCopies.Split(';').ToList(); foreach (string cp in copyparts) diff --git a/Versandstrasse/bin/Debug/Model.dll b/Versandstrasse/bin/Debug/Model.dll index 3a9c2e9b..b8d36e01 100644 Binary files a/Versandstrasse/bin/Debug/Model.dll and b/Versandstrasse/bin/Debug/Model.dll differ diff --git a/Versandstrasse/bin/Debug/Model.pdb b/Versandstrasse/bin/Debug/Model.pdb index 518b4770..a7c18ed9 100644 Binary files a/Versandstrasse/bin/Debug/Model.pdb and b/Versandstrasse/bin/Debug/Model.pdb differ diff --git a/Versandstrasse/bin/Debug/OnDocOffice.dll b/Versandstrasse/bin/Debug/OnDocOffice.dll index 64ddb38b..d3d90f53 100644 Binary files a/Versandstrasse/bin/Debug/OnDocOffice.dll and b/Versandstrasse/bin/Debug/OnDocOffice.dll differ diff --git a/Versandstrasse/bin/Debug/OnDocOffice.pdb b/Versandstrasse/bin/Debug/OnDocOffice.pdb index bdc13a34..057660e0 100644 Binary files a/Versandstrasse/bin/Debug/OnDocOffice.pdb and b/Versandstrasse/bin/Debug/OnDocOffice.pdb differ diff --git a/Versandstrasse/bin/Debug/Versandstrasse.dll b/Versandstrasse/bin/Debug/Versandstrasse.dll index 62fc5dd9..ceb2b378 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 7928a933..bdbd2625 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 a99509df..2af036c4 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 62fc5dd9..ceb2b378 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 7928a933..bdbd2625 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.pdb and b/Versandstrasse/obj/Debug/Versandstrasse.pdb differ