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

@@ -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;