diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index b549bfe9..2718d7b5 100644 Binary files a/API_NetFramework/bin/DOCGEN.dll and b/API_NetFramework/bin/DOCGEN.dll differ diff --git a/API_NetFramework/bin/DOCGEN.pdb b/API_NetFramework/bin/DOCGEN.pdb index 940b4075..5a5d579f 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/OnDocOffice.dll b/API_NetFramework/bin/OnDocOffice.dll index 1290d4c8..de6abead 100644 Binary files a/API_NetFramework/bin/OnDocOffice.dll and b/API_NetFramework/bin/OnDocOffice.dll differ diff --git a/API_NetFramework/bin/OnDocOffice.pdb b/API_NetFramework/bin/OnDocOffice.pdb index 44a238a2..8c9e2424 100644 Binary files a/API_NetFramework/bin/OnDocOffice.pdb and b/API_NetFramework/bin/OnDocOffice.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index 04dbad72..4c292008 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index 16943c7c..48b4ca52 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index 69a28e6a..ed187786 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -33950,3 +33950,159 @@ Die Anweisung wurde beendet. 2025-10-17 11:14:04.8642|DEBUG|OnDoc| 2025-10-17 11:14:04.9059|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 2025-10-17 11:14:06.8746|DEBUG|OnDoc|Generate_Word +2025-11-06 13:30:30.2803|DEBUG|OnDoc| +2025-11-06 13:30:30.3554|DEBUG|OnDoc| +2025-11-06 13:31:28.6761|DEBUG|OnDoc|Mailversand: 2 +2025-11-06 13:31:28.7113|DEBUG|OnDoc| +2025-11-06 13:31:28.7113|DEBUG|OnDoc| +2025-11-06 13:31:40.8358|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-11-06 13:31:40.8736|DEBUG|OnDoc|Mail Versand NOK - Exception Inner: System.Net.WebException: Der Remotename konnte nicht aufgelöst werden: 'smtp.tgcorp.ch' + bei System.Net.ServicePoint.GetConnection(PooledStream PooledStream, Object owner, Boolean async, IPAddress& address, Socket& abortSocket, Socket& abortSocket6) + bei System.Net.PooledStream.Activate(Object owningObject, Boolean async, GeneralAsyncDelegate asyncCallback) + bei System.Net.ConnectionPool.GetConnection(Object owningObject, GeneralAsyncDelegate asyncCallback, Int32 creationTimeout) + bei System.Net.Mail.SmtpConnection.GetConnection(ServicePoint servicePoint) + bei System.Net.Mail.SmtpClient.GetConnection() + bei System.Net.Mail.SmtpClient.Send(MailMessage message) +2025-11-06 13:31:40.9096|DEBUG|OnDoc|Mailversand: -1 +2025-11-06 13:32:13.5841|DEBUG|OnDoc| +2025-11-06 13:32:13.5946|DEBUG|OnDoc| +2025-11-06 13:32:13.6243|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-11-06 13:32:13.6243|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-11-06 13:32:19.6986|DEBUG|OnDoc|Mailversand: 1 +2025-11-06 13:32:19.7266|DEBUG|OnDoc| +2025-11-06 13:32:19.7291|DEBUG|OnDoc| +2025-11-06 13:33:11.3162|DEBUG|OnDoc| +2025-11-06 13:33:11.3561|DEBUG|OnDoc| +2025-11-06 13:33:39.3597|DEBUG|OnDoc|Mailversand: 2 +2025-11-06 13:33:39.3898|DEBUG|OnDoc| +2025-11-06 13:33:39.3898|DEBUG|OnDoc| +2025-11-06 13:33:51.4703|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-11-06 13:33:51.5101|DEBUG|OnDoc|Mail Versand NOK - Exception Inner: System.Net.WebException: Der Remotename konnte nicht aufgelöst werden: 'smtp.tgcorp.ch' + bei System.Net.ServicePoint.GetConnection(PooledStream PooledStream, Object owner, Boolean async, IPAddress& address, Socket& abortSocket, Socket& abortSocket6) + bei System.Net.PooledStream.Activate(Object owningObject, Boolean async, GeneralAsyncDelegate asyncCallback) + bei System.Net.ConnectionPool.GetConnection(Object owningObject, GeneralAsyncDelegate asyncCallback, Int32 creationTimeout) + bei System.Net.Mail.SmtpConnection.GetConnection(ServicePoint servicePoint) + bei System.Net.Mail.SmtpClient.GetConnection() + bei System.Net.Mail.SmtpClient.Send(MailMessage message) +2025-11-06 13:39:47.2984|DEBUG|OnDoc| +2025-11-06 13:39:47.3311|DEBUG|OnDoc| +2025-11-06 13:40:06.5572|DEBUG|OnDoc|Mailversand: 2 +2025-11-06 13:40:06.6060|DEBUG|OnDoc| +2025-11-06 13:40:06.6060|DEBUG|OnDoc| +2025-11-06 13:40:18.7207|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-11-06 13:40:18.7616|DEBUG|OnDoc|Mail Versand NOK - Exception Inner: System.Net.WebException: Der Remotename konnte nicht aufgelöst werden: 'smtp.tgcorp.ch' + bei System.Net.ServicePoint.GetConnection(PooledStream PooledStream, Object owner, Boolean async, IPAddress& address, Socket& abortSocket, Socket& abortSocket6) + bei System.Net.PooledStream.Activate(Object owningObject, Boolean async, GeneralAsyncDelegate asyncCallback) + bei System.Net.ConnectionPool.GetConnection(Object owningObject, GeneralAsyncDelegate asyncCallback, Int32 creationTimeout) + bei System.Net.Mail.SmtpConnection.GetConnection(ServicePoint servicePoint) + bei System.Net.Mail.SmtpClient.GetConnection() + bei System.Net.Mail.SmtpClient.Send(MailMessage message) +2025-11-06 13:43:25.5042|DEBUG|OnDoc| +2025-11-06 13:43:25.5147|DEBUG|OnDoc| +2025-11-06 13:43:25.5422|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-11-06 13:43:25.5422|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-11-06 13:43:29.3249|DEBUG|OnDoc|Mailversand: 1 +2025-11-06 13:43:29.3526|DEBUG|OnDoc| +2025-11-06 13:43:29.3526|DEBUG|OnDoc| +2025-11-06 13:43:41.4053|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-11-06 13:43:41.4400|DEBUG|OnDoc|Mail Versand NOK - Exception Inner: System.Net.WebException: Der Remotename konnte nicht aufgelöst werden: 'smtp.tgcorp.ch' + bei System.Net.ServicePoint.GetConnection(PooledStream PooledStream, Object owner, Boolean async, IPAddress& address, Socket& abortSocket, Socket& abortSocket6) + bei System.Net.PooledStream.Activate(Object owningObject, Boolean async, GeneralAsyncDelegate asyncCallback) + bei System.Net.ConnectionPool.GetConnection(Object owningObject, GeneralAsyncDelegate asyncCallback, Int32 creationTimeout) + bei System.Net.Mail.SmtpConnection.GetConnection(ServicePoint servicePoint) + bei System.Net.Mail.SmtpClient.GetConnection() + bei System.Net.Mail.SmtpClient.Send(MailMessage message) +2025-11-06 13:44:09.1214|DEBUG|OnDoc|Mailversand: 2 +2025-11-06 13:44:09.1602|DEBUG|OnDoc| +2025-11-06 13:44:09.1602|DEBUG|OnDoc| +2025-11-06 13:44:21.2284|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-11-06 13:44:21.2634|DEBUG|OnDoc|Mail Versand NOK - Exception Inner: System.Net.WebException: Der Remotename konnte nicht aufgelöst werden: 'smtp.tgcorp.ch' + bei System.Net.ServicePoint.GetConnection(PooledStream PooledStream, Object owner, Boolean async, IPAddress& address, Socket& abortSocket, Socket& abortSocket6) + bei System.Net.PooledStream.Activate(Object owningObject, Boolean async, GeneralAsyncDelegate asyncCallback) + bei System.Net.ConnectionPool.GetConnection(Object owningObject, GeneralAsyncDelegate asyncCallback, Int32 creationTimeout) + bei System.Net.Mail.SmtpConnection.GetConnection(ServicePoint servicePoint) + bei System.Net.Mail.SmtpClient.GetConnection() + bei System.Net.Mail.SmtpClient.Send(MailMessage message) +2025-11-06 13:45:08.4248|DEBUG|OnDoc| +2025-11-06 13:45:08.4350|DEBUG|OnDoc| +2025-11-06 13:45:08.4610|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-11-06 13:45:08.4625|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-11-06 13:46:23.2502|DEBUG|OnDoc| +2025-11-06 13:46:23.2823|DEBUG|OnDoc| +2025-11-06 13:47:27.9253|DEBUG|OnDoc|Mailversand: 2 +2025-11-06 13:47:27.9821|DEBUG|OnDoc| +2025-11-06 13:47:27.9821|DEBUG|OnDoc| +2025-11-06 13:47:39.1114|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-11-06 13:47:39.1492|DEBUG|OnDoc|Mail Versand NOK - Exception Inner: System.Net.WebException: Der Remotename konnte nicht aufgelöst werden: 'smtp.tgcorp.ch' + bei System.Net.ServicePoint.GetConnection(PooledStream PooledStream, Object owner, Boolean async, IPAddress& address, Socket& abortSocket, Socket& abortSocket6) + bei System.Net.PooledStream.Activate(Object owningObject, Boolean async, GeneralAsyncDelegate asyncCallback) + bei System.Net.ConnectionPool.GetConnection(Object owningObject, GeneralAsyncDelegate asyncCallback, Int32 creationTimeout) + bei System.Net.Mail.SmtpConnection.GetConnection(ServicePoint servicePoint) + bei System.Net.Mail.SmtpClient.GetConnection() + bei System.Net.Mail.SmtpClient.Send(MailMessage message) +2025-11-06 13:52:40.1174|DEBUG|OnDoc|Mailversand: 2 +2025-11-06 13:52:40.1651|DEBUG|OnDoc| +2025-11-06 13:52:40.1651|DEBUG|OnDoc| +2025-11-06 13:52:52.2417|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-11-06 13:52:52.2766|DEBUG|OnDoc|Mail Versand NOK - Exception Inner: System.Net.WebException: Der Remotename konnte nicht aufgelöst werden: 'smtp.tgcorp.ch' + bei System.Net.ServicePoint.GetConnection(PooledStream PooledStream, Object owner, Boolean async, IPAddress& address, Socket& abortSocket, Socket& abortSocket6) + bei System.Net.PooledStream.Activate(Object owningObject, Boolean async, GeneralAsyncDelegate asyncCallback) + bei System.Net.ConnectionPool.GetConnection(Object owningObject, GeneralAsyncDelegate asyncCallback, Int32 creationTimeout) + bei System.Net.Mail.SmtpConnection.GetConnection(ServicePoint servicePoint) + bei System.Net.Mail.SmtpClient.GetConnection() + bei System.Net.Mail.SmtpClient.Send(MailMessage message) +2025-11-06 13:54:36.9784|DEBUG|OnDoc| +2025-11-06 13:54:36.9784|DEBUG|OnDoc| +2025-11-06 13:54:37.0315|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-11-06 13:54:37.0315|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-11-06 13:54:55.8865|DEBUG|OnDoc|Mailversand: 1 +2025-11-06 13:54:55.9467|DEBUG|OnDoc| +2025-11-06 13:54:55.9467|DEBUG|OnDoc| +2025-11-06 13:55:08.0312|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-11-06 13:55:08.0665|DEBUG|OnDoc|Mail Versand NOK - Exception Inner: System.Net.WebException: Der Remotename konnte nicht aufgelöst werden: 'smtp.tgcorp.ch' + bei System.Net.ServicePoint.GetConnection(PooledStream PooledStream, Object owner, Boolean async, IPAddress& address, Socket& abortSocket, Socket& abortSocket6) + bei System.Net.PooledStream.Activate(Object owningObject, Boolean async, GeneralAsyncDelegate asyncCallback) + bei System.Net.ConnectionPool.GetConnection(Object owningObject, GeneralAsyncDelegate asyncCallback, Int32 creationTimeout) + bei System.Net.Mail.SmtpConnection.GetConnection(ServicePoint servicePoint) + bei System.Net.Mail.SmtpClient.GetConnection() + bei System.Net.Mail.SmtpClient.Send(MailMessage message) +2025-11-06 16:47:43.2018|DEBUG|OnDoc| +2025-11-06 16:47:43.2596|DEBUG|OnDoc| +2025-11-06 16:48:06.0654|DEBUG|OnDoc| +2025-11-06 16:48:06.1239|DEBUG|OnDoc| +2025-11-07 06:56:26.1556|DEBUG|OnDoc| +2025-11-07 06:56:26.1890|DEBUG|OnDoc| +2025-11-07 07:09:17.2137|DEBUG|OnDoc| +2025-11-07 07:09:17.2425|DEBUG|OnDoc| +2025-11-07 07:19:29.8530|DEBUG|OnDoc| +2025-11-07 07:19:29.9073|DEBUG|OnDoc| +2025-11-07 07:19:47.7776|DEBUG|OnDoc| +2025-11-07 07:19:47.8013|DEBUG|OnDoc| +2025-11-07 07:22:49.4565|DEBUG|OnDoc| +2025-11-07 07:22:49.4886|DEBUG|OnDoc| +2025-11-07 07:25:33.7747|DEBUG|OnDoc| +2025-11-07 07:25:33.8056|DEBUG|OnDoc| +2025-11-07 07:28:08.0187|DEBUG|OnDoc| +2025-11-07 07:28:08.0736|DEBUG|OnDoc| +2025-11-07 07:45:28.4552|DEBUG|OnDoc| +2025-11-07 07:45:28.4855|DEBUG|OnDoc| +2025-11-07 07:54:46.1349|DEBUG|OnDoc| +2025-11-07 07:54:46.1669|DEBUG|OnDoc| +2025-11-07 07:56:35.3306|DEBUG|OnDoc| +2025-11-07 07:56:35.3673|DEBUG|OnDoc| +2025-11-07 08:09:19.4802|DEBUG|OnDoc| +2025-11-07 08:09:19.5157|DEBUG|OnDoc| +2025-11-07 08:10:14.0622|DEBUG|OnDoc| +2025-11-07 08:10:14.0984|DEBUG|OnDoc| +2025-11-07 08:13:24.7447|DEBUG|OnDoc| +2025-11-07 08:13:24.7763|DEBUG|OnDoc| +2025-11-07 08:18:07.5913|DEBUG|OnDoc| +2025-11-07 08:18:07.6336|DEBUG|OnDoc| +2025-11-07 08:44:52.3892|DEBUG|OnDoc| +2025-11-07 08:44:52.4225|DEBUG|OnDoc| +2025-11-07 08:46:21.6325|DEBUG|OnDoc| +2025-11-07 08:46:21.6882|DEBUG|OnDoc| +2025-11-07 10:47:22.5913|DEBUG|OnDoc| +2025-11-07 10:47:22.6204|DEBUG|OnDoc| +2025-11-07 11:00:45.7724|DEBUG|OnDoc| +2025-11-07 11:00:45.8048|DEBUG|OnDoc| diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 374df490..d51c0f3c 100644 Binary files a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll index 04dbad72..4c292008 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb index 16943c7c..48b4ca52 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/Client/Client.csproj b/Client/Client.csproj index 05ff2cfa..558887c7 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -776,6 +776,12 @@ PendDok.cs + + UserControl + + + UCAllgemeinDokumentParamExtern.cs + UserControl @@ -964,6 +970,9 @@ PendDok.cs + + UCAllgemeinDokumentParamExtern.cs + UCAllgemeineDokumentParam.cs diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index a2f8cb75..b844ecba 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -65,7 +65,7 @@ this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(472, 26); this.label2.TabIndex = 2; - this.label2.Text = "4. November 2025"; + this.label2.Text = "7. November 2025"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label2.Click += new System.EventHandler(this.label2_Click); // diff --git a/Client/DocMgmt/Dokumentpaket.cs b/Client/DocMgmt/Dokumentpaket.cs index d93003c8..b15a0687 100644 --- a/Client/DocMgmt/Dokumentpaket.cs +++ b/Client/DocMgmt/Dokumentpaket.cs @@ -29,6 +29,7 @@ using static BroadcastListener.Classes.Factory; using Windows.Graphics.Display; using Windows.Foundation.Metadata; using System.Threading; +using OnDoc.Diverses; namespace OnDoc.DocMgmt { @@ -38,7 +39,7 @@ namespace OnDoc.DocMgmt private DataTable dokumentpaket = new DataTable(); private DataTable dokumentpaketvorlagen = new DataTable(); private DataTable dokumentpaketvorlagen_Original = new DataTable(); - private int profilnr {get;set;} + private int profilnr { get; set; } public int dokumentpaketnr { get; set; } = 0; public int partnernr { get; set; } = 0; private bool EinzelGenerierung { get; set; } = false; @@ -125,24 +126,25 @@ namespace OnDoc.DocMgmt this.BeginUpdate(); if (dokumentpaketnr == 0) { - if (!NeuesDokumentpaket()){ this.Close(); return; }; + if (!NeuesDokumentpaket()) { this.Close(); return; }; } Update_PaketDetails(); dokList1.set_vorschau_aus_dp(); if (this.txtbpnummer.Text == "") { btnSearchBP_Click(sender, e); } - + this.EndUpdate(); } - private void Update_PaketDetails() { + private void Update_PaketDetails() + { Cursor = Cursors.WaitCursor; DB db = new DB(AppParams.connectionstring); - db.Get_Tabledata("Select * from edex_dokumentpaket where dokumentpaketnr="+dokumentpaketnr.ToString(), false, true); + db.Get_Tabledata("Select * from edex_dokumentpaket where dokumentpaketnr=" + dokumentpaketnr.ToString(), false, true); dokumentpaket = db.dsdaten.Tables[0].Copy(); db.clear_parameter(); db.add_parameter("@dpnr", dokumentpaketnr.ToString()); string sql = "sp_ondoc_dpdetails"; - db.Get_Tabledata(sql,true,false); + db.Get_Tabledata(sql, true, false); //string sql = "SELECT dbo.edex_dokumentpaket.dokumentpaketnr, dbo.edex_dokumentpaket.bezeichnung, dbo.dokumenttyp.dokumenttypnr, "; //sql = sql + "dbo.dokumenttyp.bezeichnung AS dokumenttypbezeichnung, dbo.edex_dokumentpaketvorlage.zwingend, "; //sql = sql + "dbo.edex_dokumentpaketvorlage.sort FROM dbo.edex_dokumentpaket INNER JOIN dbo.edex_dokumentpaketvorlage ON "; @@ -160,7 +162,7 @@ namespace OnDoc.DocMgmt sfListView1.AllowTriStateMode = false; sfListView1.CheckedMember = "zwingend"; TabControlDokuments.TabPages.Clear(); - foreach(System.Data.DataRow r in dokumentpaketvorlagen.Rows) + foreach (System.Data.DataRow r in dokumentpaketvorlagen.Rows) { if (Convert.ToInt32(r[4]) == 1) { add_uc(r); } } @@ -175,8 +177,8 @@ namespace OnDoc.DocMgmt { this.RibbonButtonGenerieren.Enabled = false; this.groupBox1.Enabled = false; - this.groupBox2.Enabled=false; - this.groupBox3.Enabled=false; + this.groupBox2.Enabled = false; + this.groupBox3.Enabled = false; } this.EndUpdate(); } @@ -185,7 +187,7 @@ namespace OnDoc.DocMgmt dokList1.profilnr = this.profilnr; dokList1.hide_panels(); dokList1.dokpaket_update_grid(); - + } @@ -201,9 +203,10 @@ namespace OnDoc.DocMgmt private void btnSearchBP_Click(object sender, EventArgs e) { - if (this.partnernr == 0) { - Partnersuche ps = new Partnersuche(); - ps.ShowDialog(); + if (this.partnernr == 0) + { + Partnersuche ps = new Partnersuche(); + ps.ShowDialog(); if (ps.DialogResult == DialogResult.OK) { this.txtbpnummer.Text = ps.partnernr.ToString(); ; @@ -216,8 +219,8 @@ namespace OnDoc.DocMgmt return; } } - - set_bp_person(ps.partnernr,0); + + set_bp_person(ps.partnernr, 0); } else { @@ -233,23 +236,46 @@ namespace OnDoc.DocMgmt ps.ShowDialog(); if (ps.DialogResult == DialogResult.OK) { - this.txtpersonnummer.Text = ps.partnernr.ToString(); + this.txtpersonnummer.Text = ps.partnernr.ToString(); this.lblKurznamePerson.Text = ps.partnerkurzname.ToString(); - if (this.txtpersonnummer.Text.Length < 9) { + if (this.txtpersonnummer.Text.Length < 9) + { MessageBox.Show("Beim gewählten Partner handelt es ich nicht um eine Person.", "Partnerselektion", MessageBoxButtons.OK, MessageBoxIcon.Error); this.txtpersonnummer.Text = ""; this.lblKurznamePerson.Text = ""; return; } - set_bp_person(0,ps.partnernr); + set_bp_person(0, ps.partnernr); } } private void add_uc(System.Data.DataRow r) { + DB db = new DB(AppParams.connectionstring); + db.Get_Tabledata("Select isnull(uri,'') as uri, isnull(uribeschreibung,'') as descr from dokumenttyp where dokumenttypnr = " + r[2].ToString(), false, true); + if (db.dsdaten.Tables[0].Rows[0][0].ToString() != "") + { + UCAllgemeinDokumentParamExtern extdoc = new UCAllgemeinDokumentParamExtern(); + extdoc.Dock = DockStyle.Fill; + extdoc.dokumenttypnr = Convert.ToInt32(r[2]); + if (extdoc.set_personendokument() == true) + { + if (txtpersonnummer.Text != "") { extdoc.partnernr = Convert.ToInt32(txtpersonnummer.Text); } + } + else + { + if (txtbpnummer.Text != "") { extdoc.partnernr = Convert.ToInt32(txtbpnummer.Text); } + } + extdoc.Refresh_Details(db.dsdaten.Tables[0].Rows[0][0].ToString(), db.dsdaten.Tables[0].Rows[0][1].ToString()); + TabPageAdv tabPage1 = new TabPageAdv(r[3].ToString()); + tabPage1.Controls.Add(extdoc); + + TabControlDokuments.TabPages.Add(tabPage1); + return; + } UCAllgemeineDokumentParam newdoc = new UCAllgemeineDokumentParam(); Logging.Logging.Debug("Dokumentpaket - Profilnr", "Dokumentpaket", this.profilnr.ToString()); newdoc.profilnr = profilnr; - newdoc.Dock= DockStyle.Fill; + newdoc.Dock = DockStyle.Fill; newdoc.checkpartner = false; newdoc.dokumenttypnr = Convert.ToInt32(r[2]); if (newdoc.set_personendokument() == true) @@ -260,12 +286,12 @@ namespace OnDoc.DocMgmt { if (txtbpnummer.Text != "") { newdoc.partnernr = Convert.ToInt32(txtbpnummer.Text); } } - + newdoc.Refresh_Details(); - + TabPageAdv tabPage = new TabPageAdv(r[3].ToString()); tabPage.Controls.Add(newdoc); - + TabControlDokuments.TabPages.Add(tabPage); } private void remove_uc(System.Data.DataRow r) @@ -273,7 +299,7 @@ namespace OnDoc.DocMgmt foreach (TabPageAdv tab in TabControlDokuments.TabPages) { if (tab.Text == r[3].ToString()) { TabControlDokuments.TabPages.Remove(tab); return; } - + } } @@ -331,24 +357,24 @@ namespace OnDoc.DocMgmt { Database.DB db = new Database.DB(AppParams.connectionstring); db.clear_parameter(); - if (bpnummer !=0) db.add_parameter("@partnernr", bpnummer.ToString()); - if (personnummer !=0) db.add_parameter("@partnernr", personnummer.ToString()); + if (bpnummer != 0) db.add_parameter("@partnernr", bpnummer.ToString()); + if (personnummer != 0) db.add_parameter("@partnernr", personnummer.ToString()); db.Get_Tabledata("sp_ondoc_bp_person", true, false); - if (bpnummer!=0 && db.dsdaten.Tables[0].Rows.Count ==1) + if (bpnummer != 0 && db.dsdaten.Tables[0].Rows.Count == 1) { txtbpnummer.Text = db.dsdaten.Tables[0].Rows[0]["bp_nr"].ToString(); - lblKurznameBP.Text = db.dsdaten.Tables[0].Rows[0]["bp_kurzname"].ToString(); + lblKurznameBP.Text = db.dsdaten.Tables[0].Rows[0]["bp_kurzname"].ToString(); txtpersonnummer.Text = ""; - if (txtpersonnummer.Text=="") + if (txtpersonnummer.Text == "") { txtpersonnummer.Text = db.dsdaten.Tables[0].Rows[0]["pers_nr"].ToString(); lblKurznamePerson.Text = db.dsdaten.Tables[0].Rows[0]["person_kurzname"].ToString(); } update_dokumente_bp_person(bpnummer, true); - if (txtpersonnummer.Text!="") { update_dokumente_bp_person(Convert.ToInt32(txtpersonnummer.Text), false); } + if (txtpersonnummer.Text != "") { update_dokumente_bp_person(Convert.ToInt32(txtpersonnummer.Text), false); } } - + } private void update_dokumente_bp_person(int partnernr, bool bp) @@ -357,19 +383,38 @@ namespace OnDoc.DocMgmt { foreach (TabPageAdv tab in TabControlDokuments.TabPages) { - UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0]; - uc.ausDokumentpaket = true; - if (bp && !uc.personendokument) + string ty = tab.Controls[0].GetType().Name; + if (ty == "UCAllgemeineDokumentParam") { - uc.partnernr = partnernr; - uc.update_partner(); + UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0]; + uc.ausDokumentpaket = true; + if (bp && !uc.personendokument) + { + uc.partnernr = partnernr; + uc.update_partner(); + } + if (!bp && uc.personendokument) + { + uc.partnernr = partnernr; + uc.update_partner(); + } + uc.ausDokumentpaket = false; } - if (!bp && uc.personendokument) + if (ty == "UCAllgemeinDokumentParamExtern") { - uc.partnernr = partnernr; - uc.update_partner(); + UCAllgemeinDokumentParamExtern uce = (UCAllgemeinDokumentParamExtern)tab.Controls[0]; + if (bp && !uce.personendokument) + { + uce.partnernr = partnernr; + uce.update_partner(); + } + if (!bp && uce.personendokument) + { + uce.partnernr = partnernr; + uce.update_partner(); + } } - uc.ausDokumentpaket = false; + } } catch { } @@ -402,31 +447,49 @@ namespace OnDoc.DocMgmt { string errormessage = ""; string dokumenterror = ""; - + foreach (TabPageAdv tab in TabControlDokuments.TabPages) { - UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0]; - uc.ausDokumentpaket = true; - uc.genertated_dokumentid=uc.genertated_dokumentid; - dokumenterror = ""; - - if (uc.partnernr == 0) { dokumenterror = dokumenterror + "- Kein Partner gewählt" + Environment.NewLine; } - else + string ty = tab.Controls[0].GetType().Name; + if (ty == "UCAllgemeineDokumentParam") { - uc.check_bp_person(); - if (uc.bpperson_error_type == 1) { dokumenterror = dokumenterror + "- Dokument muss für eine Person erstellt werden" + Environment.NewLine; } - if (uc.bpperson_error_type == 2) { dokumenterror = dokumenterror + "- Dokument muss für einen BP erstellt werden" + Environment.NewLine; } + UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0]; + uc.ausDokumentpaket = true; + uc.genertated_dokumentid = uc.genertated_dokumentid; + dokumenterror = ""; + + if (uc.partnernr == 0) { dokumenterror = dokumenterror + "- Kein Partner gewählt" + Environment.NewLine; } + else + { + uc.check_bp_person(); + if (uc.bpperson_error_type == 1) { dokumenterror = dokumenterror + "- Dokument muss für eine Person erstellt werden" + Environment.NewLine; } + if (uc.bpperson_error_type == 2) { dokumenterror = dokumenterror + "- Dokument muss für einen BP erstellt werden" + Environment.NewLine; } + } + if (!uc.check_fields()) + { + dokumenterror = dokumenterror + uc.check_error + Environment.NewLine; + + } + uc.ausDokumentpaket = false; + if (dokumenterror != "") { errormessage = errormessage + Environment.NewLine + tab.Text + ":" + Environment.NewLine + dokumenterror; } } - if (!uc.check_fields()) + if (ty == "UCAllgemeinDokumentParamExtern") { - dokumenterror = dokumenterror + uc.check_error + Environment.NewLine; + UCAllgemeinDokumentParamExtern uce = (UCAllgemeinDokumentParamExtern)tab.Controls[0]; + dokumenterror = ""; + + if (uce.partnernr == 0) { dokumenterror = dokumenterror + "- Kein Partner gewählt" + Environment.NewLine; } + else + { + uce.check_bp_person(); + if (uce.bpperson_error_type == 1) { dokumenterror = dokumenterror + "- Dokument muss für eine Person erstellt werden" + Environment.NewLine; } + if (uce.bpperson_error_type == 2) { dokumenterror = dokumenterror + "- Dokument muss für einen BP erstellt werden" + Environment.NewLine; } + } + } - } - uc.ausDokumentpaket = false; - if (dokumenterror!="") { errormessage = errormessage + Environment.NewLine+ tab.Text +":"+ Environment.NewLine + dokumenterror; } - } - + + if (errormessage != "") { @@ -443,11 +506,11 @@ namespace OnDoc.DocMgmt return; } - if (!dokList1.grid_empty() && dokList1.get_selected_records() != 0) + if (!dokList1.grid_empty() && dokList1.get_selected_records() != 0) { - if (MessageBox.Show("Alle Dokumente neu genererieren?"+Environment.NewLine+"(Bestehende Dokumente werden gelöscht)", "Generierung", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + if (MessageBox.Show("Alle Dokumente neu genererieren?" + Environment.NewLine + "(Bestehende Dokumente werden gelöscht)", "Generierung", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { - if (MessageBox.Show("Neu hinzugefügte Dokumente generieren?","Generierung",MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.No) { return; } + if (MessageBox.Show("Neu hinzugefügte Dokumente generieren?", "Generierung", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { return; } foreach (TabPageAdv tab in TabControlDokuments.TabPages) { UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0]; @@ -455,7 +518,7 @@ namespace OnDoc.DocMgmt { Generate_Docs("", uc); } - + } return; } @@ -464,7 +527,7 @@ namespace OnDoc.DocMgmt dokList1.delete_doks_in_list(); } } - + progressBarAdv1.Minimum = 0; progressBarAdv1.Maximum = TabControlDokuments.TabPages.Count; progressBarAdv1.Value = 0; @@ -477,152 +540,164 @@ namespace OnDoc.DocMgmt string filter = "dokumentid in ('"; foreach (TabPageAdv tab in TabControlDokuments.TabPages) { - try { + try + { tab.Select(); TabControlDokuments.SelectedTab = tab; progressBarAdv1.Value = progressBarAdv1.Value + 1; Application.DoEvents(); //Thread.Sleep(1000); - UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0]; - if (((idokumentid == "" || uc.genertated_dokumentid == idokumentid) && iuc == null) || uc == iuc) + string ty = tab.Controls[0].GetType().Name; + if (ty == "UCAllgemeineDokumentParam") { - //uc.Set_Edit_later(); - uc.Update_DocGenData(); - clsDocData dokdata = new clsDocData(); - uc.update_dokdata(ref dokdata); - uc.update_partner(); - DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring); - string dokumentid = docgen.GenDocID(dokdata, false, ""); - dokdata.Dokumentid = dokumentid; - uc.genertated_dokumentid = dokumentid; - uc.Show_Neugenerieren(); - filter = filter + dokumentid + "','"; - dokumentid = dokdata.Dokumentid; - if (uc.docgendata.erstellungsart == Erstellungsart.DokumentPreview) { uc.docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; } - if (dokumentid != "") + + UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0]; + if (((idokumentid == "" || uc.genertated_dokumentid == idokumentid) && iuc == null) || uc == iuc) { - Logging.DocLog.Info("Dokument erstellt", "Dokumentpaket", dokumentid, uc.partnernr.ToString(), "Dokument erstellt"); - DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey, AppParams.Office_Fill_DocIO); - clsdok dok = new clsdok("", "", "", ""); - if (dokdata.barcode_type == "1") + //uc.Set_Edit_later(); + uc.Update_DocGenData(); + clsDocData dokdata = new clsDocData(); + uc.update_dokdata(ref dokdata); + uc.update_partner(); + DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring); + string dokumentid = docgen.GenDocID(dokdata, false, ""); + dokdata.Dokumentid = dokumentid; + uc.genertated_dokumentid = dokumentid; + uc.Show_Neugenerieren(); + filter = filter + dokumentid + "','"; + dokumentid = dokdata.Dokumentid; + if (uc.docgendata.erstellungsart == Erstellungsart.DokumentPreview) { uc.docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; } + if (dokumentid != "") { - DB dB = new DB(AppParams.connectionstring); - dB.clear_parameter(); - dB.add_parameter("@dokumentid", dokumentid); - dB.add_parameter("@DokumentidBR", ""); - dB.add_parameter("@BARCODEFONTNAME", ""); - dB.add_parameter("@BARCODEFONTSIZE", ""); - dB.add_parameter("@BarcodeKantenlaenge", ""); - dB.Get_Tabledata("sp_get_OnDoc_barcodetype_and_value", true, false); - dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][1].ToString(); - dokdata.barcode_formatn = dB.dsdaten.Tables[0].Rows[0][3].ToString(); - dokdata.barcode_text = dB.dsdaten.Tables[0].Rows[0][4].ToString(); - dokdata.barcode_kantenlaenge = dB.dsdaten.Tables[0].Rows[0][5].ToString(); - dokdata.Zusatz_Font = dB.dsdaten.Tables[0].Rows[0][6].ToString(); - dokdata.Zusatz_FontSize = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][7]); - dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][8]); - dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][9]); - - //dokdata.barcode_type= dB.dsdaten.Tables[0].Rows[0][3].ToString(); - string sql = ""; - sql = "select bcpt, bcpl, bcw, bch, bchorizontal from OnDocBarcodeMpping "; - sql = sql + "where orig_bcpt = " + dokdata.barcode_top.ToString() + " and orig_bcpl=" + dokdata.barcode_left.ToString() + " "; - sql = sql + "and orig_bcw=" + dokdata.barcode_width.ToString() + " and orig_bch=" + dokdata.barcode_height.ToString(); - dB.Get_Tabledata(sql, false, true); - if (dB.dsdaten.Tables[0].Rows.Count > 0) + Logging.DocLog.Info("Dokument erstellt", "Dokumentpaket", dokumentid, uc.partnernr.ToString(), "Dokument erstellt"); + DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey, AppParams.Office_Fill_DocIO); + clsdok dok = new clsdok("", "", "", ""); + if (dokdata.barcode_type == "1") { - Logging.Logging.Debug("Barcode-Übersteuerung" + dokdata.DokumenttypNr.ToString(), "Dokumenterstellung", ""); - dokdata.barcode_left = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpl"]); - dokdata.barcode_top = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpt"]); - dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcw"]); - dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bch"]); + DB dB = new DB(AppParams.connectionstring); + dB.clear_parameter(); + dB.add_parameter("@dokumentid", dokumentid); + dB.add_parameter("@DokumentidBR", ""); + dB.add_parameter("@BARCODEFONTNAME", ""); + dB.add_parameter("@BARCODEFONTSIZE", ""); + dB.add_parameter("@BarcodeKantenlaenge", ""); + dB.Get_Tabledata("sp_get_OnDoc_barcodetype_and_value", true, false); + dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][1].ToString(); + dokdata.barcode_formatn = dB.dsdaten.Tables[0].Rows[0][3].ToString(); + dokdata.barcode_text = dB.dsdaten.Tables[0].Rows[0][4].ToString(); + dokdata.barcode_kantenlaenge = dB.dsdaten.Tables[0].Rows[0][5].ToString(); + dokdata.Zusatz_Font = dB.dsdaten.Tables[0].Rows[0][6].ToString(); + dokdata.Zusatz_FontSize = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][7]); + dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][8]); + dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][9]); + + //dokdata.barcode_type= dB.dsdaten.Tables[0].Rows[0][3].ToString(); + string sql = ""; + sql = "select bcpt, bcpl, bcw, bch, bchorizontal from OnDocBarcodeMpping "; + sql = sql + "where orig_bcpt = " + dokdata.barcode_top.ToString() + " and orig_bcpl=" + dokdata.barcode_left.ToString() + " "; + sql = sql + "and orig_bcw=" + dokdata.barcode_width.ToString() + " and orig_bch=" + dokdata.barcode_height.ToString(); + dB.Get_Tabledata(sql, false, true); + if (dB.dsdaten.Tables[0].Rows.Count > 0) + { + Logging.Logging.Debug("Barcode-Übersteuerung" + dokdata.DokumenttypNr.ToString(), "Dokumenterstellung", ""); + dokdata.barcode_left = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpl"]); + dokdata.barcode_top = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcpt"]); + dokdata.barcode_width = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bcw"]); + dokdata.barcode_height = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0]["bch"]); + } + + dB = null; } + if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice) + { + //panelword.Visible = true; + lbldokumentname.Text = tab.Text; + Application.DoEvents(); + dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, true, AppParams.OfficeSpleep1, AppParams.vbvorlagenmanagement == "Yes"); + //panelword.Visible = false; + Application.DoEvents(); - dB = null; - } - if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice) - { - //panelword.Visible = true; - lbldokumentname.Text = tab.Text; - Application.DoEvents(); - dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, true, AppParams.OfficeSpleep1, AppParams.vbvorlagenmanagement == "Yes"); - //panelword.Visible = false; - Application.DoEvents(); + } + else + { + dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata); - } - else - { - dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata); + } - } + if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice) + { + string filename = AppParams.tempdir + dokumentid + "." + dok.extension; + filename = AppParams.tempdir + dok.dokumentname; + string filename_temp = filename + ".tmp"; + System.IO.File.WriteAllBytes(filename_temp, Convert.FromBase64String(dok.dokument)); + DB db = new DB(AppParams.connectionstring); + db.Save_To_DB(dokdata.Dokumentid, filename_temp); + db.Dok_in_Bearbeitung(1, dokdata.Dokumentid, AppParams.CurrentMitarbeiter); + db = null; + System.IO.File.Delete(filename_temp); + Logging.Logging.Debug("Before Processwatch", "DonDoc", dokumentid); + clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word"); - if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice) - { - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - filename = AppParams.tempdir + dok.dokumentname; - string filename_temp = filename + ".tmp"; - System.IO.File.WriteAllBytes(filename_temp, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename_temp); - db.Dok_in_Bearbeitung(1, dokdata.Dokumentid, AppParams.CurrentMitarbeiter); - db = null; - System.IO.File.Delete(filename_temp); - Logging.Logging.Debug("Before Processwatch", "DonDoc", dokumentid); - clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word"); + } + if (uc.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten) + { + string filename = AppParams.tempdir + dokumentid + "." + dok.extension; + //filename = AppParams.tempdir + dok.dokumentname; + System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); + DB db = new DB(AppParams.connectionstring); + db.Save_To_DB(dokdata.Dokumentid, filename); + db = null; + + switch (dok.doktype) + { + case "W": + System.Diagnostics.Process.Start("winword.exe", filename); + clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word"); + break; + case "X": + System.Diagnostics.Process.Start("excel.exe", " " + filename); + clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Excel"); + break; + case "P": + System.Diagnostics.Process.Start(filename); + break; + default: + break; + } + } + if (uc.docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF) + { + //Generator.DocToPDF(dokumentid, ref dok); + dok.extension = "pdf"; + string filename = AppParams.tempdir + dokumentid + "." + dok.extension; + System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); + DB db = new DB(AppParams.connectionstring); + db.Save_To_DB(dokdata.Dokumentid, filename); + } - } - if (uc.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten) - { - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - //filename = AppParams.tempdir + dok.dokumentname; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - db = null; - - switch (dok.doktype) + if (uc.docgendata.erstellungsart == Erstellungsart.DokumentSpäterBearbeiten) { - case "W": - System.Diagnostics.Process.Start("winword.exe", filename); - clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word"); - break; - case "X": - System.Diagnostics.Process.Start("excel.exe", " " + filename); - clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Excel"); - break; - case "P": - System.Diagnostics.Process.Start(filename); - break; - default: - break; + string filename = AppParams.tempdir + dokumentid + "." + dok.extension; + System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); + DB db = new DB(AppParams.connectionstring); + db.Save_To_DB(dokdata.Dokumentid, filename); + db = null; } - } - if (uc.docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF) - { - //Generator.DocToPDF(dokumentid, ref dok); - dok.extension = "pdf"; - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - } - if (uc.docgendata.erstellungsart == Erstellungsart.DokumentSpäterBearbeiten) - { - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - db = null; } + } + else + { + filter = filter + uc.genertated_dokumentid + "','"; } } - else + if (ty == "UCAllgemeinDokumentParamExtern" && idokumentid=="") { - filter = filter + uc.genertated_dokumentid + "','"; - + UCAllgemeinDokumentParamExtern uce = (UCAllgemeinDokumentParamExtern)tab.Controls[0]; + uce.Show_Neugenerieren(); + uce.gendoc(); } counter = counter + 1; if (this.EinzelGenerierung) @@ -643,8 +718,8 @@ namespace OnDoc.DocMgmt } catch { } } - - + + progressBarAdv1.Visible = false; filter = filter.Substring(0, filter.Length - 2) + ")"; dokList1.datafilter = filter; @@ -655,31 +730,31 @@ namespace OnDoc.DocMgmt public void ribbonButtonNew_Click(object sender, EventArgs e) { if (!NeuesDokumentpaket()) { return; } - btnSearchBP_Click(sender, e); + btnSearchBP_Click(sender, e); Update_PaketDetails(); dokList1.datafilter = "dokumentid in ('n.a.')"; dokList1.refresh_dokumente(); } - + private void sfListView1_SelectionChanged(object sender, ItemSelectionChangedEventArgs e) { - - var dr = e.AddedItems[0] as DataRowView; + + var dr = e.AddedItems[0] as DataRowView; foreach (TabPageAdv p in TabControlDokuments.TabPages) { if (p.Text == dr[3].ToString()) { - TabControlDokuments.SelectedTab=p; + TabControlDokuments.SelectedTab = p; return; } } sfListView1.CheckedItems.Add(this.sfListView1.SelectedItem); - + return; - + } private void sfListView1_ItemChecking(object sender, ItemCheckingEventArgs e) diff --git a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs index 826c7e19..56a69a57 100644 --- a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs +++ b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs @@ -42,6 +42,9 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Dokumenttyp)); this.tabControlAdv1 = new Syncfusion.Windows.Forms.Tools.TabControlAdv(); this.tabPageAdv1 = new Syncfusion.Windows.Forms.Tools.TabPageAdv(); + this.groupBox8 = new System.Windows.Forms.GroupBox(); + this.txtOnBaseFormular = new System.Windows.Forms.TextBox(); + this.label19 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.chkversandstrassefirstdok = new System.Windows.Forms.CheckBox(); this.cbebanking_moeglich = new System.Windows.Forms.CheckBox(); @@ -149,12 +152,12 @@ this.label16 = new System.Windows.Forms.Label(); this.rbNr = new System.Windows.Forms.RadioButton(); this.label15 = new System.Windows.Forms.Label(); - this.groupBox8 = new System.Windows.Forms.GroupBox(); - this.label19 = new System.Windows.Forms.Label(); - this.txtOnBaseFormular = new System.Windows.Forms.TextBox(); + this.txturibeschreibung = new System.Windows.Forms.TextBox(); + this.label20 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit(); this.tabControlAdv1.SuspendLayout(); this.tabPageAdv1.SuspendLayout(); + this.groupBox8.SuspendLayout(); this.groupBox1.SuspendLayout(); this.toolStrip2.SuspendLayout(); this.GrpUnterschrifte.SuspendLayout(); @@ -181,7 +184,6 @@ this.groupBox7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).BeginInit(); this.panel1.SuspendLayout(); - this.groupBox8.SuspendLayout(); this.SuspendLayout(); // // tabControlAdv1 @@ -217,6 +219,35 @@ this.tabPageAdv1.Text = "Allgemein"; this.tabPageAdv1.ThemesEnabled = false; // + // groupBox8 + // + this.groupBox8.Controls.Add(this.label20); + this.groupBox8.Controls.Add(this.txturibeschreibung); + this.groupBox8.Controls.Add(this.txtOnBaseFormular); + this.groupBox8.Controls.Add(this.label19); + this.groupBox8.Location = new System.Drawing.Point(521, 606); + this.groupBox8.Name = "groupBox8"; + this.groupBox8.Size = new System.Drawing.Size(488, 124); + this.groupBox8.TabIndex = 28; + this.groupBox8.TabStop = false; + this.groupBox8.Text = "OnBase Formular"; + // + // txtOnBaseFormular + // + this.txtOnBaseFormular.Location = new System.Drawing.Point(43, 21); + this.txtOnBaseFormular.Name = "txtOnBaseFormular"; + this.txtOnBaseFormular.Size = new System.Drawing.Size(439, 20); + this.txtOnBaseFormular.TabIndex = 1; + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(7, 21); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(29, 13); + this.label19.TabIndex = 0; + this.label19.Text = "URI:"; + // // groupBox1 // this.groupBox1.Controls.Add(this.chkversandstrassefirstdok); @@ -1511,32 +1542,22 @@ this.label15.TabIndex = 7; this.label15.Text = "Sort"; // - // groupBox8 - // - this.groupBox8.Controls.Add(this.txtOnBaseFormular); - this.groupBox8.Controls.Add(this.label19); - this.groupBox8.Location = new System.Drawing.Point(521, 606); - this.groupBox8.Name = "groupBox8"; - this.groupBox8.Size = new System.Drawing.Size(488, 75); - this.groupBox8.TabIndex = 28; - this.groupBox8.TabStop = false; - this.groupBox8.Text = "OnBase Formular"; - // - // label19 + // txturibeschreibung // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(7, 21); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(29, 13); - this.label19.TabIndex = 0; - this.label19.Text = "URI:"; + this.txturibeschreibung.Location = new System.Drawing.Point(43, 48); + this.txturibeschreibung.Multiline = true; + this.txturibeschreibung.Name = "txturibeschreibung"; + this.txturibeschreibung.Size = new System.Drawing.Size(439, 70); + this.txturibeschreibung.TabIndex = 2; // - // txtOnBaseFormular + // label20 // - this.txtOnBaseFormular.Location = new System.Drawing.Point(43, 21); - this.txtOnBaseFormular.Name = "txtOnBaseFormular"; - this.txtOnBaseFormular.Size = new System.Drawing.Size(439, 20); - this.txtOnBaseFormular.TabIndex = 1; + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(8, 51); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(28, 13); + this.label20.TabIndex = 3; + this.label20.Text = "Bes."; // // Dokumenttyp // @@ -1554,6 +1575,8 @@ ((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).EndInit(); this.tabControlAdv1.ResumeLayout(false); this.tabPageAdv1.ResumeLayout(false); + this.groupBox8.ResumeLayout(false); + this.groupBox8.PerformLayout(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.toolStrip2.ResumeLayout(false); @@ -1590,8 +1613,6 @@ ((System.ComponentModel.ISupportInitialize)(this.TreeDokumenttyp)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - this.groupBox8.ResumeLayout(false); - this.groupBox8.PerformLayout(); this.ResumeLayout(false); } @@ -1710,5 +1731,7 @@ private System.Windows.Forms.GroupBox groupBox8; private System.Windows.Forms.Label label19; private System.Windows.Forms.TextBox txtOnBaseFormular; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.TextBox txturibeschreibung; } } \ No newline at end of file diff --git a/Client/UIControls/Administrator/Dokumenttyp.cs b/Client/UIControls/Administrator/Dokumenttyp.cs index 8e97db73..8c4fce1f 100644 --- a/Client/UIControls/Administrator/Dokumenttyp.cs +++ b/Client/UIControls/Administrator/Dokumenttyp.cs @@ -205,6 +205,7 @@ namespace OnDoc.UIControls.Administrator //catch //{ chkboxInOffice.Checked = false; } this.txtOnBaseFormular.Text = r["URI"].ToString().Trim(); + this.txturibeschreibung.Text = r["URIBeschreibung"].ToString().Trim(); Update_Vorlagenfelder(); } private void Update_Vorlagenfelder() { @@ -362,6 +363,7 @@ namespace OnDoc.UIControls.Administrator //if (cbPDFDirekteArchivierung.Checked) { r["genresultat_type"] = 3; } r["bearbeitung_zwingend"] = this.cbbearbeitungzwingend.Checked == true; r["uri"]=this.txtOnBaseFormular.Text; + r["uriBeschreibung"]=this.txturibeschreibung.Text; diff --git a/Client/UIControls/Approval.cs b/Client/UIControls/Approval.cs index 80593a58..82befa6e 100644 --- a/Client/UIControls/Approval.cs +++ b/Client/UIControls/Approval.cs @@ -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; } diff --git a/Client/UIControls/DocPreview.cs b/Client/UIControls/DocPreview.cs index 6520c072..f32f7731 100644 --- a/Client/UIControls/DocPreview.cs +++ b/Client/UIControls/DocPreview.cs @@ -51,6 +51,10 @@ namespace OnDoc.UIControls this.pnlEdit.Visible = false; } + public int Get_Page_Count() + { + return pdfViewerControl1.PageCount; + } public void set_zoom() { this.pdfViewerControl1.ZoomMode = ZoomMode.FitWidth; diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index a8ca4a19..cdef9cfa 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -385,26 +385,29 @@ namespace OnDoc.UICintrols public void refresh_dokumente_filtered(string layout = "") { - DB db = new DB(AppParams.connectionstring); - int selectedIndex = RibbonCBProfil.SelectedIndex; try { - profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString()); - } - catch - { - load_Profile(); - profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString()); - } - System.Data.DataTable dokumente = new System.Data.DataTable(); - dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, Search_Docid, false); - dokumente.DefaultView.RowFilter = datafilter; - - if (layout == "") { layout = "trefferliste_relaunch"; } - // TableHelper.SetColumnsOrder(dokumente, "trefferliste"); - TableHelper.FormatTable(ref dokumente, layout, ref this.sfDataGrid1); - //this.sfDataGrid1.DataSource = dokumente; + DB db = new DB(AppParams.connectionstring); + int selectedIndex = RibbonCBProfil.SelectedIndex; + try + { + profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString()); + } + catch + { + load_Profile(); + profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString()); + } + System.Data.DataTable dokumente = new System.Data.DataTable(); + dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, Search_Docid, false); + dokumente.DefaultView.RowFilter = datafilter; + if (layout == "") { layout = "trefferliste_relaunch"; } + // TableHelper.SetColumnsOrder(dokumente, "trefferliste"); + TableHelper.FormatTable(ref dokumente, layout, ref this.sfDataGrid1); + //this.sfDataGrid1.DataSource = dokumente; + } + catch { } } diff --git a/Client/UIControls/UCAllgemeinDokumentParamExtern.Designer.cs b/Client/UIControls/UCAllgemeinDokumentParamExtern.Designer.cs new file mode 100644 index 00000000..95becb2c --- /dev/null +++ b/Client/UIControls/UCAllgemeinDokumentParamExtern.Designer.cs @@ -0,0 +1,182 @@ +namespace OnDoc.UIControls +{ + partial class UCAllgemeinDokumentParamExtern + { + /// + /// Erforderliche Designervariable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Verwendete Ressourcen bereinigen. + /// + /// True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Vom Komponenten-Designer generierter Code + + /// + /// Erforderliche Methode für die Designerunterstützung. + /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden. + /// + private void InitializeComponent() + { + this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.txtPartnerZusteller = new System.Windows.Forms.TextBox(); + this.groupBox6 = new System.Windows.Forms.GroupBox(); + this.txtPartnerInhaber = new System.Windows.Forms.TextBox(); + this.sfButton1 = new Syncfusion.WinForms.Controls.SfButton(); + this.lblPartner = new System.Windows.Forms.Label(); + this.lblPartnerInhaber = new System.Windows.Forms.Label(); + this.btnErneutGenerierung = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.lbluridescription = new System.Windows.Forms.Label(); + this.groupBox5.SuspendLayout(); + this.groupBox6.SuspendLayout(); + this.SuspendLayout(); + // + // groupBox5 + // + this.groupBox5.Controls.Add(this.txtPartnerZusteller); + this.groupBox5.Location = new System.Drawing.Point(288, 40); + this.groupBox5.Name = "groupBox5"; + this.groupBox5.Size = new System.Drawing.Size(200, 100); + this.groupBox5.TabIndex = 30; + this.groupBox5.TabStop = false; + this.groupBox5.Text = "Zustell-Adresse"; + // + // txtPartnerZusteller + // + this.txtPartnerZusteller.Dock = System.Windows.Forms.DockStyle.Fill; + this.txtPartnerZusteller.Location = new System.Drawing.Point(3, 16); + this.txtPartnerZusteller.Multiline = true; + this.txtPartnerZusteller.Name = "txtPartnerZusteller"; + this.txtPartnerZusteller.ReadOnly = true; + this.txtPartnerZusteller.Size = new System.Drawing.Size(194, 81); + this.txtPartnerZusteller.TabIndex = 1; + // + // groupBox6 + // + this.groupBox6.Controls.Add(this.txtPartnerInhaber); + this.groupBox6.Location = new System.Drawing.Point(73, 40); + this.groupBox6.Name = "groupBox6"; + this.groupBox6.Size = new System.Drawing.Size(200, 100); + this.groupBox6.TabIndex = 29; + this.groupBox6.TabStop = false; + this.groupBox6.Text = "Inhaber-Adresse"; + // + // txtPartnerInhaber + // + this.txtPartnerInhaber.Dock = System.Windows.Forms.DockStyle.Fill; + this.txtPartnerInhaber.Location = new System.Drawing.Point(3, 16); + this.txtPartnerInhaber.Multiline = true; + this.txtPartnerInhaber.Name = "txtPartnerInhaber"; + this.txtPartnerInhaber.ReadOnly = true; + this.txtPartnerInhaber.Size = new System.Drawing.Size(194, 81); + this.txtPartnerInhaber.TabIndex = 0; + // + // sfButton1 + // + this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); + this.sfButton1.Location = new System.Drawing.Point(5, 12); + this.sfButton1.Name = "sfButton1"; + this.sfButton1.Size = new System.Drawing.Size(47, 28); + this.sfButton1.Style.Image = global::OnDoc.Properties.Resources.Search_24x24_32; + this.sfButton1.TabIndex = 28; + this.sfButton1.Tag = "Partner suchen"; + this.sfButton1.Click += new System.EventHandler(this.sfButton1_Click); + // + // lblPartner + // + this.lblPartner.AutoSize = true; + this.lblPartner.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblPartner.Location = new System.Drawing.Point(184, 16); + this.lblPartner.Name = "lblPartner"; + this.lblPartner.Size = new System.Drawing.Size(107, 13); + this.lblPartner.TabIndex = 27; + this.lblPartner.Text = "Partner-Kurzname"; + // + // lblPartnerInhaber + // + this.lblPartnerInhaber.AutoSize = true; + this.lblPartnerInhaber.Location = new System.Drawing.Point(70, 16); + this.lblPartnerInhaber.Name = "lblPartnerInhaber"; + this.lblPartnerInhaber.Size = new System.Drawing.Size(43, 13); + this.lblPartnerInhaber.TabIndex = 26; + this.lblPartnerInhaber.Text = "Inhaber"; + // + // btnErneutGenerierung + // + this.btnErneutGenerierung.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.btnErneutGenerierung.Location = new System.Drawing.Point(890, 55); + this.btnErneutGenerierung.Name = "btnErneutGenerierung"; + this.btnErneutGenerierung.Size = new System.Drawing.Size(138, 23); + this.btnErneutGenerierung.TabIndex = 31; + this.btnErneutGenerierung.Text = "Erneut erstellen"; + this.btnErneutGenerierung.UseVisualStyleBackColor = false; + this.btnErneutGenerierung.Visible = false; + this.btnErneutGenerierung.Click += new System.EventHandler(this.btnErneutGenerierung_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(69, 213); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(349, 24); + this.label1.TabIndex = 32; + this.label1.Text = "Dokumenterstellung in externem System"; + // + // lbluridescription + // + this.lbluridescription.AutoSize = true; + this.lbluridescription.Location = new System.Drawing.Point(73, 251); + this.lbluridescription.Name = "lbluridescription"; + this.lbluridescription.Size = new System.Drawing.Size(0, 13); + this.lbluridescription.TabIndex = 33; + // + // UCAllgemeinDokumentParamExtern + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lbluridescription); + this.Controls.Add(this.label1); + this.Controls.Add(this.groupBox5); + this.Controls.Add(this.groupBox6); + this.Controls.Add(this.sfButton1); + this.Controls.Add(this.lblPartner); + this.Controls.Add(this.lblPartnerInhaber); + this.Controls.Add(this.btnErneutGenerierung); + this.Name = "UCAllgemeinDokumentParamExtern"; + this.Size = new System.Drawing.Size(1032, 519); + this.Load += new System.EventHandler(this.UCAllgemeinDokumentParamExtern_Load); + this.groupBox5.ResumeLayout(false); + this.groupBox5.PerformLayout(); + this.groupBox6.ResumeLayout(false); + this.groupBox6.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.GroupBox groupBox5; + private System.Windows.Forms.TextBox txtPartnerZusteller; + private System.Windows.Forms.GroupBox groupBox6; + private System.Windows.Forms.TextBox txtPartnerInhaber; + private Syncfusion.WinForms.Controls.SfButton sfButton1; + private System.Windows.Forms.Label lblPartner; + private System.Windows.Forms.Label lblPartnerInhaber; + private System.Windows.Forms.Button btnErneutGenerierung; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label lbluridescription; + } +} diff --git a/Client/UIControls/UCAllgemeinDokumentParamExtern.cs b/Client/UIControls/UCAllgemeinDokumentParamExtern.cs new file mode 100644 index 00000000..29579b73 --- /dev/null +++ b/Client/UIControls/UCAllgemeinDokumentParamExtern.cs @@ -0,0 +1,169 @@ +using BroadcastListener.Classes; +using Database; +using OnDoc.Klassen; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Diagnostics; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using System.Xml; + +namespace OnDoc.UIControls +{ + public partial class UCAllgemeinDokumentParamExtern : UserControl + { + public bool personendokument { get; set; } = false; + public bool bpdokument { get; set; } = false; + public int dokumenttypnr { get; set; } = 0; + public string uri { get; set; } = ""; + public int partnernr { get; set; } = 0; + public int bpperson_error_type { get; set; } = 0; + private bool bpperson_error { get; set; } = false; + + public UCAllgemeinDokumentParamExtern() + { + InitializeComponent(); + } + + private void sfButton1_Click(object sender, EventArgs e) + { + set_personendokument(); + show_partnerdialog(); + } + + public bool set_personendokument() + { + + DB db1 = new DB(AppParams.connectionstring); + db1.Get_Tabledata("select * from Dokumenttyp_BP_Person_Erstellung where dokumenttypnr=" + this.dokumenttypnr.ToString(), false, true); + if (db1.dsdaten.Tables[0].Rows.Count == 0) + { + personendokument = false; + bpdokument = true; + } + else + { + if (db1.dsdaten.Tables[0].Rows[0][1].ToString() == "2") personendokument = true; + if (db1.dsdaten.Tables[0].Rows[0][1].ToString() == "1") personendokument = false; + if (personendokument) { bpdokument = false; } + } + return personendokument; + } + private void show_partnerdialog() + { + Partnersuche ps = new Partnersuche(personendokument, true, bpdokument, dokumenttypnr); + ps.ShowDialog(); + if (ps.DialogResult == DialogResult.OK) + { + this.partnernr = ps.partnernr; + if (ps.bpperson_changed) { lblPartner.ForeColor = System.Drawing.Color.Blue; } else { lblPartner.ForeColor = System.Drawing.Color.Black; } + update_partner(); + } + } + public void update_partner() + { + DB db = new DB(AppParams.connectionstring); + + db.Get_Tabledata("Select * from partner where nrpar00=" + partnernr, false, true); + this.lblPartner.Text = db.dsdaten.Tables[0].Rows[0]["nrpar00"].ToString() + " " + db.dsdaten.Tables[0].Rows[0]["bkpar00"].ToString(); + + db.clear_parameter(); + db.add_parameter("@nrpar00", this.partnernr.ToString()); + db.Get_Tabledata("OnDoc_sp_partner_detail", true, false); + txtPartnerInhaber.Text = ""; + txtPartnerZusteller.Text = ""; + string s = ""; + for (int i = 1; i < 8; i++) + { + txtPartnerInhaber.Text = txtPartnerInhaber.Text + db.dsdaten.Tables[0].Rows[0]["d" + i.ToString()].ToString() + "\r\n"; + txtPartnerZusteller.Text = txtPartnerZusteller.Text + db.dsdaten.Tables[0].Rows[0]["h" + i.ToString()].ToString() + "\r\n"; + s = s + db.dsdaten.Tables[0].Rows[0]["h" + i.ToString()].ToString(); + } + if (s == "") { txtPartnerZusteller.Text = txtPartnerInhaber.Text; } + + //db.clear_parameter(); + //db.add_parameter("@partnernr", this.partnernr.ToString()); + //db.Get_Tabledata("sp_dokumentbearbeitung_kube", true, false); + + + db = null; + + } + + public void Refresh_Details(string uri, string description) + { + this.uri = uri; + this.lbluridescription.Text = description; + if (dokumenttypnr != 0) + { + set_personendokument(); + } + + if (partnernr != 0) + { + update_partner(); + } + } + + public void gendoc() + { + try + { + string uri1 = ""; + uri1 = uri.Replace("&partnernr&", this.partnernr.ToString()); + Process.Start(uri1); + return; + } + catch (Exception ex) + { + string error = "Die Erstellung im externen System konnte nicht gestartet werden ('" + uri + "')" + Environment.NewLine + ex.Message; + MessageBox.Show(error,"Externe Dokumenterstellung",MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + public bool check_bp_person() + { + DB db1 = new DB(AppParams.connectionstring); + db1.Get_Tabledata("select * from Dokumenttyp_BP_Person_Erstellung where dokumenttypnr=" + this.dokumenttypnr.ToString(), false, true); + bpperson_error_type = 0; + if (db1.dsdaten.Tables[0].Rows.Count > 0) + { + if (db1.dsdaten.Tables[0].Rows[0][1].ToString() == "2" && this.partnernr.ToString().Length < 9) + { + bpperson_error = true; + bpperson_error_type = 1; + return false; + + } + if (db1.dsdaten.Tables[0].Rows[0][1].ToString() == "1" && this.partnernr.ToString().Length > 8) + { + bpperson_error = true; + bpperson_error_type = 2; + return false; + } + } + return true; + + } + + public void Show_Neugenerieren() + { + btnErneutGenerierung.Visible = true; + } + + private void btnErneutGenerierung_Click(object sender, EventArgs e) + { + gendoc(); + } + + private void UCAllgemeinDokumentParamExtern_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/Client/UIControls/UCAllgemeinDokumentParamExtern.resx b/Client/UIControls/UCAllgemeinDokumentParamExtern.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/Client/UIControls/UCAllgemeinDokumentParamExtern.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs index cd5cc8d6..9ffbdc7a 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs @@ -306,6 +306,7 @@ this.gridDokwertlist.Dock = System.Windows.Forms.DockStyle.Fill; this.gridDokwertlist.Location = new System.Drawing.Point(3, 16); this.gridDokwertlist.Name = "gridDokwertlist"; + this.gridDokwertlist.PreviewRowHeight = 35; this.gridDokwertlist.SelectionUnit = Syncfusion.WinForms.DataGrid.Enums.SelectionUnit.Cell; this.gridDokwertlist.Size = new System.Drawing.Size(456, 376); this.gridDokwertlist.TabIndex = 0; @@ -664,6 +665,7 @@ // // contextMenuStrip1 // + this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs index 0e8edd7f..37d07a9b 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.cs @@ -33,6 +33,7 @@ using System.Globalization; using System.Threading; using System.ComponentModel.Design; using Syncfusion.Windows.Forms.Tools.Win32API; +using Windows.Storage.Provider; namespace OnDoc.UIControls @@ -80,6 +81,8 @@ namespace OnDoc.UIControls public string dokumentid { get; set; } = ""; + public bool isuri { get; set; } = false; + public string uri { get; set; } = ""; public UCAllgemeineDokumentParam() @@ -147,6 +150,14 @@ namespace OnDoc.UIControls { //set_personendokument(); db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr=" + dokumenttypnr, false, true); + //if (db.dsdaten.Tables[0].Rows[0]["URI"].ToString()!="") + //{ + // isuri = true; + // pnluri1.Visible = true; + // pnluri2.Visible = true; + // pnluri3.Visible = true; + // pnluri4.Visible = true; + //} System.Data.DataRow dr = db.dsdaten.Tables[0].Rows[0]; this.txtbezeichnung.Text = dr["Bezeichnung"].ToString(); this.txtbezeichnung.Enabled = Convert.ToBoolean(dr["bezeichnungmut"]); diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index b549bfe9..2718d7b5 100644 Binary files a/Client/bin/Debug/DOCGEN.dll and b/Client/bin/Debug/DOCGEN.dll differ diff --git a/Client/bin/Debug/DOCGEN.pdb b/Client/bin/Debug/DOCGEN.pdb index 940b4075..5a5d579f 100644 Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 186b7eac..bd82e3a9 100644 Binary files a/Client/bin/Debug/OnDoc.exe and b/Client/bin/Debug/OnDoc.exe differ diff --git a/Client/bin/Debug/OnDoc.pdb b/Client/bin/Debug/OnDoc.pdb index e4475c76..50de537d 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/OnDocClient.zip b/Client/bin/Debug/OnDocClient.zip index 32717e4b..64f8dc27 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/OnDocOffice.dll b/Client/bin/Debug/OnDocOffice.dll index 1290d4c8..de6abead 100644 Binary files a/Client/bin/Debug/OnDocOffice.dll and b/Client/bin/Debug/OnDocOffice.dll differ diff --git a/Client/bin/Debug/OnDocOffice.pdb b/Client/bin/Debug/OnDocOffice.pdb index 44a238a2..8c9e2424 100644 Binary files a/Client/bin/Debug/OnDocOffice.pdb and b/Client/bin/Debug/OnDocOffice.pdb differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index c081209c..de6064db 100644 Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index abe9c4ed..ddd952fc 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache index 0bcad7bf..a599b723 100644 --- a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache +++ b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -b5b40de487345304ba70eb16f349e0707687fe0185b09583c77801db01245e1e +84d81ea8d2d590860675274b5713746c8237611a0eb4cfd92e1703956b0caaf0 diff --git a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt index 19803b45..b3905ae6 100644 --- a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt +++ b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt @@ -468,3 +468,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\ru\Microsoft.CodeAnalysis.CSha E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\tr\Microsoft.CodeAnalysis.CSharp.resources.dll E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\zh-Hans\Microsoft.CodeAnalysis.CSharp.resources.dll E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\zh-Hant\Microsoft.CodeAnalysis.CSharp.resources.dll +E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.UCAllgemeinDokumentParamExtern.resources diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index a6f19bf1..94a003b0 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.UIControls.UCAllgemeinDokumentParamExtern.resources b/Client/obj/Debug/OnDoc.UIControls.UCAllgemeinDokumentParamExtern.resources new file mode 100644 index 00000000..6c05a977 Binary files /dev/null and b/Client/obj/Debug/OnDoc.UIControls.UCAllgemeinDokumentParamExtern.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 186b7eac..bd82e3a9 100644 Binary files a/Client/obj/Debug/OnDoc.exe and b/Client/obj/Debug/OnDoc.exe differ diff --git a/Client/obj/Debug/OnDoc.pdb b/Client/obj/Debug/OnDoc.pdb index e4475c76..50de537d 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index c081209c..de6064db 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index b549bfe9..2718d7b5 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.dll and b/DOCGEN/bin/Debug/DOCGEN.dll differ diff --git a/DOCGEN/bin/Debug/DOCGEN.pdb b/DOCGEN/bin/Debug/DOCGEN.pdb index 940b4075..5a5d579f 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/bin/Debug/OnDocOffice.dll b/DOCGEN/bin/Debug/OnDocOffice.dll index 1290d4c8..de6abead 100644 Binary files a/DOCGEN/bin/Debug/OnDocOffice.dll and b/DOCGEN/bin/Debug/OnDocOffice.dll differ diff --git a/DOCGEN/bin/Debug/OnDocOffice.pdb b/DOCGEN/bin/Debug/OnDocOffice.pdb index 44a238a2..8c9e2424 100644 Binary files a/DOCGEN/bin/Debug/OnDocOffice.pdb and b/DOCGEN/bin/Debug/OnDocOffice.pdb differ diff --git a/DOCGEN/clsDocGen.cs b/DOCGEN/clsDocGen.cs index 64e8015b..d27d7847 100644 --- a/DOCGEN/clsDocGen.cs +++ b/DOCGEN/clsDocGen.cs @@ -193,7 +193,7 @@ namespace DOCGEN return dok.dokument; } - public bool signdoc(string dokumentid, string tempdir) + public bool signdoc(string dokumentid, string tempdir, int pages=0) { DB db1 = new DB(connectionstring); try @@ -205,7 +205,7 @@ namespace DOCGEN string dokumenttypnr = db1.dsdaten.Tables[0].Rows[0]["dokumenttypnr"].ToString(); OnDocOffice.clsWordEdit we = new OnDocOffice.clsWordEdit(connectionstring, "", "", resturi, apikey); - if (we.insert_signature(dokumentid, unterschriftlinks, unterschriftrechts, tempdir,dokumenttypnr)) + if (we.insert_signature(dokumentid, unterschriftlinks, unterschriftrechts, tempdir,dokumenttypnr,pages)) { return true; diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index b549bfe9..2718d7b5 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.dll and b/DOCGEN/obj/Debug/DOCGEN.dll differ diff --git a/DOCGEN/obj/Debug/DOCGEN.pdb b/DOCGEN/obj/Debug/DOCGEN.pdb index 940b4075..5a5d579f 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.pdb and b/DOCGEN/obj/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index f199ea7e..5a91b72e 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/bin/Debug/DOCGEN.dll b/OnDocOffice/bin/Debug/DOCGEN.dll index b549bfe9..2718d7b5 100644 Binary files a/OnDocOffice/bin/Debug/DOCGEN.dll and b/OnDocOffice/bin/Debug/DOCGEN.dll differ diff --git a/OnDocOffice/bin/Debug/DOCGEN.pdb b/OnDocOffice/bin/Debug/DOCGEN.pdb index 940b4075..5a5d579f 100644 Binary files a/OnDocOffice/bin/Debug/DOCGEN.pdb and b/OnDocOffice/bin/Debug/DOCGEN.pdb differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.dll b/OnDocOffice/bin/Debug/OnDocOffice.dll index 1290d4c8..de6abead 100644 Binary files a/OnDocOffice/bin/Debug/OnDocOffice.dll and b/OnDocOffice/bin/Debug/OnDocOffice.dll differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.pdb b/OnDocOffice/bin/Debug/OnDocOffice.pdb index 44a238a2..8c9e2424 100644 Binary files a/OnDocOffice/bin/Debug/OnDocOffice.pdb and b/OnDocOffice/bin/Debug/OnDocOffice.pdb differ diff --git a/OnDocOffice/clsoffice.cs b/OnDocOffice/clsoffice.cs index f8f1abf6..94be93f0 100644 --- a/OnDocOffice/clsoffice.cs +++ b/OnDocOffice/clsoffice.cs @@ -1632,7 +1632,7 @@ namespace OnDocOffice return; } - public bool insert_signature(string dokumentid, string unterschriftlinks, string unterschriftrechts, string tempdir, string dokumenttypnr ) + public bool insert_signature(string dokumentid, string unterschriftlinks, string unterschriftrechts, string tempdir, string dokumenttypnr , int pages) { DB db = new DB(this.connectstring); System.Data.DataTable dt = new System.Data.DataTable(); @@ -1678,7 +1678,7 @@ namespace OnDocOffice clsFileHelper.SaveBase64ToFile(unterschriftrechts, path_unterschriftrechts); } word_signature word_Signature = new word_signature(this.connectstring); - word_Signature.sign_doc(ref word, path_unterschriftlinks, path_unterschriftrechts, dokumentid,dokumenttypnr); + word_Signature.sign_doc(ref word, path_unterschriftlinks, path_unterschriftrechts, dokumentid,dokumenttypnr,pages); if (System.IO.File.Exists(path_unterschriftlinks)) { System.IO.File.Delete(tempdir + dokumentid + "UL.png"); }; if (System.IO.File.Exists(path_unterschriftrechts)) { System.IO.File.Delete(tempdir + dokumentid + "UR.png"); } @@ -1719,7 +1719,7 @@ namespace OnDocOffice - public bool sign_doc(ref Microsoft.Office.Interop.Word.Application word, string imagepath_ul, string imagepath_ur, string dokumentid, string dokumenttypnr) + public bool sign_doc(ref Microsoft.Office.Interop.Word.Application word, string imagepath_ul, string imagepath_ur, string dokumentid, string dokumenttypnr, int pages=0) { Logging.Logging.Debug("Sign_Doc", "OnDoc", dokumentid); docWord = word.ActiveDocument; @@ -1727,18 +1727,18 @@ namespace OnDocOffice DB db = new DB(this.ConnectionString); - int pages = 0; - try - { - object miss = System.Reflection.Missing.Value; - //pages = word.ActiveDocument.Words.Last.Information[WdInformation.wdActiveEndPageNumber]; - Microsoft.Office.Interop.Word.WdStatistic stat = Microsoft.Office.Interop.Word.WdStatistic.wdStatisticPages; - pages = word.ActiveDocument.ComputeStatistics(stat, ref miss); - } - catch (Exception e) - { - Logging.Logging.Debug("Sign_Doc - Pages not found "+e.Message, "OnDoc", dokumentid); - } + //int pages = 0; + //try + //{ + // object miss = System.Reflection.Missing.Value; + // //pages = word.ActiveDocument.Words.Last.Information[WdInformation.wdActiveEndPageNumber]; + // Microsoft.Office.Interop.Word.WdStatistic stat = Microsoft.Office.Interop.Word.WdStatistic.wdStatisticPages; + // pages = word.ActiveDocument.ComputeStatistics(stat, ref miss); + //} + //catch (Exception e) + //{ + // Logging.Logging.Debug("Sign_Doc - Pages not found "+e.Message, "OnDoc", dokumentid); + //} db.clear_parameter(); db.add_parameter("@dokumenttypnr",dokumenttypnr.ToString()); diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index 2a44c4b8..7b9a14c5 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.dll b/OnDocOffice/obj/Debug/OnDocOffice.dll index 1290d4c8..de6abead 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.dll and b/OnDocOffice/obj/Debug/OnDocOffice.dll differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.pdb b/OnDocOffice/obj/Debug/OnDocOffice.pdb index 44a238a2..8c9e2424 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.pdb and b/OnDocOffice/obj/Debug/OnDocOffice.pdb differ