update 20250102

Client/DocMgmt/Dokumenterstellung.Designer.cs

@@ -50,6 +50,7 @@
             this.button2 = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
             this.ucAllgemeineDokumentParam1 = new OnDoc.UIControls.UCAllgemeineDokumentParam();
+            this.ProgressCreateInOffice = new System.Windows.Forms.ProgressBar();
             this.PnlPreview.SuspendLayout();
             this.GrpFnkt.SuspendLayout();
             this.SuspendLayout();
@@ -267,6 +268,7 @@
             this.ucAllgemeineDokumentParam1.bpperson_error_type = 0;
             this.ucAllgemeineDokumentParam1.check_error = "";
             this.ucAllgemeineDokumentParam1.checkpartner = true;
+            clsdocgendata1.anrede = null;
             clsdocgendata1.bezeichnung = null;
             clsdocgendata1.digitaleunterschrift = false;
             clsdocgendata1.dokumentdatum = null;
@@ -303,11 +305,20 @@
             this.ucAllgemeineDokumentParam1.TabIndex = 0;
             this.ucAllgemeineDokumentParam1.uniqid = "f8c10a65-c251-4f8e-9ff7-4ae4d900a268";
             // 
+            // ProgressCreateInOffice
+            // 
+            this.ProgressCreateInOffice.Location = new System.Drawing.Point(579, 112);
+            this.ProgressCreateInOffice.Name = "ProgressCreateInOffice";
+            this.ProgressCreateInOffice.Size = new System.Drawing.Size(460, 23);
+            this.ProgressCreateInOffice.TabIndex = 20;
+            this.ProgressCreateInOffice.Visible = false;
+            // 
             // Dokumenterstellung
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1051, 679);
+            this.Controls.Add(this.ProgressCreateInOffice);
             this.Controls.Add(this.PnlPreview);
             this.Controls.Add(this.sfButton3);
             this.Controls.Add(this.btnDokumenterstellen);
@@ -348,5 +359,6 @@
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.Button btnOfficePrint;
         private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.ProgressBar ProgressCreateInOffice;
     }
 }

Client/DocMgmt/Dokumenterstellung.cs

@@ -42,6 +42,7 @@ namespace OnDoc.DocMgmt
         {
             InitializeComponent();
             Broadcaster().AddListener(this);
+            Closing += Form_Closing;
         }
 
         public Dokumenterstellung(int Partnernr, int Dokumenttpynr, int Profilnr)
@@ -52,6 +53,7 @@ namespace OnDoc.DocMgmt
             profilnr = Profilnr;
             Broadcaster().AddListener(this);
             Closing += Form_Closing;
+          
         }
 
         public Dokumenterstellung(int Partnernr, int Dokumenttypnr, int Profilnr, string Interaktion, string Showdoc)
@@ -79,6 +81,11 @@ namespace OnDoc.DocMgmt
                     if (sender.Function == "Disable") { btnDokumenterstellen.Enabled = false; } else { btnDokumenterstellen.Enabled = true; }
                 }
             }
+            if (message == "AdminDokErstellung")
+            {
+                Dokument_Erstellen();
+            }
+         
             
         }
         private void Dokumenterstellung_Load(object sender, EventArgs e)
@@ -98,6 +105,7 @@ namespace OnDoc.DocMgmt
             Security security = new Security();
             security.set_security(this);
             security = null;
+          
         }
 
 
@@ -133,8 +141,11 @@ namespace OnDoc.DocMgmt
                 dB.add_parameter("@BARCODEFONTSIZE","");
                 dB.add_parameter("@BarcodeKantenlaenge", "");
                 dB.Get_Tabledata("sp_get_barcodetype_and_value", true, false);
-                dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][1].ToString();
+                dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][2].ToString();
                 dokdata.barcode_text = dB.dsdaten.Tables[0].Rows[0][4].ToString();
+                dokdata.barcode_kantenlaenge = dB.dsdaten.Tables[0].Rows[0][5].ToString();
+                dokdata.barcode_formatn = dB.dsdaten.Tables[0].Rows[0][3].ToString();
+
                 dB = null;
             }
 
@@ -144,7 +155,7 @@ namespace OnDoc.DocMgmt
                 DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey,AppParams.Office_Fill_DocIO);
                 clsdok dok = new clsdok("", "", "");
                 Logging.Logging.Debug("Generate_Doc_EDOKA", "Dokumenterstellung", dokumentid);
-                dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1);
+                dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1, AppParams.vbvorlagenmanagement=="Yes");
                 Logging.Logging.Debug("Generate_Doc_EDOKA - Ende", "Dokumenterstellung", dokumentid);
 
 

Client/DocMgmt/Dokumentpaket.cs

@@ -463,7 +463,7 @@ namespace OnDoc.DocMgmt
                             panelword.Visible = true;
                             lbldokumentname.Text = tab.Text;
                             Application.DoEvents();
-                            dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata,true,AppParams.OfficeSpleep1);
+                            dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata,true,AppParams.OfficeSpleep1,AppParams.vbvorlagenmanagement=="Yes");
                             panelword.Visible = false;
                             Application.DoEvents();