diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index 42ad5946..ca4ebeb9 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 908f9825..064ff704 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 66950f8a..ef0a1ba2 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 75fc8df4..dff5e542 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 49470b74..b23ac48b 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 915569fe..f8266446 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 7c0a3dab..18b79388 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -12972,3 +12972,207 @@ done 2025-06-20 10:45:02.2745|DEBUG|OnDoc|Start Update IL_Log: DokumentID:SB_182_1 2025-06-20 10:45:02.2915|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:SB_182_1 2025-06-20 10:45:02.2915|DEBUG|OnDoc|Ende ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002524992 +2025-06-25 07:33:17.6417|DEBUG|OnDoc|Mailversand: 2 +2025-06-25 07:33:17.7023|DEBUG|OnDoc| +2025-06-25 07:33:17.7023|DEBUG|OnDoc| +2025-06-25 07:33:17.7299|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:33:17.7560|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 07:33:17.7838|DEBUG|OnDoc| +2025-06-25 07:33:17.7838|DEBUG|OnDoc| +2025-06-25 07:33:17.8028|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:33:43.0135|DEBUG|OnDoc|Mailversand: 1 +2025-06-25 07:33:43.0443|DEBUG|OnDoc| +2025-06-25 07:33:43.0443|DEBUG|OnDoc| +2025-06-25 07:33:43.0662|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:34:02.4357|DEBUG|OnDoc|Mailversand: 1 +2025-06-25 07:34:02.4634|DEBUG|OnDoc| +2025-06-25 07:34:02.4664|DEBUG|OnDoc| +2025-06-25 07:34:02.4851|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:34:10.2594|DEBUG|OnDoc| +2025-06-25 07:34:10.2971|DEBUG|OnDoc| +2025-06-25 07:34:10.3270|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-06-25 07:34:10.3270|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-06-25 07:34:10.3860|DEBUG|OnDoc| +2025-06-25 07:34:10.3895|DEBUG|OnDoc| +2025-06-25 07:34:10.4152|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-06-25 07:34:10.4152|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-06-25 07:39:49.8357|DEBUG|OnDoc|Mailversand: 2 +2025-06-25 07:39:49.8663|DEBUG|OnDoc| +2025-06-25 07:39:49.8663|DEBUG|OnDoc| +2025-06-25 07:39:49.8906|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:39:49.9170|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 07:39:49.9433|DEBUG|OnDoc| +2025-06-25 07:39:49.9433|DEBUG|OnDoc| +2025-06-25 07:39:49.9629|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:40:15.4925|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 07:40:15.5270|DEBUG|OnDoc| +2025-06-25 07:40:15.5295|DEBUG|OnDoc| +2025-06-25 07:40:15.5554|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:40:42.4803|DEBUG|OnDoc|Mailversand: 1 +2025-06-25 07:40:42.5138|DEBUG|OnDoc| +2025-06-25 07:40:42.5138|DEBUG|OnDoc| +2025-06-25 07:40:42.5368|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:40:46.2637|DEBUG|OnDoc| +2025-06-25 07:40:46.2994|DEBUG|OnDoc| +2025-06-25 07:40:46.3256|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-25 07:40:46.3256|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-25 07:40:46.3779|DEBUG|OnDoc| +2025-06-25 07:40:46.3779|DEBUG|OnDoc| +2025-06-25 07:40:46.4055|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-06-25 07:40:46.4055|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-06-25 07:43:19.6532|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 07:43:19.6888|DEBUG|OnDoc| +2025-06-25 07:43:19.6888|DEBUG|OnDoc| +2025-06-25 07:43:19.7123|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:43:32.9228|DEBUG|OnDoc|Mailversand: 1 +2025-06-25 07:43:32.9486|DEBUG|OnDoc| +2025-06-25 07:43:32.9522|DEBUG|OnDoc| +2025-06-25 07:43:32.9693|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:43:37.3013|DEBUG|OnDoc| +2025-06-25 07:43:37.3361|DEBUG|OnDoc| +2025-06-25 07:43:37.3642|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-25 07:43:37.3642|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-25 07:43:37.4098|DEBUG|OnDoc| +2025-06-25 07:43:37.4098|DEBUG|OnDoc| +2025-06-25 07:43:37.4381|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-06-25 07:43:37.4381|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-06-25 07:45:16.6521|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 07:45:16.6945|DEBUG|OnDoc| +2025-06-25 07:45:16.6945|DEBUG|OnDoc| +2025-06-25 07:45:16.7223|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:45:28.8874|DEBUG|OnDoc|Mailversand: 1 +2025-06-25 07:45:28.9155|DEBUG|OnDoc| +2025-06-25 07:45:28.9155|DEBUG|OnDoc| +2025-06-25 07:45:28.9368|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:45:33.7840|DEBUG|OnDoc| +2025-06-25 07:45:33.8193|DEBUG|OnDoc| +2025-06-25 07:45:33.8467|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-25 07:45:33.8467|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-25 07:45:33.8923|DEBUG|OnDoc| +2025-06-25 07:45:33.8923|DEBUG|OnDoc| +2025-06-25 07:45:33.9205|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-06-25 07:45:33.9205|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-06-25 07:55:30.8619|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 07:55:30.8992|DEBUG|OnDoc| +2025-06-25 07:55:30.9037|DEBUG|OnDoc| +2025-06-25 07:55:30.9237|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:56:13.0218|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 07:56:13.0479|DEBUG|OnDoc| +2025-06-25 07:56:13.0479|DEBUG|OnDoc| +2025-06-25 07:56:13.0680|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:56:24.5310|DEBUG|OnDoc|Mailversand: 1 +2025-06-25 07:56:24.5572|DEBUG|OnDoc| +2025-06-25 07:56:24.5602|DEBUG|OnDoc| +2025-06-25 07:56:24.5777|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 07:56:28.1566|DEBUG|OnDoc| +2025-06-25 07:56:28.1926|DEBUG|OnDoc| +2025-06-25 07:56:28.2183|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-25 07:56:28.2183|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-25 07:56:28.2622|DEBUG|OnDoc| +2025-06-25 07:56:28.2622|DEBUG|OnDoc| +2025-06-25 07:56:28.2919|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-06-25 07:56:28.2939|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-06-25 08:00:59.6615|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 08:00:59.7102|DEBUG|OnDoc| +2025-06-25 08:00:59.7102|DEBUG|OnDoc| +2025-06-25 08:00:59.7322|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 08:01:44.2253|DEBUG|OnDoc|Mailversand: 1 +2025-06-25 08:01:44.2504|DEBUG|OnDoc| +2025-06-25 08:01:44.2504|DEBUG|OnDoc| +2025-06-25 08:01:44.2679|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 08:01:49.1131|DEBUG|OnDoc| +2025-06-25 08:01:49.1221|DEBUG|OnDoc| +2025-06-25 08:01:49.1486|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-25 08:01:49.1486|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-25 08:01:51.5332|DEBUG|OnDoc| +2025-06-25 08:01:51.5332|DEBUG|OnDoc| +2025-06-25 08:01:51.5669|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-06-25 08:01:51.5669|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-06-25 08:09:37.3983|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 08:09:37.4712|DEBUG|OnDoc| +2025-06-25 08:09:37.4712|DEBUG|OnDoc| +2025-06-25 08:09:37.4916|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 08:10:20.8364|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 08:10:20.8861|DEBUG|OnDoc| +2025-06-25 08:10:20.8892|DEBUG|OnDoc| +2025-06-25 08:10:20.9121|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 08:10:35.6940|DEBUG|OnDoc|Mailversand: 1 +2025-06-25 08:10:35.7272|DEBUG|OnDoc| +2025-06-25 08:10:35.7272|DEBUG|OnDoc| +2025-06-25 08:10:35.7463|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 08:10:38.9472|DEBUG|OnDoc| +2025-06-25 08:10:38.9568|DEBUG|OnDoc| +2025-06-25 08:10:38.9901|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-25 08:10:38.9901|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-25 08:10:39.0434|DEBUG|OnDoc| +2025-06-25 08:10:39.0469|DEBUG|OnDoc| +2025-06-25 08:10:39.0710|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-06-25 08:10:39.0710|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-06-25 08:11:43.9309|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 08:11:43.9659|DEBUG|OnDoc| +2025-06-25 08:11:43.9659|DEBUG|OnDoc| +2025-06-25 08:11:43.9877|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 08:12:11.0804|DEBUG|OnDoc|Mailversand: 134 +2025-06-25 08:12:11.1096|DEBUG|OnDoc| +2025-06-25 08:12:11.1096|DEBUG|OnDoc| +2025-06-25 08:12:11.1276|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 08:12:31.3833|DEBUG|OnDoc|Mailversand: 1 +2025-06-25 08:12:31.4075|DEBUG|OnDoc| +2025-06-25 08:12:31.4075|DEBUG|OnDoc| +2025-06-25 08:12:31.4277|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-25 08:12:34.6266|DEBUG|OnDoc| +2025-06-25 08:12:34.6266|DEBUG|OnDoc| +2025-06-25 08:12:34.6610|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-25 08:12:34.6610|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-25 08:12:34.7019|DEBUG|OnDoc| +2025-06-25 08:12:34.7019|DEBUG|OnDoc| +2025-06-25 08:12:34.7286|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-06-25 08:12:34.7286|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-06-27 08:50:57.0075|DEBUG|OnDoc|Mailversand: 134 +2025-06-27 08:50:57.0696|DEBUG|OnDoc| +2025-06-27 08:50:57.0862|DEBUG|OnDoc| +2025-06-27 08:50:57.1040|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-27 08:51:16.7036|DEBUG|OnDoc|Mailversand: 1 +2025-06-27 08:51:16.7286|DEBUG|OnDoc| +2025-06-27 08:51:16.7320|DEBUG|OnDoc| +2025-06-27 08:51:16.7473|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-27 08:51:19.0610|DEBUG|OnDoc| +2025-06-27 08:51:19.0610|DEBUG|OnDoc| +2025-06-27 08:51:19.0967|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-27 08:51:19.0967|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-27 08:51:19.1528|DEBUG|OnDoc| +2025-06-27 08:51:19.1528|DEBUG|OnDoc| +2025-06-27 08:51:19.1798|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-06-27 08:51:19.1798|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-06-27 08:53:07.3212|DEBUG|OnDoc|Mailversand: 134 +2025-06-27 08:53:07.3515|DEBUG|OnDoc| +2025-06-27 08:53:07.3515|DEBUG|OnDoc| +2025-06-27 08:53:07.3695|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-27 08:53:26.0255|DEBUG|OnDoc|Mailversand: 1 +2025-06-27 08:53:26.0592|DEBUG|OnDoc| +2025-06-27 08:53:26.0592|DEBUG|OnDoc| +2025-06-27 08:53:26.0773|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-27 08:53:28.6699|DEBUG|OnDoc| +2025-06-27 08:53:28.6699|DEBUG|OnDoc| +2025-06-27 08:53:28.7061|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-27 08:53:28.7061|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-27 08:53:28.7473|DEBUG|OnDoc| +2025-06-27 08:53:28.7473|DEBUG|OnDoc| +2025-06-27 08:53:28.7734|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-06-27 08:53:28.7734|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-06-27 09:02:10.5012|DEBUG|OnDoc|Mailversand: 134 +2025-06-27 09:02:10.5274|DEBUG|OnDoc| +2025-06-27 09:02:10.5325|DEBUG|OnDoc| +2025-06-27 09:02:10.5473|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-27 09:03:32.9037|DEBUG|OnDoc|Mailversand: 1 +2025-06-27 09:03:32.9291|DEBUG|OnDoc| +2025-06-27 09:03:32.9291|DEBUG|OnDoc| +2025-06-27 09:03:32.9491|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-27 09:03:35.3720|DEBUG|OnDoc| +2025-06-27 09:03:35.3720|DEBUG|OnDoc| +2025-06-27 09:03:35.4096|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-27 09:03:35.4096|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-27 09:03:35.4546|DEBUG|OnDoc| +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 diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 16160ced..5a2cc704 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 49470b74..b23ac48b 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 915569fe..f8266446 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/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index f45cced6..de52d7e6 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 3735d3b2..0d2c55f9 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -64,7 +64,7 @@ this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(142, 26); this.label2.TabIndex = 2; - this.label2.Text = "20. Juni 2025"; + this.label2.Text = "26. Juni 2025"; this.label2.Click += new System.EventHandler(this.label2_Click); // // SplashScreen diff --git a/Client/DocMgmt/DokTypSelect.Designer.cs b/Client/DocMgmt/DokTypSelect.Designer.cs index 3fe1c408..f2f1a92f 100644 --- a/Client/DocMgmt/DokTypSelect.Designer.cs +++ b/Client/DocMgmt/DokTypSelect.Designer.cs @@ -32,8 +32,8 @@ namespace OnDoc.DocMgmt { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DokTypSelect)); - Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = 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(); this.ribbon1 = new System.Windows.Forms.Ribbon(); this.ribbonTab1 = new System.Windows.Forms.RibbonTab(); this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); @@ -277,15 +277,15 @@ namespace OnDoc.DocMgmt // treeViewAdv1 // this.treeViewAdv1.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window); - treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.Black; + treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black; this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)}); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(494, 517); this.treeViewAdv1.ContextMenuStrip = this.contextMenuStripVorlagen; this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -371,15 +371,15 @@ namespace OnDoc.DocMgmt // this.treeViewAdv2.AllowDrop = true; this.treeViewAdv2.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window); - treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black; + 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; this.treeViewAdv2.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)}); this.treeViewAdv2.BeforeTouchSize = new System.Drawing.Size(498, 523); this.treeViewAdv2.ContextMenuStrip = this.contextMenuStripFavoriten; this.treeViewAdv2.Dock = System.Windows.Forms.DockStyle.Fill; diff --git a/Client/DocMgmt/DokTypSelect.cs b/Client/DocMgmt/DokTypSelect.cs index 2d0aacbe..a21e9f51 100644 --- a/Client/DocMgmt/DokTypSelect.cs +++ b/Client/DocMgmt/DokTypSelect.cs @@ -186,7 +186,7 @@ namespace OnDoc.DocMgmt } - if (vorlagentype == 1) + if (vorlagentype == 1 || vorlagentype==4) { this.Text = "Vorlage auswählen"; //Standard Vorlagen @@ -248,7 +248,10 @@ namespace OnDoc.DocMgmt treeViewAdv1.ExpandAll(); } db = null; - get_einzeldokumente(where); + if ( vorlagentype==1) + { + get_einzeldokumente(where); + } } else diff --git a/Client/DocMgmt/DokTypSelect.resx b/Client/DocMgmt/DokTypSelect.resx index d54e5c10..1ac8fd97 100644 --- a/Client/DocMgmt/DokTypSelect.resx +++ b/Client/DocMgmt/DokTypSelect.resx @@ -283,7 +283,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACo - DQAAAk1TRnQBSQFMAgEBBwEAAXgBAQF4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DQAAAk1TRnQBSQFMAgEBBwEAAYABAQGAAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -350,12 +350,6 @@ 618, 16 - - 618, 16 - - - 723, 16 - 723, 16 diff --git a/Client/DocMgmt/Dokumenterstellung.cs b/Client/DocMgmt/Dokumenterstellung.cs index ef91e673..040abd8e 100644 --- a/Client/DocMgmt/Dokumenterstellung.cs +++ b/Client/DocMgmt/Dokumenterstellung.cs @@ -45,6 +45,7 @@ namespace OnDoc.DocMgmt public bool editdoc { get; set; } = false; + public Dokumenterstellung() diff --git a/Client/Klassen/clsAppParams.cs b/Client/Klassen/clsAppParams.cs index 4cbca968..a7e9f92c 100644 --- a/Client/Klassen/clsAppParams.cs +++ b/Client/Klassen/clsAppParams.cs @@ -69,6 +69,9 @@ namespace OnDoc.Klassen public static bool AutomArchivierung { get; set; } = false; public static string SignApp { get; set; } = ""; + + public static string MachinName { get; set; } = ""; + public static bool O365 { get; set; } = false; static AppParams() { @@ -84,6 +87,21 @@ namespace OnDoc.Klassen logconnectionstring = StringCipher.Decrypt(logconnectionstring, "i%!k!7pab%bNLdA5hE4pkR4XaB%E^jB3d9tHuQ4pbF&BZjF7SB#WBWit5#HrbJiLrLVm"); DB db = new DB(connectionstring); db.Get_Tabledata("Select * from ondoc_appParams where usedbparams=1", false, true); + //MachinName = System.Environment.MachineName; + //O365=false; + //try + //{ + // List> groups = new List>(); + // List current = null; + // foreach (var line in System.IO.File.ReadAllLines(Application.StartupPath+@"o365machines.txt")) + // { + // if (line.Contains(MachinName)) + // { + // O365 = true; + // } + // } + //} + //catch { O365 = false; } if (db.dsdaten.Tables[0].Rows.Count > 0) { tempdir = db.dsdaten.Tables[0].Rows[0][0].ToString(); diff --git a/Client/UIControls/DocPreview.Designer.cs b/Client/UIControls/DocPreview.Designer.cs index 80158110..36139f44 100644 --- a/Client/UIControls/DocPreview.Designer.cs +++ b/Client/UIControls/DocPreview.Designer.cs @@ -46,9 +46,10 @@ this.FitPage = new System.Windows.Forms.ToolStripButton(); this.FitWidth = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.tsbtnrefresh = new System.Windows.Forms.ToolStripButton(); + this.tsschnellansicht = new Syncfusion.Windows.Forms.Tools.ToolStripCheckBox(); this.panel1 = new System.Windows.Forms.Panel(); this.pdfViewerControl1 = new Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl(); - this.tsbtnrefresh = new System.Windows.Forms.ToolStripButton(); this.Open.SuspendLayout(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -79,11 +80,12 @@ this.FitPage, this.FitWidth, this.toolStripButton1, - this.tsbtnrefresh}); + 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(482, 41); + this.Open.Size = new System.Drawing.Size(665, 41); this.Open.TabIndex = 5; this.Open.Text = "toolStrip1"; // @@ -96,7 +98,7 @@ this.btnFirst.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnFirst.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); this.btnFirst.Name = "btnFirst"; - this.btnFirst.Size = new System.Drawing.Size(23, 31); + this.btnFirst.Size = new System.Drawing.Size(29, 31); this.btnFirst.ToolTipText = "Erste Seite"; this.btnFirst.Click += new System.EventHandler(this.btnFirst_Click); // @@ -109,7 +111,7 @@ this.btnPrevious.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnPrevious.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); this.btnPrevious.Name = "btnPrevious"; - this.btnPrevious.Size = new System.Drawing.Size(23, 31); + this.btnPrevious.Size = new System.Drawing.Size(29, 31); this.btnPrevious.ToolTipText = "Vorherige Seite"; this.btnPrevious.Click += new System.EventHandler(this.btnPrevious_Click); // @@ -119,7 +121,7 @@ this.txtPageNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtPageNumber.Font = new System.Drawing.Font("Segoe UI", 9F); this.txtPageNumber.Name = "txtPageNumber"; - this.txtPageNumber.Size = new System.Drawing.Size(35, 23); + this.txtPageNumber.Size = new System.Drawing.Size(35, 27); this.txtPageNumber.Text = "1"; this.txtPageNumber.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -132,7 +134,7 @@ this.btnNext.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnNext.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); this.btnNext.Name = "btnNext"; - this.btnNext.Size = new System.Drawing.Size(23, 31); + this.btnNext.Size = new System.Drawing.Size(29, 31); this.btnNext.ToolTipText = "Nächste Seite"; this.btnNext.Click += new System.EventHandler(this.btnNext_Click); // @@ -145,7 +147,7 @@ this.btnLast.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnLast.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); this.btnLast.Name = "btnLast"; - this.btnLast.Size = new System.Drawing.Size(23, 31); + this.btnLast.Size = new System.Drawing.Size(29, 31); this.btnLast.ToolTipText = "Letzte Seite"; this.btnLast.Click += new System.EventHandler(this.btnLast_Click); // @@ -162,7 +164,7 @@ this.zoomIn.ImageTransparentColor = System.Drawing.Color.Magenta; this.zoomIn.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); this.zoomIn.Name = "zoomIn"; - this.zoomIn.Size = new System.Drawing.Size(23, 31); + this.zoomIn.Size = new System.Drawing.Size(29, 31); this.zoomIn.ToolTipText = "Verkleinern"; this.zoomIn.Click += new System.EventHandler(this.zoomIn_Click); // @@ -174,7 +176,7 @@ this.zoomOut.ImageTransparentColor = System.Drawing.Color.Magenta; this.zoomOut.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); this.zoomOut.Name = "zoomOut"; - this.zoomOut.Size = new System.Drawing.Size(23, 31); + this.zoomOut.Size = new System.Drawing.Size(29, 31); this.zoomOut.ToolTipText = "Vergrössern"; this.zoomOut.Click += new System.EventHandler(this.zoomOut_Click); // @@ -202,7 +204,7 @@ this.FitPage.ImageTransparentColor = System.Drawing.Color.Magenta; this.FitPage.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); this.FitPage.Name = "FitPage"; - this.FitPage.Size = new System.Drawing.Size(23, 31); + this.FitPage.Size = new System.Drawing.Size(29, 31); this.FitPage.ToolTipText = "Eine Seite"; this.FitPage.Visible = false; this.FitPage.Click += new System.EventHandler(this.FitPage_Click); @@ -215,7 +217,7 @@ this.FitWidth.ImageTransparentColor = System.Drawing.Color.Magenta; this.FitWidth.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); this.FitWidth.Name = "FitWidth"; - this.FitWidth.Size = new System.Drawing.Size(23, 31); + this.FitWidth.Size = new System.Drawing.Size(29, 31); this.FitWidth.Text = "FitWidth"; this.FitWidth.ToolTipText = "Seitenbreite"; this.FitWidth.Visible = false; @@ -227,10 +229,30 @@ this.toolStripButton1.Image = global::OnDoc.Properties.Resources.Printer_24x24_32; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(28, 28); + this.toolStripButton1.Size = new System.Drawing.Size(29, 28); this.toolStripButton1.Text = "PDF Drucken"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // tsbtnrefresh + // + this.tsbtnrefresh.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbtnrefresh.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32; + this.tsbtnrefresh.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbtnrefresh.Name = "tsbtnrefresh"; + this.tsbtnrefresh.Size = new System.Drawing.Size(29, 28); + this.tsbtnrefresh.Text = "Refresh"; + this.tsbtnrefresh.ToolTipText = "Dokument aktualisieren"; + this.tsbtnrefresh.Click += new System.EventHandler(this.tsbtnrefresh_Click); + // + // tsschnellansicht + // + this.tsschnellansicht.Checked = true; + this.tsschnellansicht.CheckState = System.Windows.Forms.CheckState.Checked; + this.tsschnellansicht.Name = "tsschnellansicht"; + this.tsschnellansicht.Size = new System.Drawing.Size(124, 28); + this.tsschnellansicht.Text = "Schnellansicht"; + this.tsschnellansicht.CheckedChanged += new System.EventHandler(this.tsschnellansicht_CheckedChanged); + // // panel1 // this.panel1.Controls.Add(this.Open); @@ -281,17 +303,6 @@ this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; this.pdfViewerControl1.ZoomMode = Syncfusion.Windows.Forms.PdfViewer.ZoomMode.Default; // - // tsbtnrefresh - // - this.tsbtnrefresh.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbtnrefresh.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32; - this.tsbtnrefresh.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbtnrefresh.Name = "tsbtnrefresh"; - this.tsbtnrefresh.Size = new System.Drawing.Size(28, 28); - this.tsbtnrefresh.Text = "Refresh"; - this.tsbtnrefresh.ToolTipText = "Dokument aktualisieren"; - this.tsbtnrefresh.Click += new System.EventHandler(this.tsbtnrefresh_Click); - // // DocPreview // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -327,5 +338,6 @@ private System.Windows.Forms.ToolStripButton toolStripButton1; private Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl pdfViewerControl1; private System.Windows.Forms.ToolStripButton tsbtnrefresh; + private Syncfusion.Windows.Forms.Tools.ToolStripCheckBox tsschnellansicht; } } diff --git a/Client/UIControls/DocPreview.cs b/Client/UIControls/DocPreview.cs index 39fc246b..c53b4dfa 100644 --- a/Client/UIControls/DocPreview.cs +++ b/Client/UIControls/DocPreview.cs @@ -62,7 +62,12 @@ namespace OnDoc.UIControls if (PrintDokID == dokumentid) { return; } PrintDokID = dokumentid; clsdok dok = new clsdok("", "", "",""); - if (dokumentid.Length > 25) { dok.dokument = dokumentid; } else { dok = GetDoc(true, dokumentid); } + if (dokumentid.Length > 25) { + dok.dokument = dokumentid; + } else + { + dok = GetDoc(true, dokumentid,this.tsschnellansicht.Checked); + } var stream = new MemoryStream(Convert.FromBase64String(dok.dokument)); @@ -127,7 +132,7 @@ namespace OnDoc.UIControls } - private clsdok GetDoc(bool AsPDF, string dokumentid) + private clsdok GetDoc(bool AsPDF, string dokumentid, bool schnellansicht = false) { clsdok dok = new clsdok("", "", "", ""); if (dokumentid == "") @@ -167,7 +172,7 @@ namespace OnDoc.UIControls DocGet gd = new DocGet(AppParams.connectionstring); if (AsPDF == true) { - dok = gd.GetDocAsPDF(dokumentid); + dok = gd.GetDocAsPDF(dokumentid,null,AppParams.tempdir, schnellansicht); } else { @@ -318,5 +323,12 @@ namespace OnDoc.UIControls Show_Doc(tmpdokid); } + + private void tsschnellansicht_CheckedChanged(object sender, EventArgs e) + { + string tmpdokid = PrintDokID.ToString(); + PrintDokID = ""; + Show_Doc(tmpdokid); + } } } diff --git a/Client/UIControls/DocPreview.resx b/Client/UIControls/DocPreview.resx index 7abca853..3b44be35 100644 --- a/Client/UIControls/DocPreview.resx +++ b/Client/UIControls/DocPreview.resx @@ -124,66 +124,66 @@ iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADRSURBVDhPY3CLL/8Pw65x5Q8YSATOsRXCrvGlGxgoMcgt - rtTRLb7sCUgvWQbZ29ezuMWXt9kHZPyF6SXZIOfECiW3+LITyPpINsgtoSzKJaL8E7ohRBvkl1TK6xpX + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADRSURBVDhPY3CLL/8Pw65x5Q8YSATOsRXCrvGlGxgoMcgt + rtTRLb7sCUgvWQbZ29ezuMWXt9n7pf2F6SXZIOfECiW3+LITyPpINsgtoSzKJaL8E7ohRBvkl1TK6xpX vghdM0kGeSRUmLrGl99B14iO8RrkElsuh8sr6BivQSDgkVip5RZbcgldIzomaBAI2MfXc7jGl09G10yy - QTDgFlvq4xZf/hrdEJINAgGXpFIpt9jyPRQbBAL19fVMbnHl5W7xGb8pMggGkJMGRQaBACyxAgD6jzPg - UwBkagAAAABJRU5ErkJggg== + QTDgFlvq4xZf/hrdEJINAgGXpFIpt9jyPRQbBAL19fVMbnHl5W7xab8pMggGkJMGRQaBACyxAgDrfTPa + tvmLXAAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACtSURBVDhPY2AgAXjFl0i4xZVtRRfHCdziy4Pd4oveuMWX + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACtSURBVDhPY2AgAXjFl0i4xZVtRRfHCdziy4Pd4oveuMWX /0eXwwAuaeX8rnHli0CKYRhdDQpwiyt1dIwpe4SsAacm+/h6Drf4sj63+PJ/6BqwanKOLTd0jSu7iq4Q - q6bQ0FBml7jyKrf4jN/oitAxWINbTIWKa3zZMXRJXJjBNa4s3S2+/Au6BD5MniaynEd2QCADkoIcGZAc - uciApGSEDEhOsMiApKyBDGCZEACNiA6aQ3+faAAAAABJRU5ErkJggg== + q6bQ0FBml7jyKrf4tN/oitAxWINbTIWKa3zZMXRJXJjBNa4s3S2+/Au6BD5MniaynEd2QCADkoIcGZAc + uciApGSEDEhOsMiApKyBDGCZEACF9g6WWkMUggAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACcSURBVDhPY3CNLd3iFV8iwUAKcIsv/+8WX/7aPaEsCF0O + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPY3CNLd3iFV8iwUAKcIsv/+8WX/7aPaEsCF0O J4BqAmPX+LKFHtH1fOhqMACyJggueugeX+6Arg4FYGoC439u8eW99vH1HOjqwQCLBjh2iS+/4hpfYoCu - B68mMA4o/+UaV1YZGhrKTLwmKHaJKz/qEVeiTJImKP7iFl+RRltNpDmP1IAgNchJjVwSkxGpCZa0rEFO - JgQA8OkOoMmEN+gAAAAASUVORK5CYII= + B68mMPYr/+UaV1YZGhrKTLwmKHaJKz/qEVeiTJImKP7iFl+RRltNpDmP1IAgNchJjVwSkxGpCZa0rEFO + JgQA6ZMOnBDgDiMAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADVSURBVDhPY3CNK1/kl1TKy0AicI0rf+AWX/4fhhlAhGt8 - +R2PhApTdMX4AFaDIDjjt1tceXl9fT0TuiZsAI9BEOwaX7bbJalUCl0jOiBoEBS/dost9UHXjAyINQjq + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADVSURBVDhPY3CNK1/kl1TKy0AicI0rf+AWX/4fhhlAhGt8 + +R2PhApTdMX4AFaDIDjtt1tceXl9fT0TuiZsAI9BEOwaX7bbJalUCl0jOiBoEBS/dost9UHXjAyINQjq uvLJ9vH1HOiGgABJBoFxbMklj8RKLcoNii//7xJR/skltlyOIoNwJQ2SDMKXWIkyCOQVt4SyKHTNyIAI - g8pOOCdWKKFrRAc4DbIPyPjrFl/eZm9fz4KuCRvAYVDZE7e4Ukd0xfgAhkGu8aUbnGMrhNEVEgLoBgEA - zx0z3yl34G0AAAAASUVORK5CYII= + g8pOOCdWKKFrRAc4DbL3S/vrFl/eZm9fz4KuCRvAYVDZE7e4Ukd0xfgAhkGu8aUbnGMrhNEVEgLoBgEA + xIcz2dQw6AYAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADMSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xWf8BmEw - GyQWVxEJUoOuDwW4JZS5usaX33GLL/+PDzvHl9x2j61wQdcPBm5xZZn2ARl/0TXhwmC1cWWZKIa4xpUH + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADMSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf9BmEw + GyQWVxEJUoOuDwW4JZS5usaX33GLL/+PDzvHl9x2j61wQdcPBm5xZZn2fml/0TXhwmC1cWWZKIa4xpUH oiskFoP0gg2xj88XcIoufoWugFgM0gsyg8EtvjwXXZIMnMvgEld+CIsESRhkBshF35AF3ePLHYjBaIZ9 - AxmEYjpKLOABGPrQXeQaX2JADMZwETXDiDqxRrV0BAJUSdnwWKBGXoMBquR+GCC3PAIAT/HxFGJn3nQA + AxmEYjpKLOABGPrQXeQaX2JADMZwETXDiDqxRrV0BAJUSdnwWKBGXoMBquR+GCC3PAIAFcnw/PEJ/FIA AAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEaSURBVDhPrVQxbsJAEHSRB+QL6Sn4gVHwLW1SIswtJRQI - CcytqfgPNDwB8QL6pEsqlCYNTYRAe3Ane40DSB5ppNXtzNzKvrsgEAjD+VOk0zZos4iQvgD7f0xb85pO - 26yRvhxa3TRSSJ+AdPyPTUw+WCv9FqDNIHzrH6SpjFarzSAXojS9S6EVo/lt6mTL5Fr2mey1ISGOnl87 - k50UWBFOV34znK5kn8lezggAaSibjwRdOAwiTZsrjYeCOIMn2mcXW0gNRxXPaj4ontWyPRG256BcujPe - QsEnJ1KY1D3jyYszcp3tFSaq8htV89cqO0dWVHKyAcc/gLQ+09YFjT/ZDpXcNQfoGXXP7WdN6e138O8R - 0hLQfN/7Hp0ALV/NHkExnWYAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEbSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf9BmEw + GyQWVxEJUoOuDwW4x1a4uMaX33GLL/+PDzvHl9wGqUXXDwZucWWZ9n5pf9E14cJgtXFlmSiGuMaVB6Ir + BCuOL/voHFdyAYRBbHR5EAbpBRtiH58v4BRd/ApdAVhRfOkGuGXxpRvQ5UEYpBdkBoNbfHkuuiQpBkFx + LoNLXPkhLBIkGQQyA+Sib8iC7vHlDjDsGlOpAzcoplIHWQ7NsG8gg1BMh2kkBDD0obvINb7EAI5jihVh + GkFsZDkMF1EzjKgTa1RLR2BFOFK2W3zRG7f48gMQDGZjqIGnbBigSl6DAbeEMldicj9IDc7cDwPw8ii+ + fLVbfNkTYssjAPMozQbaRklFAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEuSURBVDhPrZRLTsMwEEAjOAfiKFCJGIl9lrURu0hdVIHY + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEuSURBVDhPrZRLTsMwEEAjOAfiKFCJGIl9lrURu0hdVIHY lVhk0wP0Euy5UG+QO4CezbiO82mFOpKl8Xj85me5UMb9XGMVQbHbZ+Mep5bS7Sq3Dc6N3UYQhmJCqqq6 LXX7pYzb5WciAbYASiCS/iTsLOhp3T4EQNOr9cfR66+fd7nfZSBt69K038rYA/rL2/t97jcLIioXuq67 YS8gdGwEYFH6LIg++BK0rQVcardX2m5iIG1rfOgfsBEoQnw/7OGvnAgASHYhw6YXGM8jgticJtT0coHL @@ -194,7 +194,7 @@ iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADUSURBVDhPY3CLL/9PDcwAIlziylNc40sMyMEgvXCD3OPL + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADUSURBVDhPY3CLL/9PDcwAIlziylNc40sMyMEgvXCD3OPL HRjIBCC9I8kgj8RKUde4sh63uLISdA0gUF9fz+QaV97iFlc23y2mQgUkhmGQR3SZjFt82WXX+PI77vHl CuiGgDSCYyqh3Nc+vuyjW3z5a+eEMl0Ug9ziSh3d4kvPgNmo+ADcoPjyA5jypWcgepFcBDIdZAvINpCt INthzkcGINeCXO0SX34F5AsMr4FtjalQAfkfFA6g8EA3BARA4ecWX94LCk8QH6tB5ICRYhDVcj81MABm diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 194fa739..d82e21c9 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -662,6 +662,7 @@ namespace OnDoc.UICintrols else { Dokumenterstellung dokbearbeitung = new Dokumenterstellung(selected_dokumentid); + dokbearbeitung.ShowDialog(); DB db1 = new DB(AppParams.connectionstring); switch (dokbearbeitung.DocFunction) diff --git a/Client/UIControls/Serienbrief.cs b/Client/UIControls/Serienbrief.cs index a564f13d..78c6e26e 100644 --- a/Client/UIControls/Serienbrief.cs +++ b/Client/UIControls/Serienbrief.cs @@ -666,7 +666,7 @@ namespace OnDoc.UIControls { OnDoc.DocMgmt.DokTypSelect DokTypSelect = new OnDoc.DocMgmt.DokTypSelect(false); - DokTypSelect.vorlagentype = 1; + DokTypSelect.vorlagentype = 4; DokTypSelect.ShowDialog(this); if (DokTypSelect.DialogResult == DialogResult.OK) { @@ -1151,7 +1151,13 @@ namespace OnDoc.UIControls sb.barcode_zusatz = ""; db.Get_Tabledata("Select bezeichnung,office_vorlagenr, isnull(vertrag,0) as vertrag, isnull(physisches_archiv,0) as archiv from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true); - sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString(); + try + { + if (sb.bezeichnung == "") { sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString(); } + } + catch { } + + //sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString(); sb.officevorlagenr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]); sb.vertrag = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]); diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs index 127bb4bb..5da7d9eb 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.cs @@ -91,6 +91,11 @@ namespace OnDoc.UIControls } + public void enabling_partnerselektion(bool enable) + { + sfButton1.Enabled = enable; + } + public void Refresh_Details() { var x = DateDokumentDatum.Culture.DateTimeFormat.FirstDayOfWeek; @@ -331,6 +336,19 @@ namespace OnDoc.UIControls { Get_DokWertList(ref db, "", 1); } + + try + { + db.Get_Tabledata("Select count(*) from View_Dokumenttypen_Nativ where dokumenttypnr=" + this.dokumenttypnr.ToString(), false, true); + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) + { + this.ChkTagesEndArchivierung.Visible = false; + } + } + catch + { + this.ChkTagesEndArchivierung.Visible = true; + } db = null; Refresh_Team(); @@ -1217,7 +1235,12 @@ namespace OnDoc.UIControls Get_DokWertList(ref db, dokumentid, 0); - + //Dokument in Wiederbearbeitung + db.Get_Tabledata("Select count(*) from edoka_journale.dbo.ondoc_wiederbearbeitung where dokumentid='" + dokumentid + "' and status = 0", false, true); + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) + { + this.sfButton1.Enabled = false; + } db = null; } diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index 42ad5946..ca4ebeb9 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 908f9825..064ff704 100644 Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 3f43cc46..f035f70b 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 b3a31e76..7e24babb 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 30999565..695a9819 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 66950f8a..ef0a1ba2 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 75fc8df4..dff5e542 100644 Binary files a/Client/bin/Debug/OnDocOffice.pdb and b/Client/bin/Debug/OnDocOffice.pdb differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index 6bfde744..cacc5229 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 5a227b99..704d857b 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 5d47de64..11212806 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 0ed22032..2aecf6ee 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.UIControls.DocPreview.resources b/Client/obj/Debug/OnDoc.UIControls.DocPreview.resources index fe01bbe3..87cf0c82 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 3f43cc46..f035f70b 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 b3a31e76..7e24babb 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 6bfde744..cacc5229 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 2a177d78..c9c438f9 100644 --- a/DOCGEN/Klassen/SyncFWord.cs +++ b/DOCGEN/Klassen/SyncFWord.cs @@ -539,6 +539,36 @@ namespace DOCGEN.Klassen case "DOKUMENTSCHUETZEN": document.Protect(ProtectionType.AllowOnlyFormFields, "Australia"); break; + case "FORMULARAKTUALISIERENXY": + if (document.ProtectionType != ProtectionType.NoProtection) + { + document.Protect(ProtectionType.NoProtection, "Australia"); + try + { + document.UpdateDocumentFields(); + } + catch { } + try + { + document.UpdateFields = true; + } + catch { } + document.Protect(ProtectionType.AllowOnlyFormFields, "Australia"); + } + else + { + try + { + document.UpdateDocumentFields(); + } + catch { } + try + { + document.UpdateFields = true; + } + catch { } + } + break; default: break; } @@ -939,8 +969,16 @@ namespace DOCGEN.Klassen return barcodeimage; break; case "1": - barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAscii, docData.barcode_content, 6, 6, 0, "Right", docData.barcode_text + docData.barcode_zusatz, docData.Zusatz_Font, docData.Zusatz_FontSize); - barcodeimage = AutoSizeImage(barcodeimage, docData.barcode_width, docData.barcode_height, false); + if (docData.barcode_left > 200) + { + barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAscii, docData.barcode_content, 6, 6, 0, "Left", docData.barcode_text + docData.barcode_zusatz, docData.Zusatz_Font, docData.Zusatz_FontSize); + + } + else + { + barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAscii, docData.barcode_content, 6, 6, 0, "Right", docData.barcode_text + docData.barcode_zusatz, docData.Zusatz_Font, docData.Zusatz_FontSize); + } + //barcodeimage = AutoSizeImage(barcodeimage, docData.barcode_width, docData.barcode_height, false); return barcodeimage; break; default: diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index 42ad5946..ca4ebeb9 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 908f9825..064ff704 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 66950f8a..ef0a1ba2 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 75fc8df4..dff5e542 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 7cbf886f..28e6c926 100644 --- a/DOCGEN/clsDocGet.cs +++ b/DOCGEN/clsDocGet.cs @@ -27,6 +27,7 @@ using Helper; using Syncfusion.XlsIO.Parser.Biff_Records; using System.Buffers.Text; using Syncfusion.ExcelToPdfConverter; +using OnDocOffice; namespace DOCGEN @@ -151,7 +152,7 @@ namespace DOCGEN db.Get_Tabledata("select * from Relaunch_View_PDF_Parameter where dokumentid='" + DocID + "' order by sort", false, true); return GetDocAsPDF(DocID, db.dsdaten.Tables[0]); } - public clsdok GetDocAsPDF(string Docid, DataTable pdfparameters = null) + public clsdok GetDocAsPDF(string Docid, DataTable pdfparameters = null,string tempdir="", bool schnellansicht = false) { clsdok dok = GetDoc(Docid); @@ -160,6 +161,36 @@ namespace DOCGEN switch (dok.doktype.ToUpper().Substring(0, 1)) { case "D": + if (schnellansicht) + { + dok.dokument = Convert_Word_To_PDF(dok.dokument.ToString(), pdfparameters); + dok.extension = "pdf"; + return dok; + } + DB db1 = new DB(connectionstring); + + string SQL = "SELECT dbo.dokumenttyp.ErstellungInOffice FROM dbo.dokument INNER JOIN dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr where dbo.dokument.dokumentid=@dokumentid"; + db1.clear_parameter(); + db1.add_parameter("@dokumentid", Docid); + db1.Get_Tabledata_Addvar(SQL, false, true); + try + { + if (Convert.ToBoolean(db1.dsdaten.Tables[0].Rows[0]["Erstellunginoffice"])) + { + OnDocOffice.OfficeToPDF officeToPDF = new OnDocOffice.OfficeToPDF(); + dok.dokument = officeToPDF.word_to_pdf(Docid, connectionstring, tempdir); + + officeToPDF = null; + return dok; + } + } + catch { } + finally { + db1 = null; + + } + + dok.dokument = Convert_Word_To_PDF(dok.dokument.ToString(), pdfparameters); dok.extension = "pdf"; return dok; diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index 42ad5946..ca4ebeb9 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 908f9825..064ff704 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 17efc931..a10ee318 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/obj/Debug/Database.csproj.AssemblyReference.cache b/Database/obj/Debug/Database.csproj.AssemblyReference.cache index 12f436f8..fb7506ef 100644 Binary files a/Database/obj/Debug/Database.csproj.AssemblyReference.cache and b/Database/obj/Debug/Database.csproj.AssemblyReference.cache differ diff --git a/Helper/obj/Debug/Helper.csproj.AssemblyReference.cache b/Helper/obj/Debug/Helper.csproj.AssemblyReference.cache index 9bafee1f..a046c207 100644 Binary files a/Helper/obj/Debug/Helper.csproj.AssemblyReference.cache and b/Helper/obj/Debug/Helper.csproj.AssemblyReference.cache differ diff --git a/Model/obj/Debug/Model.csproj.AssemblyReference.cache b/Model/obj/Debug/Model.csproj.AssemblyReference.cache index 6943b8f3..b7610dca 100644 Binary files a/Model/obj/Debug/Model.csproj.AssemblyReference.cache and b/Model/obj/Debug/Model.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/bin/Debug/DOCGEN.dll b/OnDocOffice/bin/Debug/DOCGEN.dll index 42ad5946..ca4ebeb9 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 908f9825..064ff704 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 66950f8a..ef0a1ba2 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 75fc8df4..dff5e542 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 f938e2bf..96f844f0 100644 --- a/OnDocOffice/clsoffice.cs +++ b/OnDocOffice/clsoffice.cs @@ -1658,8 +1658,12 @@ namespace OnDocOffice public class word_signature { - + private string ConnectionString = ""; + public string MachinName { get; set; } = ""; + public bool O365 { get; set; } = false; + + public word_signature(string connectionstring) { @@ -1673,11 +1677,12 @@ namespace OnDocOffice Logging.Logging.Debug("Sign_Doc", "OnDoc", dokumentid); docWord = word.ActiveDocument; this.word = word; - + DB db = new DB(this.ConnectionString); db.clear_parameter(); db.add_parameter("@dokumenttypnr",dokumenttypnr.ToString()); db.add_parameter("@officeversion", "2016"); + db.add_parameter("@machinname", System.Environment.MachineName); db.Get_Tabledata("sp_signatureposition", true,false); System.Data.DataTable position = db.dsdaten.Tables[0]; db = null; @@ -1698,8 +1703,10 @@ namespace OnDocOffice List list = new List(); foreach (Microsoft.Office.Interop.Word.Bookmark bm in docWord.Bookmarks) { - if (bm.Name.Contains("VornameNameLinks") || bm.Name.Contains("UnterschriftLinks") || bm.Name == "TGEDKVornameNameL") { list.Add(bm.Name); } - if (bm.Name.Contains("VornameNameRechts") || bm.Name.Contains("UnterschriftRechts") || bm.Name == "TGEDKVornameNameR") { list.Add(bm.Name); } + if (bm.Name.Contains("VornameNameLinks") || bm.Name.Contains("UnterschriftLinks") || bm.Name == "TGEDKVornameNameL") { + list.Add(bm.Name); } + if (bm.Name.Contains("VornameNameRechts") || bm.Name.Contains("UnterschriftRechts") || bm.Name == "TGEDKVornameNameR") { + list.Add(bm.Name); } } list.Sort(); @@ -1762,8 +1769,13 @@ namespace OnDocOffice public void insert_unterschrift(string bookmark, string imagepath, int l, int t, int w, int h, int type) { - if (imagepath == "") return; + object What = Microsoft.Office.Interop.Word.WdGoToItem.wdGoToBookmark; + object oMissing = System.Reflection.Missing.Value; + word.Selection.GoTo(What, oMissing, oMissing, bookmark); + + if (imagepath == "") return; + object missing = Type.Missing; if (type == 1) { @@ -1777,7 +1789,11 @@ namespace OnDocOffice //myShape1.Top = myShape1.Top - myShape1.Height; myShape1.Top = myShape1.Top + t; myShape1.Left = myShape1.Left + l; - myShape1.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind; +// myShape1.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind; + myShape1.Name = "Unterschrift_" + bookmark; + + myShape1.LockAspectRatio = Microsoft.Office.Core.MsoTriState.msoTrue; + //myShape1.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind; } if (type == 2) { @@ -1790,7 +1806,8 @@ namespace OnDocOffice docWord.Activate(); bm.Range.GoTo(); bm.Select(); - + Thread.Sleep(500); + System.Windows.Forms.Application.DoEvents(); Microsoft.Office.Interop.Word.Shape myShape = docWord.Shapes.AddPicture(imagepath, false, true, 0, 0, 120, 50, missing); myShape.RelativeHorizontalPosition = Microsoft.Office.Interop.Word.WdRelativeHorizontalPosition.wdRelativeHorizontalPositionPage; myShape.RelativeVerticalPosition = Microsoft.Office.Interop.Word.WdRelativeVerticalPosition.wdRelativeVerticalPositionPage; @@ -1803,6 +1820,36 @@ namespace OnDocOffice myShape.LockAspectRatio = Microsoft.Office.Core.MsoTriState.msoTrue; myShape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind; } + if (type == 3) + { + + Microsoft.Office.Interop.Word.Range myRange = docWord.Bookmarks[bookmark].Range; + + Microsoft.Office.Interop.Word.Bookmark bm = docWord.Bookmarks[bookmark]; + + float vertical = bm.Range.Information[Microsoft.Office.Interop.Word.WdInformation.wdVerticalPositionRelativeToPage]; + float horizontal = bm.Range.Information[Microsoft.Office.Interop.Word.WdInformation.wdHorizontalPositionRelativeToPage]; + vertical = vertical - 50; + vertical = 0; + horizontal = 0; + vertical = vertical + t; + horizontal = horizontal + l; + Thread.Sleep(10); + Microsoft.Office.Interop.Word.Shape myshape = docWord.Shapes.AddTextbox(Microsoft.Office.Core + .MsoTextOrientation.msoTextOrientationHorizontal, (float)horizontal, + (float)vertical, 120, 50, missing); + Thread.Sleep(10); + myshape.Name = "Unterschrift" + "_" + bookmark; + myshape.TextFrame.ContainingRange.Borders.OutsideLineStyle = WdLineStyle.wdLineStyleNone; + myshape.TextFrame.ContainingRange.Borders.InsideLineStyle = WdLineStyle.wdLineStyleNone; + Thread.Sleep(10); + myshape.Fill.UserPicture(imagepath); + Thread.Sleep(10); + myshape.Fill.UserPicture(imagepath); + Thread.Sleep(10); + //myshape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind; + myshape.Line.Visible = Microsoft.Office.Core.MsoTriState.msoFalse; + } return; diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index 555e8c60..b82f5800 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 66950f8a..ef0a1ba2 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 75fc8df4..dff5e542 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.pdb and b/OnDocOffice/obj/Debug/OnDocOffice.pdb differ diff --git a/ZZ_Signature_C/Form1.cs b/ZZ_Signature_C/Form1.cs index 307bdd42..8312dacb 100644 --- a/ZZ_Signature_C/Form1.cs +++ b/ZZ_Signature_C/Form1.cs @@ -50,7 +50,7 @@ namespace ZZ_Signature_C string ul = txtunterschriftlinks.Text; string ur = txtunterschriftrechts.Text; - ws.sign_doc(ref word, ul, ur, "", txtdoktypnr.Text); + ws.sign_doc(ref word, ul, ur, "", txtdoktypnr.Text); docWord.Activate(); word.Visible = true; diff --git a/ZZ_Signature_C/bin/Debug/DOCGEN.dll b/ZZ_Signature_C/bin/Debug/DOCGEN.dll index 85d89af5..9d9a61c4 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 3f4f2bdf..f7cf06f2 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 ca7f2ad0..fce1e02f 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 966f2720..531e8b2e 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/OnDocOffice.dll b/ZZ_Signature_C/bin/Debug/OnDocOffice.dll index 7237ca85..ef0a1ba2 100644 Binary files a/ZZ_Signature_C/bin/Debug/OnDocOffice.dll and b/ZZ_Signature_C/bin/Debug/OnDocOffice.dll differ diff --git a/ZZ_Signature_C/bin/Debug/OnDocOffice.pdb b/ZZ_Signature_C/bin/Debug/OnDocOffice.pdb index cbc634ef..dff5e542 100644 Binary files a/ZZ_Signature_C/bin/Debug/OnDocOffice.pdb and b/ZZ_Signature_C/bin/Debug/OnDocOffice.pdb differ diff --git a/ZZ_Signature_C/bin/Debug/ZZ_Signature_C.exe b/ZZ_Signature_C/bin/Debug/ZZ_Signature_C.exe index fe44f598..80d5bfee 100644 Binary files a/ZZ_Signature_C/bin/Debug/ZZ_Signature_C.exe and b/ZZ_Signature_C/bin/Debug/ZZ_Signature_C.exe differ diff --git a/ZZ_Signature_C/bin/Debug/ZZ_Signature_C.pdb b/ZZ_Signature_C/bin/Debug/ZZ_Signature_C.pdb index 2ac9320b..b409286f 100644 Binary files a/ZZ_Signature_C/bin/Debug/ZZ_Signature_C.pdb and b/ZZ_Signature_C/bin/Debug/ZZ_Signature_C.pdb differ diff --git a/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 45bb0a2a..ea04bd86 100644 Binary files a/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache 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 d6bd00a4..22646f7f 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.exe b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.exe index fe44f598..80d5bfee 100644 Binary files a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.exe and b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.exe differ diff --git a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.pdb b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.pdb index 2ac9320b..b409286f 100644 Binary files a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.pdb and b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.pdb differ