diff --git a/API_NetFramework/Controllers/MailController.cs b/API_NetFramework/Controllers/MailController.cs index e3c7089d..63354294 100644 --- a/API_NetFramework/Controllers/MailController.cs +++ b/API_NetFramework/Controllers/MailController.cs @@ -214,6 +214,8 @@ namespace OnDocAPI_NetFramework.Controllers { MailMessage mail = new MailMessage(); SmtpClient SmtpServer = new SmtpClient(); + string mailempfaenger = System.Configuration.ConfigurationManager.AppSettings["Mailempfaenger"].ToString(); + if (mailempfaenger!="") { email.empfaenger=mailempfaenger; } mail.To.Add(email.empfaenger); mail.From = new MailAddress("OnDoc@tkb.ch"); mail.Subject = email.betreff; diff --git a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user index 94d908d3..2851e745 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-07-28T11:40:59.0692059Z||;True|2025-07-28T13:31:38.8352333+02:00||;True|2025-07-28T10:53:02.7503896+02:00||;True|2025-07-28T10:31:56.3061779+02:00||;True|2025-07-28T10:07:32.1199283+02:00||;True|2025-07-27T12:13:11.7201345+02:00||;True|2025-07-23T12:31:01.1003759+02:00||;True|2025-07-23T11:05:44.2579070+02:00||;True|2025-07-23T10:23:34.5089684+02:00||;True|2025-07-23T09:24:38.1420693+02:00||;True|2025-07-23T07:42:17.0908668+02:00||;True|2025-07-21T15:11:25.9501591+02:00||;True|2025-07-21T13:01:29.5444866+02:00||;True|2025-07-21T10:19:00.3579413+02:00||;True|2025-07-21T08:53:15.8022664+02:00||;True|2025-07-21T08:52:13.5024447+02:00||;True|2025-07-20T22:02:07.7503979+02:00||;True|2025-06-18T21:46:07.0469838+02:00||;True|2025-06-18T12:17:09.8417440+02:00||;True|2025-06-18T11:06:43.5839212+02:00||;True|2025-05-06T12:58:55.8720511+02:00||;True|2025-05-05T10:30:22.0524225+02:00||;True|2025-05-05T09:37:27.1162038+02:00||;True|2025-05-04T13:37:01.8401491+02:00||;True|2025-04-14T15:32:13.3923265+02:00||;True|2025-03-27T09:55:34.9678501+01:00||;True|2025-03-27T07:47:45.1288274+01:00||;True|2025-03-26T19:03:04.7550972+01:00||;True|2025-02-27T19:20:43.3755758+01:00||;True|2025-02-27T18:15:21.2843332+01:00||;True|2025-02-25T19:05:51.2823294+01:00||;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||; + True|2025-07-29T08:29:50.9928831Z||;True|2025-07-28T13:40:59.0692059+02:00||;True|2025-07-28T13:31:38.8352333+02:00||;True|2025-07-28T10:53:02.7503896+02:00||;True|2025-07-28T10:31:56.3061779+02:00||;True|2025-07-28T10:07:32.1199283+02:00||;True|2025-07-27T12:13:11.7201345+02:00||;True|2025-07-23T12:31:01.1003759+02:00||;True|2025-07-23T11:05:44.2579070+02:00||;True|2025-07-23T10:23:34.5089684+02:00||;True|2025-07-23T09:24:38.1420693+02:00||;True|2025-07-23T07:42:17.0908668+02:00||;True|2025-07-21T15:11:25.9501591+02:00||;True|2025-07-21T13:01:29.5444866+02:00||;True|2025-07-21T10:19:00.3579413+02:00||;True|2025-07-21T08:53:15.8022664+02:00||;True|2025-07-21T08:52:13.5024447+02:00||;True|2025-07-20T22:02:07.7503979+02:00||;True|2025-06-18T21:46:07.0469838+02:00||;True|2025-06-18T12:17:09.8417440+02:00||;True|2025-06-18T11:06:43.5839212+02:00||;True|2025-05-06T12:58:55.8720511+02:00||;True|2025-05-05T10:30:22.0524225+02:00||;True|2025-05-05T09:37:27.1162038+02:00||;True|2025-05-04T13:37:01.8401491+02:00||;True|2025-04-14T15:32:13.3923265+02:00||;True|2025-03-27T09:55:34.9678501+01:00||;True|2025-03-27T07:47:45.1288274+01:00||;True|2025-03-26T19:03:04.7550972+01:00||;True|2025-02-27T19:20:43.3755758+01:00||;True|2025-02-27T18:15:21.2843332+01:00||;True|2025-02-25T19:05:51.2823294+01:00||;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||; - 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,22 +64,22 @@ 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 07/28/2025 09:13:28 @@ -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 - 07/28/2025 13:40:58 + 07/29/2025 10:29:49 12/23/2024 22:17:43 - 07/28/2025 13:40:58 + 07/29/2025 10:29:49 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 @@ -154,37 +154,37 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 11/27/2023 09:50:04 - 07/03/2025 12:17:55 + 03/07/2025 12:17:55 - 07/03/2025 12:17:55 + 03/07/2025 12:17:55 - 09/04/2024 18:58:02 + 04/09/2024 18:58:02 - 07/03/2025 12:17:55 + 03/07/2025 12:17:55 - 07/03/2025 12:17:55 + 03/07/2025 12:17:55 - 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 - 02/12/2025 00:12:14 + 12/02/2025 00:12:14 - 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 07/28/2025 09:13:07 @@ -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 @@ -250,16 +250,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/28/2025 10:40:16 - 07/28/2025 13:40:57 + 07/29/2025 10:29:48 - 07/28/2025 13:40:57 + 07/29/2025 10:29:48 - 07/28/2025 13:40:58 + 07/29/2025 10:29:49 - 07/28/2025 13:40:58 + 07/29/2025 10:29:49 11/13/2012 13:19:34 @@ -307,10 +307,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 @@ -361,34 +361,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 @@ -397,10 +397,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 05/15/2018 15:29:36 - 02/12/2025 00:12:24 + 12/02/2025 00:12:24 - 08/05/2022 05:31:02 + 05/08/2022 05:31:02 10/20/2023 22:33:52 @@ -412,10 +412,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/23/2021 01:40:18 - 02/12/2025 00:18:34 + 12/02/2025 00:18:34 - 02/12/2025 00:18:50 + 12/02/2025 00:18:50 02/19/2020 11:05:18 @@ -424,7 +424,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 @@ -439,7 +439,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 @@ -478,187 +478,187 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/22/2025 10:15:24 - 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 04/14/2025 18:12:39 - 03/06/2024 08:11:55 + 06/03/2024 08:11:55 04/14/2025 18:11:03 @@ -667,10 +667,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/19/2024 12:25:43 - 03/06/2024 08:11:55 + 06/03/2024 08:11:55 - 07/28/2025 10:07:31 + 07/29/2025 10:29:49 \ No newline at end of file diff --git a/API_NetFramework/Web.config b/API_NetFramework/Web.config index 65a6dd90..8c088d50 100644 --- a/API_NetFramework/Web.config +++ b/API_NetFramework/Web.config @@ -37,6 +37,7 @@ + diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index cef1cca3..743dfc8b 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 65a6dd90..8c088d50 100644 --- a/API_NetFramework/bin/OnDoc_NetFramework.dll.config +++ b/API_NetFramework/bin/OnDoc_NetFramework.dll.config @@ -37,6 +37,7 @@ + diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index 40f3bb10..45b2ff86 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 b34e1578..289d5401 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -22101,3 +22101,62 @@ done 2025-07-28 15:01:50.7251|DEBUG|OnDoc| 2025-07-28 15:03:10.6622|DEBUG|OnDoc| 2025-07-28 15:03:10.6942|DEBUG|OnDoc| +2025-07-29 09:36:00.9215|DEBUG|OnDoc| +2025-07-29 09:36:00.9796|DEBUG|OnDoc| +2025-07-29 09:39:11.4793|DEBUG|OnDoc| +2025-07-29 09:39:11.5168|DEBUG|OnDoc| +2025-07-29 09:55:11.2952|DEBUG|OnDoc| +2025-07-29 09:55:11.3390|DEBUG|OnDoc| +2025-07-29 09:59:29.2569|DEBUG|OnDoc| +2025-07-29 09:59:29.3010|DEBUG|OnDoc| +2025-07-29 10:02:49.0707|DEBUG|OnDoc| +2025-07-29 10:02:49.1080|DEBUG|OnDoc| +2025-07-29 10:13:30.6429|DEBUG|OnDoc| +2025-07-29 10:13:30.6985|DEBUG|OnDoc| +2025-07-29 10:13:46.7488|DEBUG|OnDoc| +2025-07-29 10:13:46.7866|DEBUG|OnDoc| +2025-07-29 10:29:00.2728|DEBUG|OnDoc| +2025-07-29 10:29:00.3199|DEBUG|OnDoc| +2025-07-29 10:29:13.4270|DEBUG|OnDoc|Mailversand: urs.ackermann@tkb.chLink auf OnDoc-Dokument +2025-07-29 10:29:31.9305|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-07-29 10:29:31.9704|DEBUG|OnDoc|Mail Versand NOK - Exception Inner: System.Net.WebException: Der Remotename konnte nicht aufgelöst werden: 'smtp.tgcorp.ch' + bei System.Net.ServicePoint.GetConnection(PooledStream PooledStream, Object owner, Boolean async, IPAddress& address, Socket& abortSocket, Socket& abortSocket6) + bei System.Net.PooledStream.Activate(Object owningObject, Boolean async, GeneralAsyncDelegate asyncCallback) + bei System.Net.ConnectionPool.GetConnection(Object owningObject, GeneralAsyncDelegate asyncCallback, Int32 creationTimeout) + bei System.Net.Mail.SmtpConnection.GetConnection(ServicePoint servicePoint) + bei System.Net.Mail.SmtpClient.GetConnection() + bei System.Net.Mail.SmtpClient.Send(MailMessage message) +2025-07-29 12:37:31.0335|DEBUG|OnDoc| +2025-07-29 12:37:31.0635|DEBUG|OnDoc| +2025-07-29 12:38:56.8780|DEBUG|OnDoc| +2025-07-29 12:38:56.9080|DEBUG|OnDoc| +2025-07-29 12:51:25.8898|DEBUG|OnDoc| +2025-07-29 12:51:25.9151|DEBUG|OnDoc| +2025-07-29 12:55:16.3923|DEBUG|OnDoc| +2025-07-29 12:55:16.4192|DEBUG|OnDoc| +2025-07-29 13:23:10.5395|DEBUG|OnDoc| +2025-07-29 13:23:10.5776|DEBUG|OnDoc| +2025-07-29 15:05:40.4846|DEBUG|OnDoc| +2025-07-29 15:05:40.5217|DEBUG|OnDoc| +2025-07-29 15:07:35.2631|DEBUG|OnDoc| +2025-07-29 15:07:35.3021|DEBUG|OnDoc| +2025-07-29 15:14:35.4394|DEBUG|OnDoc| +2025-07-29 15:14:35.4777|DEBUG|OnDoc| +2025-07-29 15:41:23.8706|DEBUG|OnDoc| +2025-07-29 15:41:23.9048|DEBUG|OnDoc| +2025-07-29 15:46:31.2863|DEBUG|OnDoc| +2025-07-29 15:46:31.3245|DEBUG|OnDoc| +2025-07-29 15:48:25.3006|DEBUG|OnDoc| +2025-07-29 15:48:25.3493|DEBUG|OnDoc| +2025-07-29 15:53:28.6726|DEBUG|OnDoc| +2025-07-29 15:53:28.7335|DEBUG|OnDoc| +2025-07-29 16:01:19.9440|DEBUG|OnDoc| +2025-07-29 16:01:19.9817|DEBUG|OnDoc| +2025-07-29 16:10:46.2357|DEBUG|OnDoc| +2025-07-29 16:10:46.2717|DEBUG|OnDoc| +2025-07-29 16:11:01.9781|DEBUG|OnDoc| +2025-07-29 16:11:02.0166|DEBUG|OnDoc| +2025-07-29 17:40:25.7595|DEBUG|OnDoc| +2025-07-29 17:40:25.7927|DEBUG|OnDoc| +2025-07-29 17:44:05.3089|DEBUG|OnDoc| +2025-07-29 17:44:05.3440|DEBUG|OnDoc| diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 12e49dc3..f1320850 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 cef1cca3..743dfc8b 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 40f3bb10..45b2ff86 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 7eb6cd8b..32009b73 100644 --- a/API_NetFramework/obj/Debug/Package/PackageTmp/Web.config +++ b/API_NetFramework/obj/Debug/Package/PackageTmp/Web.config @@ -37,6 +37,7 @@ + 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 75afba79..eff2cce4 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 ff43182a..f7c349e5 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 65a6dd90..8c088d50 100644 --- a/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config +++ b/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config @@ -37,6 +37,7 @@ + diff --git a/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config b/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config index 7eb6cd8b..32009b73 100644 --- a/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config +++ b/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config @@ -37,6 +37,7 @@ + diff --git a/BarcodeLibVBDatamatrix/bin/Debug/Model.dll b/BarcodeLibVBDatamatrix/bin/Debug/Model.dll index 1e10b6a9..a7ddfef2 100644 Binary files a/BarcodeLibVBDatamatrix/bin/Debug/Model.dll and b/BarcodeLibVBDatamatrix/bin/Debug/Model.dll differ diff --git a/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb b/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb index b575a000..8fd925c2 100644 Binary files a/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb and b/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache index a3a91ee5..4f4e51cf 100644 Binary files a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache and b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache differ diff --git a/Client/App.config b/Client/App.config index 4c308606..8abd3dab 100644 --- a/Client/App.config +++ b/Client/App.config @@ -59,7 +59,7 @@ E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe - False + True diff --git a/Client/Client.csproj b/Client/Client.csproj index a06735cf..f1657492 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -1371,6 +1371,16 @@ + + + + + + + + + + diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index b100d6fd..cb4a26c9 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(135, 26); this.label2.TabIndex = 2; - this.label2.Text = "28. Juli 2025"; + this.label2.Text = "29. Juli 2025"; this.label2.Click += new System.EventHandler(this.label2_Click); // // SplashScreen diff --git a/Client/Diverses/frmMail.cs b/Client/Diverses/frmMail.cs index 3fe48511..2ccd80bf 100644 --- a/Client/Diverses/frmMail.cs +++ b/Client/Diverses/frmMail.cs @@ -66,6 +66,7 @@ namespace OnDoc.Diverses DB db = new DB(AppParams.connectionstring); db.Get_Tabledata("Select name,vorname,tgnummer, email from mitarbeiter where mitarbeiternr=" + AppParams.CurrentMitarbeiter.ToString(), false, true); string absender = ""; + try { absender = db.dsdaten.Tables[0].Rows[0]["Name"].ToString() + " " + db.dsdaten.Tables[0].Rows[0]["Vorname"].ToString() + ", " + db.dsdaten.Tables[0].Rows[0]["tgnummer"].ToString(); @@ -96,7 +97,7 @@ namespace OnDoc.Diverses string starthtml = ""; string endhtml = ""; string startabsatz = "Guten Tag "+empfaenger+"
" + "
"; - if (!multipledocuments()) { startabsatz = startabsatz + "
" + "Link zum Dokument:
"; } else { startabsatz = startabsatz + "
" + "Links zum Dokumenten:
"; } + if (!multipledocuments()) { startabsatz = startabsatz + "
" + "Link zum Dokument:
- "; } else { startabsatz = startabsatz + "
" + "Links zu den Dokumenten:
"; } text = text + starthtml; text = text + startabsatz; text = text + this.doclist; diff --git a/Client/DocMgmt/SerienbriefTemplateLoad.Designer.cs b/Client/DocMgmt/SerienbriefTemplateLoad.Designer.cs index 91c00831..90ab6080 100644 --- a/Client/DocMgmt/SerienbriefTemplateLoad.Designer.cs +++ b/Client/DocMgmt/SerienbriefTemplateLoad.Designer.cs @@ -33,7 +33,10 @@ this.sfButton1 = new Syncfusion.WinForms.Controls.SfButton(); this.sfButton2 = new Syncfusion.WinForms.Controls.SfButton(); this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton(); + this.label1 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // sfDataGrid1 @@ -42,9 +45,12 @@ this.sfDataGrid1.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.LastColumnFill; this.sfDataGrid1.Location = new System.Drawing.Point(5, 19); this.sfDataGrid1.Name = "sfDataGrid1"; - this.sfDataGrid1.Size = new System.Drawing.Size(417, 150); + this.sfDataGrid1.PreviewRowHeight = 35; + this.sfDataGrid1.Size = new System.Drawing.Size(444, 150); this.sfDataGrid1.TabIndex = 0; this.sfDataGrid1.Text = "sfDataGrid1"; + this.sfDataGrid1.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.sfDataGrid1_DrawCell); + this.sfDataGrid1.QueryRowStyle += new Syncfusion.WinForms.DataGrid.Events.QueryRowStyleEventHandler(this.sfDataGrid1_QueryRowStyle); this.sfDataGrid1.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellClick); this.sfDataGrid1.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellDoubleClick); // @@ -52,7 +58,7 @@ // this.sfButton1.Enabled = false; this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); - this.sfButton1.Location = new System.Drawing.Point(326, 175); + this.sfButton1.Location = new System.Drawing.Point(353, 221); this.sfButton1.Name = "sfButton1"; this.sfButton1.Size = new System.Drawing.Size(96, 28); this.sfButton1.TabIndex = 1; @@ -62,7 +68,7 @@ // sfButton2 // this.sfButton2.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); - this.sfButton2.Location = new System.Drawing.Point(5, 175); + this.sfButton2.Location = new System.Drawing.Point(5, 221); this.sfButton2.Name = "sfButton2"; this.sfButton2.Size = new System.Drawing.Size(96, 28); this.sfButton2.TabIndex = 2; @@ -73,18 +79,38 @@ // this.sfButton3.Enabled = false; this.sfButton3.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); - this.sfButton3.Location = new System.Drawing.Point(439, 19); + this.sfButton3.Location = new System.Drawing.Point(469, 19); this.sfButton3.Name = "sfButton3"; this.sfButton3.Size = new System.Drawing.Size(96, 28); this.sfButton3.TabIndex = 3; this.sfButton3.Text = "Löschen"; this.sfButton3.Click += new System.EventHandler(this.sfButton3_Click); // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(51, 176); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(35, 13); + this.label1.TabIndex = 5; + this.label1.Text = "label1"; + // + // pictureBox1 + // + this.pictureBox1.Image = global::OnDoc.Properties.Resources.Achtung_24x24_32; + this.pictureBox1.Location = new System.Drawing.Point(5, 174); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(25, 28); + this.pictureBox1.TabIndex = 6; + this.pictureBox1.TabStop = false; + // // SerienbriefTemplateLoad // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(570, 218); + this.ClientSize = new System.Drawing.Size(570, 269); + this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.label1); this.Controls.Add(this.sfButton3); this.Controls.Add(this.sfButton2); this.Controls.Add(this.sfButton1); @@ -96,7 +122,9 @@ this.Text = "Vorlage laden"; this.Load += new System.EventHandler(this.SerienbriefTemplateLoad_Load); ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); } @@ -106,5 +134,7 @@ private Syncfusion.WinForms.Controls.SfButton sfButton1; private Syncfusion.WinForms.Controls.SfButton sfButton2; private Syncfusion.WinForms.Controls.SfButton sfButton3; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.PictureBox pictureBox1; } } \ No newline at end of file diff --git a/Client/DocMgmt/SerienbriefTemplateLoad.cs b/Client/DocMgmt/SerienbriefTemplateLoad.cs index 538ff754..a8f31f4d 100644 --- a/Client/DocMgmt/SerienbriefTemplateLoad.cs +++ b/Client/DocMgmt/SerienbriefTemplateLoad.cs @@ -12,6 +12,8 @@ using Syncfusion.Windows.Forms.Tools; using Syncfusion.WinForms.Controls; using Database; using System.Security.RightsManagement; +using Syncfusion.WinForms.DataGrid.Enums; +using NLog.LayoutRenderers.Wrappers; namespace OnDoc.DocMgmt { @@ -21,6 +23,7 @@ namespace OnDoc.DocMgmt public string selectedID = ""; public string file = ""; public string usedfelder = ""; + string basedokumenttypnr = ""; public SerienbriefTemplateLoad() { InitializeComponent(); @@ -30,7 +33,7 @@ namespace OnDoc.DocMgmt this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; } - public SerienbriefTemplateLoad(string mitarbeiternr) + public SerienbriefTemplateLoad(string mitarbeiternr, string basedokumenttypnr) { InitializeComponent(); this.Style.TitleBar.BackColor = Theaming.Titelbar(); @@ -38,18 +41,36 @@ namespace OnDoc.DocMgmt this.Style.ShadowOpacity = Theaming.ShadowOpacity; this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; this.mitarbeiternr=mitarbeiternr; + this.basedokumenttypnr =basedokumenttypnr; } private void SerienbriefTemplateLoad_Load(object sender, EventArgs e) { + pictureBox1.Visible = false; + this.label1.Visible = false; load_data(); } private void load_data() { DB db = new DB(AppParams.connectionstring); - db.Get_Tabledata("Select ID,Bezeichnung, isnull(usedfelder,'') as UsedFelder from ondoc_sb_vorlage where aktiv=1 and mitarbeiternr="+ mitarbeiternr, false, true); + db.Get_Tabledata("Select '0' as S,ID,Bezeichnung, isnull(usedfelder,'') as UsedFelder, case when isnull(doktyp,'') ='' then 'A' else doktyp end as DokTyp from ondoc_sb_vorlage where aktiv=1 and mitarbeiternr="+ mitarbeiternr, false, true); + foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows) + { + if (dr[4].ToString() != basedokumenttypnr) + { + dr[0] = '1'; + } + else + { + dr[0] = '2'; + } + } + db.dsdaten.Tables[0].AcceptChanges(); this.sfDataGrid1.DataSource = db.dsdaten.Tables[0]; - this.sfDataGrid1.Columns[0].Visible = false; - this.sfDataGrid1.Columns[2].Visible = false; + this.sfDataGrid1.Columns[1].Visible = false; + this.sfDataGrid1.Columns[3].Visible = false; + this.sfDataGrid1.Columns[4].Visible = false; + this.sfDataGrid1.Columns[0].HeaderText = ""; + sfDataGrid1.RowHeight = 28; db = null; } @@ -110,5 +131,60 @@ namespace OnDoc.DocMgmt } } + + private void sfDataGrid1_DrawCell(object sender, Syncfusion.WinForms.DataGrid.Events.DrawCellEventArgs e) + { + try + { + if (e.Column.MappingName == "S") + { + try + { + e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center; + e.Handled = true; + var selectedItem = e.DataRow; + var dataRow = (e.DataRow.RowData as DataRowView).Row; + + if (Convert.ToInt32(dataRow["S"]) == 2) + { + e.Graphics.DrawImage(OnDoc.Properties.Resources.OK_24x24_32, e.Bounds.X + 10, e.Bounds.Y+2); + } + if (Convert.ToInt32(dataRow["S"]) == 1) + { + e.Graphics.DrawImage(OnDoc.Properties.Resources.Achtung_24x24_32, e.Bounds.X + 10, e.Bounds.Y+2); + } + + Pen borderPen = new Pen(Color.LightGray); + e.Graphics.DrawLine(borderPen, e.Bounds.Right, e.Bounds.Top, e.Bounds.Right, e.Bounds.Bottom); + e.Graphics.DrawLine(borderPen, e.Bounds.Left-1, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom); + return; + + } + catch { } + e.Handled = false; + } + } + catch { } + } + + private void sfDataGrid1_QueryRowStyle(object sender, Syncfusion.WinForms.DataGrid.Events.QueryRowStyleEventArgs e) + { + if (e.RowType == RowType.DefaultRow) + { + var dataRowView = e.RowData as DataRowView; + var dataRow = dataRowView.Row; + var cellValue = dataRow[4].ToString(); + if (cellValue != basedokumenttypnr) + { + //e.Style.TextColor = Color.Gray; + pictureBox1.Visible = true; + label1.Visible = true; + label1.Text = "Die Vorlage entspricht nicht dem Vorlagentyp des Serienbriefes." + Environment.NewLine; + label1.Text = label1.Text + "Das kann sich auf Einstellungen für Versandstrasse, Archivierung usw. auswirken."; + + } + + } + } } } diff --git a/Client/Properties/Resources.Designer.cs b/Client/Properties/Resources.Designer.cs index 4df39bd0..d5e65b2b 100644 --- a/Client/Properties/Resources.Designer.cs +++ b/Client/Properties/Resources.Designer.cs @@ -60,6 +60,56 @@ namespace OnDoc.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Achtung_16x16_32 { + get { + object obj = ResourceManager.GetObject("Achtung_16x16_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Achtung_24x24_32 { + get { + object obj = ResourceManager.GetObject("Achtung_24x24_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Achtung_256x256_32 { + get { + object obj = ResourceManager.GetObject("Achtung_256x256_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Achtung_32x32_32 { + get { + object obj = ResourceManager.GetObject("Achtung_32x32_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Achtung_48x48_32 { + get { + object obj = ResourceManager.GetObject("Achtung_48x48_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// @@ -2000,6 +2050,56 @@ namespace OnDoc.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap OK_16x16_32 { + get { + object obj = ResourceManager.GetObject("OK_16x16_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap OK_24x24_32 { + get { + object obj = ResourceManager.GetObject("OK_24x24_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap OK_256x256_32 { + get { + object obj = ResourceManager.GetObject("OK_256x256_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap OK_32x32_32 { + get { + object obj = ResourceManager.GetObject("OK_32x32_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap OK_48x48_32 { + get { + object obj = ResourceManager.GetObject("OK_48x48_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// diff --git a/Client/Properties/Resources.resx b/Client/Properties/Resources.resx index ecbf0378..85d13863 100644 --- a/Client/Properties/Resources.resx +++ b/Client/Properties/Resources.resx @@ -118,6 +118,21 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\Achtung_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Achtung_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Achtung_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Achtung_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Achtung_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\add_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -700,6 +715,21 @@ ..\Resources\officevorlage_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\OK_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\OK_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\OK_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\OK_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\OK_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\OnBase_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Client/Properties/Settings.Designer.cs b/Client/Properties/Settings.Designer.cs index 5aa9b05c..9909ef9d 100644 --- a/Client/Properties/Settings.Designer.cs +++ b/Client/Properties/Settings.Designer.cs @@ -219,7 +219,7 @@ namespace OnDoc.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] + [global::System.Configuration.DefaultSettingValueAttribute("True")] public string GASSize { get { return ((string)(this["GASSize"])); diff --git a/Client/Properties/Settings.settings b/Client/Properties/Settings.settings index d4007fe3..d89c2074 100644 --- a/Client/Properties/Settings.settings +++ b/Client/Properties/Settings.settings @@ -51,7 +51,7 @@ E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe - False + True \ No newline at end of file diff --git a/Client/Resources/Achtung_16x16-32.png b/Client/Resources/Achtung_16x16-32.png new file mode 100644 index 00000000..73444c40 Binary files /dev/null and b/Client/Resources/Achtung_16x16-32.png differ diff --git a/Client/Resources/Achtung_24x24-32.png b/Client/Resources/Achtung_24x24-32.png new file mode 100644 index 00000000..96573555 Binary files /dev/null and b/Client/Resources/Achtung_24x24-32.png differ diff --git a/Client/Resources/Achtung_256x256-32.png b/Client/Resources/Achtung_256x256-32.png new file mode 100644 index 00000000..5820d60d Binary files /dev/null and b/Client/Resources/Achtung_256x256-32.png differ diff --git a/Client/Resources/Achtung_32x32-32.png b/Client/Resources/Achtung_32x32-32.png new file mode 100644 index 00000000..57d1e807 Binary files /dev/null and b/Client/Resources/Achtung_32x32-32.png differ diff --git a/Client/Resources/Achtung_48x48-32.png b/Client/Resources/Achtung_48x48-32.png new file mode 100644 index 00000000..4c4baa1f Binary files /dev/null and b/Client/Resources/Achtung_48x48-32.png differ diff --git a/Client/Resources/OK_16x16-32.png b/Client/Resources/OK_16x16-32.png new file mode 100644 index 00000000..6754f40e Binary files /dev/null and b/Client/Resources/OK_16x16-32.png differ diff --git a/Client/Resources/OK_24x24-32.png b/Client/Resources/OK_24x24-32.png new file mode 100644 index 00000000..73b441a5 Binary files /dev/null and b/Client/Resources/OK_24x24-32.png differ diff --git a/Client/Resources/OK_256x256-32.png b/Client/Resources/OK_256x256-32.png new file mode 100644 index 00000000..9190939d Binary files /dev/null and b/Client/Resources/OK_256x256-32.png differ diff --git a/Client/Resources/OK_32x32-32.png b/Client/Resources/OK_32x32-32.png new file mode 100644 index 00000000..46417ff6 Binary files /dev/null and b/Client/Resources/OK_32x32-32.png differ diff --git a/Client/Resources/OK_48x48-32.png b/Client/Resources/OK_48x48-32.png new file mode 100644 index 00000000..c5225355 Binary files /dev/null and b/Client/Resources/OK_48x48-32.png differ diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 10f55c6e..212c685a 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -3206,6 +3206,7 @@ namespace OnDoc.UICintrols private void dokumentLinkPerMailVersendenToolStripMenuItem_Click(object sender, EventArgs e) { + string ul = "
    "; string endul = "
"; string li = "
  • "; @@ -3222,7 +3223,7 @@ namespace OnDoc.UICintrols } Cursor = Cursors.WaitCursor; - + DB db = new DB(AppParams.connectionstring); string doklist = ""; doklist = ul; foreach (var record in records) @@ -3231,10 +3232,12 @@ namespace OnDoc.UICintrols string documentid = datarow["dokumentid"].ToString(); string partnernr= datarow["Partner-Nr"].ToString(); string bezeichnung = datarow["DokBez"].ToString(); - doklist = doklist + li + "" + documentid + " Partner:" + partnernr + " Dokument: " + bezeichnung + endli; + db.Get_Tabledata("Select '('+ltrim(rtrim(str(nrpar00)))+') '+bkpar00 from partner where nrpar00=" + partnernr.ToString(), false, true); + string partner = db.dsdaten.Tables[0].Rows[0][0].ToString(); + doklist = doklist + li + "" + bezeichnung + " - "+partner+""+ endli; } doklist = doklist + endul; - + db = null; frmMail fmail = new frmMail(doklist); fmail.ShowDialog(); Cursor = Cursors.Default; diff --git a/Client/UIControls/Serienbrief.cs b/Client/UIControls/Serienbrief.cs index 78c6e26e..11e0759e 100644 --- a/Client/UIControls/Serienbrief.cs +++ b/Client/UIControls/Serienbrief.cs @@ -2582,7 +2582,7 @@ namespace OnDoc.UIControls dr[4] = DateTime.Now; dr[5] = AppParams.CurrentMitarbeiter; dr[6] = true; - dr[7] = dokytype; + dr[7] = sb.dokumenttypnr.ToString(); dr[8] = bez; dr[9] = json; db.daten.Tables[0].Rows.Add(dr); @@ -2597,7 +2597,7 @@ namespace OnDoc.UIControls private void ribbonbuttonloadtemplate_Click(object sender, EventArgs e) { - SerienbriefTemplateLoad sbt = new SerienbriefTemplateLoad(AppParams.CurrentMitarbeiter.ToString()); + SerienbriefTemplateLoad sbt = new SerienbriefTemplateLoad(AppParams.CurrentMitarbeiter.ToString(), sb.dokumenttypnr.ToString()); sbt.ShowDialog(); if (sbt.DialogResult == DialogResult.OK) { diff --git a/Client/Versandstrasse/Versandstrasse.Designer.cs b/Client/Versandstrasse/Versandstrasse.Designer.cs index fcf4e915..94649b3e 100644 --- a/Client/Versandstrasse/Versandstrasse.Designer.cs +++ b/Client/Versandstrasse/Versandstrasse.Designer.cs @@ -30,14 +30,14 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Versandstrasse)); - Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings11 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); - Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings11 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); - Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings11 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); + Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings3 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); + Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings3 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); + Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings3 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); - Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings12 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); - Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings12 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); - Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings12 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); + Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings4 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); + Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings4 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); + Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings4 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -49,6 +49,9 @@ this.GrpPaketDetails = new System.Windows.Forms.GroupBox(); this.btnPrepare = new System.Windows.Forms.Button(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.pnlcouvertgroesse = new System.Windows.Forms.Panel(); + this.rbc5normal = new System.Windows.Forms.RadioButton(); + this.rbc5mini = new System.Windows.Forms.RadioButton(); this.label5 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.txtadresse = new System.Windows.Forms.TextBox(); @@ -131,13 +134,11 @@ this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.ribbonButton3 = new System.Windows.Forms.RibbonButton(); this.lblserienbrief = new System.Windows.Forms.Label(); - this.pnlcouvertgroesse = new System.Windows.Forms.Panel(); - this.rbc5mini = new System.Windows.Forms.RadioButton(); - this.rbc5normal = new System.Windows.Forms.RadioButton(); this.contextMenuStrip1.SuspendLayout(); this.panelPrepare.SuspendLayout(); this.GrpPaketDetails.SuspendLayout(); this.groupBox3.SuspendLayout(); + this.pnlcouvertgroesse.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).BeginInit(); this.panelVerify.SuspendLayout(); this.panelverifysb.SuspendLayout(); @@ -154,7 +155,6 @@ this.pnlpostkorb.SuspendLayout(); this.pnlprogress.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).BeginInit(); - this.pnlcouvertgroesse.SuspendLayout(); this.SuspendLayout(); // // contextMenuStrip1 @@ -163,14 +163,14 @@ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.löschenToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(119, 26); + this.contextMenuStrip1.Size = new System.Drawing.Size(132, 28); this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); this.contextMenuStrip1.Click += new System.EventHandler(this.contextMenuStrip1_Click); // // löschenToolStripMenuItem // this.löschenToolStripMenuItem.Name = "löschenToolStripMenuItem"; - this.löschenToolStripMenuItem.Size = new System.Drawing.Size(118, 22); + this.löschenToolStripMenuItem.Size = new System.Drawing.Size(131, 24); this.löschenToolStripMenuItem.Text = "Löschen"; this.löschenToolStripMenuItem.Click += new System.EventHandler(this.löschenToolStripMenuItem_Click); // @@ -211,7 +211,7 @@ this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.Location = new System.Drawing.Point(198, 28); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(437, 20); + this.label4.Size = new System.Drawing.Size(525, 25); this.label4.TabIndex = 0; this.label4.Text = "Versand wird vorbereit - bitte einen Moment warten...."; this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -227,17 +227,17 @@ this.pdfViewerControl1.IsTextSearchEnabled = true; this.pdfViewerControl1.IsTextSelectionEnabled = true; this.pdfViewerControl1.Location = new System.Drawing.Point(908, 54); - messageBoxSettings11.EnableNotification = true; - this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings11; + messageBoxSettings3.EnableNotification = true; + this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings3; this.pdfViewerControl1.MinimumZoomPercentage = 50; this.pdfViewerControl1.Name = "pdfViewerControl1"; this.pdfViewerControl1.PageBorderThickness = 1; - pdfViewerPrinterSettings11.Copies = 1; - pdfViewerPrinterSettings11.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; - pdfViewerPrinterSettings11.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; - pdfViewerPrinterSettings11.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings11.PrintLocation"))); - pdfViewerPrinterSettings11.ShowPrintStatusDialog = true; - this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings11; + pdfViewerPrinterSettings3.Copies = 1; + pdfViewerPrinterSettings3.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; + pdfViewerPrinterSettings3.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; + pdfViewerPrinterSettings3.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings3.PrintLocation"))); + pdfViewerPrinterSettings3.ShowPrintStatusDialog = true; + this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings3; this.pdfViewerControl1.ReferencePath = null; this.pdfViewerControl1.ScrollDisplacementValue = 0; this.pdfViewerControl1.ShowHorizontalScrollBar = true; @@ -247,10 +247,10 @@ this.pdfViewerControl1.SpaceBetweenPages = 8; this.pdfViewerControl1.TabIndex = 10; this.pdfViewerControl1.Text = "pdfViewerControl1"; - textSearchSettings11.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); - textSearchSettings11.HighlightAllInstance = true; - textSearchSettings11.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); - this.pdfViewerControl1.TextSearchSettings = textSearchSettings11; + textSearchSettings3.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); + textSearchSettings3.HighlightAllInstance = true; + textSearchSettings3.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); + this.pdfViewerControl1.TextSearchSettings = textSearchSettings3; this.pdfViewerControl1.ThemeName = "Default"; this.pdfViewerControl1.VerticalScrollOffset = 0; this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; @@ -300,12 +300,46 @@ this.groupBox3.TabIndex = 2; this.groupBox3.TabStop = false; // + // pnlcouvertgroesse + // + this.pnlcouvertgroesse.Controls.Add(this.rbc5normal); + this.pnlcouvertgroesse.Controls.Add(this.rbc5mini); + this.pnlcouvertgroesse.Location = new System.Drawing.Point(2, 33); + this.pnlcouvertgroesse.Name = "pnlcouvertgroesse"; + this.pnlcouvertgroesse.Size = new System.Drawing.Size(260, 21); + this.pnlcouvertgroesse.TabIndex = 14; + this.pnlcouvertgroesse.Visible = false; + // + // rbc5normal + // + this.rbc5normal.AutoSize = true; + this.rbc5normal.Location = new System.Drawing.Point(123, 2); + this.rbc5normal.Name = "rbc5normal"; + this.rbc5normal.Size = new System.Drawing.Size(158, 19); + this.rbc5normal.TabIndex = 1; + this.rbc5normal.TabStop = true; + this.rbc5normal.Text = "C5 Normal (bis 15 Blatt)"; + this.rbc5normal.UseVisualStyleBackColor = true; + this.rbc5normal.CheckedChanged += new System.EventHandler(this.rbc5normal_CheckedChanged); + // + // rbc5mini + // + this.rbc5mini.AutoSize = true; + this.rbc5mini.Location = new System.Drawing.Point(5, 2); + this.rbc5mini.Name = "rbc5mini"; + this.rbc5mini.Size = new System.Drawing.Size(134, 19); + this.rbc5mini.TabIndex = 0; + this.rbc5mini.TabStop = true; + this.rbc5mini.Text = "C5 Mini (bis 5 Blatt)"; + this.rbc5mini.UseVisualStyleBackColor = true; + this.rbc5mini.CheckedChanged += new System.EventHandler(this.rbc5mini_CheckedChanged); + // // label5 // this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(3, 36); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(147, 13); + this.label5.Size = new System.Drawing.Size(167, 15); this.label5.TabIndex = 13; this.label5.Text = "(Rückversand: max. 5 Blätter)"; // @@ -314,7 +348,7 @@ this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(267, 41); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(93, 13); + this.label6.Size = new System.Drawing.Size(106, 15); this.label6.TabIndex = 10; this.label6.Text = "Gewählte Adresse"; // @@ -377,7 +411,7 @@ this.chkGAS.AutoSize = true; this.chkGAS.Location = new System.Drawing.Point(6, 13); this.chkGAS.Name = "chkGAS"; - this.chkGAS.Size = new System.Drawing.Size(181, 17); + this.chkGAS.Size = new System.Drawing.Size(203, 19); this.chkGAS.TabIndex = 0; this.chkGAS.Text = "Frankiertes Rückantwortcouvert "; this.chkGAS.UseVisualStyleBackColor = true; @@ -411,7 +445,7 @@ this.txtAnzahlSeiten.Location = new System.Drawing.Point(151, 152); this.txtAnzahlSeiten.Name = "txtAnzahlSeiten"; this.txtAnzahlSeiten.ReadOnly = true; - this.txtAnzahlSeiten.Size = new System.Drawing.Size(265, 13); + this.txtAnzahlSeiten.Size = new System.Drawing.Size(265, 16); this.txtAnzahlSeiten.TabIndex = 17; // // txtAnzahlDokumente @@ -421,7 +455,7 @@ this.txtAnzahlDokumente.Location = new System.Drawing.Point(151, 133); this.txtAnzahlDokumente.Name = "txtAnzahlDokumente"; this.txtAnzahlDokumente.ReadOnly = true; - this.txtAnzahlDokumente.Size = new System.Drawing.Size(265, 13); + this.txtAnzahlDokumente.Size = new System.Drawing.Size(265, 16); this.txtAnzahlDokumente.TabIndex = 16; // // label15 @@ -430,7 +464,7 @@ this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label15.Location = new System.Drawing.Point(10, 152); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(89, 13); + this.label15.Size = new System.Drawing.Size(113, 17); this.label15.TabIndex = 15; this.label15.Text = "Anzahl Seiten:"; // @@ -440,7 +474,7 @@ this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label14.Location = new System.Drawing.Point(9, 133); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(117, 13); + this.label14.Size = new System.Drawing.Size(148, 17); this.label14.TabIndex = 14; this.label14.Text = "Anzahl Dokumente:"; // @@ -474,7 +508,7 @@ this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label7.Location = new System.Drawing.Point(5, 14); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(72, 13); + this.label7.Size = new System.Drawing.Size(93, 17); this.label7.TabIndex = 10; this.label7.Text = "Versandart:"; // @@ -494,7 +528,7 @@ this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label8.Location = new System.Drawing.Point(5, 40); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(132, 13); + this.label8.Size = new System.Drawing.Size(167, 17); this.label8.TabIndex = 11; this.label8.Text = "Rückantwort-Adresse:"; // @@ -505,7 +539,7 @@ this.txtVersandoption.Location = new System.Drawing.Point(151, 14); this.txtVersandoption.Name = "txtVersandoption"; this.txtVersandoption.ReadOnly = true; - this.txtVersandoption.Size = new System.Drawing.Size(265, 13); + this.txtVersandoption.Size = new System.Drawing.Size(265, 16); this.txtVersandoption.TabIndex = 12; // // lblprueftext @@ -513,7 +547,7 @@ this.lblprueftext.AutoSize = true; this.lblprueftext.Location = new System.Drawing.Point(10, 174); this.lblprueftext.Name = "lblprueftext"; - this.lblprueftext.Size = new System.Drawing.Size(43, 13); + this.lblprueftext.Size = new System.Drawing.Size(48, 15); this.lblprueftext.TabIndex = 6; this.lblprueftext.Text = "Prüftext"; // @@ -557,7 +591,7 @@ this.lblprueftextsb2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblprueftextsb2.Location = new System.Drawing.Point(9, 184); this.lblprueftextsb2.Name = "lblprueftextsb2"; - this.lblprueftextsb2.Size = new System.Drawing.Size(51, 13); + this.lblprueftextsb2.Size = new System.Drawing.Size(64, 17); this.lblprueftextsb2.TabIndex = 20; this.lblprueftextsb2.Text = "Prüftext"; // @@ -568,7 +602,7 @@ this.txtAnzahlDokumetneSB.Location = new System.Drawing.Point(151, 126); this.txtAnzahlDokumetneSB.Name = "txtAnzahlDokumetneSB"; this.txtAnzahlDokumetneSB.ReadOnly = true; - this.txtAnzahlDokumetneSB.Size = new System.Drawing.Size(265, 13); + this.txtAnzahlDokumetneSB.Size = new System.Drawing.Size(265, 16); this.txtAnzahlDokumetneSB.TabIndex = 19; // // txtRückantwortSB @@ -588,7 +622,7 @@ this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label16.Location = new System.Drawing.Point(9, 126); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(117, 13); + this.label16.Size = new System.Drawing.Size(148, 17); this.label16.TabIndex = 18; this.label16.Text = "Anzahl Dokumente:"; // @@ -598,7 +632,7 @@ this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label9.Location = new System.Drawing.Point(6, 7); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(72, 13); + this.label9.Size = new System.Drawing.Size(93, 17); this.label9.TabIndex = 14; this.label9.Text = "Versandart:"; // @@ -608,7 +642,7 @@ this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label10.Location = new System.Drawing.Point(6, 33); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(132, 13); + this.label10.Size = new System.Drawing.Size(167, 17); this.label10.TabIndex = 15; this.label10.Text = "Rückantwort-Adresse:"; // @@ -619,7 +653,7 @@ this.txtversandartsb.Location = new System.Drawing.Point(152, 7); this.txtversandartsb.Name = "txtversandartsb"; this.txtversandartsb.ReadOnly = true; - this.txtversandartsb.Size = new System.Drawing.Size(265, 13); + this.txtversandartsb.Size = new System.Drawing.Size(265, 16); this.txtversandartsb.TabIndex = 16; // // btnsendserienbrief @@ -652,7 +686,7 @@ this.lblprueftextSB.AutoSize = true; this.lblprueftextSB.Location = new System.Drawing.Point(9, 154); this.lblprueftextSB.Name = "lblprueftextSB"; - this.lblprueftextSB.Size = new System.Drawing.Size(43, 13); + this.lblprueftextSB.Size = new System.Drawing.Size(48, 15); this.lblprueftextSB.TabIndex = 6; this.lblprueftextSB.Text = "Prüftext"; // @@ -678,7 +712,7 @@ this.rbb1post.Checked = true; this.rbb1post.Location = new System.Drawing.Point(74, 21); this.rbb1post.Name = "rbb1post"; - this.rbb1post.Size = new System.Drawing.Size(62, 17); + this.rbb1post.Size = new System.Drawing.Size(71, 19); this.rbb1post.TabIndex = 5; this.rbb1post.TabStop = true; this.rbb1post.Text = "B1-Post"; @@ -690,7 +724,7 @@ this.rbb2post.AutoSize = true; this.rbb2post.Location = new System.Drawing.Point(6, 21); this.rbb2post.Name = "rbb2post"; - this.rbb2post.Size = new System.Drawing.Size(62, 17); + this.rbb2post.Size = new System.Drawing.Size(71, 19); this.rbb2post.TabIndex = 4; this.rbb2post.Text = "B2-Post"; this.rbb2post.UseVisualStyleBackColor = true; @@ -701,7 +735,7 @@ this.rbversandoption3.AutoSize = true; this.rbversandoption3.Location = new System.Drawing.Point(222, 21); this.rbversandoption3.Name = "rbversandoption3"; - this.rbversandoption3.Size = new System.Drawing.Size(207, 17); + this.rbversandoption3.Size = new System.Drawing.Size(238, 19); this.rbversandoption3.TabIndex = 2; this.rbversandoption3.Text = "Hauptadresse, Postversand erzwingen"; this.rbversandoption3.UseVisualStyleBackColor = true; @@ -712,7 +746,7 @@ this.rbapost.AutoSize = true; this.rbapost.Location = new System.Drawing.Point(142, 21); this.rbapost.Name = "rbapost"; - this.rbapost.Size = new System.Drawing.Size(56, 17); + this.rbapost.Size = new System.Drawing.Size(63, 19); this.rbapost.TabIndex = 3; this.rbapost.Text = "A-Post"; this.rbapost.UseVisualStyleBackColor = true; @@ -723,7 +757,7 @@ this.rbversandoption2.AutoSize = true; this.rbversandoption2.Location = new System.Drawing.Point(222, 21); this.rbversandoption2.Name = "rbversandoption2"; - this.rbversandoption2.Size = new System.Drawing.Size(197, 17); + this.rbversandoption2.Size = new System.Drawing.Size(228, 19); this.rbversandoption2.TabIndex = 1; this.rbversandoption2.Text = "Hauptadresse, E-Banking erzwingen"; this.rbversandoption2.UseVisualStyleBackColor = true; @@ -734,7 +768,7 @@ this.rbversandoption1.AutoSize = true; this.rbversandoption1.Location = new System.Drawing.Point(222, 21); this.rbversandoption1.Name = "rbversandoption1"; - this.rbversandoption1.Size = new System.Drawing.Size(166, 17); + this.rbversandoption1.Size = new System.Drawing.Size(191, 19); this.rbversandoption1.TabIndex = 0; this.rbversandoption1.Text = "Hauptadresse und Versandart"; this.rbversandoption1.UseVisualStyleBackColor = true; @@ -780,7 +814,7 @@ this.treeViewAdv1.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdv1.HelpTextControl.Location = new System.Drawing.Point(732, 0); this.treeViewAdv1.HelpTextControl.Name = "helpText"; - this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(49, 15); + this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(55, 17); this.treeViewAdv1.HelpTextControl.TabIndex = 0; this.treeViewAdv1.HelpTextControl.Text = "help text"; this.treeViewAdv1.HideSelection = false; @@ -817,7 +851,7 @@ this.treeViewAdv1.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdv1.ToolTipControl.Location = new System.Drawing.Point(642, 0); this.treeViewAdv1.ToolTipControl.Name = "toolTip"; - this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(41, 15); + this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(46, 17); this.treeViewAdv1.ToolTipControl.TabIndex = 1; this.treeViewAdv1.ToolTipControl.Text = "toolTip"; this.treeViewAdv1.TransparentControls = true; @@ -839,17 +873,17 @@ this.pdfViewerControl2.IsTextSearchEnabled = true; this.pdfViewerControl2.IsTextSelectionEnabled = true; this.pdfViewerControl2.Location = new System.Drawing.Point(482, 0); - messageBoxSettings12.EnableNotification = true; - this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings12; + messageBoxSettings4.EnableNotification = true; + this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings4; this.pdfViewerControl2.MinimumZoomPercentage = 50; this.pdfViewerControl2.Name = "pdfViewerControl2"; this.pdfViewerControl2.PageBorderThickness = 1; - pdfViewerPrinterSettings12.Copies = 1; - pdfViewerPrinterSettings12.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; - pdfViewerPrinterSettings12.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; - pdfViewerPrinterSettings12.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings12.PrintLocation"))); - pdfViewerPrinterSettings12.ShowPrintStatusDialog = true; - this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings12; + pdfViewerPrinterSettings4.Copies = 1; + pdfViewerPrinterSettings4.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; + pdfViewerPrinterSettings4.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; + pdfViewerPrinterSettings4.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings4.PrintLocation"))); + pdfViewerPrinterSettings4.ShowPrintStatusDialog = true; + this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings4; this.pdfViewerControl2.ReferencePath = null; this.pdfViewerControl2.ScrollDisplacementValue = 0; this.pdfViewerControl2.ShowHorizontalScrollBar = true; @@ -859,10 +893,10 @@ this.pdfViewerControl2.SpaceBetweenPages = 8; this.pdfViewerControl2.TabIndex = 11; this.pdfViewerControl2.Text = "pdfViewerControl2"; - textSearchSettings12.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); - textSearchSettings12.HighlightAllInstance = true; - textSearchSettings12.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); - this.pdfViewerControl2.TextSearchSettings = textSearchSettings12; + textSearchSettings4.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); + textSearchSettings4.HighlightAllInstance = true; + textSearchSettings4.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); + this.pdfViewerControl2.TextSearchSettings = textSearchSettings4; this.pdfViewerControl2.ThemeName = "Default"; this.pdfViewerControl2.VerticalScrollOffset = 0; this.pdfViewerControl2.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; @@ -906,7 +940,7 @@ this.textBox4.Location = new System.Drawing.Point(156, 165); this.textBox4.Name = "textBox4"; this.textBox4.ReadOnly = true; - this.textBox4.Size = new System.Drawing.Size(265, 13); + this.textBox4.Size = new System.Drawing.Size(265, 16); this.textBox4.TabIndex = 25; // // label17 @@ -915,7 +949,7 @@ this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label17.Location = new System.Drawing.Point(12, 165); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(89, 13); + this.label17.Size = new System.Drawing.Size(113, 17); this.label17.TabIndex = 24; this.label17.Text = "Anzahl Seiten:"; // @@ -926,7 +960,7 @@ this.textBox3.Location = new System.Drawing.Point(156, 141); this.textBox3.Name = "textBox3"; this.textBox3.ReadOnly = true; - this.textBox3.Size = new System.Drawing.Size(265, 13); + this.textBox3.Size = new System.Drawing.Size(265, 16); this.textBox3.TabIndex = 23; // // label13 @@ -935,7 +969,7 @@ this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label13.Location = new System.Drawing.Point(12, 141); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(117, 13); + this.label13.Size = new System.Drawing.Size(148, 17); this.label13.TabIndex = 22; this.label13.Text = "Anzahl Dokumente:"; // @@ -956,7 +990,7 @@ this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label11.Location = new System.Drawing.Point(10, 19); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(72, 13); + this.label11.Size = new System.Drawing.Size(93, 17); this.label11.TabIndex = 18; this.label11.Text = "Versandart:"; // @@ -966,7 +1000,7 @@ this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label12.Location = new System.Drawing.Point(10, 45); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(132, 13); + this.label12.Size = new System.Drawing.Size(167, 17); this.label12.TabIndex = 19; this.label12.Text = "Rückantwort-Adresse:"; // @@ -977,7 +1011,7 @@ this.textBox2.Location = new System.Drawing.Point(156, 19); this.textBox2.Name = "textBox2"; this.textBox2.ReadOnly = true; - this.textBox2.Size = new System.Drawing.Size(265, 13); + this.textBox2.Size = new System.Drawing.Size(265, 16); this.textBox2.TabIndex = 20; // // treeViewAdvCouverts @@ -1010,7 +1044,7 @@ this.treeViewAdvCouverts.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdvCouverts.HelpTextControl.Location = new System.Drawing.Point(732, 0); this.treeViewAdvCouverts.HelpTextControl.Name = "helpText"; - this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(49, 15); + this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(55, 17); this.treeViewAdvCouverts.HelpTextControl.TabIndex = 0; this.treeViewAdvCouverts.HelpTextControl.Text = "help text"; this.treeViewAdvCouverts.HideSelection = false; @@ -1047,7 +1081,7 @@ this.treeViewAdvCouverts.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdvCouverts.ToolTipControl.Location = new System.Drawing.Point(642, 0); this.treeViewAdvCouverts.ToolTipControl.Name = "toolTip"; - this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(41, 15); + this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(46, 17); this.treeViewAdvCouverts.ToolTipControl.TabIndex = 1; this.treeViewAdvCouverts.ToolTipControl.Text = "toolTip"; this.treeViewAdvCouverts.TransparentControls = true; @@ -1060,19 +1094,19 @@ this.versandCouvertLöschenToolStripMenuItem, this.versandCouvertÖffnenbearbeitenToolStripMenuItem}); this.contextMenuStrip2.Name = "contextMenuStrip2"; - this.contextMenuStrip2.Size = new System.Drawing.Size(262, 48); + this.contextMenuStrip2.Size = new System.Drawing.Size(313, 52); // // versandCouvertLöschenToolStripMenuItem // this.versandCouvertLöschenToolStripMenuItem.Name = "versandCouvertLöschenToolStripMenuItem"; - this.versandCouvertLöschenToolStripMenuItem.Size = new System.Drawing.Size(261, 22); + this.versandCouvertLöschenToolStripMenuItem.Size = new System.Drawing.Size(312, 24); this.versandCouvertLöschenToolStripMenuItem.Text = "Versand-Couvert löschen"; this.versandCouvertLöschenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertLöschenToolStripMenuItem_Click); // // versandCouvertÖffnenbearbeitenToolStripMenuItem // this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Name = "versandCouvertÖffnenbearbeitenToolStripMenuItem"; - this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Size = new System.Drawing.Size(261, 22); + this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Size = new System.Drawing.Size(312, 24); this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Text = "Versand-Couvert öffnen/bearbeiten"; this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertÖffnenbearbeitenToolStripMenuItem_Click); // @@ -1209,7 +1243,7 @@ this.lblprieveiwbezeichnung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblprieveiwbezeichnung.Location = new System.Drawing.Point(7, 16); this.lblprieveiwbezeichnung.Name = "lblprieveiwbezeichnung"; - this.lblprieveiwbezeichnung.Size = new System.Drawing.Size(0, 20); + this.lblprieveiwbezeichnung.Size = new System.Drawing.Size(0, 25); this.lblprieveiwbezeichnung.TabIndex = 0; // // panel2 @@ -1267,7 +1301,7 @@ this.lblpostausgang.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblpostausgang.Location = new System.Drawing.Point(1238, 49); this.lblpostausgang.Name = "lblpostausgang"; - this.lblpostausgang.Size = new System.Drawing.Size(135, 20); + this.lblpostausgang.Size = new System.Drawing.Size(166, 25); this.lblpostausgang.TabIndex = 24; this.lblpostausgang.Text = "labelpostausgang"; this.lblpostausgang.Visible = false; @@ -1292,7 +1326,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(9, 22); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(143, 13); + this.label1.Size = new System.Drawing.Size(163, 15); this.label1.TabIndex = 21; this.label1.Text = "Fortschritt Dokumentversand"; // @@ -1326,7 +1360,7 @@ this.lblProgressTitel.AutoSize = true; this.lblProgressTitel.Location = new System.Drawing.Point(12, 9); this.lblProgressTitel.Name = "lblProgressTitel"; - this.lblProgressTitel.Size = new System.Drawing.Size(0, 13); + this.lblProgressTitel.Size = new System.Drawing.Size(0, 15); this.lblProgressTitel.TabIndex = 19; // // label3 @@ -1334,7 +1368,7 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(435, 78); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(25, 13); + this.label3.Size = new System.Drawing.Size(28, 15); this.label3.TabIndex = 18; this.label3.Text = "100"; // @@ -1343,7 +1377,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 78); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(13, 13); + this.label2.Size = new System.Drawing.Size(14, 15); this.label2.TabIndex = 17; this.label2.Text = "0"; // @@ -1368,43 +1402,11 @@ this.lblserienbrief.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblserienbrief.Location = new System.Drawing.Point(1236, 48); this.lblserienbrief.Name = "lblserienbrief"; - this.lblserienbrief.Size = new System.Drawing.Size(101, 20); + this.lblserienbrief.Size = new System.Drawing.Size(125, 25); this.lblserienbrief.TabIndex = 26; this.lblserienbrief.Text = "lblSerienbrief"; this.lblserienbrief.Visible = false; // - // pnlcouvertgroesse - // - this.pnlcouvertgroesse.Controls.Add(this.rbc5normal); - this.pnlcouvertgroesse.Controls.Add(this.rbc5mini); - this.pnlcouvertgroesse.Location = new System.Drawing.Point(2, 33); - this.pnlcouvertgroesse.Name = "pnlcouvertgroesse"; - this.pnlcouvertgroesse.Size = new System.Drawing.Size(260, 21); - this.pnlcouvertgroesse.TabIndex = 14; - this.pnlcouvertgroesse.Visible = false; - // - // rbc5mini - // - this.rbc5mini.AutoSize = true; - this.rbc5mini.Location = new System.Drawing.Point(5, 2); - this.rbc5mini.Name = "rbc5mini"; - this.rbc5mini.Size = new System.Drawing.Size(115, 17); - this.rbc5mini.TabIndex = 0; - this.rbc5mini.TabStop = true; - this.rbc5mini.Text = "C5 Mini (bis 5 Blatt)"; - this.rbc5mini.UseVisualStyleBackColor = true; - // - // rbc5normal - // - this.rbc5normal.AutoSize = true; - this.rbc5normal.Location = new System.Drawing.Point(123, 2); - this.rbc5normal.Name = "rbc5normal"; - this.rbc5normal.Size = new System.Drawing.Size(135, 17); - this.rbc5normal.TabIndex = 1; - this.rbc5normal.TabStop = true; - this.rbc5normal.Text = "C5 Normal (bis 15 Blatt)"; - this.rbc5normal.UseVisualStyleBackColor = true; - // // Versandstrasse // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1433,6 +1435,8 @@ this.GrpPaketDetails.ResumeLayout(false); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); + this.pnlcouvertgroesse.ResumeLayout(false); + this.pnlcouvertgroesse.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).EndInit(); this.panelVerify.ResumeLayout(false); this.panelVerify.PerformLayout(); @@ -1455,8 +1459,6 @@ this.pnlprogress.ResumeLayout(false); this.pnlprogress.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).EndInit(); - this.pnlcouvertgroesse.ResumeLayout(false); - this.pnlcouvertgroesse.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Client/Versandstrasse/Versandstrasse.cs b/Client/Versandstrasse/Versandstrasse.cs index ae28d256..f4f61e9d 100644 --- a/Client/Versandstrasse/Versandstrasse.cs +++ b/Client/Versandstrasse/Versandstrasse.cs @@ -78,7 +78,7 @@ namespace OnDoc.Versandstrasse { bool hasprivateaddresses = false; DB db = new DB(AppParams.connectionstring); - db.Get_Tabledata("Select * from Antwortadresse_mitarbeiter where mitarbeiternr = "+AppParams.CurrentMitarbeiter.ToString()+" order by reihenfolge", false, true); + db.Get_Tabledata("Select * from Antwortadresse_mitarbeiter where mitarbeiternr = " + AppParams.CurrentMitarbeiter.ToString() + " order by reihenfolge", false, true); if (db.dsdaten.Tables[0].Rows.Count > 0) { hasprivateaddresses = true; @@ -111,18 +111,18 @@ namespace OnDoc.Versandstrasse //treeViewAdvAdresse.SelectedNode = 0; treeViewAdvAdresse.Enabled = false; - + db = null; } private void Versandstrasse_Load(object sender, EventArgs e) { - + if (Properties.Settings.Default.GASSize == "True") { this.label5.Visible = false; this.pnlcouvertgroesse.Visible = true; - this.pnlcouvertgroesse.Enabled= false; + this.pnlcouvertgroesse.Enabled = false; this.rbc5mini.Checked = true; this.rbc5normal.Checked = false; } @@ -147,8 +147,8 @@ namespace OnDoc.Versandstrasse db = null; - if (treeViewAdv1.Nodes.Count > 0) - { + if (treeViewAdv1.Nodes.Count > 0) + { treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0]; this.pnlcouvert.Visible = true; this.pnlpostkorb.Visible = false; @@ -167,7 +167,7 @@ namespace OnDoc.Versandstrasse this.lblserienbrief.Left = this.Width - lblserienbrief.Width; } } - else + else { this.lblpostausgang.Visible = true; this.lblpostausgang.Left = this.Width - lblpostausgang.Width; @@ -175,7 +175,7 @@ namespace OnDoc.Versandstrasse this.pnlpostkorb.Visible = true; this.pnlpostkorb.Dock = DockStyle.Fill; - + Refresh_VersandCouverts(); ribbon1.Select(); ribbon1_Click(sender, e); @@ -185,9 +185,9 @@ namespace OnDoc.Versandstrasse } panelPrepare.Left = this.Width - this.panelPrepare.Width; - lblprueftext.MaximumSize = new Size(panelVerify.Width-10, 50); - lblprueftextSB.MaximumSize = new Size(panelVerify.Width-10, 50); - lblprueftextsb2.MaximumSize = new Size(panelVerify.Width-10, 50); + lblprueftext.MaximumSize = new Size(panelVerify.Width - 10, 50); + lblprueftextSB.MaximumSize = new Size(panelVerify.Width - 10, 50); + lblprueftextsb2.MaximumSize = new Size(panelVerify.Width - 10, 50); @@ -220,12 +220,12 @@ namespace OnDoc.Versandstrasse { db.Get_Tabledata("Select nrpar00, bkpar00 from partner where nrpar00=" + pakete[i].partnernr.ToString(), false, true); DruckJob = new TreeNodeAdv(); - DruckJob.Text = "Versand-Couvert - " + db.dsdaten.Tables[0].Rows[0][0].ToString()+ ", " + db.dsdaten.Tables[0].Rows[0][1].ToString(); + DruckJob.Text = "Versand-Couvert - " + db.dsdaten.Tables[0].Rows[0][0].ToString() + ", " + db.dsdaten.Tables[0].Rows[0][1].ToString(); DruckJob.Tag = "Druckpaket"; //pakete[i].partnernr = i; DruckJob.TagObject = pakete[i]; set_nodeimage(DruckJob, 0); - + treeViewAdv1.Nodes.Add(DruckJob); @@ -235,7 +235,7 @@ namespace OnDoc.Versandstrasse //db.Get_Tabledata("Select * from [applikation] where applikationsnr = 1", false, true); //if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Showlogin"]) == true) { button3.Visible = true; } else { button3.Visible = false; } - db = null; + db = null; treeViewAdv1.ExpandAll(); foreach (TreeNodeAdv node in treeViewAdv1.Nodes) { @@ -278,12 +278,13 @@ namespace OnDoc.Versandstrasse List errors = new List(); private void add_errormessage(int nr, string message) - + { bool found = false; - foreach (errormsg ermsg in errors) { + foreach (errormsg ermsg in errors) + { if (ermsg.number == nr) { found = true; break; } } if (!found) @@ -304,7 +305,7 @@ namespace OnDoc.Versandstrasse db1.Get_Tabledata("Select isnull(versandstrasse_moeglich,0), isnull(versandstrasse_firstdoc,0) from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true); if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) == 0 || Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][1]) == 0) { - + richTextBox1.Clear(); richTextBox1.BulletIndent = 20; richTextBox1.SelectionBullet = true; @@ -325,12 +326,12 @@ namespace OnDoc.Versandstrasse Versanddokument vd = node.Nodes[0].TagObject as Versanddokument; if (vd.Partnernr.ToString() != vp.partnernr.ToString()) { - db.Get_Tabledata("SELECT dbo.Partner.NRPAR00, dbo.Partner.BKPAR00 FROM partner where nrpar00="+vd.Partnernr, false, true); + db.Get_Tabledata("SELECT dbo.Partner.NRPAR00, dbo.Partner.BKPAR00 FROM partner where nrpar00=" + vd.Partnernr, false, true); node.Text = "Versand-Couvert" + " - " + db.dsdaten.Tables[0].Rows[0][0].ToString() + " " + db.dsdaten.Tables[0].Rows[0][1].ToString(); vp.partnernr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]); } } - if (vp.partnernr == 0 && node.Nodes.Count==1) + if (vp.partnernr == 0 && node.Nodes.Count == 1) { TreeNodeAdv tn = node.Nodes[0]; db.Get_Tabledata("SELECT dbo.Partner.NRPAR00, dbo.Partner.BKPAR00 FROM dbo.dokument INNER JOIN dbo.Partner ON dbo.dokument.nrpar00 = dbo.Partner.NRPAR00 WHERE dbo.dokument.dokumentid='" + tn.Tag + "'", false, true); @@ -350,9 +351,10 @@ namespace OnDoc.Versandstrasse int anzbp = 1; bool versandbereit = true; - if (vp.partnernr > 99999999) { + if (vp.partnernr > 99999999) + { versandbereit = false; - add_errormessage(6,"Im Versand-Couvert liegen ausschliesslich Personen-Dokumente. Der Versand braucht technisch ein BP-Dokument."); + add_errormessage(6, "Im Versand-Couvert liegen ausschliesslich Personen-Dokumente. Der Versand braucht technisch ein BP-Dokument."); } string kdenummern = ""; @@ -360,18 +362,19 @@ namespace OnDoc.Versandstrasse { Versanddokument vd = dokumentnode.TagObject as Versanddokument; if (kdenummern != "") { kdenummern = kdenummern + ";"; } - kdenummern = kdenummern + vd.Partnernr.ToString(); + kdenummern = kdenummern + vd.Partnernr.ToString(); } if (kdenummern != "") { db.clear_parameter(); - db.add_parameter("@kundennummer",kdenummern); + db.add_parameter("@kundennummer", kdenummern); db.Get_Tabledata("ondoc_versandstrasse_check_kdenr", true, false); - if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0])!=0) { + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) != 0) + { versandbereit = false; - - add_errormessage(Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0].ToString()), db.dsdaten.Tables[0].Rows[0][1].ToString()); + + add_errormessage(Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0].ToString()), db.dsdaten.Tables[0].Rows[0][1].ToString()); } } @@ -393,7 +396,7 @@ namespace OnDoc.Versandstrasse if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0) { set_nodeimage(dokumentnode, 0); - add_errormessage(4,"Im Versand-Couvert liegt ein Dokument, welches nicht via Versandstrasse verschickt werden kann"); + add_errormessage(4, "Im Versand-Couvert liegt ein Dokument, welches nicht via Versandstrasse verschickt werden kann"); versandbereit = false; } else @@ -406,13 +409,14 @@ namespace OnDoc.Versandstrasse } if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0) { - if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; add_errormessage(2,"Im Versand-Couvert liegt an erster Position ein Dokument, welches nicht als vorderstes Dokument tauglich ist"); } + if (nodecounter == 0) { set_nodeimage(dokumentnode, 4); versandbereit = false; add_errormessage(2, "Im Versand-Couvert liegt an erster Position ein Dokument, welches nicht als vorderstes Dokument tauglich ist"); } else { set_nodeimage(dokumentnode, 5); } db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='" + dokumentnode.Tag + "'", false, true); - if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) > 0){ + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) > 0) + { if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0) { set_nodeimage(dokumentnode, 4); @@ -425,9 +429,11 @@ namespace OnDoc.Versandstrasse } else { - db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='"+dokumentnode.Tag + "'", false, true); - if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) >1 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) >1 ){ - if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0){ + db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='" + dokumentnode.Tag + "'", false, true); + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 1 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) > 1) + { + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0) + { set_nodeimage(dokumentnode, 2); versandbereit = false; add_errormessage(7, "Im Versand-Couvert sind Dokumente mit fehlender faksimiler Unterschrift"); @@ -442,7 +448,7 @@ namespace OnDoc.Versandstrasse } nodecounter++; } - if (node.Nodes.Count < 1) { versandbereit = false;add_errormessage(1, "Im Versand-Couvert liegen keine Dokumente"); } + if (node.Nodes.Count < 1) { versandbereit = false; add_errormessage(1, "Im Versand-Couvert liegen keine Dokumente"); } if (anzbp > 1) { versandbereit = false; } if (versandbereit == true) { @@ -465,11 +471,11 @@ namespace OnDoc.Versandstrasse if (!errormessage.Contains(emsg.message)) { //if (errormessage != "") { errormessage = errormessage + Environment.NewLine; } - errormessage = errormessage + emsg.message+"\n"; + errormessage = errormessage + emsg.message + "\n"; } } - - richTextBox1.SelectedText = errormessage.Substring(0,errormessage.Length-1); + + richTextBox1.SelectedText = errormessage.Substring(0, errormessage.Length - 1); } lblerror.Visible = true; @@ -484,9 +490,9 @@ namespace OnDoc.Versandstrasse foreach (Versanddokument vd in pakete[0].Dokument) { TreeNodeAdv tn = new TreeNodeAdv(); - tn.Text = vd.Bezeichnung+" ("+vd.DokumentID+")"; + tn.Text = vd.Bezeichnung + " (" + vd.DokumentID + ")"; tn.Tag = vd.dokument; - + set_nodeimage(tn, 3); treeViewAdv1.Nodes[0].Nodes.Add(tn); } @@ -538,8 +544,9 @@ namespace OnDoc.Versandstrasse TreeViewDropPositions dropPosition = this.treeViewDragHighlightTracker.DropPosition; this.treeViewDragHighlightTracker.ClearHighlightNode(); this.currentSourceNode = null; - if (sourceNode.Level == 0) { - return; + if (sourceNode.Level == 0) + { + return; } if (destinationNode != null) @@ -553,18 +560,18 @@ namespace OnDoc.Versandstrasse sourceNode.Move(destinationNode, NodePositions.Next); break; case TreeViewDropPositions.OnNode: - + Versandpaket sourcepaket = sourceNode.Parent.TagObject as Versandpaket; TreeNodeAdv savenode = sourceNode.Parent; sourceNode.Move(destinationNode.Nodes); - + //Versanddokument dem neuen Versandpaket zuordnen Versandpaket paket = destinationNode.TagObject as Versandpaket; Versanddokument vd = sourceNode.TagObject as Versanddokument; paket.Dokument.Add(vd); destinationNode.TagObject = paket; - + foreach (Versanddokument vd1 in sourcepaket.Dokument) { if (vd1.DokumentID == vd.DokumentID) @@ -619,8 +626,8 @@ namespace OnDoc.Versandstrasse TreeNodeAdv xdestinationNode = this.treeViewDragHighlightTracker.HighlightNode; TreeViewDropPositions dropPosition = this.treeViewDragHighlightTracker.DropPosition; - if (sourceNode.Level==1) { return false; } - + if (sourceNode.Level == 1) { return false; } + if (destinationNode == null || destinationNode == sourceNode) return false; @@ -706,7 +713,7 @@ namespace OnDoc.Versandstrasse private void treeViewAdv1_NodeMouseClick(object sender, TreeViewAdvMouseClickEventArgs e) { - + } private void button1_Click(object sender, EventArgs e) @@ -736,7 +743,7 @@ namespace OnDoc.Versandstrasse this.txtRückantwort.Text = txtadresse.Text.ToString(); this.txtRückantwortSB.Text = txtRückantwort.Text; this.txtversandartsb.Text = txtVersandoption.Text; - + if (serienbrief) { clsVersandstrasse vs = new clsVersandstrasse(); @@ -755,11 +762,11 @@ namespace OnDoc.Versandstrasse panelPrepare.Visible = true; panelPrepare.Left = (this.Width - panelPrepare.Width) / 2; - - + + panelverifysb.Visible = false; - btnsendserienbrief.Visible = false; - btnSendFinal.Visible = true; + btnsendserienbrief.Visible = false; + btnSendFinal.Visible = true; Application.DoEvents(); Cursor = Cursors.WaitCursor; try @@ -774,7 +781,7 @@ namespace OnDoc.Versandstrasse { clsVersandstrasse vs = new clsVersandstrasse(); vsdok.dokument = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath); - + } } } @@ -830,16 +837,30 @@ namespace OnDoc.Versandstrasse treeViewAdv1.SelectedNode.TagObject = paket; panelVerify.Visible = true; this.txtAnzahlSeiten.Text = pdfViewerControl1.PageCount.ToString(); + if (Properties.Settings.Default.GASSize == "True") + { + if (Convert.ToInt32(txtAnzahlSeiten.Text) > 30) + + { + if (chkGAS.Checked && rbc5mini.Checked) + { + rbc5normal.Checked = true; + MessageBox.Show("Aufgrund der Anzahl Seiten wurde automatisch C5 Normal für das Rückantwort-Couvert gesetzt.", "Rückantwort-Couvert", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } this.txtAnzahlDokumente.Text = paket.Dokument.Count().ToString(); lblprieveiwbezeichnung.Text = "Aufbereitetes PDF"; } - catch (Exception ex) { MessageBox.Show(ex.Message); - } + catch (Exception ex) + { + MessageBox.Show(ex.Message); + } panelPrepare.Visible = false; Cursor = Cursors.Default; Application.DoEvents(); - } + } private string save_stapel(ref Stream[] streams) { @@ -894,7 +915,7 @@ namespace OnDoc.Versandstrasse private void btnSendFinal_Click(object sender, EventArgs e) { - + if (serienbrief) { @@ -910,12 +931,12 @@ namespace OnDoc.Versandstrasse } foreach (TreeNodeAdv node in treeViewAdv1.Nodes[0].Nodes) { - + svp.finaldoc = node.TagObject.ToString(); svp.send_onbase_doc = true; - string dokumentid = node.Text.Substring(node.Text.Length-23, 22); + string dokumentid = node.Text.Substring(node.Text.Length - 23, 22); string _sqlWhere = @"dokumentid = '" + dokumentid + "'"; - + DataTable _newDataTable = sb.dsempfaenger.Tables[0].Select(_sqlWhere, "").CopyToDataTable(); svp.partnernr = Convert.ToInt32(_newDataTable.Rows[0]["partnernr"].ToString()); @@ -924,10 +945,10 @@ namespace OnDoc.Versandstrasse vd.dokument = node.TagObject.ToString(); vd.inteintragnr = Convert.ToInt32(_newDataTable.Rows[0]["inteintragnr"].ToString()); - svp.bemerkung = vd.DokumentID +" / " + sb.serienbriefnr.ToString() + "_" + _newDataTable.Rows[0]["inteintragnr"].ToString(); + svp.bemerkung = vd.DokumentID + " / " + sb.serienbriefnr.ToString() + "_" + _newDataTable.Rows[0]["inteintragnr"].ToString(); svp.Dokument.Clear(); svp.Dokument.Add(vd); - + DB db = new DB(AppParams.connectionstring); //db.clear_parameter(); //db.add_parameter("@tgnummer", AppParams.currenttgnummer); @@ -941,12 +962,12 @@ namespace OnDoc.Versandstrasse this.progressBarAdv1.Value = this.progressBarAdv1.Value + 1; send_vs(ref svp, false); - + } - + sb.status = 1; pdfViewerControl1.Unload(); @@ -968,7 +989,7 @@ namespace OnDoc.Versandstrasse } foreach (TreeNodeAdv node in treeViewAdv1.SelectedNode.Nodes) { - foreach(Versanddokument vdok in vp.Dokument) + foreach (Versanddokument vdok in vp.Dokument) { if (node.Tag == vdok.DokumentID) { vdl.Add(vdok); } } @@ -992,19 +1013,20 @@ namespace OnDoc.Versandstrasse DB db = new DB(AppParams.connectionstring); string dokumente = ""; if (vp.Dokument.Count > 1) { vp.send_onbase_doc = false; } - else { - foreach (Versanddokument vd in vp.Dokument) + else { - dokumente = dokumente + vd.DokumentID + ";"; - string sql = "SELECT dbo.dokumenttyp.ErstellungInOffice FROM dbo.dokument INNER JOIN dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr WHERE (dbo.dokument.dokumentid = '" + vd.DokumentID + "')"; - db.Get_Tabledata(sql, false, true); - if (db.dsdaten.Tables[0].Rows[0][0].ToString() == "True") + foreach (Versanddokument vd in vp.Dokument) { - //vd.dokument = ""; - vp.send_onbase_doc = false; + dokumente = dokumente + vd.DokumentID + ";"; + string sql = "SELECT dbo.dokumenttyp.ErstellungInOffice FROM dbo.dokument INNER JOIN dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr WHERE (dbo.dokument.dokumentid = '" + vd.DokumentID + "')"; + db.Get_Tabledata(sql, false, true); + if (db.dsdaten.Tables[0].Rows[0][0].ToString() == "True") + { + //vd.dokument = ""; + vp.send_onbase_doc = false; + } } } - } //db.clear_parameter(); //db.add_parameter("@tgnummer", AppParams.currenttgnummer); //db.add_parameter("@partnernr", vp.partnernr.ToString()); @@ -1022,37 +1044,37 @@ namespace OnDoc.Versandstrasse string jsonstring = JsonConvert.SerializeObject(vp); //vp.send_onbase_doc = true; - - DB db = new DB(AppParams.connectionstring); - db.clear_parameter(); - db.add_parameter("@ersteller", AppParams.CurrentMitarbeiter.ToString()); - db.Get_Tabledata("ondoc_create_versandpaket", true, false); - int paketid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]); - - - db.Get_Tabledata_for_Update("Select top 1 * from Ondoc_Versandstrasse_Paket where id=" + paketid.ToString(), false, true); - DataRow dr = db.daten.Tables[0].Rows[0]; - dr[2] = jsonstring; - dr["aktiv"] = 1; - dr["versandoption"] = vp.Versandoption.ToString(); - dr["Bemerkung"] = vp.bemerkung; - // db.daten.Tables[0].Rows.Add(dr); - db.Update_Data(); - - db.daten.Tables.Clear(); - db.Get_Tabledata_for_Update("Select * from ondoc_versandstrasse_paket_dokumentid where couvert_id = -1", false, true); - foreach (Versanddokument vd in vp.Dokument) - { - DataRow dr1 = db.daten.Tables[0].NewRow(); - dr1[1] = paketid; - dr1[2] = vd.DokumentID; - dr1[3] = 1; - db.daten.Tables[0].Rows.Add(dr1); - - } - db.Update_Data(); - treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode); + + DB db = new DB(AppParams.connectionstring); + db.clear_parameter(); + db.add_parameter("@ersteller", AppParams.CurrentMitarbeiter.ToString()); + db.Get_Tabledata("ondoc_create_versandpaket", true, false); + int paketid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]); + + + db.Get_Tabledata_for_Update("Select top 1 * from Ondoc_Versandstrasse_Paket where id=" + paketid.ToString(), false, true); + DataRow dr = db.daten.Tables[0].Rows[0]; + dr[2] = jsonstring; + dr["aktiv"] = 1; + dr["versandoption"] = vp.Versandoption.ToString(); + dr["Bemerkung"] = vp.bemerkung; + // db.daten.Tables[0].Rows.Add(dr); + db.Update_Data(); + + db.daten.Tables.Clear(); + db.Get_Tabledata_for_Update("Select * from ondoc_versandstrasse_paket_dokumentid where couvert_id = -1", false, true); + foreach (Versanddokument vd in vp.Dokument) + { + DataRow dr1 = db.daten.Tables[0].NewRow(); + dr1[1] = paketid; + dr1[2] = vd.DokumentID; + dr1[3] = 1; + db.daten.Tables[0].Rows.Add(dr1); + + } + db.Update_Data(); + treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode); if (!direktversenden) { return; @@ -1140,10 +1162,11 @@ namespace OnDoc.Versandstrasse { txtadresse.Text = txtadresse.Text + dr["zeile7"].ToString() + Environment.NewLine; } - catch { } - + catch { } + } - catch { + catch + { txtadresse.Text = ""; } @@ -1204,8 +1227,9 @@ namespace OnDoc.Versandstrasse { foreach (TreeNodeAdv tn in treeViewAdvAdresse.Nodes) { - if (tn.Tag.ToString() == paket.GASAdresse) { - treeViewAdvAdresse.SelectedNode = tn; + if (tn.Tag.ToString() == paket.GASAdresse) + { + treeViewAdvAdresse.SelectedNode = tn; } } } @@ -1225,7 +1249,7 @@ namespace OnDoc.Versandstrasse } else { - dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null,null,"",this.ribbonchkadresse.Checked); + dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, null, "", this.ribbonchkadresse.Checked); } var stream = new MemoryStream(Convert.FromBase64String(dok)); @@ -1235,8 +1259,8 @@ namespace OnDoc.Versandstrasse GrpPaketDetails.Enabled = false; } } - catch (Exception ex) { } - finally { Cursor.Current=Cursors.Default; } + catch (Exception ex) { } + finally { Cursor.Current = Cursors.Default; } } private void button2_Click(object sender, EventArgs e) @@ -1246,7 +1270,7 @@ namespace OnDoc.Versandstrasse private void contextMenuStrip1_Click(object sender, EventArgs e) { - + } private void toolStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e) @@ -1258,37 +1282,37 @@ namespace OnDoc.Versandstrasse { } private void Refresh_VersandCouverts() - { + { - DB db = new DB(AppParams.connectionstring); - DB db2 = new DB(AppParams.connectionstring); + DB db = new DB(AppParams.connectionstring); + DB db2 = new DB(AppParams.connectionstring); - db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true); - treeViewAdvCouverts.Nodes.Clear(); - foreach (DataRow dr in db.dsdaten.Tables[0].Rows) + db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true); + treeViewAdvCouverts.Nodes.Clear(); + foreach (DataRow dr in db.dsdaten.Tables[0].Rows) + { + Versandpaket vp = JsonConvert.DeserializeObject(dr["paket"].ToString()); + TreeNodeAdv tn = new TreeNodeAdv(); + db2.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + vp.partnernr.ToString(), false, true); + tn.Text = vp.partnernr.ToString() + " - " + db2.dsdaten.Tables[0].Rows[0][0].ToString(); + tn.TagObject = vp.finaldoc; + tn.Tag = dr[0].ToString(); + if (vp.Versandoption.ToString() == "A_POST") { set_nodeimage(tn, 0); } + if (vp.Versandoption.ToString() == "B1_POST") { set_nodeimage(tn, 1); } + if (vp.Versandoption.ToString() == "B2_POST") { set_nodeimage(tn, 2); } + treeViewAdvCouverts.Nodes.Add(tn); + foreach (Versanddokument vd in vp.Dokument) { - Versandpaket vp = JsonConvert.DeserializeObject(dr["paket"].ToString()); - TreeNodeAdv tn = new TreeNodeAdv(); - db2.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + vp.partnernr.ToString(), false, true); - tn.Text = vp.partnernr.ToString() + " - " + db2.dsdaten.Tables[0].Rows[0][0].ToString(); - tn.TagObject = vp.finaldoc; - tn.Tag = dr[0].ToString(); - if (vp.Versandoption.ToString() == "A_POST") { set_nodeimage(tn, 0); } - if (vp.Versandoption.ToString() == "B1_POST") { set_nodeimage(tn, 1); } - if (vp.Versandoption.ToString() == "B2_POST") { set_nodeimage(tn, 2); } - treeViewAdvCouverts.Nodes.Add(tn); - foreach (Versanddokument vd in vp.Dokument) - { - TreeNodeAdv tn2 = new TreeNodeAdv(); - tn2.Text = vd.Bezeichnung; - tn2.Tag = vd.DokumentID; - tn2.TagObject = vd.dokument; - tn.Nodes.Add(tn2); - } + TreeNodeAdv tn2 = new TreeNodeAdv(); + tn2.Text = vd.Bezeichnung; + tn2.Tag = vd.DokumentID; + tn2.TagObject = vd.dokument; + tn.Nodes.Add(tn2); } - db = null; - db2 = null; - + } + db = null; + db2 = null; + } @@ -1321,7 +1345,7 @@ namespace OnDoc.Versandstrasse } else { - this.textBox4.Text = ""; + this.textBox4.Text = ""; this.textBox3.Text = ""; this.textBox2.Text = ""; this.textBox1.Text = ""; @@ -1338,7 +1362,7 @@ namespace OnDoc.Versandstrasse foreach (TreeNodeAdv tn in treeViewAdvCouverts.SelectedNodes) { db.Exec_SQL("Update ondoc_versandstrasse_paket set geloescht=getdate(), aktiv=0, geloescht_durch=" + AppParams.CurrentMitarbeiter.ToString() + " where id=" + tn.Tag.ToString()); - + } db = null; pdfViewerControl2.Unload(); @@ -1352,10 +1376,10 @@ namespace OnDoc.Versandstrasse if (treeViewAdvCouverts.SelectedNode.Level != 1) { return; } int id = Convert.ToInt32(treeViewAdvCouverts.SelectedNode.Tag); DB db = new DB(AppParams.connectionstring); - db.Get_Tabledata("Select * from Ondoc_Versandstrasse_Paket where id=" +id.ToString(), false, true); + db.Get_Tabledata("Select * from Ondoc_Versandstrasse_Paket where id=" + id.ToString(), false, true); Versandpaket vp = JsonConvert.DeserializeObject(db.dsdaten.Tables[0].Rows[0]["Paket"].ToString()); pakete.Add(vp); - + foreach (TreeNodeAdv tn in treeViewAdvCouverts.SelectedNodes) { db.Exec_SQL("Update ondoc_versandstrasse_paket set geloescht=getdate(), aktiv=0, reopen=1,geloescht_durch=" + AppParams.CurrentMitarbeiter.ToString() + " where id=" + id.ToString()); @@ -1367,7 +1391,7 @@ namespace OnDoc.Versandstrasse lblprieveiwbezeichnung.Text = ""; Reload_Tree(); ribbon1.TabIndex = 0; - + } @@ -1383,11 +1407,11 @@ namespace OnDoc.Versandstrasse node = node.Parent; Versandpaket vp = node.TagObject as Versandpaket; reserve_vs_dokument(treeViewAdv1.SelectedNode.Tag.ToString(), 2); - + vp.Dokument.Remove(vd); - + treeViewAdv1.SelectedNode.Remove(); - + Verify_Couvert(node); } else @@ -1424,7 +1448,7 @@ namespace OnDoc.Versandstrasse private void contextMenuStrip1_Opening(object sender, CancelEventArgs e) { - if (treeViewAdv1.SelectedNode.Level>1 && treeViewAdv1.SelectedNode.Parent.Text.Contains("Serienbrief")) + if (treeViewAdv1.SelectedNode.Level > 1 && treeViewAdv1.SelectedNode.Parent.Text.Contains("Serienbrief")) { löschenToolStripMenuItem.Enabled = false; } @@ -1457,7 +1481,7 @@ namespace OnDoc.Versandstrasse private void tsbtnpreviewdoc_Click(object sender, EventArgs e) { - + } private void tsbtncheckaddress_Click(object sender, EventArgs e) @@ -1466,7 +1490,7 @@ namespace OnDoc.Versandstrasse private void ribbonButton1_Click(object sender, EventArgs e) { - + } private void ribbonButtonNewCouvert_Click(object sender, EventArgs e) @@ -1496,7 +1520,7 @@ namespace OnDoc.Versandstrasse { this.lblpostausgang.Visible = false; this.pnlcouvert.Visible = true; - this.pnlcouvert.Dock= DockStyle.Fill; + this.pnlcouvert.Dock = DockStyle.Fill; this.pnlpostkorb.Visible = false; } } @@ -1506,11 +1530,11 @@ namespace OnDoc.Versandstrasse if (this.ribbonTab2.Active) { this.lblpostausgang.Visible = true; - this.lblpostausgang.Left = this.Width-lblpostausgang.Width; + this.lblpostausgang.Left = this.Width - lblpostausgang.Width; this.pnlcouvert.Visible = false; - + this.pnlpostkorb.Visible = true; - this.pnlpostkorb.Dock= DockStyle.Fill; + this.pnlpostkorb.Dock = DockStyle.Fill; Refresh_VersandCouverts(); } } @@ -1551,22 +1575,22 @@ namespace OnDoc.Versandstrasse } else { - ribbonbuttondokpreviewpostkorb.Checked= true; + ribbonbuttondokpreviewpostkorb.Checked = true; treeViewAdv1_AfterSelect(sender, e); } } private void Versandstrasse_Resize(object sender, EventArgs e) { - this.treeViewAdvCouverts.Height = this.Height - this.ribbon1.Height-this.grpCouvertDetails.Height; + this.treeViewAdvCouverts.Height = this.Height - this.ribbon1.Height - this.grpCouvertDetails.Height; panelPrepare.Left = this.Width - this.panelPrepare.Width; } private void Versandstrasse_FormClosing(object sender, FormClosingEventArgs e) { - if (this.treeViewAdv1.Nodes.Count > 0) - { - MessageBox.Show("Vor dem Schliessen sind die pendenten Couverts zu löschen oder in den Postausgang zu legen.","Schliessen",MessageBoxButtons.OK,MessageBoxIcon.Information); + if (this.treeViewAdv1.Nodes.Count > 0) + { + MessageBox.Show("Vor dem Schliessen sind die pendenten Couverts zu löschen oder in den Postausgang zu legen.", "Schliessen", MessageBoxButtons.OK, MessageBoxIcon.Information); e.Cancel = true; } } @@ -1576,7 +1600,7 @@ namespace OnDoc.Versandstrasse int a = 0; } - public void add_doc (Versanddokument vs) + public void add_doc(Versanddokument vs) { bool zugewiesen = false; foreach (Versandpaket vp in pakete) @@ -1605,7 +1629,7 @@ namespace OnDoc.Versandstrasse pakete.Add(vp); zugewiesen = true; Reload_Tree(); - + } } @@ -1614,5 +1638,15 @@ namespace OnDoc.Versandstrasse { AppParams.versandstrassewindows_open = false; } + + private void rbc5mini_CheckedChanged(object sender, EventArgs e) + { + this.panelVerify.Visible = false; + } + + private void rbc5normal_CheckedChanged(object sender, EventArgs e) + { + this.panelVerify.Visible = false; + } } } diff --git a/Client/Versandstrasse/Versandstrasse.resx b/Client/Versandstrasse/Versandstrasse.resx index b8f9d1ef..658a01bb 100644 --- a/Client/Versandstrasse/Versandstrasse.resx +++ b/Client/Versandstrasse/Versandstrasse.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0 - DAAAAk1TRnQBSQFMAgEBBgEAASABAQEgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBgEAASgBAQEoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -194,7 +194,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU - DAAAAk1TRnQBSQFMAgEBBQEAASgBAQEoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBQEAATABAQEwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -248,7 +248,7 @@ AYABAQIAAeABBwHAAQMBwAEDAgAB8AEPAfABDwHwAQ8BgAEBCw== - + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh @@ -337,7 +337,7 @@ /wM19F1wo1uqCAAAAABJRU5ErkJggg== - + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh @@ -355,7 +355,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq - CQAAAk1TRnQBSQFMAgEBAwEAAegBAAHoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAAfABAAHwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index e733345a..8910190b 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 a5446a05..cb595688 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 bc69e496..89fffbae 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 b83c42cb..af51c310 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 e0d70c08..01340935 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index a7dfa560..5a13ae12 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 4eccb592..8b3f1c39 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Client/obj/Debug/OnDoc.Properties.Resources.resources b/Client/obj/Debug/OnDoc.Properties.Resources.resources index 2d63ecc7..89e3f534 100644 Binary files a/Client/obj/Debug/OnDoc.Properties.Resources.resources and b/Client/obj/Debug/OnDoc.Properties.Resources.resources differ diff --git a/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources index 52db0f08..2121b4c5 100644 Binary files a/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources and b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index e733345a..8910190b 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 a5446a05..cb595688 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 36bdeb85..5b641c63 100644 Binary files a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index b83c42cb..af51c310 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/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index 2e6782d6..1d61041b 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache 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 cb2a54cf..fcbac7f0 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 a16837d9..e2620f15 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/Images/Icons/Icons/Blue/Achtung.ico b/Images/Icons/Icons/Blue/Achtung.ico new file mode 100644 index 00000000..d2abcac7 Binary files /dev/null and b/Images/Icons/Icons/Blue/Achtung.ico differ diff --git a/Images/Icons/Icons/Blue/Images/Achtung_16x16-32.png b/Images/Icons/Icons/Blue/Images/Achtung_16x16-32.png new file mode 100644 index 00000000..73444c40 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Achtung_16x16-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Achtung_24x24-32.png b/Images/Icons/Icons/Blue/Images/Achtung_24x24-32.png new file mode 100644 index 00000000..96573555 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Achtung_24x24-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Achtung_256x256-32.png b/Images/Icons/Icons/Blue/Images/Achtung_256x256-32.png new file mode 100644 index 00000000..5820d60d Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Achtung_256x256-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Achtung_32x32-32.png b/Images/Icons/Icons/Blue/Images/Achtung_32x32-32.png new file mode 100644 index 00000000..57d1e807 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Achtung_32x32-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Achtung_48x48-32.png b/Images/Icons/Icons/Blue/Images/Achtung_48x48-32.png new file mode 100644 index 00000000..4c4baa1f Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Achtung_48x48-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/OK_16x16-32.png b/Images/Icons/Icons/Blue/Images/OK_16x16-32.png new file mode 100644 index 00000000..6754f40e Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/OK_16x16-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/OK_24x24-32.png b/Images/Icons/Icons/Blue/Images/OK_24x24-32.png new file mode 100644 index 00000000..73b441a5 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/OK_24x24-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/OK_256x256-32.png b/Images/Icons/Icons/Blue/Images/OK_256x256-32.png new file mode 100644 index 00000000..9190939d Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/OK_256x256-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/OK_32x32-32.png b/Images/Icons/Icons/Blue/Images/OK_32x32-32.png new file mode 100644 index 00000000..46417ff6 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/OK_32x32-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/OK_48x48-32.png b/Images/Icons/Icons/Blue/Images/OK_48x48-32.png new file mode 100644 index 00000000..c5225355 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/OK_48x48-32.png differ diff --git a/Images/Icons/Icons/Blue/OK.ico b/Images/Icons/Icons/Blue/OK.ico new file mode 100644 index 00000000..19394328 Binary files /dev/null and b/Images/Icons/Icons/Blue/OK.ico differ diff --git a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache index d716f0aa..46d13d23 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/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index b9517670..a75d0235 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache index 106be9cf..b3ae8edd 100644 Binary files a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache and b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache differ diff --git a/VBOffice/bin/Debug/Model.dll b/VBOffice/bin/Debug/Model.dll index 1e10b6a9..a7ddfef2 100644 Binary files a/VBOffice/bin/Debug/Model.dll and b/VBOffice/bin/Debug/Model.dll differ diff --git a/VBOffice/bin/Debug/Model.pdb b/VBOffice/bin/Debug/Model.pdb index b575a000..8fd925c2 100644 Binary files a/VBOffice/bin/Debug/Model.pdb and b/VBOffice/bin/Debug/Model.pdb differ diff --git a/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache b/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache index 78cca3de..84e99fdf 100644 Binary files a/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache and b/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache differ diff --git a/Versandstrasse/bin/Debug/DOCGEN.dll b/Versandstrasse/bin/Debug/DOCGEN.dll index 58a533d1..576659e3 100644 Binary files a/Versandstrasse/bin/Debug/DOCGEN.dll and b/Versandstrasse/bin/Debug/DOCGEN.dll differ diff --git a/Versandstrasse/bin/Debug/DOCGEN.pdb b/Versandstrasse/bin/Debug/DOCGEN.pdb index 48fcb8f4..cc49bcb1 100644 Binary files a/Versandstrasse/bin/Debug/DOCGEN.pdb and b/Versandstrasse/bin/Debug/DOCGEN.pdb differ diff --git a/Versandstrasse/bin/Debug/Model.dll b/Versandstrasse/bin/Debug/Model.dll index 1e10b6a9..a7ddfef2 100644 Binary files a/Versandstrasse/bin/Debug/Model.dll and b/Versandstrasse/bin/Debug/Model.dll differ diff --git a/Versandstrasse/bin/Debug/Model.pdb b/Versandstrasse/bin/Debug/Model.pdb index b575a000..8fd925c2 100644 Binary files a/Versandstrasse/bin/Debug/Model.pdb and b/Versandstrasse/bin/Debug/Model.pdb differ diff --git a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache index 60cfdd70..24e3f814 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache and b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache differ diff --git a/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache b/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache index 26b66d42..cc1bf0d9 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/ZZPDFTest/bin/Debug/DOCGEN.dll b/ZZPDFTest/bin/Debug/DOCGEN.dll index 58a533d1..576659e3 100644 Binary files a/ZZPDFTest/bin/Debug/DOCGEN.dll and b/ZZPDFTest/bin/Debug/DOCGEN.dll differ diff --git a/ZZPDFTest/bin/Debug/DOCGEN.pdb b/ZZPDFTest/bin/Debug/DOCGEN.pdb index 48fcb8f4..cc49bcb1 100644 Binary files a/ZZPDFTest/bin/Debug/DOCGEN.pdb and b/ZZPDFTest/bin/Debug/DOCGEN.pdb differ diff --git a/ZZPDFTest/bin/Debug/Model.dll b/ZZPDFTest/bin/Debug/Model.dll index 1e10b6a9..a7ddfef2 100644 Binary files a/ZZPDFTest/bin/Debug/Model.dll and b/ZZPDFTest/bin/Debug/Model.dll differ diff --git a/ZZPDFTest/bin/Debug/Model.pdb b/ZZPDFTest/bin/Debug/Model.pdb index b575a000..8fd925c2 100644 Binary files a/ZZPDFTest/bin/Debug/Model.pdb and b/ZZPDFTest/bin/Debug/Model.pdb differ diff --git a/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache b/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache index 17034260..b3eb0869 100644 Binary files a/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache and b/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Model.dll b/ZZ_BarcpdeFromFont/bin/Debug/Model.dll index 1e10b6a9..a7ddfef2 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Model.dll and b/ZZ_BarcpdeFromFont/bin/Debug/Model.dll differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb b/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb index b575a000..8fd925c2 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb and b/ZZ_BarcpdeFromFont/bin/Debug/Model.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 6386c76b..5412090d 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/bin/Debug/DOCGEN.dll b/ZZ_Signature_C/bin/Debug/DOCGEN.dll index 58a533d1..576659e3 100644 Binary files a/ZZ_Signature_C/bin/Debug/DOCGEN.dll and b/ZZ_Signature_C/bin/Debug/DOCGEN.dll differ diff --git a/ZZ_Signature_C/bin/Debug/DOCGEN.pdb b/ZZ_Signature_C/bin/Debug/DOCGEN.pdb index 48fcb8f4..cc49bcb1 100644 Binary files a/ZZ_Signature_C/bin/Debug/DOCGEN.pdb and b/ZZ_Signature_C/bin/Debug/DOCGEN.pdb differ diff --git a/ZZ_Signature_C/bin/Debug/Model.dll b/ZZ_Signature_C/bin/Debug/Model.dll index 1e10b6a9..a7ddfef2 100644 Binary files a/ZZ_Signature_C/bin/Debug/Model.dll and b/ZZ_Signature_C/bin/Debug/Model.dll differ diff --git a/ZZ_Signature_C/bin/Debug/Model.pdb b/ZZ_Signature_C/bin/Debug/Model.pdb index b575a000..8fd925c2 100644 Binary files a/ZZ_Signature_C/bin/Debug/Model.pdb and b/ZZ_Signature_C/bin/Debug/Model.pdb differ diff --git a/ZZ_Signature_C/bin/Debug/vbBarcodes.xml b/ZZ_Signature_C/bin/Debug/vbBarcodes.xml deleted file mode 100644 index 498c9a48..00000000 --- a/ZZ_Signature_C/bin/Debug/vbBarcodes.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - -vbBarcodes - - - - - - A strongly-typed resource class, for looking up localized strings, etc. - - - - - Returns the cached ResourceManager instance used by this class. - - - - - Overrides the current thread's CurrentUICulture property for all - resource lookups using this strongly typed resource class. - - - - diff --git a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache index e0ec3fd5..a50da4ec 100644 Binary files a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache and b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache differ diff --git a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.FileListAbsolute.txt b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.FileListAbsolute.txt index a3a6daf5..849c20bf 100644 --- a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.FileListAbsolute.txt +++ b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.FileListAbsolute.txt @@ -76,4 +76,3 @@ E:\Software-Projekte\OnDoc\OnDoc\ZZ_Signature_C\bin\Debug\Syncfusion.XlsIO.Base. E:\Software-Projekte\OnDoc\OnDoc\ZZ_Signature_C\bin\Debug\Syncfusion.ExcelToPDFConverter.Base.xml E:\Software-Projekte\OnDoc\OnDoc\ZZ_Signature_C\bin\Debug\OfficePrinter.pdb E:\Software-Projekte\OnDoc\OnDoc\ZZ_Signature_C\bin\Debug\Syncfusion.Presentation.Base.xml -E:\Software-Projekte\OnDoc\OnDoc\ZZ_Signature_C\bin\Debug\vbBarcodes.xml diff --git a/vbBarcodes/bin/Debug/Model.dll b/vbBarcodes/bin/Debug/Model.dll index 1e10b6a9..a7ddfef2 100644 Binary files a/vbBarcodes/bin/Debug/Model.dll and b/vbBarcodes/bin/Debug/Model.dll differ diff --git a/vbBarcodes/bin/Debug/Model.pdb b/vbBarcodes/bin/Debug/Model.pdb index b575a000..8fd925c2 100644 Binary files a/vbBarcodes/bin/Debug/Model.pdb and b/vbBarcodes/bin/Debug/Model.pdb differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache index 552e3fb1..d47892df 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache and b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache differ diff --git a/zz_api_doccreate_demo/bin/Debug/Model.dll b/zz_api_doccreate_demo/bin/Debug/Model.dll index 1e10b6a9..a7ddfef2 100644 Binary files a/zz_api_doccreate_demo/bin/Debug/Model.dll and b/zz_api_doccreate_demo/bin/Debug/Model.dll differ diff --git a/zz_api_doccreate_demo/bin/Debug/Model.pdb b/zz_api_doccreate_demo/bin/Debug/Model.pdb index b575a000..8fd925c2 100644 Binary files a/zz_api_doccreate_demo/bin/Debug/Model.pdb and b/zz_api_doccreate_demo/bin/Debug/Model.pdb differ diff --git a/zz_api_doccreate_demo/obj/Debug/zz_api_doccreate_demo.csproj.AssemblyReference.cache b/zz_api_doccreate_demo/obj/Debug/zz_api_doccreate_demo.csproj.AssemblyReference.cache index e29ce97a..f75d5433 100644 Binary files a/zz_api_doccreate_demo/obj/Debug/zz_api_doccreate_demo.csproj.AssemblyReference.cache and b/zz_api_doccreate_demo/obj/Debug/zz_api_doccreate_demo.csproj.AssemblyReference.cache differ