diff --git a/API_NetFramework/API_NetFramework.csproj b/API_NetFramework/API_NetFramework.csproj
index 2aec7c2c..26e6a41a 100644
--- a/API_NetFramework/API_NetFramework.csproj
+++ b/API_NetFramework/API_NetFramework.csproj
@@ -234,6 +234,7 @@
+
diff --git a/API_NetFramework/Controllers/ImageController.cs b/API_NetFramework/Controllers/ImageController.cs
new file mode 100644
index 00000000..02ac433b
--- /dev/null
+++ b/API_NetFramework/Controllers/ImageController.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using API_NetFramework.Models;
+using System.Web.WebPages;
+using System.IO;
+
+namespace API_NetFramework.Controllers
+{
+ public class ImageController : ApiController
+ {
+ string tokenfunction = "Image";
+
+ private System.Drawing.Image ResizeImage(System.Drawing.Image imgToResize, Size size)
+ {
+ // Get the image current width
+ int sourceWidth = imgToResize.Width;
+ // Get the image current height
+ int sourceHeight = imgToResize.Height;
+ float nPercent = 0;
+ float nPercentW = 0;
+ float nPercentH = 0;
+ // Calculate width and height with new desired size
+ nPercentW = ((float)size.Width / (float)sourceWidth);
+ nPercentH = ((float)size.Height / (float)sourceHeight);
+ nPercent = Math.Min(nPercentW, nPercentH);
+ // New Width and Height
+ int destWidth = (int)(sourceWidth * nPercent);
+ int destHeight = (int)(sourceHeight * nPercent);
+ Bitmap b = new Bitmap(destWidth, destHeight);
+ Graphics g = Graphics.FromImage((System.Drawing.Image)b);
+ g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+ // Draw image with new width and height
+ g.DrawImage(imgToResize, 0, 0, destWidth, destHeight);
+ g.Dispose();
+ return (System.Drawing.Image)b;
+ }
+
+ private System.Drawing.Image resizeImage(System.Drawing.Image imgToResize, Size size)
+ {
+ return (System.Drawing.Image)(new Bitmap(imgToResize, size));
+ }
+
+ [HttpGet]
+ [Route("API/GetImageAsBase64")]
+
+ public IHttpActionResult GetImageAsBase64(int imageid, int ImageWidth = 0, int ImageHeight = 0)
+ {
+ string path = System.Configuration.ConfigurationManager.AppSettings["ImagePath"];
+ string filename = "";
+ int defaultheigt = 0;
+ int defaultwidth = 0;
+ APILogging.Log((HttpRequestMessage)Request, "Image-Bezug: " + imageid.ToString(), LogLevelType.Info);
+
+ if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false)
+ {
+ return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key");
+ }
+ System.Data.DataSet ds = new System.Data.DataSet();
+ ds.ReadXml(path + "imageids.xml");
+ filename = "";
+ foreach (System.Data.DataRow row in ds.Tables[0].Rows)
+ {
+ if (Convert.ToInt32(row[0]) == imageid)
+ {
+ defaultheigt = Convert.ToInt32(row[3]);
+ defaultwidth = Convert.ToInt32(row[2]);
+ filename = path + row[1].ToString();
+ }
+ }
+ ds.Dispose();
+ if (filename == "")
+ {
+ APILogging.Log((HttpRequestMessage)Request, "Image-Bezug - nicht vorhanden: " + imageid.ToString(), LogLevelType.Info);
+ return Content(HttpStatusCode.NotFound, "Image ID: " + imageid.ToString()+"nicht gefunden");
+ }
+
+ System.Drawing.Image iimg = System.Drawing.Image.FromFile(filename);
+ System.Drawing.Image imgnew = null;
+
+ switch (ImageWidth)
+ {
+ case 0:
+ ImageWidth =defaultwidth;
+ ImageHeight = defaultheigt;
+ Bitmap b = new Bitmap(iimg);
+ imgnew = ResizeImage(b, new Size(ImageHeight, ImageWidth));
+ b = null;
+ break;
+ case -1:
+ imgnew = iimg;
+ break;
+ default:
+ Bitmap b1 = new Bitmap(iimg);
+ imgnew = ResizeImage(b1, new Size(ImageHeight, ImageWidth));
+ b1 = null;
+ break;
+
+ }
+ using (MemoryStream m = new MemoryStream())
+ {
+ string newfilename = path + Guid.NewGuid().ToString() + ".tmp";
+ imgnew.Save(newfilename);
+ imgnew = System.Drawing.Image.FromFile(newfilename);
+
+ imgnew.Save(m, imgnew.RawFormat);
+ byte[] imageBytes = m.ToArray();
+ imgnew.Dispose();
+ m.Dispose();
+ System.IO.File.Delete(newfilename);
+ return Ok(Convert.ToBase64String(imageBytes));
+ }
+ }
+ }
+}
diff --git a/API_NetFramework/Web.config b/API_NetFramework/Web.config
index 8500a2df..58b31451 100644
--- a/API_NetFramework/Web.config
+++ b/API_NetFramework/Web.config
@@ -10,6 +10,7 @@
+
diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll
index 132d247d..220b4828 100644
Binary files a/API_NetFramework/bin/DOCGEN.dll and b/API_NetFramework/bin/DOCGEN.dll differ
diff --git a/API_NetFramework/bin/DOCGEN.pdb b/API_NetFramework/bin/DOCGEN.pdb
index 14900413..9576c6b2 100644
Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ
diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll
index 5f55c2b6..1a3391af 100644
Binary files a/API_NetFramework/bin/Database.dll and b/API_NetFramework/bin/Database.dll differ
diff --git a/API_NetFramework/bin/Database.pdb b/API_NetFramework/bin/Database.pdb
index 20a5779f..1a60ac27 100644
Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ
diff --git a/API_NetFramework/bin/Model.dll b/API_NetFramework/bin/Model.dll
index de268a58..ae8ff539 100644
Binary files a/API_NetFramework/bin/Model.dll and b/API_NetFramework/bin/Model.dll differ
diff --git a/API_NetFramework/bin/Model.pdb b/API_NetFramework/bin/Model.pdb
index 4aed68a3..fa22bb16 100644
Binary files a/API_NetFramework/bin/Model.pdb and b/API_NetFramework/bin/Model.pdb differ
diff --git a/API_NetFramework/bin/OfficePrinter.dll b/API_NetFramework/bin/OfficePrinter.dll
index ad64eaf3..e45b3779 100644
Binary files a/API_NetFramework/bin/OfficePrinter.dll and b/API_NetFramework/bin/OfficePrinter.dll differ
diff --git a/API_NetFramework/bin/OfficePrinter.pdb b/API_NetFramework/bin/OfficePrinter.pdb
index 8d94ad26..a3fd4f2d 100644
Binary files a/API_NetFramework/bin/OfficePrinter.pdb and b/API_NetFramework/bin/OfficePrinter.pdb differ
diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll
index 7c3be612..18c0f0a3 100644
Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ
diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll.config b/API_NetFramework/bin/OnDoc_NetFramework.dll.config
index 8500a2df..58b31451 100644
--- a/API_NetFramework/bin/OnDoc_NetFramework.dll.config
+++ b/API_NetFramework/bin/OnDoc_NetFramework.dll.config
@@ -10,6 +10,7 @@
+
diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb
index dcb645a4..01d67b58 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 5cef3eab..659f8142 100644
--- a/API_NetFramework/log.txt
+++ b/API_NetFramework/log.txt
@@ -1385,3 +1385,645 @@ Parametername: encoder
2024-11-27 11:10:49.6961|DEBUG|OnDoc|
2024-11-27 11:10:49.7309|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: etroesch
2024-11-27 11:10:49.7309|INFO|OnDoc|Unterschrift-Bezug: etroesch
+2024-11-27 18:52:26.6191|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 18:52:36.7071|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 19:00:24.8348|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 19:01:58.0278|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 19:06:30.1595|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 19:06:30.7295|ERROR|OnDoc|Unberechtigter Zugriff
+2024-11-27 19:12:19.6373|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 19:12:44.3975|DEBUG|OnDoc|Start Adresse GetAll
+2024-11-27 19:12:44.4345|DEBUG|OnDoc|
+2024-11-27 19:12:44.4345|DEBUG|OnDoc|Ende Adresse GetAll
+2024-11-27 19:12:56.4469|DEBUG|OnDoc|Start Check DokumentID: DokumentID:1
+2024-11-27 19:12:56.4839|DEBUG|OnDoc|
+2024-11-27 19:12:56.4839|DEBUG|OnDoc|
+2024-11-27 19:12:56.4839|DEBUG|OnDoc|Ende Check DokumentID: DokumentID:1
+2024-11-27 19:12:58.3969|DEBUG|OnDoc|Start Check DokumentID: DokumentID:1
+2024-11-27 19:12:58.4059|DEBUG|OnDoc|
+2024-11-27 19:12:58.4059|DEBUG|OnDoc|
+2024-11-27 19:12:58.4059|DEBUG|OnDoc|Ende Check DokumentID: DokumentID:1
+2024-11-27 19:13:08.1549|DEBUG|OnDoc|Start GetDocument DokumentID:1
+2024-11-27 19:13:08.1949|DEBUG|OnDoc|
+2024-11-27 19:13:08.4042|DEBUG|OnDoc|Ende GetDocument DokumentID:1
+2024-11-27 19:13:23.4767|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1
+2024-11-27 19:13:23.5118|INFO|OnDoc|Unterschrift-Bezug: 1
+2024-11-27 20:21:47.0315|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 20:23:03.1602|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 20:26:17.7095|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 20:29:02.4780|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 20:52:25.8177|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 20:56:02.1595|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 21:00:02.3946|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 21:01:29.5860|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 21:05:24.8449|DEBUG|OnDoc|
+2024-11-27 21:05:26.8501|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2024-11-27 21:05:26.8601|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2024-11-27 21:09:17.0556|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 21:10:07.3669|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 21:11:42.3971|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 21:12:11.3943|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 21:12:50.3108|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 21:27:17.4207|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 21:27:38.7823|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 21:30:12.5826|INFO|OnDoc|Image-Bezug: 2
+2024-11-27 21:30:48.9079|INFO|OnDoc|Image-Bezug: 2
+2024-11-27 21:31:03.5924|INFO|OnDoc|Image-Bezug: 1
+2024-11-27 22:32:11.9333|INFO|OnDoc|Image-Bezug: 2
+2024-11-27 22:32:12.9341|INFO|OnDoc|Image-Bezug: 2
+2024-11-27 22:32:13.8695|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 06:36:09.6845|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 06:36:12.2523|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 06:36:13.0633|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 07:01:12.3509|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 07:01:13.1737|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 07:01:13.9589|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 07:01:33.5119|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 07:01:34.3505|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 07:01:35.1390|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 07:57:58.3947|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 07:57:59.1685|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 07:57:59.9451|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 07:58:21.7784|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 07:58:21.8958|DEBUG|OnDoc|
+2024-11-28 07:58:21.9279|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2024-11-28 07:58:21.9319|INFO|OnDoc|Unterschrift-Bezug: 1234
+2024-11-28 07:58:21.9790|DEBUG|OnDoc|
+2024-11-28 07:58:22.0025|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tg1294
+2024-11-28 07:58:22.0025|INFO|OnDoc|Unterschrift-Bezug: tg1294
+2024-11-28 07:58:22.7887|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 07:58:22.8906|DEBUG|OnDoc|
+2024-11-28 07:58:22.9217|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2024-11-28 07:58:22.9217|INFO|OnDoc|Unterschrift-Bezug: 1234
+2024-11-28 07:58:22.9617|DEBUG|OnDoc|
+2024-11-28 07:58:22.9857|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tg1294
+2024-11-28 07:58:22.9857|INFO|OnDoc|Unterschrift-Bezug: tg1294
+2024-11-28 07:58:23.7344|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 07:58:23.8522|DEBUG|OnDoc|
+2024-11-28 07:58:23.8862|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2024-11-28 07:58:23.8862|INFO|OnDoc|Unterschrift-Bezug: 1234
+2024-11-28 07:58:23.9252|DEBUG|OnDoc|
+2024-11-28 07:58:23.9559|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tg1294
+2024-11-28 07:58:23.9559|INFO|OnDoc|Unterschrift-Bezug: tg1294
+2024-11-28 08:11:40.7654|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:42.4933|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:43.3730|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:44.2452|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:45.1607|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:46.0422|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:46.9264|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:47.7866|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:48.7583|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:49.7957|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:50.6990|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:51.5942|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:52.4545|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:53.3232|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:54.1897|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:55.0919|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:55.9882|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:56.8704|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:57.7633|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:58.6575|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:11:59.6161|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:12:00.6122|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:12:01.5587|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:12:02.4319|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:12:03.3057|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:12:04.2985|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:12:05.2513|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:12:06.1361|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:12:07.1144|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:12:08.1298|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:12:09.0196|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:13:10.6113|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:13:11.4807|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:13:12.3422|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:15:42.5457|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:15:44.4114|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:15:45.2412|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:16:09.8877|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:16:10.0020|DEBUG|OnDoc|
+2024-11-28 08:16:10.0345|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tg1294
+2024-11-28 08:16:10.0345|INFO|OnDoc|Unterschrift-Bezug: tg1294
+2024-11-28 08:16:10.0732|DEBUG|OnDoc|
+2024-11-28 08:16:10.0972|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: etroesch
+2024-11-28 08:16:10.0972|INFO|OnDoc|Unterschrift-Bezug: etroesch
+2024-11-28 08:16:10.9215|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:16:11.0269|DEBUG|OnDoc|
+2024-11-28 08:16:11.0574|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tg1294
+2024-11-28 08:16:11.0574|INFO|OnDoc|Unterschrift-Bezug: tg1294
+2024-11-28 08:16:11.0939|DEBUG|OnDoc|
+2024-11-28 08:16:11.1180|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: etroesch
+2024-11-28 08:16:11.1180|INFO|OnDoc|Unterschrift-Bezug: etroesch
+2024-11-28 08:16:11.8833|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:16:11.9882|DEBUG|OnDoc|
+2024-11-28 08:16:12.0183|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tg1294
+2024-11-28 08:16:12.0183|INFO|OnDoc|Unterschrift-Bezug: tg1294
+2024-11-28 08:16:12.0603|DEBUG|OnDoc|
+2024-11-28 08:16:12.0848|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: etroesch
+2024-11-28 08:16:12.0868|INFO|OnDoc|Unterschrift-Bezug: etroesch
+2024-11-28 08:18:06.8975|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:18:07.0037|DEBUG|OnDoc|
+2024-11-28 08:18:07.0349|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tg1294
+2024-11-28 08:18:07.0349|INFO|OnDoc|Unterschrift-Bezug: tg1294
+2024-11-28 08:18:07.0739|DEBUG|OnDoc|
+2024-11-28 08:18:07.0981|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: etroesch
+2024-11-28 08:18:07.0981|INFO|OnDoc|Unterschrift-Bezug: etroesch
+2024-11-28 08:18:07.8795|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:18:07.9852|DEBUG|OnDoc|
+2024-11-28 08:18:08.0166|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tg1294
+2024-11-28 08:18:08.0166|INFO|OnDoc|Unterschrift-Bezug: tg1294
+2024-11-28 08:18:08.0538|DEBUG|OnDoc|
+2024-11-28 08:18:08.0778|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: etroesch
+2024-11-28 08:18:08.0778|INFO|OnDoc|Unterschrift-Bezug: etroesch
+2024-11-28 08:18:08.8553|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:18:08.9629|DEBUG|OnDoc|
+2024-11-28 08:18:08.9934|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tg1294
+2024-11-28 08:18:08.9934|INFO|OnDoc|Unterschrift-Bezug: tg1294
+2024-11-28 08:18:09.0297|DEBUG|OnDoc|
+2024-11-28 08:18:09.0539|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: etroesch
+2024-11-28 08:18:09.0559|INFO|OnDoc|Unterschrift-Bezug: etroesch
+2024-11-28 08:33:09.2284|DEBUG|OnDoc|
+2024-11-28 08:33:09.2539|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:09.2539|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:09.2934|DEBUG|OnDoc|
+2024-11-28 08:33:09.3169|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:09.3169|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:10.0537|DEBUG|OnDoc|
+2024-11-28 08:33:10.0777|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:10.0777|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:10.1142|DEBUG|OnDoc|
+2024-11-28 08:33:10.1377|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:10.1377|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:10.8813|DEBUG|OnDoc|
+2024-11-28 08:33:10.9053|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:10.9053|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:10.9423|DEBUG|OnDoc|
+2024-11-28 08:33:10.9673|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:10.9673|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:11.7222|DEBUG|OnDoc|
+2024-11-28 08:33:11.7462|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:11.7462|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:11.7833|DEBUG|OnDoc|
+2024-11-28 08:33:11.8078|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:11.8078|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:12.6345|DEBUG|OnDoc|
+2024-11-28 08:33:12.6595|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:12.6595|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:12.6964|DEBUG|OnDoc|
+2024-11-28 08:33:12.7204|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:12.7204|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:13.4649|DEBUG|OnDoc|
+2024-11-28 08:33:13.4880|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:13.4880|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:13.5236|DEBUG|OnDoc|
+2024-11-28 08:33:13.5477|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:13.5477|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:14.3221|DEBUG|OnDoc|
+2024-11-28 08:33:14.3461|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:14.3461|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:14.3825|DEBUG|OnDoc|
+2024-11-28 08:33:14.4065|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:14.4065|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:15.2535|DEBUG|OnDoc|
+2024-11-28 08:33:15.2785|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:15.2785|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:15.3173|DEBUG|OnDoc|
+2024-11-28 08:33:15.3423|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:15.3423|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:16.0676|DEBUG|OnDoc|
+2024-11-28 08:33:16.0917|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:16.0917|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:16.1287|DEBUG|OnDoc|
+2024-11-28 08:33:16.1527|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:16.1527|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:16.8634|DEBUG|OnDoc|
+2024-11-28 08:33:16.8869|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:16.8869|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:16.9234|DEBUG|OnDoc|
+2024-11-28 08:33:16.9499|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:16.9499|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:17.6535|DEBUG|OnDoc|
+2024-11-28 08:33:17.6781|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:17.6801|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:17.7143|DEBUG|OnDoc|
+2024-11-28 08:33:17.7378|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:17.7378|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:18.4524|DEBUG|OnDoc|
+2024-11-28 08:33:18.4759|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:18.4779|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:18.5114|DEBUG|OnDoc|
+2024-11-28 08:33:18.5360|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:18.5360|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:19.2795|DEBUG|OnDoc|
+2024-11-28 08:33:19.3040|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:19.3050|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:19.3385|DEBUG|OnDoc|
+2024-11-28 08:33:19.3620|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:19.3620|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:20.0758|DEBUG|OnDoc|
+2024-11-28 08:33:20.1003|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:20.1013|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:20.1359|DEBUG|OnDoc|
+2024-11-28 08:33:20.1604|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:20.1604|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:20.8664|DEBUG|OnDoc|
+2024-11-28 08:33:20.8915|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:20.8915|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:20.9288|DEBUG|OnDoc|
+2024-11-28 08:33:20.9533|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:20.9533|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:21.6827|DEBUG|OnDoc|
+2024-11-28 08:33:21.7072|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:21.7072|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:21.7428|DEBUG|OnDoc|
+2024-11-28 08:33:21.7673|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:21.7673|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:22.4824|DEBUG|OnDoc|
+2024-11-28 08:33:22.5059|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:22.5079|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:22.5425|DEBUG|OnDoc|
+2024-11-28 08:33:22.5670|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:22.5670|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:23.2860|DEBUG|OnDoc|
+2024-11-28 08:33:23.3120|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:23.3120|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:23.3491|DEBUG|OnDoc|
+2024-11-28 08:33:23.3743|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:23.3743|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:24.1072|DEBUG|OnDoc|
+2024-11-28 08:33:24.1343|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:24.1343|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:24.1769|DEBUG|OnDoc|
+2024-11-28 08:33:24.2034|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:24.2034|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:24.9634|DEBUG|OnDoc|
+2024-11-28 08:33:24.9899|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:24.9929|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:25.0315|DEBUG|OnDoc|
+2024-11-28 08:33:25.0565|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:25.0565|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:25.7906|DEBUG|OnDoc|
+2024-11-28 08:33:25.8146|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:25.8146|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:25.8511|DEBUG|OnDoc|
+2024-11-28 08:33:25.8771|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:25.8771|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:26.5910|DEBUG|OnDoc|
+2024-11-28 08:33:26.6151|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:26.6181|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:26.6521|DEBUG|OnDoc|
+2024-11-28 08:33:26.6777|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:26.6807|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:27.4026|DEBUG|OnDoc|
+2024-11-28 08:33:27.4278|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:27.4298|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:27.4671|DEBUG|OnDoc|
+2024-11-28 08:33:27.4923|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:27.4923|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:28.2403|DEBUG|OnDoc|
+2024-11-28 08:33:28.2654|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:28.2654|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:28.3044|DEBUG|OnDoc|
+2024-11-28 08:33:28.3279|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:28.3279|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:29.0598|DEBUG|OnDoc|
+2024-11-28 08:33:29.0860|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:29.0860|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:29.1251|DEBUG|OnDoc|
+2024-11-28 08:33:29.1506|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:29.1506|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:29.8680|DEBUG|OnDoc|
+2024-11-28 08:33:29.8925|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:29.8925|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:29.9306|DEBUG|OnDoc|
+2024-11-28 08:33:29.9560|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:29.9560|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:30.7039|DEBUG|OnDoc|
+2024-11-28 08:33:30.7284|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:30.7284|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:30.7675|DEBUG|OnDoc|
+2024-11-28 08:33:30.7917|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:30.7917|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:31.5282|DEBUG|OnDoc|
+2024-11-28 08:33:31.5528|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:31.5558|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:31.5913|DEBUG|OnDoc|
+2024-11-28 08:33:31.6153|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:31.6183|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:32.3945|DEBUG|OnDoc|
+2024-11-28 08:33:32.4206|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:32.4206|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:32.4611|DEBUG|OnDoc|
+2024-11-28 08:33:32.4886|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:32.4886|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:33.2784|DEBUG|OnDoc|
+2024-11-28 08:33:33.3025|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:33.3045|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:33.3401|DEBUG|OnDoc|
+2024-11-28 08:33:33.3641|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:33.3671|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:33:34.1241|DEBUG|OnDoc|
+2024-11-28 08:33:34.1500|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:33:34.1500|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:33:34.1906|DEBUG|OnDoc|
+2024-11-28 08:33:34.2169|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:33:34.2169|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:43:50.2517|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:43:50.3614|DEBUG|OnDoc|
+2024-11-28 08:43:50.3915|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:43:50.3915|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:43:50.4279|DEBUG|OnDoc|
+2024-11-28 08:43:50.4530|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:43:50.4530|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:43:51.2448|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:43:51.3480|DEBUG|OnDoc|
+2024-11-28 08:43:51.3766|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:43:51.3766|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:43:51.4142|DEBUG|OnDoc|
+2024-11-28 08:43:51.4384|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:43:51.4384|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:43:52.2145|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:43:52.3231|DEBUG|OnDoc|
+2024-11-28 08:43:52.3535|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:43:52.3535|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:43:52.3891|DEBUG|OnDoc|
+2024-11-28 08:43:52.4134|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:43:52.4154|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:43:53.1869|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:43:53.2894|DEBUG|OnDoc|
+2024-11-28 08:43:53.3219|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:43:53.3219|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:43:53.3584|DEBUG|OnDoc|
+2024-11-28 08:43:53.3810|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:43:53.3810|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:43:54.1528|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:43:54.2551|DEBUG|OnDoc|
+2024-11-28 08:43:54.2857|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:43:54.2857|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:43:54.3879|DEBUG|OnDoc|
+2024-11-28 08:43:54.4245|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:43:54.4245|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:50:44.5921|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:50:44.7137|DEBUG|OnDoc|
+2024-11-28 08:50:44.7473|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:50:44.7473|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:50:44.7844|DEBUG|OnDoc|
+2024-11-28 08:50:44.8085|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:50:44.8085|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:50:45.6052|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:50:45.7088|DEBUG|OnDoc|
+2024-11-28 08:50:45.7396|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:50:45.7396|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:50:45.7762|DEBUG|OnDoc|
+2024-11-28 08:50:45.8007|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:50:45.8007|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:50:46.5591|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:50:46.6604|DEBUG|OnDoc|
+2024-11-28 08:50:46.7041|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:50:46.7041|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:50:46.7408|DEBUG|OnDoc|
+2024-11-28 08:50:46.7643|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:50:46.7643|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:50:47.5436|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:50:47.6489|DEBUG|OnDoc|
+2024-11-28 08:50:47.6811|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:50:47.6811|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:50:47.7169|DEBUG|OnDoc|
+2024-11-28 08:50:47.7420|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:50:47.7420|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:50:48.5035|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:50:48.6089|DEBUG|OnDoc|
+2024-11-28 08:50:48.6403|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:50:48.6403|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:50:48.6780|DEBUG|OnDoc|
+2024-11-28 08:50:48.7019|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:50:48.7019|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:54:24.2485|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:54:24.3568|DEBUG|OnDoc|
+2024-11-28 08:54:24.3893|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:54:24.3893|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:54:24.4248|DEBUG|OnDoc|
+2024-11-28 08:54:24.4507|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:54:24.4507|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:54:25.2478|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:54:25.3560|DEBUG|OnDoc|
+2024-11-28 08:54:25.3861|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:54:25.3861|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:54:25.4248|DEBUG|OnDoc|
+2024-11-28 08:54:25.4491|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:54:25.4491|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:54:26.2200|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:54:26.3259|DEBUG|OnDoc|
+2024-11-28 08:54:26.3570|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:54:26.3570|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:54:26.3937|DEBUG|OnDoc|
+2024-11-28 08:54:26.4177|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:54:26.4177|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:54:27.1912|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:54:27.2997|DEBUG|OnDoc|
+2024-11-28 08:54:27.3311|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:54:27.3311|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:54:27.3664|DEBUG|OnDoc|
+2024-11-28 08:54:27.3891|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:54:27.3891|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:54:28.1787|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:54:28.2817|DEBUG|OnDoc|
+2024-11-28 08:54:28.3127|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:54:28.3127|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:54:28.3492|DEBUG|OnDoc|
+2024-11-28 08:54:28.3721|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:54:28.3721|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:54:59.1879|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 08:54:59.2896|DEBUG|OnDoc|
+2024-11-28 08:54:59.3237|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:54:59.3237|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:54:59.3784|DEBUG|OnDoc|
+2024-11-28 08:54:59.4069|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:54:59.4069|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:58:18.7865|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:58:18.9065|DEBUG|OnDoc|
+2024-11-28 08:58:18.9385|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:58:18.9385|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:58:18.9868|DEBUG|OnDoc|
+2024-11-28 08:58:19.0112|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:58:19.0112|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:58:19.7997|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:58:19.9114|DEBUG|OnDoc|
+2024-11-28 08:58:19.9453|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:58:19.9453|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:58:19.9863|DEBUG|OnDoc|
+2024-11-28 08:58:20.0143|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:58:20.0143|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:58:20.8055|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:58:20.9166|DEBUG|OnDoc|
+2024-11-28 08:58:20.9520|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:58:20.9520|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:58:20.9932|DEBUG|OnDoc|
+2024-11-28 08:58:21.0196|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:58:21.0196|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:58:21.8118|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:58:21.9274|DEBUG|OnDoc|
+2024-11-28 08:58:21.9620|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:58:21.9620|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:58:22.0032|DEBUG|OnDoc|
+2024-11-28 08:58:22.0307|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:58:22.0307|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:58:22.8121|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:58:22.9216|DEBUG|OnDoc|
+2024-11-28 08:58:22.9545|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:58:22.9545|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:58:22.9953|DEBUG|OnDoc|
+2024-11-28 08:58:23.0226|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:58:23.0246|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 08:58:23.8046|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 08:58:23.9185|DEBUG|OnDoc|
+2024-11-28 08:58:23.9532|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 08:58:23.9532|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 08:58:23.9948|DEBUG|OnDoc|
+2024-11-28 08:58:24.0213|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 08:58:24.0243|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 09:06:03.7329|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 09:06:06.2663|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 09:06:07.0962|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 09:06:07.9074|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 09:06:08.7176|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 09:06:09.5418|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 09:51:29.8202|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 09:51:31.7017|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 09:51:32.5143|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 09:51:33.3116|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 09:51:34.1014|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 09:51:34.9033|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 10:14:34.3651|DEBUG|OnDoc|
+2024-11-28 10:14:34.4307|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 10:14:34.4307|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 10:14:34.5250|DEBUG|OnDoc|
+2024-11-28 10:14:34.5585|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 10:14:34.5585|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 10:15:00.0108|DEBUG|OnDoc|
+2024-11-28 10:15:00.0372|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 10:15:00.0398|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 10:15:00.0778|DEBUG|OnDoc|
+2024-11-28 10:15:00.1013|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 10:15:00.1013|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 10:15:00.1013|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 10:15:09.3540|DEBUG|OnDoc|
+2024-11-28 10:15:09.3770|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 10:15:09.3770|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 10:15:09.4127|DEBUG|OnDoc|
+2024-11-28 10:15:09.4367|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 10:15:09.4367|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 10:15:09.4367|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 10:15:59.8725|DEBUG|OnDoc|
+2024-11-28 10:15:59.9300|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 10:15:59.9300|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 10:16:05.7401|DEBUG|OnDoc|
+2024-11-28 10:16:05.8028|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 10:16:05.8049|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 10:16:12.4628|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 10:16:25.4627|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 10:17:29.6848|DEBUG|OnDoc|
+2024-11-28 10:17:29.7515|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 10:17:29.7515|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 10:17:29.7886|DEBUG|OnDoc|
+2024-11-28 10:17:29.8126|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 10:17:29.8126|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 10:17:29.8215|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 10:30:46.3027|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 10:31:17.8190|DEBUG|OnDoc|
+2024-11-28 10:31:17.8460|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 10:31:17.8460|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 10:31:17.8857|DEBUG|OnDoc|
+2024-11-28 10:31:17.9107|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 10:31:17.9107|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 10:31:17.9200|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 10:31:46.5682|DEBUG|OnDoc|
+2024-11-28 10:31:46.6044|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 10:31:46.6044|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 10:31:46.6430|DEBUG|OnDoc|
+2024-11-28 10:31:46.6675|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 10:31:46.6675|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 10:31:46.6675|INFO|OnDoc|Image-Bezug: 2
+2024-11-28 10:32:06.6155|DEBUG|OnDoc|
+2024-11-28 10:32:06.6408|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 10:32:06.6408|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 10:32:06.6774|DEBUG|OnDoc|
+2024-11-28 10:32:06.7009|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 10:32:06.7009|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 15:13:58.7280|DEBUG|OnDoc|
+2024-11-28 15:13:58.7825|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 15:13:58.7825|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 15:13:58.8614|DEBUG|OnDoc|
+2024-11-28 15:13:58.8935|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 15:13:58.8935|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 15:14:11.2978|DEBUG|OnDoc|
+2024-11-28 15:14:11.3303|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 15:14:11.3303|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 15:14:11.3758|DEBUG|OnDoc|
+2024-11-28 15:14:11.4033|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 15:14:11.4033|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 15:14:38.6485|DEBUG|OnDoc|
+2024-11-28 15:14:38.6731|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 15:14:38.6731|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 15:14:38.7098|DEBUG|OnDoc|
+2024-11-28 15:14:38.7363|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 15:14:38.7363|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 15:14:56.5734|DEBUG|OnDoc|
+2024-11-28 15:14:56.6019|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 15:14:56.6019|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 15:14:56.6394|DEBUG|OnDoc|
+2024-11-28 15:14:56.6639|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 15:14:56.6639|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 15:15:14.2552|DEBUG|OnDoc|
+2024-11-28 15:15:14.2822|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 15:15:14.2822|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 15:15:14.3218|DEBUG|OnDoc|
+2024-11-28 15:15:14.3457|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 15:15:14.3457|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 15:16:06.9989|DEBUG|OnDoc|
+2024-11-28 15:16:07.0245|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 15:16:07.0245|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 15:16:07.0615|DEBUG|OnDoc|
+2024-11-28 15:16:07.0862|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 15:16:07.0862|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 15:16:28.6636|DEBUG|OnDoc|
+2024-11-28 15:16:28.6877|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 15:16:28.6877|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 15:16:28.7272|DEBUG|OnDoc|
+2024-11-28 15:16:28.7502|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 15:16:28.7502|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 15:17:15.9502|DEBUG|OnDoc|
+2024-11-28 15:17:15.9734|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 15:17:15.9734|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 15:17:16.0085|DEBUG|OnDoc|
+2024-11-28 15:17:16.0332|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 15:17:16.0332|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 16:43:44.0114|DEBUG|OnDoc|
+2024-11-28 16:43:44.0689|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 16:43:44.0719|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 16:43:44.1393|DEBUG|OnDoc|
+2024-11-28 16:43:44.1714|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 16:43:44.1714|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 16:43:57.8582|DEBUG|OnDoc|
+2024-11-28 16:43:57.8814|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 16:43:57.8844|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 16:43:57.9185|DEBUG|OnDoc|
+2024-11-28 16:43:57.9410|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 16:43:57.9410|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 16:43:57.9530|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 18:43:10.8475|DEBUG|OnDoc|
+2024-11-28 18:43:10.8822|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 18:43:10.8822|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 18:43:10.9193|DEBUG|OnDoc|
+2024-11-28 18:43:10.9426|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 18:43:10.9426|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 18:43:10.9426|INFO|OnDoc|Image-Bezug: 1
+2024-11-28 18:43:29.2437|DEBUG|OnDoc|
+2024-11-28 18:43:29.2672|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2024-11-28 18:43:29.2672|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2024-11-28 18:43:29.3082|DEBUG|OnDoc|
+2024-11-28 18:43:29.3332|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tester1
+2024-11-28 18:43:29.3332|INFO|OnDoc|Unterschrift-Bezug: tester1
+2024-11-28 18:43:29.3442|INFO|OnDoc|Image-Bezug: 1
diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache
index d1f0b8cd..8812eee7 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/API_NetFramework.csproj.CoreCompileInputs.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.CoreCompileInputs.cache
index 3da8f25c..af19d725 100644
--- a/API_NetFramework/obj/Debug/API_NetFramework.csproj.CoreCompileInputs.cache
+++ b/API_NetFramework/obj/Debug/API_NetFramework.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0d1a9ebbad5bb9929b52cfc409e2f295381fddc112dacd091614320eb3f2990e
+1d5e7777976b1fcf427b978fd296839fb79b70f6485f6c476d89469696b7e7f2
diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll
index 7c3be612..18c0f0a3 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 dcb645a4..01d67b58 100644
Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ
diff --git a/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll
index 5f55c2b6..1a3391af 100644
Binary files a/BarcodeLib/bin/Debug/Database.dll and b/BarcodeLib/bin/Debug/Database.dll differ
diff --git a/BarcodeLib/bin/Debug/Database.pdb b/BarcodeLib/bin/Debug/Database.pdb
index 20a5779f..1a60ac27 100644
Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ
diff --git a/BarcodeLib/bin/Debug/Model.dll b/BarcodeLib/bin/Debug/Model.dll
index de268a58..ae8ff539 100644
Binary files a/BarcodeLib/bin/Debug/Model.dll and b/BarcodeLib/bin/Debug/Model.dll differ
diff --git a/BarcodeLib/bin/Debug/Model.pdb b/BarcodeLib/bin/Debug/Model.pdb
index 4aed68a3..fa22bb16 100644
Binary files a/BarcodeLib/bin/Debug/Model.pdb and b/BarcodeLib/bin/Debug/Model.pdb differ
diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache
index 7e56307d..77b7204d 100644
Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ
diff --git a/Client/Client.csproj b/Client/Client.csproj
index 70ac842b..5a0bc4b0 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -220,6 +220,7 @@
Serienbrief_Sheetselect.cs
+
diff --git a/Client/DocMgmt/Serienbrief.Designer.cs b/Client/DocMgmt/Serienbrief.Designer.cs
index f8c4697c..4e562d53 100644
--- a/Client/DocMgmt/Serienbrief.Designer.cs
+++ b/Client/DocMgmt/Serienbrief.Designer.cs
@@ -86,6 +86,7 @@
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonNew = new System.Windows.Forms.RibbonButton();
this.RibbonButtonOpen = new System.Windows.Forms.RibbonButton();
+ this.ribbonButtonDelete = new System.Windows.Forms.RibbonButton();
this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonEditWord = new System.Windows.Forms.RibbonButton();
this.ribbonPanel5 = new System.Windows.Forms.RibbonPanel();
@@ -110,8 +111,11 @@
this.panel1 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
- this.ribbonButtonDelete = new System.Windows.Forms.RibbonButton();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.rbppohne = new System.Windows.Forms.RadioButton();
+ this.rbppa = new System.Windows.Forms.RadioButton();
+ this.rbbpb = new System.Windows.Forms.RadioButton();
this.GrpDokumentInhalt.SuspendLayout();
this.grpDruckstapel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).BeginInit();
@@ -139,10 +143,12 @@
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// GrpDokumentInhalt
//
+ this.GrpDokumentInhalt.Controls.Add(this.groupBox1);
this.GrpDokumentInhalt.Controls.Add(this.grpDruckstapel);
this.GrpDokumentInhalt.Controls.Add(this.pnlprogress);
this.GrpDokumentInhalt.Controls.Add(this.groupBox8);
@@ -312,9 +318,9 @@
// groupBox8
//
this.groupBox8.Controls.Add(this.cbboxteam);
- this.groupBox8.Location = new System.Drawing.Point(546, 174);
+ this.groupBox8.Location = new System.Drawing.Point(546, 138);
this.groupBox8.Name = "groupBox8";
- this.groupBox8.Size = new System.Drawing.Size(534, 73);
+ this.groupBox8.Size = new System.Drawing.Size(534, 48);
this.groupBox8.TabIndex = 15;
this.groupBox8.TabStop = false;
this.groupBox8.Text = "Team";
@@ -323,7 +329,7 @@
//
this.cbboxteam.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxteam.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
- this.cbboxteam.Location = new System.Drawing.Point(151, 19);
+ this.cbboxteam.Location = new System.Drawing.Point(22, 19);
this.cbboxteam.Name = "cbboxteam";
this.cbboxteam.Size = new System.Drawing.Size(354, 19);
this.cbboxteam.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
@@ -341,7 +347,7 @@
this.groupBox7.Controls.Add(this.lblUnterschriftlinks);
this.groupBox7.Location = new System.Drawing.Point(546, 23);
this.groupBox7.Name = "groupBox7";
- this.groupBox7.Size = new System.Drawing.Size(534, 145);
+ this.groupBox7.Size = new System.Drawing.Size(534, 109);
this.groupBox7.TabIndex = 14;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "Unterschriften";
@@ -359,7 +365,7 @@
// cbdigitaleunterschrfiten
//
this.cbdigitaleunterschrfiten.AutoSize = true;
- this.cbdigitaleunterschrfiten.Location = new System.Drawing.Point(22, 113);
+ this.cbdigitaleunterschrfiten.Location = new System.Drawing.Point(189, 18);
this.cbdigitaleunterschrfiten.Name = "cbdigitaleunterschrfiten";
this.cbdigitaleunterschrfiten.Size = new System.Drawing.Size(111, 17);
this.cbdigitaleunterschrfiten.TabIndex = 10;
@@ -370,9 +376,9 @@
//
this.cbboxunterschriftrechts.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxunterschriftrechts.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
- this.cbboxunterschriftrechts.Location = new System.Drawing.Point(151, 79);
+ this.cbboxunterschriftrechts.Location = new System.Drawing.Point(189, 79);
this.cbboxunterschriftrechts.Name = "cbboxunterschriftrechts";
- this.cbboxunterschriftrechts.Size = new System.Drawing.Size(354, 19);
+ this.cbboxunterschriftrechts.Size = new System.Drawing.Size(316, 19);
this.cbboxunterschriftrechts.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxunterschriftrechts.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxunterschriftrechts.TabIndex = 9;
@@ -382,9 +388,9 @@
//
this.cbboxunterschriftlinks.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxunterschriftlinks.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
- this.cbboxunterschriftlinks.Location = new System.Drawing.Point(151, 50);
+ this.cbboxunterschriftlinks.Location = new System.Drawing.Point(189, 50);
this.cbboxunterschriftlinks.Name = "cbboxunterschriftlinks";
- this.cbboxunterschriftlinks.Size = new System.Drawing.Size(354, 19);
+ this.cbboxunterschriftlinks.Size = new System.Drawing.Size(316, 19);
this.cbboxunterschriftlinks.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxunterschriftlinks.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxunterschriftlinks.TabIndex = 8;
@@ -805,6 +811,16 @@
this.RibbonButtonOpen.Text = "Öffnen/bearbeiten";
this.RibbonButtonOpen.Click += new System.EventHandler(this.RibbonButtonOpen_Click);
//
+ // ribbonButtonDelete
+ //
+ this.ribbonButtonDelete.Enabled = false;
+ this.ribbonButtonDelete.Image = global::OnDoc.Properties.Resources.DeleteDoc_32x32_32;
+ this.ribbonButtonDelete.LargeImage = global::OnDoc.Properties.Resources.DeleteDoc_32x32_32;
+ this.ribbonButtonDelete.Name = "ribbonButtonDelete";
+ this.ribbonButtonDelete.SmallImage = global::OnDoc.Properties.Resources.DeleteDoc_24x24_32;
+ this.ribbonButtonDelete.Text = "Löschen";
+ this.ribbonButtonDelete.Click += new System.EventHandler(this.ribbonButton3_Click);
+ //
// ribbonPanel4
//
this.ribbonPanel4.ButtonMoreVisible = false;
@@ -1035,16 +1051,6 @@
this.splitContainer1.SplitterDistance = 900;
this.splitContainer1.TabIndex = 5;
//
- // ribbonButtonDelete
- //
- this.ribbonButtonDelete.Enabled = false;
- this.ribbonButtonDelete.Image = global::OnDoc.Properties.Resources.DeleteDoc_32x32_32;
- this.ribbonButtonDelete.LargeImage = global::OnDoc.Properties.Resources.DeleteDoc_32x32_32;
- this.ribbonButtonDelete.Name = "ribbonButtonDelete";
- this.ribbonButtonDelete.SmallImage = global::OnDoc.Properties.Resources.DeleteDoc_24x24_32;
- this.ribbonButtonDelete.Text = "Löschen";
- this.ribbonButtonDelete.Click += new System.EventHandler(this.ribbonButton3_Click);
- //
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1054,6 +1060,50 @@
this.docPreview1.TabIndex = 4;
this.docPreview1.ZoomPercentage = 0;
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.rbbpb);
+ this.groupBox1.Controls.Add(this.rbppa);
+ this.groupBox1.Controls.Add(this.rbppohne);
+ this.groupBox1.Location = new System.Drawing.Point(546, 192);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(534, 55);
+ this.groupBox1.TabIndex = 16;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Fakturierung";
+ //
+ // rbppohne
+ //
+ this.rbppohne.AutoSize = true;
+ this.rbppohne.Checked = true;
+ this.rbppohne.Location = new System.Drawing.Point(20, 23);
+ this.rbppohne.Name = "rbppohne";
+ this.rbppohne.Size = new System.Drawing.Size(52, 17);
+ this.rbppohne.TabIndex = 0;
+ this.rbppohne.TabStop = true;
+ this.rbppohne.Text = "Keine";
+ this.rbppohne.UseVisualStyleBackColor = true;
+ //
+ // rbppa
+ //
+ this.rbppa.AutoSize = true;
+ this.rbppa.Location = new System.Drawing.Point(87, 24);
+ this.rbppa.Name = "rbppa";
+ this.rbppa.Size = new System.Drawing.Size(73, 17);
+ this.rbppa.TabIndex = 1;
+ this.rbppa.Text = "PP-A-Post";
+ this.rbppa.UseVisualStyleBackColor = true;
+ //
+ // rbbpb
+ //
+ this.rbbpb.AutoSize = true;
+ this.rbbpb.Location = new System.Drawing.Point(166, 24);
+ this.rbbpb.Name = "rbbpb";
+ this.rbbpb.Size = new System.Drawing.Size(73, 17);
+ this.rbbpb.TabIndex = 2;
+ this.rbbpb.Text = "PP-B-Post";
+ this.rbbpb.UseVisualStyleBackColor = true;
+ //
// Serienbrief
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1102,6 +1152,8 @@
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
@@ -1183,5 +1235,9 @@
private System.Windows.Forms.RibbonButton RibbonButtonArchivierenUndAbschlessen;
private System.Windows.Forms.ToolStripMenuItem erneutGenerierenToolStripMenuItem;
private System.Windows.Forms.RibbonButton ribbonButtonDelete;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.RadioButton rbbpb;
+ private System.Windows.Forms.RadioButton rbppa;
+ private System.Windows.Forms.RadioButton rbppohne;
}
}
\ No newline at end of file
diff --git a/Client/DocMgmt/Serienbrief.cs b/Client/DocMgmt/Serienbrief.cs
index 1b125535..f9c79caf 100644
--- a/Client/DocMgmt/Serienbrief.cs
+++ b/Client/DocMgmt/Serienbrief.cs
@@ -6,6 +6,7 @@ using System.Drawing;
using System.IO;
using System.Linq;
using System.Net;
+using System.Net.NetworkInformation;
using System.Runtime.CompilerServices;
using System.Runtime.Remoting.Messaging;
using System.Text;
@@ -13,6 +14,8 @@ using System.Threading.Tasks;
using System.Web.Caching;
using System.Windows.Forms;
using System.Xml.Linq;
+using BroadcastListener.Classes;
+using BroadcastListener.Interfaces;
using Database;
using DOCGEN.Klassen;
using Helper;
@@ -35,11 +38,12 @@ using Windows.ApplicationModel.VoiceCommands;
using Windows.Media.Ocr;
using Windows.Perception.Spatial;
using static Model.OnBaseDocUpload;
+using static BroadcastListener.Classes.Factory;
namespace OnDoc.UIControls
{
- public partial class Serienbrief : SfForm
+ public partial class Serienbrief : SfForm, IMessageListener1
{
//private int dokumenttypnr = 0;
private int officevorlagenr = 0;
@@ -48,7 +52,7 @@ namespace OnDoc.UIControls
private int serienbriefnr = 0;
private DOCGEN.DocGen dg = null;
private DOCGEN.DocGet dget = null;
-
+ SerienbriefBearbeitung sbedit;
//private DataSet dsempfaenger = new DataSet();
private int selectedsbnr = 0;
public Serienbrief()
@@ -56,6 +60,8 @@ namespace OnDoc.UIControls
InitializeComponent();
this.Style.TitleBar.BackColor = Theaming.Titelbar();
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
+ Broadcaster().AddListener(this);
+ Closing += Form_Closing;
}
public Serienbrief(int profilnr)
@@ -64,15 +70,53 @@ namespace OnDoc.UIControls
this.Style.TitleBar.BackColor = Theaming.Titelbar();
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
this.profilnr = profilnr;
+ Broadcaster().AddListener(this);
+ Closing += Form_Closing;
}
private void Serienbrief_Load(object sender, EventArgs e)
{
Refresh_Lists();
Refresh_Team();
+ //Broadcaster().AddListener(this);
+ //Closing += Form_Closing;
}
+ private void Form_Closing(object sender, CancelEventArgs e)
+ {
+ Broadcaster().RemoveListener(this);
+ }
+
+ private bool IsPreview = false;
+ private string PreviewFiename = "";
+ public void OnListen(string message, SenderInfo sender)
+ {
+ if (message == "BtnSBVorschau")
+ {
+ if (sender.SenderName=="Serienbriefbearbeitung")
+ {
+ string[] details = sender.Function.Split(' ');
+ foreach (System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
+ {
+ if (dr[0].ToString() == details[0].ToString())
+ {
+ IsPreview = true;
+ PreviewFiename = sender.Details.ToString()+".tmp";
+ ribbonbuttonsave_Click(sender, null);
+ Generate(Convert.ToInt32(dr["intEintragnr"]));
+ System.IO.File.Delete(PreviewFiename);
+ PreviewFiename = "";
+ IsPreview = false;
+ }
+ }
+ }
+ }
+ if (message== "BtnSBVorschauSave")
+ {
+ ribbonbuttonsave_Click(sender, null);
+ }
+ }
private void enable_disable_functions(int type, bool enabled)
{
if (type == 1)
@@ -226,6 +270,27 @@ namespace OnDoc.UIControls
}
DB dB = new DB(AppParams.connectionstring);
//sb.dsempfaenger.Tables[0].Rows.Clear();
+ foreach (System.Data.DataColumn dc in importdata.Columns)
+ {
+ bool found = false;
+ foreach (System.Data.DataColumn edc in sb.dsempfaenger.Tables[0].Columns)
+ {
+ if (edc.ColumnName == dc.ColumnName) { found = true; break; }
+ }
+ if (!found)
+ {
+ try
+ {
+ sb.dsempfaenger.Tables[0].Columns.Add("$$" + dc.ColumnName + "$$");
+ dc.ColumnName = "$$" + dc.ColumnName + "$$";
+ }
+ catch { }
+ }
+
+ }
+ importdata.AcceptChanges();
+
+
sfDataGridEmpfaenger.DataSource = null;
foreach (System.Data.DataRow dr in importdata.Rows)
{
@@ -269,15 +334,20 @@ namespace OnDoc.UIControls
}
private void refresh_spalten()
{
- //sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
- //sfDataGridEmpfaenger.Columns["FEHLERCODE"].Visible = false;
- //sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = false;
- //sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
- //sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = false;
- //sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
- //sfDataGridEmpfaenger.Columns["ERSTELLER"].Visible = false;
- //sfDataGridEmpfaenger.Columns["DRUCKJOBID"].Visible = false;
- //sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false;
+ try
+ {
+ sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = false;
+ }
+ catch { }
+ sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
+ sfDataGridEmpfaenger.Columns["FEHLERCODE"].Visible = false;
+ sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = false;
+ sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
+ sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = false;
+ sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
+ sfDataGridEmpfaenger.Columns["ERSTELLER"].Visible = false;
+ sfDataGridEmpfaenger.Columns["DRUCKJOBID"].Visible = false;
+ sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false;
sfDataGridEmpfaenger.Columns["Zustelladresse"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede1"].Visible = false;
sfDataGridEmpfaenger.Columns["Briefanrede2"].Visible = false;
@@ -287,8 +357,7 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.Columns["Strasse"].Visible = false;
sfDataGridEmpfaenger.Columns["PLZ"].Visible = false;
sfDataGridEmpfaenger.Columns["Ort"].Visible = false;
-
-
+ sfDataGridEmpfaenger.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
}
private void init_empfaenger(int serienbriefnr)
{
@@ -488,13 +557,18 @@ namespace OnDoc.UIControls
{
sb.faksimile_unterschrfit = "False";
}
- }catch { sb.faksimile_unterschrfit = "False"; }
+ } catch { sb.faksimile_unterschrfit = "False"; }
try { sb.team = Convert.ToInt32(cbboxteam.SelectedValue.ToString()); } catch { sb.team = 0; }
sb.archivdatum = Convert.ToDateTime(DateDokumentDatum.Value);
sb.dokumentdatum = Convert.ToDateTime(DateDokumentDatum.Value);
+ if (rbppa.Checked) { sb.ppfaktura = 1; }
+ if (rbbpb.Checked) { sb.ppfaktura = 2; }
+ if (rbppohne.Checked) { sb.ppfaktura = 0; }
DB db = new DB(AppParams.connectionstring);
sb.serienbriefnr = db.Save_Serienbrief(sb, AppParams.tempdir);
- db.save_sb_vorlage_to_db(sb.filename, "", sb.serienbriefnr);
+ //sb.dsempfaenger.WriteXml(@"x:\test.xml");
+ if (!IsPreview) { db.save_sb_vorlage_to_db(sb.filename, "", sb.serienbriefnr); }
+ else { db.save_sb_vorlage_to_db(PreviewFiename, "", sb.serienbriefnr); }
}
@@ -641,6 +715,12 @@ namespace OnDoc.UIControls
cbboxunterschriftrechts.SelectedValue = sb.unterschriftrechts;
cbboxverantwortlich.SelectedValue = sb.verantwortlich;
DateDokumentDatum.Value = sb.archivdatum;
+ switch (sb.ppfaktura)
+ {
+ case 0:rbppohne.Checked = true;break;
+ case 1: rbppa.Checked = true;break;
+ case 2:rbbpb.Checked = true;break;
+ }
if (sb.zustaendig == -1)
{
rbzustaendigkube.Checked = true; rbzustaendigmitarbeiter.Checked = false;
@@ -680,8 +760,15 @@ namespace OnDoc.UIControls
private void ribbonButton1_Click(object sender, EventArgs e)
{
- SerienbriefBearbeitung sbedit = new SerienbriefBearbeitung(this.sb);
+
+ try
+ {
+ sbedit.Dispose();
+ }
+ catch { }
+ sbedit = new SerienbriefBearbeitung(this.sb);
sbedit.Show();
+
this.sb = sbedit.sb;
update_serienbriefdaten(false);
@@ -845,6 +932,12 @@ namespace OnDoc.UIControls
private void RibbonButtonGenerateSB_Click(object sender, EventArgs e)
{
ribbonbuttonsave_Click(sender, e);
+ Generate();
+ }
+ private void Generate(int vorschauid = 0)
+ {
+
+
ToastMessage.ShowToast("Speichern", "Serienbriefdaten wurden gespeichert");
vorlagendaten = null;
vorlagendaten = new System.Data.DataTable();
@@ -852,10 +945,34 @@ namespace OnDoc.UIControls
dg = new DOCGEN.DocGen();
dget = new DOCGEN.DocGet(AppParams.connectionstring);
DB dB = new DB(AppParams.connectionstring);
+ if (IsPreview)
+ {
+ Helper.FileHelper fh = new FileHelper();
+ sb.VorlageBase64 = fh.Base64FromFile(PreviewFiename);
+ } else {
string fn = dB.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir);
- sb.VorlageBase64 = dB.dsdaten.Tables[0].Rows[0][0].ToString();
+ sb.VorlageBase64 = dB.dsdaten.Tables[0].Rows[0][0].ToString(); }
+
sb.DocValues = new List();
- vorlagendaten_aufbereiten();
+
+ APIHelper imghelper = new APIHelper(AppParams.RESTURI, AppParams.apikey);
+ if (sb.faksimile_unterschrfit == "True")
+ {
+ sb.img_unterschriftlinks = Newtonsoft.Json.JsonConvert.DeserializeObject(imghelper.get_unterschrift(sb.unterschriftlinks.ToString()));
+ sb.img_unterschrfitrechts = Newtonsoft.Json.JsonConvert.DeserializeObject(imghelper.get_unterschrift(sb.unterschriftrechts.ToString()));
+ }
+ if (sb.ppfaktura == 1)
+ {
+ sb.img_faktura = Newtonsoft.Json.JsonConvert.DeserializeObject(imghelper.get_image(1, -1, 0));
+ }
+ if (sb.ppfaktura == 2)
+ {
+ sb.img_faktura = Newtonsoft.Json.JsonConvert.DeserializeObject(imghelper.get_image(2, -1, 0));
+ }
+ imghelper = null;
+
+
+ vorlagendaten_aufbereiten(vorschauid);
update_serienbriefdaten(false);
update_zahlen();
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[2];
@@ -863,235 +980,251 @@ namespace OnDoc.UIControls
}
- private void vorlagendaten_aufbereiten()
+ private void vorlagendaten_aufbereiten(int vorschauid = 0)
{
init_progressbar("Dokumente generieren", vorlagendaten.Rows.Count);
for (int i = 0, loopTo = vorlagendaten.Rows.Count - 1; i <= loopTo; i++)
{
- add_progress();
- System.Windows.Forms.Application.DoEvents();
-
- string sp1 = "";
- string[] sp2;
- string feldnr;
- for (int i1 = 0, loopTo1 = vorlagendaten.Columns.Count - 1; i1 <= loopTo1; i1++)
+ if (vorschauid == 0 || Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
{
- try
- {
- sp1 = vorlagendaten.Columns[i1].ColumnName;
- sp2 = sp1.Split(new string[] { "_09_" }, StringSplitOptions.None);
- sp1 = sp2[0] + "_09_" + sp2[2];
- feldnr = sp2[1].ToString();
- sp1 = sp1;
- }
- catch
- {
- sp1 = vorlagendaten.Columns[i1].ColumnName;
- feldnr = sp1;
- }
- switch (sp1)
+ add_progress();
+ System.Windows.Forms.Application.DoEvents();
+
+ string sp1 = "";
+ string[] sp2;
+ string feldnr;
+ for (int i1 = 0, loopTo1 = vorlagendaten.Columns.Count - 1; i1 <= loopTo1; i1++)
{
- // Mapping Zustelladresse
- case "F_09_1":
- case "F_09_10":
- {
- if (vorlagendaten.Rows[i]["Zustelladresse"] != "")
+ try
+ {
+ sp1 = vorlagendaten.Columns[i1].ColumnName;
+ sp2 = sp1.Split(new string[] { "_09_" }, StringSplitOptions.None);
+ sp1 = sp2[0] + "_09_" + sp2[2];
+ feldnr = sp2[1].ToString();
+ sp1 = sp1;
+ }
+ catch
+ {
+ sp1 = vorlagendaten.Columns[i1].ColumnName;
+ feldnr = sp1;
+ }
+ switch (sp1)
+ {
+ // Mapping Zustelladresse
+ case "F_09_1":
+ case "F_09_10":
{
- vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Zustelladresse"];
- }
+ if (vorlagendaten.Rows[i]["Zustelladresse"] != "")
+ {
+ vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Zustelladresse"];
+ }
- break;
- }
- case "F_09_89":
- {
- if (vorlagendaten.Rows[i]["Name"] != "")
- {
- vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Name"];
+ break;
}
-
- break;
- }
- case "F_09_111":
- {
- if (vorlagendaten.Rows[i]["Vorname"] != "")
+ case "F_09_89":
{
- vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Vorname"];
+ if (vorlagendaten.Rows[i]["Name"] != "")
+ {
+ vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Name"];
+ }
+
+ break;
}
+ case "F_09_111":
+ {
+ if (vorlagendaten.Rows[i]["Vorname"] != "")
+ {
+ vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Vorname"];
+ }
- break;
- }
- case "F_09_122":
- case "F_09_123":
- case "F_09_20":
- {
- string s = "";
- string s1;
- if (vorlagendaten.Rows[i]["Briefanrede1"] != "")
+ break;
+ }
+ case "F_09_122":
+ case "F_09_123":
+ case "F_09_20":
{
- s = vorlagendaten.Rows[i]["Briefanrede1"].ToString();
- if (s.Substring(0, 4) == "Herr")
+ string s = "";
+ string s1;
+ if (vorlagendaten.Rows[i]["Briefanrede1"] != "")
{
- s = "r " + s;
+ s = vorlagendaten.Rows[i]["Briefanrede1"].ToString();
+ if (s.Substring(0, 4) == "Herr")
+ {
+ s = "r " + s;
+ }
+ else
+ {
+ s = " " + s;
+ }
}
- else
+ if (vorlagendaten.Rows[i]["Briefanrede2"] != "")
{
- s = " " + s;
+ if (!string.IsNullOrEmpty(s))
+ s = s + Environment.NewLine;
+ s1 = vorlagendaten.Rows[i]["Briefanrede2"].ToString();
+ if (s.Substring(0, 4) == "Herr")
+ {
+ s = s + "Sehr geehrter " + s1;
+ }
+ else
+ {
+ s = s + "Sehr geehrte " + s1;
+ }
}
- }
- if (vorlagendaten.Rows[i]["Briefanrede2"] != "")
- {
if (!string.IsNullOrEmpty(s))
- s = s + Environment.NewLine;
- s1 = vorlagendaten.Rows[i]["Briefanrede2"].ToString();
- if (s.Substring(0, 4) == "Herr")
{
- s = s + "Sehr geehrter " + s1;
+ vorlagendaten.Rows[i][i1] = s;
}
- else
+
+ break;
+ }
+ case "F_09_98":
+ {
+ if (vorlagendaten.Rows[i]["Strasse"] != "")
{
- s = s + "Sehr geehrte " + s1;
+ vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Strasse"];
}
+
+ break;
}
- if (!string.IsNullOrEmpty(s))
+ case "F_09_93":
{
- vorlagendaten.Rows[i][i1] = s;
- }
+ if (vorlagendaten.Rows[i]["Ort"] != "")
+ {
+ vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"];
+ }
- break;
- }
- case "F_09_98":
- {
- if (vorlagendaten.Rows[i]["Strasse"] != "")
- {
- vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Strasse"];
+ break;
}
-
- break;
- }
- case "F_09_93":
- {
- if (vorlagendaten.Rows[i]["Ort"] != "")
+ case var @case when @case == "F_09_93":
{
- vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"];
+ if (vorlagendaten.Rows[i]["Ort"] != "")
+ {
+ vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"];
+ }
+
+ break;
}
+ case "F_09_96":
+ {
+ if (vorlagendaten.Rows[i]["PLZ"] != "")
+ {
+ vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"];
+ }
- break;
- }
- case var @case when @case == "F_09_93":
- {
- if (vorlagendaten.Rows[i]["Ort"] != "")
+ break;
+ }
+ case "F_09_132":
{
- vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"];
+ if (vorlagendaten.Rows[i]["PLZ"].ToString() != "" | vorlagendaten.Rows[i]["Ort"].ToString() != "0")
+ {
+ vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"] + " " + vorlagendaten.Rows[i]["Ort"];
+ }
+
+ break;
}
- break;
- }
- case "F_09_96":
- {
- if (vorlagendaten.Rows[i]["PLZ"] != "")
+ default:
{
- vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"];
+ break;
}
+ }
- break;
- }
- case "F_09_132":
+ // Verknüpfte Felder
+ try
+ {
+ int i2;
+ var loopTo2 = sb.dsempfaenger.Tables["VerkFelder"].Rows.Count - 1;
+ for (i2 = 0; i2 <= loopTo2; i2++)
{
- if (vorlagendaten.Rows[i]["PLZ"].ToString() != "" | vorlagendaten.Rows[i]["Ort"].ToString() != "0")
+ if (feldnr == sb.dsempfaenger.Tables["verkfelder"].Rows[i2]["Vorlagenfeldnr"].ToString())
{
- vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"] + " " + vorlagendaten.Rows[i]["Ort"];
+ vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i][sb.dsempfaenger.Tables["verkfelder"].Rows[i2]["IDVWert"].ToString()];
}
-
- break;
}
+ }
- default:
+ catch
+ {
+
+ }
+ if (object.ReferenceEquals(vorlagendaten.Rows[i][i1], DBNull.Value))
+ {
+ vorlagendaten.Rows[i][i1] = "";
+ }
+ try
+ {
+ if (vorlagendaten.Columns[i1].ColumnName.ToString().Substring(0, 5) == "F_09_")
{
- break;
+ Insert_Value(vorlagendaten.Rows[i][i1].ToString(), vorlagendaten.Columns[i1].ColumnName);
}
- }
-
- // Verknüpfte Felder
- try
- {
- int i2;
- var loopTo2 = sb.dsempfaenger.Tables["VerkFelder"].Rows.Count - 1;
- for (i2 = 0; i2 <= loopTo2; i2++)
+ }
+ catch { }
+ try
+ {
+ if (vorlagendaten.Columns[i1].ColumnName.ToString().Substring(0, 5) == "I_09_")
+ {
+ string intfeldname;
+ string Intbookmark;
+ string IntWert;
+ intfeldname = vorlagendaten.Columns[i1].ColumnName;
+ Intbookmark = Helper.Strings.Right(vorlagendaten.Columns[i1].ColumnName, vorlagendaten.Columns[i1].ColumnName.Length - 5);
+ IntWert = Helper.Strings.Right(vorlagendaten.Columns[i1].ColumnName, vorlagendaten.Columns[i1].ColumnName.Length - 14);
+
+ int ind;
+ ind = IntWert.IndexOf("_09_");
+ IntWert = Helper.Strings.Left(IntWert, ind);
+ // SplitArray = IntWert.Split("_09_")
+ // IntWert = SplitArray(0)
+ // IntWert = RenCol(IntWert)
+ Insert_Value(vorlagendaten.Rows[i][IntWert].ToString(), Intbookmark);
+ }
+ }
+ catch { }
+ try
{
- if (feldnr == sb.dsempfaenger.Tables["verkfelder"].Rows[i2]["Vorlagenfeldnr"].ToString())
+ if (vorlagendaten.Columns[i1].ColumnName.ToString().Substring(0, 2) == "$$")
{
- vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i][sb.dsempfaenger.Tables["verkfelder"].Rows[i2]["IDVWert"].ToString()];
+ Insert_Value(vorlagendaten.Rows[i][i1].ToString(), vorlagendaten.Columns[i1].ColumnName);
}
}
+ catch { }
}
- catch
+ Helper.FileHelper fh = new FileHelper();
+ DB db = new DB(AppParams.connectionstring);
+ System.Data.DataRow dr = sb.dsempfaenger.Tables[0].Select("intEintragnr = '" + vorlagendaten.Rows[i]["IntEintragnr"].ToString() + "'").FirstOrDefault();
+ string dokumentid = "";
+ if (dr != null)
{
-
+ dokumentid = dr["dokumentid"].ToString();
}
- if (object.ReferenceEquals(vorlagendaten.Rows[i][i1], DBNull.Value))
+ if (dokumentid == "") { dokumentid = db.get_dbkey("Dokument"); }
+ string filename = dokumentid + ".pdf";
+
+ if (vorschauid != 0 && Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
{
- vorlagendaten.Rows[i][i1] = "";
+ string pdfdoc_preview = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey));
+ sbedit.Update_Preview(pdfdoc_preview);
}
- try
+ else
{
- if (vorlagendaten.Columns[i1].ColumnName.ToString().Substring(0, 5) == "F_09_")
- {
- Insert_Value(vorlagendaten.Rows[i][i1].ToString(), vorlagendaten.Columns[i1].ColumnName);
- }
+ string pdfdoc = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey));
+
+ fh.SaveBase64ToFile(pdfdoc, AppParams.tempdir + filename);
+ db.save_serienbrief_datei(sb.serienbriefnr, Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]), AppParams.tempdir + filename, dokumentid);
+ System.IO.File.Delete(AppParams.tempdir + filename);
}
- catch { }
- try
+ db = null;
+ if (dr != null && vorschauid == 0)
{
- if (vorlagendaten.Columns[i1].ColumnName.ToString().Substring(0, 5) == "I_09_")
- {
- string intfeldname;
- string Intbookmark;
- string IntWert;
- intfeldname = vorlagendaten.Columns[i1].ColumnName;
- Intbookmark = Helper.Strings.Right(vorlagendaten.Columns[i1].ColumnName, vorlagendaten.Columns[i1].ColumnName.Length - 5);
- IntWert = Helper.Strings.Right(vorlagendaten.Columns[i1].ColumnName, vorlagendaten.Columns[i1].ColumnName.Length - 14);
-
- int ind;
- ind = IntWert.IndexOf("_09_");
- IntWert = Helper.Strings.Left(IntWert, ind);
- // SplitArray = IntWert.Split("_09_")
- // IntWert = SplitArray(0)
- // IntWert = RenCol(IntWert)
- Insert_Value(vorlagendaten.Rows[i][IntWert].ToString(), Intbookmark);
- }
+ dr["STATUS"] = "1";
+ dr["Dokumentid"] = dokumentid;
}
- catch { }
- }
- Helper.FileHelper fh = new FileHelper();
- DB db = new DB(AppParams.connectionstring);
- System.Data.DataRow dr = sb.dsempfaenger.Tables[0].Select("intEintragnr = '" + vorlagendaten.Rows[i]["IntEintragnr"].ToString() + "'").FirstOrDefault();
- string dokumentid = "";
- if (dr != null)
- {
- dokumentid = dr["dokumentid"].ToString();
+ sb.DocValues.Clear();
}
- if (dokumentid == "") { dokumentid = db.get_dbkey("Dokument"); }
- string filename = dokumentid + ".pdf";
-
-
- string pdfdoc = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey));
- //string filename = "SB_" + sb.serienbriefnr.ToString() + vorlagendaten.Rows[i]["intEintragnr"].ToString() + ".pdf";
-
- fh.SaveBase64ToFile(pdfdoc, AppParams.tempdir + filename);
- db.save_serienbrief_datei(sb.serienbriefnr, Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]), AppParams.tempdir + filename, dokumentid);
- System.IO.File.Delete(AppParams.tempdir + filename);
- db = null;
- if (dr != null)
- {
- dr["STATUS"] = "1";
- dr["Dokumentid"] = dokumentid;
- }
-
- sb.DocValues.Clear();
-
}
finish_progress();
@@ -1177,6 +1310,7 @@ namespace OnDoc.UIControls
}
clsDocValue dv = new clsDocValue();
+
dv.TMBeginn = beginntextmarke; ;
dv.TMEnd = endetextmarke;
dv.Value = feldwert;
diff --git a/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs b/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs
index 1b38ee0e..b01d00ff 100644
--- a/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs
+++ b/Client/DocMgmt/SerienbriefBearbeitung.Designer.cs
@@ -31,122 +31,125 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SerienbriefBearbeitung));
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.label3 = new System.Windows.Forms.Label();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+ this.sfdatagridstandard = new Syncfusion.WinForms.DataGrid.SfDataGrid();
+ this.contextMenuStandard = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.platzhalterImDokumentEinfügenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
+ this.sfdatagridDokspezifisch = new Syncfusion.WinForms.DataGrid.SfDataGrid();
+ this.contextMenuIDV = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.platzhalterImDokumentEinfügenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+ this.label3 = new System.Windows.Forms.Label();
this.sfdatagridUsed = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.contextMenuUsed = new System.Windows.Forms.ContextMenuStrip(this.components);
this.cursorImDokumentPositionierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.platzhalterLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.sfdatagridDokspezifisch = new Syncfusion.WinForms.DataGrid.SfDataGrid();
- this.contextMenuIDV = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.platzhalterImDokumentEinfügenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
- this.sfdatagridstandard = new Syncfusion.WinForms.DataGrid.SfDataGrid();
- this.contextMenuStandard = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.platzhalterImDokumentEinfügenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.label4 = new System.Windows.Forms.Label();
+ this.txtfilter = new System.Windows.Forms.TextBox();
+ this.tscomboboxbp = new System.Windows.Forms.ToolStripComboBox();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
+ this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.toolStrip1.SuspendLayout();
- this.groupBox1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.sfdatagridUsed)).BeginInit();
- this.contextMenuUsed.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.sfdatagridDokspezifisch)).BeginInit();
- this.contextMenuIDV.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sfdatagridstandard)).BeginInit();
this.contextMenuStandard.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.sfdatagridDokspezifisch)).BeginInit();
+ this.contextMenuIDV.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.sfdatagridUsed)).BeginInit();
+ this.contextMenuUsed.SuspendLayout();
+ this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripButton1});
+ this.toolStripButton1,
+ this.tscomboboxbp,
+ this.toolStripButton2,
+ this.toolStripButton3});
this.toolStrip1.Location = new System.Drawing.Point(2, 2);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(382, 25);
+ this.toolStrip1.Size = new System.Drawing.Size(375, 25);
this.toolStrip1.TabIndex = 0;
this.toolStrip1.Text = "toolStrip1";
//
- // groupBox1
+ // toolStripButton1
//
- this.groupBox1.Controls.Add(this.label3);
- this.groupBox1.Controls.Add(this.label2);
- this.groupBox1.Controls.Add(this.label1);
- this.groupBox1.Controls.Add(this.sfdatagridUsed);
- this.groupBox1.Controls.Add(this.sfdatagridDokspezifisch);
- this.groupBox1.Controls.Add(this.sfdatagridstandard);
- this.groupBox1.Location = new System.Drawing.Point(5, 30);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(379, 435);
- this.groupBox1.TabIndex = 1;
- this.groupBox1.TabStop = false;
+ this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.toolStripButton1.Image = global::OnDoc.Properties.Resources.save_24x24_32;
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(23, 22);
+ this.toolStripButton1.Text = "Speichern und schliessen";
+ this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
- // label3
+ // toolStripButton2
//
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(7, 244);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(96, 13);
- this.label3.TabIndex = 5;
- this.label3.Text = "Verwendete Werte";
+ this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.toolStripButton2.Image = global::OnDoc.Properties.Resources.Preview_Rechts_24x24_32;
+ this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton2.Name = "toolStripButton2";
+ this.toolStripButton2.Size = new System.Drawing.Size(23, 22);
+ this.toolStripButton2.Text = "Vorschau";
+ this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
+ //
+ // sfdatagridstandard
+ //
+ this.sfdatagridstandard.AccessibleName = "Table";
+ this.sfdatagridstandard.AllowFiltering = true;
+ this.sfdatagridstandard.ContextMenuStrip = this.contextMenuStandard;
+ this.sfdatagridstandard.Location = new System.Drawing.Point(3, 39);
+ this.sfdatagridstandard.Name = "sfdatagridstandard";
+ this.sfdatagridstandard.Size = new System.Drawing.Size(373, 481);
+ this.sfdatagridstandard.TabIndex = 0;
+ this.sfdatagridstandard.Text = "sfDataGrid1";
+ this.sfdatagridstandard.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfdatagridstandard_CellClick);
+ //
+ // contextMenuStandard
+ //
+ this.contextMenuStandard.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.platzhalterImDokumentEinfügenToolStripMenuItem});
+ this.contextMenuStandard.Name = "contextMenuStandard";
+ this.contextMenuStandard.Size = new System.Drawing.Size(256, 26);
+ //
+ // platzhalterImDokumentEinfügenToolStripMenuItem
+ //
+ this.platzhalterImDokumentEinfügenToolStripMenuItem.Name = "platzhalterImDokumentEinfügenToolStripMenuItem";
+ this.platzhalterImDokumentEinfügenToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
+ this.platzhalterImDokumentEinfügenToolStripMenuItem.Text = "Platzhalter im Dokument einfügen";
+ this.platzhalterImDokumentEinfügenToolStripMenuItem.Click += new System.EventHandler(this.platzhalterImDokumentEinfügenToolStripMenuItem_Click);
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(7, 119);
+ this.label2.Location = new System.Drawing.Point(6, 526);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(190, 13);
this.label2.TabIndex = 4;
this.label2.Text = "Verfügbare dokument-spzifische Werte";
+ this.label2.Visible = false;
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(7, 16);
+ this.label1.Location = new System.Drawing.Point(6, 16);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(137, 13);
this.label1.TabIndex = 3;
this.label1.Text = "Verfügbare Standard-Werte";
//
- // sfdatagridUsed
- //
- this.sfdatagridUsed.AccessibleName = "Table";
- this.sfdatagridUsed.ContextMenuStrip = this.contextMenuUsed;
- this.sfdatagridUsed.Location = new System.Drawing.Point(6, 263);
- this.sfdatagridUsed.Name = "sfdatagridUsed";
- this.sfdatagridUsed.Size = new System.Drawing.Size(367, 166);
- this.sfdatagridUsed.TabIndex = 2;
- this.sfdatagridUsed.Text = "sfDataGrid1";
- //
- // contextMenuUsed
- //
- this.contextMenuUsed.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.cursorImDokumentPositionierenToolStripMenuItem,
- this.platzhalterLöschenToolStripMenuItem});
- this.contextMenuUsed.Name = "contextMenuUsed";
- this.contextMenuUsed.Size = new System.Drawing.Size(258, 48);
- //
- // cursorImDokumentPositionierenToolStripMenuItem
- //
- this.cursorImDokumentPositionierenToolStripMenuItem.Name = "cursorImDokumentPositionierenToolStripMenuItem";
- this.cursorImDokumentPositionierenToolStripMenuItem.Size = new System.Drawing.Size(257, 22);
- this.cursorImDokumentPositionierenToolStripMenuItem.Text = "Cursor im Dokument positionieren";
- this.cursorImDokumentPositionierenToolStripMenuItem.Click += new System.EventHandler(this.cursorImDokumentPositionierenToolStripMenuItem_Click);
- //
- // platzhalterLöschenToolStripMenuItem
- //
- this.platzhalterLöschenToolStripMenuItem.Name = "platzhalterLöschenToolStripMenuItem";
- this.platzhalterLöschenToolStripMenuItem.Size = new System.Drawing.Size(257, 22);
- this.platzhalterLöschenToolStripMenuItem.Text = "Platzhalter löschen";
- //
// sfdatagridDokspezifisch
//
this.sfdatagridDokspezifisch.AccessibleName = "Table";
this.sfdatagridDokspezifisch.ContextMenuStrip = this.contextMenuIDV;
- this.sfdatagridDokspezifisch.Location = new System.Drawing.Point(6, 135);
+ this.sfdatagridDokspezifisch.Location = new System.Drawing.Point(3, 542);
this.sfdatagridDokspezifisch.Name = "sfdatagridDokspezifisch";
this.sfdatagridDokspezifisch.Size = new System.Drawing.Size(367, 101);
this.sfdatagridDokspezifisch.TabIndex = 1;
this.sfdatagridDokspezifisch.Text = "sfDataGrid1";
+ this.sfdatagridDokspezifisch.Visible = false;
this.sfdatagridDokspezifisch.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfdatagridDokspezifisch_CellClick);
//
// contextMenuIDV
@@ -163,47 +166,112 @@
this.platzhalterImDokumentEinfügenToolStripMenuItem1.Text = "Platzhalter im Dokument einfügen";
this.platzhalterImDokumentEinfügenToolStripMenuItem1.Click += new System.EventHandler(this.platzhalterImDokumentEinfügenToolStripMenuItem1_Click);
//
- // sfdatagridstandard
+ // label3
//
- this.sfdatagridstandard.AccessibleName = "Table";
- this.sfdatagridstandard.ContextMenuStrip = this.contextMenuStandard;
- this.sfdatagridstandard.Location = new System.Drawing.Point(6, 32);
- this.sfdatagridstandard.Name = "sfdatagridstandard";
- this.sfdatagridstandard.Size = new System.Drawing.Size(367, 84);
- this.sfdatagridstandard.TabIndex = 0;
- this.sfdatagridstandard.Text = "sfDataGrid1";
- this.sfdatagridstandard.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfdatagridstandard_CellClick);
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(6, 526);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(96, 13);
+ this.label3.TabIndex = 5;
+ this.label3.Text = "Verwendete Werte";
//
- // contextMenuStandard
+ // sfdatagridUsed
//
- this.contextMenuStandard.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.platzhalterImDokumentEinfügenToolStripMenuItem});
- this.contextMenuStandard.Name = "contextMenuStandard";
- this.contextMenuStandard.Size = new System.Drawing.Size(256, 26);
+ this.sfdatagridUsed.AccessibleName = "Table";
+ this.sfdatagridUsed.ContextMenuStrip = this.contextMenuUsed;
+ this.sfdatagridUsed.Location = new System.Drawing.Point(3, 542);
+ this.sfdatagridUsed.Name = "sfdatagridUsed";
+ this.sfdatagridUsed.Size = new System.Drawing.Size(367, 166);
+ this.sfdatagridUsed.TabIndex = 2;
+ this.sfdatagridUsed.Text = "sfDataGrid1";
//
- // platzhalterImDokumentEinfügenToolStripMenuItem
+ // contextMenuUsed
//
- this.platzhalterImDokumentEinfügenToolStripMenuItem.Name = "platzhalterImDokumentEinfügenToolStripMenuItem";
- this.platzhalterImDokumentEinfügenToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
- this.platzhalterImDokumentEinfügenToolStripMenuItem.Text = "Platzhalter im Dokument einfügen";
- this.platzhalterImDokumentEinfügenToolStripMenuItem.Click += new System.EventHandler(this.platzhalterImDokumentEinfügenToolStripMenuItem_Click);
+ this.contextMenuUsed.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.cursorImDokumentPositionierenToolStripMenuItem,
+ this.platzhalterLöschenToolStripMenuItem});
+ this.contextMenuUsed.Name = "contextMenuUsed";
+ this.contextMenuUsed.Size = new System.Drawing.Size(258, 48);
//
- // toolStripButton1
+ // cursorImDokumentPositionierenToolStripMenuItem
//
- this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
- this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(23, 22);
- this.toolStripButton1.Text = "toolStripButton1";
- this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ this.cursorImDokumentPositionierenToolStripMenuItem.Name = "cursorImDokumentPositionierenToolStripMenuItem";
+ this.cursorImDokumentPositionierenToolStripMenuItem.Size = new System.Drawing.Size(257, 22);
+ this.cursorImDokumentPositionierenToolStripMenuItem.Text = "Cursor im Dokument positionieren";
+ this.cursorImDokumentPositionierenToolStripMenuItem.Click += new System.EventHandler(this.cursorImDokumentPositionierenToolStripMenuItem_Click);
+ //
+ // platzhalterLöschenToolStripMenuItem
+ //
+ this.platzhalterLöschenToolStripMenuItem.Name = "platzhalterLöschenToolStripMenuItem";
+ this.platzhalterLöschenToolStripMenuItem.Size = new System.Drawing.Size(257, 22);
+ this.platzhalterLöschenToolStripMenuItem.Text = "Platzhalter löschen";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(149, 16);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(41, 13);
+ this.label4.TabIndex = 6;
+ this.label4.Text = "Suche:";
+ //
+ // txtfilter
+ //
+ this.txtfilter.Location = new System.Drawing.Point(196, 13);
+ this.txtfilter.Name = "txtfilter";
+ this.txtfilter.Size = new System.Drawing.Size(150, 20);
+ this.txtfilter.TabIndex = 7;
+ this.txtfilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtfilter_KeyDown);
+ //
+ // tscomboboxbp
+ //
+ this.tscomboboxbp.Name = "tscomboboxbp";
+ this.tscomboboxbp.Size = new System.Drawing.Size(121, 25);
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.sfdatagridstandard);
+ this.groupBox2.Controls.Add(this.label1);
+ this.groupBox2.Controls.Add(this.label4);
+ this.groupBox2.Controls.Add(this.txtfilter);
+ this.groupBox2.Controls.Add(this.label2);
+ this.groupBox2.Controls.Add(this.sfdatagridUsed);
+ this.groupBox2.Controls.Add(this.sfdatagridDokspezifisch);
+ this.groupBox2.Controls.Add(this.label3);
+ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left;
+ this.groupBox2.Location = new System.Drawing.Point(2, 27);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(387, 718);
+ this.groupBox2.TabIndex = 9;
+ this.groupBox2.TabStop = false;
+ //
+ // toolStripButton3
+ //
+ this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.toolStripButton3.Image = global::OnDoc.Properties.Resources.Preview_Now_24x24_32;
+ this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton3.Name = "toolStripButton3";
+ this.toolStripButton3.Size = new System.Drawing.Size(23, 22);
+ this.toolStripButton3.Text = "toolStripButton3";
+ this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
+ //
+ // docPreview1
+ //
+ this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.docPreview1.Location = new System.Drawing.Point(389, 27);
+ this.docPreview1.Name = "docPreview1";
+ this.docPreview1.Size = new System.Drawing.Size(0, 718);
+ this.docPreview1.TabIndex = 8;
+ this.docPreview1.Visible = false;
+ this.docPreview1.ZoomPercentage = 0;
//
// SerienbriefBearbeitung
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(386, 478);
- this.Controls.Add(this.groupBox1);
+ this.ClientSize = new System.Drawing.Size(379, 747);
+ this.Controls.Add(this.docPreview1);
+ this.Controls.Add(this.groupBox2);
this.Controls.Add(this.toolStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "SerienbriefBearbeitung";
@@ -213,14 +281,14 @@
this.Load += new System.EventHandler(this.SerienbriefBearbeitung_Load);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.sfdatagridUsed)).EndInit();
- this.contextMenuUsed.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.sfdatagridDokspezifisch)).EndInit();
- this.contextMenuIDV.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.sfdatagridstandard)).EndInit();
this.contextMenuStandard.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.sfdatagridDokspezifisch)).EndInit();
+ this.contextMenuIDV.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.sfdatagridUsed)).EndInit();
+ this.contextMenuUsed.ResumeLayout(false);
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -229,7 +297,6 @@
#endregion
private System.Windows.Forms.ToolStrip toolStrip1;
- private System.Windows.Forms.GroupBox groupBox1;
private Syncfusion.WinForms.DataGrid.SfDataGrid sfdatagridUsed;
private Syncfusion.WinForms.DataGrid.SfDataGrid sfdatagridDokspezifisch;
private Syncfusion.WinForms.DataGrid.SfDataGrid sfdatagridstandard;
@@ -244,5 +311,12 @@
private System.Windows.Forms.ToolStripMenuItem cursorImDokumentPositionierenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem platzhalterLöschenToolStripMenuItem;
private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.ToolStripButton toolStripButton2;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.TextBox txtfilter;
+ private System.Windows.Forms.ToolStripComboBox tscomboboxbp;
+ private UIControls.DocPreview docPreview1;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.ToolStripButton toolStripButton3;
}
}
\ No newline at end of file
diff --git a/Client/DocMgmt/SerienbriefBearbeitung.cs b/Client/DocMgmt/SerienbriefBearbeitung.cs
index dc71343e..17e8a42c 100644
--- a/Client/DocMgmt/SerienbriefBearbeitung.cs
+++ b/Client/DocMgmt/SerienbriefBearbeitung.cs
@@ -9,6 +9,8 @@ using System.Security.RightsManagement;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using BroadcastListener.Classes;
+using System.Xml;
using Model;
using OnDoc.Helper;
using OnDoc.Klassen;
@@ -20,6 +22,9 @@ using Syncfusion.WinForms.DataGrid.Interactivity;
using Windows.Devices.HumanInterfaceDevice;
using Windows.Media.Ocr;
using Windows.UI.Xaml.Controls;
+using BroadcastListener.Classes;
+using BroadcastListener.Interfaces;
+using static BroadcastListener.Classes.Factory;
namespace OnDoc.DocMgmt
{
@@ -48,6 +53,10 @@ namespace OnDoc.DocMgmt
this.sb = sb;
}
+ public void Update_Preview(string document)
+ {
+ this.docPreview1.Show_Doc(document);
+ }
private DataTable get_idvwerte()
{
int i;
@@ -97,6 +106,14 @@ namespace OnDoc.DocMgmt
}
return dt;
}
+
+ private void format_standardgrid()
+ {
+ sfdatagridstandard.RowHeight = 17;
+
+ sfdatagridstandard.Columns[0].Width = sfdatagridstandard.Width * 0.1;
+ sfdatagridstandard.Columns[1].Width = sfdatagridstandard.Width * 0.85;
+ }
private void SerienbriefBearbeitung_Load(object sender, EventArgs e)
{
StdFelder = get_vorlagenfelder(sb.dokumenttypnr, 0);
@@ -107,8 +124,12 @@ namespace OnDoc.DocMgmt
dr[1] = dr[1].ToString().Replace(System.Environment.NewLine, " ");
}
StdFelder.AcceptChanges();
- sfdatagridstandard.RowHeight = 17;
sfdatagridstandard.DataSource = StdFelder;
+ foreach (System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
+ {
+ tscomboboxbp.Items.Add(dr[0].ToString() + " " + dr[1].ToString());
+ }
+ format_standardgrid();
IDVFelder = get_idvwerte();
@@ -159,6 +180,7 @@ namespace OnDoc.DocMgmt
private void get_usedfelder(ref System.Data.DataTable list)
{
list = get_vorlagenfelder(sb.dokumenttypnr, 1);
+ if (sb.dsempfaenger.Tables["UsedFelder"].Rows.Count>0) list = sb.dsempfaenger.Tables["UsedFelder"].Copy();
int i;
string s;
bool dodelete = false;
@@ -190,7 +212,12 @@ namespace OnDoc.DocMgmt
{
try
{
+ if (row["Beginntextmarke"].ToString() == "TMSB_0")
+ {
+ string A = "";
+ }
s = word.ActiveDocument.Bookmarks[row["beginntextmarke"].ToString()].Name.ToString();
+
}
catch
{
@@ -357,10 +384,14 @@ namespace OnDoc.DocMgmt
string regelbez = "";
private void sfdatagridstandard_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
- var selectedItem = e.DataRow;
- var dataRow = (e.DataRow.RowData as DataRowView).Row;
- regelnr = Convert.ToInt32(dataRow[0].ToString());
- regelbez = dataRow[1].ToString();
+ try
+ {
+ var selectedItem = e.DataRow;
+ var dataRow = (e.DataRow.RowData as DataRowView).Row;
+ regelnr = Convert.ToInt32(dataRow[0].ToString());
+ regelbez = dataRow[1].ToString();
+ }
+ catch { }
}
private void sfdatagridDokspezifisch_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
@@ -382,7 +413,59 @@ namespace OnDoc.DocMgmt
}
sb.dsempfaenger.Tables["UsedFelder"].AcceptChanges();
+ Broadcaster().Broadcast("BtnSBVorschauSave", new SenderInfo("Speichern", "Speichern",""));
this.Close();
}
+
+ private void toolStripTextBox1_KeyDown(object sender, KeyEventArgs e)
+ {
+
+ }
+
+ private void txtfilter_KeyDown(object sender, KeyEventArgs e)
+ {
+ DataView dv = new DataView(StdFelder);
+ try
+ {
+ dv.RowFilter = "Bezeichnung like '%" + txtfilter.Text.ToString() + "%'";
+ }
+ catch { dv.RowFilter = "Bezeichnung like '%'"; }
+
+
+ sfdatagridstandard.DataSource = null;
+ sfdatagridstandard.DataSource = dv;
+ format_standardgrid();
+ }
+
+ private void toolStripButton2_Click(object sender, EventArgs e)
+ {
+
+ UsedFelder.AcceptChanges();
+ sb.dsempfaenger.Tables["UsedFelder"].Rows.Clear();
+ for (int i = 0; i < UsedFelder.Rows.Count; i++)
+ {
+
+ sb.dsempfaenger.Tables["UsedFelder"].ImportRow(UsedFelder.Rows[i]);
+ }
+
+ sb.dsempfaenger.Tables["UsedFelder"].AcceptChanges();
+
+ string FileName = word.ActiveDocument.FullName;
+ word.ActiveDocument.Save();
+ word.ActiveDocument.SaveAs2(word.ActiveDocument.FullName + ".tmp");
+ word.ActiveDocument.Close();
+ word.Documents.Open(FileName);
+ this.docPreview1.Visible = true;
+ this.Width = groupBox2.Width * 3;
+ Broadcaster().Broadcast("BtnSBVorschau", new SenderInfo("Serienbriefbearbeitung", tscomboboxbp.Text, FileName));
+
+ }
+
+ private void toolStripButton3_Click(object sender, EventArgs e)
+ {
+ docPreview1.Visible = false;
+ this.Width = groupBox2.Width + 10;
+ return;
+ }
}
}
diff --git a/Client/DocMgmt/SerienbriefBearbeitung.resx b/Client/DocMgmt/SerienbriefBearbeitung.resx
index b97f2be0..8a73f566 100644
--- a/Client/DocMgmt/SerienbriefBearbeitung.resx
+++ b/Client/DocMgmt/SerienbriefBearbeitung.resx
@@ -120,31 +120,16 @@
17, 17
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
- YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
- 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
- bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
- VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
- c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
- Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
- mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
- kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
- TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-
-
-
- 437, 17
+
+ 122, 17
294, 17
-
- 122, 17
+
+ 437, 17
+
AAABAAUAAAAAAAEAIAAXZwAAVgAAADAwAAABACAAqCUAAG1nAAAgIAAAAQAgAKgQAAAVjQAAGBgAAAEA
diff --git a/Client/Helper/APIHelper.cs b/Client/Helper/APIHelper.cs
new file mode 100644
index 00000000..65404212
--- /dev/null
+++ b/Client/Helper/APIHelper.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OnDoc.Helper
+{
+ public class APIHelper
+ {
+ private string resturi = "";
+ private string apikey = "";
+
+ public APIHelper(string iRestURI, string iApiKey)
+ {
+ resturi = iRestURI;
+ apikey = iApiKey;
+ }
+ public string get_image(int imageid, int width, int height)
+
+ {
+ string URL = resturi + "API/GetImageAsBase64?imageid=" + imageid.ToString() + "&ImageWidth=" + width.ToString() + "&ImageHeight=" + height.ToString();
+ HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest;
+ webRequest.Method = WebRequestMethods.Http.Get;
+ webRequest.Headers["Authorization"] = "Bearer " + apikey;
+ try
+ {
+ using (HttpWebResponse response = webRequest.GetResponse() as HttpWebResponse)
+ {
+ if (response.StatusCode == HttpStatusCode.OK)
+ {
+ StreamReader reader = new StreamReader(response.GetResponseStream());
+ string responseContent = reader.ReadToEnd();
+
+ return responseContent;
+ }
+ else
+ {
+ Logging.Logging.Error(URL + ": " + response.StatusCode.ToString() + " / " + response.StatusDescription, "Client - GetImage", "");
+ return "";
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ return "";
+ }
+ }
+ public string get_unterschrift(string MaNr)
+ {
+
+ string URL = resturi + "API/GetUnterschriftAsBase64ByMitarbeiternr?MaNr=" + MaNr;
+
+ HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest;
+ webRequest.Method = WebRequestMethods.Http.Get;
+ webRequest.Headers["Authorization"] = "Bearer " + apikey;
+ try
+ {
+ using (HttpWebResponse response = webRequest.GetResponse() as HttpWebResponse)
+ {
+ if (response.StatusCode == HttpStatusCode.OK)
+ {
+ StreamReader reader = new StreamReader(response.GetResponseStream());
+ string responseContent = reader.ReadToEnd();
+
+ return responseContent;
+ }
+ else
+ {
+ Logging.Logging.Error(URL + ": " + response.StatusCode.ToString() + " / " + response.StatusDescription, "Clinet - DokList GetDocument", "");
+ return "";
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ return "";
+ }
+ }
+ }
+}
diff --git a/Client/Start.cs b/Client/Start.cs
index 958382c5..2997a8f6 100644
--- a/Client/Start.cs
+++ b/Client/Start.cs
@@ -5,6 +5,7 @@ using OnDoc.DocMgmt;
using OnDoc.Klassen;
using Syncfusion.WinForms.Controls;
using System;
+using System.Data;
using System.Deployment.Application;
using System.IO;
using System.Windows.Forms;
@@ -129,6 +130,20 @@ namespace OnDoc
//}
//partnerTree1.mitarbeiternr = AppParams.CurrentMitarbieter;
+ //DataSet ds = new DataSet();
+ //System.Data.DataTable dataTable = new System.Data.DataTable();
+ //dataTable.Columns.Add("ID");
+ //dataTable.Columns.Add("ImageName");
+ //System.Data.DataRow dr = dataTable.NewRow();
+ //dr[0] = "1";
+ //dr[1] = "Bildname";
+ //dataTable.Rows.Add(dr);
+ //ds.Tables.Add(dataTable);
+ //ds.WriteXml(@"E:\Software-Projekte\OnDoc\Images\imageids.xml");
+
+
+
+
}
diff --git a/Client/UIControls/DocPreview.cs b/Client/UIControls/DocPreview.cs
index b6fb67d7..bc968e0a 100644
--- a/Client/UIControls/DocPreview.cs
+++ b/Client/UIControls/DocPreview.cs
@@ -50,7 +50,7 @@ namespace OnDoc.UIControls
public void Show_Doc(string dokumentid)
{
clsdok dok = new clsdok("", "", "");
- dok = GetDoc(true, dokumentid);
+ if (dokumentid.Length > 25) { dok.dokument = dokumentid; } else { dok = GetDoc(true, dokumentid); }
var stream = new MemoryStream(Convert.FromBase64String(dok.dokument));
diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll
index 132d247d..220b4828 100644
Binary files a/Client/bin/Debug/DOCGEN.dll and b/Client/bin/Debug/DOCGEN.dll differ
diff --git a/Client/bin/Debug/DOCGEN.pdb b/Client/bin/Debug/DOCGEN.pdb
index 14900413..9576c6b2 100644
Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ
diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll
index 5f55c2b6..1a3391af 100644
Binary files a/Client/bin/Debug/Database.dll and b/Client/bin/Debug/Database.dll differ
diff --git a/Client/bin/Debug/Database.pdb b/Client/bin/Debug/Database.pdb
index 20a5779f..1a60ac27 100644
Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ
diff --git a/Client/bin/Debug/Model.dll b/Client/bin/Debug/Model.dll
index de268a58..ae8ff539 100644
Binary files a/Client/bin/Debug/Model.dll and b/Client/bin/Debug/Model.dll differ
diff --git a/Client/bin/Debug/Model.pdb b/Client/bin/Debug/Model.pdb
index 4aed68a3..fa22bb16 100644
Binary files a/Client/bin/Debug/Model.pdb and b/Client/bin/Debug/Model.pdb differ
diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe
index b3a81a81..e3c9ad02 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 25312ecd..9dc28485 100644
Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ
diff --git a/Client/bin/Debug/apikey.cfg b/Client/bin/Debug/apikey.cfg
index 8682a3da..07fffa01 100644
--- a/Client/bin/Debug/apikey.cfg
+++ b/Client/bin/Debug/apikey.cfg
@@ -1 +1 @@
-dFuyEhqaiQZ5vsGP66+D0BJttUtKYRCXt7XpBHLym7flLMz8gpFZgf28+9wwx30EkjOd0OVD5fgxqxFftCQ9UucI6Xf119aM48gMt3/T3tlx/QWcnuPlLhM/MpS8P8I4tuCwrj//dDGf194wJK9lWBB0LT6xFUqAZLuujmMHVPRn0QmcQQi992T00HTTiwz1SwgawjRlLt0jD40UO6vl9Wf2n5eq3000jwOno1YbyvCBqQu6wAVYtmtMAYw1IoKQ5bF6zpqAGehpFjm0EcdIJFVR6U3njEmI5xBjeY6/SNA=
\ No newline at end of file
+z45owU7noj0pu0Z+W+hYA5kZKbAEO3cuasO19k9g3ndk3oRgC6228Q+9Pr8xIicrsSKbrvNlmffYGud2EBxgDhsmfmOc73AS7nS27UKfxiiH7DDNF7Yi8tvsIgp2T8F+RQR0b3nPWkRT/0/lig8ey9sysJmqEfNZIwQixTsUbLfEjrjZrOS3716MAucLdzlbZPCLVKJsz3HGEyvTgzTzJLUjI07/cz5kUhSVj5TaQ8Ivvu4GFtou555cCEH1AXOjzJgznfHgHsojMyfyiCbukKZ62euGyEOUTSEUHpLfra8stsxqvGyiuq3eKvVc7xOQ9+keemMehQl6ZO9q9bM//A==
\ No newline at end of file
diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll
index b330ee68..c92d3d1f 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 63fbbe32..73c8cb59 100644
Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ
diff --git a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
index 08ec3af9..d12d4c5d 100644
--- a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
+++ b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-d12f283318bf5001c92ba993d56640d65572c928ee53285767ebdfcf370acd1a
+f6ccea9e3c71a133ca1f57e98fdde2a07e11150b4ee0bc22217f97cad0eae70e
diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache
index 1d0c67c8..97ec7119 100644
Binary files a/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/Client/obj/Debug/Client.csproj.GenerateResource.cache differ
diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index cf011375..e9e9664e 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.SerienbriefBearbeitung.resources b/Client/obj/Debug/OnDoc.DocMgmt.SerienbriefBearbeitung.resources
index b9097f91..f5cea509 100644
Binary files a/Client/obj/Debug/OnDoc.DocMgmt.SerienbriefBearbeitung.resources and b/Client/obj/Debug/OnDoc.DocMgmt.SerienbriefBearbeitung.resources differ
diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe
index b3a81a81..e3c9ad02 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 25312ecd..9dc28485 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 b330ee68..c92d3d1f 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/Klassen/SyncFWord.cs b/DOCGEN/Klassen/SyncFWord.cs
index 35b9be44..3870e69d 100644
--- a/DOCGEN/Klassen/SyncFWord.cs
+++ b/DOCGEN/Klassen/SyncFWord.cs
@@ -32,6 +32,8 @@ using Syncfusion.XlsIO;
using System.Security.Permissions;
using System.Net;
using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using static System.Net.Mime.MediaTypeNames;
@@ -78,6 +80,35 @@ namespace DOCGEN.Klassen
}
+ private string get_image(int imageid, int width, int height)
+ {
+ string URL = resturi + "API/GetImageAsBase64?imageid=" + imageid.ToString() + "&ImageWidth=" + width.ToString() + "&ImageHeight=" + height.ToString();
+ HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest;
+ webRequest.Method = WebRequestMethods.Http.Get;
+ webRequest.Headers["Authorization"] = "Bearer " + apikey;
+ try
+ {
+ using (HttpWebResponse response = webRequest.GetResponse() as HttpWebResponse)
+ {
+ if (response.StatusCode == HttpStatusCode.OK)
+ {
+ StreamReader reader = new StreamReader(response.GetResponseStream());
+ string responseContent = reader.ReadToEnd();
+
+ return responseContent;
+ }
+ else
+ {
+ Logging.Logging.Error(URL + ": " + response.StatusCode.ToString() + " / " + response.StatusDescription, "Client - GetImage", "");
+ return "";
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ return "";
+ }
+ }
private string get_unterschrift(string MaNr)
{
@@ -115,7 +146,7 @@ namespace DOCGEN.Klassen
// return (Image)new Bitmap(imgToResize, size);
//}
- public string Generate_Word(string base64, clsDocData docdata)
+ public string Generate_Word(string base64, clsDocData docdata, string img_UL="", string img_UR="",string img_faktura="")
{
string formattype = "";
MemoryStream ms = new MemoryStream(Helper.EncodeExtensions.DecodeBase642ByteArray(base64));
@@ -137,7 +168,12 @@ namespace DOCGEN.Klassen
if (compatibilityMode > CompatibilityMode.Word2010) { document.Settings.CompatibilityMode = CompatibilityMode.Word2010; }
formattype = document.ActualFormatType.ToString();
var formattype_original = document.ActualFormatType;
-
+ string ppimg = "";
+ string ppimg64 = "";
+ if (img_faktura != "")
+ {
+ insert_ppfaktura(document, img_faktura);
+ }
foreach (clsDocValue dv in docdata.DocValues)
{
if (docdata.Form_ohne_Unterschrift == "True")
@@ -167,15 +203,15 @@ namespace DOCGEN.Klassen
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
IWParagraph paragraph = new WParagraph(document);
paragraph.AppendBreak(BreakType.LineBreak);
-
+
if (dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99")
{
- string unterschrift = get_unterschrift(docdata.Unterschrift_Links);
+ string unterschrift = "";
+ if (img_UL != "") { unterschrift = img_UL.ToString(); } else {
+ unterschrift = Newtonsoft.Json.JsonConvert.DeserializeObject(get_unterschrift(docdata.Unterschrift_Links)); }
if (unterschrift != "")
{
- string ss = Newtonsoft.Json.JsonConvert.DeserializeObject(unterschrift);
-
- MemoryStream mssign = new MemoryStream(Convert.FromBase64String(ss));
+ MemoryStream mssign = new MemoryStream(Convert.FromBase64String(unterschrift));
System.Drawing.Image img = System.Drawing.Image.FromStream(mssign);
paragraph.AppendPicture(img);
mssign.Dispose();
@@ -184,11 +220,13 @@ namespace DOCGEN.Klassen
}
else
{
- string unterschrift = get_unterschrift(docdata.Unterschrift_Rechts);
+ string unterschrift = "";
+
+ if (img_UR != "") { unterschrift = img_UR; } else {
+ unterschrift = Newtonsoft.Json.JsonConvert.DeserializeObject(get_unterschrift(docdata.Unterschrift_Rechts)); }
if (unterschrift != "")
{
- string ss = Newtonsoft.Json.JsonConvert.DeserializeObject(unterschrift);
- MemoryStream mssign = new MemoryStream(Helper.EncodeExtensions.DecodeBase642ByteArray(ss));
+ MemoryStream mssign = new MemoryStream(Helper.EncodeExtensions.DecodeBase642ByteArray(unterschrift));
System.Drawing.Image img = System.Drawing.Image.FromStream(mssign);
mssign.Dispose();
paragraph.AppendPicture(img);
@@ -242,6 +280,10 @@ namespace DOCGEN.Klassen
if (dv.FieldName.ToString() != "")
{
+ if (dv.FieldName.ToString().Substring(0, 2) == "$$")
+ {
+ Replace_Text(ref document, dv.FieldName.ToString(),dv.Value.ToString());
+ }
try
{
foreach (WSection section in document.Sections)
@@ -340,6 +382,7 @@ namespace DOCGEN.Klassen
//document.UpdateDocumentFields();
//document.UpdateAlternateChunks();
+
MemoryStream destms = new MemoryStream();
if (formattype_original.ToString().ToUpper() == "DOTMXXX")
@@ -504,10 +547,10 @@ namespace DOCGEN.Klassen
}
return baseEntity;
}
- public Image resizeImage(Image imgToResize, Size size)
- {
- return (Image)(new Bitmap(imgToResize, size));
- }
+ //public Image resizeImage(Image imgToResize, Size size)
+ //{
+ // return (Image)(new Bitmap(imgToResize, size));
+ //}
private static void FindAndReplaceInTable(WTable table, TextSelection textSelection)
{
//Iterate through the rows of table.
@@ -534,6 +577,20 @@ namespace DOCGEN.Klassen
}
}
+ public void insert_ppfaktura(WordDocument document, string ppfakturaimage)
+ {
+ BookmarksNavigator bookmarkNavigator = new BookmarksNavigator(document);
+ bookmarkNavigator.MoveToBookmark("TGEDKAdresseZustellungB99");
+ string img = ppfakturaimage;
+ byte[] b = Convert.FromBase64String(ppfakturaimage);
+ MemoryStream mssign = new MemoryStream(b);
+ System.Drawing.Image image = System.Drawing.Image.FromStream(mssign);
+ IWParagraph paragraph = new WParagraph(document);
+ paragraph.AppendPicture(image);
+ bookmarkNavigator.InsertParagraph(paragraph);
+
+ }
+
public void Insert_Barcode(WordDocument document, clsDocData docData)
{
diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll
index 132d247d..220b4828 100644
Binary files a/DOCGEN/bin/Debug/DOCGEN.dll and b/DOCGEN/bin/Debug/DOCGEN.dll differ
diff --git a/DOCGEN/bin/Debug/DOCGEN.pdb b/DOCGEN/bin/Debug/DOCGEN.pdb
index 14900413..9576c6b2 100644
Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ
diff --git a/DOCGEN/bin/Debug/Database.dll b/DOCGEN/bin/Debug/Database.dll
index 5f55c2b6..1a3391af 100644
Binary files a/DOCGEN/bin/Debug/Database.dll and b/DOCGEN/bin/Debug/Database.dll differ
diff --git a/DOCGEN/bin/Debug/Database.pdb b/DOCGEN/bin/Debug/Database.pdb
index 20a5779f..1a60ac27 100644
Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ
diff --git a/DOCGEN/bin/Debug/Model.dll b/DOCGEN/bin/Debug/Model.dll
index de268a58..ae8ff539 100644
Binary files a/DOCGEN/bin/Debug/Model.dll and b/DOCGEN/bin/Debug/Model.dll differ
diff --git a/DOCGEN/bin/Debug/Model.pdb b/DOCGEN/bin/Debug/Model.pdb
index 4aed68a3..fa22bb16 100644
Binary files a/DOCGEN/bin/Debug/Model.pdb and b/DOCGEN/bin/Debug/Model.pdb differ
diff --git a/DOCGEN/bin/Debug/OfficePrinter.dll b/DOCGEN/bin/Debug/OfficePrinter.dll
index ad64eaf3..e45b3779 100644
Binary files a/DOCGEN/bin/Debug/OfficePrinter.dll and b/DOCGEN/bin/Debug/OfficePrinter.dll differ
diff --git a/DOCGEN/bin/Debug/OfficePrinter.pdb b/DOCGEN/bin/Debug/OfficePrinter.pdb
index 8d94ad26..a3fd4f2d 100644
Binary files a/DOCGEN/bin/Debug/OfficePrinter.pdb and b/DOCGEN/bin/Debug/OfficePrinter.pdb differ
diff --git a/DOCGEN/clsDocGen.cs b/DOCGEN/clsDocGen.cs
index 809e3c52..4ce1e9cd 100644
--- a/DOCGEN/clsDocGen.cs
+++ b/DOCGEN/clsDocGen.cs
@@ -93,7 +93,8 @@ namespace DOCGEN
dd.DocValues = sb.DocValues;
dd.As_Faksimile = sb.faksimile_unterschrfit.ToString();
dd.Barcode = sb.vertrag == 1;
- dok.dokument = sfword.Generate_Word(vorlage,dd);
+
+ dok.dokument = sfword.Generate_Word(vorlage,dd, sb.img_unterschriftlinks,sb.img_unterschrfitrechts,sb.img_faktura);
dok.doktype = "D";
diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll
index 132d247d..220b4828 100644
Binary files a/DOCGEN/obj/Debug/DOCGEN.dll and b/DOCGEN/obj/Debug/DOCGEN.dll differ
diff --git a/DOCGEN/obj/Debug/DOCGEN.pdb b/DOCGEN/obj/Debug/DOCGEN.pdb
index 14900413..9576c6b2 100644
Binary files a/DOCGEN/obj/Debug/DOCGEN.pdb and b/DOCGEN/obj/Debug/DOCGEN.pdb differ
diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache
index 9ee0e9bf..e42a3369 100644
Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ
diff --git a/Database/bin/Debug/Database.dll b/Database/bin/Debug/Database.dll
index 5f55c2b6..1a3391af 100644
Binary files a/Database/bin/Debug/Database.dll and b/Database/bin/Debug/Database.dll differ
diff --git a/Database/bin/Debug/Database.pdb b/Database/bin/Debug/Database.pdb
index 20a5779f..1a60ac27 100644
Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ
diff --git a/Database/bin/Debug/Model.dll b/Database/bin/Debug/Model.dll
index de268a58..ae8ff539 100644
Binary files a/Database/bin/Debug/Model.dll and b/Database/bin/Debug/Model.dll differ
diff --git a/Database/bin/Debug/Model.pdb b/Database/bin/Debug/Model.pdb
index 4aed68a3..fa22bb16 100644
Binary files a/Database/bin/Debug/Model.pdb and b/Database/bin/Debug/Model.pdb differ
diff --git a/Database/db.cs b/Database/db.cs
index 5609f220..0a7a9e1c 100644
--- a/Database/db.cs
+++ b/Database/db.cs
@@ -1257,6 +1257,8 @@ namespace Database
sb.dsempfaenger.ReadXml(fn);
System.IO.File.Delete(fn);
}
+ Get_Tabledata("Select isnull(faktura,0) from edex_sb_serienbrief where serienbriefnr=" + sb.serienbriefnr.ToString(), false, true);
+ sb.ppfaktura = Convert.ToInt32(dsdaten.Tables[0].Rows[0][0]);
return sb;
}
public int Save_Serienbrief(serienbrief sb, string temppath)
@@ -1314,6 +1316,7 @@ namespace Database
save_empfaengerdata(sb.serienbriefnr, temppath, sb.dsempfaenger);
edoka_conn.CloseConnection(true);
+ Exec_SQL("Update edex_sb_serienbrief set faktura=" + sb.ppfaktura.ToString() + " where serienbriefnr = " + sb.serienbriefnr.ToString());
return sb.serienbriefnr;
}
diff --git a/Database/obj/Debug/Database.csproj.AssemblyReference.cache b/Database/obj/Debug/Database.csproj.AssemblyReference.cache
index cffc0cc1..5ec7d3f5 100644
Binary files a/Database/obj/Debug/Database.csproj.AssemblyReference.cache and b/Database/obj/Debug/Database.csproj.AssemblyReference.cache differ
diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll
index 5f55c2b6..1a3391af 100644
Binary files a/Database/obj/Debug/Database.dll and b/Database/obj/Debug/Database.dll differ
diff --git a/Database/obj/Debug/Database.pdb b/Database/obj/Debug/Database.pdb
index 20a5779f..1a60ac27 100644
Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ
diff --git a/Model/bin/Debug/Model.dll b/Model/bin/Debug/Model.dll
index de268a58..ae8ff539 100644
Binary files a/Model/bin/Debug/Model.dll and b/Model/bin/Debug/Model.dll differ
diff --git a/Model/bin/Debug/Model.pdb b/Model/bin/Debug/Model.pdb
index 4aed68a3..fa22bb16 100644
Binary files a/Model/bin/Debug/Model.pdb and b/Model/bin/Debug/Model.pdb differ
diff --git a/Model/clsSerienbrief.cs b/Model/clsSerienbrief.cs
index c0e9ecb1..ef898c89 100644
--- a/Model/clsSerienbrief.cs
+++ b/Model/clsSerienbrief.cs
@@ -44,11 +44,18 @@ namespace Model
public int bldossier { get; set; } = 0;
public int vertrag { get; set; } = 0;
+ public int ppfaktura { get; set; } = 0;
+
public int officevorlagenr { get; set; } = 0;
public string filename { get; set; }
public DataSet dsempfaenger { get; set; }
public List DocValues { get; set; }
public string VorlageBase64 { get; set; } = "";
+ public string img_unterschriftlinks { get; set; } = "";
+ public string img_unterschrfitrechts { get; set; } = "";
+ public string img_faktura { get; set; } = "";
+
+
}
diff --git a/Model/obj/Debug/Model.dll b/Model/obj/Debug/Model.dll
index de268a58..ae8ff539 100644
Binary files a/Model/obj/Debug/Model.dll and b/Model/obj/Debug/Model.dll differ
diff --git a/Model/obj/Debug/Model.pdb b/Model/obj/Debug/Model.pdb
index 4aed68a3..fa22bb16 100644
Binary files a/Model/obj/Debug/Model.pdb and b/Model/obj/Debug/Model.pdb differ
diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll
index 5f55c2b6..1a3391af 100644
Binary files a/OnDocOffice/bin/Debug/Database.dll and b/OnDocOffice/bin/Debug/Database.dll differ
diff --git a/OnDocOffice/bin/Debug/Database.pdb b/OnDocOffice/bin/Debug/Database.pdb
index 20a5779f..1a60ac27 100644
Binary files a/OnDocOffice/bin/Debug/Database.pdb and b/OnDocOffice/bin/Debug/Database.pdb differ
diff --git a/OnDocOffice/bin/Debug/Model.dll b/OnDocOffice/bin/Debug/Model.dll
index de268a58..ae8ff539 100644
Binary files a/OnDocOffice/bin/Debug/Model.dll and b/OnDocOffice/bin/Debug/Model.dll differ
diff --git a/OnDocOffice/bin/Debug/Model.pdb b/OnDocOffice/bin/Debug/Model.pdb
index 4aed68a3..fa22bb16 100644
Binary files a/OnDocOffice/bin/Debug/Model.pdb and b/OnDocOffice/bin/Debug/Model.pdb differ
diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache
index b77d2af2..b499b98d 100644
Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ