Update 20250618

This commit is contained in:
Stefan Hutter
2025-06-18 23:11:00 +02:00
parent 85ff87dc62
commit f45b683545
173 changed files with 1728 additions and 320 deletions

View File

@@ -63,11 +63,11 @@ namespace DOCGEN.Generator
public clsdok Generate_Doc_EDOKA(string dokumentid, ref clsDocData docdata, bool useoffice = false, int OfficeSleep = 0, bool vbfilemanagement = false, bool editdoc = false)
{
if (docdata.Bezeichnung.Contains("QDF"))
if (docdata.Bezeichnung.Contains("QDF"))
{
generate_docdata(dokumentid, ref docdata);
Generate_QDF(dokumentid, ref docdata, tempdir);
clsdok dokempty = new clsdok("", "", "QDF","");
generate_docdata(dokumentid, ref docdata);
Generate_QDF(dokumentid, ref docdata, tempdir);
clsdok dokempty = new clsdok("", "", "QDF", "");
return dokempty;
}
useoffice = docdata.Erstellung_in_Office;
@@ -101,12 +101,17 @@ if (docdata.Bezeichnung.Contains("QDF"))
docdata.prefix = Prefix;
switch (Apptype.ToUpper())
{
case "DOCX": case "DOCM": case "DOC": case "DOT":
case "WORD": case "DOTM":
case "DOCX":
case "DOCM":
case "DOC":
case "DOT":
case "WORD":
case "DOTM":
SyncFWord sfword = new SyncFWord(resturi, apikey);
generate_docdata(dokumentid, ref docdata);
clsdok dok = new clsdok("", "", "", "");
if (useoffice == false) {
if (useoffice == false)
{
Logging.Logging.Debug("Generate_Word", "Start", dokumentid);
if (docdata.remove_signature)
{
@@ -119,7 +124,7 @@ if (docdata.Bezeichnung.Contains("QDF"))
dt.Rows[0][0] = fh.Base64FromFile(filename);
ws = null;
}
dok.dokument = sfword.Generate_Word(dt.Rows[0][0].ToString(), docdata,"","","",false,editdoc);
dok.dokument = sfword.Generate_Word(dt.Rows[0][0].ToString(), docdata, "", "", "", false, editdoc);
Logging.Logging.Debug("Generate_Word", "Ende", dokumentid);
Thread.Sleep(OfficeSleep);
}
@@ -138,7 +143,11 @@ if (docdata.Bezeichnung.Contains("QDF"))
dok.extension = dt2.Rows[0][1].ToString();
//if (dok.extension.ToUpper()=="DOTM") { dok.extension = "docm"; }
return dok;
case "XLSM": case "XLSX": case "XLST": case "XLS": case "XLT":
case "XLSM":
case "XLSX":
case "XLST":
case "XLS":
case "XLT":
case "XLTM":
case "EXCEL":
@@ -161,7 +170,10 @@ if (docdata.Bezeichnung.Contains("QDF"))
}
return dokexcel;
//break;
case "PDF": case "ACROBAT": case "FORMULAR": case "DOKUMENT":
case "PDF":
case "ACROBAT":
case "FORMULAR":
case "DOKUMENT":
clsdok dokpdf = new clsdok("", "", "", "");
dokpdf.dokument = dt.Rows[0][0].ToString();
dokpdf.extension = Extension;
@@ -225,7 +237,7 @@ if (docdata.Bezeichnung.Contains("QDF"))
public void Generate_QDF(string dokumentid, ref clsDocData docdata, string tempdir)
{
DB db = new DB(connectionstring);
db.Get_Tabledata("Select * from ondoc_qdf_parameter where aktiv=1", false, true);
string qdfsource = db.dsdaten.Tables[0].Rows[0][1].ToString();
string qdfviewer = db.dsdaten.Tables[0].Rows[0][2].ToString();
@@ -281,5 +293,5 @@ if (docdata.Bezeichnung.Contains("QDF"))
//Process.Start(qdfviewer + " " + dokumentname);
}
}
}
}