diff --git a/API_NetFramework/Controllers/ArchivController.cs b/API_NetFramework/Controllers/ArchivController.cs index 4ddd6a1a..e11e5eda 100644 --- a/API_NetFramework/Controllers/ArchivController.cs +++ b/API_NetFramework/Controllers/ArchivController.cs @@ -320,7 +320,7 @@ namespace API_NetFramework.Controllers break; case "3": APILogging.Log((HttpRequestMessage)Request, db.dsdaten.Tables[0].Rows[0][0].ToString() + dokumentid, LogLevelType.Debug); - return Content(HttpStatusCode.NotFound, returnmessage); + return Content(HttpStatusCode.OK, returnmessage); case "0": return (ArchivDocFromDatabase(dokumentid)); case "4": diff --git a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user index 61300bec..ba86cf66 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-02-09T13:47:25.8660147Z||;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-12T11:49:01.5618262Z||;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||; - 03/06/2024 09:20:46 + 06/03/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 - 03/06/2024 09:20:41 + 06/03/2024 09:20:41 07/19/2024 12:24:15 @@ -64,28 +64,28 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/19/2024 12:24:15 - 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 + 06/03/2024 09:20:40 - 10/09/2013 17:29:20 + 09/10/2013 17:29:20 - 10/09/2013 17:29:20 + 09/10/2013 17:29:20 - 09/04/2024 19:25:14 + 04/09/2024 19:25:14 - 02/07/2025 21:09:44 + 02/09/2025 17:54:19 - 02/07/2025 21:09:44 + 02/09/2025 17:54:19 12/26/2024 14:12:09 @@ -115,7 +115,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:35:02 - 11/02/2014 16:28:40 + 02/11/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 - 02/09/2025 12:40:22 + 02/12/2025 07:57:46 12/23/2024 22:17:43 - 02/09/2025 12:40:22 + 02/12/2025 07:57:46 11/27/2023 09:49:58 - 07/09/2023 11:54:46 + 09/07/2023 11:54:46 - 07/09/2023 12:19:34 + 09/07/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 - 09/04/2024 18:58:02 + 04/09/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 - 12/11/2018 18:29:00 + 11/12/2018 18:29:00 01/25/2019 00:18:54 - 12/11/2018 18:28:58 + 11/12/2018 18:28:58 - 12/11/2018 18:29:00 + 11/12/2018 18:29:00 10/31/2023 16:00:18 - 05/03/2023 23:41:40 + 03/05/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 - 12/11/2018 18:28:58 + 11/12/2018 18:28:58 - 11/04/2022 19:09:46 + 04/11/2022 19:09:46 02/02/2025 15:33:38 @@ -229,7 +229,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 11/28/2018 00:07:54 - 08/03/2023 06:09:56 + 03/08/2023 06:09:56 04/30/2024 21:58:56 @@ -244,16 +244,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 01/28/2025 08:37:54 - 02/09/2025 12:40:21 + 02/12/2025 07:57:43 - 02/09/2025 12:40:21 + 02/12/2025 07:57:43 - 02/09/2025 14:41:45 + 02/12/2025 11:31:47 - 02/09/2025 14:41:45 + 02/12/2025 11:31:47 11/13/2012 13:19:34 @@ -301,10 +301,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/15/2022 06:21:10 - 05/10/2021 02:47:54 + 10/05/2021 02:47:54 - 05/10/2021 02:49:46 + 10/05/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 - 08/07/2017 03:30:56 + 07/08/2017 03:30:56 - 12/09/2024 21:02:32 + 09/12/2024 21:02:32 - 12/09/2024 21:21:22 + 09/12/2024 21:21:22 - 12/09/2024 21:25:18 + 09/12/2024 21:25:18 - 12/09/2024 21:34:20 + 09/12/2024 21:34:20 - 12/09/2024 21:33:50 + 09/12/2024 21:33:50 - 12/09/2024 21:03:58 + 09/12/2024 21:03:58 - 12/09/2024 21:23:26 + 09/12/2024 21:23:26 - 12/09/2024 21:32:30 + 09/12/2024 21:32:30 - 12/09/2024 21:26:42 + 09/12/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 - 08/05/2022 05:31:02 + 05/08/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 - 01/10/2013 22:54:22 + 10/01/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 - 11/02/2014 15:26:04 + 02/11/2014 15:26:04 10/20/2023 22:33:48 @@ -442,10 +442,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:33:58 - 02/09/2025 07:54:24 + 02/11/2025 17:14:08 - 02/09/2025 07:54:24 + 02/11/2025 17:14:08 01/24/2025 09:01:41 @@ -460,196 +460,196 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/04/2025 20:25:44 - 05/10/2016 15:11:52 + 10/05/2016 15:11:52 01/23/2014 13:57:34 - 09/04/2024 19:24:38 + 04/09/2024 19:24:38 - 09/04/2024 19:24:38 + 04/09/2024 19:24:38 - 03/06/2024 09:16:17 + 06/03/2024 09:16:17 - 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:16 - 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:15 - 03/06/2024 09:16:14 + 06/03/2024 09:16:14 - 03/06/2024 08:11:55 + 06/03/2024 08:11:55 - 03/06/2024 08:11:55 + 06/03/2024 08:11:55 07/19/2024 12:25:43 - 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:14 - 03/06/2024 09:16:13 + 06/03/2024 09:16:13 - 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 09:16:17 - 03/06/2024 08:12:04 + 06/03/2024 08:12:04 - 01/10/2024 20:21:44 + 10/01/2024 20:21:44 - 03/06/2024 08:11:55 + 06/03/2024 08:11:55 - 03/06/2024 08:11:55 + 06/03/2024 08:11:55 - 03/06/2024 10:48:16 + 06/03/2024 10:48:16 07/19/2024 12:25:43 - 03/06/2024 08:11:55 + 06/03/2024 08:11:55 02/04/2025 21:33:02 diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll index bf2dd661..eca6c249 100644 Binary files a/API_NetFramework/bin/Database.dll and b/API_NetFramework/bin/Database.dll differ diff --git a/API_NetFramework/bin/Database.pdb b/API_NetFramework/bin/Database.pdb index eb46c762..0446abd8 100644 Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ diff --git a/API_NetFramework/bin/OnDocOffice.dll b/API_NetFramework/bin/OnDocOffice.dll index ebafee9e..ac18f262 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 d0c62156..e05826c9 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 ae259e47..45c3b5e8 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 d2ed01cb..06957257 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 df1e96d4..c6f3172b 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -5082,3 +5082,299 @@ Mit folgendem Link kann OnDoc direkt gestartet werden
2025-02-09 20:43:06.0266|DEBUG|OnDoc| 2025-02-09 20:43:06.0362|DEBUG|OnDoc| 2025-02-09 20:43:06.0542|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-10 18:54:36.6167|DEBUG|OnDoc|Mailversand: 1287 +2025-02-10 18:54:37.8879|DEBUG|OnDoc| +2025-02-10 18:54:37.8989|DEBUG|OnDoc| +2025-02-10 18:54:37.9204|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-10 18:54:40.9009|DEBUG|OnDoc|Mailversand: 2 +2025-02-10 18:54:44.2942|DEBUG|OnDoc| +2025-02-10 18:54:44.3307|DEBUG|OnDoc| +2025-02-10 18:54:44.3467|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-10 18:55:08.4446|DEBUG|OnDoc|Mailversand: 1 +2025-02-10 18:55:08.4776|DEBUG|OnDoc| +2025-02-10 18:55:08.4776|DEBUG|OnDoc| +2025-02-10 18:55:08.5066|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-10 18:55:28.7089|DEBUG|OnDoc|Mailversand: 1 +2025-02-10 18:55:28.7349|DEBUG|OnDoc| +2025-02-10 18:55:28.7379|DEBUG|OnDoc| +2025-02-10 18:55:28.7549|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-10 18:55:33.5810|DEBUG|OnDoc| +2025-02-10 18:55:33.5810|DEBUG|OnDoc| +2025-02-10 18:55:33.6180|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-10 18:55:33.6180|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-10 18:55:33.6900|DEBUG|OnDoc| +2025-02-10 18:55:33.6900|DEBUG|OnDoc| +2025-02-10 18:55:33.7429|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-02-10 18:55:33.7429|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-02-10 18:55:55.6423|DEBUG|OnDoc|Mailversand: 1 +2025-02-10 18:55:55.6723|DEBUG|OnDoc| +2025-02-10 18:55:55.6753|DEBUG|OnDoc| +2025-02-10 18:55:55.7009|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-10 18:55:59.8145|DEBUG|OnDoc| +2025-02-10 18:55:59.8145|DEBUG|OnDoc| +2025-02-10 18:55:59.8515|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-10 18:55:59.8515|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-10 18:55:59.9030|DEBUG|OnDoc| +2025-02-10 18:55:59.9030|DEBUG|OnDoc| +2025-02-10 18:55:59.9340|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-02-10 18:55:59.9340|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-02-11 12:49:28.0783|DEBUG|OnDoc| +2025-02-11 12:49:28.1143|DEBUG|OnDoc| +2025-02-11 12:49:28.1413|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 12:49:28.1433|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 12:51:06.7264|DEBUG|OnDoc| +2025-02-11 12:51:06.7264|DEBUG|OnDoc| +2025-02-11 12:51:06.7595|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 12:51:06.7595|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 12:53:35.4588|DEBUG|OnDoc| +2025-02-11 12:53:35.4920|DEBUG|OnDoc| +2025-02-11 12:53:35.5200|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 12:53:35.5200|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 12:54:31.5450|DEBUG|OnDoc| +2025-02-11 12:54:31.5480|DEBUG|OnDoc| +2025-02-11 12:54:31.5732|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 12:54:31.5732|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 12:56:30.9047|DEBUG|OnDoc| +2025-02-11 12:56:30.9399|DEBUG|OnDoc| +2025-02-11 12:56:30.9693|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 12:56:30.9713|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 13:11:09.4480|DEBUG|OnDoc| +2025-02-11 13:11:09.4804|DEBUG|OnDoc| +2025-02-11 13:11:09.5064|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 13:11:09.5084|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 13:12:32.1546|DEBUG|OnDoc| +2025-02-11 13:12:32.1546|DEBUG|OnDoc| +2025-02-11 13:12:32.1816|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 13:12:32.1816|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 15:41:21.0091|DEBUG|OnDoc| +2025-02-11 15:41:21.0334|DEBUG|OnDoc| +2025-02-11 15:41:21.0593|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 15:41:21.0593|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 15:58:08.6871|DEBUG|OnDoc| +2025-02-11 15:58:08.7121|DEBUG|OnDoc| +2025-02-11 15:58:08.7441|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 15:58:08.7441|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 15:58:39.8741|DEBUG|OnDoc| +2025-02-11 15:58:39.8741|DEBUG|OnDoc| +2025-02-11 15:58:39.9003|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 15:58:39.9003|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:02:00.4622|DEBUG|OnDoc| +2025-02-11 16:02:00.4872|DEBUG|OnDoc| +2025-02-11 16:02:00.5132|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:02:00.5132|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:03:01.5891|DEBUG|OnDoc| +2025-02-11 16:03:01.5891|DEBUG|OnDoc| +2025-02-11 16:03:01.6167|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:03:01.6187|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:10:48.6382|DEBUG|OnDoc| +2025-02-11 16:10:48.6632|DEBUG|OnDoc| +2025-02-11 16:10:48.6902|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:10:48.6902|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:15:33.3462|DEBUG|OnDoc| +2025-02-11 16:15:33.3715|DEBUG|OnDoc| +2025-02-11 16:15:33.4013|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:15:33.4013|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:16:10.1389|DEBUG|OnDoc| +2025-02-11 16:16:10.1389|DEBUG|OnDoc| +2025-02-11 16:16:10.1669|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:16:10.1669|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:19:20.5111|DEBUG|OnDoc| +2025-02-11 16:19:20.5111|DEBUG|OnDoc| +2025-02-11 16:19:20.5381|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:19:20.5401|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:20:43.1551|DEBUG|OnDoc| +2025-02-11 16:20:43.1551|DEBUG|OnDoc| +2025-02-11 16:20:43.1833|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:20:43.1833|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:21:58.2543|DEBUG|OnDoc| +2025-02-11 16:21:58.2785|DEBUG|OnDoc| +2025-02-11 16:21:58.3055|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:21:58.3055|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:23:38.3462|DEBUG|OnDoc|Mailversand: 1287 +2025-02-11 16:23:38.3805|DEBUG|OnDoc| +2025-02-11 16:23:38.3895|DEBUG|OnDoc| +2025-02-11 16:23:38.4085|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-11 16:23:59.4043|DEBUG|OnDoc|Mailversand: 1 +2025-02-11 16:23:59.4343|DEBUG|OnDoc| +2025-02-11 16:23:59.4343|DEBUG|OnDoc| +2025-02-11 16:23:59.4536|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-11 16:24:05.8980|DEBUG|OnDoc| +2025-02-11 16:24:05.9340|DEBUG|OnDoc| +2025-02-11 16:24:05.9590|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:24:05.9620|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:24:06.0060|DEBUG|OnDoc| +2025-02-11 16:24:06.0090|DEBUG|OnDoc| +2025-02-11 16:24:06.0360|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 16:24:06.0360|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-11 16:25:16.0917|DEBUG|OnDoc| +2025-02-11 16:25:16.0917|DEBUG|OnDoc| +2025-02-11 16:25:16.1187|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 16:25:16.1187|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-11 16:26:05.4088|DEBUG|OnDoc|Mailversand: 1 +2025-02-11 16:26:05.4435|DEBUG|OnDoc| +2025-02-11 16:26:05.4466|DEBUG|OnDoc| +2025-02-11 16:26:05.4615|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-11 16:26:19.6418|DEBUG|OnDoc|Mailversand: 1287 +2025-02-11 16:26:19.6678|DEBUG|OnDoc| +2025-02-11 16:26:19.6678|DEBUG|OnDoc| +2025-02-11 16:26:19.6892|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-11 16:26:25.9635|DEBUG|OnDoc| +2025-02-11 16:26:26.0035|DEBUG|OnDoc| +2025-02-11 16:26:26.0278|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:26:26.0278|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:26:26.0708|DEBUG|OnDoc| +2025-02-11 16:26:26.0708|DEBUG|OnDoc| +2025-02-11 16:26:26.0979|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 16:26:26.0979|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-11 16:39:54.9783|DEBUG|OnDoc| +2025-02-11 16:39:55.0029|DEBUG|OnDoc| +2025-02-11 16:39:55.0316|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:39:55.0316|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:41:17.5165|DEBUG|OnDoc| +2025-02-11 16:41:17.5406|DEBUG|OnDoc| +2025-02-11 16:41:17.5666|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:41:17.5666|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:45:13.3120|DEBUG|OnDoc| +2025-02-11 16:45:13.3120|DEBUG|OnDoc| +2025-02-11 16:45:13.3381|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:45:13.3381|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:48:12.9990|DEBUG|OnDoc| +2025-02-11 16:48:13.0235|DEBUG|OnDoc| +2025-02-11 16:48:13.0499|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:48:13.0499|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 16:49:07.0030|DEBUG|OnDoc| +2025-02-11 16:49:07.0292|DEBUG|OnDoc| +2025-02-11 16:49:07.0554|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 16:49:07.0554|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 17:04:45.1039|DEBUG|OnDoc| +2025-02-11 17:04:45.1320|DEBUG|OnDoc| +2025-02-11 17:04:45.1591|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 17:04:45.1591|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 17:06:07.3925|DEBUG|OnDoc| +2025-02-11 17:06:07.4175|DEBUG|OnDoc| +2025-02-11 17:06:07.4430|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 17:06:07.4460|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 17:06:57.9868|DEBUG|OnDoc|Mailversand: 1287 +2025-02-11 17:06:58.0184|DEBUG|OnDoc| +2025-02-11 17:06:58.0184|DEBUG|OnDoc| +2025-02-11 17:06:58.0414|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-11 17:07:11.2590|DEBUG|OnDoc|Mailversand: 1 +2025-02-11 17:07:11.2880|DEBUG|OnDoc| +2025-02-11 17:07:11.2910|DEBUG|OnDoc| +2025-02-11 17:07:11.3080|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-11 17:07:16.3121|DEBUG|OnDoc| +2025-02-11 17:07:16.3469|DEBUG|OnDoc| +2025-02-11 17:07:16.3749|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 17:07:16.3749|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 17:07:16.4213|DEBUG|OnDoc| +2025-02-11 17:07:16.4213|DEBUG|OnDoc| +2025-02-11 17:07:16.4523|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 17:07:16.4523|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-11 17:10:13.4157|DEBUG|OnDoc| +2025-02-11 17:10:13.4726|DEBUG|OnDoc| +2025-02-11 17:10:13.4990|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 17:10:13.4990|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 17:10:13.5487|DEBUG|OnDoc| +2025-02-11 17:10:13.5487|DEBUG|OnDoc| +2025-02-11 17:10:13.5747|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 17:10:13.5747|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-11 17:11:21.9559|DEBUG|OnDoc| +2025-02-11 17:11:21.9912|DEBUG|OnDoc| +2025-02-11 17:11:22.0166|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 17:11:22.0166|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 17:11:22.0623|DEBUG|OnDoc| +2025-02-11 17:11:22.0623|DEBUG|OnDoc| +2025-02-11 17:11:22.0903|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 17:11:22.0903|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-11 17:15:03.2197|DEBUG|OnDoc| +2025-02-11 17:15:03.2770|DEBUG|OnDoc| +2025-02-11 17:15:03.3020|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 17:15:03.3020|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 17:15:03.3731|DEBUG|OnDoc| +2025-02-11 17:15:03.3731|DEBUG|OnDoc| +2025-02-11 17:15:03.4069|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 17:15:03.4069|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-11 17:15:53.0432|DEBUG|OnDoc| +2025-02-11 17:15:53.0786|DEBUG|OnDoc| +2025-02-11 17:15:53.1036|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 17:15:53.1036|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 17:15:53.1476|DEBUG|OnDoc| +2025-02-11 17:15:53.1496|DEBUG|OnDoc| +2025-02-11 17:15:53.1726|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 17:15:53.1726|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-11 19:10:54.3109|DEBUG|OnDoc| +2025-02-11 19:10:54.3109|DEBUG|OnDoc| +2025-02-11 19:10:54.3396|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 19:10:54.3396|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 19:11:52.0611|DEBUG|OnDoc| +2025-02-11 19:11:52.0861|DEBUG|OnDoc| +2025-02-11 19:11:52.1121|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 19:11:52.1121|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 19:12:49.2585|DEBUG|OnDoc| +2025-02-11 19:12:49.2848|DEBUG|OnDoc| +2025-02-11 19:12:49.3111|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 19:12:49.3111|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 19:14:25.3040|DEBUG|OnDoc| +2025-02-11 19:14:25.3300|DEBUG|OnDoc| +2025-02-11 19:14:25.3570|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 19:14:25.3570|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 19:15:22.5194|DEBUG|OnDoc| +2025-02-11 19:15:22.5434|DEBUG|OnDoc| +2025-02-11 19:15:22.5705|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 19:15:22.5725|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 19:15:56.1830|DEBUG|OnDoc| +2025-02-11 19:15:56.1830|DEBUG|OnDoc| +2025-02-11 19:15:56.2117|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 19:15:56.2117|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 19:17:27.3820|DEBUG|OnDoc| +2025-02-11 19:17:27.4410|DEBUG|OnDoc| +2025-02-11 19:17:27.4720|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 19:17:27.4720|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 19:17:27.5260|DEBUG|OnDoc| +2025-02-11 19:17:27.5260|DEBUG|OnDoc| +2025-02-11 19:17:27.5574|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 19:17:27.5574|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-11 19:18:21.4963|DEBUG|OnDoc| +2025-02-11 19:18:21.4963|DEBUG|OnDoc| +2025-02-11 19:18:21.5233|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 19:18:21.5253|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 19:20:10.1662|DEBUG|OnDoc| +2025-02-11 19:20:10.2243|DEBUG|OnDoc| +2025-02-11 19:20:10.2513|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 19:20:10.2513|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 19:20:10.3267|DEBUG|OnDoc| +2025-02-11 19:20:10.3365|DEBUG|OnDoc| +2025-02-11 19:20:10.3616|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 19:20:10.3616|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-11 19:33:00.6309|DEBUG|OnDoc| +2025-02-11 19:33:00.6889|DEBUG|OnDoc| +2025-02-11 19:33:00.7169|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 19:33:00.7169|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 19:33:02.8711|DEBUG|OnDoc| +2025-02-11 19:33:02.8711|DEBUG|OnDoc| +2025-02-11 19:33:02.9051|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 19:33:02.9051|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-11 19:35:04.2628|DEBUG|OnDoc| +2025-02-11 19:35:04.2985|DEBUG|OnDoc| +2025-02-11 19:35:04.3235|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-11 19:35:04.3235|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-11 19:35:04.3661|DEBUG|OnDoc| +2025-02-11 19:35:04.3690|DEBUG|OnDoc| +2025-02-11 19:35:04.3920|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-11 19:35:04.3920|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-12 18:46:13.0819|DEBUG|OnDoc|Mailversand: 1287 +2025-02-12 18:46:13.1894|DEBUG|OnDoc| +2025-02-12 18:46:13.1894|DEBUG|OnDoc| +2025-02-12 18:46:13.2135|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-12 18:46:37.2901|DEBUG|OnDoc|Mailversand: 1287 +2025-02-12 18:46:37.3161|DEBUG|OnDoc| +2025-02-12 18:46:37.3161|DEBUG|OnDoc| +2025-02-12 18:46:37.3381|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-12 18:47:40.6114|DEBUG|OnDoc|Mailversand: 1287 +2025-02-12 18:47:40.6354|DEBUG|OnDoc| +2025-02-12 18:47:40.6354|DEBUG|OnDoc| +2025-02-12 18:47:40.6535|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-02-12 19:00:50.9543|DEBUG|OnDoc|Mailversand: 2 +2025-02-12 19:00:51.0045|DEBUG|OnDoc| +2025-02-12 19:00:51.0085|DEBUG|OnDoc| +2025-02-12 19:00:51.0256|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index d6d366af..286d0c8f 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 ae259e47..45c3b5e8 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 d2ed01cb..06957257 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/OnDocOffice.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll index 9e66dd56..d705c57d 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 7c4bc9e7..8eb77f69 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 ef6c875c..69d1684d 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 a05cc172..b34fa91e 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/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll index bf2dd661..eca6c249 100644 Binary files a/BarcodeLib/bin/Debug/Database.dll and b/BarcodeLib/bin/Debug/Database.dll differ diff --git a/BarcodeLib/bin/Debug/Database.pdb b/BarcodeLib/bin/Debug/Database.pdb index eb46c762..0446abd8 100644 Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index 4cb96450..423a19e0 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/Client.csproj.user b/Client/Client.csproj.user index d0ffe724..3e75046a 100644 --- a/Client/Client.csproj.user +++ b/Client/Client.csproj.user @@ -1,8 +1,7 @@  - - + ondoc:%3ffunktion=openclient&partnernr=1000208 publish\ diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index c7e91ced..17a9634b 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 = "10. Februar 2025"; + this.label2.Text = "12. Februar 2025"; // // SplashScreen // diff --git a/Client/Klassen/clsAppParams.cs b/Client/Klassen/clsAppParams.cs index 8edb9aca..f92fb78c 100644 --- a/Client/Klassen/clsAppParams.cs +++ b/Client/Klassen/clsAppParams.cs @@ -37,6 +37,7 @@ namespace OnDoc.Klassen public static string barcodefontsize { get; set; } = ""; public static string barcodetextposition { get; set; } = ""; public static bool isSysadmin { get; set; } = false; + public static bool showlogin { get; set; } = false; public static string currenttgnummer { get; set; }=""; public static string ZusatzFont { get; set; } = ""; diff --git a/Client/Start.cs b/Client/Start.cs index 8692f145..8c313578 100644 --- a/Client/Start.cs +++ b/Client/Start.cs @@ -71,8 +71,15 @@ namespace OnDoc } AppParams.CurrentMitarbeiter = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["mitarbeiternr"].ToString()); AppParams.currenttgnummer = mitarbeiter; - db.Get_Tabledata("select count(*) from ondoc_admin where tgnummer='"+AppParams.currenttgnummer+"'", false, true); - if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) { AppParams.isSysadmin = true; } else { AppParams.isSysadmin = false; } + db.Get_Tabledata("select count(*) from ondoc_admin where tgnummer='"+AppParams.currenttgnummer+"' and aktiv=1", false, true); + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) { + AppParams.isSysadmin = true; + AppParams.showlogin = true; + + } else { + AppParams.isSysadmin = false; + AppParams.showlogin = false; + } db.dsdaten.Tables.Clear(); db.Get_Tabledata("Select * from [applikation] where applikationsnr = 1", false, true); panel1.Visible = false; @@ -233,6 +240,7 @@ namespace OnDoc { ExternalCall.sourceparam = sr.ReadToEnd(); ExternalCall.sourceparam = ExternalCall.sourceparam.Replace("\r\n", ""); + sr.Close(); } ExternalCall.executed = false; @@ -246,6 +254,13 @@ namespace OnDoc if (ExternalCall.sourceparam != "" && ExternalCall.parseparams()) { + if (ExternalCall.function.ToLower() == "openclient") + { + if (ExternalCall.partnernr != "") + { + dokList1.refresh_edk_partner(Convert.ToInt32(ExternalCall.partnernr)); + } + } if (ExternalCall.function.ToLower()=="ucheck") { dokList1.StartPruefung(); diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index a179b725..7dfdc5b5 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -63,7 +63,6 @@ namespace OnDoc.UICintrols this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid(); - this.docPreview1 = new OnDoc.UIControls.DocPreview(); this.panel2 = new System.Windows.Forms.Panel(); this.lblTitel = new System.Windows.Forms.Label(); this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel(); @@ -167,6 +166,7 @@ namespace OnDoc.UICintrols this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton(); this.ribbonButton5 = new System.Windows.Forms.RibbonButton(); + this.docPreview1 = new OnDoc.UIControls.DocPreview(); this.dokwerte1 = new OnDoc.UIControls.Dokwerte(); this.ctxMenuDokList.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -484,16 +484,6 @@ namespace OnDoc.UICintrols this.sfDataGrid1.ColumnResizing += new Syncfusion.WinForms.DataGrid.Events.ColumnResizingEventHandler(this.sfDataGrid1_ColumnResizing); this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent); // - // docPreview1 - // - this.docPreview1.BackColor = System.Drawing.SystemColors.Control; - this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; - this.docPreview1.Location = new System.Drawing.Point(0, 0); - this.docPreview1.Name = "docPreview1"; - this.docPreview1.Size = new System.Drawing.Size(1709, 347); - this.docPreview1.TabIndex = 0; - this.docPreview1.ZoomPercentage = 0; - // // panel2 // this.panel2.BackColor = System.Drawing.Color.WhiteSmoke; @@ -1394,6 +1384,16 @@ namespace OnDoc.UICintrols this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage"))); this.ribbonButton5.Text = "Load"; // + // docPreview1 + // + this.docPreview1.BackColor = System.Drawing.SystemColors.Control; + this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; + this.docPreview1.Location = new System.Drawing.Point(0, 0); + this.docPreview1.Name = "docPreview1"; + this.docPreview1.Size = new System.Drawing.Size(1709, 347); + this.docPreview1.TabIndex = 0; + this.docPreview1.ZoomPercentage = 0; + // // dokwerte1 // this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right; diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 48de1fa4..6bcf708c 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -212,7 +212,17 @@ namespace OnDoc.UICintrols } index = index + 1; } - if (selindex > 0) { ribbonCBAnsicht.SelectedIndex = selindex ; } + if (selindex > 0) + { + try + { + ribbonCBAnsicht.SelectedIndex = selindex; + } + catch + { + ribbonCBAnsicht.SelectedIndex = selindex - 1; + } + } db = null; // if (standardview != "") { refresh_view(standardview); } if (standardview != null) { refresh_view(standardview); } @@ -453,20 +463,24 @@ namespace OnDoc.UICintrols private void dokumentBearbeitenToolStripMenuItem_Click(object sender, EventArgs e) { - if (!row_selected()) return; - var records = sfDataGrid1.View.GetSelectedRecords(); - if (records.Count > 1) + try { - if (MessageBox.Show("Mehrere Dokumente zum Bearbeiten öffnen?", "Dokument bearbeiten", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; } + if (!row_selected()) return; + var records = sfDataGrid1.View.GetSelectedRecords(); + if (records.Count > 1) + { + if (MessageBox.Show("Mehrere Dokumente zum Bearbeiten öffnen?", "Dokument bearbeiten", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; } - } - foreach (var record in records) - { - var datarow = record as DataRowView; - string documentid = datarow["dokumentid"].ToString(); - dokument_bearbeiten(documentid, false); + } + foreach (var record in records) + { + var datarow = record as DataRowView; + string documentid = datarow["dokumentid"].ToString(); + dokument_bearbeiten(documentid, false); + } } + catch { } } public void dokument_bearbeiten(string dokid, bool newdok = false) { @@ -1038,6 +1052,7 @@ namespace OnDoc.UICintrols this.sfDataGrid1.ShowGroupDropArea = false; this.lblTitel.Text = ""; this.RibbonButtonNewDoc.Visible = false; + this.ribbonPanelNeu.Visible = false; //this.RibbonPanelDoklist.Visible = false; this.RibbonBtnVorschauNo.Visible = false; this.RibbonButtonVorschauRechts.Visible = false; @@ -1151,7 +1166,7 @@ namespace OnDoc.UICintrols } if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X") { - if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"]) == false == false) + if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"]) == false ) if (Convert.ToBoolean(dataRow["toapprove"]) == true) { if (Convert.ToBoolean(dataRow["approved"]) == true) @@ -1519,13 +1534,14 @@ namespace OnDoc.UICintrols try { ribbonLabelToApprove.Text = ""; + ribbonLabelToApprove.Visible = false; DB db1 = new DB(AppParams.connectionstring); db1.Get_Tabledata("Select count(*) from view_relaunch_approval where bewilligt=0 and abgelehnt = 0 and mitarbeiter_bewilligung=" + AppParams.CurrentMitarbeiter.ToString(), false, true); if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) == 0) { //ribbonLabelToApprove.Text = ""; - ribbonLabelToApprove.Visible = false; + //ribbonLabelToApprove.Visible = false; } else @@ -1538,7 +1554,7 @@ namespace OnDoc.UICintrols { //ribbonLabelToApprove.Text = ""; - ribbonLabelToApprove.Visible = false; + //ribbonLabelToApprove.Visible = false; } else @@ -1608,12 +1624,14 @@ namespace OnDoc.UICintrols ribbonVorlagen.Visible = AppParams.isSysadmin; ribbonBerechtigung.Visible = AppParams.isSysadmin; ribbonpanelanalyse.Visible = AppParams.isSysadmin; - RibbonPanelDiverses.Visible = AppParams.isSysadmin; - + RibbonPanelDiverses.Visible = true; + ribbonPanel3.Visible = AppParams.isSysadmin; + ribbonPanel4.Visible = AppParams.isSysadmin; RibbonTabAdmin.Visible = false; RibbonTabAdmin.Visible = true; ribbonSaveGridView.Enabled = AppParams.isSysadmin; ribbonSaveGridView.Visible = AppParams.isSysadmin; + ribbonAnmelden.Visible = AppParams.showlogin; //pos_elements(); } @@ -2478,6 +2496,7 @@ namespace OnDoc.UICintrols var datarow = record as DataRowView; string documentid = datarow["dokumentid"].ToString(); DOCGEN.DocGen dg = new DocGen(AppParams.connectionstring,AppParams.RESTURI,AppParams.apikey); + if (dg.signdoc(selected_dokumentid, AppParams.tempdir)) { DB db = new DB(AppParams.connectionstring); diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs index e3579a2e..79ae7624 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.cs @@ -744,7 +744,6 @@ namespace OnDoc.UIControls if (rbEditlater.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; } if (rbasPDF.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDF; } if (rbasPDFarchivieren.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDFArchivieren; } - docgendata.dokumentwerte = gridDokwertlist.DataSource as DataTable; @@ -778,7 +777,7 @@ namespace OnDoc.UIControls if (docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF) { dokdata.Result_as_PDF = "True"; } else { dokdata.Result_as_PDF = "False"; } if (docgendata.digitaleunterschrift == true) { dokdata.As_Faksimile = "True"; } else { dokdata.As_Faksimile = "False"; } if (docgendata.frormularOhneUnterschrift == true) { dokdata.Form_ohne_Unterschrift = "True"; } else { dokdata.Form_ohne_Unterschrift = "False"; } - + dokdata.Zustaendig_Kube = "0"; if (this.rbzustaendigkube.Checked) { @@ -825,7 +824,7 @@ namespace OnDoc.UIControls { dokdata.approval1 = 0; dokdata.approval2 = 0; - + dokdata.toapprove = 1; try { if (cbboxunterschriftlinks.Text == "") { dokdata.approval1 = 1; } diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll index bf2dd661..eca6c249 100644 Binary files a/Client/bin/Debug/Database.dll and b/Client/bin/Debug/Database.dll differ diff --git a/Client/bin/Debug/Database.pdb b/Client/bin/Debug/Database.pdb index eb46c762..0446abd8 100644 Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 42ae3ba0..f2663276 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 fb09d742..fa66f4b4 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 897bae9d..9698e181 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 ebafee9e..ac18f262 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 d0c62156..e05826c9 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 2e548866..527ec678 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 9e3b27fb..93e5302f 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 2d9e1982..df8595d4 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 45bb0a2a..2f240fb4 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 42ae3ba0..f2663276 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 fb09d742..fa66f4b4 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 2e548866..527ec678 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/bin/Debug/Database.dll b/DOCGEN/bin/Debug/Database.dll index bf2dd661..eca6c249 100644 Binary files a/DOCGEN/bin/Debug/Database.dll and b/DOCGEN/bin/Debug/Database.dll differ diff --git a/DOCGEN/bin/Debug/Database.pdb b/DOCGEN/bin/Debug/Database.pdb index eb46c762..0446abd8 100644 Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ diff --git a/DOCGEN/bin/Debug/OnDocOffice.dll b/DOCGEN/bin/Debug/OnDocOffice.dll index ebafee9e..ac18f262 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 d0c62156..e05826c9 100644 Binary files a/DOCGEN/bin/Debug/OnDocOffice.pdb and b/DOCGEN/bin/Debug/OnDocOffice.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index 198f1dfc..657247f1 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/Database/bin/Debug/Database.dll b/Database/bin/Debug/Database.dll index bf2dd661..eca6c249 100644 Binary files a/Database/bin/Debug/Database.dll and b/Database/bin/Debug/Database.dll differ diff --git a/Database/bin/Debug/Database.pdb b/Database/bin/Debug/Database.pdb index eb46c762..0446abd8 100644 Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ diff --git a/Database/db.cs b/Database/db.cs index d9e30cc1..7033d27e 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -448,7 +448,7 @@ namespace Database dok.iMutierer = dok.iErsteller; dok.iMitarbeiternr = dok.iErsteller; dok.daMutiertam = DateTime.Now; - dok.daErstelltam = DateTime.Now; + if (!editdoc) { dok.daErstelltam = DateTime.Now; } dok.iMutiererteam = Convert.ToInt32(DocData.Team); dok.iMutierertieam = Convert.ToInt32(DocData.Team); dok.iErstellerteam = Convert.ToInt32(DocData.Team); ; @@ -559,7 +559,7 @@ namespace Database int approved2 = DocData.approval2; if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Unterschrift_Pruefung"]) == true || DocData.As_Faksimile == "True") { - toapprove = 1; + //toapprove = 1; //if (dok.iUnterschriftlinks == dok.iErsteller) { approved1 = 1; } //if (dok.iUnterschriftrechts == dok.iErsteller) { approved2 = 1; } } diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll index bf2dd661..eca6c249 100644 Binary files a/Database/obj/Debug/Database.dll and b/Database/obj/Debug/Database.dll differ diff --git a/Database/obj/Debug/Database.pdb b/Database/obj/Debug/Database.pdb index eb46c762..0446abd8 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache index b9b342d3..fa9818a7 100644 Binary files a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache and b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache differ diff --git a/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache b/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache index 5e1a3be3..79679977 100644 Binary files a/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache and b/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache differ diff --git a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache index 81d31a95..0ad54a7f 100644 Binary files a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache and b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll index bf2dd661..eca6c249 100644 Binary files a/OnDocOffice/bin/Debug/Database.dll and b/OnDocOffice/bin/Debug/Database.dll differ diff --git a/OnDocOffice/bin/Debug/Database.pdb b/OnDocOffice/bin/Debug/Database.pdb index eb46c762..0446abd8 100644 Binary files a/OnDocOffice/bin/Debug/Database.pdb and b/OnDocOffice/bin/Debug/Database.pdb differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.dll b/OnDocOffice/bin/Debug/OnDocOffice.dll index ebafee9e..ac18f262 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 d0c62156..e05826c9 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 2450d6b7..8c2f8e2d 100644 --- a/OnDocOffice/clsoffice.cs +++ b/OnDocOffice/clsoffice.cs @@ -27,6 +27,7 @@ using Database; using System.Runtime.InteropServices.ComTypes; using Syncfusion.CompoundFile.DocIO; using Helper; +using Microsoft.VisualBasic.Logging; namespace OnDocOffice @@ -1562,7 +1563,7 @@ namespace OnDocOffice Start_Application(); //word.Visible = true; word.Documents.Open(filename); - word.Visible = true; + //word.Visible = true; string path_unterschriftlinks = ""; @@ -1611,6 +1612,7 @@ namespace OnDocOffice { Logging.Logging.Debug("Sign_Doc", "OnDoc", dokumentid); docWord = word.ActiveDocument; + Thread.Sleep(1000); if (word.ActiveDocument.ProtectionType != Microsoft.Office.Interop.Word.WdProtectionType.wdNoProtection) { @@ -1656,26 +1658,113 @@ namespace OnDocOffice public void insert_unterschrift(string bookmark, string imagepath) { + if (imagepath == "") return; + + + object missing = Type.Missing; - Microsoft.Office.Interop.Word.Bookmark bm = docWord.Bookmarks[bookmark]; Microsoft.Office.Interop.Word.Range myRange = docWord.Bookmarks[bookmark].Range; + + Microsoft.Office.Interop.Word.Bookmark bm = docWord.Bookmarks[bookmark]; + + // Microsoft.Office.Interop.Word.InlineShape myinlineshape = myRange.InlineShapes.AddPicture(imagepath, false, false, missing); + float vertical = bm.Range.Information[Microsoft.Office.Interop.Word.WdInformation.wdVerticalPositionRelativeToPage]; float horizontal = bm.Range.Information[Microsoft.Office.Interop.Word.WdInformation.wdHorizontalPositionRelativeToPage]; - Microsoft.Office.Interop.Word.Shape myShape = docWord.Shapes.AddPicture(@"E:\Software-Projekte\OnDoc\Unterschriften\1.jpg", false, true, 0, 0, 120, 50, myRange); - myShape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapTight; + float marigntop = docWord.PageSetup.TopMargin; + float marginleft = docWord.PageSetup.LeftMargin; + + docWord.Activate(); + //Microsoft.Office.Interop.Word.Range myRange3 = bm.Range; + //Microsoft.Office.Interop.Word.Range myRange4 = bm.Range.GoTo(); + + //Microsoft.Office.Interop.Word.Shape myShape = docWord.Shapes.AddPicture( imagepath, false, true, 0, 0, 120, 50, myRange4); + + + Microsoft.Office.Interop.Word.Shape myShape = docWord.Shapes.AddPicture(imagepath, false, true, 0, 0, 120, 50, missing); + //myShape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapTight; myShape.RelativeHorizontalPosition = Microsoft.Office.Interop.Word.WdRelativeHorizontalPosition.wdRelativeHorizontalPositionPage; - myShape.Left = horizontal; myShape.RelativeVerticalPosition = Microsoft.Office.Interop.Word.WdRelativeVerticalPosition.wdRelativeVerticalPositionPage; - myShape.Top = vertical - myShape.Height; - myShape.Name= "Unterschrift" + "_" + bookmark; - myShape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind; - myShape.ZOrder(Microsoft.Office.Core.MsoZOrderCmd.msoSendBackward); - myShape.Select(); + if (bookmark.Contains("Rechts")) + { + myShape.Left = horizontal-marginleft ; + } + else + { + myShape.Left = horizontal - marginleft; + } + myShape.Name = "Unterschrift_" + bookmark; + + myShape.Top = vertical - (myShape.Height + marigntop + 7); + + Logging.Logging.Debug(horizontal.ToString() + "/" + vertical.ToString() + "/" + marginleft.ToString() + "/" + marigntop.ToString()+"/"+myShape.Top.ToString()+"/"+myShape.Left.ToString(), "OnDoc", ""); + + myShape.LockAspectRatio = Microsoft.Office.Core.MsoTriState.msoTrue; + myShape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind; + //myShape.ZOrder(Microsoft.Office.Core.MsoZOrderCmd.msoSendBackward); + //myShape.Select(); return; + + + + + //docWord.Activate(); + //object missing = Type.Missing; + //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]; + //bm.Select(); + + //docWord.Activate(); + //Microsoft.Office.Interop.Word.Range myRange3 = bm.Range; + //Microsoft.Office.Interop.Word.Range myRange4 = bm.Range.GoTo(); + + //Microsoft.Office.Interop.Word.Shape myShape = docWord.Shapes.AddPicture(@"E:\Software-Projekte\OnDoc\Unterschriften\1.jpg", false, true, -50, 0, 120, 50, missing); + //myShape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapTight; + //myShape.RelativeHorizontalPosition = Microsoft.Office.Interop.Word.WdRelativeHorizontalPosition.wdRelativeHorizontalPositionPage; + + //myShape.Left = horizontal; + //myShape.RelativeVerticalPosition = Microsoft.Office.Interop.Word.WdRelativeVerticalPosition.wdRelativeVerticalPositionPage; + //myShape.Top = vertical - myShape.Height; + ////myShape.LockAspectRatio = Microsoft.Office.Core.MsoTriState.msoTrue; + //myShape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind; + //myShape.ZOrder(Microsoft.Office.Core.MsoZOrderCmd.msoSendBackward); + //myShape.Select(); + + + + // if (imagepath == "") return; + // object missing = Type.Missing; + + // Microsoft.Office.Interop.Word.Range myRange1 = docWord.selection this.docWord WordApp.Selection.Range.GoTo(Word.WdGoToItem.wdGoToPage, Word.WdGoToItem.wdGoToPage, 2); + // Microsoft.Office.Interop.Word.Bookmark bm = docWord.Bookmarks[bookmark]; + // Microsoft.Office.Interop.Word.Range myRange = docWord.Bookmarks[bookmark].Range; + // float vertical = bm.Range.Information[Microsoft.Office.Interop.Word.WdInformation.wdVerticalPositionRelativeToPage]; + // float horizontal = bm.Range.Information[Microsoft.Office.Interop.Word.WdInformation.wdHorizontalPositionRelativeToPage]; + // Logging.Logging.Debug("Unterschrift vertical:" + vertical.ToString() + " / Horizontal: " + horizontal.ToString(), "OnDoc", ""); + // Microsoft.Office.Interop.Word.Shape myShape = docWord.Shapes.AddPicture(imagepath, false, true,vertical,horizontal, 120, 50, myRange); + // myShape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapTight; + // myShape.RelativeHorizontalPosition = Microsoft.Office.Interop.Word.WdRelativeHorizontalPosition.wdRelativeHorizontalPositionPage; + // myShape.RelativeVerticalPosition = Microsoft.Office.Interop.Word.WdRelativeVerticalPosition.wdRelativeVerticalPositionPage; + // myShape.Left = horizontal; + // myShape.Top = (vertical - myShape.Height); + // myShape.Name= "Unterschrift" + "_" + bookmark; + // Logging.Logging.Debug("Myshape:" + myShape.Name + " Left:" + myShape.Left.ToString() + ", Top:" + myShape.Top.ToString(), "OnDoc", ""); + //// myShape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind; + // myShape.ZOrder(Microsoft.Office.Core.MsoZOrderCmd.msoSendBackward); + // //myShape.Select(); + // return; + + + + //object missing = Type.Missing; //Microsoft.Office.Interop.Word.Range myRange = docWord.Bookmarks[bookmark].Range; diff --git a/OnDocOffice/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/OnDocOffice/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 5a13ae12..2f8a9d32 100644 Binary files a/OnDocOffice/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/OnDocOffice/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index ae7bd4f3..88a3741c 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 ebafee9e..ac18f262 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 d0c62156..e05826c9 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.pdb and b/OnDocOffice/obj/Debug/OnDocOffice.pdb differ diff --git a/Vorlagen_Viewer/bin/Debug/Database.dll b/Vorlagen_Viewer/bin/Debug/Database.dll index 3b6a758b..bf2dd661 100644 Binary files a/Vorlagen_Viewer/bin/Debug/Database.dll and b/Vorlagen_Viewer/bin/Debug/Database.dll differ diff --git a/Vorlagen_Viewer/bin/Debug/Database.pdb b/Vorlagen_Viewer/bin/Debug/Database.pdb index 86f5f0be..eb46c762 100644 Binary files a/Vorlagen_Viewer/bin/Debug/Database.pdb and b/Vorlagen_Viewer/bin/Debug/Database.pdb differ diff --git a/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache b/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache index d9df0a90..a989122e 100644 Binary files a/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache and b/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Database.dll b/ZZ_BarcpdeFromFont/bin/Debug/Database.dll index 3b6a758b..bf2dd661 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Database.dll and b/ZZ_BarcpdeFromFont/bin/Debug/Database.dll differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb b/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb index 86f5f0be..eb46c762 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb and b/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb differ diff --git a/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache b/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache index 090391e2..0836d646 100644 Binary files a/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache and b/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache differ diff --git a/ZZ_Signature_C/Form1.cs b/ZZ_Signature_C/Form1.cs index eae1e667..2344ed69 100644 --- a/ZZ_Signature_C/Form1.cs +++ b/ZZ_Signature_C/Form1.cs @@ -41,11 +41,12 @@ namespace ZZ_Signature_C word = new Microsoft.Office.Interop.Word.Application(); docWord = word.Documents.Open(@"E:\Software-Projekte\OnDoc\Excel_Dateien\Signature.docx"); docWord.Activate(); + word.Visible = true; + + insert_unterschrift("TGEDKVornameNameLinksB99"); + insert_unterschrift("TGEDKVornameNameRechtsB99"); - insert_unterschrift("Unterschrift2"); - insert_unterschrift("TGEDKNameVornameLinksB"); - word.Visible = true; word.ActiveDocument.SaveAs2(@"E:\Software-Projekte\OnDoc\Excel_Dateien\SignatureSigned.docx"); @@ -88,23 +89,12 @@ namespace ZZ_Signature_C 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; - - //word.ActiveDocument.Bookmarks[tmn].Select(); - - //Microsoft.Office.Interop.Word.Shape myshape1 = docWord.Shapes.AddShape(1, horizontal, vertical, 120, 50); - //myshape1.Fill.UserPicture(@"E:\Software-Projekte\OnDoc\Unterschriften\1.jpg"); - ////myshape1.Line.Weight = -2; - //myshape1.Name = "Unterschrift" + "_" + tmn; - //myshape1.Line.Visible= Microsoft.Office.Core.MsoTriState.msoFalse; - - ////Microsoft.Office.Interop.Word.InlineShape myshape3 = word.Selection.InlineShapes.AddPicture(@"E:\Software-Projekte\OnDoc\Unterschriften\1.jpg",false,true,myRange,); - + docWord.Activate(); Microsoft.Office.Interop.Word.Range myRange3 = bm.Range; Microsoft.Office.Interop.Word.Range myRange4 = bm.Range.GoTo(); - + Microsoft.Office.Interop.Word.Shape myShape = docWord.Shapes.AddPicture(@"E:\Software-Projekte\OnDoc\Unterschriften\1.jpg", false, true, 0, 0, 120, 50, myRange); myShape.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapTight; myShape.RelativeHorizontalPosition = Microsoft.Office.Interop.Word.WdRelativeHorizontalPosition.wdRelativeHorizontalPositionPage; @@ -117,6 +107,18 @@ namespace ZZ_Signature_C myShape.Select(); return; + //vertical = vertical - 50; + + //word.ActiveDocument.Bookmarks[tmn].Select(); + + //Microsoft.Office.Interop.Word.Shape myshape1 = docWord.Shapes.AddShape(1, horizontal, vertical, 120, 50); + //myshape1.Fill.UserPicture(@"E:\Software-Projekte\OnDoc\Unterschriften\1.jpg"); + ////myshape1.Line.Weight = -2; + //myshape1.Name = "Unterschrift" + "_" + tmn; + //myshape1.Line.Visible= Microsoft.Office.Core.MsoTriState.msoFalse; + + ////Microsoft.Office.Interop.Word.InlineShape myshape3 = word.Selection.InlineShapes.AddPicture(@"E:\Software-Projekte\OnDoc\Unterschriften\1.jpg",false,true,myRange,); + Microsoft.Office.Interop.Word.Shape myshape = docWord.Shapes.AddTextbox(Microsoft.Office.Core .MsoTextOrientation.msoTextOrientationHorizontal, (float)horizontal, (float)vertical, 120, 56, ref missing); diff --git a/ZZ_Signature_C/bin/Debug/ZZ_Signature_C.exe b/ZZ_Signature_C/bin/Debug/ZZ_Signature_C.exe index 8f80d544..42ff4255 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 0266eeec..924ed457 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 63b0ba03..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.exe b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.exe index 8f80d544..42ff4255 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 0266eeec..924ed457 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 diff --git a/vbBarcodes/bin/Debug/Database.dll b/vbBarcodes/bin/Debug/Database.dll index 3b6a758b..bf2dd661 100644 Binary files a/vbBarcodes/bin/Debug/Database.dll and b/vbBarcodes/bin/Debug/Database.dll differ diff --git a/vbBarcodes/bin/Debug/Database.pdb b/vbBarcodes/bin/Debug/Database.pdb index 86f5f0be..eb46c762 100644 Binary files a/vbBarcodes/bin/Debug/Database.pdb and b/vbBarcodes/bin/Debug/Database.pdb differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache index 0889a9d3..7ad1ac4c 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache and b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache differ