update 20250111

This commit is contained in:
Stefan Hutter
2025-01-11 18:28:18 +01:00
parent bd4598e4a8
commit 11b4f840f0
150 changed files with 3091 additions and 390 deletions

View File

@@ -94,7 +94,7 @@ namespace DOCGEN.Generator
else
{
Logging.Logging.Debug("Generate_Word_in_Office", "Init", dokumentid);
OnDocOffice.clsWordEdit oo = new OnDocOffice.clsWordEdit("", "","");
OnDocOffice.clsWordEdit oo = new OnDocOffice.clsWordEdit("", "","",resturi,apikey);
Logging.Logging.Debug("Generate_Word_in_Office", "Start", dokumentid);
dok.dokument = oo.Generate_Word_in_Office(ref docdata, ref dok, dt.Rows[0][0].ToString(), connectionstring, tempdir, dokumentid, Apptype,Extension,OfficeSleep,Office_Fill_DocIO, vbfilemanagement);
@@ -142,7 +142,7 @@ namespace DOCGEN.Generator
//db.get_vorlage_to_file(db.dsdaten.Tables[0].Rows[0][1].ToString(),tempdir,dokumentid );
}
public void generate_docdata(string dokumentid, ref clsDocData docdata)
{
@@ -159,11 +159,11 @@ namespace DOCGEN.Generator
docValues.Add(dv);
}
clsDocValue dv1 = new clsDocValue();
docdata.DocValues = docValues;
db.Get_Tabledata("Select * from view_ER_Makros where dokumentid='" + dokumentid + "' order by reihenfolge",false,true);
List<clsDocMacro>docMacros = new List<clsDocMacro>();
db.Get_Tabledata("Select * from view_ER_Makros where dokumentid='" + dokumentid + "' order by reihenfolge", false, true);
List<clsDocMacro> docMacros = new List<clsDocMacro>();
foreach (DataRow r in db.dsdaten.Tables[0].Rows)
{
clsDocMacro dm = new clsDocMacro();
@@ -172,7 +172,21 @@ namespace DOCGEN.Generator
docMacros.Add(dm);
}
docdata.DocMacros = docMacros;
//db.Get_Tabledata("Select * from OnDocTMFaksimile", false, true);
//List<clsNameVOrnameTM> NameVornameTM = new List<clsNameVOrnameTM>();
//foreach (DataRow r in db.dsdaten.Tables[0].Rows)
//{
// clsNameVOrnameTM clsNameVOrnameTM = new clsNameVOrnameTM();
// clsNameVOrnameTM.TM = r[1].ToString().Trim();
// clsNameVOrnameTM.FNKT = r[2].ToString().Trim();
// NameVornameTM.Add(clsNameVOrnameTM);
//}
//docdata.VornameNameTextmarken = NameVornameTM;
db = null;
}
}