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

update 20250420

Browse Source
This commit is contained in:
Stefan Hutter
2025-04-20 12:11:01 +02:00
parent d278bed131
commit 25ce6bc343
27 changed files with 4491 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Client/UIControls/Serienbrief.Designer.cs generated
View File

@@ -93,6 +93,7 @@
this.partnerHinzufügenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.partnerLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.erneutGenerierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.vorschauToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.ctxmenutree = new System.Windows.Forms.ContextMenuStrip(this.components);
this.partnerlistePrüfenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -136,6 +137,8 @@
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.folderBrowser1 = new Syncfusion.Windows.Forms.FolderBrowser(this.components);
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.ribbonpaneladmin = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonAddmin = new System.Windows.Forms.RibbonButton();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.GrpDokumentInhalt.SuspendLayout();
this.grpFaktura.SuspendLayout();
@@ -697,7 +700,7 @@
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(1098, 118);
this.pnlLoad.Location = new System.Drawing.Point(178, 82);
this.pnlLoad.Name = "pnlLoad";
this.pnlLoad.Size = new System.Drawing.Size(957, 634);
this.pnlLoad.TabIndex = 4;
@@ -815,9 +818,10 @@
this.ctxmenuEmpfaenger.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.partnerHinzufügenToolStripMenuItem,
this.partnerLöschenToolStripMenuItem,
this.erneutGenerierenToolStripMenuItem});
this.erneutGenerierenToolStripMenuItem,
this.vorschauToolStripMenuItem});
this.ctxmenuEmpfaenger.Name = "ctxmenuEmpfaenger";
this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(211, 70);
this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(211, 92);
//
// partnerHinzufügenToolStripMenuItem
//
@@ -840,6 +844,13 @@
this.erneutGenerierenToolStripMenuItem.Text = "Generierung zurücksetzen";
this.erneutGenerierenToolStripMenuItem.Click += new System.EventHandler(this.erneutGenerierenToolStripMenuItem_Click);
//
// vorschauToolStripMenuItem
//
this.vorschauToolStripMenuItem.Name = "vorschauToolStripMenuItem";
this.vorschauToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
this.vorschauToolStripMenuItem.Text = "Vorschau";
this.vorschauToolStripMenuItem.Click += new System.EventHandler(this.vorschauToolStripMenuItem_Click);
//
// treeViewAdv1
//
treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1;
@@ -864,6 +875,7 @@
this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(392, 112);
this.treeViewAdv1.HelpTextControl.TabIndex = 0;
this.treeViewAdv1.HelpTextControl.Visible = true;
this.treeViewAdv1.HideSelection = false;
this.treeViewAdv1.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText;
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)))));
@@ -1018,6 +1030,7 @@
this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel7);
this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel8);
this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel9);
this.ribbonTabFunktionen.Panels.Add(this.ribbonpaneladmin);
this.ribbonTabFunktionen.Text = "Funktionen";
//
// ribbonPanel1
@@ -1317,6 +1330,22 @@
this.splitContainer1.SplitterDistance = 902;
this.splitContainer1.TabIndex = 5;
//
// ribbonpaneladmin
//
this.ribbonpaneladmin.Items.Add(this.ribbonButtonAddmin);
this.ribbonpaneladmin.Name = "ribbonpaneladmin";
this.ribbonpaneladmin.Text = "";
//
// ribbonButtonAddmin
//
this.ribbonButtonAddmin.CheckOnClick = true;
this.ribbonButtonAddmin.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.Image")));
this.ribbonButtonAddmin.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.LargeImage")));
this.ribbonButtonAddmin.Name = "ribbonButtonAddmin";
this.ribbonButtonAddmin.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.SmallImage")));
this.ribbonButtonAddmin.Text = "Grid erweitern";
this.ribbonButtonAddmin.Click += new System.EventHandler(this.ribbonButton1_Click_1);
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1483,5 +1512,8 @@
private System.Windows.Forms.Button btnblexport;
private Syncfusion.Windows.Forms.FolderBrowser folderBrowser1;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
private System.Windows.Forms.ToolStripMenuItem vorschauToolStripMenuItem;
private System.Windows.Forms.RibbonPanel ribbonpaneladmin;
private System.Windows.Forms.RibbonButton ribbonButtonAddmin;
}
}

74
Client/UIControls/Serienbrief.cs
View File

@@ -120,6 +120,7 @@ namespace OnDoc.UIControls
Security security = new Security();
security.set_security_general(this);
security = null;
if (AppParams.isSysadmin) { this.ribbonpaneladmin.Visible = true; } else { this.ribbonpaneladmin.Visible=false; }
//Closing += Form_Closing;
}
@@ -238,6 +239,7 @@ namespace OnDoc.UIControls
ctxmenuEmpfaenger.Enabled = true;
partnerHinzufügenToolStripMenuItem.Visible = true;
partnerLöschenToolStripMenuItem.Visible = true;
vorschauToolStripMenuItem.Visible = true;
erneutGenerierenToolStripMenuItem.Visible = false;
docPreview1.Visible = false;
@@ -246,6 +248,7 @@ namespace OnDoc.UIControls
{
partnerHinzufügenToolStripMenuItem.Visible = false;
partnerLöschenToolStripMenuItem.Visible = false;
vorschauToolStripMenuItem.Visible = false;
sfDataGridEmpfaenger.AllowEditing = false;
erneutGenerierenToolStripMenuItem.Visible = true;
docPreview1.clear_viewer();
@@ -563,9 +566,16 @@ namespace OnDoc.UIControls
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;
if (!this.ribbonButtonAddmin.Checked)
{
sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = false;
sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = false;
}
if (this.ribbonButtonAddmin.Checked)
{
sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = true;
}
sfDataGridEmpfaenger.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
@@ -869,8 +879,8 @@ namespace OnDoc.UIControls
try { sb.postzustellung = Convert.ToInt32(cbboxpostzustellung.SelectedValue.ToString()); } catch { sb.postzustellung = 0; }
try { sb.unterschriftlinks = Convert.ToInt32(cbboxunterschriftlinks.SelectedValue.ToString()); } catch { sb.unterschriftlinks = 0; }
try { sb.unterschriftrechts = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue.ToString()); } catch { sb.unterschriftrechts = 0; }
if (cbboxunterschriftlinks.Text.Trim() == "") { sb.unterschriftlinks = 0; }
if (cbboxunterschriftrechts.Text.Trim() == "") { sb.unterschriftrechts = 0; }
try { if (cbboxunterschriftlinks.Text.Trim() == "") { sb.unterschriftlinks = 0; } } catch { sb.unterschriftlinks = 0; }
try { if (cbboxunterschriftrechts.Text.Trim() == "") { sb.unterschriftrechts = 0; } } catch { sb.unterschriftrechts = 0; }
try
{
if (cbdigitaleunterschrfiten.Checked)
@@ -1519,7 +1529,7 @@ namespace OnDoc.UIControls
finally { db = null; }
}
private void Generate(int vorschauid = -1)
private void Generate(int vorschauid = -1, bool sbmain = false)
{
@@ -1538,6 +1548,7 @@ namespace OnDoc.UIControls
{
Helper.FileHelper fh = new FileHelper();
sb.VorlageBase64 = fh.Base64FromFile(PreviewFiename);
fh = null;
}
else
{
@@ -1591,7 +1602,7 @@ namespace OnDoc.UIControls
imghelper = null;
vorlagendaten_aufbereiten(vorschauid);
vorlagendaten_aufbereiten(vorschauid, sbmain);
if (cbdigitaleunterschrfiten.Checked)
{
sb.toapproval = 1;
@@ -1606,6 +1617,7 @@ namespace OnDoc.UIControls
sb.approval2 = 0;
}
if (sbmain) { return; }
update_serienbriefdaten(false);
update_zahlen();
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[2];
@@ -1613,7 +1625,7 @@ namespace OnDoc.UIControls
}
private void vorlagendaten_aufbereiten(int vorschauid = -1)
private void vorlagendaten_aufbereiten(int vorschauid = -1, bool sbmain = false)
{
init_progressbar("Dokumente generieren", vorlagendaten.Rows.Count);
@@ -1844,7 +1856,17 @@ namespace OnDoc.UIControls
if (vorschauid != -1 && Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
{
string pdfdoc_preview = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey));
sbedit.Update_Preview(pdfdoc_preview);
if (!sbmain)
{
sbedit.Update_Preview(pdfdoc_preview);
}
else
{
docPreview1.show_base64(pdfdoc_preview, "");
docPreview1.Visible= true;
}
}
else
{
@@ -2940,6 +2962,40 @@ namespace OnDoc.UIControls
versandpakete.Add(vp);
OnDoc.Versandstrasse.Versandstrasse vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete);
vs.ShowDialog();
if (vs.sb.status == 1)
{
foreach (System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
{
dr["status"] = 2;
}
sb.dsempfaenger.AcceptChanges();
update_serienbriefdaten(false);
update_zahlen();
}
}
private void vorschauToolStripMenuItem_Click(object sender, EventArgs e)
{
var selectedItem = this.sfDataGridEmpfaenger.CurrentItem as DataRowView;
var dataRow = (selectedItem as DataRowView).Row;
var cellValue = dataRow["IntEintragnr"].ToString();
IsPreview = true;
DB db = new DB(AppParams.connectionstring);
string fn = db.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir);
sb.VorlageBase64 = db.dsdaten.Tables[0].Rows[0][0].ToString();
FileHelper fh = new FileHelper();
PreviewFiename = AppParams.tempdir + "sb_" + DateTime.Now.ToString("yyyyMMddhhmmss") + "_pv.pdf";
fh.SaveBase64ToFile(sb.VorlageBase64, PreviewFiename);
fn = null;
int vorschauid = Convert.ToInt32(cellValue);
update_serienbriefdaten(false);
Generate(vorschauid,true);
IsPreview = false;
}
private void ribbonButton1_Click_1(object sender, EventArgs e)
{
}
}

18
Client/UIControls/Serienbrief.resx
View File

@@ -128,6 +128,24 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<data name="ribbonButtonAddmin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonAddmin.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonAddmin.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">