diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll
index 3cbd1837..c1d4f4f1 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 d3ccad5c..670cfa5e 100644
Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ
diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt
index a917ba5a..ee819be8 100644
--- a/API_NetFramework/log.txt
+++ b/API_NetFramework/log.txt
@@ -6797,3 +6797,503 @@ done
2025-03-27 11:51:30.7036|DEBUG|OnDoc|Start Transfer to OnBase
2025-03-27 11:51:30.7036|DEBUG|OnDoc|Ende Transfer to OnBase
2025-03-27 11:51:30.7267|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000208_20250327115130.json.pdf
+2025-04-08 14:10:52.9778|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002492156
+2025-04-08 14:10:53.0131|DEBUG|OnDoc|
+2025-04-08 14:10:53.0399|DEBUG|OnDoc|
+2025-04-08 14:10:53.0429|DEBUG|OnDoc|
+2025-04-08 14:10:53.0429|DEBUG|OnDoc|
+2025-04-08 14:10:53.0429|DEBUG|OnDoc|
+2025-04-08 14:10:53.2899|DEBUG|OnDoc|
+2025-04-08 14:10:53.2929|DEBUG|OnDoc|
+2025-04-08 14:10:53.2929|DEBUG|OnDoc|
+2025-04-08 14:10:54.5001|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-08 14:10:55.5832|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-08 14:10:55.5976|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002492156
+2025-04-08 14:10:55.5976|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002492156
+2025-04-08 14:10:55.6097|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002492156
+2025-04-08 14:10:55.6097|DEBUG|OnDoc|
+2025-04-08 14:10:55.6097|DEBUG|OnDoc|
+2025-04-08 14:10:55.6097|DEBUG|OnDoc|
+2025-04-08 14:10:55.6607|DEBUG|OnDoc|
+2025-04-08 14:10:55.6607|DEBUG|OnDoc|
+2025-04-08 14:10:55.6607|DEBUG|OnDoc|
+2025-04-08 14:10:55.6607|DEBUG|OnDoc|
+2025-04-08 14:10:55.6607|DEBUG|OnDoc|
+2025-04-08 14:10:55.6807|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-08 14:10:55.6898|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-08 14:10:55.6898|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000208_20250408021055.json.pdf
+2025-04-09 07:02:38.9763|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002493961
+2025-04-09 07:02:39.0058|DEBUG|OnDoc|
+2025-04-09 07:02:39.0308|DEBUG|OnDoc|
+2025-04-09 07:02:39.0308|DEBUG|OnDoc|
+2025-04-09 07:02:39.0308|DEBUG|OnDoc|
+2025-04-09 07:02:39.0308|DEBUG|OnDoc|OFFEDK0082025002493961 ErstellungInOffec - EDKB02DMS
+2025-04-09 07:02:39.0308|DEBUG|OnDoc|
+2025-04-09 07:02:39.0518|DEBUG|OnDoc|
+2025-04-09 07:02:39.0518|INFO|OnDoc|Dokumentarchivierung via EDKB02_DMS ausgelöstOFFEDK0082025002493961
+2025-04-12 15:49:24.4512|DEBUG|OnDoc|Start ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002493984
+2025-04-12 15:49:24.4942|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-12 15:49:24.6874|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-12 15:49:24.7209|DEBUG|OnDoc|Start Update IL_Log: DokumentID:SB_139_0
+2025-04-12 15:49:24.7368|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:SB_139_0
+2025-04-12 15:49:24.7368|DEBUG|OnDoc|Ende ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002493984
+2025-04-12 15:49:24.8300|DEBUG|OnDoc|Start ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002494008
+2025-04-12 15:49:24.8300|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-12 15:49:24.8477|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-12 15:49:24.8623|DEBUG|OnDoc|Start Update IL_Log: DokumentID:SB_139_1
+2025-04-12 15:49:24.8707|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:SB_139_1
+2025-04-12 15:49:24.8707|DEBUG|OnDoc|Ende ArchivSBDoc DokumentID: DokumentID:OFFEDK0082025002494008
+2025-04-12 19:04:14.8196|INFO|OnDoc|Image-Bezug: 1
+2025-04-13 09:13:19.7483|DEBUG|OnDoc|
+2025-04-13 09:13:19.7798|DEBUG|OnDoc|
+2025-04-13 09:13:19.7798|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:19.9110|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:19.9110|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:19.9211|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:20.0562|DEBUG|OnDoc|
+2025-04-13 09:13:20.0562|DEBUG|OnDoc|
+2025-04-13 09:13:20.0562|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:20.0876|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:20.0876|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:20.0876|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:20.0876|DEBUG|OnDoc|
+2025-04-13 09:13:20.0876|DEBUG|OnDoc|
+2025-04-13 09:13:20.1031|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:20.1402|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:20.1402|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:20.1402|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:20.1402|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:20.1552|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:20.1552|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000208_20250413091320.json.pdf
+2025-04-13 09:13:22.6213|DEBUG|OnDoc|
+2025-04-13 09:13:22.6213|DEBUG|OnDoc|
+2025-04-13 09:13:22.6213|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:22.6548|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:22.6548|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:22.6548|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:22.6660|DEBUG|OnDoc|
+2025-04-13 09:13:22.6660|DEBUG|OnDoc|
+2025-04-13 09:13:22.6660|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:22.6890|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:22.6890|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:22.6985|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:22.6985|DEBUG|OnDoc|
+2025-04-13 09:13:22.6985|DEBUG|OnDoc|
+2025-04-13 09:13:22.6985|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:22.7542|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:22.7542|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:22.7629|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:22.7629|DEBUG|OnDoc|
+2025-04-13 09:13:22.7629|DEBUG|OnDoc|
+2025-04-13 09:13:22.7629|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:22.8040|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:22.8070|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:22.8070|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:22.8070|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:22.8070|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:22.8241|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000209_20250413091322.json.pdf
+2025-04-13 09:13:37.5197|DEBUG|OnDoc|
+2025-04-13 09:13:37.5323|DEBUG|OnDoc|
+2025-04-13 09:13:37.5323|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:37.5561|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:37.5561|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:37.5561|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:37.5561|DEBUG|OnDoc|
+2025-04-13 09:13:37.5561|DEBUG|OnDoc|
+2025-04-13 09:13:37.5561|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:37.5856|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:37.5872|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:37.5872|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:37.5872|DEBUG|OnDoc|
+2025-04-13 09:13:37.5872|DEBUG|OnDoc|
+2025-04-13 09:13:37.6037|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:37.6414|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:37.6414|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:37.6414|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:37.6497|DEBUG|OnDoc|
+2025-04-13 09:13:37.6497|DEBUG|OnDoc|
+2025-04-13 09:13:37.6497|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:37.7135|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:37.7135|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:37.7135|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:37.7135|DEBUG|OnDoc|
+2025-04-13 09:13:37.7135|DEBUG|OnDoc|
+2025-04-13 09:13:37.7135|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:37.7634|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:37.7634|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:37.7634|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:37.7634|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:37.7772|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:37.7772|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000208_20250413091337.json.pdf
+2025-04-13 09:13:39.8737|DEBUG|OnDoc|
+2025-04-13 09:13:39.8850|DEBUG|OnDoc|
+2025-04-13 09:13:39.8850|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:39.9010|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:39.9010|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:39.9010|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:39.9010|DEBUG|OnDoc|
+2025-04-13 09:13:39.9010|DEBUG|OnDoc|
+2025-04-13 09:13:39.9010|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:39.9246|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:39.9246|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:39.9322|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:39.9322|DEBUG|OnDoc|
+2025-04-13 09:13:39.9322|DEBUG|OnDoc|
+2025-04-13 09:13:39.9322|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:39.9717|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:39.9717|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:39.9787|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:39.9787|DEBUG|OnDoc|
+2025-04-13 09:13:39.9787|DEBUG|OnDoc|
+2025-04-13 09:13:39.9787|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:40.0207|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:40.0207|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:40.0274|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:40.0274|DEBUG|OnDoc|
+2025-04-13 09:13:40.0274|DEBUG|OnDoc|
+2025-04-13 09:13:40.0274|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:40.0680|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:40.0680|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:40.0746|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:13:40.0746|DEBUG|OnDoc|
+2025-04-13 09:13:40.0746|DEBUG|OnDoc|
+2025-04-13 09:13:40.0746|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:40.1150|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:40.1150|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:40.1219|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:13:40.1219|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:13:40.1219|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:13:40.1219|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000209_20250413091340.json.pdf
+2025-04-13 09:15:29.5232|DEBUG|OnDoc|
+2025-04-13 09:15:29.5590|DEBUG|OnDoc|
+2025-04-13 09:15:29.5590|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:29.5806|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:29.5806|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:29.5892|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:36.4470|DEBUG|OnDoc|
+2025-04-13 09:15:36.4839|DEBUG|OnDoc|
+2025-04-13 09:15:36.4839|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:36.5001|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:36.5001|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:36.5001|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:36.5095|DEBUG|OnDoc|
+2025-04-13 09:15:36.5095|DEBUG|OnDoc|
+2025-04-13 09:15:36.5095|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:36.6117|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:36.6211|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:36.6211|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:36.6211|DEBUG|OnDoc|
+2025-04-13 09:15:36.6211|DEBUG|OnDoc|
+2025-04-13 09:15:36.6382|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:36.6757|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:36.6757|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:36.6817|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:36.6817|DEBUG|OnDoc|
+2025-04-13 09:15:36.6817|DEBUG|OnDoc|
+2025-04-13 09:15:36.6817|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:36.7368|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:36.7368|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:36.7452|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:36.7452|DEBUG|OnDoc|
+2025-04-13 09:15:36.7452|DEBUG|OnDoc|
+2025-04-13 09:15:36.7452|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:36.7918|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:36.7918|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:36.7918|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:36.7918|DEBUG|OnDoc|
+2025-04-13 09:15:36.7918|DEBUG|OnDoc|
+2025-04-13 09:15:36.8074|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:36.8464|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:36.8464|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:36.8541|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:36.8541|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:36.8541|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:36.8684|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000208_20250413091536.json.pdf
+2025-04-13 09:15:39.7878|DEBUG|OnDoc|
+2025-04-13 09:15:39.7977|DEBUG|OnDoc|
+2025-04-13 09:15:39.7977|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:39.8112|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:39.8112|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:39.8112|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:39.8112|DEBUG|OnDoc|
+2025-04-13 09:15:39.8217|DEBUG|OnDoc|
+2025-04-13 09:15:39.8217|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:39.8217|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:39.8217|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:39.8417|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:39.8417|DEBUG|OnDoc|
+2025-04-13 09:15:39.8417|DEBUG|OnDoc|
+2025-04-13 09:15:39.8417|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:39.8844|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:39.8844|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:39.8844|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:39.8844|DEBUG|OnDoc|
+2025-04-13 09:15:39.8844|DEBUG|OnDoc|
+2025-04-13 09:15:39.8844|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:39.9313|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:39.9313|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:39.9313|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:39.9313|DEBUG|OnDoc|
+2025-04-13 09:15:39.9313|DEBUG|OnDoc|
+2025-04-13 09:15:39.9313|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:40.0232|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:40.0321|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:40.0321|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:40.0421|DEBUG|OnDoc|
+2025-04-13 09:15:40.0421|DEBUG|OnDoc|
+2025-04-13 09:15:40.0421|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:40.1037|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:40.1037|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:40.1037|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:40.1037|DEBUG|OnDoc|
+2025-04-13 09:15:40.1037|DEBUG|OnDoc|
+2025-04-13 09:15:40.1037|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:40.1548|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:40.1548|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:40.1548|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:15:40.1548|DEBUG|OnDoc|
+2025-04-13 09:15:40.1548|DEBUG|OnDoc|
+2025-04-13 09:15:40.1680|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:40.1990|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:40.1990|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:40.1990|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:15:40.1990|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:15:40.2122|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:15:40.2122|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000209_20250413091540.json.pdf
+2025-04-13 09:17:02.2205|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013
+2025-04-13 09:17:02.2575|DEBUG|OnDoc|
+2025-04-13 09:17:02.2925|DEBUG|OnDoc|
+2025-04-13 09:17:02.3075|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:17:05.6136|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494037
+2025-04-13 09:17:05.6494|DEBUG|OnDoc|
+2025-04-13 09:17:05.6869|DEBUG|OnDoc|
+2025-04-13 09:17:05.7000|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:17:08.1806|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013 - 1000208 - , Weinfelden
+2025-04-13 09:17:08.1897|DEBUG|OnDoc|
+2025-04-13 09:17:08.2166|DEBUG|OnDoc|
+2025-04-13 09:17:08.2286|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:17:10.3904|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494037 - 1000209 - Hungerbühler Remo u/o Haltmann Tim u/o Rüsi Patrick, Fritschen
+2025-04-13 09:17:10.3999|DEBUG|OnDoc|
+2025-04-13 09:17:10.4341|DEBUG|OnDoc|
+2025-04-13 09:17:10.4341|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:17:17.7047|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013 - 1000208 - , Weinfelden
+2025-04-13 09:17:17.7397|DEBUG|OnDoc|
+2025-04-13 09:17:17.7681|DEBUG|OnDoc|
+2025-04-13 09:17:17.7801|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:17:19.4333|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494037 - 1000209 - Hungerbühler Remo u/o Haltmann Tim u/o Rüsi Patrick, Fritschen
+2025-04-13 09:17:19.4333|DEBUG|OnDoc|
+2025-04-13 09:17:19.4683|DEBUG|OnDoc|
+2025-04-13 09:17:19.4793|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:17:20.9116|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013 - 1000208 - , Weinfelden
+2025-04-13 09:17:20.9210|DEBUG|OnDoc|
+2025-04-13 09:17:20.9522|DEBUG|OnDoc|
+2025-04-13 09:17:20.9656|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:17:44.2864|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494037 - 1000209 - Hungerbühler Remo u/o Haltmann Tim u/o Rüsi Patrick, Fritschen
+2025-04-13 09:17:48.7833|DEBUG|OnDoc|
+2025-04-13 09:17:48.8523|DEBUG|OnDoc|
+2025-04-13 09:17:52.1315|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:18:04.6793|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013 - 1000208 - , Weinfelden
+2025-04-13 09:18:04.7148|DEBUG|OnDoc|
+2025-04-13 09:18:05.1671|DEBUG|OnDoc|
+2025-04-13 09:18:05.1991|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:18:05.1991|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:18:07.1556|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:18:07.6015|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000208_20250413091807.json.pdf
+2025-04-13 09:18:37.2047|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013
+2025-04-13 09:18:37.2405|DEBUG|OnDoc|
+2025-04-13 09:18:37.2820|DEBUG|OnDoc|
+2025-04-13 09:18:37.2933|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:18:46.4874|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494037
+2025-04-13 09:18:46.5218|DEBUG|OnDoc|
+2025-04-13 09:18:46.5502|DEBUG|OnDoc|
+2025-04-13 09:18:46.5622|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:22:08.7917|DEBUG|OnDoc|
+2025-04-13 09:22:08.8564|DEBUG|OnDoc|
+2025-04-13 09:22:41.6226|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:22:41.7752|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:23:02.7415|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:23:02.7626|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:23:19.0924|DEBUG|OnDoc|
+2025-04-13 09:23:19.6519|DEBUG|OnDoc|
+2025-04-13 09:23:21.2088|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:23:21.2318|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:23:21.5790|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:23:21.5951|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:23:24.8003|DEBUG|OnDoc|
+2025-04-13 09:23:26.0643|DEBUG|OnDoc|
+2025-04-13 09:23:27.0522|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:23:27.8974|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:23:27.9072|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:23:27.9072|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:23:27.9072|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:23:27.9212|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:23:27.9212|DEBUG|OnDoc|
+2025-04-13 09:23:27.9317|DEBUG|OnDoc|
+2025-04-13 09:23:28.6446|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000208_20250413092327.json.pdf
+2025-04-13 09:23:28.6446|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:23:28.6696|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:23:28.6696|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:23:28.6696|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:23:28.6696|DEBUG|OnDoc|
+2025-04-13 09:23:28.6810|DEBUG|OnDoc|
+2025-04-13 09:23:32.6064|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:23:32.6330|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:23:32.6345|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:23:32.6345|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:23:32.6345|DEBUG|OnDoc|
+2025-04-13 09:23:32.6345|DEBUG|OnDoc|
+2025-04-13 09:23:33.2506|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:23:33.2986|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:23:33.2986|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_0
+2025-04-13 09:23:33.3086|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_0
+2025-04-13 09:23:33.3086|DEBUG|OnDoc|
+2025-04-13 09:23:33.3086|DEBUG|OnDoc|
+2025-04-13 09:23:33.8398|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:23:33.8878|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:23:33.8878|DEBUG|OnDoc|Start Update IL_Log: DokumentID:140_1
+2025-04-13 09:23:33.8878|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:140_1
+2025-04-13 09:23:33.8878|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:23:33.9030|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:23:33.9030|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000209_20250413092333.json.pdf
+2025-04-13 09:24:05.5195|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013
+2025-04-13 09:24:05.5561|DEBUG|OnDoc|
+2025-04-13 09:24:05.5896|DEBUG|OnDoc|
+2025-04-13 09:24:05.5896|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:24:05.6225|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494037
+2025-04-13 09:24:05.6225|DEBUG|OnDoc|
+2025-04-13 09:24:05.6589|DEBUG|OnDoc|
+2025-04-13 09:24:05.6722|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:24:05.6912|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013
+2025-04-13 09:24:05.6912|DEBUG|OnDoc|
+2025-04-13 09:24:05.7205|DEBUG|OnDoc|
+2025-04-13 09:24:05.7324|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:24:05.7523|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494037
+2025-04-13 09:24:05.7523|DEBUG|OnDoc|
+2025-04-13 09:24:05.7837|DEBUG|OnDoc|
+2025-04-13 09:24:05.7974|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:24:05.8160|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013
+2025-04-13 09:24:05.8160|DEBUG|OnDoc|
+2025-04-13 09:24:05.8468|DEBUG|OnDoc|
+2025-04-13 09:24:05.8608|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:24:05.8608|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:24:05.9074|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:24:05.9526|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000208_20250413092405.json.pdf
+2025-04-13 09:24:10.9573|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013
+2025-04-13 09:24:10.9665|DEBUG|OnDoc|
+2025-04-13 09:24:10.9965|DEBUG|OnDoc|
+2025-04-13 09:24:10.9965|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:24:11.0262|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494037
+2025-04-13 09:24:11.0262|DEBUG|OnDoc|
+2025-04-13 09:24:11.0552|DEBUG|OnDoc|
+2025-04-13 09:24:11.0682|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:24:11.0885|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013
+2025-04-13 09:24:11.0885|DEBUG|OnDoc|
+2025-04-13 09:24:11.1178|DEBUG|OnDoc|
+2025-04-13 09:24:11.1298|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:24:11.1491|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494037
+2025-04-13 09:24:11.1511|DEBUG|OnDoc|
+2025-04-13 09:24:11.1803|DEBUG|OnDoc|
+2025-04-13 09:24:11.1932|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:24:11.2124|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494013
+2025-04-13 09:24:11.2124|DEBUG|OnDoc|
+2025-04-13 09:24:11.2372|DEBUG|OnDoc|
+2025-04-13 09:24:11.2492|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:24:11.2682|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002494037
+2025-04-13 09:24:11.2682|DEBUG|OnDoc|
+2025-04-13 09:24:11.2982|DEBUG|OnDoc|
+2025-04-13 09:24:11.3105|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile.
+2025-04-13 09:24:11.3105|DEBUG|OnDoc|Start Transfer to OnBase
+2025-04-13 09:24:11.4010|DEBUG|OnDoc|Ende Transfer to OnBase
+2025-04-13 09:24:11.4548|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000209_20250413092411.json.pdf
+2025-04-13 10:23:45.5080|DEBUG|OnDoc|
+2025-04-13 10:23:45.5560|DEBUG|OnDoc|
+2025-04-13 10:23:45.6194|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 10:23:45.6194|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 10:23:50.4734|DEBUG|OnDoc|
+2025-04-13 10:23:50.4839|DEBUG|OnDoc|
+2025-04-13 10:23:50.5379|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 10:23:50.5379|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 10:23:51.4309|DEBUG|OnDoc|
+2025-04-13 10:23:51.4309|DEBUG|OnDoc|
+2025-04-13 10:23:51.4795|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 10:23:51.4795|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 10:23:52.1062|DEBUG|OnDoc|
+2025-04-13 10:23:52.1062|DEBUG|OnDoc|
+2025-04-13 10:23:52.1491|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 10:23:52.1514|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 10:23:53.9074|DEBUG|OnDoc|
+2025-04-13 10:23:53.9074|DEBUG|OnDoc|
+2025-04-13 10:23:53.9435|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 10:23:53.9435|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 10:23:54.4685|DEBUG|OnDoc|
+2025-04-13 10:23:54.4790|DEBUG|OnDoc|
+2025-04-13 10:23:54.5413|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 10:23:54.5413|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 10:27:25.7615|DEBUG|OnDoc|
+2025-04-13 10:27:25.8025|DEBUG|OnDoc|
+2025-04-13 10:27:25.8625|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 10:27:25.8625|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 11:25:27.2496|DEBUG|OnDoc|
+2025-04-13 11:25:27.2917|DEBUG|OnDoc|
+2025-04-13 11:25:27.3446|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 11:25:27.3446|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 11:25:28.2257|DEBUG|OnDoc|
+2025-04-13 11:25:28.2358|DEBUG|OnDoc|
+2025-04-13 11:25:28.2831|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 11:25:28.2831|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:33:36.1135|DEBUG|OnDoc|
+2025-04-13 12:33:36.1541|DEBUG|OnDoc|
+2025-04-13 12:33:36.2107|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:33:36.2137|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:33:38.5885|DEBUG|OnDoc|
+2025-04-13 12:33:38.5885|DEBUG|OnDoc|
+2025-04-13 12:33:38.6277|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:33:38.6277|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:33:41.6376|DEBUG|OnDoc|
+2025-04-13 12:33:41.6376|DEBUG|OnDoc|
+2025-04-13 12:33:41.6759|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:33:41.6759|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:33:43.3327|DEBUG|OnDoc|
+2025-04-13 12:33:43.3327|DEBUG|OnDoc|
+2025-04-13 12:33:43.3788|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:33:43.3788|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:33:45.0316|DEBUG|OnDoc|
+2025-04-13 12:33:45.0316|DEBUG|OnDoc|
+2025-04-13 12:33:45.0781|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:33:45.0781|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:33:46.2119|DEBUG|OnDoc|
+2025-04-13 12:33:46.2221|DEBUG|OnDoc|
+2025-04-13 12:33:46.2801|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:33:46.2801|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:34:33.8015|DEBUG|OnDoc|
+2025-04-13 12:34:33.8476|DEBUG|OnDoc|
+2025-04-13 12:34:33.8828|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:34:33.8848|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:34:37.8526|DEBUG|OnDoc|
+2025-04-13 12:34:37.8566|DEBUG|OnDoc|
+2025-04-13 12:34:37.8971|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:34:37.9001|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:36:05.7196|DEBUG|OnDoc|
+2025-04-13 12:36:05.7562|DEBUG|OnDoc|
+2025-04-13 12:36:05.8183|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:36:05.8233|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:36:07.5325|DEBUG|OnDoc|
+2025-04-13 12:36:07.5325|DEBUG|OnDoc|
+2025-04-13 12:36:07.5935|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:36:07.5935|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:36:48.4877|DEBUG|OnDoc|
+2025-04-13 12:36:48.4877|DEBUG|OnDoc|
+2025-04-13 12:36:48.5180|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:36:48.5180|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:36:49.8601|DEBUG|OnDoc|
+2025-04-13 12:36:49.8601|DEBUG|OnDoc|
+2025-04-13 12:36:49.8872|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:36:49.8872|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:36:56.2336|DEBUG|OnDoc|
+2025-04-13 12:36:56.2336|DEBUG|OnDoc|
+2025-04-13 12:36:56.2632|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:36:56.2632|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-04-13 12:36:57.6069|DEBUG|OnDoc|
+2025-04-13 12:36:57.6069|DEBUG|OnDoc|
+2025-04-13 12:36:57.6338|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-04-13 12:36:57.6365|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache
index fe5d984a..25f8853a 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 3cbd1837..c1d4f4f1 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 d3ccad5c..670cfa5e 100644
Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ
diff --git a/Client/Diverses/MitarbeiterProfil.Designer.cs b/Client/Diverses/MitarbeiterProfil.Designer.cs
index c81354a7..f5b6f28b 100644
--- a/Client/Diverses/MitarbeiterProfil.Designer.cs
+++ b/Client/Diverses/MitarbeiterProfil.Designer.cs
@@ -28,7 +28,10 @@
///
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MitarbeiterProfil));
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
this.ribbon1 = new System.Windows.Forms.Ribbon();
this.ribbonTab1 = new System.Windows.Forms.RibbonTab();
this.RibbonPanelExit = new System.Windows.Forms.RibbonPanel();
@@ -87,6 +90,43 @@
this.btnDeleteImage = new System.Windows.Forms.Button();
this.btnSaveSignature = new System.Windows.Forms.Button();
this.sign1 = new WinSign.Sign();
+ this.ribbonTab3 = new System.Windows.Forms.RibbonTab();
+ this.GrpGAS = new System.Windows.Forms.GroupBox();
+ this.treeViewAdvAdresse = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
+ this.label19 = new System.Windows.Forms.Label();
+ this.TreeViewADVPersadresse = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
+ this.label20 = new System.Windows.Forms.Label();
+ this.btnSavePersAdressen = new System.Windows.Forms.Button();
+ this.panelpersadresse = new System.Windows.Forms.Panel();
+ this.label21 = new System.Windows.Forms.Label();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.textBox2 = new System.Windows.Forms.TextBox();
+ this.label22 = new System.Windows.Forms.Label();
+ this.textBox3 = new System.Windows.Forms.TextBox();
+ this.label23 = new System.Windows.Forms.Label();
+ this.textBox4 = new System.Windows.Forms.TextBox();
+ this.label24 = new System.Windows.Forms.Label();
+ this.textBox5 = new System.Windows.Forms.TextBox();
+ this.label25 = new System.Windows.Forms.Label();
+ this.textBox6 = new System.Windows.Forms.TextBox();
+ this.label26 = new System.Windows.Forms.Label();
+ this.textBox7 = new System.Windows.Forms.TextBox();
+ this.label27 = new System.Windows.Forms.Label();
+ this.btnSavePersAddr = new System.Windows.Forms.Button();
+ this.btnCancelPersAddr = new System.Windows.Forms.Button();
+ this.btnNewPersAddr = new System.Windows.Forms.Button();
+ this.textBox8 = new System.Windows.Forms.TextBox();
+ this.label28 = new System.Windows.Forms.Label();
+ this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.adresseLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.txtadresse = new System.Windows.Forms.TextBox();
+ this.label29 = new System.Windows.Forms.Label();
+ this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.persönlicheAdresseErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.label30 = new System.Windows.Forms.Label();
+ this.label31 = new System.Windows.Forms.Label();
+ this.label32 = new System.Windows.Forms.Label();
+ this.adresseBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GrpBoxProfile.SuspendLayout();
this.GrpBoxDetails.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxTeam)).BeginInit();
@@ -95,6 +135,12 @@
this.GrpBoxMitarbeiter.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.GrpGetSignature.SuspendLayout();
+ this.GrpGAS.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.TreeViewADVPersadresse)).BeginInit();
+ this.panelpersadresse.SuspendLayout();
+ this.contextMenuStrip1.SuspendLayout();
+ this.contextMenuStrip2.SuspendLayout();
this.SuspendLayout();
//
// ribbon1
@@ -116,10 +162,11 @@
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(796, 121);
+ this.ribbon1.Size = new System.Drawing.Size(859, 121);
this.ribbon1.TabIndex = 0;
this.ribbon1.Tabs.Add(this.ribbonTab1);
this.ribbon1.Tabs.Add(this.ribbonTab2);
+ this.ribbon1.Tabs.Add(this.ribbonTab3);
this.ribbon1.TabSpacing = 4;
this.ribbon1.Text = "ribbon1";
//
@@ -367,7 +414,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, 148);
+ this.GrpBoxMitarbeiter.Location = new System.Drawing.Point(8, 129);
this.GrpBoxMitarbeiter.Name = "GrpBoxMitarbeiter";
this.GrpBoxMitarbeiter.Size = new System.Drawing.Size(793, 340);
this.GrpBoxMitarbeiter.TabIndex = 3;
@@ -569,7 +616,7 @@
this.GrpGetSignature.Controls.Add(this.btnDeleteImage);
this.GrpGetSignature.Controls.Add(this.btnSaveSignature);
this.GrpGetSignature.Controls.Add(this.sign1);
- this.GrpGetSignature.Location = new System.Drawing.Point(72, 88);
+ this.GrpGetSignature.Location = new System.Drawing.Point(104, 85);
this.GrpGetSignature.Name = "GrpGetSignature";
this.GrpGetSignature.Size = new System.Drawing.Size(644, 394);
this.GrpGetSignature.TabIndex = 21;
@@ -694,11 +741,430 @@
this.sign1.Size = new System.Drawing.Size(616, 228);
this.sign1.TabIndex = 20;
//
+ // ribbonTab3
+ //
+ this.ribbonTab3.Name = "ribbonTab3";
+ this.ribbonTab3.Text = "Versandstrasse-Rückantwort";
+ this.ribbonTab3.ActiveChanged += new System.EventHandler(this.ribbonTab3_ActiveChanged);
+ //
+ // GrpGAS
+ //
+ this.GrpGAS.Controls.Add(this.panelpersadresse);
+ this.GrpGAS.Controls.Add(this.label30);
+ this.GrpGAS.Controls.Add(this.label31);
+ this.GrpGAS.Controls.Add(this.label32);
+ this.GrpGAS.Controls.Add(this.label29);
+ this.GrpGAS.Controls.Add(this.txtadresse);
+ this.GrpGAS.Controls.Add(this.btnNewPersAddr);
+ this.GrpGAS.Controls.Add(this.btnSavePersAdressen);
+ this.GrpGAS.Controls.Add(this.label20);
+ this.GrpGAS.Controls.Add(this.TreeViewADVPersadresse);
+ this.GrpGAS.Controls.Add(this.label19);
+ this.GrpGAS.Controls.Add(this.treeViewAdvAdresse);
+ this.GrpGAS.Location = new System.Drawing.Point(8, 48);
+ this.GrpGAS.Name = "GrpGAS";
+ this.GrpGAS.Size = new System.Drawing.Size(705, 509);
+ this.GrpGAS.TabIndex = 22;
+ this.GrpGAS.TabStop = false;
+ this.GrpGAS.Text = "Rückantwort-Adressen";
+ this.GrpGAS.Visible = false;
+ //
+ // treeViewAdvAdresse
+ //
+ this.treeViewAdvAdresse.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;
+ this.treeViewAdvAdresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
+ new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
+ this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(275, 288);
+ this.treeViewAdvAdresse.ContextMenuStrip = this.contextMenuStrip2;
+ //
+ //
+ //
+ this.treeViewAdvAdresse.HelpTextControl.BaseThemeName = null;
+ this.treeViewAdvAdresse.HelpTextControl.Location = new System.Drawing.Point(0, 0);
+ this.treeViewAdvAdresse.HelpTextControl.Name = "";
+ this.treeViewAdvAdresse.HelpTextControl.Size = new System.Drawing.Size(392, 112);
+ this.treeViewAdvAdresse.HelpTextControl.TabIndex = 0;
+ this.treeViewAdvAdresse.HelpTextControl.Visible = true;
+ this.treeViewAdvAdresse.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText;
+ this.treeViewAdvAdresse.Location = new System.Drawing.Point(6, 40);
+ this.treeViewAdvAdresse.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
+ this.treeViewAdvAdresse.Name = "treeViewAdvAdresse";
+ this.treeViewAdvAdresse.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
+ this.treeViewAdvAdresse.Size = new System.Drawing.Size(275, 288);
+ this.treeViewAdvAdresse.TabIndex = 4;
+ this.treeViewAdvAdresse.Text = "treeViewAdv2";
+ this.treeViewAdvAdresse.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0;
+ this.treeViewAdvAdresse.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true;
+ //
+ //
+ //
+ this.treeViewAdvAdresse.ToolTipControl.BaseThemeName = null;
+ this.treeViewAdvAdresse.ToolTipControl.Location = new System.Drawing.Point(0, 0);
+ this.treeViewAdvAdresse.ToolTipControl.Name = "";
+ this.treeViewAdvAdresse.ToolTipControl.Size = new System.Drawing.Size(392, 112);
+ this.treeViewAdvAdresse.ToolTipControl.TabIndex = 0;
+ this.treeViewAdvAdresse.ToolTipControl.Visible = true;
+ this.treeViewAdvAdresse.AfterSelect += new System.EventHandler(this.treeViewAdvAdresse_AfterSelect);
+ this.treeViewAdvAdresse.Click += new System.EventHandler(this.treeViewAdvAdresse_Click);
+ this.treeViewAdvAdresse.DoubleClick += new System.EventHandler(this.treeViewAdvAdresse_DoubleClick);
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.Location = new System.Drawing.Point(7, 23);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(97, 13);
+ this.label19.TabIndex = 5;
+ this.label19.Text = "Standard-Adressen";
+ //
+ // TreeViewADVPersadresse
+ //
+ this.TreeViewADVPersadresse.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;
+ this.TreeViewADVPersadresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
+ new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)});
+ this.TreeViewADVPersadresse.BeforeTouchSize = new System.Drawing.Size(346, 113);
+ this.TreeViewADVPersadresse.ContextMenuStrip = this.contextMenuStrip1;
+ //
+ //
+ //
+ this.TreeViewADVPersadresse.HelpTextControl.BaseThemeName = null;
+ this.TreeViewADVPersadresse.HelpTextControl.Location = new System.Drawing.Point(0, 0);
+ this.TreeViewADVPersadresse.HelpTextControl.Name = "";
+ this.TreeViewADVPersadresse.HelpTextControl.Size = new System.Drawing.Size(392, 112);
+ this.TreeViewADVPersadresse.HelpTextControl.TabIndex = 0;
+ this.TreeViewADVPersadresse.HelpTextControl.Visible = true;
+ this.TreeViewADVPersadresse.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText;
+ this.TreeViewADVPersadresse.Location = new System.Drawing.Point(300, 40);
+ this.TreeViewADVPersadresse.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
+ this.TreeViewADVPersadresse.Name = "TreeViewADVPersadresse";
+ this.TreeViewADVPersadresse.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
+ this.TreeViewADVPersadresse.Size = new System.Drawing.Size(346, 113);
+ this.TreeViewADVPersadresse.TabIndex = 6;
+ this.TreeViewADVPersadresse.Text = "treeViewAdv2";
+ this.TreeViewADVPersadresse.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0;
+ this.TreeViewADVPersadresse.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true;
+ //
+ //
+ //
+ this.TreeViewADVPersadresse.ToolTipControl.BaseThemeName = null;
+ this.TreeViewADVPersadresse.ToolTipControl.Location = new System.Drawing.Point(0, 0);
+ this.TreeViewADVPersadresse.ToolTipControl.Name = "";
+ this.TreeViewADVPersadresse.ToolTipControl.Size = new System.Drawing.Size(392, 112);
+ this.TreeViewADVPersadresse.ToolTipControl.TabIndex = 0;
+ this.TreeViewADVPersadresse.ToolTipControl.Visible = true;
+ this.TreeViewADVPersadresse.AfterSelect += new System.EventHandler(this.TreeViewADVPersadresse_AfterSelect);
+ this.TreeViewADVPersadresse.Click += new System.EventHandler(this.TreeViewADVPersadresse_Click);
+ this.TreeViewADVPersadresse.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TreeViewADVPersadresse_KeyDown);
+ //
+ // label20
+ //
+ this.label20.AutoSize = true;
+ this.label20.Location = new System.Drawing.Point(298, 22);
+ this.label20.Name = "label20";
+ this.label20.Size = new System.Drawing.Size(210, 13);
+ this.label20.TabIndex = 7;
+ this.label20.Text = "Gewählte Standard-/ persönliche Adressen";
+ //
+ // btnSavePersAdressen
+ //
+ this.btnSavePersAdressen.Location = new System.Drawing.Point(571, 159);
+ this.btnSavePersAdressen.Name = "btnSavePersAdressen";
+ this.btnSavePersAdressen.Size = new System.Drawing.Size(75, 23);
+ this.btnSavePersAdressen.TabIndex = 8;
+ this.btnSavePersAdressen.Text = "Speichern";
+ this.btnSavePersAdressen.UseVisualStyleBackColor = true;
+ this.btnSavePersAdressen.Click += new System.EventHandler(this.btnSavePersAdressen_Click);
+ //
+ // panelpersadresse
+ //
+ this.panelpersadresse.BackColor = System.Drawing.Color.Gainsboro;
+ this.panelpersadresse.Controls.Add(this.textBox8);
+ this.panelpersadresse.Controls.Add(this.label28);
+ this.panelpersadresse.Controls.Add(this.btnCancelPersAddr);
+ this.panelpersadresse.Controls.Add(this.btnSavePersAddr);
+ this.panelpersadresse.Controls.Add(this.textBox7);
+ this.panelpersadresse.Controls.Add(this.label27);
+ this.panelpersadresse.Controls.Add(this.textBox6);
+ this.panelpersadresse.Controls.Add(this.label26);
+ this.panelpersadresse.Controls.Add(this.textBox5);
+ this.panelpersadresse.Controls.Add(this.label25);
+ this.panelpersadresse.Controls.Add(this.textBox4);
+ this.panelpersadresse.Controls.Add(this.label24);
+ this.panelpersadresse.Controls.Add(this.textBox3);
+ this.panelpersadresse.Controls.Add(this.label23);
+ this.panelpersadresse.Controls.Add(this.textBox2);
+ this.panelpersadresse.Controls.Add(this.label22);
+ this.panelpersadresse.Controls.Add(this.textBox1);
+ this.panelpersadresse.Controls.Add(this.label21);
+ this.panelpersadresse.Location = new System.Drawing.Point(144, 29);
+ this.panelpersadresse.Name = "panelpersadresse";
+ this.panelpersadresse.Size = new System.Drawing.Size(352, 304);
+ this.panelpersadresse.TabIndex = 9;
+ this.panelpersadresse.Visible = false;
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.Location = new System.Drawing.Point(22, 48);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(39, 13);
+ this.label21.TabIndex = 0;
+ this.label21.Text = "Zeile 1";
+ //
+ // textBox1
+ //
+ this.textBox1.Location = new System.Drawing.Point(97, 48);
+ this.textBox1.Name = "textBox1";
+ this.textBox1.ReadOnly = true;
+ this.textBox1.Size = new System.Drawing.Size(237, 20);
+ this.textBox1.TabIndex = 1;
+ this.textBox1.TabStop = false;
+ this.textBox1.Text = "Thurgauer Kantonalban";
+ //
+ // textBox2
+ //
+ this.textBox2.Location = new System.Drawing.Point(97, 71);
+ this.textBox2.Name = "textBox2";
+ this.textBox2.Size = new System.Drawing.Size(237, 20);
+ this.textBox2.TabIndex = 1;
+ //
+ // label22
+ //
+ this.label22.AutoSize = true;
+ this.label22.Location = new System.Drawing.Point(22, 71);
+ this.label22.Name = "label22";
+ this.label22.Size = new System.Drawing.Size(39, 13);
+ this.label22.TabIndex = 2;
+ this.label22.Text = "Zeile 2";
+ //
+ // textBox3
+ //
+ this.textBox3.Location = new System.Drawing.Point(97, 93);
+ this.textBox3.Name = "textBox3";
+ this.textBox3.Size = new System.Drawing.Size(237, 20);
+ this.textBox3.TabIndex = 2;
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.Location = new System.Drawing.Point(22, 93);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(39, 13);
+ this.label23.TabIndex = 4;
+ this.label23.Text = "Zeile 3";
+ //
+ // textBox4
+ //
+ this.textBox4.Location = new System.Drawing.Point(97, 116);
+ this.textBox4.Name = "textBox4";
+ this.textBox4.Size = new System.Drawing.Size(237, 20);
+ this.textBox4.TabIndex = 3;
+ //
+ // label24
+ //
+ this.label24.AutoSize = true;
+ this.label24.Location = new System.Drawing.Point(22, 116);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(39, 13);
+ this.label24.TabIndex = 6;
+ this.label24.Text = "Zeile 4";
+ //
+ // textBox5
+ //
+ this.textBox5.Location = new System.Drawing.Point(97, 139);
+ this.textBox5.Name = "textBox5";
+ this.textBox5.Size = new System.Drawing.Size(237, 20);
+ this.textBox5.TabIndex = 4;
+ //
+ // label25
+ //
+ this.label25.AutoSize = true;
+ this.label25.Location = new System.Drawing.Point(22, 139);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(39, 13);
+ this.label25.TabIndex = 8;
+ this.label25.Text = "Zeile 5";
+ //
+ // textBox6
+ //
+ this.textBox6.Location = new System.Drawing.Point(97, 162);
+ this.textBox6.Name = "textBox6";
+ this.textBox6.Size = new System.Drawing.Size(237, 20);
+ this.textBox6.TabIndex = 5;
+ //
+ // label26
+ //
+ this.label26.AutoSize = true;
+ this.label26.Location = new System.Drawing.Point(22, 162);
+ this.label26.Name = "label26";
+ this.label26.Size = new System.Drawing.Size(39, 13);
+ this.label26.TabIndex = 10;
+ this.label26.Text = "Zeile 6";
+ //
+ // textBox7
+ //
+ this.textBox7.Location = new System.Drawing.Point(97, 185);
+ this.textBox7.Name = "textBox7";
+ this.textBox7.Size = new System.Drawing.Size(237, 20);
+ this.textBox7.TabIndex = 6;
+ //
+ // label27
+ //
+ this.label27.AutoSize = true;
+ this.label27.Location = new System.Drawing.Point(22, 185);
+ this.label27.Name = "label27";
+ this.label27.Size = new System.Drawing.Size(39, 13);
+ this.label27.TabIndex = 12;
+ this.label27.Text = "Zeile 7";
+ //
+ // btnSavePersAddr
+ //
+ this.btnSavePersAddr.Location = new System.Drawing.Point(259, 252);
+ this.btnSavePersAddr.Name = "btnSavePersAddr";
+ this.btnSavePersAddr.Size = new System.Drawing.Size(75, 23);
+ this.btnSavePersAddr.TabIndex = 8;
+ this.btnSavePersAddr.Text = "Speichern ";
+ this.btnSavePersAddr.UseVisualStyleBackColor = true;
+ this.btnSavePersAddr.Click += new System.EventHandler(this.btnSavePersAddr_Click);
+ //
+ // btnCancelPersAddr
+ //
+ this.btnCancelPersAddr.Location = new System.Drawing.Point(15, 252);
+ this.btnCancelPersAddr.Name = "btnCancelPersAddr";
+ this.btnCancelPersAddr.Size = new System.Drawing.Size(75, 23);
+ this.btnCancelPersAddr.TabIndex = 7;
+ this.btnCancelPersAddr.Text = "Abbrechen";
+ this.btnCancelPersAddr.UseVisualStyleBackColor = true;
+ this.btnCancelPersAddr.Click += new System.EventHandler(this.btnCancelPersAddr_Click);
+ //
+ // btnNewPersAddr
+ //
+ this.btnNewPersAddr.Image = global::OnDoc.Properties.Resources.add_24x24_32;
+ this.btnNewPersAddr.Location = new System.Drawing.Point(644, 39);
+ this.btnNewPersAddr.Name = "btnNewPersAddr";
+ this.btnNewPersAddr.Size = new System.Drawing.Size(50, 32);
+ this.btnNewPersAddr.TabIndex = 10;
+ this.btnNewPersAddr.UseVisualStyleBackColor = true;
+ this.btnNewPersAddr.Click += new System.EventHandler(this.btnNewPersAddr_Click);
+ //
+ // textBox8
+ //
+ this.textBox8.Location = new System.Drawing.Point(97, 13);
+ this.textBox8.Name = "textBox8";
+ this.textBox8.Size = new System.Drawing.Size(237, 20);
+ this.textBox8.TabIndex = 0;
+ //
+ // label28
+ //
+ this.label28.AutoSize = true;
+ this.label28.Location = new System.Drawing.Point(22, 13);
+ this.label28.Name = "label28";
+ this.label28.Size = new System.Drawing.Size(69, 13);
+ this.label28.TabIndex = 16;
+ this.label28.Text = "Bezeichnung";
+ //
+ // contextMenuStrip1
+ //
+ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.adresseLöschenToolStripMenuItem,
+ this.adresseBearbeitenToolStripMenuItem});
+ this.contextMenuStrip1.Name = "contextMenuStrip1";
+ this.contextMenuStrip1.Size = new System.Drawing.Size(175, 48);
+ //
+ // adresseLöschenToolStripMenuItem
+ //
+ this.adresseLöschenToolStripMenuItem.Name = "adresseLöschenToolStripMenuItem";
+ this.adresseLöschenToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+ this.adresseLöschenToolStripMenuItem.Text = "Adresse löschen";
+ this.adresseLöschenToolStripMenuItem.Click += new System.EventHandler(this.adresseLöschenToolStripMenuItem_Click);
+ //
+ // txtadresse
+ //
+ this.txtadresse.Location = new System.Drawing.Point(301, 231);
+ this.txtadresse.Multiline = true;
+ this.txtadresse.Name = "txtadresse";
+ this.txtadresse.ReadOnly = true;
+ this.txtadresse.Size = new System.Drawing.Size(274, 97);
+ this.txtadresse.TabIndex = 11;
+ //
+ // label29
+ //
+ this.label29.AutoSize = true;
+ this.label29.Location = new System.Drawing.Point(298, 215);
+ this.label29.Name = "label29";
+ this.label29.Size = new System.Drawing.Size(87, 13);
+ this.label29.TabIndex = 12;
+ this.label29.Text = "Adress-Vorschau";
+ //
+ // contextMenuStrip2
+ //
+ this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.persönlicheAdresseErstellenToolStripMenuItem});
+ this.contextMenuStrip2.Name = "contextMenuStrip2";
+ this.contextMenuStrip2.Size = new System.Drawing.Size(227, 26);
+ //
+ // persönlicheAdresseErstellenToolStripMenuItem
+ //
+ this.persönlicheAdresseErstellenToolStripMenuItem.Name = "persönlicheAdresseErstellenToolStripMenuItem";
+ this.persönlicheAdresseErstellenToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
+ this.persönlicheAdresseErstellenToolStripMenuItem.Text = "Persönliche Adresse erstellen";
+ this.persönlicheAdresseErstellenToolStripMenuItem.Click += new System.EventHandler(this.persönlicheAdresseErstellenToolStripMenuItem_Click);
+ //
+ // label30
+ //
+ this.label30.AutoSize = true;
+ this.label30.Location = new System.Drawing.Point(298, 186);
+ this.label30.Name = "label30";
+ this.label30.Size = new System.Drawing.Size(153, 13);
+ this.label30.TabIndex = 15;
+ this.label30.Text = "- Mit Speichersymbol speichern";
+ //
+ // label31
+ //
+ this.label31.AutoSize = true;
+ this.label31.Location = new System.Drawing.Point(298, 172);
+ this.label31.Name = "label31";
+ this.label31.Size = new System.Drawing.Size(225, 13);
+ this.label31.TabIndex = 14;
+ this.label31.Text = "- Element anwählen und Tasten Ctrl Up/Down";
+ //
+ // label32
+ //
+ this.label32.AutoSize = true;
+ this.label32.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label32.Location = new System.Drawing.Point(298, 159);
+ this.label32.Name = "label32";
+ this.label32.Size = new System.Drawing.Size(69, 13);
+ this.label32.TabIndex = 13;
+ this.label32.Text = "Sortierung:";
+ //
+ // adresseBearbeitenToolStripMenuItem
+ //
+ this.adresseBearbeitenToolStripMenuItem.Name = "adresseBearbeitenToolStripMenuItem";
+ this.adresseBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+ this.adresseBearbeitenToolStripMenuItem.Text = "Adresse bearbeiten";
+ this.adresseBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.adresseBearbeitenToolStripMenuItem_Click);
+ //
// MitarbeiterProfil
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(800, 498);
+ this.ClientSize = new System.Drawing.Size(863, 498);
+ this.Controls.Add(this.GrpGAS);
this.Controls.Add(this.GrpGetSignature);
this.Controls.Add(this.GrpBoxMitarbeiter);
this.Controls.Add(this.GrpBoxDetails);
@@ -724,6 +1190,14 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.GrpGetSignature.ResumeLayout(false);
this.GrpGetSignature.PerformLayout();
+ this.GrpGAS.ResumeLayout(false);
+ this.GrpGAS.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.TreeViewADVPersadresse)).EndInit();
+ this.panelpersadresse.ResumeLayout(false);
+ this.panelpersadresse.PerformLayout();
+ this.contextMenuStrip1.ResumeLayout(false);
+ this.contextMenuStrip2.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -788,5 +1262,42 @@
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Button btnSaveForUser;
private System.Windows.Forms.Label label18;
+ private System.Windows.Forms.RibbonTab ribbonTab3;
+ private System.Windows.Forms.GroupBox GrpGAS;
+ private System.Windows.Forms.Label label19;
+ private Syncfusion.Windows.Forms.Tools.TreeViewAdv treeViewAdvAdresse;
+ private System.Windows.Forms.Label label20;
+ private Syncfusion.Windows.Forms.Tools.TreeViewAdv TreeViewADVPersadresse;
+ private System.Windows.Forms.Button btnSavePersAdressen;
+ private System.Windows.Forms.Panel panelpersadresse;
+ private System.Windows.Forms.TextBox textBox7;
+ private System.Windows.Forms.Label label27;
+ private System.Windows.Forms.TextBox textBox6;
+ private System.Windows.Forms.Label label26;
+ private System.Windows.Forms.TextBox textBox5;
+ private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.TextBox textBox4;
+ private System.Windows.Forms.Label label24;
+ private System.Windows.Forms.TextBox textBox3;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.TextBox textBox2;
+ private System.Windows.Forms.Label label22;
+ private System.Windows.Forms.TextBox textBox1;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.Button btnNewPersAddr;
+ private System.Windows.Forms.Button btnCancelPersAddr;
+ private System.Windows.Forms.Button btnSavePersAddr;
+ private System.Windows.Forms.TextBox textBox8;
+ private System.Windows.Forms.Label label28;
+ private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+ private System.Windows.Forms.ToolStripMenuItem adresseLöschenToolStripMenuItem;
+ private System.Windows.Forms.TextBox txtadresse;
+ private System.Windows.Forms.Label label29;
+ private System.Windows.Forms.ContextMenuStrip contextMenuStrip2;
+ private System.Windows.Forms.ToolStripMenuItem persönlicheAdresseErstellenToolStripMenuItem;
+ private System.Windows.Forms.Label label30;
+ private System.Windows.Forms.Label label31;
+ private System.Windows.Forms.Label label32;
+ private System.Windows.Forms.ToolStripMenuItem adresseBearbeitenToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/Client/Diverses/MitarbeiterProfil.cs b/Client/Diverses/MitarbeiterProfil.cs
index ea05200c..51abfa8d 100644
--- a/Client/Diverses/MitarbeiterProfil.cs
+++ b/Client/Diverses/MitarbeiterProfil.cs
@@ -28,6 +28,8 @@ using Syncfusion.Office;
using Newtonsoft.Json;
using Windows.UI;
using System.Security.Cryptography;
+using Windows.UI.Core.Preview;
+
namespace OnDoc.Diverses
{
@@ -66,6 +68,7 @@ namespace OnDoc.Diverses
{
btnSaveForUser.Visible = true;
}
+ load_adressen();
}
@@ -211,12 +214,14 @@ namespace OnDoc.Diverses
GrpBoxDetails.Dock = DockStyle.Fill;
GrpBoxDetails.Visible = true;
GrpBoxMitarbeiter.Visible = false;
+ GrpGAS.Visible = false;
}
private void ribbonTab2_ActiveChanged(object sender, EventArgs e)
{
GrpBoxProfile.Visible = false;
GrpBoxDetails.Visible = false;
+ GrpGAS.Visible = false;
GrpBoxMitarbeiter.Visible = true;
GrpBoxMitarbeiter.Dock = DockStyle.Fill;
DB db = new DB(AppParams.connectionstring);
@@ -540,7 +545,307 @@ namespace OnDoc.Diverses
}
}
+ private void load_adressen()
+ {
+ DB db = new DB(AppParams.connectionstring);
+ db.Get_Tabledata("Select * from Antwortadresse order by bezeichnung", false, true);
+ foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
+ {
+ TreeNodeAdv node = new TreeNodeAdv();
+ node.Text = dr["bezeichnung"].ToString();
+ node.TagObject = dr;
+ treeViewAdvAdresse.Nodes.Add(node);
+
+ }
+ treeViewAdvAdresse.SelectedNode = treeViewAdvAdresse.Nodes[0];
+
+
+ db.Get_Tabledata("Select * from Antwortadresse_Mitarbeiter where mitarbeiternr=" + AppParams.CurrentMitarbeiter.ToString() + " order by reihenfolge",false,true);
+ foreach(System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
+ {
+ TreeNodeAdv node = new TreeNodeAdv();
+ node.Text = dr["bezeichnung"].ToString();
+ node.TagObject = dr;
+ TreeViewADVPersadresse.Nodes.Add(node);
+ }
+
+ db = null;
+ }
+
+ private void treeViewAdvAdresse_DoubleClick(object sender, EventArgs e)
+ {
+ TreeNodeAdv tn = treeViewAdvAdresse.SelectedNode;
+ tn.Tag = "Standard";
+
+ TreeViewADVPersadresse.Nodes.Add(tn);
+
+ }
+
+ private void btnSavePersAdressen_Click(object sender, EventArgs e)
+ {
+ DB db = new DB(AppParams.connectionstring);
+ DB db1 = new DB(AppParams.connectionstring);
+ db.Exec_SQL("Delete from antwortadresse_mitarbeiter where mitarbeiternr=" + AppParams.CurrentMitarbeiter.ToString());
+ int sort = 0;
+ db.Get_Tabledata_for_Update("Select * from antwortadresse_mitarbeiter where mitarbeiternr=" + AppParams.CurrentMitarbeiter.ToString(), false, true);
+ foreach (TreeNodeAdv tn in TreeViewADVPersadresse.Nodes)
+ {
+ System.Data.DataRow dr = db.daten.Tables[0].NewRow();
+ dr["tgnummer"] = AppParams.currenttgnummer;
+ dr["mitarbeiternr"] = AppParams.CurrentMitarbeiter;
+ dr["erstellt_am"] = DateTime.Now;
+ dr["mutiert_am"] = DateTime.Now;
+ dr["reihenfolge"] = sort;
+ dr["mutierer"] = AppParams.CurrentMitarbeiter;
+ dr["aktiv"] = true;
+ sort = sort + 1;
+ if (tn.Tag == "Standard")
+ {
+ System.Data.DataRow adr = tn.TagObject as System.Data.DataRow;
+ db1.Get_Tabledata("Select * from antwortadresse where id=" + adr["id"].ToString(), false, true);
+ dr["bezeichnung"] = tn.Text;
+ dr["Zeile1"] = db1.dsdaten.Tables[0].Rows[0]["Zeile1"].ToString();
+ dr["Zeile2"] = db1.dsdaten.Tables[0].Rows[0]["Zeile2"].ToString();
+ dr["Zeile3"] = db1.dsdaten.Tables[0].Rows[0]["Zeile3"].ToString();
+ dr["Zeile4"] = db1.dsdaten.Tables[0].Rows[0]["Zeile4"].ToString();
+ dr["Zeile5"] = db1.dsdaten.Tables[0].Rows[0]["Zeile5"].ToString();
+ dr["Zeile6"] = db1.dsdaten.Tables[0].Rows[0]["Zeile6"].ToString();
+ dr["Zeile7"] = "";
+ dr["standardadresse"] = adr["id"];
+ }
+ else
+ {
+ dr["standardadresse"] = 0;
+ System.Data.DataRow adr = tn.TagObject as System.Data.DataRow;
+ dr["bezeichnung"] = tn.Text;
+ dr["Zeile1"] = adr["Zeile1"].ToString();
+ dr["Zeile2"] = adr["Zeile2"].ToString();
+ dr["Zeile3"] = adr["Zeile3"].ToString();
+ dr["Zeile4"] = adr["Zeile4"].ToString();
+ dr["Zeile5"] = adr["Zeile5"].ToString();
+ dr["Zeile6"] = adr["Zeile6"].ToString();
+ dr["Zeile7"] = adr["Zeile7"].ToString();
+ }
+ db.daten.Tables[0].Rows.Add(dr);
+ }
+ db.Update_Data();
+ db = null;
+ db1 = null;
+ }
+
+ private void btnNewPersAddr_Click(object sender, EventArgs e)
+ {
+ panelpersadresse.Visible = true;
+ textBox8.Focus();
+
+ }
+
+ private void btnCancelPersAddr_Click(object sender, EventArgs e)
+ {
+ panelpersadresse.Visible = false;
+ }
+
+ private void btnSavePersAddr_Click(object sender, EventArgs e)
+ {
+ if (editadress)
+ {
+ System.Data.DataRow dr1 = TreeViewADVPersadresse.SelectedNode.TagObject as System.Data.DataRow;
+ dr1["bezeichnung"] = textBox8.Text;
+ dr1["zeile1"] = textBox1.Text;
+ dr1["zeile2"] = textBox2.Text;
+ dr1["zeile3"] = textBox3.Text;
+ dr1["zeile4"] = textBox4.Text;
+ dr1["zeile5"] = textBox5.Text;
+ dr1["zeile6"] = textBox6.Text;
+ dr1["zeile7"] = textBox7.Text;
+ TreeViewADVPersadresse.SelectedNode.Text=textBox8.Text;
+ TreeViewADVPersadresse.SelectedNode.TagObject = dr1;
+ panelpersadresse.Visible = false;
+ TreeViewADVPersadresse_AfterSelect(sender, e);
+ editadress = false;
+ return;
+ }
+ DB db = new DB(AppParams.connectionstring);
+ db.Get_Tabledata("Select top 1 * from antwortadresse_mitarbeiter where id=-1", false, true);
+ System.Data.DataRow dr = db.dsdaten.Tables[0].NewRow();
+ dr["tgnummer"] = AppParams.currenttgnummer;
+ dr["mitarbeiternr"] = AppParams.CurrentMitarbeiter;
+ dr["standardadresse"] = 0;
+ dr["reihenfolge"] = 0;
+ dr["bezeichnung"] = textBox8.Text;
+ dr["zeile1"] = textBox1.Text;
+ dr["zeile2"] = textBox2.Text;
+ dr["zeile3"] = textBox3.Text;
+ dr["zeile4"] = textBox4.Text;
+ dr["zeile5"] = textBox5.Text;
+ dr["zeile6"] = textBox6.Text;
+ dr["zeile7"] = textBox7.Text;
+
+ TreeNodeAdv tnnew = new TreeNodeAdv();
+ tnnew.Text = dr["bezeichnung"].ToString();
+ tnnew.TagObject = dr;
+ TreeViewADVPersadresse.Nodes.Add(tnnew);
+ db = null;
+ panelpersadresse.Visible = false;
+
+
+
+ }
+
+ private void adresseLöschenToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ TreeViewADVPersadresse.SelectedNode.Remove();
+
+ }
+ catch { }
+ }
+
+ private void treeViewAdvAdresse_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void TreeViewADVPersadresse_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void TreeViewADVPersadresse_AfterSelect(object sender, EventArgs e)
+ {
+ try
+ {
+ System.Data.DataRow dr = TreeViewADVPersadresse.SelectedNode.TagObject as System.Data.DataRow;
+ txtadresse.Text = "";
+
+ txtadresse.Text = dr["zeile1"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile2"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile3"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile4"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile5"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile6"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile7"].ToString() + Environment.NewLine;
+ }
+ catch { }
+ }
+
+ private void treeViewAdvAdresse_AfterSelect(object sender, EventArgs e)
+ {
+ try
+ {
+ System.Data.DataRow dr = treeViewAdvAdresse.SelectedNode.TagObject as System.Data.DataRow;
+ txtadresse.Text = "";
+
+ txtadresse.Text = dr["zeile1"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile2"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile3"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile4"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile5"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile6"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile7"].ToString() + Environment.NewLine;
+ }
+ catch { }
+ }
+
+ private void persönlicheAdresseErstellenToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ System.Data.DataRow dr = treeViewAdvAdresse.SelectedNode.TagObject as System.Data.DataRow;
+ textBox8.Text = "*** neue Adresse ***";
+ textBox1.Text = dr["zeile1"].ToString();
+ textBox2.Text = dr["zeile2"].ToString();
+ textBox3.Text = dr["zeile3"].ToString();
+ textBox4.Text = dr["zeile4"].ToString();
+ textBox5.Text = dr["zeile5"].ToString();
+ textBox6.Text = dr["zeile6"].ToString();
+ textBox7.Text = "";
+ panelpersadresse.Visible = true;
+
+ }
+ catch { }
+
+ }
+
+ private void MoveNode(bool moveUp)
+ {
+ TreeNodeAdv selectedNode = TreeViewADVPersadresse.SelectedNode;
+ if (selectedNode == null || selectedNode.Parent == null) return;
+
+ TreeNodeAdvCollection parentNodes = selectedNode.Parent.Nodes;
+ int index = parentNodes.IndexOf(selectedNode);
+ if (moveUp && index > 0)
+ {
+ // Verschiebe nach oben
+ parentNodes.RemoveAt(index);
+ parentNodes.Insert(index - 1, selectedNode);
+ TreeViewADVPersadresse.SelectedNode = selectedNode;
+ }
+ else if (!moveUp && index < parentNodes.Count - 1)
+ {
+ // Verschiebe nach unten
+ parentNodes.RemoveAt(index);
+ parentNodes.Insert(index + 1, selectedNode);
+ TreeViewADVPersadresse.SelectedNode = selectedNode;
+ }
+ }
+
+ private void TreeViewADVPersadresse_KeyDown(object sender, KeyEventArgs e)
+ {
+
+ switch (e.KeyCode)
+ {
+ case Keys.Down:
+ if (e.Control)
+ {
+ MoveNode(false);
+
+ // MoveNodeDown(treeViewAdv2.SelectedNode);
+
+ }
+ break;
+ case Keys.Up:
+ if (e.Control)
+ {
+ MoveNode(true);
+ // MoveNodeUp(treeViewAdv2.SelectedNode);
+ }
+ break;
+
+ }
+ }
+
+ private bool editadress = false;
+ private void adresseBearbeitenToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ editadress = true;
+ System.Data.DataRow dr = TreeViewADVPersadresse.SelectedNode.TagObject as System.Data.DataRow;
+ textBox8.Text = TreeViewADVPersadresse.SelectedNode.Text;
+ textBox1.Text = dr["zeile1"].ToString();
+ textBox2.Text = dr["zeile2"].ToString();
+ textBox3.Text = dr["zeile3"].ToString();
+ textBox4.Text = dr["zeile4"].ToString();
+ textBox5.Text = dr["zeile5"].ToString();
+ textBox6.Text = dr["zeile6"].ToString();
+ textBox7.Text = "";
+ panelpersadresse.Visible = true;
+ }catch
+ {
+
+ }
+ }
+
+ private void ribbonTab3_ActiveChanged(object sender, EventArgs e)
+ {
+ GrpBoxProfile.Visible = false;
+ GrpBoxDetails.Visible = false;
+ GrpBoxMitarbeiter.Visible = false;
+ GrpGAS.Visible = true;
+ }
}
}
diff --git a/Client/Diverses/MitarbeiterProfil.resx b/Client/Diverses/MitarbeiterProfil.resx
index c2257f62..594fe136 100644
--- a/Client/Diverses/MitarbeiterProfil.resx
+++ b/Client/Diverses/MitarbeiterProfil.resx
@@ -124,6 +124,12 @@
vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
+
+ 17, 17
+
+
+ 171, 17
+
AAABAAUAAAAAAAEAIACcHAAAVgAAADAwAAABACAAqCUAAPIcAAAgIAAAAQAgAKgQAACaQgAAGBgAAAEA
diff --git a/Client/DocMgmt/DokTypSelect.Designer.cs b/Client/DocMgmt/DokTypSelect.Designer.cs
index 546ff49f..3fe1c408 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();
@@ -117,7 +117,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(503, 74);
+ this.ribbon1.Size = new System.Drawing.Size(499, 74);
this.ribbon1.TabIndex = 0;
this.ribbon1.Tabs.Add(this.ribbonTab1);
this.ribbon1.TabSpacing = 4;
@@ -269,7 +269,7 @@ namespace OnDoc.DocMgmt
this.sfListView1.HotTracking = true;
this.sfListView1.Location = new System.Drawing.Point(2, 76);
this.sfListView1.Name = "sfListView1";
- this.sfListView1.Size = new System.Drawing.Size(503, 584);
+ this.sfListView1.Size = new System.Drawing.Size(499, 584);
this.sfListView1.TabIndex = 1;
this.sfListView1.Text = "sfListView1";
this.sfListView1.DoubleClick += new System.EventHandler(this.sfListView1_DoubleClick);
@@ -277,15 +277,15 @@ namespace OnDoc.DocMgmt
// treeViewAdv1
//
this.treeViewAdv1.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;
+ 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;
this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
- new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
+ new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)});
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(494, 517);
this.treeViewAdv1.ContextMenuStrip = this.contextMenuStripVorlagen;
this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -371,15 +371,15 @@ namespace OnDoc.DocMgmt
//
this.treeViewAdv2.AllowDrop = true;
this.treeViewAdv2.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window);
- 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;
+ 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.treeViewAdv2.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
- new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
+ new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.treeViewAdv2.BeforeTouchSize = new System.Drawing.Size(498, 523);
this.treeViewAdv2.ContextMenuStrip = this.contextMenuStripFavoriten;
this.treeViewAdv2.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -703,7 +703,7 @@ namespace OnDoc.DocMgmt
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(507, 662);
+ this.ClientSize = new System.Drawing.Size(503, 662);
this.Controls.Add(this.grpFavoriten);
this.Controls.Add(this.grpVorlagen);
this.Controls.Add(this.sfListView1);
diff --git a/Client/DocMgmt/DokTypSelect.resx b/Client/DocMgmt/DokTypSelect.resx
index 04fdf5dd..d54e5c10 100644
--- a/Client/DocMgmt/DokTypSelect.resx
+++ b/Client/DocMgmt/DokTypSelect.resx
@@ -283,7 +283,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACo
- DQAAAk1TRnQBSQFMAgEBBwEAAXABAQFwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ DQAAAk1TRnQBSQFMAgEBBwEAAXgBAQF4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -350,6 +350,12 @@
618, 16
+
+ 618, 16
+
+
+ 723, 16
+
723, 16
diff --git a/Client/Program.cs b/Client/Program.cs
index 14c46937..f2bd0469 100644
--- a/Client/Program.cs
+++ b/Client/Program.cs
@@ -79,7 +79,7 @@ namespace OnDoc
else
{
- if (args[0].ToString().ToUpper().IndexOf("PARTNERNR") > 0 || args[0].ToString().ToUpper().IndexOf("UCHECK") > 0 || args[0].ToString().ToUpper().IndexOf("OPENCLIENT") > 0 || args[0].ToString().ToUpper().IndexOf("CREATESB") > 0)
+ if (args[0].ToString().ToUpper().IndexOf("PARTNERNR") > 0 || args[0].ToString().ToUpper().IndexOf("UCHECK") > 0 || args[0].ToString().ToUpper().IndexOf("OPENCLIENT") > 0 || args[0].ToString().ToUpper().IndexOf("CREATESB") > 0|| args[0].ToString().ToUpper().IndexOf("CREATEPAC") > 0)
{
AppParams.init();
//MessageBox.Show(AppParams.tempdir);
diff --git a/Client/Start.cs b/Client/Start.cs
index 4439c87c..89532760 100644
--- a/Client/Start.cs
+++ b/Client/Start.cs
@@ -295,7 +295,14 @@ namespace OnDoc
}
if (ExternalCall.function.ToLower() == "createpac")
{
- dokList1.createdocumentpaket(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr));
+ if (ExternalCall.partnernr == "")
+ {
+ dokList1.createdocumentpaket(Convert.ToInt32(0), Convert.ToInt32(ExternalCall.dokumenttypnr));
+ }
+ else
+ {
+ dokList1.createdocumentpaket(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr));
+ }
}
if (ExternalCall.function.ToLower() == "createsb")
{
diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs
index b533ac07..f5896d7c 100644
--- a/Client/UIControls/DokList.cs
+++ b/Client/UIControls/DokList.cs
@@ -1645,7 +1645,7 @@ namespace OnDoc.UICintrols
}
private void ribbonButtonVersandstrasse_Click(object sender, EventArgs e)
{
-
+
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
int i = 0;
@@ -1675,7 +1675,7 @@ namespace OnDoc.UICintrols
vp.Mitteilung = "";
vp.GAS = "";
vp.GASAdresse = "";
- vp.PaketNr = i.ToString();
+ vp.PaketNr = Guid.NewGuid().ToString();
vp.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString()));
reserve_vs_dokument(datarow["dokumentid"].ToString(), 1);
diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx
index 4cce1206..295a528e 100644
--- a/Client/UIControls/DokList.resx
+++ b/Client/UIControls/DokList.resx
@@ -190,7 +190,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
@@ -205,7 +205,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
@@ -220,7 +220,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
diff --git a/Client/UIControls/Serienbrief.cs b/Client/UIControls/Serienbrief.cs
index 1a4d047d..ef0a611e 100644
--- a/Client/UIControls/Serienbrief.cs
+++ b/Client/UIControls/Serienbrief.cs
@@ -936,6 +936,9 @@ namespace OnDoc.UIControls
{
RibbonButtonArchivierenUndAbschlessen.Enabled = true;
ribbonButtonVersandstrasse.Enabled = true;
+ ribbonButtonVersandstrasse.Enabled = true;
+ if (sb.ppfaktura!=0) { ribbonButtonVersandstrasse.Enabled = false; }
+
ribbonButtonDruckstapel.Enabled = true;
if (cbdigitaleunterschrfiten.Checked)
@@ -2886,6 +2889,31 @@ namespace OnDoc.UIControls
vp.GAS = "";
vp.GASAdresse = "";
vp.PaketNr = "0";
+
+ DataView dv = new DataView(sb.dsempfaenger.Tables[0]);
+ DB db = new DB(AppParams.connectionstring);
+ init_progressbar("Dokumente vorbereiten", dv.Count);
+ dv.RowFilter = "Status = 1";
+ dv.Sort = "Partnernr";
+ foreach (DataRowView rowView in dv)
+ {
+ add_progress();
+ OnBaseDocUpload.OnBaseDokument onbasedoc = new OnBaseDocUpload.OnBaseDokument();
+ System.Data.DataRow dr = rowView.Row;
+ db.Get_Tabledata("Select dokumentid, dbo.BinaryToBase64(dokument) as dokument from edex_sb_serienbrief_dokument where dokumentid='" + dr["dokumentid"].ToString() + "' order by inteintragnr", false, true);
+ string dokument = db.dsdaten.Tables[0].Rows[0]["dokument"].ToString();
+ db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + dr["partnernr"].ToString(), false, true);
+ Versanddokument vd = new Versanddokument("", "", "");
+ vd.Partnernr = dr["Partnernr"].ToString();
+ vd.inteintragnr = Convert.ToInt32(dr["inteintragnr"].ToString());
+ vd.Bezeichnung = dr["Partnernr"].ToString() + " - " + db.dsdaten.Tables[0].Rows[0][0].ToString();
+ vd.DokumentID = dr["dokumentid"].ToString();
+ vd.dokument = dokument;
+ vp.Dokument.Add(vd);
+ add_progress();
+ }
+ db = null;
+ finish_progress();
versandpakete.Add(vp);
OnDoc.Versandstrasse.Versandstrasse vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete);
vs.ShowDialog();
diff --git a/Client/Versandstrasse/Versandstrasse.Designer.cs b/Client/Versandstrasse/Versandstrasse.Designer.cs
index 75cdd67a..2cc55d32 100644
--- a/Client/Versandstrasse/Versandstrasse.Designer.cs
+++ b/Client/Versandstrasse/Versandstrasse.Designer.cs
@@ -30,15 +30,15 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Versandstrasse));
- Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings1 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
- Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings1 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
- Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings1 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
+ Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings3 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
+ Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings3 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
+ Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings3 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
+ Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings4 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
+ Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings4 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
+ Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings4 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
- Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings2 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
- Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings2 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
- Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings2 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
- Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
@@ -47,10 +47,18 @@
this.tsbtnDruckPaketNew = new System.Windows.Forms.ToolStripButton();
this.tscheckboxpreview = new Syncfusion.Windows.Forms.Tools.ToolStripCheckBox();
this.tsbtnVersenden = new System.Windows.Forms.ToolStripButton();
+ this.tschkcouvertpos = new Syncfusion.Windows.Forms.Tools.ToolStripCheckBox();
+ this.tsbtnpreviewdoc = new System.Windows.Forms.ToolStripButton();
+ this.tsbtncheckaddress = new System.Windows.Forms.ToolStripButton();
this.panelPrepare = new System.Windows.Forms.Panel();
this.label4 = new System.Windows.Forms.Label();
this.pdfViewerControl1 = new Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl();
this.GrpPaketDetails = new System.Windows.Forms.GroupBox();
+ this.panelverifysb = new System.Windows.Forms.Panel();
+ this.btnsendserienbrief = new System.Windows.Forms.Button();
+ this.button5 = new System.Windows.Forms.Button();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
this.panelVerify = new System.Windows.Forms.Panel();
this.button3 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
@@ -75,16 +83,19 @@
this.tabPageAdv1 = new Syncfusion.Windows.Forms.Tools.TabPageAdv();
this.tabPageAdv2 = new Syncfusion.Windows.Forms.Tools.TabPageAdv();
this.pdfViewerControl2 = new Syncfusion.Windows.Forms.PdfViewer.PdfViewerControl();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
this.treeViewAdvCouverts = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
- this.imageList2 = new System.Windows.Forms.ImageList(this.components);
this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.versandCouvertLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.versandCouvertÖffnenbearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.imageList2 = new System.Windows.Forms.ImageList(this.components);
+ this.txtadresse = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
this.contextMenuStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.panelPrepare.SuspendLayout();
this.GrpPaketDetails.SuspendLayout();
+ this.panelverifysb.SuspendLayout();
this.panelVerify.SuspendLayout();
this.groupBox3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).BeginInit();
@@ -95,9 +106,9 @@
this.TabControlDokuments.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
this.tabPageAdv2.SuspendLayout();
+ this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdvCouverts)).BeginInit();
this.contextMenuStrip2.SuspendLayout();
- this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// contextMenuStrip1
@@ -106,13 +117,14 @@
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.löschenToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
- this.contextMenuStrip1.Size = new System.Drawing.Size(181, 48);
+ this.contextMenuStrip1.Size = new System.Drawing.Size(119, 26);
+ this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
this.contextMenuStrip1.Click += new System.EventHandler(this.contextMenuStrip1_Click);
//
// löschenToolStripMenuItem
//
this.löschenToolStripMenuItem.Name = "löschenToolStripMenuItem";
- this.löschenToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.löschenToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.löschenToolStripMenuItem.Text = "Löschen";
this.löschenToolStripMenuItem.Click += new System.EventHandler(this.löschenToolStripMenuItem_Click);
//
@@ -144,10 +156,13 @@
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsbtnDruckPaketNew,
this.tscheckboxpreview,
- this.tsbtnVersenden});
+ this.tsbtnVersenden,
+ this.tschkcouvertpos,
+ this.tsbtnpreviewdoc,
+ this.tsbtncheckaddress});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(1509, 46);
+ this.toolStrip1.Size = new System.Drawing.Size(1430, 46);
this.toolStrip1.TabIndex = 8;
this.toolStrip1.Text = "toolStrip1";
this.toolStrip1.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.toolStrip1_ItemClicked);
@@ -163,9 +178,12 @@
//
// tscheckboxpreview
//
+ this.tscheckboxpreview.Checked = true;
+ this.tscheckboxpreview.CheckState = System.Windows.Forms.CheckState.Checked;
this.tscheckboxpreview.Name = "tscheckboxpreview";
this.tscheckboxpreview.Size = new System.Drawing.Size(205, 43);
this.tscheckboxpreview.Text = "Vorschau aufbereitete Dokumente";
+ this.tscheckboxpreview.Visible = false;
//
// tsbtnVersenden
//
@@ -176,11 +194,46 @@
this.tsbtnVersenden.Text = "Dokumente an Versandstrasse übergeben";
this.tsbtnVersenden.Visible = false;
//
+ // tschkcouvertpos
+ //
+ this.tschkcouvertpos.Checked = true;
+ this.tschkcouvertpos.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.tschkcouvertpos.Name = "tschkcouvertpos";
+ this.tschkcouvertpos.Size = new System.Drawing.Size(217, 43);
+ this.tschkcouvertpos.Text = "Adressposition für Couvert anzeigen";
+ this.tschkcouvertpos.Visible = false;
+ this.tschkcouvertpos.CheckedChanged += new System.EventHandler(this.tschkcouvertpos_CheckedChanged);
+ //
+ // tsbtnpreviewdoc
+ //
+ this.tsbtnpreviewdoc.Checked = true;
+ this.tsbtnpreviewdoc.CheckOnClick = true;
+ this.tsbtnpreviewdoc.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.tsbtnpreviewdoc.Image = global::OnDoc.Properties.Resources.Preview_Rechts_32x32_32;
+ this.tsbtnpreviewdoc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsbtnpreviewdoc.Name = "tsbtnpreviewdoc";
+ this.tsbtnpreviewdoc.Size = new System.Drawing.Size(209, 43);
+ this.tsbtnpreviewdoc.Text = "Vorschau aufbereitetes Dokument";
+ this.tsbtnpreviewdoc.Click += new System.EventHandler(this.tsbtnpreviewdoc_Click);
+ //
+ // tsbtncheckaddress
+ //
+ this.tsbtncheckaddress.Checked = true;
+ this.tsbtncheckaddress.CheckOnClick = true;
+ this.tsbtncheckaddress.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.tsbtncheckaddress.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.tsbtncheckaddress.Image = ((System.Drawing.Image)(resources.GetObject("tsbtncheckaddress.Image")));
+ this.tsbtncheckaddress.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsbtncheckaddress.Name = "tsbtncheckaddress";
+ this.tsbtncheckaddress.Size = new System.Drawing.Size(202, 43);
+ this.tsbtncheckaddress.Text = "Adressposition für Couvert anzeigen";
+ this.tsbtncheckaddress.Click += new System.EventHandler(this.tsbtncheckaddress_Click);
+ //
// panelPrepare
//
this.panelPrepare.BackColor = System.Drawing.Color.Silver;
this.panelPrepare.Controls.Add(this.label4);
- this.panelPrepare.Location = new System.Drawing.Point(351, 20);
+ this.panelPrepare.Location = new System.Drawing.Point(1090, 9);
this.panelPrepare.Name = "panelPrepare";
this.panelPrepare.Size = new System.Drawing.Size(832, 94);
this.panelPrepare.TabIndex = 14;
@@ -207,30 +260,30 @@
this.pdfViewerControl1.IsTextSearchEnabled = true;
this.pdfViewerControl1.IsTextSelectionEnabled = true;
this.pdfViewerControl1.Location = new System.Drawing.Point(888, 46);
- messageBoxSettings1.EnableNotification = true;
- this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings1;
+ messageBoxSettings3.EnableNotification = true;
+ this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings3;
this.pdfViewerControl1.MinimumZoomPercentage = 50;
this.pdfViewerControl1.Name = "pdfViewerControl1";
this.pdfViewerControl1.PageBorderThickness = 1;
- pdfViewerPrinterSettings1.Copies = 1;
- pdfViewerPrinterSettings1.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
- pdfViewerPrinterSettings1.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
- pdfViewerPrinterSettings1.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings1.PrintLocation")));
- pdfViewerPrinterSettings1.ShowPrintStatusDialog = true;
- this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings1;
+ pdfViewerPrinterSettings3.Copies = 1;
+ pdfViewerPrinterSettings3.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
+ pdfViewerPrinterSettings3.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
+ pdfViewerPrinterSettings3.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings3.PrintLocation")));
+ pdfViewerPrinterSettings3.ShowPrintStatusDialog = true;
+ this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings3;
this.pdfViewerControl1.ReferencePath = null;
this.pdfViewerControl1.ScrollDisplacementValue = 0;
this.pdfViewerControl1.ShowHorizontalScrollBar = true;
this.pdfViewerControl1.ShowToolBar = true;
this.pdfViewerControl1.ShowVerticalScrollBar = true;
- this.pdfViewerControl1.Size = new System.Drawing.Size(621, 556);
+ this.pdfViewerControl1.Size = new System.Drawing.Size(542, 555);
this.pdfViewerControl1.SpaceBetweenPages = 8;
this.pdfViewerControl1.TabIndex = 10;
this.pdfViewerControl1.Text = "pdfViewerControl1";
- textSearchSettings1.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
- 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;
+ textSearchSettings3.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
+ textSearchSettings3.HighlightAllInstance = true;
+ textSearchSettings3.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
+ this.pdfViewerControl1.TextSearchSettings = textSearchSettings3;
this.pdfViewerControl1.ThemeName = "Default";
this.pdfViewerControl1.VerticalScrollOffset = 0;
this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default;
@@ -238,6 +291,7 @@
//
// GrpPaketDetails
//
+ this.GrpPaketDetails.Controls.Add(this.panelverifysb);
this.GrpPaketDetails.Controls.Add(this.panelVerify);
this.GrpPaketDetails.Controls.Add(this.btnPrepare);
this.GrpPaketDetails.Controls.Add(this.groupBox3);
@@ -250,6 +304,58 @@
this.GrpPaketDetails.TabStop = false;
this.GrpPaketDetails.Text = "Details zum Couvert";
//
+ // panelverifysb
+ //
+ this.panelverifysb.Controls.Add(this.btnsendserienbrief);
+ this.panelverifysb.Controls.Add(this.button5);
+ this.panelverifysb.Controls.Add(this.label1);
+ this.panelverifysb.Controls.Add(this.label5);
+ this.panelverifysb.Location = new System.Drawing.Point(9, 383);
+ this.panelverifysb.Name = "panelverifysb";
+ this.panelverifysb.Size = new System.Drawing.Size(431, 100);
+ this.panelverifysb.TabIndex = 9;
+ this.panelverifysb.Visible = false;
+ //
+ // btnsendserienbrief
+ //
+ this.btnsendserienbrief.BackColor = System.Drawing.Color.Salmon;
+ this.btnsendserienbrief.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btnsendserienbrief.Location = new System.Drawing.Point(209, 58);
+ this.btnsendserienbrief.Name = "btnsendserienbrief";
+ this.btnsendserienbrief.Size = new System.Drawing.Size(216, 35);
+ this.btnsendserienbrief.TabIndex = 9;
+ this.btnsendserienbrief.Text = "Versand unwiderruflich auslösen";
+ this.btnsendserienbrief.UseVisualStyleBackColor = false;
+ this.btnsendserienbrief.Click += new System.EventHandler(this.btnsendserienbrief_Click);
+ //
+ // button5
+ //
+ this.button5.Location = new System.Drawing.Point(3, 68);
+ this.button5.Name = "button5";
+ this.button5.Size = new System.Drawing.Size(123, 23);
+ this.button5.TabIndex = 7;
+ this.button5.Text = "Abbrechen";
+ this.button5.UseVisualStyleBackColor = true;
+ this.button5.Click += new System.EventHandler(this.button5_Click);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(4, 17);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(133, 13);
+ this.label1.TabIndex = 7;
+ this.label1.Text = "Versandstrasse bergeben. ";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(4, 4);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(380, 13);
+ this.label5.TabIndex = 6;
+ this.label5.Text = "Durch \"Versand unwiderruflich auslösen\" werden die Doikumente direkt an die ";
+ //
// panelVerify
//
this.panelVerify.Controls.Add(this.button3);
@@ -271,8 +377,9 @@
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(196, 35);
this.button3.TabIndex = 8;
- this.button3.Text = "Direkt versenden (Tests)";
+ this.button3.Text = "Direkt versenden (nur Tests)";
this.button3.UseVisualStyleBackColor = false;
+ this.button3.Visible = false;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// button2
@@ -290,18 +397,18 @@
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(4, 17);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(141, 13);
+ this.label3.Size = new System.Drawing.Size(152, 13);
this.label3.TabIndex = 7;
- this.label3.Text = "der Druckaufgrag ausgelöst.";
+ this.label3.Text = "der Druckauftrag bereit gestellt";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(4, 4);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(310, 13);
+ this.label2.Size = new System.Drawing.Size(345, 13);
this.label2.TabIndex = 6;
- this.label2.Text = "Das aufbereitete PDF prüfen. Sofern \"geprüft\" betätigt wird, wird";
+ this.label2.Text = "Prüfen des aufbereiteten PDS. Nach betätigen von \"Versand auslösen\"";
//
// btnSendFinal
//
@@ -311,7 +418,7 @@
this.btnSendFinal.Name = "btnSendFinal";
this.btnSendFinal.Size = new System.Drawing.Size(196, 35);
this.btnSendFinal.TabIndex = 5;
- this.btnSendFinal.Text = "Versenden (Queue)";
+ this.btnSendFinal.Text = "Versand auslösen";
this.btnSendFinal.UseVisualStyleBackColor = false;
this.btnSendFinal.Click += new System.EventHandler(this.btnSendFinal_Click);
//
@@ -327,6 +434,8 @@
//
// groupBox3
//
+ this.groupBox3.Controls.Add(this.label6);
+ this.groupBox3.Controls.Add(this.txtadresse);
this.groupBox3.Controls.Add(this.treeViewAdvAdresse);
this.groupBox3.Controls.Add(this.chkGAS);
this.groupBox3.Dock = System.Windows.Forms.DockStyle.Top;
@@ -339,16 +448,16 @@
// treeViewAdvAdresse
//
this.treeViewAdvAdresse.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;
+ treeNodeAdvStyleInfo4.CheckBoxTickThickness = 1;
+ treeNodeAdvStyleInfo4.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdvStyleInfo4.EnsureDefaultOptionedChild = true;
+ treeNodeAdvStyleInfo4.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdvStyleInfo4.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdvStyleInfo4.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
+ treeNodeAdvStyleInfo4.TextColor = System.Drawing.Color.Black;
this.treeViewAdvAdresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
- new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
- this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(417, 193);
+ new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo4)});
+ this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(259, 193);
//
//
//
@@ -363,7 +472,7 @@
this.treeViewAdvAdresse.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.treeViewAdvAdresse.Name = "treeViewAdvAdresse";
this.treeViewAdvAdresse.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
- this.treeViewAdvAdresse.Size = new System.Drawing.Size(417, 193);
+ this.treeViewAdvAdresse.Size = new System.Drawing.Size(259, 193);
this.treeViewAdvAdresse.TabIndex = 3;
this.treeViewAdvAdresse.Text = "treeViewAdv2";
this.treeViewAdvAdresse.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0;
@@ -493,7 +602,7 @@
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 46);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(888, 556);
+ this.panel3.Size = new System.Drawing.Size(888, 555);
this.panel3.TabIndex = 13;
//
// treeViewAdv1
@@ -501,17 +610,17 @@
this.treeViewAdv1.AllowDrop = true;
this.treeViewAdv1.BackColor = System.Drawing.Color.White;
this.treeViewAdv1.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))));
- treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1;
- treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true;
- treeNodeAdvStyleInfo2.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- 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.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
+ treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
+ treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true;
+ treeNodeAdvStyleInfo1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ 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.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
- new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
- this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(433, 556);
+ new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
+ this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(433, 555);
this.treeViewAdv1.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat;
this.treeViewAdv1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.ContextMenuStrip = this.contextMenuStrip1;
@@ -541,7 +650,7 @@
this.treeViewAdv1.SelectedNodeBackground = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(197)))), ((int)(((byte)(197))))));
this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdv1.ShowFocusRect = false;
- this.treeViewAdv1.Size = new System.Drawing.Size(433, 556);
+ this.treeViewAdv1.Size = new System.Drawing.Size(433, 555);
this.treeViewAdv1.Style = Syncfusion.Windows.Forms.Tools.TreeStyle.Office2016Colorful;
this.treeViewAdv1.TabIndex = 7;
this.treeViewAdv1.Text = "treeViewAdv2";
@@ -580,7 +689,7 @@
this.TabControlDokuments.Dock = System.Windows.Forms.DockStyle.Fill;
this.TabControlDokuments.Location = new System.Drawing.Point(2, 2);
this.TabControlDokuments.Name = "TabControlDokuments";
- this.TabControlDokuments.Size = new System.Drawing.Size(1519, 632);
+ this.TabControlDokuments.Size = new System.Drawing.Size(1440, 631);
this.TabControlDokuments.TabIndex = 20;
this.TabControlDokuments.ThemeStyle.PrimitiveButtonStyle.DisabledNextPageImage = null;
this.TabControlDokuments.SelectedIndexChanged += new System.EventHandler(this.TabControlDokuments_SelectedIndexChanged);
@@ -596,7 +705,7 @@
this.tabPageAdv1.Location = new System.Drawing.Point(5, 25);
this.tabPageAdv1.Name = "tabPageAdv1";
this.tabPageAdv1.ShowCloseButton = true;
- this.tabPageAdv1.Size = new System.Drawing.Size(1509, 602);
+ this.tabPageAdv1.Size = new System.Drawing.Size(1430, 601);
this.tabPageAdv1.Text = "Versand-Couvert erstellen";
this.tabPageAdv1.ThemesEnabled = false;
//
@@ -609,7 +718,7 @@
this.tabPageAdv2.Location = new System.Drawing.Point(5, 25);
this.tabPageAdv2.Name = "tabPageAdv2";
this.tabPageAdv2.ShowCloseButton = true;
- this.tabPageAdv2.Size = new System.Drawing.Size(1509, 602);
+ this.tabPageAdv2.Size = new System.Drawing.Size(1430, 601);
this.tabPageAdv2.Text = "Bereitgestellte Versand-Couverts";
this.tabPageAdv2.ThemesEnabled = false;
//
@@ -624,52 +733,63 @@
this.pdfViewerControl2.IsTextSearchEnabled = true;
this.pdfViewerControl2.IsTextSelectionEnabled = true;
this.pdfViewerControl2.Location = new System.Drawing.Point(482, 0);
- messageBoxSettings2.EnableNotification = true;
- this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings2;
+ messageBoxSettings4.EnableNotification = true;
+ this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings4;
this.pdfViewerControl2.MinimumZoomPercentage = 50;
this.pdfViewerControl2.Name = "pdfViewerControl2";
this.pdfViewerControl2.PageBorderThickness = 1;
- pdfViewerPrinterSettings2.Copies = 1;
- pdfViewerPrinterSettings2.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
- pdfViewerPrinterSettings2.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
- pdfViewerPrinterSettings2.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings2.PrintLocation")));
- pdfViewerPrinterSettings2.ShowPrintStatusDialog = true;
- this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings2;
+ pdfViewerPrinterSettings4.Copies = 1;
+ pdfViewerPrinterSettings4.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
+ pdfViewerPrinterSettings4.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
+ pdfViewerPrinterSettings4.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings4.PrintLocation")));
+ pdfViewerPrinterSettings4.ShowPrintStatusDialog = true;
+ this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings4;
this.pdfViewerControl2.ReferencePath = null;
this.pdfViewerControl2.ScrollDisplacementValue = 0;
this.pdfViewerControl2.ShowHorizontalScrollBar = true;
this.pdfViewerControl2.ShowToolBar = true;
this.pdfViewerControl2.ShowVerticalScrollBar = true;
- this.pdfViewerControl2.Size = new System.Drawing.Size(1027, 602);
+ this.pdfViewerControl2.Size = new System.Drawing.Size(948, 601);
this.pdfViewerControl2.SpaceBetweenPages = 8;
this.pdfViewerControl2.TabIndex = 11;
this.pdfViewerControl2.Text = "pdfViewerControl2";
- textSearchSettings2.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
- textSearchSettings2.HighlightAllInstance = true;
- textSearchSettings2.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
- this.pdfViewerControl2.TextSearchSettings = textSearchSettings2;
+ textSearchSettings4.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
+ textSearchSettings4.HighlightAllInstance = true;
+ textSearchSettings4.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
+ this.pdfViewerControl2.TextSearchSettings = textSearchSettings4;
this.pdfViewerControl2.ThemeName = "Default";
this.pdfViewerControl2.VerticalScrollOffset = 0;
this.pdfViewerControl2.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default;
this.pdfViewerControl2.ZoomMode = Syncfusion.Windows.Forms.PdfViewer.ZoomMode.Default;
//
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.treeViewAdvCouverts);
+ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left;
+ this.groupBox2.Location = new System.Drawing.Point(0, 0);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(482, 601);
+ this.groupBox2.TabIndex = 12;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Couverts";
+ //
// treeViewAdvCouverts
//
this.treeViewAdvCouverts.AllowDrop = true;
this.treeViewAdvCouverts.AllowMouseBasedSelection = true;
this.treeViewAdvCouverts.BackColor = System.Drawing.Color.White;
this.treeViewAdvCouverts.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))));
- treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1;
- treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true;
- treeNodeAdvStyleInfo3.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- 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.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
+ treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1;
+ treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true;
+ treeNodeAdvStyleInfo2.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ 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.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdvCouverts.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
- new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)});
- this.treeViewAdvCouverts.BeforeTouchSize = new System.Drawing.Size(476, 583);
+ new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
+ this.treeViewAdvCouverts.BeforeTouchSize = new System.Drawing.Size(476, 582);
this.treeViewAdvCouverts.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat;
this.treeViewAdvCouverts.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdvCouverts.ContextMenuStrip = this.contextMenuStrip2;
@@ -699,7 +819,7 @@
this.treeViewAdvCouverts.SelectedNodeBackground = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(197)))), ((int)(((byte)(197))))));
this.treeViewAdvCouverts.SelectedNodeForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdvCouverts.ShowFocusRect = false;
- this.treeViewAdvCouverts.Size = new System.Drawing.Size(476, 583);
+ this.treeViewAdvCouverts.Size = new System.Drawing.Size(476, 582);
this.treeViewAdvCouverts.Style = Syncfusion.Windows.Forms.Tools.TreeStyle.Office2016Colorful;
this.treeViewAdvCouverts.TabIndex = 8;
this.treeViewAdvCouverts.Text = "treeViewAdv2";
@@ -725,16 +845,9 @@
this.treeViewAdvCouverts.TransparentControls = true;
this.treeViewAdvCouverts.AfterSelect += new System.EventHandler(this.treeViewAdvCouverts_AfterSelect);
//
- // imageList2
- //
- this.imageList2.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList2.ImageStream")));
- this.imageList2.TransparentColor = System.Drawing.Color.Transparent;
- this.imageList2.Images.SetKeyName(0, "APost.png");
- this.imageList2.Images.SetKeyName(1, "B1.png");
- this.imageList2.Images.SetKeyName(2, "B2.png");
- //
// contextMenuStrip2
//
+ this.contextMenuStrip2.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.versandCouvertLöschenToolStripMenuItem,
this.versandCouvertÖffnenbearbeitenToolStripMenuItem});
@@ -755,22 +868,37 @@
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Text = "Versand-Couvert öffnen/bearbeiten";
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertÖffnenbearbeitenToolStripMenuItem_Click);
//
- // groupBox2
+ // imageList2
//
- this.groupBox2.Controls.Add(this.treeViewAdvCouverts);
- this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left;
- this.groupBox2.Location = new System.Drawing.Point(0, 0);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(482, 602);
- this.groupBox2.TabIndex = 12;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Couverts";
+ this.imageList2.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList2.ImageStream")));
+ this.imageList2.TransparentColor = System.Drawing.Color.Transparent;
+ this.imageList2.Images.SetKeyName(0, "APost.png");
+ this.imageList2.Images.SetKeyName(1, "B1.png");
+ this.imageList2.Images.SetKeyName(2, "B2.png");
+ //
+ // txtadresse
+ //
+ this.txtadresse.Location = new System.Drawing.Point(268, 44);
+ this.txtadresse.Multiline = true;
+ this.txtadresse.Name = "txtadresse";
+ this.txtadresse.ReadOnly = true;
+ this.txtadresse.Size = new System.Drawing.Size(163, 97);
+ this.txtadresse.TabIndex = 12;
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(265, 25);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(93, 13);
+ this.label6.TabIndex = 10;
+ this.label6.Text = "Gewählte Adresse";
//
// Versandstrasse
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1523, 636);
+ this.ClientSize = new System.Drawing.Size(1444, 635);
this.Controls.Add(this.TabControlDokuments);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.KeyPreview = true;
@@ -785,6 +913,8 @@
this.panelPrepare.ResumeLayout(false);
this.panelPrepare.PerformLayout();
this.GrpPaketDetails.ResumeLayout(false);
+ this.panelverifysb.ResumeLayout(false);
+ this.panelverifysb.PerformLayout();
this.panelVerify.ResumeLayout(false);
this.panelVerify.PerformLayout();
this.groupBox3.ResumeLayout(false);
@@ -798,9 +928,9 @@
this.TabControlDokuments.ResumeLayout(false);
this.tabPageAdv1.ResumeLayout(false);
this.tabPageAdv2.ResumeLayout(false);
+ this.groupBox2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.treeViewAdvCouverts)).EndInit();
this.contextMenuStrip2.ResumeLayout(false);
- this.groupBox2.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -848,5 +978,15 @@
private System.Windows.Forms.ToolStripMenuItem versandCouvertLöschenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem versandCouvertÖffnenbearbeitenToolStripMenuItem;
private System.Windows.Forms.GroupBox groupBox2;
+ private Syncfusion.Windows.Forms.Tools.ToolStripCheckBox tschkcouvertpos;
+ private System.Windows.Forms.Button btnsendserienbrief;
+ private System.Windows.Forms.Panel panelverifysb;
+ private System.Windows.Forms.Button button5;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.ToolStripButton tsbtnpreviewdoc;
+ private System.Windows.Forms.ToolStripButton tsbtncheckaddress;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.TextBox txtadresse;
}
}
\ No newline at end of file
diff --git a/Client/Versandstrasse/Versandstrasse.cs b/Client/Versandstrasse/Versandstrasse.cs
index ab04d226..d0a60a44 100644
--- a/Client/Versandstrasse/Versandstrasse.cs
+++ b/Client/Versandstrasse/Versandstrasse.cs
@@ -50,30 +50,61 @@ namespace OnDoc.Versandstrasse
new QueryDragInsertInfoEventHandler(treeViewDragHighlightTracker_QueryDragInsertInfo);
this.pakete = pakete;
this.serienbrief = pakete[0].isSerienbrief;
+
if (serienbrief)
{
+ this.tsbtnDruckPaketNew.Enabled = false;
+ this.TabControlDokuments.TabPages[1].Enabled = false;
this.sb = pakete[0].sb;
+ this.btnPrepare.Text = "Versand prüfen";
+ }
+ else
+ {
+ tsbtnDruckPaketNew.Enabled = true;
}
}
private void load_adressen()
{
+ bool hasprivateaddresses = false;
DB db = new DB(AppParams.connectionstring);
+ db.Get_Tabledata("Select * from Antwortadresse_mitarbeiter order by reihenfolge", false, true);
+ if (db.dsdaten.Tables[0].Rows.Count > 0)
+ {
+ hasprivateaddresses = true;
+ foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
+ {
+ TreeNodeAdv node = new TreeNodeAdv();
+ node.Text = dr["bezeichnung"].ToString();
+ node.TagObject = dr;
+ treeViewAdvAdresse.Nodes.Add(node);
+
+ }
+
+ TreeNodeAdv stdnode = new TreeNodeAdv();
+ stdnode.Text = "Standard-Adressen";
+ treeViewAdvAdresse.Nodes.Add(stdnode);
+ treeViewAdvAdresse.SelectedNode = stdnode;
+ }
db.Get_Tabledata("Select * from Antwortadresse order by bezeichnung", false, true);
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
TreeNodeAdv node = new TreeNodeAdv();
node.Text = dr["bezeichnung"].ToString();
node.TagObject = dr;
- treeViewAdvAdresse.Nodes.Add(node);
-
+ if (hasprivateaddresses) { treeViewAdvAdresse.SelectedNode.Nodes.Add(node); } else { treeViewAdvAdresse.Nodes.Add(node); }
}
- treeViewAdvAdresse.Enabled = false;
+
treeViewAdvAdresse.SelectedNode = treeViewAdvAdresse.Nodes[0];
+ treeViewAdvAdresse.Enabled = false;
+
+ db = null;
}
private void Versandstrasse_Load(object sender, EventArgs e)
{
+
+
Reload_Tree();
load_adressen();
}
@@ -101,14 +132,19 @@ namespace OnDoc.Versandstrasse
DruckJob = new TreeNodeAdv();
DruckJob.Text = "Versand-Couvert - " + db.dsdaten.Tables[0].Rows[0][0].ToString();
DruckJob.Tag = "Druckpaket";
+ //pakete[i].partnernr = i;
DruckJob.TagObject = pakete[i];
set_nodeimage(DruckJob, 0);
-
+
treeViewAdv1.Nodes.Add(DruckJob);
PopulateDocs(pakete[i], ref DruckJob);
}
- db = null;
+
+ db.Get_Tabledata("Select * from [applikation] where applikationsnr = 1", false, true);
+ if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Showlogin"]) == true) { button3.Visible = true; } else { button3.Visible = false; }
+
+ db = null;
treeViewAdv1.ExpandAll();
foreach (TreeNodeAdv node in treeViewAdv1.Nodes)
{
@@ -131,9 +167,15 @@ namespace OnDoc.Versandstrasse
}
private bool Verify_Couvert(TreeNodeAdv node)
{
- DB db = new DB(AppParams.connectionstring);
+
Versandpaket vp = node.TagObject as Versandpaket;
+ if (vp.isSerienbrief)
+ {
+ set_nodeimage(node, 1);
+ return true;
+ }
+ DB db = new DB(AppParams.connectionstring);
if (vp.partnernr == 0 && node.Nodes.Count==1)
{
TreeNodeAdv tn = node.Nodes[0];
@@ -143,6 +185,10 @@ namespace OnDoc.Versandstrasse
}
+ if (chkGAS.Checked && txtadresse.Text == "")
+ {
+ return false;
+ }
int currentbp = vp.partnernr;
//node.LeftImageIndices = new int[] { 0 };
int nodecounter = 0;
@@ -204,13 +250,11 @@ namespace OnDoc.Versandstrasse
private void populate_serienbriefe()
{
- DB db = new DB(AppParams.connectionstring);
- db.Get_Tabledata("Select dokumentid, dbo.BinaryToBase64(dokument) as dokument from edex_sb_serienbrief_dokument where serienbriefnr=" + sb.serienbriefnr.ToString() + "order by inteintragnr", false, true);
- foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
+ foreach (Versanddokument vd in pakete[0].Dokument)
{
TreeNodeAdv tn = new TreeNodeAdv();
- tn.Text = dr["dokumentid"].ToString();
- tn.Tag = dr["dokument"].ToString();
+ tn.Text = vd.DokumentID + " - " + vd.Bezeichnung;
+ tn.Tag = vd.dokument;
set_nodeimage(tn, 3);
treeViewAdv1.Nodes[0].Nodes.Add(tn);
}
@@ -225,6 +269,7 @@ namespace OnDoc.Versandstrasse
dokumentnode.Text = paket.Dokument[i].Bezeichnung + " (" + paket.Dokument[i].Partnernr + ")";
dokumentnode.Tag = paket.Dokument[i].DokumentID;
dokumentnode.TagObject = paket.Dokument[i];
+ reserve_vs_dokument(dokumentnode.Tag.ToString(), 3);
db.Get_Tabledata("SELECT dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc FROM dbo.dokument INNER JOIN " +
" dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr where dbo.dokument.dokumentid='" + dokumentnode.Tag + "'", false, true);
@@ -402,7 +447,7 @@ namespace OnDoc.Versandstrasse
private void treeViewAdv1_NodeMouseClick(object sender, TreeViewAdvMouseClickEventArgs e)
{
-
+
}
private void button1_Click(object sender, EventArgs e)
@@ -424,6 +469,7 @@ namespace OnDoc.Versandstrasse
private void btnSend_Click(object sender, EventArgs e)
{
+ Cursor.Current = Cursors.WaitCursor;
if (serienbrief)
{
clsVersandstrasse vs = new clsVersandstrasse();
@@ -432,10 +478,16 @@ namespace OnDoc.Versandstrasse
tn.TagObject = vs.Prepare_PDF(tn.Text.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, sb, tn.Tag.ToString());
}
vs = null;
- panelVerify.Visible = true;
+ panelVerify.Visible = false;
+ panelverifysb.Visible = true;
+ btnsendserienbrief.Visible = true;
+ btnSendFinal.Visible = false;
return;
}
panelPrepare.Visible = true;
+ panelverifysb.Visible = false;
+ btnsendserienbrief.Visible = false;
+ btnSendFinal.Visible = true;
Application.DoEvents();
Cursor = Cursors.WaitCursor;
try
@@ -532,6 +584,9 @@ namespace OnDoc.Versandstrasse
if (chkGAS.Checked)
{
treeViewAdvAdresse.Enabled = true;
+ treeViewAdvAdresse.SelectedNode = treeViewAdvAdresse.Nodes[0];
+ treeViewAdvAdresse_AfterSelect(sender, e);
+
Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket;
vp.GAS = "1";
treeViewAdv1.SelectedNode.TagObject = vp;
@@ -550,6 +605,7 @@ namespace OnDoc.Versandstrasse
direktversenden = true;
btnSendFinal_Click(sender, e);
direktversenden = false;
+ this.panelVerify.Visible = false;
}
private void btnSendFinal_Click(object sender, EventArgs e)
@@ -559,14 +615,16 @@ namespace OnDoc.Versandstrasse
Versandpaket svp = treeViewAdv1.Nodes[0].TagObject as Versandpaket;
foreach (TreeNodeAdv node in treeViewAdv1.Nodes[0].Nodes)
{
+
svp.finaldoc = node.TagObject.ToString();
svp.send_onbase_doc = true;
- string _sqlWhere = @"dokumentid = '" + node.Text + "'";
+ string _sqlWhere = @"dokumentid = '" + node.Text.Substring(0,22) + "'";
+ string dokumentid = node.Text.Substring(0, 22);
DataTable _newDataTable = sb.dsempfaenger.Tables[0].Select(_sqlWhere, "").CopyToDataTable();
svp.partnernr = Convert.ToInt32(_newDataTable.Rows[0]["partnernr"].ToString());
- Versanddokument vd = new Versanddokument(node.Text, "", svp.partnernr.ToString());
+ Versanddokument vd = new Versanddokument(dokumentid, "", svp.partnernr.ToString());
vd.dokument = node.TagObject.ToString();
vd.inteintragnr = Convert.ToInt32(_newDataTable.Rows[0]["inteintragnr"].ToString());
@@ -583,7 +641,9 @@ namespace OnDoc.Versandstrasse
db = null;
send_vs(ref svp, false);
+
}
+ pdfViewerControl1.Unload();
return;
}
panelVerify.Visible = false;
@@ -591,8 +651,10 @@ namespace OnDoc.Versandstrasse
vp.verified = true;
treeViewAdv1.SelectedNode.TagObject = vp;
panelVerify.Visible = false;
+ pakete.Remove(vp);
SendTo_Versandstrasse();
+ pdfViewerControl1.Unload();
}
private void SendTo_Versandstrasse()
@@ -601,6 +663,8 @@ namespace OnDoc.Versandstrasse
vp.send_onbase_doc = true;
DB db = new DB(AppParams.connectionstring);
string dokumente = "";
+ if (vp.Dokument.Count > 1) { vp.send_onbase_doc = false; }
+ else {
foreach (Versanddokument vd in vp.Dokument)
{
dokumente = dokumente + vd.DokumentID + ";";
@@ -612,6 +676,7 @@ namespace OnDoc.Versandstrasse
vp.send_onbase_doc = false;
}
}
+ }
db.clear_parameter();
db.add_parameter("@tgnummer", AppParams.currenttgnummer);
db.add_parameter("@partnernr", vp.partnernr.ToString());
@@ -624,7 +689,7 @@ namespace OnDoc.Versandstrasse
send_vs(ref vp);
}
- private void send_vs(ref Versandpaket vp, bool showmessage = true, bool direktversenden = false)
+ private void send_vs(ref Versandpaket vp, bool showmessage = true)
{
string jsonstring = JsonConvert.SerializeObject(vp);
@@ -728,8 +793,24 @@ namespace OnDoc.Versandstrasse
vp.GASAdresse = dr2["einzeilig"].ToString();
treeViewAdv1.SelectedNode.TagObject = vp;
+ txtadresse.Text = "";
+
+ txtadresse.Text = dr["zeile1"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile2"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile3"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile4"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile5"].ToString() + Environment.NewLine;
+ txtadresse.Text = txtadresse.Text + dr["zeile6"].ToString() + Environment.NewLine;
+ try
+ {
+ txtadresse.Text = txtadresse.Text + dr["zeile7"].ToString() + Environment.NewLine;
+ }
+ catch { }
+
+ }
+ catch {
+ txtadresse.Text = "";
}
- catch { }
}
@@ -751,9 +832,11 @@ namespace OnDoc.Versandstrasse
{
try
{
+ Cursor.Current = Cursors.WaitCursor;
TreeNodeAdv node = treeViewAdv1.SelectedNode;
if (node.Level == 1)
{
+
if (Verify_Couvert(node) == false)
{
GrpPaketDetails.Enabled = false;
@@ -798,12 +881,12 @@ namespace OnDoc.Versandstrasse
string dok = "";
if (serienbrief)
{
- dok = vs.Prepare_PDF(node.Text.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, sb, node.Tag.ToString());
+ dok = vs.Prepare_PDF(node.Text.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, sb, node.Tag.ToString(), this.tschkcouvertpos.Checked);
}
else
{
- dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath);
+ dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null,null,"",this.tschkcouvertpos.Checked);
}
var stream = new MemoryStream(Convert.FromBase64String(dok));
@@ -814,6 +897,7 @@ namespace OnDoc.Versandstrasse
}
}
catch { }
+ finally { Cursor.Current=Cursors.Default; }
}
private void button2_Click(object sender, EventArgs e)
@@ -895,11 +979,32 @@ namespace OnDoc.Versandstrasse
}
db = null;
+ pdfViewerControl2.Unload();
Refresh_VersandCouverts();
+
}
private void versandCouvertÖffnenbearbeitenToolStripMenuItem_Click(object sender, EventArgs e)
{
+ if (treeViewAdvCouverts.SelectedNode.Level != 1) { return; }
+ int id = Convert.ToInt32(treeViewAdvCouverts.SelectedNode.Tag);
+ DB db = new DB(AppParams.connectionstring);
+ db.Get_Tabledata("Select * from Ondoc_Versandstrasse_Paket where id=" +id.ToString(), false, true);
+ Versandpaket vp = JsonConvert.DeserializeObject(db.dsdaten.Tables[0].Rows[0]["Paket"].ToString());
+ pakete.Add(vp);
+
+ foreach (TreeNodeAdv tn in treeViewAdvCouverts.SelectedNodes)
+ {
+ db.Exec_SQL("Update ondoc_versandstrasse_paket set geloescht=getdate(), aktiv=0, geloescht_durch=" + AppParams.CurrentMitarbeiter.ToString() + " where id=" + id.ToString());
+
+ }
+ db = null;
+ treeViewAdvCouverts.Nodes.Remove(treeViewAdvCouverts.SelectedNode);
+ pdfViewerControl2.Unload();
+ Reload_Tree();
+ this.TabControlDokuments.SelectedIndex = 0;
+
+
}
@@ -911,8 +1016,9 @@ namespace OnDoc.Versandstrasse
if (node.Level > 1)
{
node = node.Parent;
- treeViewAdv1.SelectedNode.Remove();
reserve_vs_dokument(node.Tag.ToString(), 2);
+ treeViewAdv1.SelectedNode.Remove();
+
Verify_Couvert(node);
}
else
@@ -937,5 +1043,54 @@ namespace OnDoc.Versandstrasse
db.Get_Tabledata("Ondoc_Handle_Versandstrasse_Reserved_Dokcuments", true, false);
db = null;
}
+
+ private void tschkcouvertpos_CheckedChanged(object sender, EventArgs e)
+ {
+ treeViewAdv1_AfterSelect(sender, e);
+ }
+
+ private void contextMenuStrip1_Opening(object sender, CancelEventArgs e)
+ {
+ if (treeViewAdv1.SelectedNode.Level>1 && treeViewAdv1.SelectedNode.Parent.Text.Contains("Serienbrief"))
+ {
+ löschenToolStripMenuItem.Enabled = false;
+ }
+ else
+ {
+ löschenToolStripMenuItem.Enabled = true;
+ }
+ }
+
+ private void btnsendserienbrief_Click(object sender, EventArgs e)
+ {
+ direktversenden = true;
+ btnSendFinal_Click(sender, e);
+ direktversenden = false;
+ this.panelverifysb.Visible = false;
+ }
+
+ private void button5_Click(object sender, EventArgs e)
+ {
+ this.panelverifysb.Visible = false;
+ }
+
+ private void tsbtnpreviewdoc_Click(object sender, EventArgs e)
+ {
+ tscheckboxpreview.Checked=tsbtnpreviewdoc.Checked;
+ if (tsbtnpreviewdoc.Checked == false)
+ {
+ this.pdfViewerControl1.Unload();
+ }
+ else
+ {
+ treeViewAdv1_AfterSelect(sender, e);
+ }
+ }
+
+ private void tsbtncheckaddress_Click(object sender, EventArgs e)
+ {
+ tschkcouvertpos.Checked=tsbtncheckaddress.Checked;
+ treeViewAdv1_AfterSelect(sender, e);
+ }
}
}
diff --git a/Client/Versandstrasse/Versandstrasse.resx b/Client/Versandstrasse/Versandstrasse.resx
index e20044f9..5850d698 100644
--- a/Client/Versandstrasse/Versandstrasse.resx
+++ b/Client/Versandstrasse/Versandstrasse.resx
@@ -128,7 +128,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0
- DAAAAk1TRnQBSQFMAgEBBgEAAUgBAAFIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ DAAAAk1TRnQBSQFMAgEBBgEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -194,7 +194,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU
- DAAAAk1TRnQBSQFMAgEBBQEAAVABAAFQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ DAAAAk1TRnQBSQFMAgEBBQEAAaABAAGgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -251,14 +251,30 @@
17, 17
-
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
+ YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
+ /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
+ I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
+ cX79DFKrHHD5d9D26hvicx4pABt2lpg10zYzU0zr7+e3xXGcrkEB2O2TNec9nJFwB3alZn5jZorfeDZh
+ 6Q3g8s06BeCoKF4MRURoH1+BY2oNCbeb0TIclIYxOhzf8frTOuo7FxCbbVIAzpni0iceEc8vhzEwGkJD
+ lx83ymxifejdKjRNk/8PWnyIyTQqAJek0jqHwfEVscu31baIu8+90sTE4nY025dQ2/5FIPpnXlzKuK8A
+ HBUzHot52djqQ6HZhfR7IwK4mKpHtvEDMqvfCiQ6zaAAXM8x94aIWTNrLLG4kVUzgaTSPlzLtyJOZxbb
+ 1wtfyg4Q+AfA3aZlButjSfxGcUJBk4g5tuP3haQKRKXcUQDOmbvNTpPOJeFFjordZmbWTNvMTHFUcpUC
+ nOccAdABIDXXE1nzAAAAAElFTkSuQmCC
+
+
+
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
d2luZy5Qb2ludEYCAAAAAXgBeQAACwsCAAAAAAAAAAAAAAAL
-
+
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
@@ -276,7 +292,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq
- CQAAAk1TRnQBSQFMAgEBAwEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CQAAAk1TRnQBSQFMAgEBAwEAAWABAAFgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -318,7 +334,6 @@
AYABAQGAAQECAAs=
-
AAABAAUAAAAAAAEAIABcjwAAVgAAADAwAAABACAAqCUAALKPAAAgIAAAAQAgAKgQAABatQAAGBgAAAEA
diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe
index c049d65a..88ba22c7 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 aa44323a..9808fb95 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 7af25d30..add3010d 100644
Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ
diff --git a/Client/bin/Debug/Versandstrasse.dll b/Client/bin/Debug/Versandstrasse.dll
index ceb2b378..117f12a3 100644
Binary files a/Client/bin/Debug/Versandstrasse.dll and b/Client/bin/Debug/Versandstrasse.dll differ
diff --git a/Client/bin/Debug/Versandstrasse.pdb b/Client/bin/Debug/Versandstrasse.pdb
index bdbd2625..aee9a86c 100644
Binary files a/Client/bin/Debug/Versandstrasse.pdb and b/Client/bin/Debug/Versandstrasse.pdb differ
diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll
index 27659400..593bcc9a 100644
Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ
diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache
index 59c8e28e..4bf5e73c 100644
Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ
diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index cc5e2352..a5353415 100644
Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources b/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources
index c1cffffd..0ed22032 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.UICintrols.DokList.resources b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources
index 5eb9fac6..2bc5f2f5 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.Versandstrasse.Versandstrasse.resources b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources
index 6661cb3c..c4a106c5 100644
Binary files a/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources and b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources differ
diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe
index c049d65a..88ba22c7 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 aa44323a..9808fb95 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 27659400..593bcc9a 100644
Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ
diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache
index 974ebd38..e3a3d7e5 100644
Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ
diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache
index 347941ee..2976d09a 100644
Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ
diff --git a/Versandstrasse/Class1.cs b/Versandstrasse/Class1.cs
index 8e882dd3..f941657b 100644
--- a/Versandstrasse/Class1.cs
+++ b/Versandstrasse/Class1.cs
@@ -18,6 +18,7 @@ using Model;
using Syncfusion.Pdf;
using Syncfusion.Pdf.Graphics;
using Syncfusion.Pdf.Parsing;
+using Syncfusion.XPS;
namespace Versandstrasse
@@ -57,7 +58,7 @@ namespace Versandstrasse
string resturi = "";
string apikey = "";
- public string Prepare_PDF(string dokumentid, string tempdir, string connectionstring, string resturi, string apikey, string startuppath, versandscript vs = null, serienbrief sb = null, string sbsourcedok="")
+ public string Prepare_PDF(string dokumentid, string tempdir, string connectionstring, string resturi, string apikey, string startuppath, versandscript vs = null, serienbrief sb = null, string sbsourcedok="", bool couvertpos = false)
{
Lic();
this.resturi=resturi;
@@ -145,7 +146,11 @@ namespace Versandstrasse
{
Add_Logo(ref loadedDocument, vdok.LogoColor, vdok.LogoLeft, vdok.LogoTop, vdok.LogoWidth, vdok.LogoHeigth, vdok.LogoOnPages,this.resturi,this.apikey,startuppath);
}
-
+
+ if (couvertpos)
+ {
+ drawcouvert(ref loadedDocument);
+ }
if (vdok.TextReplaces.Count > 0)
{
foreach (TextReplace tr in vdok.TextReplaces)
@@ -336,6 +341,42 @@ namespace Versandstrasse
return "";
}
}
+
+ private void drawcouvert(ref PdfLoadedDocument document)
+ {
+ PdfLoadedPage loadedPage = document.Pages[0] as PdfLoadedPage;
+
+ PdfUnitConvertor convertor = new PdfUnitConvertor();
+
+ float leftmm = 120;
+ float topmm = 58;
+ float pointsLeft = convertor.ConvertUnits(leftmm, PdfGraphicsUnit.Millimeter, PdfGraphicsUnit.Point);
+ float pointstop = convertor.ConvertUnits(topmm, PdfGraphicsUnit.Millimeter, PdfGraphicsUnit.Point);
+
+ RectangleF bounds = new RectangleF(pointsLeft, pointstop, 100, 45);
+
+ //Set the page Transparency$PdfSolidBrush brush = new PdfSolidBrush(Color.LightBlue);
+ PdfSolidBrush brush = new PdfSolidBrush(Color.LightBlue);
+ loadedPage.Graphics.Save();
+ loadedPage.Graphics.SetTransparency(1, 1, PdfBlendMode.Multiply);
+
+ //Draw the rectangle on the PDF document
+ loadedPage.Graphics.DrawRectangle(brush, bounds);
+
+ //PdfLoadedPage loadedPage = document.Pages[0] as PdfLoadedPage;
+ //PdfPen pen = new PdfPen(PdfBrushes.Red, 10f);
+
+ //PointF p1 = new PointF(10, 100);
+ //PointF p2 = new PointF(10, 200);
+ //PointF p3 = new PointF(100, 100);
+ //PointF p4 = new PointF(100, 200);
+ //PointF p5 = new PointF(55, 150);
+ //PointF[] points = { p1, p2, p3, p4, p5 };
+ ////Draw the polygon on PDF document
+ //PdfLinearGradientBrush brush = new PdfLinearGradientBrush(new PointF(10, 100), new PointF(100, 200), new PdfColor(Color.Red), new PdfColor(Color.Green));
+ //loadedPage.Graphics.DrawPolygon(pen, brush, points);
+ }
+
private void Add_Logo(ref PdfLoadedDocument document, bool color, int left, int top, int width, int height, string pages, string resturi, string apikey, string startuppath)
{
string imagefile = "";
@@ -358,7 +399,7 @@ namespace Versandstrasse
{
PdfLoadedPage loadedPage = document.Pages[i] as PdfLoadedPage;
PdfGraphics graphics = loadedPage.Graphics;
- graphics.DrawImage(image, 85, 30);
+ graphics.DrawImage(image,left,top);
}
}
@@ -372,7 +413,7 @@ namespace Versandstrasse
int pageno = Convert.ToInt32(p) - 1;
PdfLoadedPage loadedPage = document.Pages[pageno] as PdfLoadedPage;
PdfGraphics graphics = loadedPage.Graphics;
- graphics.DrawImage(image, 85, 30);
+ graphics.DrawImage(image, left, top);
}
}
diff --git a/Versandstrasse/bin/Debug/Versandstrasse.dll b/Versandstrasse/bin/Debug/Versandstrasse.dll
index ceb2b378..117f12a3 100644
Binary files a/Versandstrasse/bin/Debug/Versandstrasse.dll and b/Versandstrasse/bin/Debug/Versandstrasse.dll differ
diff --git a/Versandstrasse/bin/Debug/Versandstrasse.pdb b/Versandstrasse/bin/Debug/Versandstrasse.pdb
index bdbd2625..aee9a86c 100644
Binary files a/Versandstrasse/bin/Debug/Versandstrasse.pdb and b/Versandstrasse/bin/Debug/Versandstrasse.pdb differ
diff --git a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache
index 2af036c4..e2a47444 100644
Binary files a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache and b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache differ
diff --git a/Versandstrasse/obj/Debug/Versandstrasse.dll b/Versandstrasse/obj/Debug/Versandstrasse.dll
index ceb2b378..117f12a3 100644
Binary files a/Versandstrasse/obj/Debug/Versandstrasse.dll and b/Versandstrasse/obj/Debug/Versandstrasse.dll differ
diff --git a/Versandstrasse/obj/Debug/Versandstrasse.pdb b/Versandstrasse/obj/Debug/Versandstrasse.pdb
index bdbd2625..aee9a86c 100644
Binary files a/Versandstrasse/obj/Debug/Versandstrasse.pdb and b/Versandstrasse/obj/Debug/Versandstrasse.pdb differ