Update 20250117 12:30

This commit is contained in:
Stefan Hutter
2025-01-17 12:37:03 +01:00
parent 3e36dd541b
commit cfd7c00451
147 changed files with 89099 additions and 248 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -263,6 +263,9 @@ namespace OnDocOffice
public string filename { get; set; }
public string dokumentid { get; set; }
public string cursortm { get; set; }
public string cursorfeld { get; set; }
public bool is_protected { get; set; } = false;
public
Microsoft.Office.Interop.Word.Application word;
@@ -613,20 +616,33 @@ namespace OnDocOffice
{
}
cursortm = "";
foreach (clsDocValue dv in docdata.DocValues)
{
if (dv.TMBeginn.ToString().Contains("Tagesdatum")){
int a = 1;
}
try
{
if (dv.TMBeginn.ToString() == "TGEDKCursor" || dv.TMBeginn.ToString() == "TGEDKCursorB" ||
dv.FieldName.ToString() == "TGEDKCursor" || dv.FieldName.ToString() == "TGEDKCursorB") { cursorpositionieren = true; }
if (dv.TMBeginn.ToString().Contains("TGEDKCursor")) {
//if (dv.TMBeginn.ToString() == "TGEDKCursor" || dv.TMBeginn.ToString() == "TGEDKCursorB" ||
// dv.FieldName.ToString() == "TGEDKCursor" || dv.FieldName.ToString() == "TGEDKCursorB") {
cursorpositionieren = true;
cursortm = dv.TMBeginn.ToString();
//break;
}
if (dv.FieldName.ToString().Contains("TGEDKCursor")){
cursorpositionieren = true;
cursorfeld = dv.FieldName.ToString();
//break;
}
}
catch { }
// Logging.Logging.Debug(dv.TMBeginn.ToString() + " / " + dv.TMEnd.ToString(), dv.Value.ToString(), dokumentid);
dialogGenerate.add_progress((int)progressstep);
if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() == "")
if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() == "" && !dv.TMBeginn.ToString().Contains("TGEDKCurosr"))
{
try
{
@@ -698,7 +714,7 @@ namespace OnDocOffice
}
catch { }
}
if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() != "")
if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() != "" && !dv.TMBeginn.ToString().Contains("TGEDKCursor"))
{
try
{
@@ -711,10 +727,11 @@ namespace OnDocOffice
}
catch { }
}
if (dv.FieldName.ToString() != "")
if (dv.FieldName.ToString() != "" && !dv.FieldName.Contains("TGEDKCursor"))
{
try
{
worddoc.FormFields[dv.FieldName.ToString()].Result = dv.Value;
}
catch { }
@@ -741,6 +758,16 @@ namespace OnDocOffice
run_macros(ref docdata, connectionstring);
if (cursorpositionieren)
{
try
{
if (cursortm != "") { worddoc.Bookmarks[cursortm].Select(); }
if (cursorfeld != "") { worddoc.FormFields[cursorfeld].Select(); }
}
catch { }
}
worddoc.Save();
Logging.Logging.Debug("Word Saved", "clsOffice", dokumentid);