shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update 20241229

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-29 23:03:57 +01:00
parent 4455cca85a
commit 2feaf6cc29
140 changed files with 12447 additions and 556552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -139,9 +139,12 @@ namespace OnDoc.DocMgmt
Logging.DocLog.Info("Dokumenterstellung", "frmDokumenterstellung", dokumentid, ucAllgemeineDokumentParam1.partnernr.ToString(), "Dokumenterstellung");
if (dokumentid != "")
{
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey);
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);
Logging.Logging.Debug("Generate_Doc_EDOKA - Ende", "Dokumenterstellung", dokumentid);
interop = ucAllgemeineDokumentParam1.interop;

44
Client/DocMgmt/Dokumentpaket.Designer.cs generated
View File

@@ -48,6 +48,9 @@
this.sfListView1 = new Syncfusion.WinForms.ListView.SfListView();
this.TabControlDokuments = new Syncfusion.Windows.Forms.Tools.TabControlAdv();
this.tabPageAdv1 = new Syncfusion.Windows.Forms.Tools.TabPageAdv();
this.panelword = new System.Windows.Forms.Panel();
this.lbldokumentname = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.pnlfooter = new System.Windows.Forms.Panel();
this.progressBarAdv1 = new Syncfusion.Windows.Forms.Tools.ProgressBarAdv();
this.pnlleft = new System.Windows.Forms.Panel();
@@ -59,6 +62,7 @@
this.dokList1 = new OnDoc.UICintrols.DokList();
((System.ComponentModel.ISupportInitialize)(this.TabControlDokuments)).BeginInit();
this.TabControlDokuments.SuspendLayout();
this.panelword.SuspendLayout();
this.pnlfooter.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).BeginInit();
this.pnlleft.SuspendLayout();
@@ -220,6 +224,7 @@
// sfListView1
//
this.sfListView1.AccessibleName = "ScrollControl";
this.sfListView1.AutoHideScrollBars = true;
this.sfListView1.BackColor = System.Drawing.SystemColors.Window;
this.sfListView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfListView1.Location = new System.Drawing.Point(0, 149);
@@ -232,7 +237,6 @@
//
// TabControlDokuments
//
this.TabControlDokuments.BeforeTouchSize = new System.Drawing.Size(1069, 660);
this.TabControlDokuments.BorderVisible = true;
this.TabControlDokuments.Controls.Add(this.tabPageAdv1);
this.TabControlDokuments.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -250,10 +254,40 @@
this.tabPageAdv1.Name = "tabPageAdv1";
this.tabPageAdv1.ShowCloseButton = true;
this.tabPageAdv1.Size = new System.Drawing.Size(1059, 630);
this.tabPageAdv1.TabIndex = 1;
this.tabPageAdv1.Text = "tabPageAdv1";
this.tabPageAdv1.ThemesEnabled = false;
//
// panelword
//
this.panelword.BackColor = System.Drawing.Color.PowderBlue;
this.panelword.Controls.Add(this.lbldokumentname);
this.panelword.Controls.Add(this.label1);
this.panelword.Location = new System.Drawing.Point(437, 75);
this.panelword.Name = "panelword";
this.panelword.Size = new System.Drawing.Size(715, 354);
this.panelword.TabIndex = 24;
this.panelword.Visible = false;
//
// lbldokumentname
//
this.lbldokumentname.AutoSize = true;
this.lbldokumentname.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbldokumentname.Location = new System.Drawing.Point(22, 81);
this.lbldokumentname.Name = "lbldokumentname";
this.lbldokumentname.Size = new System.Drawing.Size(167, 26);
this.lbldokumentname.TabIndex = 1;
this.lbldokumentname.Text = "Dokumentname";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(22, 25);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(443, 26);
this.label1.TabIndex = 0;
this.label1.Text = "Folgendes Dokument wird in Word generiert:";
//
// pnlfooter
//
this.pnlfooter.Controls.Add(this.progressBarAdv1);
@@ -379,6 +413,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(2124, 851);
this.Controls.Add(this.panelword);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.pnlleft);
@@ -394,6 +429,8 @@
this.Load += new System.EventHandler(this.Dokumentpaket_Load);
((System.ComponentModel.ISupportInitialize)(this.TabControlDokuments)).EndInit();
this.TabControlDokuments.ResumeLayout(false);
this.panelword.ResumeLayout(false);
this.panelword.PerformLayout();
this.pnlfooter.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).EndInit();
this.pnlleft.ResumeLayout(false);
@@ -437,5 +474,8 @@
private Syncfusion.Windows.Forms.Tools.ProgressBarAdv progressBarAdv1;
private System.Windows.Forms.RibbonPanel ribbonPanel5;
private System.Windows.Forms.RibbonButton ribbonButtonNew;
private System.Windows.Forms.Panel panelword;
private System.Windows.Forms.Label lbldokumentname;
private System.Windows.Forms.Label label1;
}
}

34
Client/DocMgmt/Dokumentpaket.cs
View File

@@ -434,7 +434,7 @@ namespace OnDoc.DocMgmt
if (idokumentid == "" || uc.genertated_dokumentid == idokumentid)
{
uc.Set_Edit_later();
//uc.Set_Edit_later();
uc.Update_DocGenData();
clsDocData dokdata = new clsDocData();
uc.update_dokdata(ref dokdata);
@@ -446,13 +446,41 @@ namespace OnDoc.DocMgmt
uc.Show_Neugenerieren();
filter = filter + dokumentid + "','";
dokumentid = dokdata.Dokumentid;
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentPreview) { uc.docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
if (dokumentid != "")
{
Logging.DocLog.Info("Dokument erstellt", "Dokumentpaket", dokumentid, uc.partnernr.ToString(), "Dokument erstellt");
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI,AppParams.apikey);
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("", "", "");
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
{
panelword.Visible = true;
lbldokumentname.Text = tab.Text;
Application.DoEvents();
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata,true,AppParams.OfficeSpleep1);
panelword.Visible = false;
Application.DoEvents();
}
else
{
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
}
if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
string filename_temp = filename + ".tmp";
System.IO.File.WriteAllBytes(filename_temp, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename_temp);
db.Dok_in_Bearbeitung(1,dokdata.Dokumentid, AppParams.CurrentMitarbieter);
db = null;
System.IO.File.Delete(filename_temp);
clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
}
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;

2
Client/DocMgmt/FrmDokumenterstellung.cs
View File

@@ -216,7 +216,7 @@ namespace OnDoc.DocMgmt
dokdata.barcode_content = dB.daten.Tables[0].Rows[0][1].ToString();
dB = null;
}
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey);
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("", "", "");
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);