diff --git a/API_NetFramework/Controllers/ArchivController.cs b/API_NetFramework/Controllers/ArchivController.cs index 9b0f9278..bae1bf85 100644 --- a/API_NetFramework/Controllers/ArchivController.cs +++ b/API_NetFramework/Controllers/ArchivController.cs @@ -197,7 +197,10 @@ namespace API_NetFramework.Controllers db1 = null; dt = null; reader = null; - + db.clear_parameter(); + db.add_parameter("@dokumentid", DokumentID); + db.Get_Tabledata("[sp_Get_OnDoc_Parameters]", true, false); + } if (officeformat.Contains(doktypnr) || extension.ToUpper()=="PDF") { diff --git a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user index f7f03488..84e47006 100644 --- a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,12 +5,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>E:\Software-Projekte\OnDoc\PubServices\OnDoc - True|2025-01-19T15:20:16.1036874Z||;True|2025-01-19T16:19:11.5720999+01:00||;True|2025-01-12T14:24:46.2550852+01:00||;True|2025-01-12T14:00:23.9205001+01:00||;True|2025-01-07T15:08:24.2722613+01:00||;True|2025-01-06T09:25:16.5522864+01:00||;True|2024-12-22T16:49:54.0855447+01:00||;True|2024-12-08T09:59:39.7127943+01:00||;True|2024-12-08T09:26:52.1924006+01:00||;True|2024-12-02T09:50:13.5426444+01:00||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||; + True|2025-01-20T09:17:24.5425008Z||;True|2025-01-19T16:20:16.1036874+01:00||;True|2025-01-19T16:19:11.5720999+01:00||;True|2025-01-12T14:24:46.2550852+01:00||;True|2025-01-12T14:00:23.9205001+01:00||;True|2025-01-07T15:08:24.2722613+01:00||;True|2025-01-06T09:25:16.5522864+01:00||;True|2024-12-22T16:49:54.0855447+01:00||;True|2024-12-08T09:59:39.7127943+01:00||;True|2024-12-08T09:26:52.1924006+01:00||;True|2024-12-02T09:50:13.5426444+01:00||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||; - 06/03/2024 09:20:46 + 03/06/2024 09:20:46 07/19/2024 12:24:15 @@ -49,7 +49,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/19/2024 12:24:15 - 06/03/2024 09:20:41 + 03/06/2024 09:20:41 07/19/2024 12:24:15 @@ -64,22 +64,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/19/2024 12:24:15 - 06/03/2024 09:20:40 + 03/06/2024 09:20:40 - 06/03/2024 09:20:40 + 03/06/2024 09:20:40 - 06/03/2024 09:20:40 + 03/06/2024 09:20:40 - 09/10/2013 17:29:20 + 10/09/2013 17:29:20 - 09/10/2013 17:29:20 + 10/09/2013 17:29:20 - 04/09/2024 19:25:14 + 09/04/2024 19:25:14 01/18/2025 13:55:56 @@ -115,7 +115,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:35:02 - 02/11/2014 16:28:40 + 11/02/2014 16:28:40 10/20/2023 22:35:02 @@ -130,22 +130,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:35:04 - 01/19/2025 13:38:20 + 01/20/2025 08:55:13 12/23/2024 22:17:43 - 01/19/2025 13:38:20 + 01/20/2025 08:55:13 11/27/2023 09:49:58 - 09/07/2023 11:54:46 + 07/09/2023 11:54:46 - 09/07/2023 12:19:34 + 07/09/2023 12:19:34 11/27/2023 09:50:34 @@ -160,7 +160,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 12/30/2024 08:48:57 - 04/09/2024 18:58:02 + 09/04/2024 18:58:02 12/30/2024 08:48:57 @@ -169,22 +169,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 12/30/2024 08:48:57 - 11/12/2018 18:29:00 + 12/11/2018 18:29:00 01/25/2019 00:18:54 - 11/12/2018 18:28:58 + 12/11/2018 18:28:58 - 11/12/2018 18:29:00 + 12/11/2018 18:29:00 10/31/2023 16:00:18 - 03/05/2023 23:41:40 + 05/03/2023 23:41:40 10/31/2023 16:04:06 @@ -208,10 +208,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/31/2023 16:00:32 - 11/12/2018 18:28:58 + 12/11/2018 18:28:58 - 04/11/2022 19:09:46 + 11/04/2022 19:09:46 01/14/2025 20:53:13 @@ -229,7 +229,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 11/28/2018 00:07:54 - 03/08/2023 06:09:56 + 08/03/2023 06:09:56 04/30/2024 21:58:56 @@ -250,10 +250,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 01/19/2025 11:29:23 - 01/19/2025 13:38:20 + 01/20/2025 10:15:52 - 01/19/2025 13:38:20 + 01/20/2025 10:15:52 11/13/2012 13:19:34 @@ -301,10 +301,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/15/2022 06:21:10 - 10/05/2021 02:47:54 + 05/10/2021 02:47:54 - 10/05/2021 02:49:46 + 05/10/2021 02:49:46 02/15/2022 06:33:08 @@ -355,34 +355,34 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/15/2022 06:38:42 - 07/08/2017 03:30:56 + 08/07/2017 03:30:56 - 09/12/2024 21:02:32 + 12/09/2024 21:02:32 - 09/12/2024 21:21:22 + 12/09/2024 21:21:22 - 09/12/2024 21:25:18 + 12/09/2024 21:25:18 - 09/12/2024 21:34:20 + 12/09/2024 21:34:20 - 09/12/2024 21:33:50 + 12/09/2024 21:33:50 - 09/12/2024 21:03:58 + 12/09/2024 21:03:58 - 09/12/2024 21:23:26 + 12/09/2024 21:23:26 - 09/12/2024 21:32:30 + 12/09/2024 21:32:30 - 09/12/2024 21:26:42 + 12/09/2024 21:26:42 02/19/2020 11:05:18 @@ -391,7 +391,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 05/15/2018 15:29:36 - 05/08/2022 05:31:02 + 08/05/2022 05:31:02 10/20/2023 22:33:52 @@ -412,7 +412,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 05/15/2018 15:29:52 - 10/01/2013 22:54:22 + 01/10/2013 22:54:22 10/20/2023 22:33:58 @@ -427,7 +427,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 01/01/0001 00:00:00 - 02/11/2014 15:26:04 + 11/02/2014 15:26:04 10/20/2023 22:33:48 @@ -454,196 +454,196 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 12/28/2024 10:07:41 - 10/05/2016 15:11:52 + 05/10/2016 15:11:52 01/23/2014 13:57:34 - 04/09/2024 19:24:38 + 09/04/2024 19:24:38 - 04/09/2024 19:24:38 + 09/04/2024 19:24:38 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 08:11:55 + 03/06/2024 08:11:55 - 06/03/2024 08:11:55 + 03/06/2024 08:11:55 07/19/2024 12:25:43 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:13 + 03/06/2024 09:16:13 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 08:12:04 + 03/06/2024 08:12:04 - 10/01/2024 20:21:44 + 01/10/2024 20:21:44 - 06/03/2024 08:11:55 + 03/06/2024 08:11:55 - 06/03/2024 08:11:55 + 03/06/2024 08:11:55 - 06/03/2024 10:48:16 + 03/06/2024 10:48:16 07/19/2024 12:25:43 - 06/03/2024 08:11:55 + 03/06/2024 08:11:55 01/12/2025 14:00:22 diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index 6a759100..ae5f182d 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 7e28abc9..4eb9997f 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index 72ba9f28..1e35fbf8 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 91267137..ab4ad2c3 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 96a5cb9d..9ac7d99b 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 72ba9f28..1e35fbf8 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 91267137..ab4ad2c3 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll index 6a759100..ae5f182d 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb index 7e28abc9..4eb9997f 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll index 72ba9f28..1e35fbf8 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb index 91267137..ab4ad2c3 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb differ diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index fd89573c..99c1e287 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(168, 26); this.label2.TabIndex = 2; - this.label2.Text = "19. Januar 2025"; + this.label2.Text = "20. Januar 2025"; // // SplashScreen // diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index 5993980d..d91ef091 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -51,6 +51,9 @@ namespace OnDoc.UICintrols this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); + this.gruppenÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gruppenSchliessenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.tsrbvorschau = new System.Windows.Forms.ToolStripComboBox(); @@ -155,6 +158,9 @@ namespace OnDoc.UICintrols this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig(); this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton(); this.ribbonButton5 = new System.Windows.Forms.RibbonButton(); + this.ctxMenuGroups = new System.Windows.Forms.ContextMenuStrip(this.components); + this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.dokwerte1 = new OnDoc.UIControls.Dokwerte(); this.ctxMenuDokList.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -164,6 +170,7 @@ namespace OnDoc.UICintrols this.splitContainer1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit(); this.panel2.SuspendLayout(); + this.ctxMenuGroups.SuspendLayout(); this.SuspendLayout(); // // ctxMenuDokList @@ -186,9 +193,13 @@ namespace OnDoc.UICintrols this.wordInterOPEditToolStripMenuItem, this.attributeAnzeigenVersteckenToolStripMenuItem, this.historyToolStripMenuItem, - this.dokumentFürPartnerErstellenToolStripMenuItem}); + this.dokumentFürPartnerErstellenToolStripMenuItem, + this.toolStripMenuItem3, + this.gruppenÖffnenToolStripMenuItem, + this.gruppenSchliessenToolStripMenuItem}); this.ctxMenuDokList.Name = "ctxMenuDokList"; - this.ctxMenuDokList.Size = new System.Drawing.Size(280, 368); + this.ctxMenuDokList.Size = new System.Drawing.Size(280, 418); + this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening); // // dokumentAnzeigenToolStripMenuItem // @@ -324,6 +335,25 @@ namespace OnDoc.UICintrols this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen"; this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click); // + // toolStripMenuItem3 + // + this.toolStripMenuItem3.Name = "toolStripMenuItem3"; + this.toolStripMenuItem3.Size = new System.Drawing.Size(276, 6); + // + // gruppenÖffnenToolStripMenuItem + // + this.gruppenÖffnenToolStripMenuItem.Name = "gruppenÖffnenToolStripMenuItem"; + this.gruppenÖffnenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.gruppenÖffnenToolStripMenuItem.Text = "Alle Gruppen aufklappen"; + this.gruppenÖffnenToolStripMenuItem.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem_Click); + // + // gruppenSchliessenToolStripMenuItem + // + this.gruppenSchliessenToolStripMenuItem.Name = "gruppenSchliessenToolStripMenuItem"; + this.gruppenSchliessenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.gruppenSchliessenToolStripMenuItem.Text = "Alle Gruppen einklappen"; + this.gruppenSchliessenToolStripMenuItem.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem_Click); + // // toolStrip1 // this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -418,6 +448,7 @@ namespace OnDoc.UICintrols this.sfDataGrid1.AllowSelectionOnMouseDown = true; this.sfDataGrid1.ContextMenuStrip = this.ctxMenuDokList; this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill; + this.sfDataGrid1.ExpanderColumnWidth = 288D; this.sfDataGrid1.Location = new System.Drawing.Point(0, 0); this.sfDataGrid1.Name = "sfDataGrid1"; this.sfDataGrid1.RowHeight = 30; @@ -480,6 +511,7 @@ namespace OnDoc.UICintrols // this.ribbon2.BackColor = System.Drawing.SystemColors.ActiveCaption; this.ribbon2.CaptionBarVisible = false; + this.ribbon2.Cursor = System.Windows.Forms.Cursors.Default; this.ribbon2.Font = new System.Drawing.Font("Segoe UI", 9F); this.ribbon2.Location = new System.Drawing.Point(0, 0); this.ribbon2.Minimized = false; @@ -843,11 +875,14 @@ namespace OnDoc.UICintrols // // ribbonCBAnsicht // - this.ribbonCBAnsicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonCBAnsicht.AllowTextEdit = false; + this.ribbonCBAnsicht.DrawIconsBar = false; + this.ribbonCBAnsicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium; this.ribbonCBAnsicht.Name = "ribbonCBAnsicht"; this.ribbonCBAnsicht.SelectedIndex = -1; this.ribbonCBAnsicht.TextBoxText = ""; this.ribbonCBAnsicht.DropDownItemClicked += new System.Windows.Forms.RibbonComboBox.RibbonItemEventHandler(this.ribbonCBAnsicht_DropDownItemClicked); + // // ribbonItemGroup3 // @@ -1277,6 +1312,28 @@ namespace OnDoc.UICintrols this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage"))); this.ribbonButton5.Text = "Load"; // + // ctxMenuGroups + // + this.ctxMenuGroups.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.gruppenÖffnenToolStripMenuItem1, + this.gruppenSchliessenToolStripMenuItem1}); + this.ctxMenuGroups.Name = "ctxMenuGroups"; + this.ctxMenuGroups.Size = new System.Drawing.Size(206, 48); + // + // gruppenÖffnenToolStripMenuItem1 + // + this.gruppenÖffnenToolStripMenuItem1.Name = "gruppenÖffnenToolStripMenuItem1"; + this.gruppenÖffnenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22); + this.gruppenÖffnenToolStripMenuItem1.Text = "Alle Gruppen aufklappen"; + this.gruppenÖffnenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem1_Click); + // + // gruppenSchliessenToolStripMenuItem1 + // + this.gruppenSchliessenToolStripMenuItem1.Name = "gruppenSchliessenToolStripMenuItem1"; + this.gruppenSchliessenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22); + this.gruppenSchliessenToolStripMenuItem1.Text = "Alle Gruppen einklappen"; + this.gruppenSchliessenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem1_Click); + // // dokwerte1 // this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right; @@ -1307,6 +1364,7 @@ namespace OnDoc.UICintrols ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); + this.ctxMenuGroups.ResumeLayout(false); this.ResumeLayout(false); } @@ -1436,5 +1494,11 @@ namespace OnDoc.UICintrols private System.Windows.Forms.ToolStripMenuItem dokumentFürPartnerErstellenToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem zurUnterschriftenPrüfungToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; + private System.Windows.Forms.ToolStripMenuItem gruppenÖffnenToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem gruppenSchliessenToolStripMenuItem; + private System.Windows.Forms.ContextMenuStrip ctxMenuGroups; + private System.Windows.Forms.ToolStripMenuItem gruppenÖffnenToolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem gruppenSchliessenToolStripMenuItem1; } } diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 6c29dd48..39698076 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -205,7 +205,7 @@ namespace OnDoc.UICintrols } index = index + 1; } - if (selindex>0) { ribbonCBAnsicht.SelectedIndex=selindex; } + if (selindex>0) { ribbonCBAnsicht.SelectedIndex=selindex-1; } db = null; // if (standardview != "") { refresh_view(standardview); } if (standardview != null) { refresh_view(standardview); } @@ -376,6 +376,7 @@ namespace OnDoc.UICintrols private void sfDataGrid1_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) { + //var rowColumnIndex = sfDataGrid1.TableControl.PointToCellRowColumnIndex(e.MouseEventArgs.Location); string documentid = ""; try { @@ -391,6 +392,7 @@ namespace OnDoc.UICintrols selected_cellvalue = this.sfDataGrid1.View.GetPropertyAccessProvider().GetValue(e.DataRow.RowData, e.DataColumn.GridColumn.MappingName).ToString(); update_ansicht(dataRow["Bearbeitung_Zwingend"].ToString(), dataRow["toapprove"].ToString(), dataRow["approved"].ToString(), dataRow["faksimile"].ToString()); + sfDataGrid1.ContextMenuStrip = ctxMenuDokList; return; if (dokwerte1.Width > 0) { @@ -418,10 +420,9 @@ namespace OnDoc.UICintrols } catch { - selected_dokumentid = ""; selected_partnernr = ""; - + sfDataGrid1.ContextMenuStrip = ctxMenuGroups; return; } if (vorschauposition == "Keine Vorschau") { return; } @@ -481,10 +482,11 @@ namespace OnDoc.UICintrols db.Get_Tabledata("Select * from dokument where dokumentid='" + selected_dokumentid + "'", false, true); if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["verantwortlich"]) != AppParams.CurrentMitarbeiter) { - if (MessageBox.Show("Durch die Bearbeitung wird die Dokument-Verantwortung übernommen.", "Dokumentbearbieutng", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK) + if (MessageBox.Show("Durch die Bearbeitung wird die Dokument-Verantwortung übernommen.", "Dokumentbearbeiutng", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK) { db.Exec_SQL("Update dokument set verantwortlich=" + AppParams.CurrentMitarbeiter.ToString() + " where dokumentid='" + selected_dokumentid + "'"); Logging.DocLog.Info("Verantwortung für Bearbeitung übernommen", "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung übernommen"); + return; } } Logging.Logging.Debug("Vor Dok In Bearbeitung", "ondoc client", ""); @@ -1723,7 +1725,10 @@ return; } } } - catch { } + catch (Exception ex) + { + //MessageBox.Show(ex.Message); + } } private void RibbonButtonViewStandard_Click(object sender, EventArgs e) @@ -1807,6 +1812,7 @@ return; } } db = null; + ribbonCBAnsicht.SelectedIndex = 1; refresh_ansichten(); } } @@ -1885,7 +1891,7 @@ return; RibbonButtonAttributeEinAusblenden.Checked = true; } show_hide_attribute(); - update_currentview(); + update_currentview(); } //if (dokwerte1.Width == 0) //{ @@ -2212,6 +2218,54 @@ return; { this.profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag); } + + private void ctxMenuDokList_Opening(object sender, CancelEventArgs e) + { + + + if (this.sfDataGrid1.GroupColumnDescriptions.Count > 0) + { + gruppenÖffnenToolStripMenuItem.Visible = true; + gruppenSchliessenToolStripMenuItem.Visible = true; + toolStripMenuItem3.Visible = true; + } + else + { + gruppenÖffnenToolStripMenuItem.Visible = false; + gruppenSchliessenToolStripMenuItem.Visible = false; + toolStripMenuItem3.Visible = false; + + } + + + //var location = this.PointToClient(Cursor.Position); + ////System.Drawing.Point location = new System.Drawing.Point(); + // //location.X = Cursor.Position.X; + // //location.Y = Cursor.Position.Y; + //MessageBox.Show(location.X.ToString() + " / " + location.Y.ToString()); + } + + private void gruppenÖffnenToolStripMenuItem_Click(object sender, EventArgs e) + { + this.sfDataGrid1.ExpandAllGroup(); + } + + private void gruppenSchliessenToolStripMenuItem_Click(object sender, EventArgs e) + { + this.sfDataGrid1.CollapseAllGroup(); + } + + private void gruppenÖffnenToolStripMenuItem1_Click(object sender, EventArgs e) + { + gruppenÖffnenToolStripMenuItem_Click(sender, e); + } + + private void gruppenSchliessenToolStripMenuItem1_Click(object sender, EventArgs e) + { + gruppenSchliessenToolStripMenuItem_Click(sender, e); + } + + } diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx index cd88d383..901ed977 100644 --- a/Client/UIControls/DokList.resx +++ b/Client/UIControls/DokList.resx @@ -566,4 +566,7 @@ vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII= + + 578, 17 + \ No newline at end of file diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index 6a759100..ae5f182d 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 7e28abc9..4eb9997f 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 02722f1e..4dedfe9d 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 1dcb5c8b..a86d9639 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 c1eb1acc..b0ebc058 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index c06254ea..466cbc9b 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 bee511e6..d48fcafa 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache index e95f7aa3..ecbbf743 100644 Binary files a/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/Client/obj/Debug/Client.csproj.GenerateResource.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 11adedb0..e44b4aba 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 02722f1e..4dedfe9d 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 1dcb5c8b..a86d9639 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 c06254ea..466cbc9b 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/SyncFExcel.cs b/DOCGEN/Klassen/SyncFExcel.cs index eaf9c1c9..2c6da7d8 100644 --- a/DOCGEN/Klassen/SyncFExcel.cs +++ b/DOCGEN/Klassen/SyncFExcel.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using Model; using Syncfusion.DocIO.DLS; using Syncfusion.XlsIO; +using Syncfusion.XlsIO.Implementation.XmlSerialization; namespace DOCGEN.Klassen { @@ -65,6 +66,7 @@ namespace DOCGEN.Klassen } try { + worksheet.Range[dv.FieldName].Text = dv.Value.ToString(); } catch { } @@ -76,7 +78,7 @@ namespace DOCGEN.Klassen // Debug.Print(name.Value); //} } - + } if (docdata.Barcode == true) { @@ -116,7 +118,7 @@ namespace DOCGEN.Klassen row = Convert.ToInt32(dr["rowindex"]); col = Convert.ToInt32(dr["columnindex"]); - string value = workBook.Worksheets[Convert.ToInt32(dr["sheet"])-1].Range[row, col].DisplayText.ToString(); + string value = workBook.Worksheets[Convert.ToInt32(dr["sheet"]) - 1].Range[row, col].DisplayText.ToString(); dr["value"] = value; } workBook.Close(); @@ -150,19 +152,81 @@ namespace DOCGEN.Klassen { foreach (IName name in workBook.Names) { - if (name.Name.ToString().ToUpper().Substring(0, 7) == "TGEDKBC") + if (name.Name.ToString().ToUpper().Contains("TGEDKBC")) { + int i = name.Index; int row = worksheet.Range[name.Name].Row; int col = worksheet.Range[name.Name].Column; - IPictureShape picture = worksheet.Pictures.AddPicture(row, col, barcodeimage); + string barcode = Bar25I(docData.Dokumentid.Substring(6, 16)); + worksheet.Range[name.Name].Value= barcode; + //worksheet.Range[dv.FieldName].Text = dv.Value.ToString(); + //IPictureShape picture = worksheet.Pictures.AddPicture(row, col, barcodeimage); } } } - // System.Drawing.Im + // System.Drawing.Im + } + + public bool IsNumeric(string value) + { + return value.All(char.IsNumber); + } + public string Bar25I(string BarTextIn) + { + string Bar25IRet = default; + string BarTextOut = ""; + string TempString = ""; + long CharValue = 0; + string barcodeout = ""; + // Initialize input and output strings + BarTextOut = ""; + BarTextIn = BarTextIn.Trim(); + + // Throw away non-numeric data + TempString = ""; + for (int II = 1, loopTo = BarTextIn.Length; II <= loopTo; II++) + { + if (IsNumeric(BarTextIn.Substring(II - 1, 1))) + { + TempString = TempString + BarTextIn.Substring(II - 1, 1); + } + } + + // If not an even number of digits, add a leading 0 + if (TempString.Length % 2 == 1) + { + TempString = "0" + TempString; } + + // Break digit pairs up and convert to characters- build output string + for (int II = 1, loopTo1 = TempString.Length; II <= loopTo1; II += 2) + { + // Break string into pairs of digits and get value + CharValue = Convert.ToInt32(TempString.Substring(II - 1, 2)); + // translate value to ASCII and save in BarTextOut + if (CharValue < 90) + { + BarTextOut = BarTextOut + (char)(CharValue + 33); + } + else + { + BarTextOut = BarTextOut + (char)(CharValue + 71); + } + } + + // Build ouput string, trailing space for Windows rasterization bug + barcodeout = "{" + BarTextOut + "} "; + + // Return the string + Bar25IRet = barcodeout; + return Bar25IRet; } + + + } + } diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index 6a759100..ae5f182d 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 7e28abc9..4eb9997f 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index 6a759100..ae5f182d 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 7e28abc9..4eb9997f 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 f4e3165d..125cc31c 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ