Update 20241215

This commit is contained in:
Stefan Hutter
2024-11-15 14:52:05 +01:00
parent 3c5380f422
commit 69de21ca51
1081 changed files with 28807 additions and 3739 deletions

View File

@@ -33,7 +33,6 @@
this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton();
this.btnDokumenterstellen = new Syncfusion.WinForms.Controls.SfButton();
this.PnlPreview = new System.Windows.Forms.Panel();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.GrpFnkt = new System.Windows.Forms.GroupBox();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
@@ -47,6 +46,8 @@
this.lbledit = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.btnOfficePrint = new System.Windows.Forms.Button();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.ucAllgemeineDokumentParam1 = new OnDoc.UIControls.UCAllgemeineDokumentParam();
this.PnlPreview.SuspendLayout();
this.GrpFnkt.SuspendLayout();
@@ -82,17 +83,10 @@
this.PnlPreview.TabIndex = 19;
this.PnlPreview.Visible = false;
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 123);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(668, 292);
this.docPreview1.TabIndex = 1;
//
// GrpFnkt
//
this.GrpFnkt.BackColor = System.Drawing.Color.SeaShell;
this.GrpFnkt.Controls.Add(this.btnOfficePrint);
this.GrpFnkt.Controls.Add(this.label6);
this.GrpFnkt.Controls.Add(this.label5);
this.GrpFnkt.Controls.Add(this.ribbonButtonVersandstrasse);
@@ -122,6 +116,7 @@
this.label6.Size = new System.Drawing.Size(79, 13);
this.label6.TabIndex = 11;
this.label6.Text = "Versandstrasse";
this.label6.Visible = false;
//
// label5
//
@@ -141,6 +136,7 @@
this.ribbonButtonVersandstrasse.TabIndex = 9;
this.ribbonButtonVersandstrasse.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.ribbonButtonVersandstrasse.UseVisualStyleBackColor = true;
this.ribbonButtonVersandstrasse.Visible = false;
this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.button5_Click);
//
// label4
@@ -232,6 +228,26 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// btnOfficePrint
//
this.btnOfficePrint.Image = ((System.Drawing.Image)(resources.GetObject("btnOfficePrint.Image")));
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.Click += new System.EventHandler(this.btnOfficePrint_Click);
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 123);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(668, 292);
this.docPreview1.TabIndex = 1;
this.docPreview1.ZoomPercentage = 0;
//
// ucAllgemeineDokumentParam1
//
this.ucAllgemeineDokumentParam1.ausDokumentpaket = false;
@@ -317,5 +333,6 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label lbledit;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button btnOfficePrint;
}
}

View File

@@ -19,6 +19,8 @@ using BroadcastListener.Classes;
using BroadcastListener.Interfaces;
using static BroadcastListener.Classes.Factory;
using OnDoc.Helper;
using DOCGEN;
using System.Globalization;
namespace OnDoc.DocMgmt
{
@@ -234,5 +236,19 @@ namespace OnDoc.DocMgmt
{
}
private void btnOfficePrint_Click(object sender, EventArgs e)
{
clsdok dok = new clsdok("", "", "");
OfficePrinter.OnDocOffice op = new OfficePrinter.OnDocOffice();
DocGet gd = new DocGet(AppParams.connectionstring);
{
dok = gd.GetDoc(dokumentid);
}
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename );
op.PrintInWord(Filename, AppParams.wordprintmacro);
}
}
}

View File

@@ -118,6 +118,24 @@
<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

@@ -30,34 +30,64 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmBewilligung));
this.approval1 = new OnDoc.UIControls.Approval();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
// approval1
//
this.approval1.Dock = System.Windows.Forms.DockStyle.Fill;
this.approval1.Location = new System.Drawing.Point(2, 2);
this.approval1.Location = new System.Drawing.Point(2, 33);
this.approval1.Name = "approval1";
this.approval1.Size = new System.Drawing.Size(1608, 948);
this.approval1.Size = new System.Drawing.Size(1608, 917);
this.approval1.TabIndex = 0;
//
// toolStrip1
//
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton1});
this.toolStrip1.Location = new System.Drawing.Point(2, 2);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1608, 31);
this.toolStrip1.TabIndex = 1;
this.toolStrip1.Text = "toolStrip1";
//
// toolStripButton1
//
this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton1.Image = global::OnDoc.Properties.Resources.CloseApplication_24x24_32;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(28, 28);
this.toolStripButton1.Text = "toolStripButton1";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// frmBewilligung
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1612, 952);
this.Controls.Add(this.approval1);
this.Controls.Add(this.toolStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "frmBewilligung";
this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
this.Text = "Unterschriftenprüfung";
this.Load += new System.EventHandler(this.frmBewilligung_Load);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private UIControls.Approval approval1;
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripButton toolStripButton1;
}
}

View File

@@ -26,5 +26,10 @@ namespace OnDoc.DocMgmt
{
this.approval1.Update_Docs(AppParams.CurrentMitarbieter);
}
private void toolStripButton1_Click(object sender, EventArgs e)
{
this.Close();
}
}
}

View File

@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

View File

@@ -88,6 +88,7 @@ namespace OnDoc.DocMgmt
dr["notiz"] = txtnachricht.Text;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
Logging.DocLog.Info("Dokument zur Prüfung", "Dokument zur Prüfung", dokumentid, "", cbboxunterschriftlinks.Text.ToString());
}
if (pxapproval2.Visible == false)
{
@@ -104,6 +105,7 @@ namespace OnDoc.DocMgmt
dr["notiz"] = txtnachricht.Text;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
Logging.DocLog.Info("Dokument zur Prüfung", "Dokument zur Prüfung", dokumentid, "", cbboxunterschriftrechts.Text.ToString());
}
if (pxapproval1.Visible && pxapproval2.Visible)
{
@@ -114,6 +116,7 @@ namespace OnDoc.DocMgmt
{
dB.insert_note(AppParams.CurrentMitarbieter, "Hinweis zur Unterschriftenprüfung", txtnachricht.Text, dokumentid);
}
this.Close();
}