Update 20250117 12:30

API_NetFramework/Controllers/MailController.cs

@@ -51,6 +51,11 @@ namespace OnDocAPI_NetFramework.Controllers
                 if (betreff == null) { betreff = ""; }
                 if (betreff == "") { betreff = db.dsdaten.Tables[0].Rows[0][1].ToString(); }
                 if (message == "") { message = db.dsdaten.Tables[0].Rows[0][2].ToString(); }
+                if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][3]) == 0)
+                {
+                    db = null;
+                    return Content(HttpStatusCode.OK, empfaenger + ": Mail gem. MA-Einstelung nicht zugestellt"); 
+                }
                 empfaenger = db.dsdaten.Tables[0].Rows[0][0].ToString();
 
                 //if (Regex.IsMatch(empfaenger, @"^\d+$") == true)

API_NetFramework/log.txt

@@ -2740,3 +2740,123 @@ Parametername: encoder
 2025-01-13 20:32:42.1541|INFO|OnDoc|Image-Bezug: 1
 2025-01-13 20:36:12.2796|INFO|OnDoc|Image-Bezug: 1
 2025-01-13 20:36:39.0689|INFO|OnDoc|Image-Bezug: 1
+2025-01-14 22:09:32.1837|DEBUG|OnDoc|
+2025-01-14 22:09:32.2338|DEBUG|OnDoc|
+2025-01-14 22:09:32.2659|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-01-14 22:09:32.2689|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-01-14 22:09:56.4093|DEBUG|OnDoc|
+2025-01-14 22:09:56.4093|DEBUG|OnDoc|
+2025-01-14 22:09:56.4348|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-01-14 22:09:56.4348|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-01-14 22:14:17.6383|DEBUG|OnDoc|
+2025-01-14 22:14:17.6715|DEBUG|OnDoc|
+2025-01-14 22:14:17.6974|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-01-14 22:14:17.6974|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-01-14 22:14:25.8096|DEBUG|OnDoc|
+2025-01-14 22:14:25.8096|DEBUG|OnDoc|
+2025-01-14 22:14:25.8346|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-01-14 22:14:25.8346|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-01-14 22:14:29.1336|DEBUG|OnDoc|
+2025-01-14 22:14:29.1336|DEBUG|OnDoc|
+2025-01-14 22:14:29.1580|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-01-14 22:14:29.1600|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-01-14 22:14:29.7576|DEBUG|OnDoc|
+2025-01-14 22:14:29.7576|DEBUG|OnDoc|
+2025-01-14 22:14:29.7876|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-01-14 22:14:29.7876|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-01-14 22:14:31.3274|DEBUG|OnDoc|
+2025-01-14 22:14:31.3314|DEBUG|OnDoc|
+2025-01-14 22:14:31.3524|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-01-14 22:14:31.3524|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-01-14 22:14:36.7612|DEBUG|OnDoc|
+2025-01-14 22:14:36.7612|DEBUG|OnDoc|
+2025-01-14 22:14:36.7912|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-01-14 22:14:36.7912|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-01-15 06:15:50.5818|DEBUG|OnDoc|
+2025-01-15 06:15:50.6098|DEBUG|OnDoc|
+2025-01-15 06:15:50.6358|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-01-15 06:15:50.6358|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-01-15 06:15:50.7979|DEBUG|OnDoc|
+2025-01-15 06:15:50.8079|DEBUG|OnDoc|
+2025-01-15 06:15:50.8309|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
+2025-01-15 06:15:50.8309|INFO|OnDoc|Unterschrift-Bezug: TG9665
+2025-01-15 06:18:22.3773|DEBUG|OnDoc|
+2025-01-15 06:18:22.4123|DEBUG|OnDoc|
+2025-01-15 06:18:22.4413|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-01-15 06:18:22.4413|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-01-15 06:18:22.6003|DEBUG|OnDoc|
+2025-01-15 06:18:22.6113|DEBUG|OnDoc|
+2025-01-15 06:18:22.6353|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
+2025-01-15 06:18:22.6353|INFO|OnDoc|Unterschrift-Bezug: TG9665
+2025-01-15 06:18:38.3648|DEBUG|OnDoc|
+2025-01-15 06:18:38.3648|DEBUG|OnDoc|
+2025-01-15 06:18:38.3968|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-01-15 06:18:38.3968|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-01-15 06:18:38.4348|DEBUG|OnDoc|
+2025-01-15 06:18:38.4348|DEBUG|OnDoc|
+2025-01-15 06:18:38.4589|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
+2025-01-15 06:18:38.4589|INFO|OnDoc|Unterschrift-Bezug: TG9665
+2025-01-15 08:06:39.8668|DEBUG|OnDoc|
+2025-01-15 08:06:39.9039|DEBUG|OnDoc|
+2025-01-15 08:06:39.9364|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-01-15 08:06:39.9364|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-01-15 08:06:40.2179|DEBUG|OnDoc|
+2025-01-15 08:06:40.2275|DEBUG|OnDoc|
+2025-01-15 08:06:40.2560|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
+2025-01-15 08:06:40.2560|INFO|OnDoc|Unterschrift-Bezug: TG9665
+2025-01-15 08:09:21.6033|DEBUG|OnDoc|
+2025-01-15 08:09:21.6364|DEBUG|OnDoc|
+2025-01-15 08:09:21.6649|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-01-15 08:09:21.6649|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-01-15 08:09:21.8190|DEBUG|OnDoc|
+2025-01-15 08:09:21.8190|DEBUG|OnDoc|
+2025-01-15 08:09:21.8532|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
+2025-01-15 08:09:21.8532|INFO|OnDoc|Unterschrift-Bezug: TG9665
+2025-01-16 19:48:03.1863|DEBUG|OnDoc|
+2025-01-16 19:48:03.2103|DEBUG|OnDoc|
+2025-01-16 19:48:03.2353|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2025-01-16 19:48:03.2353|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2025-01-16 19:48:03.3223|DEBUG|OnDoc|
+2025-01-16 19:48:03.3313|DEBUG|OnDoc|
+2025-01-16 19:48:03.3573|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: etroesch
+2025-01-16 19:48:03.3573|INFO|OnDoc|Unterschrift-Bezug: etroesch
+2025-01-16 19:48:29.3119|DEBUG|OnDoc|
+2025-01-16 19:48:29.3119|DEBUG|OnDoc|
+2025-01-16 19:48:29.3419|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2025-01-16 19:48:29.3419|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2025-01-16 19:48:29.3829|DEBUG|OnDoc|
+2025-01-16 19:48:29.3829|DEBUG|OnDoc|
+2025-01-16 19:48:29.4129|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: etroesch
+2025-01-16 19:48:29.4129|INFO|OnDoc|Unterschrift-Bezug: etroesch
+2025-01-16 19:50:45.8509|DEBUG|OnDoc|
+2025-01-16 19:50:45.8829|DEBUG|OnDoc|
+2025-01-16 19:50:45.9089|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler
+2025-01-16 19:50:45.9089|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler
+2025-01-16 19:50:45.9799|DEBUG|OnDoc|
+2025-01-16 19:50:45.9829|DEBUG|OnDoc|
+2025-01-16 19:50:45.9969|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: 0
+2025-01-16 19:51:06.7194|DEBUG|OnDoc|
+2025-01-16 19:51:06.7194|DEBUG|OnDoc|
+2025-01-16 19:51:06.7374|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: 0
+2025-01-16 19:51:06.7754|DEBUG|OnDoc|
+2025-01-16 19:51:06.7784|DEBUG|OnDoc|
+2025-01-16 19:51:06.7784|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: 0
+2025-01-16 19:55:39.0660|DEBUG|OnDoc|
+2025-01-16 19:55:39.0980|DEBUG|OnDoc|
+2025-01-16 19:55:39.1230|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: tg1294
+2025-01-16 19:55:39.1230|INFO|OnDoc|Unterschrift-Bezug: tg1294
+2025-01-16 19:55:39.1890|DEBUG|OnDoc|
+2025-01-16 19:55:39.1890|DEBUG|OnDoc|
+2025-01-16 19:55:39.2080|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: 0
+2025-01-16 21:56:37.9517|DEBUG|OnDoc|
+2025-01-16 21:56:37.9827|DEBUG|OnDoc|
+2025-01-16 21:56:38.0104|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-01-16 21:56:38.0134|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-01-16 21:56:38.0874|DEBUG|OnDoc|
+2025-01-16 21:56:38.0964|DEBUG|OnDoc|
+2025-01-16 21:56:38.1212|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
+2025-01-16 21:56:38.1212|INFO|OnDoc|Unterschrift-Bezug: TG9665
+2025-01-16 21:56:58.4160|DEBUG|OnDoc|Mailversand: 2
+2025-01-16 21:56:58.4530|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-16 21:56:59.3632|DEBUG|OnDoc|Mailversand: 855
+2025-01-16 21:56:59.3972|ERROR|OnDoc|Unberechtigter Zugriff

BarcodeLib/BarcodeLib.csproj

@@ -100,6 +100,7 @@
     <Compile Include="Barcoded\LinearSymbol.cs" />
     <Compile Include="Barcoded\LinearVectors.cs" />
     <Compile Include="Barcodes.cs" />
+    <Compile Include="clsBarI25.cs" />
     <Compile Include="Datamatrix\C40TextState.cs" />
     <Compile Include="Datamatrix\Class1.cs" />
     <Compile Include="Datamatrix\DmtxBestLine.cs" />

BarcodeLib/UI/Barcodekleber.cs

@@ -38,6 +38,7 @@ namespace BarcodeLib.UI
             {
                 this.cbxreportname.Items.Add(file.Name);
             }
+            this.cbxreportname.SelectedIndex = 0;
         }
 
         private void button2_Click(object sender, EventArgs e)
@@ -45,13 +46,15 @@ namespace BarcodeLib.UI
             DataTable dt = new DataTable();
             DataSet dataSet = new DataSet();
             dt.Columns.Add("barcode");
+            dt.Columns.Add("barcodetext");
             for (int i = 0; i < Convert.ToInt32(textBox1.Text); i++)
             {
                 DataRow dr = dt.NewRow();
                 string s;
                 s = i.ToString();
                 while (s.Length < 8) { s = "0" + s; };
-                dr[0] = "" + s;
+                dr[0] = Bar25I(s);
+                dr[1] = s;
                 dt.Rows.Add(dr);
             }
             dataSet.Tables.Add(dt);
@@ -75,6 +78,7 @@ namespace BarcodeLib.UI
             DataTable dt = new DataTable();
             DataSet dataSet = new DataSet();
             dt.Columns.Add("barcode");
+            dt.Columns.Add("barcodetext");
             for (int i = 0; i < Convert.ToInt32(textBox1.Text); i++)
             {
                 DataRow dr = dt.NewRow();
@@ -87,7 +91,8 @@ namespace BarcodeLib.UI
                 while (s.Length < 5) { s = "0" + s; };
                 s = DateTime.Now.Year.ToString()+s;
                 s = s+Helper.DivFnkt.modulo10(s).ToString();
-                dr[0] = s;
+                dr[0] = Bar25I(s);
+                dr[1] = s;
                 dt.Rows.Add(dr);
             }
             dataSet.Tables.Add(dt);
@@ -107,5 +112,60 @@ namespace BarcodeLib.UI
 
 
         }
+        public bool IsNumeric(string value)
+        {
+            return value.All(char.IsNumber);
+        }
+        public string Bar25I(string BarTextIn)
+        {
+            string Bar25IRet = default;
+            string BarTextOut = "";
+            string TempString = "";
+            long CharValue = 0;
+            string barcodeout = "";
+            // Initialize input and output strings
+            BarTextOut = "";
+            BarTextIn = BarTextIn.Trim();
+
+            // Throw away non-numeric data
+            TempString = "";
+            for (int II = 1, loopTo = BarTextIn.Length; II <= loopTo; II++)
+            {
+                if (IsNumeric(BarTextIn.Substring(II - 1, 1)))
+                {
+                    TempString = TempString + BarTextIn.Substring(II - 1, 1);
+                }
+            }
+
+            // If not an even number of digits, add a leading 0
+            if (TempString.Length % 2 == 1)
+            {
+                TempString = "0" + TempString;
+            }
+
+            // Break digit pairs up and convert to characters- build output string
+            for (int II = 1, loopTo1 = TempString.Length; II <= loopTo1; II += 2)
+            {
+                // Break string into pairs of digits and get value
+                CharValue = Convert.ToInt32(TempString.Substring(II - 1, 2));
+                // translate value to ASCII and save in BarTextOut
+                if (CharValue < 90)
+                {
+                    BarTextOut = BarTextOut + (char)(CharValue + 33);
+                }
+                else
+                {
+                    BarTextOut = BarTextOut + (char)(CharValue + 71);
+                }
+            }
+
+            // Build ouput string, trailing space for Windows rasterization bug
+            barcodeout = "{" + BarTextOut + "} ";
+
+            // Return the string
+            Bar25IRet = barcodeout;
+            return Bar25IRet;
+        }
+
     }
 }

BarcodeLib/clsBarI25.cs

@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarcodeLib
+{
+    public class clsBarI25
+    {
+        public Image GetBarI25(Color forecolor, Color backcolor, string text, string barcodefontname, int barcodefontsize, int imagewidth, int imageheight, string zusatztext, string zusatzfontname, int zusatfontsize, int rotation)
+        {
+            return DrawText1(forecolor, backcolor,barcodefontname,barcodefontsize,text, imagewidth,imageheight,zusatztext,zusatzfontname,zusatfontsize,rotation);
+        }
+
+        public string Bar25I(string BarTextIn)
+        {
+            string Bar25IRet = default;
+            string BarTextOut = "";
+            string TempString = "";
+            long CharValue = 0;
+            string barcodeout = "";
+            // Initialize input and output strings
+            BarTextOut = "";
+            BarTextIn = BarTextIn.Trim();
+
+            // Throw away non-numeric data
+            TempString = "";
+            for (int II = 1, loopTo = BarTextIn.Length; II <= loopTo; II++)
+            {
+                if (IsNumeric(BarTextIn.Substring(II - 1, 1)))
+                {
+                    TempString = TempString + BarTextIn.Substring(II - 1, 1);
+                }
+            }
+
+            // If not an even number of digits, add a leading 0
+            if (TempString.Length % 2 == 1)
+            {
+                TempString = "0" + TempString;
+            }
+
+            // Break digit pairs up and convert to characters- build output string
+            for (int II = 1, loopTo1 = TempString.Length; II <= loopTo1; II += 2)
+            {
+                // Break string into pairs of digits and get value
+                CharValue = Convert.ToInt32(TempString.Substring(II - 1, 2));
+                // translate value to ASCII and save in BarTextOut
+                if (CharValue < 90)
+                {
+                    BarTextOut = BarTextOut + (char)(CharValue + 33);
+                }
+                else
+                {
+                    BarTextOut = BarTextOut + (char)(CharValue + 71);
+                }
+            }
+
+            // Build ouput string, trailing space for Windows rasterization bug
+            barcodeout = "{" + BarTextOut + "} ";
+
+            // Return the string
+            Bar25IRet = barcodeout;
+            return Bar25IRet;
+        }
+
+        public bool IsNumeric(string value)
+        {
+            return value.All(char.IsNumber);
+        }
+        public Image DrawText1(Color foreColor, Color backColor, string fontName, int fontSize, string txt, int width, int height, string zusatz,string zusatzfontname, int zusatzfontsize , int rotation)
+        {
+            Bitmap img = new Bitmap(width, height);
+            Graphics Gimg = Graphics.FromImage(img);
+            Font imgFont = new Font(fontName, fontSize);
+            PointF imgPoint = new PointF(5, 5);
+            SolidBrush bForeColor = new SolidBrush(foreColor);
+            SolidBrush bBackColor = new SolidBrush(backColor);
+            Gimg.FillRectangle(bBackColor, 0, 0, width, height);
+            Gimg.DrawString(txt, imgFont, bForeColor, imgPoint);
+            Font fzFont = new Font(zusatzfontname, zusatzfontsize);
+
+            SizeF textSize = Gimg.MeasureString(zusatz, fzFont, 50);
+
+            PointF imgPointZusatz = new PointF(width - textSize.Width - 15, 30);
+            Gimg.DrawString(zusatz, fzFont, bForeColor, imgPointZusatz);
+
+            return RotateImage(img, rotation, true, true, Color.White);
+            //img.Save(imagePath, ImageFormat.Jpeg);
+        }
+
+        public static Bitmap RotateImage(Image inputImage, float angleDegrees, bool upsizeOk,
+                                  bool clipOk, Color backgroundColor)
+        {
+            // Test for zero rotation and return a clone of the input image
+            if (angleDegrees == 0f)
+                return (Bitmap)inputImage.Clone();
+
+            // Set up old and new image dimensions, assuming upsizing not wanted and clipping OK
+            int oldWidth = inputImage.Width;
+            int oldHeight = inputImage.Height;
+            int newWidth = oldWidth;
+            int newHeight = oldHeight;
+            float scaleFactor = 1f;
+
+            // If upsizing wanted or clipping not OK calculate the size of the resulting bitmap
+            if (upsizeOk || !clipOk)
+            {
+                double angleRadians = angleDegrees * Math.PI / 180d;
+
+                double cos = Math.Abs(Math.Cos(angleRadians));
+                double sin = Math.Abs(Math.Sin(angleRadians));
+                newWidth = (int)Math.Round(oldWidth * cos + oldHeight * sin);
+                newHeight = (int)Math.Round(oldWidth * sin + oldHeight * cos);
+            }
+
+            // If upsizing not wanted and clipping not OK need a scaling factor
+            if (!upsizeOk && !clipOk)
+            {
+                scaleFactor = Math.Min((float)oldWidth / newWidth, (float)oldHeight / newHeight);
+                newWidth = oldWidth;
+                newHeight = oldHeight;
+            }
+
+            // Create the new bitmap object. If background color is transparent it must be 32-bit, 
+            //  otherwise 24-bit is good enough.
+            Bitmap newBitmap = new Bitmap(newWidth, newHeight, backgroundColor == Color.Transparent ?
+                                             PixelFormat.Format32bppArgb : PixelFormat.Format24bppRgb);
+            newBitmap.SetResolution(inputImage.HorizontalResolution, inputImage.VerticalResolution);
+
+            // Create the Graphics object that does the work
+            using (Graphics graphicsObject = Graphics.FromImage(newBitmap))
+            {
+                graphicsObject.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                graphicsObject.PixelOffsetMode = PixelOffsetMode.HighQuality;
+                graphicsObject.SmoothingMode = SmoothingMode.HighQuality;
+
+                // Fill in the specified background color if necessary
+                if (backgroundColor != Color.Transparent)
+                    graphicsObject.Clear(backgroundColor);
+
+                // Set up the built-in transformation matrix to do the rotation and maybe scaling
+                graphicsObject.TranslateTransform(newWidth / 2f, newHeight / 2f);
+
+                if (scaleFactor != 1f)
+                    graphicsObject.ScaleTransform(scaleFactor, scaleFactor);
+
+                graphicsObject.RotateTransform(angleDegrees);
+                graphicsObject.TranslateTransform(-oldWidth / 2f, -oldHeight / 2f);
+
+                // Draw the result 
+                graphicsObject.DrawImage(inputImage, 0, 0);
+            }
+
+            return newBitmap;
+        }
+    }
+}

BarcodeLib/obj/Debug/BarcodeLib.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-4f8677c8e85a9757b986fd73821645a4a6e9753ca3cd4d4f52977c7093d08212
+29442f56ffe6512195e0a44c4b5996ec63580c54f5e48400620b56772a6c35f0

Client/Diverses/MitarbeiterProfil.Designer.cs

@@ -73,6 +73,7 @@
             this.lblVorname = new System.Windows.Forms.Label();
             this.txtName = new System.Windows.Forms.TextBox();
             this.lblName = new System.Windows.Forms.Label();
+            this.chkOndocMails = new System.Windows.Forms.CheckBox();
             this.GrpBoxProfile.SuspendLayout();
             this.GrpBoxDetails.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.cbboxTeam)).BeginInit();
@@ -331,6 +332,7 @@
             // 
             // GrpBoxMitarbeiter
             // 
+            this.GrpBoxMitarbeiter.Controls.Add(this.chkOndocMails);
             this.GrpBoxMitarbeiter.Controls.Add(this.button1);
             this.GrpBoxMitarbeiter.Controls.Add(this.btnLoadImage);
             this.GrpBoxMitarbeiter.Controls.Add(this.label12);
@@ -518,6 +520,16 @@
             this.lblName.TabIndex = 0;
             this.lblName.Text = "Name";
             // 
+            // chkOndocMails
+            // 
+            this.chkOndocMails.AutoSize = true;
+            this.chkOndocMails.Location = new System.Drawing.Point(29, 257);
+            this.chkOndocMails.Name = "chkOndocMails";
+            this.chkOndocMails.Size = new System.Drawing.Size(128, 17);
+            this.chkOndocMails.TabIndex = 19;
+            this.chkOndocMails.Text = "OnDoc-Mails erhalten";
+            this.chkOndocMails.UseVisualStyleBackColor = true;
+            // 
             // MitarbeiterProfil
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -595,5 +607,6 @@
         private System.Windows.Forms.Label label12;
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.CheckBox chkOndocMails;
     }
 }

Client/Diverses/MitarbeiterProfil.cs

@@ -216,6 +216,7 @@ namespace OnDoc.Diverses
                 txtfax.Text = db.dsdaten.Tables[0].Rows[0]["fax"].ToString();
                 txtunterschrift.Text = db.dsdaten.Tables[0].Rows[0]["unterschrift_text"].ToString();
                 txtfunktion.Text =  db.dsdaten.Tables[0].Rows[0]["funktion"].ToString();
+                chkOndocMails.Checked = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["mailempfang"]) == true;
                 db = null;
                 //    System.Drawing.Image image = System.Drawing.Image.FromFile(@"E:\Software-Projekte\OnDoc\Images\download.png");
                 //this.pictureBox1.Image = image;
@@ -320,6 +321,9 @@ namespace OnDoc.Diverses
           
              db.Exec_SQL("Update mitarbeiter set name='" + txtName.Text + "', vorname='" + txtVorname.Text + "', email='" + txtmail.Text + "', telefon='" + txttelefon.Text + "' where mitarbeiternr=" + AppParams.CurrentMitarbeiter.ToString());
             db.Exec_SQL("Update mitarbeiter set fax='" + txtfax.Text + "', unterschrift_text='" + txtunterschrift.Text + "', funktion='" + txtfunktion.Text + "', mutiert_am=getdate(), mutierer=" + AppParams.CurrentMitarbeiter.ToString() + " where mitarbeiternr = " + AppParams.CurrentMitarbeiter.ToString());
+            int mailempfang = 0;
+            if (chkOndocMails.Checked) { mailempfang = 1; }
+            db.Exec_SQL("Update mitarbeiter set mailempfang=" + mailempfang.ToString() + " where mitarbeiternr = " + AppParams.CurrentMitarbeiter.ToString());
             db = null;
         }
     }

Client/Diverses/SplashScreen.Designer.cs

@@ -64,7 +64,7 @@
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(168, 26);
             this.label2.TabIndex = 2;
-            this.label2.Text = "13. Januar 2025";
+            this.label2.Text = "16. Januar 2025";
             // 
             // SplashScreen
             // 

Client/DocMgmt/Dokumentpaket.cs

@@ -116,15 +116,20 @@ namespace OnDoc.DocMgmt
             DB db = new DB(AppParams.connectionstring);
             db.Get_Tabledata("Select * from edex_dokumentpaket where dokumentpaketnr="+dokumentpaketnr.ToString(), false, true);
             dokumentpaket = db.dsdaten.Tables[0].Copy();
-            string sql = "SELECT  dbo.edex_dokumentpaket.dokumentpaketnr, dbo.edex_dokumentpaket.bezeichnung, dbo.dokumenttyp.dokumenttypnr, ";
+
-            sql = sql + "dbo.dokumenttyp.bezeichnung AS dokumenttypbezeichnung, dbo.edex_dokumentpaketvorlage.zwingend, ";
+            db.clear_parameter();
-            sql = sql + "dbo.edex_dokumentpaketvorlage.sort FROM dbo.edex_dokumentpaket INNER JOIN dbo.edex_dokumentpaketvorlage ON ";
+            db.add_parameter("@dpnr", dokumentpaketnr.ToString());
-            sql = sql + "dbo.edex_dokumentpaket.dokumentpaketnr = dbo.edex_dokumentpaketvorlage.dokumentpaketnr INNER JOIN dbo.dokumenttyp ON ";
+            string sql = "sp_ondoc_dpdetails";
-            sql = sql + "dbo.edex_dokumentpaketvorlage.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr ";
+            db.Get_Tabledata(sql,true,false);
-            sql = sql + " WHERE edex_dokumentpaket.dokumentpaketnr="+dokumentpaketnr.ToString()+" and  (dbo.edex_dokumentpaket.aktiv = 1) AND ";
+            //string sql = "SELECT  dbo.edex_dokumentpaket.dokumentpaketnr, dbo.edex_dokumentpaket.bezeichnung, dbo.dokumenttyp.dokumenttypnr, ";
-            sql = sql + " dbo.edex_dokumentpaketvorlage.aktiv = 1 ORDER BY dbo.edex_dokumentpaketvorlage.sort";
+            //sql = sql + "dbo.dokumenttyp.bezeichnung AS dokumenttypbezeichnung, dbo.edex_dokumentpaketvorlage.zwingend, ";
-            db.Get_Tabledata(sql,false,true);
+            //sql = sql + "dbo.edex_dokumentpaketvorlage.sort FROM dbo.edex_dokumentpaket INNER JOIN dbo.edex_dokumentpaketvorlage ON ";
-            dokumentpaketvorlagen=db.dsdaten.Tables[0].Copy();
+            //sql = sql + "dbo.edex_dokumentpaket.dokumentpaketnr = dbo.edex_dokumentpaketvorlage.dokumentpaketnr INNER JOIN dbo.dokumenttyp ON ";
+            //sql = sql + "dbo.edex_dokumentpaketvorlage.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr ";
+            //sql = sql + " WHERE edex_dokumentpaket.dokumentpaketnr="+dokumentpaketnr.ToString()+" and  (dbo.edex_dokumentpaket.aktiv = 1) AND ";
+            //sql = sql + " dbo.edex_dokumentpaketvorlage.aktiv = 1 ORDER BY dbo.edex_dokumentpaketvorlage.sort";
+            //db.Get_Tabledata(sql,false,true);
+            dokumentpaketvorlagen = db.dsdaten.Tables[0].Copy();
             dokumentpaketvorlagen_Original = db.dsdaten.Tables[0].Copy();
             sfListView1.DataSource = dokumentpaketvorlagen;
             sfListView1.DisplayMember = "dokumenttypbezeichnung";
@@ -267,12 +272,12 @@ namespace OnDoc.DocMgmt
             {
                 if (Convert.ToInt32(r[2]) == vorlagenr)
                 {
-                    if (Convert.ToInt32(r[4])==1 && Convert.ToInt32(r[4]) != zwingend)
+                    //if (Convert.ToInt32(r[4])==1 && Convert.ToInt32(r[4]) != zwingend)
-                    {
+                    //{
-                        MessageBox.Show("Zwingende Dokumente können nicht abgewählt werden");
+                    //    MessageBox.Show("Zwingende Dokumente können nicht abgewählt werden");
-                        dataRow[4] = 1;
+                    //    dataRow[4] = 1;
-                        return;
+                    //    return;
-                    }
+                    //}
                 }
             }
             if (Convert.ToInt32(dataRow[4]) == 1)

Client/DocMgmt/Serienbrief.Designer.cs

@@ -41,16 +41,19 @@
             this.rbbpb = new System.Windows.Forms.RadioButton();
             this.rbppa = new System.Windows.Forms.RadioButton();
             this.rbppohne = new System.Windows.Forms.RadioButton();
-            this.grpDruckstapel = new System.Windows.Forms.GroupBox();
-            this.button2 = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
-            this.treeviewDruckstapel = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
             this.pnlprogress = new System.Windows.Forms.Panel();
             this.progressBarAdv1 = new Syncfusion.Windows.Forms.Tools.ProgressBarAdv();
             this.lblProgressTitel = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.progressBar1 = new System.Windows.Forms.ProgressBar();
+            this.grpDruckstapel = new System.Windows.Forms.GroupBox();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.button2 = new System.Windows.Forms.Button();
+            this.button1 = new System.Windows.Forms.Button();
+            this.treeviewDruckstapel = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
             this.groupBox8 = new System.Windows.Forms.GroupBox();
             this.cbboxteam = new Syncfusion.WinForms.ListView.SfComboBox();
             this.groupBox7 = new System.Windows.Forms.GroupBox();
@@ -127,10 +130,11 @@
             this.label4 = new System.Windows.Forms.Label();
             this.GrpDokumentInhalt.SuspendLayout();
             this.grpFaktura.SuspendLayout();
-            this.grpDruckstapel.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).BeginInit();
             this.pnlprogress.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).BeginInit();
+            this.grpDruckstapel.SuspendLayout();
+            this.panel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).BeginInit();
             this.groupBox8.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.cbboxteam)).BeginInit();
             this.groupBox7.SuspendLayout();
@@ -160,8 +164,8 @@
             // GrpDokumentInhalt
             // 
             this.GrpDokumentInhalt.Controls.Add(this.grpFaktura);
-            this.GrpDokumentInhalt.Controls.Add(this.grpDruckstapel);
             this.GrpDokumentInhalt.Controls.Add(this.pnlprogress);
+            this.GrpDokumentInhalt.Controls.Add(this.grpDruckstapel);
             this.GrpDokumentInhalt.Controls.Add(this.groupBox8);
             this.GrpDokumentInhalt.Controls.Add(this.groupBox7);
             this.GrpDokumentInhalt.Controls.Add(this.groupBox6);
@@ -219,12 +223,85 @@
             this.rbppohne.Text = "Keine";
             this.rbppohne.UseVisualStyleBackColor = true;
             // 
+            // pnlprogress
+            // 
+            this.pnlprogress.BackColor = System.Drawing.Color.Gainsboro;
+            this.pnlprogress.Controls.Add(this.progressBarAdv1);
+            this.pnlprogress.Controls.Add(this.lblProgressTitel);
+            this.pnlprogress.Controls.Add(this.label3);
+            this.pnlprogress.Controls.Add(this.label2);
+            this.pnlprogress.Controls.Add(this.progressBar1);
+            this.pnlprogress.Location = new System.Drawing.Point(1086, 23);
+            this.pnlprogress.Name = "pnlprogress";
+            this.pnlprogress.Size = new System.Drawing.Size(477, 99);
+            this.pnlprogress.TabIndex = 17;
+            this.pnlprogress.Visible = false;
+            // 
+            // progressBarAdv1
+            // 
+            this.progressBarAdv1.BackgroundStyle = Syncfusion.Windows.Forms.Tools.ProgressBarBackgroundStyles.Office2016Colorful;
+            this.progressBarAdv1.BackMultipleColors = new System.Drawing.Color[] {
+        System.Drawing.Color.Empty};
+            this.progressBarAdv1.BackSegments = false;
+            this.progressBarAdv1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(147)))), ((int)(((byte)(149)))), ((int)(((byte)(152)))));
+            this.progressBarAdv1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.progressBarAdv1.CustomText = null;
+            this.progressBarAdv1.CustomWaitingRender = false;
+            this.progressBarAdv1.ForegroundImage = null;
+            this.progressBarAdv1.GradientEndColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
+            this.progressBarAdv1.GradientStartColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
+            this.progressBarAdv1.Location = new System.Drawing.Point(12, 46);
+            this.progressBarAdv1.MultipleColors = new System.Drawing.Color[] {
+        System.Drawing.Color.Empty};
+            this.progressBarAdv1.Name = "progressBarAdv1";
+            this.progressBarAdv1.ProgressStyle = Syncfusion.Windows.Forms.Tools.ProgressBarStyles.Office2016Colorful;
+            this.progressBarAdv1.SegmentWidth = 12;
+            this.progressBarAdv1.Size = new System.Drawing.Size(448, 23);
+            this.progressBarAdv1.TabIndex = 20;
+            this.progressBarAdv1.Text = "progressBarAdv1";
+            this.progressBarAdv1.ThemeName = "Office2016Colorful";
+            this.progressBarAdv1.WaitingGradientWidth = 400;
+            // 
+            // lblProgressTitel
+            // 
+            this.lblProgressTitel.AutoSize = true;
+            this.lblProgressTitel.Location = new System.Drawing.Point(12, 9);
+            this.lblProgressTitel.Name = "lblProgressTitel";
+            this.lblProgressTitel.Size = new System.Drawing.Size(0, 13);
+            this.lblProgressTitel.TabIndex = 19;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(435, 78);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(25, 13);
+            this.label3.TabIndex = 18;
+            this.label3.Text = "100";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(12, 78);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(13, 13);
+            this.label2.TabIndex = 17;
+            this.label2.Text = "0";
+            // 
+            // progressBar1
+            // 
+            this.progressBar1.Location = new System.Drawing.Point(12, 46);
+            this.progressBar1.Name = "progressBar1";
+            this.progressBar1.Size = new System.Drawing.Size(448, 23);
+            this.progressBar1.TabIndex = 16;
+            // 
             // grpDruckstapel
             // 
+            this.grpDruckstapel.Controls.Add(this.panel2);
             this.grpDruckstapel.Controls.Add(this.button2);
             this.grpDruckstapel.Controls.Add(this.button1);
             this.grpDruckstapel.Controls.Add(this.treeviewDruckstapel);
-            this.grpDruckstapel.Location = new System.Drawing.Point(1086, 23);
+            this.grpDruckstapel.Location = new System.Drawing.Point(1141, 9);
             this.grpDruckstapel.Name = "grpDruckstapel";
             this.grpDruckstapel.Size = new System.Drawing.Size(477, 210);
             this.grpDruckstapel.TabIndex = 19;
@@ -232,6 +309,34 @@
             this.grpDruckstapel.Text = "Druckstapel";
             this.grpDruckstapel.Visible = false;
             // 
+            // panel2
+            // 
+            this.panel2.BackColor = System.Drawing.Color.MistyRose;
+            this.panel2.Controls.Add(this.label6);
+            this.panel2.Controls.Add(this.label5);
+            this.panel2.Location = new System.Drawing.Point(232, 70);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(239, 59);
+            this.panel2.TabIndex = 21;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(4, 26);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(224, 13);
+            this.label6.TabIndex = 1;
+            this.label6.Text = "Druckereinstellungen Ein-/Doppelseitig prüfen";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(4, 7);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(183, 13);
+            this.label5.TabIndex = 0;
+            this.label5.Text = "Der Druck erfolgt vie Acrobat Reader";
+            // 
             // button2
             // 
             this.button2.Location = new System.Drawing.Point(396, 184);
@@ -244,7 +349,7 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(240, 15);
+            this.button1.Location = new System.Drawing.Point(232, 16);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(169, 23);
             this.button1.TabIndex = 19;
@@ -298,78 +403,6 @@
             this.treeviewDruckstapel.ToolTipControl.TabIndex = 0;
             this.treeviewDruckstapel.ToolTipControl.Visible = true;
             // 
-            // pnlprogress
-            // 
-            this.pnlprogress.BackColor = System.Drawing.Color.Gainsboro;
-            this.pnlprogress.Controls.Add(this.progressBarAdv1);
-            this.pnlprogress.Controls.Add(this.lblProgressTitel);
-            this.pnlprogress.Controls.Add(this.label3);
-            this.pnlprogress.Controls.Add(this.label2);
-            this.pnlprogress.Controls.Add(this.progressBar1);
-            this.pnlprogress.Location = new System.Drawing.Point(1086, 23);
-            this.pnlprogress.Name = "pnlprogress";
-            this.pnlprogress.Size = new System.Drawing.Size(477, 99);
-            this.pnlprogress.TabIndex = 17;
-            this.pnlprogress.Visible = false;
-            // 
-            // progressBarAdv1
-            // 
-            this.progressBarAdv1.BackgroundStyle = Syncfusion.Windows.Forms.Tools.ProgressBarBackgroundStyles.Office2016Colorful;
-            this.progressBarAdv1.BackMultipleColors = new System.Drawing.Color[] {
-        System.Drawing.Color.Empty};
-            this.progressBarAdv1.BackSegments = false;
-            this.progressBarAdv1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(147)))), ((int)(((byte)(149)))), ((int)(((byte)(152)))));
-            this.progressBarAdv1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.progressBarAdv1.CustomText = null;
-            this.progressBarAdv1.CustomWaitingRender = false;
-            this.progressBarAdv1.ForegroundImage = null;
-            this.progressBarAdv1.GradientEndColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
-            this.progressBarAdv1.GradientStartColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
-            this.progressBarAdv1.Location = new System.Drawing.Point(12, 46);
-            this.progressBarAdv1.MultipleColors = new System.Drawing.Color[] {
-        System.Drawing.Color.Empty};
-            this.progressBarAdv1.Name = "progressBarAdv1";
-            this.progressBarAdv1.ProgressStyle = Syncfusion.Windows.Forms.Tools.ProgressBarStyles.Office2016Colorful;
-            this.progressBarAdv1.SegmentWidth = 12;
-            this.progressBarAdv1.Size = new System.Drawing.Size(448, 23);
-            this.progressBarAdv1.TabIndex = 20;
-            this.progressBarAdv1.Text = "progressBarAdv1";
-            this.progressBarAdv1.ThemeName = "Office2016Colorful";
-            this.progressBarAdv1.WaitingGradientWidth = 400;
-            // 
-            // lblProgressTitel
-            // 
-            this.lblProgressTitel.AutoSize = true;
-            this.lblProgressTitel.Location = new System.Drawing.Point(12, 9);
-            this.lblProgressTitel.Name = "lblProgressTitel";
-            this.lblProgressTitel.Size = new System.Drawing.Size(0, 13);
-            this.lblProgressTitel.TabIndex = 19;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(435, 78);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(25, 13);
-            this.label3.TabIndex = 18;
-            this.label3.Text = "100";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(12, 78);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(13, 13);
-            this.label2.TabIndex = 17;
-            this.label2.Text = "0";
-            // 
-            // progressBar1
-            // 
-            this.progressBar1.Location = new System.Drawing.Point(12, 46);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(448, 23);
-            this.progressBar1.TabIndex = 16;
-            // 
             // groupBox8
             // 
             this.groupBox8.Controls.Add(this.cbboxteam);
@@ -416,6 +449,8 @@
             this.cbformularohneunterschrfit.TabIndex = 11;
             this.cbformularohneunterschrfit.Text = "Formular ohne Unterschrift";
             this.cbformularohneunterschrfit.UseVisualStyleBackColor = true;
+            this.cbformularohneunterschrfit.CheckedChanged += new System.EventHandler(this.cbformularohneunterschrfit_CheckedChanged);
+            this.cbformularohneunterschrfit.Click += new System.EventHandler(this.cbformularohneunterschrfit_Click);
             // 
             // cbdigitaleunterschrfiten
             // 
@@ -426,6 +461,7 @@
             this.cbdigitaleunterschrfiten.TabIndex = 10;
             this.cbdigitaleunterschrfiten.Text = "Faksimile Signatur";
             this.cbdigitaleunterschrfiten.UseVisualStyleBackColor = true;
+            this.cbdigitaleunterschrfiten.CheckedChanged += new System.EventHandler(this.cbdigitaleunterschrfiten_CheckedChanged);
             // 
             // cbboxunterschriftrechts
             // 
@@ -647,6 +683,7 @@
             // sfDataGridEmpfaenger
             // 
             this.sfDataGridEmpfaenger.AccessibleName = "Table";
+            this.sfDataGridEmpfaenger.AllowFiltering = true;
             this.sfDataGridEmpfaenger.AllowResizingColumns = true;
             this.sfDataGridEmpfaenger.ContextMenuStrip = this.ctxmenuEmpfaenger;
             this.sfDataGridEmpfaenger.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1038,7 +1075,7 @@
             this.ribbonButtonPartnerPruefen.LargeImage = global::OnDoc.Properties.Resources.SB_Partnerliste_Pruefen_32x32_32;
             this.ribbonButtonPartnerPruefen.Name = "ribbonButtonPartnerPruefen";
             this.ribbonButtonPartnerPruefen.SmallImage = global::OnDoc.Properties.Resources.SB_Partnerliste_Pruefen_24x24_32;
-            this.ribbonButtonPartnerPruefen.Text = "Partnerlise_prüfen";
+            this.ribbonButtonPartnerPruefen.Text = "Partnerliste_prüfen";
             this.ribbonButtonPartnerPruefen.Click += new System.EventHandler(this.ribbonButton2_Click);
             // 
             // ribbonPanel8
@@ -1189,7 +1226,7 @@
             // 
             this.panelLoad.BackColor = System.Drawing.Color.Silver;
             this.panelLoad.Controls.Add(this.label4);
-            this.panelLoad.Location = new System.Drawing.Point(463, 97);
+            this.panelLoad.Location = new System.Drawing.Point(488, 46);
             this.panelLoad.Name = "panelLoad";
             this.panelLoad.Size = new System.Drawing.Size(578, 100);
             this.panelLoad.TabIndex = 6;
@@ -1225,11 +1262,13 @@
             this.GrpDokumentInhalt.ResumeLayout(false);
             this.grpFaktura.ResumeLayout(false);
             this.grpFaktura.PerformLayout();
-            this.grpDruckstapel.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).EndInit();
             this.pnlprogress.ResumeLayout(false);
             this.pnlprogress.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).EndInit();
+            this.grpDruckstapel.ResumeLayout(false);
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).EndInit();
             this.groupBox8.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.cbboxteam)).EndInit();
             this.groupBox7.ResumeLayout(false);
@@ -1353,5 +1392,8 @@
         private System.Windows.Forms.ToolStripMenuItem archivierenUndAbschliessenToolStripMenuItem;
         private System.Windows.Forms.RibbonButton ribbonbuttonloadtemplate;
         private System.Windows.Forms.RibbonButton ribbonbuttonsavetemplate;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label label5;
     }
 }

Client/DocMgmt/Serienbrief.cs

@@ -98,12 +98,20 @@ namespace OnDoc.UIControls
 
         private bool IsPreview = false;
         private string PreviewFiename = "";
+        private int broadcasterdone = 0;
         public void OnListen(string message, SenderInfo sender)
         {
             if (message == "BtnSBVorschau")
             {
                 if (sender.SenderName == "Serienbriefbearbeitung")
                 {
+                    
+                    if (broadcasterdone == 1)
+                    {
+                        broadcasterdone = 0;
+                        return;
+                    }
+                    broadcasterdone = 1;
                     string[] details = sender.Function.Split(' ');
                     foreach (System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
                     {
@@ -367,6 +375,7 @@ namespace OnDoc.UIControls
                 if (!found) { sb.dsempfaenger.Tables[0].Columns.Add("IntEintragnr"); }
                 int lastid = sb.dsempfaenger.Tables[0].Rows.Count;
 
+                int saldmessage = 0;
                 sfDataGridEmpfaenger.DataSource = null;
                 foreach (System.Data.DataRow dr in importdata.Rows)
                 {
@@ -398,20 +407,42 @@ namespace OnDoc.UIControls
                     //    r1["inteingragnr"] = string.Empty;
                     //}
                     //catch { }
-                    dB.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + r1[0].ToString(), false, true);
+                  
+                    dB.Get_Tabledata("Select bkpar00, saldiert from partner where nrpar00=" + r1[0].ToString(), false, true);
                     try
                     {
                         if (dB.dsdaten.Tables[0].Rows.Count > 0)
                         {
-                            if (dB.dsdaten.Tables[0].Rows.Count < 1) r1["Fehlercode"] = 1; else r1["fehlercode"] = 0;
+                            //if (dB.dsdaten.Tables[0].Rows.Count < 1) r1["Fehlercode"] = 1; else 
-                            r1[1] = dB.dsdaten.Tables[0].Rows[0][0].ToString();
+                            r1["fehlercode"] = 0;
+                            string kurzbez = dB.dsdaten.Tables[0].Rows[0][0].ToString();
+                            if (Convert.ToBoolean(dB.dsdaten.Tables[0].Rows[0][1]) == true)
+                            {
+                                saldmessage = 1;
+                                kurzbez = "SALDIERT: " + kurzbez;
+                            }
+                            //r1[1] = dB.dsdaten.Tables[0].Rows[0][0].ToString();
+                            r1[1] = kurzbez;
+                            sb.dsempfaenger.Tables[0].Rows.Add(r1);
+                        }
+                        else
+                        {
+                            r1["Fehlercode"] = 1;
+                            r1[1] = "Parnter nicht vorhanden";
                             sb.dsempfaenger.Tables[0].Rows.Add(r1);
                         }
                     }
                     catch { }
                 }
                 dB = null;
-                Partnerliste_Pruefen();
+               if (saldmessage > 0)
+                {
+                    MessageBox.Show("Die Partnerliste enthält saldierte Kunden-Einträge", "Partnerprüfung", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+}
+
+
+
+                    Partnerliste_Pruefen();
                 refresh_empfaenger(sb.dsempfaenger.Tables[0]);
 
                 finish_progress();
@@ -500,6 +531,7 @@ namespace OnDoc.UIControls
                     sb.dokumenttypnr = DokTypSelect.dokumenttypnr;
                     update_serienbrief_details(true, sb.dokumenttypnr, 0);
                     init_empfaenger(-1);
+                   //this.cbboxzustaendigmitarbeiter.SelectedValue = AppParams.CurrentMitarbeiter;
                     vorlagenfelder(sb.dokumenttypnr);
                     refresh_empfaenger(sb.dsempfaenger.Tables[0]);
                     update_screen();
@@ -654,11 +686,16 @@ namespace OnDoc.UIControls
             sb.aktiv = true;
             sb.mutiert_am = DateTime.Now;
             sb.mutierer = AppParams.CurrentMitarbeiter;
-            sb.verantwortlich = AppParams.CurrentMitarbeiter;
+            //sb.verantwortlich = AppParams.CurrentMitarbeiter;
-            if (rbzustaendigkube.Checked) { sb.zustaendig = -1; } else { sb.zustaendig = Convert.ToInt32(cbboxzustaendigmitarbeiter.SelectedValue); }
+            if (rbzustaendigkube.Checked) { sb.zustaendig = -1; } else {
+                sb.zustaendig = Convert.ToInt32(cbboxzustaendigmitarbeiter.SelectedValue);
+            }
+            //sb.zustaendig = Convert.ToInt32(cbboxzustaendigmitarbeiter.SelectedValue);
             try { sb.postzustellung = Convert.ToInt32(cbboxpostzustellung.SelectedValue.ToString()); } catch { sb.postzustellung = 0; }
             try { sb.unterschriftlinks = Convert.ToInt32(cbboxunterschriftlinks.SelectedValue.ToString()); } catch { sb.unterschriftlinks = 0; }
             try { sb.unterschriftrechts = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue.ToString()); } catch { sb.unterschriftrechts = 0; }
+            if (cbboxunterschriftlinks.Text.Trim() == "") { sb.unterschriftlinks = 0; }
+            if (cbboxunterschriftrechts.Text.Trim() == "") { sb.unterschriftrechts = 0; }
             try
             {
                 if (cbdigitaleunterschrfiten.Checked)
@@ -875,6 +912,7 @@ namespace OnDoc.UIControls
             cbboxunterschriftlinks.SelectedValue = sb.unterschriftlinks;
             cbboxunterschriftrechts.SelectedValue = sb.unterschriftrechts;
             cbboxverantwortlich.SelectedValue = sb.verantwortlich;
+            
             DateDokumentDatum.Value = sb.archivdatum;
             switch (sb.ppfaktura)
             {
@@ -891,6 +929,7 @@ namespace OnDoc.UIControls
                 rbzustaendigkube.Checked = false;
                 rbzustaendigmitarbeiter.Checked = true;
                 cbboxzustaendigmitarbeiter.SelectedValue = sb.zustaendig;
+                if (sb.zustaendig == 0) { cbboxzustaendigmitarbeiter.SelectedValue = AppParams.CurrentMitarbeiter; }
             }
             update_zahlen();
             GrpDokumentInhalt.Enabled = true;
@@ -1152,7 +1191,7 @@ namespace OnDoc.UIControls
             if (!Partnerliste_Pruefen()) { return; }
             Generate();
         }
-        private void Generate(int vorschauid = 0)
+        private void Generate(int vorschauid = -1)
         {
 
 
@@ -1191,6 +1230,9 @@ namespace OnDoc.UIControls
             {
                 sb.img_faktura = Newtonsoft.Json.JsonConvert.DeserializeObject<string>(imghelper.get_image(2, -1, 0));
             }
+            if (cbboxunterschriftlinks.Text.Trim() == "") { sb.unterschriftlinks = 0; }
+            if (cbboxunterschriftrechts.Text.Trim() == "") { sb.unterschriftrechts = 0; };
+
             imghelper = null;
 
 
@@ -1202,13 +1244,13 @@ namespace OnDoc.UIControls
 
         }
 
-        private void vorlagendaten_aufbereiten(int vorschauid = 0)
+        private void vorlagendaten_aufbereiten(int vorschauid = -1)
         {
 
             init_progressbar("Dokumente generieren", vorlagendaten.Rows.Count);
             for (int i = 0, loopTo = vorlagendaten.Rows.Count - 1; i <= loopTo; i++)
             {
-                if (vorschauid == 0 || Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
+                if (vorschauid == -1 || Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
                 {
                     add_progress();
                     System.Windows.Forms.Application.DoEvents();
@@ -1430,7 +1472,7 @@ namespace OnDoc.UIControls
                     if (dokumentid == "") { dokumentid = db.get_dbkey("Dokument"); }
                     string filename = dokumentid + ".pdf";
 
-                    if (vorschauid != 0 && Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
+                    if (vorschauid != -1 && Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
                     {
                         string pdfdoc_preview = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey));
                         sbedit.Update_Preview(pdfdoc_preview);
@@ -1444,7 +1486,7 @@ namespace OnDoc.UIControls
                         System.IO.File.Delete(AppParams.tempdir + filename);
                     }
                     db = null;
-                    if (dr != null && vorschauid == 0)
+                    if (dr != null && vorschauid == -1)
                     {
                         dr["STATUS"] = "1";
                         dr["Dokumentid"] = dokumentid;
@@ -2069,5 +2111,42 @@ namespace OnDoc.UIControls
             }
             
         }
+
+        private void cbformularohneunterschrfit_Click(object sender, EventArgs e)
+        {
+        }
+
+        private void cbformularohneunterschrfit_CheckedChanged(object sender, EventArgs e)
+        {
+            if (cbformularohneunterschrfit.Checked)
+            {
+                cbboxunterschriftlinks.SelectedValue = -1;
+                cbboxunterschriftrechts.SelectedValue = -1;
+                cbboxunterschriftrechts.Enabled = false;
+                cbboxunterschriftlinks.Enabled = false;
+                cbdigitaleunterschrfiten.Checked = false;
+                cbdigitaleunterschrfiten.Enabled = false;
+            }
+            else {
+                cbboxunterschriftrechts.Enabled = true;
+                cbboxunterschriftlinks.Enabled = true;
+                cbdigitaleunterschrfiten.Enabled = true;
+            }
+        }
+
+        private void cbdigitaleunterschrfiten_CheckedChanged(object sender, EventArgs e)
+        {
+            if (cbdigitaleunterschrfiten.Checked)
+            {
+                cbboxunterschriftlinks.Enabled = true;
+                cbboxunterschriftrechts.Enabled = true;
+                cbformularohneunterschrfit.Checked = false;
+                cbformularohneunterschrfit.Enabled = false;
+            }
+            else
+            {
+                cbformularohneunterschrfit.Enabled = true;
+            }
+        }
     } 
 }

Client/DocMgmt/SerienbriefBearbeitung.cs

@@ -25,6 +25,7 @@ using Windows.UI.Xaml.Controls;
 using BroadcastListener.Classes;
 using BroadcastListener.Interfaces;
 using static BroadcastListener.Classes.Factory;
+using System.Threading;
 
 namespace OnDoc.DocMgmt
 {
@@ -133,6 +134,10 @@ namespace OnDoc.DocMgmt
             {
                 tscomboboxbp.Items.Add(dr[0].ToString() + " " + dr[1].ToString());
             }
+            if (tscomboboxbp.Items.Count > 0)
+            {
+                tscomboboxbp.SelectedIndex = 0;
+            }
             format_standardgrid();
 
 
@@ -176,6 +181,7 @@ namespace OnDoc.DocMgmt
             word = new Microsoft.Office.Interop.Word.Application();
             doc = new Microsoft.Office.Interop.Word.Document();
             word.Documents.Open(sb.filename);
+            Thread.Sleep(1000);
             doc = word.ActiveDocument;
             word.Visible = word_visible;
             word.WindowState = Microsoft.Office.Interop.Word.WdWindowState.wdWindowStateMaximize;

Client/DocMgmt/frmToApproval.Designer.cs

@@ -74,18 +74,18 @@
             this.label2.AutoSize = true;
             this.label2.Location = new System.Drawing.Point(29, 31);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(151, 13);
+            this.label2.Size = new System.Drawing.Size(148, 13);
             this.label2.TabIndex = 14;
-            this.label2.Text = "Unterschfrift links prüfen durch";
+            this.label2.Text = "Unterschrift links prüfen durch";
             // 
             // label3
             // 
             this.label3.AutoSize = true;
             this.label3.Location = new System.Drawing.Point(29, 62);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(159, 13);
+            this.label3.Size = new System.Drawing.Size(156, 13);
             this.label3.TabIndex = 15;
-            this.label3.Text = "Unterschfrift rechts prüfen durch";
+            this.label3.Text = "Unterschrift rechts prüfen durch";
             // 
             // label4
             // 

Client/DocMgmt/frmToApproval.resx

@@ -121,7 +121,7 @@
   <data name="pxapproval1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
         nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
         RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
         J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj
@@ -401,7 +401,7 @@
   <data name="pxapproval1.InitialImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
         nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
         RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
         J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj
@@ -681,7 +681,7 @@
   <data name="pxapproval2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
         nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
         RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
         J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj
@@ -961,7 +961,7 @@
   <data name="pxapproval2.InitialImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
         nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
         RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
         J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj

Client/Klassen/EDKFile.cs

@@ -139,7 +139,7 @@ namespace OnDoc.Klassen
 
                     if (dokwerte.Count > 0)
                     {
-                        for (int i = 0; i < dokwerte.Count - 1; i++)
+                        for (int i = 0; i < dokwerte.Count ; i++)
                         {
                             XmlNodeList XNode = dokwerte[i].ChildNodes;
                             string value;
@@ -191,7 +191,7 @@ namespace OnDoc.Klassen
 
         public static string GetAVQ_Parameter(string name)
         {
-            for (int i = 0; i < parameters.Count; i++)
+            for (int i = 0; i < parameters.Count+1; i++)
             {
                 if (parameters[i].name.ToUpper() == name.ToUpper())
                 {

Client/Klassen/clsPartner.cs

@@ -33,6 +33,7 @@ namespace OnDoc.Klassen
                 db.add_parameter("@anz", anzahl.ToString());
                 db.add_parameter("@fnkt", fnkt.ToString());
                 partnerliste = db.Get_Tabledata("sp_partner_search", true, false);
+                if (partnerliste.Rows.Count < 1) { return partnerliste; }
 
                 string selectstring = "";
                 if (saldiert == false)
@@ -41,11 +42,11 @@ namespace OnDoc.Klassen
                 }
                 if (!personendokument && !bpdokument)
                 {
-                    DataRow[] rowsToKeep = partnerliste.Select(selectstring);
+                        DataRow[] rowsToKeep = partnerliste.Select(selectstring);
-                    DataTable tempDataTable = rowsToKeep.CopyToDataTable();
+                        DataTable tempDataTable = rowsToKeep.CopyToDataTable();
-                    partnerliste.Clear();
+                        partnerliste.Clear();
-                    partnerliste.Merge(tempDataTable);
+                        partnerliste.Merge(tempDataTable);
-                    tempDataTable.Dispose();
+                        tempDataTable.Dispose();
 
                 } else { selectstring = selectstring + " and "; }
                 if (personendokument)

Client/Program.cs

@@ -62,6 +62,7 @@ namespace OnDoc
                     }
                     string destfile = AppParams.tempdir + DateTime.Now.ToString("yyyyMMddHHmmss") + "_tmpfile.edk";
                     System.IO.File.Copy(args[0],destfile);
+                    //System.IO.File.Delete(args[0]);
                  
                     //EDK_Data.Load_EDK_File(args[0]);
                 }
@@ -114,6 +115,7 @@ namespace OnDoc
             //        Application.Run(MyForm);
            
             Application.Run(new Start());
+            
             //Application.Run(new Dummy());
 
 

Client/Start.cs

@@ -107,7 +107,7 @@ namespace OnDoc
             
             dokList1.load_Profile();
             dokList1.refresh_dokumente();
-            dokList1.set_functions();
+            
 
            
             Logging.Logging.Debug("Start - Ende", "start.cs", "");
@@ -139,6 +139,7 @@ namespace OnDoc
             timer1.Start();
         }
 
+
         private void Start_Load(object sender, EventArgs e)
         {
             //if (ExternalCall.sourceparam.Trim().ToString() !="" && ExternalCall.executed == false)

Client/UIControls/DocPreview.cs

@@ -57,24 +57,28 @@ namespace OnDoc.UIControls
         }
         public void Show_Doc(string dokumentid)
         {
-            PrintDokID= dokumentid;
+            try
-            clsdok dok = new clsdok("", "", "");
+            {
-            if (dokumentid.Length > 25) { dok.dokument = dokumentid; } else { dok = GetDoc(true, dokumentid); }
+                PrintDokID = dokumentid;
-            var stream = new MemoryStream(Convert.FromBase64String(dok.dokument));
+                clsdok dok = new clsdok("", "", "");
+                if (dokumentid.Length > 25) { dok.dokument = dokumentid; } else { dok = GetDoc(true, dokumentid); }
+                var stream = new MemoryStream(Convert.FromBase64String(dok.dokument));
 
 
-            //clsGetDoc gd = new clsGetDoc(AppParams.connectionstring);
+                //clsGetDoc gd = new clsGetDoc(AppParams.connectionstring);
 
-            if (stream.Length > 0)
+                if (stream.Length > 0)
-            {
+                {
-                this.pdfViewerControl1.Load(stream);
+                    this.pdfViewerControl1.Load(stream);
-                this.pdfViewerControl1.Visible = true;
+                    this.pdfViewerControl1.Visible = true;
-                pdfViewerControl1.ZoomMode = ZoomMode.FitWidth;
+                    pdfViewerControl1.ZoomMode = ZoomMode.FitWidth;
-            }
+                }
-            else
+                else
-            {
+                {
-                
+
+                }
             }
+            catch { }
         }
 
         public void show_base64(string image,string Logtext)

Client/UIControls/DokList.cs

@@ -979,6 +979,24 @@ namespace OnDoc.UICintrols
                     e.Graphics.DrawLine(borderPen, e.Bounds.Left, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom);
                     return;
                 }
+                if (e.Column.MappingName == "Erstellt am")
+                {
+                    var f = e.Column.Format;
+                    var selectedItem = e.DataRow;
+                    var dataRow = (e.DataRow.RowData as DataRowView).Row;
+                    e.DisplayText = dataRow["Erstellt am"].ToString();
+                    //e.DisplayText = e.DisplayText.ToString("dd.MM.yyyy hh:mm:ss");
+                    //int i = 0;
+                }
+                if (e.Column.MappingName == "Mutiert am")
+                {
+                    var f = e.Column.Format;
+                    var selectedItem = e.DataRow;
+                    var dataRow = (e.DataRow.RowData as DataRowView).Row;
+                    e.DisplayText = dataRow["Mutiert am"].ToString();
+                    //e.DisplayText = e.DisplayText.ToString("dd.MM.yyyy hh:mm:ss");
+                    //int i = 0;
+                }
                 if (e.Column.MappingName == "fileext")
                 {
                     try

Client/UIControls/UCAllgemeineDokumentParam.Designer.cs

@@ -58,6 +58,7 @@
             this.GrpTeam = new System.Windows.Forms.GroupBox();
             this.cbboxteam = new Syncfusion.WinForms.ListView.SfComboBox();
             this.GrpUnterschrift = new System.Windows.Forms.GroupBox();
+            this.lblohneUnterschrift = new System.Windows.Forms.Label();
             this.cbformularohneunterschrfit = new System.Windows.Forms.CheckBox();
             this.cbfaksimile = new System.Windows.Forms.CheckBox();
             this.cbboxunterschriftrechts = new Syncfusion.WinForms.ListView.SfComboBox();
@@ -79,7 +80,6 @@
             this.lblPostzustellung = new System.Windows.Forms.Label();
             this.btnErneutGenerierung = new System.Windows.Forms.Button();
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.lblohneUnterschrift = new System.Windows.Forms.Label();
             this.GrpPartner.SuspendLayout();
             this.groupBox5.SuspendLayout();
             this.groupBox6.SuspendLayout();
@@ -307,9 +307,10 @@
             this.gridDokwertlist.Size = new System.Drawing.Size(456, 376);
             this.gridDokwertlist.TabIndex = 0;
             this.gridDokwertlist.Text = "sfDataGrid1";
-            this.gridDokwertlist.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellDoubleClick);
+            this.gridDokwertlist.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellClick);
             this.gridDokwertlist.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellDoubleClick);
             this.gridDokwertlist.CurrentCellEndEdit += new Syncfusion.WinForms.DataGrid.Events.CurrentCellEndEditEventHandler(this.gridDokwertlist_CurrentCellEndEdit);
+            this.gridDokwertlist.DoubleClick += new System.EventHandler(this.gridDokwertlist_DoubleClick);
             // 
             // lblBezeichnung
             // 
@@ -424,6 +425,16 @@
             this.GrpUnterschrift.TabStop = false;
             this.GrpUnterschrift.Text = "Unterschriften";
             // 
+            // lblohneUnterschrift
+            // 
+            this.lblohneUnterschrift.AutoSize = true;
+            this.lblohneUnterschrift.Location = new System.Drawing.Point(19, 34);
+            this.lblohneUnterschrift.Name = "lblohneUnterschrift";
+            this.lblohneUnterschrift.Size = new System.Drawing.Size(131, 13);
+            this.lblohneUnterschrift.TabIndex = 12;
+            this.lblohneUnterschrift.Text = "Formular ohne Unterschrift";
+            this.lblohneUnterschrift.Visible = false;
+            // 
             // cbformularohneunterschrfit
             // 
             this.cbformularohneunterschrfit.AutoSize = true;
@@ -648,16 +659,6 @@
             this.contextMenuStrip1.Name = "contextMenuStrip1";
             this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
             // 
-            // lblohneUnterschrift
-            // 
-            this.lblohneUnterschrift.AutoSize = true;
-            this.lblohneUnterschrift.Location = new System.Drawing.Point(19, 34);
-            this.lblohneUnterschrift.Name = "lblohneUnterschrift";
-            this.lblohneUnterschrift.Size = new System.Drawing.Size(131, 13);
-            this.lblohneUnterschrift.TabIndex = 12;
-            this.lblohneUnterschrift.Text = "Formular ohne Unterschrift";
-            this.lblohneUnterschrift.Visible = false;
-            // 
             // UCAllgemeineDokumentParam
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

Client/UIControls/UCAllgemeineDokumentParam.cs

@@ -37,6 +37,8 @@ namespace OnDoc.UIControls
 
         public bool interop { get; set; } = false;
         public bool barcode { get; set; } = false;
+
+        public bool bedingt_retournierbar { get; set; } = false;
         public bool runmacros { get; set; } = false;
 
         public string check_error { get; set; } = "";
@@ -175,8 +177,15 @@ namespace OnDoc.UIControls
                 catch { interop = false; }
                 barcode = Convert.ToBoolean(dr["Vertrag"])== true;
 
-                barcode = Convert.ToBoolean(dr["zu_retournieren"]) == true;
+                if (Convert.ToInt32(dr["doktypbedingteretournierung"]) > 0)
-
+                {
+                    barcode = true;
+                }
+                try
+                {
+                    this.bedingt_retournierbar = Convert.ToBoolean(dr["bedingtretournierbar"]) == true;
+                }
+                catch { }
                 try
                 {
                     if (dr["physisches_archiv"].ToString() == "1") { this.barcode_zusatz = " U"; }
@@ -571,6 +580,7 @@ namespace OnDoc.UIControls
             try { docgendata.unterschriftRehts = cbboxunterschriftrechts.SelectedValue.ToString(); } catch { docgendata.unterschriftRehts = ""; }
             if (cbfaksimile.Checked) { docgendata.digitaleunterschrift = true; } else { docgendata.digitaleunterschrift = false; }
             if (cbformularohneunterschrfit.Checked) { docgendata.frormularOhneUnterschrift = true; } else { docgendata.frormularOhneUnterschrift = false; }
+            if (lblohneUnterschrift.Visible) { docgendata.frormularOhneUnterschrift = true; }
             docgendata.verantwortlich = cbboxverantwortlich.SelectedValue.ToString();
             docgendata.team = cbboxteam.SelectedValue.ToString();
 
@@ -644,6 +654,7 @@ namespace OnDoc.UIControls
             dokdata.Erstellung_in_Office = this.Erstellung_in_Office;
             dokdata.FillOffice = this.FillOffice;
             dokdata.CompatibilityMode= this.CompatibilityMode;
+            if (dokdata.Barcode==false && this.bedingt_retournierbar==true) { dokdata.Barcode = true; }
 
             if (DateTerminText.Text == "")
             {
@@ -685,18 +696,22 @@ namespace OnDoc.UIControls
 
         private void gridDokwertlist_CellDoubleClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
         {
-            if (e.DataColumn.ColumnIndex!=15) { return; }
+            try
-            var selectedItem = e.DataRow;
-            var dataRow = (e.DataRow.RowData as DataRowView).Row;
-            string datenherkunft = dataRow["datenherkunft"].ToString();
-            string feldtyp = dataRow["feldtyp"].ToString();
-            if (datenherkunft != "")
             {
-                dataRow["feldwert"] = data_select(datenherkunft, feldtyp);
+                //if (e.DataColumn.ColumnIndex != 15) { return; }
-                gridDokwertlist.Refresh();
+                var selectedItem = e.DataRow;
+                var dataRow = (e.DataRow.RowData as DataRowView).Row;
+                string datenherkunft = dataRow["datenherkunft"].ToString();
+                string feldtyp = dataRow["feldtyp"].ToString();
+                if (datenherkunft != "")
+                {
+                    dataRow["feldwert"] = data_select(datenherkunft, feldtyp);
+                    gridDokwertlist.Refresh();
 
 
+                }
             }
+            catch { }
         }
 
         private string data_select(string datenherkunft, string feldtyp)
@@ -890,5 +905,31 @@ namespace OnDoc.UIControls
         {
             this.DateTerminText.Text = DateTermin.Value.ToString().Substring(0,10);
         }
+
+        private void gridDokwertlist_DoubleClick(object sender, EventArgs e)
+        {
+           
+        }
+
+        private void gridDokwertlist_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
+        {
+
+            try
+            {
+                if (e.DataColumn.ColumnIndex != 15) { return; }
+                var selectedItem = e.DataRow;
+                var dataRow = (e.DataRow.RowData as DataRowView).Row;
+                string datenherkunft = dataRow["datenherkunft"].ToString();
+                string feldtyp = dataRow["feldtyp"].ToString();
+                if (datenherkunft != "")
+                {
+                    dataRow["feldwert"] = data_select(datenherkunft, feldtyp);
+                    gridDokwertlist.Refresh();
+
+
+                }
+            }
+            catch { }
+        }
     }
 }

Client/bin/Debug/bck/Herma_4611.frx

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" DoublePass="true" ReportInfo.Created="09/23/2024 14:02:41" ReportInfo.Modified="09/23/2024 14:49:37" ReportInfo.CreatorVersion="2024.1.0.0">
+<Report ScriptLanguage="CSharp" DoublePass="true" ReportInfo.Created="09/23/2024 14:02:41" ReportInfo.Modified="01/14/2025 19:30:14" ReportInfo.CreatorVersion="2024.1.0.0">
   <Dictionary>
     <TableDataSource Name="Barcodes" ReferenceName="Data.Barcodes" DataType="System.Int32" Enabled="true">
       <Column Name="barcode" DataType="System.String"/>
+      <Column Name="barcodetext" DataType="System.String"/>
     </TableDataSource>
   </Dictionary>
   <ReportPage Name="Page1" PaperWidth="210.0072" PaperHeight="297.0022" LeftMargin="0" TopMargin="4.826" RightMargin="0" BottomMargin="0" Columns.Count="3" Columns.Width="70.104" Columns.Positions="0,70.104,140.208" Watermark.Font="Arial, 60pt" Duplex="Simplex">
-    <DataBand Name="Data1" Width="264.99" Height="64.26" DataSource="Barcodes">
+    <DataBand Name="Data1" Width="264.99" Height="66.15" DataSource="Barcodes">
-      <BarcodeObject Name="Barcode1" Left="56.7" Top="9.45" Width="141.17" Height="28.35" AutoSize="false" Text="[Barcodes.barcode]" ShowText="false" AllowExpressions="true" Barcode="2/5 Interleaved"/>
+      <TextObject Name="Text2" Left="28.35" Top="9.45" Width="198.45" Height="37.8" Text="[Barcodes.barcode]" HorzAlign="Center" Font="Bar 25i d, 26pt"/>
-      <TextObject Name="Text1" Left="56.7" Top="37.8" Width="141.75" Height="18.9" Text="[Barcodes.barcode]" HorzAlign="Center" Font="Arial, 10pt"/>
+      <TextObject Name="Text3" Left="37.8" Top="37.8" Width="189" Height="18.9" Text="[Barcodes.barcodetext]" HorzAlign="Center" Font="Arial, 11pt"/>
     </DataBand>
   </ReportPage>
 </Report>

DOCGEN/Klassen/SyncFWord.cs

@@ -51,19 +51,21 @@ namespace DOCGEN.Klassen
         public SyncFWord(string resturi, string apikey)
         {
             this.resturi = resturi;
-            this.apikey=apikey;
+            this.apikey = apikey;
         }
 
         public bool create_nativ(string property, string value, string base64, string originalfile, string destfile)
         {
             //FileStream ms = new FileStream(@originalfile, FileMode.Open, FileAccess.Read);
             WordDocument document = new WordDocument();
-            document.Open(@originalfile,FormatType.Automatic);
+            document.Open(@originalfile, FormatType.Automatic);
             //document.Open(ms, FormatType.Automatic);
-            try { 
+            try
-            document.CustomDocumentProperties.Add(property, value);
+            {
+                document.CustomDocumentProperties.Add(property, value);
             }
-            catch {
+            catch
+            {
                 document.CustomDocumentProperties.Remove(property);
                 document.CustomDocumentProperties.Add(property, value);
 
@@ -80,7 +82,7 @@ namespace DOCGEN.Klassen
                 }
             }
             catch { }
-                
+
             Logging.Logging.Debug("Create Native: " + destfile, "Ondoc", "");
             document.UpdateDocumentFields();
             document.Save(destfile);
@@ -121,8 +123,8 @@ namespace DOCGEN.Klassen
         }
         private string get_unterschrift(string MaNr)
         {
-           
+
-            string URL =  resturi + "API/GetUnterschriftAsBase64ByMitarbeiternr?MaNr=" + MaNr;
+            string URL = resturi + "API/GetUnterschriftAsBase64ByMitarbeiternr?MaNr=" + MaNr;
 
             HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest;
             webRequest.Method = WebRequestMethods.Http.Get;
@@ -156,8 +158,8 @@ namespace DOCGEN.Klassen
             return (System.Drawing.Image)new Bitmap(imgToResize, size);
 
         }
-  
+
-        public void set_compatibilitymode(ref WordDocument document,string force)
+        public void set_compatibilitymode(ref WordDocument document, string force)
         {
             CompatibilityMode compatibilityMode = document.Settings.CompatibilityMode;
             Logging.Logging.Debug(compatibilityMode.ToString(), "ondoc sf", force);
@@ -192,7 +194,7 @@ namespace DOCGEN.Klassen
 
             }
         }
-        public string Generate_Word(string base64, clsDocData docdata,  string img_UL="", string img_UR="",string img_faktura="")
+        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));
@@ -255,7 +257,8 @@ namespace DOCGEN.Klassen
                     paragraph.AppendBreak(BreakType.LineBreak);
 
                 }
-                catch {
+                catch
+                {
                     foreach (WSection section in document.Sections)
                     {
                         IWParagraph p;
@@ -277,12 +280,16 @@ namespace DOCGEN.Klassen
             //{
             //    insert_ppfaktura(document, img_faktura);
             //}
-            if (docdata.Form_ohne_Unterschrift=="True" || docdata.As_Faksimile == "True")
+            if (docdata.Form_ohne_Unterschrift == "True" || docdata.As_Faksimile == "True")
             {
                 //DB db = new DB();
             }
+
+
             foreach (clsDocValue dv in docdata.DocValues)
             {
+                //if (dv.TMBeginn.ToString().Contains("TGEDKCursor")) { //break; }
+                //if (dv.FieldName.ToString().Contains("TGEDKCursor")) { //break; }
                 if (docdata.Form_ohne_Unterschrift == "True")
                 {
                     foreach (clsDocValue dv2 in docdata.DocValues)
@@ -298,6 +305,11 @@ namespace DOCGEN.Klassen
                         //if (dv2.TMBeginn.ToString() == "TGEDKFunktionRechtsB99") { dv2.Value = ""; }
                     }
                 }
+
+                if (dv.TMBeginn.ToString() == "TGEDKTagesdatumB99")
+                {
+                    int a = 1;
+                }
                 if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() == "")
                 {
                     try
@@ -323,8 +335,11 @@ namespace DOCGEN.Klassen
                             if (dv.TMBeginn.ToString().Contains("VornameNameLinks"))
                             {
                                 string unterschrift = "";
-                                if (img_UL != "") { unterschrift = img_UL.ToString(); } else { 
+                                if (img_UL != "") { unterschrift = img_UL.ToString(); }
-                                    unterschrift = Newtonsoft.Json.JsonConvert.DeserializeObject<string>(get_unterschrift(docdata.Unterschrift_Links)); } 
+                                else
+                                {
+                                    unterschrift = Newtonsoft.Json.JsonConvert.DeserializeObject<string>(get_unterschrift(docdata.Unterschrift_Links));
+                                }
                                 if (unterschrift != "")
                                 {
                                     MemoryStream mssign = new MemoryStream(Convert.FromBase64String(unterschrift));
@@ -337,9 +352,12 @@ namespace DOCGEN.Klassen
                             else
                             {
                                 string unterschrift = "";
-                               
+
-                                if (img_UR != "") { unterschrift = img_UR; } else { 
+                                if (img_UR != "") { unterschrift = img_UR; }
-                                    unterschrift = Newtonsoft.Json.JsonConvert.DeserializeObject<string>(get_unterschrift(docdata.Unterschrift_Rechts)); }
+                                else
+                                {
+                                    unterschrift = Newtonsoft.Json.JsonConvert.DeserializeObject<string>(get_unterschrift(docdata.Unterschrift_Rechts));
+                                }
                                 if (unterschrift != "")
                                 {
                                     MemoryStream mssign = new MemoryStream(Helper.EncodeExtensions.DecodeBase642ByteArray(unterschrift));
@@ -373,43 +391,50 @@ namespace DOCGEN.Klassen
                         else
                         {
                             //if (docdata.As_Faksimile=="True" && (dv.TMBeginn.ToString() == "TGEDKFunktionLinksB99" || dv.TMBeginn.ToString() == "TGEDKFunktionRechtsB99"))
-                                if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString().Contains("FunktionLinks") || dv.TMBeginn.ToString().Contains("FunktionRechts")))
+                            if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString().Contains("FunktionLinks") || dv.TMBeginn.ToString().Contains("FunktionRechts")))
-                                {
+                            {
 
                             }
                             else
                             {
-                               //if (dv.TMBeginn.ToString() == "TGEDKAdresseZustellungB99")
+                                //if (dv.TMBeginn.ToString() == "TGEDKAdresseZustellungB99")
-                                    if (dv.TMBeginn.ToString() == "TGEDKZustellungB99")
+                                if (dv.TMBeginn.ToString() == "TGEDKZustellungB99")
-                                    {
+                                {
-                                        if (img_faktura != "")
+                                    if (img_faktura != "")
 
                                     {
 
                                         insert_ppfaktura(document, img_faktura);
                                         bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
                                         bookmarkNavigator.InsertText(dv.Value.ToString());
-                                       
+
 
                                         //bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
                                     }
                                     else
                                     {
-                                        bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
+                                        if (!dv.TMBeginn.ToString().Contains("TGEDKCursor"))
-                                        bookmarkNavigator.InsertText(dv.Value.ToString());
+                                        {
-                                        bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
+                                            bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
+                                            bookmarkNavigator.InsertText(dv.Value.ToString());
+                                            bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
+                                        }
                                     }
 
                                 }
                                 else
                                 {
-                                    bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
+                                    if (!dv.TMBeginn.ToString().Contains("TGEDKCursor"))
-                                    bookmarkNavigator.InsertText(dv.Value.ToString());
+                                    {
-                                    bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
+
-                                }  
+                                        bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
+                                        bookmarkNavigator.InsertText(dv.Value.ToString());
+                                        bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
+                                    }
+                                }
 
                             }
-                            
+
                         }
                     }
                     catch { }
@@ -418,7 +443,10 @@ namespace DOCGEN.Klassen
                 {
                     try
                     {
-                        ReplaceBookmarkContent(ref document, dv.TMBeginn.ToString(), dv.TMEnd.ToString(), dv.Value.ToString());
+                        if (!dv.TMBeginn.ToString().Contains("TGEDKCursor"))
+                        {
+                            ReplaceBookmarkContent(ref document, dv.TMBeginn.ToString(), dv.TMEnd.ToString(), dv.Value.ToString());
+                        }
                     }
                     catch { }
                 }
@@ -427,7 +455,7 @@ namespace DOCGEN.Klassen
                 {
                     if (dv.FieldName.ToString().Substring(0, 2) == "$$")
                     {
-                        Replace_Text(ref document, dv.FieldName.ToString(),dv.Value.ToString());
+                        Replace_Text(ref document, dv.FieldName.ToString(), dv.Value.ToString());
                     }
                     try
                     {
@@ -438,7 +466,7 @@ namespace DOCGEN.Klassen
                                 //Iterates through form fields
                                 foreach (WFormField formField in textBody.FormFields)
                                 {
-                                    if (formField.Name == dv.FieldName.ToString())
+                                    if (formField.Name == dv.FieldName.ToString() && !dv.FieldName.ToString().Contains("TGEDKCursor"))
                                     {
                                         formField.Text = dv.Value.ToString();
                                         break;
@@ -515,12 +543,12 @@ namespace DOCGEN.Klassen
                 }
             }
 
-         
+
 
             //document.UpdateDocumentFields();
             //document.UpdateAlternateChunks();
 
-           
+
 
             MemoryStream destms = new MemoryStream();
             if (formattype_original.ToString().ToUpper() == "DOTMXXX")
@@ -721,7 +749,7 @@ namespace DOCGEN.Klassen
             BookmarksNavigator bookmarkNavigator = new BookmarksNavigator(document);
             //bookmarkNavigator.MoveToBookmark("TGEDKAdresseZustellungB99");
             bookmarkNavigator.MoveToBookmark("TGEDKZustellungB99");
-            
+
             string img = ppfakturaimage;
             byte[] b = Convert.FromBase64String(ppfakturaimage);
             MemoryStream mssign = new MemoryStream(b);
@@ -731,7 +759,7 @@ namespace DOCGEN.Klassen
             //paragraph.AppendText(zustellungvalue);
             bookmarkNavigator.InsertParagraph(paragraph);
 
-           
+
 
         }
 
@@ -820,7 +848,7 @@ namespace DOCGEN.Klassen
                 case "0":
                     //int rotation = 0;
                     //if (docData.barcode_horizontal == 0) { rotation = 270; }
-                    barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5, docData.Dokumentid.Substring(6, 16), docData.Dokumentid.Substring(6, 16)+docData.barcode_zusatz, docData.barcode_textposition, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize),0);
+                    barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5, docData.Dokumentid.Substring(6, 16), docData.Dokumentid.Substring(6, 16) + docData.barcode_zusatz, docData.barcode_textposition, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize), 0);
                     //barcodeimage = AutoSizeImage(barcodeimage, docData.barcode_width, docData.barcode_height,false);
                     //barcodeimage = ScaleImage(barcodeimage, docData.barcode_width, docData.barcode_height);
                     //barcodeimage = resizeImage(barcodeimage, new Size(docData.barcode_width,docData.barcode_height));
@@ -833,42 +861,42 @@ namespace DOCGEN.Klassen
                     //System.IO.File.Delete(@"h:\tssettings\edoka\a_" + docData.Dokumentid + ".png");
                     //barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAutoBest, docData.barcode_content, 4, 0, 0, "Left", docData.barcode_content, docData.barcode_font, docData.barcode_fontsize);
 
-                    barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAscii,docData.barcode_content, 6, 6, 0, "Right", docData.barcode_text+docData.barcode_zusatz, docData.Zusatz_Font, docData.Zusatz_FontSize);
+                    barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAscii, docData.barcode_content, 6, 6, 0, "Right", docData.barcode_text + docData.barcode_zusatz, docData.Zusatz_Font, docData.Zusatz_FontSize);
                     barcodeimage = AutoSizeImage(barcodeimage, docData.barcode_width, docData.barcode_height, false);
                     //barcodeimage= resizeImage(barcodeimage, new Size(docData.barcode_width, docData.barcode_height));
                     //barcodeimage = ScaleImage(barcodeimage, docData.barcode_width,docData.barcode_height);
                     //barcodeimage.Save(@"x:\bctest.png");
-                    
+
                     break;
                 default:
-                    barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5C, docData.Dokumentid.Substring(9, 13), docData.Dokumentid.Substring(6, 16)+docData.barcode_zusatz, docData.barcode_textposition, docData.barcode_font, Convert.ToInt32(docData.barcode_fontsize), 0);
+                    barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5C, docData.Dokumentid.Substring(9, 13), docData.Dokumentid.Substring(6, 16) + docData.barcode_zusatz, docData.barcode_textposition, docData.barcode_font, Convert.ToInt32(docData.barcode_fontsize), 0);
                     break;
             }
-//            System.Drawing.Image barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5C, docData.Dokumentid.Substring(9, 13), docData.Dokumentid.Substring(9, 13), docData.barcode_textposition "Below", "Arial", 6, 0);
+            //            System.Drawing.Image barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5C, docData.Dokumentid.Substring(9, 13), docData.Dokumentid.Substring(9, 13), docData.barcode_textposition "Below", "Arial", 6, 0);
 
             foreach (WSection section in document.Sections)
             {
 
-              
+
                 WPicture picture = new WPicture(document);
                 picture.LoadImage(barcodeimage);
                 //picture.Height = docData.barcode_height;
-                
+
                 //picture.Width = docData.barcode_width;
                 picture.VerticalPosition = docData.barcode_left;
                 picture.HorizontalPosition = docData.barcode_top;
-                picture.HorizontalOrigin = HorizontalOrigin.Page ;
+                picture.HorizontalOrigin = HorizontalOrigin.Page;
                 picture.VerticalOrigin = VerticalOrigin.Page;
                 picture.TextWrappingStyle = TextWrappingStyle.Square;
                 picture.TextWrappingType = TextWrappingType.Largest;
-                
+
                 //picture.Width = barcodeimage.Width;
                 //picture.Height = barcodeimage.Height;
                 if (docData.barcode_horizontal == 0)
                 {
                     picture.Rotation = 270;
-               //     picture.Height = docData.barcode_height;
+                    //     picture.Height = docData.barcode_height;
-               //     picture.Width = docData.barcode_width;
+                    //     picture.Width = docData.barcode_width;
                     picture.VerticalPosition = docData.barcode_top; ;
                     picture.HorizontalPosition = docData.barcode_left;
 
@@ -882,29 +910,29 @@ namespace DOCGEN.Klassen
                     picture.VerticalPosition = docData.barcode_top; ;
                     picture.HorizontalPosition = docData.barcode_left;
 
-               //     picture.Width = barcodeimage.Width;
+                    //     picture.Width = barcodeimage.Width;
-                 //   picture.Height = barcodeimage.Height;
+                    //   picture.Height = barcodeimage.Height;
 
 
                 }
                 if (docData.barcode_type == "0")
                 {
                     picture.Width = docData.barcode_width;
-                       picture.Height = docData.barcode_height;
+                    picture.Height = docData.barcode_height;
 
                 }
                 WPicture picture2 = new WPicture(document);
                 picture2 = picture;
-               
+
                 section.HeadersFooters.Footer.AddParagraph().ChildEntities.Add(picture);
                 section.HeadersFooters.FirstPageFooter.AddParagraph().ChildEntities.Add(picture2);
 
                 if (section.HeadersFooters.FirstPageFooter.Paragraphs.Count < 1)
-                    {
+                {
                     section.HeadersFooters.FirstPageFooter.AddParagraph();
-                section.HeadersFooters.FirstPageFooter.Paragraphs[0].ChildEntities.Add(picture);
+                    section.HeadersFooters.FirstPageFooter.Paragraphs[0].ChildEntities.Add(picture);
                 }
-                
+
 
                 Syncfusion.DocIO.DLS.IWParagraph paragraph = section.Body.LastParagraph;
                 if (paragraph != null)
@@ -927,7 +955,7 @@ namespace DOCGEN.Klassen
 
             return newImage;
         }
-        public void insert_Logo(WordDocument document, clsDocData docData) 
+        public void insert_Logo(WordDocument document, clsDocData docData)
         {
             IWSection section = document.Sections[0];
             IWParagraph paragraph = section.HeadersFooters.Header.AddParagraph();
@@ -1056,8 +1084,8 @@ namespace DOCGEN.Klassen
         }
         public void SplitDocument_Part2(ref WordDocument wordDocument, ref WordDocument target, int SectionNumber)
         {
-            
+
-            
+
             int i = 0;
             foreach (WSection section in wordDocument.Sections)
             {

Model/clsDocData.cs

@@ -24,6 +24,8 @@ namespace Model
         public string Verantwortlich { get; set; }
         public string Zustaendig {  get; set; }
 
+
+
         public string Team { get; set; }
 
         public string Unterschrift_Links { get; set; }

OnDoc.sln

@@ -59,6 +59,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "vbBarcodes", "vbBarcodes\vb
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BarcodeLibVBDatamatrix", "BarcodeLibVBDatamatrix\BarcodeLibVBDatamatrix.vbproj", "{AB5C9C28-1ECC-4612-AA82-91CB77D83ACA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZZ_BarcpdeFromFont", "ZZ_BarcpdeFromFont\ZZ_BarcpdeFromFont.csproj", "{913D34B6-1F69-4232-8AE6-7790794F5871}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -165,6 +167,10 @@ Global
 		{AB5C9C28-1ECC-4612-AA82-91CB77D83ACA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB5C9C28-1ECC-4612-AA82-91CB77D83ACA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB5C9C28-1ECC-4612-AA82-91CB77D83ACA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{913D34B6-1F69-4232-8AE6-7790794F5871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{913D34B6-1F69-4232-8AE6-7790794F5871}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{913D34B6-1F69-4232-8AE6-7790794F5871}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{913D34B6-1F69-4232-8AE6-7790794F5871}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

OnDocOffice/clsoffice.cs

@@ -263,6 +263,9 @@ namespace OnDocOffice
         public string filename { get; set; }
         public string dokumentid { get; set; }
 
+        public string cursortm { get; set; }
+        public string cursorfeld { get; set; }
+
         public bool is_protected { get; set; } = false;
         public
         Microsoft.Office.Interop.Word.Application word;
@@ -613,20 +616,33 @@ namespace OnDocOffice
                 {
 
                 }
+                cursortm = "";
                 foreach (clsDocValue dv in docdata.DocValues)
                 {
-
+                    if (dv.TMBeginn.ToString().Contains("Tagesdatum")){
+                        int a = 1;
+                    }
                     try
                     {
-                        if (dv.TMBeginn.ToString() == "TGEDKCursor" || dv.TMBeginn.ToString() == "TGEDKCursorB" ||
+                        if (dv.TMBeginn.ToString().Contains("TGEDKCursor")) { 
-                            dv.FieldName.ToString() == "TGEDKCursor" || dv.FieldName.ToString() == "TGEDKCursorB") { cursorpositionieren = true; }
+                        //if (dv.TMBeginn.ToString() == "TGEDKCursor" || dv.TMBeginn.ToString() == "TGEDKCursorB" ||
+                        //    dv.FieldName.ToString() == "TGEDKCursor" || dv.FieldName.ToString() == "TGEDKCursorB") {
+                            cursorpositionieren = true;
+                            cursortm = dv.TMBeginn.ToString();
+                            //break;
+                        }
+                        if (dv.FieldName.ToString().Contains("TGEDKCursor")){
+                            cursorpositionieren = true;
+                            cursorfeld = dv.FieldName.ToString();
+                            //break;
+                        }
                     }
                     catch { }
                     //                    Logging.Logging.Debug(dv.TMBeginn.ToString() + " / " + dv.TMEnd.ToString(), dv.Value.ToString(), dokumentid);
                     dialogGenerate.add_progress((int)progressstep);
-                    if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() == "")
+                    if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() == "" && !dv.TMBeginn.ToString().Contains("TGEDKCurosr"))
                     {
-
+                        
                         try
                         {
 
@@ -698,7 +714,7 @@ namespace OnDocOffice
                         }
                         catch { }
                     }
-                    if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() != "")
+                    if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() != "" && !dv.TMBeginn.ToString().Contains("TGEDKCursor"))
                     {
                         try
                         {
@@ -711,10 +727,11 @@ namespace OnDocOffice
                         }
                         catch { }
                     }
-                    if (dv.FieldName.ToString() != "")
+                    if (dv.FieldName.ToString() != "" && !dv.FieldName.Contains("TGEDKCursor"))
                     {
                         try
                         {
+
                             worddoc.FormFields[dv.FieldName.ToString()].Result = dv.Value;
                         }
                         catch { }
@@ -741,6 +758,16 @@ namespace OnDocOffice
 
             run_macros(ref docdata, connectionstring);
 
+            if (cursorpositionieren)
+            {
+                try
+
+                {
+                    if (cursortm != "") { worddoc.Bookmarks[cursortm].Select(); }
+                    if (cursorfeld != "") { worddoc.FormFields[cursorfeld].Select(); }
+                }
+                catch { }
+            }
             worddoc.Save();
             Logging.Logging.Debug("Word Saved", "clsOffice", dokumentid);
 

OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd4598e4a8c105bac7401af843b66bf50f9b6c17")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3e36dd541b11e3e8942c22617c519c25904bd77b")]
 [assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")]
 [assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache

@@ -1 +1 @@
-3fe68515a6b5321b50da60ef6318d743a3577e4625150456fd959bc44c5a01e1
+a19bace92e9de4f8b4437cb71f8e59f3727a08c4ba35c8ff09ab48db3155595b

ZZ_BarcpdeFromFont/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+    </startup>
+</configuration>

ZZ_BarcpdeFromFont/Form1.Designer.cs

@@ -0,0 +1,99 @@
+namespace ZZ_BarcpdeFromFont
+{
+    partial class Form1
+    {
+        /// <summary>
+        /// Erforderliche Designervariable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Verwendete Ressourcen bereinigen.
+        /// </summary>
+        /// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Vom Windows Form-Designer generierter Code
+
+        /// <summary>
+        /// Erforderliche Methode für die Designerunterstützung.
+        /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.button1 = new System.Windows.Forms.Button();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(113, 30);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(168, 20);
+            this.textBox1.TabIndex = 0;
+            this.textBox1.Text = "0082025002484292";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(28, 30);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(53, 13);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "HR-String";
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(113, 78);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 23);
+            this.button1.TabIndex = 2;
+            this.button1.Text = "Generate";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Location = new System.Drawing.Point(31, 148);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(643, 483);
+            this.pictureBox1.TabIndex = 3;
+            this.pictureBox1.TabStop = false;
+            // 
+            // Form1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 707);
+            this.Controls.Add(this.pictureBox1);
+            this.Controls.Add(this.button1);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.textBox1);
+            this.Name = "Form1";
+            this.Text = "Form1";
+            this.Load += new System.EventHandler(this.Form1_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.PictureBox pictureBox1;
+    }
+}
+

ZZ_BarcpdeFromFont/Form1.cs

@@ -0,0 +1,296 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Drawing.Text;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+
+namespace ZZ_BarcpdeFromFont
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            string inp = Bar25I(this.textBox1.Text);
+            Font f = new Font("Bar 25i c", 46);
+            BarcodeLib.clsBarI25 barbarcode = new BarcodeLib.clsBarI25();
+
+            pictureBox1.Image = barbarcode.GetBarI25(Color.Black, Color.White, inp, "Bar 25i c HR", 36, 350, 50, " U", "Futur Book", 8,270);
+            //pictureBox1.Image= DrawText(inp, f, Color.Black, 140,textBox1.Text+ " U");
+            //pictureBox1.Image = DrawText1(Color.Black, Color.White, "Bar 25i c HR", 36, inp, 350, 50, " U",0);
+
+        }
+
+        public string Bar25I(string BarTextIn)
+        {
+            string Bar25IRet = default;
+            string BarTextOut = "";
+            string TempString = "";
+            long CharValue = 0;
+            string barcodeout = "";
+            // Initialize input and output strings
+            BarTextOut = "";
+            BarTextIn = BarTextIn.Trim();
+
+            // Throw away non-numeric data
+            TempString = "";
+            for (int II = 1, loopTo = BarTextIn.Length; II <= loopTo; II++)
+            {
+                if (IsNumeric(BarTextIn.Substring(II - 1, 1)))
+                {
+                    TempString = TempString + BarTextIn.Substring(II - 1, 1);
+                }
+            }
+
+            // If not an even number of digits, add a leading 0
+            if (TempString.Length % 2 == 1)
+            {
+                TempString = "0" + TempString;
+            }
+
+            // Break digit pairs up and convert to characters- build output string
+            for (int II = 1, loopTo1 = TempString.Length; II <= loopTo1; II += 2)
+            {
+                // Break string into pairs of digits and get value
+                CharValue = Convert.ToInt32(TempString.Substring(II - 1, 2));
+                // translate value to ASCII and save in BarTextOut
+                if (CharValue < 90)
+                {
+                    BarTextOut = BarTextOut + (char)(CharValue + 33);
+                }
+                else
+                {
+                    BarTextOut = BarTextOut + (char)(CharValue + 71);
+                }
+            }
+
+            // Build ouput string, trailing space for Windows rasterization bug
+            barcodeout = "{" + BarTextOut + "} ";
+
+            // Return the string
+            Bar25IRet = barcodeout;
+            return Bar25IRet;
+        }
+
+        public bool IsNumeric(string value)
+        {
+            return value.All(char.IsNumber);
+        }
+        //private Image DrawText(String text, Font font, Color textColor, Color backColor)
+        //{
+        //    //first, create a dummy bitmap just to get a graphics object
+        //    Image img = new Bitmap(1, 1);
+        //    Graphics drawing = Graphics.FromImage(img);
+
+        //    //measure the string to see how big the image needs to be
+        //    SizeF textSize = drawing.MeasureString(text, font);
+
+        //    //free up the dummy image and old graphics object
+        //    img.Dispose();
+        //    drawing.Dispose();
+
+        //    //create a new image of the right size
+        //    img = new Bitmap((int)textSize.Width, (int)textSize.Height);
+
+        //    drawing = Graphics.FromImage(img);
+
+        //    //paint the background
+        //    drawing.Clear(backColor);
+
+        //    //create a brush for the text
+        //    Brush textBrush = new SolidBrush(textColor);
+
+        //    drawing.DrawString(text, font, textBrush, 0, 0);
+
+        //    drawing.Save();
+
+        //    textBrush.Dispose();
+        //    drawing.Dispose();
+
+        //    return img;
+
+        //}
+
+        public Image DrawText(String text, Font font, Color textColor, int maxWidth, String path)
+        {
+            //first, create a dummy bitmap just to get a graphics object
+            Image img = new Bitmap(1, 1);
+            Graphics drawing = Graphics.FromImage(img);
+            //measure the string to see how big the image needs to be
+            SizeF textSize = drawing.MeasureString(text, font, maxWidth);
+
+            //set the stringformat flags to rtl
+            StringFormat sf = new StringFormat();
+            //uncomment the next line for right to left languages
+            //sf.FormatFlags = StringFormatFlags.DirectionRightToLeft;
+            sf.Trimming = StringTrimming.Word;
+            //free up the dummy image and old graphics object
+            img.Dispose();
+            drawing.Dispose();
+
+            int multi = 4;
+            //create a new image of the right size
+            img = new Bitmap((int)textSize.Width*multi, (int)textSize.Height);
+
+            drawing = Graphics.FromImage(img);
+            //Adjust for high quality
+            drawing.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
+            drawing.InterpolationMode = InterpolationMode.HighQualityBilinear;
+            drawing.PixelOffsetMode = PixelOffsetMode.HighQuality;
+            drawing.SmoothingMode = SmoothingMode.HighQuality;
+            drawing.TextRenderingHint = TextRenderingHint.AntiAliasGridFit;
+
+            //paint the background
+            drawing.Clear(Color.Transparent);
+
+            //create a brush for the text
+            Brush textBrush = new SolidBrush(textColor);
+
+            Font ftext = new Font("Arial", 15,FontStyle.Bold);
+            drawing.DrawString(text, font, textBrush, new RectangleF(0, 0, textSize.Width*multi, textSize.Height), sf);
+            drawing.DrawString(path, ftext, textBrush, new RectangleF(50, 50, textSize.Width*multi , textSize.Height ), sf);
+
+            drawing.Save();
+
+            textBrush.Dispose();
+            drawing.Dispose();
+            return img;
+            img.Save(path, System.Drawing.Imaging.ImageFormat.Png);
+            img.Dispose();
+
+        }
+
+        public Image DrawText1(Color foreColor, Color backColor, string fontName, int fontSize, string txt, int width, int height, string zusatz, int rotation)
+        {
+            Bitmap img = new Bitmap(width, height);
+            Graphics Gimg = Graphics.FromImage(img);
+            Font imgFont = new Font(fontName, fontSize);
+            PointF imgPoint = new PointF(5, 5);
+            SolidBrush bForeColor = new SolidBrush(foreColor);
+            SolidBrush bBackColor = new SolidBrush(backColor);
+            Gimg.FillRectangle(bBackColor, 0, 0, width, height);
+            Gimg.DrawString(txt, imgFont, bForeColor, imgPoint);
+            Font fzFont = new Font("Arial", 9);
+
+            SizeF textSize = Gimg.MeasureString(zusatz, fzFont, 50);
+
+            PointF imgPointZusatz= new PointF(width-textSize.Width-15, 30);
+            Gimg.DrawString(zusatz, fzFont, bForeColor, imgPointZusatz);
+
+            return RotateImage(img, rotation,true,true,Color.White);
+            //img.Save(imagePath, ImageFormat.Jpeg);
+        }
+
+        public static Bitmap RotateImage(Image inputImage, float angleDegrees, bool upsizeOk,
+                                  bool clipOk, Color backgroundColor)
+        {
+            // Test for zero rotation and return a clone of the input image
+            if (angleDegrees == 0f)
+                return (Bitmap)inputImage.Clone();
+
+            // Set up old and new image dimensions, assuming upsizing not wanted and clipping OK
+            int oldWidth = inputImage.Width;
+            int oldHeight = inputImage.Height;
+            int newWidth = oldWidth;
+            int newHeight = oldHeight;
+            float scaleFactor = 1f;
+
+            // If upsizing wanted or clipping not OK calculate the size of the resulting bitmap
+            if (upsizeOk || !clipOk)
+            {
+                double angleRadians = angleDegrees * Math.PI / 180d;
+
+                double cos = Math.Abs(Math.Cos(angleRadians));
+                double sin = Math.Abs(Math.Sin(angleRadians));
+                newWidth = (int)Math.Round(oldWidth * cos + oldHeight * sin);
+                newHeight = (int)Math.Round(oldWidth * sin + oldHeight * cos);
+            }
+
+            // If upsizing not wanted and clipping not OK need a scaling factor
+            if (!upsizeOk && !clipOk)
+            {
+                scaleFactor = Math.Min((float)oldWidth / newWidth, (float)oldHeight / newHeight);
+                newWidth = oldWidth;
+                newHeight = oldHeight;
+            }
+
+            // Create the new bitmap object. If background color is transparent it must be 32-bit, 
+            //  otherwise 24-bit is good enough.
+            Bitmap newBitmap = new Bitmap(newWidth, newHeight, backgroundColor == Color.Transparent ?
+                                             PixelFormat.Format32bppArgb : PixelFormat.Format24bppRgb);
+            newBitmap.SetResolution(inputImage.HorizontalResolution, inputImage.VerticalResolution);
+
+            // Create the Graphics object that does the work
+            using (Graphics graphicsObject = Graphics.FromImage(newBitmap))
+            {
+                graphicsObject.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                graphicsObject.PixelOffsetMode = PixelOffsetMode.HighQuality;
+                graphicsObject.SmoothingMode = SmoothingMode.HighQuality;
+
+                // Fill in the specified background color if necessary
+                if (backgroundColor != Color.Transparent)
+                    graphicsObject.Clear(backgroundColor);
+
+                // Set up the built-in transformation matrix to do the rotation and maybe scaling
+                graphicsObject.TranslateTransform(newWidth / 2f, newHeight / 2f);
+
+                if (scaleFactor != 1f)
+                    graphicsObject.ScaleTransform(scaleFactor, scaleFactor);
+
+                graphicsObject.RotateTransform(angleDegrees);
+                graphicsObject.TranslateTransform(-oldWidth / 2f, -oldHeight / 2f);
+
+                // Draw the result 
+                graphicsObject.DrawImage(inputImage, 0, 0);
+            }
+
+            return newBitmap;
+        }
+        public static Image RotateImage1(Image img, float rotationAngle)
+        {
+            //create an empty Bitmap image
+            Bitmap bmp = new Bitmap(img.Width, img.Height);
+
+            //turn the Bitmap into a Graphics object
+            Graphics gfx = Graphics.FromImage(bmp);
+
+            //now we set the rotation point to the center of our image
+            gfx.TranslateTransform((float)bmp.Width / 2, (float)bmp.Height / 2);
+
+            //now rotate the image
+            gfx.RotateTransform(rotationAngle);
+
+            gfx.TranslateTransform(-(float)bmp.Width / 2, -(float)bmp.Height / 2);
+
+            //set the InterpolationMode to HighQualityBicubic so to ensure a high
+            //quality image once it is transformed to the specified size
+            gfx.InterpolationMode = InterpolationMode.HighQualityBicubic;
+
+            //now draw our new image onto the graphics object
+            gfx.DrawImage(img, new Point(0, 0));
+
+            //dispose of our Graphics object
+            gfx.Dispose();
+
+            //return the image
+            return bmp;
+        }
+        private void Form1_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+
+}