diff --git a/API_NetFramework/Controllers/UnterschriftController.cs b/API_NetFramework/Controllers/UnterschriftController.cs index 009e6a4c..65d38c9e 100644 --- a/API_NetFramework/Controllers/UnterschriftController.cs +++ b/API_NetFramework/Controllers/UnterschriftController.cs @@ -105,8 +105,9 @@ namespace API_NetFramework.Controllers else { filename = path + TGNummer + ".jpg"; } if (!File.Exists(filename)) { - APILogging.Log((HttpRequestMessage)Request, "Unterschrift-Bezug - nicht vorhanden: " + TGNummer, LogLevelType.Info); - return Content(HttpStatusCode.NotFound, "Image " + filename + " not found"); + APILogging.Log((HttpRequestMessage)Request, "Unterschrift-Bezug - nicht vorhanden: " + TGNummer+" DEMO-Unterschrfit verwendet", LogLevelType.Info); + filename = path + "1.jpg"; + //return Content(HttpStatusCode.NotFound, "Image " + filename + " not found"); } try { diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index 8ef9b4d7..f62a892e 100644 Binary files a/API_NetFramework/bin/DOCGEN.dll and b/API_NetFramework/bin/DOCGEN.dll differ diff --git a/API_NetFramework/bin/DOCGEN.pdb b/API_NetFramework/bin/DOCGEN.pdb index 3a5fe2fb..5d43d16f 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/Model.dll b/API_NetFramework/bin/Model.dll index 5177cf3e..dc7a1e44 100644 Binary files a/API_NetFramework/bin/Model.dll and b/API_NetFramework/bin/Model.dll differ diff --git a/API_NetFramework/bin/Model.pdb b/API_NetFramework/bin/Model.pdb index 532596f2..be84dcbc 100644 Binary files a/API_NetFramework/bin/Model.pdb and b/API_NetFramework/bin/Model.pdb differ diff --git a/API_NetFramework/bin/OnDocOffice.dll b/API_NetFramework/bin/OnDocOffice.dll index 2bc14d42..2dec0cce 100644 Binary files a/API_NetFramework/bin/OnDocOffice.dll and b/API_NetFramework/bin/OnDocOffice.dll differ diff --git a/API_NetFramework/bin/OnDocOffice.pdb b/API_NetFramework/bin/OnDocOffice.pdb index d7542cf7..20da657c 100644 Binary files a/API_NetFramework/bin/OnDocOffice.pdb and b/API_NetFramework/bin/OnDocOffice.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index 750652f4..d5381b1c 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index feaf1877..51031929 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/bin/vbBarcodes.dll b/API_NetFramework/bin/vbBarcodes.dll index f68e5af6..b5f44b4d 100644 Binary files a/API_NetFramework/bin/vbBarcodes.dll and b/API_NetFramework/bin/vbBarcodes.dll differ diff --git a/API_NetFramework/bin/vbBarcodes.pdb b/API_NetFramework/bin/vbBarcodes.pdb index f2800be8..0f6a4e0c 100644 Binary files a/API_NetFramework/bin/vbBarcodes.pdb and b/API_NetFramework/bin/vbBarcodes.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index 00021e3f..28e7761c 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -2290,3 +2290,239 @@ Parametername: encoder 2025-01-07 15:48:18.7226|DEBUG|OnDoc| 2025-01-07 15:48:18.7226|DEBUG|OnDoc| 2025-01-07 15:48:18.7226|DEBUG|OnDoc| +2025-01-09 09:44:34.9165|DEBUG|OnDoc| +2025-01-09 09:44:34.9896|DEBUG|OnDoc| +2025-01-09 09:44:35.0155|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 09:44:35.0155|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 09:45:19.8188|DEBUG|OnDoc| +2025-01-09 09:45:19.8558|DEBUG|OnDoc| +2025-01-09 09:45:19.8809|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 09:45:19.8809|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 09:59:32.2847|DEBUG|OnDoc| +2025-01-09 09:59:32.3428|DEBUG|OnDoc| +2025-01-09 09:59:32.3748|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 09:59:32.3748|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 09:59:33.3420|DEBUG|OnDoc| +2025-01-09 09:59:33.3420|DEBUG|OnDoc| +2025-01-09 09:59:33.3815|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 09:59:33.3845|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 10:00:51.1723|DEBUG|OnDoc| +2025-01-09 10:00:51.1813|DEBUG|OnDoc| +2025-01-09 10:00:51.2085|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 10:00:51.2085|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 10:00:52.0411|DEBUG|OnDoc| +2025-01-09 10:00:52.0411|DEBUG|OnDoc| +2025-01-09 10:00:52.0766|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tg1294 +2025-01-09 10:00:52.0766|INFO|OnDoc|Unterschrift-Bezug: tg1294 +2025-01-09 11:13:40.5258|DEBUG|OnDoc| +2025-01-09 11:13:40.5553|DEBUG|OnDoc| +2025-01-09 11:13:40.5818|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 11:13:40.5818|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 11:13:40.6703|DEBUG|OnDoc| +2025-01-09 11:13:40.6703|DEBUG|OnDoc| +2025-01-09 11:13:40.7021|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 11:13:40.7021|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 11:14:55.6204|DEBUG|OnDoc| +2025-01-09 11:14:55.6204|DEBUG|OnDoc| +2025-01-09 11:14:55.6511|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 11:14:55.6511|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 11:14:55.6871|DEBUG|OnDoc| +2025-01-09 11:14:55.6871|DEBUG|OnDoc| +2025-01-09 11:14:55.7111|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 11:14:55.7131|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 11:21:43.5745|DEBUG|OnDoc| +2025-01-09 11:21:43.6064|DEBUG|OnDoc| +2025-01-09 11:21:43.6310|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 11:21:43.6340|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 11:21:43.7076|DEBUG|OnDoc| +2025-01-09 11:21:43.7171|DEBUG|OnDoc| +2025-01-09 11:21:43.7401|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 11:21:43.7401|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 11:37:41.6566|DEBUG|OnDoc| +2025-01-09 11:37:41.6888|DEBUG|OnDoc| +2025-01-09 11:37:41.7178|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 11:37:41.7178|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 11:37:41.7988|DEBUG|OnDoc| +2025-01-09 11:37:41.8078|DEBUG|OnDoc| +2025-01-09 11:37:41.8318|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 11:37:41.8318|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 11:39:15.7437|DEBUG|OnDoc| +2025-01-09 11:39:15.7757|DEBUG|OnDoc| +2025-01-09 11:39:15.8022|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 11:39:15.8022|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 11:39:15.8774|DEBUG|OnDoc| +2025-01-09 11:39:15.8874|DEBUG|OnDoc| +2025-01-09 11:39:15.9105|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 11:39:15.9105|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 11:53:16.6594|DEBUG|OnDoc| +2025-01-09 11:53:16.6904|DEBUG|OnDoc| +2025-01-09 11:53:16.7164|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 11:53:16.7164|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 11:53:16.7921|DEBUG|OnDoc| +2025-01-09 11:53:16.7921|DEBUG|OnDoc| +2025-01-09 11:53:16.8261|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 11:53:16.8261|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 13:51:21.5224|DEBUG|OnDoc| +2025-01-09 13:51:21.5841|DEBUG|OnDoc| +2025-01-09 13:51:21.6126|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 13:51:21.6126|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 13:51:43.0544|DEBUG|OnDoc| +2025-01-09 13:51:43.0635|DEBUG|OnDoc| +2025-01-09 13:51:43.0892|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 13:51:43.0892|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 13:52:33.6502|DEBUG|OnDoc| +2025-01-09 13:52:33.6502|DEBUG|OnDoc| +2025-01-09 13:52:33.6774|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 13:52:33.6774|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 13:52:33.7174|DEBUG|OnDoc| +2025-01-09 13:52:33.7174|DEBUG|OnDoc| +2025-01-09 13:52:33.7424|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 13:52:33.7444|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 13:55:08.5595|DEBUG|OnDoc| +2025-01-09 13:55:08.5595|DEBUG|OnDoc| +2025-01-09 13:55:08.5965|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 13:55:08.5965|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 13:55:08.6517|DEBUG|OnDoc| +2025-01-09 13:55:08.6517|DEBUG|OnDoc| +2025-01-09 13:55:08.6777|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 13:55:08.6777|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 13:55:21.6531|DEBUG|OnDoc| +2025-01-09 13:55:21.6531|DEBUG|OnDoc| +2025-01-09 13:55:21.6903|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 13:55:21.6903|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 13:55:21.7338|DEBUG|OnDoc| +2025-01-09 13:55:21.7338|DEBUG|OnDoc| +2025-01-09 13:55:21.7608|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 13:55:21.7608|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 13:58:09.8830|DEBUG|OnDoc| +2025-01-09 13:58:09.8930|DEBUG|OnDoc| +2025-01-09 13:58:09.9200|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 13:58:09.9200|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 13:58:09.9606|DEBUG|OnDoc| +2025-01-09 13:58:09.9626|DEBUG|OnDoc| +2025-01-09 13:58:09.9886|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 13:58:09.9886|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 13:58:26.9908|DEBUG|OnDoc| +2025-01-09 13:58:26.9938|DEBUG|OnDoc| +2025-01-09 13:58:27.0194|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-09 13:58:27.0194|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-09 13:58:27.0580|DEBUG|OnDoc| +2025-01-09 13:58:27.0580|DEBUG|OnDoc| +2025-01-09 13:58:27.0840|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-09 13:58:27.0840|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-09 15:00:17.8160|DEBUG|OnDoc| +2025-01-09 15:00:17.8392|DEBUG|OnDoc| +2025-01-09 15:00:17.8652|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-01-09 15:00:17.8652|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-01-10 10:04:48.9224|DEBUG|OnDoc| +2025-01-10 10:04:48.9484|DEBUG|OnDoc| +2025-01-10 10:04:48.9754|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:04:48.9754|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:04:49.0786|DEBUG|OnDoc| +2025-01-10 10:04:49.0876|DEBUG|OnDoc| +2025-01-10 10:04:49.1116|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:04:49.1116|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 10:06:37.4795|DEBUG|OnDoc| +2025-01-10 10:06:37.4795|DEBUG|OnDoc| +2025-01-10 10:06:37.5116|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:06:37.5116|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:06:37.5611|DEBUG|OnDoc| +2025-01-10 10:06:37.5611|DEBUG|OnDoc| +2025-01-10 10:06:37.5871|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:06:37.5871|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 10:08:14.1063|DEBUG|OnDoc| +2025-01-10 10:08:14.1419|DEBUG|OnDoc| +2025-01-10 10:08:14.1669|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:08:14.1669|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:08:14.2254|DEBUG|OnDoc| +2025-01-10 10:08:14.2254|DEBUG|OnDoc| +2025-01-10 10:08:14.2506|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:08:14.2506|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 10:10:14.9860|DEBUG|OnDoc| +2025-01-10 10:10:15.0223|DEBUG|OnDoc| +2025-01-10 10:10:15.0463|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:10:15.0463|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:10:15.0993|DEBUG|OnDoc| +2025-01-10 10:10:15.0993|DEBUG|OnDoc| +2025-01-10 10:10:15.1245|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:10:15.1245|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 10:10:52.5096|DEBUG|OnDoc| +2025-01-10 10:10:52.5480|DEBUG|OnDoc| +2025-01-10 10:10:52.5741|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:10:52.5741|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:10:52.6263|DEBUG|OnDoc| +2025-01-10 10:10:52.6263|DEBUG|OnDoc| +2025-01-10 10:10:52.6518|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:10:52.6518|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 10:11:41.5727|DEBUG|OnDoc| +2025-01-10 10:11:41.6083|DEBUG|OnDoc| +2025-01-10 10:11:41.6333|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:11:41.6353|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:11:41.6848|DEBUG|OnDoc| +2025-01-10 10:11:41.6848|DEBUG|OnDoc| +2025-01-10 10:11:41.7103|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:11:41.7123|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 10:12:52.9454|DEBUG|OnDoc| +2025-01-10 10:12:52.9804|DEBUG|OnDoc| +2025-01-10 10:12:53.0055|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:12:53.0055|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:12:53.0570|DEBUG|OnDoc| +2025-01-10 10:12:53.0570|DEBUG|OnDoc| +2025-01-10 10:12:53.0814|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:12:53.0814|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 10:17:09.6218|DEBUG|OnDoc| +2025-01-10 10:17:09.6593|DEBUG|OnDoc| +2025-01-10 10:17:09.6863|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:17:09.6863|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:17:09.7450|DEBUG|OnDoc| +2025-01-10 10:17:09.7450|DEBUG|OnDoc| +2025-01-10 10:17:09.7710|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:17:09.7750|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 10:19:01.2822|DEBUG|OnDoc| +2025-01-10 10:19:01.3182|DEBUG|OnDoc| +2025-01-10 10:19:01.3427|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:19:01.3427|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:19:01.4007|DEBUG|OnDoc| +2025-01-10 10:19:01.4007|DEBUG|OnDoc| +2025-01-10 10:19:01.4249|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:19:01.4249|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 10:20:01.1170|DEBUG|OnDoc| +2025-01-10 10:20:01.1259|DEBUG|OnDoc| +2025-01-10 10:20:01.1490|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:20:01.1509|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:20:01.2124|DEBUG|OnDoc| +2025-01-10 10:20:01.2124|DEBUG|OnDoc| +2025-01-10 10:20:01.2424|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:20:01.2454|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 10:20:30.5645|DEBUG|OnDoc| +2025-01-10 10:20:30.5735|DEBUG|OnDoc| +2025-01-10 10:20:30.6030|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:20:30.6030|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:20:30.6675|DEBUG|OnDoc| +2025-01-10 10:20:30.6675|DEBUG|OnDoc| +2025-01-10 10:20:30.6940|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:20:30.6940|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 10:22:33.0336|DEBUG|OnDoc| +2025-01-10 10:22:33.0666|DEBUG|OnDoc| +2025-01-10 10:22:33.0936|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 10:22:33.0936|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 10:22:33.1871|DEBUG|OnDoc| +2025-01-10 10:22:33.1871|DEBUG|OnDoc| +2025-01-10 10:22:33.2186|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 10:22:33.2186|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 14:24:40.8750|DEBUG|OnDoc| +2025-01-10 14:24:40.9050|DEBUG|OnDoc| +2025-01-10 14:24:40.9300|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 14:24:40.9325|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 14:24:41.0169|DEBUG|OnDoc| +2025-01-10 14:24:41.0269|DEBUG|OnDoc| +2025-01-10 14:24:41.0500|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 14:24:41.0500|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-10 14:26:35.3347|DEBUG|OnDoc| +2025-01-10 14:26:35.3438|DEBUG|OnDoc| +2025-01-10 14:26:35.3678|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-10 14:26:35.3687|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-10 14:26:35.4068|DEBUG|OnDoc| +2025-01-10 14:26:35.4068|DEBUG|OnDoc| +2025-01-10 14:26:35.4338|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-10 14:26:35.4338|INFO|OnDoc|Unterschrift-Bezug: TG9665 diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index f5685152..fd4ed500 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 750652f4..d5381b1c 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 feaf1877..51031929 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/BarcodeLib/bin/Debug/Model.dll b/BarcodeLib/bin/Debug/Model.dll index 5177cf3e..dc7a1e44 100644 Binary files a/BarcodeLib/bin/Debug/Model.dll and b/BarcodeLib/bin/Debug/Model.dll differ diff --git a/BarcodeLib/bin/Debug/Model.pdb b/BarcodeLib/bin/Debug/Model.pdb index 532596f2..be84dcbc 100644 Binary files a/BarcodeLib/bin/Debug/Model.pdb and b/BarcodeLib/bin/Debug/Model.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index 3092e458..55ec5f33 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/BarcodeLibVBDatamatrix/BarcodeLibVBDatamatrix.vbproj b/BarcodeLibVBDatamatrix/BarcodeLibVBDatamatrix.vbproj new file mode 100644 index 00000000..c62a48e7 --- /dev/null +++ b/BarcodeLibVBDatamatrix/BarcodeLibVBDatamatrix.vbproj @@ -0,0 +1,114 @@ + + + + + Debug + AnyCPU + {AB5C9C28-1ECC-4612-AA82-91CB77D83ACA} + Library + BarcodeLibVBDatamatrix + BarcodeLibVBDatamatrix + 512 + Windows + v4.8 + true + + + true + full + true + true + bin\Debug\ + BarcodeLibVBDatamatrix.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + pdbonly + false + true + true + bin\Release\ + BarcodeLibVBDatamatrix.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + ..\Client\bin\Debug\MW6.SDK.dll + + + + + + + + + + + + + + + + + + + + + + + + + + True + Application.myapp + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + {a1fd0973-89a7-4588-877d-373835d6e00c} + Model + + + + \ No newline at end of file diff --git a/BarcodeLibVBDatamatrix/Class1.vb b/BarcodeLibVBDatamatrix/Class1.vb new file mode 100644 index 00000000..079a6b54 --- /dev/null +++ b/BarcodeLibVBDatamatrix/Class1.vb @@ -0,0 +1,153 @@ +Imports System.Drawing +Imports System.Net +Imports Model +Public Class MW6Datamatrix + + Dim ObjPointMinus As Integer = 0 + Public Sub Generage_BarcodeImage(ByRef docdata As clsDocData, temppath As String) + Dim FontColor As Color = Color.Black + Dim BackColor As Color = Color.White + Dim FontName As String = docdata.Zusatz_Font + Dim FontSize As Integer = docdata.Zusatz_FontSize + Dim Height As Integer = 0 + Dim Width As Integer = 0 + Dim objFont As New Drawing.Font(FontName, FontSize) + Dim image1bmp As New Bitmap(400, 400) + Dim image1 As Bitmap = Datamatrix_Generator_1(Height, Width, docdata) + Dim objFontsize As Graphics = Graphics.FromImage(image1bmp) + Dim sf = objFontsize.MeasureString(docdata.barcode_text, objFont) + Select Case docdata.barcode_formatn + Case 0, 2 + If image1.Width < 70 Then Width = sf.Width + 10 + image1.Width Else Width = image1.Width * 3 + Case 1, 3 + If image1.Width < 70 Then Width = sf.Width + 10 + image1.Width Else Width = image1.Width * 3 + Case 22 + If image1.Height < 70 Then Height = sf.Height + 10 + image1.Height Else Height = image1.Height * 3 + Case 33 + If image1.Height < 70 Then Height = sf.Height + 10 + image1.Height Else Height = image1.Height * 3 + End Select + + Dim objBitmap As New Bitmap(Width, Height) + Dim objGraphics As Graphics = Graphics.FromImage(objBitmap) + Dim objBrushForeColor As New SolidBrush(FontColor) + Dim objBrushBackColor As New SolidBrush(BackColor) + Dim objColor As Color + + Select Case docdata.barcode_formatn + Case 0 'rechts + Dim stringFormat As New StringFormat() + stringFormat.Alignment = StringAlignment.Far + stringFormat.LineAlignment = StringAlignment.Near + objGraphics.FillRectangle(objBrushBackColor, 0, 0, Width, Height) + Dim objPoint As New PointF(Width - image1.Width - 10, Height - sf.Height - ObjPointMinus) + objGraphics.DrawString(docdata.barcode_text, objFont, objBrushForeColor, objPoint, stringFormat) + objGraphics.DrawImage(image1, New Drawing.Point(Width - image1.Width, 0)) + Case 1 'links + objGraphics.FillRectangle(objBrushBackColor, 0, 0, Width, Height) + Dim objPoint As New PointF(image1.Width + 10, Height - sf.Height - ObjPointMinus) + objGraphics.DrawString(docdata.barcode_text, objFont, objBrushForeColor, objPoint) + objGraphics.DrawImage(image1, New Drawing.Point(0, 0)) + Case 2 'links + objGraphics.FillRectangle(objBrushBackColor, 0, 0, Width, Height) + Dim objPoint As New PointF(image1.Width + 10, Height - sf.Height - ObjPointMinus) + objGraphics.DrawString(docdata.barcode_text, objFont, objBrushForeColor, objPoint) + objGraphics.DrawImage(image1, New Drawing.Point(0, 0)) + objBitmap.RotateFlip(RotateFlipType.Rotate90FlipNone) + Case 3 + Dim stringFormat As New StringFormat() + stringFormat.Alignment = StringAlignment.Far + stringFormat.LineAlignment = StringAlignment.Near + objGraphics.FillRectangle(objBrushBackColor, 0, 0, Width, Height) + Dim objPoint As New PointF(Width - image1.Width - 10, Height - sf.Height - ObjPointMinus) + objGraphics.DrawString(docdata.barcode_text, objFont, objBrushForeColor, objPoint, stringFormat) + objGraphics.DrawImage(image1, New Drawing.Point(Width - image1.Width, 0)) + objBitmap.RotateFlip(RotateFlipType.Rotate90FlipNone) + Case 3 + End Select + image1 = Nothing + objBitmap.Save(temppath + "a_" + docdata.Dokumentid + ".png", System.Drawing.Imaging.ImageFormat.Png) + objBitmap = Nothing + End Sub + + Public Function Datamatrix_Generator_1(ByRef Height As Integer, ByRef width As Integer, ByRef docdata As clsDocData) As Image + Dim DMNetCtrl As New MW6.SDK.DataMatrix.DataMatrixNet + DMNetCtrl.Data = docdata.barcode_content + Dim ActualRows As Integer + Dim ActualCols As Integer + Dim ActualWidth As Integer + Dim ActualHeight As Integer + Dim ExtraWidth As Integer = 0 + Dim ExtraHeight As Integer = 0 + Dim imgsize As Integer + DMNetCtrl.GetActualRC(ActualRows, ActualCols) + DMNetCtrl.GetActualSize(True, Nothing, ActualWidth, ActualHeight) + DMNetCtrl.SetSize(ActualWidth + ExtraWidth, ActualHeight + ExtraHeight) + Dim MS As System.IO.MemoryStream = New System.IO.MemoryStream + DMNetCtrl.SaveAsMemory(MS, System.Drawing.Imaging.ImageFormat.Png) + Dim img4 As Image + img4 = System.Drawing.Image.FromStream(MS) + If docdata.barcode_kantenlaenge = "" Then docdata.barcode_kantenlaenge = 2 + + Try + imgsize = docdata.barcode_kantenlaenge * 37.795275593333 + Catch + imgsize = 1.5 * 37.795275593333 + End Try + + img4 = AutoSizeImage(img4, imgsize, imgsize, True) + width = img4.Width + Height = img4.Height + MS.Close() + Return img4 + + + + End Function + + Public Function AutoSizeImage(ByVal oBitmap As Image, +ByVal maxWidth As Integer, +ByVal maxHeight As Integer, +Optional ByVal bStretch As Boolean = False) As Image + + ' Größenverhältnis der max. Dimension + Dim maxRatio As Single = maxWidth / maxHeight + + ' Bildgröße und aktuelles Größenverhältnis + Dim imgWidth As Integer = oBitmap.Width + Dim imgHeight As Integer = oBitmap.Height + Dim imgRatio As Single = imgWidth / imgHeight + + ' Bild anpassen? + If (imgWidth > maxWidth Or imgHeight > maxHeight) Or (bStretch) Then + If imgRatio <= maxRatio Then + ' Größenverhältnis des Bildes ist kleiner als die + ' maximale Größe, in der das Bild angezeigt werden kann. + ' In diesem Fall muss die Bildbreite angepasst werden. + imgWidth = imgWidth / (imgHeight / maxHeight) + imgHeight = maxHeight + Else + ' Größenverhältnis des Bildes ist größer als die + ' maximale Größe, in der das Bild angezeigt werden kann. + ' In diesem Fall muss die Bildhöhe angepasst werden. + imgHeight = imgHeight / (imgWidth / maxWidth) + imgWidth = maxWidth + End If + + ' Bitmap-Objekt in der neuen Größe erstellen + Dim oImage As New Bitmap(imgWidth, imgHeight) + + ' Bild interpolieren, damit die Qualität erhalten bleibt + Using g As Graphics = Graphics.FromImage(oImage) + g.InterpolationMode = Drawing2D.InterpolationMode.HighQualityBicubic + g.DrawImage(oBitmap, New Drawing.Rectangle(0, 0, imgWidth, imgHeight)) + End Using + + ' neues Bitmap zurückgeben + Return oImage + Else + ' unverändertes Originalbild zurückgeben + Return oBitmap + End If + End Function + +End Class diff --git a/BarcodeLibVBDatamatrix/My Project/Application.Designer.vb b/BarcodeLibVBDatamatrix/My Project/Application.Designer.vb new file mode 100644 index 00000000..88dd01c7 --- /dev/null +++ b/BarcodeLibVBDatamatrix/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + diff --git a/BarcodeLibVBDatamatrix/My Project/Application.myapp b/BarcodeLibVBDatamatrix/My Project/Application.myapp new file mode 100644 index 00000000..758895de --- /dev/null +++ b/BarcodeLibVBDatamatrix/My Project/Application.myapp @@ -0,0 +1,10 @@ + + + false + false + 0 + true + 0 + 1 + true + diff --git a/BarcodeLibVBDatamatrix/My Project/AssemblyInfo.vb b/BarcodeLibVBDatamatrix/My Project/AssemblyInfo.vb new file mode 100644 index 00000000..65b7511d --- /dev/null +++ b/BarcodeLibVBDatamatrix/My Project/AssemblyInfo.vb @@ -0,0 +1,35 @@ +Imports System +Imports System.Reflection +Imports System.Runtime.InteropServices + +' Allgemeine Informationen über eine Assembly werden über die folgenden +' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +' die einer Assembly zugeordnet sind. + +' Werte der Assemblyattribute überprüfen + + + + + + + + + + +'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird. + + +' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +' +' Hauptversion +' Nebenversion +' Buildnummer +' Revision +' +' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, +' indem Sie "*" wie unten gezeigt eingeben: +' + + + diff --git a/BarcodeLibVBDatamatrix/My Project/Resources.Designer.vb b/BarcodeLibVBDatamatrix/My Project/Resources.Designer.vb new file mode 100644 index 00000000..30f17141 --- /dev/null +++ b/BarcodeLibVBDatamatrix/My Project/Resources.Designer.vb @@ -0,0 +1,62 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My.Resources + + 'This class was auto-generated by the StronglyTypedResourceBuilder + 'class via a tool like ResGen or Visual Studio. + 'To add or remove a member, edit your .ResX file then rerun ResGen + 'with the /str option, or rebuild your VS project. + ''' + ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' + _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("BarcodeLibVBDatamatrix.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set(ByVal value As Global.System.Globalization.CultureInfo) + resourceCulture = value + End Set + End Property + End Module +End Namespace diff --git a/BarcodeLibVBDatamatrix/My Project/Resources.resx b/BarcodeLibVBDatamatrix/My Project/Resources.resx new file mode 100644 index 00000000..af7dbebb --- /dev/null +++ b/BarcodeLibVBDatamatrix/My Project/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/BarcodeLibVBDatamatrix/My Project/Settings.Designer.vb b/BarcodeLibVBDatamatrix/My Project/Settings.Designer.vb new file mode 100644 index 00000000..af96e838 --- /dev/null +++ b/BarcodeLibVBDatamatrix/My Project/Settings.Designer.vb @@ -0,0 +1,73 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My + + _ + Partial Friend NotInheritable Class MySettings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) + +#Region "My.Settings Auto-Save Functionality" +#If _MyType = "WindowsForms" Then + Private Shared addedHandler As Boolean + + Private Shared addedHandlerLockObject As New Object + + _ + Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub +#End If +#End Region + + Public Shared ReadOnly Property [Default]() As MySettings + Get + +#If _MyType = "WindowsForms" Then + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If +#End If + Return defaultInstance + End Get + End Property + End Class +End Namespace + +Namespace My + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.BarcodeLibVBDatamatrix.My.MySettings + Get + Return Global.BarcodeLibVBDatamatrix.My.MySettings.Default + End Get + End Property + End Module +End Namespace diff --git a/BarcodeLibVBDatamatrix/My Project/Settings.settings b/BarcodeLibVBDatamatrix/My Project/Settings.settings new file mode 100644 index 00000000..85b890b3 --- /dev/null +++ b/BarcodeLibVBDatamatrix/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/BarcodeLibVBDatamatrix/bin/Debug/BarcodeLibVBDatamatrix.dll b/BarcodeLibVBDatamatrix/bin/Debug/BarcodeLibVBDatamatrix.dll new file mode 100644 index 00000000..cbce2d9a Binary files /dev/null and b/BarcodeLibVBDatamatrix/bin/Debug/BarcodeLibVBDatamatrix.dll differ diff --git a/BarcodeLibVBDatamatrix/bin/Debug/BarcodeLibVBDatamatrix.pdb b/BarcodeLibVBDatamatrix/bin/Debug/BarcodeLibVBDatamatrix.pdb new file mode 100644 index 00000000..bb332b00 Binary files /dev/null and b/BarcodeLibVBDatamatrix/bin/Debug/BarcodeLibVBDatamatrix.pdb differ diff --git a/BarcodeLibVBDatamatrix/bin/Debug/BarcodeLibVBDatamatrix.xml b/BarcodeLibVBDatamatrix/bin/Debug/BarcodeLibVBDatamatrix.xml new file mode 100644 index 00000000..d71503a6 --- /dev/null +++ b/BarcodeLibVBDatamatrix/bin/Debug/BarcodeLibVBDatamatrix.xml @@ -0,0 +1,26 @@ + + + + +BarcodeLibVBDatamatrix + + + + + + 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/BarcodeLibVBDatamatrix/bin/Debug/MW6.SDK.dll b/BarcodeLibVBDatamatrix/bin/Debug/MW6.SDK.dll new file mode 100644 index 00000000..bed1c51c Binary files /dev/null and b/BarcodeLibVBDatamatrix/bin/Debug/MW6.SDK.dll differ diff --git a/BarcodeLibVBDatamatrix/bin/Debug/Model.dll b/BarcodeLibVBDatamatrix/bin/Debug/Model.dll new file mode 100644 index 00000000..dc7a1e44 Binary files /dev/null and b/BarcodeLibVBDatamatrix/bin/Debug/Model.dll differ diff --git a/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb b/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb new file mode 100644 index 00000000..be84dcbc Binary files /dev/null and b/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb b/BarcodeLibVBDatamatrix/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb new file mode 100644 index 00000000..e7dcac55 --- /dev/null +++ b/BarcodeLibVBDatamatrix/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb @@ -0,0 +1,7 @@ +' + Option Strict Off + Option Explicit On + + Imports System + Imports System.Reflection + diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeL.D3C85273.Up2Date b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeL.D3C85273.Up2Date new file mode 100644 index 00000000..e69de29b diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.Resources.resources b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.Resources.resources new file mode 100644 index 00000000..6c05a977 Binary files /dev/null and b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.Resources.resources differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.dll b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.dll new file mode 100644 index 00000000..cbce2d9a Binary files /dev/null and b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.dll differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.pdb b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.pdb new file mode 100644 index 00000000..bb332b00 Binary files /dev/null and b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.pdb differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache new file mode 100644 index 00000000..cb4efbc3 Binary files /dev/null and b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.CoreCompileInputs.cache b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.CoreCompileInputs.cache new file mode 100644 index 00000000..c55b8888 --- /dev/null +++ b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +513f8118bdab587ef285420f3d33e05caf0a31a49edde7b1fbbf37010243f038 diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.FileListAbsolute.txt b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.FileListAbsolute.txt new file mode 100644 index 00000000..dfc4a33f --- /dev/null +++ b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.FileListAbsolute.txt @@ -0,0 +1,14 @@ +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\bin\Debug\BarcodeLibVBDatamatrix.dll +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\bin\Debug\BarcodeLibVBDatamatrix.pdb +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\bin\Debug\BarcodeLibVBDatamatrix.xml +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\bin\Debug\Model.dll +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\bin\Debug\MW6.SDK.dll +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\bin\Debug\Model.pdb +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\obj\Debug\BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\obj\Debug\BarcodeLibVBDatamatrix.Resources.resources +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\obj\Debug\BarcodeLibVBDatamatrix.vbproj.GenerateResource.cache +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\obj\Debug\BarcodeLibVBDatamatrix.vbproj.CoreCompileInputs.cache +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\obj\Debug\BarcodeL.D3C85273.Up2Date +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\obj\Debug\BarcodeLibVBDatamatrix.dll +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\obj\Debug\BarcodeLibVBDatamatrix.xml +E:\Software-Projekte\OnDoc\OnDoc\BarcodeLibVBDatamatrix\obj\Debug\BarcodeLibVBDatamatrix.pdb diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.GenerateResource.cache b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.GenerateResource.cache new file mode 100644 index 00000000..1a598239 Binary files /dev/null and b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.GenerateResource.cache differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.xml b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.xml new file mode 100644 index 00000000..d71503a6 --- /dev/null +++ b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.xml @@ -0,0 +1,26 @@ + + + + +BarcodeLibVBDatamatrix + + + + + + 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/BarcodeLibVBDatamatrix/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/BarcodeLibVBDatamatrix/obj/Debug/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 00000000..2f8a9d32 Binary files /dev/null and b/BarcodeLibVBDatamatrix/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/BarcodeLibVBDatamatrix/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 00000000..caa23ac0 Binary files /dev/null and b/BarcodeLibVBDatamatrix/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/TempPE/My Project.Resources.Designer.vb.dll b/BarcodeLibVBDatamatrix/obj/Debug/TempPE/My Project.Resources.Designer.vb.dll new file mode 100644 index 00000000..43fd35e2 Binary files /dev/null and b/BarcodeLibVBDatamatrix/obj/Debug/TempPE/My Project.Resources.Designer.vb.dll differ diff --git a/Client/Client.csproj b/Client/Client.csproj index be255252..10dd9d93 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -25,7 +25,7 @@ true true 1 - 1.0.0.%2a + 1.9.0.%2a false true true @@ -554,6 +554,12 @@ SerienbriefBearbeitung.cs + + Form + + + SerienbriefTemplateLoad.cs + Form @@ -586,6 +592,7 @@ + @@ -778,6 +785,9 @@ SerienbriefBearbeitung.cs + + SerienbriefTemplateLoad.cs + Serienbrief_Sheetselect.cs diff --git a/Client/Client.csproj.user b/Client/Client.csproj.user index 75779f27..d0ffe724 100644 --- a/Client/Client.csproj.user +++ b/Client/Client.csproj.user @@ -1,7 +1,8 @@  - E:\Software-Projekte\OnDoc\EDK_Dateien\1.edk + + publish\ diff --git a/Client/Diverses/MitarbeiterProfil.Designer.cs b/Client/Diverses/MitarbeiterProfil.Designer.cs index 909e8fe6..58226c88 100644 --- a/Client/Diverses/MitarbeiterProfil.Designer.cs +++ b/Client/Diverses/MitarbeiterProfil.Designer.cs @@ -268,6 +268,7 @@ // // cbboxTeam // + this.cbboxTeam.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cbboxTeam.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; this.cbboxTeam.Location = new System.Drawing.Point(137, 97); this.cbboxTeam.Name = "cbboxTeam"; @@ -279,6 +280,7 @@ // // cbboxUnterschriftRechts // + this.cbboxUnterschriftRechts.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cbboxUnterschriftRechts.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; this.cbboxUnterschriftRechts.Location = new System.Drawing.Point(137, 72); this.cbboxUnterschriftRechts.Name = "cbboxUnterschriftRechts"; @@ -290,6 +292,7 @@ // // cbboxUnterschriftLinks // + this.cbboxUnterschriftLinks.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cbboxUnterschriftLinks.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; this.cbboxUnterschriftLinks.Location = new System.Drawing.Point(137, 47); this.cbboxUnterschriftLinks.Name = "cbboxUnterschriftLinks"; @@ -347,7 +350,7 @@ this.GrpBoxMitarbeiter.Controls.Add(this.lblVorname); this.GrpBoxMitarbeiter.Controls.Add(this.txtName); this.GrpBoxMitarbeiter.Controls.Add(this.lblName); - this.GrpBoxMitarbeiter.Location = new System.Drawing.Point(5, 139); + this.GrpBoxMitarbeiter.Location = new System.Drawing.Point(5, 129); this.GrpBoxMitarbeiter.Name = "GrpBoxMitarbeiter"; this.GrpBoxMitarbeiter.Size = new System.Drawing.Size(793, 340); this.GrpBoxMitarbeiter.TabIndex = 3; diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index 7fd71941..d1a0da2d 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -60,11 +60,11 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(152, 339); + this.label2.Location = new System.Drawing.Point(144, 330); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(156, 26); + this.label2.Size = new System.Drawing.Size(168, 26); this.label2.TabIndex = 2; - this.label2.Text = "8. Januar 2025"; + this.label2.Text = "12. Januar 2025"; // // SplashScreen // diff --git a/Client/Diverses/SplashScreen.cs b/Client/Diverses/SplashScreen.cs index de443beb..8bcd089a 100644 --- a/Client/Diverses/SplashScreen.cs +++ b/Client/Diverses/SplashScreen.cs @@ -16,6 +16,7 @@ namespace OnDoc.Diverses public SplashScreen() { InitializeComponent(); + Application.DoEvents(); } diff --git a/Client/DocMgmt/DokTypSelect.Designer.cs b/Client/DocMgmt/DokTypSelect.Designer.cs index 27494c83..de70d09f 100644 --- a/Client/DocMgmt/DokTypSelect.Designer.cs +++ b/Client/DocMgmt/DokTypSelect.Designer.cs @@ -32,8 +32,8 @@ namespace OnDoc.DocMgmt { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DokTypSelect)); - Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); + Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); this.ribbon1 = new System.Windows.Forms.Ribbon(); this.ribbonTab1 = new System.Windows.Forms.RibbonTab(); this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); @@ -111,7 +111,7 @@ namespace OnDoc.DocMgmt this.ribbon1.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013; this.ribbon1.OrbVisible = false; this.ribbon1.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F); - this.ribbon1.Size = new System.Drawing.Size(495, 74); + this.ribbon1.Size = new System.Drawing.Size(488, 74); this.ribbon1.TabIndex = 0; this.ribbon1.Tabs.Add(this.ribbonTab1); this.ribbon1.TabSpacing = 4; @@ -256,12 +256,13 @@ namespace OnDoc.DocMgmt // sfListView1 // this.sfListView1.AccessibleName = "ScrollControl"; + this.sfListView1.AutoHideScrollBars = true; this.sfListView1.BackColor = System.Drawing.SystemColors.Window; this.sfListView1.Dock = System.Windows.Forms.DockStyle.Fill; this.sfListView1.HotTracking = true; this.sfListView1.Location = new System.Drawing.Point(2, 76); this.sfListView1.Name = "sfListView1"; - this.sfListView1.Size = new System.Drawing.Size(495, 584); + this.sfListView1.Size = new System.Drawing.Size(488, 584); this.sfListView1.TabIndex = 1; this.sfListView1.Text = "sfListView1"; this.sfListView1.DoubleClick += new System.EventHandler(this.sfListView1_DoubleClick); @@ -269,15 +270,15 @@ namespace OnDoc.DocMgmt // treeViewAdv1 // this.treeViewAdv1.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window); - treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.Black; + treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black; this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)}); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(494, 517); this.treeViewAdv1.ContextMenuStrip = this.contextMenuStripVorlagen; this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -361,15 +362,15 @@ namespace OnDoc.DocMgmt // this.treeViewAdv2.AllowDrop = true; this.treeViewAdv2.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window); - treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black; + treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black; this.treeViewAdv2.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)}); this.treeViewAdv2.BeforeTouchSize = new System.Drawing.Size(498, 523); this.treeViewAdv2.ContextMenuStrip = this.contextMenuStripFavoriten; this.treeViewAdv2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -611,7 +612,7 @@ namespace OnDoc.DocMgmt // toolstripCombobox_Fachverantwortung // this.toolstripCombobox_Fachverantwortung.Name = "toolstripCombobox_Fachverantwortung"; - this.toolstripCombobox_Fachverantwortung.Size = new System.Drawing.Size(121, 48); + this.toolstripCombobox_Fachverantwortung.Size = new System.Drawing.Size(130, 23); this.toolstripCombobox_Fachverantwortung.SelectedIndexChanged += new System.EventHandler(this.toolstripCombobox_Fachverantwortung_SelectedIndexChanged); // // toolStripButton4 @@ -620,7 +621,7 @@ namespace OnDoc.DocMgmt this.toolStripButton4.Image = global::OnDoc.Properties.Resources.CloseApplication_24x24_32; this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(23, 45); + this.toolStripButton4.Size = new System.Drawing.Size(23, 20); this.toolStripButton4.Text = "toolStripButton2"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // diff --git a/Client/DocMgmt/DokTypSelect.cs b/Client/DocMgmt/DokTypSelect.cs index 638a10ea..d5534967 100644 --- a/Client/DocMgmt/DokTypSelect.cs +++ b/Client/DocMgmt/DokTypSelect.cs @@ -81,7 +81,7 @@ namespace OnDoc.DocMgmt this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; DB db = new DB(AppParams.connectionstring); - db.Get_Tabledata("select distinct dbo.get_fachverantwortung(dbo.dokumenttyp.dokumenttypnr) as fv from dbo.dokumenttyp order by dbo.get_fachverantwortung(dbo.dokumenttyp.dokumenttypnr) asc", false, true); + db.Get_Tabledata("select distinct fachverantwortung from dbo.view_dokumenttypen_relaunch order by fachverantwortung asc", false, true); foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows) { toolstripCombobox_Fachverantwortung.Items.Add(dr[0].ToString()); diff --git a/Client/DocMgmt/DokTypSelect.resx b/Client/DocMgmt/DokTypSelect.resx index bfc68137..0ef764e5 100644 --- a/Client/DocMgmt/DokTypSelect.resx +++ b/Client/DocMgmt/DokTypSelect.resx @@ -284,7 +284,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi - DAAAAk1TRnQBSQFMAgEBBgEAAdABAAHQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBgEAAdgBAAHYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -344,12 +344,6 @@ 618, 16 - - 618, 16 - - - 723, 16 - 723, 16 diff --git a/Client/DocMgmt/Dokumenterstellung.cs b/Client/DocMgmt/Dokumenterstellung.cs index 160708ec..73ddcfaf 100644 --- a/Client/DocMgmt/Dokumenterstellung.cs +++ b/Client/DocMgmt/Dokumenterstellung.cs @@ -151,7 +151,19 @@ namespace OnDoc.DocMgmt dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][9]); //dokdata.barcode_type= dB.dsdaten.Tables[0].Rows[0][3].ToString(); - + string sql = ""; + sql = "select bcpt, bcpl, bcw, bch, bchorizontal from OnDocBarcodeMpping "; + sql = sql + "where orig_bcpt = " + dokdata.barcode_top.ToString() + " and orig_bcpl=" + dokdata.barcode_left.ToString() + " "; + sql = sql + "and orig_bcw=" + dokdata.barcode_width.ToString() + " and orig_bch=" + dokdata.barcode_height.ToString(); + dB.Get_Tabledata(sql, false, true); + if (dB.dsdaten.Tables[0].Rows.Count > 0) + { + Logging.Logging.Debug("Barcode-Übersteuerung" + dokdata.DokumenttypNr.ToString(), "Dokumenterstellung", ""); + dokdata.barcode_left = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpl"]); + dokdata.barcode_top = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpt"]); + dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcw"]); + dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bch"]); + } dB = null; } @@ -199,6 +211,7 @@ namespace OnDoc.DocMgmt } db = null; DocFunction = 1; + System.IO.File.Delete(filename); this.Close(); return; } diff --git a/Client/DocMgmt/Serienbrief.Designer.cs b/Client/DocMgmt/Serienbrief.Designer.cs index 176489b2..e95d6b0c 100644 --- a/Client/DocMgmt/Serienbrief.Designer.cs +++ b/Client/DocMgmt/Serienbrief.Designer.cs @@ -104,6 +104,8 @@ this.RibbonButtonExcelImport = new System.Windows.Forms.RibbonButton(); this.ribbonPanel6 = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonVorlageBearbeiten = new System.Windows.Forms.RibbonButton(); + this.ribbonbuttonloadtemplate = new System.Windows.Forms.RibbonButton(); + this.ribbonbuttonsavetemplate = new System.Windows.Forms.RibbonButton(); this.ribbonPanel7 = new System.Windows.Forms.RibbonPanel(); this.ribbonbuttonaddpartner = new System.Windows.Forms.RibbonButton(); this.ribbonButtonPartnerPruefen = new System.Windows.Forms.RibbonButton(); @@ -120,9 +122,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.label1 = new System.Windows.Forms.Label(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.docPreview1 = new OnDoc.UIControls.DocPreview(); this.panelLoad = new System.Windows.Forms.Panel(); this.label4 = new System.Windows.Forms.Label(); + this.docPreview1 = new OnDoc.UIControls.DocPreview(); this.GrpDokumentInhalt.SuspendLayout(); this.groupBox1.SuspendLayout(); this.grpDruckstapel.SuspendLayout(); @@ -535,6 +537,7 @@ // // DateTermin // + this.DateTermin.DateTimeIcon = null; this.DateTermin.Location = new System.Drawing.Point(367, 110); this.DateTermin.Name = "DateTermin"; this.DateTermin.Size = new System.Drawing.Size(107, 21); @@ -554,6 +557,7 @@ // // DateDokumentDatum // + this.DateDokumentDatum.DateTimeIcon = null; this.DateDokumentDatum.Location = new System.Drawing.Point(120, 110); this.DateDokumentDatum.Name = "DateDokumentDatum"; this.DateDokumentDatum.Size = new System.Drawing.Size(107, 21); @@ -934,6 +938,7 @@ // // ribbonPanel5 // + this.ribbonPanel5.ButtonMoreVisible = false; this.ribbonPanel5.Items.Add(this.ribbonbuttonsave); this.ribbonPanel5.Name = "ribbonPanel5"; this.ribbonPanel5.Text = ""; @@ -971,6 +976,8 @@ // ribbonPanel6 // this.ribbonPanel6.Items.Add(this.ribbonButtonVorlageBearbeiten); + this.ribbonPanel6.Items.Add(this.ribbonbuttonloadtemplate); + this.ribbonPanel6.Items.Add(this.ribbonbuttonsavetemplate); this.ribbonPanel6.Name = "ribbonPanel6"; this.ribbonPanel6.Text = ""; // @@ -984,8 +991,29 @@ this.ribbonButtonVorlageBearbeiten.Text = "Vorlage_bearbeiten"; this.ribbonButtonVorlageBearbeiten.Click += new System.EventHandler(this.ribbonButton1_Click); // + // ribbonbuttonloadtemplate + // + this.ribbonbuttonloadtemplate.Enabled = false; + this.ribbonbuttonloadtemplate.Image = global::OnDoc.Properties.Resources.officevorlage_32x32_32; + this.ribbonbuttonloadtemplate.LargeImage = global::OnDoc.Properties.Resources.officevorlage_32x32_32; + this.ribbonbuttonloadtemplate.Name = "ribbonbuttonloadtemplate"; + this.ribbonbuttonloadtemplate.SmallImage = global::OnDoc.Properties.Resources.officevorlage_16x16_32; + this.ribbonbuttonloadtemplate.Text = "Vorlage_laden"; + this.ribbonbuttonloadtemplate.Click += new System.EventHandler(this.ribbonbuttonloadtemplate_Click); + // + // ribbonbuttonsavetemplate + // + this.ribbonbuttonsavetemplate.DropDownResizable = true; + this.ribbonbuttonsavetemplate.Image = global::OnDoc.Properties.Resources.save_32x32_32; + this.ribbonbuttonsavetemplate.LargeImage = global::OnDoc.Properties.Resources.save_32x32_32; + this.ribbonbuttonsavetemplate.Name = "ribbonbuttonsavetemplate"; + this.ribbonbuttonsavetemplate.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonsavetemplate.SmallImage"))); + this.ribbonbuttonsavetemplate.Text = "Vorlage_speichern"; + this.ribbonbuttonsavetemplate.Click += new System.EventHandler(this.ribbonbuttonsavetemplate_Click); + // // ribbonPanel7 // + this.ribbonPanel7.ButtonMoreVisible = false; this.ribbonPanel7.Items.Add(this.ribbonbuttonaddpartner); this.ribbonPanel7.Items.Add(this.ribbonButtonPartnerPruefen); this.ribbonPanel7.Name = "ribbonPanel7"; @@ -1014,6 +1042,7 @@ // // ribbonPanel8 // + this.ribbonPanel8.ButtonMoreVisible = false; this.ribbonPanel8.Items.Add(this.RibbonButtonGenerateSB); this.ribbonPanel8.Items.Add(this.ribbonButtonDruckstapel); this.ribbonPanel8.Name = "ribbonPanel8"; @@ -1041,6 +1070,7 @@ // // ribbonPanel9 // + this.ribbonPanel9.ButtonMoreVisible = false; this.ribbonPanel9.Items.Add(this.RibbonButtonArchivierenUndAbschlessen); this.ribbonPanel9.Name = "ribbonPanel9"; this.ribbonPanel9.Text = ""; @@ -1145,15 +1175,6 @@ this.splitContainer1.SplitterDistance = 900; this.splitContainer1.TabIndex = 5; // - // docPreview1 - // - this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; - this.docPreview1.Location = new System.Drawing.Point(0, 0); - this.docPreview1.Name = "docPreview1"; - this.docPreview1.Size = new System.Drawing.Size(725, 598); - this.docPreview1.TabIndex = 4; - this.docPreview1.ZoomPercentage = 0; - // // panelLoad // this.panelLoad.BackColor = System.Drawing.Color.Silver; @@ -1174,6 +1195,15 @@ this.label4.TabIndex = 0; this.label4.Text = "Serienbrief wird initialisiert - bitte einen Moment warten...."; // + // docPreview1 + // + this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; + this.docPreview1.Location = new System.Drawing.Point(0, 0); + this.docPreview1.Name = "docPreview1"; + this.docPreview1.Size = new System.Drawing.Size(725, 598); + this.docPreview1.TabIndex = 4; + this.docPreview1.ZoomPercentage = 0; + // // Serienbrief // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1320,5 +1350,7 @@ private System.Windows.Forms.ToolStripMenuItem dokumentgenerierungZurücksetzenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem druckstapelAufbereitenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem archivierenUndAbschliessenToolStripMenuItem; + private System.Windows.Forms.RibbonButton ribbonbuttonloadtemplate; + private System.Windows.Forms.RibbonButton ribbonbuttonsavetemplate; } } \ No newline at end of file diff --git a/Client/DocMgmt/Serienbrief.cs b/Client/DocMgmt/Serienbrief.cs index 5897d9ce..fcfe00cb 100644 --- a/Client/DocMgmt/Serienbrief.cs +++ b/Client/DocMgmt/Serienbrief.cs @@ -41,6 +41,7 @@ using static Model.OnBaseDocUpload; using static BroadcastListener.Classes.Factory; using Microsoft.Office.Interop.Excel; using Microsoft.SqlServer.Server; +using OnDoc.Diverses; namespace OnDoc.UIControls @@ -138,6 +139,8 @@ namespace OnDoc.UIControls ribbonbuttonaddpartner.Enabled = false; ribbonButtonPartnerPruefen.Enabled = false; ribbonButtonVorlageBearbeiten.Enabled = false; + ribbonbuttonloadtemplate.Enabled = false; + ribbonbuttonsave.Enabled = false; ribbonbuttonaddpartner.Enabled = false; ribbonButtonPartnerPruefen.Enabled = false; RibbonButtonGenerateSB.Enabled = false; @@ -157,6 +160,9 @@ namespace OnDoc.UIControls groupBox7.Enabled = enabled; groupBox8.Enabled = enabled; ribbonButtonVorlageBearbeiten.Enabled = enabled; + ribbonbuttonloadtemplate.Enabled = enabled; + ribbonbuttonsave.Enabled = enabled; + } if (type == 4) { @@ -780,7 +786,9 @@ namespace OnDoc.UIControls DB db = new DB(AppParams.connectionstring); db.clear_parameter(); db.add_parameter("@mitarbeiternr", AppParams.CurrentMitarbeiter.ToString()); + db.add_parameter("@ondoc", "1"); db.Get_Tabledata("dbo.sp_edex_sb_get_serienbriefe", true, false); + sfdatagridsbload.DataSource = null; sfdatagridsbload.DataSource = db.dsdaten.Tables[0]; btnsbloadok.Left = pnlLoad.Width - btnsbloadok.Width - 20; @@ -824,6 +832,7 @@ namespace OnDoc.UIControls db.Get_Tabledata(sql, false, true); if (db.dsdaten.Tables[0].Rows.Count > 0) { + Logging.Logging.Debug("Barcode-Übersteuerung" + sb.dokumenttypnr, "Serienbrief", ""); sb.barcode_left = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcpl"]); sb.barcode_top = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcpt"]); sb.barcode_width = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcw"]); @@ -1976,5 +1985,58 @@ namespace OnDoc.UIControls { Refresh_Team(0); } + + private void ribbonbuttonsavetemplate_Click(object sender, EventArgs e) + { + string bez = ""; + InputDialog id = new InputDialog("Name zum Speichern", "Name", ""); + + if (id.ShowDialog() == DialogResult.OK) { + bez = id.result; + } + id.Dispose(); + if (bez !="") { + //InputBoxItem[] items = new InputBoxItem[] { new InputBoxItem("Bezeichnung") }; + //InputBox input = InputBox.Show("Name für die Vorlage",items,InputBoxButtons.OKCancel); + //if (input.Result == InputBoxResult.OK) { + // string bez = input.Items["Bezeichnung"].ToString(); + + DB db = new DB(AppParams.connectionstring); + db.Get_Tabledata("Select dbo.binarytobase64(vorlage),DocType from edex_sb_vorlage where serienbriefnr=" + sb.serienbriefnr.ToString(), false, true); + string file = db.dsdaten.Tables[0].Rows[0][0].ToString(); + string dokytype = db.dsdaten.Tables[0].Rows[0][1].ToString(); + db.Get_Tabledata_for_Update("select top 1 * from ondoc_sb_vorlage where id=-1", false, true); + System.Data.DataRow dr = db.daten.Tables[0].NewRow(); + dr[1] = AppParams.CurrentMitarbeiter; + dr[2] = file; + dr[3] = DateTime.Now; + dr[4] = DateTime.Now; + dr[5] = AppParams.CurrentMitarbeiter; + dr[6] = true; + dr[7] = dokytype; + dr[8] = bez; + db.daten.Tables[0].Rows.Add(dr); + db.Update_Data(); + db = null; + } + + } + + private void ribbonbuttonloadtemplate_Click(object sender, EventArgs e) + { + SerienbriefTemplateLoad sbt = new SerienbriefTemplateLoad(AppParams.CurrentMitarbeiter.ToString()); + sbt.ShowDialog(); + if ( + sbt.DialogResult == DialogResult.OK) { + sb.VorlageBase64 = sbt.file; + FileHelper fh = new FileHelper(); + fh.SaveBase64ToFile(sbt.file, sb.filename); + fh = null; + + update_serienbriefdaten(false); + + } + + } } } diff --git a/Client/DocMgmt/Serienbrief.resx b/Client/DocMgmt/Serienbrief.resx index f9e3eada..1dd0bbfc 100644 --- a/Client/DocMgmt/Serienbrief.resx +++ b/Client/DocMgmt/Serienbrief.resx @@ -123,10 +123,16 @@ 321, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII= + + 17, 17 - AAABAAUAAAAAAAEAIABVIgAAVgAAADAwAAABACAAqCUAAKsiAAAgIAAAAQAgAKgQAABTSAAAGBgAAAEA diff --git a/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs b/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs index 5d12f432..42605a1b 100644 --- a/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs +++ b/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs @@ -51,11 +51,11 @@ this.label4 = new System.Windows.Forms.Label(); this.txtfilter = new System.Windows.Forms.TextBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.docPreview1 = new OnDoc.UIControls.DocPreview(); - this.label5 = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); this.label6 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); - this.panel1 = new System.Windows.Forms.Panel(); + this.label5 = new System.Windows.Forms.Label(); + this.docPreview1 = new OnDoc.UIControls.DocPreview(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.sfdatagridstandard)).BeginInit(); this.contextMenuStandard.SuspendLayout(); @@ -76,7 +76,7 @@ this.toolStripButton3}); this.toolStrip1.Location = new System.Drawing.Point(2, 2); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1323, 25); + this.toolStrip1.Size = new System.Drawing.Size(377, 25); this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; // @@ -263,25 +263,16 @@ this.groupBox2.TabIndex = 9; this.groupBox2.TabStop = false; // - // docPreview1 - // - this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; - this.docPreview1.Location = new System.Drawing.Point(389, 27); - this.docPreview1.Name = "docPreview1"; - this.docPreview1.Size = new System.Drawing.Size(936, 820); - this.docPreview1.TabIndex = 8; - this.docPreview1.Visible = false; - this.docPreview1.ZoomPercentage = 0; - // - // label5 + // panel1 // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(3, 9); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(201, 17); - this.label5.TabIndex = 8; - this.label5.Text = "Hinweise zur Speicherung:"; + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128))))); + this.panel1.Controls.Add(this.label6); + this.panel1.Controls.Add(this.label7); + this.panel1.Controls.Add(this.label5); + this.panel1.Location = new System.Drawing.Point(3, 714); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(367, 100); + this.panel1.TabIndex = 11; // // label6 // @@ -295,28 +286,37 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(16, 43); + this.label7.Location = new System.Drawing.Point(16, 48); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(333, 13); this.label7.TabIndex = 10; this.label7.Text = "2.Bearbeitungsfenster über Speichersymbol speichern und schliessen"; // - // panel1 + // label5 // - this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128))))); - this.panel1.Controls.Add(this.label6); - this.panel1.Controls.Add(this.label7); - this.panel1.Controls.Add(this.label5); - this.panel1.Location = new System.Drawing.Point(3, 714); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(367, 100); - this.panel1.TabIndex = 11; + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label5.Location = new System.Drawing.Point(3, 9); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(201, 17); + this.label5.TabIndex = 8; + this.label5.Text = "Hinweise zur Speicherung:"; + // + // docPreview1 + // + this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; + this.docPreview1.Location = new System.Drawing.Point(389, 27); + this.docPreview1.Name = "docPreview1"; + this.docPreview1.Size = new System.Drawing.Size(0, 820); + this.docPreview1.TabIndex = 8; + this.docPreview1.Visible = false; + this.docPreview1.ZoomPercentage = 0; // // SerienbriefBearbeitung // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1327, 849); + this.ClientSize = new System.Drawing.Size(381, 849); this.Controls.Add(this.docPreview1); this.Controls.Add(this.groupBox2); this.Controls.Add(this.toolStrip1); diff --git a/Client/DocMgmt/SerienbriefTemplateLoad.Designer.cs b/Client/DocMgmt/SerienbriefTemplateLoad.Designer.cs new file mode 100644 index 00000000..2e8ea834 --- /dev/null +++ b/Client/DocMgmt/SerienbriefTemplateLoad.Designer.cs @@ -0,0 +1,110 @@ +namespace OnDoc.DocMgmt +{ + partial class SerienbriefTemplateLoad + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SerienbriefTemplateLoad)); + this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid(); + this.sfButton1 = new Syncfusion.WinForms.Controls.SfButton(); + this.sfButton2 = new Syncfusion.WinForms.Controls.SfButton(); + this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton(); + ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit(); + this.SuspendLayout(); + // + // sfDataGrid1 + // + this.sfDataGrid1.AccessibleName = "Table"; + 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.TabIndex = 0; + this.sfDataGrid1.Text = "sfDataGrid1"; + this.sfDataGrid1.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellClick); + this.sfDataGrid1.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellDoubleClick); + // + // sfButton1 + // + 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.Name = "sfButton1"; + this.sfButton1.Size = new System.Drawing.Size(96, 28); + this.sfButton1.TabIndex = 1; + this.sfButton1.Text = "Übernehmen"; + this.sfButton1.Click += new System.EventHandler(this.sfButton1_Click); + // + // sfButton2 + // + this.sfButton2.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); + this.sfButton2.Location = new System.Drawing.Point(5, 175); + this.sfButton2.Name = "sfButton2"; + this.sfButton2.Size = new System.Drawing.Size(96, 28); + this.sfButton2.TabIndex = 2; + this.sfButton2.Text = "Abbruch"; + this.sfButton2.Click += new System.EventHandler(this.sfButton2_Click); + // + // sfButton3 + // + 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.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); + // + // 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.Controls.Add(this.sfButton3); + this.Controls.Add(this.sfButton2); + this.Controls.Add(this.sfButton1); + this.Controls.Add(this.sfDataGrid1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "SerienbriefTemplateLoad"; + this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; + this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; + this.Text = "Vorlage laden"; + this.Load += new System.EventHandler(this.SerienbriefTemplateLoad_Load); + ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid1; + private Syncfusion.WinForms.Controls.SfButton sfButton1; + private Syncfusion.WinForms.Controls.SfButton sfButton2; + private Syncfusion.WinForms.Controls.SfButton sfButton3; + } +} \ No newline at end of file diff --git a/Client/DocMgmt/SerienbriefTemplateLoad.cs b/Client/DocMgmt/SerienbriefTemplateLoad.cs new file mode 100644 index 00000000..f5618709 --- /dev/null +++ b/Client/DocMgmt/SerienbriefTemplateLoad.cs @@ -0,0 +1,110 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using OnDoc.Klassen; +using Syncfusion.Windows.Forms.Tools; +using Syncfusion.WinForms.Controls; +using Database; + +namespace OnDoc.DocMgmt +{ + public partial class SerienbriefTemplateLoad : SfForm + { + private string mitarbeiternr { get; set; } = ""; + public string selectedID = ""; + public string file = ""; + public SerienbriefTemplateLoad() + { + InitializeComponent(); + this.Style.TitleBar.BackColor = Theaming.Titelbar(); + this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + this.Style.ShadowOpacity = Theaming.ShadowOpacity; + this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; + } + + public SerienbriefTemplateLoad(string mitarbeiternr) + { + InitializeComponent(); + this.Style.TitleBar.BackColor = Theaming.Titelbar(); + this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + this.Style.ShadowOpacity = Theaming.ShadowOpacity; + this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; + this.mitarbeiternr=mitarbeiternr; + + } + private void SerienbriefTemplateLoad_Load(object sender, EventArgs e) + { + load_data(); + } + private void load_data() { + DB db = new DB(AppParams.connectionstring); + db.Get_Tabledata("Select ID,Bezeichnung from ondoc_sb_vorlage where aktiv=1 and mitarbeiternr="+ mitarbeiternr, false, true); + this.sfDataGrid1.DataSource = db.dsdaten.Tables[0]; + this.sfDataGrid1.Columns[0].Visible = false; + db = null; + } + + private void sfDataGrid1_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) + { + try + { + var rowIndex = e.DataRow.RowIndex; + //Get the column index value + var columnIndex = e.DataColumn.ColumnIndex; + var selectedItem = e.DataRow; + var dataRow = (e.DataRow.RowData as DataRowView).Row; + selectedID = dataRow["id"].ToString(); + sfButton1.Enabled=true; + sfButton3.Enabled = true; + } + catch { } + } + + private void sfDataGrid1_CellDoubleClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) + { + + sfDataGrid1_CellClick(sender, e); + sfButton1_Click(sender, e); + this.Close(); + } + + private void sfButton1_Click(object sender, EventArgs e) + { + if (selectedID!="") + { + DialogResult = DialogResult.OK; + DB db = new DB(AppParams.connectionstring); + db.Get_Tabledata("Select vorlage from ondoc_sb_vorlage where id=" + selectedID, false, true); + this.file = db.dsdaten.Tables[0].Rows[0][0].ToString(); + db = null; + this.Close(); + } + } + + private void sfButton2_Click(object sender, EventArgs e) + { + DialogResult=DialogResult.Cancel; + this.Close(); + } + + private void sfButton3_Click(object sender, EventArgs e) + { + if (MessageBox.Show("Vorlagendatei löschen", "Löschen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + DB dB = new DB(AppParams.connectionstring); + dB.Exec_SQL("update ondoc_sb_vorlage set aktiv=0, mutiert_am=getdate(), mutierer=" + AppParams.CurrentMitarbeiter.ToString() + " where id=" + selectedID.ToString()); + dB = null; + sfButton1.Enabled = false; + sfButton3.Enabled = false; + load_data(); + } + + } + } +} diff --git a/Client/DocMgmt/SerienbriefTemplateLoad.resx b/Client/DocMgmt/SerienbriefTemplateLoad.resx new file mode 100644 index 00000000..b8b09cf7 --- /dev/null +++ b/Client/DocMgmt/SerienbriefTemplateLoad.resx @@ -0,0 +1,628 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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 + DqMogIKCDqMogIKCDqMogIKCDqMogIKCDqMogIKCDuP/AWiH5eL1I/fKAAAAAElFTkSuQmCCKAAAADAA + AABgAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + 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 + N3YnGREKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACsb + EyiQXEOcomhLwEwxI2MAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGZUEvfqJo + S8KFVT6KGxEMFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///////wAA////////AAD///////8AAP///////wAA//4P8H//AAD/+AfgH/8AAP/g + AYAH/wAA/8AAAAP/AAD/gMACA/8AAP+D4AeD/wAA/4P4H8P/AAD/w///w/8AAP/D///D/wAA/8P//8P/ + AAD/g/APw/8AAP+D4APB/wAA/wfgAeD/AAD8B+AA4D8AAOAPH8DwDwAA4B4P8HgHAADgPgf4fAcAAOH8 + A/h/hwAA4fwD4H+HAADh/APAP4cAAOH8P8B/hwAA4fwfwH8HAADgPh/gfAcAAOAeD/B4BwAA8A4D/fAP + AAD8BwAH4D8AAP8HgAfg/wAA/4PAB8H/AAD/g/APw/8AAP/D///D/wAA/8P//8P/AAD/w///w/8AAP+D + +B/D/wAA/4HgB4P/AAD/gMADA/8AAP/AAAAD/wAA/+ADwAf/AAD/+AfgH/8AAP/+D/B//wAA//////// + AAD///////8AAP///////wAA////////AAD///////8AACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + 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 + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////x+P//wPB//4AAH/8AAA//DAcP/x/ + /D/8f/x//HgcP/h4Dj/weAYPwMfDA8HD44PHgePjx4GB48ePg+PBx4ODwMPDA+BAHgf4YB4f/HgeP/x/ + /H/8f/x//HgeP/wQCD/+AAB//wPA///H4/////////////////8oAAAAGAAAADAAAAABACAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHhMNB6hs + TnXXimTfrW9QgwAAAAEAAAAAAAAAAAAAAAO0dFSV2Itk255lSWgAAAAEAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACPW0JH2oxl3Peec/3IgF3B/KJ1/8eAXbana05cq25PYMyD + X8L5oHT9xX9cwfqhdf7ViWPSgVM8OQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + 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 + rEH//6xB + + + \ No newline at end of file diff --git a/Client/Klassen/EDKFile.cs b/Client/Klassen/EDKFile.cs index 85670d67..742f272a 100644 --- a/Client/Klassen/EDKFile.cs +++ b/Client/Klassen/EDKFile.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; using System.Web.UI.WebControls; @@ -47,10 +48,10 @@ namespace OnDoc.Klassen public string name { get; set; } public string value { get; set; } - public EDK_Dokumentwerte (string name, string value) + public EDK_Dokumentwerte(string name, string value) { - this.name=name; - this.value=value; + this.name = name; + this.value = value; } } @@ -64,13 +65,13 @@ namespace OnDoc.Klassen public static bool toexecute { get; set; } public static string verantwortlich { get; set; } public static string unterschrift_links { get; set; } - public static string unterschrift_rechts{get;set;} + public static string unterschrift_rechts { get; set; } public static string AnzeigePartnernr { get; set; } public static List parameters { get; set; } public static List dokumentwerte { get; set; } - + public static void Load_EDK_File(string filename) @@ -103,52 +104,66 @@ namespace OnDoc.Klassen break; case EDK_ActionType.DokumentErstellung: - creatortg = doc.SelectSingleNode("action/creatorTg").InnerText; - source = doc.SelectSingleNode("action/sourceApplication").InnerText; - verantwortlich = doc.SelectSingleNode("action/Verantwortlich").InnerText; - unterschrift_links = doc.SelectSingleNode("action/uslinks").InnerText; - unterschrift_rechts = doc.SelectSingleNode("action/usrechts").InnerText; - - - XmlElement RootNode = doc.DocumentElement; - XmlNodeList nodeList = RootNode.ChildNodes; - XmlNodeList dokwerte = RootNode.LastChild.ChildNodes; - List Params = new List(); - List Dokwerte = new List(); - if (nodeList.Count > 0) - { - string value; - string name; - var loopTo = nodeList.Count - 1; - for (int i = 0; i < nodeList.Count - 1; i++) + creatortg = doc.SelectSingleNode("action/creatorTg").InnerText; + source = doc.SelectSingleNode("action/sourceApplication").InnerText; + verantwortlich = ""; + try { - value = nodeList.Item(i).InnerText; - name = nodeList.Item(i).LocalName; - Params.Add(new EDK_Parameters(name, value)); + verantwortlich = doc.SelectSingleNode("action/Verantwortlich").InnerText; } - } - parameters = Params; - - if (dokwerte.Count > 0) - { - for (int i = 0; i < dokwerte.Count - 1; i++) + catch { } + unterschrift_links = ""; + unterschrift_rechts = ""; + try { unterschrift_links = doc.SelectSingleNode("action/uslinks").InnerText; } catch { } + try { unterschrift_rechts = doc.SelectSingleNode("action/usrechts").InnerText; } catch { } + + + XmlElement RootNode = doc.DocumentElement; + XmlNodeList nodeList = RootNode.ChildNodes; + XmlNodeList dokwerte = RootNode.LastChild.ChildNodes; + List Params = new List(); + List Dokwerte = new List(); + if (nodeList.Count > 0) { - XmlNodeList XNode = dokwerte[i].ChildNodes; string value; string name; - try { value = XNode[1].InnerText; } catch { value = ""; } - try { name = XNode[0].InnerText; } catch { name = ""; } - Dokwerte.Add(new EDK_Dokumentwerte(name, value)); + var loopTo = nodeList.Count - 1; + for (int i = 0; i < nodeList.Count - 1; i++) + { + value = nodeList.Item(i).InnerText; + name = nodeList.Item(i).LocalName; + Params.Add(new EDK_Parameters(name, value)); + } } - dokumentwerte = Dokwerte; + parameters = Params; - if (parameters.Count > 0) + if (dokwerte.Count > 0) { - executed = false; - toexecute = true; - } + for (int i = 0; i < dokwerte.Count - 1; i++) + { + XmlNodeList XNode = dokwerte[i].ChildNodes; + string value; + string name; + try { value = XNode[1].InnerText; } catch { value = ""; } + try { name = XNode[0].InnerText; } catch { name = ""; } + Dokwerte.Add(new EDK_Dokumentwerte(name, value)); + } + dokumentwerte = Dokwerte; + + if (parameters.Count > 0) + { + executed = false; + toexecute = true; + } else + { + executed = false; + toexecute = true; + + } - } + } + executed = false; + toexecute = true; break; default: System.IO.File.Delete(filename); @@ -159,20 +174,25 @@ namespace OnDoc.Klassen public static string GetAVQ_Value(string name, string techname) { - for (int i = 0; i < dokumentwerte.Count; i++) + try { - EDK_Dokumentwerte d = dokumentwerte[i]; - if (dokumentwerte[i].name == name || dokumentwerte[i].name == techname) + for (int i = 0; i < dokumentwerte.Count; i++) { - return dokumentwerte[i].value; + EDK_Dokumentwerte d = dokumentwerte[i]; + if (dokumentwerte[i].name == name || dokumentwerte[i].name == techname) + { + return dokumentwerte[i].value; + } } + return ""; } - return ""; + catch { return ""; } } public static string GetAVQ_Parameter(string name) { - for (int i = 0; i < parameters.Count; i++) { + for (int i = 0; i < parameters.Count; i++) + { if (parameters[i].name.ToUpper() == name.ToUpper()) { return parameters[i].value; diff --git a/Client/Klassen/inputBox.cs b/Client/Klassen/inputBox.cs new file mode 100644 index 00000000..d19d0d1d --- /dev/null +++ b/Client/Klassen/inputBox.cs @@ -0,0 +1,468 @@ +/* + * Author: Tony Brix, http://tonybrix.info + * License: MIT + */ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Windows.Forms; + +public enum InputBoxButtons +{ + OK, + OKCancel, + YesNo, + YesNoCancel, + Save, + SaveCancel +} + +public enum InputBoxResult +{ + Cancel, + OK, + Yes, + No, + Save +} + +public struct InputBoxItem +{ + public string Label; + public string Text; + public bool IsPassword; + + public InputBoxItem(string label) + { + Label = label; + Text = ""; + IsPassword = false; + } + public InputBoxItem(string label, string text) + { + Label = label; + Text = text; + IsPassword = false; + } + public InputBoxItem(string label, bool isPassword) + { + Label = label; + Text = ""; + IsPassword = isPassword; + } + public InputBoxItem(string label, string text, bool isPassword) + { + Label = label; + Text = text; + IsPassword = isPassword; + } +} + +//public struct InputBoxOptions +//{ +// public bool ShowCloseButton = true; +//} + +public class InputBox +{ + private Dictionary items; + private InputBoxResult result; + + private InputBox(dialogForm dialog) + { + result = dialog.InputResult; + items = new Dictionary(); + for (int i = 0; i < dialog.label.Length; i++) + { + items.Add(dialog.label[i].Text, dialog.textBox[i].Text); + } + } + + public static InputBox Show(string title, string label) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { new InputBoxItem(label) }, InputBoxButtons.OK); + dialog.ShowDialog(); + return new InputBox(dialog); + } + + public static InputBox Show(string title, string label, InputBoxButtons buttons) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { new InputBoxItem(label) }, buttons); + dialog.ShowDialog(); + return new InputBox(dialog); + } + + public static InputBox Show(string title, string label, string text) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { new InputBoxItem(label, text) }, InputBoxButtons.OK); + dialog.ShowDialog(); + return new InputBox(dialog); + } + + public static InputBox Show(string title, string label, string text, InputBoxButtons buttons) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { new InputBoxItem(label, text) }, buttons); + dialog.ShowDialog(); + return new InputBox(dialog); + } + + public static InputBox Show(string title, string[] labels) + { + InputBoxItem[] items = new InputBoxItem[labels.Length]; + for (int i = 0; i < labels.Length; i++) + { + items[i] = new InputBoxItem(labels[i]); + } + + dialogForm dialog = new dialogForm(title, items, InputBoxButtons.OK); + dialog.ShowDialog(); + return new InputBox(dialog); + } + + public static InputBox Show(string title, string[] labels, InputBoxButtons buttons) + { + InputBoxItem[] items = new InputBoxItem[labels.Length]; + for (int i = 0; i < labels.Length; i++) + { + items[i] = new InputBoxItem(labels[i]); + } + + dialogForm dialog = new dialogForm(title, items, buttons); + dialog.ShowDialog(); + return new InputBox(dialog); + } + + public static InputBox Show(string title, InputBoxItem item) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { item }, InputBoxButtons.OK); + dialog.ShowDialog(); + return new InputBox(dialog); + } + + public static InputBox Show(string title, InputBoxItem item, InputBoxButtons buttons) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { item }, buttons); + dialog.ShowDialog(); + return new InputBox(dialog); + } + + public static InputBox Show(string title, InputBoxItem[] items) + { + dialogForm dialog = new dialogForm(title, items, InputBoxButtons.OK); + dialog.ShowDialog(); + return new InputBox(dialog); + } + + public static InputBox Show(string title, InputBoxItem[] items, InputBoxButtons buttons) + { + dialogForm dialog = new dialogForm(title, items, buttons); + dialog.ShowDialog(); + return new InputBox(dialog); + } + + public static InputBox Show(IWin32Window window, string title, string label) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { new InputBoxItem(label) }, InputBoxButtons.OK); + dialog.ShowDialog(window); + return new InputBox(dialog); + } + + public static InputBox Show(IWin32Window window, string title, string label, InputBoxButtons buttons) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { new InputBoxItem(label) }, buttons); + dialog.ShowDialog(window); + return new InputBox(dialog); + } + + public static InputBox Show(IWin32Window window, string title, string label, string text) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { new InputBoxItem(label, text) }, InputBoxButtons.OK); + dialog.ShowDialog(window); + return new InputBox(dialog); + } + + public static InputBox Show(IWin32Window window, string title, string label, string text, InputBoxButtons buttons) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { new InputBoxItem(label, text) }, buttons); + dialog.ShowDialog(window); + return new InputBox(dialog); + } + + public static InputBox Show(IWin32Window window, string title, string[] labels) + { + InputBoxItem[] items = new InputBoxItem[labels.Length]; + for (int i = 0; i < labels.Length; i++) + { + items[i] = new InputBoxItem(labels[i]); + } + + dialogForm dialog = new dialogForm(title, items, InputBoxButtons.OK); + dialog.ShowDialog(window); + return new InputBox(dialog); + } + + public static InputBox Show(IWin32Window window, string title, string[] labels, InputBoxButtons buttons) + { + InputBoxItem[] items = new InputBoxItem[labels.Length]; + for (int i = 0; i < labels.Length; i++) + { + items[i] = new InputBoxItem(labels[i]); + } + + dialogForm dialog = new dialogForm(title, items, buttons); + dialog.ShowDialog(window); + return new InputBox(dialog); + } + + public static InputBox Show(IWin32Window window, string title, InputBoxItem item) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { item }, InputBoxButtons.OK); + dialog.ShowDialog(window); + return new InputBox(dialog); + } + + public static InputBox Show(IWin32Window window, string title, InputBoxItem item, InputBoxButtons buttons) + { + dialogForm dialog = new dialogForm(title, new InputBoxItem[] { item }, buttons); + dialog.ShowDialog(window); + return new InputBox(dialog); + } + + public static InputBox Show(IWin32Window window, string title, InputBoxItem[] items) + { + dialogForm dialog = new dialogForm(title, items, InputBoxButtons.OK); + dialog.ShowDialog(window); + return new InputBox(dialog); + } + + public static InputBox Show(IWin32Window window, string title, InputBoxItem[] items, InputBoxButtons buttons) + { + dialogForm dialog = new dialogForm(title, items, buttons); + dialog.ShowDialog(window); + return new InputBox(dialog); + } + + public Dictionary Items + { + get { return items; } + } + + public InputBoxResult Result + { + get { return result; } + } + + private class dialogForm : Form + { + private InputBoxResult inputResult = InputBoxResult.Cancel; + public TextBox[] textBox; + public Label[] label; + private Button button1; + private Button button2; + private Button button3; + + public InputBoxResult InputResult + { + get { return inputResult; } + } + + public dialogForm(string title, InputBoxItem[] items, InputBoxButtons buttons) + { + int minWidth = 312; + label = new Label[items.Length]; + for (int i = 0; i < label.Length; i++) + { + label[i] = new Label(); + } + textBox = new TextBox[items.Length]; + for (int i = 0; i < textBox.Length; i++) + { + textBox[i] = new TextBox(); + } + button2 = new Button(); + button3 = new Button(); + button1 = new Button(); + SuspendLayout(); + // + // label + // + for (int i = 0; i < items.Length; i++) + { + label[i].AutoSize = true; + label[i].Location = new Point(12, 9 + (i * 39)); + label[i].Name = "label[" + i + "]"; + label[i].Text = items[i].Label; + if (label[i].Width > minWidth) + { + minWidth = label[i].Width; + } + } + // + // textBox + // + for (int i = 0; i < items.Length; i++) + { + textBox[i].Anchor = (AnchorStyles)(AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right); + textBox[i].Location = new Point(12, 25 + (i * 39)); + textBox[i].Name = "textBox[" + i + "]"; + textBox[i].Size = new Size(288, 20); + textBox[i].TabIndex = i; + textBox[i].Text = items[i].Text; + if (items[i].IsPassword) + { + textBox[i].UseSystemPasswordChar = true; + } + } + // + // button1 + // + button1.Anchor = (AnchorStyles)(AnchorStyles.Bottom | AnchorStyles.Right); + button1.Location = new Point(208, 15 + (39 * label.Length)); + button1.Name = "button1"; + button1.Size = new Size(92, 23); + button1.TabIndex = items.Length + 2; + button1.Text = "button1"; + button1.UseVisualStyleBackColor = true; + // + // button2 + // + button2.Anchor = (AnchorStyles)(AnchorStyles.Bottom | AnchorStyles.Right); + button2.Location = new Point(110, 15 + (39 * label.Length)); + button2.Name = "button2"; + button2.Size = new Size(92, 23); + button2.TabIndex = items.Length + 1; + button2.Text = "button2"; + button2.UseVisualStyleBackColor = true; + // + // button3 + // + button3.Anchor = (AnchorStyles)(AnchorStyles.Bottom | AnchorStyles.Right); + button3.Location = new Point(12, 15 + (39 * label.Length)); + button3.Name = "button3"; + button3.Size = new Size(92, 23); + button3.TabIndex = items.Length; + button3.Text = "button3"; + button3.UseVisualStyleBackColor = true; + // + // Evaluate MessageBoxButtons + // + switch (buttons) + { + case InputBoxButtons.OK: + button1.Text = "OK"; + button1.Click += OK_Click; + button2.Visible = false; + button3.Visible = false; + AcceptButton = button1; + break; + case InputBoxButtons.OKCancel: + button1.Text = "Cancel"; + button1.Click += Cancel_Click; + button2.Text = "OK"; + button2.Click += OK_Click; + button3.Visible = false; + AcceptButton = button2; + break; + case InputBoxButtons.YesNo: + button1.Text = "No"; + button1.Click += No_Click; + button2.Text = "Yes"; + button2.Click += Yes_Click; + button3.Visible = false; + AcceptButton = button2; + break; + case InputBoxButtons.YesNoCancel: + button1.Text = "Cancel"; + button1.Click += Cancel_Click; + button2.Text = "No"; + button2.Click += No_Click; + button3.Text = "Yes"; + button3.Click += Yes_Click; + AcceptButton = button3; + break; + case InputBoxButtons.Save: + button1.Text = "Save"; + button1.Click += Save_Click; + button2.Visible = false; + button3.Visible = false; + AcceptButton = button1; + break; + case InputBoxButtons.SaveCancel: + button1.Text = "Cancel"; + button1.Click += Cancel_Click; + button2.Text = "Save"; + button2.Click += Save_Click; + button3.Visible = false; + AcceptButton = button2; + break; + default: + throw new Exception("Invalid InputBoxButton Value"); + } + // + // dialogForm + // + AutoScaleDimensions = new SizeF(6F, 13F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(312, 47 + (39 * items.Length)); + for (int i = 0; i < label.Length; i++) + { + Controls.Add(label[i]); + } + for (int i = 0; i < textBox.Length; i++) + { + Controls.Add(textBox[i]); + } + Controls.Add(button1); + Controls.Add(button2); + Controls.Add(button3); + MaximizeBox = false; + MinimizeBox = false; + MaximumSize = new Size(99999, 85 + (39 * items.Length)); + Name = "dialogForm"; + ShowIcon = false; + ShowInTaskbar = false; + Text = title; + ResumeLayout(false); + PerformLayout(); + foreach (Label l in label) + { + if (l.Width > minWidth) + { + minWidth = l.Width; + } + } + ClientSize = new Size(minWidth + 24, 47 + (39 * items.Length)); + MinimumSize = new Size(minWidth + 40, 85 + (39 * items.Length)); + } + + private void OK_Click(object sender, EventArgs e) + { + inputResult = InputBoxResult.OK; + Close(); + } + + private void Cancel_Click(object sender, EventArgs e) + { + inputResult = InputBoxResult.Cancel; + Close(); + } + + private void Yes_Click(object sender, EventArgs e) + { + inputResult = InputBoxResult.Yes; + Close(); + } + + private void No_Click(object sender, EventArgs e) + { + inputResult = InputBoxResult.No; + Close(); + } + + private void Save_Click(object sender, EventArgs e) + { + inputResult = InputBoxResult.Save; + Close(); + } + } +} diff --git a/Client/UIControls/Administrator/AdminDokTypGenerierung.Designer.cs b/Client/UIControls/Administrator/AdminDokTypGenerierung.Designer.cs index 7f46ba4e..9d237a03 100644 --- a/Client/UIControls/Administrator/AdminDokTypGenerierung.Designer.cs +++ b/Client/UIControls/Administrator/AdminDokTypGenerierung.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); + Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AdminDokTypGenerierung)); this.groupBox7 = new System.Windows.Forms.GroupBox(); this.TreeDokumenttyp = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); @@ -40,20 +40,23 @@ this.rbNr = new System.Windows.Forms.RadioButton(); this.label15 = new System.Windows.Forms.Label(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.label18 = new System.Windows.Forms.Label(); - this.chkfilloffice = new System.Windows.Forms.CheckBox(); - this.cbboxcompatibilitymode = new System.Windows.Forms.ComboBox(); - this.chkboxInOffice = new System.Windows.Forms.CheckBox(); this.chkinterop = new System.Windows.Forms.CheckBox(); this.chkbearbeitungdirekt = new System.Windows.Forms.CheckBox(); - this.cbbearbeitungzwingend = new System.Windows.Forms.CheckBox(); this.cbPDFDirekteArchivierung = new System.Windows.Forms.CheckBox(); this.cbPDFDokument = new System.Windows.Forms.CheckBox(); this.cbOfficeDokument = new System.Windows.Forms.CheckBox(); + this.label18 = new System.Windows.Forms.Label(); + this.chkfilloffice = new System.Windows.Forms.CheckBox(); + this.cbboxcompatibilitymode = new System.Windows.Forms.ComboBox(); + this.chkboxInOffice = new System.Windows.Forms.CheckBox(); + this.cbbearbeitungzwingend = new System.Windows.Forms.CheckBox(); this.sfButton1 = new Syncfusion.WinForms.Controls.SfButton(); this.btnerstellen = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.label1 = new System.Windows.Forms.Label(); + this.cbboxfachverantwortung = new System.Windows.Forms.ComboBox(); + this.btnFilterDelete = new System.Windows.Forms.Button(); this.groupBox7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).BeginInit(); this.panel1.SuspendLayout(); @@ -67,26 +70,26 @@ this.groupBox7.Controls.Add(this.TreeDokumenttyp); this.groupBox7.Controls.Add(this.panel1); this.groupBox7.Dock = System.Windows.Forms.DockStyle.Left; - this.groupBox7.Location = new System.Drawing.Point(0, 0); + this.groupBox7.Location = new System.Drawing.Point(2, 2); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(282, 446); + this.groupBox7.Size = new System.Drawing.Size(369, 349); this.groupBox7.TabIndex = 2; this.groupBox7.TabStop = false; this.groupBox7.Text = "Dokumenttypen"; // // TreeDokumenttyp // - treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo2.ShowCheckBox = false; - treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black; + treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo1.ShowCheckBox = false; + treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black; this.TreeDokumenttyp.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)}); - this.TreeDokumenttyp.BeforeTouchSize = new System.Drawing.Size(273, 356); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); + this.TreeDokumenttyp.BeforeTouchSize = new System.Drawing.Size(363, 234); this.TreeDokumenttyp.Dock = System.Windows.Forms.DockStyle.Left; // // @@ -98,11 +101,11 @@ this.TreeDokumenttyp.HelpTextControl.TabIndex = 0; this.TreeDokumenttyp.HelpTextControl.Visible = true; this.TreeDokumenttyp.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; - this.TreeDokumenttyp.Location = new System.Drawing.Point(3, 87); + this.TreeDokumenttyp.Location = new System.Drawing.Point(3, 112); this.TreeDokumenttyp.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220))))); this.TreeDokumenttyp.Name = "TreeDokumenttyp"; this.TreeDokumenttyp.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText; - this.TreeDokumenttyp.Size = new System.Drawing.Size(273, 356); + this.TreeDokumenttyp.Size = new System.Drawing.Size(363, 234); this.TreeDokumenttyp.SortWithChildNodes = true; this.TreeDokumenttyp.TabIndex = 11; this.TreeDokumenttyp.Text = "treeViewAdv1"; @@ -121,6 +124,9 @@ // // panel1 // + this.panel1.Controls.Add(this.btnFilterDelete); + this.panel1.Controls.Add(this.cbboxfachverantwortung); + this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.chkboxaktive); this.panel1.Controls.Add(this.txtFilter); this.panel1.Controls.Add(this.rbBezeichnung); @@ -130,7 +136,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(3, 16); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(276, 71); + this.panel1.Size = new System.Drawing.Size(363, 96); this.panel1.TabIndex = 10; // // chkboxaktive @@ -138,25 +144,26 @@ this.chkboxaktive.AutoSize = true; this.chkboxaktive.Checked = true; this.chkboxaktive.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkboxaktive.Location = new System.Drawing.Point(205, 43); + this.chkboxaktive.Location = new System.Drawing.Point(303, 11); this.chkboxaktive.Name = "chkboxaktive"; this.chkboxaktive.Size = new System.Drawing.Size(55, 17); this.chkboxaktive.TabIndex = 10; this.chkboxaktive.Text = "aktive"; this.chkboxaktive.UseVisualStyleBackColor = true; + this.chkboxaktive.Visible = false; // // txtFilter // - this.txtFilter.Location = new System.Drawing.Point(69, 12); + this.txtFilter.Location = new System.Drawing.Point(118, 15); this.txtFilter.Name = "txtFilter"; - this.txtFilter.Size = new System.Drawing.Size(191, 20); + this.txtFilter.Size = new System.Drawing.Size(153, 20); this.txtFilter.TabIndex = 6; this.txtFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFilter_KeyDown); // // rbBezeichnung // this.rbBezeichnung.AutoSize = true; - this.rbBezeichnung.Location = new System.Drawing.Point(111, 42); + this.rbBezeichnung.Location = new System.Drawing.Point(160, 73); this.rbBezeichnung.Name = "rbBezeichnung"; this.rbBezeichnung.Size = new System.Drawing.Size(87, 17); this.rbBezeichnung.TabIndex = 9; @@ -176,7 +183,7 @@ // this.rbNr.AutoSize = true; this.rbNr.Checked = true; - this.rbNr.Location = new System.Drawing.Point(69, 42); + this.rbNr.Location = new System.Drawing.Point(117, 73); this.rbNr.Name = "rbNr"; this.rbNr.Size = new System.Drawing.Size(36, 17); this.rbNr.TabIndex = 8; @@ -187,7 +194,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(12, 44); + this.label15.Location = new System.Drawing.Point(12, 71); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(26, 13); this.label15.TabIndex = 7; @@ -200,13 +207,58 @@ this.groupBox4.Controls.Add(this.cbPDFDirekteArchivierung); this.groupBox4.Controls.Add(this.cbPDFDokument); this.groupBox4.Controls.Add(this.cbOfficeDokument); - this.groupBox4.Location = new System.Drawing.Point(301, 166); + this.groupBox4.Location = new System.Drawing.Point(386, 123); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(351, 73); + this.groupBox4.Size = new System.Drawing.Size(303, 56); this.groupBox4.TabIndex = 25; this.groupBox4.TabStop = false; this.groupBox4.Text = "Generierung ohne Office"; // + // chkinterop + // + this.chkinterop.Location = new System.Drawing.Point(141, 0); + this.chkinterop.Name = "chkinterop"; + this.chkinterop.Size = new System.Drawing.Size(127, 24); + this.chkinterop.TabIndex = 11; + this.chkinterop.Text = "Bearbeitung InterOP"; + this.chkinterop.Visible = false; + // + // chkbearbeitungdirekt + // + this.chkbearbeitungdirekt.Location = new System.Drawing.Point(11, 24); + this.chkbearbeitungdirekt.Name = "chkbearbeitungdirekt"; + this.chkbearbeitungdirekt.Size = new System.Drawing.Size(257, 24); + this.chkbearbeitungdirekt.TabIndex = 10; + this.chkbearbeitungdirekt.Text = "Nach der Generierung direkt bearbeiten"; + this.chkbearbeitungdirekt.CheckedChanged += new System.EventHandler(this.chkbearbeitungdirekt_CheckedChanged); + // + // cbPDFDirekteArchivierung + // + this.cbPDFDirekteArchivierung.Location = new System.Drawing.Point(392, 69); + this.cbPDFDirekteArchivierung.Name = "cbPDFDirekteArchivierung"; + this.cbPDFDirekteArchivierung.Size = new System.Drawing.Size(280, 24); + this.cbPDFDirekteArchivierung.TabIndex = 8; + this.cbPDFDirekteArchivierung.Text = "Direkte OnBase-Archvierung"; + this.cbPDFDirekteArchivierung.Visible = false; + // + // cbPDFDokument + // + this.cbPDFDokument.Location = new System.Drawing.Point(392, 50); + this.cbPDFDokument.Name = "cbPDFDokument"; + this.cbPDFDokument.Size = new System.Drawing.Size(280, 24); + this.cbPDFDokument.TabIndex = 6; + this.cbPDFDokument.Text = "Generierng als PDF"; + this.cbPDFDokument.Visible = false; + // + // cbOfficeDokument + // + this.cbOfficeDokument.Location = new System.Drawing.Point(392, 29); + this.cbOfficeDokument.Name = "cbOfficeDokument"; + this.cbOfficeDokument.Size = new System.Drawing.Size(240, 24); + this.cbOfficeDokument.TabIndex = 4; + this.cbOfficeDokument.Text = "Office-Dokument"; + this.cbOfficeDokument.Visible = false; + // // label18 // this.label18.AutoSize = true; @@ -245,23 +297,7 @@ this.chkboxInOffice.Size = new System.Drawing.Size(187, 24); this.chkboxInOffice.TabIndex = 26; this.chkboxInOffice.Text = "Erstellung mit Office"; - // - // chkinterop - // - this.chkinterop.Location = new System.Drawing.Point(238, 19); - this.chkinterop.Name = "chkinterop"; - this.chkinterop.Size = new System.Drawing.Size(127, 24); - this.chkinterop.TabIndex = 11; - this.chkinterop.Text = "Bearbeitung InterOP"; - this.chkinterop.Visible = false; - // - // chkbearbeitungdirekt - // - this.chkbearbeitungdirekt.Location = new System.Drawing.Point(11, 24); - this.chkbearbeitungdirekt.Name = "chkbearbeitungdirekt"; - this.chkbearbeitungdirekt.Size = new System.Drawing.Size(257, 24); - this.chkbearbeitungdirekt.TabIndex = 10; - this.chkbearbeitungdirekt.Text = "Nach der Generierung direkt bearbeiten"; + this.chkboxInOffice.CheckedChanged += new System.EventHandler(this.chkboxInOffice_CheckedChanged); // // cbbearbeitungzwingend // @@ -273,46 +309,19 @@ this.cbbearbeitungzwingend.Text = "Bearbeitung zwingend"; this.cbbearbeitungzwingend.CheckedChanged += new System.EventHandler(this.cbbearbeitungzwingend_CheckedChanged); // - // cbPDFDirekteArchivierung - // - this.cbPDFDirekteArchivierung.Location = new System.Drawing.Point(392, 69); - this.cbPDFDirekteArchivierung.Name = "cbPDFDirekteArchivierung"; - this.cbPDFDirekteArchivierung.Size = new System.Drawing.Size(280, 24); - this.cbPDFDirekteArchivierung.TabIndex = 8; - this.cbPDFDirekteArchivierung.Text = "Direkte OnBase-Archvierung"; - this.cbPDFDirekteArchivierung.Visible = false; - // - // cbPDFDokument - // - this.cbPDFDokument.Location = new System.Drawing.Point(392, 50); - this.cbPDFDokument.Name = "cbPDFDokument"; - this.cbPDFDokument.Size = new System.Drawing.Size(280, 24); - this.cbPDFDokument.TabIndex = 6; - this.cbPDFDokument.Text = "Generierng als PDF"; - this.cbPDFDokument.Visible = false; - // - // cbOfficeDokument - // - this.cbOfficeDokument.Location = new System.Drawing.Point(392, 29); - this.cbOfficeDokument.Name = "cbOfficeDokument"; - this.cbOfficeDokument.Size = new System.Drawing.Size(240, 24); - this.cbOfficeDokument.TabIndex = 4; - this.cbOfficeDokument.Text = "Office-Dokument"; - this.cbOfficeDokument.Visible = false; - // // sfButton1 // this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); - this.sfButton1.Location = new System.Drawing.Point(301, 312); + this.sfButton1.Location = new System.Drawing.Point(377, 257); this.sfButton1.Name = "sfButton1"; - this.sfButton1.Size = new System.Drawing.Size(96, 28); + this.sfButton1.Size = new System.Drawing.Size(136, 28); this.sfButton1.TabIndex = 26; this.sfButton1.Text = "Speichern"; this.sfButton1.Click += new System.EventHandler(this.sfButton1_Click); // // btnerstellen // - this.btnerstellen.Location = new System.Drawing.Point(301, 386); + this.btnerstellen.Location = new System.Drawing.Point(377, 312); this.btnerstellen.Name = "btnerstellen"; this.btnerstellen.Size = new System.Drawing.Size(136, 23); this.btnerstellen.TabIndex = 27; @@ -324,9 +333,9 @@ // this.groupBox1.Controls.Add(this.chkboxInOffice); this.groupBox1.Controls.Add(this.chkfilloffice); - this.groupBox1.Location = new System.Drawing.Point(301, 220); + this.groupBox1.Location = new System.Drawing.Point(386, 177); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(331, 74); + this.groupBox1.Size = new System.Drawing.Size(303, 74); this.groupBox1.TabIndex = 29; this.groupBox1.TabStop = false; this.groupBox1.Text = "Office"; @@ -336,18 +345,46 @@ this.groupBox2.Controls.Add(this.label18); this.groupBox2.Controls.Add(this.cbboxcompatibilitymode); this.groupBox2.Controls.Add(this.cbbearbeitungzwingend); - this.groupBox2.Location = new System.Drawing.Point(301, 60); + this.groupBox2.Location = new System.Drawing.Point(386, 17); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(351, 100); + this.groupBox2.Size = new System.Drawing.Size(303, 100); this.groupBox2.TabIndex = 30; this.groupBox2.TabStop = false; this.groupBox2.Text = "Allgemein"; // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 44); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(99, 13); + this.label1.TabIndex = 11; + this.label1.Text = "Fachverantwortung"; + // + // cbboxfachverantwortung + // + this.cbboxfachverantwortung.FormattingEnabled = true; + this.cbboxfachverantwortung.Location = new System.Drawing.Point(117, 40); + this.cbboxfachverantwortung.Name = "cbboxfachverantwortung"; + this.cbboxfachverantwortung.Size = new System.Drawing.Size(154, 21); + this.cbboxfachverantwortung.TabIndex = 12; + this.cbboxfachverantwortung.SelectedIndexChanged += new System.EventHandler(this.cbboxfachverantwortung_SelectedIndexChanged); + // + // btnFilterDelete + // + this.btnFilterDelete.Location = new System.Drawing.Point(280, 34); + this.btnFilterDelete.Name = "btnFilterDelete"; + this.btnFilterDelete.Size = new System.Drawing.Size(80, 23); + this.btnFilterDelete.TabIndex = 13; + this.btnFilterDelete.Text = "Filter löschen"; + this.btnFilterDelete.UseVisualStyleBackColor = true; + this.btnFilterDelete.Click += new System.EventHandler(this.btnFilterDelete_Click); + // // AdminDokTypGenerierung // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(661, 446); + this.ClientSize = new System.Drawing.Size(692, 353); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.btnerstellen); @@ -356,6 +393,8 @@ this.Controls.Add(this.groupBox7); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "AdminDokTypGenerierung"; + this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; + this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; this.Text = "AdminDokumentGenerierung"; this.Load += new System.EventHandler(this.AdminDokTypGenerierung_Load); this.groupBox7.ResumeLayout(false); @@ -397,5 +436,8 @@ private System.Windows.Forms.Button btnerstellen; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox cbboxfachverantwortung; + private System.Windows.Forms.Button btnFilterDelete; } } \ No newline at end of file diff --git a/Client/UIControls/Administrator/AdminDokTypGenerierung.cs b/Client/UIControls/Administrator/AdminDokTypGenerierung.cs index f6077b4e..4d3bdebd 100644 --- a/Client/UIControls/Administrator/AdminDokTypGenerierung.cs +++ b/Client/UIControls/Administrator/AdminDokTypGenerierung.cs @@ -38,6 +38,12 @@ namespace OnDoc.UIControls.Administrator private void AdminDokTypGenerierung_Load(object sender, EventArgs e) { + DB db = new DB(AppParams.connectionstring); + db.Get_Tabledata("select distinct fachverantwortung from dbo.view_dokumenttypen_relaunch order by fachverantwortung asc", false, true); + foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows) + { + cbboxfachverantwortung.Items.Add(dr[0].ToString()); + } update_tree(); return; @@ -49,20 +55,29 @@ namespace OnDoc.UIControls.Administrator TreeDokumenttyp.Nodes.Clear(); - string sql = ""; - sql = "Select dokumenttypnr as ID, Bezeichnung, Aktiv from dokumenttyp"; + string sql = " Select dokumenttypnr as ID, Bezeichnung from view_dokumenttypen_relaunch "; + string where = ""; + //sql = "Select dokumenttypnr as ID, Bezeichnung, Aktiv from dokumenttyp"; if (txtFilter.Text.Trim().Length > 0) { - sql = sql + " where bezeichnung like '%" + txtFilter.Text.Replace(" ", "%") + "%'"; + if (where.Length > 0) { where = where + " and "; } else { where = "where "; } + where = where + " bezeichnung like '%" + txtFilter.Text.Replace(" ", "%") + "%'"; } - else + if (cbboxfachverantwortung.Text != "") { - sql = sql + " where dokumenttypnr > 0"; + if (where.Length > 0) { where = where + " and "; } else { where = "where "; } + where = where + " fachverantwortung ='"+cbboxfachverantwortung.Text+"'" ; } - if (chkboxaktive.Checked) { sql = sql + " and aktiv=1"; } + + if (where.Trim().Length > 0) { sql = sql + where; } + //else + //{ + // sql = sql + " where dokumenttypnr > 0"; + //} + // if (chkboxaktive.Checked) { sql = sql + " and aktiv=1"; } if (rbNr.Checked) { - sql = sql + " order by id"; + sql = sql + " order by dokumenttypnr"; } else { @@ -78,10 +93,10 @@ namespace OnDoc.UIControls.Administrator TreeNodeAdv nodeAdv = new TreeNodeAdv(); nodeAdv.Text = r["id"].ToString() + " " + r["Bezeichnung"].ToString(); nodeAdv.Tag = r["id"].ToString(); - if (Convert.ToBoolean(r["aktiv"]) == false) - { - nodeAdv.Font = new System.Drawing.Font(nodeAdv.Font, FontStyle.Strikeout); - } + //if (Convert.ToBoolean(r["aktiv"]) == false) + //{ + // nodeAdv.Font = new System.Drawing.Font(nodeAdv.Font, FontStyle.Strikeout); + //} TreeDokumenttyp.Nodes.Add(nodeAdv); } } @@ -158,6 +173,40 @@ namespace OnDoc.UIControls.Administrator { } + + private void chkboxInOffice_CheckedChanged(object sender, EventArgs e) + { + if (chkboxInOffice.Checked) { + chkbearbeitungdirekt.Checked = false; + chkfilloffice.Checked = true; + } + } + + private void chkbearbeitungdirekt_CheckedChanged(object sender, EventArgs e) + { + if (chkbearbeitungdirekt.Checked) + { + chkboxInOffice.Checked = false; + chkfilloffice.Checked = false; + } + } + + private void toolstripCombobox_Fachverantwortung_SelectedIndexChanged(object sender, EventArgs e) + { + + } + + private void cbboxfachverantwortung_SelectedIndexChanged(object sender, EventArgs e) + { + update_tree(); + } + + private void btnFilterDelete_Click(object sender, EventArgs e) + { + cbboxfachverantwortung.Text = ""; + txtFilter.Text = ""; + update_tree(); + } } } diff --git a/Client/UIControls/Administrator/OfficeVorlage.cs b/Client/UIControls/Administrator/OfficeVorlage.cs index de19995e..2abec153 100644 --- a/Client/UIControls/Administrator/OfficeVorlage.cs +++ b/Client/UIControls/Administrator/OfficeVorlage.cs @@ -21,8 +21,7 @@ using Syncfusion.Windows.Forms; using Syncfusion.Windows.Forms.Tools; using Syncfusion.WinForms.Controls; using VBFileManagement; -using Windows.Devices.Sensors; -using Windows.Media.Audio; + namespace OnDoc.UIControls.Administrator { diff --git a/Client/UIControls/DocPreview.Designer.cs b/Client/UIControls/DocPreview.Designer.cs index bab2d164..877ff136 100644 --- a/Client/UIControls/DocPreview.Designer.cs +++ b/Client/UIControls/DocPreview.Designer.cs @@ -78,10 +78,10 @@ this.FitPage, this.FitWidth, this.toolStripButton1}); - this.Open.Location = new System.Drawing.Point(3, 6); + this.Open.Location = new System.Drawing.Point(3, 0); this.Open.Name = "Open"; this.Open.Padding = new System.Windows.Forms.Padding(5); - this.Open.Size = new System.Drawing.Size(361, 41); + this.Open.Size = new System.Drawing.Size(454, 41); this.Open.TabIndex = 5; this.Open.Text = "toolStrip1"; // @@ -264,7 +264,7 @@ this.pdfViewerControl1.ReferencePath = null; this.pdfViewerControl1.ScrollDisplacementValue = 0; this.pdfViewerControl1.ShowHorizontalScrollBar = true; - this.pdfViewerControl1.ShowToolBar = true; + this.pdfViewerControl1.ShowToolBar = false; this.pdfViewerControl1.ShowVerticalScrollBar = true; this.pdfViewerControl1.Size = new System.Drawing.Size(781, 519); this.pdfViewerControl1.SpaceBetweenPages = 8; @@ -274,6 +274,7 @@ textSearchSettings1.HighlightAllInstance = true; textSearchSettings1.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); this.pdfViewerControl1.TextSearchSettings = textSearchSettings1; + this.pdfViewerControl1.ThemeName = "Default"; this.pdfViewerControl1.VerticalScrollOffset = 0; this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; this.pdfViewerControl1.ZoomMode = Syncfusion.Windows.Forms.PdfViewer.ZoomMode.Default; diff --git a/Client/UIControls/DocPreview.resx b/Client/UIControls/DocPreview.resx index 860d8166..462b8cc8 100644 --- a/Client/UIControls/DocPreview.resx +++ b/Client/UIControls/DocPreview.resx @@ -125,10 +125,10 @@ iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADVSURBVDhPY3CLL/8Pw65x5Q8YSATOsRXCrvGlGygyyC2u - 1NEtvuwJSC9ZBtnb17MA1bfZB2X9hekl2SDnxAoloCtOIOsDYZIMcksoi3KJKP+ErAeGiTLIL6mUFyi3 + 1NEtvuwJSC9ZBtnb17MA1bfZB2b+hekl2SDnxAoloCtOIOsDYZIMcksoi3KJKP+ErAeGiTLIL6mUFyi3 CFktOiZokEdChalrfPkdZHXYMF6DXGLL5XB5BR0TdlFipZZbbMklZHXYMFFhZB9fzwH03mRkteiYKINg - wC221Aeo7jWyHhgmySAQcEkqlXKLLd+DrA+ESTYIBOrr65nc4srL3eKzflNkEAwgJw2KDAIBSGItXwQA - CbAz5iVNkssAAAAASUVORK5CYII= + wC221Aeo7jWyHhgmySAQcEkqlXKLLd+DrA+ESTYIBOrr65nc4srL3eIzf1NkEAwgJw2KDAIBSGItXwQA + Aicz439QGrkAAAAASUVORK5CYII= @@ -136,8 +136,8 @@ iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACzSURBVDhPYyAFeMWXSLjFlW2FcgkDt/jyYLf4ojdA+j9U CDdwSSvnd40rXwRSDMNQKezALa7U0TGm7BGyBpya7OPrOdziy/qACv6hawBhqDIEcI4tN3SNK7uKTTEM - Q5UyMISGhjK7xJVXucVn/camEBmDNbjFVKi4xpcdw6YAG2YAOiUdyPiCLoEPk6eJLOfBAMkBgQxICnJk - QHLkIgOSkhEyIDnBIgOgYuKzBjKAZMKyrQCVGg6eVJofGwAAAABJRU5ErkJggg== + Q5UyMISGhjK7xJVXucVn/samEBmDNbjFVKi4xpcdw6YAG2YAOiUdyPiCLoEPk6eJLOfBAMkBgQxICnJk + QHLkIgOSkhEyIDnBIgOgYuKzBjKAZMKyrQCRUQ6clqvFpwAAAABJRU5ErkJggg== @@ -145,39 +145,39 @@ iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACeSURBVDhPY3CNLd3iFV8iwUAKcIsv/w/Er90TyoKgQoQB VBMYu8aXLfSIrueDSuEGyJoguOihe3y5A1QaO8DUBMb/gLjXPr6eA6oMFaApRsEu8eVXXONLDKBKEQCb - YhQcVP7LNa6sMjQ0lBmqhQhNUOwSV37UI65EmSRNUPzFLb4ijbaaSHMeqQFBapCTGrkkJiNSEyxpWYP0 - TMjAAAD4Pw6kcfrAuQAAAABJRU5ErkJggg== + YhQcWP7LNa6sMjQ0lBmqhQhNUOwSV37UI65EmSRNUPzFLb4ijbaaSHMeqQFBapCTGrkkJiNSEyxpWYP0 + TMjAAAD0lA6i2Wu4swAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADaSURBVDhPY3CNK1/kl1TKy0AiAOp74BZf/h+GGUCEa3z5 - HY+EClOoGqIAVoMgOOu3W1x5eX19PRNULV6AxyAIdo0v2+2SVCoFVY8TEDQIil+7xZb6QPVgBcQaBMbA + HY+EClOoGqIAVoMgOPO3W1x5eX19PRNULV6AxyAIdo0v2+2SVCoFVY8TEDQIil+7xZb6QPVgBcQaBMbA sJtsH1/PAdWLAkgyCIxjSy55JFZqQfXDAekGAbFLRPknl9hyOagZYECyQbiSBmlhhCexEmUQyCtuCWVR - UD1YAREGlZ1wTqxQgqrHCXAaZB+U9RdIt9nb17NA1eIFOAwqe+IWV+oIVUMUwDDINb50g3NshTBUnmiA - alD5fwDZszPlE4//iQAAAABJRU5ErkJggg== + UD1YAREGlZ1wTqxQgqrHCXAaZB+Y+RdIt9nb17NA1eIFOAwqe+IWV+oIVUMUwDDINb50g3NshTBUnmiA + alD5fwDUaDPi09L+WgAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADPSURBVDhPY0AH9vb1LC5xFZFucWWrXOLLH7vFZ/0GYTAb - JAaUA6mBKscO3BLKXF3jy++4xZf/x4ed40tuu8dWuEC1oQKgbZn2QVl/sWnEhsFqgXqg2iHANa48EJti + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADPSURBVDhPY0AH9vb1LC5xFZFucWWrXOLLH7vFZ/4GYTAb + JAaUA6mBKscO3BLKXF3jy++4xZf/x4ed40tuu8dWuEC1oQKgbZn2gZl/sWnEhsFqgXqg2iHANa48EJti YjBIL9gQ+/h8Aafo4lfYFBGDQXpBZjAAObnokmTgXAaXuPJDWCRIwiAzQC76hizoHl/uQAxG1gPE30AG - IQv8BwccEQBDH5BAcZFrfIkBMRhZDxB/o2oYUSfWqJaOQIAqKRsGqJLXYIAquR8GyCuPGBgAihnxLMs+ - FUEAAAAASUVORK5CYII= + IQv8BwccEQBDH5BAcZFrfIkBMRhZDxB/o2oYUSfWqJaOQIAqKRsGqJLXYIAquR8GyCuPGBgAbQXxIN23 + EOIAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY0AH9vb1LC5xFZFucWWrXOLLH7vFZ/0GYTAb - JAaUA6mBKscO3GMrXFzjy++4xZf/x4ed40tug9RCtaECoG2Z9kFZf7FpxIbBaoF6oNohwDWuPBCr4viy - j85xJRdAGMTGpgakF2yIfXy+gFN08SusiuJLN4AVAQGIjU0NSC/IDAYgJxddEoaJMQiKcxlc4soPYZEA - Y2INApkBctE3ZEH3+HIHGHaNqdSBmsMAYiPLIesB4m8gg5AF/kP1EQQY+oAEiotc40sM4DimWBGqD+ii - YkVkOWQ9QPyNqmFEnVijWjoCK8KRst3ii94A6QMQDGZjqIGnbBigSl6DAbeEMldicj9IDc7cDwPw8ii+ - fLVbfNkT4sojBgYAZ4fNNo7VHMkAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEcSURBVDhPrVQxjsIwEHRxD7gvpL/ifhBEYlNTIsBLmwIh + XXIxVPwHGp6AeAE9dFAhGpo0pxPsGjsyYCBFRppk452ZWIltdo8wnH7EctwRMp/FoHYCkj+irmkMe6Qx + cj9a/XHMQW0FqPMrRpBtSGtst8C3JWE7+fcZfdRa9Bj7FVyqtlcM+SmS2ZpItU9DXh0Swuiz2U0PXhH8 + LrQIQbVPQ17KYPgwvG9aVgkyHLJYqpWnoVk1iDJoRoU72ALVsOS9yZfJYVS7PdeDLCjIHTgb31s8+PBy + MyMO2XfJXhoYH84oDdye60EWtX6jev5abetIi56sbAE/R7wvr9T1g6Zc2Ra17DULMch5ld1Pmqe736I8 + j0DNBeT7aucRYxdKc80qgQKkhwAAAABJRU5ErkJggg== diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index e848df58..96f9f485 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -535,7 +535,7 @@ namespace OnDoc.UICintrols //System.Diagnostics.Process.Start(tempfilename); if (interop == true) { - OnDocOffice.clsWordEdit WordInterOP = new OnDocOffice.clsWordEdit(AppParams.connectionstring, tempfilename, selected_dokumentid); + OnDocOffice.clsWordEdit WordInterOP = new OnDocOffice.clsWordEdit(AppParams.connectionstring, tempfilename, selected_dokumentid,AppParams.RESTURI,AppParams.apikey); WordInterOP.Edit_Document(runmacros); WordInterOP = null; } @@ -1828,59 +1828,64 @@ namespace OnDoc.UICintrols private void sfDataGrid1_DataSourceChanged(object sender, Syncfusion.WinForms.DataGrid.Events.DataSourceChangedEventArgs e) { - dokwerte1.clear_details(); - docPreview1.clear_viewer(); - if (get_selected_records() == 0) + try { - RibbonButtonEditEditDoc.Enabled = false; - RibbonButtonEditDelete.Enabled = false; - RibbonButtonZuweisen.Enabled = false; - ribbonButtonToApproval.Enabled = false; - RibbonButtonArchivToOnBase.Enabled = false; - dokumentBearbeitenToolStripMenuItem.Enabled = false; - dokumentLöschenToolStripMenuItem.Enabled = false; - druckenToolStripMenuItem.Enabled = false; - dokumentKopierenToolStripMenuItem.Enabled = false; - attributeAnzeigenVersteckenToolStripMenuItem.Enabled = false; - historyToolStripMenuItem.Enabled = false; - archivierenToolStripMenuItem.Enabled = false; - zellenwertInZwischenablageKopierenToolStripMenuItem.Enabled = false; - selected_dokumentid = ""; - selected_partnernr = ""; - selected_cellvalue = ""; + dokwerte1.clear_details(); + docPreview1.clear_viewer(); + if (get_selected_records() == 0) + { + RibbonButtonEditEditDoc.Enabled = false; + RibbonButtonEditDelete.Enabled = false; + RibbonButtonZuweisen.Enabled = false; + ribbonButtonToApproval.Enabled = false; + RibbonButtonArchivToOnBase.Enabled = false; + dokumentBearbeitenToolStripMenuItem.Enabled = false; + dokumentLöschenToolStripMenuItem.Enabled = false; + druckenToolStripMenuItem.Enabled = false; + dokumentKopierenToolStripMenuItem.Enabled = false; + attributeAnzeigenVersteckenToolStripMenuItem.Enabled = false; + historyToolStripMenuItem.Enabled = false; + archivierenToolStripMenuItem.Enabled = false; + zellenwertInZwischenablageKopierenToolStripMenuItem.Enabled = false; + selected_dokumentid = ""; + selected_partnernr = ""; + selected_cellvalue = ""; + } + else + { + RibbonButtonEditEditDoc.Enabled = true; + RibbonButtonEditDelete.Enabled = true; + RibbonButtonZuweisen.Enabled = true; + ribbonButtonToApproval.Enabled = true; + RibbonButtonArchivToOnBase.Enabled = true; + dokumentBearbeitenToolStripMenuItem.Enabled = true; + dokumentLöschenToolStripMenuItem.Enabled = true; + archivierenToolStripMenuItem.Enabled = true; + zellenwertInZwischenablageKopierenToolStripMenuItem.Enabled = true; + druckenToolStripMenuItem.Enabled = true; + dokumentKopierenToolStripMenuItem.Enabled = true; + attributeAnzeigenVersteckenToolStripMenuItem.Enabled = true; + historyToolStripMenuItem.Enabled = true; + + this.sfDataGrid1.SelectedItem = this.sfDataGrid1.View.Records[0]; + sfDataGrid1.SelectedIndex = 0; + var record = sfDataGrid1.View.Records.GetItemAt(sfDataGrid1.SelectedIndex); + + // var changed = DrugGrid.View.GetPropertyAccessProvider().SetValue(record, "GPackSize", "Hello"); // returns true, suggesting + selected_dokumentid = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "dokumentid").ToString(); + selected_partnernr = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "partner-nr").ToString(); + selected_cellvalue = selected_dokumentid; + + string bearbeitung_zwingend = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "Bearbeitung_Zwingend").ToString(); + string toapprove = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "toapprove").ToString(); + string approved = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "approved").ToString(); + string faksimle = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "faksimile").ToString(); + update_ansicht(bearbeitung_zwingend, toapprove, approved, faksimle); + } } - else - { - RibbonButtonEditEditDoc.Enabled = true; - RibbonButtonEditDelete.Enabled = true; - RibbonButtonZuweisen.Enabled = true; - ribbonButtonToApproval.Enabled = true; - RibbonButtonArchivToOnBase.Enabled = true; - dokumentBearbeitenToolStripMenuItem.Enabled = true; - dokumentLöschenToolStripMenuItem.Enabled = true; - archivierenToolStripMenuItem.Enabled = true; - zellenwertInZwischenablageKopierenToolStripMenuItem.Enabled = true; - druckenToolStripMenuItem.Enabled = true; - dokumentKopierenToolStripMenuItem.Enabled = true; - attributeAnzeigenVersteckenToolStripMenuItem.Enabled = true; - historyToolStripMenuItem.Enabled = true; - - this.sfDataGrid1.SelectedItem = this.sfDataGrid1.View.Records[0]; - sfDataGrid1.SelectedIndex = 0; - var record = sfDataGrid1.View.Records.GetItemAt(sfDataGrid1.SelectedIndex); - - // var changed = DrugGrid.View.GetPropertyAccessProvider().SetValue(record, "GPackSize", "Hello"); // returns true, suggesting - selected_dokumentid = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "dokumentid").ToString(); - selected_partnernr = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "partner-nr").ToString(); - selected_cellvalue = selected_dokumentid; + catch { } - string bearbeitung_zwingend = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "Bearbeitung_Zwingend").ToString(); - string toapprove = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "toapprove").ToString(); - string approved = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "approved").ToString(); - string faksimle = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "faksimile").ToString(); - update_ansicht(bearbeitung_zwingend, toapprove, approved, faksimle); } - } private void sfDataGrid1_FilterChanged(object sender, FilterChangedEventArgs e) { diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx index 8266785d..e9022caf 100644 --- a/Client/UIControls/DokList.resx +++ b/Client/UIControls/DokList.resx @@ -524,19 +524,19 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC + wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC + wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII= + wAAADsABataJCQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII= diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs index ef88e20a..9d6436aa 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.cs @@ -129,7 +129,7 @@ namespace OnDoc.UIControls this.cbboxunterschriftrechts.Enabled = Convert.ToBoolean(dr["unterschrift_rechts"]) == true; this.cbformularohneunterschrfit.Enabled = Convert.ToBoolean(dr["unterschrift_ohne"]) == true; this.cbfaksimile.Enabled = Convert.ToBoolean(dr["unterschrift_faksimile"]) == true; - this.cbfaksimile.Checked = false; + if (this.cbfaksimile.Enabled == true) { this.cbfaksimile.Checked=true; } this.cbformularohneunterschrfit.Checked = false; try { @@ -219,10 +219,14 @@ namespace OnDoc.UIControls db.Get_Tabledata(sql, false, true); if (db.dsdaten.Tables[0].Rows.Count > 0) { + string logdata1 = barcode_left.ToString() + "/" + barcode_top.ToString() + "/" + barcode_width.ToString() + "/" + barcode_height.ToString(); this.barcode_left = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcpl"]); this.barcode_top = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcpt"]); this.barcode_width = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcw"]); this.barcode_height = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bch"]); + string logdata2 = barcode_left.ToString() + "/" + barcode_top.ToString() + "/" + barcode_width.ToString() + "/" + barcode_height.ToString(); + Logging.Logging.Debug("Barcode-Resize: " + logdata1 + " - " + logdata2, "ondoc", ""); + } } @@ -509,7 +513,32 @@ namespace OnDoc.UIControls check_error = check_error + "- " + bezeichnung + " Feldwert ist zwingend" ; } } } + if (cbfaksimile.Checked) + { + int ul = 0; + int ur = 0; + try + { + ul = Convert.ToInt32(cbboxunterschriftlinks.SelectedValue); + } + catch { } + try + { + ur = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue); + } + catch { } + if (ul==0 || ur == 0) + { + if (check_error != "") { check_error = check_error + Environment.NewLine + Environment.NewLine; } + check_error = check_error + "- " + "Bitte Unterschrift links und rechts auswählen"; + } + + + } + if (check_error == "") { return true; } else { return false; } + + return true; } public void Update_DocGenData() diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index 8ef9b4d7..f62a892e 100644 Binary files a/Client/bin/Debug/DOCGEN.dll and b/Client/bin/Debug/DOCGEN.dll differ diff --git a/Client/bin/Debug/DOCGEN.pdb b/Client/bin/Debug/DOCGEN.pdb index 3a5fe2fb..5d43d16f 100644 Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ diff --git a/Client/bin/Debug/Model.dll b/Client/bin/Debug/Model.dll index 5177cf3e..dc7a1e44 100644 Binary files a/Client/bin/Debug/Model.dll and b/Client/bin/Debug/Model.dll differ diff --git a/Client/bin/Debug/Model.pdb b/Client/bin/Debug/Model.pdb index 532596f2..be84dcbc 100644 Binary files a/Client/bin/Debug/Model.pdb and b/Client/bin/Debug/Model.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 02c341a7..77b5faa4 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 513bc23f..4e97fe8f 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 6be0c333..4e07d905 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/OnDocOffice.dll b/Client/bin/Debug/OnDocOffice.dll index 2bc14d42..2dec0cce 100644 Binary files a/Client/bin/Debug/OnDocOffice.dll and b/Client/bin/Debug/OnDocOffice.dll differ diff --git a/Client/bin/Debug/OnDocOffice.pdb b/Client/bin/Debug/OnDocOffice.pdb index d7542cf7..20da657c 100644 Binary files a/Client/bin/Debug/OnDocOffice.pdb and b/Client/bin/Debug/OnDocOffice.pdb differ diff --git a/Client/bin/Debug/_Zipit.bat b/Client/bin/Debug/_Zipit.bat index bf7b9be9..e8c87b78 100644 --- a/Client/bin/Debug/_Zipit.bat +++ b/Client/bin/Debug/_Zipit.bat @@ -1,5 +1,5 @@ delete EDKB02DMS.zip -"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll vbbarcodes.dll +"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll vbbarcodes.dll BarcodeLibVBDatamatrix.dll copy OnDocClient.zip H:\NextCloud\ZZDownload pause \ No newline at end of file diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index d1913996..c056e17e 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/bin/Debug/vbBarcodes.dll b/Client/bin/Debug/vbBarcodes.dll index f68e5af6..b5f44b4d 100644 Binary files a/Client/bin/Debug/vbBarcodes.dll and b/Client/bin/Debug/vbBarcodes.dll differ diff --git a/Client/bin/Debug/vbBarcodes.pdb b/Client/bin/Debug/vbBarcodes.pdb index f2800be8..0f6a4e0c 100644 Binary files a/Client/bin/Debug/vbBarcodes.pdb and b/Client/bin/Debug/vbBarcodes.pdb differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index 1b819113..1ad79d19 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache index daaba00f..eae460dc 100644 --- a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache +++ b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -214d353aff1cf5b21e76f95012103b7385af6396d0631660f67e7f8309c948cb +0ebfa8660e9a4803f2c070035283fb2abe7589fb363960199b8d3b0282a9d215 diff --git a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt index d4343e9f..d3b4ee5f 100644 --- a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt +++ b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt @@ -366,3 +366,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\vbBarcodes.pdb E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\vbBarcodes.xml E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\MW6.SDK.dll E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.AdminDokTypGenerierung.resources +E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.SerienbriefTemplateLoad.resources diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache index 1c6318ff..292d8621 100644 Binary files a/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/Client/obj/Debug/Client.csproj.GenerateResource.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 0e71e64f..9e5991a7 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 3053f279..88544d47 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources b/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources index 4db37489..6ffd2473 100644 Binary files a/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources and b/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources differ diff --git a/Client/obj/Debug/OnDoc.DocMgmt.SerienbriefTemplateLoad.resources b/Client/obj/Debug/OnDoc.DocMgmt.SerienbriefTemplateLoad.resources new file mode 100644 index 00000000..f2dc1ec5 Binary files /dev/null and b/Client/obj/Debug/OnDoc.DocMgmt.SerienbriefTemplateLoad.resources differ diff --git a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources index 5ada5289..6122ed44 100644 Binary files a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources and b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources differ diff --git a/Client/obj/Debug/OnDoc.UIControls.DocPreview.resources b/Client/obj/Debug/OnDoc.UIControls.DocPreview.resources index fb69fc86..5bba4cf0 100644 Binary files a/Client/obj/Debug/OnDoc.UIControls.DocPreview.resources and b/Client/obj/Debug/OnDoc.UIControls.DocPreview.resources differ diff --git a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources index cc34211a..e10ecfbb 100644 Binary files a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources and b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 02c341a7..77b5faa4 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 513bc23f..4e97fe8f 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index d1913996..c056e17e 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/DocGen.csproj b/DOCGEN/DocGen.csproj index 2746223c..4dd8fb1e 100644 --- a/DOCGEN/DocGen.csproj +++ b/DOCGEN/DocGen.csproj @@ -38,6 +38,9 @@ ..\BarcodeLib\bin\Debug\BarcodeLib.dll + + ..\BarcodeLibVBDatamatrix\bin\Debug\BarcodeLibVBDatamatrix.dll + ..\packages\BitMiracle.LibTiff.NET.2.4.649\lib\net40\BitMiracle.LibTiff.NET.dll diff --git a/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs b/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs index 57488d83..5c61a5cd 100644 --- a/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs +++ b/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs @@ -94,7 +94,7 @@ namespace DOCGEN.Generator else { Logging.Logging.Debug("Generate_Word_in_Office", "Init", dokumentid); - OnDocOffice.clsWordEdit oo = new OnDocOffice.clsWordEdit("", "",""); + OnDocOffice.clsWordEdit oo = new OnDocOffice.clsWordEdit("", "","",resturi,apikey); Logging.Logging.Debug("Generate_Word_in_Office", "Start", dokumentid); dok.dokument = oo.Generate_Word_in_Office(ref docdata, ref dok, dt.Rows[0][0].ToString(), connectionstring, tempdir, dokumentid, Apptype,Extension,OfficeSleep,Office_Fill_DocIO, vbfilemanagement); @@ -142,7 +142,7 @@ namespace DOCGEN.Generator //db.get_vorlage_to_file(db.dsdaten.Tables[0].Rows[0][1].ToString(),tempdir,dokumentid ); } - + public void generate_docdata(string dokumentid, ref clsDocData docdata) { @@ -159,11 +159,11 @@ namespace DOCGEN.Generator docValues.Add(dv); } clsDocValue dv1 = new clsDocValue(); - + docdata.DocValues = docValues; - db.Get_Tabledata("Select * from view_ER_Makros where dokumentid='" + dokumentid + "' order by reihenfolge",false,true); - ListdocMacros = new List(); + db.Get_Tabledata("Select * from view_ER_Makros where dokumentid='" + dokumentid + "' order by reihenfolge", false, true); + List docMacros = new List(); foreach (DataRow r in db.dsdaten.Tables[0].Rows) { clsDocMacro dm = new clsDocMacro(); @@ -172,7 +172,21 @@ namespace DOCGEN.Generator docMacros.Add(dm); } docdata.DocMacros = docMacros; + + //db.Get_Tabledata("Select * from OnDocTMFaksimile", false, true); + //List NameVornameTM = new List(); + //foreach (DataRow r in db.dsdaten.Tables[0].Rows) + //{ + // clsNameVOrnameTM clsNameVOrnameTM = new clsNameVOrnameTM(); + // clsNameVOrnameTM.TM = r[1].ToString().Trim(); + // clsNameVOrnameTM.FNKT = r[2].ToString().Trim(); + // NameVornameTM.Add(clsNameVOrnameTM); + + //} + //docdata.VornameNameTextmarken = NameVornameTM; + db = null; } + } diff --git a/DOCGEN/Klassen/SyncFWord.cs b/DOCGEN/Klassen/SyncFWord.cs index bfe0d430..c96e5eaf 100644 --- a/DOCGEN/Klassen/SyncFWord.cs +++ b/DOCGEN/Klassen/SyncFWord.cs @@ -16,6 +16,7 @@ using NLog; using Syncfusion.XlsIO.Implementation.XmlSerialization; using System.Security.Authentication.ExtendedProtection; using System.Drawing; +using System.Drawing.Drawing2D; using Syncfusion.XPS; using System.Xml.Linq; using System.Text.RegularExpressions; @@ -35,6 +36,8 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using static System.Net.Mime.MediaTypeNames; using System.Diagnostics; +using Database; +using System.Drawing.Drawing2D; @@ -274,16 +277,25 @@ namespace DOCGEN.Klassen { insert_ppfaktura(document, img_faktura); } + if (docdata.Form_ohne_Unterschrift=="True" || docdata.As_Faksimile == "True") + { + DB db = new DB(); + } foreach (clsDocValue dv in docdata.DocValues) { if (docdata.Form_ohne_Unterschrift == "True") { foreach (clsDocValue dv2 in docdata.DocValues) { - if (dv2.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") { dv2.Value = ""; } - if (dv2.TMBeginn.ToString() == "TGEDKVornameNameRechtsB99") { dv2.Value = ""; } - if (dv2.TMBeginn.ToString() == "TGEDKFunktionLinksB99") { dv2.Value = ""; } - if (dv2.TMBeginn.ToString() == "TGEDKFunktionRechtsB99") { dv2.Value = ""; } + + if (dv2.TMBeginn.ToString().Contains("VornameNameLinks")) { dv2.Value = ""; } + if (dv2.TMBeginn.ToString().Contains("VornameNameRechts")) { dv2.Value = ""; } + if (dv2.TMBeginn.ToString().Contains("TGEDKFunktionLinks")) { dv2.Value = ""; } + if (dv2.TMBeginn.ToString().Contains("FunktionRechts")) { dv2.Value = ""; } + //if (dv2.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") { dv2.Value = ""; } + //if (dv2.TMBeginn.ToString() == "TGEDKVornameNameRechtsB99") { dv2.Value = ""; } + //if (dv2.TMBeginn.ToString() == "TGEDKFunktionLinksB99") { dv2.Value = ""; } + //if (dv2.TMBeginn.ToString() == "TGEDKFunktionRechtsB99") { dv2.Value = ""; } } } if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() == "") @@ -291,20 +303,24 @@ namespace DOCGEN.Klassen try { BookmarksNavigator bookmarkNavigator = new BookmarksNavigator(document); - if ((dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99" || dv.TMBeginn.ToString() == "TGEDKVornameNameRechtsB99") && docdata.As_Faksimile == "True") + // if ((dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99" || dv.TMBeginn.ToString() == "TGEDKVornameNameRechtsB99") && docdata.As_Faksimile == "True") + if ((dv.TMBeginn.ToString().Contains("VornameNameLinks") || dv.TMBeginn.ToString().Contains("VornameNameRechts")) && docdata.As_Faksimile == "True") { string funktionlinks = ""; string funktionrechts = ""; foreach (clsDocValue dv2 in docdata.DocValues) { - if (dv2.TMBeginn.ToString()== "TGEDKFunktionLinksB99") { funktionlinks = dv2.Value.ToString(); } - if (dv2.TMBeginn.ToString() == "TGEDKFunktionRechtsB99") { funktionrechts = dv2.Value.ToString(); } + //if (dv2.TMBeginn.ToString() == "TGEDKFunktionLinksB99") { funktionlinks = dv2.Value.ToString(); } + //if (dv2.TMBeginn.ToString() == "TGEDKFunktionRechtsB99") { funktionrechts = dv2.Value.ToString(); } + if (dv2.TMBeginn.ToString().Contains("FunktionLinks")) { funktionlinks = dv2.Value.ToString(); } + if (dv2.TMBeginn.ToString().Contains("FunktionRecht")) { funktionrechts = dv2.Value.ToString(); } } bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); IWParagraph paragraph = new WParagraph(document); paragraph.AppendBreak(BreakType.LineBreak); - if (dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") + // if (dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") + if (dv.TMBeginn.ToString().Contains("VornameNameLinks")) { string unterschrift = ""; if (img_UL != "") { unterschrift = img_UL.ToString(); } else { @@ -337,7 +353,8 @@ namespace DOCGEN.Klassen //paragraph.AppendPicture(image); paragraph.AppendBreak(BreakType.LineBreak); paragraph.AppendText(dv.Value.ToString()); - if (dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") + //if (dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") + if (dv.TMBeginn.ToString().Contains("VornameNameLinks")) { paragraph.AppendBreak(BreakType.LineBreak); paragraph.AppendText(funktionlinks); @@ -355,8 +372,9 @@ namespace DOCGEN.Klassen } else { - if (docdata.As_Faksimile=="True" && (dv.TMBeginn.ToString() == "TGEDKFunktionLinksB99" || dv.TMBeginn.ToString() == "TGEDKFunktionRechtsB99")) - { + //if (docdata.As_Faksimile=="True" && (dv.TMBeginn.ToString() == "TGEDKFunktionLinksB99" || dv.TMBeginn.ToString() == "TGEDKFunktionRechtsB99")) + if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString().Contains("FunktionLinks") || dv.TMBeginn.ToString().Contains("FunktionRechts"))) + { } else @@ -685,6 +703,82 @@ namespace DOCGEN.Klassen } + private static System.Drawing.Image ResizeImage(System.Drawing.Image imgToResize, Size size) + { + // Get the image current width + int sourceWidth = imgToResize.Width; + // Get the image current height + int sourceHeight = imgToResize.Height; + float nPercent = 0; + float nPercentW = 0; + float nPercentH = 0; + // Calculate width and height with new desired size + nPercentW = ((float)size.Width / (float)sourceWidth); + nPercentH = ((float)size.Height / (float)sourceHeight); + nPercent = Math.Min(nPercentW, nPercentH); + // New Width and Height + int destWidth = (int)(sourceWidth * nPercent); + int destHeight = (int)(sourceHeight * nPercent); + Bitmap b = new Bitmap(destWidth, destHeight); + Graphics g = Graphics.FromImage((System.Drawing.Image)b); + g.InterpolationMode = InterpolationMode.HighQualityBicubic; + // Draw image with new width and height + g.DrawImage(imgToResize, 0, 0, destWidth, destHeight); + g.Dispose(); + return (System.Drawing.Image)b; + } + + public System.Drawing.Image AutoSizeImage(System.Drawing.Image oBitmap, int maxWidth, int maxHeight, bool bStretch = false) + { + + // Größenverhältnis der max. Dimension + float maxRatio = (float)(maxWidth / (double)maxHeight); + + // Bildgröße und aktuelles Größenverhältnis + int imgWidth = oBitmap.Width; + int imgHeight = oBitmap.Height; + float imgRatio = (float)(imgWidth / (double)imgHeight); + + // Bild anpassen? + if (imgWidth > maxWidth | imgHeight > maxHeight | bStretch) + { + if (imgRatio <= maxRatio) + { + // Größenverhältnis des Bildes ist kleiner als die + // maximale Größe, in der das Bild angezeigt werden kann. + // In diesem Fall muss die Bildbreite angepasst werden. + imgWidth = (int)Math.Round(imgWidth / (imgHeight / (double)maxHeight)); + imgHeight = maxHeight; + } + else + { + // Größenverhältnis des Bildes ist größer als die + // maximale Größe, in der das Bild angezeigt werden kann. + // In diesem Fall muss die Bildhöhe angepasst werden. + imgHeight = (int)Math.Round(imgHeight / (imgWidth / (double)maxWidth)); + imgWidth = maxWidth; + } + + // Bitmap-Objekt in der neuen Größe erstellen + var oImage = new Bitmap(imgWidth, imgHeight); + + // Bild interpolieren, damit die Qualität erhalten bleibt + using (Graphics g = Graphics.FromImage(oImage)) + { + g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic; + g.DrawImage(oBitmap, new System.Drawing.Rectangle(0, 0, imgWidth, imgHeight)); + } + + // neues Bitmap zurückgeben + return oImage; + } + else + { + // unverändertes Originalbild zurückgeben + return oBitmap; + } + } + public void Insert_Barcode(WordDocument document, clsDocData docData) { System.Drawing.Image barcodeimage; @@ -695,14 +789,21 @@ namespace DOCGEN.Klassen //int rotation = 0; //if (docData.barcode_horizontal == 0) { rotation = 270; } barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5, docData.Dokumentid.Substring(6, 16), docData.Dokumentid.Substring(6, 16)+docData.barcode_zusatz, docData.barcode_textposition, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize),0); + //barcodeimage = ScaleImage(barcodeimage, docData.barcode_width, docData.barcode_height); + //barcodeimage = resizeImage(barcodeimage, new Size(docData.barcode_width,docData.barcode_height)); + break; case "1": - + //BarcodeLibVBDatamatrix.MW6Datamatrix dm = new BarcodeLibVBDatamatrix.MW6Datamatrix(); + //dm.Generage_BarcodeImage(ref docData, @"h:\tssettings\edoka\"); + //barcodeimage = System.Drawing.Image.FromFile(@"h:\tssettings\edoka\a_" + docData.Dokumentid + ".png"); + //System.IO.File.Delete(@"h:\tssettings\edoka\a_" + docData.Dokumentid + ".png"); //barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAutoBest, docData.barcode_content, 4, 0, 0, "Left", docData.barcode_content, docData.barcode_font, docData.barcode_fontsize); barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAscii,docData.barcode_content, 6, 6, 0, "Right", docData.barcode_text+docData.barcode_zusatz, docData.Zusatz_Font, docData.Zusatz_FontSize); + barcodeimage = AutoSizeImage(barcodeimage, docData.barcode_width, docData.barcode_height, false); //barcodeimage= resizeImage(barcodeimage, new Size(docData.barcode_width, docData.barcode_height)); - barcodeimage = ScaleImage(barcodeimage, docData.barcode_width,docData.barcode_height); + //barcodeimage = ScaleImage(barcodeimage, docData.barcode_width,docData.barcode_height); //barcodeimage.Save(@"x:\bctest.png"); break; @@ -743,8 +844,8 @@ namespace DOCGEN.Klassen else { picture.Rotation = 0; - // picture.Height = docData.barcode_height; - // picture.Width = docData.barcode_width; + //picture.Height = docData.barcode_height; + //picture.Width = docData.barcode_width; picture.VerticalPosition = docData.barcode_top; ; picture.HorizontalPosition = docData.barcode_left; diff --git a/DOCGEN/bin/Debug/BarcodeLibVBDatamatrix.dll b/DOCGEN/bin/Debug/BarcodeLibVBDatamatrix.dll new file mode 100644 index 00000000..cbce2d9a Binary files /dev/null and b/DOCGEN/bin/Debug/BarcodeLibVBDatamatrix.dll differ diff --git a/DOCGEN/bin/Debug/BarcodeLibVBDatamatrix.pdb b/DOCGEN/bin/Debug/BarcodeLibVBDatamatrix.pdb new file mode 100644 index 00000000..bb332b00 Binary files /dev/null and b/DOCGEN/bin/Debug/BarcodeLibVBDatamatrix.pdb differ diff --git a/DOCGEN/bin/Debug/BarcodeLibVBDatamatrix.xml b/DOCGEN/bin/Debug/BarcodeLibVBDatamatrix.xml new file mode 100644 index 00000000..d71503a6 --- /dev/null +++ b/DOCGEN/bin/Debug/BarcodeLibVBDatamatrix.xml @@ -0,0 +1,26 @@ + + + + +BarcodeLibVBDatamatrix + + + + + + 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/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index 8ef9b4d7..f62a892e 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.dll and b/DOCGEN/bin/Debug/DOCGEN.dll differ diff --git a/DOCGEN/bin/Debug/DOCGEN.pdb b/DOCGEN/bin/Debug/DOCGEN.pdb index 3a5fe2fb..5d43d16f 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/bin/Debug/Model.dll b/DOCGEN/bin/Debug/Model.dll index 5177cf3e..dc7a1e44 100644 Binary files a/DOCGEN/bin/Debug/Model.dll and b/DOCGEN/bin/Debug/Model.dll differ diff --git a/DOCGEN/bin/Debug/Model.pdb b/DOCGEN/bin/Debug/Model.pdb index 532596f2..be84dcbc 100644 Binary files a/DOCGEN/bin/Debug/Model.pdb and b/DOCGEN/bin/Debug/Model.pdb differ diff --git a/DOCGEN/bin/Debug/OnDocOffice.dll b/DOCGEN/bin/Debug/OnDocOffice.dll index 2bc14d42..2dec0cce 100644 Binary files a/DOCGEN/bin/Debug/OnDocOffice.dll and b/DOCGEN/bin/Debug/OnDocOffice.dll differ diff --git a/DOCGEN/bin/Debug/OnDocOffice.pdb b/DOCGEN/bin/Debug/OnDocOffice.pdb index d7542cf7..20da657c 100644 Binary files a/DOCGEN/bin/Debug/OnDocOffice.pdb and b/DOCGEN/bin/Debug/OnDocOffice.pdb differ diff --git a/DOCGEN/bin/Debug/vbBarcodes.dll b/DOCGEN/bin/Debug/vbBarcodes.dll index f68e5af6..b5f44b4d 100644 Binary files a/DOCGEN/bin/Debug/vbBarcodes.dll and b/DOCGEN/bin/Debug/vbBarcodes.dll differ diff --git a/DOCGEN/bin/Debug/vbBarcodes.pdb b/DOCGEN/bin/Debug/vbBarcodes.pdb index f2800be8..0f6a4e0c 100644 Binary files a/DOCGEN/bin/Debug/vbBarcodes.pdb and b/DOCGEN/bin/Debug/vbBarcodes.pdb differ diff --git a/DOCGEN/obj/Debug/DOCGEN.csproj.FileListAbsolute.txt b/DOCGEN/obj/Debug/DOCGEN.csproj.FileListAbsolute.txt index 243db33b..75f963db 100644 --- a/DOCGEN/obj/Debug/DOCGEN.csproj.FileListAbsolute.txt +++ b/DOCGEN/obj/Debug/DOCGEN.csproj.FileListAbsolute.txt @@ -145,3 +145,6 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\vbBarcodes.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\vbBarcodes.pdb E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\vbBarcodes.xml E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\MW6.SDK.dll +E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\BarcodeLibVBDatamatrix.dll +E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\BarcodeLibVBDatamatrix.pdb +E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\BarcodeLibVBDatamatrix.xml diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index 8ef9b4d7..f62a892e 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.dll and b/DOCGEN/obj/Debug/DOCGEN.dll differ diff --git a/DOCGEN/obj/Debug/DOCGEN.pdb b/DOCGEN/obj/Debug/DOCGEN.pdb index 3a5fe2fb..5d43d16f 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.pdb and b/DOCGEN/obj/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DOCGEN/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e2293ba0..90e3c948 100644 Binary files a/DOCGEN/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/DOCGEN/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index 79e93e05..e0b505fc 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.CoreCompileInputs.cache b/DOCGEN/obj/Debug/DocGen.csproj.CoreCompileInputs.cache index 57307a73..39900709 100644 --- a/DOCGEN/obj/Debug/DocGen.csproj.CoreCompileInputs.cache +++ b/DOCGEN/obj/Debug/DocGen.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -b32ab343a38c6d5b916f80e7fd54b41a5746e818a83a14e1742d42fe6fea74dd +64d91d76f5c9148565f8e8a8e85a25d3cd803ce356667c8a8e39a9e5b7a30928 diff --git a/Database/bin/Debug/Model.dll b/Database/bin/Debug/Model.dll index 5177cf3e..dc7a1e44 100644 Binary files a/Database/bin/Debug/Model.dll and b/Database/bin/Debug/Model.dll differ diff --git a/Database/bin/Debug/Model.pdb b/Database/bin/Debug/Model.pdb index 532596f2..be84dcbc 100644 Binary files a/Database/bin/Debug/Model.pdb and b/Database/bin/Debug/Model.pdb differ diff --git a/Database/obj/Debug/Database.csproj.AssemblyReference.cache b/Database/obj/Debug/Database.csproj.AssemblyReference.cache index 869244d4..77ce4c45 100644 Binary files a/Database/obj/Debug/Database.csproj.AssemblyReference.cache and b/Database/obj/Debug/Database.csproj.AssemblyReference.cache differ diff --git a/Model/bin/Debug/Model.dll b/Model/bin/Debug/Model.dll index 5177cf3e..dc7a1e44 100644 Binary files a/Model/bin/Debug/Model.dll and b/Model/bin/Debug/Model.dll differ diff --git a/Model/bin/Debug/Model.pdb b/Model/bin/Debug/Model.pdb index 532596f2..be84dcbc 100644 Binary files a/Model/bin/Debug/Model.pdb and b/Model/bin/Debug/Model.pdb differ diff --git a/Model/clsDocData.cs b/Model/clsDocData.cs index 6db4f5da..ba1bdc73 100644 --- a/Model/clsDocData.cs +++ b/Model/clsDocData.cs @@ -73,10 +73,18 @@ namespace Model public List DocValues {get;set;} public List DocMacros { get; set; } + public List VornameNameTextmarken { get; set; } + public DataTable dokumentwerte { get; set; } } + public class clsNameVOrnameTM + { + public string TM { get; set; } + public string FNKT { get; set; } + } + public class clsDocValue { public string TMBeginn { get; set; } diff --git a/Model/obj/Debug/Model.dll b/Model/obj/Debug/Model.dll index 5177cf3e..dc7a1e44 100644 Binary files a/Model/obj/Debug/Model.dll and b/Model/obj/Debug/Model.dll differ diff --git a/Model/obj/Debug/Model.pdb b/Model/obj/Debug/Model.pdb index 532596f2..be84dcbc 100644 Binary files a/Model/obj/Debug/Model.pdb and b/Model/obj/Debug/Model.pdb differ diff --git a/OnDoc.sln b/OnDoc.sln index 5bc50bbb..8bb7d633 100644 --- a/OnDoc.sln +++ b/OnDoc.sln @@ -57,6 +57,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vorlagen_Viewer", "Vorlagen EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "vbBarcodes", "vbBarcodes\vbBarcodes.vbproj", "{B6B11226-AD5F-4FCD-8975-7F35531BC26E}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BarcodeLibVBDatamatrix", "BarcodeLibVBDatamatrix\BarcodeLibVBDatamatrix.vbproj", "{AB5C9C28-1ECC-4612-AA82-91CB77D83ACA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -159,6 +161,10 @@ Global {B6B11226-AD5F-4FCD-8975-7F35531BC26E}.Debug|Any CPU.Build.0 = Debug|Any CPU {B6B11226-AD5F-4FCD-8975-7F35531BC26E}.Release|Any CPU.ActiveCfg = Release|Any CPU {B6B11226-AD5F-4FCD-8975-7F35531BC26E}.Release|Any CPU.Build.0 = Release|Any CPU + {AB5C9C28-1ECC-4612-AA82-91CB77D83ACA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB5C9C28-1ECC-4612-AA82-91CB77D83ACA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB5C9C28-1ECC-4612-AA82-91CB77D83ACA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB5C9C28-1ECC-4612-AA82-91CB77D83ACA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/OnDocOffice/bin/Debug/Model.dll b/OnDocOffice/bin/Debug/Model.dll index 5177cf3e..dc7a1e44 100644 Binary files a/OnDocOffice/bin/Debug/Model.dll and b/OnDocOffice/bin/Debug/Model.dll differ diff --git a/OnDocOffice/bin/Debug/Model.pdb b/OnDocOffice/bin/Debug/Model.pdb index 532596f2..be84dcbc 100644 Binary files a/OnDocOffice/bin/Debug/Model.pdb and b/OnDocOffice/bin/Debug/Model.pdb differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.dll b/OnDocOffice/bin/Debug/OnDocOffice.dll index 2bc14d42..2dec0cce 100644 Binary files a/OnDocOffice/bin/Debug/OnDocOffice.dll and b/OnDocOffice/bin/Debug/OnDocOffice.dll differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.pdb b/OnDocOffice/bin/Debug/OnDocOffice.pdb index d7542cf7..20da657c 100644 Binary files a/OnDocOffice/bin/Debug/OnDocOffice.pdb and b/OnDocOffice/bin/Debug/OnDocOffice.pdb differ diff --git a/OnDocOffice/bin/Debug/vbBarcodes.dll b/OnDocOffice/bin/Debug/vbBarcodes.dll index f68e5af6..b5f44b4d 100644 Binary files a/OnDocOffice/bin/Debug/vbBarcodes.dll and b/OnDocOffice/bin/Debug/vbBarcodes.dll differ diff --git a/OnDocOffice/bin/Debug/vbBarcodes.pdb b/OnDocOffice/bin/Debug/vbBarcodes.pdb index f2800be8..0f6a4e0c 100644 Binary files a/OnDocOffice/bin/Debug/vbBarcodes.pdb and b/OnDocOffice/bin/Debug/vbBarcodes.pdb differ diff --git a/OnDocOffice/clsoffice.cs b/OnDocOffice/clsoffice.cs index 5373f257..4fde9d6a 100644 --- a/OnDocOffice/clsoffice.cs +++ b/OnDocOffice/clsoffice.cs @@ -21,6 +21,7 @@ using Syncfusion.DocIO.DLS; using System.IO; using Microsoft.VisualBasic; using System.Net.NetworkInformation; +using System.Net; namespace OnDocOffice @@ -34,6 +35,8 @@ namespace OnDocOffice Microsoft.Office.Interop.Excel.Application excel; Workbook workBook = null; + public string resturi = ""; + public string apikey = ""; public clsExcelEdit(string connectstring, string filename, string dokumentid) { @@ -218,23 +221,23 @@ namespace OnDocOffice int i2 = 0; for (i1 = 1; i1 < workBook.Names.Count; i1++) { - - string na = workBook.Names.Item(i1).NameLocal; - if (na.Substring(0, 7) == "TGEDKBC") - { - excel.Range[excel.Names.Item(na).NameLocal].Select(); - excel.ActiveCell.FormulaR1C1 = barcode; + + string na = workBook.Names.Item(i1).NameLocal; + if (na.Substring(0, 7) == "TGEDKBC") + { + excel.Range[excel.Names.Item(na).NameLocal].Select(); + excel.ActiveCell.FormulaR1C1 = barcode; try { excel.Selection.Characters.Font.Name = docdata.barcode_font; } catch { } - } - if (na.Substring(0, 7) == "TGEDKAR") - { - excel.Range[excel.Names.Item(na).NameLocal].Select(); - excel.ActiveCell.FormulaR1C1 = convert_excel(docdata.barcode_zusatz); - } + } + if (na.Substring(0, 7) == "TGEDKAR") + { + excel.Range[excel.Names.Item(na).NameLocal].Select(); + excel.ActiveCell.FormulaR1C1 = convert_excel(docdata.barcode_zusatz); + } } } @@ -245,7 +248,7 @@ namespace OnDocOffice string b64 = fh.Base64FromFile(filename); excel.Workbooks.Open(filename); - excel.Visible= true; + excel.Visible = true; excel = null; Logging.Logging.Debug("Generierung abgeschlossen", "clsOffice", dokumentid); return b64; @@ -266,13 +269,17 @@ namespace OnDocOffice Microsoft.Office.Interop.Word.Document worddoc; Document doc = null; + public string resturi = ""; + public string apikey = ""; + - public clsWordEdit(string connectstring, string filename, string dokumentid) + public clsWordEdit(string connectstring, string filename, string dokumentid, string resturi, string apikey) { this.connectstring = connectstring; this.filename = filename; this.dokumentid = dokumentid; - + this.resturi = resturi; + this.apikey = apikey; } public bool Start_Application() { @@ -284,8 +291,8 @@ namespace OnDocOffice word = (Microsoft.Office.Interop.Word.Application)Interaction.CreateObject("Word.Application"); //word = new Microsoft.Office.Interop.Word.Application(); - word.Run("Autoexec"); - word.NormalTemplate.Saved = true; + word.Run("Autoexec"); + word.NormalTemplate.Saved = true; return true; } catch @@ -294,7 +301,7 @@ namespace OnDocOffice } } - + public void Edit_Document(bool runmacros) { Start_Application(); @@ -346,23 +353,24 @@ namespace OnDocOffice if (db.dsdaten.Tables[0].Rows.Count > 0) { word.Visible = true; word.Activate(); } foreach (DataRow dr in db.dsdaten.Tables[0].Rows) { - try { - if (dr[0].ToString() == "DokumentSchuetzen") - { - worddoc.Range(0, 0).Select(); - worddoc.Protect(Type: Microsoft.Office.Interop.Word.WdProtectionType.wdAllowOnlyFormFields, NoReset: true, Password: "Australia"); - } try { - word.Run(dr[0].ToString()); - } - catch (Exception e) { string a = e.Message; } + if (dr[0].ToString() == "DokumentSchuetzen") + { + worddoc.Range(0, 0).Select(); + worddoc.Protect(Type: Microsoft.Office.Interop.Word.WdProtectionType.wdAllowOnlyFormFields, NoReset: true, Password: "Australia"); + } + try + { + word.Run(dr[0].ToString()); + } + catch (Exception e) { string a = e.Message; } } catch { } } } - public void Word_Compatibility_Mode (ref WordDocument wd) + public void Word_Compatibility_Mode(ref WordDocument wd) { CompatibilityMode compatibilityMode = wd.Settings.CompatibilityMode; var formattype_original = wd.ActualFormatType; @@ -375,11 +383,12 @@ namespace OnDocOffice wd.Settings.CompatibilityMode = CompatibilityMode.Word2013; break; default: -// wd.Settings.CompatibilityMode = CompatibilityMode.Word2003; + // wd.Settings.CompatibilityMode = CompatibilityMode.Word2003; break; } } - private void get_bookmakrs(string file, ref clsDocData ddata) { + private void get_bookmakrs(string file, ref clsDocData ddata) + { MemoryStream ms = new MemoryStream(Helper.EncodeExtensions.DecodeBase642ByteArray(file)); WordDocument document = new WordDocument(ms, FormatType.Automatic); //List bookmarks = new List(); @@ -406,7 +415,7 @@ namespace OnDocOffice //} ms = null; } - private string set_cmode(string file) + private string set_cmode(string file) { string formattype = ""; MemoryStream ms = new MemoryStream(Helper.EncodeExtensions.DecodeBase642ByteArray(file)); @@ -428,7 +437,7 @@ namespace OnDocOffice // break; //} MemoryStream destms = new MemoryStream(); - document.Save(destms,formattype_original); + document.Save(destms, formattype_original); document.Close(); document.Dispose(); @@ -459,16 +468,16 @@ namespace OnDocOffice } Helper.clsFileHelper fh = new Helper.clsFileHelper(); - + //vorlage = fh.Base64FromFile(filename); //vorlage = set_cmode(vorlage); fh.SaveBase64ToFile(vorlage, filename); - get_bookmakrs(fh.Base64FromFile(filename),ref docdata); + get_bookmakrs(fh.Base64FromFile(filename), ref docdata); Logging.Logging.Debug("Generate_Word_in_Office", "clsOffice", dokumentid); dialogGenerate.set_progress(20); Start_Application(); - + // Thread.Sleep(OfficeSleep); worddoc = word.Documents.Open(filename); @@ -581,7 +590,7 @@ namespace OnDocOffice Kopfzeile_generieren(); } //word.Visible = false; - dialogGenerate.set_progress(40); + dialogGenerate.set_progress(40); //word.ScreenUpdating = false; if (bookmarks_docio == 1) { @@ -592,28 +601,28 @@ namespace OnDocOffice } else { - - + + float progressstep = 1; try { float b = 60; - progressstep = b/ (float)docdata.DocValues.Count(); + progressstep = b / (float)docdata.DocValues.Count(); } catch { - + } foreach (clsDocValue dv in docdata.DocValues) { - + try { if (dv.TMBeginn.ToString() == "TGEDKCursor" || dv.TMBeginn.ToString() == "TGEDKCursorB" || dv.FieldName.ToString() == "TGEDKCursor" || dv.FieldName.ToString() == "TGEDKCursorB") { cursorpositionieren = true; } } catch { } -// Logging.Logging.Debug(dv.TMBeginn.ToString() + " / " + dv.TMEnd.ToString(), dv.Value.ToString(), dokumentid); + // Logging.Logging.Debug(dv.TMBeginn.ToString() + " / " + dv.TMEnd.ToString(), dv.Value.ToString(), dokumentid); dialogGenerate.add_progress((int)progressstep); if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() == "") { @@ -621,7 +630,7 @@ namespace OnDocOffice try { - //Logging.Logging.Debug(dv.TMBeginn.ToString() ,"Select" , dokumentid); + Logging.Logging.Debug(dv.TMBeginn.ToString(), "Select", dokumentid); worddoc.Bookmarks[dv.TMBeginn.ToString()].Select(); //Logging.Logging.Debug(dv.TMBeginn.ToString(), "Select-End", dokumentid); word.Selection.Text = dv.Value.ToString(); @@ -629,7 +638,7 @@ namespace OnDocOffice //pos = worddoc.Bookmarks[dv.TMBeginn.ToString()].Start; //pos2 = word.Selection.End; - // Logging.Logging.Debug(dv.TMBeginn.ToString(), "Selection-End", dokumentid); + // Logging.Logging.Debug(dv.TMBeginn.ToString(), "Selection-End", dokumentid); //------------------------------ if (dv.TMBeginn.ToString().Substring(0, 19) == "XTGEDKDirektTelefonB" || @@ -727,10 +736,11 @@ namespace OnDocOffice catch { } } word.Visible = true; + word.Activate(); Logging.Logging.Debug("Start Macros", "clsOffice", dokumentid); run_macros(ref docdata, connectionstring); - + worddoc.Save(); Logging.Logging.Debug("Word Saved", "clsOffice", dokumentid); @@ -748,7 +758,7 @@ namespace OnDocOffice dialogGenerate.Close(); dialogGenerate.Dispose(); return b64; - + //return fh.Base64FromFile(filename); } @@ -897,9 +907,9 @@ namespace OnDocOffice } private void Generate_Barcodes(ref clsDocData docdata, string tempdir) { - Logging.Logging.Debug("Barcode genererien start","OnDoc clsOffice",dokumentid); + Logging.Logging.Debug("Barcode genererien start", "OnDoc clsOffice", dokumentid); vbBarcodes.vbarcodes vbcode = new vbBarcodes.vbarcodes(); - vbcode.GenerateBarcodes(ref word, ref docdata, connectstring,tempdir); + vbcode.GenerateBarcodes(ref word, ref docdata, connectstring, tempdir); vbcode = null; Logging.Logging.Debug("Barcode genererien Ende", "OnDoc clsOffice", dokumentid); return; @@ -919,7 +929,8 @@ namespace OnDocOffice { word.Selection.GoTo(What: Microsoft.Office.Interop.Word.WdGoToItem.wdGoToPage, xname); } - catch (Exception e) { + catch (Exception e) + { Logging.Logging.Debug("Word GotoPage " + xname + " " + e.Message, "OnDoc clsOffice", dokumentid); } HeaderFooterAnzeigen(); @@ -946,7 +957,7 @@ namespace OnDocOffice //return; } - + word.Selection.HeaderFooter.Shapes.AddTextbox(Microsoft.Office.Core.MsoTextOrientation.msoTextOrientationHorizontal, docdata.barcode_left, docdata.barcode_top, docdata.barcode_width, docdata.barcode_height).Select(); @@ -1041,7 +1052,34 @@ namespace OnDocOffice public string get_unterschrift(string input) { - return ""; + + string URL = resturi + "API/GetUnterschriftAsBase64ByMitarbeiternr?MaNr=" + input; + + HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest; + webRequest.Method = WebRequestMethods.Http.Get; + webRequest.Headers["Authorization"] = "Bearer " + apikey; + try + { + using (HttpWebResponse response = webRequest.GetResponse() as HttpWebResponse) + { + if (response.StatusCode == HttpStatusCode.OK) + { + StreamReader reader = new StreamReader(response.GetResponseStream()); + string responseContent = reader.ReadToEnd(); + + return responseContent; + } + else + { + Logging.Logging.Error(URL + ": " + response.StatusCode.ToString() + " / " + response.StatusDescription, "Clinet - DokList GetDocument", ""); + return ""; + } + } + } + catch (Exception ex) + { + return ""; + } } public void Replace_Text(ref WordDocument wordDocument, string TextToReplace, string NewText) { @@ -1119,12 +1157,21 @@ namespace OnDocOffice { if (docdata.Form_ohne_Unterschrift == "True") { + foreach (clsDocValue dv2 in docdata.DocValues) { - if (dv2.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") { dv2.Value = ""; } - if (dv2.TMBeginn.ToString() == "TGEDKVornameNameRechtsB99") { dv2.Value = ""; } - if (dv2.TMBeginn.ToString() == "TGEDKFunktionLinksB99") { dv2.Value = ""; } - if (dv2.TMBeginn.ToString() == "TGEDKFunktionRechtsB99") { dv2.Value = ""; } + if (dv2.TMBeginn.ToString().Contains("VornameNameLinks")) { dv2.Value = ""; } + if (dv2.TMBeginn.ToString().Contains("VornameNameRechts")) { dv2.Value = ""; } + if (dv2.TMBeginn.ToString().Contains("TGEDKFunktionLinks")) { dv2.Value = ""; } + if (dv2.TMBeginn.ToString().Contains("FunktionRechts")) { dv2.Value = ""; } + //clsNameVOrnameTM tm = docdata.VornameNameTextmarken.Find(x => x.TM == dv2.TMBeginn.ToString()); + //if (tm != null) { + // dv2.Value = ""; + // } + //if (dv2.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") { dv2.Value = ""; } + //if (dv2.TMBeginn.ToString() == "TGEDKVornameNameRechtsB99") { dv2.Value = ""; } + //if (dv2.TMBeginn.ToString() == "TGEDKFunktionLinksB99") { dv2.Value = ""; } + //if (dv2.TMBeginn.ToString() == "TGEDKFunktionRechtsB99") { dv2.Value = ""; } } } if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() == "") @@ -1132,20 +1179,27 @@ namespace OnDocOffice try { BookmarksNavigator bookmarkNavigator = new BookmarksNavigator(document); - if ((dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99" || dv.TMBeginn.ToString() == "TGEDKVornameNameRechtsB99") && docdata.As_Faksimile == "True") + + + // if ((dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99" || dv.TMBeginn.ToString() == "TGEDKVornameNameRechtsB99") && docdata.As_Faksimile == "True") + if ((dv.TMBeginn.ToString().Contains("VornameNameLinks") || dv.TMBeginn.ToString().Contains("VornameNameRechts")) && docdata.As_Faksimile == "True") { + Logging.Logging.Debug(dv.TMBeginn.ToString() + " / " + dv.Value.ToString(), "clsOffice", ""); string funktionlinks = ""; string funktionrechts = ""; foreach (clsDocValue dv2 in docdata.DocValues) { - if (dv2.TMBeginn.ToString() == "TGEDKFunktionLinksB99") { funktionlinks = dv2.Value.ToString(); } - if (dv2.TMBeginn.ToString() == "TGEDKFunktionRechtsB99") { funktionrechts = dv2.Value.ToString(); } + //if (dv2.TMBeginn.ToString() == "TGEDKFunktionLinksB99") { funktionlinks = dv2.Value.ToString(); } + //if (dv2.TMBeginn.ToString() == "TGEDKFunktionRechtsB99") { funktionrechts = dv2.Value.ToString(); } + if (dv2.TMBeginn.ToString().Contains("FunktionLinks")) { funktionlinks = dv2.Value.ToString(); } + if (dv2.TMBeginn.ToString().Contains("FunktionRecht")) { funktionrechts = dv2.Value.ToString(); } } bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); IWParagraph paragraph = new WParagraph(document); paragraph.AppendBreak(BreakType.LineBreak); - if (dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") + // if (dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") + if (dv.TMBeginn.ToString().Contains("VornameNameLinks")) { string unterschrift = ""; if (img_UL != "") { unterschrift = img_UL.ToString(); } @@ -1184,7 +1238,8 @@ namespace OnDocOffice //paragraph.AppendPicture(image); paragraph.AppendBreak(BreakType.LineBreak); paragraph.AppendText(dv.Value.ToString()); - if (dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") + //if (dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99") + if (dv.TMBeginn.ToString().Contains("VornameNameLinks")) { paragraph.AppendBreak(BreakType.LineBreak); paragraph.AppendText(funktionlinks); @@ -1202,7 +1257,8 @@ namespace OnDocOffice } else { - if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString() == "TGEDKFunktionLinksB99" || dv.TMBeginn.ToString() == "TGEDKFunktionRechtsB99")) +// if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString() == "TGEDKFunktionLinksB99" || dv.TMBeginn.ToString() == "TGEDKFunktionRechtsB99")) + if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString().Contains("FunktionLinks") || dv.TMBeginn.ToString().Contains("FunktionRechts"))) { } @@ -1212,13 +1268,13 @@ namespace OnDocOffice bookmark = document.Bookmarks.FindByName(dv.TMBeginn.ToString()); if (bookmark != null) { - bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString(),true,false); + bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString(), true, false); bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); bookmarkNavigator.InsertText(dv.Value.ToString()); - bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(),true); + bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); //TextBodyPart bookmarkContent = bookmarkNavigator.GetBookmarkContent(); //string bookmarkText = ((Syncfusion.DocIO.DLS.WParagraph)bookmarkContent.BodyItems.FirstItem).Text; - + } } diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index 514ca5be..bfb10122 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.dll b/OnDocOffice/obj/Debug/OnDocOffice.dll index 2bc14d42..2dec0cce 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.dll and b/OnDocOffice/obj/Debug/OnDocOffice.dll differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.pdb b/OnDocOffice/obj/Debug/OnDocOffice.pdb index d7542cf7..20da657c 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.pdb and b/OnDocOffice/obj/Debug/OnDocOffice.pdb differ diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs index 383158b1..bc60c4e5 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3b0a2b05270204d0d7f1de494a4135e56bfd4d28")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd4598e4a8c105bac7401af843b66bf50f9b6c17")] [assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache index 81665578..57ba2799 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache @@ -1 +1 @@ -9b78cd272674f9df31dddfd8bae3f58852e0abc654f63100c50d5235b8c5b48c +3fe68515a6b5321b50da60ef6318d743a3577e4625150456fd959bc44c5a01e1 diff --git a/vbBarcodes/Class1.vb b/vbBarcodes/Class1.vb index ba0027c2..9a3a2b5e 100644 --- a/vbBarcodes/Class1.vb +++ b/vbBarcodes/Class1.vb @@ -4,6 +4,7 @@ Imports Model Imports System.Drawing Imports Database Imports System.Runtime.CompilerServices +Imports System.Net Public Class vbarcodes @@ -91,6 +92,9 @@ Public Class vbarcodes Textboxesi = Textboxesi + 1 objWord.ActiveWindow.ActivePane.View.SeekView = Microsoft.Office.Interop.Word.WdSeekView.wdSeekMainDocument Next i + If docdata.barcode_type <> 0 Then + System.IO.File.Delete(Temppath + "\a_" + docdata.Dokumentid.ToString + ".png") + End If End Sub Sub Insert_Datamatrix() Dim Form @@ -132,7 +136,7 @@ Public Class vbarcodes End Select Form = Nothing - System.IO.File.Delete(Temppath + "\a_" + docdata.Dokumentid.ToString + ".png") + Exit Sub Catch ex As Exception End Try diff --git a/vbBarcodes/bin/Debug/Database.dll b/vbBarcodes/bin/Debug/Database.dll index 1f891a40..4bb6fc56 100644 Binary files a/vbBarcodes/bin/Debug/Database.dll and b/vbBarcodes/bin/Debug/Database.dll differ diff --git a/vbBarcodes/bin/Debug/Database.pdb b/vbBarcodes/bin/Debug/Database.pdb index 5f30b546..9150410f 100644 Binary files a/vbBarcodes/bin/Debug/Database.pdb and b/vbBarcodes/bin/Debug/Database.pdb differ diff --git a/vbBarcodes/bin/Debug/Model.dll b/vbBarcodes/bin/Debug/Model.dll index 5177cf3e..dc7a1e44 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 532596f2..be84dcbc 100644 Binary files a/vbBarcodes/bin/Debug/Model.pdb and b/vbBarcodes/bin/Debug/Model.pdb differ diff --git a/vbBarcodes/bin/Debug/vbBarcodes.dll b/vbBarcodes/bin/Debug/vbBarcodes.dll index f68e5af6..b5f44b4d 100644 Binary files a/vbBarcodes/bin/Debug/vbBarcodes.dll and b/vbBarcodes/bin/Debug/vbBarcodes.dll differ diff --git a/vbBarcodes/bin/Debug/vbBarcodes.pdb b/vbBarcodes/bin/Debug/vbBarcodes.pdb index f2800be8..0f6a4e0c 100644 Binary files a/vbBarcodes/bin/Debug/vbBarcodes.pdb and b/vbBarcodes/bin/Debug/vbBarcodes.pdb differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.dll b/vbBarcodes/obj/Debug/vbBarcodes.dll index f68e5af6..b5f44b4d 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.dll and b/vbBarcodes/obj/Debug/vbBarcodes.dll differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.pdb b/vbBarcodes/obj/Debug/vbBarcodes.pdb index f2800be8..0f6a4e0c 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.pdb and b/vbBarcodes/obj/Debug/vbBarcodes.pdb differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache index de0ccbd1..289621eb 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache and b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache differ