update 20250416

This commit is contained in:
Stefan Hutter
2025-04-16 21:33:23 +02:00
parent a65bc81881
commit d278bed131
368 changed files with 85780 additions and 553 deletions

View File

@@ -50,6 +50,11 @@ namespace OnDoc.Diverses
mitarbeiternr = Mitarbeiternr;
}
public void hide_versandstrasse()
{
this.ribbonTab3.Visible = false;
}
private void MitarbeiterProfil_Load(object sender, EventArgs e)
{

View File

@@ -54,17 +54,17 @@
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(122, 26);
this.label1.TabIndex = 1;
this.label1.Text = "Version 1.0";
this.label1.Text = "Version 1.5";
//
// label2
//
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(157, 330);
this.label2.Location = new System.Drawing.Point(150, 330);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(134, 26);
this.label2.Size = new System.Drawing.Size(146, 26);
this.label2.TabIndex = 2;
this.label2.Text = "7. April 2025";
this.label2.Text = "15. April 2025";
//
// SplashScreen
//

View File

@@ -79,7 +79,7 @@ namespace OnDoc
else
{
if (args[0].ToString().ToUpper().IndexOf("PARTNERNR") > 0 || args[0].ToString().ToUpper().IndexOf("UCHECK") > 0 || args[0].ToString().ToUpper().IndexOf("OPENCLIENT") > 0 || args[0].ToString().ToUpper().IndexOf("CREATESB") > 0|| args[0].ToString().ToUpper().IndexOf("CREATEPAC") > 0)
if (args[0].ToString().ToUpper().IndexOf("PARTNERNR") > 0 || args[0].ToString().ToUpper().IndexOf("UCHECK") > 0 || args[0].ToString().ToUpper().IndexOf("OPENCLIENT") > 0 || args[0].ToString().ToUpper().IndexOf("CREATESB") > 0|| args[0].ToString().ToUpper().IndexOf("CREATEPAC") > 0 || args[0].ToString().ToUpper().IndexOf("CREATEDOC") > 0)
{
AppParams.init();
//MessageBox.Show(AppParams.tempdir);

View File

@@ -286,7 +286,16 @@ namespace OnDoc
if (ExternalCall.Interaktion == "Yes")
{
dokList1.createnewdoc(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr));
if (ExternalCall.partnernr != "")
{
dokList1.createnewdoc(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr));
}
else
{
dokList1.createnewdoc(0, Convert.ToInt32(ExternalCall.dokumenttypnr));
}
}
else
{

View File

@@ -1150,6 +1150,10 @@ namespace OnDoc.UICintrols
private void ribbonButton1_Click(object sender, EventArgs e)
{
MitarbeiterProfil map = new MitarbeiterProfil(AppParams.CurrentMitarbeiter);
if (ribbonButtonVersandstrasse.Visible == false)
{
map.hide_versandstrasse();
}
map.ShowDialog();
load_Profile();
}

View File

@@ -29,12 +29,12 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv5 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv6 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv7 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv8 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Serienbrief));
this.GrpDokumentInhalt = new System.Windows.Forms.GroupBox();
this.grpFaktura = new System.Windows.Forms.GroupBox();
@@ -134,9 +134,9 @@
this.ribbonbuttonAbgelehnt = new System.Windows.Forms.RibbonButton();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.folderBrowser1 = new Syncfusion.Windows.Forms.FolderBrowser(this.components);
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.GrpDokumentInhalt.SuspendLayout();
this.grpFaktura.SuspendLayout();
this.pnlprogress.SuspendLayout();
@@ -181,9 +181,9 @@
this.GrpDokumentInhalt.Controls.Add(this.groupBox5);
this.GrpDokumentInhalt.Dock = System.Windows.Forms.DockStyle.Top;
this.GrpDokumentInhalt.Enabled = false;
this.GrpDokumentInhalt.Location = new System.Drawing.Point(0, 119);
this.GrpDokumentInhalt.Location = new System.Drawing.Point(0, 118);
this.GrpDokumentInhalt.Name = "GrpDokumentInhalt";
this.GrpDokumentInhalt.Size = new System.Drawing.Size(1633, 254);
this.GrpDokumentInhalt.Size = new System.Drawing.Size(1633, 246);
this.GrpDokumentInhalt.TabIndex = 1;
this.GrpDokumentInhalt.TabStop = false;
this.GrpDokumentInhalt.Text = "Dokument-Inhalt";
@@ -380,15 +380,15 @@
//
// treeviewDruckstapel
//
treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.Black;
treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black;
this.treeviewDruckstapel.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)});
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.treeviewDruckstapel.BeforeTouchSize = new System.Drawing.Size(215, 191);
this.treeviewDruckstapel.Dock = System.Windows.Forms.DockStyle.Left;
//
@@ -697,9 +697,9 @@
this.pnlLoad.Controls.Add(this.btnsbloadcancel);
this.pnlLoad.Controls.Add(this.btnsbloadok);
this.pnlLoad.Controls.Add(this.panel1);
this.pnlLoad.Location = new System.Drawing.Point(292, 106);
this.pnlLoad.Location = new System.Drawing.Point(1098, 118);
this.pnlLoad.Name = "pnlLoad";
this.pnlLoad.Size = new System.Drawing.Size(493, 634);
this.pnlLoad.Size = new System.Drawing.Size(957, 634);
this.pnlLoad.TabIndex = 4;
this.pnlLoad.Visible = false;
//
@@ -712,7 +712,7 @@
this.sfdatagridsbload.Location = new System.Drawing.Point(0, 47);
this.sfdatagridsbload.Name = "sfdatagridsbload";
this.sfdatagridsbload.ShowToolTip = true;
this.sfdatagridsbload.Size = new System.Drawing.Size(489, 489);
this.sfdatagridsbload.Size = new System.Drawing.Size(953, 489);
this.sfdatagridsbload.TabIndex = 3;
this.sfdatagridsbload.Text = "sfDataGrid1";
this.sfdatagridsbload.ToolTipOpening += new Syncfusion.WinForms.DataGrid.Events.ToolTipOpeningEventHandler(this.sfdatagridsbload_ToolTipOpening);
@@ -748,7 +748,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(489, 47);
this.panel1.Size = new System.Drawing.Size(953, 47);
this.panel1.TabIndex = 1;
//
// label1
@@ -789,7 +789,7 @@
this.GrpEmpfaenger.Dock = System.Windows.Forms.DockStyle.Fill;
this.GrpEmpfaenger.Location = new System.Drawing.Point(0, 0);
this.GrpEmpfaenger.Name = "GrpEmpfaenger";
this.GrpEmpfaenger.Size = new System.Drawing.Size(902, 582);
this.GrpEmpfaenger.Size = new System.Drawing.Size(902, 591);
this.GrpEmpfaenger.TabIndex = 2;
this.GrpEmpfaenger.TabStop = false;
this.GrpEmpfaenger.Text = "Empfänger";
@@ -804,7 +804,7 @@
this.sfDataGridEmpfaenger.Location = new System.Drawing.Point(233, 16);
this.sfDataGridEmpfaenger.Name = "sfDataGridEmpfaenger";
this.sfDataGridEmpfaenger.SelectionMode = Syncfusion.WinForms.DataGrid.Enums.GridSelectionMode.Extended;
this.sfDataGridEmpfaenger.Size = new System.Drawing.Size(666, 563);
this.sfDataGridEmpfaenger.Size = new System.Drawing.Size(666, 572);
this.sfDataGridEmpfaenger.TabIndex = 4;
this.sfDataGridEmpfaenger.Text = "sfDataGrid1";
this.sfDataGridEmpfaenger.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.sfDataGridEmpfaenger_DrawCell);
@@ -842,16 +842,16 @@
//
// treeViewAdv1
//
treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black;
treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black;
this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(230, 563);
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(230, 572);
this.treeViewAdv1.ContextMenuStrip = this.ctxmenutree;
this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Left;
this.treeViewAdv1.Enabled = false;
@@ -868,53 +868,53 @@
this.treeViewAdv1.Location = new System.Drawing.Point(3, 16);
this.treeViewAdv1.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.treeViewAdv1.Name = "treeViewAdv1";
treeNodeAdv5.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv5.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv5.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv5.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv5.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv5.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv5.EnsureDefaultOptionedChild = true;
treeNodeAdv5.MultiLine = true;
treeNodeAdv5.ShowLine = true;
treeNodeAdv5.Text = "In Bearbeitung";
treeNodeAdv6.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv6.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv6.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv6.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv6.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv6.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv6.EnsureDefaultOptionedChild = true;
treeNodeAdv6.MultiLine = true;
treeNodeAdv6.ShowLine = true;
treeNodeAdv6.Text = "Fehlerhaft";
treeNodeAdv7.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv7.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv7.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv7.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv7.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv7.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv7.EnsureDefaultOptionedChild = true;
treeNodeAdv7.MultiLine = true;
treeNodeAdv7.ShowLine = true;
treeNodeAdv7.Text = "Generierte Dokumente";
treeNodeAdv8.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv8.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv8.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv8.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv8.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv8.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv8.EnsureDefaultOptionedChild = true;
treeNodeAdv8.MultiLine = true;
treeNodeAdv8.ShowLine = true;
treeNodeAdv8.Text = "Abgeschlossen";
treeNodeAdv1.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv1.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv1.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv1.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv1.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv1.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv1.EnsureDefaultOptionedChild = true;
treeNodeAdv1.MultiLine = true;
treeNodeAdv1.ShowLine = true;
treeNodeAdv1.Text = "In Bearbeitung";
treeNodeAdv2.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv2.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv2.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv2.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv2.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv2.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv2.EnsureDefaultOptionedChild = true;
treeNodeAdv2.MultiLine = true;
treeNodeAdv2.ShowLine = true;
treeNodeAdv2.Text = "Fehlerhaft";
treeNodeAdv3.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv3.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv3.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv3.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv3.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv3.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv3.EnsureDefaultOptionedChild = true;
treeNodeAdv3.MultiLine = true;
treeNodeAdv3.ShowLine = true;
treeNodeAdv3.Text = "Generierte Dokumente";
treeNodeAdv4.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv4.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv4.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv4.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv4.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv4.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv4.EnsureDefaultOptionedChild = true;
treeNodeAdv4.MultiLine = true;
treeNodeAdv4.ShowLine = true;
treeNodeAdv4.Text = "Abgeschlossen";
this.treeViewAdv1.Nodes.AddRange(new Syncfusion.Windows.Forms.Tools.TreeNodeAdv[] {
treeNodeAdv5,
treeNodeAdv6,
treeNodeAdv7,
treeNodeAdv8});
treeNodeAdv1,
treeNodeAdv2,
treeNodeAdv3,
treeNodeAdv4});
this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.treeViewAdv1.Size = new System.Drawing.Size(230, 563);
this.treeViewAdv1.Size = new System.Drawing.Size(230, 572);
this.treeViewAdv1.TabIndex = 3;
this.treeViewAdv1.Text = "treeViewAdv1";
this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0;
@@ -976,7 +976,7 @@
this.GridEmpfänger.EditMode = Syncfusion.WinForms.DataGrid.Enums.EditMode.SingleClick;
this.GridEmpfänger.Location = new System.Drawing.Point(3, 16);
this.GridEmpfänger.Name = "GridEmpfänger";
this.GridEmpfänger.Size = new System.Drawing.Size(896, 563);
this.GridEmpfänger.Size = new System.Drawing.Size(896, 572);
this.GridEmpfänger.TabIndex = 2;
this.GridEmpfänger.Text = "sfDataGrid1";
//
@@ -998,7 +998,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(1633, 119);
this.ribbon1.Size = new System.Drawing.Size(1633, 118);
this.ribbon1.TabIndex = 3;
this.ribbon1.Tabs.Add(this.ribbonTabFunktionen);
this.ribbon1.Tabs.Add(this.ribbonTabPruefung);
@@ -1303,7 +1303,7 @@
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.Location = new System.Drawing.Point(0, 373);
this.splitContainer1.Location = new System.Drawing.Point(0, 364);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -1313,7 +1313,7 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.docPreview1);
this.splitContainer1.Size = new System.Drawing.Size(1633, 582);
this.splitContainer1.Size = new System.Drawing.Size(1633, 591);
this.splitContainer1.SplitterDistance = 902;
this.splitContainer1.TabIndex = 5;
//
@@ -1322,7 +1322,7 @@
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(727, 582);
this.docPreview1.Size = new System.Drawing.Size(727, 591);
this.docPreview1.TabIndex = 4;
this.docPreview1.ZoomPercentage = 0;
//

View File

@@ -519,6 +519,8 @@ namespace OnDoc.UIControls
}
private void refresh_spalten()
{
sb.dsempfaenger.Tables[0].AcceptChanges();
sfDataGridEmpfaenger.BeginUpdate();
int hasbl = 0;
foreach(System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
{
@@ -545,9 +547,9 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.Columns["BLKUNDE"].Width = 50;
}
sfDataGridEmpfaenger.Columns[0].HeaderText = "Kunden-Nr";
//sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = true;
//sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
sfDataGridEmpfaenger.Columns["ERSTELLER"].Visible = false;
sfDataGridEmpfaenger.Columns["DRUCKJOBID"].Visible = false;
sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false;
@@ -560,10 +562,16 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.Columns["Strasse"].Visible = false;
sfDataGridEmpfaenger.Columns["PLZ"].Visible = false;
sfDataGridEmpfaenger.Columns["Ort"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = false;
sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = false;
sfDataGridEmpfaenger.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
}
catch { }
finally { sfDataGridEmpfaenger.EndUpdate(); }
}
private void init_empfaenger(int serienbriefnr)
{
@@ -584,6 +592,7 @@ namespace OnDoc.UIControls
sb.dsempfaenger.ReadXml(filename);
sb.dsempfaenger.Tables.Remove("Layout");
sb.dsempfaenger.AcceptChanges();
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
//System.IO.File.Delete(filename);
}
@@ -602,7 +611,21 @@ namespace OnDoc.UIControls
//this.cbboxzustaendigmitarbeiter.SelectedValue = AppParams.CurrentMitarbeiter;
sb.verantwortlich = AppParams.CurrentMitarbeiter;
vorlagenfelder(sb.dokumenttypnr);
try
{
bool boolinteintragexists = false;
foreach (DataColumn dc in sb.dsempfaenger.Tables[0].Columns)
{
if (dc.ColumnName.ToLower() == "inteingragnr") { boolinteintragexists = true; break; }
}
if (boolinteintragexists == false)
{
sb.dsempfaenger.Tables[0].Columns.Add("IntEintragnr");
}
}
catch { }
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
refresh_spalten();
update_screen();
update_serienbriefdaten(true);
@@ -899,7 +922,7 @@ namespace OnDoc.UIControls
{
try
{
refresh_spalten();
int inbearbeitung = 0;
int fehlerhaft = 0;
int generiert = 0;

File diff suppressed because it is too large Load Diff

View File

@@ -23,6 +23,9 @@ using System.Net;
using Newtonsoft.Json;
using Windows.Media.Capture;
using Syncfusion.Olap.MDXQueryParser;
using Windows.Media.Streaming.Adaptive;
using System.Data.SqlTypes;
using NLog.LayoutRenderers.Wrappers;
namespace OnDoc.Versandstrasse
{
@@ -53,14 +56,15 @@ namespace OnDoc.Versandstrasse
if (serienbrief)
{
this.tsbtnDruckPaketNew.Enabled = false;
this.TabControlDokuments.TabPages[1].Enabled = false;
this.ribbonButtonNewCouvert.Enabled = false;
this.ribbonTab2.Enabled = false;
this.sb = pakete[0].sb;
this.btnPrepare.Text = "Versand prüfen";
}
else
{
tsbtnDruckPaketNew.Enabled = true;
ribbonButtonNewCouvert.Enabled = true;
}
}
@@ -76,23 +80,27 @@ namespace OnDoc.Versandstrasse
{
TreeNodeAdv node = new TreeNodeAdv();
node.Text = dr["bezeichnung"].ToString();
node.Tag = dr["einzeilig"].ToString();
node.TagObject = dr;
treeViewAdvAdresse.Nodes.Add(node);
node.TextColor = Color.Blue;
}
TreeNodeAdv stdnode = new TreeNodeAdv();
stdnode.Text = "Standard-Adressen";
treeViewAdvAdresse.Nodes.Add(stdnode);
treeViewAdvAdresse.SelectedNode = stdnode;
//TreeNodeAdv stdnode = new TreeNodeAdv();
//stdnode.Text = "Standard-Adressen";
//treeViewAdvAdresse.Nodes.Add(stdnode);
//treeViewAdvAdresse.SelectedNode = stdnode;
}
db.Get_Tabledata("Select * from Antwortadresse order by bezeichnung", false, true);
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
TreeNodeAdv node = new TreeNodeAdv();
node.Text = dr["bezeichnung"].ToString();
node.Tag = dr["einzeilig"].ToString();
node.TagObject = dr;
if (hasprivateaddresses) { treeViewAdvAdresse.SelectedNode.Nodes.Add(node); } else { treeViewAdvAdresse.Nodes.Add(node); }
//node.TextColor = Color.Gray;
//if (hasprivateaddresses) { treeViewAdvAdresse.SelectedNode.Nodes.Add(node); } else { treeViewAdvAdresse.Nodes.Add(node); }
treeViewAdvAdresse.Nodes.Add(node);
}
treeViewAdvAdresse.SelectedNode = treeViewAdvAdresse.Nodes[0];
@@ -107,6 +115,11 @@ namespace OnDoc.Versandstrasse
Reload_Tree();
load_adressen();
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0];
this.pnlcouvert.Visible = true;
this.pnlpostkorb.Visible = false;
this.pnlpostkorb.Dock = DockStyle.Fill;
this.pnlcouvert.Dock = DockStyle.Fill;
}
private void Reload_Tree()
{
@@ -136,13 +149,14 @@ namespace OnDoc.Versandstrasse
DruckJob.TagObject = pakete[i];
set_nodeimage(DruckJob, 0);
treeViewAdv1.Nodes.Add(DruckJob);
PopulateDocs(pakete[i], ref DruckJob);
}
db.Get_Tabledata("Select * from [applikation] where applikationsnr = 1", false, true);
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Showlogin"]) == true) { button3.Visible = true; } else { button3.Visible = false; }
//db.Get_Tabledata("Select * from [applikation] where applikationsnr = 1", false, true);
//if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Showlogin"]) == true) { button3.Visible = true; } else { button3.Visible = false; }
db = null;
treeViewAdv1.ExpandAll();
@@ -253,8 +267,9 @@ namespace OnDoc.Versandstrasse
foreach (Versanddokument vd in pakete[0].Dokument)
{
TreeNodeAdv tn = new TreeNodeAdv();
tn.Text = vd.DokumentID + " - " + vd.Bezeichnung;
tn.Text = vd.Bezeichnung+" ("+vd.DokumentID+")";
tn.Tag = vd.dokument;
set_nodeimage(tn, 3);
treeViewAdv1.Nodes[0].Nodes.Add(tn);
}
@@ -317,7 +332,27 @@ namespace OnDoc.Versandstrasse
sourceNode.Move(destinationNode, NodePositions.Next);
break;
case TreeViewDropPositions.OnNode:
Versandpaket sourcepaket = sourceNode.Parent.TagObject as Versandpaket;
TreeNodeAdv savenode = sourceNode.Parent;
sourceNode.Move(destinationNode.Nodes);
//gaga
//Versanddokument dem neuen Versandpaket zuordnen
Versandpaket paket = destinationNode.TagObject as Versandpaket;
Versanddokument vd = sourceNode.TagObject as Versanddokument;
paket.Dokument.Add(vd);
destinationNode.TagObject = paket;
foreach (Versanddokument vd1 in sourcepaket.Dokument)
{
if (vd1.DokumentID == vd.DokumentID)
{
sourcepaket.Dokument.Remove(vd1);
break;
}
}
savenode.TagObject = sourcepaket;
destinationNode.Expand();
break;
}
@@ -470,6 +505,14 @@ namespace OnDoc.Versandstrasse
private void btnSend_Click(object sender, EventArgs e)
{
Cursor.Current = Cursors.WaitCursor;
if (rbapost.Checked) { txtVersandoption.Text = "A_POST"; }
if (rbb1post.Checked) { txtVersandoption.Text = "B1_POST"; }
if (rbb2post.Checked) { txtVersandoption.Text = "B2_POST"; }
this.txtRückantwort.Text = txtadresse.Text.ToString();
this.txtRückantwortSB.Text = txtRückantwort.Text;
this.txtversandartsb.Text = txtVersandoption.Text;
if (serienbrief)
{
clsVersandstrasse vs = new clsVersandstrasse();
@@ -482,9 +525,13 @@ namespace OnDoc.Versandstrasse
panelverifysb.Visible = true;
btnsendserienbrief.Visible = true;
btnSendFinal.Visible = false;
this.txtAnzahlDokumetneSB.Text = treeViewAdv1.Nodes[0].Nodes.Count.ToString();
return;
}
panelPrepare.Visible = true;
panelverifysb.Visible = false;
btnsendserienbrief.Visible = false;
btnSendFinal.Visible = true;
@@ -502,6 +549,7 @@ namespace OnDoc.Versandstrasse
{
clsVersandstrasse vs = new clsVersandstrasse();
vsdok.dokument = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath);
}
}
}
@@ -511,6 +559,7 @@ namespace OnDoc.Versandstrasse
// vsdok.dokument = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring,AppParams.RESTURI,AppParams.apikey, Application.StartupPath);
// //string dok = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring);
//}
treeViewAdv1.SelectedNode.TagObject = paket;
Stream[] streams = new Stream[paket.Dokument.Count];
int i = 0;
@@ -554,6 +603,8 @@ namespace OnDoc.Versandstrasse
streams = null;
treeViewAdv1.SelectedNode.TagObject = paket;
panelVerify.Visible = true;
this.txtAnzahlSeiten.Text = pdfViewerControl1.PageCount.ToString();
this.txtAnzahlDokumente.Text = paket.Dokument.Count().ToString();
}
catch { }
panelPrepare.Visible = false;
@@ -581,6 +632,8 @@ namespace OnDoc.Versandstrasse
private void chkGAS_CheckedChanged(object sender, EventArgs e)
{
this.panelVerify.Visible = false;
this.panelverifysb.Visible = false;
if (chkGAS.Checked)
{
treeViewAdvAdresse.Enabled = true;
@@ -610,6 +663,7 @@ namespace OnDoc.Versandstrasse
private void btnSendFinal_Click(object sender, EventArgs e)
{
if (serienbrief)
{
Versandpaket svp = treeViewAdv1.Nodes[0].TagObject as Versandpaket;
@@ -618,8 +672,9 @@ namespace OnDoc.Versandstrasse
svp.finaldoc = node.TagObject.ToString();
svp.send_onbase_doc = true;
string _sqlWhere = @"dokumentid = '" + node.Text.Substring(0,22) + "'";
string dokumentid = node.Text.Substring(0, 22);
string dokumentid = node.Text.Substring(node.Text.Length-23, 22);
string _sqlWhere = @"dokumentid = '" + dokumentid + "'";
DataTable _newDataTable = sb.dsempfaenger.Tables[0].Select(_sqlWhere, "").CopyToDataTable();
svp.partnernr = Convert.ToInt32(_newDataTable.Rows[0]["partnernr"].ToString());
@@ -628,16 +683,18 @@ namespace OnDoc.Versandstrasse
vd.dokument = node.TagObject.ToString();
vd.inteintragnr = Convert.ToInt32(_newDataTable.Rows[0]["inteintragnr"].ToString());
svp.bemerkung = vd.DokumentID +" / " + sb.serienbriefnr.ToString() + "_" + _newDataTable.Rows[0]["inteintragnr"].ToString();
svp.Dokument.Clear();
svp.Dokument.Add(vd);
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.add_parameter("@tgnummer", AppParams.currenttgnummer);
db.add_parameter("@partnernr", svp.partnernr.ToString());
db.add_parameter("@gasadresse", svp.GASAdresse);
db.add_parameter("@versandoption", svp.Versandoption);
db.add_parameter("@dokumente", node.Text + " / " + sb.serienbriefnr.ToString() + "_" + _newDataTable.Rows[0]["inteintragnr"].ToString());
db.Get_Tabledata("Ondoc_Insert_Versandprotokoll", true, false);
svp.protokollid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
//db.clear_parameter();
//db.add_parameter("@tgnummer", AppParams.currenttgnummer);
//db.add_parameter("@partnernr", svp.partnernr.ToString());
//db.add_parameter("@gasadresse", svp.GASAdresse);
//db.add_parameter("@versandoption", svp.Versandoption);
//db.add_parameter("@dokumente", node.Text + " / " + sb.serienbriefnr.ToString() + "_" + _newDataTable.Rows[0]["inteintragnr"].ToString());
//db.Get_Tabledata("Ondoc_Insert_Versandprotokoll", true, false);
//svp.protokollid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
db = null;
send_vs(ref svp, false);
@@ -648,6 +705,15 @@ namespace OnDoc.Versandstrasse
}
panelVerify.Visible = false;
Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket;
List<Versanddokument> vdl = new List<Versanddokument>();
foreach (TreeNodeAdv node in treeViewAdv1.SelectedNode.Nodes)
{
foreach(Versanddokument vdok in vp.Dokument)
{
if (node.Tag == vdok.DokumentID) { vdl.Add(vdok); }
}
}
vp.Dokument = vdl;
vp.verified = true;
treeViewAdv1.SelectedNode.TagObject = vp;
panelVerify.Visible = false;
@@ -655,7 +721,8 @@ namespace OnDoc.Versandstrasse
SendTo_Versandstrasse();
pdfViewerControl1.Unload();
vdl = null;
vp = null;
}
private void SendTo_Versandstrasse()
{
@@ -672,19 +739,19 @@ namespace OnDoc.Versandstrasse
db.Get_Tabledata(sql, false, true);
if (db.dsdaten.Tables[0].Rows[0][0].ToString() == "True")
{
vd.dokument = "";
//vd.dokument = "";
vp.send_onbase_doc = false;
}
}
}
db.clear_parameter();
db.add_parameter("@tgnummer", AppParams.currenttgnummer);
db.add_parameter("@partnernr", vp.partnernr.ToString());
db.add_parameter("@gasadresse", vp.GASAdresse);
db.add_parameter("@versandoption", vp.Versandoption);
db.add_parameter("@dokumente", dokumente);
db.Get_Tabledata("Ondoc_Insert_Versandprotokoll", true, false);
vp.protokollid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
//db.clear_parameter();
//db.add_parameter("@tgnummer", AppParams.currenttgnummer);
//db.add_parameter("@partnernr", vp.partnernr.ToString());
//db.add_parameter("@gasadresse", vp.GASAdresse);
//db.add_parameter("@versandoption", vp.Versandoption);
//db.add_parameter("@dokumente", dokumente);
//db.Get_Tabledata("Ondoc_Insert_Versandprotokoll", true, false);
//vp.protokollid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
db = null;
send_vs(ref vp);
@@ -694,8 +761,7 @@ namespace OnDoc.Versandstrasse
string jsonstring = JsonConvert.SerializeObject(vp);
//vp.send_onbase_doc = true;
if (!direktversenden)
{
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
@@ -708,6 +774,8 @@ namespace OnDoc.Versandstrasse
DataRow dr = db.daten.Tables[0].Rows[0];
dr[2] = jsonstring;
dr["aktiv"] = 1;
dr["versandoption"] = vp.Versandoption.ToString();
dr["Bemerkung"] = vp.bemerkung;
// db.daten.Tables[0].Rows.Add(dr);
db.Update_Data();
@@ -723,10 +791,12 @@ namespace OnDoc.Versandstrasse
}
db.Update_Data();
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
if (!direktversenden)
{
return;
}
string URL = AppParams.RESTURI + "api/Send_Versandstrasse";
string URL = AppParams.RESTURI + "api/Send_Versandstrasse?paketid=" + paketid.ToString();
panelVerify.Visible = false;
@@ -773,6 +843,7 @@ namespace OnDoc.Versandstrasse
private void rbapost_CheckedChanged(object sender, EventArgs e)
{
this.panelVerify.Visible = false;
string versandoption = "";
if (rbapost.Checked) { versandoption = "A_POST"; }
if (rbb1post.Checked) { versandoption = "B1_POST"; }
@@ -785,6 +856,7 @@ namespace OnDoc.Versandstrasse
private void treeViewAdvAdresse_AfterSelect(object sender, EventArgs e)
{
this.panelVerify.Visible = false;
try
{
Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket;
@@ -832,6 +904,7 @@ namespace OnDoc.Versandstrasse
{
try
{
this.panelVerify.Visible = false;
Cursor.Current = Cursors.WaitCursor;
TreeNodeAdv node = treeViewAdv1.SelectedNode;
if (node.Level == 1)
@@ -868,25 +941,27 @@ namespace OnDoc.Versandstrasse
{
foreach (TreeNodeAdv tn in treeViewAdvAdresse.Nodes)
{
if (tn.Text == paket.GASAdresse) { treeViewAdvAdresse.SelectedNode = tn; }
if (tn.Tag.ToString() == paket.GASAdresse) {
treeViewAdvAdresse.SelectedNode = tn;
}
}
}
}
else
{
if (tscheckboxpreview.Checked)
if (ribbonButtonDokPreview.Checked)
{
clsVersandstrasse vs = new clsVersandstrasse();
string dok = "";
if (serienbrief)
{
dok = vs.Prepare_PDF(node.Text.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, sb, node.Tag.ToString(), this.tschkcouvertpos.Checked);
dok = vs.Prepare_PDF(node.Text.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, sb, node.Tag.ToString(), this.ribbonchkadresse.Checked);
}
else
{
dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null,null,"",this.tschkcouvertpos.Checked);
dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null,null,"",this.ribbonchkadresse.Checked);
}
var stream = new MemoryStream(Convert.FromBase64String(dok));
@@ -917,10 +992,6 @@ namespace OnDoc.Versandstrasse
private void TabControlDokuments_SelectedIndexChanged(object sender, EventArgs e)
{
if (TabControlDokuments.SelectedIndex == 1)
{
Refresh_VersandCouverts();
}
}
private void Refresh_VersandCouverts()
{
@@ -939,7 +1010,7 @@ namespace OnDoc.Versandstrasse
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() == "B1_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)
@@ -962,10 +1033,25 @@ namespace OnDoc.Versandstrasse
try
{
TreeNodeAdv node = treeViewAdvCouverts.SelectedNode;
if (this.ribbonbuttondokpreviewpostkorb.Checked)
{
var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString()));
this.pdfViewerControl2.Load(stream);
stream = null;
}
if (node.Level==1)
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where id=" + node.Tag.ToString(), false, true);
Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(db.dsdaten.Tables[0].Rows[0]["paket"].ToString());
db = null;
this.textBox4.Text = this.pdfViewerControl2.PageCount.ToString();
this.textBox3.Text = node.Nodes.Count.ToString();
this.textBox2.Text = vp.Versandoption;
this.textBox1.Text = vp.GASAdresse;
}
var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString()));
this.pdfViewerControl2.Load(stream);
stream = null;
}
catch { }
}
@@ -1002,7 +1088,7 @@ namespace OnDoc.Versandstrasse
treeViewAdvCouverts.Nodes.Remove(treeViewAdvCouverts.SelectedNode);
pdfViewerControl2.Unload();
Reload_Tree();
this.TabControlDokuments.SelectedIndex = 0;
ribbon1.TabIndex = 0;
@@ -1016,7 +1102,7 @@ namespace OnDoc.Versandstrasse
if (node.Level > 1)
{
node = node.Parent;
reserve_vs_dokument(node.Tag.ToString(), 2);
reserve_vs_dokument(treeViewAdv1.SelectedNode.Tag.ToString(), 2);
treeViewAdv1.SelectedNode.Remove();
Verify_Couvert(node);
@@ -1076,21 +1162,102 @@ namespace OnDoc.Versandstrasse
private void tsbtnpreviewdoc_Click(object sender, EventArgs e)
{
tscheckboxpreview.Checked=tsbtnpreviewdoc.Checked;
if (tsbtnpreviewdoc.Checked == false)
{
this.pdfViewerControl1.Unload();
}
else
{
treeViewAdv1_AfterSelect(sender, e);
}
}
private void tsbtncheckaddress_Click(object sender, EventArgs e)
{
tschkcouvertpos.Checked=tsbtncheckaddress.Checked;
}
private void ribbonButton1_Click(object sender, EventArgs e)
{
}
private void ribbonButtonNewCouvert_Click(object sender, EventArgs e)
{
Versandpaket newpaket = new Versandpaket();
newpaket.PaketNr = (treeViewAdv1.Nodes.Count + 1).ToString();
newpaket.Versandoption = "B2_POST";
newpaket.GAS = "";
newpaket.GASAdresse = "";
newpaket.Mitteilung = "";
newpaket.Dokument = new List<Versanddokument>();
string NodeText = "Versand-Couvert " + (treeViewAdv1.Nodes.Count + 1).ToString();
TreeNodeAdv drucknode = new TreeNodeAdv();
drucknode.Text = NodeText;
drucknode.Tag = "Druckpaket";
drucknode.TagObject = newpaket;
pakete.Add(newpaket);
treeViewAdv1.Nodes.Add(drucknode);
}
private void ribbonTab1_ActiveChanged(object sender, EventArgs e)
{
if (this.ribbonTab1.Active)
{
this.pnlcouvert.Visible = true;
this.pnlcouvert.Dock= DockStyle.Fill;
this.pnlpostkorb.Visible = false;
}
}
private void ribbonTab2_ActiveChanged(object sender, EventArgs e)
{
if (this.ribbonTab2.Active)
{
this.pnlcouvert.Visible = false;
this.pnlpostkorb.Visible = true;
this.pnlpostkorb.Dock= DockStyle.Fill;
Refresh_VersandCouverts();
}
}
private void ribbonButtonDokPreview_Click(object sender, EventArgs e)
{
if (this.ribbonButtonDokPreview.Checked)
{
this.ribbonButtonDokPreview.Checked = false;
this.pdfViewerControl1.Unload();
}
else
{
this.ribbonButtonDokPreview.Checked = true;
treeViewAdv1_AfterSelect(sender, e);
}
}
private void ribbonchkadresse_Click(object sender, EventArgs e)
{
treeViewAdv1_AfterSelect(sender, e);
}
private void ribbon1_Click(object sender, EventArgs e)
{
this.pnlcouvert.Dock = DockStyle.Fill;
}
private void ribbonbuttondokpreviewpostkorb_Click(object sender, EventArgs e)
{
if (ribbonbuttondokpreviewpostkorb.Checked)
{
ribbonbuttondokpreviewpostkorb.Checked = false;
this.pdfViewerControl2.Unload();
}
else
{
ribbonbuttondokpreviewpostkorb.Checked= true;
treeViewAdv1_AfterSelect(sender, e);
}
}
private void Versandstrasse_Resize(object sender, EventArgs e)
{
this.treeViewAdvCouverts.Height = this.Height - this.ribbon1.Height-this.grpCouvertDetails.Height;
}
}
}

View File

@@ -128,7 +128,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0
DAAAAk1TRnQBSQFMAgEBBgEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBBgEAAcABAAHAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -194,7 +194,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU
DAAAAk1TRnQBSQFMAgEBBQEAAaABAAGgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBBQEAAcgBAAHIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -246,25 +246,6 @@
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>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="tsbtncheckaddress.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
cX79DFKrHHD5d9D26hvicx4pABt2lpg10zYzU0zr7+e3xXGcrkEB2O2TNec9nJFwB3alZn5jZorfeDZh
6Q3g8s06BeCoKF4MRURoH1+BY2oNCbeb0TIclIYxOhzf8frTOuo7FxCbbVIAzpni0iceEc8vhzEwGkJD
lx83ymxifejdKjRNk/8PWnyIyTQqAJek0jqHwfEVscu31baIu8+90sTE4nY025dQ2/5FIPpnXlzKuK8A
HBUzHot52djqQ6HZhfR7IwK4mKpHtvEDMqvfCiQ6zaAAXM8x94aIWTNrLLG4kVUzgaTSPlzLtyJOZxbb
1wtfyg4Q+AfA3aZlButjSfxGcUJBk4g5tuP3haQKRKXcUQDOmbvNTpPOJeFFjordZmbWTNvMTHFUcpUC
nOccAdABIDXXE1nzAAAAAElFTkSuQmCC
</value>
</data>
<data name="pdfViewerPrinterSettings3.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -272,6 +253,88 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
d2luZy5Qb2ludEYCAAAAAXgBeQAACwsCAAAAAAAAAAAAAAAL
</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnsendserienbrief.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAQHSURBVEhLpZQL
TFNXGMdP9sxc5pibGQnZlkjGQCMdq1Me45Z3WyhMwhCwQMco9EFBWYDN1k7mdNUsPqJ7CcVM3IYIiDJ0
W8sgUafByaOtLUOIG7DhQMi8Zo/K67/condwI9CxX/Ll5Hzn/r9fcm7uJWQRrFtH+YniJNXePr5yQsjT
3PNFk5ycfH9gYOAjnl5esTsNu/GtyQRVnuaP4FDB8SUeHhJCyIPczH8imKLCqfDIT5lBMeLYloGBATid
TtjtDpQZK5C6Mb37eb9V2wkhftysWwRRVAAVEaUNCQ1TPOPtnbKp8M0JY8VhlBmNOFJ5FBaLFWfPnoN2
6zsIeoUycvMLclcQHCpQMoKCzYUT5cYKHCorx2dHKqcF585Dp1+kYOYVRYvimpkruu10wuFwoLyiAqnS
9Ks+vivfI4Ss5GbdQiAQPMDn85d4ej0nZl6yyWyGWlPwZwgVVvOYx5PxhJCHuJlFwQ8K8o1LSKz3WbV6
MyHEk3t+T9YuW7b0RUKWu1NrCVlKCHmYEHKfPyGP8gl5ypOQ5eROPUHI47OGB/ACFGsixUMCRTFNydQ0
lamaXucsFR2aqb7JrMw+OENJR2Tl0RvUhXR68VaaEkqG/f39VawgJSW1q0irx8ulhxDb1A9xgx3ihit3
1vkrqt6GhEYHDJ2DqBwcg6a8GiU6PVJS035kBW/kKCzjTie2lJSAV2iAqLEbwprLEB7/Yd6KOHYJCSfa
sPvSNRy+dhOyXR+hqKgIt//+C3KF0soK0qSZnWCYnIBeuwU8TSmEX3XNKwmvakXiiXZ8cPknGHt/h3T7
Hrxd8hYmx8ddo6QZMgsr2Jghmxa4mML7724DT6GFsMEBYW3bPYcnnWzH3rafUd4zihSdAdv0emBqkp2S
Lnt9LsE0e3cZwMsuRswpO0S17ezwsKpWbDjVgf0dfSjrHsFrxaUw7NjBjS8sYCg7eAAhah2i620Q1rYj
7MtWpDV04kDnAD7pGkKGbicO7tvHjblwS4CpKSTFS/BSRj6i6iyQfWPHh9Zf8LH9NyTmlyBOJMbU5L/X
MpMFBfStW8jL3wSTyYy6qi8QJlNjT3sf9nf0Iz63AMc+PwqzuYn5VYCmaW58fsHIyChyFEo0nj7D9k7W
1iBZrkJStgq11dVs//SZryHPVeLGyAjbY5hTMHj9OrLkOWj6rnlWgGH0xjBGh4e4bTS3tCArOwe/Dg6y
vVmCu99Bf/8AZFnZOP/9hZl5t7hw8aIr29fX59rP+g5yVWpbT28vchQqdFos3KzbWKw214yrPb1Q5mmu
sIKY2Lg2pVoDi9XqenBsbHxRxWC12aDMy4dQLOlgBc96e/MjY8R1qdJ0s+TV9f+rmBnRInHdihUvrGFm
/wM19F1wo1uqCAAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnSendFinal.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAARiSURBVEhLtVRr
TFtlGD4z3mayX/pnMfHPBJe4YcRRCvQGSBnQlkIQWkBKgRZYe3rZZH8wQd0FNtgUMlcuLgSTzbjBpllk
XAqFAZMAm2ODJc7aQVsQ8JKNgSRTz2O+U1vKYeAS45s8Oe/znfd5nnznnO9QYoXhWEyy4a9IqR6RUt0a
RO0thVBmvCVMs2ynOCVS0LESpeUPSaoJIrkRvAQdC75UD7ImVpgglBunqJjkfTjTNoiByWnYr6+i98Y0
ukfvIau4Cm8Ic3PWBchM2ZK0/QiPK8Sps3YMTrjRMexkr8b3bQgTaSBJNYPiJ+pxoXscd+YWcePeKm5O
L+K66wFUJZXYLchRcwN2ifIyteZqHP34c8SkGNB/y4M/AZxsvgJJKo26xlaIFTQosj3SbIS49PcgUBhU
3IBQfk6m1lQNUrUN58GTlkB/sA574gvx3e278MzMIyJBB4o8+3b7MFxTs3BNr8WPUzNQlxzBzqjcxwa8
a6hiA0g1tHwNYUopxiecLCdXNiAiQY8pz1xgkFsF5hq8GqFe9w528HMyNfRx7nignC4v9rytAxWdXLpS
XtWCE7a2daixtUGZ/yHC44tk3IA9Cfrc9ILDqDndys6erL+I2qavAtryymaIlVZQ4lSzJExS2BjCy24K
5akbg/FaVF5jdFLxQb1e/ww3IFZJ7xDIaVsoL2eNhiCEp2raJcr/TCSnD3F1/08pFGXbopNK618XaHp2
8nP+E4hHdFJJg6KgbFsgIDxOm5ZReBhn2xw4d8mBC5cH8I19BF9c6sO5i45NQWbIbOvlAVZL1jKKjuDN
2ML0QEBIZKaK+0V0OkbW8M2KO5tvqkYIT7V6OEMjs7I09DH25sOl36HSfYB849E1os1KS1ciq6gCiw+X
WZ5vOo6QSPXq2QkTaFTqkkp8OzqBvH2H2J9Wd98Ihscm2bXNQGbsfaMgBza35CN2Lbu0ErvF2tUdxCsN
Lwrl9M23JFqI5DSUmnIkZpYhLt36RJBmlrEakYIG8RDKjONi2f6XAgHCRN12wV79D8nGBrRP3odzYQW3
vSv4/icfSP9vnGiu3LmPZGMjBEnFTn5c3suseYxM/4pEYfpVkma9Zu56NDW0AMwtATNLQL/HB9JvyN2+
fm4ZGPoZsHQ9mpakWYckCtNvxJsSK0zzIpmx452K889ae5m7V2cB7wNgdhGoHfGB9H7+SRCvC+JEQ7TW
XsZJvMQphnbiTcUqLVKKop4iuzF1MB5/wMwicHrMB9L7+adB3BbE/QGmDsYLYAtFUVuEPm9f0e3Mc6ZO
xh0cQMTBhqQ/xQn0c3+AuZPxaBx4PmAcHEBuDnADRjkBQZwN+IcTDdGaOxlvxpfMVq4/VeHA03QH4+2f
BX5Z9okmFnzwG7J8/vGcaIiW7mRm9WNY9/dly9LFNNtcwFU3MOQGhr0+DLp92IiT2QE3UO8CLJ1MC9c3
UCeuMVutPYztQB+zfKAHsHY/Gcgs0VjtTEPFGF4I9vwbJahImKh1DeYAAAAASUVORK5CYII=
</value>
</data>
<data name="btnPrepare.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="pdfViewerPrinterSettings4.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -292,7 +355,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq
CQAAAk1TRnQBSQFMAgEBAwEAAWABAAFgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBAwEAAYgBAAGIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -332,6 +395,24 @@
Ae8B9AIAAf8B8QGSCOwBkgHxAf8CAAH/AfEBkgjsAZIB8QH/EQABQgFNAT4HAAE+AwABKAMAAUADAAEQ
AwABAQEAAQEFAAGAFwAD/wEAAYABAQGAAQEBgAEBIgABBAEgDgABAgFABgABAgFABgABAgFALgABgAEB
AYABAQGAAQECAAs=
</value>
</data>
<data name="ribbonButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButton3.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButton3.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.