update 20241127

This commit is contained in:
Stefan Hutter
2024-11-27 15:53:34 +01:00
parent 341ea50f06
commit 2a652c7325
11218 changed files with 1987907 additions and 362275 deletions

View File

@@ -29,7 +29,7 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Dokumenterstellung));
Model.clsdocgendata clsdocgendata1 = new Model.clsdocgendata();
Model.clsdocgendata clsdocgendata2 = new Model.clsdocgendata();
this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton();
this.btnDokumenterstellen = new Syncfusion.WinForms.Controls.SfButton();
this.PnlPreview = new System.Windows.Forms.Panel();
@@ -119,14 +119,13 @@
//
// btnOfficePrint
//
this.btnOfficePrint.Image = ((System.Drawing.Image)(resources.GetObject("btnOfficePrint.Image")));
this.btnOfficePrint.Image = global::OnDoc.Properties.Resources.Printer_48x48_32;
this.btnOfficePrint.Location = new System.Drawing.Point(419, 19);
this.btnOfficePrint.Name = "btnOfficePrint";
this.btnOfficePrint.Size = new System.Drawing.Size(74, 79);
this.btnOfficePrint.TabIndex = 12;
this.btnOfficePrint.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.btnOfficePrint.UseVisualStyleBackColor = true;
this.btnOfficePrint.Visible = false;
this.btnOfficePrint.Click += new System.EventHandler(this.btnOfficePrint_Click);
//
// label6
@@ -147,6 +146,7 @@
this.label5.Size = new System.Drawing.Size(60, 13);
this.label5.TabIndex = 10;
this.label5.Text = "Archivieren";
this.label5.Visible = false;
//
// ribbonButtonVersandstrasse
//
@@ -256,29 +256,29 @@
this.ucAllgemeineDokumentParam1.bpperson_error_type = 0;
this.ucAllgemeineDokumentParam1.check_error = "";
this.ucAllgemeineDokumentParam1.checkpartner = true;
clsdocgendata1.bezeichnung = null;
clsdocgendata1.digitaleunterschrift = false;
clsdocgendata1.dokumentdatum = null;
clsdocgendata1.dokumenttypnr = null;
clsdocgendata1.dokumentwerte = null;
clsdocgendata1.ersteller = null;
clsdocgendata1.erstelling_in_office = false;
clsdocgendata1.erstellungsart = Model.Erstellungsart.DokumentBearbeiten;
clsdocgendata1.frormularOhneUnterschrift = false;
clsdocgendata1.inhaberadresse = null;
clsdocgendata1.logo = "";
clsdocgendata1.partnernr = null;
clsdocgendata1.postzustellung = null;
clsdocgendata1.status = null;
clsdocgendata1.team = null;
clsdocgendata1.unterschriftLinks = null;
clsdocgendata1.unterschriftRehts = null;
clsdocgendata1.verantwortlich = null;
clsdocgendata1.versandstrasse_moeglich = false;
clsdocgendata1.zustaendigkube = null;
clsdocgendata1.zustaendigmitarbeiter = null;
clsdocgendata1.zustelladresse = null;
this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata1;
clsdocgendata2.bezeichnung = null;
clsdocgendata2.digitaleunterschrift = false;
clsdocgendata2.dokumentdatum = null;
clsdocgendata2.dokumenttypnr = null;
clsdocgendata2.dokumentwerte = null;
clsdocgendata2.ersteller = null;
clsdocgendata2.erstelling_in_office = false;
clsdocgendata2.erstellungsart = Model.Erstellungsart.DokumentBearbeiten;
clsdocgendata2.frormularOhneUnterschrift = false;
clsdocgendata2.inhaberadresse = null;
clsdocgendata2.logo = "";
clsdocgendata2.partnernr = null;
clsdocgendata2.postzustellung = null;
clsdocgendata2.status = null;
clsdocgendata2.team = null;
clsdocgendata2.unterschriftLinks = null;
clsdocgendata2.unterschriftRehts = null;
clsdocgendata2.verantwortlich = null;
clsdocgendata2.versandstrasse_moeglich = false;
clsdocgendata2.zustaendigkube = null;
clsdocgendata2.zustaendigmitarbeiter = null;
clsdocgendata2.zustelladresse = null;
this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata2;
this.ucAllgemeineDokumentParam1.dokumenttypnr = 0;
this.ucAllgemeineDokumentParam1.genertated_dokumentid = null;
this.ucAllgemeineDokumentParam1.interop = false;

View File

@@ -122,7 +122,7 @@ namespace OnDoc.DocMgmt
Logging.DocLog.Info("Dokumenterstellung", "frmDokumenterstellung", dokumentid, ucAllgemeineDokumentParam1.partnernr.ToString(), "Dokumenterstellung");
if (dokumentid != "")
{
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir);
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey);
clsdok dok = new clsdok("", "", "");
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice);

View File

@@ -118,24 +118,6 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnOfficePrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAAuRJREFUaEPt
2cvLDXEcx/EjkZJYSESytsGC5JJLCv8AWYjcV7JRyjWl/AFPIUvJQor8ATZkoSgUOym55p6Q6/uT89XX
75n5nTkz85uZhU+96jlzTqff58x3fnOe5+n1MwWf8atmH7AEyZOqgLzDUiRNygKiEknPhC/wFhNQJScR
lkg6Tk0UkGTjlLLARbxxj5OMU8oCB7AQr92x2scpdQFFJcIzUds4NVFAWYQk45SywBmsdPbjB+z5WsYp
ZYEidCbmoHTaLiCLUTp1F9iFawW8RycLFM1N/C+gdK3AZMz482OxdKmAFn8dDzFTB4qkKwUm4YY79gCF
SsQKzIW/EVWxDD6+wFr4xRudiVmIJlbgAsI3LUvv7eMLPHE//4S/Ww8cpy4UMFr8IWyFLxEdp1iBI8i6
CZVxFT5hAS3+ICxb8A32fO44tXERa7d5BFucXEEYnYmwxKgz0XSBcLcxGpmdCHMM/nW3MBZ/02QBffJ+
8Rqb5+6xSuyGZQFewZ7/iBX4J7ECa7CnJlqYblK2GLtgp+Ne/5h8h16rxb/sHxP97rAKoxIrUOcu5Nni
x0BRifuw53UmtBZ7rE8+c/FK0wXC3cYyDb6EyRwbn1iB7ThVgT4Av5/bJ5+XdbDXSu7Y+KS6iMPdJhyb
MPMQXrADF6+kKJC122SNjaXQbpOXugvYV2K/+NjYFN5t8hIrsBea42HcRbj42sfGJ1ZAC7I3H1bSsfFJ
USD52PjECqzHvgEO4wvCxRcdG9mA0qlyEU9Eld3GtPZXiY2wRQw7Nl5rBc7BFqE77zBj47VSYByewhax
HFnJGxuvtgJfcRanCzgPW8ALjEeY2Nh4tRUoS9ttmEFj47VeYDM0/7OxA5fxCVmvzVKpgGZeu8fRIYzA
L0AjdRv+q7PRTeoEst7HDPzjVd3ZhnChWR6j9B02ZS4ha8G6I+ubqP65Nx+djEbO/7fxGXQ/2ISp6HxW
4w6OQxdf1vbZQHq931ZtB5WroluuAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonArchiv.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAADSdJREFUaEPV

View File

@@ -207,7 +207,7 @@
this.RibbonButtonGenerieren.LargeImage = global::OnDoc.Properties.Resources.DokumenteGenerieren_32x32_321;
this.RibbonButtonGenerieren.Name = "RibbonButtonGenerieren";
this.RibbonButtonGenerieren.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonGenerieren.SmallImage")));
this.RibbonButtonGenerieren.Text = "Dokumente Generieren";
this.RibbonButtonGenerieren.Text = "Dokumente_generieren";
this.RibbonButtonGenerieren.Click += new System.EventHandler(this.RibbonButtonGenerieren_Click);
//
// RibbonButtonGenerate
@@ -366,8 +366,10 @@
this.dokList1.partnernr = 0;
this.dokList1.profilnr = 0;
this.dokList1.runmacros = false;
this.dokList1.Search_Docid = "";
this.dokList1.selected_cellvalue = null;
this.dokList1.selected_dokumentid = null;
this.dokList1.selected_partnernr = null;
this.dokList1.Size = new System.Drawing.Size(477, 660);
this.dokList1.TabIndex = 0;
//

View File

@@ -425,7 +425,7 @@ namespace OnDoc.DocMgmt
if (dokumentid != "")
{
Logging.DocLog.Info("Dokument erstellt", "Dokumentpaket", dokumentid, uc.partnernr.ToString(), "Dokument erstellt");
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir);
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI,AppParams.apikey);
clsdok dok = new clsdok("", "", "");
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);

View File

@@ -204,7 +204,7 @@ namespace OnDoc.DocMgmt
if (dokumentid != "")
{
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir);
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey);
clsdok dok = new clsdok("", "", "");
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);

View File

@@ -478,6 +478,17 @@ namespace OnDoc.UIControls
try { sb.postzustellung = Convert.ToInt32(cbboxpostzustellung.SelectedValue.ToString()); } catch { sb.postzustellung = 0; }
try { sb.unterschriftlinks = Convert.ToInt32(cbboxunterschriftlinks.SelectedValue.ToString()); } catch { sb.unterschriftlinks = 0; }
try { sb.unterschriftrechts = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue.ToString()); } catch { sb.unterschriftrechts = 0; }
try
{
if (cbdigitaleunterschrfiten.Checked)
{
sb.faksimile_unterschrfit = "True";
}
else
{
sb.faksimile_unterschrfit = "False";
}
}catch { sb.faksimile_unterschrfit = "False"; }
try { sb.team = Convert.ToInt32(cbboxteam.SelectedValue.ToString()); } catch { sb.team = 0; }
sb.archivdatum = Convert.ToDateTime(DateDokumentDatum.Value);
sb.dokumentdatum = Convert.ToDateTime(DateDokumentDatum.Value);
@@ -1066,7 +1077,7 @@ namespace OnDoc.UIControls
string filename = dokumentid + ".pdf";
string pdfdoc = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid));
string pdfdoc = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey));
//string filename = "SB_" + sb.serienbriefnr.ToString() + vorlagendaten.Rows[i]["intEintragnr"].ToString() + ".pdf";
fh.SaveBase64ToFile(pdfdoc, AppParams.tempdir + filename);