shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 20250406

Browse Source
This commit is contained in:
Stefan Hutter
2025-04-06 07:39:53 +02:00
parent 632b97c292
commit 42c86d957c
155 changed files with 1725 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
API_NetFramework/bin/DOCGEN.dll
View File

Binary file not shown.

BIN
API_NetFramework/bin/DOCGEN.pdb
View File

Binary file not shown.

BIN
API_NetFramework/bin/OnDocOffice.dll
View File

Binary file not shown.

BIN
API_NetFramework/bin/OnDocOffice.pdb
View File

Binary file not shown.

BIN
API_NetFramework/bin/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/bin/OnDoc_NetFramework.pdb
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb
View File

Binary file not shown.

9
Client/Client.csproj
View File

@@ -555,6 +555,12 @@
<Compile Include="DocMgmt\frmDokumentpaketNeugenerierung.Designer.cs">
<DependentUpon>frmDokumentpaketNeugenerierung.cs</DependentUpon>
</Compile>
<Compile Include="DocMgmt\FrmDokumentwerte.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DocMgmt\FrmDokumentwerte.Designer.cs">
<DependentUpon>FrmDokumentwerte.cs</DependentUpon>
</Compile>
<Compile Include="DocMgmt\frmNote.cs">
<SubType>Form</SubType>
</Compile>
@@ -807,6 +813,9 @@
<EmbeddedResource Include="DocMgmt\frmDokumentpaketNeugenerierung.resx">
<DependentUpon>frmDokumentpaketNeugenerierung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DocMgmt\FrmDokumentwerte.resx">
<DependentUpon>FrmDokumentwerte.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DocMgmt\frmNote.resx">
<DependentUpon>frmNote.cs</DependentUpon>
</EmbeddedResource>

6
Client/Diverses/SplashScreen.Designer.cs generated
View File

@@ -60,11 +60,11 @@
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Location = new System.Drawing.Point(147, 330);
this.label2.Location = new System.Drawing.Point(157, 330);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(150, 26);
this.label2.Size = new System.Drawing.Size(134, 26);
this.label2.TabIndex = 2;
this.label2.Text = "31. März 2025";
this.label2.Text = "6. April 2025";
//
// SplashScreen
//

33
Client/DocMgmt/DokTypDetails.Designer.cs generated
View File

@@ -30,29 +30,56 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DokTypDetails));
this.dokTypDetail1 = new OnDoc.UIControls.DokTypDetail();
this.button1 = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// dokTypDetail1
//
this.dokTypDetail1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dokTypDetail1.dokumentpaket = false;
this.dokTypDetail1.dokumenttypnr = 0;
this.dokTypDetail1.Location = new System.Drawing.Point(2, 2);
this.dokTypDetail1.einzeldokument = 0;
this.dokTypDetail1.Location = new System.Drawing.Point(2, 47);
this.dokTypDetail1.Name = "dokTypDetail1";
this.dokTypDetail1.Size = new System.Drawing.Size(1144, 777);
this.dokTypDetail1.Size = new System.Drawing.Size(1144, 732);
this.dokTypDetail1.TabIndex = 0;
//
// button1
//
this.button1.Location = new System.Drawing.Point(6, 12);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(122, 23);
this.button1.TabIndex = 1;
this.button1.Text = "Office-Datei öffnen";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox1.Location = new System.Drawing.Point(2, 2);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(1144, 45);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
//
// DokTypDetails
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1148, 781);
this.Controls.Add(this.dokTypDetail1);
this.Controls.Add(this.groupBox1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "DokTypDetails";
this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
this.Text = "Vorlagen_Details";
this.Load += new System.EventHandler(this.DokTypDetails_Load);
this.groupBox1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -60,5 +87,7 @@
#endregion
private UIControls.DokTypDetail dokTypDetail1;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.GroupBox groupBox1;
}
}

10
Client/DocMgmt/DokTypDetails.cs
View File

@@ -66,10 +66,20 @@ namespace OnDoc.DocMgmt
private void DokTypDetails_Load(object sender, EventArgs e)
{
this.groupBox1.Visible = true;
if (this.dokumentpaket == true)
{
groupBox1.Visible = false;
}
dokTypDetail1.dokumenttypnr=dokumenttypnr;
dokTypDetail1.einzeldokument = einzeldokument;
dokTypDetail1.dokumentpaket = dokumentpaket;
dokTypDetail1.Refresh_Details();
}
private void button1_Click(object sender, EventArgs e)
{
dokTypDetail1.opensource();
}
}
}

18
Client/DocMgmt/DokTypSelect.Designer.cs generated
View File

@@ -324,33 +324,34 @@ namespace OnDoc.DocMgmt
//
// contextMenuStripVorlagen
//
this.contextMenuStripVorlagen.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStripVorlagen.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ctxmenuerstellen,
this.zuFavoritenHinzufügenToolStripMenuItem,
this.detailsAnzeigenToolStripMenuItem});
this.contextMenuStripVorlagen.Name = "contextMenuStrip1";
this.contextMenuStripVorlagen.Size = new System.Drawing.Size(204, 70);
this.contextMenuStripVorlagen.Size = new System.Drawing.Size(208, 82);
this.contextMenuStripVorlagen.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
//
// ctxmenuerstellen
//
this.ctxmenuerstellen.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
this.ctxmenuerstellen.Name = "ctxmenuerstellen";
this.ctxmenuerstellen.Size = new System.Drawing.Size(203, 22);
this.ctxmenuerstellen.Size = new System.Drawing.Size(207, 26);
this.ctxmenuerstellen.Text = "Erstellen";
this.ctxmenuerstellen.Click += new System.EventHandler(this.ctxmenuerstellen_Click);
//
// zuFavoritenHinzufügenToolStripMenuItem
//
this.zuFavoritenHinzufügenToolStripMenuItem.Name = "zuFavoritenHinzufügenToolStripMenuItem";
this.zuFavoritenHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(203, 22);
this.zuFavoritenHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(207, 26);
this.zuFavoritenHinzufügenToolStripMenuItem.Text = "Zu Favoriten hinzufügen";
this.zuFavoritenHinzufügenToolStripMenuItem.Click += new System.EventHandler(this.zuFavoritenHinzufügenToolStripMenuItem_Click);
//
// detailsAnzeigenToolStripMenuItem
//
this.detailsAnzeigenToolStripMenuItem.Name = "detailsAnzeigenToolStripMenuItem";
this.detailsAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(203, 22);
this.detailsAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(207, 26);
this.detailsAnzeigenToolStripMenuItem.Text = "Details anzeigen";
this.detailsAnzeigenToolStripMenuItem.Click += new System.EventHandler(this.detailsAnzeigenToolStripMenuItem_Click);
//
@@ -421,6 +422,7 @@ namespace OnDoc.DocMgmt
//
// contextMenuStripFavoriten
//
this.contextMenuStripFavoriten.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStripFavoriten.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.neuerOrdnerAufObesterEbeneToolStripMenuItem,
this.neuerUnterordnerToolStripMenuItem,
@@ -512,6 +514,7 @@ namespace OnDoc.DocMgmt
// toolStrip1
//
this.toolStrip1.AutoSize = false;
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsbtnNewRoot,
this.tsbtnNewFolder,
@@ -619,6 +622,7 @@ namespace OnDoc.DocMgmt
this.toolStrip2.AutoSize = false;
this.toolStrip2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.toolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
this.toolStrip2.ImageScalingSize = new System.Drawing.Size(20, 20);
this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel1,
this.toolstriptextboxsearch,
@@ -653,7 +657,7 @@ namespace OnDoc.DocMgmt
this.toolStripButton1.Image = global::OnDoc.Properties.Resources.Search_24x24_32;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(23, 45);
this.toolStripButton1.Size = new System.Drawing.Size(24, 45);
this.toolStripButton1.Text = "Suchen";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
@@ -663,7 +667,7 @@ namespace OnDoc.DocMgmt
this.toolStripButton2.Image = global::OnDoc.Properties.Resources.CloseApplication_24x24_32;
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(23, 45);
this.toolStripButton2.Size = new System.Drawing.Size(24, 45);
this.toolStripButton2.Text = "Suchfeld initialisieren";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
@@ -691,7 +695,7 @@ namespace OnDoc.DocMgmt
this.toolStripButton4.Image = global::OnDoc.Properties.Resources.CloseApplication_24x24_32;
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(23, 45);
this.toolStripButton4.Size = new System.Drawing.Size(24, 45);
this.toolStripButton4.Text = "Fachverantwortung initialisieren";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//

2
Client/DocMgmt/DokTypSelect.resx
View File

@@ -283,7 +283,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACo
DQAAAk1TRnQBSQFMAgEBBwEAAVgBAQFYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DQAAAk1TRnQBSQFMAgEBBwEAAWgBAQFoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

16
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -24,6 +24,8 @@ using System.Globalization;
using System.Threading;
using Syncfusion.Windows.Forms;
using Syncfusion.Grouping;
using System.Xml.Linq;
using System.Reflection.Emit;
namespace OnDoc.DocMgmt
{
@@ -195,13 +197,25 @@ namespace OnDoc.DocMgmt
dB = null;
}
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, AppParams.RESTURI, AppParams.apikey,AppParams.Office_Fill_DocIO);
clsdok dok = new clsdok("", "", "", "");
Logging.Logging.Debug("Generate_Doc_EDOKA", "Dokumenterstellung", dokumentid);
//Generator.generate_docdata(dokumentid, ref dokdata);
//FrmDokumentwerte dw = new FrmDokumentwerte();
//dw.docData = dokdata;
//dw.ShowDialog();
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1, AppParams.vbvorlagenmanagement=="Yes",this.editdoc);
Logging.Logging.Debug("Generate_Doc_EDOKA - Ende", "Dokumenterstellung", dokumentid);
if (dok.extension == "QDF") {

42
Client/DocMgmt/Dokumentpaket.Designer.cs generated
View File

@@ -44,6 +44,7 @@
this.ribbonButtonNew = new System.Windows.Forms.RibbonButton();
this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonGenerieren = new System.Windows.Forms.RibbonButton();
this.RibbonButtonEInzelgenerierung = new System.Windows.Forms.RibbonButton();
this.RibbonButtonGenerate = new System.Windows.Forms.RibbonButton();
this.sfListView1 = new Syncfusion.WinForms.ListView.SfListView();
this.TabControlDokuments = new Syncfusion.Windows.Forms.Tools.TabControlAdv();
@@ -152,7 +153,7 @@
this.ribbon1.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013;
this.ribbon1.OrbVisible = false;
this.ribbon1.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F);
this.ribbon1.Size = new System.Drawing.Size(2120, 121);
this.ribbon1.Size = new System.Drawing.Size(1536, 121);
this.ribbon1.TabIndex = 17;
this.ribbon1.Tabs.Add(this.ribbonTab1);
this.ribbon1.TabSpacing = 4;
@@ -202,6 +203,7 @@
//
this.ribbonPanel3.ButtonMoreVisible = false;
this.ribbonPanel3.Items.Add(this.RibbonButtonGenerieren);
this.ribbonPanel3.Items.Add(this.RibbonButtonEInzelgenerierung);
this.ribbonPanel3.Name = "ribbonPanel3";
this.ribbonPanel3.Text = "";
//
@@ -210,10 +212,21 @@
this.RibbonButtonGenerieren.Image = global::OnDoc.Properties.Resources.DokumenteGenerieren_32x32_321;
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.SmallImage = global::OnDoc.Properties.Resources.DokumenteGenerieren_24x24_321;
this.RibbonButtonGenerieren.Text = "Dokumente generieren";
this.RibbonButtonGenerieren.ToolTip = "Alle Dokumente sofort generieren";
this.RibbonButtonGenerieren.Click += new System.EventHandler(this.RibbonButtonGenerieren_Click);
//
// RibbonButtonEInzelgenerierung
//
this.RibbonButtonEInzelgenerierung.Image = global::OnDoc.Properties.Resources.DokumenteGenerieren_32x32_321;
this.RibbonButtonEInzelgenerierung.LargeImage = global::OnDoc.Properties.Resources.DokumenteGenerieren_32x32_321;
this.RibbonButtonEInzelgenerierung.Name = "RibbonButtonEInzelgenerierung";
this.RibbonButtonEInzelgenerierung.SmallImage = global::OnDoc.Properties.Resources.DokumenteGenerieren_24x24_321;
this.RibbonButtonEInzelgenerierung.Text = "Einzeln generieren";
this.RibbonButtonEInzelgenerierung.ToolTip = "Dokumente nacheinander, einzeln generieren";
this.RibbonButtonEInzelgenerierung.Click += new System.EventHandler(this.RibbonButtonEInzelgenerierung_Click);
//
// RibbonButtonGenerate
//
this.RibbonButtonGenerate.Image = global::OnDoc.Properties.Resources.DokumenteGenerieren_32x32_321;
@@ -229,7 +242,7 @@
this.sfListView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfListView1.Location = new System.Drawing.Point(0, 149);
this.sfListView1.Name = "sfListView1";
this.sfListView1.Size = new System.Drawing.Size(249, 530);
this.sfListView1.Size = new System.Drawing.Size(249, 524);
this.sfListView1.TabIndex = 18;
this.sfListView1.Text = "sfListView1";
this.sfListView1.SelectionChanged += new System.EventHandler<Syncfusion.WinForms.ListView.Events.ItemSelectionChangedEventArgs>(this.sfListView1_SelectionChanged);
@@ -243,7 +256,7 @@
this.TabControlDokuments.Dock = System.Windows.Forms.DockStyle.Fill;
this.TabControlDokuments.Location = new System.Drawing.Point(3, 16);
this.TabControlDokuments.Name = "TabControlDokuments";
this.TabControlDokuments.Size = new System.Drawing.Size(1069, 660);
this.TabControlDokuments.Size = new System.Drawing.Size(1069, 654);
this.TabControlDokuments.TabIndex = 19;
this.TabControlDokuments.ThemeStyle.PrimitiveButtonStyle.DisabledNextPageImage = null;
//
@@ -254,7 +267,7 @@
this.tabPageAdv1.Location = new System.Drawing.Point(5, 25);
this.tabPageAdv1.Name = "tabPageAdv1";
this.tabPageAdv1.ShowCloseButton = true;
this.tabPageAdv1.Size = new System.Drawing.Size(1059, 630);
this.tabPageAdv1.Size = new System.Drawing.Size(1059, 624);
this.tabPageAdv1.Text = "tabPageAdv1";
this.tabPageAdv1.ThemesEnabled = false;
//
@@ -293,9 +306,9 @@
//
this.pnlfooter.Controls.Add(this.progressBarAdv1);
this.pnlfooter.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pnlfooter.Location = new System.Drawing.Point(2, 802);
this.pnlfooter.Location = new System.Drawing.Point(2, 796);
this.pnlfooter.Name = "pnlfooter";
this.pnlfooter.Size = new System.Drawing.Size(2120, 47);
this.pnlfooter.Size = new System.Drawing.Size(1536, 47);
this.pnlfooter.TabIndex = 20;
//
// progressBarAdv1
@@ -313,7 +326,7 @@
System.Drawing.Color.Empty};
this.progressBarAdv1.Name = "progressBarAdv1";
this.progressBarAdv1.SegmentWidth = 12;
this.progressBarAdv1.Size = new System.Drawing.Size(2120, 23);
this.progressBarAdv1.Size = new System.Drawing.Size(1536, 23);
this.progressBarAdv1.TabIndex = 0;
this.progressBarAdv1.Text = "progressBarGeneraate";
this.progressBarAdv1.Visible = false;
@@ -326,7 +339,7 @@
this.pnlleft.Dock = System.Windows.Forms.DockStyle.Left;
this.pnlleft.Location = new System.Drawing.Point(2, 123);
this.pnlleft.Name = "pnlleft";
this.pnlleft.Size = new System.Drawing.Size(249, 679);
this.pnlleft.Size = new System.Drawing.Size(249, 673);
this.pnlleft.TabIndex = 21;
//
// groupBox1
@@ -373,7 +386,7 @@
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left;
this.groupBox2.Location = new System.Drawing.Point(251, 123);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(1075, 679);
this.groupBox2.Size = new System.Drawing.Size(1075, 673);
this.groupBox2.TabIndex = 22;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Dokumente zur Erstellung";
@@ -384,7 +397,7 @@
this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox3.Location = new System.Drawing.Point(1326, 123);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(796, 679);
this.groupBox3.Size = new System.Drawing.Size(212, 673);
this.groupBox3.TabIndex = 23;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Generierte Dokumente";
@@ -400,20 +413,22 @@
this.dokList1.mitarbeiternr = 0;
this.dokList1.Name = "dokList1";
this.dokList1.partnernr = 0;
this.dokList1.personbezeichnung = "";
this.dokList1.personnr = 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(790, 660);
this.dokList1.Size = new System.Drawing.Size(206, 654);
this.dokList1.TabIndex = 0;
//
// Dokumentpaket
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(2124, 851);
this.ClientSize = new System.Drawing.Size(1540, 845);
this.Controls.Add(this.panelword);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
@@ -478,5 +493,6 @@
private System.Windows.Forms.Panel panelword;
private System.Windows.Forms.Label lbldokumentname;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.RibbonButton RibbonButtonEInzelgenerierung;
}
}

298
Client/DocMgmt/Dokumentpaket.cs
View File

@@ -41,7 +41,7 @@ namespace OnDoc.DocMgmt
private int profilnr {get;set;}
public int dokumentpaketnr { get; set; } = 0;
public int partnernr { get; set; } = 0;
private bool EinzelGenerierung { get; set; } = false;
public Dokumentpaket()
{
InitializeComponent();
@@ -471,155 +471,178 @@ namespace OnDoc.DocMgmt
progressBarAdv1.Visible = true;
Generate_Docs();
}
private void Generate_Docs(string idokumentid="",UCAllgemeineDokumentParam iuc = null) {
private void Generate_Docs(string idokumentid = "", UCAllgemeineDokumentParam iuc = null)
{
int counter = 0;
string filter = "dokumentid in ('";
foreach (TabPageAdv tab in TabControlDokuments.TabPages)
{
progressBarAdv1.Value = progressBarAdv1.Value + 1;
Application.DoEvents();
//Thread.Sleep(1000);
try {
progressBarAdv1.Value = progressBarAdv1.Value + 1;
Application.DoEvents();
//Thread.Sleep(1000);
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
if (((idokumentid == "" || uc.genertated_dokumentid == idokumentid) && iuc==null) || uc==iuc)
{
//uc.Set_Edit_later();
uc.Update_DocGenData();
clsDocData dokdata = new clsDocData();
uc.update_dokdata(ref dokdata);
uc.update_partner();
DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring);
string dokumentid = docgen.GenDocID(dokdata, false, "");
dokdata.Dokumentid = dokumentid;
uc.genertated_dokumentid = dokumentid;
uc.Show_Neugenerieren();
filter = filter + dokumentid + "','";
dokumentid = dokdata.Dokumentid;
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentPreview) { uc.docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
if (dokumentid != "")
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
if (((idokumentid == "" || uc.genertated_dokumentid == idokumentid) && iuc == null) || uc == iuc)
{
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, AppParams.RESTURI,AppParams.apikey,AppParams.Office_Fill_DocIO);
clsdok dok = new clsdok("", "", "", "");
if (dokdata.barcode_type == "1")
//uc.Set_Edit_later();
uc.Update_DocGenData();
clsDocData dokdata = new clsDocData();
uc.update_dokdata(ref dokdata);
uc.update_partner();
DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring);
string dokumentid = docgen.GenDocID(dokdata, false, "");
dokdata.Dokumentid = dokumentid;
uc.genertated_dokumentid = dokumentid;
uc.Show_Neugenerieren();
filter = filter + dokumentid + "','";
dokumentid = dokdata.Dokumentid;
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentPreview) { uc.docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
if (dokumentid != "")
{
DB dB = new DB(AppParams.connectionstring);
dB.clear_parameter();
dB.add_parameter("@dokumentid", dokumentid);
dB.add_parameter("@DokumentidBR", "");
dB.add_parameter("@BARCODEFONTNAME", "");
dB.add_parameter("@BARCODEFONTSIZE", "");
dB.add_parameter("@BarcodeKantenlaenge", "");
dB.Get_Tabledata("sp_get_OnDoc_barcodetype_and_value", true, false);
dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][1].ToString();
dokdata.barcode_formatn = dB.dsdaten.Tables[0].Rows[0][3].ToString();
dokdata.barcode_text = dB.dsdaten.Tables[0].Rows[0][4].ToString();
dokdata.barcode_kantenlaenge = dB.dsdaten.Tables[0].Rows[0][5].ToString();
dokdata.Zusatz_Font = dB.dsdaten.Tables[0].Rows[0][6].ToString();
dokdata.Zusatz_FontSize = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][7]);
dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][8]);
dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][9]);
//dokdata.barcode_type= dB.dsdaten.Tables[0].Rows[0][3].ToString();
string sql = "";
sql = "select bcpt, bcpl, bcw, bch, bchorizontal from OnDocBarcodeMpping ";
sql = sql + "where orig_bcpt = " + dokdata.barcode_top.ToString() + " and orig_bcpl=" + dokdata.barcode_left.ToString() + " ";
sql = sql + "and orig_bcw=" + dokdata.barcode_width.ToString() + " and orig_bch=" + dokdata.barcode_height.ToString();
dB.Get_Tabledata(sql, false, true);
if (dB.dsdaten.Tables[0].Rows.Count > 0)
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, AppParams.RESTURI, AppParams.apikey, AppParams.Office_Fill_DocIO);
clsdok dok = new clsdok("", "", "", "");
if (dokdata.barcode_type == "1")
{
Logging.Logging.Debug("Barcode-Übersteuerung" + dokdata.DokumenttypNr.ToString(), "Dokumenterstellung", "");
dokdata.barcode_left = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpl"]);
dokdata.barcode_top = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpt"]);
dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcw"]);
dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bch"]);
DB dB = new DB(AppParams.connectionstring);
dB.clear_parameter();
dB.add_parameter("@dokumentid", dokumentid);
dB.add_parameter("@DokumentidBR", "");
dB.add_parameter("@BARCODEFONTNAME", "");
dB.add_parameter("@BARCODEFONTSIZE", "");
dB.add_parameter("@BarcodeKantenlaenge", "");
dB.Get_Tabledata("sp_get_OnDoc_barcodetype_and_value", true, false);
dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][1].ToString();
dokdata.barcode_formatn = dB.dsdaten.Tables[0].Rows[0][3].ToString();
dokdata.barcode_text = dB.dsdaten.Tables[0].Rows[0][4].ToString();
dokdata.barcode_kantenlaenge = dB.dsdaten.Tables[0].Rows[0][5].ToString();
dokdata.Zusatz_Font = dB.dsdaten.Tables[0].Rows[0][6].ToString();
dokdata.Zusatz_FontSize = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][7]);
dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][8]);
dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][9]);
//dokdata.barcode_type= dB.dsdaten.Tables[0].Rows[0][3].ToString();
string sql = "";
sql = "select bcpt, bcpl, bcw, bch, bchorizontal from OnDocBarcodeMpping ";
sql = sql + "where orig_bcpt = " + dokdata.barcode_top.ToString() + " and orig_bcpl=" + dokdata.barcode_left.ToString() + " ";
sql = sql + "and orig_bcw=" + dokdata.barcode_width.ToString() + " and orig_bch=" + dokdata.barcode_height.ToString();
dB.Get_Tabledata(sql, false, true);
if (dB.dsdaten.Tables[0].Rows.Count > 0)
{
Logging.Logging.Debug("Barcode-Übersteuerung" + dokdata.DokumenttypNr.ToString(), "Dokumenterstellung", "");
dokdata.barcode_left = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpl"]);
dokdata.barcode_top = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpt"]);
dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcw"]);
dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bch"]);
}
dB = null;
}
if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
{
//panelword.Visible = true;
lbldokumentname.Text = tab.Text;
Application.DoEvents();
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, true, AppParams.OfficeSpleep1, AppParams.vbvorlagenmanagement == "Yes");
//panelword.Visible = false;
Application.DoEvents();
}
else
{
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
}
dB = null;
}
if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
{
//panelword.Visible = true;
lbldokumentname.Text = tab.Text;
Application.DoEvents();
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata,true,AppParams.OfficeSpleep1,AppParams.vbvorlagenmanagement=="Yes");
//panelword.Visible = false;
Application.DoEvents();
}
else
{
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
}
if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
filename = AppParams.tempdir + dok.dokumentname;
string filename_temp = filename + ".tmp";
System.IO.File.WriteAllBytes(filename_temp, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename_temp);
db.Dok_in_Bearbeitung(1,dokdata.Dokumentid, AppParams.CurrentMitarbeiter);
db = null;
System.IO.File.Delete(filename_temp);
Logging.Logging.Debug("Before Processwatch","DonDoc",dokumentid);
clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
}
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
//filename = AppParams.tempdir + dok.dokumentname;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename);
db = null;
switch (dok.doktype)
if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
{
case "W":
System.Diagnostics.Process.Start("winword.exe", filename);
clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
break;
case "X":
System.Diagnostics.Process.Start("excel.exe", " " + filename);
clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Excel");
break;
case "P":
System.Diagnostics.Process.Start(filename);
break;
default:
break;
}
}
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF)
{
//Generator.DocToPDF(dokumentid, ref dok);
dok.extension = "pdf";
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename);
}
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
filename = AppParams.tempdir + dok.dokumentname;
string filename_temp = filename + ".tmp";
System.IO.File.WriteAllBytes(filename_temp, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename_temp);
db.Dok_in_Bearbeitung(1, dokdata.Dokumentid, AppParams.CurrentMitarbeiter);
db = null;
System.IO.File.Delete(filename_temp);
Logging.Logging.Debug("Before Processwatch", "DonDoc", dokumentid);
clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
}
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
//filename = AppParams.tempdir + dok.dokumentname;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename);
db = null;
switch (dok.doktype)
{
case "W":
System.Diagnostics.Process.Start("winword.exe", filename);
clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
break;
case "X":
System.Diagnostics.Process.Start("excel.exe", " " + filename);
clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Excel");
break;
case "P":
System.Diagnostics.Process.Start(filename);
break;
default:
break;
}
}
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF)
{
//Generator.DocToPDF(dokumentid, ref dok);
dok.extension = "pdf";
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename);
}
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentSpäterBearbeiten)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename);
db = null;
}
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentSpäterBearbeiten)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename);
db = null;
}
}
else
{
filter = filter + uc.genertated_dokumentid + "','";
}
counter = counter + 1;
if (this.EinzelGenerierung)
{
if (counter < TabControlDokuments.TabPages.Count)
{
if (MessageBox.Show("Nächstes Dokument generieren oder Generierung abbrechen?", "Dokumentgenerierung", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.Cancel)
{
progressBarAdv1.Visible = false;
filter = filter.Substring(0, filter.Length - 2) + ")";
dokList1.datafilter = filter;
dokList1.refresh_dokumente("view_dokumentpaket");
dokList1.refresh_dokumente();
return;
}
}
}
}
else
{
filter = filter + uc.genertated_dokumentid + "','";
}
catch { }
}
progressBarAdv1.Visible = false;
filter = filter.Substring(0, filter.Length - 2) + ")";
dokList1.datafilter = filter;
@@ -661,5 +684,12 @@ namespace OnDoc.DocMgmt
{
//int a = 1;
}
private void RibbonButtonEInzelgenerierung_Click(object sender, EventArgs e)
{
this.EinzelGenerierung = true;
RibbonButtonGenerieren_Click(sender, e);
this.EinzelGenerierung = false;
}
}
}

6
Client/DocMgmt/Dokumentpaket.resx
View File

@@ -161,12 +161,6 @@
B7FBYqiqcBiQ0HreI2vSk1kgZ4eUbLUEYRAbJAaSQ1aL1YCIqn2u8S1n5/rnrvIAORuEQWyQGEgOWS1W
A0AgrHyXX3LHlUkgP4MwiA0SQ1cH1gtKjqBkiS5JCMCTMigzJbVfIjkzgfSAMxOlAACf2BGuKP2MmgAA
AABJRU5ErkJggg==
</value>
</data>
<data name="RibbonButtonGenerieren.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnSearchBP.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

62
Client/DocMgmt/FrmDokumentwerte.Designer.cs generated Normal file
View File

@@ -0,0 +1,62 @@
namespace OnDoc.DocMgmt
{
partial class FrmDokumentwerte
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.SuspendLayout();
//
// sfDataGrid1
//
this.sfDataGrid1.AccessibleName = "Table";
this.sfDataGrid1.Location = new System.Drawing.Point(22, 13);
this.sfDataGrid1.Name = "sfDataGrid1";
this.sfDataGrid1.Size = new System.Drawing.Size(1046, 685);
this.sfDataGrid1.TabIndex = 0;
this.sfDataGrid1.Text = "sfDataGrid1";
//
// FrmDokumentwerte
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1093, 710);
this.Controls.Add(this.sfDataGrid1);
this.Name = "FrmDokumentwerte";
this.Text = "FrmDokumentwerte";
this.Load += new System.EventHandler(this.FrmDokumentwerte_Load);
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit();
this.ResumeLayout(false);
}
#endregion
private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid1;
}
}

28
Client/DocMgmt/FrmDokumentwerte.cs Normal file
View File

@@ -0,0 +1,28 @@
using Model;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnDoc.DocMgmt
{
public partial class FrmDokumentwerte : Form
{
public clsDocData docData = new clsDocData();
public FrmDokumentwerte()
{
InitializeComponent();
}
private void FrmDokumentwerte_Load(object sender, EventArgs e)
{
sfDataGrid1.DataSource = docData.DocValues;
}
}
}

120
Client/DocMgmt/FrmDokumentwerte.resx Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

27
Client/Start.cs
View File

@@ -5,6 +5,7 @@ using OnDoc.Diverses;
using OnDoc.DocMgmt;
using OnDoc.Klassen;
using Syncfusion.WinForms.Controls;
using Syncfusion.XlsIO;
using Syncfusion.XlsIO.Implementation;
using System;
using System.Data;
@@ -40,6 +41,30 @@ namespace OnDoc
db = null;
}
private void Delete_Old_Files()
{
try
{
string[] files = Directory.GetFiles(AppParams.tempdir);
foreach (string file in files)
{
FileInfo fi = new FileInfo(file);
if (fi.LastAccessTime < DateTime.Now.AddDays(-5))
fi.Delete();
}
foreach (string file in files)
{
FileInfo fi = new FileInfo(file);
if (fi.LastAccessTime < DateTime.Now.AddDays(-5))
fi.Delete();
}
}
catch { }
//Delete_Old_Spooler_Files();
}
public Start()
{
InitializeComponent();
@@ -53,7 +78,7 @@ namespace OnDoc
InitLogging();
Logging.Logging.Debug("Start", "OnDoc-Client", "");
Delete_Old_Files();
mitarbeiter = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
mitarbeiter = mitarbeiter.Substring(mitarbeiter.IndexOf("\\") + 1);
AppParams.systemtgnummer = mitarbeiter;

2
Client/UIControls/Administrator/Dokumenttyp.cs
View File

@@ -122,7 +122,7 @@ namespace OnDoc.UIControls.Administrator
db.Get_Tabledata("Select * from Dokumenttyp_BP_Person_Erstellung where dokumenttypnr=" + dokumenttypnr.ToString(), false, true);
if (db.dsdaten.Tables[0].Rows.Count != 0)
{
erstellungstyp = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
erstellungstyp = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]);
}
db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr = " + dokumenttypnr.ToString(), false, true);

50
Client/UIControls/DokTypDetail.cs
View File

@@ -1,6 +1,8 @@
using Database;
using DOCGEN;
using Microsoft.Office.Interop.Word;
using Model;
using OnDoc.Helper;
using OnDoc.Klassen;
using System;
using System.Collections.Generic;
@@ -12,6 +14,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Web.UI.WebControls.Expressions;
using System.Windows.Forms;
using System.Windows.Forms.Design;
namespace OnDoc.UIControls
{
@@ -21,6 +24,8 @@ namespace OnDoc.UIControls
public int einzeldokument { get; set; } = 0;
public bool dokumentpaket { get; set; } = false;
public string source { get; set; } = "";
public DokTypDetail()
{
InitializeComponent();
@@ -35,18 +40,20 @@ namespace OnDoc.UIControls
public void Refresh_Details()
{
DataTable details = new DataTable();
System.Data.DataTable details = new System.Data.DataTable();
details.Columns.Add("Element");
details.Columns.Add("Inhalt");
if (dokumentpaket)
{
sfDataGrid1.Dock = DockStyle.Top;
groupBox2.Dock = DockStyle.Fill;
groupBox2.Visible = true;
}
else
{
sfDataGrid1.Dock = DockStyle.Fill;
groupBox2.Visible = false;
}
@@ -124,6 +131,7 @@ namespace OnDoc.UIControls
{
DocGet dg = new DocGet(AppParams.connectionstring);
clsdok dok = new clsdok(dB.dsdaten.Tables[0].Rows[0][dc.ColumnName].ToString(), dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString(), "","");
source = dok.dokument;
string PDF = "";
switch (dB.dsdaten.Tables[0].Rows[0]["Applikation"].ToString().ToUpper())
{
@@ -148,6 +156,46 @@ namespace OnDoc.UIControls
sfDataGrid1.DataSource = details;
dB = null;
}
public string RandomString(int length)
{
var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
var stringChars = new char[8];
var random = new Random();
for (int i = 0; i < stringChars.Length; i++)
{
stringChars[i] = chars[random.Next(chars.Length)];
}
return new String(stringChars);
}
public void opensource()
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select office_vorlagenr from dokumenttyp where dokumenttypnr=" + this.dokumenttypnr.ToString(), false, true);
string vorlagenr = db.dsdaten.Tables[0].Rows[0][0].ToString();
VBFileManagement.VBFileManagement vm = new VBFileManagement.VBFileManagement();
db.Get_ApplicationType_from_Vorlage(Convert.ToInt32(vorlagenr));
string type = db.dsdaten.Tables[0].Rows[0][0].ToString();
string ext = db.dsdaten.Tables[0].Rows[0][1].ToString();
string filename = AppParams.tempdir+ RandomString(12) + "." + ext;
vm.Get_From_DB(Convert.ToInt32(vorlagenr), filename, AppParams.connectionstring);
vm = null;
if (type.ToUpper().Substring(0,1) == "D" || type.ToUpper().Substring(0, 1) == "W")
{
System.Diagnostics.Process.Start("winword.exe", "/n " + filename);
}
if (type.ToUpper().Substring(0,1) == "X" || type.ToUpper().Substring(0, 1) == "E")
{
System.Diagnostics.Process.Start("excel.exe", " " + filename);
}
db = null;
}
private void sfDataGrid2_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{

21
Client/UIControls/Serienbrief.cs
View File

@@ -117,6 +117,9 @@ namespace OnDoc.UIControls
Refresh_Lists();
Refresh_Team();
Broadcaster().AddListener(this);
Security security = new Security();
security.set_security_general(this);
security = null;
//Closing += Form_Closing;
}
@@ -2519,14 +2522,18 @@ namespace OnDoc.UIControls
fh = null;
sb.dsempfaenger.Tables["UsedFelder"].Rows.Clear();
string json = sbt.usedfelder;
System.Data.DataTable dt = (System.Data.DataTable)JsonConvert.DeserializeObject(json, (typeof(System.Data.DataTable)));
sb.dsempfaenger.Tables["UsedFelder"].Rows.Clear();
foreach (System.Data.DataRow dr in dt.Rows)
try
{
sb.dsempfaenger.Tables["Usedfelder"].ImportRow(dr);
};
string json = sbt.usedfelder;
System.Data.DataTable dt = (System.Data.DataTable)JsonConvert.DeserializeObject(json, (typeof(System.Data.DataTable)));
sb.dsempfaenger.Tables["UsedFelder"].Rows.Clear();
foreach (System.Data.DataRow dr in dt.Rows)
{
sb.dsempfaenger.Tables["Usedfelder"].ImportRow(dr);
};
}
catch { }
update_serienbriefdaten(false);
}

997
Client/Versandstrasse/Versandstrasse.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

199
Client/Versandstrasse/Versandstrasse.cs
View File

@@ -25,6 +25,7 @@ using Windows.Media.Capture;
namespace OnDoc.Versandstrasse
{
public partial class Versandstrasse : SfForm
{
private List<Versandpaket> pakete = new List<Versandpaket>();
@@ -32,6 +33,7 @@ namespace OnDoc.Versandstrasse
private TreeNodeAdv currentSourceNode;
private bool serienbrief = false;
private serienbrief sb;
private bool direktversenden = false;
public Versandstrasse(List<Versandpaket> pakete)
{
InitializeComponent();
@@ -95,17 +97,96 @@ namespace OnDoc.Versandstrasse
{
db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + pakete[i].partnernr.ToString(), false, true);
DruckJob = new TreeNodeAdv();
DruckJob.Text = "Druckpaket " + pakete[i].PaketNr.ToString()+" - " + db.dsdaten.Tables[0].Rows[0][0].ToString();
DruckJob.Text = "Versand-Couvert - " + db.dsdaten.Tables[0].Rows[0][0].ToString();
DruckJob.Tag = "Druckpaket";
DruckJob.TagObject = pakete[i];
set_nodeimage(DruckJob, 0);
treeViewAdv1.Nodes.Add(DruckJob);
PopulateDocs(pakete[i], ref DruckJob);
}
db = null;
treeViewAdv1.ExpandAll();
foreach (TreeNodeAdv node in treeViewAdv1.Nodes)
{
if (node.Level == 1) { Verify_Couvert(node); }
}
}
private void set_nodeimage(TreeNodeAdv node, int img)
{
node.LeftImageIndices = null;
node.LeftImageIndices = new int[] { img };
}
private void Verify_Couverts()
{
foreach (TreeNodeAdv node in treeViewAdv1.Nodes)
{
if (node.Level == 1) { Verify_Couvert(node); }
}
}
private bool Verify_Couvert(TreeNodeAdv node)
{
Versandpaket vp = node.TagObject as Versandpaket;
int currentbp = vp.partnernr;
DB db = new DB(AppParams.connectionstring);
//node.LeftImageIndices = new int[] { 0 };
int nodecounter = 0;
int anzbp = 1;
bool versandbereit = true;
foreach (TreeNodeAdv dokumentnode in node.Nodes)
{
//node.LeftImageIndices = new int[] { 0 };
db.Get_Tabledata("SELECT dbo.dokument.nrpar00, dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc FROM dbo.dokument INNER JOIN " +
" dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr where dbo.dokument.dokumentid='" + dokumentnode.Tag + "'", false, true);
//BP-Verifikation
if (currentbp != Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["nrpar00"]))
{
currentbp = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["nrpar00"]);
anzbp = anzbp + 1;
}
//Versandstrasse möglich
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0)
{
set_nodeimage(dokumentnode, 0);
versandbereit = false;
}
else
{
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0)
{
if (nodecounter == 0) { set_nodeimage(dokumentnode, 4); }
else
{
set_nodeimage(dokumentnode, 5);
}
}
}
if (node.Nodes.Count == 0)
{
versandbereit = false;
}
nodecounter++;
}
if (node.Nodes.Count < 1) { versandbereit = false; }
if (anzbp > 1) { versandbereit = false; }
if (versandbereit == true)
{
set_nodeimage(node, 1);
return true;
} else
{
set_nodeimage(node, 0);
return false;
}
}
private void populate_serienbriefe()
@@ -117,11 +198,13 @@ namespace OnDoc.Versandstrasse
TreeNodeAdv tn = new TreeNodeAdv();
tn.Text = dr["dokumentid"].ToString();
tn.Tag = dr["dokument"].ToString();
set_nodeimage(tn, 3);
treeViewAdv1.Nodes[0].Nodes.Add(tn);
}
}
private void PopulateDocs(Versandpaket paket, ref TreeNodeAdv parentnode)
{
DB db = new DB(AppParams.connectionstring);
TreeNodeAdv dokumentnode;
for (int i = 0; i < paket.Dokument.Count; i++)
{
@@ -129,6 +212,24 @@ namespace OnDoc.Versandstrasse
dokumentnode.Text = paket.Dokument[i].Bezeichnung+" (" + paket.Dokument[i].Partnernr+")";
dokumentnode.Tag = paket.Dokument[i].DokumentID;
dokumentnode.TagObject= paket.Dokument[i];
db.Get_Tabledata("SELECT dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc FROM dbo.dokument INNER JOIN " +
" dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr where dbo.dokument.dokumentid='" + dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0)
{
set_nodeimage(dokumentnode, 5);
} else
{
set_nodeimage(dokumentnode, 3);
}
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) ==0)
{
set_nodeimage(dokumentnode, 0);
} else
{
//dokumentnode.LeftImageIndices = new int[] { 3};
}
parentnode.Nodes.Add(dokumentnode);
}
@@ -160,6 +261,8 @@ namespace OnDoc.Versandstrasse
}
}
treeView.SelectedNode = sourceNode;
Verify_Couverts();
}
private void treeViewAdv1_DragLeave(object sender, EventArgs e)
@@ -422,6 +525,13 @@ namespace OnDoc.Versandstrasse
}
}
private void button3_Click(object sender, EventArgs e)
{
direktversenden = true;
btnSendFinal_Click(sender, e);
direktversenden = false;
}
private void btnSendFinal_Click(object sender, EventArgs e)
{
if (serienbrief)
@@ -494,14 +604,29 @@ namespace OnDoc.Versandstrasse
send_vs(ref vp);
}
private void send_vs(ref Versandpaket vp, bool showmessage = true) {
//vp.send_onbase_doc = true;
private void send_vs(ref Versandpaket vp, bool showmessage = true, bool direktversenden = false) {
string jsonstring = JsonConvert.SerializeObject(vp);
//vp.send_onbase_doc = true;
if (!direktversenden)
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata_for_Update("Select top 1 * from Ondoc_Versandstrasse_Paket where id=1", false, true);
DataRow dr = db.daten.Tables[0].NewRow();
dr[1] = AppParams.CurrentMitarbeiter.ToString();
dr[2] = jsonstring;
dr[3] = DateTime.Now;
db.daten.Tables[0].Rows.Add(dr);
db.Update_Data();
return;
}
string URL = AppParams.RESTURI + "api/Send_Versandstrasse";
panelVerify.Visible = false;
WebRequest request;
var data = Encoding.UTF8.GetBytes(jsonstring);
request = WebRequest.Create(URL);
@@ -589,6 +714,11 @@ namespace OnDoc.Versandstrasse
TreeNodeAdv node = treeViewAdv1.SelectedNode;
if (node.Level == 1)
{
if (Verify_Couvert(node)==false)
{
GrpPaketDetails.Enabled = false;
return;
}
GrpPaketDetails.Enabled = true;
Versandpaket paket = node.TagObject as Versandpaket; ;
@@ -653,9 +783,68 @@ namespace OnDoc.Versandstrasse
{
try
{
TreeNodeAdv node = treeViewAdv1.SelectedNode;
if (node.Level > 1) {
node = node.Parent;
treeViewAdv1.SelectedNode.Remove();
Verify_Couvert(node);
}
else {
treeViewAdv1.SelectedNode.Remove();
}
}
catch { }
}
private void toolStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
}
private void TabControlDokuments_SelectedIndexChanged(object sender, EventArgs e)
{
if (TabControlDokuments.SelectedIndex == 1)
{
DB db = new DB(AppParams.connectionstring);
DB db2 = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
treeViewAdvCouverts.Nodes.Clear();
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
{
Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(dr["paket"].ToString());
TreeNodeAdv tn = new TreeNodeAdv();
db2.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + vp.partnernr.ToString(), false, true);
tn.Text = vp.partnernr.ToString() + " - " + db2.dsdaten.Tables[0].Rows[0][0].ToString();
tn.TagObject = vp.finaldoc;
tn.Tag = dr[0].ToString();
if (vp.Versandoption.ToString() == "A_POST") { set_nodeimage(tn, 0); }
if (vp.Versandoption.ToString() == "B2_POST") { set_nodeimage(tn, 1); }
if (vp.Versandoption.ToString() == "B2_POST") { set_nodeimage(tn, 2); }
treeViewAdvCouverts.Nodes.Add(tn);
foreach (Versanddokument vd in vp.Dokument)
{
TreeNodeAdv tn2 = new TreeNodeAdv();
tn2.Text = vd.Bezeichnung;
tn2.Tag = vd.DokumentID;
tn2.TagObject = vd.dokument;
tn.Nodes.Add(tn2);
}
}
db = null;
db2 = null;
}
}
private void treeViewAdvCouverts_AfterSelect(object sender, EventArgs e)
{
TreeNodeAdv node = treeViewAdvCouverts.SelectedNode;
var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString()));
this.pdfViewerControl2.Load(stream);
stream = null;
}
}
}

190
Client/Versandstrasse/Versandstrasse.resx
View File

@@ -118,12 +118,198 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>122, 17</value>
<value>157, 24</value>
</metadata>
<metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>387, 17</value>
</metadata>
<data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0
DAAAAk1TRnQBSQFMAgEBBgEAAUABAAFAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wIAAfMB4wpHAfMDAAHy
AZIK7AHzIgAB8wNHCRcB9AIAAfID7AntAfMiAAHjAUcBvQH0C/MB/wGSAewBvAHzC/IB/yAAAkcB9AxH
ARcC7AHzDOwB7SAAAUcBFwHzBUcDFwVHAewB7QHzBewD7QXsIAABRwEXAfMDRwGUAf8DAAH/ARcDRwHs
Ae0B8wPsAe8B/wMAAf8B7QPsIAABRwEXAfMDRwGZAQAB/wLzARsERwHsAe0B8wPsAbwBAAH/AvMB8QTs
IAABRwEXAfMDRwEHAQAB8wdHAewB7QHzA+wBBwEAAfMH7CAAAUcBFwHzA0cBFwH/AQAB8wEWBUcB7AHt
AfMD7AHtAf8BAAHzAe8F7CAAAUcBFwHzBEcBFwHzAv8BvQRHAewB7QHzBOwB7QHzAv8BBwTsIAABRwEX
AfMDRwEWARsBFwEWAv8ERwHsAe0B8wPsAe8B8gHtAZIC/wTsIAABRwEXAfMDRwG9AQABvQFHAfQBAAEX
A0cB7AHtAfMD7AHwAQABBwHsAfQBAAHtA+wgAAFHARcB8wNHARYD/wEAAfQERwHsAe0B8wPsAfcD/wEA
AfME7CAAAfMB9AHzBEcBFgLzAb0BFwRHA/ME7AHvAfIB8wHwAe0E7CIAAfMNRwIAAfMN7CIAAf8BFwtH
AZQCAAH/Ae0L7AHvJAAB/wG9ARYBFwGPAbEBvQH/CAAB9AG8AZIC7AGSAbwB9AQAAfQOlAHzAfQBBwzv
AQcB8wIAAf8BvQEXAo8CbwFqAo8BvQH/BAAB/wEHCOwBBwH/AgABlA9HAe8P7AEAAf8BtwOPAY4BFgJv
AWoCjwG3Af8CAAH/Ae8K7AHvAf8BAAEWD0cB7w/sAQABvQOPAhcCFgFvARcBagKPAb0CAAEHA+wB7QEH
B+wBBwEAARYGRwEXARYBFwZHAe8G7AHtAe8BkgbsAf8BFwGPARcB8wH/Ab0BFwEWAb0B/wHzAWoCjwH/
AfQE7AHzAf8BvAfsAfQBFgZHAeMB/wG3BkcB7wbsAfcB/wG8BuwBvQKPAeMD/wK9A/8BFwFqAY8BvQG8
A+wB8gP/AfAG7AG8ARYGRwHjAf8BtwZHAe8G7AH3Af8BvAbsARYDjwG9Bv8BvQJvAWoBsQGSAuwB8QL/
AQcC/wHxBewBkgEWBkcB4wH/AbcGRwHvBuwB9wH/AbwG7AEXA48BFwG9BP8BvQIWAm8BjwLsAQcC/wH3
AewB7wL/AfIF7AEWBkcB4wH/AbcGRwHvBuwB9wH/AbwG7AEXA48BFwG9BP8BvQEXAhYBbwEXAuwBBwH/
Ae8D7AH3Av8B8wHtA+wBFgZHAeMB/wG3BkcB7wbsAfcB/wG8BuwBFgOPAb0G/wG9ARcBjgGPARYBkgjs
AZIB9AH/AfMB7QHsAZIBFgZHAeMB/wG3BkcB7wbsAfcB/wG8BuwBvQKPAeMD/wK9A/8BFwKPAb0BvAns
Ae0B9AH/AQcB7AG8ARYGRwHjAf8BtwZHAe8G7AH3Af8BvAbsAf8BFwGPARcB8wH/Ab0CFwG9Af8B8wKP
ARcB/wH0CuwB7QEHAe0B7AH0ARYERwEXAbcBvQH/AbcGRwHvBOwB7QG8AfEB/wG8BuwBAAG9Ao8BFwHj
BI8B4wEXAo8BvQIAAQcM7AEHAQABFgRHARcD/wG3BkcB7wTsAZID/wG8BuwBAAH/AbcKjwG3Af8CAAH/
Ae8K7AHvAf8BAAEWBUcD4wEXBkcB7wTsAe0D9wGSBuwCAAH/Ab0BFwaPARcBvQH/BAAB/wEHCOwBBwH/
AgABFg9HAe8P7AQAAf8BvQEWAhcBFgG9Af8IAAH0AbwBkgLsAZIBvAH0BAABGw5HAb0B8g7sAQcBQgFN
AT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/wEAAYABAwGAAQMFAAEDAQABAx0AAeABAAHg
BAABAQEAAQEFAAEBAQABAQYAAYABAAGAFAABAQEQAQEBEAUAASABAAEgDAABwAEAAcAFAAHAAQABwAUA
AfABDwHwAQ8EAAHAAQMBwAEDBAABgAEBAYABAQQAAYABAQGAAQFEAAGAAQEBgAEBBAABgAEBAYABAQQA
AcABAwHAAQMEAAHwAQ8B8AEPBAAL
</value>
</data>
<metadata name="imageList1_sik.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>221, 14</value>
</metadata>
<data name="imageList1_sik.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU
DAAAAk1TRnQBSQFMAgEBBQEAAUgBAAFIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wIAAfEBEwoAAfIyAAHx
AgABDgkQAfIyAAETAQAB7wHzC/EB9DEAAQ4B8wwAARExAAEQAfEEAAQONgABEAHxAwAB6wH/AwAB/wFD
NAABEAHxAwABkgEAAfQC8QG8AQ40AAEQAfEDAAHtAQAB8TgAARAB8QMAAQ8B/wEAAfIBbTYAARAB8QQA
AUMB8QL/AZI1AAEQAfEDAAHqAfABEQETAv8BDjQAARAB8QMAAe8BAAGSAQAB8wEAARA0AAEQAfEDAAET
Av8B9AEAAfM0AALyAfEEAAFtAfAB8gEHAQ82AAHxPwAB9AERCwAB7DQAAb0GFgG9CAAB9AHCAcACVQHA
AcIB9AgAAf8BvQEWARcBjwGxAb0B/wUAAfABswqKAbMB8AQAAb0IRwG9BQAB/wHCCFUBwgH/BAAB/wG9
ARcCjwJvAWoCjwG9Af8CAAHwDtMB8AIAAb0KRwG9AwAB/wHAClUBwAH/AgAB/wG3A48BjgEWAm8BagKP
AbcB/wEAAbMO0wGzAQABvQxHAb0CAAHCA1UBlwGYB1UBwgIAAb0DjwIXAhYBbwEXAWoCjwG9AQABig7T
AYoBvQ5HAb0B9ANVAZcB8gH/AQgHVQH0Af8BFwGPARcB8wH/Ab0BFwEWAb0B/wHzAWoCjwH/AYoH0wHN
BtMBigEWDkcBFgHCA1UB8QP/AQgGVQHCAb0CjwHjA/8CvQP/ARcBagGPAb0BigbTAbMBvAGzBdMBigEW
ARcBtwGUAUcBFwEWAUcB4wG3ARYBFwGUAkcBFgHAAlUBwgL/AcEC/wHCAZcEVQHAARYDjwG9Bv8BvQJv
AWoBsQGKBtMBswH/Aa0F0wGKARYBFwG9AfQBFgGUAbcBFwH/ARYB9AEWAf8BvQEXARYCVQHBAv8BwAFV
AZ4C/wHiAZcEVQEXA48BFwG9BP8BvQIWAm8BjwGKBtMBswH/Aa0F0wGKAhYB9AG9ARcBtwG9AeMB/wEW
AfQBFgH0ArcBFgJVAZ8B/wGeA1UBwAL/AQABlwNVARcDjwEXAb0E/wG9ARcCFgFvARcBigbTAbMB/wGt
BdMBigEWARcBtwGUAeMCtwLjAbcBFgEXAbcBlAEXARYBwAhVAcAC/wHzAZcBVQHAARYDjwG9Bv8BvQEX
AY4BjwEWAYoG0wGzAf8BrQXTAYoBFg5HARYBwglVAZcB9AH/AZ8BVQHCAb0CjwHjA/8CvQP/ARcCjwG9
AYoF0wEGAfEB8AGyBdMBigG9DkcBvQH0ClUBlwGfAZcBVQH0Af8BFwGPARcB8wH/Ab0CFwG9Af8B8wKP
ARcB/wGKBtMCzQbTAYoBAAG9DEcBvQIAAcIMVQHCAgABvQKPARcB4wSPAeMBFwKPAb0BAAGKDtMBigIA
Ab0KRwG9AwAB/wHAClUBwAH/AgAB/wG3Co8BtwH/AQABsw7TAbMDAAG9CEcBvQUAAf8BwghVAcIB/wQA
Af8BvQEXBo8BFwG9Af8CAAHwDtMB8AQAAb0GFgG9CAAB9AHCAcACVQHAAcIB9AgAAf8BvQEWAhcBFgG9
Af8FAAHwAbMKigGzAfABAAFCAU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/AQABgAED
BwABAx8AAeAGAAEBBwABAQgAAYAWAAEBARAHAAEgDgABwAcAAcAHAAHwAQ8B8AEPAfABDwGAAQEB4AEH
AcABAwHAAQMCAAHAAQMBgAEBAYABAQIAAYABAQGAAQEBgAEBQgABgAEBAYABAQGAAQECAAHAAQMBgAEB
AYABAQIAAeABBwHAAQMBwAEDAgAB8AEPAfABDwHwAQ8BgAEBCw==
</value>
</data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="pdfViewerPrinterSettings1.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<data name="pdfViewerPrinterSettings3.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
d2luZy5Qb2ludEYCAAAAAXgBeQAACwsCAAAAAAAAAAAAAAAL
</value>
</data>
<metadata name="imageList2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>498, 17</value>
</metadata>
<data name="imageList2.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACK
CQAAAk1TRnQBSQFMAgEBAwEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wIAAfQB7wHsCPgB7AHv
AfQCAAH/AfEBkgHsBvgB7AGSAfEB/wIAAf8B8QGSAewG+AHsAZIB8QH/EQAB9AHsDPgB7AH0Af8B7wz4
Ae8C/wHvDPgB7wH/EAAB7w74Ae8B8Q74AvEO+AHxEAAB7A74AewBkg74ApIO+AGSEAAE+AHwAf8B7wL4
Ae8B/wHwBPgB7A/4AewP+BAABPgB7wEAAfEC+AHxAQAB7wf4AewC8AEHAe0B7AG8AfABvAHtBvgB7ALw
AQcB7QGSA7wB7QP4EAAE+AHsAv8C8wL/AewH+AHsAfEB+AGSAfAC+AHwAe0H+AHsAfEB+AGSAfAB7QHx
Ae0C7AP4EAAF+AHzAQAC9AEAAfMI+AHsAfEB+AGSAfAC+AHwAe0H+AHsAfEB+AGSAfAB+AHtAfEB7AT4
EAAF+AG8AQACBwEAAbwI+AHsAfQBvAHzAe0C+AHwAe0H+AHsAfQBvAHzAe0C+AGSAbwE+BAABfgBkgEA
AvIBAAGSCPgB7AHxAfgC7wHsAe0B8AHtB/gB7AHxAfgC7wP4AfIE+BAABvgE/wn4AewB8wEHAfIB7QHs
AQcB9AHtB/gB7AHzAQcB8gLtAgcB8QT4EAAG+AG8Av8BvAb4AewD+ALtAewD+AHtAewE+AHsA/gC7QHs
AvgB7QH3AewE+BAAAewO+AHsAZIO+AKSDvgBkhAAAe8O+AHvAfEO+ALxDvgB8RAAAfQB7Az4AewB9AH/
Ae8M+AHvAv8B7wz4Ae8B/xEAAfQB7wHsCPgB7AHvAfQCAAH/AfEBkgHsBvgB7AGSAfEB/wIAAf8B8QGS
AewG+AHsAZIB8QH/EQABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAYABAQGA
AQEBgAEBIgABBAEgDgABAgFABgABAgFABgABAgFALgABgAEBAYABAQGAAQECAAs=
</value>
</data>
<data name="pdfViewerPrinterSettings4.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh

BIN
Client/bin/Debug/3ixKB9tR.doc Normal file
View File

Binary file not shown.

BIN
Client/bin/Debug/6Keyzcoe.xlsx Normal file
View File

Binary file not shown.

BIN
Client/bin/Debug/DOCGEN.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/DOCGEN.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/F3gVoghy.xltm Normal file
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocClient.zip
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocOffice.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocOffice.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/Versandstrasse.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/Versandstrasse.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/ZMYDzeBP.doc Normal file
View File

Binary file not shown.

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/nhQsZ8iN.xltm Normal file
View File

Binary file not shown.

BIN
Client/bin/Debug/qNOUIjbM.doc Normal file
View File

Binary file not shown.

BIN
Client/bin/Debug/rhGBmrxQ.doc Normal file
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
View File

@@ -1 +1 @@
301ab83201bdba95627643324c3e29d7d312adb7e52556b616a0a0d0c1dfff41
65ae806e012952db5e8ce8c767250f579a0fda646b606deb2730010e6e5ecdd5

1
Client/obj/Debug/Client.csproj.FileListAbsolute.txt
View File

@@ -377,3 +377,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\de-DE\OnDoc.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.FrmDokumentwerte.resources

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.DocMgmt.Dokumentpaket.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.DocMgmt.FrmDokumentwerte.resources Normal file
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
DOCGEN/bin/Debug/DOCGEN.dll
View File

Binary file not shown.

BIN
DOCGEN/bin/Debug/DOCGEN.pdb
View File

Binary file not shown.

BIN
DOCGEN/bin/Debug/OnDocOffice.dll
View File

Binary file not shown.

BIN
DOCGEN/bin/Debug/OnDocOffice.pdb
View File

Binary file not shown.

22
DOCGEN/clsDocGet.cs
View File

@@ -222,6 +222,7 @@ namespace DOCGEN
return ReturnValue;
}
public string docfiletype { get; set; } = "";
private bool Is_WordDocument(MemoryStream stream)
{
Syncfusion.DocIO.DLS.WordDocument WordDocument = new Syncfusion.DocIO.DLS.WordDocument();
@@ -230,6 +231,7 @@ namespace DOCGEN
WordDocument.Open(stream, FormatType.Automatic);
string type = "";
type = WordDocument.ActualFormatType.ToString();
docfiletype = type;
return true;
}
catch
@@ -243,6 +245,24 @@ namespace DOCGEN
}
}
public string check_office_application(string source)
{
MemoryStream ms = new MemoryStream(Convert.FromBase64String(source));
if (Is_WordDocument(ms))
{
ms.Close();
ms = null;
return "Word";
}
if (Is_ExcelDocument(ms))
{
ms.Close();
ms = null;
return "Excel";
}
return "";
}
private bool Is_ExcelDocument(MemoryStream stream)
{
ExcelEngine excelEngine = new ExcelEngine();
@@ -254,7 +274,7 @@ namespace DOCGEN
string type = "";
workbook = application.Workbooks.Open(stream);
type = workbook.Version.ToString();
docfiletype = type;
return true;
}
catch

BIN
DOCGEN/obj/Debug/DOCGEN.dll
View File

Binary file not shown.

BIN
DOCGEN/obj/Debug/DOCGEN.pdb
View File

Binary file not shown.

BIN
DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Images/VS/2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 990 B

BIN
Images/VS/APost.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
Images/VS/B1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
Images/VS/B2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
Images/VS/TCS-Sommerreifentest-SR25-225-40-R18-92Y-W-DE.pdf Normal file
View File

Binary file not shown.

BIN
Images/VS/box_9538998.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
Images/VS/check_14025690.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
Images/VS/close_13984246.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
Images/VS/computer_13699718.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
Images/VS/cross_17667774.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
Images/VS/mark_15490415.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
Images/VS/number-1_16609498.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
Images/VS/one.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
Images/VS/one_8017246.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
Images/VS/one_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
Images/VS/road_15891610.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
Images/VS/stop_2402598.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
Images/VS/stop_5181602.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
Images/VS/two_17136505 - Kopie.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
Images/VS/two_17136505.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
Images/VS/two_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
OnDocOffice/bin/Debug/DOCGEN.dll
View File

Binary file not shown.

BIN
OnDocOffice/bin/Debug/DOCGEN.pdb
View File

Binary file not shown.

BIN
OnDocOffice/bin/Debug/OnDocOffice.dll
View File

Binary file not shown.

BIN
OnDocOffice/bin/Debug/OnDocOffice.pdb
View File

Binary file not shown.

3
OnDocOffice/clsoffice.cs
View File

@@ -612,6 +612,7 @@ namespace OnDocOffice
switch (ext)
{
case ".DOCX":
word.ActiveDocument.SaveAs2(filename, CompatibilityMode: 14, FileFormat: Microsoft.Office.Interop.Word.WdSaveFormat.wdFormatXMLDocument);
break;
case ".DOCM":
@@ -1991,6 +1992,8 @@ namespace OnDocOffice
Microsoft.Office.Interop.Word.Application word = new Microsoft.Office.Interop.Word.Application();
Microsoft.Office.Interop.Word.Document worddoc = new Microsoft.Office.Interop.Word.Document();
worddoc= word.Documents.Open(filename);
word.ActiveDocument.EmbedTrueTypeFonts = true;
worddoc.EmbedTrueTypeFonts= true;
worddoc.ExportAsFixedFormat(outputfile.ToString(), Microsoft.Office.Interop.Word.WdExportFormat.wdExportFormatPDF, false, Microsoft.Office.Interop.Word.WdExportOptimizeFor.wdExportOptimizeForPrint, Microsoft.Office.Interop.Word.WdExportRange.wdExportAllDocument,0,99, Microsoft.Office.Interop.Word.WdExportItem.wdExportDocumentContent, true, true, Microsoft.Office.Interop.Word.WdExportCreateBookmarks.wdExportCreateNoBookmarks, true, true, false);
worddoc.Close(false);

BIN
OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
OnDocOffice/obj/Debug/OnDocOffice.dll
View File

Binary file not shown.

BIN
OnDocOffice/obj/Debug/OnDocOffice.pdb
View File

Binary file not shown.

BIN
ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
VBOffice/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
VBOffice/bin/Debug/Database.pdb
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More