update 20250319

API_NetFramework/log.txt

@@ -5848,3 +5848,7 @@ done
 2025-03-16 08:20:53.5058|DEBUG|OnDoc|
 2025-03-16 08:20:53.5288|DEBUG|OnDoc|
 2025-03-16 08:20:53.5288|INFO|OnDoc|Dokumentarchivierung via EDKB02_DMS ausgelöstOFFEDK0082025002491424
+2025-03-19 17:34:30.3103|DEBUG|OnDoc|Mailversand: 2
+2025-03-19 17:34:30.3949|DEBUG|OnDoc|
+2025-03-19 17:34:30.4079|DEBUG|OnDoc|
+2025-03-19 17:34:30.4244|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. 

Client/Diverses/SplashScreen.Designer.cs

@@ -64,7 +64,7 @@
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(150, 26);
             this.label2.TabIndex = 2;
-            this.label2.Text = "16. März 2025";
+            this.label2.Text = "19. März 2025";
             // 
             // SplashScreen
             // 

Client/DocMgmt/frmNote.Designer.cs

@@ -90,6 +90,7 @@
             this.button2.TabIndex = 5;
             this.button2.Text = "Abbrechen";
             this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
             // 
             // frmNote
             // 

Client/DocMgmt/frmNote.cs

@@ -55,5 +55,11 @@ namespace OnDoc.DocMgmt
             this.betreff = txtbetreff.Text;
             DialogResult = DialogResult.OK;
         }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            this.Close();
+        }
     }
 }

Client/UIControls/DokList.Designer.cs

@@ -183,6 +183,7 @@ namespace OnDoc.UICintrols
             // 
             // ctxMenuDokList
             // 
+            this.ctxMenuDokList.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.ctxMenuDokList.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.dokumentAnzeigenToolStripMenuItem,
             this.dokumentBearbeitenToolStripMenuItem,
@@ -208,14 +209,14 @@ namespace OnDoc.UICintrols
             this.gruppenÖffnenToolStripMenuItem,
             this.gruppenSchliessenToolStripMenuItem});
             this.ctxMenuDokList.Name = "ctxMenuDokList";
-            this.ctxMenuDokList.Size = new System.Drawing.Size(280, 446);
+            this.ctxMenuDokList.Size = new System.Drawing.Size(342, 522);
             this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening);
             // 
             // dokumentAnzeigenToolStripMenuItem
             // 
             this.dokumentAnzeigenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.ShowDoc_16x16_32;
             this.dokumentAnzeigenToolStripMenuItem.Name = "dokumentAnzeigenToolStripMenuItem";
-            this.dokumentAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.dokumentAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.dokumentAnzeigenToolStripMenuItem.Text = "Dokument anzeigen";
             this.dokumentAnzeigenToolStripMenuItem.Click += new System.EventHandler(this.dokumentAnzeigenToolStripMenuItem_Click);
             // 
@@ -223,7 +224,7 @@ namespace OnDoc.UICintrols
             // 
             this.dokumentBearbeitenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.EditDoc_16x16_32;
             this.dokumentBearbeitenToolStripMenuItem.Name = "dokumentBearbeitenToolStripMenuItem";
-            this.dokumentBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.dokumentBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.dokumentBearbeitenToolStripMenuItem.Text = "Dokument bearbeiten";
             this.dokumentBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.dokumentBearbeitenToolStripMenuItem_Click);
             // 
@@ -231,27 +232,27 @@ namespace OnDoc.UICintrols
             // 
             this.dokumentLöschenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.DeleteDoc_16x16_32;
             this.dokumentLöschenToolStripMenuItem.Name = "dokumentLöschenToolStripMenuItem";
-            this.dokumentLöschenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.dokumentLöschenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.dokumentLöschenToolStripMenuItem.Text = "Dokument löschen";
             this.dokumentLöschenToolStripMenuItem.Click += new System.EventHandler(this.dokumentLöschenToolStripMenuItem_Click);
             // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(276, 6);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(338, 6);
             // 
             // zurUnterschriftenPrüfungToolStripMenuItem
             // 
             this.zurUnterschriftenPrüfungToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Approval_16x16_32;
             this.zurUnterschriftenPrüfungToolStripMenuItem.Name = "zurUnterschriftenPrüfungToolStripMenuItem";
-            this.zurUnterschriftenPrüfungToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.zurUnterschriftenPrüfungToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.zurUnterschriftenPrüfungToolStripMenuItem.Text = "Zur Unterschriften-Prüfung";
             this.zurUnterschriftenPrüfungToolStripMenuItem.Click += new System.EventHandler(this.zurUnterschriftenPrüfungToolStripMenuItem_Click);
             // 
             // dokumentUnterzeichnenToolStripMenuItem
             // 
             this.dokumentUnterzeichnenToolStripMenuItem.Name = "dokumentUnterzeichnenToolStripMenuItem";
-            this.dokumentUnterzeichnenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.dokumentUnterzeichnenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.dokumentUnterzeichnenToolStripMenuItem.Text = "Dokument unterzeichnen";
             this.dokumentUnterzeichnenToolStripMenuItem.Visible = false;
             this.dokumentUnterzeichnenToolStripMenuItem.Click += new System.EventHandler(this.dokumentUnterzeichnenToolStripMenuItem_Click);
@@ -260,7 +261,7 @@ namespace OnDoc.UICintrols
             // 
             this.archivierenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("archivierenToolStripMenuItem.Image")));
             this.archivierenToolStripMenuItem.Name = "archivierenToolStripMenuItem";
-            this.archivierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.archivierenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.archivierenToolStripMenuItem.Text = "Archivieren";
             this.archivierenToolStripMenuItem.Click += new System.EventHandler(this.archivierenToolStripMenuItem_Click);
             // 
@@ -268,7 +269,7 @@ namespace OnDoc.UICintrols
             // 
             this.druckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Printer_16x16_32;
             this.druckenToolStripMenuItem.Name = "druckenToolStripMenuItem";
-            this.druckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.druckenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.druckenToolStripMenuItem.Text = "Drucken";
             this.druckenToolStripMenuItem.Visible = false;
             this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click);
@@ -276,13 +277,13 @@ namespace OnDoc.UICintrols
             // toolStripMenuItem4
             // 
             this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(276, 6);
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(338, 6);
             // 
             // dokumentFürPartnerErstellenToolStripMenuItem
             // 
             this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
             this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
-            this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Kunde erstellen";
             this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
             // 
@@ -290,19 +291,19 @@ namespace OnDoc.UICintrols
             // 
             this.dokumentKopierenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Copy_16x16_32;
             this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem";
-            this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren";
             this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(276, 6);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(338, 6);
             // 
             // barcodeDemoToolStripMenuItem
             // 
             this.barcodeDemoToolStripMenuItem.Name = "barcodeDemoToolStripMenuItem";
-            this.barcodeDemoToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.barcodeDemoToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.barcodeDemoToolStripMenuItem.Text = "Barcode-Demo";
             this.barcodeDemoToolStripMenuItem.Visible = false;
             this.barcodeDemoToolStripMenuItem.Click += new System.EventHandler(this.barcodeDemoToolStripMenuItem_Click);
@@ -310,7 +311,7 @@ namespace OnDoc.UICintrols
             // vertragPDFDEMOToolStripMenuItem
             // 
             this.vertragPDFDEMOToolStripMenuItem.Name = "vertragPDFDEMOToolStripMenuItem";
-            this.vertragPDFDEMOToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.vertragPDFDEMOToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.vertragPDFDEMOToolStripMenuItem.Text = "Vertrag_PDF_DEMO";
             this.vertragPDFDEMOToolStripMenuItem.Visible = false;
             this.vertragPDFDEMOToolStripMenuItem.Click += new System.EventHandler(this.vertragPDFDEMOToolStripMenuItem_Click);
@@ -318,14 +319,14 @@ namespace OnDoc.UICintrols
             // zellenwertInZwischenablageKopierenToolStripMenuItem
             // 
             this.zellenwertInZwischenablageKopierenToolStripMenuItem.Name = "zellenwertInZwischenablageKopierenToolStripMenuItem";
-            this.zellenwertInZwischenablageKopierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.zellenwertInZwischenablageKopierenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.zellenwertInZwischenablageKopierenToolStripMenuItem.Text = "Zellenwert in Zwischenablage kopieren";
             this.zellenwertInZwischenablageKopierenToolStripMenuItem.Click += new System.EventHandler(this.zellenwertInZwischenablageKopierenToolStripMenuItem_Click);
             // 
             // pDFGenerierenToolStripMenuItem
             // 
             this.pDFGenerierenToolStripMenuItem.Name = "pDFGenerierenToolStripMenuItem";
-            this.pDFGenerierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.pDFGenerierenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.pDFGenerierenToolStripMenuItem.Text = "PDF generieren";
             this.pDFGenerierenToolStripMenuItem.Visible = false;
             this.pDFGenerierenToolStripMenuItem.Click += new System.EventHandler(this.pDFGenerierenToolStripMenuItem_Click);
@@ -333,14 +334,14 @@ namespace OnDoc.UICintrols
             // dokumentAnVersandstrasseToolStripMenuItem
             // 
             this.dokumentAnVersandstrasseToolStripMenuItem.Name = "dokumentAnVersandstrasseToolStripMenuItem";
-            this.dokumentAnVersandstrasseToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.dokumentAnVersandstrasseToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.dokumentAnVersandstrasseToolStripMenuItem.Text = "Dokument an Versandstrasse";
             this.dokumentAnVersandstrasseToolStripMenuItem.Visible = false;
             // 
             // wordInterOPEditToolStripMenuItem
             // 
             this.wordInterOPEditToolStripMenuItem.Name = "wordInterOPEditToolStripMenuItem";
-            this.wordInterOPEditToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.wordInterOPEditToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.wordInterOPEditToolStripMenuItem.Text = "Word InterOP Edit";
             this.wordInterOPEditToolStripMenuItem.Visible = false;
             this.wordInterOPEditToolStripMenuItem.Click += new System.EventHandler(this.wordInterOPEditToolStripMenuItem_Click);
@@ -349,39 +350,40 @@ namespace OnDoc.UICintrols
             // 
             this.attributeAnzeigenVersteckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Attribut_16x16_32;
             this.attributeAnzeigenVersteckenToolStripMenuItem.Name = "attributeAnzeigenVersteckenToolStripMenuItem";
-            this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute ein- / ausblenden";
             this.attributeAnzeigenVersteckenToolStripMenuItem.Click += new System.EventHandler(this.attributeAnzeigenVersteckenToolStripMenuItem_Click);
             // 
             // historyToolStripMenuItem
             // 
             this.historyToolStripMenuItem.Name = "historyToolStripMenuItem";
-            this.historyToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.historyToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.historyToolStripMenuItem.Text = "History";
             this.historyToolStripMenuItem.Click += new System.EventHandler(this.historyToolStripMenuItem_Click);
             // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(276, 6);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(338, 6);
             // 
             // gruppenÖffnenToolStripMenuItem
             // 
             this.gruppenÖffnenToolStripMenuItem.Name = "gruppenÖffnenToolStripMenuItem";
-            this.gruppenÖffnenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.gruppenÖffnenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.gruppenÖffnenToolStripMenuItem.Text = "Alle Gruppen aufklappen";
             this.gruppenÖffnenToolStripMenuItem.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem_Click);
             // 
             // gruppenSchliessenToolStripMenuItem
             // 
             this.gruppenSchliessenToolStripMenuItem.Name = "gruppenSchliessenToolStripMenuItem";
-            this.gruppenSchliessenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+            this.gruppenSchliessenToolStripMenuItem.Size = new System.Drawing.Size(341, 26);
             this.gruppenSchliessenToolStripMenuItem.Text = "Alle Gruppen einklappen";
             this.gruppenSchliessenToolStripMenuItem.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem_Click);
             // 
             // toolStrip1
             // 
             this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripLabel1,
             this.tsrbvorschau,
@@ -398,7 +400,7 @@ namespace OnDoc.UICintrols
             // toolStripLabel1
             // 
             this.toolStripLabel1.Name = "toolStripLabel1";
-            this.toolStripLabel1.Size = new System.Drawing.Size(116, 22);
+            this.toolStripLabel1.Size = new System.Drawing.Size(143, 22);
             this.toolStripLabel1.Text = "Dokument-Vorschau";
             // 
             // tsrbvorschau
@@ -425,7 +427,7 @@ namespace OnDoc.UICintrols
             this.tsbtnpreviewno.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewno.Image")));
             this.tsbtnpreviewno.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbtnpreviewno.Name = "tsbtnpreviewno";
-            this.tsbtnpreviewno.Size = new System.Drawing.Size(23, 22);
+            this.tsbtnpreviewno.Size = new System.Drawing.Size(29, 22);
             this.tsbtnpreviewno.Text = "Keine Vorschau";
             // 
             // tsbtnpreviewbottom
@@ -434,7 +436,7 @@ namespace OnDoc.UICintrols
             this.tsbtnpreviewbottom.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewbottom.Image")));
             this.tsbtnpreviewbottom.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbtnpreviewbottom.Name = "tsbtnpreviewbottom";
-            this.tsbtnpreviewbottom.Size = new System.Drawing.Size(23, 22);
+            this.tsbtnpreviewbottom.Size = new System.Drawing.Size(29, 22);
             this.tsbtnpreviewbottom.Text = "Vorschau unten";
             // 
             // tsbtnpreviewright
@@ -443,7 +445,7 @@ namespace OnDoc.UICintrols
             this.tsbtnpreviewright.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewright.Image")));
             this.tsbtnpreviewright.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbtnpreviewright.Name = "tsbtnpreviewright";
-            this.tsbtnpreviewright.Size = new System.Drawing.Size(23, 22);
+            this.tsbtnpreviewright.Size = new System.Drawing.Size(29, 22);
             this.tsbtnpreviewright.Text = "Vorschau rechts";
             // 
             // splitContainer1
@@ -476,6 +478,7 @@ namespace OnDoc.UICintrols
             this.sfDataGrid1.ExpanderColumnWidth = 288D;
             this.sfDataGrid1.Location = new System.Drawing.Point(0, 0);
             this.sfDataGrid1.Name = "sfDataGrid1";
+            this.sfDataGrid1.PreviewRowHeight = 35;
             this.sfDataGrid1.RowHeight = 30;
             this.sfDataGrid1.SelectionMode = Syncfusion.WinForms.DataGrid.Enums.GridSelectionMode.Extended;
             this.sfDataGrid1.ShowGroupDropArea = true;
@@ -1376,23 +1379,24 @@ namespace OnDoc.UICintrols
             // 
             // ctxMenuGroups
             // 
+            this.ctxMenuGroups.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.ctxMenuGroups.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.gruppenÖffnenToolStripMenuItem1,
             this.gruppenSchliessenToolStripMenuItem1});
             this.ctxMenuGroups.Name = "ctxMenuGroups";
-            this.ctxMenuGroups.Size = new System.Drawing.Size(206, 48);
+            this.ctxMenuGroups.Size = new System.Drawing.Size(244, 52);
             // 
             // gruppenÖffnenToolStripMenuItem1
             // 
             this.gruppenÖffnenToolStripMenuItem1.Name = "gruppenÖffnenToolStripMenuItem1";
-            this.gruppenÖffnenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
+            this.gruppenÖffnenToolStripMenuItem1.Size = new System.Drawing.Size(243, 24);
             this.gruppenÖffnenToolStripMenuItem1.Text = "Alle Gruppen aufklappen";
             this.gruppenÖffnenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem1_Click);
             // 
             // gruppenSchliessenToolStripMenuItem1
             // 
             this.gruppenSchliessenToolStripMenuItem1.Name = "gruppenSchliessenToolStripMenuItem1";
-            this.gruppenSchliessenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
+            this.gruppenSchliessenToolStripMenuItem1.Size = new System.Drawing.Size(243, 24);
             this.gruppenSchliessenToolStripMenuItem1.Text = "Alle Gruppen einklappen";
             this.gruppenSchliessenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem1_Click);
             // 

Client/UIControls/DokList.cs

@@ -760,7 +760,7 @@ namespace OnDoc.UICintrols
                     if (interop == true)
                     {
                         OnDocOffice.clsExcelEdit ExcelInterOP = new OnDocOffice.clsExcelEdit(AppParams.connectionstring, tempfilename, selected_dokumentid);
-                        ExcelInterOP.Edit_Document();
+                        ExcelInterOP.Edit_Document(runmacros);
                         ExcelInterOP = null;
                     }
                     else
@@ -2217,7 +2217,7 @@ namespace OnDoc.UICintrols
                         {
                             Syncfusion.WinForms.Controls.ToolTipItem t = new Syncfusion.WinForms.Controls.ToolTipItem();
                             t.Text = db.dsdaten.Tables[0].Rows[0]["mutiert_am"].ToString() +
-                                Environment.NewLine + Environment.NewLine + db.dsdaten.Tables[0].Rows[0]["betreff"].ToString() +
+                                //Environment.NewLine + Environment.NewLine + db.dsdaten.Tables[0].Rows[0]["betreff"].ToString() +
                                 Environment.NewLine + Environment.NewLine + db.dsdaten.Tables[0].Rows[0]["Notizgrund"].ToString();
                             System.Drawing.Font tf = new System.Drawing.Font(t.Style.Font.FontFamily, 10,FontStyle.Bold);
                             

Client/UIControls/DokList.resx

@@ -190,7 +190,7 @@
   <data name="tsbtnpreviewno.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
         YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
         /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
         I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
@@ -205,7 +205,7 @@
   <data name="tsbtnpreviewbottom.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
         YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
         /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
         I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
@@ -220,7 +220,7 @@
   <data name="tsbtnpreviewright.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
         YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
         /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
         I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM

Client/UIControls/Dokwerte.cs

@@ -86,7 +86,7 @@ namespace OnDoc.UIControls
 
         private void sfDataGrid1_CopyCellContent(object sender, Syncfusion.WinForms.DataGrid.Events.CellCutCopyPasteEventArgs e)
         {
-            MessageBox.Show(e.ClipboardValue.ToString());
+            //MessageBox.Show(e.ClipboardValue.ToString());
             
         }
 

Client/UIControls/UCAllgemeineDokumentParam.cs

@@ -340,6 +340,8 @@ namespace OnDoc.UIControls
 
         }
 
+        public List<clsav_authl_ref> List_avqref { get; set; } = new List<clsav_authl_ref>();
+
         private void Get_DokWertList(ref DB db, string dokumentid, int createnew)
         {
             System.Data.DataTable dokwertlist = new System.Data.DataTable();
@@ -356,6 +358,13 @@ namespace OnDoc.UIControls
                 {
                     string val = EDK_Data.GetAVQ_Value(dr[0].ToString(), dr[12].ToString());
                     if (val != "") { dr[2] = val; }
+                    if (dr[0].ToString().ToLower().Contains("extl") && dr[0].ToString().ToLower().Contains("auth")&&dr[0].ToString().ToLower().Contains("ref"))
+                    {
+                        clsav_authl_ref avqref = new clsav_authl_ref();
+                        Logging.Logging.Debug("avq_ref", "OnDoc", val);
+                        avqref.auth_ref = val;
+                        List_avqref.Add(avqref);
+                    }
                 }
                 dokwertlist.AcceptChanges();
 
@@ -769,7 +778,7 @@ namespace OnDoc.UIControls
             catch { dokdata.postzustellung = "0"; }
 
 
-
+            if (List_avqref.Count > 0) { dokdata.avq_authl_ref=List_avqref; }
             dokdata.DokumenttypNr = docgendata.dokumenttypnr;
             dokdata.Unterschrift_Links = docgendata.unterschriftLinks;
             dokdata.Unterschrift_Rechts = docgendata.unterschriftRehts;

DOCGEN/Klassen/DocGenerator_from_EDOKA.cs

@@ -139,6 +139,7 @@ if (docdata.Bezeichnung.Contains("QDF"))
                     //if (dok.extension.ToUpper()=="DOTM") { dok.extension = "docm"; }
                     return dok;
                 case "XLSM": case "XLSX": case "XLST": case "XLS": case "XLT":
+                case "XLTM":
                 case "EXCEL":
 
                     SyncFExcel sfexcel = new SyncFExcel();
@@ -146,7 +147,7 @@ if (docdata.Bezeichnung.Contains("QDF"))
                     clsdok dokexcel = new clsdok("", "", "", "");
                     if (useoffice == false)
                     {
-                        dokexcel.dokument = sfexcel.Generate_Excel(dt.Rows[0][0].ToString(), docdata);
+                        dokexcel.dokument = sfexcel.Generate_Excel(dt.Rows[0][0].ToString(), docdata, Apptype.ToUpper());
                         dokexcel.doktype = "X";
                         dokexcel.extension = dt2.Rows[0][1].ToString();
                     }

DOCGEN/Klassen/SyncFExcel.cs

@@ -47,15 +47,13 @@ namespace DOCGEN.Klassen
 
         }
 
-        public string Generate_Excel(string base64, clsDocData docdata)
+        public string Generate_Excel(string base64, clsDocData docdata, string apptype)
         {
             ExcelEngine ex = new ExcelEngine();
             IApplication app = ex.Excel;
             MemoryStream ms = new MemoryStream(Helper.EncodeExtensions.DecodeBase642ByteArray(base64));
             IWorkbook workBook = app.Workbooks.Open(ms, ExcelOpenType.Automatic);
-
+            
-            string formattype = "";
-
             foreach (clsDocValue dv in docdata.DocValues)
             {
                 foreach (IWorksheet worksheet in workBook.Worksheets)
@@ -86,7 +84,14 @@ namespace DOCGEN.Klassen
             }
 
             MemoryStream destms = new MemoryStream();
-            workBook.SaveAs(destms);
+            if (apptype == "XLTM")
+            {
+                workBook.SaveAs(destms, ExcelSaveType.SaveAsMacroTemplate);
+            } else
+            {
+                workBook.SaveAs(destms);
+            }
+
             workBook.Close();
             workBook = null;
             ex.Dispose();

Database/db.cs

@@ -650,6 +650,24 @@ namespace Database
 
             db.Exec_SQL("Update dokument set faksimile=" + as_faksimile.ToString() + ", bearbeitung_zwingend = " + bearbeitung_zwingend.ToString() + ", toapprove=" + toapprove.ToString() + ", approved=" + approved.ToString() + ", approval1=" + approved1.ToString() + ", approval2=" + approved2.ToString() + ", signiert="+signiert.ToString()+" where dokumentid = '" + dokumentid + "'");
 
+            try
+            {
+                if (DocData.avq_authl_ref.Count() > 0)
+                {
+                    foreach (clsav_authl_ref avqref in DocData.avq_authl_ref)
+                    {
+                        db.clear_parameter();
+                        db.add_parameter("@dokumentid", dokumentid);
+                        db.add_parameter("@avq_auto_extl_refr", avqref.auth_ref.ToString());
+                        db.add_parameter("@FNKT", "1");
+                        db.add_parameter("@newdocid", "");
+                        db.add_parameter("@manr", dok.iErsteller.ToString());
+                        db.Get_Tabledata("dbo.sp_insert_update_avq_auth_extl_ref", true, false);
+
+                    }
+                }
+            } catch { }
+
             return dokumentid;
         }
         public void set_approvalstate(string dokumentid, bool init = false)

Model/clsDocData.cs

@@ -84,6 +84,8 @@ namespace Model
         public bool remove_signature { get; set; } = false;
         public bool sign { get; set; } = false;
 
+        public List<clsav_authl_ref> avq_authl_ref { get; set; } 
+
         public string prefix { get; set; } = "";
         public List<clsDocValue> DocValues {get;set;}
         public List<clsDocMacro> DocMacros { get; set; }
@@ -94,6 +96,10 @@ namespace Model
 
     }
 
+    public class clsav_authl_ref
+    {
+        public string auth_ref { get; set; }
+    }
     public class clsNameVOrnameTM
     {
         public string TM { get; set; }

OnDocOffice/clsoffice.cs

@@ -68,11 +68,31 @@ namespace OnDocOffice
             }
         }
 
-        public void Edit_Document()
+        public void Edit_Document(bool runmacros)
         {
             Start_Application();
             workBook = excel.Workbooks.Open(filename);
             excel.Visible = true;
+            if (runmacros == true)
+            {
+                Logging.Logging.Debug("Makros auslesen", "Edit_Document", dokumentid);
+                Database.DB db = new Database.DB(connectstring);
+                db.Get_Tabledata("Select * from ondoc_macros where dokumentid='" + dokumentid + "'  order by reihenfolge", false, true);
+                foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
+                {
+                    try
+                    {
+                        Logging.Logging.Debug("Makro ", "Edit_Document", dr[0].ToString());
+                        excel.Run(dr[0].ToString());
+                    }
+                    catch (Exception e)
+                    {
+                        Logging.Logging.Debug("MakroError ", "Edit_Document", e.Message);
+                        string a = e.Message;
+                    }
+                }
+            }
+
             //clsProcessWatch.AddToList(dokumentid, filename, "Word");
             bool isClosed = IsDocumentClosed(excel, workBook);
             workBook = null;
@@ -192,7 +212,8 @@ namespace OnDocOffice
             Helper.clsFileHelper fh = new Helper.clsFileHelper();
             fh.SaveBase64ToFile(vorlage, filename);
             Start_Application();
-            workBook = excel.Workbooks.Open(filename);
+            workBook = excel.Workbooks.Add(filename);
+            //workBook = excel.Workbooks.Open(filename);
             foreach (Worksheet ws in workBook.Sheets)
             {
                 ws.Activate();
@@ -200,6 +221,7 @@ namespace OnDocOffice
                 {
                     try
                     {
+                        Logging.Logging.Debug("Excel: "+dv.FieldName+" / "+dv.Value,"OnDocOffice","");
                         if (dv.TMBeginn == "TGEDKCursor" || dv.TMBeginn == "TGEDKCursorB" || dv.FieldName == "TGEDKCursor" || dv.FieldName == "TGEDKCursorB")
                         {
                             try
@@ -253,6 +275,24 @@ namespace OnDocOffice
                 }
 
             }
+
+            Database.DB db = new Database.DB(connectstring);
+            db.Get_Tabledata("Select * from ondoc_macros where dokumentid='" + dokumentid + "'  order by reihenfolge", false, true);
+            foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
+            {
+                try
+                {
+                    Logging.Logging.Debug("Makro ", "Create", dr[0].ToString());
+                    excel.Run(dr[0].ToString());
+                }
+                catch (Exception e)
+                {
+                    Logging.Logging.Debug("MakroError ", "Create", e.Message);
+                    string a = e.Message;
+                }
+            }
+            db = null;
+
             workBook.Save();
             workBook.Close();
             workBook = null;