Update 20241118

API_NetFramework/API_NetFramework.csproj

@@ -231,6 +231,7 @@
     <Compile Include="Controllers\DocumentController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\ArchivController.cs" />
+    <Compile Include="Controllers\MailController.cs" />
     <Compile Include="Controllers\TokenController.cs" />
     <Compile Include="Controllers\UnterschriftController.cs" />
     <Compile Include="Controllers\ValuesController.cs" />

API_NetFramework/API_NetFramework.csproj.user

@@ -10,7 +10,7 @@
     <UseGlobalApplicationHostFile />
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
-    <Controller_SelectedScaffolderCategoryPath>root/Common</Controller_SelectedScaffolderCategoryPath>
+    <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
     <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
     <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
     <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>

API_NetFramework/Controllers/ArchivController.cs

@@ -260,7 +260,7 @@ namespace API_NetFramework.Controllers
             try
             {
                 APILogging.Log((HttpRequestMessage)Request, "Start ArchivDocFromIRIS DokumentID: " + dokumentid, LogLevelType.Debug);
-                if (dokumentid.Substring(0, 6).ToUpper() == "ONDOC00")
+                if (dokumentid.Substring(0, 9).ToUpper() == "OFFEDK008")
                 {
                     return (ArchivDocFromDatabase(dokumentid));
                 }

API_NetFramework/Controllers/MailController.cs

@@ -0,0 +1,25 @@
+using API_NetFramework.Controllers;
+using API_NetFramework.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace OnDocAPI_NetFramework.Controllers
+{
+    public class MailController : ApiController
+    {
+        [HttpGet]
+        [Route("API/SendMail")]
+        public IHttpActionResult SendMail(string empfaenger, string betreff, string message, string dokumentid, string ondoclink)
+        {
+            APILogging.Log((HttpRequestMessage)Request, "Mailversand: " + empfaenger+""+betreff, LogLevelType.Debug);
+
+
+
+            return Content(HttpStatusCode.OK, empfaenger + ": Mail versandt");
+        }
+    }
+}

API_NetFramework/obj/Debug/API_NetFramework.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-fd071c09c7dba1a10d40b75954ad2f0d5d3e0976027671a6eb97b96a5125f413
+e3bd8e83aa5c2a0e3a79dc6a52be63d1040407a3b479c3366beaa1e996e86770

API_NetFramework/obj/Debug/API_NetFramework.csproj.FileListAbsolute.txt

@@ -297,3 +297,5 @@ E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Compression.Bas
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.OfficeChart.Base.dll
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Compression.Base.xml
 E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.OfficeChart.Base.xml
+E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\OnDocOffice.dll
+E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\OnDocOffice.pdb

Client/Client.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{1CBBE5F6-4562-4EEF-BC9B-177F30901E23}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>OnDoc</RootNamespace>
-    <AssemblyName>OnDoc</AssemblyName>
+    <AssemblyName>update</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>

Client/DocMgmt/DokTypSelect.cs

@@ -71,6 +71,7 @@ namespace OnDoc.DocMgmt
             this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
             if (this.favoriten) { Load_Favoriten(""); }
             else { load_standard(""); }
+            
         }
 
 
@@ -121,7 +122,7 @@ namespace OnDoc.DocMgmt
                     if (dr["Parentid"].ToString() == "0")
                     {
                         //Creates a TreeNode if the parent equals 0
-                        TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString());
+                        TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString() );
                         root.Tag = Convert.ToInt32(dr["id"]) * -1;
                         root.TagObject = dr;
                         root.LeftImageIndices = new int[] { 0 };
@@ -161,7 +162,7 @@ namespace OnDoc.DocMgmt
                     if (dr["bezeichnung"].ToString() == "Dokumentpakete")
                     {
                         //Creates a TreeNode if the parent equals 0
-                        TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString());
+                        TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString() );
                         root.Tag = Convert.ToInt32(dr["id"]) * -1;
                         root.TagObject = dr;
                         root.LeftImageIndices = new int[] { 0 };
@@ -213,7 +214,7 @@ namespace OnDoc.DocMgmt
             foreach (System.Data.DataRow row in dr.GetChildRows("TreeParentChild"))
             {
                 //Creating a TreeNode for each row
-                TreeNodeAdv cChild = new TreeNodeAdv(row["bezeichnung"].ToString());
+                TreeNodeAdv cChild = new TreeNodeAdv(row["bezeichnung"].ToString() );
                 cChild.Tag = Convert.ToInt32(row["id"]) * -1;
                 cChild.LeftImageIndices = new int[] { 0 };
                 cChild.TagObject = row;
@@ -221,7 +222,7 @@ namespace OnDoc.DocMgmt
                 pNode.Nodes.Add(cChild);
                 //Recursively build the tree
                 PopulateTree(row, cChild);
-                PopulateSubTree(row, cChild);
+                //PopulateSubTree(row, cChild);
             }
         }
 

Client/DocMgmt/Dokumenterstellung.cs

@@ -100,7 +100,10 @@ namespace OnDoc.DocMgmt
 
         private void sfButton2_Click(object sender, EventArgs e)
         {
+            Cursor = Cursors.WaitCursor;
             Dokument_Erstellen();
+            Cursor = Cursors.Default;
+            
         }
         public void Dokument_Erstellen() 
         {
@@ -121,11 +124,11 @@ namespace OnDoc.DocMgmt
             {
                 DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir);
                 clsdok dok = new clsdok("", "", "");
-                dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
+                dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice);
 
                 interop = ucAllgemeineDokumentParam1.interop;
 
-                if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
+                if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten || ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
                 {
                     string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
                     System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
@@ -133,11 +136,6 @@ namespace OnDoc.DocMgmt
                     db.Save_To_DB(dokdata.Dokumentid, filename);
                     db = null;
                     DocFunction = 1;
-
-                    //if (dok.extension.Substring(0,1).ToUpper() == "D") { System.Diagnostics.Process.Start("winword.exe", filename); }
-                    //if (dok.extension.Substring(0, 1).ToUpper() == "X") { System.Diagnostics.Process.Start("excel.exe", filename); }
-                    //clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
-                    
                     this.Close();
                     return;
                 }

Client/DocMgmt/frmToApproval.cs

@@ -57,6 +57,7 @@ namespace OnDoc.DocMgmt
                 cbboxunterschriftrechts.Enabled = false;
                 pxapproval2.Visible = true;
             }
+
             if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approved"])){
                 cbboxunterschriftlinks.Enabled = false;
                 pxapproval1.Visible = true;
@@ -64,13 +65,29 @@ namespace OnDoc.DocMgmt
                 pxapproval2.Visible = true;
                 btntoapproval.Enabled = false;
             }
-            
+            if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approval1"]))
+            {
+                cbboxunterschriftlinks.Enabled = false;
+                pxapproval1.Visible = true;
+            }
+            if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approval2"]))
+            {
+                cbboxunterschriftrechts.Enabled = false;
+                pxapproval2.Visible = true;
+            }
         }
 
         private void btntoapproval_Click(object sender, EventArgs e)
         {
+
             DB dB = new DB(AppParams.connectionstring);
-            
+
+
+
+            string sql = "Update dokument_Bewilligung set aktiv=0, mutiert_am=getdate(), mutierer = " + AppParams.CurrentMitarbieter.ToString();
+            sql = sql + " where dokumentid='" + dokumentid + "' and abgelehnt=0 and bewilligt=0";
+            dB.Exec_SQL(sql);
+
             dB.Get_Tabledata_for_Update("select top 1 * from dokument_bewilligung where id=-2", false, true);
 
             if (pxapproval1.Visible == false)

Client/Helper/FileHelper.cs

@@ -32,5 +32,11 @@ namespace OnDoc.Helper
             stream.Position = 0;
             return stream;
         }
+
+        public String Base64FromFile(string filename)
+        {
+            Byte[] bytes = File.ReadAllBytes(filename);
+            return Convert.ToBase64String(bytes);
+        }
     }
 }

Client/UIControls/Administrator/Dokumenttyp.Designer.cs

@@ -138,6 +138,7 @@
             this.label16 = new System.Windows.Forms.Label();
             this.rbNr = new System.Windows.Forms.RadioButton();
             this.label15 = new System.Windows.Forms.Label();
+            this.chkboxInOffice = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
             this.tabControlAdv1.SuspendLayout();
             this.tabPageAdv1.SuspendLayout();
@@ -576,6 +577,7 @@
             // 
             // GroupBox2
             // 
+            this.GroupBox2.Controls.Add(this.chkboxInOffice);
             this.GroupBox2.Controls.Add(this.cbaktiv);
             this.GroupBox2.Controls.Add(this.rbDokumenterstellungPerson);
             this.GroupBox2.Controls.Add(this.rbDokumenterstellungBP);
@@ -1360,6 +1362,14 @@
             this.label15.TabIndex = 7;
             this.label15.Text = "Sort";
             // 
+            // chkboxInOffice
+            // 
+            this.chkboxInOffice.Location = new System.Drawing.Point(293, 71);
+            this.chkboxInOffice.Name = "chkboxInOffice";
+            this.chkboxInOffice.Size = new System.Drawing.Size(187, 24);
+            this.chkboxInOffice.TabIndex = 26;
+            this.chkboxInOffice.Text = "Erstellung mit Office";
+            // 
             // Dokumenttyp
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1514,5 +1524,6 @@
         private Syncfusion.Windows.Forms.Tools.TreeViewAdv TreeDokumenttyp;
         internal System.Windows.Forms.CheckBox chkbearbeitungdirekt;
         internal System.Windows.Forms.CheckBox chkinterop;
+        internal System.Windows.Forms.CheckBox chkboxInOffice;
     }
 }

Client/UIControls/Administrator/Dokumenttyp.cs

@@ -162,7 +162,12 @@ namespace OnDoc.UIControls.Administrator
             }
             catch { chkinterop.Checked = false; }
 
-
+            try
+            {
+                chkboxInOffice.Checked = Convert.ToBoolean(r["erstellunginoffice"]) == true;
+            }
+            catch
+            { chkboxInOffice.Checked = false; }
 
             Update_Vorlagenfelder();
         }
@@ -251,6 +256,12 @@ namespace OnDoc.UIControls.Administrator
             {
                 chkaktiv.Checked = false;
             }
+            if (Convert.ToBoolean(dr["erstellunginoffice"]) == true)
+            {
+                chkboxInOffice.Checked = true;
+            }
+            else
+            { chkboxInOffice.Checked= false; }
         }
 
         private void txtfeldname_TextChanged(object sender, EventArgs e)
@@ -304,7 +315,7 @@ namespace OnDoc.UIControls.Administrator
             r["ebanking_moeglich"] = cbebanking_moeglich.Checked == true;
             r["BearbeitungDirket"] = chkbearbeitungdirekt.Checked==true;
             r["interop"] = chkinterop.Checked == true;
-
+            r["erstellungInOffice"] = chkboxInOffice.Checked == true;
             if (cbOfficeDokument.Checked) { r["genresultat_type"] = 1; }
             if (cbPDFDokument.Checked) { r["genresultat_type"] = 2; }
             if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; }

Client/UIControls/DokList.Designer.cs

@@ -112,12 +112,12 @@ namespace OnDoc.UICintrols
             this.RibbonButtonBerechtigungsgruppe = new System.Windows.Forms.RibbonButton();
             this.RibbonPanelDiverses = new System.Windows.Forms.RibbonPanel();
             this.ribbonButtonBCK = new System.Windows.Forms.RibbonButton();
+            this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel();
+            this.ribbonbuttonlogin = new System.Windows.Forms.RibbonButton();
             this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig();
             this.lblToApprove = new System.Windows.Forms.Label();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
-            this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel();
-            this.ribbonbuttonlogin = new System.Windows.Forms.RibbonButton();
             ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
             this.ctxMenuDokList.SuspendLayout();
             this.toolStrip1.SuspendLayout();
@@ -890,6 +890,20 @@ namespace OnDoc.UICintrols
             this.ribbonButtonBCK.Text = "BCK";
             this.ribbonButtonBCK.Click += new System.EventHandler(this.ribbonButton3_Click);
             // 
+            // ribbonPanel4
+            // 
+            this.ribbonPanel4.Items.Add(this.ribbonbuttonlogin);
+            this.ribbonPanel4.Name = "ribbonPanel4";
+            this.ribbonPanel4.Text = "";
+            // 
+            // ribbonbuttonlogin
+            // 
+            this.ribbonbuttonlogin.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.Image")));
+            this.ribbonbuttonlogin.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.LargeImage")));
+            this.ribbonbuttonlogin.Name = "ribbonbuttonlogin";
+            this.ribbonbuttonlogin.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.SmallImage")));
+            this.ribbonbuttonlogin.Click += new System.EventHandler(this.ribbonbuttonlogin_Click);
+            // 
             // lblToApprove
             // 
             this.lblToApprove.AutoSize = true;
@@ -914,20 +928,6 @@ namespace OnDoc.UICintrols
             this.RibbonButtonCreateNewDoc.Text = "Dokument";
             this.RibbonButtonCreateNewDoc.Click += new System.EventHandler(this.RibbonButtonCreateNewDoc_Click);
             // 
-            // ribbonPanel4
-            // 
-            this.ribbonPanel4.Items.Add(this.ribbonbuttonlogin);
-            this.ribbonPanel4.Name = "ribbonPanel4";
-            this.ribbonPanel4.Text = "";
-            // 
-            // ribbonbuttonlogin
-            // 
-            this.ribbonbuttonlogin.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.Image")));
-            this.ribbonbuttonlogin.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.LargeImage")));
-            this.ribbonbuttonlogin.Name = "ribbonbuttonlogin";
-            this.ribbonbuttonlogin.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.SmallImage")));
-            this.ribbonbuttonlogin.Click += new System.EventHandler(this.ribbonbuttonlogin_Click);
-            // 
             // DokList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

Client/UIControls/DokList.resx

@@ -469,23 +469,20 @@
   </data>
   <data name="ribbonbuttonlogin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
-        QwAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonbuttonlogin.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
-        QwAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonbuttonlogin.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAATSURBVDhPYxgFo2AUjAIwYGAAAAQQAAGnRHxjAAAAAElF
-        TkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

Client/UIControls/UCAllgemeineDokumentParam.cs

@@ -45,6 +45,16 @@ namespace OnDoc.UIControls
         
         public string genertated_dokumentid { get; set; }
 
+        public bool ErstellungInOffice = false;
+        public int vorlagenr = 0;
+        public bool kopfzeile_generieren = false;
+        public string barcode_zusatz = "";
+        public int barcode_top = 0;
+        public int barcode_left = 0;
+        public int barcode_width = 0;
+        public int barcode_height = 0;
+        public int barcode_horizontal = 0;
+
         public UCAllgemeineDokumentParam()
         {
             InitializeComponent();
@@ -105,6 +115,17 @@ namespace OnDoc.UIControls
                 this.cbfaksimile.Enabled = Convert.ToBoolean(dr["unterschrift_faksimile"]) == true;
                 this.cbfaksimile.Checked = false;
                 this.cbformularohneunterschrfit.Checked = false;
+                try { 
+                if (Convert.ToBoolean(dr["ErstellungInOffice"]) == true){
+                    this.ErstellungInOffice = true;
+                }
+                else
+                {
+                    ErstellungInOffice = false;
+                }
+                }
+                catch { ErstellungInOffice=false; }
+
                 if (dr["Versandstrasse_moeglich"].ToString() == "") { docgendata.versandstrasse_moeglich = false; }
                 else
                 {
@@ -123,6 +144,28 @@ namespace OnDoc.UIControls
                 catch { interop = false; }
                 barcode = Convert.ToBoolean(dr["Vertrag"])== true;
 
+                try
+                {
+                    if (dr["physichses_archiv"].ToString() == "1") { this.barcode_zusatz = " U"; }
+                    if (dr["physichses_archiv"].ToString() == "2") { this.barcode_zusatz = " F"; }
+                }
+                catch { }
+
+
+                db.Get_Tabledata("Select office_vorlagenr,kopfzeile_generieren, bcpt,bcpl, bcw, bch, bchorizontal from office_vorlage where office_vorlagenr="+dr["office_vorlagenr"].ToString(),false,true);
+                this.vorlagenr = Convert.ToInt32(dr["office_vorlagenr"]);
+                this.kopfzeile_generieren = false;
+                this.barcode_left = Convert.ToInt32(dr["bcpl"]);
+                this.barcode_top = Convert.ToInt32(dr["bcpt"]);
+                this.barcode_width = Convert.ToInt32(dr["bcw"]);
+                this.barcode_height = Convert.ToInt32(dr["bch"]);
+                this.barcode_horizontal = Convert.ToInt32(dr["bchorizontal"]);
+                try
+                {
+                    if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][1]) == true) { this.kopfzeile_generieren = true; }
+                }
+                catch { }
+
             }
             else
             {
@@ -173,7 +216,7 @@ namespace OnDoc.UIControls
             gridDokwertlist.QueryImageCellStyle += gridDokwertlist_QueryImageCellStyle;
             gridDokwertlist.Columns["userinterface"].FilterPredicates.Add(new Syncfusion.Data.FilterPredicate() { FilterType=Syncfusion.Data.FilterType.Equals,FilterValue=true });
 
-            db = null;
+             db = null;
             Refresh_Team();
             this.cbboxteam.SelectedIndex = 0;
         }
@@ -365,6 +408,7 @@ namespace OnDoc.UIControls
             docgendata.dokumentdatum = DateDokumentDatum.DateTimeText.ToString();
             docgendata.bezeichnung = txtbezeichnung.Text;
             docgendata.erstellungsart = Erstellungsart.DokumentPreview;
+            if (ErstellungInOffice == true) { docgendata.erstellungsart = Erstellungsart.ErstellungInOffice; }
             if (rbDokumentbearbeiten.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentBearbeiten; }
             if (rbEditlater.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
             if (rbasPDF.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDF; }
@@ -392,6 +436,15 @@ namespace OnDoc.UIControls
             if (docgendata.digitaleunterschrift == true) { dokdata.As_Faksimile = "True"; } else { dokdata.As_Faksimile = "False"; }
             dokdata.dokumentwerte = docgendata.dokumentwerte;
             dokdata.Barcode = barcode;
+            dokdata.VorlageNr = this.vorlagenr.ToString();
+            dokdata.Kopfzeile_generieren = this.kopfzeile_generieren;
+            dokdata.barcode_zusatz = barcode_zusatz;
+            dokdata.barcode_left = barcode_left;
+            dokdata.barcode_width = barcode_width;
+            dokdata.barcode_top = barcode_top;
+            dokdata.barcode_height = barcode_height;
+            dokdata.barcode_zusatz = barcode_zusatz;
+
             
         }
         private void sfButton1_Click(object sender, EventArgs e)

Client/obj/Client.csproj.nuget.dgspec.json

@@ -158,6 +158,9 @@
               },
               "E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj": {
                 "projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj"
+              },
+              "E:\\Software-Projekte\\OnDoc\\OnDoc\\OnDocOffice\\OnDocOffice.csproj": {
+                "projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\OnDocOffice\\OnDocOffice.csproj"
               }
             }
           }
@@ -227,6 +230,28 @@
         "net481": {}
       }
     },
+    "E:\\Software-Projekte\\OnDoc\\OnDoc\\OnDocOffice\\OnDocOffice.csproj": {
+      "restore": {
+        "projectUniqueName": "E:\\Software-Projekte\\OnDoc\\OnDoc\\OnDocOffice\\OnDocOffice.csproj",
+        "projectName": "OnDocOffice",
+        "projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\OnDocOffice\\OnDocOffice.csproj",
+        "frameworks": {
+          "net481": {
+            "projectReferences": {
+              "E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj": {
+                "projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj"
+              },
+              "E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj": {
+                "projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj"
+              }
+            }
+          }
+        }
+      },
+      "frameworks": {
+        "net481": {}
+      }
+    },
     "E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj": {
       "restore": {
         "projectUniqueName": "E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj",

Client/obj/project.assets.json

@@ -311,7 +311,8 @@
         "dependencies": {
           "Database": "1.0.0",
           "Helper": "1.0.0",
-          "Model": "1.0.0"
+          "Model": "1.0.0",
+          "OnDocOffice": "1.0.0"
         },
         "compile": {
           "bin/placeholder/DocGen.dll": {}
@@ -356,6 +357,19 @@
           "bin/placeholder/OfficePrinter.dll": {}
         }
       },
+      "OnDocOffice/1.0.0": {
+        "type": "project",
+        "dependencies": {
+          "Helper": "1.0.0",
+          "Model": "1.0.0"
+        },
+        "compile": {
+          "bin/placeholder/OnDocOffice.dll": {}
+        },
+        "runtime": {
+          "bin/placeholder/OnDocOffice.dll": {}
+        }
+      },
       "VBFileManagement/1.0.0": {
         "type": "project",
         "compile": {
@@ -676,7 +690,8 @@
         "dependencies": {
           "Database": "1.0.0",
           "Helper": "1.0.0",
-          "Model": "1.0.0"
+          "Model": "1.0.0",
+          "OnDocOffice": "1.0.0"
         },
         "compile": {
           "bin/placeholder/DocGen.dll": {}
@@ -721,6 +736,19 @@
           "bin/placeholder/OfficePrinter.dll": {}
         }
       },
+      "OnDocOffice/1.0.0": {
+        "type": "project",
+        "dependencies": {
+          "Helper": "1.0.0",
+          "Model": "1.0.0"
+        },
+        "compile": {
+          "bin/placeholder/OnDocOffice.dll": {}
+        },
+        "runtime": {
+          "bin/placeholder/OnDocOffice.dll": {}
+        }
+      },
       "VBFileManagement/1.0.0": {
         "type": "project",
         "compile": {
@@ -1041,7 +1069,8 @@
         "dependencies": {
           "Database": "1.0.0",
           "Helper": "1.0.0",
-          "Model": "1.0.0"
+          "Model": "1.0.0",
+          "OnDocOffice": "1.0.0"
         },
         "compile": {
           "bin/placeholder/DocGen.dll": {}
@@ -1086,6 +1115,19 @@
           "bin/placeholder/OfficePrinter.dll": {}
         }
       },
+      "OnDocOffice/1.0.0": {
+        "type": "project",
+        "dependencies": {
+          "Helper": "1.0.0",
+          "Model": "1.0.0"
+        },
+        "compile": {
+          "bin/placeholder/OnDocOffice.dll": {}
+        },
+        "runtime": {
+          "bin/placeholder/OnDocOffice.dll": {}
+        }
+      },
       "VBFileManagement/1.0.0": {
         "type": "project",
         "compile": {
@@ -1406,7 +1448,8 @@
         "dependencies": {
           "Database": "1.0.0",
           "Helper": "1.0.0",
-          "Model": "1.0.0"
+          "Model": "1.0.0",
+          "OnDocOffice": "1.0.0"
         },
         "compile": {
           "bin/placeholder/DocGen.dll": {}
@@ -1451,6 +1494,19 @@
           "bin/placeholder/OfficePrinter.dll": {}
         }
       },
+      "OnDocOffice/1.0.0": {
+        "type": "project",
+        "dependencies": {
+          "Helper": "1.0.0",
+          "Model": "1.0.0"
+        },
+        "compile": {
+          "bin/placeholder/OnDocOffice.dll": {}
+        },
+        "runtime": {
+          "bin/placeholder/OnDocOffice.dll": {}
+        }
+      },
       "VBFileManagement/1.0.0": {
         "type": "project",
         "compile": {
@@ -1771,7 +1827,8 @@
         "dependencies": {
           "Database": "1.0.0",
           "Helper": "1.0.0",
-          "Model": "1.0.0"
+          "Model": "1.0.0",
+          "OnDocOffice": "1.0.0"
         },
         "compile": {
           "bin/placeholder/DocGen.dll": {}
@@ -1816,6 +1873,19 @@
           "bin/placeholder/OfficePrinter.dll": {}
         }
       },
+      "OnDocOffice/1.0.0": {
+        "type": "project",
+        "dependencies": {
+          "Helper": "1.0.0",
+          "Model": "1.0.0"
+        },
+        "compile": {
+          "bin/placeholder/OnDocOffice.dll": {}
+        },
+        "runtime": {
+          "bin/placeholder/OnDocOffice.dll": {}
+        }
+      },
       "VBFileManagement/1.0.0": {
         "type": "project",
         "compile": {
@@ -2848,6 +2918,11 @@
       "path": "../OfficePrinter/OfficePrinter.csproj",
       "msbuildProject": "../OfficePrinter/OfficePrinter.csproj"
     },
+    "OnDocOffice/1.0.0": {
+      "type": "project",
+      "path": "../OnDocOffice/OnDocOffice.csproj",
+      "msbuildProject": "../OnDocOffice/OnDocOffice.csproj"
+    },
     "VBFileManagement/1.0.0": {
       "type": "project",
       "path": "../VBFileManagement/VBFileManagement.vbproj",

Client/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "LwjOZBX8J9I=",
+  "dgSpecHash": "yvBt3tq7lIs=",
   "success": true,
   "projectFilePath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Client\\Client.csproj",
   "expectedPackageFiles": [

DOCGEN/DocGen.csproj

@@ -138,6 +138,10 @@
       <Project>{a1fd0973-89a7-4588-877d-373835d6e00c}</Project>
       <Name>Model</Name>
     </ProjectReference>
+    <ProjectReference Include="..\OnDocOffice\OnDocOffice.csproj">
+      <Project>{ff8f7808-3af7-467c-947b-d8d3c6bf7bd7}</Project>
+      <Name>OnDocOffice</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />

DOCGEN/Klassen/DocGenerator_from_EDOKA.cs

@@ -11,6 +11,7 @@ using Model;
 using System.Diagnostics;
 using NLog;
 using System.Security.Policy;
+using OfficePrinter;
 
 namespace DOCGEN.Generator
 {
@@ -42,7 +43,7 @@ namespace DOCGEN.Generator
             this.tempdir = tempdir;
         }
 
-        public clsdok Generate_Doc_EDOKA(string dokumentid, ref clsDocData docdata )
+        public clsdok Generate_Doc_EDOKA(string dokumentid, ref clsDocData docdata, bool useoffice = false )
         {
             DB db = new DB(connectionstring);
             DataTable dt = new DataTable();
@@ -59,7 +60,14 @@ namespace DOCGEN.Generator
                     SyncFWord sfword = new SyncFWord();
                     generate_docdata(dokumentid, ref docdata);
                     clsdok dok = new clsdok("", "", "");
-                    dok.dokument= sfword.Generate_Word(dt.Rows[0][0].ToString(), docdata);
+                    if (useoffice == false) { 
+                        dok.dokument = sfword.Generate_Word(dt.Rows[0][0].ToString(), docdata); 
+                    } else
+                    {
+                        OnDocOffice.clsWordEdit oo = new OnDocOffice.clsWordEdit("", "","");
+                        dok.dokument = oo.Generate_Word_in_Office(ref docdata, ref dok, dt.Rows[0][0].ToString(), connectionstring, tempdir, dokumentid, Apptype);
+                    }
+
                     dok.doktype = "D";
                     dok.extension = dt2.Rows[0][1].ToString();
                     //if (dok.extension.ToUpper()=="DOTM") { dok.extension = "docm"; }

DOCGEN/obj/Debug/DOCGEN.csproj.FileListAbsolute.txt

@@ -132,3 +132,5 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\FastReport.xml
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.Up2Date
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DOCGEN.dll
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DOCGEN.pdb
+E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\OnDocOffice.dll
+E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\OnDocOffice.pdb

DOCGEN/obj/Debug/DocGen.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-0a239b9ab18e54ef74fccb23ad3fd662228282573aa6dcf292e80f21c2df4095
+4da3193ff40a54fa181ed15ea9573eaab157bd10f4799f82d43d0e49007a526c

Database/db.cs

@@ -182,7 +182,7 @@ namespace Database
         #endregion
         public string generate_key(string dbkey)
         {
-            string skey = "OFFEDK000";
+            string skey = "OFFEDK008";
             string s = "";
             s = DateTime.Now.Year.ToString().Trim();
             string dt = s;

Helper/clsFileHelper.cs

@@ -47,5 +47,11 @@ namespace Helper
             stream.Position = 0;
             return stream;
         }
+
+        public String Base64FromFile(string filename)
+        {
+            Byte[] bytes = File.ReadAllBytes(filename);
+            return Convert.ToBase64String(bytes);
+        }
     }
 }

Model/clsDocData.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Security.Permissions;
+using System.Security.Policy;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -33,8 +34,23 @@ namespace Model
         public string Direct_to_Archive { get; set; }
         public string Result_as_PDF { get; set; }
 
+        public bool Kopfzeile_generieren { get; set; } = false;
 
-        public bool Barcode { get; set; }
+        public string barcode_zusatz { get; set; } = "";
+        public int barcode_top { get; set; } = 0;
+        public int barcode_left { get; set; } = 0;
+        public int barcode_width  { get; set; }=0;
+        public int barcode_height { get; set; } = 0;
+        public int barcode_horizontal { get; set; }  = 0;
+
+        public string barcode_font { get; set; } = "Bar 25i c HR";
+        public int barcode_fontsize { get; set; } = 26;
+        public string Zusatz_Font { get; set; } = "Arial";
+        public int Zusatz_FontSize { get; set; } = 8;
+
+
+
+public bool Barcode { get; set; }
         public bool PrintLogo { get; set; } = false;
 
         public string UseEDOKA_Values { get; set; }