diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index a1601ba0..6aa52502 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 8310f8ef..b9e716cf 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/OnDocOffice.dll b/API_NetFramework/bin/OnDocOffice.dll index 64ddb38b..d3d90f53 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 bdc13a34..057660e0 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 2cfbf7e2..6ac7504d 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 88bf2775..4cc6f874 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 4201b11c..8448a73e 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 2cfbf7e2..6ac7504d 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 88bf2775..4cc6f874 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/Client/Client.csproj b/Client/Client.csproj index 8a65cd0b..13dc60dd 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -555,6 +555,12 @@ frmDokumentpaketNeugenerierung.cs + + Form + + + FrmDokumentwerte.cs + Form @@ -807,6 +813,9 @@ frmDokumentpaketNeugenerierung.cs + + FrmDokumentwerte.cs + frmNote.cs diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index d03aee41..012071d1 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -60,11 +60,11 @@ // 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(147, 330); + this.label2.Location = new System.Drawing.Point(157, 330); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(150, 26); + this.label2.Size = new System.Drawing.Size(134, 26); this.label2.TabIndex = 2; - this.label2.Text = "31. März 2025"; + this.label2.Text = "6. April 2025"; // // SplashScreen // diff --git a/Client/DocMgmt/DokTypDetails.Designer.cs b/Client/DocMgmt/DokTypDetails.Designer.cs index 6ce1fafe..8e6a599b 100644 --- a/Client/DocMgmt/DokTypDetails.Designer.cs +++ b/Client/DocMgmt/DokTypDetails.Designer.cs @@ -30,29 +30,56 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DokTypDetails)); this.dokTypDetail1 = new OnDoc.UIControls.DokTypDetail(); + this.button1 = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // dokTypDetail1 // this.dokTypDetail1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dokTypDetail1.dokumentpaket = false; this.dokTypDetail1.dokumenttypnr = 0; - this.dokTypDetail1.Location = new System.Drawing.Point(2, 2); + this.dokTypDetail1.einzeldokument = 0; + this.dokTypDetail1.Location = new System.Drawing.Point(2, 47); this.dokTypDetail1.Name = "dokTypDetail1"; - this.dokTypDetail1.Size = new System.Drawing.Size(1144, 777); + this.dokTypDetail1.Size = new System.Drawing.Size(1144, 732); this.dokTypDetail1.TabIndex = 0; // + // button1 + // + this.button1.Location = new System.Drawing.Point(6, 12); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(122, 23); + this.button1.TabIndex = 1; + this.button1.Text = "Office-Datei öffnen"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.button1); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; + this.groupBox1.Location = new System.Drawing.Point(2, 2); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(1144, 45); + this.groupBox1.TabIndex = 2; + this.groupBox1.TabStop = false; + // // DokTypDetails // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1148, 781); this.Controls.Add(this.dokTypDetail1); + this.Controls.Add(this.groupBox1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "DokTypDetails"; this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; this.Text = "Vorlagen_Details"; this.Load += new System.EventHandler(this.DokTypDetails_Load); + this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); } @@ -60,5 +87,7 @@ #endregion private UIControls.DokTypDetail dokTypDetail1; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.GroupBox groupBox1; } } \ No newline at end of file diff --git a/Client/DocMgmt/DokTypDetails.cs b/Client/DocMgmt/DokTypDetails.cs index 37d09b3a..e8e40aa3 100644 --- a/Client/DocMgmt/DokTypDetails.cs +++ b/Client/DocMgmt/DokTypDetails.cs @@ -66,10 +66,20 @@ namespace OnDoc.DocMgmt private void DokTypDetails_Load(object sender, EventArgs e) { + this.groupBox1.Visible = true; + if (this.dokumentpaket == true) + { + groupBox1.Visible = false; + } dokTypDetail1.dokumenttypnr=dokumenttypnr; dokTypDetail1.einzeldokument = einzeldokument; dokTypDetail1.dokumentpaket = dokumentpaket; dokTypDetail1.Refresh_Details(); } + + private void button1_Click(object sender, EventArgs e) + { + dokTypDetail1.opensource(); + } } } diff --git a/Client/DocMgmt/DokTypSelect.Designer.cs b/Client/DocMgmt/DokTypSelect.Designer.cs index f2330e9c..546ff49f 100644 --- a/Client/DocMgmt/DokTypSelect.Designer.cs +++ b/Client/DocMgmt/DokTypSelect.Designer.cs @@ -324,33 +324,34 @@ namespace OnDoc.DocMgmt // // contextMenuStripVorlagen // + this.contextMenuStripVorlagen.ImageScalingSize = new System.Drawing.Size(20, 20); this.contextMenuStripVorlagen.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ctxmenuerstellen, this.zuFavoritenHinzufügenToolStripMenuItem, this.detailsAnzeigenToolStripMenuItem}); this.contextMenuStripVorlagen.Name = "contextMenuStrip1"; - this.contextMenuStripVorlagen.Size = new System.Drawing.Size(204, 70); + this.contextMenuStripVorlagen.Size = new System.Drawing.Size(208, 82); this.contextMenuStripVorlagen.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); // // ctxmenuerstellen // this.ctxmenuerstellen.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32; this.ctxmenuerstellen.Name = "ctxmenuerstellen"; - this.ctxmenuerstellen.Size = new System.Drawing.Size(203, 22); + this.ctxmenuerstellen.Size = new System.Drawing.Size(207, 26); this.ctxmenuerstellen.Text = "Erstellen"; this.ctxmenuerstellen.Click += new System.EventHandler(this.ctxmenuerstellen_Click); // // zuFavoritenHinzufügenToolStripMenuItem // this.zuFavoritenHinzufügenToolStripMenuItem.Name = "zuFavoritenHinzufügenToolStripMenuItem"; - this.zuFavoritenHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(203, 22); + this.zuFavoritenHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(207, 26); this.zuFavoritenHinzufügenToolStripMenuItem.Text = "Zu Favoriten hinzufügen"; this.zuFavoritenHinzufügenToolStripMenuItem.Click += new System.EventHandler(this.zuFavoritenHinzufügenToolStripMenuItem_Click); // // detailsAnzeigenToolStripMenuItem // this.detailsAnzeigenToolStripMenuItem.Name = "detailsAnzeigenToolStripMenuItem"; - this.detailsAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(203, 22); + this.detailsAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(207, 26); this.detailsAnzeigenToolStripMenuItem.Text = "Details anzeigen"; this.detailsAnzeigenToolStripMenuItem.Click += new System.EventHandler(this.detailsAnzeigenToolStripMenuItem_Click); // @@ -421,6 +422,7 @@ namespace OnDoc.DocMgmt // // contextMenuStripFavoriten // + this.contextMenuStripFavoriten.ImageScalingSize = new System.Drawing.Size(20, 20); this.contextMenuStripFavoriten.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.neuerOrdnerAufObesterEbeneToolStripMenuItem, this.neuerUnterordnerToolStripMenuItem, @@ -512,6 +514,7 @@ namespace OnDoc.DocMgmt // toolStrip1 // this.toolStrip1.AutoSize = false; + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsbtnNewRoot, this.tsbtnNewFolder, @@ -619,6 +622,7 @@ namespace OnDoc.DocMgmt this.toolStrip2.AutoSize = false; this.toolStrip2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.toolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolStrip2.ImageScalingSize = new System.Drawing.Size(20, 20); this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripLabel1, this.toolstriptextboxsearch, @@ -653,7 +657,7 @@ namespace OnDoc.DocMgmt this.toolStripButton1.Image = global::OnDoc.Properties.Resources.Search_24x24_32; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(23, 45); + this.toolStripButton1.Size = new System.Drawing.Size(24, 45); this.toolStripButton1.Text = "Suchen"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // @@ -663,7 +667,7 @@ namespace OnDoc.DocMgmt this.toolStripButton2.Image = global::OnDoc.Properties.Resources.CloseApplication_24x24_32; this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(23, 45); + this.toolStripButton2.Size = new System.Drawing.Size(24, 45); this.toolStripButton2.Text = "Suchfeld initialisieren"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // @@ -691,7 +695,7 @@ namespace OnDoc.DocMgmt this.toolStripButton4.Image = global::OnDoc.Properties.Resources.CloseApplication_24x24_32; this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(23, 45); + this.toolStripButton4.Size = new System.Drawing.Size(24, 45); this.toolStripButton4.Text = "Fachverantwortung initialisieren"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // diff --git a/Client/DocMgmt/DokTypSelect.resx b/Client/DocMgmt/DokTypSelect.resx index 78117141..8c784107 100644 --- a/Client/DocMgmt/DokTypSelect.resx +++ b/Client/DocMgmt/DokTypSelect.resx @@ -283,7 +283,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACo - DQAAAk1TRnQBSQFMAgEBBwEAAVgBAQFYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DQAAAk1TRnQBSQFMAgEBBwEAAWgBAQFoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Client/DocMgmt/Dokumenterstellung.cs b/Client/DocMgmt/Dokumenterstellung.cs index 8326ce47..ef91e673 100644 --- a/Client/DocMgmt/Dokumenterstellung.cs +++ b/Client/DocMgmt/Dokumenterstellung.cs @@ -24,6 +24,8 @@ using System.Globalization; using System.Threading; using Syncfusion.Windows.Forms; using Syncfusion.Grouping; +using System.Xml.Linq; +using System.Reflection.Emit; namespace OnDoc.DocMgmt { @@ -195,13 +197,25 @@ namespace OnDoc.DocMgmt dB = null; } - + + + Logging.DocLog.Info("Dokumenterstellung", "frmDokumenterstellung", dokumentid, ucAllgemeineDokumentParam1.partnernr.ToString(), "Dokumenterstellung"); if (dokumentid != "") { DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey,AppParams.Office_Fill_DocIO); clsdok dok = new clsdok("", "", "", ""); Logging.Logging.Debug("Generate_Doc_EDOKA", "Dokumenterstellung", dokumentid); + + //Generator.generate_docdata(dokumentid, ref dokdata); + //FrmDokumentwerte dw = new FrmDokumentwerte(); + //dw.docData = dokdata; + //dw.ShowDialog(); + + + + + dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1, AppParams.vbvorlagenmanagement=="Yes",this.editdoc); Logging.Logging.Debug("Generate_Doc_EDOKA - Ende", "Dokumenterstellung", dokumentid); if (dok.extension == "QDF") { diff --git a/Client/DocMgmt/Dokumentpaket.Designer.cs b/Client/DocMgmt/Dokumentpaket.Designer.cs index 018d81e4..b7cb1fd1 100644 --- a/Client/DocMgmt/Dokumentpaket.Designer.cs +++ b/Client/DocMgmt/Dokumentpaket.Designer.cs @@ -44,6 +44,7 @@ this.ribbonButtonNew = new System.Windows.Forms.RibbonButton(); this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonGenerieren = new System.Windows.Forms.RibbonButton(); + this.RibbonButtonEInzelgenerierung = new System.Windows.Forms.RibbonButton(); this.RibbonButtonGenerate = new System.Windows.Forms.RibbonButton(); this.sfListView1 = new Syncfusion.WinForms.ListView.SfListView(); this.TabControlDokuments = new Syncfusion.Windows.Forms.Tools.TabControlAdv(); @@ -152,7 +153,7 @@ this.ribbon1.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013; this.ribbon1.OrbVisible = false; this.ribbon1.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F); - this.ribbon1.Size = new System.Drawing.Size(2120, 121); + this.ribbon1.Size = new System.Drawing.Size(1536, 121); this.ribbon1.TabIndex = 17; this.ribbon1.Tabs.Add(this.ribbonTab1); this.ribbon1.TabSpacing = 4; @@ -202,6 +203,7 @@ // this.ribbonPanel3.ButtonMoreVisible = false; this.ribbonPanel3.Items.Add(this.RibbonButtonGenerieren); + this.ribbonPanel3.Items.Add(this.RibbonButtonEInzelgenerierung); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Text = ""; // @@ -210,10 +212,21 @@ this.RibbonButtonGenerieren.Image = global::OnDoc.Properties.Resources.DokumenteGenerieren_32x32_321; this.RibbonButtonGenerieren.LargeImage = global::OnDoc.Properties.Resources.DokumenteGenerieren_32x32_321; this.RibbonButtonGenerieren.Name = "RibbonButtonGenerieren"; - this.RibbonButtonGenerieren.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonGenerieren.SmallImage"))); + this.RibbonButtonGenerieren.SmallImage = global::OnDoc.Properties.Resources.DokumenteGenerieren_24x24_321; this.RibbonButtonGenerieren.Text = "Dokumente generieren"; + this.RibbonButtonGenerieren.ToolTip = "Alle Dokumente sofort generieren"; this.RibbonButtonGenerieren.Click += new System.EventHandler(this.RibbonButtonGenerieren_Click); // + // RibbonButtonEInzelgenerierung + // + this.RibbonButtonEInzelgenerierung.Image = global::OnDoc.Properties.Resources.DokumenteGenerieren_32x32_321; + this.RibbonButtonEInzelgenerierung.LargeImage = global::OnDoc.Properties.Resources.DokumenteGenerieren_32x32_321; + this.RibbonButtonEInzelgenerierung.Name = "RibbonButtonEInzelgenerierung"; + this.RibbonButtonEInzelgenerierung.SmallImage = global::OnDoc.Properties.Resources.DokumenteGenerieren_24x24_321; + this.RibbonButtonEInzelgenerierung.Text = "Einzeln generieren"; + this.RibbonButtonEInzelgenerierung.ToolTip = "Dokumente nacheinander, einzeln generieren"; + this.RibbonButtonEInzelgenerierung.Click += new System.EventHandler(this.RibbonButtonEInzelgenerierung_Click); + // // RibbonButtonGenerate // this.RibbonButtonGenerate.Image = global::OnDoc.Properties.Resources.DokumenteGenerieren_32x32_321; @@ -229,7 +242,7 @@ this.sfListView1.Dock = System.Windows.Forms.DockStyle.Fill; this.sfListView1.Location = new System.Drawing.Point(0, 149); this.sfListView1.Name = "sfListView1"; - this.sfListView1.Size = new System.Drawing.Size(249, 530); + this.sfListView1.Size = new System.Drawing.Size(249, 524); this.sfListView1.TabIndex = 18; this.sfListView1.Text = "sfListView1"; this.sfListView1.SelectionChanged += new System.EventHandler(this.sfListView1_SelectionChanged); @@ -243,7 +256,7 @@ this.TabControlDokuments.Dock = System.Windows.Forms.DockStyle.Fill; this.TabControlDokuments.Location = new System.Drawing.Point(3, 16); this.TabControlDokuments.Name = "TabControlDokuments"; - this.TabControlDokuments.Size = new System.Drawing.Size(1069, 660); + this.TabControlDokuments.Size = new System.Drawing.Size(1069, 654); this.TabControlDokuments.TabIndex = 19; this.TabControlDokuments.ThemeStyle.PrimitiveButtonStyle.DisabledNextPageImage = null; // @@ -254,7 +267,7 @@ this.tabPageAdv1.Location = new System.Drawing.Point(5, 25); this.tabPageAdv1.Name = "tabPageAdv1"; this.tabPageAdv1.ShowCloseButton = true; - this.tabPageAdv1.Size = new System.Drawing.Size(1059, 630); + this.tabPageAdv1.Size = new System.Drawing.Size(1059, 624); this.tabPageAdv1.Text = "tabPageAdv1"; this.tabPageAdv1.ThemesEnabled = false; // @@ -293,9 +306,9 @@ // this.pnlfooter.Controls.Add(this.progressBarAdv1); this.pnlfooter.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlfooter.Location = new System.Drawing.Point(2, 802); + this.pnlfooter.Location = new System.Drawing.Point(2, 796); this.pnlfooter.Name = "pnlfooter"; - this.pnlfooter.Size = new System.Drawing.Size(2120, 47); + this.pnlfooter.Size = new System.Drawing.Size(1536, 47); this.pnlfooter.TabIndex = 20; // // progressBarAdv1 @@ -313,7 +326,7 @@ System.Drawing.Color.Empty}; this.progressBarAdv1.Name = "progressBarAdv1"; this.progressBarAdv1.SegmentWidth = 12; - this.progressBarAdv1.Size = new System.Drawing.Size(2120, 23); + this.progressBarAdv1.Size = new System.Drawing.Size(1536, 23); this.progressBarAdv1.TabIndex = 0; this.progressBarAdv1.Text = "progressBarGeneraate"; this.progressBarAdv1.Visible = false; @@ -326,7 +339,7 @@ this.pnlleft.Dock = System.Windows.Forms.DockStyle.Left; this.pnlleft.Location = new System.Drawing.Point(2, 123); this.pnlleft.Name = "pnlleft"; - this.pnlleft.Size = new System.Drawing.Size(249, 679); + this.pnlleft.Size = new System.Drawing.Size(249, 673); this.pnlleft.TabIndex = 21; // // groupBox1 @@ -373,7 +386,7 @@ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left; this.groupBox2.Location = new System.Drawing.Point(251, 123); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(1075, 679); + this.groupBox2.Size = new System.Drawing.Size(1075, 673); this.groupBox2.TabIndex = 22; this.groupBox2.TabStop = false; this.groupBox2.Text = "Dokumente zur Erstellung"; @@ -384,7 +397,7 @@ this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox3.Location = new System.Drawing.Point(1326, 123); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(796, 679); + this.groupBox3.Size = new System.Drawing.Size(212, 673); this.groupBox3.TabIndex = 23; this.groupBox3.TabStop = false; this.groupBox3.Text = "Generierte Dokumente"; @@ -400,20 +413,22 @@ 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 = ""; this.dokList1.selected_cellvalue = null; this.dokList1.selected_dokumentid = null; this.dokList1.selected_partnernr = null; - this.dokList1.Size = new System.Drawing.Size(790, 660); + this.dokList1.Size = new System.Drawing.Size(206, 654); this.dokList1.TabIndex = 0; // // Dokumentpaket // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2124, 851); + this.ClientSize = new System.Drawing.Size(1540, 845); this.Controls.Add(this.panelword); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); @@ -478,5 +493,6 @@ private System.Windows.Forms.Panel panelword; private System.Windows.Forms.Label lbldokumentname; private System.Windows.Forms.Label label1; + private System.Windows.Forms.RibbonButton RibbonButtonEInzelgenerierung; } } \ No newline at end of file diff --git a/Client/DocMgmt/Dokumentpaket.cs b/Client/DocMgmt/Dokumentpaket.cs index 44765c79..d191ad63 100644 --- a/Client/DocMgmt/Dokumentpaket.cs +++ b/Client/DocMgmt/Dokumentpaket.cs @@ -41,7 +41,7 @@ namespace OnDoc.DocMgmt private int profilnr {get;set;} public int dokumentpaketnr { get; set; } = 0; public int partnernr { get; set; } = 0; - + private bool EinzelGenerierung { get; set; } = false; public Dokumentpaket() { InitializeComponent(); @@ -471,155 +471,178 @@ namespace OnDoc.DocMgmt progressBarAdv1.Visible = true; Generate_Docs(); } - private void Generate_Docs(string idokumentid="",UCAllgemeineDokumentParam iuc = null) { + private void Generate_Docs(string idokumentid = "", UCAllgemeineDokumentParam iuc = null) + { + int counter = 0; string filter = "dokumentid in ('"; foreach (TabPageAdv tab in TabControlDokuments.TabPages) { - progressBarAdv1.Value = progressBarAdv1.Value + 1; - Application.DoEvents(); - //Thread.Sleep(1000); + try { + progressBarAdv1.Value = progressBarAdv1.Value + 1; + Application.DoEvents(); + //Thread.Sleep(1000); - UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0]; - if (((idokumentid == "" || uc.genertated_dokumentid == idokumentid) && iuc==null) || uc==iuc) - { - //uc.Set_Edit_later(); - uc.Update_DocGenData(); - clsDocData dokdata = new clsDocData(); - uc.update_dokdata(ref dokdata); - uc.update_partner(); - DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring); - string dokumentid = docgen.GenDocID(dokdata, false, ""); - dokdata.Dokumentid = dokumentid; - uc.genertated_dokumentid = dokumentid; - uc.Show_Neugenerieren(); - filter = filter + dokumentid + "','"; - dokumentid = dokdata.Dokumentid; - if (uc.docgendata.erstellungsart == Erstellungsart.DokumentPreview) { uc.docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; } - if (dokumentid != "") + UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0]; + if (((idokumentid == "" || uc.genertated_dokumentid == idokumentid) && iuc == null) || uc == iuc) { - Logging.DocLog.Info("Dokument erstellt", "Dokumentpaket", dokumentid, uc.partnernr.ToString(), "Dokument erstellt"); - DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI,AppParams.apikey,AppParams.Office_Fill_DocIO); - clsdok dok = new clsdok("", "", "", ""); - if (dokdata.barcode_type == "1") + //uc.Set_Edit_later(); + uc.Update_DocGenData(); + clsDocData dokdata = new clsDocData(); + uc.update_dokdata(ref dokdata); + uc.update_partner(); + DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring); + string dokumentid = docgen.GenDocID(dokdata, false, ""); + dokdata.Dokumentid = dokumentid; + uc.genertated_dokumentid = dokumentid; + uc.Show_Neugenerieren(); + filter = filter + dokumentid + "','"; + dokumentid = dokdata.Dokumentid; + if (uc.docgendata.erstellungsart == Erstellungsart.DokumentPreview) { uc.docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; } + if (dokumentid != "") { - DB dB = new DB(AppParams.connectionstring); - dB.clear_parameter(); - dB.add_parameter("@dokumentid", dokumentid); - dB.add_parameter("@DokumentidBR", ""); - dB.add_parameter("@BARCODEFONTNAME", ""); - dB.add_parameter("@BARCODEFONTSIZE", ""); - dB.add_parameter("@BarcodeKantenlaenge", ""); - dB.Get_Tabledata("sp_get_OnDoc_barcodetype_and_value", true, false); - dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][1].ToString(); - dokdata.barcode_formatn = dB.dsdaten.Tables[0].Rows[0][3].ToString(); - dokdata.barcode_text = dB.dsdaten.Tables[0].Rows[0][4].ToString(); - dokdata.barcode_kantenlaenge = dB.dsdaten.Tables[0].Rows[0][5].ToString(); - dokdata.Zusatz_Font = dB.dsdaten.Tables[0].Rows[0][6].ToString(); - dokdata.Zusatz_FontSize = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][7]); - dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][8]); - dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][9]); - - //dokdata.barcode_type= dB.dsdaten.Tables[0].Rows[0][3].ToString(); - string sql = ""; - sql = "select bcpt, bcpl, bcw, bch, bchorizontal from OnDocBarcodeMpping "; - sql = sql + "where orig_bcpt = " + dokdata.barcode_top.ToString() + " and orig_bcpl=" + dokdata.barcode_left.ToString() + " "; - sql = sql + "and orig_bcw=" + dokdata.barcode_width.ToString() + " and orig_bch=" + dokdata.barcode_height.ToString(); - dB.Get_Tabledata(sql, false, true); - if (dB.dsdaten.Tables[0].Rows.Count > 0) + Logging.DocLog.Info("Dokument erstellt", "Dokumentpaket", dokumentid, uc.partnernr.ToString(), "Dokument erstellt"); + DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey, AppParams.Office_Fill_DocIO); + clsdok dok = new clsdok("", "", "", ""); + if (dokdata.barcode_type == "1") { - Logging.Logging.Debug("Barcode-Übersteuerung" + dokdata.DokumenttypNr.ToString(), "Dokumenterstellung", ""); - dokdata.barcode_left = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpl"]); - dokdata.barcode_top = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpt"]); - dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcw"]); - dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bch"]); + DB dB = new DB(AppParams.connectionstring); + dB.clear_parameter(); + dB.add_parameter("@dokumentid", dokumentid); + dB.add_parameter("@DokumentidBR", ""); + dB.add_parameter("@BARCODEFONTNAME", ""); + dB.add_parameter("@BARCODEFONTSIZE", ""); + dB.add_parameter("@BarcodeKantenlaenge", ""); + dB.Get_Tabledata("sp_get_OnDoc_barcodetype_and_value", true, false); + dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][1].ToString(); + dokdata.barcode_formatn = dB.dsdaten.Tables[0].Rows[0][3].ToString(); + dokdata.barcode_text = dB.dsdaten.Tables[0].Rows[0][4].ToString(); + dokdata.barcode_kantenlaenge = dB.dsdaten.Tables[0].Rows[0][5].ToString(); + dokdata.Zusatz_Font = dB.dsdaten.Tables[0].Rows[0][6].ToString(); + dokdata.Zusatz_FontSize = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][7]); + dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][8]); + dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][9]); + + //dokdata.barcode_type= dB.dsdaten.Tables[0].Rows[0][3].ToString(); + string sql = ""; + sql = "select bcpt, bcpl, bcw, bch, bchorizontal from OnDocBarcodeMpping "; + sql = sql + "where orig_bcpt = " + dokdata.barcode_top.ToString() + " and orig_bcpl=" + dokdata.barcode_left.ToString() + " "; + sql = sql + "and orig_bcw=" + dokdata.barcode_width.ToString() + " and orig_bch=" + dokdata.barcode_height.ToString(); + dB.Get_Tabledata(sql, false, true); + if (dB.dsdaten.Tables[0].Rows.Count > 0) + { + Logging.Logging.Debug("Barcode-Übersteuerung" + dokdata.DokumenttypNr.ToString(), "Dokumenterstellung", ""); + dokdata.barcode_left = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpl"]); + dokdata.barcode_top = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpt"]); + dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcw"]); + dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bch"]); + } + + dB = null; } + if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice) + { + //panelword.Visible = true; + lbldokumentname.Text = tab.Text; + Application.DoEvents(); + dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, true, AppParams.OfficeSpleep1, AppParams.vbvorlagenmanagement == "Yes"); + //panelword.Visible = false; + Application.DoEvents(); - dB = null; - } - if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice) - { - //panelword.Visible = true; - lbldokumentname.Text = tab.Text; - Application.DoEvents(); - dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata,true,AppParams.OfficeSpleep1,AppParams.vbvorlagenmanagement=="Yes"); - //panelword.Visible = false; - Application.DoEvents(); + } + else + { + dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata); - } - else - { - dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata); + } - } + if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice) + { + string filename = AppParams.tempdir + dokumentid + "." + dok.extension; + filename = AppParams.tempdir + dok.dokumentname; + string filename_temp = filename + ".tmp"; + System.IO.File.WriteAllBytes(filename_temp, Convert.FromBase64String(dok.dokument)); + DB db = new DB(AppParams.connectionstring); + db.Save_To_DB(dokdata.Dokumentid, filename_temp); + db.Dok_in_Bearbeitung(1, dokdata.Dokumentid, AppParams.CurrentMitarbeiter); + db = null; + System.IO.File.Delete(filename_temp); + Logging.Logging.Debug("Before Processwatch", "DonDoc", dokumentid); + clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word"); - if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice) - { - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - filename = AppParams.tempdir + dok.dokumentname; - string filename_temp = filename + ".tmp"; - System.IO.File.WriteAllBytes(filename_temp, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename_temp); - db.Dok_in_Bearbeitung(1,dokdata.Dokumentid, AppParams.CurrentMitarbeiter); - db = null; - System.IO.File.Delete(filename_temp); - Logging.Logging.Debug("Before Processwatch","DonDoc",dokumentid); - clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word"); + } + if (uc.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten) + { + string filename = AppParams.tempdir + dokumentid + "." + dok.extension; + //filename = AppParams.tempdir + dok.dokumentname; + System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); + DB db = new DB(AppParams.connectionstring); + db.Save_To_DB(dokdata.Dokumentid, filename); + db = null; + + switch (dok.doktype) + { + case "W": + System.Diagnostics.Process.Start("winword.exe", filename); + clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word"); + break; + case "X": + System.Diagnostics.Process.Start("excel.exe", " " + filename); + clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Excel"); + break; + case "P": + System.Diagnostics.Process.Start(filename); + break; + default: + break; + } + } + if (uc.docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF) + { + //Generator.DocToPDF(dokumentid, ref dok); + dok.extension = "pdf"; + string filename = AppParams.tempdir + dokumentid + "." + dok.extension; + System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); + DB db = new DB(AppParams.connectionstring); + db.Save_To_DB(dokdata.Dokumentid, filename); + } - } - if (uc.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten) - { - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - //filename = AppParams.tempdir + dok.dokumentname; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - db = null; - - switch (dok.doktype) + if (uc.docgendata.erstellungsart == Erstellungsart.DokumentSpäterBearbeiten) { - case "W": - System.Diagnostics.Process.Start("winword.exe", filename); - clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word"); - break; - case "X": - System.Diagnostics.Process.Start("excel.exe", " " + filename); - clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Excel"); - break; - case "P": - System.Diagnostics.Process.Start(filename); - break; - default: - break; + string filename = AppParams.tempdir + dokumentid + "." + dok.extension; + System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); + DB db = new DB(AppParams.connectionstring); + db.Save_To_DB(dokdata.Dokumentid, filename); + db = null; } + } - if (uc.docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF) - { - //Generator.DocToPDF(dokumentid, ref dok); - dok.extension = "pdf"; - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - } + } + else + { + filter = filter + uc.genertated_dokumentid + "','"; - if (uc.docgendata.erstellungsart == Erstellungsart.DokumentSpäterBearbeiten) + } + counter = counter + 1; + if (this.EinzelGenerierung) + { + if (counter < TabControlDokuments.TabPages.Count) { - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - db = null; + if (MessageBox.Show("Nächstes Dokument generieren oder Generierung abbrechen?", "Dokumentgenerierung", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.Cancel) + { + progressBarAdv1.Visible = false; + filter = filter.Substring(0, filter.Length - 2) + ")"; + dokList1.datafilter = filter; + dokList1.refresh_dokumente("view_dokumentpaket"); + dokList1.refresh_dokumente(); + return; + } } - } } - else - { - filter = filter + uc.genertated_dokumentid + "','"; - - } + catch { } } + + progressBarAdv1.Visible = false; filter = filter.Substring(0, filter.Length - 2) + ")"; dokList1.datafilter = filter; @@ -661,5 +684,12 @@ namespace OnDoc.DocMgmt { //int a = 1; } + + private void RibbonButtonEInzelgenerierung_Click(object sender, EventArgs e) + { + this.EinzelGenerierung = true; + RibbonButtonGenerieren_Click(sender, e); + this.EinzelGenerierung = false; + } } } diff --git a/Client/DocMgmt/Dokumentpaket.resx b/Client/DocMgmt/Dokumentpaket.resx index 9e258f6f..cceba7f8 100644 --- a/Client/DocMgmt/Dokumentpaket.resx +++ b/Client/DocMgmt/Dokumentpaket.resx @@ -161,12 +161,6 @@ B7FBYqiqcBiQ0HreI2vSk1kgZ4eUbLUEYRAbJAaSQ1aL1YCIqn2u8S1n5/rnrvIAORuEQWyQGEgOWS1W A0AgrHyXX3LHlUkgP4MwiA0SQ1cH1gtKjqBkiS5JCMCTMigzJbVfIjkzgfSAMxOlAACf2BGuKP2MmgAA AABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== diff --git a/Client/DocMgmt/FrmDokumentwerte.Designer.cs b/Client/DocMgmt/FrmDokumentwerte.Designer.cs new file mode 100644 index 00000000..ea3a87d2 --- /dev/null +++ b/Client/DocMgmt/FrmDokumentwerte.Designer.cs @@ -0,0 +1,62 @@ +namespace OnDoc.DocMgmt +{ + partial class FrmDokumentwerte + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid(); + ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit(); + this.SuspendLayout(); + // + // sfDataGrid1 + // + this.sfDataGrid1.AccessibleName = "Table"; + this.sfDataGrid1.Location = new System.Drawing.Point(22, 13); + this.sfDataGrid1.Name = "sfDataGrid1"; + this.sfDataGrid1.Size = new System.Drawing.Size(1046, 685); + this.sfDataGrid1.TabIndex = 0; + this.sfDataGrid1.Text = "sfDataGrid1"; + // + // FrmDokumentwerte + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1093, 710); + this.Controls.Add(this.sfDataGrid1); + this.Name = "FrmDokumentwerte"; + this.Text = "FrmDokumentwerte"; + this.Load += new System.EventHandler(this.FrmDokumentwerte_Load); + ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid1; + } +} \ No newline at end of file diff --git a/Client/DocMgmt/FrmDokumentwerte.cs b/Client/DocMgmt/FrmDokumentwerte.cs new file mode 100644 index 00000000..55d649c6 --- /dev/null +++ b/Client/DocMgmt/FrmDokumentwerte.cs @@ -0,0 +1,28 @@ +using Model; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Security.Cryptography.X509Certificates; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace OnDoc.DocMgmt +{ + public partial class FrmDokumentwerte : Form + { +public clsDocData docData = new clsDocData(); + public FrmDokumentwerte() + { + InitializeComponent(); + } + + private void FrmDokumentwerte_Load(object sender, EventArgs e) + { + sfDataGrid1.DataSource = docData.DocValues; + } + } +} diff --git a/Client/DocMgmt/FrmDokumentwerte.resx b/Client/DocMgmt/FrmDokumentwerte.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/Client/DocMgmt/FrmDokumentwerte.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Client/Start.cs b/Client/Start.cs index 98109ee7..4439c87c 100644 --- a/Client/Start.cs +++ b/Client/Start.cs @@ -5,6 +5,7 @@ using OnDoc.Diverses; using OnDoc.DocMgmt; using OnDoc.Klassen; using Syncfusion.WinForms.Controls; +using Syncfusion.XlsIO; using Syncfusion.XlsIO.Implementation; using System; using System.Data; @@ -40,6 +41,30 @@ namespace OnDoc db = null; } + private void Delete_Old_Files() + { + try + { + + string[] files = Directory.GetFiles(AppParams.tempdir); + + foreach (string file in files) + { + FileInfo fi = new FileInfo(file); + if (fi.LastAccessTime < DateTime.Now.AddDays(-5)) + fi.Delete(); + } + foreach (string file in files) + { + FileInfo fi = new FileInfo(file); + if (fi.LastAccessTime < DateTime.Now.AddDays(-5)) + fi.Delete(); + } + } + catch { } + + //Delete_Old_Spooler_Files(); + } public Start() { InitializeComponent(); @@ -53,7 +78,7 @@ namespace OnDoc InitLogging(); Logging.Logging.Debug("Start", "OnDoc-Client", ""); - + Delete_Old_Files(); mitarbeiter = System.Security.Principal.WindowsIdentity.GetCurrent().Name; mitarbeiter = mitarbeiter.Substring(mitarbeiter.IndexOf("\\") + 1); AppParams.systemtgnummer = mitarbeiter; diff --git a/Client/UIControls/Administrator/Dokumenttyp.cs b/Client/UIControls/Administrator/Dokumenttyp.cs index 3bf4234e..12581f65 100644 --- a/Client/UIControls/Administrator/Dokumenttyp.cs +++ b/Client/UIControls/Administrator/Dokumenttyp.cs @@ -122,7 +122,7 @@ namespace OnDoc.UIControls.Administrator db.Get_Tabledata("Select * from Dokumenttyp_BP_Person_Erstellung where dokumenttypnr=" + dokumenttypnr.ToString(), false, true); if (db.dsdaten.Tables[0].Rows.Count != 0) { - erstellungstyp = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]); + erstellungstyp = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]); } db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr = " + dokumenttypnr.ToString(), false, true); diff --git a/Client/UIControls/DokTypDetail.cs b/Client/UIControls/DokTypDetail.cs index 0c18423d..3d5eda6c 100644 --- a/Client/UIControls/DokTypDetail.cs +++ b/Client/UIControls/DokTypDetail.cs @@ -1,6 +1,8 @@ using Database; using DOCGEN; +using Microsoft.Office.Interop.Word; using Model; +using OnDoc.Helper; using OnDoc.Klassen; using System; using System.Collections.Generic; @@ -12,6 +14,7 @@ using System.Text; using System.Threading.Tasks; using System.Web.UI.WebControls.Expressions; using System.Windows.Forms; +using System.Windows.Forms.Design; namespace OnDoc.UIControls { @@ -21,6 +24,8 @@ namespace OnDoc.UIControls public int einzeldokument { get; set; } = 0; public bool dokumentpaket { get; set; } = false; + + public string source { get; set; } = ""; public DokTypDetail() { InitializeComponent(); @@ -35,18 +40,20 @@ namespace OnDoc.UIControls public void Refresh_Details() { - DataTable details = new DataTable(); + System.Data.DataTable details = new System.Data.DataTable(); details.Columns.Add("Element"); details.Columns.Add("Inhalt"); if (dokumentpaket) { + sfDataGrid1.Dock = DockStyle.Top; groupBox2.Dock = DockStyle.Fill; groupBox2.Visible = true; } else { + sfDataGrid1.Dock = DockStyle.Fill; groupBox2.Visible = false; } @@ -124,6 +131,7 @@ namespace OnDoc.UIControls { DocGet dg = new DocGet(AppParams.connectionstring); clsdok dok = new clsdok(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString(), dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString(), "",""); + source = dok.dokument; string PDF = ""; switch (dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString().ToUpper()) { @@ -148,6 +156,46 @@ namespace OnDoc.UIControls sfDataGrid1.DataSource = details; dB = null; } + public string RandomString(int length) + { + var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + var stringChars = new char[8]; + var random = new Random(); + + for (int i = 0; i < stringChars.Length; i++) + { + stringChars[i] = chars[random.Next(chars.Length)]; + } + + return new String(stringChars); + } + public void opensource() + { + + + DB db = new DB(AppParams.connectionstring); + db.Get_Tabledata("Select office_vorlagenr from dokumenttyp where dokumenttypnr=" + this.dokumenttypnr.ToString(), false, true); + string vorlagenr = db.dsdaten.Tables[0].Rows[0][0].ToString(); + VBFileManagement.VBFileManagement vm = new VBFileManagement.VBFileManagement(); + + + db.Get_ApplicationType_from_Vorlage(Convert.ToInt32(vorlagenr)); + string type = db.dsdaten.Tables[0].Rows[0][0].ToString(); + string ext = db.dsdaten.Tables[0].Rows[0][1].ToString(); + string filename = AppParams.tempdir+ RandomString(12) + "." + ext; + + vm.Get_From_DB(Convert.ToInt32(vorlagenr), filename, AppParams.connectionstring); + vm = null; + if (type.ToUpper().Substring(0,1) == "D" || type.ToUpper().Substring(0, 1) == "W") + { + System.Diagnostics.Process.Start("winword.exe", "/n " + filename); + } + if (type.ToUpper().Substring(0,1) == "X" || type.ToUpper().Substring(0, 1) == "E") + { + System.Diagnostics.Process.Start("excel.exe", " " + filename); + } + db = null; + } private void sfDataGrid2_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) { diff --git a/Client/UIControls/Serienbrief.cs b/Client/UIControls/Serienbrief.cs index 985a2504..1a4d047d 100644 --- a/Client/UIControls/Serienbrief.cs +++ b/Client/UIControls/Serienbrief.cs @@ -117,6 +117,9 @@ namespace OnDoc.UIControls Refresh_Lists(); Refresh_Team(); Broadcaster().AddListener(this); + Security security = new Security(); + security.set_security_general(this); + security = null; //Closing += Form_Closing; } @@ -2519,14 +2522,18 @@ namespace OnDoc.UIControls fh = null; sb.dsempfaenger.Tables["UsedFelder"].Rows.Clear(); - string json = sbt.usedfelder; - System.Data.DataTable dt = (System.Data.DataTable)JsonConvert.DeserializeObject(json, (typeof(System.Data.DataTable))); - - sb.dsempfaenger.Tables["UsedFelder"].Rows.Clear(); - foreach (System.Data.DataRow dr in dt.Rows) + try { - sb.dsempfaenger.Tables["Usedfelder"].ImportRow(dr); - }; + string json = sbt.usedfelder; + System.Data.DataTable dt = (System.Data.DataTable)JsonConvert.DeserializeObject(json, (typeof(System.Data.DataTable))); + + sb.dsempfaenger.Tables["UsedFelder"].Rows.Clear(); + foreach (System.Data.DataRow dr in dt.Rows) + { + sb.dsempfaenger.Tables["Usedfelder"].ImportRow(dr); + }; + } + catch { } update_serienbriefdaten(false); } diff --git a/Client/Versandstrasse/Versandstrasse.Designer.cs b/Client/Versandstrasse/Versandstrasse.Designer.cs index 7442e338..45427e49 100644 --- a/Client/Versandstrasse/Versandstrasse.Designer.cs +++ b/Client/Versandstrasse/Versandstrasse.Designer.cs @@ -29,131 +29,106 @@ private void InitializeComponent() { 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.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 messageBoxSettings1 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); - Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings1 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Versandstrasse)); - Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings1 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); - this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); + 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(); + 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); + this.imageList1_sik = new System.Windows.Forms.ImageList(this.components); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.tsbtnDruckPaketNew = new System.Windows.Forms.ToolStripButton(); - this.tsbtnVersenden = new System.Windows.Forms.ToolStripButton(); this.tscheckboxpreview = new Syncfusion.Windows.Forms.Tools.ToolStripCheckBox(); + this.tsbtnVersenden = new System.Windows.Forms.ToolStripButton(); + this.panelPrepare = new System.Windows.Forms.Panel(); + this.label4 = new System.Windows.Forms.Label(); + this.pdfViewerControl1 = new Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl(); this.GrpPaketDetails = new System.Windows.Forms.GroupBox(); - this.panelVerify = new System.Windows.Forms.Panel(); - 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.button1 = new System.Windows.Forms.Button(); 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.pdfViewerControl1 = new Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl(); - this.panel1 = new System.Windows.Forms.Panel(); - this.panel2 = new System.Windows.Forms.Panel(); + 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.button2 = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); - this.panelPrepare = new System.Windows.Forms.Panel(); - this.label4 = new System.Windows.Forms.Label(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit(); + 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.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.contextMenuStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); + this.panelPrepare.SuspendLayout(); this.GrpPaketDetails.SuspendLayout(); - this.panelVerify.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.groupBox3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).BeginInit(); - this.groupBox1.SuspendLayout(); - this.panel1.SuspendLayout(); - this.panel2.SuspendLayout(); + this.panelVerify.SuspendLayout(); this.panel3.SuspendLayout(); - this.panelPrepare.SuspendLayout(); - this.contextMenuStrip1.SuspendLayout(); + ((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.SuspendLayout(); // - // treeViewAdv1 + // contextMenuStrip1 // - 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))))); - this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); - this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(548, 493); - this.treeViewAdv1.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat; - this.treeViewAdv1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.treeViewAdv1.ContextMenuStrip = this.contextMenuStrip1; - this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Fill; - this.treeViewAdv1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.treeViewAdv1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); + this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + 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.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.Text = "Löschen"; // - this.treeViewAdv1.HelpTextControl.BaseThemeName = null; - 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.TabIndex = 0; - this.treeViewAdv1.HelpTextControl.Text = "help text"; - this.treeViewAdv1.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; - this.treeViewAdv1.Indent = 20; - this.treeViewAdv1.ItemHeight = 25; - this.treeViewAdv1.LineColor = System.Drawing.Color.FromArgb(((int)(((byte)(94)))), ((int)(((byte)(94)))), ((int)(((byte)(94))))); - this.treeViewAdv1.Location = new System.Drawing.Point(0, 0); - this.treeViewAdv1.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(158)))), ((int)(((byte)(218))))); - this.treeViewAdv1.MetroScrollBars = true; - this.treeViewAdv1.Name = "treeViewAdv1"; - this.treeViewAdv1.PathSeparator = "/"; - this.treeViewAdv1.SelectedNodeBackground = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(197)))), ((int)(((byte)(197)))))); - this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); - this.treeViewAdv1.ShowFocusRect = false; - this.treeViewAdv1.Size = new System.Drawing.Size(548, 493); - this.treeViewAdv1.Style = Syncfusion.Windows.Forms.Tools.TreeStyle.Office2016Colorful; - this.treeViewAdv1.TabIndex = 7; - this.treeViewAdv1.Text = "treeViewAdv2"; - this.treeViewAdv1.ThemeName = "Office2016Colorful"; - this.treeViewAdv1.ThemeStyle.LineColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(171)))), ((int)(((byte)(171))))); - this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; - this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true; - this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + // imageList1 // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "close_13984246.png"); + this.imageList1.Images.SetKeyName(1, "check_14025690.png"); + this.imageList1.Images.SetKeyName(2, "one_red.png"); + this.imageList1.Images.SetKeyName(3, "one.png"); + this.imageList1.Images.SetKeyName(4, "two_red.png"); + this.imageList1.Images.SetKeyName(5, "two_17136505.png"); // + // imageList1_sik // - this.treeViewAdv1.ToolTipControl.BackColor = System.Drawing.SystemColors.Info; - this.treeViewAdv1.ToolTipControl.BaseThemeName = null; - 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.TabIndex = 1; - this.treeViewAdv1.ToolTipControl.Text = "toolTip"; - this.treeViewAdv1.TransparentControls = true; - this.treeViewAdv1.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.treeViewAdv1_ItemDrag); - this.treeViewAdv1.AfterSelect += new System.EventHandler(this.treeViewAdv1_AfterSelect); - this.treeViewAdv1.NodeMouseClick += new Syncfusion.Windows.Forms.Tools.TreeNodeAdvMouseClickArgs(this.treeViewAdv1_NodeMouseClick); - this.treeViewAdv1.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeViewAdv1_DragDrop); - this.treeViewAdv1.DragOver += new System.Windows.Forms.DragEventHandler(this.treeViewAdv1_DragOver); - this.treeViewAdv1.DragLeave += new System.EventHandler(this.treeViewAdv1_DragLeave); + this.imageList1_sik.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1_sik.ImageStream"))); + this.imageList1_sik.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1_sik.Images.SetKeyName(0, "road_15891610.png"); + this.imageList1_sik.Images.SetKeyName(1, "check_14025690.png"); + this.imageList1_sik.Images.SetKeyName(2, "close_13984246.png"); + this.imageList1_sik.Images.SetKeyName(3, "number-1_16609498.png"); + this.imageList1_sik.Images.SetKeyName(4, "two_17136505.png"); // // toolStrip1 // @@ -161,23 +136,30 @@ this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsbtnDruckPaketNew, - this.tsbtnVersenden, - this.tscheckboxpreview}); - this.toolStrip1.Location = new System.Drawing.Point(2, 2); + this.tscheckboxpreview, + this.tsbtnVersenden}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1551, 46); + this.toolStrip1.Size = new System.Drawing.Size(1509, 46); this.toolStrip1.TabIndex = 8; this.toolStrip1.Text = "toolStrip1"; + this.toolStrip1.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.toolStrip1_ItemClicked); // // tsbtnDruckPaketNew // this.tsbtnDruckPaketNew.Image = global::OnDoc.Properties.Resources.add_32x32_32; this.tsbtnDruckPaketNew.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbtnDruckPaketNew.Name = "tsbtnDruckPaketNew"; - this.tsbtnDruckPaketNew.Size = new System.Drawing.Size(127, 43); - this.tsbtnDruckPaketNew.Text = "Neues Druckpaket"; + this.tsbtnDruckPaketNew.Size = new System.Drawing.Size(155, 43); + this.tsbtnDruckPaketNew.Text = "Neues Versand-Couvert"; this.tsbtnDruckPaketNew.Click += new System.EventHandler(this.tsbtnDruckPaketNew_Click); // + // tscheckboxpreview + // + this.tscheckboxpreview.Name = "tscheckboxpreview"; + this.tscheckboxpreview.Size = new System.Drawing.Size(205, 43); + this.tscheckboxpreview.Text = "Vorschau aufbereitete Dokumente"; + // // tsbtnVersenden // this.tsbtnVersenden.Image = global::OnDoc.Properties.Resources.Letter_24x24_32; @@ -187,11 +169,65 @@ this.tsbtnVersenden.Text = "Dokumente an Versandstrasse übergeben"; this.tsbtnVersenden.Visible = false; // - // tscheckboxpreview + // panelPrepare // - this.tscheckboxpreview.Name = "tscheckboxpreview"; - this.tscheckboxpreview.Size = new System.Drawing.Size(205, 43); - this.tscheckboxpreview.Text = "Vorschau aufbereitete Dokumente"; + this.panelPrepare.BackColor = System.Drawing.Color.Silver; + this.panelPrepare.Controls.Add(this.label4); + this.panelPrepare.Location = new System.Drawing.Point(351, 20); + this.panelPrepare.Name = "panelPrepare"; + this.panelPrepare.Size = new System.Drawing.Size(832, 94); + this.panelPrepare.TabIndex = 14; + this.panelPrepare.Visible = false; + // + // label4 + // + this.label4.AutoSize = true; + 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(19, 34); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(437, 20); + this.label4.TabIndex = 0; + this.label4.Text = "Versand wird vorbereit - bitte einen Moment warten...."; + // + // pdfViewerControl1 + // + this.pdfViewerControl1.CursorMode = Syncfusion.Windows.Forms.PdfViewer.PdfViewerCursorMode.SelectTool; + this.pdfViewerControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.pdfViewerControl1.EnableContextMenu = true; + this.pdfViewerControl1.EnableNotificationBar = true; + this.pdfViewerControl1.HorizontalScrollOffset = 0; + this.pdfViewerControl1.IsBookmarkEnabled = true; + this.pdfViewerControl1.IsTextSearchEnabled = true; + this.pdfViewerControl1.IsTextSelectionEnabled = true; + this.pdfViewerControl1.Location = new System.Drawing.Point(888, 46); + messageBoxSettings3.EnableNotification = true; + this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings3; + 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; + this.pdfViewerControl1.ReferencePath = null; + this.pdfViewerControl1.ScrollDisplacementValue = 0; + this.pdfViewerControl1.ShowHorizontalScrollBar = true; + this.pdfViewerControl1.ShowToolBar = true; + this.pdfViewerControl1.ShowVerticalScrollBar = true; + this.pdfViewerControl1.Size = new System.Drawing.Size(621, 556); + 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; + this.pdfViewerControl1.ThemeName = "Default"; + this.pdfViewerControl1.VerticalScrollOffset = 0; + this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; + this.pdfViewerControl1.ZoomMode = Syncfusion.Windows.Forms.PdfViewer.ZoomMode.Default; // // GrpPaketDetails // @@ -200,75 +236,107 @@ this.GrpPaketDetails.Controls.Add(this.groupBox3); this.GrpPaketDetails.Controls.Add(this.groupBox1); this.GrpPaketDetails.Controls.Add(this.button1); - this.GrpPaketDetails.Dock = System.Windows.Forms.DockStyle.Left; - this.GrpPaketDetails.Location = new System.Drawing.Point(0, 0); + this.GrpPaketDetails.Location = new System.Drawing.Point(436, 3); this.GrpPaketDetails.Name = "GrpPaketDetails"; this.GrpPaketDetails.Size = new System.Drawing.Size(446, 493); this.GrpPaketDetails.TabIndex = 9; this.GrpPaketDetails.TabStop = false; - this.GrpPaketDetails.Text = "Details zum Druckpaket"; + this.GrpPaketDetails.Text = "Details zum Couvert"; // - // panelVerify + // button1 // - 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; + 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); // - // button2 + // groupBox1 // - 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); + 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"; // - // label3 + // rbversandoption1 // - 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."; + 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; // - // label2 + // rbversandoption2 // - 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"; + 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; // - // btnSendFinal + // rbapost // - this.btnSendFinal.BackColor = System.Drawing.Color.YellowGreen; - 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 = "Unwiderruflich versenden"; - this.btnSendFinal.UseVisualStyleBackColor = false; - this.btnSendFinal.Click += new System.EventHandler(this.btnSendFinal_Click); + 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); // - // btnPrepare + // rbversandoption3 // - 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-Paket püfen"; - this.btnPrepare.UseVisualStyleBackColor = true; - this.btnPrepare.Click += new System.EventHandler(this.btnSend_Click); + 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; + // + // rbb2post + // + 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); + // + // rbb1post + // + 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); // // groupBox3 // @@ -281,18 +349,29 @@ 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); - 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)}); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo4)}); this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(417, 193); // // @@ -325,223 +404,333 @@ this.treeViewAdvAdresse.AfterSelect += new System.EventHandler(this.treeViewAdvAdresse_AfterSelect); this.treeViewAdvAdresse.NodeMouseClick += new Syncfusion.Windows.Forms.Tools.TreeNodeAdvMouseClickArgs(this.treeViewAdvAdresse_NodeMouseClick); // - // 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ückantowrtcouvert"; - this.chkGAS.UseVisualStyleBackColor = true; - this.chkGAS.CheckedChanged += new System.EventHandler(this.chkGAS_CheckedChanged); - // - // groupBox1 - // - 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"; - // - // rbb1post - // - 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); - // - // rbb2post - // - 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); - // - // rbversandoption3 - // - 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; - // - // 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 + // btnPrepare // - 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.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); // - // rbversandoption1 + // panelVerify // - 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.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; // - // button1 + // btnSendFinal // - 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); + 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); // - // pdfViewerControl1 + // label2 // - this.pdfViewerControl1.CursorMode = Syncfusion.Windows.Forms.PdfViewer.PdfViewerCursorMode.SelectTool; - this.pdfViewerControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfViewerControl1.EnableContextMenu = true; - this.pdfViewerControl1.EnableNotificationBar = true; - this.pdfViewerControl1.HorizontalScrollOffset = 0; - this.pdfViewerControl1.IsBookmarkEnabled = true; - this.pdfViewerControl1.IsTextSearchEnabled = true; - this.pdfViewerControl1.IsTextSelectionEnabled = true; - this.pdfViewerControl1.Location = new System.Drawing.Point(0, 0); - messageBoxSettings1.EnableNotification = true; - this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings1; - this.pdfViewerControl1.MinimumZoomPercentage = 50; - this.pdfViewerControl1.Name = "pdfViewerControl1"; - this.pdfViewerControl1.PageBorderThickness = 1; - 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; - this.pdfViewerControl1.ShowToolBar = true; - this.pdfViewerControl1.ShowVerticalScrollBar = true; - this.pdfViewerControl1.Size = new System.Drawing.Size(554, 493); - this.pdfViewerControl1.SpaceBetweenPages = 8; - this.pdfViewerControl1.TabIndex = 10; - this.pdfViewerControl1.Text = "pdfViewerControl1"; - 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; - this.pdfViewerControl1.ZoomMode = Syncfusion.Windows.Forms.PdfViewer.ZoomMode.Default; + 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"; // - // panel1 + // label3 // - this.panel1.Controls.Add(this.treeViewAdv1); - this.panel1.Dock = System.Windows.Forms.DockStyle.Left; - this.panel1.Location = new System.Drawing.Point(2, 48); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(548, 493); - this.panel1.TabIndex = 11; + 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."; // - // panel2 + // button2 // - this.panel2.Controls.Add(this.GrpPaketDetails); - this.panel2.Dock = System.Windows.Forms.DockStyle.Left; - this.panel2.Location = new System.Drawing.Point(550, 48); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(449, 493); - this.panel2.TabIndex = 12; + 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); // // panel3 // - this.panel3.Controls.Add(this.pdfViewerControl1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(999, 48); + this.panel3.Controls.Add(this.treeViewAdv1); + this.panel3.Controls.Add(this.GrpPaketDetails); + this.panel3.Dock = System.Windows.Forms.DockStyle.Left; + this.panel3.Location = new System.Drawing.Point(0, 46); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(554, 493); + this.panel3.Size = new System.Drawing.Size(888, 556); this.panel3.TabIndex = 13; // - // panelPrepare + // 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; // - this.panelPrepare.BackColor = System.Drawing.Color.Silver; - this.panelPrepare.Controls.Add(this.label4); - this.panelPrepare.Location = new System.Drawing.Point(384, 139); - this.panelPrepare.Name = "panelPrepare"; - this.panelPrepare.Size = new System.Drawing.Size(832, 94); - this.panelPrepare.TabIndex = 14; - this.panelPrepare.Visible = false; + // treeViewAdv1 // - // label4 + 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))))); + this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); + 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; + this.treeViewAdv1.ContextMenuStrip = this.contextMenuStrip1; + this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Left; + this.treeViewAdv1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.treeViewAdv1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); // - this.label4.AutoSize = true; - 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(19, 34); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(437, 20); - this.label4.TabIndex = 0; - this.label4.Text = "Versand wird vorbereit - bitte einen Moment warten...."; // - // contextMenuStrip1 // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.löschenToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(181, 48); - this.contextMenuStrip1.Click += new System.EventHandler(this.contextMenuStrip1_Click); + this.treeViewAdv1.HelpTextControl.BaseThemeName = null; + 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.TabIndex = 0; + this.treeViewAdv1.HelpTextControl.Text = "help text"; + this.treeViewAdv1.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; + this.treeViewAdv1.Indent = 20; + this.treeViewAdv1.ItemHeight = 25; + this.treeViewAdv1.LeftImageList = this.imageList1; + this.treeViewAdv1.LineColor = System.Drawing.Color.FromArgb(((int)(((byte)(94)))), ((int)(((byte)(94)))), ((int)(((byte)(94))))); + this.treeViewAdv1.Location = new System.Drawing.Point(0, 0); + this.treeViewAdv1.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(158)))), ((int)(((byte)(218))))); + this.treeViewAdv1.MetroScrollBars = true; + this.treeViewAdv1.Name = "treeViewAdv1"; + this.treeViewAdv1.PathSeparator = "/"; + this.treeViewAdv1.SelectedNodeBackground = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(197)))), ((int)(((byte)(197)))))); + this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); + this.treeViewAdv1.ShowFocusRect = false; + this.treeViewAdv1.Size = new System.Drawing.Size(433, 556); + this.treeViewAdv1.Style = Syncfusion.Windows.Forms.Tools.TreeStyle.Office2016Colorful; + this.treeViewAdv1.TabIndex = 7; + this.treeViewAdv1.Text = "treeViewAdv2"; + this.treeViewAdv1.ThemeName = "Office2016Colorful"; + this.treeViewAdv1.ThemeStyle.LineColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(171)))), ((int)(((byte)(171))))); + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true; + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); // - // löschenToolStripMenuItem // - this.löschenToolStripMenuItem.Name = "löschenToolStripMenuItem"; - this.löschenToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.löschenToolStripMenuItem.Text = "Löschen"; + // + this.treeViewAdv1.ToolTipControl.BackColor = System.Drawing.SystemColors.Info; + this.treeViewAdv1.ToolTipControl.BaseThemeName = null; + 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.TabIndex = 1; + this.treeViewAdv1.ToolTipControl.Text = "toolTip"; + this.treeViewAdv1.TransparentControls = true; + this.treeViewAdv1.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.treeViewAdv1_ItemDrag); + this.treeViewAdv1.AfterSelect += new System.EventHandler(this.treeViewAdv1_AfterSelect); + this.treeViewAdv1.NodeMouseClick += new Syncfusion.Windows.Forms.Tools.TreeNodeAdvMouseClickArgs(this.treeViewAdv1_NodeMouseClick); + this.treeViewAdv1.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeViewAdv1_DragDrop); + this.treeViewAdv1.DragOver += new System.Windows.Forms.DragEventHandler(this.treeViewAdv1_DragOver); + this.treeViewAdv1.DragLeave += new System.EventHandler(this.treeViewAdv1_DragLeave); + // + // treeViewAdvCouverts + // + this.treeViewAdvCouverts.AllowDrop = 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))))); + 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); + 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.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))))); + // + // + // + this.treeViewAdvCouverts.HelpTextControl.BaseThemeName = null; + 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.TabIndex = 0; + this.treeViewAdvCouverts.HelpTextControl.Text = "help text"; + this.treeViewAdvCouverts.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; + this.treeViewAdvCouverts.Indent = 20; + 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.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(158)))), ((int)(((byte)(218))))); + this.treeViewAdvCouverts.MetroScrollBars = true; + this.treeViewAdvCouverts.Name = "treeViewAdvCouverts"; + this.treeViewAdvCouverts.PathSeparator = "/"; + 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.Style = Syncfusion.Windows.Forms.Tools.TreeStyle.Office2016Colorful; + this.treeViewAdvCouverts.TabIndex = 8; + this.treeViewAdvCouverts.Text = "treeViewAdv2"; + this.treeViewAdvCouverts.ThemeName = "Office2016Colorful"; + this.treeViewAdvCouverts.ThemeStyle.LineColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(171)))), ((int)(((byte)(171))))); + this.treeViewAdvCouverts.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; + this.treeViewAdvCouverts.ThemeStyle.TreeNodeAdvStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.treeViewAdvCouverts.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true; + this.treeViewAdvCouverts.ThemeStyle.TreeNodeAdvStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.treeViewAdvCouverts.ThemeStyle.TreeNodeAdvStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.treeViewAdvCouverts.ThemeStyle.TreeNodeAdvStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + // + // + // + this.treeViewAdvCouverts.ToolTipControl.BackColor = System.Drawing.SystemColors.Info; + this.treeViewAdvCouverts.ToolTipControl.BaseThemeName = null; + 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.TabIndex = 1; + this.treeViewAdvCouverts.ToolTipControl.Text = "toolTip"; + this.treeViewAdvCouverts.TransparentControls = true; + this.treeViewAdvCouverts.AfterSelect += new System.EventHandler(this.treeViewAdvCouverts_AfterSelect); + // + // imageList2 + // + this.imageList2.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList2.ImageStream"))); + this.imageList2.TransparentColor = System.Drawing.Color.Transparent; + this.imageList2.Images.SetKeyName(0, "APost.png"); + this.imageList2.Images.SetKeyName(1, "B1.png"); + this.imageList2.Images.SetKeyName(2, "B2.png"); + // + // 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(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; + // + // button3 + // + 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); // // Versandstrasse // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1555, 543); - this.Controls.Add(this.panelPrepare); - this.Controls.Add(this.panel3); - this.Controls.Add(this.panel2); - this.Controls.Add(this.panel1); - this.Controls.Add(this.toolStrip1); + this.ClientSize = new System.Drawing.Size(1523, 636); + this.Controls.Add(this.TabControlDokuments); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.Name = "Versandstrasse"; @@ -549,58 +738,68 @@ this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; this.Text = "Versandstrasse"; this.Load += new System.EventHandler(this.Versandstrasse_Load); - ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit(); + this.contextMenuStrip1.ResumeLayout(false); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); + this.panelPrepare.ResumeLayout(false); + this.panelPrepare.PerformLayout(); this.GrpPaketDetails.ResumeLayout(false); - this.panelVerify.ResumeLayout(false); - this.panelVerify.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).EndInit(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.panel1.ResumeLayout(false); - this.panel2.ResumeLayout(false); + this.panelVerify.ResumeLayout(false); + this.panelVerify.PerformLayout(); this.panel3.ResumeLayout(false); - this.panelPrepare.ResumeLayout(false); - this.panelPrepare.PerformLayout(); - this.contextMenuStrip1.ResumeLayout(false); + ((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.ResumeLayout(false); } #endregion - private Syncfusion.Windows.Forms.Tools.TreeViewAdv treeViewAdv1; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton tsbtnDruckPaketNew; private System.Windows.Forms.ToolStripButton tsbtnVersenden; + private Syncfusion.Windows.Forms.Tools.ToolStripCheckBox tscheckboxpreview; + private System.Windows.Forms.Panel panelPrepare; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem löschenToolStripMenuItem; + private System.Windows.Forms.ImageList imageList1_sik; + private System.Windows.Forms.ImageList imageList1; + private Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl pdfViewerControl1; private System.Windows.Forms.GroupBox GrpPaketDetails; + private System.Windows.Forms.Panel panelVerify; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Button btnSendFinal; + private System.Windows.Forms.Button btnPrepare; + private System.Windows.Forms.GroupBox groupBox3; + private Syncfusion.Windows.Forms.Tools.TreeViewAdv treeViewAdvAdresse; + private System.Windows.Forms.CheckBox chkGAS; private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.RadioButton rbb1post; + private System.Windows.Forms.RadioButton rbb2post; private System.Windows.Forms.RadioButton rbversandoption3; + private System.Windows.Forms.RadioButton rbapost; private System.Windows.Forms.RadioButton rbversandoption2; private System.Windows.Forms.RadioButton rbversandoption1; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.CheckBox chkGAS; private System.Windows.Forms.Button button1; - private System.Windows.Forms.RadioButton rbb2post; - private System.Windows.Forms.RadioButton rbapost; - private Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl pdfViewerControl1; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel3; - private System.Windows.Forms.RadioButton rbb1post; - private Syncfusion.Windows.Forms.Tools.ToolStripCheckBox tscheckboxpreview; - private System.Windows.Forms.Button btnPrepare; - private Syncfusion.Windows.Forms.Tools.TreeViewAdv treeViewAdvAdresse; - private System.Windows.Forms.Panel panelPrepare; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Button btnSendFinal; - private System.Windows.Forms.Panel panelVerify; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; - private System.Windows.Forms.ToolStripMenuItem löschenToolStripMenuItem; + private Syncfusion.Windows.Forms.Tools.TabControlAdv TabControlDokuments; + private Syncfusion.Windows.Forms.Tools.TabPageAdv tabPageAdv1; + private Syncfusion.Windows.Forms.Tools.TabPageAdv tabPageAdv2; + private Syncfusion.Windows.Forms.Tools.TreeViewAdv treeViewAdv1; + private Syncfusion.Windows.Forms.Tools.TreeViewAdv treeViewAdvCouverts; + private System.Windows.Forms.ImageList imageList2; + private Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl pdfViewerControl2; + private System.Windows.Forms.Button button3; } } \ No newline at end of file diff --git a/Client/Versandstrasse/Versandstrasse.cs b/Client/Versandstrasse/Versandstrasse.cs index 85d1b187..3582450a 100644 --- a/Client/Versandstrasse/Versandstrasse.cs +++ b/Client/Versandstrasse/Versandstrasse.cs @@ -25,6 +25,7 @@ using Windows.Media.Capture; namespace OnDoc.Versandstrasse { + public partial class Versandstrasse : SfForm { private List pakete = new List(); @@ -32,6 +33,7 @@ namespace OnDoc.Versandstrasse private TreeNodeAdv currentSourceNode; private bool serienbrief = false; private serienbrief sb; + private bool direktversenden = false; public Versandstrasse(List pakete) { InitializeComponent(); @@ -95,17 +97,96 @@ namespace OnDoc.Versandstrasse { db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + pakete[i].partnernr.ToString(), false, true); DruckJob = new TreeNodeAdv(); - DruckJob.Text = "Druckpaket " + pakete[i].PaketNr.ToString()+" - " + db.dsdaten.Tables[0].Rows[0][0].ToString(); + DruckJob.Text = "Versand-Couvert - " + db.dsdaten.Tables[0].Rows[0][0].ToString(); DruckJob.Tag = "Druckpaket"; DruckJob.TagObject = pakete[i]; - - + set_nodeimage(DruckJob, 0); + treeViewAdv1.Nodes.Add(DruckJob); PopulateDocs(pakete[i], ref DruckJob); } db = null; treeViewAdv1.ExpandAll(); + foreach (TreeNodeAdv node in treeViewAdv1.Nodes) + { + if (node.Level == 1) { Verify_Couvert(node); } + } + } + + private void set_nodeimage(TreeNodeAdv node, int img) + { + node.LeftImageIndices = null; + node.LeftImageIndices = new int[] { img }; + } + + private void Verify_Couverts() + { + foreach (TreeNodeAdv node in treeViewAdv1.Nodes) + { + if (node.Level == 1) { Verify_Couvert(node); } + } + } + private bool Verify_Couvert(TreeNodeAdv node) + { + Versandpaket vp = node.TagObject as Versandpaket; + 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 }; + db.Get_Tabledata("SELECT dbo.dokument.nrpar00, 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); + //BP-Verifikation + if (currentbp != Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["nrpar00"])) + { + currentbp = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["nrpar00"]); + anzbp = anzbp + 1; + } + + //Versandstrasse möglich + 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); } + else + { + set_nodeimage(dokumentnode, 5); + } + + + } + } + if (node.Nodes.Count == 0) + { + versandbereit = false; + } + nodecounter++; + } + if (node.Nodes.Count < 1) { versandbereit = false; } + if (anzbp > 1) { versandbereit = false; } + if (versandbereit == true) + { + set_nodeimage(node, 1); + return true; + } else + { + set_nodeimage(node, 0); + return false; + } } private void populate_serienbriefe() @@ -117,11 +198,13 @@ namespace OnDoc.Versandstrasse TreeNodeAdv tn = new TreeNodeAdv(); tn.Text = dr["dokumentid"].ToString(); tn.Tag = dr["dokument"].ToString(); + set_nodeimage(tn, 3); treeViewAdv1.Nodes[0].Nodes.Add(tn); } } private void PopulateDocs(Versandpaket paket, ref TreeNodeAdv parentnode) { + DB db = new DB(AppParams.connectionstring); TreeNodeAdv dokumentnode; for (int i = 0; i < paket.Dokument.Count; i++) { @@ -129,6 +212,24 @@ namespace OnDoc.Versandstrasse dokumentnode.Text = paket.Dokument[i].Bezeichnung+" (" + paket.Dokument[i].Partnernr+")"; dokumentnode.Tag = paket.Dokument[i].DokumentID; 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) + { + set_nodeimage(dokumentnode, 5); + } else + { + set_nodeimage(dokumentnode, 3); + } + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) ==0) + { + set_nodeimage(dokumentnode, 0); + } else + { + //dokumentnode.LeftImageIndices = new int[] { 3}; + } + parentnode.Nodes.Add(dokumentnode); } @@ -160,6 +261,8 @@ namespace OnDoc.Versandstrasse } } treeView.SelectedNode = sourceNode; + Verify_Couverts(); + } private void treeViewAdv1_DragLeave(object sender, EventArgs e) @@ -422,6 +525,13 @@ namespace OnDoc.Versandstrasse } } + private void button3_Click(object sender, EventArgs e) + { + direktversenden = true; + btnSendFinal_Click(sender, e); + direktversenden = false; + } + private void btnSendFinal_Click(object sender, EventArgs e) { if (serienbrief) @@ -494,14 +604,29 @@ namespace OnDoc.Versandstrasse send_vs(ref vp); } - private void send_vs(ref Versandpaket vp, bool showmessage = true) { - //vp.send_onbase_doc = true; + 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(); + return; + } string URL = AppParams.RESTURI + "api/Send_Versandstrasse"; panelVerify.Visible = false; + WebRequest request; var data = Encoding.UTF8.GetBytes(jsonstring); request = WebRequest.Create(URL); @@ -589,6 +714,11 @@ namespace OnDoc.Versandstrasse TreeNodeAdv node = treeViewAdv1.SelectedNode; if (node.Level == 1) { + if (Verify_Couvert(node)==false) + { + GrpPaketDetails.Enabled = false; + return; + } GrpPaketDetails.Enabled = true; Versandpaket paket = node.TagObject as Versandpaket; ; @@ -653,9 +783,68 @@ namespace OnDoc.Versandstrasse { 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) + { + + } + + private void TabControlDokuments_SelectedIndexChanged(object sender, EventArgs e) + { + if (TabControlDokuments.SelectedIndex == 1) + { + 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); + treeViewAdvCouverts.Nodes.Clear(); + foreach (DataRow dr in db.dsdaten.Tables[0].Rows) + { + Versandpaket vp = JsonConvert.DeserializeObject(dr["paket"].ToString()); + TreeNodeAdv tn = new TreeNodeAdv(); + db2.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + vp.partnernr.ToString(), false, true); + tn.Text = vp.partnernr.ToString() + " - " + db2.dsdaten.Tables[0].Rows[0][0].ToString(); + tn.TagObject = vp.finaldoc; + tn.Tag = dr[0].ToString(); + if (vp.Versandoption.ToString() == "A_POST") { set_nodeimage(tn, 0); } + if (vp.Versandoption.ToString() == "B2_POST") { set_nodeimage(tn, 1); } + if (vp.Versandoption.ToString() == "B2_POST") { set_nodeimage(tn, 2); } + treeViewAdvCouverts.Nodes.Add(tn); + foreach (Versanddokument vd in vp.Dokument) + { + TreeNodeAdv tn2 = new TreeNodeAdv(); + tn2.Text = vd.Bezeichnung; + tn2.Tag = vd.DokumentID; + tn2.TagObject = vd.dokument; + tn.Nodes.Add(tn2); + } + } + db = null; + db2 = null; + } + + } + + private void treeViewAdvCouverts_AfterSelect(object sender, EventArgs e) + { + TreeNodeAdv node = treeViewAdvCouverts.SelectedNode; + + var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString())); + this.pdfViewerControl2.Load(stream); + stream = null; + } + } } diff --git a/Client/Versandstrasse/Versandstrasse.resx b/Client/Versandstrasse/Versandstrasse.resx index 11f84e1c..70c29fac 100644 --- a/Client/Versandstrasse/Versandstrasse.resx +++ b/Client/Versandstrasse/Versandstrasse.resx @@ -118,12 +118,198 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 122, 17 + 157, 24 + + 387, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0 + DAAAAk1TRnQBSQFMAgEBBgEAAUABAAFAAQABEAEAARABAAT/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 + + + + 221, 14 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU + DAAAAk1TRnQBSQFMAgEBBQEAAUgBAAFIAQABEAEAARABAAT/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/wIAAfEBEwoAAfIyAAHx + AgABDgkQAfIyAAETAQAB7wHzC/EB9DEAAQ4B8wwAARExAAEQAfEEAAQONgABEAHxAwAB6wH/AwAB/wFD + NAABEAHxAwABkgEAAfQC8QG8AQ40AAEQAfEDAAHtAQAB8TgAARAB8QMAAQ8B/wEAAfIBbTYAARAB8QQA + AUMB8QL/AZI1AAEQAfEDAAHqAfABEQETAv8BDjQAARAB8QMAAe8BAAGSAQAB8wEAARA0AAEQAfEDAAET + Av8B9AEAAfM0AALyAfEEAAFtAfAB8gEHAQ82AAHxPwAB9AERCwAB7DQAAb0GFgG9CAAB9AHCAcACVQHA + AcIB9AgAAf8BvQEWARcBjwGxAb0B/wUAAfABswqKAbMB8AQAAb0IRwG9BQAB/wHCCFUBwgH/BAAB/wG9 + ARcCjwJvAWoCjwG9Af8CAAHwDtMB8AIAAb0KRwG9AwAB/wHAClUBwAH/AgAB/wG3A48BjgEWAm8BagKP + AbcB/wEAAbMO0wGzAQABvQxHAb0CAAHCA1UBlwGYB1UBwgIAAb0DjwIXAhYBbwEXAWoCjwG9AQABig7T + AYoBvQ5HAb0B9ANVAZcB8gH/AQgHVQH0Af8BFwGPARcB8wH/Ab0BFwEWAb0B/wHzAWoCjwH/AYoH0wHN + BtMBigEWDkcBFgHCA1UB8QP/AQgGVQHCAb0CjwHjA/8CvQP/ARcBagGPAb0BigbTAbMBvAGzBdMBigEW + ARcBtwGUAUcBFwEWAUcB4wG3ARYBFwGUAkcBFgHAAlUBwgL/AcEC/wHCAZcEVQHAARYDjwG9Bv8BvQJv + AWoBsQGKBtMBswH/Aa0F0wGKARYBFwG9AfQBFgGUAbcBFwH/ARYB9AEWAf8BvQEXARYCVQHBAv8BwAFV + AZ4C/wHiAZcEVQEXA48BFwG9BP8BvQIWAm8BjwGKBtMBswH/Aa0F0wGKAhYB9AG9ARcBtwG9AeMB/wEW + AfQBFgH0ArcBFgJVAZ8B/wGeA1UBwAL/AQABlwNVARcDjwEXAb0E/wG9ARcCFgFvARcBigbTAbMB/wGt + BdMBigEWARcBtwGUAeMCtwLjAbcBFgEXAbcBlAEXARYBwAhVAcAC/wHzAZcBVQHAARYDjwG9Bv8BvQEX + AY4BjwEWAYoG0wGzAf8BrQXTAYoBFg5HARYBwglVAZcB9AH/AZ8BVQHCAb0CjwHjA/8CvQP/ARcCjwG9 + AYoF0wEGAfEB8AGyBdMBigG9DkcBvQH0ClUBlwGfAZcBVQH0Af8BFwGPARcB8wH/Ab0CFwG9Af8B8wKP + ARcB/wGKBtMCzQbTAYoBAAG9DEcBvQIAAcIMVQHCAgABvQKPARcB4wSPAeMBFwKPAb0BAAGKDtMBigIA + Ab0KRwG9AwAB/wHAClUBwAH/AgAB/wG3Co8BtwH/AQABsw7TAbMDAAG9CEcBvQUAAf8BwghVAcIB/wQA + Af8BvQEXBo8BFwG9Af8CAAHwDtMB8AQAAb0GFgG9CAAB9AHCAcACVQHAAcIB9AgAAf8BvQEWAhcBFgG9 + Af8FAAHwAbMKigGzAfABAAFCAU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/AQABgAED + BwABAx8AAeAGAAEBBwABAQgAAYAWAAEBARAHAAEgDgABwAcAAcAHAAHwAQ8B8AEPAfABDwGAAQEB4AEH + AcABAwHAAQMCAAHAAQMBgAEBAYABAQIAAYABAQGAAQEBgAEBQgABgAEBAYABAQGAAQECAAHAAQMBgAEB + AYABAQIAAeABBwHAAQMBwAEDAgAB8AEPAfABDwHwAQ8BgAEBCw== + + 17, 17 - + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 + dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh + d2luZy5Qb2ludEYCAAAAAXgBeQAACwsCAAAAAAAAAAAAAAAL + + + + 498, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACK + CQAAAk1TRnQBSQFMAgEBAwEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + 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/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 diff --git a/Client/bin/Debug/3ixKB9tR.doc b/Client/bin/Debug/3ixKB9tR.doc new file mode 100644 index 00000000..11a9c196 Binary files /dev/null and b/Client/bin/Debug/3ixKB9tR.doc differ diff --git a/Client/bin/Debug/6Keyzcoe.xlsx b/Client/bin/Debug/6Keyzcoe.xlsx new file mode 100644 index 00000000..2942f9b0 Binary files /dev/null and b/Client/bin/Debug/6Keyzcoe.xlsx differ diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index a1601ba0..6aa52502 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 8310f8ef..b9e716cf 100644 Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ diff --git a/Client/bin/Debug/F3gVoghy.xltm b/Client/bin/Debug/F3gVoghy.xltm new file mode 100644 index 00000000..445de227 Binary files /dev/null and b/Client/bin/Debug/F3gVoghy.xltm differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index f0fb3eaf..ed14277d 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 56450924..79b6bcc2 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 4806eaa1..f7bf7698 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 64ddb38b..d3d90f53 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 bdc13a34..057660e0 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 028ed8d3..62fc5dd9 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 b576f268..7928a933 100644 Binary files a/Client/bin/Debug/Versandstrasse.pdb and b/Client/bin/Debug/Versandstrasse.pdb differ diff --git a/Client/bin/Debug/ZMYDzeBP.doc b/Client/bin/Debug/ZMYDzeBP.doc new file mode 100644 index 00000000..11a9c196 Binary files /dev/null and b/Client/bin/Debug/ZMYDzeBP.doc differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index bddc284e..3d72a336 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/bin/Debug/nhQsZ8iN.xltm b/Client/bin/Debug/nhQsZ8iN.xltm new file mode 100644 index 00000000..445de227 Binary files /dev/null and b/Client/bin/Debug/nhQsZ8iN.xltm differ diff --git a/Client/bin/Debug/qNOUIjbM.doc b/Client/bin/Debug/qNOUIjbM.doc new file mode 100644 index 00000000..ea9541e1 Binary files /dev/null and b/Client/bin/Debug/qNOUIjbM.doc differ diff --git a/Client/bin/Debug/rhGBmrxQ.doc b/Client/bin/Debug/rhGBmrxQ.doc new file mode 100644 index 00000000..0139bbc3 Binary files /dev/null and b/Client/bin/Debug/rhGBmrxQ.doc differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index 2ff5dce6..cafa417d 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.CoreCompileInputs.cache b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache index 4dcadfe6..a8c142fd 100644 --- a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache +++ b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -301ab83201bdba95627643324c3e29d7d312adb7e52556b616a0a0d0c1dfff41 +65ae806e012952db5e8ce8c767250f579a0fda646b606deb2730010e6e5ecdd5 diff --git a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt index c3e0fb22..f4753406 100644 --- a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt +++ b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt @@ -377,3 +377,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\de-DE\OnDoc.resources.dll E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.Up2Date 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 diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index deeef61f..728d53c8 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 bd7ee22f..3d5715a1 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.DocMgmt.Dokumentpaket.resources b/Client/obj/Debug/OnDoc.DocMgmt.Dokumentpaket.resources index b2fbaa2e..bc9d051b 100644 Binary files a/Client/obj/Debug/OnDoc.DocMgmt.Dokumentpaket.resources and b/Client/obj/Debug/OnDoc.DocMgmt.Dokumentpaket.resources differ diff --git a/Client/obj/Debug/OnDoc.DocMgmt.FrmDokumentwerte.resources b/Client/obj/Debug/OnDoc.DocMgmt.FrmDokumentwerte.resources new file mode 100644 index 00000000..6c05a977 Binary files /dev/null and b/Client/obj/Debug/OnDoc.DocMgmt.FrmDokumentwerte.resources differ diff --git a/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources index 59b33b14..d162d856 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 f0fb3eaf..ed14277d 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 56450924..79b6bcc2 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 bddc284e..3d72a336 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/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index a1601ba0..6aa52502 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 8310f8ef..b9e716cf 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/bin/Debug/OnDocOffice.dll b/DOCGEN/bin/Debug/OnDocOffice.dll index 64ddb38b..d3d90f53 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 bdc13a34..057660e0 100644 Binary files a/DOCGEN/bin/Debug/OnDocOffice.pdb and b/DOCGEN/bin/Debug/OnDocOffice.pdb differ diff --git a/DOCGEN/clsDocGet.cs b/DOCGEN/clsDocGet.cs index 3af16403..7cbf886f 100644 --- a/DOCGEN/clsDocGet.cs +++ b/DOCGEN/clsDocGet.cs @@ -222,6 +222,7 @@ namespace DOCGEN return ReturnValue; } + public string docfiletype { get; set; } = ""; private bool Is_WordDocument(MemoryStream stream) { Syncfusion.DocIO.DLS.WordDocument WordDocument = new Syncfusion.DocIO.DLS.WordDocument(); @@ -230,6 +231,7 @@ namespace DOCGEN WordDocument.Open(stream, FormatType.Automatic); string type = ""; type = WordDocument.ActualFormatType.ToString(); + docfiletype = type; return true; } catch @@ -243,6 +245,24 @@ namespace DOCGEN } } + public string check_office_application(string source) + { + MemoryStream ms = new MemoryStream(Convert.FromBase64String(source)); + if (Is_WordDocument(ms)) + { + ms.Close(); + ms = null; + return "Word"; + } + if (Is_ExcelDocument(ms)) + { + ms.Close(); + ms = null; + return "Excel"; + } + return ""; + } + private bool Is_ExcelDocument(MemoryStream stream) { ExcelEngine excelEngine = new ExcelEngine(); @@ -254,7 +274,7 @@ namespace DOCGEN string type = ""; workbook = application.Workbooks.Open(stream); type = workbook.Version.ToString(); - + docfiletype = type; return true; } catch diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index a1601ba0..6aa52502 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 8310f8ef..b9e716cf 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 4cda7375..fb1406ef 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.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 1b84f3d5..c1cf6d84 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 fff2397e..e428193d 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/Images/VS/2.png b/Images/VS/2.png new file mode 100644 index 00000000..746727ba Binary files /dev/null and b/Images/VS/2.png differ diff --git a/Images/VS/APost.png b/Images/VS/APost.png new file mode 100644 index 00000000..88587448 Binary files /dev/null and b/Images/VS/APost.png differ diff --git a/Images/VS/B1.png b/Images/VS/B1.png new file mode 100644 index 00000000..3041777e Binary files /dev/null and b/Images/VS/B1.png differ diff --git a/Images/VS/B2.png b/Images/VS/B2.png new file mode 100644 index 00000000..6ac9446a Binary files /dev/null and b/Images/VS/B2.png differ diff --git a/Images/VS/TCS-Sommerreifentest-SR25-225-40-R18-92Y-W-DE.pdf b/Images/VS/TCS-Sommerreifentest-SR25-225-40-R18-92Y-W-DE.pdf new file mode 100644 index 00000000..84dd11a4 Binary files /dev/null and b/Images/VS/TCS-Sommerreifentest-SR25-225-40-R18-92Y-W-DE.pdf differ diff --git a/Images/VS/box_9538998.png b/Images/VS/box_9538998.png new file mode 100644 index 00000000..abb09105 Binary files /dev/null and b/Images/VS/box_9538998.png differ diff --git a/Images/VS/check_14025690.png b/Images/VS/check_14025690.png new file mode 100644 index 00000000..733eac84 Binary files /dev/null and b/Images/VS/check_14025690.png differ diff --git a/Images/VS/close_13984246.png b/Images/VS/close_13984246.png new file mode 100644 index 00000000..92c45b9d Binary files /dev/null and b/Images/VS/close_13984246.png differ diff --git a/Images/VS/computer_13699718.png b/Images/VS/computer_13699718.png new file mode 100644 index 00000000..5c8413eb Binary files /dev/null and b/Images/VS/computer_13699718.png differ diff --git a/Images/VS/cross_17667774.png b/Images/VS/cross_17667774.png new file mode 100644 index 00000000..c4b9cc31 Binary files /dev/null and b/Images/VS/cross_17667774.png differ diff --git a/Images/VS/mark_15490415.png b/Images/VS/mark_15490415.png new file mode 100644 index 00000000..d80630f6 Binary files /dev/null and b/Images/VS/mark_15490415.png differ diff --git a/Images/VS/number-1_16609498.png b/Images/VS/number-1_16609498.png new file mode 100644 index 00000000..64d145cc Binary files /dev/null and b/Images/VS/number-1_16609498.png differ diff --git a/Images/VS/one.png b/Images/VS/one.png new file mode 100644 index 00000000..6778b021 Binary files /dev/null and b/Images/VS/one.png differ diff --git a/Images/VS/one_8017246.png b/Images/VS/one_8017246.png new file mode 100644 index 00000000..b23701a3 Binary files /dev/null and b/Images/VS/one_8017246.png differ diff --git a/Images/VS/one_red.png b/Images/VS/one_red.png new file mode 100644 index 00000000..268f291d Binary files /dev/null and b/Images/VS/one_red.png differ diff --git a/Images/VS/road_15891610.png b/Images/VS/road_15891610.png new file mode 100644 index 00000000..9228e23c Binary files /dev/null and b/Images/VS/road_15891610.png differ diff --git a/Images/VS/stop_2402598.png b/Images/VS/stop_2402598.png new file mode 100644 index 00000000..3246413c Binary files /dev/null and b/Images/VS/stop_2402598.png differ diff --git a/Images/VS/stop_5181602.png b/Images/VS/stop_5181602.png new file mode 100644 index 00000000..423ba8ad Binary files /dev/null and b/Images/VS/stop_5181602.png differ diff --git a/Images/VS/two_17136505 - Kopie.png b/Images/VS/two_17136505 - Kopie.png new file mode 100644 index 00000000..d73c372b Binary files /dev/null and b/Images/VS/two_17136505 - Kopie.png differ diff --git a/Images/VS/two_17136505.png b/Images/VS/two_17136505.png new file mode 100644 index 00000000..69e5dd38 Binary files /dev/null and b/Images/VS/two_17136505.png differ diff --git a/Images/VS/two_red.png b/Images/VS/two_red.png new file mode 100644 index 00000000..88700810 Binary files /dev/null and b/Images/VS/two_red.png differ diff --git a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache index 620cf0d7..fe557394 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 a1601ba0..6aa52502 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 8310f8ef..b9e716cf 100644 Binary files a/OnDocOffice/bin/Debug/DOCGEN.pdb and b/OnDocOffice/bin/Debug/DOCGEN.pdb differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.dll b/OnDocOffice/bin/Debug/OnDocOffice.dll index 64ddb38b..d3d90f53 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 bdc13a34..057660e0 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 ba2b10ad..910bd40d 100644 --- a/OnDocOffice/clsoffice.cs +++ b/OnDocOffice/clsoffice.cs @@ -612,6 +612,7 @@ namespace OnDocOffice switch (ext) { case ".DOCX": + word.ActiveDocument.SaveAs2(filename, CompatibilityMode: 14, FileFormat: Microsoft.Office.Interop.Word.WdSaveFormat.wdFormatXMLDocument); break; case ".DOCM": @@ -1991,6 +1992,8 @@ namespace OnDocOffice 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); diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index 0d02f04b..dcd67b88 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 64ddb38b..d3d90f53 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 bdc13a34..057660e0 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.pdb and b/OnDocOffice/obj/Debug/OnDocOffice.pdb differ diff --git a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache index eb315754..545cefd4 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 f15f063a..1ce81ad9 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 ab28dfec..569b3817 100644 Binary files a/VBOffice/bin/Debug/Database.pdb and b/VBOffice/bin/Debug/Database.pdb differ diff --git a/VBOffice/bin/Debug/Model.dll b/VBOffice/bin/Debug/Model.dll index 8c8d952b..3a9c2e9b 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 a196c3f2..518b4770 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 b20c1358..4a829975 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 be74c228..f65e4d3c 100644 --- a/Versandstrasse/Class1.cs +++ b/Versandstrasse/Class1.cs @@ -24,6 +24,21 @@ namespace Versandstrasse { public class clsVersandstrasse { + + public bool SaveBase64ToFile(string Base64String, string filename) + { + try + { + System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(Base64String)); + return true; + } + catch + { + return false; + } + + } + private List loadedDocuments = new List(); public void Lic() { @@ -94,6 +109,15 @@ namespace Versandstrasse { vscript = (versandscript)(serializer.Deserialize(reader)); } + foreach (vsdokument vsd in vscript.dokuments) + { + + } + if (vscript.Split_Doc !="") + { + split_doc(ref vscript,dok.dokument); + } + if (vscript.PartCopies != "") { create_copies(ref vscript, dok.dokument); @@ -108,7 +132,7 @@ namespace Versandstrasse d.LogoWidth = width; d.LogoColor = color; d.Logo = logo; - d.LogoOnPages = "1"; + d.LogoOnPages = pages; d.sourcedokument = dok.dokument; vscript.dokuments.Add(d); } @@ -128,9 +152,10 @@ namespace Versandstrasse { if (tr.TextToReplace.Trim() != "") { - Replace_Text(ref loadedDocument, tr.TextToReplace, tr.NewText); + Replace_Text(ref loadedDocument, tr.TextToReplace, tr.NewText, tr.Fontname, tr.Fontsize); } } + //loadedDocument.Save(@"x:\r1.pdf"); } if (loadedDocument.Pages.Count % 2 == 0) { } else { Add_EmptyPage(ref loadedDocument); } MemoryStream outputStream = new MemoryStream(); @@ -171,20 +196,64 @@ namespace Versandstrasse } + return vscript.FinalDoc; + } + private void split_doc(ref versandscript vscript, string document) + { + SaveBase64ToFile(document, @"x:\f0.pdf"); + vscript.dokuments[0].sourcedokument = document; + vsdokument vsd = vscript.dokuments[0]; + var stream = new MemoryStream(Convert.FromBase64String(vscript.dokuments[0].sourcedokument)); + PdfLoadedDocument loadedDocument = new PdfLoadedDocument(stream); + TextSearchOptions to = new TextSearchOptions(); + Dictionary> matchedTextbounds = new Dictionary>(); + loadedDocument.FindText(vscript.Split_Doc, out matchedTextbounds); + PdfDocument newdoc = new PdfDocument(); + PdfDocument newdoc2 = new PdfDocument(); + foreach (int index in matchedTextbounds.Keys) + { + if (matchedTextbounds[index].Count > 0) + { + newdoc.ImportPage(loadedDocument, index); + newdoc2.ImportPageRange(loadedDocument, index + 1, loadedDocument.Pages.Count - (index+1)); + } + } - return vscript.FinalDoc; - } + //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; + //SaveBase64ToFile(vscript.dokuments[0].sourcedokument, @"x:\f1.pdf"); + //SaveBase64ToFile(vscript.dokuments[1].sourcedokument, @"x:\f2.pdf"); + + } private void create_copies(ref versandscript vscript, string dokument) { - vsdokument vsd = vscript.dokuments[0]; - if (vsd.LogoTop == 0) { vsd.LogoTop = top; } - if (vsd.LogoLeft == 0) { vsd.LogoLeft = left; } - if (vsd.LogoHeigth == 0) { vsd.LogoHeigth = height; } - if (vsd.LogoWidth == 0) { vsd.LogoWidth = width; } - vsd.sourcedokument = dokument; + //vsdokument vsd = vscript.dokuments[0]; + //if (vsd.LogoTop == 0) { vsd.LogoTop = top; } + //if (vsd.LogoLeft == 0) { vsd.LogoLeft = left; } + //if (vsd.LogoHeigth == 0) { vsd.LogoHeigth = height; } + //if (vsd.LogoWidth == 0) { vsd.LogoWidth = width; } + //vsd.sourcedokument = dokument; int i = 1; List copyparts = vscript.PartCopies.Split(';').ToList(); @@ -193,28 +262,39 @@ namespace Versandstrasse string[] part = cp.Split(':'); int part1 = Convert.ToInt32(part[0]); int part2 = Convert.ToInt32(part[1]); - - vsdokument source = vscript.dokuments[part1 - 1]; - if (vscript.dokuments.Count >= part2) { vscript.dokuments[i] = source; } else { vscript.dokuments.Add(source); } + 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) + private void Replace_Text(ref PdfLoadedDocument document, string texttoreplace, string newtext, string fontname, string fontsize) { PdfLoadedPage loadedPage = document.Pages[0] as PdfLoadedPage; - PdfFont font = new PdfTrueTypeFont(new Font("Futura Book", 9)); + string fname = "Futura Book"; + string fsize = "9"; + if (fontname != "") + { + fname = fontname; + fsize = fontsize; + } + PdfFont font = new PdfTrueTypeFont(new Font(fname, Convert.ToInt32(fsize))); Dictionary> matchedTextbounds = new Dictionary>(); document.FindText(texttoreplace, out matchedTextbounds); for (int i = 0; i < matchedTextbounds.Count; i++) { - loadedPage = (PdfLoadedPage)document.Pages[0]; - foreach (RectangleF rectangle in matchedTextbounds[i]) + for (int i1 = 0; i1 < document.Pages.Count; i1++) { - loadedPage.Graphics.DrawRectangle(PdfBrushes.White, rectangle); - loadedPage.Graphics.DrawString(newtext, font, PdfBrushes.Black, rectangle.X - 2, rectangle.Y - 2); + loadedPage = (PdfLoadedPage)document.Pages[i1]; + foreach (RectangleF rectangle in matchedTextbounds[i]) + { + loadedPage.Graphics.DrawRectangle(PdfBrushes.White, rectangle); + loadedPage.Graphics.DrawString(newtext, font, PdfBrushes.Black, rectangle.X - 2, rectangle.Y - 2); + } } + } } @@ -337,5 +417,8 @@ namespace Versandstrasse { public string TextToReplace { get; set; } = ""; public string NewText { get; set; } = ""; + + public string Fontname { get; set; } = ""; + public string Fontsize { get; set; } = ""; } } diff --git a/Versandstrasse/bin/Debug/DOCGEN.dll b/Versandstrasse/bin/Debug/DOCGEN.dll index a1601ba0..6aa52502 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 8310f8ef..b9e716cf 100644 Binary files a/Versandstrasse/bin/Debug/DOCGEN.pdb and b/Versandstrasse/bin/Debug/DOCGEN.pdb differ diff --git a/Versandstrasse/bin/Debug/Versandstrasse.dll b/Versandstrasse/bin/Debug/Versandstrasse.dll index 028ed8d3..62fc5dd9 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 b576f268..7928a933 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 18589fbb..a99509df 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 028ed8d3..62fc5dd9 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 b576f268..7928a933 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 b682f745..ac7d4ffa 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/Form1.cs b/ZZPDFTest/Form1.cs index 566198f3..7c1acc38 100644 --- a/ZZPDFTest/Form1.cs +++ b/ZZPDFTest/Form1.cs @@ -180,12 +180,14 @@ namespace ZZPDFTest } + private void button4_Click(object sender, EventArgs e) { + Model.serienbrief sb; clsVersandstrasse vs = new clsVersandstrasse(); string tempdir = @"h:\tssettings\edoka"; string connectionstring = "data source=shu01\\shu00;initial catalog=edoka_dms;packet size=4096;user id=sa;password=*shu29"; - string pdfdokument = vs.Prepare_PDF("OFFEDK0082025002491692",tempdir,connectionstring); + string pdfdokument = vs.Prepare_PDF("OFFEDK0082025002493849", @"h:\tssettings\edoka\", connectionstring, "", "", Application.StartupPath); var stream = new MemoryStream(Convert.FromBase64String(pdfdokument)); pdfViewerControl1.Load(stream); } diff --git a/ZZPDFTest/ZZPDFTest.csproj b/ZZPDFTest/ZZPDFTest.csproj index e1eedbe2..62970371 100644 --- a/ZZPDFTest/ZZPDFTest.csproj +++ b/ZZPDFTest/ZZPDFTest.csproj @@ -33,6 +33,10 @@ 4 + + False + ..\Model\bin\Debug\Model.dll + ..\packages\Syncfusion.Compression.Base.28.2.11\lib\net462\Syncfusion.Compression.Base.dll diff --git a/ZZPDFTest/bin/Debug/DOCGEN.dll b/ZZPDFTest/bin/Debug/DOCGEN.dll index 34a325a0..a1601ba0 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 cb1c7d7c..8310f8ef 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 f15f063a..1ce81ad9 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 ab28dfec..569b3817 100644 Binary files a/ZZPDFTest/bin/Debug/Database.pdb and b/ZZPDFTest/bin/Debug/Database.pdb differ diff --git a/ZZPDFTest/bin/Debug/Images/Images.zip b/ZZPDFTest/bin/Debug/Images/Images.zip new file mode 100644 index 00000000..6f562076 Binary files /dev/null and b/ZZPDFTest/bin/Debug/Images/Images.zip differ diff --git a/ZZPDFTest/bin/Debug/Images/PP_A_Post_Fenster.png b/ZZPDFTest/bin/Debug/Images/PP_A_Post_Fenster.png new file mode 100644 index 00000000..62233535 Binary files /dev/null and b/ZZPDFTest/bin/Debug/Images/PP_A_Post_Fenster.png differ diff --git a/ZZPDFTest/bin/Debug/Images/PP_B_Post_Fenster.png b/ZZPDFTest/bin/Debug/Images/PP_B_Post_Fenster.png new file mode 100644 index 00000000..607390d5 Binary files /dev/null and b/ZZPDFTest/bin/Debug/Images/PP_B_Post_Fenster.png differ diff --git a/ZZPDFTest/bin/Debug/Images/imageids.xml b/ZZPDFTest/bin/Debug/Images/imageids.xml new file mode 100644 index 00000000..80439886 --- /dev/null +++ b/ZZPDFTest/bin/Debug/Images/imageids.xml @@ -0,0 +1,34 @@ + + + + 1 + PP_A_Post_Fenster.png + 120 + 50 + + + 2 + PP_B_Post_Fenster.png + 120 + 50 + + + 3 + tkb_logo_4c_u.jpg + 120 + 50 + + + 4 + tkb_logo_ohne_claim_4c_c.jpg + 120 + 50 + + + 5 + tkb_logo_ohne_claim_sw.jpg + 120 + 50 + + + diff --git a/ZZPDFTest/bin/Debug/Images/tkb_logo_4c_u.jpg b/ZZPDFTest/bin/Debug/Images/tkb_logo_4c_u.jpg new file mode 100644 index 00000000..d8901225 Binary files /dev/null and b/ZZPDFTest/bin/Debug/Images/tkb_logo_4c_u.jpg differ diff --git a/ZZPDFTest/bin/Debug/Images/tkb_logo_ohne_claim_4c_c.jpg b/ZZPDFTest/bin/Debug/Images/tkb_logo_ohne_claim_4c_c.jpg new file mode 100644 index 00000000..ea92c401 Binary files /dev/null and b/ZZPDFTest/bin/Debug/Images/tkb_logo_ohne_claim_4c_c.jpg differ diff --git a/ZZPDFTest/bin/Debug/Images/tkb_logo_ohne_claim_sw.jpg b/ZZPDFTest/bin/Debug/Images/tkb_logo_ohne_claim_sw.jpg new file mode 100644 index 00000000..12fc0686 Binary files /dev/null and b/ZZPDFTest/bin/Debug/Images/tkb_logo_ohne_claim_sw.jpg differ diff --git a/ZZPDFTest/bin/Debug/Model.dll b/ZZPDFTest/bin/Debug/Model.dll index e9b2b2dd..3a9c2e9b 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 db579073..518b4770 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 abcd83d3..29d32119 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 5316d775..f277e769 100644 Binary files a/ZZPDFTest/bin/Debug/Versandstrasse.pdb and b/ZZPDFTest/bin/Debug/Versandstrasse.pdb differ diff --git a/ZZPDFTest/bin/Debug/ZZPDFTest.exe b/ZZPDFTest/bin/Debug/ZZPDFTest.exe index 8a6835c5..bf980a65 100644 Binary files a/ZZPDFTest/bin/Debug/ZZPDFTest.exe and b/ZZPDFTest/bin/Debug/ZZPDFTest.exe differ diff --git a/ZZPDFTest/bin/Debug/ZZPDFTest.pdb b/ZZPDFTest/bin/Debug/ZZPDFTest.pdb index 86dc87e3..e28f7d29 100644 Binary files a/ZZPDFTest/bin/Debug/ZZPDFTest.pdb and b/ZZPDFTest/bin/Debug/ZZPDFTest.pdb differ diff --git a/ZZPDFTest/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/ZZPDFTest/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 29ecde36..ea04bd86 100644 Binary files a/ZZPDFTest/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/ZZPDFTest/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/ZZPDFTest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ZZPDFTest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7fa7450d..2b4779bc 100644 Binary files a/ZZPDFTest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/ZZPDFTest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache b/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache index 7f09c874..a68b3b75 100644 Binary files a/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache and b/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache differ diff --git a/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.CoreCompileInputs.cache b/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.CoreCompileInputs.cache index b3f1a41b..0c33eaf0 100644 --- a/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.CoreCompileInputs.cache +++ b/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -4c9b590c745079594eaadac96de4579c6bc6144fb8a84b3b65a3ff05a197aecf +658a60c61ce73e081cd590f0c1ea1391c53e1a05d06021b2c2b73f1c63226c4a diff --git a/ZZPDFTest/obj/Debug/ZZPDFTest.exe b/ZZPDFTest/obj/Debug/ZZPDFTest.exe index 8a6835c5..bf980a65 100644 Binary files a/ZZPDFTest/obj/Debug/ZZPDFTest.exe and b/ZZPDFTest/obj/Debug/ZZPDFTest.exe differ diff --git a/ZZPDFTest/obj/Debug/ZZPDFTest.pdb b/ZZPDFTest/obj/Debug/ZZPDFTest.pdb index 86dc87e3..e28f7d29 100644 Binary files a/ZZPDFTest/obj/Debug/ZZPDFTest.pdb and b/ZZPDFTest/obj/Debug/ZZPDFTest.pdb differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Database.dll b/ZZ_BarcpdeFromFont/bin/Debug/Database.dll index f15f063a..1ce81ad9 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 ab28dfec..569b3817 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/Model.dll b/ZZ_BarcpdeFromFont/bin/Debug/Model.dll index e9b2b2dd..3a9c2e9b 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 db579073..518b4770 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 958b3ecf..ed80b9de 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 34a325a0..a1601ba0 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 cb1c7d7c..8310f8ef 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 f15f063a..1ce81ad9 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 ab28dfec..569b3817 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/Model.dll b/ZZ_Signature_C/bin/Debug/Model.dll index 8c8d952b..3a9c2e9b 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 a196c3f2..518b4770 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 fa28bc46..752735bd 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 849c20bf..a3a6daf5 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,3 +76,4 @@ 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 f15f063a..1ce81ad9 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 ab28dfec..569b3817 100644 Binary files a/vbBarcodes/bin/Debug/Database.pdb and b/vbBarcodes/bin/Debug/Database.pdb differ diff --git a/vbBarcodes/bin/Debug/Model.dll b/vbBarcodes/bin/Debug/Model.dll index 8c8d952b..3a9c2e9b 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 a196c3f2..518b4770 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 2c25b75b..faf21136 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache and b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache differ