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

update 20260326

Browse Source
This commit is contained in:
Stefan Hutter
2026-03-26 18:26:34 +01:00
parent 399d63bc69
commit e82057b6e4
87 changed files with 5024 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
Client/UIControls/Approval.cs
View File

@@ -95,18 +95,48 @@ namespace OnDoc.UIControls
try
{
if (nodetag.Contains("(Paket)"))
docPreview1.Width = splitContainer1.Panel2.Width - grpDetails.Width - 5;
grpversanddetails.Left = grpDetails.Left;
grpversanddetails.Top= grpDetails.Top;
grpversanddetails.Width = grpDetails.Width;
grpversanddetails.Visible = false;
grpversanddetails.Dock = DockStyle.Right;
grpDetails.Dock = DockStyle.Right;
if (nodetag.Contains("Couvert)"))
{
string pid = nodetag.Substring(0, nodetag.Length - 7);
grpDetails.Visible = false;
string pid = nodetag.Substring(0, nodetag.Length - 9);
//grpDetails.Visible = false;
DB dB = new DB(AppParams.connectionstring);
dB.Get_Tabledata("Select paket from ondoc_versandstrasse_paket where id = " + pid.ToString(), false, true);
dB.Get_Tabledata("Select paket, erstellt_am from ondoc_versandstrasse_paket where id = " + pid.ToString(), false, true);
Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(dB.dsdaten.Tables[0].Rows[0]["paket"].ToString());
this.docPreview1.Show_Doc(vp.finaldoc);
// vp = null;
try
{
txtcouverterstelltam.Text = "";
txtversandart.Text = "";
txtgasadresse.Text = "";
txtanzahldokumente.Text = "";
txtanzahldokumente.Text = "";
txtanzahlseiten.Text = "";
txtgassize.Text = "";
txtversandart.Text = vp.Versandoption;
txtcouverterstelltam.Text=dB.dsdaten.Tables[0].Rows[0]["erstellt_am"].ToString();
txtgasadresse.Text = vp.GASAdresse.Replace(";",Environment.NewLine);
txtanzahldokumente.Text = vp.Dokument.Count.ToString();
txtanzahlseiten.Text= this.docPreview1.Get_Page_Count().ToString();
txtgassize.Text = vp.GASSize.ToString();
}
catch { }
grpversanddetails.Visible = true;
grpversanddetails.Dock = DockStyle.Right;
vp = null;
this.docPreview1.Width = this.Width - grpversanddetails.Width - groupBox1.Width-10;
dB = null;
return;
}
grpDetails.Visible = true;
this.docPreview1.Width = this.Width - grpDetails.Width - groupBox1.Width-10;
notes.Rows.Clear(); ;
notes.Columns.Clear();
notes.AcceptChanges();
@@ -214,8 +244,8 @@ namespace OnDoc.UIControls
}
TreeNodeAdv tndok = new TreeNodeAdv();
tndok.Text = "Dokumentpaket - " + dr["Bezeichnung"].ToString();
tndok.Tag = dr["paketid"].ToString() + "(Paket)";
tndok.Text = "Versand-Couvert - " + dr["Bezeichnung"].ToString();
tndok.Tag = dr["paketid"].ToString() + "(Couvert)";
tndok.TagObject = dr;
tnpartner.Nodes.Add(tndok);
}
@@ -239,10 +269,10 @@ namespace OnDoc.UIControls
if (note.ShowDialog() == DialogResult.OK)
{
DB db = new DB(AppParams.connectionstring);
if (treeViewAdv1.SelectedNode.Tag.ToString().Contains("(Paket)"))
if (treeViewAdv1.SelectedNode.Tag.ToString().Contains("(Couvert)"))
{
string pid = treeViewAdv1.SelectedNode.Tag.ToString();
pid = pid.Substring(0, pid.Length - 7);
pid = pid.Substring(0, pid.Length - 9);
DB db1 = new DB(AppParams.connectionstring);
db1.clear_parameter();
db1.add_parameter("@paketid", pid);
@@ -446,10 +476,10 @@ namespace OnDoc.UIControls
int error = 0;
int approvaltype = 0;
this.pnlsignerror.Visible = false;
if (treeViewAdv1.SelectedNode.Tag.ToString().Contains("(Paket)"))
if (treeViewAdv1.SelectedNode.Tag.ToString().Contains("(Couvert)"))
{
string pid = treeViewAdv1.SelectedNode.Tag.ToString();
pid = pid.Substring(0,pid.Length - 7);
pid = pid.Substring(0,pid.Length - 9);
DB db1 = new DB(AppParams.connectionstring);
db1.clear_parameter();
db1.add_parameter("@paketid", pid);
@@ -666,5 +696,28 @@ namespace OnDoc.UIControls
}
catch { }
}
private void label10_Click(object sender, EventArgs e)
{
}
private void label11_Click(object sender, EventArgs e)
{
}
private void groupBox1_Resize(object sender, EventArgs e)
{
}
private void Approval_SizeChanged(object sender, EventArgs e)
{
this.docPreview1.Width = this.Width - grpDetails.Width - groupBox1.Width - 10;
int i = txtVerantwortlich.Top + txtVerantwortlich.Height;
i = txtNote.Top - i;
this.sfListView1.Height = i - lblnotizen.Height-10;
}
}
}