update 20260220

This commit is contained in:
Stefan Hutter
2026-02-20 18:04:31 +01:00
parent 9e64ca707d
commit 30d047e33d
100 changed files with 11274 additions and 442 deletions

View File

@@ -337,7 +337,7 @@ namespace DOCGEN.Klassen
FirstfooterPar.ChildEntities.Add(picture);
if (section.HeadersFooters.FirstPageHeader.Paragraphs.Count > 0)
{
section.HeadersFooters.FirstPageHeader.Paragraphs.RemoveAt(section.HeadersFooters.FirstPageHeader.Paragraphs.Count - 1);
// section.HeadersFooters.FirstPageHeader.Paragraphs.RemoveAt(section.HeadersFooters.FirstPageHeader.Paragraphs.Count - 1);
}
section.HeadersFooters.FirstPageHeader.Paragraphs.Add(FirstfooterPar);
}
@@ -432,7 +432,9 @@ namespace DOCGEN.Klassen
List<string> cellwidth = null;
List<string> cellpadding = null;
List<string> headers = null;
List<string> fontsize = null;
List<string> stringList = null;
string fonts = "0";
string s = "";
DataTable dt = (DataTable)JsonConvert.DeserializeObject(item.itemvalue, (typeof(DataTable)));
@@ -446,10 +448,12 @@ namespace DOCGEN.Klassen
if (formats.Tag == "CellWidth") { s = formats.Value.ToString(); cellwidth = s.Split(';').ToList(); }
if (formats.Tag == "CellPadding") { s = formats.Value.ToString(); cellpadding = s.Split(';').ToList(); }
if (formats.Tag == "Headers") { s = formats.Value.ToString(); headers = s.Split(';').ToList(); }
if (formats.Tag == "FontSize") { s = formats.Value.ToString(); fontsize = s.Split(';').ToList(); }
//Console.WriteLine(questions.Question.QuestionId + "." + questions.Question.QuestionText.ToString());
}
}
catch { }
if (fontsize.Count>0) { fonts = fontsize[0].ToString(); }
if (cellpadding.Count == 0)
{
cellpadding.Add("0");
@@ -500,22 +504,32 @@ namespace DOCGEN.Klassen
{
for (int j = 0; j < dt.Columns.Count; j++)
{
table[i, j].AddParagraph().AppendText(dt.Rows[i][dt.Columns[j]].ToString());
if (fonts == "0")
{
table[i, j].AddParagraph().AppendText(dt.Rows[i][dt.Columns[j]].ToString());
}
else
{
IWTextRange textRange = table[i, j].AddParagraph().AppendText(dt.Rows[i][dt.Columns[j]].ToString());
textRange.CharacterFormat.FontSize=Convert.ToInt32(fonts);
}
WTableCell cell = table.Rows[i].Cells[j];
try
{
if (cellpadding.Count > 0)
{
cell.CellFormat.SamePaddingsAsTable = false;
cell.CellFormat.Paddings.Left = Convert.ToInt32(cellpadding[0]); //in terms of points
cell.CellFormat.Paddings.Right = Convert.ToInt32(cellpadding[1]); //in terms of points
cell.CellFormat.Paddings.Top = Convert.ToInt32(cellpadding[2]); //in terms of points
cell.CellFormat.Paddings.Bottom = Convert.ToInt32(cellpadding[3]); //in terms of points
}
}
catch { }
@@ -1211,7 +1225,7 @@ namespace DOCGEN.Klassen
}
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
if (docdata.Unterschrift_Links != "-1")
if (docdata.Unterschrift_Links != "-1" && docdata.print_signature==true)
{
insert_signature(dv.TMBeginn.ToLower(), unterschrift, ref document);
}
@@ -1234,7 +1248,7 @@ namespace DOCGEN.Klassen
}
bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString());
bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true);
if (docdata.Unterschrift_Rechts != "-1")
if (docdata.Unterschrift_Rechts != "-1" && docdata.print_signature == true)
{
insert_signature(dv.TMBeginn.ToLower(), unterschrift, ref document);
}
@@ -1344,6 +1358,7 @@ namespace DOCGEN.Klassen
{
try
{
if (string.IsNullOrEmpty(apivalue.Type)) { apivalue.Type = ""; }
if (apivalue.Type == "Checkbox")
{
CheckboxCount = 0;
@@ -2334,6 +2349,11 @@ namespace DOCGEN.Klassen
di.left = "40";
di.width = "160";
di.height = "40";
di.top = docData.logo_top.ToString();
di.left = docData.logo_left.ToString();
di.width=docData.logo_width.ToString();
di.height=docData.logo_heigth.ToString();
Insert_CLMLogo(di, ref document);
di = null;
return;

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.