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

Update 20251107

Browse Source
This commit is contained in:
Stefan Hutter
2025-11-07 15:07:34 +01:00
parent e6d233b36d
commit ec5c61cc57
55 changed files with 1032 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Client/UIControls/Approval.cs
View File

@@ -1,5 +1,6 @@
using Database;
using DOCGEN;
using Microsoft.Office.Interop.Word;
using NLog.LayoutRenderers;
using OnDoc.DocMgmt;
using OnDoc.Klassen;
@@ -40,6 +41,7 @@ namespace OnDoc.UIControls
}
private System.Data.DataTable notes = new System.Data.DataTable();
public int pages = 0;
private void AddNote(string datum, string betreff, string note, string ersteller)
{
@@ -62,6 +64,7 @@ namespace OnDoc.UIControls
notes.Columns.Add("Note");
notes.Columns.Add("Notewriter");
this.docPreview1.Show_Doc(nodetag);
this.pages = docPreview1.Get_Page_Count();
Database.DB db = new Database.DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from View_Relaunach_Approval_Doc where dokumentid='" + nodetag + "'", false, true);
@@ -194,6 +197,7 @@ namespace OnDoc.UIControls
string threaddocid = "";
string threadempfaenger = "";
string threadid = "";
private void signdoc()
{
string intDokid = threaddocid;
@@ -209,7 +213,8 @@ namespace OnDoc.UIControls
//Application.DoEvents();
//Cursor = Cursors.WaitCursor;
DOCGEN.DocGen dg = new DocGen(AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey);
if (dg.signdoc(threaddocid, AppParams.tempdir))
if (dg.signdoc(threaddocid, AppParams.tempdir,pages))
{
db.Exec_SQL("Update Dokument set signiert=1, mutierer=" + AppParams.CurrentMitarbeiter.ToString() + ", mutiertam=getdate() where dokumentid='" + intDokid + "'");
}
@@ -264,16 +269,17 @@ namespace OnDoc.UIControls
if (db.dsdaten.Tables[0].Rows[0]["approved"].ToString()=="True")
{
panelsign.Visible = true;
Application.DoEvents();
Cursor = Cursors.WaitCursor;
System.Windows.Forms.Application.DoEvents();
Cursor = Cursors.WaitCursor;
DOCGEN.DocGen dg = new DocGen(AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey);
if (dg.signdoc(dr["dokumentid"].ToString(), AppParams.tempdir))
if (dg.signdoc(dr["dokumentid"].ToString(), AppParams.tempdir, pages)) ;
{
db.Exec_SQL("Update Dokument set signiert=1, mutierer=" + AppParams.CurrentMitarbeiter.ToString() + ", mutiertam=getdate() where dokumentid='" + dr["dokumentid"].ToString() + "'");
}
dg = null;
panelsign.Visible = false;
Application.DoEvents();
System.Windows.Forms.Application.DoEvents();
Cursor = Cursors.Default;
}