diff --git a/API_NetFramework/Controllers/ArchivController.cs b/API_NetFramework/Controllers/ArchivController.cs index da613c4d..c6d19c9a 100644 --- a/API_NetFramework/Controllers/ArchivController.cs +++ b/API_NetFramework/Controllers/ArchivController.cs @@ -44,6 +44,7 @@ namespace API_NetFramework.Controllers public int senderror { get; set; } = 0; public string response { get; set; } = ""; } + public enum uploadtype { @@ -59,7 +60,6 @@ namespace API_NetFramework.Controllers // GET: OnBase string tokenfunction = "Archiv"; string connectionstring = StringCipher.Decrypt(ConfigurationManager.ConnectionStrings["EDOKAConnectionstring"].ConnectionString, "i%!k!7pab%bNLdA5hE4pkR4XaB%E^jB3d9tHuQ4pbF&BZjF7SB#WBWit5#HrbJiLrLVm"); - private void Update_IL_Log(ref ILResponse ilr, string dokumentid) { APILogging.Log((HttpRequestMessage)Request, "Start Update IL_Log: DokumentID:" + dokumentid, LogLevelType.Debug); @@ -611,7 +611,7 @@ namespace API_NetFramework.Controllers } } - + private string archiv_sb_doc(string dokumentid, string partnernr, string serienbriefnr, string dokument, string inteintragnr) { OnBaseDocUpload.OnBaseDokument onbasedoc = new OnBaseDocUpload.OnBaseDokument(); @@ -654,6 +654,7 @@ namespace API_NetFramework.Controllers return ilr.response; } + [HttpPost] [Route("API/Send_Versandstrasse")] @@ -757,6 +758,19 @@ namespace API_NetFramework.Controllers string result = ""; inthandle = archiv_sb_doc(vd.DokumentID, vd.Partnernr, versandpaket.sb.serienbriefnr.ToString(), vd.dokument, vd.inteintragnr.ToString()); + + int test; + bool isnumeric = int.TryParse(inthandle, out test); + + if (!isnumeric || inthandle == "") + { + ILResponse ilr1 = new ILResponse(); + ilr1.response = "Dokument IntEIntrag="+vd.inteintragnr.ToString()+" nicht archiviert"; + ilr1.senderror = 1; + DB db = new DB(connectionstring); + db.Exec_SQL("Update OnDoc_Versandstrasse_paket set fehler=1, fehlerdatum=getdate(), fehlerbeschreibung='"+ ilr1.response+"' where id=" + paketid); + return Content(HttpStatusCode.InternalServerError, ilr1.response); + } oba.DocumentHandle = inthandle.ToString(); DOCGEN.DocGen dg = new DOCGEN.DocGen(); versandpaket.finaldoc = dg.geneate_dummy_pdf("VS Serienbrief: Handle "+oba.DocumentHandle.ToString() +" "+ DateTime.Now.ToString("dd.MM.yyyy hh:mm:ss")); @@ -768,15 +782,38 @@ namespace API_NetFramework.Controllers db.clear_parameter(); db.add_parameter("@dokumentid", vd.DokumentID); db.Get_Tabledata("sp_get_handle", true, false); + if (db.dsdaten.Tables[0].Rows.Count > 0) { inthandle = db.dsdaten.Tables[0].Rows[0][0].ToString(); + int test; + bool isnumeric = int.TryParse(inthandle, out test); + if (!isnumeric || inthandle=="") + { + ILResponse ilr1 = new ILResponse(); + ilr1.response = "Dokument ID:'"+ vd.DokumentID+"' nicht archiviert"; + ilr1.senderror = 1; + db.Exec_SQL("Update OnDoc_Versandstrasse_paket set fehler=1, fehlerdatum=getdate(), fehlerbeschreibung='" + ilr1.response + "' where id=" + paketid); + + return Content(HttpStatusCode.InternalServerError, ilr1.response); + } + oba.DocumentHandle = inthandle; DOCGEN.DocGen dg = new DOCGEN.DocGen(); versandpaket.finaldoc=dg.geneate_dummy_pdf("Versandstrasse - DummyDokument - " + DateTime.Now.ToString("dd.MM.yyyy hh:mm:ss")); //versandpaket.finaldoc = ""; dg = null; } + else + { + ILResponse ilr1 = new ILResponse(); + ilr1.response = "Dokument ID:'" + vd.DokumentID + "' nicht archiviert"; + ilr1.senderror = 1; + db.Exec_SQL("Update OnDoc_Versandstrasse_paket set fehler=1, fehlerdatum=getdate(), fehlerbeschreibung='" + ilr1.response + "' where id=" + paketid); + + return Content(HttpStatusCode.InternalServerError, ilr1.response); + + } db = null; } } diff --git a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user index 15def2b4..b8b1b94f 100644 --- a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>E:\Software-Projekte\OnDoc\PubServices\OnDoc - True|2025-05-06T10:58:55.8720511Z||;True|2025-05-05T10:30:22.0524225+02:00||;True|2025-05-05T09:37:27.1162038+02:00||;True|2025-05-04T13:37:01.8401491+02:00||;True|2025-04-14T15:32:13.3923265+02:00||;True|2025-03-27T09:55:34.9678501+01:00||;True|2025-03-27T07:47:45.1288274+01:00||;True|2025-03-26T19:03:04.7550972+01:00||;True|2025-02-27T19:20:43.3755758+01:00||;True|2025-02-27T18:15:21.2843332+01:00||;True|2025-02-25T19:05:51.2823294+01:00||;True|2025-02-25T19:04:29.0810473+01:00||;True|2025-02-21T10:28:09.2279895+01:00||;True|2025-02-21T09:59:33.3258979+01:00||;True|2025-02-12T12:49:01.5618262+01:00||;True|2025-02-09T14:47:25.8660147+01:00||;True|2025-02-09T12:40:23.8730229+01:00||;True|2025-02-05T14:41:27.6196364+01:00||;True|2025-02-04T22:19:44.0470841+01:00||;True|2025-02-04T21:33:03.4165210+01:00||;True|2025-02-02T20:06:51.6815543+01:00||;True|2025-01-20T10:17:24.5425008+01:00||;True|2025-01-19T16:20:16.1036874+01:00||;True|2025-01-19T16:19:11.5720999+01:00||;True|2025-01-12T14:24:46.2550852+01:00||;True|2025-01-12T14:00:23.9205001+01:00||;True|2025-01-07T15:08:24.2722613+01:00||;True|2025-01-06T09:25:16.5522864+01:00||;True|2024-12-22T16:49:54.0855447+01:00||;True|2024-12-08T09:59:39.7127943+01:00||;True|2024-12-08T09:26:52.1924006+01:00||;True|2024-12-02T09:50:13.5426444+01:00||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||; + True|2025-06-18T19:46:07.0469838Z||;True|2025-06-18T12:17:09.8417440+02:00||;True|2025-06-18T11:06:43.5839212+02:00||;True|2025-05-06T12:58:55.8720511+02:00||;True|2025-05-05T10:30:22.0524225+02:00||;True|2025-05-05T09:37:27.1162038+02:00||;True|2025-05-04T13:37:01.8401491+02:00||;True|2025-04-14T15:32:13.3923265+02:00||;True|2025-03-27T09:55:34.9678501+01:00||;True|2025-03-27T07:47:45.1288274+01:00||;True|2025-03-26T19:03:04.7550972+01:00||;True|2025-02-27T19:20:43.3755758+01:00||;True|2025-02-27T18:15:21.2843332+01:00||;True|2025-02-25T19:05:51.2823294+01:00||;True|2025-02-25T19:04:29.0810473+01:00||;True|2025-02-21T10:28:09.2279895+01:00||;True|2025-02-21T09:59:33.3258979+01:00||;True|2025-02-12T12:49:01.5618262+01:00||;True|2025-02-09T14:47:25.8660147+01:00||;True|2025-02-09T12:40:23.8730229+01:00||;True|2025-02-05T14:41:27.6196364+01:00||;True|2025-02-04T22:19:44.0470841+01:00||;True|2025-02-04T21:33:03.4165210+01:00||;True|2025-02-02T20:06:51.6815543+01:00||;True|2025-01-20T10:17:24.5425008+01:00||;True|2025-01-19T16:20:16.1036874+01:00||;True|2025-01-19T16:19:11.5720999+01:00||;True|2025-01-12T14:24:46.2550852+01:00||;True|2025-01-12T14:00:23.9205001+01:00||;True|2025-01-07T15:08:24.2722613+01:00||;True|2025-01-06T09:25:16.5522864+01:00||;True|2024-12-22T16:49:54.0855447+01:00||;True|2024-12-08T09:59:39.7127943+01:00||;True|2024-12-08T09:26:52.1924006+01:00||;True|2024-12-02T09:50:13.5426444+01:00||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||; @@ -82,10 +82,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 04/09/2024 19:25:14 - 05/04/2025 13:55:10 + 06/15/2025 08:32:39 - 05/04/2025 13:55:10 + 06/15/2025 08:32:39 02/28/2025 10:40:17 @@ -94,10 +94,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/28/2025 10:40:17 - 05/06/2025 12:58:31 + 06/15/2025 08:30:32 - 05/06/2025 12:58:31 + 06/15/2025 08:30:32 10/20/2023 22:35:02 @@ -130,13 +130,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:35:04 - 05/06/2025 12:58:54 + 06/18/2025 21:46:05 12/23/2024 22:17:43 - 05/06/2025 12:58:54 + 06/18/2025 21:46:05 11/27/2023 09:49:58 @@ -214,10 +214,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 04/11/2022 19:09:46 - 05/06/2025 12:58:30 + 02/06/2025 15:43:12 - 05/06/2025 12:58:30 + 02/06/2025 15:43:12 08/19/2014 21:33:57 @@ -250,16 +250,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/28/2025 10:40:16 - 05/06/2025 12:58:54 + 06/18/2025 21:46:05 - 05/06/2025 12:58:54 + 06/18/2025 21:46:05 - 05/06/2025 12:58:54 + 06/18/2025 21:46:06 - 05/06/2025 12:58:54 + 06/18/2025 21:46:06 11/13/2012 13:19:34 @@ -454,10 +454,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:33:58 - 04/29/2025 09:05:19 + 06/06/2025 10:46:02 - 04/29/2025 09:05:19 + 06/06/2025 10:46:02 03/28/2025 14:01:17 @@ -466,10 +466,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 03/28/2025 14:01:17 - 04/27/2025 12:44:45 + 06/06/2025 10:46:01 - 04/27/2025 12:44:45 + 06/06/2025 10:46:01 10/05/2016 15:11:52 diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index 85d89af5..42ad5946 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 3f4f2bdf..908f9825 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll index ca7f2ad0..6520e565 100644 Binary files a/API_NetFramework/bin/Database.dll and b/API_NetFramework/bin/Database.dll differ diff --git a/API_NetFramework/bin/Database.pdb b/API_NetFramework/bin/Database.pdb index 966f2720..30570d28 100644 Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ diff --git a/API_NetFramework/bin/OnDocOffice.dll b/API_NetFramework/bin/OnDocOffice.dll index 7237ca85..66950f8a 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 cbc634ef..75fc8df4 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 1bcc5967..69bd5bb0 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 8085b9de..d4de652b 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 e0999f5d..0f186836 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -12526,3 +12526,414 @@ done 2025-05-30 15:04:53.5145|DEBUG|OnDoc| 2025-05-30 15:04:53.5145|DEBUG|OnDoc| 2025-05-30 15:04:53.5348|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-10 10:08:52.5869|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002519041 +2025-06-10 10:08:52.6380|DEBUG|OnDoc| +2025-06-10 10:08:52.6667|DEBUG|OnDoc| +2025-06-10 10:08:52.6667|DEBUG|OnDoc| +2025-06-10 10:08:52.6716|DEBUG|OnDoc| +2025-06-10 10:08:52.6716|DEBUG|OnDoc| +2025-06-10 10:08:53.0725|DEBUG|OnDoc| +2025-06-10 10:08:53.0725|DEBUG|OnDoc| +2025-06-10 10:08:53.0840|DEBUG|OnDoc| +2025-06-10 10:09:22.8775|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-10 10:09:22.9128|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Fast +2025-06-10 10:09:23.0658|DEBUG|OnDoc|Ende Transfer to OnBase +2025-06-10 10:09:30.2091|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002519041 +2025-06-10 10:09:30.7491|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002519041 +2025-06-10 10:09:30.7676|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002519041 +2025-06-10 10:09:32.2209|DEBUG|OnDoc| +2025-06-10 10:09:32.2209|DEBUG|OnDoc| +2025-06-10 10:09:32.2333|DEBUG|OnDoc| +2025-06-10 10:09:32.3234|DEBUG|OnDoc| +2025-06-10 10:09:32.3234|DEBUG|OnDoc| +2025-06-10 10:09:32.3234|DEBUG|OnDoc| +2025-06-11 09:17:04.5752|DEBUG|OnDoc|Mailversand: 2 +2025-06-11 09:17:04.6345|DEBUG|OnDoc| +2025-06-11 09:17:04.6475|DEBUG|OnDoc| +2025-06-11 09:17:04.6651|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-11 09:17:18.2308|DEBUG|OnDoc|Mailversand: 1 +2025-06-11 09:17:18.2564|DEBUG|OnDoc| +2025-06-11 09:17:18.2564|DEBUG|OnDoc| +2025-06-11 09:17:18.2746|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-11 09:17:25.4182|DEBUG|OnDoc| +2025-06-11 09:17:25.4549|DEBUG|OnDoc| +2025-06-11 09:17:25.4842|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-11 09:17:25.4842|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-11 09:17:25.5537|DEBUG|OnDoc| +2025-06-11 09:17:25.5537|DEBUG|OnDoc| +2025-06-11 09:17:25.5805|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-06-11 09:17:25.5805|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-06-11 09:19:19.6168|DEBUG|OnDoc|Mailversand: 2 +2025-06-11 09:19:19.6465|DEBUG|OnDoc| +2025-06-11 09:19:19.6465|DEBUG|OnDoc| +2025-06-11 09:19:19.6651|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-15 08:42:39.6365|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524701 +2025-06-15 08:42:39.6650|DEBUG|OnDoc| +2025-06-15 08:42:39.7010|DEBUG|OnDoc| +2025-06-15 08:42:39.7010|DEBUG|OnDoc| +2025-06-15 08:42:39.7010|DEBUG|OnDoc| +2025-06-15 08:42:39.7010|DEBUG|OnDoc| +2025-06-15 08:42:39.8143|DEBUG|OnDoc| +2025-06-15 08:42:39.8143|DEBUG|OnDoc| +2025-06-15 08:42:39.8143|DEBUG|OnDoc| +2025-06-15 08:42:44.3381|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-15 08:42:44.3482|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Fast +2025-06-15 08:42:44.4786|DEBUG|OnDoc|Ende Transfer to OnBase +2025-06-15 08:42:44.4956|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524701 +2025-06-15 08:42:44.4981|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524701 +2025-06-15 08:42:44.4981|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524701 +2025-06-15 08:42:44.4981|DEBUG|OnDoc| +2025-06-15 08:42:44.4981|DEBUG|OnDoc| +2025-06-15 08:42:44.4981|DEBUG|OnDoc| +2025-06-15 08:42:44.5534|DEBUG|OnDoc| +2025-06-15 08:42:44.5534|DEBUG|OnDoc| +2025-06-15 08:42:44.5908|ERROR|OnDoc|Ungültiger Objektname "edoka_journale.dbo.OnDoc_Wiederbearbietung". +2025-06-16 11:48:54.5910|DEBUG|OnDoc| +2025-06-16 11:48:54.6255|DEBUG|OnDoc| +2025-06-16 11:48:54.6521|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG0494 +2025-06-16 11:48:54.6521|INFO|OnDoc|Unterschrift-Bezug - nicht vorhanden: TG0494 DEMO-Unterschrfit verwendet +2025-06-16 11:48:54.6521|INFO|OnDoc|Unterschrift-Bezug: TG0494 +2025-06-16 11:49:05.3232|INFO|OnDoc|Unterschriften-Image gespeichert - TG0494 +2025-06-16 11:49:05.3669|DEBUG|OnDoc| +2025-06-16 11:49:05.3669|DEBUG|OnDoc| +2025-06-16 11:49:05.3925|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG0494 +2025-06-16 11:49:05.3925|INFO|OnDoc|Unterschrift-Bezug: TG0494 +2025-06-16 11:50:37.4464|DEBUG|OnDoc|Mailversand: 44 +2025-06-16 11:50:37.4743|DEBUG|OnDoc| +2025-06-16 11:50:37.4743|DEBUG|OnDoc| +2025-06-16 11:50:37.4939|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-16 11:50:37.5230|DEBUG|OnDoc|Mailversand: 2 +2025-06-16 11:50:37.5475|DEBUG|OnDoc| +2025-06-16 11:50:37.5475|DEBUG|OnDoc| +2025-06-16 11:50:37.5680|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-16 11:51:05.5470|DEBUG|OnDoc|Mailversand: 1 +2025-06-16 11:51:05.5805|DEBUG|OnDoc| +2025-06-16 11:51:05.5805|DEBUG|OnDoc| +2025-06-16 11:51:05.5986|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-16 11:51:39.1876|DEBUG|OnDoc|Mailversand: 1 +2025-06-16 11:51:39.2209|DEBUG|OnDoc| +2025-06-16 11:51:39.2209|DEBUG|OnDoc| +2025-06-16 11:51:39.2411|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-06-16 11:52:31.8400|DEBUG|OnDoc| +2025-06-16 11:52:31.8792|DEBUG|OnDoc| +2025-06-16 11:52:31.9047|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG0494 +2025-06-16 11:52:31.9047|INFO|OnDoc|Unterschrift-Bezug: TG0494 +2025-06-16 11:52:42.1478|DEBUG|OnDoc| +2025-06-16 11:52:42.1567|DEBUG|OnDoc| +2025-06-16 11:52:42.1814|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-06-16 11:52:42.1846|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-06-17 12:54:00.4392|DEBUG|OnDoc| +2025-06-17 12:54:00.4768|DEBUG|OnDoc| +2025-06-17 12:54:00.5069|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-17 12:54:00.5069|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-17 12:55:49.7653|DEBUG|OnDoc| +2025-06-17 12:55:49.7963|DEBUG|OnDoc| +2025-06-17 12:55:49.8241|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-17 12:55:49.8241|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-17 12:56:50.9810|DEBUG|OnDoc| +2025-06-17 12:56:51.0140|DEBUG|OnDoc| +2025-06-17 12:56:51.0412|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-17 12:56:51.0412|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-17 12:57:34.8187|DEBUG|OnDoc| +2025-06-17 12:57:34.8492|DEBUG|OnDoc| +2025-06-17 12:57:34.8743|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-17 12:57:34.8743|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-17 12:58:17.5050|DEBUG|OnDoc| +2025-06-17 12:58:17.5381|DEBUG|OnDoc| +2025-06-17 12:58:17.5621|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-17 12:58:17.5621|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-17 12:58:26.4905|DEBUG|OnDoc| +2025-06-17 12:58:26.4905|DEBUG|OnDoc| +2025-06-17 12:58:26.5163|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-17 12:58:26.5163|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-17 13:17:23.8246|DEBUG|OnDoc| +2025-06-17 13:17:23.8576|DEBUG|OnDoc| +2025-06-17 13:17:23.8845|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-17 13:17:23.8845|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-17 13:17:30.0037|DEBUG|OnDoc| +2025-06-17 13:17:30.0037|DEBUG|OnDoc| +2025-06-17 13:17:30.0350|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-06-17 13:17:30.0350|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-06-18 12:53:38.1850|DEBUG|OnDoc| +2025-06-18 12:53:38.2801|DEBUG|OnDoc| +2025-06-18 12:53:56.8910|DEBUG|OnDoc| +2025-06-18 12:53:56.8910|DEBUG|OnDoc| +2025-06-18 12:54:04.5085|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 +2025-06-18 12:54:04.5444|DEBUG|OnDoc| +2025-06-18 12:54:04.5652|DEBUG|OnDoc| +2025-06-18 12:54:04.5652|DEBUG|OnDoc| +2025-06-18 12:54:04.5652|DEBUG|OnDoc| +2025-06-18 12:54:04.5652|DEBUG|OnDoc| +2025-06-18 12:54:04.5652|DEBUG|OnDoc| +2025-06-18 12:54:04.5767|DEBUG|OnDoc| +2025-06-18 12:54:04.5767|DEBUG|OnDoc| +2025-06-18 12:54:05.9149|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 12:54:05.9241|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Fast +2025-06-18 12:54:06.0747|DEBUG|OnDoc|Ende Transfer to OnBase:"XTQZW3" +2025-06-18 12:54:06.0954|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 / 0/0 / "XTQZW3" +2025-06-18 12:54:06.0954|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 12:54:06.0954|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 12:54:06.0954|DEBUG|OnDoc| +2025-06-18 12:54:06.0954|DEBUG|OnDoc| +2025-06-18 12:54:06.1074|DEBUG|OnDoc| +2025-06-18 12:54:06.1452|DEBUG|OnDoc| +2025-06-18 12:54:06.1452|DEBUG|OnDoc| +2025-06-18 12:54:06.1668|ERROR|OnDoc|Ungültiger Objektname "edoka_journale.dbo.OnDoc_Wiederbearbietung". +2025-06-18 12:54:29.9338|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 +2025-06-18 12:54:34.2164|DEBUG|OnDoc| +2025-06-18 12:54:34.2783|DEBUG|OnDoc| +2025-06-18 12:54:37.5232|DEBUG|OnDoc| +2025-06-18 12:54:37.5584|DEBUG|OnDoc| +2025-06-18 12:54:48.4861|DEBUG|OnDoc| +2025-06-18 12:54:48.5267|DEBUG|OnDoc| +2025-06-18 12:55:11.5647|DEBUG|OnDoc| +2025-06-18 12:55:11.6041|DEBUG|OnDoc| +2025-06-18 12:55:46.3218|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 12:55:51.4069|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 13:01:16.9129|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 13:01:17.2182|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:01:17.2328|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:11:02.4972|DEBUG|OnDoc| +2025-06-18 13:11:02.8025|DEBUG|OnDoc| +2025-06-18 13:11:02.8472|DEBUG|OnDoc| +2025-06-18 13:11:02.8472|DEBUG|OnDoc| +2025-06-18 13:11:05.2062|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:11:05.2062|DEBUG|OnDoc| +2025-06-18 13:11:05.2437|DEBUG|OnDoc| +2025-06-18 13:11:05.2437|DEBUG|OnDoc| +2025-06-18 13:11:05.2487|DEBUG|OnDoc| +2025-06-18 13:11:05.2487|DEBUG|OnDoc| +2025-06-18 13:11:05.2487|DEBUG|OnDoc| +2025-06-18 13:11:17.2439|DEBUG|OnDoc| +2025-06-18 13:11:17.2809|DEBUG|OnDoc| +2025-06-18 13:11:27.3976|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 13:11:27.4327|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 13:11:27.5688|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 13:11:27.5782|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:11:27.5782|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:11:27.5943|ERROR|OnDoc|Das Objekt des Typs "System.Web.Http.Results.NegotiatedContentResult`1[System.String]" kann nicht in Typ "System.Net.Http.HttpResponseMessage" umgewandelt werden. +2025-06-18 13:12:34.6672|DEBUG|OnDoc| +2025-06-18 13:12:34.7517|DEBUG|OnDoc| +2025-06-18 13:12:34.8351|DEBUG|OnDoc| +2025-06-18 13:12:34.8454|DEBUG|OnDoc| +2025-06-18 13:12:35.6956|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:12:35.7041|DEBUG|OnDoc| +2025-06-18 13:12:35.7279|DEBUG|OnDoc| +2025-06-18 13:12:35.7279|DEBUG|OnDoc| +2025-06-18 13:12:35.7338|DEBUG|OnDoc| +2025-06-18 13:12:35.7338|DEBUG|OnDoc| +2025-06-18 13:12:35.7338|DEBUG|OnDoc| +2025-06-18 13:12:36.4677|DEBUG|OnDoc| +2025-06-18 13:12:36.4677|DEBUG|OnDoc| +2025-06-18 13:12:39.5643|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 13:12:39.5999|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 13:12:39.7307|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 13:12:39.7404|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:12:39.7404|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:12:39.7553|ERROR|OnDoc|Das Objekt des Typs "System.Web.Http.Results.NegotiatedContentResult`1[System.String]" kann nicht in Typ "System.Net.Http.HttpResponseMessage" umgewandelt werden. +2025-06-18 13:14:23.0595|DEBUG|OnDoc| +2025-06-18 13:14:23.1181|DEBUG|OnDoc| +2025-06-18 13:14:24.5511|DEBUG|OnDoc| +2025-06-18 13:14:24.5511|DEBUG|OnDoc| +2025-06-18 13:14:26.0091|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:14:26.0192|DEBUG|OnDoc| +2025-06-18 13:14:26.0423|DEBUG|OnDoc| +2025-06-18 13:14:26.0448|DEBUG|OnDoc| +2025-06-18 13:14:26.0448|DEBUG|OnDoc| +2025-06-18 13:14:26.0448|DEBUG|OnDoc| +2025-06-18 13:14:26.0448|DEBUG|OnDoc| +2025-06-18 13:14:34.1950|DEBUG|OnDoc| +2025-06-18 13:14:34.2328|DEBUG|OnDoc| +2025-06-18 13:14:37.6357|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 13:14:37.6709|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 13:14:37.8008|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 13:14:37.8008|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:14:37.8160|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:14:37.8160|ERROR|OnDoc|Das Objekt des Typs "System.Web.Http.Results.NegotiatedContentResult`1[System.String]" kann nicht in Typ "System.Net.Http.HttpResponseMessage" umgewandelt werden. +2025-06-18 13:14:45.3834|DEBUG|OnDoc| +2025-06-18 13:14:45.4332|DEBUG|OnDoc| +2025-06-18 13:14:52.9685|DEBUG|OnDoc| +2025-06-18 13:14:52.9685|DEBUG|OnDoc| +2025-06-18 13:15:05.7822|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524785 +2025-06-18 13:15:06.8405|DEBUG|OnDoc| +2025-06-18 13:15:06.8713|DEBUG|OnDoc| +2025-06-18 13:15:08.5305|DEBUG|OnDoc| +2025-06-18 13:15:08.5305|DEBUG|OnDoc| +2025-06-18 13:15:09.5552|DEBUG|OnDoc| +2025-06-18 13:15:09.5718|DEBUG|OnDoc| +2025-06-18 13:15:22.8062|DEBUG|OnDoc| +2025-06-18 13:15:22.8439|DEBUG|OnDoc| +2025-06-18 13:15:32.4763|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 13:15:32.5116|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Fast +2025-06-18 13:15:32.5710|DEBUG|OnDoc|Ende Transfer to OnBase:"MNMCJP" +2025-06-18 13:15:40.5452|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524785 / 0/0 / "MNMCJP" +2025-06-18 13:15:41.9681|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524785 +2025-06-18 13:15:41.9833|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524785 +2025-06-18 13:15:45.5529|DEBUG|OnDoc| +2025-06-18 13:15:45.6218|DEBUG|OnDoc| +2025-06-18 13:15:45.6258|DEBUG|OnDoc| +2025-06-18 13:15:45.6258|DEBUG|OnDoc| +2025-06-18 13:15:45.6258|DEBUG|OnDoc| +2025-06-18 13:15:45.6538|ERROR|OnDoc|Ungültiger Objektname "edoka_journale.dbo.OnDoc_Wiederbearbietung". +2025-06-18 13:39:23.0505|DEBUG|OnDoc| +2025-06-18 13:39:23.1104|DEBUG|OnDoc| +2025-06-18 13:39:23.1607|DEBUG|OnDoc| +2025-06-18 13:39:23.1607|DEBUG|OnDoc| +2025-06-18 13:39:39.8207|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:39:39.8287|DEBUG|OnDoc| +2025-06-18 13:39:39.8582|DEBUG|OnDoc| +2025-06-18 13:39:39.8582|DEBUG|OnDoc| +2025-06-18 13:39:39.8582|DEBUG|OnDoc| +2025-06-18 13:39:39.8582|DEBUG|OnDoc| +2025-06-18 13:39:39.8582|DEBUG|OnDoc| +2025-06-18 13:39:41.2396|DEBUG|OnDoc| +2025-06-18 13:39:41.2762|DEBUG|OnDoc| +2025-06-18 13:39:42.6957|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 13:39:42.7053|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 13:39:42.8426|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 13:39:42.8426|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:39:42.8591|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:44:10.1346|DEBUG|OnDoc| +2025-06-18 13:44:10.1852|DEBUG|OnDoc| +2025-06-18 13:44:10.2333|DEBUG|OnDoc| +2025-06-18 13:44:10.2333|DEBUG|OnDoc| +2025-06-18 13:44:13.0866|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:44:13.0962|DEBUG|OnDoc| +2025-06-18 13:44:13.1346|DEBUG|OnDoc| +2025-06-18 13:44:13.1346|DEBUG|OnDoc| +2025-06-18 13:44:13.1391|DEBUG|OnDoc| +2025-06-18 13:44:13.1391|DEBUG|OnDoc| +2025-06-18 13:44:13.1391|DEBUG|OnDoc| +2025-06-18 13:44:17.1690|DEBUG|OnDoc| +2025-06-18 13:44:17.2063|DEBUG|OnDoc| +2025-06-18 13:44:18.4420|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 13:44:18.4521|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 13:44:18.5808|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 13:44:18.5808|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:44:18.5985|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:50:17.2902|DEBUG|OnDoc| +2025-06-18 13:50:17.3697|DEBUG|OnDoc| +2025-06-18 13:50:17.4388|DEBUG|OnDoc| +2025-06-18 13:50:17.4388|DEBUG|OnDoc| +2025-06-18 13:50:17.4733|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:50:17.4733|DEBUG|OnDoc| +2025-06-18 13:50:17.4987|DEBUG|OnDoc| +2025-06-18 13:50:17.4987|DEBUG|OnDoc| +2025-06-18 13:50:17.4987|DEBUG|OnDoc| +2025-06-18 13:50:17.4987|DEBUG|OnDoc| +2025-06-18 13:50:17.4987|DEBUG|OnDoc| +2025-06-18 13:50:21.4349|DEBUG|OnDoc| +2025-06-18 13:50:21.5118|DEBUG|OnDoc| +2025-06-18 13:50:45.2824|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 13:50:47.1031|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 13:51:35.5748|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 13:51:36.6157|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 13:51:36.6333|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 14:25:03.0467|DEBUG|OnDoc| +2025-06-18 14:25:03.1089|DEBUG|OnDoc| +2025-06-18 14:25:03.1631|DEBUG|OnDoc| +2025-06-18 14:25:03.1631|DEBUG|OnDoc| +2025-06-18 14:25:03.1917|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 +2025-06-18 14:25:03.1917|DEBUG|OnDoc| +2025-06-18 14:25:03.2238|DEBUG|OnDoc| +2025-06-18 14:25:03.2238|DEBUG|OnDoc| +2025-06-18 14:25:03.2238|DEBUG|OnDoc| +2025-06-18 14:25:03.2238|DEBUG|OnDoc| +2025-06-18 14:25:03.2338|DEBUG|OnDoc| +2025-06-18 14:25:06.6541|DEBUG|OnDoc| +2025-06-18 14:25:06.6541|DEBUG|OnDoc| +2025-06-18 14:25:14.4017|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 14:25:14.4106|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 14:25:28.3143|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 14:25:28.8243|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 14:25:28.8419|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 14:25:50.9060|DEBUG|OnDoc| +2025-06-18 14:25:50.9293|DEBUG|OnDoc| +2025-06-18 14:25:50.9603|DEBUG|OnDoc| +2025-06-18 14:25:50.9603|DEBUG|OnDoc| +2025-06-18 14:25:50.9804|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524785 +2025-06-18 14:25:50.9823|DEBUG|OnDoc| +2025-06-18 14:25:51.0026|DEBUG|OnDoc| +2025-06-18 14:25:51.0026|DEBUG|OnDoc| +2025-06-18 14:25:51.0026|DEBUG|OnDoc| +2025-06-18 14:25:51.0026|DEBUG|OnDoc| +2025-06-18 14:25:51.0026|DEBUG|OnDoc| +2025-06-18 14:26:00.7173|DEBUG|OnDoc| +2025-06-18 14:26:00.7550|DEBUG|OnDoc| +2025-06-18 14:26:13.6483|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 14:26:13.6844|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 14:26:19.0193|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524785 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 14:26:19.2431|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524785 +2025-06-18 14:26:19.2596|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524785 +2025-06-18 14:27:12.9734|DEBUG|OnDoc| +2025-06-18 14:27:13.0608|DEBUG|OnDoc| +2025-06-18 14:27:13.1116|DEBUG|OnDoc| +2025-06-18 14:27:13.1116|DEBUG|OnDoc| +2025-06-18 14:27:13.1446|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 +2025-06-18 14:27:13.1446|DEBUG|OnDoc| +2025-06-18 14:27:13.1737|DEBUG|OnDoc| +2025-06-18 14:27:13.1737|DEBUG|OnDoc| +2025-06-18 14:27:13.1737|DEBUG|OnDoc| +2025-06-18 14:27:13.1737|DEBUG|OnDoc| +2025-06-18 14:27:13.1737|DEBUG|OnDoc| +2025-06-18 14:27:18.1815|DEBUG|OnDoc| +2025-06-18 14:27:18.2209|DEBUG|OnDoc| +2025-06-18 14:27:24.0006|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 14:27:24.0353|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 14:27:34.6764|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 14:27:35.2486|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 14:27:35.2655|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 14:31:02.1381|DEBUG|OnDoc| +2025-06-18 14:31:02.1662|DEBUG|OnDoc| +2025-06-18 14:31:02.1959|DEBUG|OnDoc| +2025-06-18 14:31:02.1959|DEBUG|OnDoc| +2025-06-18 14:31:02.2169|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524785 +2025-06-18 14:31:02.2169|DEBUG|OnDoc| +2025-06-18 14:31:02.2451|DEBUG|OnDoc| +2025-06-18 14:31:02.2451|DEBUG|OnDoc| +2025-06-18 14:31:02.2482|DEBUG|OnDoc| +2025-06-18 14:31:02.2482|DEBUG|OnDoc| +2025-06-18 14:31:02.2482|DEBUG|OnDoc| +2025-06-18 14:31:02.2482|DEBUG|OnDoc| +2025-06-18 14:31:02.2482|DEBUG|OnDoc| +2025-06-18 14:31:02.3064|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 14:31:02.3064|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 14:31:02.3447|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524785 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 14:31:02.3447|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524785 +2025-06-18 14:31:02.3447|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524785 +2025-06-18 14:32:04.5871|DEBUG|OnDoc| +2025-06-18 14:32:04.6607|DEBUG|OnDoc| +2025-06-18 14:32:04.7143|DEBUG|OnDoc| +2025-06-18 14:32:04.7143|DEBUG|OnDoc| +2025-06-18 14:32:04.7425|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 +2025-06-18 14:32:04.7425|DEBUG|OnDoc| +2025-06-18 14:32:04.7705|DEBUG|OnDoc| +2025-06-18 14:32:04.7705|DEBUG|OnDoc| +2025-06-18 14:32:04.7705|DEBUG|OnDoc| +2025-06-18 14:32:04.7705|DEBUG|OnDoc| +2025-06-18 14:32:04.7705|DEBUG|OnDoc| +2025-06-18 14:32:04.7805|DEBUG|OnDoc| +2025-06-18 14:32:04.7805|DEBUG|OnDoc| +2025-06-18 14:32:06.0361|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 14:32:06.0451|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 14:32:06.1707|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524777 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 14:32:06.1707|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 14:32:06.1867|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524777 +2025-06-18 14:33:01.1565|DEBUG|OnDoc| +2025-06-18 14:33:01.2108|DEBUG|OnDoc| +2025-06-18 14:33:01.2422|DEBUG|OnDoc| +2025-06-18 14:33:01.2422|DEBUG|OnDoc| +2025-06-18 14:33:01.2642|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524785 +2025-06-18 14:33:01.2642|DEBUG|OnDoc| +2025-06-18 14:33:01.2893|DEBUG|OnDoc| +2025-06-18 14:33:01.2893|DEBUG|OnDoc| +2025-06-18 14:33:01.2893|DEBUG|OnDoc| +2025-06-18 14:33:01.2893|DEBUG|OnDoc| +2025-06-18 14:33:01.2974|DEBUG|OnDoc| +2025-06-18 14:33:01.2974|DEBUG|OnDoc| +2025-06-18 14:33:01.2974|DEBUG|OnDoc| +2025-06-18 14:33:01.3509|DEBUG|OnDoc|Start Transfer to OnBase +2025-06-18 14:33:01.3509|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-06-18 14:33:01.3897|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002524785 / 1/1 / Der Remoteserver hat einen Fehler zurückgegeben: (404) Nicht gefunden. +2025-06-18 14:33:01.3897|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002524785 +2025-06-18 14:33:01.3897|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002524785 diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 02a91c51..e54f622d 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 1bcc5967..69bd5bb0 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 8085b9de..d4de652b 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll index 00742519..42ad5946 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb index 7ddfd298..908f9825 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.dll index 7280b31e..6520e565 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.pdb index 18e13af0..30570d28 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Database.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.dll index 709316af..bf71e439 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.pdb index 47969700..3536bbbd 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll index 7237ca85..66950f8a 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.pdb index cbc634ef..75fc8df4 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll index 2d89bd3b..69bd5bb0 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb index c5f2fb6c..d4de652b 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb differ diff --git a/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll index ca7f2ad0..6520e565 100644 Binary files a/BarcodeLib/bin/Debug/Database.dll and b/BarcodeLib/bin/Debug/Database.dll differ diff --git a/BarcodeLib/bin/Debug/Database.pdb b/BarcodeLib/bin/Debug/Database.pdb index 966f2720..30570d28 100644 Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index a26677f0..5292ce7d 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/BarcodeLibVBDatamatrix/bin/Debug/Model.dll b/BarcodeLibVBDatamatrix/bin/Debug/Model.dll index 709316af..bf71e439 100644 Binary files a/BarcodeLibVBDatamatrix/bin/Debug/Model.dll and b/BarcodeLibVBDatamatrix/bin/Debug/Model.dll differ diff --git a/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb b/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb index 47969700..3536bbbd 100644 Binary files a/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb and b/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache index bfc178a5..cd3c6341 100644 Binary files a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache and b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache differ diff --git a/Client/Diverses/FrmExternalDocEdit.Designer.cs b/Client/Diverses/FrmExternalDocEdit.Designer.cs index 5c8cf647..1c00e361 100644 --- a/Client/Diverses/FrmExternalDocEdit.Designer.cs +++ b/Client/Diverses/FrmExternalDocEdit.Designer.cs @@ -117,7 +117,7 @@ // this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); this.sfButton1.Location = new System.Drawing.Point(6, 110); - this.sfButton1.Name = "sfButton1"; + this.sfButton1.Name = "sn3fButton1"; this.sfButton1.Size = new System.Drawing.Size(162, 28); this.sfButton1.TabIndex = 7; this.sfButton1.Text = "Neues Dokument erstellen"; diff --git a/Client/Diverses/MitarbeiterProfil.Designer.cs b/Client/Diverses/MitarbeiterProfil.Designer.cs index 861807c5..829219cb 100644 --- a/Client/Diverses/MitarbeiterProfil.Designer.cs +++ b/Client/Diverses/MitarbeiterProfil.Designer.cs @@ -58,6 +58,7 @@ this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.GrpBoxMitarbeiter = new System.Windows.Forms.GroupBox(); + this.button3 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); this.chkOndocMails = new System.Windows.Forms.CheckBox(); this.button1 = new System.Windows.Forms.Button(); @@ -149,6 +150,7 @@ this.ribbon1.CausesValidation = false; this.ribbon1.Font = new System.Drawing.Font("Segoe UI", 9F); this.ribbon1.Location = new System.Drawing.Point(2, 2); + this.ribbon1.Margin = new System.Windows.Forms.Padding(4); this.ribbon1.Minimized = false; this.ribbon1.Name = "ribbon1"; // @@ -162,7 +164,7 @@ this.ribbon1.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013; this.ribbon1.OrbVisible = false; this.ribbon1.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F); - this.ribbon1.Size = new System.Drawing.Size(859, 121); + this.ribbon1.Size = new System.Drawing.Size(1070, 149); this.ribbon1.TabIndex = 0; this.ribbon1.Tabs.Add(this.ribbonTab1); this.ribbon1.Tabs.Add(this.ribbonTab2); @@ -264,9 +266,11 @@ // GrpBoxProfile // this.GrpBoxProfile.Controls.Add(this.lbprofile); - this.GrpBoxProfile.Location = new System.Drawing.Point(5, 194); + this.GrpBoxProfile.Location = new System.Drawing.Point(7, 239); + this.GrpBoxProfile.Margin = new System.Windows.Forms.Padding(4); this.GrpBoxProfile.Name = "GrpBoxProfile"; - this.GrpBoxProfile.Size = new System.Drawing.Size(231, 366); + this.GrpBoxProfile.Padding = new System.Windows.Forms.Padding(4); + this.GrpBoxProfile.Size = new System.Drawing.Size(308, 450); this.GrpBoxProfile.TabIndex = 1; this.GrpBoxProfile.TabStop = false; this.GrpBoxProfile.Text = "Profile"; @@ -275,9 +279,11 @@ // this.lbprofile.Dock = System.Windows.Forms.DockStyle.Fill; this.lbprofile.FormattingEnabled = true; - this.lbprofile.Location = new System.Drawing.Point(3, 16); + this.lbprofile.ItemHeight = 16; + this.lbprofile.Location = new System.Drawing.Point(4, 19); + this.lbprofile.Margin = new System.Windows.Forms.Padding(4); this.lbprofile.Name = "lbprofile"; - this.lbprofile.Size = new System.Drawing.Size(225, 347); + this.lbprofile.Size = new System.Drawing.Size(300, 427); this.lbprofile.TabIndex = 0; this.lbprofile.SelectedValueChanged += new System.EventHandler(this.lbprofile_SelectedValueChanged); // @@ -293,9 +299,11 @@ this.GrpBoxDetails.Controls.Add(this.label3); this.GrpBoxDetails.Controls.Add(this.label2); this.GrpBoxDetails.Controls.Add(this.label1); - this.GrpBoxDetails.Location = new System.Drawing.Point(297, 173); + this.GrpBoxDetails.Location = new System.Drawing.Point(396, 213); + this.GrpBoxDetails.Margin = new System.Windows.Forms.Padding(4); this.GrpBoxDetails.Name = "GrpBoxDetails"; - this.GrpBoxDetails.Size = new System.Drawing.Size(565, 366); + this.GrpBoxDetails.Padding = new System.Windows.Forms.Padding(4); + this.GrpBoxDetails.Size = new System.Drawing.Size(753, 450); this.GrpBoxDetails.TabIndex = 2; this.GrpBoxDetails.TabStop = false; this.GrpBoxDetails.Text = "Details"; @@ -303,34 +311,38 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(25, 28); + this.label5.Location = new System.Drawing.Point(33, 34); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(69, 13); + this.label5.Size = new System.Drawing.Size(84, 16); this.label5.TabIndex = 10; this.label5.Text = "Bezeichnung"; // // txtbezeichnung // - this.txtbezeichnung.Location = new System.Drawing.Point(137, 21); + this.txtbezeichnung.Location = new System.Drawing.Point(183, 26); + this.txtbezeichnung.Margin = new System.Windows.Forms.Padding(4); this.txtbezeichnung.Name = "txtbezeichnung"; - this.txtbezeichnung.Size = new System.Drawing.Size(244, 20); + this.txtbezeichnung.Size = new System.Drawing.Size(324, 22); this.txtbezeichnung.TabIndex = 9; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(25, 124); + this.label4.Location = new System.Drawing.Point(33, 153); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(50, 13); + this.label4.Size = new System.Drawing.Size(62, 16); this.label4.TabIndex = 8; this.label4.Text = "Standard"; // // cbStandard // this.cbStandard.AutoSize = true; - this.cbStandard.Location = new System.Drawing.Point(137, 123); + this.cbStandard.Location = new System.Drawing.Point(183, 151); + this.cbStandard.Margin = new System.Windows.Forms.Padding(4); this.cbStandard.Name = "cbStandard"; - this.cbStandard.Size = new System.Drawing.Size(15, 14); + this.cbStandard.Size = new System.Drawing.Size(18, 17); this.cbStandard.TabIndex = 7; this.cbStandard.UseVisualStyleBackColor = true; // @@ -338,9 +350,11 @@ // this.cbboxTeam.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cbboxTeam.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxTeam.Location = new System.Drawing.Point(137, 97); + this.cbboxTeam.Location = new System.Drawing.Point(183, 119); + this.cbboxTeam.Margin = new System.Windows.Forms.Padding(4); this.cbboxTeam.Name = "cbboxTeam"; - this.cbboxTeam.Size = new System.Drawing.Size(244, 19); + this.cbboxTeam.Padding = new System.Windows.Forms.Padding(9, 0, 0, 0); + this.cbboxTeam.Size = new System.Drawing.Size(325, 23); this.cbboxTeam.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cbboxTeam.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.cbboxTeam.TabIndex = 5; @@ -350,9 +364,11 @@ // this.cbboxUnterschriftRechts.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cbboxUnterschriftRechts.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxUnterschriftRechts.Location = new System.Drawing.Point(137, 72); + this.cbboxUnterschriftRechts.Location = new System.Drawing.Point(183, 89); + this.cbboxUnterschriftRechts.Margin = new System.Windows.Forms.Padding(4); this.cbboxUnterschriftRechts.Name = "cbboxUnterschriftRechts"; - this.cbboxUnterschriftRechts.Size = new System.Drawing.Size(244, 19); + this.cbboxUnterschriftRechts.Padding = new System.Windows.Forms.Padding(9, 0, 0, 0); + this.cbboxUnterschriftRechts.Size = new System.Drawing.Size(325, 23); this.cbboxUnterschriftRechts.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cbboxUnterschriftRechts.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.cbboxUnterschriftRechts.TabIndex = 4; @@ -362,9 +378,11 @@ // this.cbboxUnterschriftLinks.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cbboxUnterschriftLinks.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxUnterschriftLinks.Location = new System.Drawing.Point(137, 47); + this.cbboxUnterschriftLinks.Location = new System.Drawing.Point(183, 58); + this.cbboxUnterschriftLinks.Margin = new System.Windows.Forms.Padding(4); this.cbboxUnterschriftLinks.Name = "cbboxUnterschriftLinks"; - this.cbboxUnterschriftLinks.Size = new System.Drawing.Size(244, 19); + this.cbboxUnterschriftLinks.Padding = new System.Windows.Forms.Padding(9, 0, 0, 0); + this.cbboxUnterschriftLinks.Size = new System.Drawing.Size(325, 23); this.cbboxUnterschriftLinks.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cbboxUnterschriftLinks.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.cbboxUnterschriftLinks.TabIndex = 3; @@ -373,32 +391,36 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(25, 97); + this.label3.Location = new System.Drawing.Point(33, 119); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(34, 13); + this.label3.Size = new System.Drawing.Size(43, 16); this.label3.TabIndex = 2; this.label3.Text = "Team"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(25, 72); + this.label2.Location = new System.Drawing.Point(33, 89); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(93, 13); + this.label2.Size = new System.Drawing.Size(112, 16); this.label2.TabIndex = 1; this.label2.Text = "Unterschrift rechts"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(25, 54); + this.label1.Location = new System.Drawing.Point(33, 66); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(85, 13); + this.label1.Size = new System.Drawing.Size(103, 16); this.label1.TabIndex = 0; this.label1.Text = "Unterschrift links"; // // GrpBoxMitarbeiter // + this.GrpBoxMitarbeiter.Controls.Add(this.button3); this.GrpBoxMitarbeiter.Controls.Add(this.button2); this.GrpBoxMitarbeiter.Controls.Add(this.chkOndocMails); this.GrpBoxMitarbeiter.Controls.Add(this.button1); @@ -420,17 +442,31 @@ this.GrpBoxMitarbeiter.Controls.Add(this.lblVorname); this.GrpBoxMitarbeiter.Controls.Add(this.txtName); this.GrpBoxMitarbeiter.Controls.Add(this.lblName); - this.GrpBoxMitarbeiter.Location = new System.Drawing.Point(8, 129); + this.GrpBoxMitarbeiter.Location = new System.Drawing.Point(11, 159); + this.GrpBoxMitarbeiter.Margin = new System.Windows.Forms.Padding(4); this.GrpBoxMitarbeiter.Name = "GrpBoxMitarbeiter"; - this.GrpBoxMitarbeiter.Size = new System.Drawing.Size(793, 340); + this.GrpBoxMitarbeiter.Padding = new System.Windows.Forms.Padding(4); + this.GrpBoxMitarbeiter.Size = new System.Drawing.Size(1057, 418); this.GrpBoxMitarbeiter.TabIndex = 3; this.GrpBoxMitarbeiter.TabStop = false; // + // button3 + // + this.button3.Location = new System.Drawing.Point(780, 255); + this.button3.Margin = new System.Windows.Forms.Padding(4); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(196, 28); + this.button3.TabIndex = 23; + this.button3.Text = "Bild aktualisieren"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click_1); + // // button2 // - this.button2.Location = new System.Drawing.Point(386, 208); + this.button2.Location = new System.Drawing.Point(515, 256); + this.button2.Margin = new System.Windows.Forms.Padding(4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(147, 23); + this.button2.Size = new System.Drawing.Size(196, 28); this.button2.TabIndex = 22; this.button2.Text = "Unterschrift erfassen"; this.button2.UseVisualStyleBackColor = true; @@ -439,18 +475,20 @@ // chkOndocMails // this.chkOndocMails.AutoSize = true; - this.chkOndocMails.Location = new System.Drawing.Point(29, 257); + this.chkOndocMails.Location = new System.Drawing.Point(39, 316); + this.chkOndocMails.Margin = new System.Windows.Forms.Padding(4); this.chkOndocMails.Name = "chkOndocMails"; - this.chkOndocMails.Size = new System.Drawing.Size(128, 17); + this.chkOndocMails.Size = new System.Drawing.Size(158, 20); this.chkOndocMails.TabIndex = 19; this.chkOndocMails.Text = "OnDoc-Mails erhalten"; this.chkOndocMails.UseVisualStyleBackColor = true; // // button1 // - this.button1.Location = new System.Drawing.Point(628, 208); + this.button1.Location = new System.Drawing.Point(837, 256); + this.button1.Margin = new System.Windows.Forms.Padding(4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(104, 23); + this.button1.Size = new System.Drawing.Size(139, 28); this.button1.TabIndex = 18; this.button1.Text = "Bild löschen"; this.button1.UseVisualStyleBackColor = true; @@ -458,9 +496,10 @@ // // btnLoadImage // - this.btnLoadImage.Location = new System.Drawing.Point(386, 208); + this.btnLoadImage.Location = new System.Drawing.Point(515, 256); + this.btnLoadImage.Margin = new System.Windows.Forms.Padding(4); this.btnLoadImage.Name = "btnLoadImage"; - this.btnLoadImage.Size = new System.Drawing.Size(104, 23); + this.btnLoadImage.Size = new System.Drawing.Size(139, 28); this.btnLoadImage.TabIndex = 17; this.btnLoadImage.Text = "Bild importieren"; this.btnLoadImage.UseVisualStyleBackColor = true; @@ -469,18 +508,20 @@ // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(306, 71); + this.label12.Location = new System.Drawing.Point(408, 87); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(61, 13); + this.label12.Size = new System.Drawing.Size(73, 16); this.label12.TabIndex = 16; this.label12.Text = "Unterschrift"; // // pictureBox1 // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox1.Location = new System.Drawing.Point(386, 62); + this.pictureBox1.Location = new System.Drawing.Point(515, 76); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(4); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(346, 140); + this.pictureBox1.Size = new System.Drawing.Size(461, 172); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 15; this.pictureBox1.TabStop = false; @@ -490,121 +531,136 @@ // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(307, 58); + this.label11.Location = new System.Drawing.Point(409, 71); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(50, 13); + this.label11.Size = new System.Drawing.Size(65, 16); this.label11.TabIndex = 14; this.label11.Text = "Faksimile"; // // txtfunktion // - this.txtfunktion.Location = new System.Drawing.Point(96, 204); + this.txtfunktion.Location = new System.Drawing.Point(128, 251); + this.txtfunktion.Margin = new System.Windows.Forms.Padding(4); this.txtfunktion.Name = "txtfunktion"; - this.txtfunktion.Size = new System.Drawing.Size(147, 20); + this.txtfunktion.Size = new System.Drawing.Size(195, 22); this.txtfunktion.TabIndex = 13; // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(26, 207); + this.label10.Location = new System.Drawing.Point(35, 255); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(48, 13); + this.label10.Size = new System.Drawing.Size(57, 16); this.label10.TabIndex = 12; this.label10.Text = "Funktion"; // // txtunterschrift // - this.txtunterschrift.Location = new System.Drawing.Point(386, 25); + this.txtunterschrift.Location = new System.Drawing.Point(515, 31); + this.txtunterschrift.Margin = new System.Windows.Forms.Padding(4); this.txtunterschrift.Name = "txtunterschrift"; - this.txtunterschrift.Size = new System.Drawing.Size(147, 20); + this.txtunterschrift.Size = new System.Drawing.Size(195, 22); this.txtunterschrift.TabIndex = 11; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(307, 28); + this.label9.Location = new System.Drawing.Point(409, 34); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(61, 13); + this.label9.Size = new System.Drawing.Size(73, 16); this.label9.TabIndex = 10; this.label9.Text = "Unterschrift"; // // txtfax // - this.txtfax.Location = new System.Drawing.Point(96, 151); + this.txtfax.Location = new System.Drawing.Point(128, 186); + this.txtfax.Margin = new System.Windows.Forms.Padding(4); this.txtfax.Name = "txtfax"; - this.txtfax.Size = new System.Drawing.Size(147, 20); + this.txtfax.Size = new System.Drawing.Size(195, 22); this.txtfax.TabIndex = 9; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(26, 154); + this.label8.Location = new System.Drawing.Point(35, 190); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(24, 13); + this.label8.Size = new System.Drawing.Size(29, 16); this.label8.TabIndex = 8; this.label8.Text = "Fax"; // // txttelefon // - this.txttelefon.Location = new System.Drawing.Point(96, 125); + this.txttelefon.Location = new System.Drawing.Point(128, 154); + this.txttelefon.Margin = new System.Windows.Forms.Padding(4); this.txttelefon.Name = "txttelefon"; - this.txttelefon.Size = new System.Drawing.Size(147, 20); + this.txttelefon.Size = new System.Drawing.Size(195, 22); this.txttelefon.TabIndex = 7; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(26, 128); + this.label7.Location = new System.Drawing.Point(35, 158); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(43, 13); + this.label7.Size = new System.Drawing.Size(53, 16); this.label7.TabIndex = 6; this.label7.Text = "Telefon"; // // txtmail // - this.txtmail.Location = new System.Drawing.Point(96, 99); + this.txtmail.Location = new System.Drawing.Point(128, 122); + this.txtmail.Margin = new System.Windows.Forms.Padding(4); this.txtmail.Name = "txtmail"; - this.txtmail.Size = new System.Drawing.Size(147, 20); + this.txtmail.Size = new System.Drawing.Size(195, 22); this.txtmail.TabIndex = 5; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(26, 102); + this.label6.Location = new System.Drawing.Point(35, 126); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(26, 13); + this.label6.Size = new System.Drawing.Size(32, 16); this.label6.TabIndex = 4; this.label6.Text = "Mail"; // // txtVorname // - this.txtVorname.Location = new System.Drawing.Point(96, 48); + this.txtVorname.Location = new System.Drawing.Point(128, 59); + this.txtVorname.Margin = new System.Windows.Forms.Padding(4); this.txtVorname.Name = "txtVorname"; - this.txtVorname.Size = new System.Drawing.Size(147, 20); + this.txtVorname.Size = new System.Drawing.Size(195, 22); this.txtVorname.TabIndex = 3; // // lblVorname // this.lblVorname.AutoSize = true; - this.lblVorname.Location = new System.Drawing.Point(26, 51); + this.lblVorname.Location = new System.Drawing.Point(35, 63); + this.lblVorname.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblVorname.Name = "lblVorname"; - this.lblVorname.Size = new System.Drawing.Size(49, 13); + this.lblVorname.Size = new System.Drawing.Size(62, 16); this.lblVorname.TabIndex = 2; this.lblVorname.Text = "Vorname"; // // txtName // - this.txtName.Location = new System.Drawing.Point(96, 22); + this.txtName.Location = new System.Drawing.Point(128, 27); + this.txtName.Margin = new System.Windows.Forms.Padding(4); this.txtName.Name = "txtName"; - this.txtName.Size = new System.Drawing.Size(147, 20); + this.txtName.Size = new System.Drawing.Size(195, 22); this.txtName.TabIndex = 1; // // lblName // this.lblName.AutoSize = true; - this.lblName.Location = new System.Drawing.Point(26, 25); + this.lblName.Location = new System.Drawing.Point(35, 31); + this.lblName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblName.Name = "lblName"; - this.lblName.Size = new System.Drawing.Size(35, 13); + this.lblName.Size = new System.Drawing.Size(44, 16); this.lblName.TabIndex = 0; this.lblName.Text = "Name"; // @@ -622,9 +678,11 @@ this.GrpGetSignature.Controls.Add(this.btnDeleteImage); this.GrpGetSignature.Controls.Add(this.btnSaveSignature); this.GrpGetSignature.Controls.Add(this.sign1); - this.GrpGetSignature.Location = new System.Drawing.Point(104, 85); + this.GrpGetSignature.Location = new System.Drawing.Point(128, 97); + this.GrpGetSignature.Margin = new System.Windows.Forms.Padding(4); this.GrpGetSignature.Name = "GrpGetSignature"; - this.GrpGetSignature.Size = new System.Drawing.Size(644, 394); + this.GrpGetSignature.Padding = new System.Windows.Forms.Padding(4); + this.GrpGetSignature.Size = new System.Drawing.Size(859, 485); this.GrpGetSignature.TabIndex = 21; this.GrpGetSignature.TabStop = false; this.GrpGetSignature.Text = "Unterschrift erfassen"; @@ -634,17 +692,19 @@ // this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label18.Location = new System.Drawing.Point(11, 60); + this.label18.Location = new System.Drawing.Point(15, 74); + this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(130, 17); + this.label18.Size = new System.Drawing.Size(152, 20); this.label18.TabIndex = 30; this.label18.Text = "Starten links unten."; // // btnSaveForUser // - this.btnSaveForUser.Location = new System.Drawing.Point(462, 40); + this.btnSaveForUser.Location = new System.Drawing.Point(616, 49); + this.btnSaveForUser.Margin = new System.Windows.Forms.Padding(4); this.btnSaveForUser.Name = "btnSaveForUser"; - this.btnSaveForUser.Size = new System.Drawing.Size(176, 23); + this.btnSaveForUser.Size = new System.Drawing.Size(235, 28); this.btnSaveForUser.TabIndex = 29; this.btnSaveForUser.Text = "Unterschrift für andere Benutzer"; this.btnSaveForUser.UseVisualStyleBackColor = true; @@ -654,9 +714,10 @@ // this.label17.AutoSize = true; this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label17.Location = new System.Drawing.Point(11, 103); + this.label17.Location = new System.Drawing.Point(15, 127); + this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(361, 17); + this.label17.Size = new System.Drawing.Size(423, 20); this.label17.TabIndex = 28; this.label17.Text = "Handlungsbevollmächtige den Zusatz \"i.V.\" voransetzen"; // @@ -664,9 +725,10 @@ // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(11, 85); + this.label16.Location = new System.Drawing.Point(15, 105); + this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(315, 17); + this.label16.Size = new System.Drawing.Size(370, 20); this.label16.TabIndex = 27; this.label16.Text = "Prokuristen der Unterschrift den Zusatz \"pp\" und"; // @@ -675,9 +737,10 @@ this.label15.AutoSize = true; this.label15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(615, 7); + this.label15.Location = new System.Drawing.Point(820, 9); + this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(23, 22); + this.label15.Size = new System.Drawing.Size(29, 27); this.label15.TabIndex = 26; this.label15.Text = "X"; this.label15.Click += new System.EventHandler(this.label15_Click); @@ -686,9 +749,10 @@ // this.label14.AutoSize = true; this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(11, 43); + this.label14.Location = new System.Drawing.Point(15, 53); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(400, 17); + this.label14.Size = new System.Drawing.Size(475, 20); this.label14.TabIndex = 25; this.label14.Text = "Bitte möglichst den gesamten Platz des Eingabefeldes nutzen."; // @@ -696,17 +760,19 @@ // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label13.Location = new System.Drawing.Point(11, 26); + this.label13.Location = new System.Drawing.Point(15, 32); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(198, 17); + this.label13.Size = new System.Drawing.Size(239, 20); this.label13.TabIndex = 24; this.label13.Text = "Unterschrift mit Stift erfassen. "; // // GetSignatureAbort // - this.GetSignatureAbort.Location = new System.Drawing.Point(524, 55); + this.GetSignatureAbort.Location = new System.Drawing.Point(699, 68); + this.GetSignatureAbort.Margin = new System.Windows.Forms.Padding(4); this.GetSignatureAbort.Name = "GetSignatureAbort"; - this.GetSignatureAbort.Size = new System.Drawing.Size(103, 23); + this.GetSignatureAbort.Size = new System.Drawing.Size(137, 28); this.GetSignatureAbort.TabIndex = 23; this.GetSignatureAbort.Text = "Abbrechen"; this.GetSignatureAbort.UseVisualStyleBackColor = true; @@ -715,9 +781,10 @@ // // btnDeleteImage // - this.btnDeleteImage.Location = new System.Drawing.Point(11, 365); + this.btnDeleteImage.Location = new System.Drawing.Point(15, 449); + this.btnDeleteImage.Margin = new System.Windows.Forms.Padding(4); this.btnDeleteImage.Name = "btnDeleteImage"; - this.btnDeleteImage.Size = new System.Drawing.Size(103, 23); + this.btnDeleteImage.Size = new System.Drawing.Size(137, 28); this.btnDeleteImage.TabIndex = 22; this.btnDeleteImage.Text = "Bild löschen"; this.btnDeleteImage.UseVisualStyleBackColor = true; @@ -725,9 +792,10 @@ // // btnSaveSignature // - this.btnSaveSignature.Location = new System.Drawing.Point(498, 365); + this.btnSaveSignature.Location = new System.Drawing.Point(664, 449); + this.btnSaveSignature.Margin = new System.Windows.Forms.Padding(4); this.btnSaveSignature.Name = "btnSaveSignature"; - this.btnSaveSignature.Size = new System.Drawing.Size(129, 23); + this.btnSaveSignature.Size = new System.Drawing.Size(172, 28); this.btnSaveSignature.TabIndex = 21; this.btnSaveSignature.Text = "Unterschrift speichern"; this.btnSaveSignature.UseVisualStyleBackColor = true; @@ -739,12 +807,13 @@ this.sign1.BackgroundImageBitmap = null; this.sign1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.sign1.FileFormat = System.Drawing.Imaging.ImageFormat.Bmp; - this.sign1.Location = new System.Drawing.Point(11, 126); + this.sign1.Location = new System.Drawing.Point(15, 155); + this.sign1.Margin = new System.Windows.Forms.Padding(5); this.sign1.Name = "sign1"; this.sign1.PenColor = System.Drawing.Color.Black; this.sign1.PenWidth = 4; this.sign1.RequiredPoints = 20; - this.sign1.Size = new System.Drawing.Size(616, 228); + this.sign1.Size = new System.Drawing.Size(821, 280); this.sign1.TabIndex = 20; // // GrpGAS @@ -761,9 +830,11 @@ this.GrpGAS.Controls.Add(this.TreeViewADVPersadresse); this.GrpGAS.Controls.Add(this.label19); this.GrpGAS.Controls.Add(this.treeViewAdvAdresse); - this.GrpGAS.Location = new System.Drawing.Point(8, 48); + this.GrpGAS.Location = new System.Drawing.Point(7, 37); + this.GrpGAS.Margin = new System.Windows.Forms.Padding(4); this.GrpGAS.Name = "GrpGAS"; - this.GrpGAS.Size = new System.Drawing.Size(705, 509); + this.GrpGAS.Padding = new System.Windows.Forms.Padding(4); + this.GrpGAS.Size = new System.Drawing.Size(940, 626); this.GrpGAS.TabIndex = 22; this.GrpGAS.TabStop = false; this.GrpGAS.Text = "Rückantwort-Adressen"; @@ -790,33 +861,37 @@ this.panelpersadresse.Controls.Add(this.label22); this.panelpersadresse.Controls.Add(this.textBox1); this.panelpersadresse.Controls.Add(this.label21); - this.panelpersadresse.Location = new System.Drawing.Point(144, 29); + this.panelpersadresse.Location = new System.Drawing.Point(192, 36); + this.panelpersadresse.Margin = new System.Windows.Forms.Padding(4); this.panelpersadresse.Name = "panelpersadresse"; - this.panelpersadresse.Size = new System.Drawing.Size(352, 254); + this.panelpersadresse.Size = new System.Drawing.Size(469, 313); this.panelpersadresse.TabIndex = 9; this.panelpersadresse.Visible = false; // // textBox8 // - this.textBox8.Location = new System.Drawing.Point(97, 13); + this.textBox8.Location = new System.Drawing.Point(129, 16); + this.textBox8.Margin = new System.Windows.Forms.Padding(4); this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(237, 20); + this.textBox8.Size = new System.Drawing.Size(315, 22); this.textBox8.TabIndex = 0; // // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(22, 13); + this.label28.Location = new System.Drawing.Point(29, 16); + this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(69, 13); + this.label28.Size = new System.Drawing.Size(84, 16); this.label28.TabIndex = 16; this.label28.Text = "Bezeichnung"; // // btnCancelPersAddr // - this.btnCancelPersAddr.Location = new System.Drawing.Point(15, 220); + this.btnCancelPersAddr.Location = new System.Drawing.Point(20, 271); + this.btnCancelPersAddr.Margin = new System.Windows.Forms.Padding(4); this.btnCancelPersAddr.Name = "btnCancelPersAddr"; - this.btnCancelPersAddr.Size = new System.Drawing.Size(75, 23); + this.btnCancelPersAddr.Size = new System.Drawing.Size(100, 28); this.btnCancelPersAddr.TabIndex = 7; this.btnCancelPersAddr.Text = "Abbrechen"; this.btnCancelPersAddr.UseVisualStyleBackColor = true; @@ -824,9 +899,10 @@ // // btnSavePersAddr // - this.btnSavePersAddr.Location = new System.Drawing.Point(259, 220); + this.btnSavePersAddr.Location = new System.Drawing.Point(345, 271); + this.btnSavePersAddr.Margin = new System.Windows.Forms.Padding(4); this.btnSavePersAddr.Name = "btnSavePersAddr"; - this.btnSavePersAddr.Size = new System.Drawing.Size(75, 23); + this.btnSavePersAddr.Size = new System.Drawing.Size(100, 28); this.btnSavePersAddr.TabIndex = 8; this.btnSavePersAddr.Text = "Speichern "; this.btnSavePersAddr.UseVisualStyleBackColor = true; @@ -834,110 +910,123 @@ // // textBox7 // - this.textBox7.Location = new System.Drawing.Point(97, 185); + this.textBox7.Location = new System.Drawing.Point(129, 228); + this.textBox7.Margin = new System.Windows.Forms.Padding(4); this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(237, 20); + this.textBox7.Size = new System.Drawing.Size(315, 22); this.textBox7.TabIndex = 6; this.textBox7.Visible = false; // // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(22, 185); + this.label27.Location = new System.Drawing.Point(29, 228); + this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(39, 13); + this.label27.Size = new System.Drawing.Size(47, 16); this.label27.TabIndex = 12; this.label27.Text = "Zeile 7"; this.label27.Visible = false; // // textBox6 // - this.textBox6.Location = new System.Drawing.Point(97, 162); + this.textBox6.Location = new System.Drawing.Point(129, 199); + this.textBox6.Margin = new System.Windows.Forms.Padding(4); this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(237, 20); + this.textBox6.Size = new System.Drawing.Size(315, 22); this.textBox6.TabIndex = 5; this.textBox6.Visible = false; // // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(22, 162); + this.label26.Location = new System.Drawing.Point(29, 199); + this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(39, 13); + this.label26.Size = new System.Drawing.Size(47, 16); this.label26.TabIndex = 10; this.label26.Text = "Zeile 6"; this.label26.Visible = false; // // textBox5 // - this.textBox5.Location = new System.Drawing.Point(97, 139); + this.textBox5.Location = new System.Drawing.Point(129, 171); + this.textBox5.Margin = new System.Windows.Forms.Padding(4); this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(237, 20); + this.textBox5.Size = new System.Drawing.Size(315, 22); this.textBox5.TabIndex = 4; // // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(22, 139); + this.label25.Location = new System.Drawing.Point(29, 171); + this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(39, 13); + this.label25.Size = new System.Drawing.Size(47, 16); this.label25.TabIndex = 8; this.label25.Text = "Zeile 5"; // // textBox4 // - this.textBox4.Location = new System.Drawing.Point(97, 116); + this.textBox4.Location = new System.Drawing.Point(129, 143); + this.textBox4.Margin = new System.Windows.Forms.Padding(4); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(237, 20); + this.textBox4.Size = new System.Drawing.Size(315, 22); this.textBox4.TabIndex = 3; // // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(22, 116); + this.label24.Location = new System.Drawing.Point(29, 143); + this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(39, 13); + this.label24.Size = new System.Drawing.Size(47, 16); this.label24.TabIndex = 6; this.label24.Text = "Zeile 4"; // // textBox3 // - this.textBox3.Location = new System.Drawing.Point(97, 93); + this.textBox3.Location = new System.Drawing.Point(129, 114); + this.textBox3.Margin = new System.Windows.Forms.Padding(4); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(237, 20); + this.textBox3.Size = new System.Drawing.Size(315, 22); this.textBox3.TabIndex = 2; // // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(22, 93); + this.label23.Location = new System.Drawing.Point(29, 114); + this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(39, 13); + this.label23.Size = new System.Drawing.Size(47, 16); this.label23.TabIndex = 4; this.label23.Text = "Zeile 3"; // // textBox2 // - this.textBox2.Location = new System.Drawing.Point(97, 71); + this.textBox2.Location = new System.Drawing.Point(129, 87); + this.textBox2.Margin = new System.Windows.Forms.Padding(4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(237, 20); + this.textBox2.Size = new System.Drawing.Size(315, 22); this.textBox2.TabIndex = 1; // // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(22, 71); + this.label22.Location = new System.Drawing.Point(29, 87); + this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(39, 13); + this.label22.Size = new System.Drawing.Size(47, 16); this.label22.TabIndex = 2; this.label22.Text = "Zeile 2"; // // textBox1 // - this.textBox1.Location = new System.Drawing.Point(97, 48); + this.textBox1.Location = new System.Drawing.Point(129, 59); + this.textBox1.Margin = new System.Windows.Forms.Padding(4); this.textBox1.Name = "textBox1"; this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(237, 20); + this.textBox1.Size = new System.Drawing.Size(315, 22); this.textBox1.TabIndex = 1; this.textBox1.TabStop = false; this.textBox1.Text = "Thurgauer Kantonalbank"; @@ -945,27 +1034,30 @@ // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(22, 48); + this.label21.Location = new System.Drawing.Point(29, 59); + this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(39, 13); + this.label21.Size = new System.Drawing.Size(47, 16); this.label21.TabIndex = 0; this.label21.Text = "Zeile 1"; // // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(298, 186); + this.label30.Location = new System.Drawing.Point(397, 229); + this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(153, 13); + this.label30.Size = new System.Drawing.Size(194, 16); this.label30.TabIndex = 15; this.label30.Text = "- Mit Speichersymbol speichern"; // // label31 // this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(298, 172); + this.label31.Location = new System.Drawing.Point(397, 212); + this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(225, 13); + this.label31.Size = new System.Drawing.Size(274, 16); this.label31.TabIndex = 14; this.label31.Text = "- Element anwählen und Tasten Ctrl Up/Down"; // @@ -973,45 +1065,50 @@ // this.label32.AutoSize = true; this.label32.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label32.Location = new System.Drawing.Point(298, 159); + this.label32.Location = new System.Drawing.Point(397, 196); + this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(69, 13); + this.label32.Size = new System.Drawing.Size(89, 17); this.label32.TabIndex = 13; this.label32.Text = "Sortierung:"; // // label29 // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(298, 215); + this.label29.Location = new System.Drawing.Point(397, 265); + this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(87, 13); + this.label29.Size = new System.Drawing.Size(111, 16); this.label29.TabIndex = 12; this.label29.Text = "Adress-Vorschau"; // // txtadresse // - this.txtadresse.Location = new System.Drawing.Point(301, 231); + this.txtadresse.Location = new System.Drawing.Point(401, 284); + this.txtadresse.Margin = new System.Windows.Forms.Padding(4); this.txtadresse.Multiline = true; this.txtadresse.Name = "txtadresse"; this.txtadresse.ReadOnly = true; - this.txtadresse.Size = new System.Drawing.Size(274, 97); + this.txtadresse.Size = new System.Drawing.Size(364, 118); this.txtadresse.TabIndex = 11; // // btnNewPersAddr // this.btnNewPersAddr.Image = global::OnDoc.Properties.Resources.add_24x24_32; - this.btnNewPersAddr.Location = new System.Drawing.Point(644, 39); + this.btnNewPersAddr.Location = new System.Drawing.Point(859, 48); + this.btnNewPersAddr.Margin = new System.Windows.Forms.Padding(4); this.btnNewPersAddr.Name = "btnNewPersAddr"; - this.btnNewPersAddr.Size = new System.Drawing.Size(50, 32); + this.btnNewPersAddr.Size = new System.Drawing.Size(67, 39); this.btnNewPersAddr.TabIndex = 10; this.btnNewPersAddr.UseVisualStyleBackColor = true; this.btnNewPersAddr.Click += new System.EventHandler(this.btnNewPersAddr_Click); // // btnSavePersAdressen // - this.btnSavePersAdressen.Location = new System.Drawing.Point(571, 159); + this.btnSavePersAdressen.Location = new System.Drawing.Point(761, 196); + this.btnSavePersAdressen.Margin = new System.Windows.Forms.Padding(4); this.btnSavePersAdressen.Name = "btnSavePersAdressen"; - this.btnSavePersAdressen.Size = new System.Drawing.Size(75, 23); + this.btnSavePersAdressen.Size = new System.Drawing.Size(100, 28); this.btnSavePersAdressen.TabIndex = 8; this.btnSavePersAdressen.Text = "Speichern"; this.btnSavePersAdressen.UseVisualStyleBackColor = true; @@ -1020,9 +1117,10 @@ // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(298, 22); + this.label20.Location = new System.Drawing.Point(397, 27); + this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(210, 13); + this.label20.Size = new System.Drawing.Size(263, 16); this.label20.TabIndex = 7; this.label20.Text = "Gewählte Standard-/ persönliche Adressen"; // @@ -1038,7 +1136,7 @@ treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black; this.TreeViewADVPersadresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); - this.TreeViewADVPersadresse.BeforeTouchSize = new System.Drawing.Size(346, 113); + this.TreeViewADVPersadresse.BeforeTouchSize = new System.Drawing.Size(460, 138); this.TreeViewADVPersadresse.ContextMenuStrip = this.contextMenuStrip1; // // @@ -1050,11 +1148,12 @@ this.TreeViewADVPersadresse.HelpTextControl.TabIndex = 0; this.TreeViewADVPersadresse.HelpTextControl.Visible = true; this.TreeViewADVPersadresse.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; - this.TreeViewADVPersadresse.Location = new System.Drawing.Point(300, 40); + this.TreeViewADVPersadresse.Location = new System.Drawing.Point(400, 49); + this.TreeViewADVPersadresse.Margin = new System.Windows.Forms.Padding(4); this.TreeViewADVPersadresse.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220))))); this.TreeViewADVPersadresse.Name = "TreeViewADVPersadresse"; this.TreeViewADVPersadresse.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText; - this.TreeViewADVPersadresse.Size = new System.Drawing.Size(346, 113); + this.TreeViewADVPersadresse.Size = new System.Drawing.Size(460, 138); this.TreeViewADVPersadresse.TabIndex = 6; this.TreeViewADVPersadresse.Text = "treeViewAdv2"; this.TreeViewADVPersadresse.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; @@ -1074,32 +1173,34 @@ // // contextMenuStrip1 // + this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.adresseLöschenToolStripMenuItem, this.adresseBearbeitenToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(175, 48); + this.contextMenuStrip1.Size = new System.Drawing.Size(207, 52); // // adresseLöschenToolStripMenuItem // this.adresseLöschenToolStripMenuItem.Name = "adresseLöschenToolStripMenuItem"; - this.adresseLöschenToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.adresseLöschenToolStripMenuItem.Size = new System.Drawing.Size(206, 24); this.adresseLöschenToolStripMenuItem.Text = "Adresse löschen"; this.adresseLöschenToolStripMenuItem.Click += new System.EventHandler(this.adresseLöschenToolStripMenuItem_Click); // // adresseBearbeitenToolStripMenuItem // this.adresseBearbeitenToolStripMenuItem.Name = "adresseBearbeitenToolStripMenuItem"; - this.adresseBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.adresseBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(206, 24); this.adresseBearbeitenToolStripMenuItem.Text = "Adresse bearbeiten"; this.adresseBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.adresseBearbeitenToolStripMenuItem_Click); // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(7, 23); + this.label19.Location = new System.Drawing.Point(9, 28); + this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(97, 13); + this.label19.Size = new System.Drawing.Size(124, 16); this.label19.TabIndex = 5; this.label19.Text = "Standard-Adressen"; // @@ -1115,7 +1216,7 @@ treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black; this.treeViewAdvAdresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)}); - this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(275, 288); + this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(365, 354); this.treeViewAdvAdresse.ContextMenuStrip = this.contextMenuStrip2; // // @@ -1127,11 +1228,12 @@ this.treeViewAdvAdresse.HelpTextControl.TabIndex = 0; this.treeViewAdvAdresse.HelpTextControl.Visible = true; this.treeViewAdvAdresse.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; - this.treeViewAdvAdresse.Location = new System.Drawing.Point(6, 40); + this.treeViewAdvAdresse.Location = new System.Drawing.Point(8, 49); + this.treeViewAdvAdresse.Margin = new System.Windows.Forms.Padding(4); this.treeViewAdvAdresse.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220))))); this.treeViewAdvAdresse.Name = "treeViewAdvAdresse"; this.treeViewAdvAdresse.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText; - this.treeViewAdvAdresse.Size = new System.Drawing.Size(275, 288); + this.treeViewAdvAdresse.Size = new System.Drawing.Size(365, 354); this.treeViewAdvAdresse.TabIndex = 4; this.treeViewAdvAdresse.Text = "treeViewAdv2"; this.treeViewAdvAdresse.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; @@ -1151,31 +1253,33 @@ // // contextMenuStrip2 // + this.contextMenuStrip2.ImageScalingSize = new System.Drawing.Size(20, 20); this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.persönlicheAdresseErstellenToolStripMenuItem}); this.contextMenuStrip2.Name = "contextMenuStrip2"; - this.contextMenuStrip2.Size = new System.Drawing.Size(227, 26); + this.contextMenuStrip2.Size = new System.Drawing.Size(269, 28); // // persönlicheAdresseErstellenToolStripMenuItem // this.persönlicheAdresseErstellenToolStripMenuItem.Name = "persönlicheAdresseErstellenToolStripMenuItem"; - this.persönlicheAdresseErstellenToolStripMenuItem.Size = new System.Drawing.Size(226, 22); + this.persönlicheAdresseErstellenToolStripMenuItem.Size = new System.Drawing.Size(268, 24); this.persönlicheAdresseErstellenToolStripMenuItem.Text = "Persönliche Adresse erstellen"; this.persönlicheAdresseErstellenToolStripMenuItem.Click += new System.EventHandler(this.persönlicheAdresseErstellenToolStripMenuItem_Click); // // MitarbeiterProfil // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(863, 498); - this.Controls.Add(this.GrpGAS); + this.ClientSize = new System.Drawing.Size(1074, 611); this.Controls.Add(this.GrpGetSignature); + this.Controls.Add(this.GrpGAS); this.Controls.Add(this.GrpBoxMitarbeiter); this.Controls.Add(this.GrpBoxDetails); this.Controls.Add(this.GrpBoxProfile); this.Controls.Add(this.ribbon1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "MitarbeiterProfil"; this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; @@ -1303,5 +1407,6 @@ private System.Windows.Forms.Label label31; private System.Windows.Forms.Label label32; private System.Windows.Forms.ToolStripMenuItem adresseBearbeitenToolStripMenuItem; + private System.Windows.Forms.Button button3; } } \ No newline at end of file diff --git a/Client/Diverses/MitarbeiterProfil.cs b/Client/Diverses/MitarbeiterProfil.cs index 38954d86..f8371be7 100644 --- a/Client/Diverses/MitarbeiterProfil.cs +++ b/Client/Diverses/MitarbeiterProfil.cs @@ -73,6 +73,16 @@ namespace OnDoc.Diverses { btnSaveForUser.Visible = true; } + if (AppParams.SignaturePassword.ToString() != "") + { + button1.Visible = false; + button3.Visible = true; + } + else + { + button1.Visible = true; + button3.Visible = false; + } load_adressen(); } @@ -468,7 +478,12 @@ namespace OnDoc.Diverses private void button2_Click(object sender, EventArgs e) { - GrpGetSignature.Visible = true; + if (AppParams.SignApp != "") + { + System.Diagnostics.Process.Start(AppParams.SignApp); + } + else + { GrpGetSignature.Visible = true; } } private void label15_Click(object sender, EventArgs e) @@ -851,6 +866,19 @@ namespace OnDoc.Diverses GrpBoxMitarbeiter.Visible = false; GrpGAS.Visible = true; } + + private void button3_Click_1(object sender, EventArgs e) + { + string unterschrift = get_unterschrift(this.tgnummer); + + string ss = Newtonsoft.Json.JsonConvert.DeserializeObject(unterschrift); + MemoryStream mssign = new MemoryStream(Convert.FromBase64String(ss)); + System.Drawing.Image img = System.Drawing.Image.FromStream(mssign); + pictureBox1.Image = img; + mssign.Close(); + mssign.Dispose(); + + } } } diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index d01859ac..bdfb07c0 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -40,9 +40,10 @@ this.pictureBox1.ErrorImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.ErrorImage"))); this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); this.pictureBox1.InitialImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.InitialImage"))); - this.pictureBox1.Location = new System.Drawing.Point(104, 25); + this.pictureBox1.Location = new System.Drawing.Point(139, 31); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(261, 258); + this.pictureBox1.Size = new System.Drawing.Size(348, 318); this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // @@ -50,9 +51,10 @@ // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(164, 304); + this.label1.Location = new System.Drawing.Point(219, 374); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(122, 26); + this.label1.Size = new System.Drawing.Size(151, 31); this.label1.TabIndex = 1; this.label1.Text = "Version 1.6"; // @@ -60,23 +62,25 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(159, 330); + this.label2.Location = new System.Drawing.Point(207, 406); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(130, 26); + this.label2.Size = new System.Drawing.Size(176, 31); this.label2.TabIndex = 2; - this.label2.Text = "5. Juni 2025"; + this.label2.Text = "17. Juni 2025"; this.label2.Click += new System.EventHandler(this.label2_Click); // // SplashScreen // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(469, 396); + this.ClientSize = new System.Drawing.Size(625, 487); this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.Controls.Add(this.pictureBox1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "SplashScreen"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "SplashScreen"; diff --git a/Client/Klassen/clsAppParams.cs b/Client/Klassen/clsAppParams.cs index 7a859b22..4cbca968 100644 --- a/Client/Klassen/clsAppParams.cs +++ b/Client/Klassen/clsAppParams.cs @@ -67,6 +67,8 @@ namespace OnDoc.Klassen public static bool versandstrassewindows_open { get; set; } = false; public static bool AutomArchivierung { get; set; } = false; + + public static string SignApp { get; set; } = ""; static AppParams() { @@ -105,6 +107,7 @@ namespace OnDoc.Klassen SignaturePassword = db.dsdaten.Tables[0].Rows[0][20].ToString(); Environment = db.dsdaten.Tables[0].Rows[0][21].ToString(); AutomArchivierung = db.dsdaten.Tables[0].Rows[0][22].ToString() == "TRUE"; + SignApp = db.dsdaten.Tables[0].Rows[0][23].ToString(); } else { diff --git a/Client/Start.cs b/Client/Start.cs index 8a54bf2c..db48d2b3 100644 --- a/Client/Start.cs +++ b/Client/Start.cs @@ -144,6 +144,7 @@ namespace OnDoc dokList1.mitarbeiternr = AppParams.CurrentMitarbeiter; + dokList1.load_Profile(); dokList1.load_Profile(); dokList1.refresh_dokumente(); dokList1.set_functions(); @@ -325,7 +326,7 @@ namespace OnDoc case 3: Logging.DocLog.Info("Archiviertes Dokument wieder bearbeiten '" + ExternalCall.dokumentid ,"OnDoc",ExternalCall.dokumentid, "", "Dokument erneut bearbeiten"); DB db1 = new DB(AppParams.connectionstring); - db1.dokument_reaktivieren(ExternalCall.dokumentid, AppParams.CurrentMitarbeiter.ToString()); + db1.dokument_reaktivieren(ExternalCall.dokumentid, AppParams.CurrentMitarbeiter.ToString(),1); dokList1.dokument_bearbeiten(ExternalCall.dokumentid, false); db1 = null; diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 6d895e28..194fa739 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -1594,7 +1594,7 @@ namespace OnDoc.UICintrols private void archivedoc(string documentid) { string URL = AppParams.RESTURI + "api/ArchiveDocFromDatabase?dokumentid=" + documentid; - + HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest; webRequest.Method = WebRequestMethods.Http.Get; webRequest.Headers["Authorization"] = "Bearer " + AppParams.apikey; @@ -1608,6 +1608,15 @@ namespace OnDoc.UICintrols string responseContent = reader.ReadToEnd(); if (responseContent.Contains("Hinweismeldung:")) { + DB db = new DB(AppParams.connectionstring); + if (db.dokument_in_wiederbearbeitung(documentid)) + { + MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " wurde nicht durchgeführt:" + Environment.NewLine + responseContent+Environment.NewLine+Environment.NewLine+"Stelle im OnBase sicher, dass du das wiederbearbeitete Dokument nicht anzeigst und dadurch die Bearbeitung/Archivierung blockierst."); + db = null; + return; + } + db = null; + MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " wurde nicht durchgeführt:" + Environment.NewLine + responseContent); return; } @@ -1624,6 +1633,14 @@ namespace OnDoc.UICintrols } catch (Exception ex) { + DB db = new DB(AppParams.connectionstring); + if (db.dokument_in_wiederbearbeitung(documentid)) + { + MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " konnte nicht durchgeführt werden:" + Environment.NewLine + "Fehler: " + ex.Message + Environment.NewLine + Environment.NewLine + "Stelle im OnBase sicher, dass du das wiederbearbeitete Dokument nicht anzeigst und dadurch die Bearbeitung/Archivierung blockierst."); + db = null; + return; + } + db = null; MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " konnte nicht durchgeführt werden." + Environment.NewLine + "Fehler: " + ex.Message); } } diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs index e9b9e204..127bb4bb 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.cs @@ -783,6 +783,14 @@ namespace OnDoc.UIControls dokdata.postzustellung = cbboxpostzustellung.SelectedValue.ToString(); } catch { dokdata.postzustellung = "0"; } + try + { + if (cbboxpostzustellung.Text == "") + { + dokdata.postzustellung = "0"; + } + } + catch { } if (List_avqref.Count > 0) { dokdata.avq_authl_ref=List_avqref; } diff --git a/Client/Versandstrasse/Versandstrasse.cs b/Client/Versandstrasse/Versandstrasse.cs index 841074c1..e4fd981c 100644 --- a/Client/Versandstrasse/Versandstrasse.cs +++ b/Client/Versandstrasse/Versandstrasse.cs @@ -364,7 +364,7 @@ namespace OnDoc.Versandstrasse foreach (TreeNodeAdv dokumentnode in node.Nodes) { //node.LeftImageIndices = new int[] { 0 }; - db.Get_Tabledata("SELECT dbo.dokument.nrpar00, dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc FROM dbo.dokument INNER JOIN " + + db.Get_Tabledata("SELECT dbo.dokument.nrpar00, dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc, isnull(postzustellung,0) as postzustellung FROM dbo.dokument INNER JOIN " + " dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr where dbo.dokument.dokumentid='" + dokumentnode.Tag + "'", false, true); //BP-Verifikation //if (currentbp != Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["nrpar00"])) @@ -383,6 +383,12 @@ namespace OnDoc.Versandstrasse } else { + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) > 1) + { + set_nodeimage(dokumentnode, 2); + versandbereit = false; + add_errormessage(2, "Im Versand-Couvert liegt an erster Position ein Dokument, bei welchem die Postzustellung festgelegt wurde."); + } if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0) { if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; add_errormessage(2,"Im Versand-Couvert liegt an erster Position ein Dokument, welches nicht als vorderstes Dokument tauglich ist"); } diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index 85d89af5..42ad5946 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 3f4f2bdf..908f9825 100644 Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll index ca7f2ad0..6520e565 100644 Binary files a/Client/bin/Debug/Database.dll and b/Client/bin/Debug/Database.dll differ diff --git a/Client/bin/Debug/Database.pdb b/Client/bin/Debug/Database.pdb index 966f2720..30570d28 100644 Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index db4f52e0..d1694183 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 39327685..f01aa285 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 1e19383e..343d1ec0 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 7237ca85..66950f8a 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 cbc634ef..75fc8df4 100644 Binary files a/Client/bin/Debug/OnDocOffice.pdb and b/Client/bin/Debug/OnDocOffice.pdb differ diff --git a/Client/bin/Debug/Versandstrasse.dll b/Client/bin/Debug/Versandstrasse.dll index 5bb758ff..b5901a4f 100644 Binary files a/Client/bin/Debug/Versandstrasse.dll and b/Client/bin/Debug/Versandstrasse.dll differ diff --git a/Client/bin/Debug/Versandstrasse.pdb b/Client/bin/Debug/Versandstrasse.pdb index 3b80a4f4..d77b1594 100644 Binary files a/Client/bin/Debug/Versandstrasse.pdb and b/Client/bin/Debug/Versandstrasse.pdb differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index 09494a6c..3ea018da 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 f9e0c5bd..81f51e7c 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 5a13ae12..dfdb2dba 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 db4f52e0..d1694183 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 39327685..f01aa285 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 09494a6c..3ea018da 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/Klassen/DocGenerator_from_EDOKA.cs b/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs index 6fe8175d..fe05024b 100644 --- a/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs +++ b/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs @@ -63,11 +63,11 @@ namespace DOCGEN.Generator public clsdok Generate_Doc_EDOKA(string dokumentid, ref clsDocData docdata, bool useoffice = false, int OfficeSleep = 0, bool vbfilemanagement = false, bool editdoc = false) { -if (docdata.Bezeichnung.Contains("QDF")) + if (docdata.Bezeichnung.Contains("QDF")) { - generate_docdata(dokumentid, ref docdata); - Generate_QDF(dokumentid, ref docdata, tempdir); - clsdok dokempty = new clsdok("", "", "QDF",""); + generate_docdata(dokumentid, ref docdata); + Generate_QDF(dokumentid, ref docdata, tempdir); + clsdok dokempty = new clsdok("", "", "QDF", ""); return dokempty; } useoffice = docdata.Erstellung_in_Office; @@ -101,12 +101,17 @@ if (docdata.Bezeichnung.Contains("QDF")) docdata.prefix = Prefix; switch (Apptype.ToUpper()) { - case "DOCX": case "DOCM": case "DOC": case "DOT": - case "WORD": case "DOTM": + case "DOCX": + case "DOCM": + case "DOC": + case "DOT": + case "WORD": + case "DOTM": SyncFWord sfword = new SyncFWord(resturi, apikey); generate_docdata(dokumentid, ref docdata); clsdok dok = new clsdok("", "", "", ""); - if (useoffice == false) { + if (useoffice == false) + { Logging.Logging.Debug("Generate_Word", "Start", dokumentid); if (docdata.remove_signature) { @@ -119,7 +124,7 @@ if (docdata.Bezeichnung.Contains("QDF")) dt.Rows[0][0] = fh.Base64FromFile(filename); ws = null; } - dok.dokument = sfword.Generate_Word(dt.Rows[0][0].ToString(), docdata,"","","",false,editdoc); + dok.dokument = sfword.Generate_Word(dt.Rows[0][0].ToString(), docdata, "", "", "", false, editdoc); Logging.Logging.Debug("Generate_Word", "Ende", dokumentid); Thread.Sleep(OfficeSleep); } @@ -138,7 +143,11 @@ if (docdata.Bezeichnung.Contains("QDF")) dok.extension = dt2.Rows[0][1].ToString(); //if (dok.extension.ToUpper()=="DOTM") { dok.extension = "docm"; } return dok; - case "XLSM": case "XLSX": case "XLST": case "XLS": case "XLT": + case "XLSM": + case "XLSX": + case "XLST": + case "XLS": + case "XLT": case "XLTM": case "EXCEL": @@ -161,7 +170,10 @@ if (docdata.Bezeichnung.Contains("QDF")) } return dokexcel; //break; - case "PDF": case "ACROBAT": case "FORMULAR": case "DOKUMENT": + case "PDF": + case "ACROBAT": + case "FORMULAR": + case "DOKUMENT": clsdok dokpdf = new clsdok("", "", "", ""); dokpdf.dokument = dt.Rows[0][0].ToString(); dokpdf.extension = Extension; @@ -225,7 +237,7 @@ if (docdata.Bezeichnung.Contains("QDF")) public void Generate_QDF(string dokumentid, ref clsDocData docdata, string tempdir) { DB db = new DB(connectionstring); - + db.Get_Tabledata("Select * from ondoc_qdf_parameter where aktiv=1", false, true); string qdfsource = db.dsdaten.Tables[0].Rows[0][1].ToString(); string qdfviewer = db.dsdaten.Tables[0].Rows[0][2].ToString(); @@ -281,5 +293,5 @@ if (docdata.Bezeichnung.Contains("QDF")) //Process.Start(qdfviewer + " " + dokumentname); } - } + } } diff --git a/DOCGEN/Klassen/SyncFWord.cs b/DOCGEN/Klassen/SyncFWord.cs index b3b19602..2a177d78 100644 --- a/DOCGEN/Klassen/SyncFWord.cs +++ b/DOCGEN/Klassen/SyncFWord.cs @@ -194,7 +194,7 @@ namespace DOCGEN.Klassen } } - + private void insert_signature(string bookmark, string unterschrift, ref WordDocument document) { @@ -204,14 +204,14 @@ namespace DOCGEN.Klassen MemoryStream mssign = new MemoryStream(Convert.FromBase64String(unterschrift)); System.Drawing.Image img = System.Drawing.Image.FromStream(mssign); - Shape signature = bm.BookmarkStart.OwnerParagraph.AppendShape(Syncfusion.DocIO.DLS.AutoShapeType.Rectangle,135,55); + Shape signature = bm.BookmarkStart.OwnerParagraph.AppendShape(Syncfusion.DocIO.DLS.AutoShapeType.Rectangle, 135, 55); //IWParagraph p = bm.BookmarkStart.OwnerParagraph; //IWPicture u = p.AppendPicture(img); IWParagraph sigparagraph = signature.TextBody.AddParagraph(); signature.WrapFormat.TextWrappingStyle = TextWrappingStyle.Behind; signature.LineFormat.DashStyle = LineDashing.Solid; - signature.LineFormat.Color= Color.White; - + signature.LineFormat.Color = Color.White; + signature.WrapFormat.AllowOverlap = true; signature.VerticalPosition = signature.VerticalPosition - 54; signature.WrapFormat.TextWrappingStyle = TextWrappingStyle.Behind; @@ -221,12 +221,12 @@ namespace DOCGEN.Klassen p.Width = 120; p.Height = 50; signature.Name = "Unterschrift_" + bookmark; - - -// signature.OwnerParagraph.AppendPicture(img); + + + // signature.OwnerParagraph.AppendPicture(img); mssign = null; } - public string Generate_Word(string base64, clsDocData docdata, string img_UL = "", string img_UR = "", string img_faktura = "", bool serienbrief=false, bool editdoc=false) + public string Generate_Word(string base64, clsDocData docdata, string img_UL = "", string img_UR = "", string img_faktura = "", bool serienbrief = false, bool editdoc = false) { string formattype = ""; MemoryStream ms = new MemoryStream(Helper.EncodeExtensions.DecodeBase642ByteArray(base64)); @@ -271,12 +271,12 @@ namespace DOCGEN.Klassen string ppimg = ""; string ppimg64 = ""; - + if (docdata.Barcode == true) { //20250531 - Barcode nicht beim Serienbrief - if (!serienbrief && !editdoc) Insert_Barcode(document, docdata); + if (!serienbrief) Insert_Barcode(document, docdata); } if (docdata.PrintLogo == true) { @@ -354,10 +354,10 @@ namespace DOCGEN.Klassen } } - if (dv.TMBeginn.ToString() == "TGEDKTagesdatumB99" || dv.TMBeginn.ToString().Contains("Inhaber")) + if (dv.TMBeginn.ToString() == "TGEDKTagesdatumB99" || dv.TMBeginn.ToString().Contains("Inhaber")) { int a = 1; - + } if (dv.TMBeginn.ToString() != "" && dv.TMEnd.ToString() == "") { @@ -365,7 +365,7 @@ namespace DOCGEN.Klassen { BookmarksNavigator bookmarkNavigator = new BookmarksNavigator(document); // if ((dv.TMBeginn.ToString() == "TGEDKVornameNameLinksB99" || dv.TMBeginn.ToString() == "TGEDKVornameNameRechtsB99") && docdata.As_Faksimile == "True") - if ((dv.TMBeginn.ToString().Contains("VornameNameLinks") || dv.TMBeginn.ToString().Contains("VornameNameRechts")) && docdata.As_Faksimile == "True" && (docdata.sign == true || serienbrief==true)) + if ((dv.TMBeginn.ToString().Contains("VornameNameLinks") || dv.TMBeginn.ToString().Contains("VornameNameRechts")) && docdata.As_Faksimile == "True" && (docdata.sign == true || serienbrief == true)) { if (dv.TMBeginn.ToString().Contains("VornameNameLinks")) @@ -377,7 +377,7 @@ namespace DOCGEN.Klassen unterschrift = Newtonsoft.Json.JsonConvert.DeserializeObject(get_unterschrift(docdata.Unterschrift_Links)); } bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); - bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(),true); + bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); if (docdata.Unterschrift_Links != "-1") { insert_signature(dv.TMBeginn.ToLower(), unterschrift, ref document); @@ -393,7 +393,7 @@ namespace DOCGEN.Klassen unterschrift = Newtonsoft.Json.JsonConvert.DeserializeObject(get_unterschrift(docdata.Unterschrift_Rechts)); } bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); - bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(),true); + bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); if (docdata.Unterschrift_Rechts != "-1") { insert_signature(dv.TMBeginn.ToLower(), unterschrift, ref document); @@ -403,38 +403,23 @@ namespace DOCGEN.Klassen - + } else { - if (dv.TMBeginn.ToString() == "TGEDKZustellungB99") - { - if (img_faktura != "") - - { + if (dv.TMBeginn.ToString() == "TGEDKZustellungB99") + { + if (img_faktura != "") - insert_ppfaktura(document, img_faktura); - bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); - bookmarkNavigator.InsertText(dv.Value.ToString()); + { + insert_ppfaktura(document, img_faktura); + bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); + bookmarkNavigator.InsertText(dv.Value.ToString()); - //bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); - } - else - { - if (!dv.TMBeginn.ToString().Contains("TGEDKCursor")) - { - if (dv.TMBeginn.ToString().Contains("VornameName")) - { - int a = 1; - } - bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); - //bookmarkNavigator.InsertText(dv.Value.ToString()); - bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); - } - } + //bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); } else { @@ -444,13 +429,28 @@ namespace DOCGEN.Klassen { int a = 1; } - bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); //bookmarkNavigator.InsertText(dv.Value.ToString()); bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); } } + } + else + { + if (!dv.TMBeginn.ToString().Contains("TGEDKCursor")) + { + if (dv.TMBeginn.ToString().Contains("VornameName")) + { + int a = 1; + } + + bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); + //bookmarkNavigator.InsertText(dv.Value.ToString()); + bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); + } + } + //} } @@ -463,8 +463,8 @@ namespace DOCGEN.Klassen { if (!dv.TMBeginn.ToString().Contains("TGEDKCursor")) { - - ReplaceBookmarkContent(ref document, dv.TMBeginn.ToString(), dv.TMEnd.ToString(), dv.Value.ToString(),serienbrief); + + ReplaceBookmarkContent(ref document, dv.TMBeginn.ToString(), dv.TMEnd.ToString(), dv.Value.ToString(), serienbrief); } } catch { } @@ -551,9 +551,10 @@ namespace DOCGEN.Klassen { string phrase = dm.BookMark; string[] parts = phrase.Split(':'); - variable= parts[0]; - inhalt= parts[1]; - } else { } + variable = parts[0]; + inhalt = parts[1]; + } + else { } if (document.ProtectionType == ProtectionType.NoProtection) @@ -680,7 +681,7 @@ namespace DOCGEN.Klassen } } - + public void ReplaceBookmarkContent(ref WordDocument document, String bookmark1, String bookmark2, String replacementContent, bool serienbrief) { @@ -689,7 +690,7 @@ namespace DOCGEN.Klassen { BookmarksNavigator bmn = new BookmarksNavigator(document); bmn.MoveToBookmark(bookmark1); - bmn.InsertText(replacementContent+" "); return; + bmn.InsertText(replacementContent + " "); return; } @@ -701,7 +702,7 @@ namespace DOCGEN.Klassen //Get the bookmark instance by using FindByName method of BookmarkCollection with bookmark name. Bookmark firstBookmark = document.Bookmarks.FindByName(bookmark1); //Access the bookmark end’s owner paragraph by using bookmark. - + //BookmarksNavigator bmn = new BookmarksNavigator(document); //bmn.MoveToBookmark(bookmark1); //TextBodyPart tbp = bmn.GetBookmarkContent(); @@ -957,7 +958,7 @@ namespace DOCGEN.Klassen System.Drawing.Image barcodeimage2; barcodeimage2 = barcodeimage; - + WPicture picture = new WPicture(document); WPicture picture2 = new WPicture(document); @@ -1010,15 +1011,21 @@ namespace DOCGEN.Klassen //foreach (IWSection section in document.Sections) //{ IWSection section = document.Sections[0]; - if (section.PageSetup.DifferentFirstPage == true) + if (section.PageSetup.DifferentFirstPage == true) + { + + WParagraph FirstfooterPar = new WParagraph(document); + FirstfooterPar.ChildEntities.Add(picture); + if (section.HeadersFooters.FirstPageFooter.Paragraphs.Count > 0) { - WParagraph FirstfooterPar = new WParagraph(document); - FirstfooterPar.ChildEntities.Add(picture); - section.HeadersFooters.FirstPageFooter.Paragraphs.Add(FirstfooterPar); + section.HeadersFooters.FirstPageFooter.Paragraphs.RemoveAt(section.HeadersFooters.FirstPageFooter.Paragraphs.Count - 1); } - WParagraph footerPar = new WParagraph(document); - footerPar.ChildEntities.Add(picture2); - section.HeadersFooters.Footer.Paragraphs.Add(footerPar); + section.HeadersFooters.FirstPageFooter.Paragraphs.Add(FirstfooterPar); + } + WParagraph footerPar = new WParagraph(document); + footerPar.ChildEntities.Add(picture2); + if (section.HeadersFooters.Footer.Count > 0) { section.HeadersFooters.Footer.Paragraphs.RemoveAt(section.HeadersFooters.Footer.Paragraphs.Count-1); } + section.HeadersFooters.Footer.Paragraphs.Add(footerPar); //} } public void xInsert_Barcode(WordDocument document, clsDocData docData) @@ -1041,7 +1048,7 @@ namespace DOCGEN.Klassen if (docData.barcode_horizontal == 0) { - barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 66, 600, 100, docData.barcode_zusatz, "Futur Book", 16,0); + barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 66, 600, 100, docData.barcode_zusatz, "Futur Book", 16, 0); //barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 429, 52, docData.barcode_zusatz, "Futur Book", 8, 270); } @@ -1083,7 +1090,7 @@ namespace DOCGEN.Klassen WPicture picture = new WPicture(document); picture.LoadImage(barcodeimage); - + //picture.Height = docData.barcode_height; //picture.Width = docData.barcode_width; @@ -1121,8 +1128,8 @@ namespace DOCGEN.Klassen } if (docData.barcode_type == "0") { - // picture.Width = docData.barcode_width; - // picture.Height = docData.barcode_height; + // picture.Width = docData.barcode_width; + // picture.Height = docData.barcode_height; } WPicture picture2 = new WPicture(document); diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index 85d89af5..42ad5946 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 3f4f2bdf..908f9825 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/bin/Debug/Database.dll b/DOCGEN/bin/Debug/Database.dll index ca7f2ad0..6520e565 100644 Binary files a/DOCGEN/bin/Debug/Database.dll and b/DOCGEN/bin/Debug/Database.dll differ diff --git a/DOCGEN/bin/Debug/Database.pdb b/DOCGEN/bin/Debug/Database.pdb index 966f2720..30570d28 100644 Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ diff --git a/DOCGEN/bin/Debug/OnDocOffice.dll b/DOCGEN/bin/Debug/OnDocOffice.dll index 7237ca85..66950f8a 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 cbc634ef..75fc8df4 100644 Binary files a/DOCGEN/bin/Debug/OnDocOffice.pdb and b/DOCGEN/bin/Debug/OnDocOffice.pdb differ diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index 85d89af5..42ad5946 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 3f4f2bdf..908f9825 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 f3f330ba..f8569368 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/Database/bin/Debug/Database.dll b/Database/bin/Debug/Database.dll index ca7f2ad0..6520e565 100644 Binary files a/Database/bin/Debug/Database.dll and b/Database/bin/Debug/Database.dll differ diff --git a/Database/bin/Debug/Database.pdb b/Database/bin/Debug/Database.pdb index 966f2720..30570d28 100644 Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ diff --git a/Database/db.cs b/Database/db.cs index ff40e4f6..445614d1 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -2263,15 +2263,25 @@ namespace Database //return true; } - public bool dokument_reaktivieren(string dokumentid, string mitarbeiternr) + public bool dokument_reaktivieren(string dokumentid, string mitarbeiternr, int wiederbearbeitung=0) { clear_parameter(); add_parameter("@fnkt", "12"); add_parameter("@dokumentid", dokumentid); add_parameter("@value1", mitarbeiternr); + add_parameter("@value2", wiederbearbeitung.ToString()); Get_Tabledata("sp_edoka_onbase", true, false); return true; } + public bool dokument_in_wiederbearbeitung(string dokumentid) + { + clear_parameter(); + add_parameter("@fnkt", "13"); + add_parameter("@dokumentid", dokumentid); + Get_Tabledata("sp_edoka_onbase", true, false); + if (Convert.ToInt32(dsdaten.Tables[0].Rows[0][0]) > 0) { return true; } else { return false; }; + + } } diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll index ca7f2ad0..6520e565 100644 Binary files a/Database/obj/Debug/Database.dll and b/Database/obj/Debug/Database.dll differ diff --git a/Database/obj/Debug/Database.pdb b/Database/obj/Debug/Database.pdb index 966f2720..30570d28 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/DocIO_Demo_SHU/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DocIO_Demo_SHU/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 9f74b224..469c7345 100644 Binary files a/DocIO_Demo_SHU/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/DocIO_Demo_SHU/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache index d0bdb4c8..734de170 100644 Binary files a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache and b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache differ diff --git a/DocIO_Demo_SHU/obj/Debug/build.force b/DocIO_Demo_SHU/obj/Debug/build.force new file mode 100644 index 00000000..e69de29b diff --git a/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache b/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache index 50551425..7272e0df 100644 Binary files a/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache and b/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache differ diff --git a/NativVorlagen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/NativVorlagen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 0f73ebe2..e4658117 100644 Binary files a/NativVorlagen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/NativVorlagen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache index e643312d..affb773a 100644 Binary files a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache and b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/bin/Debug/DOCGEN.dll b/OnDocOffice/bin/Debug/DOCGEN.dll index 85d89af5..42ad5946 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 3f4f2bdf..908f9825 100644 Binary files a/OnDocOffice/bin/Debug/DOCGEN.pdb and b/OnDocOffice/bin/Debug/DOCGEN.pdb differ diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll index ca7f2ad0..6520e565 100644 Binary files a/OnDocOffice/bin/Debug/Database.dll and b/OnDocOffice/bin/Debug/Database.dll differ diff --git a/OnDocOffice/bin/Debug/Database.pdb b/OnDocOffice/bin/Debug/Database.pdb index 966f2720..30570d28 100644 Binary files a/OnDocOffice/bin/Debug/Database.pdb and b/OnDocOffice/bin/Debug/Database.pdb differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.dll b/OnDocOffice/bin/Debug/OnDocOffice.dll index 7237ca85..66950f8a 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 cbc634ef..75fc8df4 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 7e13a769..f938e2bf 100644 --- a/OnDocOffice/clsoffice.cs +++ b/OnDocOffice/clsoffice.cs @@ -1,5 +1,6 @@ using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Word; + using Model; using System; using System.Collections.Generic; @@ -60,6 +61,7 @@ namespace OnDocOffice try { excel = new Microsoft.Office.Interop.Excel.Application(); + excel.AutomationSecurity = Microsoft.Office.Core.MsoAutomationSecurity.msoAutomationSecurityByUI; return true; } catch @@ -344,6 +346,7 @@ namespace OnDocOffice ////ExcelInst.Visible = true; word = (Microsoft.Office.Interop.Word.Application)Interaction.CreateObject("Word.Application"); + word.AutomationSecurity = Microsoft.Office.Core.MsoAutomationSecurity.msoAutomationSecurityByUI; //word = new Microsoft.Office.Interop.Word.Application(); word.Run("Autoexec"); word.NormalTemplate.Saved = true; diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index 2783a3e0..ca1c6564 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 7237ca85..66950f8a 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 cbc634ef..75fc8df4 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.pdb and b/OnDocOffice/obj/Debug/OnDocOffice.pdb differ diff --git a/OnDoc_ArchivierungBatch/App.config b/OnDoc_ArchivierungBatch/App.config index 460dda13..a3d3f303 100644 --- a/OnDoc_ArchivierungBatch/App.config +++ b/OnDoc_ArchivierungBatch/App.config @@ -33,25 +33,6 @@ x:\ondoc_archivierung_batch_log.txt - - - Data source=shu01\shu00;initial catalog=edoka_dms;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 - - - https://localhost:44334/ - - - pZkuG6l6ORCEckqQimPK58PO1A9EnkMtL5oCgRX9WiWnD4xeH7ikGzhWnTBy/vk8J4Iiz8gCSx9uFHA4+DvITG0roO97sk82d/0BCjVlwLWINpXlJfGYEF3X96AdoCQvb3ruwv/tVqEHsSU5aNfyxBAe+EhLTHQ8t7ysgJZWh98= - - - Data source=shu01\shu00;initial catalog=edoka_journale;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 - - - dm@tkb.ch - - - INT: - - + diff --git a/OnDoc_ArchivierungBatch/Program.cs b/OnDoc_ArchivierungBatch/Program.cs index 1edf4913..9d1c203d 100644 --- a/OnDoc_ArchivierungBatch/Program.cs +++ b/OnDoc_ArchivierungBatch/Program.cs @@ -21,6 +21,7 @@ namespace OnDoc_ArchivierungBatch private static int total = 0; private static int ok = 0; private static int error = 0; + private static int docerror = 0; static void Main(string[] args) { @@ -39,7 +40,7 @@ namespace OnDoc_ArchivierungBatch private static void archivedoc(string documentid) { write_log(documentid); - string URL = Properties.Settings.Default.RESTURI + "api/ /ArchiveDocFromDatabase?dokumentid=" + documentid; + string URL = Properties.Settings.Default.RESTURI + "api/ArchiveDocFromDatabase?dokumentid=" + documentid; HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest; webRequest.Method = WebRequestMethods.Http.Get; @@ -56,14 +57,17 @@ namespace OnDoc_ArchivierungBatch { write_log("Die Archivierung des Dokumentes " + documentid + " wurde nicht durchgeführt:" + Environment.NewLine + responseContent); error = error + 1; + docerror = 1; return; } + ok = ok + 1; } else { write_log("Die Archivierung des Dokumentes " + documentid + " wurde abgebrochen." + Environment.NewLine + "Fehler: " + response.StatusDescription); error = error + 1; + docerror = 1; } } @@ -72,17 +76,37 @@ namespace OnDoc_ArchivierungBatch { write_log("Die Archivierung des Dokumentes " + documentid + " konnte nicht durchgeführt werden." + Environment.NewLine + "Fehler: " + ex.Message); error = error + 1; + docerror = 1; } } + public static void Exec_SQL(string sql) + { + SqlConnection sqlconnect = new SqlConnection(); + SqlCommand sqlcmd = new SqlCommand(); + sqlcmd.Connection = sqlconnect; + sqlconnect.ConnectionString = Properties.Settings.Default.Connectionstring; + sqlcmd.CommandType = CommandType.Text; + sqlcmd.CommandText = sql; + sqlcmd.Connection.Open(); + sqlcmd.ExecuteNonQuery(); + sqlcmd.Connection.Close(); + + } private static void run() { + connectionstring = Properties.Settings.Default.Connectionstring; - Get_Tabledata("Select dokumentid from dokument where automatischearchivierung=1 and isnull(utomatischarchiviertam,0)=0"); + Get_Tabledata("Select dokumentid from dokument where automatischearchivierung=1 and dbo.fnkt_check_archived(dokumentid)=0 and dokumentid not in (select dokumentid from dokinbearbeitung where dokumentid=dokument.dokumentid) ",false,true); foreach (System.Data.DataRow dr in dsdaten.Tables[0].Rows) { + docerror = 0; archivedoc(dr[0].ToString()); + if (docerror == 0) + { + Exec_SQL("Update dokument set automatischarchiviertam=getdate() where dokumentid='" + dr[0].ToString() + "'"); + } } } diff --git a/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe index 9a2a356e..da3baed5 100644 Binary files a/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe and b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe differ diff --git a/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe.config b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe.config index 460dda13..a3d3f303 100644 --- a/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe.config +++ b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe.config @@ -33,25 +33,6 @@ x:\ondoc_archivierung_batch_log.txt - - - Data source=shu01\shu00;initial catalog=edoka_dms;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 - - - https://localhost:44334/ - - - pZkuG6l6ORCEckqQimPK58PO1A9EnkMtL5oCgRX9WiWnD4xeH7ikGzhWnTBy/vk8J4Iiz8gCSx9uFHA4+DvITG0roO97sk82d/0BCjVlwLWINpXlJfGYEF3X96AdoCQvb3ruwv/tVqEHsSU5aNfyxBAe+EhLTHQ8t7ysgJZWh98= - - - Data source=shu01\shu00;initial catalog=edoka_journale;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 - - - dm@tkb.ch - - - INT: - - + diff --git a/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.pdb b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.pdb index b452a5a3..06389526 100644 Binary files a/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.pdb and b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.pdb differ diff --git a/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_Archivierung_Batch.zip b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_Archivierung_Batch.zip new file mode 100644 index 00000000..d1c893d3 Binary files /dev/null and b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_Archivierung_Batch.zip differ diff --git a/OnDoc_ArchivierungBatch/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/OnDoc_ArchivierungBatch/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 696d6820..2f8a9d32 100644 Binary files a/OnDoc_ArchivierungBatch/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/OnDoc_ArchivierungBatch/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.exe b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.exe index 9a2a356e..da3baed5 100644 Binary files a/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.exe and b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.exe differ diff --git a/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.pdb b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.pdb index b452a5a3..06389526 100644 Binary files a/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.pdb and b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.pdb differ diff --git a/OnDoc_Paketversand/Program.cs b/OnDoc_Paketversand/Program.cs index 01f52709..fa0acbb0 100644 --- a/OnDoc_Paketversand/Program.cs +++ b/OnDoc_Paketversand/Program.cs @@ -87,6 +87,7 @@ namespace OnDoc_Paketversand { response = reader.ReadToEnd(); } + Logging.VersandstrasseLog.Info("Paket-Verarbeitung", "OnDoc-Paketversand", paketid, vp.partnernr.ToString(), "Ende Versand"); if (response.ToString().Contains("archiviert")) { Logging.VersandstrasseLog.Info("Paket-Verarbeitung", "OnDoc-Paketversand", paketid, vp.partnernr.ToString(), "Ende Versand"); @@ -97,7 +98,7 @@ namespace OnDoc_Paketversand string message = "Das Versand-Couvert Nr. " + paketid + " / Partner-Nr " + vp.partnernr + " konnte nicht versendet werden."; sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand Fehler", message); - sendmail(ersteller, "OnDoc-Paketversand: Dokument nicht Versandcouvert nicht versendet", message); + sendmail(ersteller, "OnDoc-Versandstrasse: Versandcouvert nicht versendet", message); Logging.VersandstrasseLog.Error("Paket-Verarbeitung", "OnDoc-Paketversand", paketid, vp.partnernr.ToString(), "Ende Versand"); error = error + 1; @@ -109,8 +110,10 @@ namespace OnDoc_Paketversand } catch (Exception ex) { - Logging.VersandstrasseLog.Error("Paket-Verarbeitung", "OnDoc-Paketversand", dr[0].ToString(), vp.partnernr.ToString(), "Ende Versand - " + ex.Message); - sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand Fehler", ex.Message); + string message = "Das Versand-Couvert Nr. " + paketid + " / Partner-Nr " + vp.partnernr + " konnte nicht versendet werden."+Environment.NewLine+"("+ex.Message+")"; + sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand Fehler", message); + sendmail(ersteller, "OnDoc-Versandstrasse: Versandcouvert nicht versendet", message); + sendmail(Properties.Settings.Default.adminmail, "OnDoc-Paketversand Fehler", message); error = error + 1; } diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe index 89664cb4..1ac68bf6 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe differ diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb index a103e5a8..e7899de8 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb differ diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip index 2e8a57f8..567aae42 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip differ diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe index 89664cb4..1ac68bf6 100644 Binary files a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe and b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe differ diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb index a103e5a8..e7899de8 100644 Binary files a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb and b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb differ diff --git a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache index 48a7e19e..08a401f3 100644 Binary files a/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache and b/ToolsDoksImportExport/obj/Debug/ToolsDoksImportExport.csproj.AssemblyReference.cache differ diff --git a/VBOffice/bin/Debug/Database.dll b/VBOffice/bin/Debug/Database.dll index 7280b31e..ca7f2ad0 100644 Binary files a/VBOffice/bin/Debug/Database.dll and b/VBOffice/bin/Debug/Database.dll differ diff --git a/VBOffice/bin/Debug/Database.pdb b/VBOffice/bin/Debug/Database.pdb index 18e13af0..966f2720 100644 Binary files a/VBOffice/bin/Debug/Database.pdb and b/VBOffice/bin/Debug/Database.pdb differ diff --git a/VBOffice/bin/Debug/Model.dll b/VBOffice/bin/Debug/Model.dll index 709316af..bf71e439 100644 Binary files a/VBOffice/bin/Debug/Model.dll and b/VBOffice/bin/Debug/Model.dll differ diff --git a/VBOffice/bin/Debug/Model.pdb b/VBOffice/bin/Debug/Model.pdb index 47969700..3536bbbd 100644 Binary files a/VBOffice/bin/Debug/Model.pdb and b/VBOffice/bin/Debug/Model.pdb differ diff --git a/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache b/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache index 8569856d..c516bedb 100644 Binary files a/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache and b/VBOffice/obj/Debug/VBOffice.vbproj.AssemblyReference.cache differ diff --git a/Versandstrasse/Class1.cs b/Versandstrasse/Class1.cs index 8be8f3d4..1422c2b6 100644 --- a/Versandstrasse/Class1.cs +++ b/Versandstrasse/Class1.cs @@ -527,7 +527,7 @@ namespace Versandstrasse float pointsLeft = convertor.ConvertUnits(leftmm, PdfGraphicsUnit.Millimeter, PdfGraphicsUnit.Point); float pointstop = convertor.ConvertUnits(topmm, PdfGraphicsUnit.Millimeter, PdfGraphicsUnit.Point); - RectangleF bounds = new RectangleF(pointsLeft, pointstop, 100, 45); + RectangleF bounds = new RectangleF(pointsLeft, pointstop, 150, 70); //Set the page Transparency$PdfSolidBrush brush = new PdfSolidBrush(Color.LightBlue); PdfSolidBrush brush = new PdfSolidBrush(Color.LightBlue); diff --git a/Versandstrasse/bin/Debug/DOCGEN.dll b/Versandstrasse/bin/Debug/DOCGEN.dll index 00742519..42ad5946 100644 Binary files a/Versandstrasse/bin/Debug/DOCGEN.dll and b/Versandstrasse/bin/Debug/DOCGEN.dll differ diff --git a/Versandstrasse/bin/Debug/DOCGEN.pdb b/Versandstrasse/bin/Debug/DOCGEN.pdb index 7ddfd298..908f9825 100644 Binary files a/Versandstrasse/bin/Debug/DOCGEN.pdb and b/Versandstrasse/bin/Debug/DOCGEN.pdb differ diff --git a/Versandstrasse/bin/Debug/Database.dll b/Versandstrasse/bin/Debug/Database.dll index 7280b31e..6520e565 100644 Binary files a/Versandstrasse/bin/Debug/Database.dll and b/Versandstrasse/bin/Debug/Database.dll differ diff --git a/Versandstrasse/bin/Debug/Database.pdb b/Versandstrasse/bin/Debug/Database.pdb index 18e13af0..30570d28 100644 Binary files a/Versandstrasse/bin/Debug/Database.pdb and b/Versandstrasse/bin/Debug/Database.pdb differ diff --git a/Versandstrasse/bin/Debug/Model.dll b/Versandstrasse/bin/Debug/Model.dll index 709316af..bf71e439 100644 Binary files a/Versandstrasse/bin/Debug/Model.dll and b/Versandstrasse/bin/Debug/Model.dll differ diff --git a/Versandstrasse/bin/Debug/Model.pdb b/Versandstrasse/bin/Debug/Model.pdb index 47969700..3536bbbd 100644 Binary files a/Versandstrasse/bin/Debug/Model.pdb and b/Versandstrasse/bin/Debug/Model.pdb differ diff --git a/Versandstrasse/bin/Debug/OnDocOffice.dll b/Versandstrasse/bin/Debug/OnDocOffice.dll index 7237ca85..66950f8a 100644 Binary files a/Versandstrasse/bin/Debug/OnDocOffice.dll and b/Versandstrasse/bin/Debug/OnDocOffice.dll differ diff --git a/Versandstrasse/bin/Debug/OnDocOffice.pdb b/Versandstrasse/bin/Debug/OnDocOffice.pdb index cbc634ef..75fc8df4 100644 Binary files a/Versandstrasse/bin/Debug/OnDocOffice.pdb and b/Versandstrasse/bin/Debug/OnDocOffice.pdb differ diff --git a/Versandstrasse/bin/Debug/Versandstrasse.dll b/Versandstrasse/bin/Debug/Versandstrasse.dll index 5bb758ff..b5901a4f 100644 Binary files a/Versandstrasse/bin/Debug/Versandstrasse.dll and b/Versandstrasse/bin/Debug/Versandstrasse.dll differ diff --git a/Versandstrasse/bin/Debug/Versandstrasse.pdb b/Versandstrasse/bin/Debug/Versandstrasse.pdb index 3b80a4f4..d77b1594 100644 Binary files a/Versandstrasse/bin/Debug/Versandstrasse.pdb and b/Versandstrasse/bin/Debug/Versandstrasse.pdb differ diff --git a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache index f8c4be91..3324392f 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache and b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache differ diff --git a/Versandstrasse/obj/Debug/Versandstrasse.dll b/Versandstrasse/obj/Debug/Versandstrasse.dll index 5bb758ff..b5901a4f 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.dll and b/Versandstrasse/obj/Debug/Versandstrasse.dll differ diff --git a/Versandstrasse/obj/Debug/Versandstrasse.pdb b/Versandstrasse/obj/Debug/Versandstrasse.pdb index 3b80a4f4..d77b1594 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.pdb and b/Versandstrasse/obj/Debug/Versandstrasse.pdb differ diff --git a/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache b/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache index 3b1d693d..78e62d05 100644 Binary files a/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache and b/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache differ diff --git a/ZZPDFTest/bin/Debug/DOCGEN.dll b/ZZPDFTest/bin/Debug/DOCGEN.dll index 00742519..85d89af5 100644 Binary files a/ZZPDFTest/bin/Debug/DOCGEN.dll and b/ZZPDFTest/bin/Debug/DOCGEN.dll differ diff --git a/ZZPDFTest/bin/Debug/DOCGEN.pdb b/ZZPDFTest/bin/Debug/DOCGEN.pdb index 7ddfd298..3f4f2bdf 100644 Binary files a/ZZPDFTest/bin/Debug/DOCGEN.pdb and b/ZZPDFTest/bin/Debug/DOCGEN.pdb differ diff --git a/ZZPDFTest/bin/Debug/Database.dll b/ZZPDFTest/bin/Debug/Database.dll index 7280b31e..ca7f2ad0 100644 Binary files a/ZZPDFTest/bin/Debug/Database.dll and b/ZZPDFTest/bin/Debug/Database.dll differ diff --git a/ZZPDFTest/bin/Debug/Database.pdb b/ZZPDFTest/bin/Debug/Database.pdb index 18e13af0..966f2720 100644 Binary files a/ZZPDFTest/bin/Debug/Database.pdb and b/ZZPDFTest/bin/Debug/Database.pdb differ diff --git a/ZZPDFTest/bin/Debug/Model.dll b/ZZPDFTest/bin/Debug/Model.dll index 709316af..bf71e439 100644 Binary files a/ZZPDFTest/bin/Debug/Model.dll and b/ZZPDFTest/bin/Debug/Model.dll differ diff --git a/ZZPDFTest/bin/Debug/Model.pdb b/ZZPDFTest/bin/Debug/Model.pdb index 47969700..3536bbbd 100644 Binary files a/ZZPDFTest/bin/Debug/Model.pdb and b/ZZPDFTest/bin/Debug/Model.pdb differ diff --git a/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache b/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache index 35c7c756..0c9fdb8a 100644 Binary files a/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache and b/ZZPDFTest/obj/Debug/ZZPDFTest.csproj.AssemblyReference.cache differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Database.dll b/ZZ_BarcpdeFromFont/bin/Debug/Database.dll index 7280b31e..ca7f2ad0 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Database.dll and b/ZZ_BarcpdeFromFont/bin/Debug/Database.dll differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb b/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb index 18e13af0..966f2720 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb and b/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Model.dll b/ZZ_BarcpdeFromFont/bin/Debug/Model.dll index 709316af..bf71e439 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Model.dll and b/ZZ_BarcpdeFromFont/bin/Debug/Model.dll differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb b/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb index 47969700..3536bbbd 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb and b/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb differ diff --git a/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache b/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache index e10e3831..d178bdfb 100644 Binary files a/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache and b/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache differ diff --git a/ZZ_Signature_C/bin/Debug/DOCGEN.dll b/ZZ_Signature_C/bin/Debug/DOCGEN.dll index 00742519..85d89af5 100644 Binary files a/ZZ_Signature_C/bin/Debug/DOCGEN.dll and b/ZZ_Signature_C/bin/Debug/DOCGEN.dll differ diff --git a/ZZ_Signature_C/bin/Debug/DOCGEN.pdb b/ZZ_Signature_C/bin/Debug/DOCGEN.pdb index 7ddfd298..3f4f2bdf 100644 Binary files a/ZZ_Signature_C/bin/Debug/DOCGEN.pdb and b/ZZ_Signature_C/bin/Debug/DOCGEN.pdb differ diff --git a/ZZ_Signature_C/bin/Debug/Database.dll b/ZZ_Signature_C/bin/Debug/Database.dll index 7280b31e..ca7f2ad0 100644 Binary files a/ZZ_Signature_C/bin/Debug/Database.dll and b/ZZ_Signature_C/bin/Debug/Database.dll differ diff --git a/ZZ_Signature_C/bin/Debug/Database.pdb b/ZZ_Signature_C/bin/Debug/Database.pdb index 18e13af0..966f2720 100644 Binary files a/ZZ_Signature_C/bin/Debug/Database.pdb and b/ZZ_Signature_C/bin/Debug/Database.pdb differ diff --git a/ZZ_Signature_C/bin/Debug/Model.dll b/ZZ_Signature_C/bin/Debug/Model.dll index 709316af..bf71e439 100644 Binary files a/ZZ_Signature_C/bin/Debug/Model.dll and b/ZZ_Signature_C/bin/Debug/Model.dll differ diff --git a/ZZ_Signature_C/bin/Debug/Model.pdb b/ZZ_Signature_C/bin/Debug/Model.pdb index 47969700..3536bbbd 100644 Binary files a/ZZ_Signature_C/bin/Debug/Model.pdb and b/ZZ_Signature_C/bin/Debug/Model.pdb differ diff --git a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache index fe2542e1..d6bd00a4 100644 Binary files a/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache and b/ZZ_Signature_C/obj/Debug/ZZ_Signature_C.csproj.AssemblyReference.cache differ diff --git a/vbBarcodes/bin/Debug/Database.dll b/vbBarcodes/bin/Debug/Database.dll index 7280b31e..ca7f2ad0 100644 Binary files a/vbBarcodes/bin/Debug/Database.dll and b/vbBarcodes/bin/Debug/Database.dll differ diff --git a/vbBarcodes/bin/Debug/Database.pdb b/vbBarcodes/bin/Debug/Database.pdb index 18e13af0..966f2720 100644 Binary files a/vbBarcodes/bin/Debug/Database.pdb and b/vbBarcodes/bin/Debug/Database.pdb differ diff --git a/vbBarcodes/bin/Debug/Model.dll b/vbBarcodes/bin/Debug/Model.dll index 709316af..bf71e439 100644 Binary files a/vbBarcodes/bin/Debug/Model.dll and b/vbBarcodes/bin/Debug/Model.dll differ diff --git a/vbBarcodes/bin/Debug/Model.pdb b/vbBarcodes/bin/Debug/Model.pdb index 47969700..3536bbbd 100644 Binary files a/vbBarcodes/bin/Debug/Model.pdb and b/vbBarcodes/bin/Debug/Model.pdb differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache index f537597d..7d4be3aa 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache and b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache differ diff --git a/zz_winsign/Form1.Designer.cs b/zz_winsign/Form1.Designer.cs index 475cd311..cafd8094 100644 --- a/zz_winsign/Form1.Designer.cs +++ b/zz_winsign/Form1.Designer.cs @@ -40,6 +40,7 @@ this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.button2 = new System.Windows.Forms.Button(); this.SuspendLayout(); // // sign1 @@ -171,11 +172,22 @@ this.label5.TabIndex = 29; this.label5.Text = "Farbe"; // + // button2 + // + this.button2.Location = new System.Drawing.Point(208, 327); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.TabIndex = 30; + this.button2.Text = "WPF"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1051, 389); + this.Controls.Add(this.button2); this.Controls.Add(this.label5); this.Controls.Add(this.label4); this.Controls.Add(this.button1); @@ -209,6 +221,7 @@ private System.Windows.Forms.SaveFileDialog saveFileDialog1; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label5; + private System.Windows.Forms.Button button2; } } diff --git a/zz_winsign/Form1.cs b/zz_winsign/Form1.cs index 743d2361..be356742 100644 --- a/zz_winsign/Form1.cs +++ b/zz_winsign/Form1.cs @@ -101,5 +101,12 @@ namespace zz_winsign { sign1.ClearSignature(); } + + private void button2_Click(object sender, EventArgs e) + { + Form2 f = new Form2(); + f.Show(); + + } } } diff --git a/zz_winsign/Form2.Designer.cs b/zz_winsign/Form2.Designer.cs new file mode 100644 index 00000000..73506649 --- /dev/null +++ b/zz_winsign/Form2.Designer.cs @@ -0,0 +1,61 @@ +namespace zz_winsign +{ + partial class Form2 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.elementHost1 = new System.Windows.Forms.Integration.ElementHost(); + this.signControl1 = new zz_winsign.SignControl(); + this.SuspendLayout(); + // + // elementHost1 + // + this.elementHost1.Location = new System.Drawing.Point(12, 25); + this.elementHost1.Name = "elementHost1"; + this.elementHost1.Size = new System.Drawing.Size(776, 413); + this.elementHost1.TabIndex = 0; + this.elementHost1.Text = "elementHost1"; + this.elementHost1.Child = this.signControl1; + // + // Form2 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.elementHost1); + this.Name = "Form2"; + this.Text = "Form2"; + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Integration.ElementHost elementHost1; + private SignControl signControl1; + } +} \ No newline at end of file diff --git a/zz_winsign/Form2.cs b/zz_winsign/Form2.cs new file mode 100644 index 00000000..9f5fd490 --- /dev/null +++ b/zz_winsign/Form2.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace zz_winsign +{ + public partial class Form2 : Form + { + public Form2() + { + InitializeComponent(); + } + } +} diff --git a/zz_winsign/Form2.resx b/zz_winsign/Form2.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/zz_winsign/Form2.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/zz_winsign/SignControl.xaml b/zz_winsign/SignControl.xaml new file mode 100644 index 00000000..b46e77e2 --- /dev/null +++ b/zz_winsign/SignControl.xaml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + +