Update 20241118

This commit is contained in:
Stefan Hutter
2024-11-18 15:21:58 +01:00
parent 69de21ca51
commit 194a97416c
120 changed files with 635 additions and 61 deletions

View File

@@ -100,7 +100,10 @@ namespace OnDoc.DocMgmt
private void sfButton2_Click(object sender, EventArgs e)
{
Cursor = Cursors.WaitCursor;
Dokument_Erstellen();
Cursor = Cursors.Default;
}
public void Dokument_Erstellen()
{
@@ -121,11 +124,11 @@ namespace OnDoc.DocMgmt
{
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir);
clsdok dok = new clsdok("", "", "");
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice);
interop = ucAllgemeineDokumentParam1.interop;
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
if (ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten || ucAllgemeineDokumentParam1.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
@@ -133,11 +136,6 @@ namespace OnDoc.DocMgmt
db.Save_To_DB(dokdata.Dokumentid, filename);
db = null;
DocFunction = 1;
//if (dok.extension.Substring(0,1).ToUpper() == "D") { System.Diagnostics.Process.Start("winword.exe", filename); }
//if (dok.extension.Substring(0, 1).ToUpper() == "X") { System.Diagnostics.Process.Start("excel.exe", filename); }
//clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
this.Close();
return;
}