update 20241120

This commit is contained in:
Stefan Hutter
2024-11-20 17:25:15 +01:00
parent 194a97416c
commit d3bf9458eb
356 changed files with 30432 additions and 500 deletions

View File

@@ -297,7 +297,7 @@ namespace OnDoc.UIControls
Base64Helper bh = new Base64Helper();
bh.Base64 = db.dsdaten.Tables[0].Rows[0][0].ToString();
string xml = bh.DecodeBase64();
string filename = AppParams.tempdir + @"\tmpsb.xml";
string filename = AppParams.tempdir + @"\"+sb.serienbriefnr.ToString()+".xml";
System.IO.File.WriteAllText(filename, xml);
//dsempfaenger.Tables.Clear();
//dsempfaenger.ReadXml(filename);
@@ -309,7 +309,7 @@ namespace OnDoc.UIControls
sb.dsempfaenger.AcceptChanges();
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
System.IO.File.Delete(filename);
//System.IO.File.Delete(filename);
}
private void RibbonButtonNew_Click(object sender, EventArgs e)
@@ -320,23 +320,31 @@ namespace OnDoc.UIControls
DokTypSelect.ShowDialog(this);
if (DokTypSelect.DialogResult == DialogResult.OK)
{
this.sb = null;
this.sb = new serienbrief();
sb.dokumenttypnr = DokTypSelect.dokumenttypnr;
try
{
this.sb = null;
this.sb = new serienbrief();
sb.dokumenttypnr = DokTypSelect.dokumenttypnr;
update_serienbrief_details(true, sb.dokumenttypnr, 0);
init_empfaenger(0);
vorlagenfelder(sb.dokumenttypnr);
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
update_screen();
update_serienbriefdaten(true);
update_serienbrief_details(true, sb.dokumenttypnr, 0);
init_empfaenger(0);
vorlagenfelder(sb.dokumenttypnr);
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
update_screen();
update_serienbriefdaten(true);
vorlage_auslesen_und_speichern();
vorlage_auslesen_und_speichern();
SerienbriefBearbeitung sbe = new SerienbriefBearbeitung(sb);
sb.dsempfaenger.Tables.Add(sbe.init_used_felder(false).Copy());
sb.dsempfaenger.Tables[sb.dsempfaenger.Tables.Count - 1].TableName = "UsedFelder";
update_serienbriefdaten(false);
treeViewAdv1.Enabled = true;
SerienbriefBearbeitung sbe = new SerienbriefBearbeitung(sb);
sb.dsempfaenger.Tables.Add(sbe.init_used_felder(false).Copy());
sb.dsempfaenger.Tables[sb.dsempfaenger.Tables.Count - 1].TableName = "UsedFelder";
Logging.Logging.Debug("Update Serienbriefdaten", "OnDoc", "");
update_serienbriefdaten(false);
treeViewAdv1.Enabled = true;
}
catch (Exception ex)
{
Logging.Logging.Debug(ex.Message, "OnDoc", "SB Error");
}
}
else