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

Update 20250118

Browse Source
This commit is contained in:
Stefan Hutter
2025-01-18 21:13:54 +01:00
parent cfd7c00451
commit bc996921a1
65 changed files with 1041 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
Client/UIControls/Approval.cs
View File

@@ -1,6 +1,7 @@
using Database;
using OnDoc.DocMgmt;
using OnDoc.Klassen;
using Syncfusion.Windows.Forms.Edit;
using Syncfusion.Windows.Forms.Tools;
using System;
using System.Collections.Generic;
@@ -45,6 +46,9 @@ namespace OnDoc.UIControls
}
private void treeViewAdv1_NodeMouseClick(object sender, Syncfusion.Windows.Forms.Tools.TreeViewAdvMouseClickEventArgs e)
{
update_details(e.Node.Tag as string);
}
private void update_details(string nodetag){
try {
notes.Rows.Clear(); ;
notes.Columns.Clear();
@@ -52,9 +56,9 @@ namespace OnDoc.UIControls
notes.Columns.Add("Betreff");
notes.Columns.Add("Note");
notes.Columns.Add("Notewriter");
this.docPreview1.Show_Doc(e.Node.Tag as string);
this.docPreview1.Show_Doc(nodetag);
Database.DB db = new Database.DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from View_Relaunach_Approval_Doc where dokumentid='" + e.Node.Tag as string + "'", false, true);
db.Get_Tabledata("Select * from View_Relaunach_Approval_Doc where dokumentid='" + nodetag + "'", false, true);
this.txtdokumentid.Text = db.dsdaten.Tables[0].Rows[0]["Dokumentid"].ToString();
this.txtbezeichnung.Text = db.dsdaten.Tables[0].Rows[0]["bezeichnung"].ToString();
this.txtPartnerNr.Text = db.dsdaten.Tables[0].Rows[0]["nrpar00"].ToString();
@@ -101,12 +105,12 @@ namespace OnDoc.UIControls
db.Get_Tabledata("Select * from view_relaunch_approval where mitarbeiter_bewilligung=" + manr.ToString() + " order by bewilligungstyp, nrpar00, bezeichnung", false, true);
TreeNodeAdv tn1 = new TreeNodeAdv();
TreeNodeAdv tn2 = new TreeNodeAdv();
//TreeNodeAdv tn1 = new TreeNodeAdv();
//TreeNodeAdv tn2 = new TreeNodeAdv();
TreeNodeAdv tnpartner = null;
tn1.Text = "Unterschfit links";
tn2.Text = "Unterschrift rechts";
//tn1.Text = "Unterschfit links";
//tn2.Text = "Unterschrift rechts";
int tmppartner = 0;
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
{
@@ -115,7 +119,8 @@ namespace OnDoc.UIControls
tmppartner = Convert.ToInt32(dr["nrpar00"]);
tnpartner = new TreeNodeAdv();
tnpartner.Text = dr["nrpar00"].ToString() + " " + dr["bkpar00"].ToString();
if (dr["bewilligungstyp"].ToString() == "1") { tn1.Nodes.Add(tnpartner); } else { tn2.Nodes.Add(tnpartner); }
if (dr["bewilligungstyp"].ToString() == "1") {
treeViewAdv1.Nodes.Add(tnpartner); } else { treeViewAdv1.Nodes.Add(tnpartner); }
}
TreeNodeAdv tndok = new TreeNodeAdv();
tndok.Text = dr["bezeichnung"].ToString();
@@ -123,14 +128,19 @@ namespace OnDoc.UIControls
tndok.TagObject = dr;
tnpartner.Nodes.Add(tndok);
}
if (tn1.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn1); }
if (tn2.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn2); }
//if (tn1.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn1); }
//if (tn2.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn2); }
treeViewAdv1.ExpandAll();
if (treeViewAdv1.Nodes.Count > 0)
{
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0].Nodes[0];
update_details(treeViewAdv1.SelectedNode.Tag as string);
}
}
private void ribbonButtonNotApproved_Click(object sender, EventArgs e)
{
frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString());
frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString(),"Ablehnen");
DataRow dr = treeViewAdv1.SelectedNode.TagObject as DataRow;
if (note.ShowDialog() == DialogResult.OK)
@@ -139,9 +149,9 @@ namespace OnDoc.UIControls
string sql = "update dokument_bewilligung set abgelehnt=1, abgelehnt_am = '" + DateTime.Now.ToString() + "' where id=" + dr["id"].ToString();
db.Exec_SQL(sql);
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
TreeNodeAdv tp = treeViewAdv1.SelectedNode.Parent;
treeViewAdv1.SelectedNode.Parent.Nodes.Remove(treeViewAdv1.SelectedNode);
// treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
// TreeNodeAdv tp = treeViewAdv1.SelectedNode.Parent;
// treeViewAdv1.SelectedNode.Parent.Nodes.Remove(treeViewAdv1.SelectedNode);
if (dr["Bewilligungstyp"].ToString() == "2")
{
db.Exec_SQL("Update dokument set approved=0, approval2=0 where dokumentid='" + dr["dokumentid"].ToString()+"'");
@@ -150,10 +160,12 @@ namespace OnDoc.UIControls
{
db.Exec_SQL("Update dokument set approved=0, approval1=0 where dokumentid='" + dr["dokumentid"].ToString()+"'");
}
if (tp.Nodes.Count < 1)
{
tp.Parent.Nodes.Remove(tp);
}
remove_node();
//if (tp.Nodes.Count < 1)
//{
// tp.Parent.Nodes.Remove(tp);
//}
db = null;
Logging.DocLog.Info("Dokument geprüft - abgelehnt", "Dokumentprüfung", dr["dokumentid"].ToString(),"","");
@@ -167,10 +179,6 @@ namespace OnDoc.UIControls
DataRow dr = treeViewAdv1.SelectedNode.TagObject as DataRow;
string sql = "update dokument_bewilligung set bewilligt=1, bewilligt_am = '" + DateTime.Now.ToString() + "' where id=" + dr["id"].ToString();
db.Exec_SQL(sql);
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
TreeNodeAdv tp = treeViewAdv1.SelectedNode.Parent;
treeViewAdv1.SelectedNode.Parent.Nodes.Remove(treeViewAdv1.SelectedNode);
if (dr["Bewilligungstyp"].ToString() == "2")
{
db.Exec_SQL("Update dokument set approval2=1 where dokumentid='" + dr["dokumentid"].ToString() + "'");
@@ -181,6 +189,58 @@ namespace OnDoc.UIControls
}
db = null;
Logging.DocLog.Info("Dokument geprüft", "Dokumentprüfung", dr["dokumentid"].ToString(), "", "");
remove_node();
}
private void remove_node()
{
this.txtdokumentid.Text = "";
this.txtbezeichnung.Text = "";
this.txtPartnerNr.Text = "";
this.txtPartner.Text = "";
this.txterstelltam.Text = "";
this.txtersteller.Text = "";
this.txtmutiertam.Text = "";
this.txtmutierer.Text = "";
this.txtVerantwortlich.Text = "";
this.docPreview1.clear_viewer();
TreeNodeAdv tparent = treeViewAdv1.SelectedNode.Parent;
tparent.Nodes.Remove(treeViewAdv1.SelectedNode);
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
if (tparent.Nodes.Count < 1)
{
treeViewAdv1.Nodes.Remove(tparent);
}
else
{
treeViewAdv1.SelectedNode = tparent.Nodes[0];
}
if (treeViewAdv1.Nodes.Count < 1)
{
}
else
{
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0].Nodes[0];
}
try
{
update_details(treeViewAdv1.SelectedNode.Tag as string);
}
catch { }
}
private void ribbonButton1_Click(object sender, EventArgs e)
{
Update_Docs(AppParams.CurrentMitarbeiter);
try
{
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0].Nodes[0];
update_details(treeViewAdv1.SelectedNode.Tag as string);
}
catch { }
}
}
}