diff --git a/API_NetFramework/Controllers/ArchivController.cs b/API_NetFramework/Controllers/ArchivController.cs index e0e8d921..069e12e1 100644 --- a/API_NetFramework/Controllers/ArchivController.cs +++ b/API_NetFramework/Controllers/ArchivController.cs @@ -140,8 +140,8 @@ namespace API_NetFramework.Controllers ArchivAktiv= System.Configuration.ConfigurationManager.AppSettings["ArchivierungAktiv"].ToString(); if (ArchivAktiv != "True") { - string message = ArchivAktiv = System.Configuration.ConfigurationManager.AppSettings["ArchivierungNoAktivMessage"].ToString(); - return Content(HttpStatusCode.InternalServerError, message); + string message = "Hinweismeldung: "+System.Configuration.ConfigurationManager.AppSettings["ArchivierungNoAktivMessage"].ToString(); + return Content(HttpStatusCode.OK, message); } try { diff --git a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user index e767a736..0d4c7f81 100644 --- a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>E:\Software-Projekte\OnDoc\PubServices\OnDoc - True|2025-02-21T09:28:09.2279895Z||;True|2025-02-21T09:59:33.3258979+01:00||;True|2025-02-12T12:49:01.5618262+01:00||;True|2025-02-09T14:47:25.8660147+01:00||;True|2025-02-09T12:40:23.8730229+01:00||;True|2025-02-05T14:41:27.6196364+01:00||;True|2025-02-04T22:19:44.0470841+01:00||;True|2025-02-04T21:33:03.4165210+01:00||;True|2025-02-02T20:06:51.6815543+01:00||;True|2025-01-20T10:17:24.5425008+01:00||;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||; + True|2025-02-25T18:05:51.2823294Z||;True|2025-02-25T19:04:29.0810473+01:00||;True|2025-02-21T10:28:09.2279895+01:00||;True|2025-02-21T09:59:33.3258979+01:00||;True|2025-02-12T12:49:01.5618262+01:00||;True|2025-02-09T14:47:25.8660147+01:00||;True|2025-02-09T12:40:23.8730229+01:00||;True|2025-02-05T14:41:27.6196364+01:00||;True|2025-02-04T22:19:44.0470841+01:00||;True|2025-02-04T21:33:03.4165210+01:00||;True|2025-02-02T20:06:51.6815543+01:00||;True|2025-01-20T10:17:24.5425008+01:00||;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||; @@ -82,22 +82,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 04/09/2024 19:25:14 - 02/19/2025 15:44:36 + 02/22/2025 07:07:32 - 02/19/2025 15:44:36 + 02/22/2025 07:07:32 - 12/26/2024 14:12:09 + 02/21/2025 13:26:10 - 12/26/2024 14:12:09 + 02/21/2025 13:26:10 - 02/19/2025 10:54:08 + 02/22/2025 06:57:47 - 02/19/2025 10:54:08 + 02/22/2025 06:57:47 10/20/2023 22:35:02 @@ -130,13 +130,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:35:04 - 02/21/2025 06:51:17 + 02/23/2025 17:15:42 12/23/2024 22:17:43 - 02/21/2025 06:51:17 + 02/23/2025 17:15:42 11/27/2023 09:49:58 @@ -250,16 +250,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/21/2025 06:22:11 - 02/21/2025 06:51:12 + 02/23/2025 14:53:16 - 02/21/2025 06:51:12 + 02/23/2025 14:53:16 - 02/21/2025 10:28:08 + 02/25/2025 19:00:18 - 02/21/2025 10:28:08 + 02/25/2025 19:00:18 11/13/2012 13:19:34 @@ -448,10 +448,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:33:58 - 02/11/2025 17:14:08 + 02/23/2025 14:08:20 - 02/11/2025 17:14:08 + 02/23/2025 14:08:20 01/24/2025 09:01:41 @@ -658,7 +658,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 06/03/2024 08:11:55 - 02/21/2025 10:28:09 + 02/25/2025 19:04:27 \ No newline at end of file diff --git a/API_NetFramework/Web.config b/API_NetFramework/Web.config index 10344aa5..88744859 100644 --- a/API_NetFramework/Web.config +++ b/API_NetFramework/Web.config @@ -32,7 +32,7 @@ - + diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index e152b6d0..447023f9 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.dll.config b/API_NetFramework/bin/OnDoc_NetFramework.dll.config index 10344aa5..88744859 100644 --- a/API_NetFramework/bin/OnDoc_NetFramework.dll.config +++ b/API_NetFramework/bin/OnDoc_NetFramework.dll.config @@ -32,7 +32,7 @@ - + diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index f259f631..ab7ce04d 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 f82076b3..a26cb5d7 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -5516,3 +5516,71 @@ Mit folgendem Link kann OnDoc direkt gestartet werden
2025-02-23 17:02:00.4145|DEBUG|OnDoc| 2025-02-23 17:02:00.4426|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal 2025-02-23 17:02:00.4426|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-25 18:51:11.7591|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002490036 +2025-02-25 18:51:11.8246|DEBUG|OnDoc| +2025-02-25 18:51:11.8286|DEBUG|OnDoc| +2025-02-25 18:51:11.8286|DEBUG|OnDoc| +2025-02-25 18:51:11.8286|DEBUG|OnDoc| +2025-02-25 18:51:11.8286|ERROR|OnDoc|OFFEDK0082025002490036 ErstellungInOffec - EDKB02DMS +2025-02-25 18:51:11.8286|DEBUG|OnDoc| +2025-02-25 18:51:11.8636|DEBUG|OnDoc| +2025-02-25 18:51:11.8636|INFO|OnDoc|Dokumentarchivierung via EDKB02_DMS ausgelöstOFFEDK0082025002490036 +2025-02-25 18:58:23.3206|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002489957 +2025-02-25 18:58:23.3526|DEBUG|OnDoc| +2025-02-25 18:58:23.3526|DEBUG|OnDoc| +2025-02-25 18:58:23.3526|DEBUG|OnDoc| +2025-02-25 18:58:23.3526|DEBUG|OnDoc| +2025-02-25 18:58:23.3526|ERROR|OnDoc|OFFEDK0082025002489957 ErstellungInOffec - EDKB02DMS +2025-02-25 18:58:23.3586|DEBUG|OnDoc| +2025-02-25 18:58:23.3736|DEBUG|OnDoc| +2025-02-25 18:58:23.3736|INFO|OnDoc|Dokumentarchivierung via EDKB02_DMS ausgelöstOFFEDK0082025002489957 +2025-02-25 18:58:44.2476|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002489996 +2025-02-25 18:58:44.2496|DEBUG|OnDoc| +2025-02-25 18:58:44.2496|DEBUG|OnDoc| +2025-02-25 18:58:44.2496|DEBUG|OnDoc| +2025-02-25 18:58:44.2496|DEBUG|OnDoc| +2025-02-25 18:58:44.2496|ERROR|OnDoc|OFFEDK0082025002489996 ErstellungInOffec - EDKB02DMS +2025-02-25 18:58:44.2496|DEBUG|OnDoc| +2025-02-25 18:58:44.2496|DEBUG|OnDoc| +2025-02-25 18:58:44.2496|INFO|OnDoc|Dokumentarchivierung via EDKB02_DMS ausgelöstOFFEDK0082025002489996 +2025-02-25 19:01:26.8953|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002489933 +2025-02-25 19:01:26.9243|DEBUG|OnDoc| +2025-02-25 19:01:26.9243|DEBUG|OnDoc| +2025-02-25 19:01:26.9243|DEBUG|OnDoc| +2025-02-25 19:01:26.9243|DEBUG|OnDoc| +2025-02-25 19:01:26.9243|ERROR|OnDoc|OFFEDK0082025002489933 ErstellungInOffec - EDKB02DMS +2025-02-25 19:01:26.9243|DEBUG|OnDoc| +2025-02-25 19:01:26.9623|ERROR|OnDoc|Der Wert NULL kann in die status-Spalte, EDOKA_DMS.dbo.statushistory-Tabelle nicht eingefügt werden. Die Spalte lässt NULL-Werte nicht zu. Fehler bei INSERT. +Die Anweisung wurde beendet. +done +2025-02-25 19:01:26.9813|ERROR|OnDoc|Die Tabelle 0 kann nicht gefunden werden. +2025-02-25 19:02:11.7068|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002489912 +2025-02-25 19:02:11.7068|DEBUG|OnDoc| +2025-02-25 19:02:11.7068|DEBUG|OnDoc| +2025-02-25 19:02:11.7068|DEBUG|OnDoc| +2025-02-25 19:02:11.7068|DEBUG|OnDoc| +2025-02-25 19:02:11.7068|ERROR|OnDoc|OFFEDK0082025002489912 ErstellungInOffec - EDKB02DMS +2025-02-25 19:02:11.7068|DEBUG|OnDoc| +2025-02-25 19:02:11.7192|DEBUG|OnDoc| +2025-02-25 19:02:11.7192|INFO|OnDoc|Dokumentarchivierung via EDKB02_DMS ausgelöstOFFEDK0082025002489912 +2025-02-25 19:02:29.9852|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002489928 +2025-02-25 19:02:30.0182|DEBUG|OnDoc| +2025-02-25 19:02:30.0182|DEBUG|OnDoc| +2025-02-25 19:02:30.0182|DEBUG|OnDoc| +2025-02-25 19:02:30.0182|DEBUG|OnDoc| +2025-02-25 19:02:30.0182|ERROR|OnDoc|OFFEDK0082025002489928 ErstellungInOffec - EDKB02DMS +2025-02-25 19:02:30.0182|DEBUG|OnDoc| +2025-02-25 19:02:30.0302|DEBUG|OnDoc| +2025-02-25 19:02:30.0302|INFO|OnDoc|Dokumentarchivierung via EDKB02_DMS ausgelöstOFFEDK0082025002489928 +2025-02-25 20:17:06.7189|DEBUG|OnDoc| +2025-02-25 20:17:06.7439|DEBUG|OnDoc| +2025-02-25 20:17:06.7689|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-25 20:17:06.7689|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-25 20:35:41.1415|DEBUG|OnDoc| +2025-02-25 20:35:41.1666|DEBUG|OnDoc| +2025-02-25 20:35:41.1926|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-25 20:35:41.1926|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-25 21:13:44.5845|DEBUG|OnDoc| +2025-02-25 21:13:44.6106|DEBUG|OnDoc| +2025-02-25 21:13:44.6387|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-25 21:13:44.6387|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll index e152b6d0..447023f9 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 f259f631..ab7ce04d 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/Web.config b/API_NetFramework/obj/Debug/Package/PackageTmp/Web.config index 35a70a63..a5159337 100644 --- a/API_NetFramework/obj/Debug/Package/PackageTmp/Web.config +++ b/API_NetFramework/obj/Debug/Package/PackageTmp/Web.config @@ -32,7 +32,7 @@ - + diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll index 4a0276b7..40ea92ed 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 025a35e5..fe497ba2 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/Database.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.dll index bfd1e892..d6889175 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.pdb index cc39e99b..6785d7ca 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll index 472bc965..b3ac94dc 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.pdb index 9eb7321e..0a74fbcf 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.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 7a4c2ae1..447023f9 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 7f4c1071..ab7ce04d 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/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config b/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config index 10344aa5..88744859 100644 --- a/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config +++ b/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config @@ -32,7 +32,7 @@ - + diff --git a/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config b/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config index 35a70a63..a5159337 100644 --- a/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config +++ b/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config @@ -32,7 +32,7 @@ - + diff --git a/Client/Client.csproj b/Client/Client.csproj index ceec33c0..aac7f126 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -401,6 +401,7 @@ + diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index 7214c1f6..e92f9e17 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(177, 26); this.label2.TabIndex = 2; - this.label2.Text = "23. Februar 2025"; + this.label2.Text = "25. Februar 2025"; // // SplashScreen // diff --git a/Client/DocMgmt/DokTypSelect.Designer.cs b/Client/DocMgmt/DokTypSelect.Designer.cs index 93351667..90b9cd6e 100644 --- a/Client/DocMgmt/DokTypSelect.Designer.cs +++ b/Client/DocMgmt/DokTypSelect.Designer.cs @@ -446,7 +446,7 @@ namespace OnDoc.DocMgmt // this.ordnerLöschenToolStripMenuItem.Name = "ordnerLöschenToolStripMenuItem"; this.ordnerLöschenToolStripMenuItem.Size = new System.Drawing.Size(308, 22); - this.ordnerLöschenToolStripMenuItem.Text = "Vorlage / Ordner mit Unterlementen löschen"; + this.ordnerLöschenToolStripMenuItem.Text = "Vorlage / Ordner mit Unterelementen löschen"; this.ordnerLöschenToolStripMenuItem.Click += new System.EventHandler(this.ordnerLöschenToolStripMenuItem_Click); // // detailsAnzeigenToolStripMenuItem1 @@ -534,7 +534,7 @@ namespace OnDoc.DocMgmt this.tsbtndelete.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbtndelete.Name = "tsbtndelete"; this.tsbtndelete.Size = new System.Drawing.Size(48, 48); - this.tsbtndelete.Text = "Vorlage / Ordner mit Unterlementen löschen"; + this.tsbtndelete.Text = "Vorlage / Ordner mit Unterelementen löschen"; this.tsbtndelete.Click += new System.EventHandler(this.tsbtndelete_Click); // // grpVorlagen diff --git a/Client/Klassen/clsAppParams.cs b/Client/Klassen/clsAppParams.cs index f92fb78c..de4d603f 100644 --- a/Client/Klassen/clsAppParams.cs +++ b/Client/Klassen/clsAppParams.cs @@ -26,7 +26,7 @@ namespace OnDoc.Klassen public static string UseAPI { get; set; } = "FALSE"; public static int CurrentMitarbeiter { get; set; } - public static string CurrentTGNummer { get; set; } = ""; + public static string RESTURI { get; set; } = "";//"http://localhost:2032/"; public static string apikey { get; set; } = ""; @@ -39,6 +39,8 @@ namespace OnDoc.Klassen public static bool isSysadmin { get; set; } = false; public static bool showlogin { get; set; } = false; public static string currenttgnummer { get; set; }=""; + public static string systemtgnummer { get; set; } = ""; + public static string umgebung { get; set; } = ""; public static string ZusatzFont { get; set; } = ""; public static string ZusatzFontSize { get; set; } = ""; diff --git a/Client/Klassen/clsProcessWatch.cs b/Client/Klassen/clsProcessWatch.cs index 2e9eec40..d040c1dd 100644 --- a/Client/Klassen/clsProcessWatch.cs +++ b/Client/Klassen/clsProcessWatch.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using System.Management; using System.Security.AccessControl; using System.Text; using System.Threading; @@ -50,6 +51,27 @@ namespace OnDoc.Klassen } } + private static string GetProcessOwner(int processId) + { + string query = "SELECT * FROM Win32_Process WHERE ProcessID = " + processId; + ManagementObjectSearcher searcher = new ManagementObjectSearcher(query); + ManagementObjectCollection processList = searcher.Get(); + + foreach (ManagementObject obj in processList) + { + string[] argList = new string[] { string.Empty, string.Empty }; + int returnVal = Convert.ToInt32(obj.InvokeMethod("GetOwner", argList)); + + if (returnVal == 0) + { + // return DOMAIN\user + return argList[1] + "\\" + argList[0]; + } + } + searcher = null; + + return "NO OWNER"; + } private static void WatchProcesses(object source, ElapsedEventArgs e) { bool word = false; @@ -81,26 +103,45 @@ namespace OnDoc.Klassen foreach (Process p in localByName) { - Logging.Logging.Debug(fc.dokumentid + "/" + p.MainWindowTitle, "", ""); - if (p.MainWindowTitle.IndexOf(fc.dokumentid) > -1 || p.MainWindowTitle.Trim() == "") - + string owner = GetProcessOwner(p.Id); + owner = owner.ToUpper(); + Logging.Logging.Debug(AppParams.systemtgnummer+"/"+AppParams.currenttgnummer+"/"+owner+"/"+fc.dokumentid + "/" + p.MainWindowTitle, "", ""); + if (p.MainWindowTitle.IndexOf(fc.dokumentid) > -1 || + (p.MainWindowTitle.Trim() == "" && owner.Contains(AppParams.systemtgnummer.ToUpper()))) { if (p.MainWindowTitle.Trim() != "") { fc.Lastfound = DateTime.Now; } found = true; save_to_db(fc); - - break; + } } + //foreach (Process p in localByName) + //{ + // Logging.Logging.Debug(fc.dokumentid + "/" + p.MainWindowTitle, "", ""); + // if (p.MainWindowTitle.IndexOf(fc.dokumentid) > -1 || p.MainWindowTitle.Trim() == "") + + // { + // if (p.MainWindowTitle.Trim() != "") { fc.Lastfound = DateTime.Now; } + // found = true; + // save_to_db(fc); + + // break; + // } + + //} + } if (excel) { Process[] localByName = Process.GetProcessesByName("EXCEL"); foreach (Process p in localByName) { - if (p.MainWindowTitle.IndexOf(fc.dokumentid) > -1 || p.MainWindowTitle.Trim() == "") + string owner = GetProcessOwner(p.Id); + owner = owner.ToUpper(); + if (p.MainWindowTitle.IndexOf(fc.dokumentid) > -1 || + (p.MainWindowTitle.Trim() == "" && owner.Contains(AppParams.systemtgnummer.ToUpper()))) { if (p.MainWindowTitle.Trim() != "") { fc.Lastfound = DateTime.Now; } found = true; @@ -108,6 +149,17 @@ namespace OnDoc.Klassen } } + //Process[] localByName = Process.GetProcessesByName("EXCEL"); + //foreach (Process p in localByName) + //{ + // if (p.MainWindowTitle.IndexOf(fc.dokumentid) > -1 || p.MainWindowTitle.Trim() == "") + // { + // if (p.MainWindowTitle.Trim() != "") { fc.Lastfound = DateTime.Now; } + // found = true; + // save_to_db(fc); + // } + + //} } if (!found) { diff --git a/Client/Program.cs b/Client/Program.cs index 06364d96..679ad75f 100644 --- a/Client/Program.cs +++ b/Client/Program.cs @@ -58,6 +58,7 @@ namespace OnDoc mitarbeiter = mitarbeiter.Substring(mitarbeiter.IndexOf("\\") + 1); Logging.Logging.Debug("EDK-Umleitung", args[0], ""); AppParams.currenttgnummer = mitarbeiter; + AppParams.systemtgnummer = mitarbeiter; db.Get_Tabledata("Select count(*) from ondoc_edk_routing where aktiv=1 and tgnummer='" + AppParams.currenttgnummer + "'", false, true); if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) { diff --git a/Client/Start.cs b/Client/Start.cs index 44de5f81..67bd1e99 100644 --- a/Client/Start.cs +++ b/Client/Start.cs @@ -54,9 +54,10 @@ namespace OnDoc Logging.Logging.Debug("Start", "OnDoc-Client", ""); mitarbeiter = System.Security.Principal.WindowsIdentity.GetCurrent().Name; - mitarbeiter = mitarbeiter.Substring(mitarbeiter.IndexOf("\\") + 1); - Logging.Logging.Debug("Start", "start.cs", mitarbeiter); + AppParams.systemtgnummer = mitarbeiter; + + Logging.Logging.Info("Start", "start.cs", mitarbeiter); DB db = new DB(AppParams.connectionstring); db.Get_Tabledata("Select mitarbeiternr, tgnummer from mitarbeiter where aktiv = 1 and tgnummer='" + mitarbeiter + "'", false, true); if (db.dsdaten.Tables[0].Rows.Count == 0) diff --git a/Client/UIControls/Approval.Designer.cs b/Client/UIControls/Approval.Designer.cs index 645243bd..8402ec2a 100644 --- a/Client/UIControls/Approval.Designer.cs +++ b/Client/UIControls/Approval.Designer.cs @@ -65,6 +65,8 @@ this.ribbonButtonNotApproved = new System.Windows.Forms.RibbonButton(); this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel(); this.ribbonButton1 = new System.Windows.Forms.RibbonButton(); + this.panelsign = new System.Windows.Forms.Panel(); + this.label5 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -72,6 +74,7 @@ this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit(); this.grpDetails.SuspendLayout(); + this.panelsign.SuspendLayout(); this.SuspendLayout(); // // splitContainer1 @@ -86,6 +89,7 @@ // // splitContainer1.Panel2 // + this.splitContainer1.Panel2.Controls.Add(this.panelsign); this.splitContainer1.Panel2.Controls.Add(this.panel1); this.splitContainer1.Panel2.Controls.Add(this.grpDetails); this.splitContainer1.Panel2.Controls.Add(this.docPreview1); @@ -492,6 +496,26 @@ this.ribbonButton1.Text = "Aktualisieren"; this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click); // + // panelsign + // + this.panelsign.BackColor = System.Drawing.SystemColors.ActiveBorder; + this.panelsign.Controls.Add(this.label5); + this.panelsign.Location = new System.Drawing.Point(117, 47); + this.panelsign.Name = "panelsign"; + this.panelsign.Size = new System.Drawing.Size(804, 167); + this.panelsign.TabIndex = 5; + this.panelsign.Visible = false; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label5.Location = new System.Drawing.Point(188, 81); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(390, 24); + this.label5.TabIndex = 0; + this.label5.Text = "Das Dokument wird signiert - bitte warten"; + // // Approval // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -507,6 +531,8 @@ ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit(); this.grpDetails.ResumeLayout(false); this.grpDetails.PerformLayout(); + this.panelsign.ResumeLayout(false); + this.panelsign.PerformLayout(); this.ResumeLayout(false); } @@ -544,5 +570,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.RibbonPanel ribbonPanel2; private System.Windows.Forms.RibbonButton ribbonButton1; + private System.Windows.Forms.Panel panelsign; + private System.Windows.Forms.Label label5; } } diff --git a/Client/UIControls/Approval.cs b/Client/UIControls/Approval.cs index e3d13498..dbe9c310 100644 --- a/Client/UIControls/Approval.cs +++ b/Client/UIControls/Approval.cs @@ -202,6 +202,7 @@ namespace OnDoc.UIControls } else { + db.Exec_SQL("Update dokument set approval1=1 where dokumentid='" + dr["dokumentid"].ToString()+"'"); } @@ -212,6 +213,8 @@ namespace OnDoc.UIControls db.Get_Tabledata("Select * from dokument where dokumentid='" + dr["dokumentid"].ToString() + "'", false, true); if (db.dsdaten.Tables[0].Rows[0]["approved"].ToString()=="True") { + panelsign.Visible = true; + Application.DoEvents(); Cursor = Cursors.WaitCursor; DOCGEN.DocGen dg = new DocGen(AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey); if (dg.signdoc(dr["dokumentid"].ToString(), AppParams.tempdir)) @@ -219,6 +222,8 @@ namespace OnDoc.UIControls db.Exec_SQL("Update Dokument set signiert=1, mutierer=" + AppParams.CurrentMitarbeiter.ToString() + ", mutiertam=getdate() where dokumentid='" + dr["dokumentid"].ToString() + "'"); } dg = null; + panelsign.Visible = false; + Application.DoEvents(); Cursor = Cursors.Default; } diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index 7db89d42..ede3d96f 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -814,7 +814,7 @@ namespace OnDoc.UICintrols this.ribbonButton3.MinSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium; this.ribbonButton3.Name = "ribbonButton3"; this.ribbonButton3.SmallImage = global::OnDoc.Properties.Resources.Partner_16x16_32; - this.ribbonButton3.Text = "Partner"; + this.ribbonButton3.Text = "Kunde"; this.ribbonButton3.Click += new System.EventHandler(this.ribbonButton3_Click_1); // // RibbonGroupFilter diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 1e846c28..0480c52c 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -1417,7 +1417,14 @@ namespace OnDoc.UICintrols { StreamReader reader = new StreamReader(response.GetResponseStream()); string responseContent = reader.ReadToEnd(); - Logging.DocLog.Info("Dokument archiviert", "OnDoc", documentid, "", "Dokument archiviert und abgeschlossen"); + if (responseContent.Contains("Hinweismeldung:")) + { + MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " wurde nicht durchgeführt:" + Environment.NewLine + responseContent); + return; + } + + + Logging.DocLog.Info("Dokument archiviert", "OnDoc", documentid, "", "Dokument archiviert und abgeschlossen"); } else { @@ -1437,7 +1444,7 @@ namespace OnDoc.UICintrols { var records = sfDataGrid1.View.GetSelectedRecords(); if (records.Count < 1) { return; } - if (MessageBox.Show("Gewählte Dokument(e) archiviern und abschliessen", "Dokument archivieren und abschliessen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; } + if (MessageBox.Show("Gewählte Dokument(e) archivieren und abschliessen?", "Dokument archivieren und abschliessen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; } DB db = new DB(AppParams.connectionstring); Cursor = Cursors.WaitCursor; diff --git a/Client/UIControls/Partnersuche.cs b/Client/UIControls/Partnersuche.cs index 13a0ddbd..739dfcb4 100644 --- a/Client/UIControls/Partnersuche.cs +++ b/Client/UIControls/Partnersuche.cs @@ -84,6 +84,7 @@ namespace OnDoc.UIControls try { TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true); + trefferlistedata.Columns[0].HeaderText = "Kunden-Nr."; try { trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20; diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 4c780084..91420c51 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 78f252cb..bf5f3857 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 12b260a9..ef0ef75c 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 17cea691..24d78dc5 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 d70da1e8..e732fdeb 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache index d3aeaf11..05f71ae1 100644 --- a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache +++ b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34c3609b08e0edcfa9562aab3046bc82a3e9b1c632b03c992c222fe1502d3c2a +306896684bce3851df942bde604ba5f484881e00d57a1005c56d5b6b051718b6 diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache index 5e0e3908..c624a184 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 0a61aca9..fdf539e8 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 835affde..41521f8e 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 4c780084..91420c51 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 78f252cb..bf5f3857 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 17cea691..24d78dc5 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/ToolsDoksImportExport/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ToolsDoksImportExport/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 6fb8f83a..1148674a 100644 Binary files a/ToolsDoksImportExport/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/ToolsDoksImportExport/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache index 357468d9..b1a627b8 100644 Binary files a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache and b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache differ diff --git a/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache index ef40e6b2..45bb0a2a 100644 Binary files a/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/ZZ_Signature_C/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ