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

update 20251216

Browse Source
This commit is contained in:
Stefan Hutter
2025-12-16 16:19:20 +01:00
parent 0cfe92ab79
commit 4239fba5aa
21 changed files with 1368 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
API_NetFramework/bin/OnDoc_NetFramework.dll
BIN
View File
Binary file not shown.
API_NetFramework/bin/OnDoc_NetFramework.pdb
BIN
View File
Binary file not shown.
API_NetFramework/log.txt
+1242
View File
File diff suppressed because it is too large Load Diff
API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.
API_NetFramework/obj/Debug/OnDoc_NetFramework.dll
BIN
View File
Binary file not shown.
API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb
BIN
View File
Binary file not shown.
Client/Diverses/SplashScreen.Designer.cs
Generated
+1 -1
View File
@@ -65,7 +65,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(472, 26);
this.label2.TabIndex = 2;
this.label2.Text = "11.Dezember 2025";
this.label2.Text = "17.Dezember 2025";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.label2.Click += new System.EventHandler(this.label2_Click);
//
Client/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.11.01")]
[assembly: AssemblyFileVersion("1.7.11.01")]
[assembly: AssemblyVersion("1.7.11.02")]
[assembly: AssemblyFileVersion("1.7.11.02")]
Client/UIControls/Approval.Designer.cs
Generated
+28 -1
View File
@@ -72,6 +72,8 @@
this.ribbonButtonNotApproved = new System.Windows.Forms.RibbonButton();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
this.pnlsignerror = new System.Windows.Forms.Panel();
this.label9 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -81,6 +83,7 @@
this.pnlMultiThreading.SuspendLayout();
this.panelsign.SuspendLayout();
this.grpDetails.SuspendLayout();
this.pnlsignerror.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
@@ -107,6 +110,7 @@
//
// groupBox1
//
this.groupBox1.Controls.Add(this.pnlsignerror);
this.groupBox1.Controls.Add(this.treeViewAdv1);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Location = new System.Drawing.Point(0, 0);
@@ -210,8 +214,9 @@
this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(392, 112);
this.treeViewAdv1.ToolTipControl.TabIndex = 0;
this.treeViewAdv1.ToolTipControl.Visible = true;
this.treeViewAdv1.AfterSelect += new System.EventHandler(this.treeViewAdv1_AfterSelect);
this.treeViewAdv1.NodeMouseClick += new Syncfusion.Windows.Forms.Tools.TreeNodeAdvMouseClickArgs(this.treeViewAdv1_NodeMouseClick);
this.treeViewAdv1.Click += new System.EventHandler(this.treeViewAdv1_Click);
this.treeViewAdv1.Click += new System.EventHandler(this.treeViewAdv1_Click_1);
//
// pnlMultiThreading
//
@@ -566,6 +571,25 @@
this.ribbonButton1.Text = "Aktualisieren";
this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click);
//
// pnlsignerror
//
this.pnlsignerror.Controls.Add(this.label9);
this.pnlsignerror.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pnlsignerror.Location = new System.Drawing.Point(3, 773);
this.pnlsignerror.Name = "pnlsignerror";
this.pnlsignerror.Size = new System.Drawing.Size(294, 100);
this.pnlsignerror.TabIndex = 5;
this.pnlsignerror.Visible = false;
//
// label9
//
this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label9.Location = new System.Drawing.Point(4, 4);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(287, 46);
this.label9.TabIndex = 0;
this.label9.Text = "Bei der Signierung ist ein Fehler aufgetreten. Bitte wiederholen";
//
// Approval
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -585,6 +609,7 @@
this.panelsign.PerformLayout();
this.grpDetails.ResumeLayout(false);
this.grpDetails.PerformLayout();
this.pnlsignerror.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -629,5 +654,7 @@
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Panel pnlsignerror;
private System.Windows.Forms.Label label9;
}
}
Client/UIControls/Approval.cs
+95 -12
View File
@@ -35,12 +35,7 @@ namespace OnDoc.UIControls
private void treeViewAdv1_Click(object sender, EventArgs e)
{
try
{
}
catch { }
}
private System.Data.DataTable notes = new System.Data.DataTable();
@@ -56,11 +51,47 @@ namespace OnDoc.UIControls
}
private void treeViewAdv1_NodeMouseClick(object sender, Syncfusion.Windows.Forms.Tools.TreeViewAdvMouseClickEventArgs e)
{
if (treeViewAdv1.SelectedNode.Level == 1)
{
this.ribbonButtonApproved.Enabled = false;
this.ribbonButtonNotApproved.Enabled = false;
}
else
{
this.ribbonButtonApproved.Enabled = true;
this.ribbonButtonNotApproved.Enabled = true;
}
update_details(e.Node.Tag as string);
}
private void treeViewAdv1_Click_1(object sender, EventArgs e)
{
}
private void update_details(string nodetag)
{
//try
//{
// if (treeViewAdv1.SelectedNode.Enabled)
// {
// this.ribbonButtonApproved.Enabled = true;
// this.ribbonButtonNotApproved.Enabled = true;
// }
// else
// {
// this.ribbonButtonApproved.Enabled = false;
// this.ribbonButtonNotApproved.Enabled = false;
// }
//}
//catch {
// this.ribbonButtonApproved.Enabled = true;
// this.ribbonButtonNotApproved.Enabled = true;
//}
try
{
if (nodetag.Contains("(Paket)"))
@@ -200,6 +231,7 @@ namespace OnDoc.UIControls
}
private void ribbonButtonNotApproved_Click(object sender, EventArgs e)
{
pnlsignerror.Visible = false;
frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString(), "Ablehnen");
DataRow dr = treeViewAdv1.SelectedNode.TagObject as DataRow;
@@ -240,12 +272,15 @@ namespace OnDoc.UIControls
}
public List<string> threaddoks = new List<string>();
int signeddoc = 0;
private void signdoc(TreeNodeAdv tn, ref TreeViewAdv tv)
{
int approvaltype = 0;
int error = 0;
this.ribbonButtonNotApproved.Enabled = false;
this.ribbonButtonApproved.Enabled = false;
signeddoc = +1;
DataRow dr = tn.TagObject as DataRow;
threaddoks.Add(dr["dokumentid"].ToString());
@@ -297,7 +332,13 @@ namespace OnDoc.UIControls
dg = null;
}
//error = 1;
//DateTime t = DateTime.Now;
//DateTime now = DateTime.Now;
//while ((DateTime.Now - t).TotalSeconds < 5)
//{
// System.Windows.Forms.Application.DoEvents();
//}
//if (signeddoc == 1) { error = 1; } ;
if (error == 0)
{
db.Get_Tabledata("Select mutierer from dokument_Bewilligung where id=" + dr["id"].ToString(), false, true);
@@ -322,8 +363,10 @@ namespace OnDoc.UIControls
//remove_node();
TreeNodeAdv tparent = tn.Parent;
tparent.Nodes.Remove(tv.SelectedNode);
tv.Nodes.Remove(tv.SelectedNode);
tparent.Nodes.Remove(tn);
// tparent.Nodes.Remove(tv.SelectedNode);
tv.Nodes.Remove(tn);
//tv.Nodes.Remove(tv.SelectedNode);
if (tparent.Nodes.Count < 1)
{
tv.Nodes.Remove(tparent);
@@ -338,7 +381,11 @@ namespace OnDoc.UIControls
}
else
{
tv.SelectedNode = tv.Nodes[0].Nodes[0];
try
{
tv.SelectedNode = tv.Nodes[0].Nodes[0];
}
catch { }
}
try
{
@@ -358,9 +405,12 @@ namespace OnDoc.UIControls
}
threaddoks.Remove(dr["dokumentid"].ToString());
db.Get_Tabledata("Select bezeichnung from dokument where dokumentid='" + dr["dokumentid"].ToString() + "'",false,true);
MessageBox.Show("Das Dokument '" + db.dsdaten.Tables[0].Rows[0][0].ToString() + "' konnte aufgrund eines technischen Problems nicht signiert werden. Bitte Vorganng wiederholsen", "", MessageBoxButtons.OK, MessageBoxIcon.Error);
// MessageBox.Show("Das Dokument '" + db.dsdaten.Tables[0].Rows[0][0].ToString() + "' konnte aufgrund eines technischen Problems nicht signiert werden. Bitte Vorganng wiederholen", "", MessageBoxButtons.OK, MessageBoxIcon.Error);
// MessageBox.Show(new Form { TopMost = true }, "Das Dokument '\" + db.dsdaten.Tables[0].Rows[0][0].ToString() + \"' konnte aufgrund eines technischen Problems nicht signiert werden. Bitte Vorganng wiederholen", "Siegnieren", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
db = null;
tn.Enabled = true;
tn.Height = 16;
tn.TextColor = Color.Red;
}
@@ -370,6 +420,7 @@ namespace OnDoc.UIControls
{
int error = 0;
int approvaltype = 0;
this.pnlsignerror.Visible = false;
if (treeViewAdv1.SelectedNode.Tag.ToString().Contains("(Paket)"))
{
string pid = treeViewAdv1.SelectedNode.Tag.ToString();
@@ -388,13 +439,19 @@ namespace OnDoc.UIControls
if (AppParams.MultiThreadingSign)
{
signeddoc = 0;
approval_startet = true;
this.docPreview1.clear_viewer();
//Thread signthread = new Thread(signdoc);
Thread signthread = new Thread(() => signdoc(treeViewAdv1.SelectedNode, ref treeViewAdv1));
signthread.Start();
//remove_node();
treeViewAdv1.SelectedNode.Enabled=false;
treeViewAdv1.SelectedNode.Height = 0;
return;
}
@@ -454,8 +511,9 @@ namespace OnDoc.UIControls
}
else
{
MessageBox.Show("Aufgrund eines technischen Problems konnte das Dokument nicht signiert werden. Bitte Vorgang wiederholen", "Signieren",MessageBoxButtons.OK,MessageBoxIcon.Error);
MessageBox.Show("Aufgrund eines technischen Problems konnte das Dokument nicht signiert werden. Bitte Vorgang wiederholen", "Signieren",MessageBoxButtons.OK,MessageBoxIcon.Error, MessageBoxDefaultButton.Button1, (MessageBoxOptions)0x40000);
mailer = null;
//MessageBox.Show(new Form { TopMost = true }, "Aufgrund eines technischen Problems konnte das Dokument nicht signiert werden. Bitte Vorgang wiederholen", "Signieren", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
if (approvaltype == 2)
{
db.Exec_SQL("Update dokument set approval2=0 where dokumentid='" + dr["dokumentid"].ToString() + "'");
@@ -511,6 +569,7 @@ namespace OnDoc.UIControls
private void ribbonButton1_Click(object sender, EventArgs e)
{
if (threaddoks.Count > 0) { return; }
Update_Docs(AppParams.CurrentMitarbeiter);
try
{
@@ -546,5 +605,29 @@ namespace OnDoc.UIControls
return treeViewAdv1.Nodes.Count;
}
private void treeViewAdv1_AfterSelect(object sender, EventArgs e)
{
this.pnlsignerror.Visible = false;
try
{
if (treeViewAdv1.SelectedNode.Level == 1)
{
this.ribbonButtonApproved.Enabled = false;
this.ribbonButtonNotApproved.Enabled = false;
}
else
{
this.ribbonButtonApproved.Enabled = true;
this.ribbonButtonNotApproved.Enabled = true;
}
if (treeViewAdv1.SelectedNode.TextColor== Color.Red)
{
this.pnlsignerror.Visible = true;
}
update_details(treeViewAdv1.SelectedNode.Tag as string);
}
catch { }
}
}
}
Client/bin/Debug/OnDoc.exe
BIN
View File
Binary file not shown.
Client/bin/Debug/OnDoc.pdb
BIN
View File
Binary file not shown.
Client/bin/Debug/OnDocClient.zip
BIN
View File
Binary file not shown.
Client/bin/Debug/de-DE/OnDoc.resources.dll
BIN
View File
Binary file not shown.
Client/obj/Debug/Client.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/OnDoc.exe
BIN
View File
Binary file not shown.
Client/obj/Debug/OnDoc.pdb
BIN
View File
Binary file not shown.
Client/obj/Debug/de-DE/OnDoc.resources.dll
BIN
View File
Binary file not shown.
DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.
OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.