diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index 9173629e..2ad6cfc6 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 d80112ce..2d2fa1ab 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index 3aeeaee5..8b11286c 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 ac646f6b..97ba9313 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 f25bde2c..cd2bc44e 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -41538,3 +41538,100 @@ Die Anweisung wurde beendet. bei System.Net.Mail.SmtpConnection.GetConnection(ServicePoint servicePoint) bei System.Net.Mail.SmtpClient.GetConnection() bei System.Net.Mail.SmtpClient.Send(MailMessage message) +2025-12-11 10:39:11.5115|DEBUG|OnDoc| +2025-12-11 10:39:11.5709|DEBUG|OnDoc| +2025-12-11 10:39:11.5709|DEBUG|OnDoc| +2025-12-11 10:39:11.5709|DEBUG|OnDoc| +2025-12-11 14:09:53.1634|DEBUG|OnDoc| +2025-12-11 14:09:53.1975|DEBUG|OnDoc| +2025-12-11 14:09:53.1975|DEBUG|OnDoc| +2025-12-11 14:09:53.1975|DEBUG|OnDoc| +2025-12-12 08:14:08.1283|DEBUG|OnDoc| +2025-12-12 08:14:08.1629|DEBUG|OnDoc| +2025-12-12 08:14:08.1629|DEBUG|OnDoc| +2025-12-12 08:14:08.1629|DEBUG|OnDoc| +2025-12-12 08:15:05.6445|DEBUG|OnDoc|Mailversand: 2 +2025-12-12 08:15:05.6807|DEBUG|OnDoc| +2025-12-12 08:15:05.6807|DEBUG|OnDoc| +2025-12-12 08:15:05.8992|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-12-12 08:15:05.9127|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-12-12 08:15:30.6108|DEBUG|OnDoc| +2025-12-12 08:15:30.6194|DEBUG|OnDoc| +2025-12-12 08:15:30.6465|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-12-12 08:15:30.6465|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-12-12 08:15:30.7230|DEBUG|OnDoc| +2025-12-12 08:15:30.7230|DEBUG|OnDoc| +2025-12-12 08:15:30.7558|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-12-12 08:15:30.7558|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-12-12 08:15:31.4464|DEBUG|OnDoc|Mailversand: 1 +2025-12-12 08:15:31.4704|DEBUG|OnDoc| +2025-12-12 08:15:31.4734|DEBUG|OnDoc| +2025-12-12 08:15:31.6138|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-12-12 08:15:31.6138|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-12-12 08:16:35.5912|DEBUG|OnDoc| +2025-12-12 08:16:35.6283|DEBUG|OnDoc| +2025-12-12 08:16:35.6303|DEBUG|OnDoc| +2025-12-12 08:16:35.6303|DEBUG|OnDoc| +2025-12-12 08:17:13.9434|DEBUG|OnDoc| +2025-12-12 08:17:14.0133|DEBUG|OnDoc| +2025-12-12 08:17:14.0133|DEBUG|OnDoc| +2025-12-12 08:17:14.0209|DEBUG|OnDoc| +2025-12-12 08:17:16.4187|DEBUG|OnDoc|Mailversand: 2 +2025-12-12 08:17:16.4832|DEBUG|OnDoc| +2025-12-12 08:17:16.4832|DEBUG|OnDoc| +2025-12-12 08:17:16.6642|DEBUG|OnDoc|Mail Versand NOK: Fehler beim Senden von Mail. stefan.hutter@tkb.ch +2025-12-12 08:17:16.6765|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-12-12 08:17:38.6801|DEBUG|OnDoc| +2025-12-12 08:17:38.6801|DEBUG|OnDoc| +2025-12-12 08:17:38.7160|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-12-12 08:17:38.7160|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-12-12 08:17:38.7749|DEBUG|OnDoc| +2025-12-12 08:17:38.7749|DEBUG|OnDoc| +2025-12-12 08:17:38.8010|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-12-12 08:17:38.8010|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-12-12 08:17:59.0102|DEBUG|OnDoc| +2025-12-12 08:17:59.0202|DEBUG|OnDoc| +2025-12-12 08:17:59.0458|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-12-12 08:17:59.0458|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-12-12 08:17:59.0936|DEBUG|OnDoc| +2025-12-12 08:17:59.0936|DEBUG|OnDoc| +2025-12-12 08:17:59.1197|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-12-12 08:17:59.1197|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-12-12 08:18:08.9659|DEBUG|OnDoc| +2025-12-12 08:18:08.9749|DEBUG|OnDoc| +2025-12-12 08:18:08.9998|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-12-12 08:18:08.9998|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-12-12 08:18:09.0458|DEBUG|OnDoc| +2025-12-12 08:18:09.0458|DEBUG|OnDoc| +2025-12-12 08:18:09.0747|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-12-12 08:18:09.0747|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-12-12 08:18:13.3325|DEBUG|OnDoc| +2025-12-12 08:18:13.3325|DEBUG|OnDoc| +2025-12-12 08:18:13.3664|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-12-12 08:18:13.3664|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-12-12 08:18:13.4149|DEBUG|OnDoc| +2025-12-12 08:18:13.4149|DEBUG|OnDoc| +2025-12-12 08:18:13.4446|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-12-12 08:18:13.4446|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-12-12 08:18:42.2567|DEBUG|OnDoc| +2025-12-12 08:18:42.3110|DEBUG|OnDoc| +2025-12-12 08:18:42.3110|DEBUG|OnDoc| +2025-12-12 08:18:42.3110|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 e1264f20..a20b5c64 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 3aeeaee5..8b11286c 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 ac646f6b..97ba9313 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/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index 7b200c1a..0a460a67 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 = "13. November 2025"; + this.label2.Text = "11.Dezember 2025"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label2.Click += new System.EventHandler(this.label2_Click); // diff --git a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs index 56a69a57..0cc3118b 100644 --- a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs +++ b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs @@ -43,6 +43,8 @@ this.tabControlAdv1 = new Syncfusion.Windows.Forms.Tools.TabControlAdv(); this.tabPageAdv1 = new Syncfusion.Windows.Forms.Tools.TabPageAdv(); this.groupBox8 = new System.Windows.Forms.GroupBox(); + this.label20 = new System.Windows.Forms.Label(); + this.txturibeschreibung = new System.Windows.Forms.TextBox(); this.txtOnBaseFormular = new System.Windows.Forms.TextBox(); this.label19 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -152,8 +154,7 @@ this.label16 = new System.Windows.Forms.Label(); this.rbNr = new System.Windows.Forms.RadioButton(); this.label15 = new System.Windows.Forms.Label(); - this.txturibeschreibung = new System.Windows.Forms.TextBox(); - this.label20 = new System.Windows.Forms.Label(); + this.cbfaksimileStandard = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit(); this.tabControlAdv1.SuspendLayout(); this.tabPageAdv1.SuspendLayout(); @@ -232,6 +233,23 @@ this.groupBox8.TabStop = false; this.groupBox8.Text = "OnBase Formular"; // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(8, 51); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(31, 15); + this.label20.TabIndex = 3; + this.label20.Text = "Bes."; + // + // txturibeschreibung + // + 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 // this.txtOnBaseFormular.Location = new System.Drawing.Point(43, 21); @@ -244,7 +262,7 @@ 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.Size = new System.Drawing.Size(31, 15); this.label19.TabIndex = 0; this.label19.Text = "URI:"; // @@ -265,7 +283,7 @@ this.chkversandstrassefirstdok.AutoSize = true; this.chkversandstrassefirstdok.Location = new System.Drawing.Point(163, 20); this.chkversandstrassefirstdok.Name = "chkversandstrassefirstdok"; - this.chkversandstrassefirstdok.Size = new System.Drawing.Size(162, 17); + this.chkversandstrassefirstdok.Size = new System.Drawing.Size(188, 19); this.chkversandstrassefirstdok.TabIndex = 2; this.chkversandstrassefirstdok.Text = "Als erstes Dokument möglich"; this.chkversandstrassefirstdok.UseVisualStyleBackColor = true; @@ -275,7 +293,7 @@ this.cbebanking_moeglich.AutoSize = true; this.cbebanking_moeglich.Location = new System.Drawing.Point(19, 43); this.cbebanking_moeglich.Name = "cbebanking_moeglich"; - this.cbebanking_moeglich.Size = new System.Drawing.Size(131, 17); + this.cbebanking_moeglich.Size = new System.Drawing.Size(152, 19); this.cbebanking_moeglich.TabIndex = 1; this.cbebanking_moeglich.Text = "E-Banking zugelassen"; this.cbebanking_moeglich.UseVisualStyleBackColor = true; @@ -285,7 +303,7 @@ this.cbversandstrasse_moeglich.AutoSize = true; this.cbversandstrasse_moeglich.Location = new System.Drawing.Point(19, 20); this.cbversandstrasse_moeglich.Name = "cbversandstrasse_moeglich"; - this.cbversandstrasse_moeglich.Size = new System.Drawing.Size(79, 17); + this.cbversandstrasse_moeglich.Size = new System.Drawing.Size(92, 19); this.cbversandstrasse_moeglich.TabIndex = 0; this.cbversandstrasse_moeglich.Text = "zugelassen"; this.cbversandstrasse_moeglich.UseVisualStyleBackColor = true; @@ -321,7 +339,7 @@ this.tsbtncopy.Image = global::OnDoc.Properties.Resources.Copy_16x16_32; this.tsbtncopy.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbtncopy.Name = "tsbtncopy"; - this.tsbtncopy.Size = new System.Drawing.Size(24, 39); + this.tsbtncopy.Size = new System.Drawing.Size(29, 39); this.tsbtncopy.Text = "Dokumenttyp kopieren"; this.tsbtncopy.Click += new System.EventHandler(this.tsbtncopy_Click); // @@ -331,12 +349,13 @@ this.toolStripButton3.Image = global::OnDoc.Properties.Resources.officevorlage_16x16_32; this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(24, 39); + this.toolStripButton3.Size = new System.Drawing.Size(29, 39); this.toolStripButton3.Text = "Vorlage anzeigen"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // // GrpUnterschrifte // + this.GrpUnterschrifte.Controls.Add(this.cbfaksimileStandard); this.GrpUnterschrifte.Controls.Add(this.lblStandard); this.GrpUnterschrifte.Controls.Add(this.lbUnterschriftStandard); this.GrpUnterschrifte.Controls.Add(this.cbUnterschriftrechts); @@ -355,7 +374,7 @@ this.lblStandard.AutoSize = true; this.lblStandard.Location = new System.Drawing.Point(336, 28); this.lblStandard.Name = "lblStandard"; - this.lblStandard.Size = new System.Drawing.Size(50, 13); + this.lblStandard.Size = new System.Drawing.Size(57, 15); this.lblStandard.TabIndex = 26; this.lblStandard.Text = "Standard"; this.lblStandard.Visible = false; @@ -375,7 +394,7 @@ // // cbUnterschriftrechts // - this.cbUnterschriftrechts.Location = new System.Drawing.Point(130, 28); + this.cbUnterschriftrechts.Location = new System.Drawing.Point(163, 28); this.cbUnterschriftrechts.Name = "cbUnterschriftrechts"; this.cbUnterschriftrechts.Size = new System.Drawing.Size(150, 24); this.cbUnterschriftrechts.TabIndex = 6; @@ -421,7 +440,7 @@ this.cbUnterschriftpruefung.AutoSize = true; this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 19); this.cbUnterschriftpruefung.Name = "cbUnterschriftpruefung"; - this.cbUnterschriftpruefung.Size = new System.Drawing.Size(176, 17); + this.cbUnterschriftpruefung.Size = new System.Drawing.Size(203, 19); this.cbUnterschriftpruefung.TabIndex = 1; this.cbUnterschriftpruefung.Text = "Unterschriftenprüfung zwingend"; this.cbUnterschriftpruefung.UseVisualStyleBackColor = true; @@ -431,7 +450,7 @@ this.chkBewilliigungZwingend.AutoSize = true; this.chkBewilliigungZwingend.Location = new System.Drawing.Point(277, 19); this.chkBewilliigungZwingend.Name = "chkBewilliigungZwingend"; - this.chkBewilliigungZwingend.Size = new System.Drawing.Size(179, 17); + this.chkBewilliigungZwingend.Size = new System.Drawing.Size(209, 19); this.chkBewilliigungZwingend.TabIndex = 0; this.chkBewilliigungZwingend.Text = "Bewilligung Dokument zwingend"; this.chkBewilliigungZwingend.UseVisualStyleBackColor = true; @@ -461,7 +480,7 @@ this.label18.AutoSize = true; this.label18.Location = new System.Drawing.Point(277, 13); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(105, 13); + this.label18.Size = new System.Drawing.Size(126, 15); this.label18.TabIndex = 29; this.label18.Text = "Kompatibilitätsmodus"; // @@ -470,7 +489,7 @@ this.chkfilloffice.AutoSize = true; this.chkfilloffice.Location = new System.Drawing.Point(277, 63); this.chkfilloffice.Name = "chkfilloffice"; - this.chkfilloffice.Size = new System.Drawing.Size(117, 17); + this.chkfilloffice.Size = new System.Drawing.Size(135, 19); this.chkfilloffice.TabIndex = 28; this.chkfilloffice.Text = "Befüllung mit Office"; this.chkfilloffice.UseVisualStyleBackColor = true; @@ -732,7 +751,7 @@ this.rbDokumenterstellungPerson.AutoSize = true; this.rbDokumenterstellungPerson.Location = new System.Drawing.Point(293, 32); this.rbDokumenterstellungPerson.Name = "rbDokumenterstellungPerson"; - this.rbDokumenterstellungPerson.Size = new System.Drawing.Size(155, 17); + this.rbDokumenterstellungPerson.Size = new System.Drawing.Size(181, 19); this.rbDokumenterstellungPerson.TabIndex = 22; this.rbDokumenterstellungPerson.Text = "Dokumenterstellung Person"; this.rbDokumenterstellungPerson.UseVisualStyleBackColor = true; @@ -743,7 +762,7 @@ this.rbDokumenterstellungBP.Checked = true; this.rbDokumenterstellungBP.Location = new System.Drawing.Point(293, 13); this.rbDokumenterstellungBP.Name = "rbDokumenterstellungBP"; - this.rbDokumenterstellungBP.Size = new System.Drawing.Size(136, 17); + this.rbDokumenterstellungBP.Size = new System.Drawing.Size(158, 19); this.rbDokumenterstellungBP.TabIndex = 21; this.rbDokumenterstellungBP.TabStop = true; this.rbDokumenterstellungBP.Text = "Dokumenterstellung BP"; @@ -1088,7 +1107,7 @@ this.chkaktiv.AutoSize = true; this.chkaktiv.Location = new System.Drawing.Point(135, 576); this.chkaktiv.Name = "chkaktiv"; - this.chkaktiv.Size = new System.Drawing.Size(15, 14); + this.chkaktiv.Size = new System.Drawing.Size(18, 17); this.chkaktiv.TabIndex = 35; this.chkaktiv.Tag = "aktiv"; this.chkaktiv.UseVisualStyleBackColor = true; @@ -1099,7 +1118,7 @@ this.label14.AutoSize = true; this.label14.Location = new System.Drawing.Point(18, 577); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(31, 13); + this.label14.Size = new System.Drawing.Size(31, 15); this.label14.TabIndex = 34; this.label14.Text = "Aktiv"; // @@ -1127,7 +1146,7 @@ this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(18, 230); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(97, 13); + this.label13.Size = new System.Drawing.Size(110, 15); this.label13.TabIndex = 31; this.label13.Text = "Tech-Bezeichnung"; // @@ -1145,7 +1164,7 @@ this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(18, 204); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(88, 13); + this.label12.Size = new System.Drawing.Size(102, 15); this.label12.TabIndex = 29; this.label12.Text = "Feldbezeichnung"; // @@ -1163,7 +1182,7 @@ this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(18, 513); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(92, 13); + this.label11.Size = new System.Drawing.Size(107, 15); this.label11.TabIndex = 27; this.label11.Text = "ESS-Image height"; // @@ -1181,7 +1200,7 @@ this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(18, 487); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(88, 13); + this.label10.Size = new System.Drawing.Size(102, 15); this.label10.TabIndex = 25; this.label10.Text = "ESS-Image width"; // @@ -1199,7 +1218,7 @@ this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(18, 461); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(77, 13); + this.label8.Size = new System.Drawing.Size(89, 15); this.label8.TabIndex = 23; this.label8.Text = "ESS-Image left"; // @@ -1217,7 +1236,7 @@ this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(18, 435); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(82, 13); + this.label7.Size = new System.Drawing.Size(94, 15); this.label7.TabIndex = 21; this.label7.Text = "ESS-Image Top"; // @@ -1236,7 +1255,7 @@ this.lblessfieldname.AutoSize = true; this.lblessfieldname.Location = new System.Drawing.Point(18, 409); this.lblessfieldname.Name = "lblessfieldname"; - this.lblessfieldname.Size = new System.Drawing.Size(77, 13); + this.lblessfieldname.Size = new System.Drawing.Size(91, 15); this.lblessfieldname.TabIndex = 19; this.lblessfieldname.Text = "ESS-Feldname"; // @@ -1254,7 +1273,7 @@ this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(18, 383); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(62, 13); + this.label9.Size = new System.Drawing.Size(72, 15); this.label9.TabIndex = 17; this.label9.Text = "ESS-Klasse"; // @@ -1272,7 +1291,7 @@ this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(18, 330); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(82, 13); + this.label6.Size = new System.Drawing.Size(95, 15); this.label6.TabIndex = 15; this.label6.Text = "Ende-Texmarke"; // @@ -1290,7 +1309,7 @@ this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(18, 304); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(90, 13); + this.label5.Size = new System.Drawing.Size(105, 15); this.label5.TabIndex = 13; this.label5.Text = "Beginn-Texmarke"; // @@ -1309,7 +1328,7 @@ this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(18, 278); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(53, 13); + this.label4.Size = new System.Drawing.Size(63, 15); this.label4.TabIndex = 11; this.label4.Text = "Feldname"; // @@ -1318,7 +1337,7 @@ this.chkzwingend.AutoSize = true; this.chkzwingend.Location = new System.Drawing.Point(135, 152); this.chkzwingend.Name = "chkzwingend"; - this.chkzwingend.Size = new System.Drawing.Size(15, 14); + this.chkzwingend.Size = new System.Drawing.Size(18, 17); this.chkzwingend.TabIndex = 10; this.chkzwingend.Tag = "Zwingend"; this.chkzwingend.UseVisualStyleBackColor = true; @@ -1329,7 +1348,7 @@ this.lbelzwingend.AutoSize = true; this.lbelzwingend.Location = new System.Drawing.Point(18, 153); this.lbelzwingend.Name = "lbelzwingend"; - this.lbelzwingend.Size = new System.Drawing.Size(54, 13); + this.lbelzwingend.Size = new System.Drawing.Size(61, 15); this.lbelzwingend.TabIndex = 9; this.lbelzwingend.Text = "Zwingend"; // @@ -1347,7 +1366,7 @@ this.lblsort.AutoSize = true; this.lblsort.Location = new System.Drawing.Point(18, 178); this.lblsort.Name = "lblsort"; - this.lblsort.Size = new System.Drawing.Size(111, 13); + this.lblsort.Size = new System.Drawing.Size(129, 15); this.lblsort.TabIndex = 7; this.lblsort.Text = "Sortier-Reihenfolge UI"; // @@ -1357,7 +1376,7 @@ this.chkui.Enabled = false; this.chkui.Location = new System.Drawing.Point(135, 129); this.chkui.Name = "chkui"; - this.chkui.Size = new System.Drawing.Size(15, 14); + this.chkui.Size = new System.Drawing.Size(18, 17); this.chkui.TabIndex = 6; this.chkui.Tag = "UI"; this.chkui.UseVisualStyleBackColor = true; @@ -1368,7 +1387,7 @@ this.lbluidesc.AutoSize = true; this.lbluidesc.Location = new System.Drawing.Point(18, 129); this.lbluidesc.Name = "lbluidesc"; - this.lbluidesc.Size = new System.Drawing.Size(18, 13); + this.lbluidesc.Size = new System.Drawing.Size(19, 15); this.lbluidesc.TabIndex = 5; this.lbluidesc.Text = "UI"; // @@ -1377,7 +1396,7 @@ this.lblfeldregelid.AutoSize = true; this.lblfeldregelid.Location = new System.Drawing.Point(132, 40); this.lblfeldregelid.Name = "lblfeldregelid"; - this.lblfeldregelid.Size = new System.Drawing.Size(50, 13); + this.lblfeldregelid.Size = new System.Drawing.Size(59, 15); this.lblfeldregelid.TabIndex = 3; this.lblfeldregelid.Text = "Feldregel"; // @@ -1386,7 +1405,7 @@ this.lblfeldregeliddesc.AutoSize = true; this.lblfeldregeliddesc.Location = new System.Drawing.Point(18, 43); this.lblfeldregeliddesc.Name = "lblfeldregeliddesc"; - this.lblfeldregeliddesc.Size = new System.Drawing.Size(50, 13); + this.lblfeldregeliddesc.Size = new System.Drawing.Size(59, 15); this.lblfeldregeliddesc.TabIndex = 2; this.lblfeldregeliddesc.Text = "Feldregel"; // @@ -1395,7 +1414,7 @@ this.lblID.AutoSize = true; this.lblID.Location = new System.Drawing.Point(132, 17); this.lblID.Name = "lblID"; - this.lblID.Size = new System.Drawing.Size(18, 13); + this.lblID.Size = new System.Drawing.Size(19, 15); this.lblID.TabIndex = 1; this.lblID.Text = "ID"; // @@ -1404,7 +1423,7 @@ this.lbliddesc.AutoSize = true; this.lbliddesc.Location = new System.Drawing.Point(18, 20); this.lbliddesc.Name = "lbliddesc"; - this.lbliddesc.Size = new System.Drawing.Size(18, 13); + this.lbliddesc.Size = new System.Drawing.Size(19, 15); this.lbliddesc.TabIndex = 0; this.lbliddesc.Text = "ID"; // @@ -1486,7 +1505,7 @@ this.chkboxaktive.CheckState = System.Windows.Forms.CheckState.Checked; this.chkboxaktive.Location = new System.Drawing.Point(205, 43); this.chkboxaktive.Name = "chkboxaktive"; - this.chkboxaktive.Size = new System.Drawing.Size(55, 17); + this.chkboxaktive.Size = new System.Drawing.Size(60, 19); this.chkboxaktive.TabIndex = 10; this.chkboxaktive.Text = "aktive"; this.chkboxaktive.UseVisualStyleBackColor = true; @@ -1505,7 +1524,7 @@ this.rbBezeichnung.AutoSize = true; this.rbBezeichnung.Location = new System.Drawing.Point(111, 42); this.rbBezeichnung.Name = "rbBezeichnung"; - this.rbBezeichnung.Size = new System.Drawing.Size(87, 17); + this.rbBezeichnung.Size = new System.Drawing.Size(100, 19); this.rbBezeichnung.TabIndex = 9; this.rbBezeichnung.Text = "Bezeichnung"; this.rbBezeichnung.UseVisualStyleBackColor = true; @@ -1516,7 +1535,7 @@ this.label16.AutoSize = true; this.label16.Location = new System.Drawing.Point(12, 15); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(29, 13); + this.label16.Size = new System.Drawing.Size(34, 15); this.label16.TabIndex = 5; this.label16.Text = "Filter"; // @@ -1526,7 +1545,7 @@ this.rbNr.Checked = true; this.rbNr.Location = new System.Drawing.Point(69, 42); this.rbNr.Name = "rbNr"; - this.rbNr.Size = new System.Drawing.Size(36, 17); + this.rbNr.Size = new System.Drawing.Size(41, 19); this.rbNr.TabIndex = 8; this.rbNr.TabStop = true; this.rbNr.Text = "Nr"; @@ -1538,26 +1557,17 @@ this.label15.AutoSize = true; this.label15.Location = new System.Drawing.Point(12, 44); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(26, 13); + this.label15.Size = new System.Drawing.Size(29, 15); this.label15.TabIndex = 7; this.label15.Text = "Sort"; // - // txturibeschreibung + // cbfaksimileStandard // - 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; - // - // label20 - // - 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."; + this.cbfaksimileStandard.Location = new System.Drawing.Point(163, 49); + this.cbfaksimileStandard.Name = "cbfaksimileStandard"; + this.cbfaksimileStandard.Size = new System.Drawing.Size(216, 24); + this.cbfaksimileStandard.TabIndex = 27; + this.cbfaksimileStandard.Text = "Faksimile Standard"; // // Dokumenttyp // @@ -1733,5 +1743,6 @@ private System.Windows.Forms.TextBox txtOnBaseFormular; private System.Windows.Forms.Label label20; private System.Windows.Forms.TextBox txturibeschreibung; + internal System.Windows.Forms.CheckBox cbfaksimileStandard; } } \ No newline at end of file diff --git a/Client/UIControls/Administrator/Dokumenttyp.cs b/Client/UIControls/Administrator/Dokumenttyp.cs index 8c4fce1f..6b64c5e8 100644 --- a/Client/UIControls/Administrator/Dokumenttyp.cs +++ b/Client/UIControls/Administrator/Dokumenttyp.cs @@ -148,8 +148,9 @@ namespace OnDoc.UIControls.Administrator this.cbUnterschriftrechts.Checked = Convert.ToBoolean(r["unterschrift_rechts"]) == true; this.cbDigitaleUnterschrift.Checked = Convert.ToBoolean(r["Unterschrift_Faksimile"]) == true; this.cbFormularOhneUnterschrift.Checked = Convert.ToBoolean(r["Unterschrift_ohne"]) == true; + this.cbfaksimileStandard.Checked = Convert.ToBoolean(r["Unterschrift_Standard"])== true; this.cbUnterschriftpruefung.Checked = Convert.ToBoolean(r["Unterschrift_Pruefung"]) == true; - this.lbUnterschriftStandard.SelectedIndex = Convert.ToInt32(r["unterschrift_standard"]); + //this.lbUnterschriftStandard.SelectedIndex = Convert.ToInt32(r["unterschrift_standard"]); this.cbboxarchiv.SelectedValue = Convert.ToInt32(r["physisches_archiv"]); //this.cbbearbeitungzwingend.Checked = Convert.ToBoolean(r["bearbeitungzwingend"]) == true; //switch (Convert.ToInt32(r["genresultat_type"])) @@ -346,6 +347,7 @@ namespace OnDoc.UIControls.Administrator r["Unterschrift_ohne"] = this.cbFormularOhneUnterschrift.Checked; r["Unterschrift_Pruefung"] = this.cbUnterschriftpruefung.Checked; r["unterschrift_standard"] = this.lbUnterschriftStandard.SelectedIndex; + r["unterschrift_standard"] = this.cbfaksimileStandard.Checked; r["aktiv"] = this.cbaktiv.Checked; r["mutierer"] = AppParams.CurrentMitarbeiter; r["mutiert_am"] = DateTime.Now; diff --git a/Client/UIControls/Approval.cs b/Client/UIControls/Approval.cs index f578c145..538ec454 100644 --- a/Client/UIControls/Approval.cs +++ b/Client/UIControls/Approval.cs @@ -26,6 +26,7 @@ namespace OnDoc.UIControls public partial class Approval : UserControl { public bool approval_startet { get; set; } = false; + private TreeViewAdv treeviewsave = new TreeViewAdv(); public Approval() { InitializeComponent(); @@ -187,6 +188,10 @@ namespace OnDoc.UIControls tnpartner.Nodes.Add(tndok); } }catch { } + if (AppParams.MultiThreadingSign) + { + treeviewsave = treeViewAdv1; + } } public int anzahl_dokument() @@ -292,6 +297,7 @@ namespace OnDoc.UIControls dg = null; } + //error = 1; if (error == 0) { db.Get_Tabledata("Select mutierer from dokument_Bewilligung where id=" + dr["id"].ToString(), false, true); @@ -354,6 +360,7 @@ namespace OnDoc.UIControls 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); db = null; + tn.Enabled = true; } @@ -387,6 +394,7 @@ namespace OnDoc.UIControls signthread.Start(); //remove_node(); + treeViewAdv1.SelectedNode.Enabled=false; return; } @@ -510,6 +518,7 @@ namespace OnDoc.UIControls update_details(treeViewAdv1.SelectedNode.Tag as string); } catch { } + } public void showhidepnlapproval(bool show) diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index 9c156b73..24e9e06b 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -474,6 +474,7 @@ namespace OnDoc.UICintrols "Vorschau rechts", "Vorschau unten", "Vorschau oben"}); + this.tsrbvorschau.Font = new System.Drawing.Font("Segoe UI", 9F); this.tsrbvorschau.Items.AddRange(new object[] { "Keine Vorschau", "Vorschau unten", diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index 9173629e..2ad6cfc6 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 d80112ce..2d2fa1ab 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 74794b63..cafe52df 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 e3ffa5ea..d71ba633 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 69231eff..eecf015c 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index 0e79ff8e..86ec0a10 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 fdf4366a..e886ebb1 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/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index a2b668b3..53bb58d1 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 74794b63..cafe52df 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 e3ffa5ea..d71ba633 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 0e79ff8e..86ec0a10 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 9173629e..2ad6cfc6 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 d80112ce..2d2fa1ab 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/clsDocGet.cs b/DOCGEN/clsDocGet.cs index 7c3e431d..f278bf3a 100644 --- a/DOCGEN/clsDocGet.cs +++ b/DOCGEN/clsDocGet.cs @@ -160,11 +160,11 @@ namespace DOCGEN db.Get_Tabledata("Select dokumenttypnr from dokument where dokumentid='" + Docid + "'", false, true); int dokumenttypnr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]); db.Get_Tabledata("Select count(*) from dbo.OnDoc_Update_PDF_Document_Fields where dokumenttypnr=" + dokumenttypnr.ToString(), false, true); - bool updatefields = false; + bool updatefields = true; if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) { - updatefields = true; + updatefields = false; } db = null; @@ -354,7 +354,7 @@ namespace DOCGEN } - public string Convert_Word_To_PDF(string document, DataTable pdfparameters = null, bool useseettings = false , bool updatefields=false) + public string Convert_Word_To_PDF(string document, DataTable pdfparameters = null, bool useseettings = false , bool updatefields=true) { diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index 9173629e..2ad6cfc6 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 d80112ce..2d2fa1ab 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 4384f08f..405583e7 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 9173629e..2ad6cfc6 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 d80112ce..2d2fa1ab 100644 Binary files a/OnDocOffice/bin/Debug/DOCGEN.pdb and b/OnDocOffice/bin/Debug/DOCGEN.pdb differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index c1d71a72..81fd764b 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ