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

update 20250126

Browse Source
This commit is contained in:
Stefan Hutter
2025-01-26 22:48:31 +01:00
parent 608c67d21b
commit 3f765247ee
97 changed files with 274 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DOCGEN/Klassen/DocGenerator_from_EDOKA.cs
View File

@@ -104,7 +104,7 @@ namespace DOCGEN.Generator
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);
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,editdoc);
Logging.Logging.Debug("Generate_Word_in_Office", "Ende", dokumentid);
oo = null;
}

24
DOCGEN/Klassen/SyncFWord.cs
View File

@@ -194,7 +194,7 @@ namespace DOCGEN.Klassen
}
}
public string Generate_Word(string base64, clsDocData docdata, string img_UL = "", string img_UR = "", string img_faktura = "")
public string Generate_Word(string base64, clsDocData docdata, string img_UL = "", string img_UR = "", string img_faktura = "", bool serienbrief=false)
{
string formattype = "";
MemoryStream ms = new MemoryStream(Helper.EncodeExtensions.DecodeBase642ByteArray(base64));
@@ -288,6 +288,10 @@ namespace DOCGEN.Klassen
foreach (clsDocValue dv in docdata.DocValues)
{
if (dv.TMBeginn.ToString().Contains("VornameName"))
{
int a = 1;
}
//if (dv.TMBeginn.ToString().Contains("TGEDKCursor")) { //break; }
//if (dv.FieldName.ToString().Contains("TGEDKCursor")) { //break; }
if (docdata.Form_ohne_Unterschrift == "True")
@@ -316,7 +320,7 @@ namespace DOCGEN.Klassen
{
BookmarksNavigator bookmarkNavigator = new BookmarksNavigator(document);
// if ((dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99" || dv.TMBeginn.ToString() == "TGEDKVornameNameRechtsB99") && docdata.As_Faksimile == "True")
if ((dv.TMBeginn.ToString().Contains("VornameNameLinks") || dv.TMBeginn.ToString().Contains("VornameNameRechts")) && docdata.As_Faksimile == "True")
if ((dv.TMBeginn.ToString().Contains("VornameNameLinks") || dv.TMBeginn.ToString().Contains("VornameNameRechts")) && docdata.As_Faksimile == "True" && serienbrief==true)
{
string funktionlinks = "";
string funktionrechts = "";
@@ -391,7 +395,7 @@ namespace DOCGEN.Klassen
else
{
//if (docdata.As_Faksimile=="True" && (dv.TMBeginn.ToString() == "TGEDKFunktionLinksB99" || dv.TMBeginn.ToString() == "TGEDKFunktionRechtsB99"))
if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString().Contains("FunktionLinks") || dv.TMBeginn.ToString().Contains("FunktionRechts")))
if (docdata.As_Faksimile == "True" && (dv.TMBeginn.ToString().Contains("FunktionLinks") || dv.TMBeginn.ToString().Contains("FunktionRechts")) && serienbrief == true)
{
}
@@ -415,8 +419,12 @@ namespace DOCGEN.Klassen
{
if (!dv.TMBeginn.ToString().Contains("TGEDKCursor"))
{
if (dv.TMBeginn.ToString().Contains("VornameName"))
{
int a = 1;
}
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
bookmarkNavigator.InsertText(dv.Value.ToString());
//bookmarkNavigator.InsertText(dv.Value.ToString());
bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
}
}
@@ -426,9 +434,13 @@ namespace DOCGEN.Klassen
{
if (!dv.TMBeginn.ToString().Contains("TGEDKCursor"))
{
if (dv.TMBeginn.ToString().Contains("VornameName"))
{
int a = 1;
}
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
bookmarkNavigator.InsertText(dv.Value.ToString());
//bookmarkNavigator.InsertText(dv.Value.ToString());
bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
}
}
@@ -479,7 +491,7 @@ namespace DOCGEN.Klassen
}
}
if (docdata.As_Faksimile == "True")
if (docdata.As_Faksimile == "True" && serienbrief==true)
{
TextSelection[] textSelections = document.FindAll("Thurgauer Kantonalbank", false, true);