diff --git a/API_NetFramework/Controllers/MailController.cs b/API_NetFramework/Controllers/MailController.cs index 6ebe0258..f79ea382 100644 --- a/API_NetFramework/Controllers/MailController.cs +++ b/API_NetFramework/Controllers/MailController.cs @@ -91,10 +91,11 @@ namespace OnDocAPI_NetFramework.Controllers s = s.Replace("$$body$$", message); string debugdir = System.Configuration.ConfigurationManager.AppSettings["DebugDir"]; string tmpfile = debugdir + @"\Mail_" + DateTime.Now.ToString("yyyyMMdd_hhmmss") + ".ps1"; - StreamWriter writer = new StreamWriter(tmpfile); - writer.Write(s); - writer.Close(); - writer.Dispose(); + System.IO.File.WriteAllText(tmpfile, s); + //StreamWriter writer = new StreamWriter(tmpfile); + //writer.Write(s); + //writer.Close(); + //writer.Dispose(); System.Diagnostics.Process.Start("powershell.exe", tmpfile); APILogging.Log((HttpRequestMessage)Request, "Mail Versand: " + s, LogLevelType.Debug); //return Content(HttpStatusCode.OK, "Mail versand noch nicht implementiert"); diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index 50d47263..4a0276b7 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 cc7eb3a3..025a35e5 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 c92c3afc..fef1f8bf 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 e4fd69d1..5c2d9153 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 5f01c32c..90e447a0 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 80383a5e..c4b3995d 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 9b25cc37..a50524f2 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 4dd167c9..521482ea 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/bin/vbBarcodes.dll b/API_NetFramework/bin/vbBarcodes.dll index 2d6a4fbc..368c87de 100644 Binary files a/API_NetFramework/bin/vbBarcodes.dll and b/API_NetFramework/bin/vbBarcodes.dll differ diff --git a/API_NetFramework/bin/vbBarcodes.pdb b/API_NetFramework/bin/vbBarcodes.pdb index 50334496..f99eca97 100644 Binary files a/API_NetFramework/bin/vbBarcodes.pdb and b/API_NetFramework/bin/vbBarcodes.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index f28ca71b..dbad13a5 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -4334,3 +4334,316 @@ Parametername: encoder 2025-02-05 11:30:14.7145|DEBUG|OnDoc| 2025-02-05 11:30:14.7441|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal 2025-02-05 11:30:14.7441|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 09:53:09.0571|DEBUG|OnDoc| +2025-02-06 09:53:09.0871|DEBUG|OnDoc| +2025-02-06 09:53:09.1132|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-02-06 09:53:09.1132|INFO|OnDoc|Unterschrift-Bezug - nicht vorhanden: TG1807 DEMO-Unterschrfit verwendet +2025-02-06 09:53:09.1132|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-02-06 09:53:09.1943|DEBUG|OnDoc| +2025-02-06 09:53:09.2039|DEBUG|OnDoc| +2025-02-06 09:53:09.2279|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-06 09:53:09.2279|INFO|OnDoc|Unterschrift-Bezug - nicht vorhanden: TG6112 DEMO-Unterschrfit verwendet +2025-02-06 09:53:09.2341|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-06 09:53:24.7434|DEBUG|OnDoc| +2025-02-06 09:53:24.7434|DEBUG|OnDoc| +2025-02-06 09:53:24.7728|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-02-06 09:53:24.7728|INFO|OnDoc|Unterschrift-Bezug - nicht vorhanden: TG1807 DEMO-Unterschrfit verwendet +2025-02-06 09:53:24.7728|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-02-06 09:53:24.8129|DEBUG|OnDoc| +2025-02-06 09:53:24.8129|DEBUG|OnDoc| +2025-02-06 09:53:24.8379|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-06 09:53:24.8379|INFO|OnDoc|Unterschrift-Bezug - nicht vorhanden: TG6112 DEMO-Unterschrfit verwendet +2025-02-06 09:53:24.8379|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-06 09:54:10.1183|DEBUG|OnDoc| +2025-02-06 09:54:10.1183|DEBUG|OnDoc| +2025-02-06 09:54:10.1509|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-02-06 09:54:10.1541|INFO|OnDoc|Unterschrift-Bezug - nicht vorhanden: TG1807 DEMO-Unterschrfit verwendet +2025-02-06 09:54:10.1541|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-02-06 09:54:26.5478|INFO|OnDoc|Unterschriften-Image gespeichert - TG1807 +2025-02-06 09:54:27.4140|DEBUG|OnDoc| +2025-02-06 09:54:27.4236|DEBUG|OnDoc| +2025-02-06 09:54:27.4474|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-02-06 09:54:27.4474|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-02-06 09:54:42.6629|DEBUG|OnDoc| +2025-02-06 09:54:42.6629|DEBUG|OnDoc| +2025-02-06 09:54:42.6899|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-06 09:54:42.6899|INFO|OnDoc|Unterschrift-Bezug - nicht vorhanden: TG6112 DEMO-Unterschrfit verwendet +2025-02-06 09:54:42.6899|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-06 09:54:53.7809|INFO|OnDoc|Unterschriften-Image gespeichert - TG6112 +2025-02-06 09:54:54.9060|DEBUG|OnDoc| +2025-02-06 09:54:54.9060|DEBUG|OnDoc| +2025-02-06 09:54:54.9431|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-06 09:54:54.9431|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-06 09:55:10.5097|DEBUG|OnDoc| +2025-02-06 09:55:10.5097|DEBUG|OnDoc| +2025-02-06 09:55:10.5359|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-02-06 09:55:10.5359|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-02-06 09:55:10.5762|DEBUG|OnDoc| +2025-02-06 09:55:10.5762|DEBUG|OnDoc| +2025-02-06 09:55:10.6022|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-06 09:55:10.6022|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-06 09:55:48.7241|DEBUG|OnDoc| +2025-02-06 09:55:48.7241|DEBUG|OnDoc| +2025-02-06 09:55:48.7503|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-02-06 09:55:48.7503|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-02-06 09:55:48.7909|DEBUG|OnDoc| +2025-02-06 09:55:48.7909|DEBUG|OnDoc| +2025-02-06 09:55:48.8170|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-06 09:55:48.8170|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-06 09:58:34.1661|DEBUG|OnDoc| +2025-02-06 09:58:34.1661|DEBUG|OnDoc| +2025-02-06 09:58:34.1919|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-02-06 09:58:34.1919|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-02-06 09:58:34.2320|DEBUG|OnDoc| +2025-02-06 09:58:34.2340|DEBUG|OnDoc| +2025-02-06 09:58:34.2579|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-06 09:58:34.2579|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-06 10:00:40.2751|DEBUG|OnDoc| +2025-02-06 10:00:40.2851|DEBUG|OnDoc| +2025-02-06 10:00:40.3123|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-02-06 10:00:40.3123|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-02-06 10:00:40.3552|DEBUG|OnDoc| +2025-02-06 10:00:40.3582|DEBUG|OnDoc| +2025-02-06 10:00:40.3894|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-06 10:00:40.3894|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-06 10:02:01.5731|DEBUG|OnDoc| +2025-02-06 10:02:01.5761|DEBUG|OnDoc| +2025-02-06 10:02:01.5998|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 10:02:01.5998|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 10:02:33.5830|DEBUG|OnDoc| +2025-02-06 10:02:33.5830|DEBUG|OnDoc| +2025-02-06 10:02:33.6177|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 10:02:33.6177|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 10:02:50.2091|DEBUG|OnDoc| +2025-02-06 10:02:50.2091|DEBUG|OnDoc| +2025-02-06 10:02:50.2362|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 10:02:50.2362|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 10:02:52.3282|DEBUG|OnDoc| +2025-02-06 10:02:52.3282|DEBUG|OnDoc| +2025-02-06 10:02:52.3594|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 10:02:52.3594|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 10:03:13.6695|DEBUG|OnDoc| +2025-02-06 10:03:13.6715|DEBUG|OnDoc| +2025-02-06 10:03:13.6980|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 10:03:13.7010|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 10:03:22.1768|INFO|OnDoc|Unterschriften-Image gespeichert - Stefan Hutter lokal +2025-02-06 10:03:22.2156|DEBUG|OnDoc| +2025-02-06 10:03:22.2186|DEBUG|OnDoc| +2025-02-06 10:03:22.2422|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 10:03:22.2422|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 10:05:08.8596|DEBUG|OnDoc| +2025-02-06 10:05:08.8596|DEBUG|OnDoc| +2025-02-06 10:05:08.8899|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-02-06 10:05:08.8899|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-02-06 10:05:08.9351|DEBUG|OnDoc| +2025-02-06 10:05:08.9388|DEBUG|OnDoc| +2025-02-06 10:05:08.9634|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-06 10:05:08.9634|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-06 10:05:24.9200|DEBUG|OnDoc|Mailversand: 134 +2025-02-06 10:05:24.9767|DEBUG|OnDoc| +2025-02-06 10:05:24.9902|DEBUG|OnDoc| +2025-02-06 10:05:25.0332|DEBUG|OnDoc|Mail Versand: Send-MailMessage -from "OnDoc@tkb.ch" -to "stefan.hutter@tkb.ch" -Subject "Dokumentprüfung " -Body "Guten Tag + Das Dokument mit dier ID wurde zur Prüfung zugestellt. + Mit folgendem Link kann OnDoc-Prüfung direkt gestartet werden: + ondoc:?funktion=ucheck" -smtpServer smtp.tgcorp.ch +2025-02-06 10:05:25.0462|DEBUG|OnDoc|Mailversand: 1287 +2025-02-06 10:05:25.0749|DEBUG|OnDoc| +2025-02-06 10:05:25.0769|DEBUG|OnDoc| +2025-02-06 10:05:25.1034|DEBUG|OnDoc|Mail Versand: Send-MailMessage -from "OnDoc@tkb.ch" -to "stefan.hutter@tkb.ch" -Subject "Dokumentprüfung " -Body "Guten Tag + Das Dokument mit dier ID wurde zur Prüfung zugestellt. + Mit folgendem Link kann OnDoc-Prüfung direkt gestartet werden: + ondoc:?funktion=ucheck" -smtpServer smtp.tgcorp.ch +2025-02-06 10:25:07.6953|DEBUG|OnDoc| +2025-02-06 10:25:07.7361|DEBUG|OnDoc| +2025-02-06 10:25:07.7674|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG1807 +2025-02-06 10:25:07.7674|INFO|OnDoc|Unterschrift-Bezug: TG1807 +2025-02-06 10:25:07.8412|DEBUG|OnDoc| +2025-02-06 10:25:07.8512|DEBUG|OnDoc| +2025-02-06 10:25:07.8752|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG6112 +2025-02-06 10:25:07.8752|INFO|OnDoc|Unterschrift-Bezug: TG6112 +2025-02-06 10:25:48.9231|DEBUG|OnDoc|Mailversand: 134 +2025-02-06 10:25:48.9516|DEBUG|OnDoc| +2025-02-06 10:25:48.9516|DEBUG|OnDoc| +2025-02-06 10:25:48.9913|DEBUG|OnDoc|Mail Versand: Send-MailMessage -from "OnDoc@tkb.ch" -to "stefan.hutter@tkb.ch" -Subject "Dokumentprüfung " -Body "Guten Tag + Das Dokument mit dier ID wurde zur Prüfung zugestellt. + Mit folgendem Link kann OnDoc-Prüfung direkt gestartet werden: + ondoc:?funktion=ucheck" -smtpServer smtp.tgcorp.ch +2025-02-06 10:25:49.0023|DEBUG|OnDoc|Mailversand: 1287 +2025-02-06 10:25:49.0283|DEBUG|OnDoc| +2025-02-06 10:25:49.0366|DEBUG|OnDoc| +2025-02-06 10:25:49.0647|DEBUG|OnDoc|Mail Versand: Send-MailMessage -from "OnDoc@tkb.ch" -to "stefan.hutter@tkb.ch" -Subject "Dokumentprüfung " -Body "Guten Tag + Das Dokument mit dier ID wurde zur Prüfung zugestellt. + Mit folgendem Link kann OnDoc-Prüfung direkt gestartet werden: + ondoc:?funktion=ucheck" -smtpServer smtp.tgcorp.ch +2025-02-06 10:53:03.3713|DEBUG|OnDoc| +2025-02-06 10:53:03.4069|DEBUG|OnDoc| +2025-02-06 10:53:03.4337|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 10:53:03.4367|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 10:58:23.3922|DEBUG|OnDoc| +2025-02-06 10:58:23.4246|DEBUG|OnDoc| +2025-02-06 10:58:23.4530|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 10:58:23.4530|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 10:59:38.6799|DEBUG|OnDoc| +2025-02-06 10:59:38.6799|DEBUG|OnDoc| +2025-02-06 10:59:38.7102|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 10:59:38.7102|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 11:08:19.2996|DEBUG|OnDoc| +2025-02-06 11:08:19.3331|DEBUG|OnDoc| +2025-02-06 11:08:19.3596|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 11:08:19.3596|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 11:08:19.4179|DEBUG|OnDoc| +2025-02-06 11:08:19.4209|DEBUG|OnDoc| +2025-02-06 11:08:19.4454|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 11:08:19.4454|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 11:08:19.5050|DEBUG|OnDoc| +2025-02-06 11:08:19.5050|DEBUG|OnDoc| +2025-02-06 11:08:19.5275|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 +2025-02-06 11:08:19.6089|DEBUG|OnDoc| +2025-02-06 11:08:19.6089|DEBUG|OnDoc| +2025-02-06 11:08:19.6345|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 +2025-02-06 11:11:15.5721|DEBUG|OnDoc| +2025-02-06 11:11:15.5964|DEBUG|OnDoc| +2025-02-06 11:11:15.6252|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 11:11:15.6252|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 11:11:45.0057|DEBUG|OnDoc| +2025-02-06 11:11:45.0057|DEBUG|OnDoc| +2025-02-06 11:11:45.0357|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 11:11:45.0357|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 17:55:08.4517|DEBUG|OnDoc| +2025-02-06 17:55:08.4835|DEBUG|OnDoc| +2025-02-06 17:55:08.5106|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 17:55:08.5106|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 17:55:08.5879|DEBUG|OnDoc| +2025-02-06 17:55:08.5976|DEBUG|OnDoc| +2025-02-06 17:55:08.6137|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 +2025-02-06 17:55:54.3640|DEBUG|OnDoc| +2025-02-06 17:55:54.3756|DEBUG|OnDoc| +2025-02-06 17:55:54.4018|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 17:55:54.4053|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 17:55:54.4469|DEBUG|OnDoc| +2025-02-06 17:55:54.4469|DEBUG|OnDoc| +2025-02-06 17:55:54.4651|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 +2025-02-06 17:56:13.4388|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002489100 +2025-02-06 17:56:13.4388|DEBUG|OnDoc| +2025-02-06 17:56:13.4388|DEBUG|OnDoc| +2025-02-06 17:56:13.4388|DEBUG|OnDoc| +2025-02-06 17:56:13.4388|DEBUG|OnDoc| +2025-02-06 17:56:13.4518|DEBUG|OnDoc| +2025-02-06 17:56:13.4518|DEBUG|OnDoc| +2025-02-06 17:56:14.8411|DEBUG|OnDoc|Start Transfer to OnBase +2025-02-06 17:56:14.9907|DEBUG|OnDoc|Ende Transfer to OnBase +2025-02-06 17:56:15.0077|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002489100 +2025-02-06 17:56:15.0077|DEBUG|OnDoc|Start Updaet IL_Log: DokumentID:OFFEDK0082025002489100 +2025-02-06 17:56:15.0173|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002489100 +2025-02-06 17:56:15.0173|DEBUG|OnDoc| +2025-02-06 17:56:15.0173|DEBUG|OnDoc| +2025-02-06 17:56:15.0173|DEBUG|OnDoc| +2025-02-06 17:56:15.0649|DEBUG|OnDoc| +2025-02-06 17:56:15.0649|DEBUG|OnDoc| +2025-02-06 17:56:15.0649|DEBUG|OnDoc| +2025-02-06 18:04:20.1880|DEBUG|OnDoc| +2025-02-06 18:04:20.2218|DEBUG|OnDoc| +2025-02-06 18:04:20.2509|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 18:04:20.2509|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 18:04:20.3277|DEBUG|OnDoc| +2025-02-06 18:04:20.3277|DEBUG|OnDoc| +2025-02-06 18:04:20.3557|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 +2025-02-06 18:06:10.5323|DEBUG|OnDoc| +2025-02-06 18:06:10.5649|DEBUG|OnDoc| +2025-02-06 18:06:10.5919|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-02-06 18:06:10.5919|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-02-06 18:06:10.6576|DEBUG|OnDoc| +2025-02-06 18:06:10.6576|DEBUG|OnDoc| +2025-02-06 18:06:10.6810|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 +2025-02-06 18:06:28.3622|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002489111 +2025-02-06 18:06:28.3622|DEBUG|OnDoc| +2025-02-06 18:06:28.3622|DEBUG|OnDoc| +2025-02-06 18:06:28.3622|DEBUG|OnDoc| +2025-02-06 18:06:28.3622|DEBUG|OnDoc| +2025-02-06 18:06:28.3622|DEBUG|OnDoc| +2025-02-06 18:06:28.3816|DEBUG|OnDoc| +2025-02-06 18:07:05.9375|DEBUG|OnDoc|Start Transfer to OnBase +2025-02-06 18:07:06.1361|DEBUG|OnDoc|Ende Transfer to OnBase +2025-02-06 18:07:06.1660|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002489111 +2025-02-06 18:07:06.1660|DEBUG|OnDoc|Start Updaet IL_Log: DokumentID:OFFEDK0082025002489111 +2025-02-06 18:07:06.1775|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002489111 +2025-02-06 18:07:06.1775|DEBUG|OnDoc| +2025-02-06 18:07:06.1775|DEBUG|OnDoc| +2025-02-06 18:07:06.1775|DEBUG|OnDoc| +2025-02-06 18:07:06.1880|DEBUG|OnDoc| +2025-02-06 18:07:06.1880|DEBUG|OnDoc| +2025-02-06 18:07:06.1880|DEBUG|OnDoc| +2025-02-06 19:22:36.7304|DEBUG|OnDoc|Mailversand: test@test.tkbDübel +2025-02-06 19:22:54.6384|DEBUG|OnDoc|Mailversand: test@tkb.chDübel +2025-02-06 19:22:57.3634|DEBUG|OnDoc| +2025-02-06 19:22:57.3739|DEBUG|OnDoc| +2025-02-06 19:23:03.9692|DEBUG|OnDoc|Mail Versand NOK: Ein Objekt kann nicht von DBNull in andere Typen umgewandelt werden. +2025-02-06 19:23:16.5719|DEBUG|OnDoc|Mailversand: test@tkb.chtest +2025-02-06 19:23:19.2171|DEBUG|OnDoc| +2025-02-06 19:23:19.2171|DEBUG|OnDoc| +2025-02-06 19:23:26.8042|DEBUG|OnDoc|Mail Versand NOK: Ein Objekt kann nicht von DBNull in andere Typen umgewandelt werden. +2025-02-06 19:24:14.0280|DEBUG|OnDoc|Mailversand: test@tkb.chäöü ÄÖÜ +2025-02-06 19:24:16.4722|DEBUG|OnDoc| +2025-02-06 19:24:16.4722|DEBUG|OnDoc| +2025-02-06 19:24:23.4277|DEBUG|OnDoc|Mail Versand NOK: Ein Objekt kann nicht von DBNull in andere Typen umgewandelt werden. +2025-02-06 19:26:55.1474|DEBUG|OnDoc|Mailversand: 1äöü ÄÖÜ +2025-02-06 19:26:57.6743|DEBUG|OnDoc| +2025-02-06 19:26:57.6854|DEBUG|OnDoc| +2025-02-06 19:30:32.7368|DEBUG|OnDoc|Mailversand: 1äöü +2025-02-06 19:30:32.8478|ERROR|OnDoc|Unberechtigter Zugriff +2025-02-06 19:31:32.9725|DEBUG|OnDoc|Mailversand: 1äöü +2025-02-06 19:31:35.4956|DEBUG|OnDoc| +2025-02-06 19:31:35.5060|DEBUG|OnDoc| +2025-02-06 19:33:05.1253|DEBUG|OnDoc|Start Adresse GetAll +2025-02-06 19:33:05.1852|DEBUG|OnDoc| +2025-02-06 19:33:05.1914|DEBUG|OnDoc| +2025-02-06 19:33:05.1914|DEBUG|OnDoc|Ende Adresse GetAll +2025-02-06 19:33:08.5036|DEBUG|OnDoc|Start Adresse GetAll +2025-02-06 19:33:08.5387|DEBUG|OnDoc| +2025-02-06 19:33:08.5387|DEBUG|OnDoc| +2025-02-06 19:33:08.5387|DEBUG|OnDoc|Ende Adresse GetAll +2025-02-06 19:33:15.9833|DEBUG|OnDoc|Start Adresse GetAll +2025-02-06 19:33:16.0191|DEBUG|OnDoc| +2025-02-06 19:33:16.0191|DEBUG|OnDoc| +2025-02-06 19:33:16.0191|DEBUG|OnDoc|Ende Adresse GetAll +2025-02-06 19:33:22.0870|DEBUG|OnDoc|Start Adresse GetAll +2025-02-06 19:33:22.1223|DEBUG|OnDoc| +2025-02-06 19:33:22.1243|DEBUG|OnDoc| +2025-02-06 19:33:22.1243|DEBUG|OnDoc|Ende Adresse GetAll +2025-02-06 19:33:25.3878|DEBUG|OnDoc|Start Adresse GetAll +2025-02-06 19:33:25.4233|DEBUG|OnDoc| +2025-02-06 19:33:25.4233|DEBUG|OnDoc| +2025-02-06 19:33:25.4233|DEBUG|OnDoc|Ende Adresse GetAll +2025-02-06 19:33:38.0825|DEBUG|OnDoc|Start Adresse GetByID ID:% +2025-02-06 19:33:38.1178|DEBUG|OnDoc| +2025-02-06 19:33:38.1509|ERROR|OnDoc|Falsche Syntax in der Nähe des for-Schlüsselworts. +2025-02-06 19:33:38.1685|ERROR|OnDoc|Die Tabelle 0 kann nicht gefunden werden. +2025-02-06 19:33:43.1273|DEBUG|OnDoc|Start Adresse GetByID ID:* +2025-02-06 19:33:43.1633|DEBUG|OnDoc| +2025-02-06 19:33:43.1893|ERROR|OnDoc|Falsche Syntax in der Nähe von "*". +2025-02-06 19:33:43.2053|ERROR|OnDoc|Die Tabelle 0 kann nicht gefunden werden. +2025-02-06 19:34:03.2014|DEBUG|OnDoc|Start Adresse GetByID ID:update mitarbeiter set mitarbeiternr=1 where mitarbeiternr=1 +2025-02-06 19:34:03.2375|DEBUG|OnDoc| +2025-02-06 19:34:03.2746|ERROR|OnDoc|Falsche Syntax in der Nähe des update-Schlüsselworts. +Die FOR JSON-Klausel ist in einer UPDATE-Anweisung nicht zulässig. +2025-02-06 19:34:03.2977|ERROR|OnDoc|Die Tabelle 0 kann nicht gefunden werden. +2025-02-06 19:34:13.4012|DEBUG|OnDoc|Start GetMitarbeiterByID ID: 1 +2025-02-06 19:34:13.4366|DEBUG|OnDoc| +2025-02-06 19:34:13.4366|DEBUG|OnDoc| +2025-02-06 19:34:13.4366|DEBUG|OnDoc|Ende GetMitarbeiterByID ID: 1 +2025-02-06 19:34:17.6241|DEBUG|OnDoc|Start GetMitarbeiterByID ID: 1 +2025-02-06 19:34:17.6594|DEBUG|OnDoc| +2025-02-06 19:34:17.6594|DEBUG|OnDoc| +2025-02-06 19:34:17.6594|DEBUG|OnDoc|Ende GetMitarbeiterByID ID: 1 +2025-02-06 19:34:21.3636|DEBUG|OnDoc|Start GetMitarbeiterByID ID: 1 +2025-02-06 19:34:21.3996|DEBUG|OnDoc| +2025-02-06 19:34:21.3996|DEBUG|OnDoc| +2025-02-06 19:34:21.3996|DEBUG|OnDoc|Ende GetMitarbeiterByID ID: 1 +2025-02-06 19:34:35.0720|DEBUG|OnDoc|Start GetDocument DokumentID:* +2025-02-06 19:34:35.1093|DEBUG|OnDoc| +2025-02-06 19:34:35.1093|DEBUG|OnDoc| +2025-02-06 19:34:35.3015|DEBUG|OnDoc|Ende GetDocument DokumentID:* +2025-02-06 19:34:40.9797|DEBUG|OnDoc|Start GetDocument DokumentID:% +2025-02-06 19:34:41.0153|DEBUG|OnDoc| +2025-02-06 19:34:41.0153|DEBUG|OnDoc| +2025-02-06 19:34:41.0933|DEBUG|OnDoc|Ende GetDocument DokumentID:% diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 453b727e..b48d3297 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 9b25cc37..a50524f2 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 4dd167c9..521482ea 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll index c92c3afc..fef1f8bf 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 e4fd69d1..5c2d9153 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 64c35511..021d1580 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/Client/Client.csproj.user b/Client/Client.csproj.user index 39d8a2bb..d0ffe724 100644 --- a/Client/Client.csproj.user +++ b/Client/Client.csproj.user @@ -1,7 +1,8 @@  - ondoc:%3fpartnernr=1000208&struktur=Verträge&funktion=createdoc&id=OFFEDK0082025002488929 + + publish\ diff --git a/Client/Diverses/InputDialog.Designer.cs b/Client/Diverses/InputDialog.Designer.cs index ac15c4f9..08e51914 100644 --- a/Client/Diverses/InputDialog.Designer.cs +++ b/Client/Diverses/InputDialog.Designer.cs @@ -43,6 +43,7 @@ this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(349, 20); this.textBox1.TabIndex = 0; + this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged); this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // // label1 diff --git a/Client/Diverses/InputDialog.cs b/Client/Diverses/InputDialog.cs index a23b6803..5ee9476e 100644 --- a/Client/Diverses/InputDialog.cs +++ b/Client/Diverses/InputDialog.cs @@ -140,5 +140,10 @@ namespace OnDoc.Diverses { btnok.Enabled = true; } + + private void textBox1_TextChanged(object sender, EventArgs e) + { + if (textBox1.Text.Trim().Length > 0) btnok.Enabled = true; else btnok.Enabled = false; + } } } diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index d89c9374..fed7a1d2 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -64,7 +64,7 @@ this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(165, 26); this.label2.TabIndex = 2; - this.label2.Text = "5. Februar 2025"; + this.label2.Text = "6. Februar 2025"; // // SplashScreen // diff --git a/Client/Klassen/clsProcessWatch.cs b/Client/Klassen/clsProcessWatch.cs index bc428142..9793e0ff 100644 --- a/Client/Klassen/clsProcessWatch.cs +++ b/Client/Klassen/clsProcessWatch.cs @@ -103,7 +103,6 @@ namespace OnDoc.Klassen } - } private static void Remove_Dok_in_Bearbeitung(string dokumentid) { diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index d709ceec..7dfdc5b5 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -33,8 +33,15 @@ namespace OnDoc.UICintrols this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DokList)); this.ctxMenuDokList = new System.Windows.Forms.ContextMenuStrip(this.components); + this.dokumentAnzeigenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dokumentBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dokumentLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.zurUnterschriftenPrüfungToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dokumentUnterzeichnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.archivierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.druckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dokumentKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.barcodeDemoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.vertragPDFDEMOToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -42,129 +49,125 @@ namespace OnDoc.UICintrols this.pDFGenerierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dokumentAnVersandstrasseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.gruppenÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.gruppenSchliessenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.tsrbvorschau = new System.Windows.Forms.ToolStripComboBox(); + this.tsbtnpreviewno = new System.Windows.Forms.ToolStripButton(); + this.tsbtnpreviewbottom = new System.Windows.Forms.ToolStripButton(); + this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid(); - this.docPreview1 = new OnDoc.UIControls.DocPreview(); this.panel2 = new System.Windows.Forms.Panel(); this.lblTitel = new System.Windows.Forms.Label(); this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel(); this.ribbon2 = new System.Windows.Forms.Ribbon(); this.RibbonTabUserFunctions = new System.Windows.Forms.RibbonTab(); - this.RibbonPanelExit = new System.Windows.Forms.RibbonPanel(); - this.RibbonPanelBearbeiten = new System.Windows.Forms.RibbonPanel(); - this.ribbonPanelZuweisung = new System.Windows.Forms.RibbonPanel(); - this.RibbonPannelAproval = new System.Windows.Forms.RibbonPanel(); - this.ribbonItemGroupApproveCounter = new System.Windows.Forms.RibbonItemGroup(); - this.ribbonLabelToApprove = new System.Windows.Forms.RibbonLabel(); - this.RibbonPanelArchiv = new System.Windows.Forms.RibbonPanel(); - this.RibbonPanelDemo = new System.Windows.Forms.RibbonPanel(); - this.RibbonPanelSuche = new System.Windows.Forms.RibbonPanel(); - this.ribbonGroupMitarbeiter = new System.Windows.Forms.RibbonItemGroup(); - this.RibbonGroupFilter = new System.Windows.Forms.RibbonItemGroup(); - this.RibbonFilterLabel = new System.Windows.Forms.RibbonLabel(); - this.ribbonPannelDiverseVorlagen = new System.Windows.Forms.RibbonPanel(); - this.RibbonPanelDoklist = new System.Windows.Forms.RibbonPanel(); - this.ribbonTabAnsicht = new System.Windows.Forms.RibbonTab(); - this.RibbonPannelAnsicht = new System.Windows.Forms.RibbonPanel(); - this.ribbonItemGroup2 = new System.Windows.Forms.RibbonItemGroup(); - this.ribboncomboboxansicht = new System.Windows.Forms.RibbonLabel(); - this.ribbonCBAnsicht = new System.Windows.Forms.RibbonComboBox(); - this.ribbonItemGroup3 = new System.Windows.Forms.RibbonItemGroup(); - this.ribbonPanelVorschau = new System.Windows.Forms.RibbonPanel(); - this.ribbonPanelAttribute = new System.Windows.Forms.RibbonPanel(); - this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); - this.ribbonTabDokpaket_Serienbrief = new System.Windows.Forms.RibbonTab(); - this.RibbonPanelCreate = new System.Windows.Forms.RibbonPanel(); - this.ribbonTabProfil = new System.Windows.Forms.RibbonTab(); - this.RibbonPanelProfil = new System.Windows.Forms.RibbonPanel(); - this.ribbonItemGroup1 = new System.Windows.Forms.RibbonItemGroup(); - this.ribbonLabel1 = new System.Windows.Forms.RibbonLabel(); - this.RibbonCBProfil = new System.Windows.Forms.RibbonComboBox(); - this.RibbonTabNativVorlagen = new System.Windows.Forms.RibbonTab(); - this.ribbonPanelNativVorlagen = new System.Windows.Forms.RibbonPanel(); - this.RibbonTabAdmin = new System.Windows.Forms.RibbonTab(); - this.RibbonPanelDiverses = new System.Windows.Forms.RibbonPanel(); - this.ribbonAnmelden = new System.Windows.Forms.RibbonPanel(); - this.ribbonVorlagen = new System.Windows.Forms.RibbonPanel(); - this.ribbonBerechtigung = new System.Windows.Forms.RibbonPanel(); - this.ribbonpanelanalyse = new System.Windows.Forms.RibbonPanel(); - this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel(); - this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig(); - this.timer1 = new System.Windows.Forms.Timer(this.components); - this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig(); - this.ctxMenuGroups = new System.Windows.Forms.ContextMenuStrip(this.components); - this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.dokwerte1 = new OnDoc.UIControls.Dokwerte(); - this.dokumentAnzeigenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dokumentBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dokumentLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.zurUnterschriftenPrüfungToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.archivierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.druckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dokumentKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tsbtnpreviewno = new System.Windows.Forms.ToolStripButton(); - this.tsbtnpreviewbottom = new System.Windows.Forms.ToolStripButton(); - this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton(); - this.RibbonButtonExit = new System.Windows.Forms.RibbonButton(); + this.ribbonPanelNeu = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonNewDoc = new System.Windows.Forms.RibbonButton(); this.RibbonButtonFavoriten = new System.Windows.Forms.RibbonButton(); + this.RibbonPanelExit = new System.Windows.Forms.RibbonPanel(); + this.RibbonButtonExit = new System.Windows.Forms.RibbonButton(); + this.RibbonPanelBearbeiten = new System.Windows.Forms.RibbonPanel(); this.ribbibButtonShowDoc = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditEditDoc = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditDelete = new System.Windows.Forms.RibbonButton(); + this.ribbonPanelZuweisung = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonZuweisen = new System.Windows.Forms.RibbonButton(); this.ribbonButtonToApproval = new System.Windows.Forms.RibbonButton(); + this.RibbonPannelAproval = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonApproval = new System.Windows.Forms.RibbonButton(); + this.ribbonItemGroupApproveCounter = new System.Windows.Forms.RibbonItemGroup(); this.ribbonButtonRefresh_Bewilligungen = new System.Windows.Forms.RibbonButton(); + this.ribbonLabelToApprove = new System.Windows.Forms.RibbonLabel(); + this.RibbonPanelArchiv = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonArchivToOnBase = new System.Windows.Forms.RibbonButton(); this.ribbonButtonVersandstrasse = new System.Windows.Forms.RibbonButton(); + this.RibbonPanelDemo = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonTest1 = new System.Windows.Forms.RibbonButton(); + this.RibbonPanelSuche = new System.Windows.Forms.RibbonPanel(); + this.ribbonGroupMitarbeiter = new System.Windows.Forms.RibbonItemGroup(); this.ribbonButtonGetMA = new System.Windows.Forms.RibbonButton(); this.ribbonDokumntID = new System.Windows.Forms.RibbonButton(); this.ribbonButton3 = new System.Windows.Forms.RibbonButton(); + this.RibbonGroupFilter = new System.Windows.Forms.RibbonItemGroup(); + this.RibbonFilterLabel = new System.Windows.Forms.RibbonLabel(); this.RibbonPartnerSaldiert = new System.Windows.Forms.RibbonButton(); this.RibbonFilterDelete = new System.Windows.Forms.RibbonButton(); this.ribbonbuttonnewparterdoc = new System.Windows.Forms.RibbonButton(); + this.ribbonPannelDiverseVorlagen = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonNativ = new System.Windows.Forms.RibbonButton(); + this.RibbonPanelDoklist = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonRefresh = new System.Windows.Forms.RibbonButton(); + this.ribbonTabAnsicht = new System.Windows.Forms.RibbonTab(); + this.RibbonPannelAnsicht = new System.Windows.Forms.RibbonPanel(); + this.ribbonItemGroup2 = new System.Windows.Forms.RibbonItemGroup(); + this.ribboncomboboxansicht = new System.Windows.Forms.RibbonLabel(); + this.ribbonCBAnsicht = new System.Windows.Forms.RibbonComboBox(); + this.ribbonItemGroup3 = new System.Windows.Forms.RibbonItemGroup(); this.RibbonButtonViewStandard = new System.Windows.Forms.RibbonButton(); this.RibbonButtonViewSave = new System.Windows.Forms.RibbonButton(); this.RibbonButtonViewDelete = new System.Windows.Forms.RibbonButton(); this.ribbonSaveGridView = new System.Windows.Forms.RibbonButton(); + this.ribbonPanelVorschau = new System.Windows.Forms.RibbonPanel(); this.RibbonBtnVorschauNo = new System.Windows.Forms.RibbonButton(); this.RibbonBtnVorschauUnten = new System.Windows.Forms.RibbonButton(); this.RibbonButtonVorschauRechts = new System.Windows.Forms.RibbonButton(); this.RibbonBtnVorschauSepparat = new System.Windows.Forms.RibbonButton(); + this.ribbonPanelAttribute = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonAttributeEinAusblenden = new System.Windows.Forms.RibbonButton(); + this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); this.ribbonButton6 = new System.Windows.Forms.RibbonButton(); + this.ribbonTabDokpaket_Serienbrief = new System.Windows.Forms.RibbonTab(); + this.RibbonPanelCreate = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonCreateNewPaket = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditPaket = new System.Windows.Forms.RibbonButton(); this.RibbonButtonCreateNewSerienbrief = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditSerienbrief = new System.Windows.Forms.RibbonButton(); + this.ribbonTabProfil = new System.Windows.Forms.RibbonTab(); + this.RibbonPanelProfil = new System.Windows.Forms.RibbonPanel(); + this.ribbonItemGroup1 = new System.Windows.Forms.RibbonItemGroup(); + this.ribbonLabel1 = new System.Windows.Forms.RibbonLabel(); + this.RibbonCBProfil = new System.Windows.Forms.RibbonComboBox(); this.ribbonButton1 = new System.Windows.Forms.RibbonButton(); + this.RibbonTabNativVorlagen = new System.Windows.Forms.RibbonTab(); + this.ribbonPanelNativVorlagen = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonNativVorlagen = new System.Windows.Forms.RibbonButton(); + this.RibbonTabAdmin = new System.Windows.Forms.RibbonTab(); + this.RibbonPanelDiverses = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonBCK = new System.Windows.Forms.RibbonButton(); + this.ribbonAnmelden = new System.Windows.Forms.RibbonPanel(); this.ribbonbuttonlogin = new System.Windows.Forms.RibbonButton(); + this.ribbonVorlagen = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonDokumenttyp = new System.Windows.Forms.RibbonButton(); this.RibbonButtonVorlagen = new System.Windows.Forms.RibbonButton(); this.ribbonButtonVorlagenfeldregel = new System.Windows.Forms.RibbonButton(); + this.ribbonBerechtigung = new System.Windows.Forms.RibbonPanel(); this.ribbonButton2 = new System.Windows.Forms.RibbonButton(); this.RibbonButtonBerechtigungsgruppe = new System.Windows.Forms.RibbonButton(); this.ribbonButtonSysadmins = new System.Windows.Forms.RibbonButton(); + this.ribbonpanelanalyse = new System.Windows.Forms.RibbonPanel(); this.ribbonbuttonedklog = new System.Windows.Forms.RibbonButton(); this.ribbonbuttonedkverarbeitung = new System.Windows.Forms.RibbonButton(); + this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel(); this.ribbonButton4 = new System.Windows.Forms.RibbonButton(); + this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel(); + this.ribbonButtonDokinBearbeitung = new System.Windows.Forms.RibbonButton(); + this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig(); + this.timer1 = new System.Windows.Forms.Timer(this.components); + this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig(); + this.ctxMenuGroups = new System.Windows.Forms.ContextMenuStrip(this.components); + this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton(); this.ribbonButton5 = new System.Windows.Forms.RibbonButton(); + this.docPreview1 = new OnDoc.UIControls.DocPreview(); + this.dokwerte1 = new OnDoc.UIControls.Dokwerte(); this.ctxMenuDokList.SuspendLayout(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -205,11 +208,43 @@ namespace OnDoc.UICintrols this.ctxMenuDokList.Size = new System.Drawing.Size(280, 462); this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening); // + // dokumentAnzeigenToolStripMenuItem + // + this.dokumentAnzeigenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.ShowDoc_16x16_32; + this.dokumentAnzeigenToolStripMenuItem.Name = "dokumentAnzeigenToolStripMenuItem"; + this.dokumentAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.dokumentAnzeigenToolStripMenuItem.Text = "Dokument anzeigen"; + this.dokumentAnzeigenToolStripMenuItem.Click += new System.EventHandler(this.dokumentAnzeigenToolStripMenuItem_Click); + // + // dokumentBearbeitenToolStripMenuItem + // + this.dokumentBearbeitenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.EditDoc_16x16_32; + this.dokumentBearbeitenToolStripMenuItem.Name = "dokumentBearbeitenToolStripMenuItem"; + this.dokumentBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.dokumentBearbeitenToolStripMenuItem.Text = "Dokument bearbeiten"; + this.dokumentBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.dokumentBearbeitenToolStripMenuItem_Click); + // + // dokumentLöschenToolStripMenuItem + // + this.dokumentLöschenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.DeleteDoc_16x16_32; + this.dokumentLöschenToolStripMenuItem.Name = "dokumentLöschenToolStripMenuItem"; + this.dokumentLöschenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.dokumentLöschenToolStripMenuItem.Text = "Dokument löschen"; + this.dokumentLöschenToolStripMenuItem.Click += new System.EventHandler(this.dokumentLöschenToolStripMenuItem_Click); + // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Size = new System.Drawing.Size(276, 6); // + // zurUnterschriftenPrüfungToolStripMenuItem + // + this.zurUnterschriftenPrüfungToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Approval_16x16_32; + this.zurUnterschriftenPrüfungToolStripMenuItem.Name = "zurUnterschriftenPrüfungToolStripMenuItem"; + this.zurUnterschriftenPrüfungToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.zurUnterschriftenPrüfungToolStripMenuItem.Text = "Zur Unterschriften-Prüfung"; + this.zurUnterschriftenPrüfungToolStripMenuItem.Click += new System.EventHandler(this.zurUnterschriftenPrüfungToolStripMenuItem_Click); + // // dokumentUnterzeichnenToolStripMenuItem // this.dokumentUnterzeichnenToolStripMenuItem.Name = "dokumentUnterzeichnenToolStripMenuItem"; @@ -218,6 +253,31 @@ namespace OnDoc.UICintrols this.dokumentUnterzeichnenToolStripMenuItem.Visible = false; this.dokumentUnterzeichnenToolStripMenuItem.Click += new System.EventHandler(this.dokumentUnterzeichnenToolStripMenuItem_Click); // + // archivierenToolStripMenuItem + // + this.archivierenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("archivierenToolStripMenuItem.Image"))); + this.archivierenToolStripMenuItem.Name = "archivierenToolStripMenuItem"; + this.archivierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.archivierenToolStripMenuItem.Text = "Archivieren"; + this.archivierenToolStripMenuItem.Click += new System.EventHandler(this.archivierenToolStripMenuItem_Click); + // + // druckenToolStripMenuItem + // + this.druckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Printer_16x16_32; + this.druckenToolStripMenuItem.Name = "druckenToolStripMenuItem"; + this.druckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.druckenToolStripMenuItem.Text = "Drucken"; + this.druckenToolStripMenuItem.Visible = false; + this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click); + // + // dokumentKopierenToolStripMenuItem + // + this.dokumentKopierenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Copy_16x16_32; + this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem"; + this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren"; + this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click); + // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; @@ -269,6 +329,14 @@ namespace OnDoc.UICintrols this.wordInterOPEditToolStripMenuItem.Visible = false; this.wordInterOPEditToolStripMenuItem.Click += new System.EventHandler(this.wordInterOPEditToolStripMenuItem_Click); // + // attributeAnzeigenVersteckenToolStripMenuItem + // + this.attributeAnzeigenVersteckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Attribut_16x16_32; + this.attributeAnzeigenVersteckenToolStripMenuItem.Name = "attributeAnzeigenVersteckenToolStripMenuItem"; + this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute ein- / ausblenden"; + this.attributeAnzeigenVersteckenToolStripMenuItem.Click += new System.EventHandler(this.attributeAnzeigenVersteckenToolStripMenuItem_Click); + // // historyToolStripMenuItem // this.historyToolStripMenuItem.Name = "historyToolStripMenuItem"; @@ -276,6 +344,14 @@ namespace OnDoc.UICintrols this.historyToolStripMenuItem.Text = "History"; this.historyToolStripMenuItem.Click += new System.EventHandler(this.historyToolStripMenuItem_Click); // + // dokumentFürPartnerErstellenToolStripMenuItem + // + this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32; + this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem"; + this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); + this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen"; + this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click); + // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; @@ -335,6 +411,33 @@ namespace OnDoc.UICintrols this.tsrbvorschau.SelectedIndexChanged += new System.EventHandler(this.tsrbvorschau_SelectedIndexChanged); this.tsrbvorschau.TextChanged += new System.EventHandler(this.tsrbvorschau_TextChanged); // + // tsbtnpreviewno + // + this.tsbtnpreviewno.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbtnpreviewno.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewno.Image"))); + this.tsbtnpreviewno.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbtnpreviewno.Name = "tsbtnpreviewno"; + this.tsbtnpreviewno.Size = new System.Drawing.Size(23, 22); + this.tsbtnpreviewno.Text = "Keine Vorschau"; + // + // tsbtnpreviewbottom + // + this.tsbtnpreviewbottom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbtnpreviewbottom.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewbottom.Image"))); + this.tsbtnpreviewbottom.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbtnpreviewbottom.Name = "tsbtnpreviewbottom"; + this.tsbtnpreviewbottom.Size = new System.Drawing.Size(23, 22); + this.tsbtnpreviewbottom.Text = "Vorschau unten"; + // + // tsbtnpreviewright + // + this.tsbtnpreviewright.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbtnpreviewright.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewright.Image"))); + this.tsbtnpreviewright.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbtnpreviewright.Name = "tsbtnpreviewright"; + this.tsbtnpreviewright.Size = new System.Drawing.Size(23, 22); + this.tsbtnpreviewright.Text = "Vorschau rechts"; + // // splitContainer1 // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -381,16 +484,6 @@ namespace OnDoc.UICintrols this.sfDataGrid1.ColumnResizing += new Syncfusion.WinForms.DataGrid.Events.ColumnResizingEventHandler(this.sfDataGrid1_ColumnResizing); this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent); // - // docPreview1 - // - this.docPreview1.BackColor = System.Drawing.SystemColors.Control; - this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; - this.docPreview1.Location = new System.Drawing.Point(0, 0); - this.docPreview1.Name = "docPreview1"; - this.docPreview1.Size = new System.Drawing.Size(1709, 347); - this.docPreview1.TabIndex = 0; - this.docPreview1.ZoomPercentage = 0; - // // panel2 // this.panel2.BackColor = System.Drawing.Color.WhiteSmoke; @@ -459,6 +552,7 @@ namespace OnDoc.UICintrols // RibbonTabUserFunctions // this.RibbonTabUserFunctions.Name = "RibbonTabUserFunctions"; + this.RibbonTabUserFunctions.Panels.Add(this.ribbonPanelNeu); this.RibbonTabUserFunctions.Panels.Add(this.RibbonPanelExit); this.RibbonTabUserFunctions.Panels.Add(this.RibbonPanelBearbeiten); this.RibbonTabUserFunctions.Panels.Add(this.ribbonPanelZuweisung); @@ -470,6 +564,32 @@ namespace OnDoc.UICintrols this.RibbonTabUserFunctions.Panels.Add(this.RibbonPanelDoklist); this.RibbonTabUserFunctions.Text = "Start"; // + // ribbonPanelNeu + // + this.ribbonPanelNeu.Items.Add(this.RibbonButtonNewDoc); + this.ribbonPanelNeu.Items.Add(this.RibbonButtonFavoriten); + this.ribbonPanelNeu.Name = "ribbonPanelNeu"; + this.ribbonPanelNeu.Text = "Neu"; + // + // RibbonButtonNewDoc + // + this.RibbonButtonNewDoc.Image = global::OnDoc.Properties.Resources.NewDoc_32x32_32; + this.RibbonButtonNewDoc.LargeImage = global::OnDoc.Properties.Resources.NewDoc_32x32_32; + this.RibbonButtonNewDoc.Name = "RibbonButtonNewDoc"; + this.RibbonButtonNewDoc.SmallImage = global::OnDoc.Properties.Resources.NewDoc_32x32_32; + this.RibbonButtonNewDoc.Text = "Dokument"; + this.RibbonButtonNewDoc.DoubleClick += new System.EventHandler(this.RibbonButtonNewDoc_DoubleClick); + this.RibbonButtonNewDoc.Click += new System.EventHandler(this.RibbonButtonNewDoc_Click); + // + // RibbonButtonFavoriten + // + this.RibbonButtonFavoriten.Image = global::OnDoc.Properties.Resources.Favoriten_32x32_32; + this.RibbonButtonFavoriten.LargeImage = global::OnDoc.Properties.Resources.Favoriten_32x32_32; + this.RibbonButtonFavoriten.Name = "RibbonButtonFavoriten"; + this.RibbonButtonFavoriten.SmallImage = global::OnDoc.Properties.Resources.Favoriten_24x24_32; + this.RibbonButtonFavoriten.Text = "Favorit"; + this.RibbonButtonFavoriten.Click += new System.EventHandler(this.RibbonButtonFavoriten_Click); + // // RibbonPanelExit // this.RibbonPanelExit.ButtonMoreVisible = false; @@ -478,436 +598,7 @@ namespace OnDoc.UICintrols this.RibbonPanelExit.Text = "Beenden"; this.RibbonPanelExit.Visible = false; // - // RibbonPanelBearbeiten - // - this.RibbonPanelBearbeiten.ButtonMoreVisible = false; - this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonNewDoc); - this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonFavoriten); - this.RibbonPanelBearbeiten.Items.Add(this.ribbibButtonShowDoc); - this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonEditEditDoc); - this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonEditDelete); - this.RibbonPanelBearbeiten.Name = "RibbonPanelBearbeiten"; - this.RibbonPanelBearbeiten.Text = "Dokument"; - // - // ribbonPanelZuweisung - // - this.ribbonPanelZuweisung.ButtonMoreVisible = false; - this.ribbonPanelZuweisung.Items.Add(this.RibbonButtonZuweisen); - this.ribbonPanelZuweisung.Items.Add(this.ribbonButtonToApproval); - this.ribbonPanelZuweisung.Name = "ribbonPanelZuweisung"; - this.ribbonPanelZuweisung.Text = "Zuweisen"; - // - // RibbonPannelAproval - // - this.RibbonPannelAproval.ButtonMoreVisible = false; - this.RibbonPannelAproval.Items.Add(this.ribbonButtonApproval); - this.RibbonPannelAproval.Items.Add(this.ribbonItemGroupApproveCounter); - this.RibbonPannelAproval.Name = "RibbonPannelAproval"; - this.RibbonPannelAproval.Text = "Unterschriftenprüfung"; - // - // ribbonItemGroupApproveCounter - // - this.ribbonItemGroupApproveCounter.Items.Add(this.ribbonButtonRefresh_Bewilligungen); - this.ribbonItemGroupApproveCounter.Items.Add(this.ribbonLabelToApprove); - this.ribbonItemGroupApproveCounter.Name = "ribbonItemGroupApproveCounter"; - // - // ribbonLabelToApprove - // - this.ribbonLabelToApprove.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonLabelToApprove.Name = "ribbonLabelToApprove"; - // - // RibbonPanelArchiv - // - this.RibbonPanelArchiv.ButtonMoreVisible = false; - this.RibbonPanelArchiv.Items.Add(this.RibbonButtonArchivToOnBase); - this.RibbonPanelArchiv.Items.Add(this.ribbonButtonVersandstrasse); - this.RibbonPanelArchiv.Name = "RibbonPanelArchiv"; - this.RibbonPanelArchiv.Text = "Archiv"; - // - // RibbonPanelDemo - // - this.RibbonPanelDemo.Items.Add(this.RibbonButtonTest1); - this.RibbonPanelDemo.Name = "RibbonPanelDemo"; - this.RibbonPanelDemo.Text = "Test-Funktionen"; - this.RibbonPanelDemo.Visible = false; - // - // RibbonPanelSuche - // - this.RibbonPanelSuche.ButtonMoreVisible = false; - this.RibbonPanelSuche.Items.Add(this.ribbonGroupMitarbeiter); - this.RibbonPanelSuche.Items.Add(this.RibbonGroupFilter); - this.RibbonPanelSuche.Name = "RibbonPanelSuche"; - this.RibbonPanelSuche.Text = "Dokumente suchen/Filter"; - // - // ribbonGroupMitarbeiter - // - this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButtonGetMA); - this.ribbonGroupMitarbeiter.Items.Add(this.ribbonDokumntID); - this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButton3); - this.ribbonGroupMitarbeiter.Name = "ribbonGroupMitarbeiter"; - this.ribbonGroupMitarbeiter.Text = ""; - // - // RibbonGroupFilter - // - this.RibbonGroupFilter.Items.Add(this.RibbonFilterLabel); - this.RibbonGroupFilter.Items.Add(this.RibbonPartnerSaldiert); - this.RibbonGroupFilter.Items.Add(this.RibbonFilterDelete); - this.RibbonGroupFilter.Items.Add(this.ribbonbuttonnewparterdoc); - this.RibbonGroupFilter.Name = "RibbonGroupFilter"; - this.RibbonGroupFilter.Text = ""; - // - // RibbonFilterLabel - // - this.RibbonFilterLabel.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.RibbonFilterLabel.Name = "RibbonFilterLabel"; - this.RibbonFilterLabel.Text = ""; - this.RibbonFilterLabel.ToolTip = "Gewählter Filter"; - // - // ribbonPannelDiverseVorlagen - // - this.ribbonPannelDiverseVorlagen.Items.Add(this.ribbonButtonNativ); - this.ribbonPannelDiverseVorlagen.Name = "ribbonPannelDiverseVorlagen"; - this.ribbonPannelDiverseVorlagen.Text = "Nativ"; - this.ribbonPannelDiverseVorlagen.Visible = false; - // - // RibbonPanelDoklist - // - this.RibbonPanelDoklist.ButtonMoreVisible = false; - this.RibbonPanelDoklist.Items.Add(this.RibbonButtonRefresh); - this.RibbonPanelDoklist.Name = "RibbonPanelDoklist"; - this.RibbonPanelDoklist.Text = "Dokumentliste"; - // - // ribbonTabAnsicht - // - this.ribbonTabAnsicht.Name = "ribbonTabAnsicht"; - this.ribbonTabAnsicht.Panels.Add(this.RibbonPannelAnsicht); - this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelVorschau); - this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelAttribute); - this.ribbonTabAnsicht.Panels.Add(this.ribbonPanel1); - this.ribbonTabAnsicht.Text = "Ansicht"; - // - // RibbonPannelAnsicht - // - this.RibbonPannelAnsicht.ButtonMoreVisible = false; - this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup2); - this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup3); - this.RibbonPannelAnsicht.Name = "RibbonPannelAnsicht"; - this.RibbonPannelAnsicht.Text = "Ansicht"; - // - // ribbonItemGroup2 - // - this.ribbonItemGroup2.Items.Add(this.ribboncomboboxansicht); - this.ribbonItemGroup2.Items.Add(this.ribbonCBAnsicht); - this.ribbonItemGroup2.Name = "ribbonItemGroup2"; - // - // ribboncomboboxansicht - // - this.ribboncomboboxansicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribboncomboboxansicht.Name = "ribboncomboboxansicht"; - this.ribboncomboboxansicht.Text = "Ansicht"; - // - // ribbonCBAnsicht - // - this.ribbonCBAnsicht.AllowTextEdit = false; - this.ribbonCBAnsicht.DrawIconsBar = false; - this.ribbonCBAnsicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonCBAnsicht.Name = "ribbonCBAnsicht"; - this.ribbonCBAnsicht.SelectedIndex = -1; - this.ribbonCBAnsicht.TextBoxText = ""; - this.ribbonCBAnsicht.DropDownItemClicked += new System.Windows.Forms.RibbonComboBox.RibbonItemEventHandler(this.ribbonCBAnsicht_DropDownItemClicked); - // - // ribbonItemGroup3 - // - this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewStandard); - this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewSave); - this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewDelete); - this.ribbonItemGroup3.Items.Add(this.ribbonSaveGridView); - this.ribbonItemGroup3.Name = "ribbonItemGroup3"; - // - // ribbonPanelVorschau - // - this.ribbonPanelVorschau.ButtonMoreVisible = false; - this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauNo); - this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauUnten); - this.ribbonPanelVorschau.Items.Add(this.RibbonButtonVorschauRechts); - this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauSepparat); - this.ribbonPanelVorschau.Name = "ribbonPanelVorschau"; - this.ribbonPanelVorschau.Text = "Vorschau ein-/ausblenden"; - // - // ribbonPanelAttribute - // - this.ribbonPanelAttribute.ButtonMoreVisible = false; - this.ribbonPanelAttribute.Items.Add(this.RibbonButtonAttributeEinAusblenden); - this.ribbonPanelAttribute.Name = "ribbonPanelAttribute"; - this.ribbonPanelAttribute.Text = "Attribute"; - // - // ribbonPanel1 - // - this.ribbonPanel1.ButtonMoreVisible = false; - this.ribbonPanel1.Items.Add(this.ribbonButton6); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Text = "Dokumentliste"; - // - // ribbonTabDokpaket_Serienbrief - // - this.ribbonTabDokpaket_Serienbrief.Name = "ribbonTabDokpaket_Serienbrief"; - this.ribbonTabDokpaket_Serienbrief.Panels.Add(this.RibbonPanelCreate); - this.ribbonTabDokpaket_Serienbrief.Text = "Dokumentpakete / Serienbrief"; - // - // RibbonPanelCreate - // - this.RibbonPanelCreate.ButtonMoreVisible = false; - this.RibbonPanelCreate.Items.Add(this.RibbonButtonCreateNewPaket); - this.RibbonPanelCreate.Items.Add(this.RibbonButtonEditPaket); - this.RibbonPanelCreate.Items.Add(this.RibbonButtonCreateNewSerienbrief); - this.RibbonPanelCreate.Items.Add(this.RibbonButtonEditSerienbrief); - this.RibbonPanelCreate.Name = "RibbonPanelCreate"; - this.RibbonPanelCreate.Text = "Serienbriefe / Dokumentpakete"; - // - // ribbonTabProfil - // - this.ribbonTabProfil.Name = "ribbonTabProfil"; - this.ribbonTabProfil.Panels.Add(this.RibbonPanelProfil); - this.ribbonTabProfil.Text = "Profil"; - // - // RibbonPanelProfil - // - this.RibbonPanelProfil.ButtonMoreVisible = false; - this.RibbonPanelProfil.Items.Add(this.ribbonItemGroup1); - this.RibbonPanelProfil.Items.Add(this.ribbonButton1); - this.RibbonPanelProfil.Name = "RibbonPanelProfil"; - this.RibbonPanelProfil.Text = "Profil"; - // - // ribbonItemGroup1 - // - this.ribbonItemGroup1.Items.Add(this.ribbonLabel1); - this.ribbonItemGroup1.Items.Add(this.RibbonCBProfil); - this.ribbonItemGroup1.Name = "ribbonItemGroup1"; - // - // ribbonLabel1 - // - this.ribbonLabel1.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonLabel1.Name = "ribbonLabel1"; - this.ribbonLabel1.Text = "Profil"; - // - // RibbonCBProfil - // - this.RibbonCBProfil.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.RibbonCBProfil.Name = "RibbonCBProfil"; - this.RibbonCBProfil.SelectedIndex = -1; - this.RibbonCBProfil.TextBoxText = ""; - this.RibbonCBProfil.DropDownItemClicked += new System.Windows.Forms.RibbonComboBox.RibbonItemEventHandler(this.RibbonCBProfil_DropDownItemClicked); - this.RibbonCBProfil.Click += new System.EventHandler(this.RibbonCBProfil_Click); - // - // RibbonTabNativVorlagen - // - this.RibbonTabNativVorlagen.Name = "RibbonTabNativVorlagen"; - this.RibbonTabNativVorlagen.Panels.Add(this.ribbonPanelNativVorlagen); - this.RibbonTabNativVorlagen.Text = "Nativ-Vorlagen"; - // - // ribbonPanelNativVorlagen - // - this.ribbonPanelNativVorlagen.ButtonMoreVisible = false; - this.ribbonPanelNativVorlagen.Items.Add(this.ribbonButtonNativVorlagen); - this.ribbonPanelNativVorlagen.Name = "ribbonPanelNativVorlagen"; - this.ribbonPanelNativVorlagen.Text = ""; - // - // RibbonTabAdmin - // - this.RibbonTabAdmin.Name = "RibbonTabAdmin"; - this.RibbonTabAdmin.Panels.Add(this.RibbonPanelDiverses); - this.RibbonTabAdmin.Panels.Add(this.ribbonAnmelden); - this.RibbonTabAdmin.Panels.Add(this.ribbonVorlagen); - this.RibbonTabAdmin.Panels.Add(this.ribbonBerechtigung); - this.RibbonTabAdmin.Panels.Add(this.ribbonpanelanalyse); - this.RibbonTabAdmin.Panels.Add(this.ribbonPanel3); - this.RibbonTabAdmin.Text = "Administration"; - // - // RibbonPanelDiverses - // - this.RibbonPanelDiverses.ButtonMoreVisible = false; - this.RibbonPanelDiverses.Items.Add(this.ribbonButtonBCK); - this.RibbonPanelDiverses.Name = "RibbonPanelDiverses"; - this.RibbonPanelDiverses.Text = "Diverse Funktionen"; - // - // ribbonAnmelden - // - this.ribbonAnmelden.ButtonMoreVisible = false; - this.ribbonAnmelden.Items.Add(this.ribbonbuttonlogin); - this.ribbonAnmelden.Name = "ribbonAnmelden"; - this.ribbonAnmelden.Text = ""; - // - // ribbonVorlagen - // - this.ribbonVorlagen.ButtonMoreVisible = false; - this.ribbonVorlagen.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left; - this.ribbonVorlagen.Items.Add(this.RibbonButtonDokumenttyp); - this.ribbonVorlagen.Items.Add(this.RibbonButtonVorlagen); - this.ribbonVorlagen.Items.Add(this.ribbonButtonVorlagenfeldregel); - this.ribbonVorlagen.Name = "ribbonVorlagen"; - this.ribbonVorlagen.Text = ""; - // - // ribbonBerechtigung - // - this.ribbonBerechtigung.ButtonMoreVisible = false; - this.ribbonBerechtigung.Items.Add(this.ribbonButton2); - this.ribbonBerechtigung.Items.Add(this.RibbonButtonBerechtigungsgruppe); - this.ribbonBerechtigung.Items.Add(this.ribbonButtonSysadmins); - this.ribbonBerechtigung.Name = "ribbonBerechtigung"; - this.ribbonBerechtigung.Text = "Berechtigungen"; - // - // ribbonpanelanalyse - // - this.ribbonpanelanalyse.ButtonMoreVisible = false; - this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedklog); - this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedkverarbeitung); - this.ribbonpanelanalyse.Name = "ribbonpanelanalyse"; - this.ribbonpanelanalyse.Text = "Analyse-Tools"; - // - // ribbonPanel3 - // - this.ribbonPanel3.ButtonMoreVisible = false; - this.ribbonPanel3.Items.Add(this.ribbonButton4); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Text = ""; - this.ribbonPanel3.Click += new System.EventHandler(this.ribbonPanel3_Click); - // - // timer1 - // - this.timer1.Interval = 600000; - this.timer1.Tick += new System.EventHandler(this.timer1_Tick); - // - // ctxMenuGroups - // - this.ctxMenuGroups.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.gruppenÖffnenToolStripMenuItem1, - this.gruppenSchliessenToolStripMenuItem1}); - this.ctxMenuGroups.Name = "ctxMenuGroups"; - this.ctxMenuGroups.Size = new System.Drawing.Size(206, 48); - // - // gruppenÖffnenToolStripMenuItem1 - // - this.gruppenÖffnenToolStripMenuItem1.Name = "gruppenÖffnenToolStripMenuItem1"; - this.gruppenÖffnenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22); - this.gruppenÖffnenToolStripMenuItem1.Text = "Alle Gruppen aufklappen"; - this.gruppenÖffnenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem1_Click); - // - // gruppenSchliessenToolStripMenuItem1 - // - this.gruppenSchliessenToolStripMenuItem1.Name = "gruppenSchliessenToolStripMenuItem1"; - this.gruppenSchliessenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22); - this.gruppenSchliessenToolStripMenuItem1.Text = "Alle Gruppen einklappen"; - this.gruppenSchliessenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem1_Click); - // - // dokwerte1 - // - this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right; - this.dokwerte1.Location = new System.Drawing.Point(1709, 153); - this.dokwerte1.Name = "dokwerte1"; - this.dokwerte1.Size = new System.Drawing.Size(0, 694); - this.dokwerte1.TabIndex = 7; - // - // dokumentAnzeigenToolStripMenuItem - // - this.dokumentAnzeigenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.ShowDoc_16x16_32; - this.dokumentAnzeigenToolStripMenuItem.Name = "dokumentAnzeigenToolStripMenuItem"; - this.dokumentAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.dokumentAnzeigenToolStripMenuItem.Text = "Dokument anzeigen"; - this.dokumentAnzeigenToolStripMenuItem.Click += new System.EventHandler(this.dokumentAnzeigenToolStripMenuItem_Click); - // - // dokumentBearbeitenToolStripMenuItem - // - this.dokumentBearbeitenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.EditDoc_16x16_32; - this.dokumentBearbeitenToolStripMenuItem.Name = "dokumentBearbeitenToolStripMenuItem"; - this.dokumentBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.dokumentBearbeitenToolStripMenuItem.Text = "Dokument bearbeiten"; - this.dokumentBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.dokumentBearbeitenToolStripMenuItem_Click); - // - // dokumentLöschenToolStripMenuItem - // - this.dokumentLöschenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.DeleteDoc_16x16_32; - this.dokumentLöschenToolStripMenuItem.Name = "dokumentLöschenToolStripMenuItem"; - this.dokumentLöschenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.dokumentLöschenToolStripMenuItem.Text = "Dokument löschen"; - this.dokumentLöschenToolStripMenuItem.Click += new System.EventHandler(this.dokumentLöschenToolStripMenuItem_Click); - // - // zurUnterschriftenPrüfungToolStripMenuItem - // - this.zurUnterschriftenPrüfungToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Approval_16x16_32; - this.zurUnterschriftenPrüfungToolStripMenuItem.Name = "zurUnterschriftenPrüfungToolStripMenuItem"; - this.zurUnterschriftenPrüfungToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.zurUnterschriftenPrüfungToolStripMenuItem.Text = "Zur Unterschriften-Prüfung"; - this.zurUnterschriftenPrüfungToolStripMenuItem.Click += new System.EventHandler(this.zurUnterschriftenPrüfungToolStripMenuItem_Click); - // - // archivierenToolStripMenuItem - // - this.archivierenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("archivierenToolStripMenuItem.Image"))); - this.archivierenToolStripMenuItem.Name = "archivierenToolStripMenuItem"; - this.archivierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.archivierenToolStripMenuItem.Text = "Archivieren"; - this.archivierenToolStripMenuItem.Click += new System.EventHandler(this.archivierenToolStripMenuItem_Click); - // - // druckenToolStripMenuItem - // - this.druckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Printer_16x16_32; - this.druckenToolStripMenuItem.Name = "druckenToolStripMenuItem"; - this.druckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.druckenToolStripMenuItem.Text = "Drucken"; - this.druckenToolStripMenuItem.Visible = false; - this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click); - // - // dokumentKopierenToolStripMenuItem - // - this.dokumentKopierenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Copy_16x16_32; - this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem"; - this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren"; - this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click); - // - // attributeAnzeigenVersteckenToolStripMenuItem - // - this.attributeAnzeigenVersteckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Attribut_16x16_32; - this.attributeAnzeigenVersteckenToolStripMenuItem.Name = "attributeAnzeigenVersteckenToolStripMenuItem"; - this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute ein- / ausblenden"; - this.attributeAnzeigenVersteckenToolStripMenuItem.Click += new System.EventHandler(this.attributeAnzeigenVersteckenToolStripMenuItem_Click); - // - // dokumentFürPartnerErstellenToolStripMenuItem - // - this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32; - this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem"; - this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22); - this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen"; - this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click); - // - // tsbtnpreviewno - // - this.tsbtnpreviewno.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbtnpreviewno.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewno.Image"))); - this.tsbtnpreviewno.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbtnpreviewno.Name = "tsbtnpreviewno"; - this.tsbtnpreviewno.Size = new System.Drawing.Size(23, 22); - this.tsbtnpreviewno.Text = "Keine Vorschau"; - // - // tsbtnpreviewbottom - // - this.tsbtnpreviewbottom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbtnpreviewbottom.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewbottom.Image"))); - this.tsbtnpreviewbottom.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbtnpreviewbottom.Name = "tsbtnpreviewbottom"; - this.tsbtnpreviewbottom.Size = new System.Drawing.Size(23, 22); - this.tsbtnpreviewbottom.Text = "Vorschau unten"; - // - // tsbtnpreviewright - // - this.tsbtnpreviewright.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbtnpreviewright.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewright.Image"))); - this.tsbtnpreviewright.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbtnpreviewright.Name = "tsbtnpreviewright"; - this.tsbtnpreviewright.Size = new System.Drawing.Size(23, 22); - this.tsbtnpreviewright.Text = "Vorschau rechts"; - // - // RibbonButtonExit + // RibbonButtonExit // this.RibbonButtonExit.Image = global::OnDoc.Properties.Resources.CloseApplication_32x32_32; this.RibbonButtonExit.LargeImage = global::OnDoc.Properties.Resources.CloseApplication_32x32_32; @@ -917,24 +608,14 @@ namespace OnDoc.UICintrols this.RibbonButtonExit.TextAlignment = System.Windows.Forms.RibbonItem.RibbonItemTextAlignment.Center; this.RibbonButtonExit.Click += new System.EventHandler(this.RibbonButtonExit_Click); // - // RibbonButtonNewDoc - // - this.RibbonButtonNewDoc.Image = global::OnDoc.Properties.Resources.NewDoc_32x32_32; - this.RibbonButtonNewDoc.LargeImage = global::OnDoc.Properties.Resources.NewDoc_32x32_32; - this.RibbonButtonNewDoc.Name = "RibbonButtonNewDoc"; - this.RibbonButtonNewDoc.SmallImage = global::OnDoc.Properties.Resources.NewDoc_32x32_32; - this.RibbonButtonNewDoc.Text = "Neu"; - this.RibbonButtonNewDoc.DoubleClick += new System.EventHandler(this.RibbonButtonNewDoc_DoubleClick); - this.RibbonButtonNewDoc.Click += new System.EventHandler(this.RibbonButtonNewDoc_Click); - // - // RibbonButtonFavoriten + // RibbonPanelBearbeiten // - this.RibbonButtonFavoriten.Image = global::OnDoc.Properties.Resources.Favoriten_32x32_32; - this.RibbonButtonFavoriten.LargeImage = global::OnDoc.Properties.Resources.Favoriten_32x32_32; - this.RibbonButtonFavoriten.Name = "RibbonButtonFavoriten"; - this.RibbonButtonFavoriten.SmallImage = global::OnDoc.Properties.Resources.Favoriten_24x24_32; - this.RibbonButtonFavoriten.Text = "Neu Favorit"; - this.RibbonButtonFavoriten.Click += new System.EventHandler(this.RibbonButtonFavoriten_Click); + this.RibbonPanelBearbeiten.ButtonMoreVisible = false; + this.RibbonPanelBearbeiten.Items.Add(this.ribbibButtonShowDoc); + this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonEditEditDoc); + this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonEditDelete); + this.RibbonPanelBearbeiten.Name = "RibbonPanelBearbeiten"; + this.RibbonPanelBearbeiten.Text = "Dokument"; // // ribbibButtonShowDoc // @@ -963,6 +644,14 @@ namespace OnDoc.UICintrols this.RibbonButtonEditDelete.Text = "Löschen"; this.RibbonButtonEditDelete.Click += new System.EventHandler(this.RibbonButtonEditDelete_Click); // + // ribbonPanelZuweisung + // + this.ribbonPanelZuweisung.ButtonMoreVisible = false; + this.ribbonPanelZuweisung.Items.Add(this.RibbonButtonZuweisen); + this.ribbonPanelZuweisung.Items.Add(this.ribbonButtonToApproval); + this.ribbonPanelZuweisung.Name = "ribbonPanelZuweisung"; + this.ribbonPanelZuweisung.Text = "Zuweisen"; + // // RibbonButtonZuweisen // this.RibbonButtonZuweisen.Image = global::OnDoc.Properties.Resources.Zuweisen_32x32_32; @@ -981,6 +670,14 @@ namespace OnDoc.UICintrols this.ribbonButtonToApproval.Text = "zur Unterschriften-Prüfung"; this.ribbonButtonToApproval.Click += new System.EventHandler(this.ribbonButtonToApproval_Click); // + // RibbonPannelAproval + // + this.RibbonPannelAproval.ButtonMoreVisible = false; + this.RibbonPannelAproval.Items.Add(this.ribbonButtonApproval); + this.RibbonPannelAproval.Items.Add(this.ribbonItemGroupApproveCounter); + this.RibbonPannelAproval.Name = "RibbonPannelAproval"; + this.RibbonPannelAproval.Text = "Unterschriftenprüfung"; + // // ribbonButtonApproval // this.ribbonButtonApproval.Image = global::OnDoc.Properties.Resources.Approval_32x32_32; @@ -990,6 +687,12 @@ namespace OnDoc.UICintrols this.ribbonButtonApproval.Text = "Offene Prüfungen"; this.ribbonButtonApproval.Click += new System.EventHandler(this.ribbonButtonApproval_Click_1); // + // ribbonItemGroupApproveCounter + // + this.ribbonItemGroupApproveCounter.Items.Add(this.ribbonButtonRefresh_Bewilligungen); + this.ribbonItemGroupApproveCounter.Items.Add(this.ribbonLabelToApprove); + this.ribbonItemGroupApproveCounter.Name = "ribbonItemGroupApproveCounter"; + // // ribbonButtonRefresh_Bewilligungen // this.ribbonButtonRefresh_Bewilligungen.Image = global::OnDoc.Properties.Resources.Refresh_16x16_32; @@ -999,6 +702,19 @@ namespace OnDoc.UICintrols this.ribbonButtonRefresh_Bewilligungen.SmallImage = global::OnDoc.Properties.Resources.Refresh_16x16_32; this.ribbonButtonRefresh_Bewilligungen.Click += new System.EventHandler(this.ribbonButtonRefresh_Bewilligungen_Click); // + // ribbonLabelToApprove + // + this.ribbonLabelToApprove.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonLabelToApprove.Name = "ribbonLabelToApprove"; + // + // RibbonPanelArchiv + // + this.RibbonPanelArchiv.ButtonMoreVisible = false; + this.RibbonPanelArchiv.Items.Add(this.RibbonButtonArchivToOnBase); + this.RibbonPanelArchiv.Items.Add(this.ribbonButtonVersandstrasse); + this.RibbonPanelArchiv.Name = "RibbonPanelArchiv"; + this.RibbonPanelArchiv.Text = "Archiv"; + // // RibbonButtonArchivToOnBase // this.RibbonButtonArchivToOnBase.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonArchivToOnBase.Image"))); @@ -1018,6 +734,13 @@ namespace OnDoc.UICintrols this.ribbonButtonVersandstrasse.Visible = false; this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.ribbonButtonVersandstrasse_Click); // + // RibbonPanelDemo + // + this.RibbonPanelDemo.Items.Add(this.RibbonButtonTest1); + this.RibbonPanelDemo.Name = "RibbonPanelDemo"; + this.RibbonPanelDemo.Text = "Test-Funktionen"; + this.RibbonPanelDemo.Visible = false; + // // RibbonButtonTest1 // this.RibbonButtonTest1.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonTest1.Image"))); @@ -1027,6 +750,22 @@ namespace OnDoc.UICintrols this.RibbonButtonTest1.Text = "Test 1"; this.RibbonButtonTest1.Click += new System.EventHandler(this.RibbonButtonTest1_Click); // + // RibbonPanelSuche + // + this.RibbonPanelSuche.ButtonMoreVisible = false; + this.RibbonPanelSuche.Items.Add(this.ribbonGroupMitarbeiter); + this.RibbonPanelSuche.Items.Add(this.RibbonGroupFilter); + this.RibbonPanelSuche.Name = "RibbonPanelSuche"; + this.RibbonPanelSuche.Text = "Dokumente suchen/Filter"; + // + // ribbonGroupMitarbeiter + // + this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButtonGetMA); + this.ribbonGroupMitarbeiter.Items.Add(this.ribbonDokumntID); + this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButton3); + this.ribbonGroupMitarbeiter.Name = "ribbonGroupMitarbeiter"; + this.ribbonGroupMitarbeiter.Text = ""; + // // ribbonButtonGetMA // this.ribbonButtonGetMA.Image = global::OnDoc.Properties.Resources.Pprofil_24x24_32; @@ -1060,6 +799,22 @@ namespace OnDoc.UICintrols this.ribbonButton3.Text = "Partner"; this.ribbonButton3.Click += new System.EventHandler(this.ribbonButton3_Click_1); // + // RibbonGroupFilter + // + this.RibbonGroupFilter.Items.Add(this.RibbonFilterLabel); + this.RibbonGroupFilter.Items.Add(this.RibbonPartnerSaldiert); + this.RibbonGroupFilter.Items.Add(this.RibbonFilterDelete); + this.RibbonGroupFilter.Items.Add(this.ribbonbuttonnewparterdoc); + this.RibbonGroupFilter.Name = "RibbonGroupFilter"; + this.RibbonGroupFilter.Text = ""; + // + // RibbonFilterLabel + // + this.RibbonFilterLabel.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.RibbonFilterLabel.Name = "RibbonFilterLabel"; + this.RibbonFilterLabel.Text = ""; + this.RibbonFilterLabel.ToolTip = "Gewählter Filter"; + // // RibbonPartnerSaldiert // this.RibbonPartnerSaldiert.Image = global::OnDoc.Properties.Resources.Partner_Saldiert_24x24_32; @@ -1092,6 +847,13 @@ namespace OnDoc.UICintrols this.ribbonbuttonnewparterdoc.Visible = false; this.ribbonbuttonnewparterdoc.Click += new System.EventHandler(this.ribbonbuttonnewparterdoc_Click); // + // ribbonPannelDiverseVorlagen + // + this.ribbonPannelDiverseVorlagen.Items.Add(this.ribbonButtonNativ); + this.ribbonPannelDiverseVorlagen.Name = "ribbonPannelDiverseVorlagen"; + this.ribbonPannelDiverseVorlagen.Text = "Nativ"; + this.ribbonPannelDiverseVorlagen.Visible = false; + // // ribbonButtonNativ // this.ribbonButtonNativ.Image = global::OnDoc.Properties.Resources.Native_32x32_32; @@ -1100,6 +862,13 @@ namespace OnDoc.UICintrols this.ribbonButtonNativ.SmallImage = global::OnDoc.Properties.Resources.Native_24x24_32; this.ribbonButtonNativ.Click += new System.EventHandler(this.ribbonButtonNativ_Click); // + // RibbonPanelDoklist + // + this.RibbonPanelDoklist.ButtonMoreVisible = false; + this.RibbonPanelDoklist.Items.Add(this.RibbonButtonRefresh); + this.RibbonPanelDoklist.Name = "RibbonPanelDoklist"; + this.RibbonPanelDoklist.Text = "Dokumentliste"; + // // RibbonButtonRefresh // this.RibbonButtonRefresh.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32; @@ -1109,6 +878,53 @@ namespace OnDoc.UICintrols this.RibbonButtonRefresh.Text = "Aktualisieren"; this.RibbonButtonRefresh.Click += new System.EventHandler(this.RibbonButtonRefresh_Click); // + // ribbonTabAnsicht + // + this.ribbonTabAnsicht.Name = "ribbonTabAnsicht"; + this.ribbonTabAnsicht.Panels.Add(this.RibbonPannelAnsicht); + this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelVorschau); + this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelAttribute); + this.ribbonTabAnsicht.Panels.Add(this.ribbonPanel1); + this.ribbonTabAnsicht.Text = "Ansicht"; + // + // RibbonPannelAnsicht + // + this.RibbonPannelAnsicht.ButtonMoreVisible = false; + this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup2); + this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup3); + this.RibbonPannelAnsicht.Name = "RibbonPannelAnsicht"; + this.RibbonPannelAnsicht.Text = "Ansicht"; + // + // ribbonItemGroup2 + // + this.ribbonItemGroup2.Items.Add(this.ribboncomboboxansicht); + this.ribbonItemGroup2.Items.Add(this.ribbonCBAnsicht); + this.ribbonItemGroup2.Name = "ribbonItemGroup2"; + // + // ribboncomboboxansicht + // + this.ribboncomboboxansicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribboncomboboxansicht.Name = "ribboncomboboxansicht"; + this.ribboncomboboxansicht.Text = "Ansicht"; + // + // ribbonCBAnsicht + // + this.ribbonCBAnsicht.AllowTextEdit = false; + this.ribbonCBAnsicht.DrawIconsBar = false; + this.ribbonCBAnsicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonCBAnsicht.Name = "ribbonCBAnsicht"; + this.ribbonCBAnsicht.SelectedIndex = -1; + this.ribbonCBAnsicht.TextBoxText = ""; + this.ribbonCBAnsicht.DropDownItemClicked += new System.Windows.Forms.RibbonComboBox.RibbonItemEventHandler(this.ribbonCBAnsicht_DropDownItemClicked); + // + // ribbonItemGroup3 + // + this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewStandard); + this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewSave); + this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewDelete); + this.ribbonItemGroup3.Items.Add(this.ribbonSaveGridView); + this.ribbonItemGroup3.Name = "ribbonItemGroup3"; + // // RibbonButtonViewStandard // this.RibbonButtonViewStandard.Image = global::OnDoc.Properties.Resources.Default_24x24_32; @@ -1150,6 +966,16 @@ namespace OnDoc.UICintrols this.ribbonSaveGridView.Visible = false; this.ribbonSaveGridView.Click += new System.EventHandler(this.ribbonButton4_Click_1); // + // ribbonPanelVorschau + // + this.ribbonPanelVorschau.ButtonMoreVisible = false; + this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauNo); + this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauUnten); + this.ribbonPanelVorschau.Items.Add(this.RibbonButtonVorschauRechts); + this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauSepparat); + this.ribbonPanelVorschau.Name = "ribbonPanelVorschau"; + this.ribbonPanelVorschau.Text = "Vorschau ein-/ausblenden"; + // // RibbonBtnVorschauNo // this.RibbonBtnVorschauNo.Image = global::OnDoc.Properties.Resources.Preview_Now_32x32_32; @@ -1189,6 +1015,13 @@ namespace OnDoc.UICintrols this.RibbonBtnVorschauSepparat.Text = "Eigenes Fenster"; this.RibbonBtnVorschauSepparat.Click += new System.EventHandler(this.RibbonBtnVorschauSepparat_Click); // + // ribbonPanelAttribute + // + this.ribbonPanelAttribute.ButtonMoreVisible = false; + this.ribbonPanelAttribute.Items.Add(this.RibbonButtonAttributeEinAusblenden); + this.ribbonPanelAttribute.Name = "ribbonPanelAttribute"; + this.ribbonPanelAttribute.Text = "Attribute"; + // // RibbonButtonAttributeEinAusblenden // this.RibbonButtonAttributeEinAusblenden.Image = global::OnDoc.Properties.Resources.Attribut_32x32_32; @@ -1198,6 +1031,13 @@ namespace OnDoc.UICintrols this.RibbonButtonAttributeEinAusblenden.Text = "Attribute ein-/ausblenden"; this.RibbonButtonAttributeEinAusblenden.Click += new System.EventHandler(this.RibbonButtonAttributeEinAusblenden_Click); // + // ribbonPanel1 + // + this.ribbonPanel1.ButtonMoreVisible = false; + this.ribbonPanel1.Items.Add(this.ribbonButton6); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Text = "Dokumentliste"; + // // ribbonButton6 // this.ribbonButton6.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32; @@ -1207,6 +1047,22 @@ namespace OnDoc.UICintrols this.ribbonButton6.Text = "Aktualisieren"; this.ribbonButton6.Click += new System.EventHandler(this.ribbonButton6_Click); // + // ribbonTabDokpaket_Serienbrief + // + this.ribbonTabDokpaket_Serienbrief.Name = "ribbonTabDokpaket_Serienbrief"; + this.ribbonTabDokpaket_Serienbrief.Panels.Add(this.RibbonPanelCreate); + this.ribbonTabDokpaket_Serienbrief.Text = "Dokumentpakete / Serienbrief"; + // + // RibbonPanelCreate + // + this.RibbonPanelCreate.ButtonMoreVisible = false; + this.RibbonPanelCreate.Items.Add(this.RibbonButtonCreateNewPaket); + this.RibbonPanelCreate.Items.Add(this.RibbonButtonEditPaket); + this.RibbonPanelCreate.Items.Add(this.RibbonButtonCreateNewSerienbrief); + this.RibbonPanelCreate.Items.Add(this.RibbonButtonEditSerienbrief); + this.RibbonPanelCreate.Name = "RibbonPanelCreate"; + this.RibbonPanelCreate.Text = "Serienbriefe / Dokumentpakete"; + // // RibbonButtonCreateNewPaket // this.RibbonButtonCreateNewPaket.Image = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32; @@ -1243,6 +1099,41 @@ namespace OnDoc.UICintrols this.RibbonButtonEditSerienbrief.Text = "Serienbrief bearbeiten"; this.RibbonButtonEditSerienbrief.Visible = false; // + // ribbonTabProfil + // + this.ribbonTabProfil.Name = "ribbonTabProfil"; + this.ribbonTabProfil.Panels.Add(this.RibbonPanelProfil); + this.ribbonTabProfil.Text = "Profil"; + // + // RibbonPanelProfil + // + this.RibbonPanelProfil.ButtonMoreVisible = false; + this.RibbonPanelProfil.Items.Add(this.ribbonItemGroup1); + this.RibbonPanelProfil.Items.Add(this.ribbonButton1); + this.RibbonPanelProfil.Name = "RibbonPanelProfil"; + this.RibbonPanelProfil.Text = "Profil"; + // + // ribbonItemGroup1 + // + this.ribbonItemGroup1.Items.Add(this.ribbonLabel1); + this.ribbonItemGroup1.Items.Add(this.RibbonCBProfil); + this.ribbonItemGroup1.Name = "ribbonItemGroup1"; + // + // ribbonLabel1 + // + this.ribbonLabel1.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonLabel1.Name = "ribbonLabel1"; + this.ribbonLabel1.Text = "Profil"; + // + // RibbonCBProfil + // + this.RibbonCBProfil.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.RibbonCBProfil.Name = "RibbonCBProfil"; + this.RibbonCBProfil.SelectedIndex = -1; + this.RibbonCBProfil.TextBoxText = ""; + this.RibbonCBProfil.DropDownItemClicked += new System.Windows.Forms.RibbonComboBox.RibbonItemEventHandler(this.RibbonCBProfil_DropDownItemClicked); + this.RibbonCBProfil.Click += new System.EventHandler(this.RibbonCBProfil_Click); + // // ribbonButton1 // this.ribbonButton1.Image = global::OnDoc.Properties.Resources.Pprofil_16x16_32; @@ -1252,6 +1143,19 @@ namespace OnDoc.UICintrols this.ribbonButton1.ToolTip = "Profil bearbeiten"; this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click); // + // RibbonTabNativVorlagen + // + this.RibbonTabNativVorlagen.Name = "RibbonTabNativVorlagen"; + this.RibbonTabNativVorlagen.Panels.Add(this.ribbonPanelNativVorlagen); + this.RibbonTabNativVorlagen.Text = "Nativ-Vorlagen"; + // + // ribbonPanelNativVorlagen + // + this.ribbonPanelNativVorlagen.ButtonMoreVisible = false; + this.ribbonPanelNativVorlagen.Items.Add(this.ribbonButtonNativVorlagen); + this.ribbonPanelNativVorlagen.Name = "ribbonPanelNativVorlagen"; + this.ribbonPanelNativVorlagen.Text = ""; + // // ribbonButtonNativVorlagen // this.ribbonButtonNativVorlagen.Image = global::OnDoc.Properties.Resources.Native_32x32_32; @@ -1261,6 +1165,25 @@ namespace OnDoc.UICintrols this.ribbonButtonNativVorlagen.Text = "Nativ-Vorlagen-Auswahl"; this.ribbonButtonNativVorlagen.Click += new System.EventHandler(this.ribbonButtonNativVorlagen_Click); // + // RibbonTabAdmin + // + this.RibbonTabAdmin.Name = "RibbonTabAdmin"; + this.RibbonTabAdmin.Panels.Add(this.RibbonPanelDiverses); + this.RibbonTabAdmin.Panels.Add(this.ribbonAnmelden); + this.RibbonTabAdmin.Panels.Add(this.ribbonVorlagen); + this.RibbonTabAdmin.Panels.Add(this.ribbonBerechtigung); + this.RibbonTabAdmin.Panels.Add(this.ribbonpanelanalyse); + this.RibbonTabAdmin.Panels.Add(this.ribbonPanel3); + this.RibbonTabAdmin.Panels.Add(this.ribbonPanel4); + this.RibbonTabAdmin.Text = "Administration"; + // + // RibbonPanelDiverses + // + this.RibbonPanelDiverses.ButtonMoreVisible = false; + this.RibbonPanelDiverses.Items.Add(this.ribbonButtonBCK); + this.RibbonPanelDiverses.Name = "RibbonPanelDiverses"; + this.RibbonPanelDiverses.Text = "Diverse Funktionen"; + // // ribbonButtonBCK // this.ribbonButtonBCK.Image = global::OnDoc.Properties.Resources.Barcode_32x32_32__2_; @@ -1270,6 +1193,13 @@ namespace OnDoc.UICintrols this.ribbonButtonBCK.Text = "BCK"; this.ribbonButtonBCK.Click += new System.EventHandler(this.ribbonButton3_Click); // + // ribbonAnmelden + // + this.ribbonAnmelden.ButtonMoreVisible = false; + this.ribbonAnmelden.Items.Add(this.ribbonbuttonlogin); + this.ribbonAnmelden.Name = "ribbonAnmelden"; + this.ribbonAnmelden.Text = ""; + // // ribbonbuttonlogin // this.ribbonbuttonlogin.Image = global::OnDoc.Properties.Resources.Login_32x32_32; @@ -1279,6 +1209,16 @@ namespace OnDoc.UICintrols this.ribbonbuttonlogin.Text = "Anmelden"; this.ribbonbuttonlogin.Click += new System.EventHandler(this.ribbonbuttonlogin_Click); // + // ribbonVorlagen + // + this.ribbonVorlagen.ButtonMoreVisible = false; + this.ribbonVorlagen.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left; + this.ribbonVorlagen.Items.Add(this.RibbonButtonDokumenttyp); + this.ribbonVorlagen.Items.Add(this.RibbonButtonVorlagen); + this.ribbonVorlagen.Items.Add(this.ribbonButtonVorlagenfeldregel); + this.ribbonVorlagen.Name = "ribbonVorlagen"; + this.ribbonVorlagen.Text = ""; + // // RibbonButtonDokumenttyp // this.RibbonButtonDokumenttyp.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonDokumenttyp.Image"))); @@ -1306,6 +1246,15 @@ namespace OnDoc.UICintrols this.ribbonButtonVorlagenfeldregel.Text = "Vorlagenfeldregel"; this.ribbonButtonVorlagenfeldregel.Click += new System.EventHandler(this.ribbonButtonVorlagenfeldregel_Click); // + // ribbonBerechtigung + // + this.ribbonBerechtigung.ButtonMoreVisible = false; + this.ribbonBerechtigung.Items.Add(this.ribbonButton2); + this.ribbonBerechtigung.Items.Add(this.RibbonButtonBerechtigungsgruppe); + this.ribbonBerechtigung.Items.Add(this.ribbonButtonSysadmins); + this.ribbonBerechtigung.Name = "ribbonBerechtigung"; + this.ribbonBerechtigung.Text = "Berechtigungen"; + // // ribbonButton2 // this.ribbonButton2.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButton2.Image"))); @@ -1333,6 +1282,14 @@ namespace OnDoc.UICintrols this.ribbonButtonSysadmins.Text = "Sys-Admins"; this.ribbonButtonSysadmins.Click += new System.EventHandler(this.ribbonButtonSysadmins_Click); // + // ribbonpanelanalyse + // + this.ribbonpanelanalyse.ButtonMoreVisible = false; + this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedklog); + this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedkverarbeitung); + this.ribbonpanelanalyse.Name = "ribbonpanelanalyse"; + this.ribbonpanelanalyse.Text = "Analyse-Tools"; + // // ribbonbuttonedklog // this.ribbonbuttonedklog.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.Image"))); @@ -1351,6 +1308,14 @@ namespace OnDoc.UICintrols this.ribbonbuttonedkverarbeitung.Text = "EDK OnDoc_EDOKA"; this.ribbonbuttonedkverarbeitung.Click += new System.EventHandler(this.ribbonbuttonedkverarbeitung_Click); // + // ribbonPanel3 + // + this.ribbonPanel3.ButtonMoreVisible = false; + this.ribbonPanel3.Items.Add(this.ribbonButton4); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Text = ""; + this.ribbonPanel3.Click += new System.EventHandler(this.ribbonPanel3_Click); + // // ribbonButton4 // this.ribbonButton4.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButton4.Image"))); @@ -1359,6 +1324,49 @@ namespace OnDoc.UICintrols this.ribbonButton4.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton4.SmallImage"))); this.ribbonButton4.Text = "Art der Dokumentgenerierung"; // + // ribbonPanel4 + // + this.ribbonPanel4.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left; + this.ribbonPanel4.Items.Add(this.ribbonButtonDokinBearbeitung); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Text = "Diverses"; + // + // ribbonButtonDokinBearbeitung + // + this.ribbonButtonDokinBearbeitung.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonDokinBearbeitung.Image"))); + this.ribbonButtonDokinBearbeitung.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonDokinBearbeitung.LargeImage"))); + this.ribbonButtonDokinBearbeitung.Name = "ribbonButtonDokinBearbeitung"; + this.ribbonButtonDokinBearbeitung.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonDokinBearbeitung.SmallImage"))); + this.ribbonButtonDokinBearbeitung.Text = "Dokumente in Bearbeitung"; + this.ribbonButtonDokinBearbeitung.Click += new System.EventHandler(this.ribbonButtonDokinBearbeitung_Click); + // + // timer1 + // + this.timer1.Interval = 600000; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // + // ctxMenuGroups + // + this.ctxMenuGroups.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.gruppenÖffnenToolStripMenuItem1, + this.gruppenSchliessenToolStripMenuItem1}); + this.ctxMenuGroups.Name = "ctxMenuGroups"; + this.ctxMenuGroups.Size = new System.Drawing.Size(206, 48); + // + // gruppenÖffnenToolStripMenuItem1 + // + this.gruppenÖffnenToolStripMenuItem1.Name = "gruppenÖffnenToolStripMenuItem1"; + this.gruppenÖffnenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22); + this.gruppenÖffnenToolStripMenuItem1.Text = "Alle Gruppen aufklappen"; + this.gruppenÖffnenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem1_Click); + // + // gruppenSchliessenToolStripMenuItem1 + // + this.gruppenSchliessenToolStripMenuItem1.Name = "gruppenSchliessenToolStripMenuItem1"; + this.gruppenSchliessenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22); + this.gruppenSchliessenToolStripMenuItem1.Text = "Alle Gruppen einklappen"; + this.gruppenSchliessenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem1_Click); + // // RibbonButtonCreateNewDoc // this.RibbonButtonCreateNewDoc.Image = global::OnDoc.Properties.Resources.NewDoc_32x32_32; @@ -1376,6 +1384,24 @@ namespace OnDoc.UICintrols this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage"))); this.ribbonButton5.Text = "Load"; // + // docPreview1 + // + this.docPreview1.BackColor = System.Drawing.SystemColors.Control; + this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; + this.docPreview1.Location = new System.Drawing.Point(0, 0); + this.docPreview1.Name = "docPreview1"; + this.docPreview1.Size = new System.Drawing.Size(1709, 347); + this.docPreview1.TabIndex = 0; + this.docPreview1.ZoomPercentage = 0; + // + // dokwerte1 + // + this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right; + this.dokwerte1.Location = new System.Drawing.Point(1709, 153); + this.dokwerte1.Name = "dokwerte1"; + this.dokwerte1.Size = new System.Drawing.Size(0, 694); + this.dokwerte1.TabIndex = 7; + // // DokList // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1537,5 +1563,8 @@ namespace OnDoc.UICintrols private System.Windows.Forms.RibbonButton ribbonbuttonnewparterdoc; private System.Windows.Forms.ToolStripMenuItem dokumentUnterzeichnenToolStripMenuItem; private System.Windows.Forms.RibbonButton ribbibButtonShowDoc; + private System.Windows.Forms.RibbonPanel ribbonPanelNeu; + private System.Windows.Forms.RibbonPanel ribbonPanel4; + private System.Windows.Forms.RibbonButton ribbonButtonDokinBearbeitung; } } diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 15a76949..bb60c5d8 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -1025,6 +1025,7 @@ namespace OnDoc.UICintrols this.RibbonPannelAproval.Visible = false; + this.RibbonPanelExit.Visible = false; this.RibbonPanelProfil.Visible = false; this.RibbonPanelCreate.Visible = false; @@ -1594,6 +1595,8 @@ namespace OnDoc.UICintrols ribbonVorlagen.Visible = AppParams.isSysadmin; ribbonBerechtigung.Visible = AppParams.isSysadmin; ribbonpanelanalyse.Visible = AppParams.isSysadmin; + RibbonPanelDiverses.Visible = AppParams.isSysadmin; + RibbonTabAdmin.Visible = false; RibbonTabAdmin.Visible = true; ribbonSaveGridView.Enabled = AppParams.isSysadmin; @@ -2381,7 +2384,7 @@ namespace OnDoc.UICintrols } if (records.Count > 1) { - if (MessageBox.Show("Mehrere Dokumente zum Bearbeiten öffnen?", "Dokument bearbeiten", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; } + if (MessageBox.Show("Mehrere Dokumente unterzeichnen", "Dokument unterzeichnen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; } } foreach (var record in records) @@ -2405,6 +2408,12 @@ namespace OnDoc.UICintrols { dokumentAnzeigenToolStripMenuItem_Click(sender, e); } + + private void ribbonButtonDokinBearbeitung_Click(object sender, EventArgs e) + { + TableEditor te = new TableEditor("DokInBearbeitung"); + te.Show(); + } } diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx index 107bd9ee..802deb08 100644 --- a/Client/UIControls/DokList.resx +++ b/Client/UIControls/DokList.resx @@ -495,6 +495,24 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== diff --git a/Client/UIControls/Serienbrief.cs b/Client/UIControls/Serienbrief.cs index dd636a56..697e20d1 100644 --- a/Client/UIControls/Serienbrief.cs +++ b/Client/UIControls/Serienbrief.cs @@ -118,6 +118,8 @@ namespace OnDoc.UIControls { this.ribbonbuttonGeprueft.Enabled = enable; this.ribbonbuttonAbgelehnt.Enabled = enable; + this.ctxmenuEmpfaenger.Enabled = enable; + this.ctxmenutree.Enabled= enable; } public void dispose() { @@ -1316,7 +1318,7 @@ namespace OnDoc.UIControls System.Data.DataTable vorlagendaten = new System.Data.DataTable(); private void RibbonButtonGenerateSB_Click(object sender, EventArgs e) { - if (cbdigitaleunterschrfiten.Checked) + if (cbdigitaleunterschrfiten.Checked && sb.approved!=1) { sb.toapproval = 1; sb.approved = 0; @@ -2380,6 +2382,7 @@ namespace OnDoc.UIControls private void cbdigitaleunterschrfiten_CheckedChanged(object sender, EventArgs e) { + if (sb.approved == 1) { return; } if (cbdigitaleunterschrfiten.Checked) { cbboxunterschriftlinks.Enabled = true; diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index 50d47263..4a0276b7 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 cc7eb3a3..025a35e5 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 c92c3afc..fef1f8bf 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 e4fd69d1..5c2d9153 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 47a6fc52..5331b5ba 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 f58c0736..d10bdac8 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 24d12854..042e1dff 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 5f01c32c..90e447a0 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 80383a5e..c4b3995d 100644 Binary files a/Client/bin/Debug/OnDocOffice.pdb and b/Client/bin/Debug/OnDocOffice.pdb differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index d5c9d068..62f41302 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/bin/Debug/vbBarcodes.dll b/Client/bin/Debug/vbBarcodes.dll index 2d6a4fbc..368c87de 100644 Binary files a/Client/bin/Debug/vbBarcodes.dll and b/Client/bin/Debug/vbBarcodes.dll differ diff --git a/Client/bin/Debug/vbBarcodes.pdb b/Client/bin/Debug/vbBarcodes.pdb index 50334496..f99eca97 100644 Binary files a/Client/bin/Debug/vbBarcodes.pdb and b/Client/bin/Debug/vbBarcodes.pdb differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index 5dbe418a..3f8bb201 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache index f34f6634..3be13eb6 100644 Binary files a/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/Client/obj/Debug/Client.csproj.GenerateResource.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index a7dfa560..ccd8896e 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources index bf0fad33..89b7730c 100644 Binary files a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources and b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 47a6fc52..5331b5ba 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 f58c0736..d10bdac8 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 d5c9d068..62f41302 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/SyncFWord.cs b/DOCGEN/Klassen/SyncFWord.cs index 3ae732dd..17f75223 100644 --- a/DOCGEN/Klassen/SyncFWord.cs +++ b/DOCGEN/Klassen/SyncFWord.cs @@ -213,7 +213,7 @@ namespace DOCGEN.Klassen signature.LineFormat.Color= Color.White; signature.WrapFormat.AllowOverlap = true; - signature.VerticalPosition = signature.VerticalPosition - 50; + signature.VerticalPosition = signature.VerticalPosition - 55; //signature.HorizontalPosition = signature.HorizontalPosition + 200; @@ -384,7 +384,7 @@ namespace DOCGEN.Klassen if (dv.TMBeginn.ToString().Contains("VornameNameRechts")) { string unterschrift = ""; - if (img_UL != "") { unterschrift = img_UL.ToString(); } + if (img_UL != "") { unterschrift = img_UR.ToString(); } else { unterschrift = Newtonsoft.Json.JsonConvert.DeserializeObject(get_unterschrift(docdata.Unterschrift_Rechts)); diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index 50d47263..4a0276b7 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 cc7eb3a3..025a35e5 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 c92c3afc..fef1f8bf 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 e4fd69d1..5c2d9153 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 5f01c32c..90e447a0 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 80383a5e..c4b3995d 100644 Binary files a/DOCGEN/bin/Debug/OnDocOffice.pdb and b/DOCGEN/bin/Debug/OnDocOffice.pdb differ diff --git a/DOCGEN/bin/Debug/vbBarcodes.dll b/DOCGEN/bin/Debug/vbBarcodes.dll index 2d6a4fbc..368c87de 100644 Binary files a/DOCGEN/bin/Debug/vbBarcodes.dll and b/DOCGEN/bin/Debug/vbBarcodes.dll differ diff --git a/DOCGEN/bin/Debug/vbBarcodes.pdb b/DOCGEN/bin/Debug/vbBarcodes.pdb index 50334496..f99eca97 100644 Binary files a/DOCGEN/bin/Debug/vbBarcodes.pdb and b/DOCGEN/bin/Debug/vbBarcodes.pdb differ diff --git a/DOCGEN/clsDocGet.cs b/DOCGEN/clsDocGet.cs index b2862fc6..89429303 100644 --- a/DOCGEN/clsDocGet.cs +++ b/DOCGEN/clsDocGet.cs @@ -297,8 +297,8 @@ namespace DOCGEN //Dokument erstellen var streamword = new MemoryStream(Convert.FromBase64String(document)); WordDocument wordDocument = new WordDocument(streamword, Syncfusion.DocIO.FormatType.Automatic); - + // Keine Parameter / Dokument als PDF konvertieren if (pdfparameters == null) @@ -308,9 +308,19 @@ namespace DOCGEN converter.Settings.EmbedFonts = true; if (useseettings) { - converter.Settings.UpdateDocumentFields = true; + converter.Settings.UpdateDocumentFields = false; converter.Settings.EnableAlternateChunks = true; converter.Settings.AutoDetectComplexScript = true; + converter.Settings.ImageResolution = 640; + converter.Settings.ImageQuality = 100; + } + else + { + converter.Settings.UpdateDocumentFields = false; + converter.Settings.EnableAlternateChunks = true; + converter.Settings.AutoDetectComplexScript = true; + converter.Settings.ImageResolution = 96; + converter.Settings.ImageQuality = 1; } //Converts Word document into PDF document using (PdfDocument pdfDocument = converter.ConvertToPDF(wordDocument)) diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index 50d47263..4a0276b7 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 cc7eb3a3..025a35e5 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 46b5cd86..a966b33a 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 c92c3afc..fef1f8bf 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 e4fd69d1..5c2d9153 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 10a42aa7..d642b2cf 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -18,6 +18,7 @@ using NLog.LayoutRenderers; using Helper; using System.Transactions; using System.Net.NetworkInformation; +using System.Linq.Expressions; @@ -2122,6 +2123,9 @@ namespace Database int approved = 0; int approved1 = 0; int approved2 = 0; + int signiert = 0; + int faksimile = 0; + if (Convert.ToBoolean(dsdaten.Tables[0].Rows[0]["Unterschrift_Pruefung"]) == true) { toapprove = 1; @@ -2131,9 +2135,14 @@ namespace Database int unterschriftlinks = Convert.ToInt32(dsdaten.Tables[0].Rows[0]["Unterschrift_links"]); int unterschriftrechts = Convert.ToInt32(dsdaten.Tables[0].Rows[0]["Unterschrift_rechts"]); int bearbeitung_zwingend = Convert.ToInt32(dsdaten.Tables[0].Rows[0]["bearbeitung_zwingend"]); - if (unterschriftlinks == 1 && unterschriftrechts == 0 && approved1 == 1) { approved = 1; } - - Exec_SQL("Update dokument set bearbeitung_zwingend = " + bearbeitung_zwingend.ToString() + ", toapprove=" + toapprove.ToString() + ", approved=" + approved.ToString() + ", approval1=" + approved1.ToString() + ", approval2=" + approved2.ToString() + " where dokumentid = '" + newdokumentid + "'"); + //if (unterschriftlinks == 1 && unterschriftrechts == 0 && approved1 == 1) { approved = 1; } + Get_Tabledata("Select faksimile from dokument where dokumentid=" + dokumentid, false, true); + try + { + faksimile = Convert.ToInt32(dsdaten.Tables[0].Rows[0][0]); + } catch { faksimile = 0; } + bearbeitung_zwingend = 1; + Exec_SQL("Update dokument set bearbeitung_zwingend = " + bearbeitung_zwingend.ToString() + ", toapprove=" + toapprove.ToString() + ", approved=" + approved.ToString() + ", approval1=" + approved1.ToString() + ", approval2=" + approved2.ToString() + ", signiert="+signiert.ToString()+", faksimile="+faksimile.ToString()+" where dokumentid = '" + newdokumentid + "'"); return newdokumentid; } diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll index c92c3afc..fef1f8bf 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 e4fd69d1..5c2d9153 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/ILMocup/bin/ILMocup.dll b/ILMocup/bin/ILMocup.dll index 2a57d999..5f06ed17 100644 Binary files a/ILMocup/bin/ILMocup.dll and b/ILMocup/bin/ILMocup.dll differ diff --git a/ILMocup/bin/ILMocup.pdb b/ILMocup/bin/ILMocup.pdb index 8e5547c9..1494092f 100644 Binary files a/ILMocup/bin/ILMocup.pdb and b/ILMocup/bin/ILMocup.pdb differ diff --git a/ILMocup/obj/Debug/ILMocup.csproj.AssemblyReference.cache b/ILMocup/obj/Debug/ILMocup.csproj.AssemblyReference.cache index 19de7555..86360927 100644 Binary files a/ILMocup/obj/Debug/ILMocup.csproj.AssemblyReference.cache and b/ILMocup/obj/Debug/ILMocup.csproj.AssemblyReference.cache differ diff --git a/ILMocup/obj/Debug/ILMocup.dll b/ILMocup/obj/Debug/ILMocup.dll index 44a95621..5f06ed17 100644 Binary files a/ILMocup/obj/Debug/ILMocup.dll and b/ILMocup/obj/Debug/ILMocup.dll differ diff --git a/ILMocup/obj/Debug/ILMocup.pdb b/ILMocup/obj/Debug/ILMocup.pdb index a01a27c1..1494092f 100644 Binary files a/ILMocup/obj/Debug/ILMocup.pdb and b/ILMocup/obj/Debug/ILMocup.pdb differ diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll index c92c3afc..fef1f8bf 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 e4fd69d1..5c2d9153 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 5f01c32c..90e447a0 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 80383a5e..c4b3995d 100644 Binary files a/OnDocOffice/bin/Debug/OnDocOffice.pdb and b/OnDocOffice/bin/Debug/OnDocOffice.pdb differ diff --git a/OnDocOffice/bin/Debug/vbBarcodes.dll b/OnDocOffice/bin/Debug/vbBarcodes.dll index 2d6a4fbc..368c87de 100644 Binary files a/OnDocOffice/bin/Debug/vbBarcodes.dll and b/OnDocOffice/bin/Debug/vbBarcodes.dll differ diff --git a/OnDocOffice/bin/Debug/vbBarcodes.pdb b/OnDocOffice/bin/Debug/vbBarcodes.pdb index 50334496..f99eca97 100644 Binary files a/OnDocOffice/bin/Debug/vbBarcodes.pdb and b/OnDocOffice/bin/Debug/vbBarcodes.pdb differ diff --git a/OnDocOffice/clsoffice.cs b/OnDocOffice/clsoffice.cs index 54d15f40..d19c9cf2 100644 --- a/OnDocOffice/clsoffice.cs +++ b/OnDocOffice/clsoffice.cs @@ -1560,7 +1560,9 @@ namespace OnDocOffice Start_Application(); //word.Visible = true; word.Documents.Open(filename); + word.Visible = true; + string path_unterschriftlinks = ""; string path_unterschriftrechts = ""; if ( unterschriftlinks != "-1") @@ -1601,11 +1603,20 @@ namespace OnDocOffice public class word_signature { + bool is_protected = false; Microsoft.Office.Interop.Word.Document docWord; public bool sign_doc(ref Microsoft.Office.Interop.Word.Application word, string imagepath_ul, string imagepath_ur, string dokumentid) { Logging.Logging.Debug("Sign_Doc", "OnDoc", dokumentid); docWord = word.ActiveDocument; + Thread.Sleep(1000); + if (word.ActiveDocument.ProtectionType != Microsoft.Office.Interop.Word.WdProtectionType.wdNoProtection) + { + word.ActiveDocument.Unprotect(Password: "Australia"); + is_protected = true; + } + + try { foreach (Microsoft.Office.Interop.Word.Bookmark bm in docWord.Bookmarks) @@ -1621,6 +1632,16 @@ namespace OnDocOffice } //docword = docWord; ; + if (is_protected) + { + try + { + word.ActiveDocument.Protect(Type: Microsoft.Office.Interop.Word.WdProtectionType.wdAllowOnlyFormFields, NoReset: true, Password: "Australia"); + } + catch { } + } + Thread.Sleep(1000); + Logging.Logging.Debug("Ende Sign_Doc", "OnDoc", dokumentid); return true; } diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index 256d95c2..56f3ed6b 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 5f01c32c..90e447a0 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 80383a5e..c4b3995d 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.pdb and b/OnDocOffice/obj/Debug/OnDocOffice.pdb differ diff --git a/vbBarcodes/Class1.vb b/vbBarcodes/Class1.vb index 372fedcc..325fed93 100644 --- a/vbBarcodes/Class1.vb +++ b/vbBarcodes/Class1.vb @@ -35,7 +35,7 @@ Public Class vbarcodes Me.connectionstring = connectionstring Logging.Logging.Debug("Delete Textfelder", "vbBarcodes", docdata.Dokumentid) - 'delete_Textfelder() + delete_Textfelder() Logging.Logging.Debug("Insert Textfelder", "vbBarcodes", docdata.Dokumentid) Insert_TextFelder() Logging.Logging.Debug("Ins Barcode", "vbBarcodes", docdata.Dokumentid) diff --git a/vbBarcodes/bin/Debug/Database.dll b/vbBarcodes/bin/Debug/Database.dll index 18733ab2..0278a7eb 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 54302531..2e8e9602 100644 Binary files a/vbBarcodes/bin/Debug/Database.pdb and b/vbBarcodes/bin/Debug/Database.pdb differ diff --git a/vbBarcodes/bin/Debug/vbBarcodes.dll b/vbBarcodes/bin/Debug/vbBarcodes.dll index 2d6a4fbc..368c87de 100644 Binary files a/vbBarcodes/bin/Debug/vbBarcodes.dll and b/vbBarcodes/bin/Debug/vbBarcodes.dll differ diff --git a/vbBarcodes/bin/Debug/vbBarcodes.pdb b/vbBarcodes/bin/Debug/vbBarcodes.pdb index 50334496..f99eca97 100644 Binary files a/vbBarcodes/bin/Debug/vbBarcodes.pdb and b/vbBarcodes/bin/Debug/vbBarcodes.pdb differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.dll b/vbBarcodes/obj/Debug/vbBarcodes.dll index 2d6a4fbc..368c87de 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.dll and b/vbBarcodes/obj/Debug/vbBarcodes.dll differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.pdb b/vbBarcodes/obj/Debug/vbBarcodes.pdb index 50334496..f99eca97 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.pdb and b/vbBarcodes/obj/Debug/vbBarcodes.pdb differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache index d6db8ac6..35c35cd8 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache and b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache differ