diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index ca4ebeb9..3943ba13 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 064ff704..48f60658 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/Model.dll b/API_NetFramework/bin/Model.dll index bf71e439..d4229ed7 100644 Binary files a/API_NetFramework/bin/Model.dll and b/API_NetFramework/bin/Model.dll differ diff --git a/API_NetFramework/bin/Model.pdb b/API_NetFramework/bin/Model.pdb index 3536bbbd..01a822a2 100644 Binary files a/API_NetFramework/bin/Model.pdb and b/API_NetFramework/bin/Model.pdb differ diff --git a/API_NetFramework/bin/OnDocOffice.dll b/API_NetFramework/bin/OnDocOffice.dll index ef0a1ba2..6ff0a895 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 dff5e542..363d483d 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 b23ac48b..172ea0db 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 f8266446..215c783c 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index 18b79388..57e3f7d5 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -13176,3 +13176,58 @@ done 2025-06-27 09:03:35.4546|DEBUG|OnDoc| 2025-06-27 09:03:35.4802|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 2025-06-27 09:03:35.4837|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-07-10 15:07:02.9055|DEBUG|OnDoc|Mailversand: 2 +2025-07-10 15:07:02.9632|DEBUG|OnDoc| +2025-07-10 15:07:02.9632|DEBUG|OnDoc| +2025-07-10 15:07:02.9903|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-07-10 15:07:12.0450|DEBUG|OnDoc|Mailversand: 1 +2025-07-10 15:07:12.0703|DEBUG|OnDoc| +2025-07-10 15:07:12.0703|DEBUG|OnDoc| +2025-07-10 15:07:12.0883|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-07-10 15:07:14.5000|DEBUG|OnDoc| +2025-07-10 15:07:14.5102|DEBUG|OnDoc| +2025-07-10 15:07:14.5348|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-07-10 15:07:14.5381|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-07-10 15:07:14.5956|DEBUG|OnDoc| +2025-07-10 15:07:14.5956|DEBUG|OnDoc| +2025-07-10 15:07:14.6228|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-07-10 15:07:14.6228|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-07-10 15:07:52.6926|DEBUG|OnDoc| +2025-07-10 15:07:52.6926|DEBUG|OnDoc| +2025-07-10 15:07:52.7282|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-07-10 15:07:52.7282|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-07-10 15:07:52.7762|DEBUG|OnDoc| +2025-07-10 15:07:52.7762|DEBUG|OnDoc| +2025-07-10 15:07:52.8047|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-07-10 15:07:52.8047|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-07-10 15:09:34.1382|DEBUG|OnDoc|Mailversand: 1 +2025-07-10 15:09:34.1751|DEBUG|OnDoc| +2025-07-10 15:09:34.1771|DEBUG|OnDoc| +2025-07-10 15:09:34.1936|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-07-10 15:09:36.5788|DEBUG|OnDoc| +2025-07-10 15:09:36.5892|DEBUG|OnDoc| +2025-07-10 15:09:36.6164|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-07-10 15:09:36.6164|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-07-10 15:09:36.6635|DEBUG|OnDoc| +2025-07-10 15:09:36.6635|DEBUG|OnDoc| +2025-07-10 15:09:36.6891|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-07-10 15:09:36.6891|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-07-10 15:10:19.0502|DEBUG|OnDoc|Mailversand: 1 +2025-07-10 15:10:19.0808|DEBUG|OnDoc| +2025-07-10 15:10:19.0838|DEBUG|OnDoc| +2025-07-10 15:10:19.0998|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-07-10 15:10:21.3031|DEBUG|OnDoc| +2025-07-10 15:10:21.3031|DEBUG|OnDoc| +2025-07-10 15:10:21.3362|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-07-10 15:10:21.3362|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-07-10 15:10:21.3786|DEBUG|OnDoc| +2025-07-10 15:10:21.3806|DEBUG|OnDoc| +2025-07-10 15:10:21.4049|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-07-10 15:10:21.4049|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-07-11 13:50:49.3410|DEBUG|OnDoc| +2025-07-11 13:50:49.3799|DEBUG|OnDoc| +2025-07-11 13:50:49.4046|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-07-11 13:50:49.4046|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-07-11 13:50:49.4630|DEBUG|OnDoc| +2025-07-11 13:50:49.4630|DEBUG|OnDoc| +2025-07-11 13:50:49.4815|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 5a2cc704..ba2f6795 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/DesignTimeResolveAssemblyReferencesInput.cache b/API_NetFramework/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 04f84906..d3051ed9 100644 Binary files a/API_NetFramework/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/API_NetFramework/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll index b23ac48b..172ea0db 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 f8266446..215c783c 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/BarcodeLib/bin/Debug/Model.dll b/BarcodeLib/bin/Debug/Model.dll index bf71e439..d4229ed7 100644 Binary files a/BarcodeLib/bin/Debug/Model.dll and b/BarcodeLib/bin/Debug/Model.dll differ diff --git a/BarcodeLib/bin/Debug/Model.pdb b/BarcodeLib/bin/Debug/Model.pdb index 3536bbbd..01a822a2 100644 Binary files a/BarcodeLib/bin/Debug/Model.pdb and b/BarcodeLib/bin/Debug/Model.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index de52d7e6..094efa49 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index 0d2c55f9..22a8c756 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(150, 330); + this.label2.Location = new System.Drawing.Point(156, 330); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(142, 26); + this.label2.Size = new System.Drawing.Size(135, 26); this.label2.TabIndex = 2; - this.label2.Text = "26. Juni 2025"; + this.label2.Text = "11. Juli 2025"; this.label2.Click += new System.EventHandler(this.label2_Click); // // SplashScreen diff --git a/Client/DocMgmt/Dokumenterstellung.Designer.cs b/Client/DocMgmt/Dokumenterstellung.Designer.cs index c3fc3b48..2e2946ad 100644 --- a/Client/DocMgmt/Dokumenterstellung.Designer.cs +++ b/Client/DocMgmt/Dokumenterstellung.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Dokumenterstellung)); - Model.clsdocgendata clsdocgendata1 = new Model.clsdocgendata(); + Model.clsdocgendata clsdocgendata6 = new Model.clsdocgendata(); this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton(); this.btnDokumenterstellen = new Syncfusion.WinForms.Controls.SfButton(); this.PnlPreview = new System.Windows.Forms.Panel(); @@ -37,7 +37,6 @@ this.GrpFnkt = new System.Windows.Forms.GroupBox(); this.label7 = new System.Windows.Forms.Label(); this.btnOfficePrint = new System.Windows.Forms.Button(); - this.label6 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.ribbonButtonVersandstrasse = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); @@ -99,7 +98,6 @@ this.GrpFnkt.BackColor = System.Drawing.Color.SeaShell; this.GrpFnkt.Controls.Add(this.label7); this.GrpFnkt.Controls.Add(this.btnOfficePrint); - this.GrpFnkt.Controls.Add(this.label6); this.GrpFnkt.Controls.Add(this.label5); this.GrpFnkt.Controls.Add(this.ribbonButtonVersandstrasse); this.GrpFnkt.Controls.Add(this.label4); @@ -140,30 +138,20 @@ this.btnOfficePrint.UseVisualStyleBackColor = true; this.btnOfficePrint.Click += new System.EventHandler(this.btnOfficePrint_Click); // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(515, 106); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(79, 13); - this.label6.TabIndex = 11; - this.label6.Text = "Versandstrasse"; - this.label6.Visible = false; - // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(525, 94); + this.label5.Location = new System.Drawing.Point(450, 94); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(60, 13); + this.label5.Size = new System.Drawing.Size(79, 13); this.label5.TabIndex = 10; - this.label5.Text = "Archivieren"; + this.label5.Text = "Versandstrasse"; this.label5.Visible = false; // // ribbonButtonVersandstrasse // - this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Versandstrasse_48x48_32; - this.ribbonButtonVersandstrasse.Location = new System.Drawing.Point(519, 14); + this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Envelope_48x48_32; + this.ribbonButtonVersandstrasse.Location = new System.Drawing.Point(452, 14); this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse"; this.ribbonButtonVersandstrasse.Size = new System.Drawing.Size(75, 79); this.ribbonButtonVersandstrasse.TabIndex = 9; @@ -270,30 +258,30 @@ this.ucAllgemeineDokumentParam1.bpperson_error_type = 0; this.ucAllgemeineDokumentParam1.check_error = ""; this.ucAllgemeineDokumentParam1.checkpartner = true; - clsdocgendata1.anrede = null; - clsdocgendata1.bezeichnung = null; - clsdocgendata1.digitaleunterschrift = false; - clsdocgendata1.dokumentdatum = null; - clsdocgendata1.dokumenttypnr = null; - clsdocgendata1.dokumentwerte = null; - clsdocgendata1.ersteller = null; - clsdocgendata1.erstelling_in_office = false; - clsdocgendata1.erstellungsart = Model.Erstellungsart.DokumentBearbeiten; - clsdocgendata1.frormularOhneUnterschrift = false; - clsdocgendata1.inhaberadresse = null; - clsdocgendata1.logo = ""; - clsdocgendata1.partnernr = null; - clsdocgendata1.postzustellung = null; - clsdocgendata1.status = null; - clsdocgendata1.team = null; - clsdocgendata1.unterschriftLinks = null; - clsdocgendata1.unterschriftRehts = null; - clsdocgendata1.verantwortlich = null; - clsdocgendata1.versandstrasse_moeglich = false; - clsdocgendata1.zustaendigkube = null; - clsdocgendata1.zustaendigmitarbeiter = null; - clsdocgendata1.zustelladresse = null; - this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata1; + clsdocgendata6.anrede = null; + clsdocgendata6.bezeichnung = null; + clsdocgendata6.digitaleunterschrift = false; + clsdocgendata6.dokumentdatum = null; + clsdocgendata6.dokumenttypnr = null; + clsdocgendata6.dokumentwerte = null; + clsdocgendata6.ersteller = null; + clsdocgendata6.erstelling_in_office = false; + clsdocgendata6.erstellungsart = Model.Erstellungsart.DokumentBearbeiten; + clsdocgendata6.frormularOhneUnterschrift = false; + clsdocgendata6.inhaberadresse = null; + clsdocgendata6.logo = ""; + clsdocgendata6.partnernr = null; + clsdocgendata6.postzustellung = null; + clsdocgendata6.status = null; + clsdocgendata6.team = null; + clsdocgendata6.unterschriftLinks = null; + clsdocgendata6.unterschriftRehts = null; + clsdocgendata6.verantwortlich = null; + clsdocgendata6.versandstrasse_moeglich = false; + clsdocgendata6.zustaendigkube = null; + clsdocgendata6.zustaendigmitarbeiter = null; + clsdocgendata6.zustelladresse = null; + this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata6; this.ucAllgemeineDokumentParam1.dokumentid = ""; this.ucAllgemeineDokumentParam1.dokumenttypnr = 0; this.ucAllgemeineDokumentParam1.genertated_dokumentid = null; @@ -349,7 +337,6 @@ private UIControls.DocPreview docPreview1; private System.Windows.Forms.GroupBox GrpFnkt; private System.Windows.Forms.Button button1; - private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label5; private System.Windows.Forms.Button ribbonButtonVersandstrasse; private System.Windows.Forms.Label label4; diff --git a/Client/DocMgmt/Dokumenterstellung.cs b/Client/DocMgmt/Dokumenterstellung.cs index 040abd8e..c4f7fbf3 100644 --- a/Client/DocMgmt/Dokumenterstellung.cs +++ b/Client/DocMgmt/Dokumenterstellung.cs @@ -17,6 +17,7 @@ using Database; using OnDoc.UIControls; using BroadcastListener.Classes; using BroadcastListener.Interfaces; + using static BroadcastListener.Classes.Factory; using OnDoc.Helper; using DOCGEN; @@ -111,6 +112,7 @@ namespace OnDoc.DocMgmt } private void Dokumenterstellung_Load(object sender, EventArgs e) { + this.Style.TitleBar.BackColor = Theaming.Titelbar(); this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); this.Style.ShadowOpacity = Theaming.ShadowOpacity; @@ -303,9 +305,16 @@ namespace OnDoc.DocMgmt db.Save_To_DB(dokdata.Dokumentid, filename); db = null; } + ribbonButtonVersandstrasse.Visible = false; + + label5.Visible = false; + if (ucAllgemeineDokumentParam1.docgendata.versandstrasse_moeglich == true) { ribbonButtonVersandstrasse.Enabled = true; + ribbonButtonVersandstrasse.Visible = true; + + label5.Visible = true; } else { ribbonButtonVersandstrasse.Enabled = false; } @@ -372,9 +381,57 @@ namespace OnDoc.DocMgmt this.Close(); } + private void reserve_vs_dokument(string dokumentid, int fnkt) + { + DB db = new DB(AppParams.connectionstring); + db.clear_parameter(); + db.add_parameter("@dokumentid", dokumentid); + db.add_parameter("@mitarbeiter", AppParams.CurrentMitarbeiter.ToString()); + db.add_parameter("@fnkt", fnkt.ToString()); + db.Get_Tabledata("Ondoc_Handle_Versandstrasse_Reserved_Dokcuments", true, false); + db = null; + } + + OnDoc.Versandstrasse.Versandstrasse vs; private void button5_Click(object sender, EventArgs e) { DocFunction = 5; + + + List versandpakete = new List(); + if (this.partnernr < 99999999) + { + Versandpaket vp = new Versandpaket(); + vp.Dokument = new List(); + vp.partnernr = ucAllgemeineDokumentParam1.partnernr; + vp.Versandoption = "B2_POST"; + vp.Mitteilung = ""; + vp.GAS = ""; + vp.GASAdresse = ""; + vp.PaketNr = Guid.NewGuid().ToString(); + DB db1 = new DB(AppParams.connectionstring); + db1.Dok_in_Bearbeitung(2, this.dokumentid, AppParams.CurrentMitarbeiter); + db1.Get_Tabledata("Select bezeichnung from dokumenttyp where dokumenttypnr="+this.ucAllgemeineDokumentParam1.dokumenttypnr.ToString(),false,true); + vp.Dokument.Add(new Versanddokument(this.dokumentid, db1.dsdaten.Tables[0].Rows[0][0].ToString(),vp.partnernr.ToString())); + db1 = null; + reserve_vs_dokument(this.dokumentid, 1); + versandpakete.Add(vp); + } + try + + { + vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete); + vs.ShowDialog(); + vs.BringToFront(); + AppParams.versandstrassewindows_open = false; + + + } + catch + { + + + } this.Close(); } diff --git a/Client/UIControls/DocPreview.Designer.cs b/Client/UIControls/DocPreview.Designer.cs index 36139f44..886e1a61 100644 --- a/Client/UIControls/DocPreview.Designer.cs +++ b/Client/UIControls/DocPreview.Designer.cs @@ -77,15 +77,15 @@ this.zoomIn, this.zoomOut, this.zoomComboBox, + this.toolStripButton1, this.FitPage, this.FitWidth, - this.toolStripButton1, this.tsbtnrefresh, this.tsschnellansicht}); this.Open.Location = new System.Drawing.Point(3, 0); this.Open.Name = "Open"; this.Open.Padding = new System.Windows.Forms.Padding(5); - this.Open.Size = new System.Drawing.Size(665, 41); + this.Open.Size = new System.Drawing.Size(552, 41); this.Open.TabIndex = 5; this.Open.Text = "toolStrip1"; // diff --git a/Client/UIControls/DocPreview.resx b/Client/UIControls/DocPreview.resx index 3b44be35..bd1972ce 100644 --- a/Client/UIControls/DocPreview.resx +++ b/Client/UIControls/DocPreview.resx @@ -125,10 +125,10 @@ iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADRSURBVDhPY3CLL/8Pw65x5Q8YSATOsRXCrvGlGxgoMcgt - rtTRLb7sCUgvWQbZ29ezuMWXt9n7pf2F6SXZIOfECiW3+LITyPpINsgtoSzKJaL8E7ohRBvkl1TK6xpX + rtTRLb7sCUgvWQbZ29ezuMWXt9n7pv6F6SXZIOfECiW3+LITyPpINsgtoSzKJaL8E7ohRBvkl1TK6xpX vghdM0kGeSRUmLrGl99B14iO8RrkElsuh8sr6BivQSDgkVip5RZbcgldIzomaBAI2MfXc7jGl09G10yy - QTDgFlvq4xZf/hrdEJINAgGXpFIpt9jyPRQbBAL19fVMbnHl5W7xab8pMggGkJMGRQaBACyxAgDrfTPa - tvmLXAAAAABJRU5ErkJggg== + QTDgFlvq4xZf/hrdEJINAgGXpFIpt9jyPRQbBAL19fVMbnHl5W7xqb8pMggGkJMGRQaBACyxAgDj9DPX + njG3twAAAABJRU5ErkJggg== @@ -136,8 +136,8 @@ iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACtSURBVDhPY2AgAXjFl0i4xZVtRRfHCdziy4Pd4oveuMWX /0eXwwAuaeX8rnHli0CKYRhdDQpwiyt1dIwpe4SsAacm+/h6Drf4sj63+PJ/6BqwanKOLTd0jSu7iq4Q - q6bQ0FBml7jyKrf4tN/oitAxWINbTIWKa3zZMXRJXJjBNa4s3S2+/Au6BD5MniaynEd2QCADkoIcGZAc - uciApGSEDEhOsMiApKyBDGCZEACF9g6WWkMUggAAAABJRU5ErkJggg== + q6bQ0FBml7jyKrf41N/oitAxWINbTIWKa3zZMXRJXJjBNa4s3S2+/Au6BD5MniaynEd2QCADkoIcGZAc + uciApGSEDEhOsMiApKyBDGCZEACCLQ6UhY/boQAAAABJRU5ErkJggg== @@ -145,39 +145,39 @@ iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPY3CNLd3iFV8iwUAKcIsv/+8WX/7aPaEsCF0O J4BqAmPX+LKFHtH1fOhqMACyJggueugeX+6Arg4FYGoC439u8eW99vH1HOjqwQCLBjh2iS+/4hpfYoCu - B68mMPYr/+UaV1YZGhrKTLwmKHaJKz/qEVeiTJImKP7iFl+RRltNpDmP1IAgNchJjVwSkxGpCZa0rEFO - JgQA6ZMOnBDgDiMAAAAASUVORK5CYII= + B68mMPYt/+UaV1YZGhrKTLwmKHaJKz/qEVeiTJImKP7iFl+RRltNpDmP1IAgNchJjVwSkxGpCZa0rEFO + JgQA5egOmulL3r0AAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADVSURBVDhPY3CNK1/kl1TKy0AicI0rf+AWX/4fhhlAhGt8 - +R2PhApTdMX4AFaDIDjtt1tceXl9fT0TuiZsAI9BEOwaX7bbJalUCl0jOiBoEBS/dost9UHXjAyINQjq + +R2PhApTdMX4AFaDIDj1t1tceXl9fT0TuiZsAI9BEOwaX7bbJalUCl0jOiBoEBS/dost9UHXjAyINQjq uvLJ9vH1HOiGgABJBoFxbMklj8RKLcoNii//7xJR/skltlyOIoNwJQ2SDMKXWIkyCOQVt4SyKHTNyIAI - g8pOOCdWKKFrRAc4DbL3S/vrFl/eZm9fz4KuCRvAYVDZE7e4Ukd0xfgAhkGu8aUbnGMrhNEVEgLoBgEA - xIcz2dQw6AYAAAAASUVORK5CYII= + g8pOOCdWKKFrRAc4DbL3Tf3rFl/eZm9fz4KuCRvAYVDZE7e4Ukd0xfgAhkGu8aUbnGMrhNEVEgLoBgEA + vzwz1r076J0AAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADMSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf9BmEw - GyQWVxEJUoOuDwW4JZS5usaX33GLL/+PDzvHl9x2j61wQdcPBm5xZZn2fml/0TXhwmC1cWWZKIa4xpUH + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADMSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf+BmEw + GyQWVxEJUoOuDwW4JZS5usaX33GLL/+PDzvHl9x2j61wQdcPBm5xZZn2vql/0TXhwmC1cWWZKIa4xpUH oiskFoP0gg2xj88XcIoufoWugFgM0gsyg8EtvjwXXZIMnMvgEld+CIsESRhkBshF35AF3ePLHYjBaIZ9 - AxmEYjpKLOABGPrQXeQaX2JADMZwETXDiDqxRrV0BAJUSdnwWKBGXoMBquR+GCC3PAIAFcnw/PEJ/FIA + AxmEYjpKLOABGPrQXeQaX2JADMZwETXDiDqxRrV0BAJUSdnwWKBGXoMBquR+GCC3PAIA+Kbw8P6QEA4A AAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEbSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf9BmEw - GyQWVxEJUoOuDwW4x1a4uMaX33GLL/+PDzvHl9wGqUXXDwZucWWZ9n5pf9E14cJgtXFlmSiGuMaVB6Ir + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEbSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf+BmEw + GyQWVxEJUoOuDwW4x1a4uMaX33GLL/+PDzvHl9wGqUXXDwZucWWZ9r6pf9E14cJgtXFlmSiGuMaVB6Ir BCuOL/voHFdyAYRBbHR5EAbpBRtiH58v4BRd/ApdAVhRfOkGuGXxpRvQ5UEYpBdkBoNbfHkuuiQpBkFx LoNLXPkhLBIkGQQyA+Sib8iC7vHlDjDsGlOpAzcoplIHWQ7NsG8gg1BMh2kkBDD0obvINb7EAI5jihVh GkFsZDkMF1EzjKgTa1RLR2BFOFK2W3zRG7f48gMQDGZjqIGnbBigSl6DAbeEMldicj9IDc7cDwPw8ii+ - fLVbfNkTYssjAPMozQbaRklFAAAAAElFTkSuQmCC + fLVbfNkTYssjANYUzPoM0k19AAAAAElFTkSuQmCC diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index d82e21c9..92abbb0b 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -716,6 +716,14 @@ namespace OnDoc.UICintrols //db1.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbeiter); //db1 = null; clsProcessWatch.AddToList(selected_dokumentid, filename, apptype); + break; + case 4: + archivedoc(dokbearbeitung.dokumentid); + break; + case 5: + + break; + break; default: break; @@ -1960,6 +1968,7 @@ namespace OnDoc.UICintrols //dokumentAnVersandstrasseToolStripMenuItem.Visible = true; refresh_dokumente(); + } private void RibbonButtonFavoriten_Click(object sender, EventArgs e) diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index ca4ebeb9..3943ba13 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 064ff704..48f60658 100644 Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ diff --git a/Client/bin/Debug/Model.dll b/Client/bin/Debug/Model.dll index bf71e439..d4229ed7 100644 Binary files a/Client/bin/Debug/Model.dll and b/Client/bin/Debug/Model.dll differ diff --git a/Client/bin/Debug/Model.pdb b/Client/bin/Debug/Model.pdb index 3536bbbd..01a822a2 100644 Binary files a/Client/bin/Debug/Model.pdb and b/Client/bin/Debug/Model.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index f035f70b..5e55fb40 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 7e24babb..2ec8307c 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 695a9819..af7a9302 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 ef0a1ba2..6ff0a895 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 dff5e542..363d483d 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 76053275..de555f0b 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 19098d29..d1dcbcc5 100644 Binary files a/Client/bin/Debug/Versandstrasse.pdb and b/Client/bin/Debug/Versandstrasse.pdb differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index cacc5229..48165a05 100644 Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index 704d857b..9ee97180 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 11212806..a7dfa560 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.UIControls.DocPreview.resources b/Client/obj/Debug/OnDoc.UIControls.DocPreview.resources index 87cf0c82..5cf8b7a5 100644 Binary files a/Client/obj/Debug/OnDoc.UIControls.DocPreview.resources and b/Client/obj/Debug/OnDoc.UIControls.DocPreview.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index f035f70b..5e55fb40 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 7e24babb..2ec8307c 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 cacc5229..48165a05 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/Klassen/SyncFWord.cs b/DOCGEN/Klassen/SyncFWord.cs index c9c438f9..70cc22df 100644 --- a/DOCGEN/Klassen/SyncFWord.cs +++ b/DOCGEN/Klassen/SyncFWord.cs @@ -539,7 +539,7 @@ namespace DOCGEN.Klassen case "DOKUMENTSCHUETZEN": document.Protect(ProtectionType.AllowOnlyFormFields, "Australia"); break; - case "FORMULARAKTUALISIERENXY": + case "FORMULARAKTUALISIEREN": if (document.ProtectionType != ProtectionType.NoProtection) { document.Protect(ProtectionType.NoProtection, "Australia"); diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index ca4ebeb9..3943ba13 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 064ff704..48f60658 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/bin/Debug/Model.dll b/DOCGEN/bin/Debug/Model.dll index bf71e439..d4229ed7 100644 Binary files a/DOCGEN/bin/Debug/Model.dll and b/DOCGEN/bin/Debug/Model.dll differ diff --git a/DOCGEN/bin/Debug/Model.pdb b/DOCGEN/bin/Debug/Model.pdb index 3536bbbd..01a822a2 100644 Binary files a/DOCGEN/bin/Debug/Model.pdb and b/DOCGEN/bin/Debug/Model.pdb differ diff --git a/DOCGEN/bin/Debug/OnDocOffice.dll b/DOCGEN/bin/Debug/OnDocOffice.dll index ef0a1ba2..6ff0a895 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 dff5e542..363d483d 100644 Binary files a/DOCGEN/bin/Debug/OnDocOffice.pdb and b/DOCGEN/bin/Debug/OnDocOffice.pdb differ diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index ca4ebeb9..3943ba13 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 064ff704..48f60658 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 a10ee318..ce879703 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/Database/bin/Debug/Model.dll b/Database/bin/Debug/Model.dll index bf71e439..d4229ed7 100644 Binary files a/Database/bin/Debug/Model.dll and b/Database/bin/Debug/Model.dll differ diff --git a/Database/bin/Debug/Model.pdb b/Database/bin/Debug/Model.pdb index 3536bbbd..01a822a2 100644 Binary files a/Database/bin/Debug/Model.pdb and b/Database/bin/Debug/Model.pdb differ diff --git a/Database/obj/Debug/Database.csproj.AssemblyReference.cache b/Database/obj/Debug/Database.csproj.AssemblyReference.cache index fb7506ef..04b86c75 100644 Binary files a/Database/obj/Debug/Database.csproj.AssemblyReference.cache and b/Database/obj/Debug/Database.csproj.AssemblyReference.cache differ diff --git a/Model/Model.csproj b/Model/Model.csproj index d5a9303e..87be6ffd 100644 --- a/Model/Model.csproj +++ b/Model/Model.csproj @@ -49,6 +49,7 @@ + diff --git a/Model/OnDocApiDoc.cs b/Model/OnDocApiDoc.cs new file mode 100644 index 00000000..812db0db --- /dev/null +++ b/Model/OnDocApiDoc.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Permissions; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + public class OnDocAPIDocGen + { + public string Result_Versandstrasse { get; set; } + public string Result_OnDoc { get; set; } + public string Result_Sender { get; set; } + public string Result_FileType { get; set; } + + public string ConfirmationMail { get; set; } + public string ConfirmationMailAddress { get; set; } + + public string VorlagenTypID { get; set; } + public string Partnernr { get; set; } + public string TGNrErsteller { get; set; } + public string TGNrVerantwortlich { get; set; } + public string TGNrUnterschriftLinks { get; set; } + public string TGNrUnterschriftRecths { get; set; } + public string OhneUnterschrift { get; set; } + public string FaksimileUnterschrift { get; set; } + + public List attributes { get; set; } + } + + public class attribute + { + public string Tag { get; set; } + public string Value { get; set; } + } +} diff --git a/Model/bin/Debug/Model.dll b/Model/bin/Debug/Model.dll index bf71e439..d4229ed7 100644 Binary files a/Model/bin/Debug/Model.dll and b/Model/bin/Debug/Model.dll differ diff --git a/Model/bin/Debug/Model.pdb b/Model/bin/Debug/Model.pdb index 3536bbbd..01a822a2 100644 Binary files a/Model/bin/Debug/Model.pdb and b/Model/bin/Debug/Model.pdb differ diff --git a/Model/obj/Debug/Model.csproj.AssemblyReference.cache b/Model/obj/Debug/Model.csproj.AssemblyReference.cache index b7610dca..6943b8f3 100644 Binary files a/Model/obj/Debug/Model.csproj.AssemblyReference.cache and b/Model/obj/Debug/Model.csproj.AssemblyReference.cache differ diff --git a/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache b/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache index 62fd8dc4..dcbf6e85 100644 --- a/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache +++ b/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -47ab6f1fac1ae70b1bf620ed97f7c079c5b1dabf2746ac3b73a94beadc85a2e5 +98b0515d86a724113e4d6c237f417a3bd9af86b43f886091f4a718b1c4878972 diff --git a/Model/obj/Debug/Model.dll b/Model/obj/Debug/Model.dll index bf71e439..d4229ed7 100644 Binary files a/Model/obj/Debug/Model.dll and b/Model/obj/Debug/Model.dll differ diff --git a/Model/obj/Debug/Model.pdb b/Model/obj/Debug/Model.pdb index 3536bbbd..01a822a2 100644 Binary files a/Model/obj/Debug/Model.pdb and b/Model/obj/Debug/Model.pdb differ diff --git a/OnDocOffice/bin/Debug/DOCGEN.dll b/OnDocOffice/bin/Debug/DOCGEN.dll index ca4ebeb9..3943ba13 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 064ff704..48f60658 100644 Binary files a/OnDocOffice/bin/Debug/DOCGEN.pdb and b/OnDocOffice/bin/Debug/DOCGEN.pdb differ diff --git a/OnDocOffice/bin/Debug/Model.dll b/OnDocOffice/bin/Debug/Model.dll index bf71e439..d4229ed7 100644 Binary files a/OnDocOffice/bin/Debug/Model.dll and b/OnDocOffice/bin/Debug/Model.dll differ diff --git a/OnDocOffice/bin/Debug/Model.pdb b/OnDocOffice/bin/Debug/Model.pdb index 3536bbbd..01a822a2 100644 Binary files a/OnDocOffice/bin/Debug/Model.pdb and b/OnDocOffice/bin/Debug/Model.pdb differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.dll b/OnDocOffice/bin/Debug/OnDocOffice.dll index ef0a1ba2..6ff0a895 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 dff5e542..363d483d 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 96f844f0..0fbfbc63 100644 --- a/OnDocOffice/clsoffice.cs +++ b/OnDocOffice/clsoffice.cs @@ -1656,6 +1656,7 @@ namespace OnDocOffice } + public class word_signature { @@ -1672,6 +1673,9 @@ namespace OnDocOffice bool is_protected = false; Microsoft.Office.Interop.Word.Document docWord; Microsoft.Office.Interop.Word.Application word; + + + public bool sign_doc(ref Microsoft.Office.Interop.Word.Application word, string imagepath_ul, string imagepath_ur, string dokumentid, string dokumenttypnr) { Logging.Logging.Debug("Sign_Doc", "OnDoc", dokumentid); @@ -1679,10 +1683,26 @@ namespace OnDocOffice this.word = word; DB db = new DB(this.ConnectionString); + + int pages = 0; + try + { + object miss = System.Reflection.Missing.Value; + //pages = word.ActiveDocument.Words.Last.Information[WdInformation.wdActiveEndPageNumber]; + Microsoft.Office.Interop.Word.WdStatistic stat = Microsoft.Office.Interop.Word.WdStatistic.wdStatisticPages; + pages = word.ActiveDocument.ComputeStatistics(stat, ref miss); + } + catch (Exception e) + { + Logging.Logging.Debug("Sign_Doc - Pages not found "+e.Message, "OnDoc", dokumentid); + } + db.clear_parameter(); db.add_parameter("@dokumenttypnr",dokumenttypnr.ToString()); db.add_parameter("@officeversion", "2016"); db.add_parameter("@machinname", System.Environment.MachineName); + db.add_parameter("dokumentid", dokumentid); + db.add_parameter("pages",pages.ToString()); db.Get_Tabledata("sp_signatureposition", true,false); System.Data.DataTable position = db.dsdaten.Tables[0]; db = null; @@ -1693,11 +1713,13 @@ namespace OnDocOffice is_protected = true; } + int w = 0; int h = 0; int l = 0; int t = 0; int type = 1; + try { List list = new List(); diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index b82f5800..6d50dd52 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 ef0a1ba2..6ff0a895 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 dff5e542..363d483d 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.pdb and b/OnDocOffice/obj/Debug/OnDocOffice.pdb differ diff --git a/Versandstrasse/Class1.cs b/Versandstrasse/Class1.cs index 35ebe1a2..95525526 100644 --- a/Versandstrasse/Class1.cs +++ b/Versandstrasse/Class1.cs @@ -532,11 +532,11 @@ namespace Versandstrasse //Set the page Transparency$PdfSolidBrush brush = new PdfSolidBrush(Color.LightBlue); PdfSolidBrush brush = new PdfSolidBrush(Color.LightBlue); loadedPage.Graphics.Save(); - loadedPage.Graphics.SetTransparency(1, 1, PdfBlendMode.Multiply); + loadedPage.Graphics.SetTransparency(1, 1f, PdfBlendMode.Darken); //Draw the rectangle on the PDF document loadedPage.Graphics.DrawRectangle(brush, bounds); - + loadedPage.Graphics.Restore(); //PdfLoadedPage loadedPage = document.Pages[0] as PdfLoadedPage; //PdfPen pen = new PdfPen(PdfBrushes.Red, 10f); diff --git a/Versandstrasse/bin/Debug/DOCGEN.dll b/Versandstrasse/bin/Debug/DOCGEN.dll index 42ad5946..3943ba13 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 908f9825..48f60658 100644 Binary files a/Versandstrasse/bin/Debug/DOCGEN.pdb and b/Versandstrasse/bin/Debug/DOCGEN.pdb differ diff --git a/Versandstrasse/bin/Debug/Database.dll b/Versandstrasse/bin/Debug/Database.dll index 6520e565..fce1e02f 100644 Binary files a/Versandstrasse/bin/Debug/Database.dll and b/Versandstrasse/bin/Debug/Database.dll differ diff --git a/Versandstrasse/bin/Debug/Database.pdb b/Versandstrasse/bin/Debug/Database.pdb index 30570d28..531e8b2e 100644 Binary files a/Versandstrasse/bin/Debug/Database.pdb and b/Versandstrasse/bin/Debug/Database.pdb differ diff --git a/Versandstrasse/bin/Debug/Model.dll b/Versandstrasse/bin/Debug/Model.dll index bf71e439..d4229ed7 100644 Binary files a/Versandstrasse/bin/Debug/Model.dll and b/Versandstrasse/bin/Debug/Model.dll differ diff --git a/Versandstrasse/bin/Debug/Model.pdb b/Versandstrasse/bin/Debug/Model.pdb index 3536bbbd..01a822a2 100644 Binary files a/Versandstrasse/bin/Debug/Model.pdb and b/Versandstrasse/bin/Debug/Model.pdb differ diff --git a/Versandstrasse/bin/Debug/OnDocOffice.dll b/Versandstrasse/bin/Debug/OnDocOffice.dll index 66950f8a..6ff0a895 100644 Binary files a/Versandstrasse/bin/Debug/OnDocOffice.dll and b/Versandstrasse/bin/Debug/OnDocOffice.dll differ diff --git a/Versandstrasse/bin/Debug/OnDocOffice.pdb b/Versandstrasse/bin/Debug/OnDocOffice.pdb index 75fc8df4..363d483d 100644 Binary files a/Versandstrasse/bin/Debug/OnDocOffice.pdb and b/Versandstrasse/bin/Debug/OnDocOffice.pdb differ diff --git a/Versandstrasse/bin/Debug/Versandstrasse.dll b/Versandstrasse/bin/Debug/Versandstrasse.dll index 76053275..de555f0b 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 19098d29..d1dcbcc5 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 b8d808cc..b810b8c3 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 76053275..de555f0b 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 19098d29..d1dcbcc5 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.pdb and b/Versandstrasse/obj/Debug/Versandstrasse.pdb differ diff --git a/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache index ea04bd86..45bb0a2a 100644 Binary files a/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ