diff --git a/API_NetFramework/Controllers/DocumentController.cs b/API_NetFramework/Controllers/DocumentController.cs index 47486d5e..3e144d25 100644 --- a/API_NetFramework/Controllers/DocumentController.cs +++ b/API_NetFramework/Controllers/DocumentController.cs @@ -199,7 +199,7 @@ namespace API_NetFramework.Controllers if (docgendata.digitaleunterschrift == true) { dokdata.As_Faksimile = "True"; } else { dokdata.As_Faksimile = "False"; } string dokumentid = ""; - dokumentid = db.Create_EDOKA_Doc(dokdata); + dokumentid = db.Create_EDOKA_Doc(dokdata, false, ""); DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(this.connectionstring); clsdok dok = new clsdok("", "", ""); diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index ae5f182d..78eda5e7 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 4eb9997f..b7365f02 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 6a5785f6..414c81c0 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 2af6c559..d17e0e03 100644 Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ diff --git a/API_NetFramework/bin/Model.dll b/API_NetFramework/bin/Model.dll index 35cf0bd7..69e9105c 100644 Binary files a/API_NetFramework/bin/Model.dll and b/API_NetFramework/bin/Model.dll differ diff --git a/API_NetFramework/bin/Model.pdb b/API_NetFramework/bin/Model.pdb index 0ab52c16..c6224b79 100644 Binary files a/API_NetFramework/bin/Model.pdb and b/API_NetFramework/bin/Model.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index 1e35fbf8..a15e08fd 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 ab4ad2c3..d53b9f90 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/VBFileManagement.dll b/API_NetFramework/bin/VBFileManagement.dll index a3e8b1e0..f32431bd 100644 Binary files a/API_NetFramework/bin/VBFileManagement.dll and b/API_NetFramework/bin/VBFileManagement.dll differ diff --git a/API_NetFramework/bin/VBFileManagement.pdb b/API_NetFramework/bin/VBFileManagement.pdb index 3f7ac119..5d98f371 100644 Binary files a/API_NetFramework/bin/VBFileManagement.pdb and b/API_NetFramework/bin/VBFileManagement.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index c9885e7c..c3b914c6 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -3036,3 +3036,128 @@ Parametername: encoder 2025-01-18 09:41:30.2909|ERROR|OnDoc|Unberechtigter Zugriff 2025-01-18 09:42:00.4149|DEBUG|OnDoc|Mailversand: 855 2025-01-18 09:42:00.4418|ERROR|OnDoc|Unberechtigter Zugriff +2025-01-23 11:04:34.2222|DEBUG|OnDoc| +2025-01-23 11:04:34.2528|DEBUG|OnDoc| +2025-01-23 11:04:34.2791|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-01-23 11:04:34.2791|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-01-23 11:04:34.3732|DEBUG|OnDoc| +2025-01-23 11:04:34.3847|DEBUG|OnDoc| +2025-01-23 11:04:34.3987|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 +2025-01-23 13:12:46.2961|DEBUG|OnDoc| +2025-01-23 13:12:46.3381|DEBUG|OnDoc| +2025-01-23 13:12:46.3656|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-23 13:12:46.3656|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-23 13:12:46.4517|DEBUG|OnDoc| +2025-01-23 13:12:46.4627|DEBUG|OnDoc| +2025-01-23 13:12:46.4862|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-23 13:12:46.4892|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-23 14:12:03.8805|DEBUG|OnDoc| +2025-01-23 14:12:03.9120|DEBUG|OnDoc| +2025-01-23 14:12:03.9371|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-23 14:12:03.9371|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-23 14:12:04.0205|DEBUG|OnDoc| +2025-01-23 14:12:04.0205|DEBUG|OnDoc| +2025-01-23 14:12:04.0521|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-23 14:12:04.0521|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-23 14:12:59.4071|DEBUG|OnDoc| +2025-01-23 14:12:59.4161|DEBUG|OnDoc| +2025-01-23 14:12:59.4403|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-23 14:12:59.4423|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-23 14:12:59.4793|DEBUG|OnDoc| +2025-01-23 14:12:59.4793|DEBUG|OnDoc| +2025-01-23 14:12:59.5046|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-23 14:12:59.5046|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-23 14:14:29.6967|DEBUG|OnDoc| +2025-01-23 14:14:29.7283|DEBUG|OnDoc| +2025-01-23 14:14:29.7431|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 +2025-01-23 14:14:29.8432|DEBUG|OnDoc| +2025-01-23 14:14:29.8532|DEBUG|OnDoc| +2025-01-23 14:14:29.8653|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 +2025-01-23 14:41:20.2970|DEBUG|OnDoc| +2025-01-23 14:41:20.3275|DEBUG|OnDoc| +2025-01-23 14:41:20.3542|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-23 14:41:20.3542|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-23 14:41:20.4264|DEBUG|OnDoc| +2025-01-23 14:41:20.4264|DEBUG|OnDoc| +2025-01-23 14:41:20.4575|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-23 14:41:20.4575|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-24 12:48:26.2511|DEBUG|OnDoc| +2025-01-24 12:48:26.2851|DEBUG|OnDoc| +2025-01-24 12:48:26.3101|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-24 12:48:26.3101|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-24 12:48:26.4061|DEBUG|OnDoc| +2025-01-24 12:48:26.4171|DEBUG|OnDoc| +2025-01-24 12:48:26.4421|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-24 12:48:26.4421|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-24 14:02:17.5174|DEBUG|OnDoc| +2025-01-24 14:02:17.5744|DEBUG|OnDoc| +2025-01-24 14:02:17.6029|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-24 14:02:17.6029|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-24 14:02:17.6952|DEBUG|OnDoc| +2025-01-24 14:02:17.6952|DEBUG|OnDoc| +2025-01-24 14:02:17.7282|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-24 14:02:17.7282|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-24 14:06:13.6210|DEBUG|OnDoc| +2025-01-24 14:06:13.6310|DEBUG|OnDoc| +2025-01-24 14:06:13.6540|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-24 14:06:13.6540|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-24 14:06:13.7066|DEBUG|OnDoc| +2025-01-24 14:06:13.7086|DEBUG|OnDoc| +2025-01-24 14:06:13.7326|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-24 14:06:13.7326|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-24 14:07:27.2829|DEBUG|OnDoc| +2025-01-24 14:07:27.2919|DEBUG|OnDoc| +2025-01-24 14:07:27.3159|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-24 14:07:27.3179|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-24 14:07:27.3714|DEBUG|OnDoc| +2025-01-24 14:07:27.3714|DEBUG|OnDoc| +2025-01-24 14:07:27.3984|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-24 14:07:27.3984|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-24 14:08:30.1301|DEBUG|OnDoc| +2025-01-24 14:08:30.1301|DEBUG|OnDoc| +2025-01-24 14:08:30.1651|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-24 14:08:30.1651|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-24 14:08:30.2213|DEBUG|OnDoc| +2025-01-24 14:08:30.2233|DEBUG|OnDoc| +2025-01-24 14:08:30.2485|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-24 14:08:30.2485|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-24 14:10:40.7609|DEBUG|OnDoc| +2025-01-24 14:10:40.7934|DEBUG|OnDoc| +2025-01-24 14:10:40.8186|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-24 14:10:40.8186|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-24 14:10:40.9076|DEBUG|OnDoc| +2025-01-24 14:10:40.9176|DEBUG|OnDoc| +2025-01-24 14:10:40.9471|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-24 14:10:40.9471|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-24 14:11:20.4301|DEBUG|OnDoc| +2025-01-24 14:11:20.4301|DEBUG|OnDoc| +2025-01-24 14:11:20.4621|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-24 14:11:20.4621|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-24 14:11:20.5131|DEBUG|OnDoc| +2025-01-24 14:11:20.5131|DEBUG|OnDoc| +2025-01-24 14:11:20.5376|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-24 14:11:20.5376|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-24 14:11:50.0678|DEBUG|OnDoc| +2025-01-24 14:11:50.0678|DEBUG|OnDoc| +2025-01-24 14:11:50.1028|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-24 14:11:50.1028|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-24 14:11:50.1563|DEBUG|OnDoc| +2025-01-24 14:11:50.1563|DEBUG|OnDoc| +2025-01-24 14:11:50.1833|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-24 14:11:50.1833|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-24 14:12:20.3387|DEBUG|OnDoc| +2025-01-24 14:12:20.3487|DEBUG|OnDoc| +2025-01-24 14:12:20.3719|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-24 14:12:20.3719|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-24 14:12:20.4219|DEBUG|OnDoc| +2025-01-24 14:12:20.4219|DEBUG|OnDoc| +2025-01-24 14:12:20.4479|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-24 14:12:20.4479|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-24 14:12:42.6894|DEBUG|OnDoc| +2025-01-24 14:12:42.6984|DEBUG|OnDoc| +2025-01-24 14:12:42.7214|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-01-24 14:12:42.7234|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-01-24 14:12:42.7725|DEBUG|OnDoc| +2025-01-24 14:12:42.7725|DEBUG|OnDoc| +2025-01-24 14:12:42.7987|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 +2025-01-24 14:12:42.8007|INFO|OnDoc|Unterschrift-Bezug: TG9665 diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 9ac7d99b..ec3db0b0 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 1e35fbf8..a15e08fd 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 ab4ad2c3..d53b9f90 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 6a5785f6..414c81c0 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 2af6c559..d17e0e03 100644 Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ diff --git a/BarcodeLib/bin/Debug/Model.dll b/BarcodeLib/bin/Debug/Model.dll index 35cf0bd7..69e9105c 100644 Binary files a/BarcodeLib/bin/Debug/Model.dll and b/BarcodeLib/bin/Debug/Model.dll differ diff --git a/BarcodeLib/bin/Debug/Model.pdb b/BarcodeLib/bin/Debug/Model.pdb index 0ab52c16..c6224b79 100644 Binary files a/BarcodeLib/bin/Debug/Model.pdb and b/BarcodeLib/bin/Debug/Model.pdb differ diff --git a/BarcodeLib/bin/Debug/VBFileManagement.dll b/BarcodeLib/bin/Debug/VBFileManagement.dll index a3e8b1e0..f32431bd 100644 Binary files a/BarcodeLib/bin/Debug/VBFileManagement.dll and b/BarcodeLib/bin/Debug/VBFileManagement.dll differ diff --git a/BarcodeLib/bin/Debug/VBFileManagement.pdb b/BarcodeLib/bin/Debug/VBFileManagement.pdb index 3f7ac119..5d98f371 100644 Binary files a/BarcodeLib/bin/Debug/VBFileManagement.pdb and b/BarcodeLib/bin/Debug/VBFileManagement.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index a983ae4e..867f228e 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/BarcodeLibVBDatamatrix/bin/Debug/Model.dll b/BarcodeLibVBDatamatrix/bin/Debug/Model.dll index f67700e0..69e9105c 100644 Binary files a/BarcodeLibVBDatamatrix/bin/Debug/Model.dll and b/BarcodeLibVBDatamatrix/bin/Debug/Model.dll differ diff --git a/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb b/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb index 5664e729..c6224b79 100644 Binary files a/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb and b/BarcodeLibVBDatamatrix/bin/Debug/Model.pdb differ diff --git a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache index 11421805..541ffd94 100644 Binary files a/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache and b/BarcodeLibVBDatamatrix/obj/Debug/BarcodeLibVBDatamatrix.vbproj.AssemblyReference.cache differ diff --git a/Client/Client.csproj b/Client/Client.csproj index 20305964..660ba717 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -530,12 +530,6 @@ Dokumentpaket.cs - - Form - - - FrmDokumenterstellung.cs - Form @@ -548,6 +542,12 @@ frmNote.cs + + Form + + + frmSerienbrief.cs + Form @@ -693,10 +693,10 @@ Partnersuche.cs - - Form + + UserControl - + Serienbrief.cs @@ -779,15 +779,15 @@ Dokumentpaket.cs - - FrmDokumenterstellung.cs - frmDokumentpaketNeugenerierung.cs frmNote.cs + + frmSerienbrief.cs + frmToApproval.cs @@ -865,7 +865,7 @@ Partnersuche.cs - + Serienbrief.cs diff --git a/Client/Diverses/InputDialog.Designer.cs b/Client/Diverses/InputDialog.Designer.cs index 413eb3f8..ac15c4f9 100644 --- a/Client/Diverses/InputDialog.Designer.cs +++ b/Client/Diverses/InputDialog.Designer.cs @@ -56,7 +56,7 @@ // btnok // this.btnok.Enabled = false; - this.btnok.Location = new System.Drawing.Point(189, 103); + this.btnok.Location = new System.Drawing.Point(288, 103); this.btnok.Name = "btnok"; this.btnok.Size = new System.Drawing.Size(75, 23); this.btnok.TabIndex = 2; @@ -66,11 +66,11 @@ // // btncancel // - this.btncancel.Location = new System.Drawing.Point(292, 103); + this.btncancel.Location = new System.Drawing.Point(207, 103); this.btncancel.Name = "btncancel"; this.btncancel.Size = new System.Drawing.Size(75, 23); this.btncancel.TabIndex = 3; - this.btncancel.Text = "Abbruch"; + this.btncancel.Text = "Abbrechen"; this.btncancel.UseVisualStyleBackColor = true; this.btncancel.Click += new System.EventHandler(this.btncancel_Click); // diff --git a/Client/Diverses/InputDialog.cs b/Client/Diverses/InputDialog.cs index bf04037c..a23b6803 100644 --- a/Client/Diverses/InputDialog.cs +++ b/Client/Diverses/InputDialog.cs @@ -42,18 +42,28 @@ namespace OnDoc.Diverses this.cbboxMitarbeiter.Visible = false; } - public InputDialog(bool Mitarbeiter,string description) + public InputDialog(bool Mitarbeiter,string description, string caption) { InitializeComponent(); + this.Style.TitleBar.BackColor = Theaming.Titelbar(); + this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + this.Style.ShadowOpacity = Theaming.ShadowOpacity; + this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; this.textBox1.Visible = false; this.cbboxMitarbeiter.Visible = true; this.label1.Text = description; + this.Text = caption; + isMaDialog = true; } public InputDialog(string caption, string description, string defaultvalue, bool multiline) { InitializeComponent(); + this.Style.TitleBar.BackColor = Theaming.Titelbar(); + this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + this.Style.ShadowOpacity = Theaming.ShadowOpacity; + this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; this.multiline = multiline; int AddHeight = 100; this.textBox1.Visible = true; @@ -65,7 +75,7 @@ namespace OnDoc.Diverses this.Height = this.textBox1.Top + this.textBox1.Height + this.btnok.Height + 50; this.btnok.Top = this.textBox1.Top + this.textBox1.Height + 5; this.btncancel.Top = this.btnok.Top; - + this.Text= caption; this.cbboxMitarbeiter.Visible = false; this.label1.Text = description; isMaDialog = false; diff --git a/Client/Diverses/SaveAnsicht.Designer.cs b/Client/Diverses/SaveAnsicht.Designer.cs index cd727ff8..06d225d5 100644 --- a/Client/Diverses/SaveAnsicht.Designer.cs +++ b/Client/Diverses/SaveAnsicht.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SaveAnsicht)); this.label1 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); @@ -64,11 +65,11 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(269, 89); + this.button2.Location = new System.Drawing.Point(283, 87); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(75, 23); this.button2.TabIndex = 3; - this.button2.Text = "Abbruch"; + this.button2.Text = "Abbrechen"; this.button2.UseVisualStyleBackColor = true; this.button2.Click += new System.EventHandler(this.button2_Click); // @@ -101,7 +102,10 @@ this.Controls.Add(this.button1); this.Controls.Add(this.textBox1); this.Controls.Add(this.label1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "SaveAnsicht"; + this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; + this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; this.Text = "Ansicht speichern"; this.Load += new System.EventHandler(this.SaveAnsicht_Load); this.ResumeLayout(false); diff --git a/Client/Diverses/SaveAnsicht.cs b/Client/Diverses/SaveAnsicht.cs index eac7862d..164f1bd1 100644 --- a/Client/Diverses/SaveAnsicht.cs +++ b/Client/Diverses/SaveAnsicht.cs @@ -9,21 +9,28 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Syncfusion.Windows.Forms; +using Syncfusion.Windows.Forms.Tools; +using Syncfusion.WinForms.Controls; namespace OnDoc.Diverses { - public partial class SaveAnsicht : Form + public partial class SaveAnsicht : SfForm { public string selectedtext = ""; public int alsStandard = 0; public SaveAnsicht() { InitializeComponent(); + this.Style.TitleBar.BackColor = Theaming.Titelbar(); + this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + this.Style.ShadowOpacity = Theaming.ShadowOpacity; + this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; } private void SaveAnsicht_Load(object sender, EventArgs e) { - + this.SetDesktopLocation(Cursor.Position.X, Cursor.Position.Y); } private void button1_Click(object sender, EventArgs e) diff --git a/Client/Diverses/SaveAnsicht.resx b/Client/Diverses/SaveAnsicht.resx index 1af7de15..91a94330 100644 --- a/Client/Diverses/SaveAnsicht.resx +++ b/Client/Diverses/SaveAnsicht.resx @@ -117,4 +117,365 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 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 + uv8MBPBPZDcQwdeMvKHnKgjgNfQHBmH2Ov8rEMB7EIEoBP57EMB5EIEIBP55EEA7iCApBH47COA6S2HV + IBy6+vdAAPdZiuDn29WZ6PwEUxBAX9Yy4CfjsjDgOQnhIAAblkJW0A1mezsQgD1LQQbNEPQ+IABfljLI + aTm9ETv1aBgQQCxr/TJrdvDp4JI1+lpmBQHkYq1fRhUCAZ8PBJCb9fiNmhQejiVbr34fsAUB6LHsr4Ow + fsLDwaSVrVC/S4EAxmQV+74QBAIAmBgEADAxCABgYhAAwMQgAICJ+RP57wOmMzXzmQAAAABJRU5ErkJg + gigAAAAwAAAAYAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAACAAAAAgAAAAIAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AFw7KhnFfltX14pkk9SIYr/ym3De349o79+PaO/fj2jv349o7/KbcN7UiGO/14pkk8V+W1dUNSYZAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + ADomGgmtb1Bj2Ipkw/Wecvr+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2 + //6jdv/1nnL62Ipkw61vUGMAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + 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 + QcPDrEHgB6xB8A+sQQ== + + \ No newline at end of file diff --git a/Client/Diverses/valueselector.Designer.cs b/Client/Diverses/valueselector.Designer.cs index 5e7e59bb..1217e312 100644 --- a/Client/Diverses/valueselector.Designer.cs +++ b/Client/Diverses/valueselector.Designer.cs @@ -32,10 +32,10 @@ this.GridData = new Syncfusion.WinForms.DataGrid.SfDataGrid(); this.sfCalendar1 = new Syncfusion.WinForms.Input.SfCalendar(); this.panel1 = new System.Windows.Forms.Panel(); - this.panel2 = new System.Windows.Forms.Panel(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); this.button1 = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.panel2 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.GridData)).BeginInit(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -82,23 +82,15 @@ this.panel1.Size = new System.Drawing.Size(363, 425); this.panel1.TabIndex = 3; // - // panel2 - // - this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel2.Location = new System.Drawing.Point(79, 351); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(32, 16); - this.panel2.TabIndex = 3; - this.panel2.Click += new System.EventHandler(this.panel2_Click); - // - // label1 + // button1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(118, 353); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(36, 13); - this.label1.TabIndex = 4; - this.label1.Text = "Heute"; + this.button1.Location = new System.Drawing.Point(136, 390); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(86, 23); + this.button1.TabIndex = 6; + this.button1.Text = "übernehmen"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); // // label2 // @@ -109,15 +101,23 @@ this.label2.TabIndex = 5; this.label2.Text = "label2"; // - // button1 + // label1 // - this.button1.Location = new System.Drawing.Point(136, 390); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(86, 23); - this.button1.TabIndex = 6; - this.button1.Text = "übernehmen"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(118, 353); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(36, 13); + this.label1.TabIndex = 4; + this.label1.Text = "Heute"; + // + // panel2 + // + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Location = new System.Drawing.Point(79, 351); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(32, 16); + this.panel2.TabIndex = 3; + this.panel2.Click += new System.EventHandler(this.panel2_Click); // // valueselector // @@ -130,7 +130,7 @@ this.Name = "valueselector"; this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; - this.Text = "Werte-Auwahl"; + this.Text = "Dokumentspezifische Werte"; this.Load += new System.EventHandler(this.valueselector_Load); ((System.ComponentModel.ISupportInitialize)(this.GridData)).EndInit(); this.panel1.ResumeLayout(false); diff --git a/Client/DocMgmt/DokTypSelect.Designer.cs b/Client/DocMgmt/DokTypSelect.Designer.cs index de70d09f..12e5dfe7 100644 --- a/Client/DocMgmt/DokTypSelect.Designer.cs +++ b/Client/DocMgmt/DokTypSelect.Designer.cs @@ -111,7 +111,7 @@ namespace OnDoc.DocMgmt this.ribbon1.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013; this.ribbon1.OrbVisible = false; this.ribbon1.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F); - this.ribbon1.Size = new System.Drawing.Size(488, 74); + this.ribbon1.Size = new System.Drawing.Size(495, 74); this.ribbon1.TabIndex = 0; this.ribbon1.Tabs.Add(this.ribbonTab1); this.ribbon1.TabSpacing = 4; @@ -262,7 +262,7 @@ namespace OnDoc.DocMgmt this.sfListView1.HotTracking = true; this.sfListView1.Location = new System.Drawing.Point(2, 76); this.sfListView1.Name = "sfListView1"; - this.sfListView1.Size = new System.Drawing.Size(488, 584); + this.sfListView1.Size = new System.Drawing.Size(495, 584); this.sfListView1.TabIndex = 1; this.sfListView1.Text = "sfListView1"; this.sfListView1.DoubleClick += new System.EventHandler(this.sfListView1_DoubleClick); @@ -550,6 +550,8 @@ namespace OnDoc.DocMgmt // toolStrip2 // this.toolStrip2.AutoSize = false; + this.toolStrip2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.toolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripLabel1, this.toolstriptextboxsearch, @@ -585,7 +587,7 @@ namespace OnDoc.DocMgmt this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(23, 45); - this.toolStripButton1.Text = "toolStripButton1"; + this.toolStripButton1.Text = "Suchen"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // // toolStripButton2 @@ -595,13 +597,14 @@ namespace OnDoc.DocMgmt this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Size = new System.Drawing.Size(23, 45); - this.toolStripButton2.Text = "toolStripButton2"; + this.toolStripButton2.Text = "Suchfeld initialisieren"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Size = new System.Drawing.Size(6, 48); + this.toolStripSeparator2.Visible = false; // // toolStripLabel2 // @@ -612,7 +615,7 @@ namespace OnDoc.DocMgmt // toolstripCombobox_Fachverantwortung // this.toolstripCombobox_Fachverantwortung.Name = "toolstripCombobox_Fachverantwortung"; - this.toolstripCombobox_Fachverantwortung.Size = new System.Drawing.Size(130, 23); + this.toolstripCombobox_Fachverantwortung.Size = new System.Drawing.Size(130, 48); this.toolstripCombobox_Fachverantwortung.SelectedIndexChanged += new System.EventHandler(this.toolstripCombobox_Fachverantwortung_SelectedIndexChanged); // // toolStripButton4 @@ -622,7 +625,7 @@ namespace OnDoc.DocMgmt this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; this.toolStripButton4.Size = new System.Drawing.Size(23, 20); - this.toolStripButton4.Text = "toolStripButton2"; + this.toolStripButton4.Text = "Fachverantwortung initialisieren"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // // DokTypSelect diff --git a/Client/DocMgmt/DokTypSelect.resx b/Client/DocMgmt/DokTypSelect.resx index 0ef764e5..6bf972be 100644 --- a/Client/DocMgmt/DokTypSelect.resx +++ b/Client/DocMgmt/DokTypSelect.resx @@ -284,7 +284,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi - DAAAAk1TRnQBSQFMAgEBBgEAAdgBAAHYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBgEAAeABAAHgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -344,6 +344,9 @@ 618, 16 + + 618, 16 + 723, 16 diff --git a/Client/DocMgmt/Dokumenterstellung.cs b/Client/DocMgmt/Dokumenterstellung.cs index 42f0e5d8..6ac72f52 100644 --- a/Client/DocMgmt/Dokumenterstellung.cs +++ b/Client/DocMgmt/Dokumenterstellung.cs @@ -36,9 +36,13 @@ namespace OnDoc.DocMgmt public int DocFunction = 0; public bool interop { get; set; } = false; public bool runmacros { get; set; } = false; - public string dokumentid = ""; + public string dokumentid { get; set; } = ""; public string filename { get; set; } = ""; + public bool editdoc { get; set; } = false; + + + public Dokumenterstellung() { InitializeComponent(); @@ -69,6 +73,15 @@ namespace OnDoc.DocMgmt Closing += Form_Closing; } + public Dokumenterstellung(string dokumentid) + { + InitializeComponent(); + Broadcaster().AddListener(this); + Closing += Form_Closing; + this.dokumentid=dokumentid; + this.editdoc = true; + } + private void Form_Closing(object sender, CancelEventArgs e) { Broadcaster().RemoveListener(this); @@ -84,7 +97,7 @@ namespace OnDoc.DocMgmt } if (message == "AdminDokErstellung") { - Dokument_Erstellen(); + Dokument_Erstellen("",false); } @@ -95,10 +108,18 @@ namespace OnDoc.DocMgmt this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); this.Style.ShadowOpacity = Theaming.ShadowOpacity; this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; - ucAllgemeineDokumentParam1.dokumenttypnr = dokumenttypnr; - ucAllgemeineDokumentParam1.partnernr = partnernr; - ucAllgemeineDokumentParam1.profilnr = profilnr; - ucAllgemeineDokumentParam1.Refresh_Details(); + if (dokumentid != "") + { + ucAllgemeineDokumentParam1.dokumentid = dokumentid; + ucAllgemeineDokumentParam1.load_doc(); + } + else + { + ucAllgemeineDokumentParam1.dokumenttypnr = dokumenttypnr; + ucAllgemeineDokumentParam1.partnernr = partnernr; + ucAllgemeineDokumentParam1.profilnr = profilnr; + ucAllgemeineDokumentParam1.Refresh_Details(); + } //if (ucAllgemeineDokumentParam1.check_bp_person() == false) //{ // btnDokumenterstellen.Enabled = false; @@ -113,11 +134,11 @@ namespace OnDoc.DocMgmt private void sfButton2_Click(object sender, EventArgs e) { Cursor = Cursors.WaitCursor; - Dokument_Erstellen(); + Dokument_Erstellen(this.dokumentid,this.editdoc); Cursor = Cursors.Default; } - public void Dokument_Erstellen() + public void Dokument_Erstellen(string dokumentid, bool editdoc) { this.filename = ""; if (ucAllgemeineDokumentParam1.check_fields()==false) { @@ -128,7 +149,8 @@ namespace OnDoc.DocMgmt ucAllgemeineDokumentParam1.update_dokdata(ref dokdata); DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring); - string dokumentid = docgen.GenDocID(dokdata); + + dokumentid = docgen.GenDocID(dokdata, editdoc, dokumentid); dokdata.Dokumentid = dokumentid; ucAllgemeineDokumentParam1.genertated_dokumentid = dokumentid; this.dokumentid=dokdata.Dokumentid; @@ -175,7 +197,7 @@ namespace OnDoc.DocMgmt DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey,AppParams.Office_Fill_DocIO); clsdok dok = new clsdok("", "", ""); Logging.Logging.Debug("Generate_Doc_EDOKA", "Dokumenterstellung", dokumentid); - dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1, AppParams.vbvorlagenmanagement=="Yes"); + dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1, AppParams.vbvorlagenmanagement=="Yes",this.editdoc); Logging.Logging.Debug("Generate_Doc_EDOKA - Ende", "Dokumenterstellung", dokumentid); diff --git a/Client/DocMgmt/Dokumentpaket.cs b/Client/DocMgmt/Dokumentpaket.cs index b9cf0a6c..ee244b15 100644 --- a/Client/DocMgmt/Dokumentpaket.cs +++ b/Client/DocMgmt/Dokumentpaket.cs @@ -485,7 +485,7 @@ namespace OnDoc.DocMgmt uc.update_dokdata(ref dokdata); uc.update_partner(); DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring); - string dokumentid = docgen.GenDocID(dokdata); + string dokumentid = docgen.GenDocID(dokdata, false, ""); dokdata.Dokumentid = dokumentid; uc.genertated_dokumentid = dokumentid; uc.Show_Neugenerieren(); diff --git a/Client/DocMgmt/FrmDokumenterstellung.Designer.cs b/Client/DocMgmt/FrmDokumenterstellung.Designer.cs deleted file mode 100644 index ff61f6de..00000000 --- a/Client/DocMgmt/FrmDokumenterstellung.Designer.cs +++ /dev/null @@ -1,651 +0,0 @@ -namespace OnDoc.DocMgmt -{ - partial class FrmDokumenterstellung - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmDokumenterstellung)); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.lblPartner = new System.Windows.Forms.Label(); - this.lblPartnerInhaber = new System.Windows.Forms.Label(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.groupBox8 = new System.Windows.Forms.GroupBox(); - this.cbboxteam = new Syncfusion.WinForms.ListView.SfComboBox(); - this.groupBox7 = new System.Windows.Forms.GroupBox(); - this.cbformularohneunterschrfit = new System.Windows.Forms.CheckBox(); - this.cbdigitaleunterschrfiten = new System.Windows.Forms.CheckBox(); - this.cbboxunterschriftrechts = new Syncfusion.WinForms.ListView.SfComboBox(); - this.cbboxunterschriftlinks = new Syncfusion.WinForms.ListView.SfComboBox(); - this.lblUnterschriftrechts = new System.Windows.Forms.Label(); - this.lblUnterschriftlinks = new System.Windows.Forms.Label(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.cbboxzustaendigmitarbeiter = new Syncfusion.WinForms.ListView.SfComboBox(); - this.cbboxzustaendigkube = new Syncfusion.WinForms.ListView.SfComboBox(); - this.rbzustaendigmitarbeiter = new System.Windows.Forms.RadioButton(); - this.rbzustaendigkube = new System.Windows.Forms.RadioButton(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.DateTermin = new Syncfusion.WinForms.Input.SfDateTimeEdit(); - this.lblTermin = new System.Windows.Forms.Label(); - this.DateDokumentDatum = new Syncfusion.WinForms.Input.SfDateTimeEdit(); - this.lblDokumentDatum = new System.Windows.Forms.Label(); - this.cbboxpostzustellung = new Syncfusion.WinForms.ListView.SfComboBox(); - this.lblPostzustellung = new System.Windows.Forms.Label(); - this.lblBezeichnung = new System.Windows.Forms.Label(); - this.txtbezeichnung = new System.Windows.Forms.TextBox(); - this.cbboxstatus = new Syncfusion.WinForms.ListView.SfComboBox(); - this.lblstatus = new System.Windows.Forms.Label(); - this.lblVerantwortlich = new System.Windows.Forms.Label(); - this.cbboxverantwortlich = new Syncfusion.WinForms.ListView.SfComboBox(); - this.rbDokumentbearbeiten = new System.Windows.Forms.RadioButton(); - this.rbEditlater = new System.Windows.Forms.RadioButton(); - this.rbasPDFarchivieren = new System.Windows.Forms.RadioButton(); - this.groupBox11 = new System.Windows.Forms.GroupBox(); - this.gridDokwertlist = new Syncfusion.WinForms.DataGrid.SfDataGrid(); - this.sfButton2 = new Syncfusion.WinForms.Controls.SfButton(); - this.groupBox9 = new System.Windows.Forms.GroupBox(); - this.rbasPDF = new System.Windows.Forms.RadioButton(); - this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton(); - this.sfButton1 = new Syncfusion.WinForms.Controls.SfButton(); - this.groupBox1.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox8.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxteam)).BeginInit(); - this.groupBox7.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftrechts)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftlinks)).BeginInit(); - this.groupBox6.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxzustaendigmitarbeiter)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxzustaendigkube)).BeginInit(); - this.groupBox5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxstatus)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxverantwortlich)).BeginInit(); - this.groupBox11.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gridDokwertlist)).BeginInit(); - this.groupBox9.SuspendLayout(); - this.SuspendLayout(); - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.groupBox3); - this.groupBox1.Controls.Add(this.groupBox2); - this.groupBox1.Controls.Add(this.sfButton1); - this.groupBox1.Controls.Add(this.lblPartner); - this.groupBox1.Controls.Add(this.lblPartnerInhaber); - this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.groupBox1.Location = new System.Drawing.Point(5, 15); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(540, 164); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Partner"; - // - // groupBox3 - // - this.groupBox3.Location = new System.Drawing.Point(298, 49); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(200, 100); - this.groupBox3.TabIndex = 4; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Zustell-Adresse"; - // - // groupBox2 - // - this.groupBox2.Location = new System.Drawing.Point(83, 49); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(200, 100); - this.groupBox2.TabIndex = 3; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Inhaber-Adresse"; - // - // lblPartner - // - this.lblPartner.AutoSize = true; - this.lblPartner.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPartner.Location = new System.Drawing.Point(194, 25); - this.lblPartner.Name = "lblPartner"; - this.lblPartner.Size = new System.Drawing.Size(107, 13); - this.lblPartner.TabIndex = 1; - this.lblPartner.Text = "Partner-Kurzname"; - // - // lblPartnerInhaber - // - this.lblPartnerInhaber.AutoSize = true; - this.lblPartnerInhaber.Location = new System.Drawing.Point(80, 25); - this.lblPartnerInhaber.Name = "lblPartnerInhaber"; - this.lblPartnerInhaber.Size = new System.Drawing.Size(80, 13); - this.lblPartnerInhaber.TabIndex = 0; - this.lblPartnerInhaber.Text = "Partner-Inhaber"; - // - // groupBox4 - // - this.groupBox4.Controls.Add(this.groupBox8); - this.groupBox4.Controls.Add(this.groupBox7); - this.groupBox4.Controls.Add(this.groupBox6); - this.groupBox4.Controls.Add(this.groupBox5); - this.groupBox4.Location = new System.Drawing.Point(5, 230); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(540, 420); - this.groupBox4.TabIndex = 1; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "Dokument-Inhalt"; - // - // groupBox8 - // - this.groupBox8.Controls.Add(this.cbboxteam); - this.groupBox8.Dock = System.Windows.Forms.DockStyle.Top; - this.groupBox8.Location = new System.Drawing.Point(3, 347); - this.groupBox8.Name = "groupBox8"; - this.groupBox8.Size = new System.Drawing.Size(534, 55); - this.groupBox8.TabIndex = 3; - this.groupBox8.TabStop = false; - this.groupBox8.Text = "Team"; - // - // cbboxteam - // - this.cbboxteam.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cbboxteam.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxteam.Location = new System.Drawing.Point(151, 19); - this.cbboxteam.Name = "cbboxteam"; - this.cbboxteam.Size = new System.Drawing.Size(354, 19); - this.cbboxteam.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); - this.cbboxteam.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbboxteam.TabIndex = 12; - this.cbboxteam.TabStop = false; - // - // groupBox7 - // - this.groupBox7.Controls.Add(this.cbformularohneunterschrfit); - this.groupBox7.Controls.Add(this.cbdigitaleunterschrfiten); - this.groupBox7.Controls.Add(this.cbboxunterschriftrechts); - this.groupBox7.Controls.Add(this.cbboxunterschriftlinks); - this.groupBox7.Controls.Add(this.lblUnterschriftrechts); - this.groupBox7.Controls.Add(this.lblUnterschriftlinks); - this.groupBox7.Dock = System.Windows.Forms.DockStyle.Top; - this.groupBox7.Location = new System.Drawing.Point(3, 202); - this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(534, 145); - this.groupBox7.TabIndex = 2; - this.groupBox7.TabStop = false; - this.groupBox7.Text = "Unterschriften"; - // - // cbformularohneunterschrfit - // - this.cbformularohneunterschrfit.AutoSize = true; - this.cbformularohneunterschrfit.Location = new System.Drawing.Point(22, 19); - this.cbformularohneunterschrfit.Name = "cbformularohneunterschrfit"; - this.cbformularohneunterschrfit.Size = new System.Drawing.Size(150, 17); - this.cbformularohneunterschrfit.TabIndex = 11; - this.cbformularohneunterschrfit.Text = "Formular ohne Unterschrift"; - this.cbformularohneunterschrfit.UseVisualStyleBackColor = true; - // - // cbdigitaleunterschrfiten - // - this.cbdigitaleunterschrfiten.AutoSize = true; - this.cbdigitaleunterschrfiten.Location = new System.Drawing.Point(22, 113); - this.cbdigitaleunterschrfiten.Name = "cbdigitaleunterschrfiten"; - this.cbdigitaleunterschrfiten.Size = new System.Drawing.Size(130, 17); - this.cbdigitaleunterschrfiten.TabIndex = 10; - this.cbdigitaleunterschrfiten.Text = "Digitale Unterschriften"; - this.cbdigitaleunterschrfiten.UseVisualStyleBackColor = true; - // - // cbboxunterschriftrechts - // - this.cbboxunterschriftrechts.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cbboxunterschriftrechts.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxunterschriftrechts.Location = new System.Drawing.Point(151, 79); - this.cbboxunterschriftrechts.Name = "cbboxunterschriftrechts"; - this.cbboxunterschriftrechts.Size = new System.Drawing.Size(354, 19); - this.cbboxunterschriftrechts.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); - this.cbboxunterschriftrechts.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbboxunterschriftrechts.TabIndex = 9; - this.cbboxunterschriftrechts.TabStop = false; - // - // cbboxunterschriftlinks - // - this.cbboxunterschriftlinks.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cbboxunterschriftlinks.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxunterschriftlinks.Location = new System.Drawing.Point(151, 50); - this.cbboxunterschriftlinks.Name = "cbboxunterschriftlinks"; - this.cbboxunterschriftlinks.Size = new System.Drawing.Size(354, 19); - this.cbboxunterschriftlinks.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); - this.cbboxunterschriftlinks.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbboxunterschriftlinks.TabIndex = 8; - this.cbboxunterschriftlinks.TabStop = false; - // - // lblUnterschriftrechts - // - this.lblUnterschriftrechts.AutoSize = true; - this.lblUnterschriftrechts.Location = new System.Drawing.Point(17, 79); - this.lblUnterschriftrechts.Name = "lblUnterschriftrechts"; - this.lblUnterschriftrechts.Size = new System.Drawing.Size(93, 13); - this.lblUnterschriftrechts.TabIndex = 7; - this.lblUnterschriftrechts.Text = "Unterschrift rechts"; - // - // lblUnterschriftlinks - // - this.lblUnterschriftlinks.AutoSize = true; - this.lblUnterschriftlinks.Location = new System.Drawing.Point(17, 50); - this.lblUnterschriftlinks.Name = "lblUnterschriftlinks"; - this.lblUnterschriftlinks.Size = new System.Drawing.Size(85, 13); - this.lblUnterschriftlinks.TabIndex = 6; - this.lblUnterschriftlinks.Text = "Unterschrift links"; - // - // groupBox6 - // - this.groupBox6.Controls.Add(this.cbboxzustaendigmitarbeiter); - this.groupBox6.Controls.Add(this.cbboxzustaendigkube); - this.groupBox6.Controls.Add(this.rbzustaendigmitarbeiter); - this.groupBox6.Controls.Add(this.rbzustaendigkube); - this.groupBox6.Dock = System.Windows.Forms.DockStyle.Top; - this.groupBox6.Location = new System.Drawing.Point(3, 102); - this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(534, 100); - this.groupBox6.TabIndex = 1; - this.groupBox6.TabStop = false; - this.groupBox6.Text = "Zuständigkeit"; - // - // cbboxzustaendigmitarbeiter - // - this.cbboxzustaendigmitarbeiter.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cbboxzustaendigmitarbeiter.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxzustaendigmitarbeiter.Location = new System.Drawing.Point(151, 59); - this.cbboxzustaendigmitarbeiter.Name = "cbboxzustaendigmitarbeiter"; - this.cbboxzustaendigmitarbeiter.Size = new System.Drawing.Size(354, 19); - this.cbboxzustaendigmitarbeiter.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); - this.cbboxzustaendigmitarbeiter.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbboxzustaendigmitarbeiter.TabIndex = 7; - this.cbboxzustaendigmitarbeiter.TabStop = false; - // - // cbboxzustaendigkube - // - this.cbboxzustaendigkube.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cbboxzustaendigkube.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxzustaendigkube.Location = new System.Drawing.Point(151, 33); - this.cbboxzustaendigkube.Name = "cbboxzustaendigkube"; - this.cbboxzustaendigkube.Size = new System.Drawing.Size(354, 19); - this.cbboxzustaendigkube.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); - this.cbboxzustaendigkube.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbboxzustaendigkube.TabIndex = 6; - this.cbboxzustaendigkube.TabStop = false; - // - // rbzustaendigmitarbeiter - // - this.rbzustaendigmitarbeiter.AutoSize = true; - this.rbzustaendigmitarbeiter.Location = new System.Drawing.Point(22, 59); - this.rbzustaendigmitarbeiter.Name = "rbzustaendigmitarbeiter"; - this.rbzustaendigmitarbeiter.Size = new System.Drawing.Size(72, 17); - this.rbzustaendigmitarbeiter.TabIndex = 1; - this.rbzustaendigmitarbeiter.TabStop = true; - this.rbzustaendigmitarbeiter.Text = "Zuständig"; - this.rbzustaendigmitarbeiter.UseVisualStyleBackColor = true; - // - // rbzustaendigkube - // - this.rbzustaendigkube.AutoSize = true; - this.rbzustaendigkube.Location = new System.Drawing.Point(22, 35); - this.rbzustaendigkube.Name = "rbzustaendigkube"; - this.rbzustaendigkube.Size = new System.Drawing.Size(95, 17); - this.rbzustaendigkube.TabIndex = 0; - this.rbzustaendigkube.TabStop = true; - this.rbzustaendigkube.Text = "Kundenberater"; - this.rbzustaendigkube.UseVisualStyleBackColor = true; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.DateTermin); - this.groupBox5.Controls.Add(this.lblTermin); - this.groupBox5.Controls.Add(this.DateDokumentDatum); - this.groupBox5.Controls.Add(this.lblDokumentDatum); - this.groupBox5.Controls.Add(this.cbboxpostzustellung); - this.groupBox5.Controls.Add(this.lblPostzustellung); - this.groupBox5.Dock = System.Windows.Forms.DockStyle.Top; - this.groupBox5.Location = new System.Drawing.Point(3, 16); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(534, 86); - this.groupBox5.TabIndex = 0; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "Allgemein"; - // - // DateTermin - // - this.DateTermin.Location = new System.Drawing.Point(398, 44); - this.DateTermin.Name = "DateTermin"; - this.DateTermin.Size = new System.Drawing.Size(107, 21); - this.DateTermin.TabIndex = 5; - this.DateTermin.ToolTipText = ""; - // - // lblTermin - // - this.lblTermin.AutoSize = true; - this.lblTermin.Location = new System.Drawing.Point(343, 48); - this.lblTermin.Name = "lblTermin"; - this.lblTermin.Size = new System.Drawing.Size(39, 13); - this.lblTermin.TabIndex = 4; - this.lblTermin.Text = "Termin"; - // - // DateDokumentDatum - // - this.DateDokumentDatum.Location = new System.Drawing.Point(151, 44); - this.DateDokumentDatum.Name = "DateDokumentDatum"; - this.DateDokumentDatum.Size = new System.Drawing.Size(107, 21); - this.DateDokumentDatum.TabIndex = 3; - this.DateDokumentDatum.ToolTipText = ""; - // - // lblDokumentDatum - // - this.lblDokumentDatum.AutoSize = true; - this.lblDokumentDatum.Location = new System.Drawing.Point(19, 48); - this.lblDokumentDatum.Name = "lblDokumentDatum"; - this.lblDokumentDatum.Size = new System.Drawing.Size(90, 13); - this.lblDokumentDatum.TabIndex = 2; - this.lblDokumentDatum.Text = "Dokument-Datum"; - // - // cbboxpostzustellung - // - this.cbboxpostzustellung.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cbboxpostzustellung.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxpostzustellung.Location = new System.Drawing.Point(151, 13); - this.cbboxpostzustellung.Name = "cbboxpostzustellung"; - this.cbboxpostzustellung.Size = new System.Drawing.Size(354, 19); - this.cbboxpostzustellung.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); - this.cbboxpostzustellung.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbboxpostzustellung.TabIndex = 1; - this.cbboxpostzustellung.TabStop = false; - // - // lblPostzustellung - // - this.lblPostzustellung.AutoSize = true; - this.lblPostzustellung.Location = new System.Drawing.Point(19, 20); - this.lblPostzustellung.Name = "lblPostzustellung"; - this.lblPostzustellung.Size = new System.Drawing.Size(75, 13); - this.lblPostzustellung.TabIndex = 0; - this.lblPostzustellung.Text = "Postzustellung"; - // - // lblBezeichnung - // - this.lblBezeichnung.AutoSize = true; - this.lblBezeichnung.Location = new System.Drawing.Point(575, 35); - this.lblBezeichnung.Name = "lblBezeichnung"; - this.lblBezeichnung.Size = new System.Drawing.Size(69, 13); - this.lblBezeichnung.TabIndex = 6; - this.lblBezeichnung.Text = "Bezeichnung"; - // - // txtbezeichnung - // - this.txtbezeichnung.Location = new System.Drawing.Point(686, 32); - this.txtbezeichnung.Name = "txtbezeichnung"; - this.txtbezeichnung.Size = new System.Drawing.Size(354, 20); - this.txtbezeichnung.TabIndex = 7; - // - // cbboxstatus - // - this.cbboxstatus.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cbboxstatus.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxstatus.Location = new System.Drawing.Point(686, 83); - this.cbboxstatus.Name = "cbboxstatus"; - this.cbboxstatus.Size = new System.Drawing.Size(354, 19); - this.cbboxstatus.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); - this.cbboxstatus.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbboxstatus.TabIndex = 7; - this.cbboxstatus.TabStop = false; - // - // lblstatus - // - this.lblstatus.AutoSize = true; - this.lblstatus.Location = new System.Drawing.Point(575, 89); - this.lblstatus.Name = "lblstatus"; - this.lblstatus.Size = new System.Drawing.Size(37, 13); - this.lblstatus.TabIndex = 6; - this.lblstatus.Text = "Status"; - // - // lblVerantwortlich - // - this.lblVerantwortlich.AutoSize = true; - this.lblVerantwortlich.Location = new System.Drawing.Point(575, 64); - this.lblVerantwortlich.Name = "lblVerantwortlich"; - this.lblVerantwortlich.Size = new System.Drawing.Size(74, 13); - this.lblVerantwortlich.TabIndex = 8; - this.lblVerantwortlich.Text = "Verantwortlich"; - // - // cbboxverantwortlich - // - this.cbboxverantwortlich.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cbboxverantwortlich.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxverantwortlich.Location = new System.Drawing.Point(686, 58); - this.cbboxverantwortlich.Name = "cbboxverantwortlich"; - this.cbboxverantwortlich.Size = new System.Drawing.Size(354, 19); - this.cbboxverantwortlich.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); - this.cbboxverantwortlich.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbboxverantwortlich.TabIndex = 9; - this.cbboxverantwortlich.TabStop = false; - // - // rbDokumentbearbeiten - // - this.rbDokumentbearbeiten.AutoSize = true; - this.rbDokumentbearbeiten.Checked = true; - this.rbDokumentbearbeiten.Location = new System.Drawing.Point(16, 25); - this.rbDokumentbearbeiten.Name = "rbDokumentbearbeiten"; - this.rbDokumentbearbeiten.Size = new System.Drawing.Size(156, 17); - this.rbDokumentbearbeiten.TabIndex = 10; - this.rbDokumentbearbeiten.TabStop = true; - this.rbDokumentbearbeiten.Text = "Dokument direkt bearbeiten"; - this.rbDokumentbearbeiten.UseVisualStyleBackColor = true; - // - // rbEditlater - // - this.rbEditlater.AutoSize = true; - this.rbEditlater.Location = new System.Drawing.Point(16, 44); - this.rbEditlater.Name = "rbEditlater"; - this.rbEditlater.Size = new System.Drawing.Size(159, 17); - this.rbEditlater.TabIndex = 11; - this.rbEditlater.Text = "Dokument später bearbeiten"; - this.rbEditlater.UseVisualStyleBackColor = true; - // - // rbasPDFarchivieren - // - this.rbasPDFarchivieren.AutoSize = true; - this.rbasPDFarchivieren.Location = new System.Drawing.Point(16, 67); - this.rbasPDFarchivieren.Name = "rbasPDFarchivieren"; - this.rbasPDFarchivieren.Size = new System.Drawing.Size(198, 17); - this.rbasPDFarchivieren.TabIndex = 12; - this.rbasPDFarchivieren.Text = "Dokument als PDF direkt archivieren"; - this.rbasPDFarchivieren.UseVisualStyleBackColor = true; - // - // groupBox11 - // - this.groupBox11.Controls.Add(this.gridDokwertlist); - this.groupBox11.Location = new System.Drawing.Point(578, 230); - this.groupBox11.Name = "groupBox11"; - this.groupBox11.Size = new System.Drawing.Size(531, 420); - this.groupBox11.TabIndex = 13; - this.groupBox11.TabStop = false; - this.groupBox11.Text = "Dokument-spezifische Werte"; - // - // gridDokwertlist - // - this.gridDokwertlist.AccessibleName = "Table"; - this.gridDokwertlist.Dock = System.Windows.Forms.DockStyle.Fill; - this.gridDokwertlist.Location = new System.Drawing.Point(3, 16); - this.gridDokwertlist.Name = "gridDokwertlist"; - this.gridDokwertlist.Size = new System.Drawing.Size(525, 401); - this.gridDokwertlist.TabIndex = 0; - this.gridDokwertlist.Text = "sfDataGrid1"; - this.gridDokwertlist.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellClick); - this.gridDokwertlist.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellDoubleClick); - this.gridDokwertlist.Click += new System.EventHandler(this.gridDokwertlist_Click); - // - // sfButton2 - // - this.sfButton2.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); - this.sfButton2.Location = new System.Drawing.Point(982, 656); - this.sfButton2.Name = "sfButton2"; - this.sfButton2.Size = new System.Drawing.Size(124, 28); - this.sfButton2.TabIndex = 14; - this.sfButton2.Text = "Dokument erstellen"; - this.sfButton2.Click += new System.EventHandler(this.sfButton2_Click); - // - // groupBox9 - // - this.groupBox9.Controls.Add(this.rbasPDF); - this.groupBox9.Controls.Add(this.rbDokumentbearbeiten); - this.groupBox9.Controls.Add(this.rbEditlater); - this.groupBox9.Controls.Add(this.rbasPDFarchivieren); - this.groupBox9.Location = new System.Drawing.Point(581, 111); - this.groupBox9.Name = "groupBox9"; - this.groupBox9.Size = new System.Drawing.Size(459, 113); - this.groupBox9.TabIndex = 15; - this.groupBox9.TabStop = false; - this.groupBox9.Text = "Dokumentvewendung"; - // - // rbasPDF - // - this.rbasPDF.AutoSize = true; - this.rbasPDF.Location = new System.Drawing.Point(16, 90); - this.rbasPDF.Name = "rbasPDF"; - this.rbasPDF.Size = new System.Drawing.Size(163, 17); - this.rbasPDF.TabIndex = 13; - this.rbasPDF.Text = "Dokument als PDF speichern"; - this.rbasPDF.UseVisualStyleBackColor = true; - // - // sfButton3 - // - this.sfButton3.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); - this.sfButton3.Location = new System.Drawing.Point(8, 656); - this.sfButton3.Name = "sfButton3"; - this.sfButton3.Size = new System.Drawing.Size(124, 28); - this.sfButton3.TabIndex = 16; - this.sfButton3.Text = "Abbrechen"; - this.sfButton3.Click += new System.EventHandler(this.sfButton3_Click); - // - // sfButton1 - // - this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); - this.sfButton1.Location = new System.Drawing.Point(15, 21); - this.sfButton1.Name = "sfButton1"; - this.sfButton1.Size = new System.Drawing.Size(47, 28); - this.sfButton1.TabIndex = 2; - // - // FrmDokumenterstellung - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1115, 703); - this.Controls.Add(this.sfButton3); - this.Controls.Add(this.groupBox9); - this.Controls.Add(this.sfButton2); - this.Controls.Add(this.groupBox4); - this.Controls.Add(this.groupBox11); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.lblBezeichnung); - this.Controls.Add(this.txtbezeichnung); - this.Controls.Add(this.cbboxverantwortlich); - this.Controls.Add(this.lblstatus); - this.Controls.Add(this.lblVerantwortlich); - this.Controls.Add(this.cbboxstatus); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "FrmDokumenterstellung"; - this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; - this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; - this.Text = "Dokumenterstellung"; - this.Load += new System.EventHandler(this.FrmDokumenterstellung_Load); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox4.ResumeLayout(false); - this.groupBox8.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.cbboxteam)).EndInit(); - this.groupBox7.ResumeLayout(false); - this.groupBox7.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftrechts)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftlinks)).EndInit(); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxzustaendigmitarbeiter)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxzustaendigkube)).EndInit(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxstatus)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxverantwortlich)).EndInit(); - this.groupBox11.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.gridDokwertlist)).EndInit(); - this.groupBox9.ResumeLayout(false); - this.groupBox9.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label lblPartner; - private System.Windows.Forms.Label lblPartnerInhaber; - private Syncfusion.WinForms.Controls.SfButton sfButton1; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.GroupBox groupBox8; - private System.Windows.Forms.GroupBox groupBox7; - private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.Label lblDokumentDatum; - private Syncfusion.WinForms.ListView.SfComboBox cbboxpostzustellung; - private System.Windows.Forms.Label lblPostzustellung; - private System.Windows.Forms.Label lblTermin; - private Syncfusion.WinForms.Input.SfDateTimeEdit DateDokumentDatum; - private Syncfusion.WinForms.Input.SfDateTimeEdit DateTermin; - private System.Windows.Forms.Label lblUnterschriftrechts; - private System.Windows.Forms.Label lblUnterschriftlinks; - private Syncfusion.WinForms.ListView.SfComboBox cbboxzustaendigmitarbeiter; - private Syncfusion.WinForms.ListView.SfComboBox cbboxzustaendigkube; - private System.Windows.Forms.RadioButton rbzustaendigmitarbeiter; - private System.Windows.Forms.RadioButton rbzustaendigkube; - private Syncfusion.WinForms.ListView.SfComboBox cbboxteam; - private System.Windows.Forms.CheckBox cbformularohneunterschrfit; - private System.Windows.Forms.CheckBox cbdigitaleunterschrfiten; - private Syncfusion.WinForms.ListView.SfComboBox cbboxunterschriftrechts; - private Syncfusion.WinForms.ListView.SfComboBox cbboxunterschriftlinks; - private System.Windows.Forms.RadioButton rbDokumentbearbeiten; - private Syncfusion.WinForms.ListView.SfComboBox cbboxverantwortlich; - private System.Windows.Forms.Label lblVerantwortlich; - private Syncfusion.WinForms.ListView.SfComboBox cbboxstatus; - private System.Windows.Forms.Label lblstatus; - private System.Windows.Forms.TextBox txtbezeichnung; - private System.Windows.Forms.Label lblBezeichnung; - private System.Windows.Forms.RadioButton rbasPDFarchivieren; - private System.Windows.Forms.RadioButton rbEditlater; - private System.Windows.Forms.GroupBox groupBox11; - private Syncfusion.WinForms.Controls.SfButton sfButton2; - private Syncfusion.WinForms.DataGrid.SfDataGrid gridDokwertlist; - private System.Windows.Forms.GroupBox groupBox9; - private System.Windows.Forms.RadioButton rbasPDF; - private Syncfusion.WinForms.Controls.SfButton sfButton3; - } -} \ No newline at end of file diff --git a/Client/DocMgmt/FrmDokumenterstellung.cs b/Client/DocMgmt/FrmDokumenterstellung.cs deleted file mode 100644 index 0075f7ad..00000000 --- a/Client/DocMgmt/FrmDokumenterstellung.cs +++ /dev/null @@ -1,330 +0,0 @@ -using OnDoc.Diverses; -using OnDoc.Klassen; -using Helper; -using Microsoft.Office.Interop.Excel; -using Model; -using Syncfusion.Windows.Forms.Tools; -using Syncfusion.WinForms.Controls; -using Syncfusion.WinForms.DataGrid; -using Syncfusion.WinForms.DataGrid.Interactivity; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Security.RightsManagement; -using System.Text; -using System.Threading.Tasks; -using System.Web.UI.WebControls; -using System.Windows.Forms; -using Database; -using OnDoc.UIControls; - -namespace OnDoc.DocMgmt -{ - public partial class FrmDokumenterstellung : SfForm - { - private int partnernr = 0; - private int profilnr = 0; - private int dokumenttypnr = 0; - public FrmDokumenterstellung() - { - InitializeComponent(); - } - - public FrmDokumenterstellung(int PartnerNr, int Dokumenttpynr, int Profilnr) - { - partnernr = PartnerNr; - dokumenttypnr = Dokumenttpynr; - profilnr = Profilnr; - InitializeComponent(); - } - private void FrmDokumenterstellung_Load(object sender, EventArgs e) - { - DB db = new DB(AppParams.connectionstring); - db.Get_Tabledata("Select nreintrag, bezeichnung from Postzustellung where aktiv=1 order by bezeichnung", false, true); - cbboxpostzustellung.DataSource = db.dsdaten.Tables[0]; - cbboxpostzustellung.ValueMember = "nreintrag"; - cbboxpostzustellung.DisplayMember = "bezeichnung"; - - db.clear_parameter(); - db.add_parameter("@partnernr", "1000208"); - db.Get_Tabledata("sp_dokumentbearbeitung_kube", true, false); - cbboxzustaendigkube.DataSource = db.dsdaten.Tables[0]; - cbboxzustaendigkube.DisplayMember = "name"; - cbboxzustaendigkube.ValueMember = "mitarbeiternr"; - - db.clear_parameter(); - db.Get_Tabledata("SP_Dokumentbearbeitung_Mitarbeiter", true, false); - cbboxzustaendigmitarbeiter.DataSource = db.dsdaten.Tables[0]; - cbboxzustaendigmitarbeiter.DisplayMember = "name"; - cbboxzustaendigmitarbeiter.ValueMember = "mitarbeiternr"; - cbboxzustaendigmitarbeiter.SelectedValue = AppParams.CurrentMitarbeiter; - cbboxunterschriftlinks.DataSource = db.dsdaten.Tables[0]; - cbboxunterschriftlinks.DisplayMember = "name"; - cbboxunterschriftlinks.ValueMember = "mitarbeiternr"; - cbboxunterschriftrechts.DataSource = db.dsdaten.Tables[0]; - cbboxunterschriftrechts.DisplayMember = "name"; - cbboxunterschriftrechts.ValueMember = "mitarbeiternr"; - cbboxverantwortlich.DataSource = db.dsdaten.Tables[0]; - cbboxverantwortlich.DisplayMember = "name"; - cbboxverantwortlich.ValueMember = "mitarbeiternr"; - cbboxverantwortlich.SelectedValue = AppParams.CurrentMitarbeiter; - - db.clear_parameter(); - db.add_parameter("dokumenttypnr", dokumenttypnr.ToString()); - db.add_parameter("@dokumentid", ""); - db.add_parameter("@fnkt", "1"); - db.add_parameter("@mitarbeiternr", AppParams.CurrentMitarbeiter.ToString()); - db.add_parameter("@bck", "0"); - db.Get_Tabledata("SP_Dokumentbearbeitung_StatusSelektion", true, false); - cbboxstatus.DataSource = db.dsdaten.Tables[0]; - cbboxstatus.DisplayMember = "Bezeichnung"; - cbboxstatus.ValueMember = "dokumentstatusnr"; - cbboxstatus.SelectedIndex = 1; - - if (partnernr != 0) - { - db.Get_Tabledata("Select * from partner where nrpar00=" + partnernr, false, true); - this.lblPartner.Text = db.dsdaten.Tables[0].Rows[0]["nrpar00"].ToString() + " " + db.dsdaten.Tables[0].Rows[0]["bkpar00"].ToString(); - } - if (dokumenttypnr != 0) - { - db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr=" + dokumenttypnr, false, true); - this.txtbezeichnung.Text = db.dsdaten.Tables[0].Rows[0]["Bezeichnung"].ToString(); - } - if (profilnr != 0) - { - db.Get_Tabledata("Select * from profil where profilnr=" + profilnr, false, true); - int ulinks = 0; - int urechts = 0; - try - { - ulinks = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString()); - cbboxunterschriftlinks.SelectedValue = ulinks; - } - catch { ulinks = 0; } - try - { - urechts = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString()); - cbboxunterschriftrechts.SelectedValue = urechts; - } - catch { urechts = 0; } - } - - System.Data.DataTable dokwertlist = new System.Data.DataTable(); - dokwertlist = db.Get_DokumentWertList("", dokumenttypnr); - gridDokwertlist.DataSource = dokwertlist; - for (int i = 3; i < gridDokwertlist.Columns.Count; i++) - { - gridDokwertlist.Columns[i].Visible = false; - } - gridDokwertlist.Columns[0].AllowEditing = false; - gridDokwertlist.Columns[1].AllowEditing = false; - gridDokwertlist.Columns[0].Width = gridDokwertlist.Width * 0.35; - gridDokwertlist.Columns[1].Width = gridDokwertlist.Width * 0.15; - gridDokwertlist.Columns[2].Width = gridDokwertlist.Width * 0.35; - gridDokwertlist.Columns.Add(new GridImageColumn() { MappingName = "S", ImageLayout = ImageLayout.Center }); - gridDokwertlist.Columns["S"].Width = 25; - gridDokwertlist.QueryImageCellStyle += gridDokwertlist_QueryImageCellStyle; - db = null; - Refresh_Team(); - this.cbboxteam.SelectedIndex = 0; - } - private void gridDokwertlist_QueryImageCellStyle(object sender, Syncfusion.WinForms.DataGrid.Events.QueryImageCellStyleEventArgs e) - { - var rowdata = (DataRowView)e.Record; - var feldtyp = rowdata.Row.ItemArray[5].ToString(); - var datenherkunft = rowdata.Row.ItemArray[6].ToString(); - try - { - if (feldtyp.ToUpper().Substring(0, 5) == "DATUM") - { - e.Image = (System.Drawing.Image.FromFile(System.Windows.Forms.Application.StartupPath + @"\images\calendar.png")); - return; - } - } - catch { } - - try - { - if (datenherkunft.ToString().Trim() != "") - { - e.Image = (System.Drawing.Image.FromFile(System.Windows.Forms.Application.StartupPath + @"\images\Search.png")); - - } - - if (datenherkunft.Substring(0, 3).ToUpper() == "&PA") - { - e.Image = (System.Drawing.Image.FromFile(System.Windows.Forms.Application.StartupPath + @"\images\Partner.png")); - } - } - catch { } - - //e.Image = (Image.FromFile(System.Windows.Forms.Application.StartupPath + @"\images\Search_16x16.png")); - } - private void Refresh_Team() - { - DB dbteam = new DB(AppParams.connectionstring); - dbteam.clear_parameter(); - dbteam.add_parameter("@profilnr", profilnr.ToString()); - dbteam.add_parameter("@mitarbeiternr", cbboxzustaendigmitarbeiter.SelectedValue.ToString()); - dbteam.Get_Tabledata("sp_dokumentbearbeitung_team", true, false); - cbboxteam.DataSource = null; - cbboxteam.DataSource = dbteam.dsdaten.Tables[0]; - cbboxteam.ValueMember = "teamnr"; - cbboxteam.DisplayMember = "bezeichnung"; - } - private void sfButton2_Click(object sender, EventArgs e) - { - clsDocData dokdata = new clsDocData(); - dokdata.PartnerNr = partnernr.ToString(); - dokdata.UseEDOKA_Values = "True"; - dokdata.DokumenttypNr = dokumenttypnr.ToString(); - dokdata.Unterschrift_Links = cbboxunterschriftlinks.SelectedValue.ToString(); - dokdata.Unterschrift_Rechts = cbboxunterschriftrechts.SelectedValue.ToString(); - dokdata.Verantwortlich = cbboxverantwortlich.SelectedValue.ToString(); - dokdata.Team = cbboxteam.SelectedValue.ToString(); - if (rbzustaendigkube.Checked) { dokdata.Zustaendig = cbboxzustaendigkube.SelectedValue.ToString(); } else { dokdata.Zustaendig = cbboxzustaendigmitarbeiter.SelectedValue.ToString(); } - dokdata.Status = cbboxstatus.SelectedValue.ToString(); - dokdata.Ersteller = AppParams.CurrentMitarbeiter.ToString(); - dokdata.DokumentDatum = DateDokumentDatum.DateTimeText.ToString(); - dokdata.Bezeichnung = txtbezeichnung.Text; - dokdata.UseEDOKA_Values = "True"; - if (rbasPDFarchivieren.Checked) { dokdata.Result_as_PDF = "True"; } else { dokdata.Result_as_PDF = ""; } - if (cbdigitaleunterschrfiten.Checked) { dokdata.As_Faksimile = "True"; } else { dokdata.As_Faksimile = "False"; } - - - DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring); - string dokumentid = docgen.GenDocID(dokdata); - dokdata.Dokumentid = dokumentid; - - - - - - if (dokumentid != "") - { - if (dokdata.barcode_type == "1") - { - DB dB = new DB(AppParams.connectionstring); - dB.clear_parameter(); - dB.add_parameter("@dokumentid", dokumentid); - dB.add_parameter("@DokumentidBR", ""); - dB.Get_Tabledata("sp_get_barcodetype_and_value", true, false); - dokdata.barcode_content = dB.daten.Tables[0].Rows[0][1].ToString(); - dB = null; - } - DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey, AppParams.Office_Fill_DocIO); - - clsdok dok = new clsdok("", "", ""); - dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata); - - if (rbDokumentbearbeiten.Checked) - { - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - db = null; - - System.Diagnostics.Process.Start("winword.exe", filename); - clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word"); - - } - if (rbasPDFarchivieren.Checked) - { - dok.extension = "pdf"; - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - } - - if (rbEditlater.Checked) - { - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - db = null; - } - this.Close(); - - } - } - - - - private void gridDokwertlist_Click(object sender, EventArgs e) - { - - } - - private void gridDokwertlist_CellDoubleClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) - { - var rowIndex = DataGridIndexResolver.ResolveToRecordIndex(this.gridDokwertlist.TableControl, this.gridDokwertlist.CurrentCell.RowIndex); - if (rowIndex != -1) - - { - Set_CellValue(rowIndex, "Gaga"); - return; - var record = (this.gridDokwertlist.View.Records[rowIndex].Data); - //MessageBox.Show(record.OrderID.ToString()); - - var selectedItem = e.DataRow; - var dataRow = (e.DataRow.RowData as DataRowView).Row; - var ft = dataRow["feldtyp"].ToString(); - var da = dataRow["datenherkunft"].ToString(); - if (ft.ToUpper().Substring(0, 5) == "DATUM") - { - frmCalendar fcal = new frmCalendar(); - fcal.ShowDialog(); - if (fcal.DialogResult == DialogResult.OK) - { - Set_CellValue(rowIndex,"Gaga"); - } - } - } - } - - private void Set_CellValue(int row,string wert) - { - int rowIndex = row + 1; - int columnIndex = gridDokwertlist.TableControl.ResolveToGridVisibleColumnIndex(2); - columnIndex = 2; - if (columnIndex < 0) - return; - var mappingName = gridDokwertlist.Columns[columnIndex].MappingName; - var recordIndex = gridDokwertlist.TableControl.ResolveToRecordIndex(rowIndex); - //recordIndex = 0; - if (recordIndex < 0) - return; - object data; - if (gridDokwertlist.View.TopLevelGroup != null) - { - var record = gridDokwertlist.View.TopLevelGroup.DisplayElements[recordIndex]; - if (!record.IsRecords) - return; - data = (record as Syncfusion.Data.RecordEntry).Data; - } - else - data = gridDokwertlist.View.Records.GetItemAt(recordIndex); - - this.gridDokwertlist.View.GetPropertyAccessProvider().SetValue(data, mappingName, "Modified Value"); - } - - private void gridDokwertlist_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) - { - - int columnIndex = gridDokwertlist.TableControl.ResolveToGridVisibleColumnIndex(2); - } - - private void sfButton3_Click(object sender, EventArgs e) - { - this.DialogResult = DialogResult.Abort; - this.Close(); - } - } -} diff --git a/Client/DocMgmt/FrmDokumenterstellung.resx b/Client/DocMgmt/FrmDokumenterstellung.resx deleted file mode 100644 index f17c0611..00000000 --- a/Client/DocMgmt/FrmDokumenterstellung.resx +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAABkAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALcAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAC3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAADPAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAM8AAAC/AAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAL8AAADvAAAAvwAAAL8AAAC/AAAAtwAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAADvAAAAvwAAAL8AAADPAAAA/wAAAEAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAAAAAABAAAAA/wAA - AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAvwAAAL8AAAC/AAAAvwAA - AL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAACPAAAAAAAAAL8AAAC/AAAAAAAA - AAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAvwAA - AL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAACPAAAAAAAA - AL8AAAC/AAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAwAAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAA - AL8AAAC/AAAAvwAAAL8AAACPAAAAAAAAAL8AAAC/AAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAA - AL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAACPAAAAAAAAAL8AAAC/AAAAAAAAAAAAAABAAAAA/wAA - AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAA - AAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAsAAAAHUAAAAhAAAAAAAAAAAAAAAAAAAAAAAA - AL8AAAC/AAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAADAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAABAAAAAgAAAA/QAAAP8AAAD+AAAAygAA - AHUAAAAaAAAAAAAAAL8AAAC/AAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAL8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAEAAAAAAAAAAygAA - AN4AAAB0AAAA2AAAAP8AAADmAAAAKQAAAL8AAAC/AAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAADAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - ABAAAAAAAAAAdQAAAP4AAABIAAAA5gAAAOYAAADmAAAA5gAAANsAAAC/AAAAAAAAAAAAAABAAAAA/wAA - AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAA - ADAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAABAAAAAAAAAAIQAAAP4AAAD9AAAA5gAAACgAAAAoAAAA5gAAAP8AAAC/AAAAAAAA - AAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AL8AAAC/AAAAAAAAAL8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAEAAAAAAAAAAAAAAAMgAAAD/AAAAUAAAAAAAAAAAAAAAKAAA - AOYAAADrAAAAKQAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAADAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAABAAAAAAAAAAAAAAACgAAADmAAAA5gAA - ACgAAAAAAAAAAAAAACgAAADmAAAA5gAAACgAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAADAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAABAAAAAAAAAAAAAA - AAAAAAAoAAAA5gAAAOYAAAAoAAAAAAAAAAAAAAAoAAAA5gAAAOYAAABoAAAA/wAAAEAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAL8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AEAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAOYAAADmAAAAKQAAAAAAAAAAAAAAKAAAAOYAAAD6AAAA/wAA - AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAA - ADAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAADmAAAA5gAAACgAAAAAAAAAAAAA - ACgAAADmAAAA/wAAAEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AL8AAAC/AAAAAAAAADAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABYAAAA5gAA - AOYAAAAoAAAAAAAAAAAAAAAoAAAA5gAAAOYAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAL8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAC/AAAAKAAAAOsAAADmAAAAKQAAAAAAAAAAAAAAKAAAAOYAAADmAAAAKQAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAADAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAAAwAAAAAAAAAL8AAAD/AAAA5gAAACgAAAAAAAAAAAAAACgAAADmAAAA5gAA - ACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAADAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAwAAAAAAAAAL8AAADbAAAA5gAAAOYAAAAoAAAAAAAA - AAAAAAApAAAA9QAAAOYAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAA - AL8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAC/AAAAAAAAAL8AAAC/AAAAKAAA - AOYAAADmAAAAKQAAAAEAAACOAAAA/wAAAPUAAADmAAAAKQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AL8AAAC/AAAAAAAAADAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAwAAAAAAAA - AL8AAAC/AAAAAAAAACgAAADmAAAA5gAAAJ4AAAD/AAAAjwAAACkAAADmAAAA5gAAACgAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAADAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAAAwAAAAAAAAAL8AAAC/AAAAAAAAAAAAAABMAAAA/wAAAP8AAACfAAAAAQAAAAAAAAAoAAAA5gAA - AOYAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAL8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAC/AAAAAAAAAL8AAAC/AAAAAAAAAAAAAABAAAAA/wAAAPoAAADmAAAAKQAA - AAAAAAAAAAAAKQAAAPQAAACXAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAADAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAwAAAAAAAAAL8AAAC/AAAAAAAAAAAAAABAAAAA/wAA - AGgAAADmAAAA5gAAACgAAAAAAAAAAAAAANAAAAC6AAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAA - ADAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAABAAAAABAAAAOAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAM8AAAC/AAAAAAAA - AAAAAABAAAAA/wAAAEAAAAAoAAAA5gAAAOcAAABbAAAAewAAAP4AAACAAAAAAAAAAAAAAAAAAAAAAAAA - AL8AAAC/AAAAAAAAAL8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAEAAAAA4AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAC3AAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAKAAAANoAAAD/AAAA/wAAALcAAAAKAAAAAAAA - AAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAADAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAABAAAABAAAAA/wAAAHAAAABAAAAAQAAA - AEAAAABoAAAA+gAAAOYAAAAoAAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAUAAAA1AAAAKgAA - AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAA/wAA - AEAAAAAAAAAAAAAAACgAAADmAAAA5gAAACgAAAAAAAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAABAAAAA/wAAAEAAAAAAAAAAKAAAAOYAAADmAAAAKQAAAAAAAAAAAAAAAAAAAAAAAABAAAAA/wAA - AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAABAAAAA/wAAAEAAAAAoAAAA5gAAAOYAAAAoAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAA/wAAAGgAAADmAAAA5gAAACgAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAL8AAAC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAA/wAAAPoAAADmAAAAKQAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL8AAADvAAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAA - AL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAADPAAAA/wAA - AOYAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAC/AAAAvwAAAL8AAADPAAAA/wAA - AM8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAA - AL8AAAC/AAAAtwAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAA/wAA - AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAABAAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAA/wAAAHAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABwAAAA/wAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAADgAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAOAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAA - AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAOAAA - AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAP/8AAMAAAAA//wAAwAAAAD// - AADP////P/8AAM////8//wAAz////wH/AADP////Af8AAM////8x/wAAz/4AATH/AADP/gABMf8AAM// - //8x/wAAz/4AATH/AADP/gABMf8AAM////8x/wAAz///DzH/AADIAAABMf8AAMgAAIAx/wAAyAAAgDH/ - AADIAACAMf8AAMgAAMYR/wAAyAAAwwH/AADIAADhgf8AAMgAAPDB/wAAyAAA+GH/AADIAAAAMP8AAMgA - AAAYfwAAyAAAAQw/AADIAAABBh8AAMgAAAEADwAAyAAAASAHAADIAAABMEMAAMgAAAEwYwAAyAAAATAz - AADIAAAAMAMAAMgAAAAxAwAAyAAAADGHAADP//8Ycf8AAM///xDx/wAAz///AfH/AADP//8D8f8AAM// - /wfx/wAAwAAAD/H/AADAAAAf8f8AAPx////x/wAA/H////H/AAD8AAAAAf8AAPwAAAAB/wAA/AAAAAH/ - AAA= - - - \ No newline at end of file diff --git a/Client/DocMgmt/frmBewilligung.Designer.cs b/Client/DocMgmt/frmBewilligung.Designer.cs index fb86957d..80ba3743 100644 --- a/Client/DocMgmt/frmBewilligung.Designer.cs +++ b/Client/DocMgmt/frmBewilligung.Designer.cs @@ -28,21 +28,26 @@ /// private void InitializeComponent() { + Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmBewilligung)); - this.approval1 = new OnDoc.UIControls.Approval(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.tabControlAdv1 = new Syncfusion.Windows.Forms.Tools.TabControlAdv(); + this.tabPageAdv1 = new Syncfusion.Windows.Forms.Tools.TabPageAdv(); + this.approval1 = new OnDoc.UIControls.Approval(); + this.tabPageAdv2 = new Syncfusion.Windows.Forms.Tools.TabPageAdv(); + this.serienbrief1 = new OnDoc.UIControls.Serienbrief(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); this.toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit(); + this.tabControlAdv1.SuspendLayout(); + this.tabPageAdv1.SuspendLayout(); + this.tabPageAdv2.SuspendLayout(); + this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit(); this.SuspendLayout(); // - // approval1 - // - this.approval1.Dock = System.Windows.Forms.DockStyle.Fill; - this.approval1.Location = new System.Drawing.Point(2, 33); - this.approval1.Name = "approval1"; - this.approval1.Size = new System.Drawing.Size(1608, 917); - this.approval1.TabIndex = 0; - // // toolStrip1 // this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); @@ -53,6 +58,7 @@ this.toolStrip1.Size = new System.Drawing.Size(1608, 31); this.toolStrip1.TabIndex = 1; this.toolStrip1.Text = "toolStrip1"; + this.toolStrip1.Visible = false; // // toolStripButton1 // @@ -64,12 +70,122 @@ this.toolStripButton1.Text = "toolStripButton1"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // tabControlAdv1 + // + this.tabControlAdv1.Controls.Add(this.tabPageAdv1); + this.tabControlAdv1.Controls.Add(this.tabPageAdv2); + this.tabControlAdv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlAdv1.Location = new System.Drawing.Point(2, 2); + this.tabControlAdv1.Name = "tabControlAdv1"; + this.tabControlAdv1.Size = new System.Drawing.Size(1608, 759); + this.tabControlAdv1.TabIndex = 2; + this.tabControlAdv1.ThemeStyle.PrimitiveButtonStyle.DisabledNextPageImage = null; + this.tabControlAdv1.SelectedIndexChanged += new System.EventHandler(this.tabControlAdv1_SelectedIndexChanged); + // + // tabPageAdv1 + // + this.tabPageAdv1.Controls.Add(this.approval1); + this.tabPageAdv1.Image = null; + this.tabPageAdv1.ImageSize = new System.Drawing.Size(16, 16); + this.tabPageAdv1.Location = new System.Drawing.Point(1, 25); + this.tabPageAdv1.Name = "tabPageAdv1"; + this.tabPageAdv1.ShowCloseButton = true; + this.tabPageAdv1.Size = new System.Drawing.Size(1605, 732); + this.tabPageAdv1.Text = "Dokument-Prüfung"; + this.tabPageAdv1.ThemesEnabled = false; + // + // approval1 + // + this.approval1.Dock = System.Windows.Forms.DockStyle.Fill; + this.approval1.Location = new System.Drawing.Point(0, 0); + this.approval1.Name = "approval1"; + this.approval1.Size = new System.Drawing.Size(1605, 732); + this.approval1.TabIndex = 0; + // + // tabPageAdv2 + // + this.tabPageAdv2.Controls.Add(this.serienbrief1); + this.tabPageAdv2.Controls.Add(this.groupBox1); + this.tabPageAdv2.Image = null; + this.tabPageAdv2.ImageSize = new System.Drawing.Size(16, 16); + this.tabPageAdv2.Location = new System.Drawing.Point(1, 25); + this.tabPageAdv2.Name = "tabPageAdv2"; + this.tabPageAdv2.ShowCloseButton = true; + this.tabPageAdv2.Size = new System.Drawing.Size(1605, 732); + this.tabPageAdv2.Text = "Serienbrief"; + this.tabPageAdv2.ThemesEnabled = false; + // + // serienbrief1 + // + this.serienbrief1.Dock = System.Windows.Forms.DockStyle.Fill; + this.serienbrief1.Location = new System.Drawing.Point(200, 0); + this.serienbrief1.Name = "serienbrief1"; + this.serienbrief1.Size = new System.Drawing.Size(1405, 732); + this.serienbrief1.TabIndex = 1; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.treeViewAdv1); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Left; + this.groupBox1.Location = new System.Drawing.Point(0, 0); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(200, 732); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + // + // treeViewAdv1 + // + treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black; + this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); + this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(194, 713); + this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Fill; + // + // + // + this.treeViewAdv1.HelpTextControl.BaseThemeName = null; + this.treeViewAdv1.HelpTextControl.Location = new System.Drawing.Point(0, 0); + this.treeViewAdv1.HelpTextControl.Name = ""; + this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(392, 112); + this.treeViewAdv1.HelpTextControl.TabIndex = 0; + this.treeViewAdv1.HelpTextControl.Visible = true; + this.treeViewAdv1.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; + this.treeViewAdv1.Location = new System.Drawing.Point(3, 16); + this.treeViewAdv1.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220))))); + this.treeViewAdv1.Name = "treeViewAdv1"; + this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText; + this.treeViewAdv1.Size = new System.Drawing.Size(194, 713); + this.treeViewAdv1.TabIndex = 0; + this.treeViewAdv1.Text = "treeViewAdv1"; + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 1; + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true; + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + // + // + // + this.treeViewAdv1.ToolTipControl.BaseThemeName = null; + this.treeViewAdv1.ToolTipControl.Location = new System.Drawing.Point(0, 0); + this.treeViewAdv1.ToolTipControl.Name = ""; + this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(392, 112); + this.treeViewAdv1.ToolTipControl.TabIndex = 0; + this.treeViewAdv1.ToolTipControl.Visible = true; + this.treeViewAdv1.NodeMouseClick += new Syncfusion.Windows.Forms.Tools.TreeNodeAdvMouseClickArgs(this.treeViewAdv1_NodeMouseClick); + // // frmBewilligung // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1612, 952); - this.Controls.Add(this.approval1); + this.ClientSize = new System.Drawing.Size(1612, 763); + this.Controls.Add(this.tabControlAdv1); this.Controls.Add(this.toolStrip1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "frmBewilligung"; @@ -79,6 +195,12 @@ this.Load += new System.EventHandler(this.frmBewilligung_Load); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).EndInit(); + this.tabControlAdv1.ResumeLayout(false); + this.tabPageAdv1.ResumeLayout(false); + this.tabPageAdv2.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -89,5 +211,11 @@ private UIControls.Approval approval1; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton toolStripButton1; + private Syncfusion.Windows.Forms.Tools.TabControlAdv tabControlAdv1; + private Syncfusion.Windows.Forms.Tools.TabPageAdv tabPageAdv1; + private Syncfusion.Windows.Forms.Tools.TabPageAdv tabPageAdv2; + private UIControls.Serienbrief serienbrief1; + private System.Windows.Forms.GroupBox groupBox1; + private Syncfusion.Windows.Forms.Tools.TreeViewAdv treeViewAdv1; } } \ No newline at end of file diff --git a/Client/DocMgmt/frmBewilligung.cs b/Client/DocMgmt/frmBewilligung.cs index d56f9ab1..f280a47a 100644 --- a/Client/DocMgmt/frmBewilligung.cs +++ b/Client/DocMgmt/frmBewilligung.cs @@ -10,10 +10,13 @@ using System.Windows.Forms; using OnDoc.Klassen; using Syncfusion.Windows.Forms.Tools; using Syncfusion.WinForms.Controls; +using BroadcastListener.Classes; +using BroadcastListener.Interfaces; +using static BroadcastListener.Classes.Factory; namespace OnDoc.DocMgmt { - public partial class frmBewilligung : SfForm + public partial class frmBewilligung : SfForm, IMessageListener1 { public frmBewilligung() { @@ -22,16 +25,96 @@ namespace OnDoc.DocMgmt this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); this.Style.ShadowOpacity = Theaming.ShadowOpacity; this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; + Broadcaster().AddListener(this); + Closing += Form_Closing; } - private void frmBewilligung_Load(object sender, EventArgs e) + private void Form_Closing(object sender, CancelEventArgs e) + { + Broadcaster().RemoveListener(this); + } + + public void OnListen(string message, SenderInfo sender) + { + if (message == "Serienbrief") + { + if (sender.SenderName == "Removesbfromlist") + { + refresh_serienbief(); + } + } + } + + private void frmBewilligung_Load(object sender, EventArgs e) { this.approval1.Update_Docs(AppParams.CurrentMitarbeiter); + if (approval1.anzahl_dokument() == 0) + { + this.tabControlAdv1.TabPages.RemoveAt(0); + refresh_serienbief(); + } + else + { + refresh_serienbief(); + } } private void toolStripButton1_Click(object sender, EventArgs e) { this.Close(); } + + private void refresh_serienbief() + { + treeViewAdv1.Nodes.Clear(); + Database.DB db = new Database.DB(AppParams.connectionstring); + db.Get_Tabledata("Select * from view_relaunch_approval_Serienbrief where mitarbeiter_bewilligung=" + AppParams.CurrentMitarbeiter.ToString() + " order by bezeichnung", false, true); + foreach (DataRow dr in db.dsdaten.Tables[0].Rows) + { + TreeNodeAdv node = new TreeNodeAdv(); + node.Text = dr["bezeichnung"].ToString(); + node.Tag = dr["serienbriefnr"].ToString(); + node.TagObject = dr; + treeViewAdv1.Nodes.Add(node); + } + if (treeViewAdv1.Nodes.Count > 0) + { + treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0]; + update_serienbrief(); + serienbrief1.setfuncitons(true); + } + else + { + serienbrief1.setfuncitons(false); + } + } + private void tabControlAdv1_SelectedIndexChanged(object sender, EventArgs e) + { + if (tabControlAdv1.SelectedIndex > 1 && tabControlAdv1.SelectedIndex==1) + { + refresh_serienbief(); + } + } + + private void treeViewAdv1_NodeMouseClick(object sender, TreeViewAdvMouseClickEventArgs e) + { + update_serienbrief(); + } + private void update_serienbrief() + { + serienbrief1.approval = true; + //serienbrief1.approvaldata = new DataTable(); + + serienbrief1.approvaldata = treeViewAdv1.SelectedNode.TagObject as DataRow; + serienbrief1.Init(); + //refresh_serienbief(); + + try + { + serienbrief1.open_sb(Convert.ToInt32(treeViewAdv1.SelectedNode.Tag)); + + } + catch { } + } } } diff --git a/Client/DocMgmt/frmBewilligung.resx b/Client/DocMgmt/frmBewilligung.resx index 1768a2fb..34a2c6c9 100644 --- a/Client/DocMgmt/frmBewilligung.resx +++ b/Client/DocMgmt/frmBewilligung.resx @@ -120,6 +120,9 @@ 17, 17 + + 25 + diff --git a/Client/DocMgmt/frmSerienbrief.Designer.cs b/Client/DocMgmt/frmSerienbrief.Designer.cs new file mode 100644 index 00000000..7f67095c --- /dev/null +++ b/Client/DocMgmt/frmSerienbrief.Designer.cs @@ -0,0 +1,63 @@ +namespace OnDoc.DocMgmt +{ + partial class frmSerienbrief + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSerienbrief)); + this.serienbrief1 = new OnDoc.UIControls.Serienbrief(); + this.SuspendLayout(); + // + // serienbrief1 + // + this.serienbrief1.Dock = System.Windows.Forms.DockStyle.Fill; + this.serienbrief1.Location = new System.Drawing.Point(2, 2); + this.serienbrief1.Name = "serienbrief1"; + this.serienbrief1.Size = new System.Drawing.Size(1669, 786); + this.serienbrief1.TabIndex = 0; + // + // frmSerienbrief + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1673, 790); + this.Controls.Add(this.serienbrief1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "frmSerienbrief"; + this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; + this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; + this.Text = "Serienbrief"; + this.Load += new System.EventHandler(this.frmSerienbrief_Load); + this.ResumeLayout(false); + + } + + #endregion + + private UIControls.Serienbrief serienbrief1; + } +} \ No newline at end of file diff --git a/Client/DocMgmt/frmSerienbrief.cs b/Client/DocMgmt/frmSerienbrief.cs new file mode 100644 index 00000000..e22d1c46 --- /dev/null +++ b/Client/DocMgmt/frmSerienbrief.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Syncfusion.Windows.Forms.Tools; +using Syncfusion.WinForms.Controls; +using NLog; +using OnDoc.DocMgmt; +using OnDoc.Helper; +using OnDoc.Klassen; +using BroadcastListener.Classes; +using BroadcastListener.Interfaces; +using static BroadcastListener.Classes.Factory; + +namespace OnDoc.DocMgmt +{ + public partial class frmSerienbrief : SfForm//, IMessageListener1 + { + private int profilnr = 0; + public frmSerienbrief() + { + InitializeComponent(); + this.Style.TitleBar.BackColor = Theaming.Titelbar(); + this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + this.Style.ShadowOpacity = Theaming.ShadowOpacity; + this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; + //Broadcaster().AddListener(this); + Closing += Form_Closing; + } + + public frmSerienbrief(int profilnr) + { + InitializeComponent(); + this.Style.TitleBar.BackColor = Theaming.Titelbar(); + this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + this.Style.ShadowOpacity = Theaming.ShadowOpacity; + this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; + this.profilnr = profilnr; + ////Broadcaster().AddListener(this); + ////Closing += Form_Closing; + } + + private void Form_Closing(object sender, CancelEventArgs e) + { + serienbrief1.dispose(); + } + + private bool IsPreview = false; + private string PreviewFiename = ""; + private int broadcasterdone = 0; + + private void frmSerienbrief_Load(object sender, EventArgs e) + { + + serienbrief1.Init(); + } + } +} diff --git a/Client/DocMgmt/Serienbrief.resx b/Client/DocMgmt/frmSerienbrief.resx similarity index 97% rename from Client/DocMgmt/Serienbrief.resx rename to Client/DocMgmt/frmSerienbrief.resx index 1dd0bbfc..0baaf012 100644 --- a/Client/DocMgmt/Serienbrief.resx +++ b/Client/DocMgmt/frmSerienbrief.resx @@ -117,22 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 156, 17 - - - 321, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII= - - - - 17, 17 - AAABAAUAAAAAAAEAIABVIgAAVgAAADAwAAABACAAqCUAAKsiAAAgIAAAAQAgAKgQAABTSAAAGBgAAAEA diff --git a/Client/DocMgmt/frmToApproval.cs b/Client/DocMgmt/frmToApproval.cs index 8c9889b1..4ae13701 100644 --- a/Client/DocMgmt/frmToApproval.cs +++ b/Client/DocMgmt/frmToApproval.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.Configuration; using System.Data; using System.Drawing; using System.Linq; @@ -17,7 +18,11 @@ namespace OnDoc.DocMgmt { public partial class frmToApproval : SfForm { - public string dokumentid { get; set; } =""; + public string dokumentid { get; set; } = ""; + public string serienbriefnr { get; set; } = ""; + + private bool isserienbrief = false; + DB db = new DB(AppParams.connectionstring); DB db1 = new DB(AppParams.connectionstring); @@ -31,14 +36,14 @@ namespace OnDoc.DocMgmt Closing += Form_Closing; } - private void Form_Closing(object sender, CancelEventArgs e) - { + private void Form_Closing(object sender, CancelEventArgs e) + { db = null; db1 = null; - } + } - private void frmToApproval_Load(object sender, EventArgs e) + private void frmToApproval_Load(object sender, EventArgs e) { db.clear_parameter(); @@ -52,28 +57,46 @@ namespace OnDoc.DocMgmt cbboxunterschriftrechts.DisplayMember = "name"; cbboxunterschriftrechts.ValueMember = "mitarbeiternr"; - if (dokumentid=="") { return; } + if (dokumentid == "" && serienbriefnr == "") { return; } + update_dokdetails(); - } - public void update_dokdetails() { + } + public void update_dokdetails() + { + + if (serienbriefnr != "") { isserienbrief = true; } btntoapproval.Enabled = true; - db1.Get_Tabledata("Select * from dokument where dokumentid='"+dokumentid+"'",false,true); - cbboxunterschriftlinks.SelectedValue = db1.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString(); - cbboxunterschriftrechts.SelectedValue = db1.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString(); - pxapproval1.Visible = false; - pxapproval2.Visible = false; - cbboxunterschriftlinks.Enabled = true; - cbboxunterschriftrechts.Enabled = true; + if (!isserienbrief) + { + + db1.Get_Tabledata("Select * from dokument where dokumentid='" + dokumentid + "'", false, true); + cbboxunterschriftlinks.SelectedValue = db1.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString(); + cbboxunterschriftrechts.SelectedValue = db1.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString(); + pxapproval1.Visible = false; + pxapproval2.Visible = false; + cbboxunterschriftlinks.Enabled = true; + cbboxunterschriftrechts.Enabled = true; + } + else + { + db1.Get_Tabledata("Select * from edex_sb_serienbrief where serienbriefnr=" + serienbriefnr, false, true); + cbboxunterschriftlinks.SelectedValue = db1.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString(); + cbboxunterschriftrechts.SelectedValue = db1.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString(); + pxapproval1.Visible = false; + pxapproval2.Visible = false; + cbboxunterschriftlinks.Enabled = true; + cbboxunterschriftrechts.Enabled = true; + } - if (db1.dsdaten.Tables[0].Rows[0]["ersteller"].ToString()== db1.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString()) + if (db1.dsdaten.Tables[0].Rows[0]["mutierer"].ToString() == db1.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString()) { cbboxunterschriftlinks.Enabled = false; pxapproval1.Visible = true; } - if (db1.dsdaten.Tables[0].Rows[0]["ersteller"].ToString() == db1.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString()) + if (db1.dsdaten.Tables[0].Rows[0]["mutierer"].ToString() == db1.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString()) { cbboxunterschriftrechts.Enabled = false; pxapproval2.Visible = true; @@ -92,8 +115,8 @@ namespace OnDoc.DocMgmt } } - - if (Convert.ToBoolean(db1.dsdaten.Tables[0].Rows[0]["approved"])){ + if (Convert.ToBoolean(db1.dsdaten.Tables[0].Rows[0]["approved"])) + { cbboxunterschriftlinks.Enabled = false; pxapproval1.Visible = true; cbboxunterschriftrechts.Enabled = false; @@ -122,31 +145,44 @@ namespace OnDoc.DocMgmt } - public void insert_bewilligung() { + public void insert_bewilligung() + { if (!btntoapproval.Enabled) { return; }; DB dB = new DB(AppParams.connectionstring); - string sql = "Update dokument_Bewilligung set aktiv=0, mutiert_am=getdate(), mutierer = " + AppParams.CurrentMitarbeiter.ToString(); - sql = sql + " where dokumentid='" + dokumentid + "' and abgelehnt=0 and bewilligt=0"; - dB.Exec_SQL(sql); + string sql = ""; + if (!isserienbrief) + { + sql = "Update dokument_Bewilligung set aktiv=0, mutiert_am=getdate(), mutierer = " + AppParams.CurrentMitarbeiter.ToString(); + sql = sql + " where dokumentid='" + dokumentid + "' and abgelehnt=0 and bewilligt=0"; + dB.Exec_SQL(sql); + dB.Get_Tabledata_for_Update("select top 1 * from dokument_bewilligung where id=-2", false, true); - dB.Get_Tabledata_for_Update("select top 1 * from dokument_bewilligung where id=-2", false, true); + } + else + { + sql = "Update serienbrief_Bewilligung set aktiv=0, mutiert_am=getdate(), mutierer = " + AppParams.CurrentMitarbeiter.ToString(); + sql = sql + " where serienbriefnr='" + serienbriefnr + "' and abgelehnt=0 and bewilligt=0"; + dB.Exec_SQL(sql); + dB.Get_Tabledata_for_Update("select top 1 * from serienbrief_bewilligung where id=-2", false, true); + + } + //dB.Exec_SQL(sql); + //dB.Get_Tabledata_for_Update("select top 1 * from dokument_bewilligung where id=-2", false, true); if (pxapproval1.Visible == false) { DataRow dr = dB.daten.Tables[0].NewRow(); - dr["dokumentid"] = this.dokumentid; + if (!isserienbrief) { dr["dokumentid"] = this.dokumentid; } else { dr["serienbriefnr"] = this.serienbriefnr; } dr["mitarbeiter_bewilligung"] = cbboxunterschriftlinks.SelectedValue.ToString(); if (Convert.ToInt32(cbboxunterschriftlinks.SelectedValue) == AppParams.CurrentMitarbeiter) { dr["bewilligt"] = true; dr["bewilligt_am"] = DateTime.Now; } - else + else { dr["bewilligt"] = false; } - - dr["abgelehnt"] = false; dr["bewilligungstyp"] = 1; dr["erstellt_am"] = DateTime.Now; @@ -159,12 +195,21 @@ namespace OnDoc.DocMgmt clsMailer mailer = new clsMailer(); mailer.sendmail(1, cbboxunterschriftlinks.SelectedValue.ToString(), "", "", dokumentid, ""); mailer = null; - Logging.DocLog.Info("Dokument zur Prüfung", "Dokument zur Prüfung", dokumentid, "", cbboxunterschriftlinks.Text.ToString()); + if (dokumentid != "") + { + Logging.DocLog.Info("Dokument zur Prüfung", "Dokument zur Prüfung", dokumentid, "", cbboxunterschriftlinks.Text.ToString()); + } + else + { + Logging.DocLog.Info("Serienbrief zur Prüfung", "Serienbrief zur Prüfung", serienbriefnr, "", cbboxunterschriftlinks.Text.ToString()); + } } + + if (pxapproval2.Visible == false) { DataRow dr = dB.daten.Tables[0].NewRow(); - dr["dokumentid"] = this.dokumentid; + if (!isserienbrief) { dr["dokumentid"] = this.dokumentid; } else { dr["serienbriefnr"] = this.serienbriefnr; } dr["mitarbeiter_bewilligung"] = cbboxunterschriftrechts.SelectedValue.ToString(); dr["bewilligt"] = false; dr["abgelehnt"] = false; @@ -180,18 +225,35 @@ namespace OnDoc.DocMgmt mailer.sendmail(1, cbboxunterschriftrechts.SelectedValue.ToString(), "", "", dokumentid, ""); mailer = null; - Logging.DocLog.Info("Dokument zur Prüfung", "Dokument zur Prüfung", dokumentid, "", cbboxunterschriftrechts.Text.ToString()); - } - if (pxapproval1.Visible && pxapproval2.Visible) - { - MessageBox.Show("Die Unterschriftenprüfung für dieses Dokument ist bereits erfolgt", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information); - this.Close(); + if (!isserienbrief) + { + Logging.DocLog.Info("Dokument zur Prüfung", "Dokument zur Prüfung", dokumentid, "", cbboxunterschriftrechts.Text.ToString()); + } + else + { + Logging.DocLog.Info("Serienbrief zur Prüfung", "Serienbrief zur Prüfung", dokumentid, "", cbboxunterschriftrechts.Text.ToString()); + + } + + if (pxapproval1.Visible && pxapproval2.Visible) + { + if (!isserienbrief) + { + MessageBox.Show("Die Unterschriftenprüfung für dieses Dokument ist bereits erfolgt", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Die Unterschriftenprüfung für diesen Serienbrief ist bereits erfolgt", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information); + + } + this.Close(); + } } if (txtnachricht.Text.Trim() != "") { dB.insert_note(AppParams.CurrentMitarbeiter, "Hinweis zur Unterschriftenprüfung", txtnachricht.Text, dokumentid); } - + } public void close_window() diff --git a/Client/Klassen/clsAppParams.cs b/Client/Klassen/clsAppParams.cs index 4e5cdbd7..5ed7e1f0 100644 --- a/Client/Klassen/clsAppParams.cs +++ b/Client/Klassen/clsAppParams.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Configuration; +using System.Data; using System.IO; using System.Linq; using System.Runtime.CompilerServices; @@ -226,5 +227,8 @@ namespace OnDoc.Klassen } } - + public static class Int_Gridsettings + { + public static DataTable Grids { get; set; } + } } diff --git a/Client/Klassen/clsPartner.cs b/Client/Klassen/clsPartner.cs index b52ab018..2f058576 100644 --- a/Client/Klassen/clsPartner.cs +++ b/Client/Klassen/clsPartner.cs @@ -43,11 +43,16 @@ namespace OnDoc.Klassen } if (!personendokument && !bpdokument) { + try { DataRow[] rowsToKeep = partnerliste.Select(selectstring); - DataTable tempDataTable = rowsToKeep.CopyToDataTable(); - partnerliste.Clear(); - partnerliste.Merge(tempDataTable); - tempDataTable.Dispose(); + DataTable tempDataTable = rowsToKeep.CopyToDataTable(); + partnerliste.Clear(); + partnerliste.Merge(tempDataTable); + tempDataTable.Dispose(); + }catch + { + partnerliste.Rows.Clear(); + } } else { selectstring = selectstring + " and "; } if (personendokument) diff --git a/Client/Start.cs b/Client/Start.cs index 64180851..26b73b48 100644 --- a/Client/Start.cs +++ b/Client/Start.cs @@ -107,7 +107,7 @@ namespace OnDoc dokList1.load_Profile(); dokList1.refresh_dokumente(); - + dokList1.set_functions(); Logging.Logging.Debug("Start - Ende", "start.cs", ""); diff --git a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs index 4a6c316d..c244b73b 100644 --- a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs +++ b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs @@ -881,7 +881,7 @@ this.tabPageAdv2.Name = "tabPageAdv2"; this.tabPageAdv2.ShowCloseButton = true; this.tabPageAdv2.Size = new System.Drawing.Size(1016, 733); - this.tabPageAdv2.Text = "Voralgenfelder"; + this.tabPageAdv2.Text = "Vorlagenfelder"; this.tabPageAdv2.ThemesEnabled = false; // // splitContainer1 diff --git a/Client/UIControls/Approval.cs b/Client/UIControls/Approval.cs index c6ceee1f..15bec67d 100644 --- a/Client/UIControls/Approval.cs +++ b/Client/UIControls/Approval.cs @@ -136,8 +136,13 @@ namespace OnDoc.UIControls treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0].Nodes[0]; update_details(treeViewAdv1.SelectedNode.Tag as string); } + } + public int anzahl_dokument() + { + return treeViewAdv1.Nodes.Count; + } private void ribbonButtonNotApproved_Click(object sender, EventArgs e) { frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString(),"Ablehnen"); diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index 8f6f11c4..7be38b6d 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -97,6 +97,7 @@ namespace OnDoc.UICintrols 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(); @@ -162,7 +163,6 @@ namespace OnDoc.UICintrols this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.dokwerte1 = new OnDoc.UIControls.Dokwerte(); - this.ribbonbuttonnewparterdoc = new System.Windows.Forms.RibbonButton(); this.ctxMenuDokList.SuspendLayout(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -815,6 +815,16 @@ namespace OnDoc.UICintrols this.RibbonFilterDelete.Visible = false; this.RibbonFilterDelete.Click += new System.EventHandler(this.RibbonFilterDelete_Click); // + // ribbonbuttonnewparterdoc + // + this.ribbonbuttonnewparterdoc.Image = global::OnDoc.Properties.Resources.NewDoc_24x24_32; + this.ribbonbuttonnewparterdoc.LargeImage = global::OnDoc.Properties.Resources.NewDoc_24x24_32; + this.ribbonbuttonnewparterdoc.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonbuttonnewparterdoc.Name = "ribbonbuttonnewparterdoc"; + this.ribbonbuttonnewparterdoc.SmallImage = global::OnDoc.Properties.Resources.NewDoc_16x16_32; + this.ribbonbuttonnewparterdoc.Visible = false; + this.ribbonbuttonnewparterdoc.Click += new System.EventHandler(this.ribbonbuttonnewparterdoc_Click); + // // ribbonPannelDiverseVorlagen // this.ribbonPannelDiverseVorlagen.Items.Add(this.ribbonButtonNativ); @@ -1343,16 +1353,6 @@ namespace OnDoc.UICintrols this.dokwerte1.Size = new System.Drawing.Size(0, 694); this.dokwerte1.TabIndex = 7; // - // ribbonbuttonnewparterdoc - // - this.ribbonbuttonnewparterdoc.Image = global::OnDoc.Properties.Resources.NewDoc_24x24_32; - this.ribbonbuttonnewparterdoc.LargeImage = global::OnDoc.Properties.Resources.NewDoc_24x24_32; - this.ribbonbuttonnewparterdoc.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonbuttonnewparterdoc.Name = "ribbonbuttonnewparterdoc"; - this.ribbonbuttonnewparterdoc.SmallImage = global::OnDoc.Properties.Resources.NewDoc_16x16_32; - this.ribbonbuttonnewparterdoc.Visible = false; - this.ribbonbuttonnewparterdoc.Click += new System.EventHandler(this.ribbonbuttonnewparterdoc_Click); - // // DokList // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 8fee4961..5706aa3b 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -51,6 +51,7 @@ using Syncfusion.WinForms.Input; using Syncfusion.Windows.Forms.CellGrid.ScrollAxis; using Syncfusion.Windows.Forms.Edit.Utils; using Syncfusion.WinForms.DataGrid.Serialization; +using NLog.LayoutRenderers; @@ -77,7 +78,7 @@ namespace OnDoc.UICintrols //private string currentview { get; set; } = ""; private System.Data.DataRow currentview { get; set; } - + //private string paketview { get; set; } = ""; private System.Data.DataRow paketview { get; set; } @@ -98,12 +99,12 @@ namespace OnDoc.UICintrols private void datagrid_AutoGeneratingColumn(object sender, AutoGeneratingColumnArgs e) { - if (e.Column.MappingName=="Erstellt am" || e.Column.MappingName=="Mutiert am") + if (e.Column.MappingName == "Erstellt am" || e.Column.MappingName == "Mutiert am") { GridDateTimeColumn gdt = e.Column as GridDateTimeColumn; gdt.Pattern = (Syncfusion.WinForms.Input.Enums.DateTimePattern)Syncfusion.Windows.Shared.DateTimePattern.FullDateTime; } - + } public void OnListen(string message, SenderInfo sender) @@ -149,6 +150,7 @@ namespace OnDoc.UICintrols if (Convert.ToBoolean(r["standard"]) == true) { RibbonCBProfil.SelectedItem = rl; + } } db = null; @@ -161,6 +163,7 @@ namespace OnDoc.UICintrols db.clear_parameter(); db.add_parameter("@maid", AppParams.CurrentMitarbeiter.ToString()); db.Get_Tabledata("sp_ondoc_get_magridveiw", true, false); + Ansichten = db.dsdaten.Tables[0].Copy(); //string standardview = ""; System.Data.DataRow standardview = null; @@ -168,10 +171,11 @@ namespace OnDoc.UICintrols int selindex = 0; foreach (System.Data.DataRow dr in Ansichten.Rows) { - + RibbonLabel rl = new RibbonLabel(); rl.Text = dr["bezeichnung"].ToString(); rl.Tag = Convert.ToInt32(dr["id"]); + if (Convert.ToInt32(rl.Tag) == -102 && AppParams.isSysadmin) { ribbonCBAnsicht.DropDownItems.Add(rl); @@ -195,6 +199,7 @@ namespace OnDoc.UICintrols ribbonCBAnsicht.SelectedItem = rl; selindex = index; standardview = dr; + currentview = dr; //standardview = dr["gridsettings"].ToString(); } if (rl.Text == Bezeichnung) @@ -205,9 +210,9 @@ namespace OnDoc.UICintrols } index = index + 1; } - if (selindex>0) { ribbonCBAnsicht.SelectedIndex=selindex-1; } + if (selindex > 0) { ribbonCBAnsicht.SelectedIndex = selindex ; } db = null; -// if (standardview != "") { refresh_view(standardview); } + // if (standardview != "") { refresh_view(standardview); } if (standardview != null) { refresh_view(standardview); } } @@ -243,11 +248,11 @@ namespace OnDoc.UICintrols public void refresh_edk_partner(int partnernr) { - + DB db = new DB(AppParams.connectionstring); try { - db.Get_Tabledata("Select bkpar00, saldiert from partner where nrpar00=" + partnernr.ToString(),false,true); + db.Get_Tabledata("Select bkpar00, saldiert from partner where nrpar00=" + partnernr.ToString(), false, true); Filter_Loeschen(); this.partnernr = partnernr; RibbonFilterLabel.Text = partnernr + " " + db.dsdaten.Tables[0].Rows[0][0].ToString(); @@ -257,8 +262,8 @@ namespace OnDoc.UICintrols refresh_dokumente(); } catch { } - finally { db=null; } -} + finally { db = null; } + } public void refresh_dokumente(string layout = "") { update_currentview(); @@ -334,7 +339,7 @@ namespace OnDoc.UICintrols zurUnterschriftenPrüfungToolStripMenuItem.Enabled = false; if (faksimile == "True") { - ribbonButtonToApproval.Enabled=true; + ribbonButtonToApproval.Enabled = true; zurUnterschriftenPrüfungToolStripMenuItem.Enabled = true; } if (bearbeitung_zwingend == "True") @@ -368,9 +373,9 @@ namespace OnDoc.UICintrols if (AppParams.StartApp == false) { - - docPreview1.Show_Doc(selected_dokumentid); - docPreview1.Hide_Editbuttons(); + + docPreview1.Show_Doc(selected_dokumentid); + docPreview1.Hide_Editbuttons(); } } private void sfDataGrid1_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) @@ -456,10 +461,10 @@ namespace OnDoc.UICintrols { var datarow = record as DataRowView; string documentid = datarow["dokumentid"].ToString(); - dokument_bearbeiten(documentid); + dokument_bearbeiten(documentid, false); } } - public void dokument_bearbeiten(string dokid) + public void dokument_bearbeiten(string dokid, bool newdok = false) { if (dokid != "") { selected_dokumentid = dokid; } clsdok dok = GetDoc(false); @@ -499,7 +504,27 @@ namespace OnDoc.UICintrols db = null; } Logging.DocLog.Info("Dokument bearbeiten", "Doklist", selected_dokumentid, selected_partnernr, "Dokument bearbeiten: InterOP: " + interop.ToString()); - OpenDoc(dok, true, interop, runmacros); + if (newdok) + { + OpenDoc(dok, true, interop, runmacros); + } + else + { + Dokumenterstellung dokbearbeitung = new Dokumenterstellung(selected_dokumentid); + if (dokbearbeitung.ShowDialog() == DialogResult.Abort) + { + DB db1 = new DB(AppParams.connectionstring); + db1.Dok_in_Bearbeitung(2, selected_dokumentid, AppParams.CurrentMitarbeiter); + db1 = null; + } + else + { + OpenDoc(dok, true, interop, runmacros); + }; + + + } + } private clsdok GetDoc(bool AsPDF) @@ -570,7 +595,7 @@ namespace OnDoc.UICintrols //System.Diagnostics.Process.Start(tempfilename); if (interop == true) { - OnDocOffice.clsWordEdit WordInterOP = new OnDocOffice.clsWordEdit(AppParams.connectionstring, tempfilename, selected_dokumentid,AppParams.RESTURI,AppParams.apikey); + OnDocOffice.clsWordEdit WordInterOP = new OnDocOffice.clsWordEdit(AppParams.connectionstring, tempfilename, selected_dokumentid, AppParams.RESTURI, AppParams.apikey); WordInterOP.Edit_Document(runmacros); WordInterOP = null; } @@ -640,7 +665,7 @@ namespace OnDoc.UICintrols private void tsrbvorschau_SelectedIndexChanged(object sender, EventArgs e) { - + vorschauposition = tsrbvorschau.Text; switch (vorschauposition) { @@ -662,7 +687,7 @@ namespace OnDoc.UICintrols docPreview1.Visible = true; docPreview1.Show_Doc(selected_dokumentid); docPreview1.Hide_Editbuttons(); - + break; case "Eigenes Fenster": this.splitContainer1.SplitterDistance = this.Height; @@ -710,8 +735,8 @@ namespace OnDoc.UICintrols currentview["Splitterdistance"] = splitContainer1.SplitterDistance; MemoryStream ms = new MemoryStream(); //gaga - //this.sfDataGrid1.Serialize(ms); - currentview["Gridsettings"]= Convert.ToBase64String(ms.ToArray()); + this.sfDataGrid1.Serialize(ms); + currentview["Gridsettings"] = Convert.ToBase64String(ms.ToArray()); } private void RibbonBtnVorschauUnten_Click(object sender, EventArgs e) @@ -793,12 +818,12 @@ namespace OnDoc.UICintrols Dokumenterstellung frmnewdok = new Dokumenterstellung(partnernr, dokumenttypnr, profilnr); if (interaktion == "No") { - + frmnewdok.Show(); frmnewdok.Visible = false; - frmnewdok.Dokument_Erstellen(); + frmnewdok.Dokument_Erstellen("", false); frmnewdok.Dispose(); - + } else @@ -812,14 +837,14 @@ namespace OnDoc.UICintrols case 1: if (frmnewdok.dokumentid != "") { - Cursor= Cursors.WaitCursor; + Cursor = Cursors.WaitCursor; System.Windows.Forms.Application.DoEvents(); selected_dokumentid = frmnewdok.dokumentid; selected_partnernr = frmnewdok.partnernr.ToString(); ; interop = frmnewdok.interop; runmacros = frmnewdok.runmacros; - dokument_bearbeiten(selected_dokumentid); + dokument_bearbeiten(selected_dokumentid, true); Cursor = Cursors.Default; System.Windows.Forms.Application.DoEvents(); @@ -850,9 +875,10 @@ namespace OnDoc.UICintrols db.clear_parameter(); db.add_parameter("@dokumentid", selected_dokumentid); db.Get_Tabledata("ondoc_check_delete_einzeldokument", true, false); - if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) { + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) + { db = null; - return; + return; } Logging.Logging.Debug("Doklist Docfunction=6", "Doklist", ""); db.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbeiter); @@ -913,9 +939,9 @@ namespace OnDoc.UICintrols private void RibbonButtonZuweisen_Click(object sender, EventArgs e) { - + if (!row_selected()) return; - InputDialog ma = new InputDialog(true, "Verantwortlichkeit wechseln zu"); + InputDialog ma = new InputDialog(true, "Verantwortlichkeit wechseln zu","Verantwortlichkeit zuweisen"); ma.ShowDialog(); if (ma.DialogResult == DialogResult.OK) { @@ -939,7 +965,7 @@ namespace OnDoc.UICintrols private void RibbonButtonCreateNewSerienbrief_Click(object sender, EventArgs e) { - Serienbrief sb = new Serienbrief(this.profilnr); + frmSerienbrief sb = new frmSerienbrief(this.profilnr); sb.Show(); } @@ -954,7 +980,7 @@ namespace OnDoc.UICintrols this.RibbonButtonFavoriten.Visible = false; this.RibbonPanelSuche.Visible = false; this.RibbonPannelAproval.Visible = false; - + this.RibbonPanelExit.Visible = false; this.RibbonPanelProfil.Visible = false; @@ -1021,7 +1047,7 @@ namespace OnDoc.UICintrols if (e.Column.MappingName == "Termin") { var dataRow = (e.DataRow.RowData as DataRowView).Row; - if (Convert.ToDateTime(dataRow["Mutiert am"]) < new DateTime(2000,1,1)) + if (Convert.ToDateTime(dataRow["Mutiert am"]) < new DateTime(2000, 1, 1)) { e.DisplayText = ""; } @@ -1259,7 +1285,7 @@ namespace OnDoc.UICintrols } } - + private void RibbonButtonArchivToOnBase_Click(object sender, EventArgs e) { var records = sfDataGrid1.View.GetSelectedRecords(); @@ -1278,7 +1304,7 @@ namespace OnDoc.UICintrols if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Status_Bezeichnungnr"]) == -2) { MessageBox.Show("Das Dokument " + documentid + " wurde zwischenzeitlich archiviert und kann nicht erneut archiviert werden.", "Dokument archivieren", MessageBoxButtons.OK, MessageBoxIcon.Information); - + } else { @@ -1373,11 +1399,12 @@ namespace OnDoc.UICintrols if (!row_selected()) return; var records = sfDataGrid1.View.GetSelectedRecords(); - if (records.Count == 1) { + if (records.Count == 1) + { frmToApproval fa = new frmToApproval(); fa.dokumentid = selected_dokumentid; fa.ShowDialog(); - return; + return; } int error = 0; @@ -1387,31 +1414,34 @@ namespace OnDoc.UICintrols string toapprove = datarow["toapprove"].ToString(); if (toapprove == "False") { error = 1; } } - if (error != 0){ + if (error != 0) + { MessageBox.Show("Es sind Dokumente in der Auswahl, welche keine Prüfung benötigten. Bitte auswahl anpassen.", "Prüfung", MessageBoxButtons.OK, MessageBoxIcon.Warning); -return; + return; } - if (MessageBox.Show("Gewählte Dokumente zur Unterschriftenprüfung "+Environment.NewLine+"(ohne Kommentar-Möglichkeit)?", "Dokument zur Unterschriftenprüfung?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { + if (MessageBox.Show("Gewählte Dokumente zur Unterschriftenprüfung " + Environment.NewLine + "(ohne Kommentar-Möglichkeit)?", "Dokument zur Unterschriftenprüfung?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { frmToApproval fa = new frmToApproval(); fa.Visible = false; fa.Show(); - + foreach (var record in records) { var datarow = record as DataRowView; string documentid = datarow["dokumentid"].ToString(); string toapprove = datarow["toapprove"].ToString(); - if (toapprove == "True") { - fa.dokumentid = documentid; - fa.update_dokdetails(); - fa.insert_bewilligung(); - } + if (toapprove == "True") + { + fa.dokumentid = documentid; + fa.update_dokdetails(); + fa.insert_bewilligung(); + } } fa.close_window(); } - + refresh_dokumente(); //frmToApproval fa = new frmToApproval(); @@ -1439,6 +1469,19 @@ return; ribbonLabelToApprove.Text = ""; ribbonLabelToApprove.Visible = false; + } + else + { + ribbonLabelToApprove.Text = db1.dsdaten.Tables[0].Rows[0][0].ToString(); + ribbonLabelToApprove.Visible = true; + } + db1.Get_Tabledata("Select count(*) from view_relaunch_approval_serienbrief where bewilligt=0 and abgelehnt = 0 and mitarbeiter_bewilligung=" + AppParams.CurrentMitarbeiter.ToString(), false, true); + if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) == 0) + { + + ribbonLabelToApprove.Text = ""; + ribbonLabelToApprove.Visible = false; + } else { @@ -1534,7 +1577,7 @@ return; private void ribbonGroupMitarbeiter_Click(object sender, EventArgs e) { - InputDialog ma = new InputDialog(true, "Verantwortlicher Mitarbeiter wählen"); + InputDialog ma = new InputDialog(true, "Verantwortlicher Mitarbeiter wählen","Mitarbeiter wählen"); ma.ShowDialog(); if (ma.DialogResult == DialogResult.OK) @@ -1626,7 +1669,7 @@ return; //private void refresh_view(string base64string) - private void refresh_view(System.Data.DataRow dataRow) + private void refresh_view(System.Data.DataRow dataRow) { string base64string = dataRow["gridsettings"].ToString(); @@ -1643,28 +1686,28 @@ return; return; } //currentview = plaintext; - + currentview = dataRow; using (MemoryStream ms = new MemoryStream(bytes)) { this.sfDataGrid1.Deserialize(ms); - + } - + sfDataGrid1.ShowToolTip = true; //sfDataGrid1.FilterRowPosition = RowPosition.Top; tsrbvorschau.SelectedIndex = Convert.ToInt32(dataRow["Preview"]); - RibbonButtonAttributeEinAusblenden.Checked = Convert.ToInt32(dataRow["Attributes"])==1; - if (tsrbvorschau.SelectedIndex!=0 && Convert.ToInt32(dataRow["SplitterDistance"]) !=0 ) + RibbonButtonAttributeEinAusblenden.Checked = Convert.ToInt32(dataRow["Attributes"]) == 1; + if (tsrbvorschau.SelectedIndex != 0 && Convert.ToInt32(dataRow["SplitterDistance"]) != 0) { this.splitContainer1.SplitterDistance = Convert.ToInt32(dataRow["SplitterDistance"]); this.docPreview1.set_zoom(); } else { - // docPreview1.clear_viewer(); + // docPreview1.clear_viewer(); } show_hide_attribute(); @@ -1700,7 +1743,7 @@ return; } private void ribbonButton4_Click(object sender, EventArgs e) { - + } @@ -1740,7 +1783,7 @@ return; sfDataGrid1.ClearSelection(); sfDataGrid1.ClearSorting(); ribbonCBAnsicht.SelectedIndex = 1; - + } private void RibbonButtonViewSave_Click(object sender, EventArgs e) @@ -1768,13 +1811,13 @@ return; if (RibbonButtonAttributeEinAusblenden.Checked) { Attribute = 1; } string sql = "insert Mitarbeiter_GridSettings (mitarbeiterid, erstellt_am, aktiv, bezeichnung, gridsettings,standard, Preview, Attributes,splitterdistance) values("; sql = sql + AppParams.CurrentMitarbeiter.ToString() + ",getdate(),1,'" + sa.selectedtext + "','" + inputAsString + "'," + sa.alsStandard.ToString(); - sql = sql + ", "+ tsrbvorschau.SelectedIndex.ToString()+", "+Attribute.ToString()+ ", "+distance.ToString()+")"; + sql = sql + ", " + tsrbvorschau.SelectedIndex.ToString() + ", " + Attribute.ToString() + ", " + distance.ToString() + ")"; //db.Exec_SQL(sql); db.Get_Tabledata_for_Update("Select * from mitarbeiter_gridsettings where id = -1", false, true); System.Data.DataRow dr = db.daten.Tables[0].NewRow(); - dr[1]=AppParams.CurrentMitarbeiter.ToString(); - dr[2]=DateTime.Now; + dr[1] = AppParams.CurrentMitarbeiter.ToString(); + dr[2] = DateTime.Now; dr[3] = true; dr[4] = sa.selectedtext; dr[5] = inputAsString; @@ -1789,7 +1832,7 @@ return; db = null; if (sa.alsStandard != 1) { refresh_ansichten(sa.selectedtext); } else { refresh_ansichten(); } - + } } @@ -1883,34 +1926,35 @@ return; } } - private void attributeAnzeigenVersteckenToolStripMenuItem_Click(object sender, EventArgs e) + private void attributeAnzeigenVersteckenToolStripMenuItem_Click(object sender, EventArgs e) + { + if (RibbonButtonAttributeEinAusblenden.Checked) { - if (RibbonButtonAttributeEinAusblenden.Checked) - { - RibbonButtonAttributeEinAusblenden.Checked = false; - } else - { - RibbonButtonAttributeEinAusblenden.Checked = true; - } - show_hide_attribute(); - update_currentview(); + RibbonButtonAttributeEinAusblenden.Checked = false; } - //if (dokwerte1.Width == 0) - //{ - // dokwerte1.Width = 300; - // dokwerte1.set_panelheight(sfDataGrid1.GroupPanel.Height, sfDataGrid1.GroupPanel.BackColor); + else + { + RibbonButtonAttributeEinAusblenden.Checked = true; + } + show_hide_attribute(); + update_currentview(); + } + //if (dokwerte1.Width == 0) + //{ + // dokwerte1.Width = 300; + // dokwerte1.set_panelheight(sfDataGrid1.GroupPanel.Height, sfDataGrid1.GroupPanel.BackColor); + + // dokwerte1.Update_Werte(selected_dokumentid); + // RibbonButtonAttributeEinAusblenden.Checked = true; + //} + //else + //{ + // dokwerte1.Width = 0; + // RibbonButtonAttributeEinAusblenden.Checked = false; + //} - // dokwerte1.Update_Werte(selected_dokumentid); - // RibbonButtonAttributeEinAusblenden.Checked = true; - //} - //else - //{ - // dokwerte1.Width = 0; - // RibbonButtonAttributeEinAusblenden.Checked = false; - //} - private void RibbonButtonAttributeEinAusblenden_Click(object sender, EventArgs e) { attributeAnzeigenVersteckenToolStripMenuItem_Click(sender, e); @@ -2022,7 +2066,7 @@ return; } catch { } - } + } private void sfDataGrid1_FilterChanged(object sender, FilterChangedEventArgs e) { @@ -2072,7 +2116,7 @@ return; string toapprove = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "toapprove").ToString(); string approved = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "approved").ToString(); string faksimile = sfDataGrid1.View.GetPropertyAccessProvider().GetValue(record, "faksimile").ToString(); - update_ansicht(bearbeitung_zwingend, toapprove, approved,faksimile); + update_ansicht(bearbeitung_zwingend, toapprove, approved, faksimile); } } @@ -2176,7 +2220,7 @@ return; private void lblToApprove_TextChanged(object sender, EventArgs e) { - + } private void sfDataGrid1_ColumnResizing(object sender, ColumnResizingEventArgs e) @@ -2213,7 +2257,7 @@ return; private void RibbonCBProfil_Click(object sender, EventArgs e) { - // this.profilnr = Convert.ToInt32(this.RibbonCBProfil.SelectedValue); + // this.profilnr = Convert.ToInt32(this.RibbonCBProfil.SelectedValue); } private void RibbonCBProfil_DropDownItemClicked(object sender, System.Windows.Forms.RibbonItemEventArgs e) @@ -2224,7 +2268,7 @@ return; private void ctxMenuDokList_Opening(object sender, CancelEventArgs e) { - + if (this.sfDataGrid1.GroupColumnDescriptions.Count > 0) { gruppenÖffnenToolStripMenuItem.Visible = true; @@ -2238,7 +2282,7 @@ return; toolStripMenuItem3.Visible = false; } - + //var location = this.PointToClient(Cursor.Position); ////System.Drawing.Point location = new System.Drawing.Point(); @@ -2270,7 +2314,7 @@ return; private void ribbonbuttonnewparterdoc_Click(object sender, EventArgs e) { - createnewdoc(this.partnernr,0); + createnewdoc(this.partnernr, 0); } } diff --git a/Client/UIControls/Partnersuche.Designer.cs b/Client/UIControls/Partnersuche.Designer.cs index 02a4b21f..857db7d8 100644 --- a/Client/UIControls/Partnersuche.Designer.cs +++ b/Client/UIControls/Partnersuche.Designer.cs @@ -58,9 +58,9 @@ this.lblPartnerNr.AutoSize = true; this.lblPartnerNr.Location = new System.Drawing.Point(12, 26); this.lblPartnerNr.Name = "lblPartnerNr"; - this.lblPartnerNr.Size = new System.Drawing.Size(55, 13); + this.lblPartnerNr.Size = new System.Drawing.Size(61, 13); this.lblPartnerNr.TabIndex = 0; - this.lblPartnerNr.Text = "Partner-Nr"; + this.lblPartnerNr.Text = "Kunden-Nr."; // // lblkurzname // @@ -211,10 +211,10 @@ // btnbpperson // this.btnbpperson.Enabled = false; - this.btnbpperson.Image = global::OnDoc.Properties.Resources.Refresh_16x16_32; - this.btnbpperson.Location = new System.Drawing.Point(555, 132); + this.btnbpperson.Image = ((System.Drawing.Image)(resources.GetObject("btnbpperson.Image"))); + this.btnbpperson.Location = new System.Drawing.Point(551, 132); this.btnbpperson.Name = "btnbpperson"; - this.btnbpperson.Size = new System.Drawing.Size(24, 27); + this.btnbpperson.Size = new System.Drawing.Size(34, 34); this.btnbpperson.TabIndex = 11; this.btnbpperson.UseVisualStyleBackColor = true; this.btnbpperson.Click += new System.EventHandler(this.btnbpperson_Click); @@ -223,7 +223,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(583, 399); + this.ClientSize = new System.Drawing.Size(584, 399); this.Controls.Add(this.btnbpperson); this.Controls.Add(this.chkkeepalive); this.Controls.Add(this.label1); diff --git a/Client/UIControls/Partnersuche.cs b/Client/UIControls/Partnersuche.cs index 6c2810af..13a0ddbd 100644 --- a/Client/UIControls/Partnersuche.cs +++ b/Client/UIControls/Partnersuche.cs @@ -95,14 +95,14 @@ namespace OnDoc.UIControls catch { } this.Text = "Kunde suchen"; this.lblPartnerNr.Text = "Kunde-Nr"; - if (personendokument) { - this.Text = "Person suchen"; - this.lblPartnerNr.Text = "Person-Nr."; - } - if (bpdokument) { - this.Text = "Partner suchen"; - this.lblPartnerNr.Text = "Partner-Nr."; - } + //if (personendokument) { + // this.Text = "Person suchen"; + // this.lblPartnerNr.Text = "Person-Nr."; + //} + //if (bpdokument) { + // this.Text = "Partner suchen"; + // this.lblPartnerNr.Text = "Partner-Nr."; + //} } private void btnsuche_Click(object sender, EventArgs e) @@ -116,6 +116,7 @@ namespace OnDoc.UIControls { trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 0,personendokument,bpdokument, chksaldiert.Checked); TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true); + trefferlistedata.Columns[0].HeaderText = "Kunden-Nr."; try { trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20; @@ -135,6 +136,8 @@ namespace OnDoc.UIControls string s = txtKurzname.Text.Trim(); trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 1, personendokument, bpdokument, chksaldiert.Checked); TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true); + trefferlistedata.Columns[0].HeaderText = "Kunden-Nr."; + try { trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20; diff --git a/Client/UIControls/Partnersuche.resx b/Client/UIControls/Partnersuche.resx index 379968a2..5fd67512 100644 --- a/Client/UIControls/Partnersuche.resx +++ b/Client/UIControls/Partnersuche.resx @@ -120,10 +120,26 @@ 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAJDSURBVEhLtZXPSxtREMfX2FaUpK3a+AMJNkpCUCOCp1bwUJAWD2JpD6WX2vbqLZoU601Fz62H + erIlgngXhNJehNwKhSL+GR4U/EE02/m83bftrlF4i/nCkJdh9vvdmXkzawXQKTYr9lHsg6HxDM/CURUv + xGbEYupfOETF4IDLBxyTzvFGAJcnQkqo3jTgVOWibqQWRDo5+HS3Z2i8JOd+x+VDROyl2HOxOhwBUGq4 + VXMuoTHauphbPy3PfiufN3ekVl23RkR8X17P7x6+mvt5dPdB9yfxVRNR3NyAS4i1JFbyxYqNJQefbbpu + UC/ka+9X9s4KG7aNvV36feqKkNX/UNwmAry5Qy7+QtG28xv8VuwpEbnf1hsUMRO43RDNvVv+c1KAVBkZ + /Du/Wfh1fOtO07QicGAm0NKZWcsXLyq59ZPyo4m5A12i7OjU/szXs3Pp14Vk8VkRODATEAw8HBj70ZUe + 2U5kRku6RI2x+Jb83+nue/JdYjJOqIKxgIfU8OSmLhGxrjuI6wV4Q6znWgHbSCBDmqTbJGmrGyIEXanH + JcpCeSQmS2AoARpEo2gYjdNXkYbSWBpMo4kNJcAV46rp0gSNK8pVJTZsiSIMiwyNmlJdIozhYsiIITCs + AIgw9jL+3rQq8nZFXu+EmAlUW3Z1iMgiO5SFdnQvnvTeXCOeyK6yCFmILEbXHYTivmpdsx1Zxazk4BID + /axyVrqc047LB29d1+qD4/s+1/STqYED1Zp89DVICRGaww0wMZ7xlcWyLOsvDFd8XAJMOgUAAAAASUVO + RK5CYII= + + 172, 17 - AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA diff --git a/Client/DocMgmt/Serienbrief.Designer.cs b/Client/UIControls/Serienbrief.Designer.cs similarity index 94% rename from Client/DocMgmt/Serienbrief.Designer.cs rename to Client/UIControls/Serienbrief.Designer.cs index 5bd06745..46b19733 100644 --- a/Client/DocMgmt/Serienbrief.Designer.cs +++ b/Client/UIControls/Serienbrief.Designer.cs @@ -92,7 +92,7 @@ this.archivierenUndAbschliessenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.GridEmpfänger = new Syncfusion.WinForms.DataGrid.SfDataGrid(); this.ribbon1 = new System.Windows.Forms.Ribbon(); - this.ribbonTab1 = new System.Windows.Forms.RibbonTab(); + this.ribbonTabFunktionen = new System.Windows.Forms.RibbonTab(); this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonExit = new System.Windows.Forms.RibbonButton(); this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel(); @@ -114,9 +114,14 @@ this.ribbonButtonPartnerPruefen = new System.Windows.Forms.RibbonButton(); this.ribbonPanel8 = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonGenerateSB = new System.Windows.Forms.RibbonButton(); + this.ribbonButtonToApproval = new System.Windows.Forms.RibbonButton(); this.ribbonButtonDruckstapel = new System.Windows.Forms.RibbonButton(); this.ribbonPanel9 = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonArchivierenUndAbschlessen = new System.Windows.Forms.RibbonButton(); + this.ribbonTabPruefung = new System.Windows.Forms.RibbonTab(); + this.ribbonPanel10 = new System.Windows.Forms.RibbonPanel(); + this.ribbonbuttonGeprueft = new System.Windows.Forms.RibbonButton(); + this.ribbonbuttonAbgelehnt = new System.Windows.Forms.RibbonButton(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.pnlLoad = new System.Windows.Forms.Panel(); this.sfdatagridsbload = new Syncfusion.WinForms.DataGrid.SfDataGrid(); @@ -172,9 +177,9 @@ this.GrpDokumentInhalt.Controls.Add(this.groupBox5); this.GrpDokumentInhalt.Dock = System.Windows.Forms.DockStyle.Top; this.GrpDokumentInhalt.Enabled = false; - this.GrpDokumentInhalt.Location = new System.Drawing.Point(2, 101); + this.GrpDokumentInhalt.Location = new System.Drawing.Point(0, 99); this.GrpDokumentInhalt.Name = "GrpDokumentInhalt"; - this.GrpDokumentInhalt.Size = new System.Drawing.Size(1629, 254); + this.GrpDokumentInhalt.Size = new System.Drawing.Size(1633, 254); this.GrpDokumentInhalt.TabIndex = 1; this.GrpDokumentInhalt.TabStop = false; this.GrpDokumentInhalt.Text = "Dokument-Inahalt"; @@ -675,7 +680,7 @@ this.GrpEmpfaenger.Dock = System.Windows.Forms.DockStyle.Fill; this.GrpEmpfaenger.Location = new System.Drawing.Point(0, 0); this.GrpEmpfaenger.Name = "GrpEmpfaenger"; - this.GrpEmpfaenger.Size = new System.Drawing.Size(900, 598); + this.GrpEmpfaenger.Size = new System.Drawing.Size(902, 602); this.GrpEmpfaenger.TabIndex = 2; this.GrpEmpfaenger.TabStop = false; this.GrpEmpfaenger.Text = "Empfänger"; @@ -690,7 +695,7 @@ this.sfDataGridEmpfaenger.Location = new System.Drawing.Point(233, 16); this.sfDataGridEmpfaenger.Name = "sfDataGridEmpfaenger"; this.sfDataGridEmpfaenger.SelectionMode = Syncfusion.WinForms.DataGrid.Enums.GridSelectionMode.Extended; - this.sfDataGridEmpfaenger.Size = new System.Drawing.Size(664, 579); + this.sfDataGridEmpfaenger.Size = new System.Drawing.Size(666, 583); this.sfDataGridEmpfaenger.TabIndex = 4; this.sfDataGridEmpfaenger.Text = "sfDataGrid1"; this.sfDataGridEmpfaenger.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGridEmpfaenger_CellClick); @@ -736,7 +741,7 @@ treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black; this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)}); - this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(230, 579); + this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(230, 583); this.treeViewAdv1.ContextMenuStrip = this.ctxmenutree; this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Left; this.treeViewAdv1.Enabled = false; @@ -799,7 +804,7 @@ treeNodeAdv3, treeNodeAdv4}); this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText; - this.treeViewAdv1.Size = new System.Drawing.Size(230, 579); + this.treeViewAdv1.Size = new System.Drawing.Size(230, 583); this.treeViewAdv1.TabIndex = 3; this.treeViewAdv1.Text = "treeViewAdv1"; this.treeViewAdv1.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; @@ -861,7 +866,7 @@ this.GridEmpfänger.EditMode = Syncfusion.WinForms.DataGrid.Enums.EditMode.SingleClick; this.GridEmpfänger.Location = new System.Drawing.Point(3, 16); this.GridEmpfänger.Name = "GridEmpfänger"; - this.GridEmpfänger.Size = new System.Drawing.Size(894, 579); + this.GridEmpfänger.Size = new System.Drawing.Size(896, 583); this.GridEmpfänger.TabIndex = 2; this.GridEmpfänger.Text = "sfDataGrid1"; // @@ -869,7 +874,7 @@ // this.ribbon1.CaptionBarVisible = false; this.ribbon1.Font = new System.Drawing.Font("Segoe UI", 9F); - this.ribbon1.Location = new System.Drawing.Point(2, 2); + this.ribbon1.Location = new System.Drawing.Point(0, 0); this.ribbon1.Minimized = false; this.ribbon1.Name = "ribbon1"; // @@ -883,25 +888,27 @@ this.ribbon1.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013; this.ribbon1.OrbVisible = false; this.ribbon1.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F); - this.ribbon1.Size = new System.Drawing.Size(1629, 99); + this.ribbon1.Size = new System.Drawing.Size(1633, 99); this.ribbon1.TabIndex = 3; - this.ribbon1.Tabs.Add(this.ribbonTab1); + this.ribbon1.Tabs.Add(this.ribbonTabFunktionen); + this.ribbon1.Tabs.Add(this.ribbonTabPruefung); this.ribbon1.TabSpacing = 4; this.ribbon1.Text = "ribbon1"; - // - // ribbonTab1 - // - this.ribbonTab1.Name = "ribbonTab1"; - this.ribbonTab1.Panels.Add(this.ribbonPanel1); - this.ribbonTab1.Panels.Add(this.ribbonPanel2); - this.ribbonTab1.Panels.Add(this.ribbonPanel4); - this.ribbonTab1.Panels.Add(this.ribbonPanel5); - this.ribbonTab1.Panels.Add(this.ribbonPanel3); - this.ribbonTab1.Panels.Add(this.ribbonPanel6); - this.ribbonTab1.Panels.Add(this.ribbonPanel7); - this.ribbonTab1.Panels.Add(this.ribbonPanel8); - this.ribbonTab1.Panels.Add(this.ribbonPanel9); - this.ribbonTab1.Text = "Funktionen"; + this.ribbon1.Click += new System.EventHandler(this.ribbon1_Click); + // + // ribbonTabFunktionen + // + this.ribbonTabFunktionen.Name = "ribbonTabFunktionen"; + this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel1); + this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel2); + this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel4); + this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel5); + this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel3); + this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel6); + this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel7); + this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel8); + this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel9); + this.ribbonTabFunktionen.Text = "Funktionen"; // // ribbonPanel1 // @@ -1082,6 +1089,7 @@ // this.ribbonPanel8.ButtonMoreVisible = false; this.ribbonPanel8.Items.Add(this.RibbonButtonGenerateSB); + this.ribbonPanel8.Items.Add(this.ribbonButtonToApproval); this.ribbonPanel8.Items.Add(this.ribbonButtonDruckstapel); this.ribbonPanel8.Name = "ribbonPanel8"; this.ribbonPanel8.Text = ""; @@ -1096,6 +1104,16 @@ this.RibbonButtonGenerateSB.Text = "Serienbrief_generieren"; this.RibbonButtonGenerateSB.Click += new System.EventHandler(this.RibbonButtonGenerateSB_Click); // + // ribbonButtonToApproval + // + this.ribbonButtonToApproval.Enabled = false; + this.ribbonButtonToApproval.Image = global::OnDoc.Properties.Resources.Approval_32x32_32; + this.ribbonButtonToApproval.LargeImage = global::OnDoc.Properties.Resources.Approval_32x32_32; + this.ribbonButtonToApproval.Name = "ribbonButtonToApproval"; + this.ribbonButtonToApproval.SmallImage = global::OnDoc.Properties.Resources.Approval_24x24_32; + this.ribbonButtonToApproval.Text = "Zur Unterschriftenprüfung"; + this.ribbonButtonToApproval.Click += new System.EventHandler(this.ribbonButtonToApproval_Click); + // // ribbonButtonDruckstapel // this.ribbonButtonDruckstapel.Enabled = false; @@ -1124,6 +1142,38 @@ this.RibbonButtonArchivierenUndAbschlessen.Click += new System.EventHandler(this.RibbonButtonArchivierenUndAbschlessen_Click); this.RibbonButtonArchivierenUndAbschlessen.CanvasChanged += new System.EventHandler(this.RibbonButtonArchivierenUndAbschlessen_CanvasChanged); // + // ribbonTabPruefung + // + this.ribbonTabPruefung.Name = "ribbonTabPruefung"; + this.ribbonTabPruefung.Panels.Add(this.ribbonPanel10); + this.ribbonTabPruefung.Text = "Prüfen"; + // + // ribbonPanel10 + // + this.ribbonPanel10.ButtonMoreVisible = false; + this.ribbonPanel10.Items.Add(this.ribbonbuttonGeprueft); + this.ribbonPanel10.Items.Add(this.ribbonbuttonAbgelehnt); + this.ribbonPanel10.Name = "ribbonPanel10"; + this.ribbonPanel10.Text = ""; + // + // ribbonbuttonGeprueft + // + this.ribbonbuttonGeprueft.Image = global::OnDoc.Properties.Resources.Approval_OK_32x32_32; + this.ribbonbuttonGeprueft.LargeImage = global::OnDoc.Properties.Resources.Approval_OK_32x32_32; + this.ribbonbuttonGeprueft.Name = "ribbonbuttonGeprueft"; + this.ribbonbuttonGeprueft.SmallImage = global::OnDoc.Properties.Resources.Approval_OK_24x24_32; + this.ribbonbuttonGeprueft.Text = "Geprüft"; + this.ribbonbuttonGeprueft.Click += new System.EventHandler(this.ribbonbuttonGeprueft_Click); + // + // ribbonbuttonAbgelehnt + // + this.ribbonbuttonAbgelehnt.Image = global::OnDoc.Properties.Resources.Approval_NOK_32x32_32; + this.ribbonbuttonAbgelehnt.LargeImage = global::OnDoc.Properties.Resources.Approval_NOK_32x32_32; + this.ribbonbuttonAbgelehnt.Name = "ribbonbuttonAbgelehnt"; + this.ribbonbuttonAbgelehnt.SmallImage = global::OnDoc.Properties.Resources.Approval_NOK_24x24_32; + this.ribbonbuttonAbgelehnt.Text = "Abgelehnt"; + this.ribbonbuttonAbgelehnt.Click += new System.EventHandler(this.ribbonbuttonAbgelehnt_Click); + // // openFileDialog1 // this.openFileDialog1.FileName = "openFileDialog1"; @@ -1146,12 +1196,14 @@ // this.sfdatagridsbload.AccessibleName = "Table"; this.sfdatagridsbload.AllowEditing = false; + this.sfdatagridsbload.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.Fill; this.sfdatagridsbload.Dock = System.Windows.Forms.DockStyle.Top; this.sfdatagridsbload.Location = new System.Drawing.Point(0, 47); this.sfdatagridsbload.Name = "sfdatagridsbload"; this.sfdatagridsbload.Size = new System.Drawing.Size(489, 489); this.sfdatagridsbload.TabIndex = 3; this.sfdatagridsbload.Text = "sfDataGrid1"; + this.sfdatagridsbload.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.sfdatagridsbload_DrawCell); this.sfdatagridsbload.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfdatagridsbload_CellClick); this.sfdatagridsbload.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfdatagridsbload_CellDoubleClick); this.sfdatagridsbload.Click += new System.EventHandler(this.Serienbrief_Load); @@ -1199,7 +1251,7 @@ // splitContainer1 // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(2, 355); + this.splitContainer1.Location = new System.Drawing.Point(0, 353); this.splitContainer1.Name = "splitContainer1"; // // splitContainer1.Panel1 @@ -1209,8 +1261,8 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.docPreview1); - this.splitContainer1.Size = new System.Drawing.Size(1629, 598); - this.splitContainer1.SplitterDistance = 900; + this.splitContainer1.Size = new System.Drawing.Size(1633, 602); + this.splitContainer1.SplitterDistance = 902; this.splitContainer1.TabIndex = 5; // // docPreview1 @@ -1218,7 +1270,7 @@ 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(725, 598); + this.docPreview1.Size = new System.Drawing.Size(727, 602); this.docPreview1.TabIndex = 4; this.docPreview1.ZoomPercentage = 0; // @@ -1226,7 +1278,7 @@ // this.panelLoad.BackColor = System.Drawing.Color.Silver; this.panelLoad.Controls.Add(this.label4); - this.panelLoad.Location = new System.Drawing.Point(488, 71); + this.panelLoad.Location = new System.Drawing.Point(114, 58); this.panelLoad.Name = "panelLoad"; this.panelLoad.Size = new System.Drawing.Size(578, 100); this.panelLoad.TabIndex = 6; @@ -1246,18 +1298,13 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1633, 955); this.Controls.Add(this.panelLoad); this.Controls.Add(this.pnlLoad); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.GrpDokumentInhalt); this.Controls.Add(this.ribbon1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.KeyPreview = true; this.Name = "Serienbrief"; - this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; - this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; - this.Text = "Serienbrief"; + this.Size = new System.Drawing.Size(1633, 955); this.Load += new System.EventHandler(this.Serienbrief_Load); this.GrpDokumentInhalt.ResumeLayout(false); this.grpFaktura.ResumeLayout(false); @@ -1330,7 +1377,7 @@ private System.Windows.Forms.Label lblPostzustellung; private Syncfusion.WinForms.DataGrid.SfDataGrid GridEmpfänger; private System.Windows.Forms.Ribbon ribbon1; - private System.Windows.Forms.RibbonTab ribbonTab1; + private System.Windows.Forms.RibbonTab ribbonTabFunktionen; private System.Windows.Forms.RibbonPanel ribbonPanel1; private System.Windows.Forms.RibbonButton RibbonButtonExit; private System.Windows.Forms.RibbonPanel ribbonPanel2; @@ -1395,5 +1442,10 @@ private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label5; + private System.Windows.Forms.RibbonTab ribbonTabPruefung; + private System.Windows.Forms.RibbonPanel ribbonPanel10; + private System.Windows.Forms.RibbonButton ribbonbuttonGeprueft; + private System.Windows.Forms.RibbonButton ribbonbuttonAbgelehnt; + private System.Windows.Forms.RibbonButton ribbonButtonToApproval; } } \ No newline at end of file diff --git a/Client/DocMgmt/Serienbrief.cs b/Client/UIControls/Serienbrief.cs similarity index 88% rename from Client/DocMgmt/Serienbrief.cs rename to Client/UIControls/Serienbrief.cs index 0098a69a..78c1dea9 100644 --- a/Client/DocMgmt/Serienbrief.cs +++ b/Client/UIControls/Serienbrief.cs @@ -46,7 +46,7 @@ using OnDoc.Diverses; namespace OnDoc.UIControls { - public partial class Serienbrief : SfForm, IMessageListener1 + public partial class Serienbrief : UserControl, IMessageListener1 { //private int dokumenttypnr = 0; private int officevorlagenr = 0; @@ -60,36 +60,67 @@ namespace OnDoc.UIControls SerienbriefBearbeitung sbedit; //private DataSet dsempfaenger = new DataSet(); private int selectedsbnr = 0; + + public bool approval = false; + public System.Data.DataRow approvaldata = null; public Serienbrief() { InitializeComponent(); - this.Style.TitleBar.BackColor = Theaming.Titelbar(); - this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); - this.Style.ShadowOpacity = Theaming.ShadowOpacity; - this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; - Broadcaster().AddListener(this); - Closing += Form_Closing; + } public Serienbrief(int profilnr) { InitializeComponent(); - this.Style.TitleBar.BackColor = Theaming.Titelbar(); - this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); - this.Style.ShadowOpacity = Theaming.ShadowOpacity; - this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; + //this.Style.TitleBar.BackColor = Theaming.Titelbar(); + //this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + //this.Style.ShadowOpacity = Theaming.ShadowOpacity; + //this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; this.profilnr = profilnr; - Broadcaster().AddListener(this); - Closing += Form_Closing; + //Broadcaster().AddListener(this); + //Closing += Form_Closing; } private void Serienbrief_Load(object sender, EventArgs e) { + //Refresh_Lists(); + //Refresh_Team(); + //Broadcaster().AddListener(this); + //Closing += Form_Closing; + + } + + public void Init() + { + if (approval) + { + this.ribbonTabFunktionen.Visible = false; + this.ribbonTabPruefung.Visible = true; + ctxmenuEmpfaenger.Visible = false; + ctxmenutree.Visible = false; + } + else + { + ribbonTabPruefung.Visible =false; + ribbonTabFunktionen.Visible = true; + ctxmenuEmpfaenger.Visible = true; + ctxmenutree.Visible = true; + + } Refresh_Lists(); Refresh_Team(); Broadcaster().AddListener(this); - Closing += Form_Closing; + //Closing += Form_Closing; + } + public void setfuncitons(bool enable) + { + this.ribbonbuttonGeprueft.Enabled = enable; + this.ribbonbuttonAbgelehnt.Enabled = enable; + } + public void dispose() + { + Broadcaster().RemoveListener(this); } private void Form_Closing(object sender, CancelEventArgs e) { @@ -282,7 +313,7 @@ namespace OnDoc.UIControls } private void RibbonButtonExit_Click(object sender, EventArgs e) { - this.Close(); + //this.Close(); } private void RibbonButtonExcelImport_Click(object sender, EventArgs e) @@ -682,10 +713,45 @@ namespace OnDoc.UIControls { sb.bezeichnung = this.txtbezeichnung.Text; sb.verantwortlich = Convert.ToInt32(this.cbboxverantwortlich.SelectedValue.ToString()); + try + { + if (cbboxunterschriftlinks.Text == "") { sb.approval1 = 1; } else { + if (sb.verantwortlich == Convert.ToInt32(this.cbboxunterschriftlinks.SelectedValue.ToString())) + { + sb.approval1 = 1; + } + } + } catch { } + try + { + if (cbboxunterschriftrechts.Text == "") { sb.approval2 = 1; } + else + { + if (sb.verantwortlich == Convert.ToInt32(this.cbboxunterschriftrechts.SelectedValue.ToString())) + { + sb.approval2 = 1; + } + } + } + catch { } + if (sb.approval1==1 && sb.approval2==1 && sb.faksimile==1) + { + sb.approved = 1; + } + if (newsb) { sb.erstellt_am = DateTime.Now; } sb.aktiv = true; sb.mutiert_am = DateTime.Now; sb.mutierer = AppParams.CurrentMitarbeiter; + if (newsb) + { + sb.toapproval = 0; + sb.approved = 0; + sb.approval1 = 0; + sb.approval2 = 0; + sb.faksimile = 0; + sb.ohneunterschrift = 0; + } //sb.verantwortlich = AppParams.CurrentMitarbeiter; if (rbzustaendigkube.Checked) { sb.zustaendig = -1; } else { sb.zustaendig = Convert.ToInt32(cbboxzustaendigmitarbeiter.SelectedValue); @@ -701,13 +767,35 @@ namespace OnDoc.UIControls if (cbdigitaleunterschrfiten.Checked) { sb.faksimile_unterschrfit = "True"; + sb.faksimile = 1; } else { sb.faksimile_unterschrfit = "False"; + sb.faksimile = 0; } } - catch { sb.faksimile_unterschrfit = "False"; } + catch { sb.faksimile_unterschrfit = "False"; sb.faksimile = 0; } + try + { + if (cbformularohneunterschrfit.Checked) + { + sb.ohne_unterschrift = "True"; + sb.ohneunterschrift = 1; + } + else + { + sb.ohne_unterschrift = "false"; + sb.ohneunterschrift = 0; + + } + } catch + { + sb.ohne_unterschrift = "false"; + sb.ohneunterschrift = 0; + + } + try { sb.team = Convert.ToInt32(cbboxteam.SelectedValue.ToString()); } catch { sb.team = 0; } sb.archivdatum = Convert.ToDateTime(DateDokumentDatum.Value); sb.dokumentdatum = Convert.ToDateTime(DateDokumentDatum.Value); @@ -757,8 +845,25 @@ namespace OnDoc.UIControls { RibbonButtonArchivierenUndAbschlessen.Enabled = true; ribbonButtonDruckstapel.Enabled = true; + + if (cbdigitaleunterschrfiten.Checked) + { + if (sb.approved == 0) + { + this.ribbonButtonDruckstapel.Enabled = false; + this.RibbonButtonArchivierenUndAbschlessen.Enabled = false; + this.ribbonButtonToApproval.Enabled = true; + } + else + { + this.ribbonButtonDruckstapel.Enabled = true; + this.RibbonButtonArchivierenUndAbschlessen.Enabled = true; + this.ribbonButtonToApproval.Enabled = false; + } + } } + enable_disable_functions(3, true); if (generiert > 0 || abgeschlossen > 0) { @@ -839,11 +944,19 @@ namespace OnDoc.UIControls DB db = new DB(AppParams.connectionstring); db.clear_parameter(); db.add_parameter("@mitarbeiternr", AppParams.CurrentMitarbeiter.ToString()); - db.add_parameter("@ondoc", "1"); - db.Get_Tabledata("dbo.sp_edex_sb_get_serienbriefe", true, false); + db.Get_Tabledata("dbo.ondoc_get_offene_serienbriefe", true, false); sfdatagridsbload.DataSource = null; sfdatagridsbload.DataSource = db.dsdaten.Tables[0]; + + sfdatagridsbload.Columns[sfdatagridsbload.Columns.Count - 1].Visible = false; + sfdatagridsbload.Columns[sfdatagridsbload.Columns.Count - 2].Visible = false; + sfdatagridsbload.Columns[0].Width = 50; + sfdatagridsbload.Columns[1].Width = 50; + sfdatagridsbload.Columns[3].Width = 120; + sfdatagridsbload.Columns[5].Width = 90; + + sfdatagridsbload.ExpanderColumnWidth = btnsbloadok.Left = pnlLoad.Width - btnsbloadok.Width - 20; if (sfdatagridsbload.RowCount == 0) this.btnsbloadok.Enabled = false; // vorlage_auslesen_und_speichern(); @@ -859,7 +972,7 @@ namespace OnDoc.UIControls { open_sb(selectedsbnr); } - private void open_sb(int serienbriefnr) + public void open_sb(int serienbriefnr) { DB db = new DB(AppParams.connectionstring); sb = new serienbrief(); @@ -912,6 +1025,8 @@ namespace OnDoc.UIControls cbboxunterschriftlinks.SelectedValue = sb.unterschriftlinks; cbboxunterschriftrechts.SelectedValue = sb.unterschriftrechts; cbboxverantwortlich.SelectedValue = sb.verantwortlich; + cbformularohneunterschrfit.Checked = sb.ohneunterschrift == 1; + cbdigitaleunterschrfiten.Checked = sb.faksimile == 1; DateDokumentDatum.Value = sb.archivdatum; switch (sb.ppfaktura) @@ -951,7 +1066,7 @@ namespace OnDoc.UIControls { var selectedItem = e.DataRow; var dataRow = (e.DataRow.RowData as DataRowView).Row; - selectedsbnr = Convert.ToInt32(dataRow["serienbriefnr"].ToString()); + selectedsbnr = Convert.ToInt32(dataRow["id"].ToString()); } catch { } @@ -1194,8 +1309,15 @@ namespace OnDoc.UIControls System.Data.DataTable vorlagendaten = new System.Data.DataTable(); private void RibbonButtonGenerateSB_Click(object sender, EventArgs e) { - + if (cbdigitaleunterschrfiten.Checked) + { + sb.toapproval = 1; + sb.approved = 0; + sb.approval1 = 0; + sb.approval2 = 0; + } ribbonbuttonsave_Click(sender, e); + if (!Partnerliste_Pruefen()) { return; } Generate(); } @@ -1210,6 +1332,10 @@ namespace OnDoc.UIControls dg = new DOCGEN.DocGen(); dget = new DOCGEN.DocGet(AppParams.connectionstring); DB dB = new DB(AppParams.connectionstring); + if (vorschauid == -1) + { + dB.Exec_SQL("Update serienbrief_Bewilligung set aktiv=0, mutiert_am=getdate(),mutierer="+ AppParams.CurrentMitarbeiter.ToString() + " where serienbriefnr=" + sb.serienbriefnr.ToString()); + } if (IsPreview) { Helper.FileHelper fh = new FileHelper(); @@ -1245,6 +1371,20 @@ namespace OnDoc.UIControls vorlagendaten_aufbereiten(vorschauid); + if (cbdigitaleunterschrfiten.Checked) + { + sb.toapproval = 1; + sb.approved = 0; + sb.approval1 = 0; + sb.approval2 = 0; + }else + { + sb.toapproval = 0; + sb.approved = 0; + sb.approval1 = 0; + sb.approval2 = 0; + + } update_serienbriefdaten(false); update_zahlen(); treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[2]; @@ -1985,7 +2125,7 @@ namespace OnDoc.UIControls private void erneutGenerierenToolStripMenuItem_Click(object sender, EventArgs e) { - + System.Data.DataTable dt = sb.dsempfaenger.Tables[0]; var records = sfDataGridEmpfaenger.View.GetSelectedRecords(); @@ -2010,6 +2150,7 @@ namespace OnDoc.UIControls } refresh_empfaenger(sb.dsempfaenger.Tables[0]); + ribbonButtonToApproval.Enabled = false; } private void ribbonButton3_Click(object sender, EventArgs e) @@ -2037,7 +2178,11 @@ namespace OnDoc.UIControls if (ribbonButtonPartnerPruefen.Enabled) partnerlistePrüfenToolStripMenuItem.Visible = true; if (RibbonButtonArchivierenUndAbschlessen.Enabled) archivierenUndAbschliessenToolStripMenuItem.Visible = true; if (ribbonButtonDruckstapel.Enabled) druckstapelAufbereitenToolStripMenuItem.Visible = true; - if (treeViewAdv1.SelectedNode.Text.Substring(0, 4) == "Gene") (dokumentgenerierungZurücksetzenToolStripMenuItem.Visible) = true; + try + { + if (treeViewAdv1.SelectedNode.Text.Substring(0, 4) == "Gene") (dokumentgenerierungZurücksetzenToolStripMenuItem.Visible) = true; + } + catch { } } @@ -2050,6 +2195,7 @@ namespace OnDoc.UIControls { sfDataGridEmpfaenger.SelectAll(); erneutGenerierenToolStripMenuItem_Click(sender, e); + ribbonButtonToApproval.Enabled= false; } private void druckstapelAufbereitenToolStripMenuItem_Click(object sender, EventArgs e) @@ -2134,11 +2280,26 @@ namespace OnDoc.UIControls cbboxunterschriftlinks.Enabled = false; cbdigitaleunterschrfiten.Checked = false; cbdigitaleunterschrfiten.Enabled = false; + sb.approval1 = 0; + sb.approval2 = 0; + sb.toapproval = 0; + sb.approval2 = 0; + sb.faksimile = 0; + sb.ohneunterschrift = 1; } else { cbboxunterschriftrechts.Enabled = true; cbboxunterschriftlinks.Enabled = true; cbdigitaleunterschrfiten.Enabled = true; + if (cbdigitaleunterschrfiten.Checked == false) + { + sb.toapproval = 0; + sb.approval2 = 0; + sb.approval1 = 0; + sb.approved = 0; + sb.faksimile = 0; + sb.ohneunterschrift = 0; + } } } @@ -2150,11 +2311,127 @@ namespace OnDoc.UIControls cbboxunterschriftrechts.Enabled = true; cbformularohneunterschrfit.Checked = false; cbformularohneunterschrfit.Enabled = false; + sb.toapproval = 1; + sb.approval2 = 0; + sb.approval1 = 0; + sb.approved = 0; + sb.faksimile = 1; + sb.ohneunterschrift = 0; } else { cbformularohneunterschrfit.Enabled = true; + if (cbformularohneunterschrfit.Checked == false) + { + sb.toapproval = 0; + sb.approval2 = 0; + sb.approval1 = 0; + sb.approved = 0; + sb.faksimile = 0; + sb.ohneunterschrift = 0; + + } } } + + private void ribbon1_Click(object sender, EventArgs e) + { + + } + + private void ribbonButtonToApproval_Click(object sender, EventArgs e) + { + frmToApproval fa = new frmToApproval(); + fa.serienbriefnr = sb.serienbriefnr.ToString(); + fa.ShowDialog(); + return; + } + + private void ribbonbuttonGeprueft_Click(object sender, EventArgs e) + { + DB db = new DB(AppParams.connectionstring); + string sql = "update serienbrief_bewilligung set bewilligt=1, bewilligt_am = '" + DateTime.Now.ToString() + "' where id=" + approvaldata["id"].ToString(); + db.Exec_SQL(sql); + if (approvaldata["Bewilligungstyp"].ToString() == "2") + { + db.Exec_SQL("Update edex_sb_serienbrief set approval2=1 where serienbriefnr=" + sb.serienbriefnr.ToString() + ""); + } + else + { + db.Exec_SQL("Update edex_sb_serienbrief set approval1=1 where serienbriefnr=" + sb.serienbriefnr.ToString() + ""); + } + db = null; + Logging.DocLog.Info("Serienbrief geprüft", "Serienbrief geprüft", sb.serienbriefnr.ToString(), "", ""); + Broadcaster().Broadcast("Serienbrief", new SenderInfo("Removesbfromlist", "Refreshpruefung", serienbriefnr.ToString())); + + } + + private void ribbonbuttonAbgelehnt_Click(object sender, EventArgs e) + { + frmNote note = new frmNote(sb.serienbriefnr.ToString(), "Ablehnen"); + //DataRow dr = treeViewAdv1.SelectedNode.TagObject as DataRow; + + if (note.ShowDialog() == DialogResult.OK) + { + DB db = new DB(AppParams.connectionstring); + string sql = "update serienbrief_bewilligung set abgelehnt=1, abgelehnt_am = '" + DateTime.Now.ToString() + "' where id=" + approvaldata["id"].ToString(); + db.Exec_SQL(sql); + + // treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode); + // TreeNodeAdv tp = treeViewAdv1.SelectedNode.Parent; + // treeViewAdv1.SelectedNode.Parent.Nodes.Remove(treeViewAdv1.SelectedNode); + if (approvaldata["Bewilligungstyp"].ToString() == "2") + { + db.Exec_SQL("Update edex_sb_serienbrief set approved=0, approval2=0 where serienbriefnr=" + sb.serienbriefnr.ToString()); + } + else + { + db.Exec_SQL("Update edex_sb_serienbrief set approved=0, approval1=0 where serienbriefnr=" + sb.serienbriefnr.ToString()); + } + //if (tp.Nodes.Count < 1) + //{ + // tp.Parent.Nodes.Remove(tp); + //} + db = null; + Logging.DocLog.Info("Serienbrief geprüft - abgelehnt", "Serienbriefprüfung", sb.serienbriefnr.ToString(), "", ""); + Broadcaster().Broadcast("Serienbrief", new SenderInfo("Removesbfromlist", "Refreshpruefung", serienbriefnr.ToString())); + + } + } + + private void sfdatagridsbload_DrawCell(object sender, Syncfusion.WinForms.DataGrid.Events.DrawCellEventArgs e) + { + if (e.Column.MappingName == "S") + { + try + { + e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center; + e.Handled = true; + var selectedItem = e.DataRow; + var dataRow = (e.DataRow.RowData as DataRowView).Row; + + if (Convert.ToInt32(dataRow["S"]) == 0) + { + e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_ToApprove_24x24_32, e.Bounds.X + 20, e.Bounds.Y); + } + if (Convert.ToInt32(dataRow["S"]) == 1) + { + e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y); + } + if (Convert.ToInt32(dataRow["S"]) == 2) + { + e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X + 20, e.Bounds.Y); + } + Pen borderPen = new Pen(Color.LightGray); + e.Graphics.DrawLine(borderPen, e.Bounds.Right, e.Bounds.Top, e.Bounds.Right, e.Bounds.Bottom); + e.Graphics.DrawLine(borderPen, e.Bounds.Left, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom); + return; + + } + catch { } + e.Handled = false; + } + + } } } diff --git a/Client/UIControls/Serienbrief.resx b/Client/UIControls/Serienbrief.resx new file mode 100644 index 00000000..d253f8ae --- /dev/null +++ b/Client/UIControls/Serienbrief.resx @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 156, 17 + + + 321, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII= + + + + 17, 17 + + \ No newline at end of file diff --git a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs index 568287c0..5acb577f 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs @@ -607,7 +607,7 @@ // DateDokumentDatum // this.DateDokumentDatum.DateTimeIcon = null; - this.DateDokumentDatum.Location = new System.Drawing.Point(151, 44); + this.DateDokumentDatum.Location = new System.Drawing.Point(151, 43); this.DateDokumentDatum.Name = "DateDokumentDatum"; this.DateDokumentDatum.Size = new System.Drawing.Size(107, 21); this.DateDokumentDatum.TabIndex = 3; diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs index d2584a16..fe701c36 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.cs @@ -68,6 +68,8 @@ namespace OnDoc.UIControls public bool FillOffice = false; public string CompatibilityMode = ""; + public string dokumentid { get; set; } = ""; + public UCAllgemeineDokumentParam() { @@ -263,7 +265,7 @@ namespace OnDoc.UIControls { } - Logging.Logging.Debug("Profilnr", "OnDOc", profilnr.ToString()); + Logging.Logging.Debug("Profilnr", "OnDoc", profilnr.ToString()); if (profilnr != 0) { @@ -290,8 +292,26 @@ namespace OnDoc.UIControls } } + + if (dokumentid == "") + { + Get_DokWertList(ref db, "", 1); + } + db = null; + + Refresh_Team(); + try + { + this.cbboxteam.SelectedIndex = 0; + } + catch { } + + } + + private void Get_DokWertList(ref DB db, string dokumentid, int createnew) + { System.Data.DataTable dokwertlist = new System.Data.DataTable(); - dokwertlist = db.Get_DokumentWertList("", dokumenttypnr); + dokwertlist = db.Get_DokumentWertList(dokumentid, dokumenttypnr, createnew); if (EDK_Data.toexecute == true) { //db.Get_Tabledata("Select mitarbeiternr from mitarbeiter where tgnummer='" + EDK_Data.verantwortlich + "'", false, true); @@ -307,7 +327,7 @@ namespace OnDoc.UIControls } dokwertlist.AcceptChanges(); - + } gridDokwertlist.DataSource = dokwertlist; for (int i = 3; i < gridDokwertlist.Columns.Count; i++) @@ -322,17 +342,10 @@ namespace OnDoc.UIControls gridDokwertlist.Columns.Add(new GridImageColumn() { MappingName = "S", ImageLayout = ImageLayout.Center }); gridDokwertlist.Columns["S"].Width = 25; gridDokwertlist.QueryImageCellStyle += gridDokwertlist_QueryImageCellStyle; - gridDokwertlist.Columns["userinterface"].FilterPredicates.Add(new Syncfusion.Data.FilterPredicate() { FilterType=Syncfusion.Data.FilterType.Equals,FilterValue=true }); + gridDokwertlist.Columns["userinterface"].FilterPredicates.Add(new Syncfusion.Data.FilterPredicate() { FilterType = Syncfusion.Data.FilterType.Equals, FilterValue = true }); gridDokwertlist.View.RecordPropertyChanged += OnRecordPropertyChanged; - db = null; - Refresh_Team(); - try - { - this.cbboxteam.SelectedIndex = 0; - } - catch { } } private void OnRecordPropertyChanged(object sender, PropertyChangedEventArgs e) @@ -626,6 +639,8 @@ namespace OnDoc.UIControls if (rbasPDFarchivieren.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDFArchivieren; } docgendata.dokumentwerte = gridDokwertlist.DataSource as DataTable; + + } @@ -691,6 +706,42 @@ namespace OnDoc.UIControls dokdata.anrede = docgendata.anrede; dokdata.barcode_zusatz = barcode_zusatz; + + if (cbfaksimile.Checked) + { + dokdata.approval1 = 0; + dokdata.approval2 = 0; + + try + { + if (cbboxunterschriftlinks.Text == "") { dokdata.approval1 = 1; } + else + { + if (Convert.ToInt32(dokdata.Verantwortlich) == Convert.ToInt32(this.cbboxunterschriftlinks.SelectedValue.ToString())) + { + dokdata.approval1 = 1; + } + } + } + catch { } + try + { + if (cbboxunterschriftrechts.Text == "") { dokdata.approval2 = 1; } + else + { + if (Convert.ToInt32(dokdata.Verantwortlich) == Convert.ToInt32(this.cbboxunterschriftrechts.SelectedValue.ToString())) + { + dokdata.approval2 = 1; + } + } + } + catch { } + if (dokdata.approval1 == 1 && dokdata.approval2 == 1 ) + { + dokdata.approved = 1; + } + } + } private void sfButton1_Click(object sender, EventArgs e) { @@ -936,7 +987,6 @@ namespace OnDoc.UIControls { } - private void gridDokwertlist_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) { @@ -958,6 +1008,44 @@ namespace OnDoc.UIControls catch { } } + public void load_doc() + { + DB db = new DB(AppParams.connectionstring); + db.Get_Tabledata("Select * from dokument where dokumentid='" + this.dokumentid+"'", false, true); + System.Data.DataRow dr = db.dsdaten.Tables[0].Rows[0]; + this.partnernr = Convert.ToInt32(dr["nrpar00"]); + this.dokumenttypnr = Convert.ToInt32(dr["dokumenttypnr"]); + Refresh_Details(); + + this.cbboxpostzustellung.SelectedValue = Convert.ToInt32(dr["postzustellung"]); + this.cbboxunterschriftlinks.SelectedValue= Convert.ToInt32(dr["unterschriftlinks"]); + this.cbboxunterschriftrechts.SelectedValue = Convert.ToInt32(dr["unterschriftrechts"]); + if (Convert.ToInt32(dr["zustaendig_kube"]) > 0) + { + rbzustaendigkube.Checked = true; + rbzustaendigmitarbeiter.Checked = false; + cbboxzustaendigkube.SelectedValue = Convert.ToInt32(dr["zustaendig_kube"]); + } else + { + rbzustaendigmitarbeiter.Checked = true; + rbzustaendigkube.Checked = false; + cbboxzustaendigmitarbeiter.SelectedValue = Convert.ToInt32(dr["zustaendiger"]); + } + this.txtbezeichnung.Text = dr["bezeichnung"].ToString(); + this.cbboxverantwortlich.SelectedValue = Convert.ToInt32(dr["verantwortlich"]); + this.txtanrede.Text = dr["anredezustelladresse"].ToString(); + this.cbboxpostzustellung.SelectedValue = Convert.ToInt32(dr["postzustellung"]); + this.DateDokumentDatum.Value = Convert.ToDateTime(dr["erstellungsdatum"]); + this.DateTerminText.Text = Convert.ToDateTime(dr["termin"]).ToString(); + if (dr["zustelladresse"].ToString() != "") this.txtPartnerZusteller.Text = dr["zustelladresse"].ToString(); + + Get_DokWertList(ref db, dokumentid, 0); + + + db = null; + + } + } } diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index ae5f182d..78eda5e7 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 4eb9997f..b7365f02 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 6a5785f6..414c81c0 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 2af6c559..d17e0e03 100644 Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ diff --git a/Client/bin/Debug/Model.dll b/Client/bin/Debug/Model.dll index 35cf0bd7..69e9105c 100644 Binary files a/Client/bin/Debug/Model.dll and b/Client/bin/Debug/Model.dll differ diff --git a/Client/bin/Debug/Model.pdb b/Client/bin/Debug/Model.pdb index 0ab52c16..c6224b79 100644 Binary files a/Client/bin/Debug/Model.pdb and b/Client/bin/Debug/Model.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index a8b6c304..b53de907 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 1102a929..37f7b58b 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/VBFileManagement.dll b/Client/bin/Debug/VBFileManagement.dll index a3e8b1e0..f32431bd 100644 Binary files a/Client/bin/Debug/VBFileManagement.dll and b/Client/bin/Debug/VBFileManagement.dll differ diff --git a/Client/bin/Debug/VBFileManagement.pdb b/Client/bin/Debug/VBFileManagement.pdb index 3f7ac119..5d98f371 100644 Binary files a/Client/bin/Debug/VBFileManagement.pdb and b/Client/bin/Debug/VBFileManagement.pdb differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index e24ef335..270149d0 100644 Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index d48fcafa..e6f5088c 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache index 78398ae0..9cfd5fb4 100644 --- a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache +++ b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ee05635a2fc158c8632aa1f66864359a3e91ff6455341d3d86f10936b410e21 +044b9e5f627fc4e3dfab276a583f01f0a9a3b1c10a4b677364a16436a7b8d601 diff --git a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt index 8ad86899..b3b2e74d 100644 --- a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt +++ b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt @@ -130,7 +130,6 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmBewilligung.r E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmDocPreview.resources E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.DokTypSelect.resources E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.Dokumentpaket.resources -E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.FrmDokumenterstellung.resources E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmNote.resources E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmToApproval.resources E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.SerienbriefBearbeitung.resources @@ -368,3 +367,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\MW6.SDK.dll E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.AdminDokTypGenerierung.resources E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.SerienbriefTemplateLoad.resources E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmDokumentpaketNeugenerierung.resources +E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmSerienbrief.resources diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache index 10a43629..318dbd01 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 5a13ae12..705166d8 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.Diverses.SaveAnsicht.resources b/Client/obj/Debug/OnDoc.Diverses.SaveAnsicht.resources index 6c05a977..fe64b5d1 100644 Binary files a/Client/obj/Debug/OnDoc.Diverses.SaveAnsicht.resources and b/Client/obj/Debug/OnDoc.Diverses.SaveAnsicht.resources differ diff --git a/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources b/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources index 6ffd2473..88e48ab7 100644 Binary files a/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources and b/Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources differ diff --git a/Client/obj/Debug/OnDoc.DocMgmt.FrmDokumenterstellung.resources b/Client/obj/Debug/OnDoc.DocMgmt.FrmDokumenterstellung.resources deleted file mode 100644 index dbfcf48e..00000000 Binary files a/Client/obj/Debug/OnDoc.DocMgmt.FrmDokumenterstellung.resources and /dev/null differ diff --git a/Client/obj/Debug/OnDoc.DocMgmt.frmSerienbrief.resources b/Client/obj/Debug/OnDoc.DocMgmt.frmSerienbrief.resources new file mode 100644 index 00000000..cc34211a Binary files /dev/null and b/Client/obj/Debug/OnDoc.DocMgmt.frmSerienbrief.resources differ diff --git a/Client/obj/Debug/OnDoc.UIControls.Partnersuche.resources b/Client/obj/Debug/OnDoc.UIControls.Partnersuche.resources index 039f57aa..c714fc4d 100644 Binary files a/Client/obj/Debug/OnDoc.UIControls.Partnersuche.resources and b/Client/obj/Debug/OnDoc.UIControls.Partnersuche.resources differ diff --git a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources index e10ecfbb..c1986495 100644 Binary files a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources and b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index a8b6c304..b53de907 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 1102a929..37f7b58b 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 e24ef335..270149d0 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs b/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs index c0b51fc5..b63b2525 100644 --- a/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs +++ b/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs @@ -57,7 +57,7 @@ namespace DOCGEN.Generator this.Office_Fill_DocIO= Office_Fill_DocIO; } - public clsdok Generate_Doc_EDOKA(string dokumentid, ref clsDocData docdata, bool useoffice = false, int OfficeSleep=0, bool vbfilemanagement = false) + public clsdok Generate_Doc_EDOKA(string dokumentid, ref clsDocData docdata, bool useoffice = false, int OfficeSleep=0, bool vbfilemanagement = false, bool editdoc=false) { useoffice = docdata.Erstellung_in_Office; try @@ -72,8 +72,15 @@ namespace DOCGEN.Generator string Apptype = ""; string Extension = ""; Logging.Logging.Debug("Generate_Doc_EDOKA", "Get_Vorlage", dokumentid); + if (!editdoc) + { + dt = db.Get_Vorlage_By_DokumentID(dokumentid, useoffice, tempdir,false); + } + else + { + dt = db.Get_Vorlage_By_DokumentID(dokumentid, useoffice, tempdir, true); - dt = db.Get_Vorlage_By_DokumentID(dokumentid,useoffice, tempdir); + } db.dsdaten.Tables.Clear(); dt2 = db.Get_ApplicationType_from_Vorlage(Convert.ToInt32(dt.Rows[0]["nr"].ToString())); Apptype = dt2.Rows[0][0].ToString(); diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index ae5f182d..78eda5e7 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 4eb9997f..b7365f02 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 6a5785f6..414c81c0 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 2af6c559..d17e0e03 100644 Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ diff --git a/DOCGEN/bin/Debug/Model.dll b/DOCGEN/bin/Debug/Model.dll index 35cf0bd7..69e9105c 100644 Binary files a/DOCGEN/bin/Debug/Model.dll and b/DOCGEN/bin/Debug/Model.dll differ diff --git a/DOCGEN/bin/Debug/Model.pdb b/DOCGEN/bin/Debug/Model.pdb index 0ab52c16..c6224b79 100644 Binary files a/DOCGEN/bin/Debug/Model.pdb and b/DOCGEN/bin/Debug/Model.pdb differ diff --git a/DOCGEN/bin/Debug/VBFileManagement.dll b/DOCGEN/bin/Debug/VBFileManagement.dll index a3e8b1e0..f32431bd 100644 Binary files a/DOCGEN/bin/Debug/VBFileManagement.dll and b/DOCGEN/bin/Debug/VBFileManagement.dll differ diff --git a/DOCGEN/bin/Debug/VBFileManagement.pdb b/DOCGEN/bin/Debug/VBFileManagement.pdb index 3f7ac119..5d98f371 100644 Binary files a/DOCGEN/bin/Debug/VBFileManagement.pdb and b/DOCGEN/bin/Debug/VBFileManagement.pdb differ diff --git a/DOCGEN/clsDocGen.cs b/DOCGEN/clsDocGen.cs index 56f218f9..68fbd5e9 100644 --- a/DOCGEN/clsDocGen.cs +++ b/DOCGEN/clsDocGen.cs @@ -62,12 +62,12 @@ namespace DOCGEN this.resturi = RestURI; this.apikey = ApiKey; } - public string GenDocID(clsDocData docdata) + public string GenDocID(clsDocData docdata, bool editdoc, string dokumentid) { this.DocData = docdata; if (DocData.UseEDOKA_Values.ToUpper() == "TRUE") { - DokumentID=db.Create_EDOKA_Doc(this.DocData); + DokumentID=db.Create_EDOKA_Doc(this.DocData,editdoc,dokumentid); Logging.DocLog.Info("Dokument erstellt", "DocGen", DokumentID, docdata.PartnerNr.ToString(), docdata.Ersteller.ToString()); } else { DokumentID = ""; }; diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index ae5f182d..78eda5e7 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 4eb9997f..b7365f02 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 125cc31c..ce4da169 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 6a5785f6..414c81c0 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 2af6c559..d17e0e03 100644 Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ diff --git a/Database/bin/Debug/Model.dll b/Database/bin/Debug/Model.dll index 35cf0bd7..69e9105c 100644 Binary files a/Database/bin/Debug/Model.dll and b/Database/bin/Debug/Model.dll differ diff --git a/Database/bin/Debug/Model.pdb b/Database/bin/Debug/Model.pdb index 0ab52c16..c6224b79 100644 Binary files a/Database/bin/Debug/Model.pdb and b/Database/bin/Debug/Model.pdb differ diff --git a/Database/bin/Debug/VBFileManagement.dll b/Database/bin/Debug/VBFileManagement.dll index a3e8b1e0..f32431bd 100644 Binary files a/Database/bin/Debug/VBFileManagement.dll and b/Database/bin/Debug/VBFileManagement.dll differ diff --git a/Database/bin/Debug/VBFileManagement.pdb b/Database/bin/Debug/VBFileManagement.pdb index 3f7ac119..5d98f371 100644 Binary files a/Database/bin/Debug/VBFileManagement.pdb and b/Database/bin/Debug/VBFileManagement.pdb differ diff --git a/Database/db.cs b/Database/db.cs index f81188d7..25a70ed4 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -17,6 +17,7 @@ using System.Runtime.CompilerServices; using NLog.LayoutRenderers; using Helper; using System.Transactions; +using System.Net.NetworkInformation; @@ -196,7 +197,7 @@ namespace Database dbkey = "0" + dbkey; } skey = skey + dbkey; - s = Helper.DivFnkt.modulo10(skey.Substring(skey.Length-15,15)).ToString(); + s = Helper.DivFnkt.modulo10(skey.Substring(skey.Length - 15, 15)).ToString(); skey = skey + s; return skey; } @@ -268,24 +269,46 @@ namespace Database } } - public DataTable Get_Vorlage_By_DokumentID(string dokumentid, bool useoffice = false, string tempdir="") + public DataTable Get_Vorlage_By_DokumentID(string dokumentid, bool useoffice = false, string tempdir = "", bool editdoc=false) { - string sql = "Select dbo.BinaryToBase64(vorlage) as Data, dbo.office_vorlage.office_vorlagenr as nr from dbo.Office_Vorlage_Datei INNER JOIN "; - sql = sql + " dbo.office_vorlage ON dbo.Office_Vorlage_Datei.office_vorlage_dateinr = dbo.office_vorlage.office_vorlagenr INNER JOIN "; - sql = sql + "dbo.dokumenttyp INNER JOIN "; - sql = sql + "dbo.dokument ON dbo.dokumenttyp.dokumenttypnr = dbo.dokument.dokumenttypnr ON dbo.office_vorlage.office_vorlagenr = dbo.dokumenttyp.office_vorlagenr "; - sql = sql + "WHERE dbo.dokument.dokumentid = '" + dokumentid + "' "; + string sql = ""; + if (!editdoc) + { + sql = "Select dbo.BinaryToBase64(vorlage) as Data, dbo.office_vorlage.office_vorlagenr as nr from dbo.Office_Vorlage_Datei INNER JOIN "; + sql = sql + " dbo.office_vorlage ON dbo.Office_Vorlage_Datei.office_vorlage_dateinr = dbo.office_vorlage.office_vorlagenr INNER JOIN "; + sql = sql + "dbo.dokumenttyp INNER JOIN "; + sql = sql + "dbo.dokument ON dbo.dokumenttyp.dokumenttypnr = dbo.dokument.dokumenttypnr ON dbo.office_vorlage.office_vorlagenr = dbo.dokumenttyp.office_vorlagenr "; + sql = sql + "WHERE dbo.dokument.dokumentid = '" + dokumentid + "' "; + } + else + { + sql = "SELECT dbo.BinaryToBase64(dbo.Doks.Dokument) AS Data, dbo.office_vorlage.office_vorlagenr AS nr "; + sql = sql + " FROM dbo.Office_Vorlage_Datei INNER JOIN "; + sql = sql + " dbo.office_vorlage ON dbo.Office_Vorlage_Datei.office_vorlage_dateinr = dbo.office_vorlage.office_vorlagenr INNER JOIN"; + sql = sql + " dbo.dokumenttyp INNER JOIN "; + sql = sql + " dbo.dokument ON dbo.dokumenttyp.dokumenttypnr = dbo.dokument.dokumenttypnr ON dbo.office_vorlage.office_vorlagenr = dbo.dokumenttyp.office_vorlagenr INNER JOIN "; + sql = sql + " dbo.Doks ON dbo.dokument.dokumentid = dbo.Doks.DokumentID "; + sql = sql + " WHERE(dbo.dokument.dokumentid = '" + dokumentid + "')"; + } + Get_Tabledata(sql, false, true); if (!useoffice) { return dsdaten.Tables[0]; } else { VBFileManagement.VBFileManagement vm = new VBFileManagement.VBFileManagement(); - vm.Get_From_DB(Convert.ToInt32(dsdaten.Tables[0].Rows[0][1]), tempdir + dokumentid, connectionstring, false); + if (!editdoc) + { + vm.Get_From_DB(Convert.ToInt32(dsdaten.Tables[0].Rows[0][1]), tempdir + dokumentid, connectionstring, false); + }else + { + vm.Get_Dok_From_DB(dokumentid, tempdir + dokumentid, connectionstring); + } + clsFileHelper fh = new clsFileHelper(); - dsdaten.Tables[0].Rows[0][0] = fh.Base64FromFile(tempdir+ dokumentid); + dsdaten.Tables[0].Rows[0][0] = fh.Base64FromFile(tempdir + dokumentid); fh = null; - vm=null; + vm = null; System.IO.File.Delete(tempdir + dokumentid); return dsdaten.Tables[0]; @@ -338,18 +361,32 @@ namespace Database #region "EDOKA_Datenbank" - public string Create_EDOKA_Doc(clsDocData DocData) + public string Create_EDOKA_Doc(clsDocData DocData, bool editdoc, string dokumentid) { DB db = new DB(connectionstring); - string dokumentid = ""; - dokumentid = db.get_dbkey("Dokument"); + + clsDokument dok = new clsDokument(); clsDokumenttyp doktyp = new clsDokumenttyp(); - clsConnectionProvider edoka_conn = new clsConnectionProvider(); edoka_conn.sConnectionString = this.connectionstring; + if (dokumentid == "") + { + dokumentid = db.get_dbkey("Dokument"); + } + else + { + dok.sDokumentid= dokumentid; + dok.cpMainConnectionProvider=edoka_conn; + dok.SelectOne(); + } + + + + + doktyp.cpMainConnectionProvider = edoka_conn; doktyp.iDokumenttypnr = Convert.ToInt32(DocData.DokumenttypNr); @@ -405,7 +442,7 @@ namespace Database dok.iBearbeitung_nach_abschluss = doktyp.iTage_mutation; dok.iBearbeitungszeit_in_minuten = doktyp.iDbearbeitungszeit; dok.iMonierung_in_tagen = doktyp.iAnzahl_tage; - // dok.sBezeichnung = doktyp.sBezeichnung; + // dok.sBezeichnung = doktyp.sBezeichnung; dok.iNrpar00 = Convert.ToInt32(DocData.PartnerNr); dok.iMutierer = dok.iErsteller; dok.iMitarbeiternr = dok.iErsteller; @@ -456,21 +493,31 @@ namespace Database dok.sDokumentname = dokumentname; dok.cpMainConnectionProvider = edoka_conn; - + edoka_conn.OpenConnection(); - dok.Insert(); + if (!editdoc) + { + dok.Insert(); + } + else + { + dok.Update(); + } edoka_conn.CloseConnection(true); - COLD_Index_Sichern(1, dokumentid); - if (dok.bZu_retournieren == true) + if (!editdoc) { - COLD_Index_Sichern(2, dokumentid); + COLD_Index_Sichern(1, dokumentid); + if (dok.bZu_retournieren == true) + { + COLD_Index_Sichern(2, dokumentid); + } + Status_Erstellen(dokumentid, false); + dok.iStatusnr = Convert.ToInt32(get_current_Status(dokumentid).ToString()); + edoka_conn.OpenConnection(); + dok.Update(); + edoka_conn.CloseConnection(true); } - Status_Erstellen(dokumentid, false); - dok.iStatusnr = Convert.ToInt32(get_current_Status(dokumentid).ToString()); - edoka_conn.OpenConnection(); - dok.Update(); - edoka_conn.CloseConnection(true); //DokumentInfoWert foreach (DataRow dr in DocData.dokumentwerte.Rows) { @@ -493,35 +540,38 @@ namespace Database db.add_parameter("@indextyp", "1"); db.Get_Tabledata("SP_Dokument_Cold_Index", true, false); } - db.clear_parameter(); - db.add_parameter("@dokumentid", dokumentid); - db.add_parameter("@coldfeldnr", dr["cold_indexfeld"].ToString()); - db.add_parameter("@value", dr["feldwert"].ToString()); - db.Get_Tabledata("SP_Dokument_Cold_Index_Update", true, false); + else + { + db.clear_parameter(); + db.add_parameter("@dokumentid", dokumentid); + db.add_parameter("@coldfeldnr", dr["cold_indexfeld"].ToString()); + db.add_parameter("@value", dr["feldwert"].ToString()); + db.Get_Tabledata("SP_Dokument_Cold_Index_Update", true, false); + } } } db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr=" + dok.iDokumenttypnr.ToString(), false, true); - int toapprove = 0; - int approved = 0; - int approved1 = 0; - int approved2 = 0; - if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Unterschrift_Pruefung"]) == true || DocData.As_Faksimile=="True") + int toapprove = DocData.toapprove; + int approved = DocData.approved; + int approved1 = DocData.approval1; + int approved2 = DocData.approval2; + if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Unterschrift_Pruefung"]) == true || DocData.As_Faksimile == "True") { toapprove = 1; - if (dok.iUnterschriftlinks == dok.iErsteller) { approved1 = 1; } - if (dok.iUnterschriftrechts == dok.iErsteller) { approved2 = 1; } + //if (dok.iUnterschriftlinks == dok.iErsteller) { approved1 = 1; } + //if (dok.iUnterschriftrechts == dok.iErsteller) { approved2 = 1; } } int unterschriftlinks = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Unterschrift_links"]); int unterschriftrechts = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Unterschrift_rechts"]); int bearbeitung_zwingend = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bearbeitung_zwingend"]); int as_faksimile = 0; - if (DocData.As_Faksimile=="True") { as_faksimile = 1; } + if (DocData.As_Faksimile == "True") { as_faksimile = 1; } //if (bearbeitung_zwingend == 4) { bearbeitung_zwingend = 1; } else { bearbeitung_zwingend = 0; } - if (unterschriftlinks == 1 && unterschriftrechts == 0 && approved1 == 1) { approved = 1; } + //if (unterschriftlinks == 1 && unterschriftrechts == 0 && approved1 == 1) { approved = 1; } - db.Exec_SQL("Update dokument set faksimile="+as_faksimile.ToString()+", bearbeitung_zwingend = " + bearbeitung_zwingend.ToString()+", toapprove=" + toapprove.ToString() + ", approved=" + approved.ToString() + ", approval1=" + approved1.ToString() + ", approval2=" + approved2.ToString() + " where dokumentid = '" + dokumentid + "'"); + db.Exec_SQL("Update dokument set faksimile=" + as_faksimile.ToString() + ", bearbeitung_zwingend = " + bearbeitung_zwingend.ToString() + ", toapprove=" + toapprove.ToString() + ", approved=" + approved.ToString() + ", approval1=" + approved1.ToString() + ", approval2=" + approved2.ToString() + " where dokumentid = '" + dokumentid + "'"); return dokumentid; } @@ -835,7 +885,8 @@ namespace Database SqlConnection Connection = new SqlConnection(); string sql = ""; if (serienbriefnr == 0) { sql = "select * from doks where dokumentid='" + DokumentID + "'"; } - if (serienbriefnr !=0) { + if (serienbriefnr != 0) + { sql = "select top 1 * from edex_sb_vorlage where serienbriefnr=" + serienbriefnr.ToString(); DokumentID = serienbriefnr.ToString(); } @@ -983,7 +1034,7 @@ namespace Database return true; } - public DataTable Get_DokumentWertList(string dokumentid, int dokumenttypnr) + public DataTable Get_DokumentWertList(string dokumentid, int dokumenttypnr, int CreateNew) { var scmCmdToExecute = new SqlCommand(); @@ -998,7 +1049,7 @@ namespace Database { scmCmdToExecute.Parameters.Add(new SqlParameter("@dokumentid", SqlDbType.VarChar, 22, ParameterDirection.Input, true, 10, 0, "", DataRowVersion.Proposed, dokumentid)); scmCmdToExecute.Parameters.Add(new SqlParameter("@dokumenttypnr", SqlDbType.Int, 4, ParameterDirection.Input, true, 10, 0, "", DataRowVersion.Proposed, dokumenttypnr)); - scmCmdToExecute.Parameters.Add(new SqlParameter("@CreateNew", SqlDbType.Int, 4, ParameterDirection.Input, true, 10, 0, "", DataRowVersion.Proposed, 1)); + scmCmdToExecute.Parameters.Add(new SqlParameter("@CreateNew", SqlDbType.Int, 4, ParameterDirection.Input, true, 10, 0, "", DataRowVersion.Proposed, CreateNew)); sdaAdapter.Fill(dtToReturn); // Release 4.0 KC 01.06.2007 XMl Daten berücksichtigen (DokumentBearbeitung.edka) @@ -1276,9 +1327,16 @@ namespace Database sb.dsempfaenger.ReadXml(fn); System.IO.File.Delete(fn); } - Get_Tabledata("Select isnull(faktura,0), isnull(office_vorlagenr,0) from edex_sb_serienbrief where serienbriefnr=" + sb.serienbriefnr.ToString(), false, true); + Get_Tabledata("Select isnull(faktura,0), isnull(office_vorlagenr,0), isnull(toapprove,0), isnull(approved,0), isnull(approval1,0), isnull(approval2,0), isnull(faksimile,0), isnull(ohneunterschrift,0) from edex_sb_serienbrief where serienbriefnr=" + sb.serienbriefnr.ToString(), false, true); sb.ppfaktura = Convert.ToInt32(dsdaten.Tables[0].Rows[0][0]); sb.officevorlagenr = Convert.ToInt32(dsdaten.Tables[0].Rows[0][1]); + sb.toapproval = Convert.ToInt32(dsdaten.Tables[0].Rows[0][2]); + sb.approved = Convert.ToInt32(dsdaten.Tables[0].Rows[0][3]); + sb.approval1 = Convert.ToInt32(dsdaten.Tables[0].Rows[0][4]); + sb.approval2 = Convert.ToInt32(dsdaten.Tables[0].Rows[0][5]); + sb.faksimile = Convert.ToInt32(dsdaten.Tables[0].Rows[0][6]); + sb.ohneunterschrift = Convert.ToInt32(dsdaten.Tables[0].Rows[0][7]); + return sb; } public int Save_Serienbrief(serienbrief sb, string temppath) @@ -1322,7 +1380,7 @@ namespace Database dbsb.iBestaetigt = sb.bestaetigt; dbsb.iAusgeloest = sb.ausgeloest; dbsb.iBldossier = sb.vertrag; - + edoka_conn.OpenConnection(); if (sb.serienbriefnr == 0) { @@ -1337,7 +1395,9 @@ namespace Database save_empfaengerdata(sb.serienbriefnr, temppath, sb.dsempfaenger); edoka_conn.CloseConnection(true); - Exec_SQL("Update edex_sb_serienbrief set faktura=" + sb.ppfaktura.ToString() + ", office_vorlagenr="+sb.officevorlagenr.ToString()+" where serienbriefnr = " + sb.serienbriefnr.ToString()); + Exec_SQL("Update edex_sb_serienbrief set faktura=" + sb.ppfaktura.ToString() + ", office_vorlagenr=" + sb.officevorlagenr.ToString() + " where serienbriefnr = " + sb.serienbriefnr.ToString()); + Exec_SQL("update edex_sb_serienbrief set toapprove=" + sb.toapproval.ToString() + ", approved=" + sb.approved.ToString() + ", approval1=" + sb.approval1.ToString() + ", approval2=" + sb.approval2.ToString() + " where serienbriefnr=" + sb.serienbriefnr.ToString()); + Exec_SQL("update edex_sb_serienbrief set faksimile=" + sb.faksimile.ToString() + ", ohneunterschrift=" + sb.ohneunterschrift.ToString() + " where serienbriefnr=" + sb.serienbriefnr.ToString()); return sb.serienbriefnr; } @@ -1363,13 +1423,13 @@ namespace Database { try { - + string filename = temppath + serienbriefnr.ToString() + ".xml"; //filename = temppath + "sbbase1.xml"; //serienbriefnr = -1; empf.WriteXml(filename); - + SqlConnection Connection = new SqlConnection(); SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_empfaenger where serienbriefnr=" + serienbriefnr.ToString() + "", Connection); SqlCommandBuilder cb = new SqlCommandBuilder(DA); @@ -1425,7 +1485,7 @@ namespace Database public string save_serienbrief_datei(int serienbriefnr, int eintragnr, string filename, string dokumentid) { SqlConnection Connection = new SqlConnection(); - SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_serienbrief_dokument where dokumentid='"+dokumentid+"'", Connection); + SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_serienbrief_dokument where dokumentid='" + dokumentid + "'", Connection); //SqlDataAdapter DA = new SqlDataAdapter("select top 1 * from edex_sb_serienbrief_dokument where inteintragnr = " + eintragnr.ToString() + " and serienbriefnr = " + serienbriefnr.ToString(), Connection); SqlCommandBuilder cb = new SqlCommandBuilder(DA); DataSet ds = new DataSet(); @@ -1624,7 +1684,7 @@ namespace Database tdt.Rows.Add(tdr); } - i=i+1; ; + i = i + 1; ; } //foreach (var DR in dv) @@ -1700,7 +1760,7 @@ namespace Database s = "Create Table DBO.EDKB09_" + sb.serienbriefnr.ToString() + "( NRPAR00 varchar(11),"; var loopTo = dt.Columns.Count - 1; for (i = 0; i <= loopTo; i++) - s = s + "["+dt.Columns[i].ColumnName + "] varchar(255),"; + s = s + "[" + dt.Columns[i].ColumnName + "] varchar(255),"; s = s.Substring(0, s.Length - 1); s = s + ""; s = s + " " + ",CONSTRAINT [PK_EDKB09_" + sb.serienbriefnr.ToString() + "] PRIMARY KEY CLUSTERED ([IntEintragnr] ASC)) ON[DEFAULT]"; @@ -1887,7 +1947,7 @@ namespace Database } - public bool save_edkdata(string filename,string tgnummer) + public bool save_edkdata(string filename, string tgnummer) { try { @@ -1997,7 +2057,7 @@ namespace Database clear_parameter(); add_parameter("UrsprungID", dokumentid); add_parameter("NewDokID", newdokumentid); - + clsDokument dok = new clsDokument(); clsConnectionProvider edoka_conn = new clsConnectionProvider(); edoka_conn.sConnectionString = this.connectionstring; @@ -2005,7 +2065,7 @@ namespace Database edoka_conn.OpenConnection(); dok.sDokumentid = dokumentid; dok.SelectOne(); - dok.sDokumentid=newdokumentid; + dok.sDokumentid = newdokumentid; dok.daErstelltam = DateTime.Now; dok.daMutiertam = DateTime.Now; dok.iErsteller = manr; diff --git a/Database/obj/Debug/Database.csproj.AssemblyReference.cache b/Database/obj/Debug/Database.csproj.AssemblyReference.cache index 04682b98..70fa15df 100644 Binary files a/Database/obj/Debug/Database.csproj.AssemblyReference.cache and b/Database/obj/Debug/Database.csproj.AssemblyReference.cache differ diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll index 6a5785f6..414c81c0 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 2af6c559..d17e0e03 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache index b52157c6..cddc0683 100644 Binary files a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache and b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache differ diff --git a/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache b/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache index a78b6ab1..2ab3276b 100644 Binary files a/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache and b/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache differ diff --git a/Images/GIF/Attach1.gif b/Images/GIF/Attach1.gif new file mode 100644 index 00000000..25494415 Binary files /dev/null and b/Images/GIF/Attach1.gif differ diff --git a/Images/Icons/Icons/Blue/Images/UpDown_16x16-32.png b/Images/Icons/Icons/Blue/Images/UpDown_16x16-32.png new file mode 100644 index 00000000..61b06c9d Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/UpDown_16x16-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/UpDown_24x24-32.png b/Images/Icons/Icons/Blue/Images/UpDown_24x24-32.png new file mode 100644 index 00000000..4a187845 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/UpDown_24x24-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/UpDown_256x256-32 (2).png b/Images/Icons/Icons/Blue/Images/UpDown_256x256-32 (2).png new file mode 100644 index 00000000..e542dc66 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/UpDown_256x256-32 (2).png differ diff --git a/Images/Icons/Icons/Blue/Images/UpDown_256x256-32.png b/Images/Icons/Icons/Blue/Images/UpDown_256x256-32.png new file mode 100644 index 00000000..e542dc66 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/UpDown_256x256-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/UpDown_32x32-32.png b/Images/Icons/Icons/Blue/Images/UpDown_32x32-32.png new file mode 100644 index 00000000..76b32bf0 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/UpDown_32x32-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/UpDown_48x48-32.png b/Images/Icons/Icons/Blue/Images/UpDown_48x48-32.png new file mode 100644 index 00000000..9ce2f123 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/UpDown_48x48-32.png differ diff --git a/Images/Icons/Icons/Blue/UpDown.ico b/Images/Icons/Icons/Blue/UpDown.ico new file mode 100644 index 00000000..57756726 Binary files /dev/null and b/Images/Icons/Icons/Blue/UpDown.ico differ diff --git a/Images/Images/bppersonswitc.png b/Images/Images/bppersonswitc.png new file mode 100644 index 00000000..88486f81 Binary files /dev/null and b/Images/Images/bppersonswitc.png differ diff --git a/Model/bin/Debug/Model.dll b/Model/bin/Debug/Model.dll index 35cf0bd7..69e9105c 100644 Binary files a/Model/bin/Debug/Model.dll and b/Model/bin/Debug/Model.dll differ diff --git a/Model/bin/Debug/Model.pdb b/Model/bin/Debug/Model.pdb index 0ab52c16..c6224b79 100644 Binary files a/Model/bin/Debug/Model.pdb and b/Model/bin/Debug/Model.pdb differ diff --git a/Model/clsDocData.cs b/Model/clsDocData.cs index b659d1a8..dcab78b8 100644 --- a/Model/clsDocData.cs +++ b/Model/clsDocData.cs @@ -63,7 +63,10 @@ namespace Model public string zustelladresse { get; set; } = ""; public string anrede { get; set; } = ""; - + public int toapprove { get; set; } = 0; + public int approved { get; set; } = 0; + public int approval1 { get; set; } = 0; + public int approval2 { get; set; } = 0; public bool Barcode { get; set; } public bool PrintLogo { get; set; } = false; diff --git a/Model/clsSerienbrief.cs b/Model/clsSerienbrief.cs index b9922841..6aa22638 100644 --- a/Model/clsSerienbrief.cs +++ b/Model/clsSerienbrief.cs @@ -68,6 +68,14 @@ namespace Model public string barcode_content { get; set; } = ""; public string barcode_text { get; set; } = ""; + public int toapproval { get; set; } = 0; + public int approved { get; set; } = 0; + public int approval1 { get; set; } = 0; + public int approval2 { get; set; } = 0; + public int faksimile { get; set; } = 0; + public int ohneunterschrift { get; set; } = 0; + + } diff --git a/Model/obj/Debug/Model.dll b/Model/obj/Debug/Model.dll index 35cf0bd7..69e9105c 100644 Binary files a/Model/obj/Debug/Model.dll and b/Model/obj/Debug/Model.dll differ diff --git a/Model/obj/Debug/Model.pdb b/Model/obj/Debug/Model.pdb index 0ab52c16..c6224b79 100644 Binary files a/Model/obj/Debug/Model.pdb and b/Model/obj/Debug/Model.pdb differ diff --git a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache index dfdd80d3..7554495b 100644 Binary files a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache and b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll index 6a5785f6..414c81c0 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 2af6c559..d17e0e03 100644 Binary files a/OnDocOffice/bin/Debug/Database.pdb and b/OnDocOffice/bin/Debug/Database.pdb differ diff --git a/OnDocOffice/bin/Debug/Model.dll b/OnDocOffice/bin/Debug/Model.dll index 35cf0bd7..69e9105c 100644 Binary files a/OnDocOffice/bin/Debug/Model.dll and b/OnDocOffice/bin/Debug/Model.dll differ diff --git a/OnDocOffice/bin/Debug/Model.pdb b/OnDocOffice/bin/Debug/Model.pdb index 0ab52c16..c6224b79 100644 Binary files a/OnDocOffice/bin/Debug/Model.pdb and b/OnDocOffice/bin/Debug/Model.pdb differ diff --git a/OnDocOffice/bin/Debug/VBFileManagement.dll b/OnDocOffice/bin/Debug/VBFileManagement.dll index a3e8b1e0..f32431bd 100644 Binary files a/OnDocOffice/bin/Debug/VBFileManagement.dll and b/OnDocOffice/bin/Debug/VBFileManagement.dll differ diff --git a/OnDocOffice/bin/Debug/VBFileManagement.pdb b/OnDocOffice/bin/Debug/VBFileManagement.pdb index 3f7ac119..5d98f371 100644 Binary files a/OnDocOffice/bin/Debug/VBFileManagement.pdb and b/OnDocOffice/bin/Debug/VBFileManagement.pdb differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index a0a863cd..d6ebbac2 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/VBFileManagement/Class1.vb b/VBFileManagement/Class1.vb index d0912c04..5e6c3ebe 100644 --- a/VBFileManagement/Class1.vb +++ b/VBFileManagement/Class1.vb @@ -96,4 +96,37 @@ Public Class VBFileManagement connection = Nothing End Function + Public Function Get_Dok_From_DB(ByVal sDokumentID As String, ByVal sDokumentName As String, ByVal connectionstring As String) As Boolean + + Dim connection As New SqlConnection() + Dim da As New SqlDataAdapter("Select * From doks where DokumentID='" + sDokumentID + "'", connection) + Dim CB As SqlCommandBuilder = New SqlCommandBuilder(da) + Dim ds As New DataSet() + + Try + 'Connectionstring zur Datenbank + connection.ConnectionString = connectionstring + connection.Open() + da.Fill(ds, "docs") + Dim myRow As DataRow + myRow = ds.Tables(0).Rows(0) + Dim MyData() As Byte + MyData = myRow.Item(1) + Dim K As Long + K = UBound(MyData) + Dim fs As New FileStream(sDokumentName, FileMode.OpenOrCreate, FileAccess.Write) + fs.Write(MyData, 0, K) + fs.Close() + fs = Nothing + Catch ex As Exception + Return False + End Try + CB = Nothing + ds = Nothing + da = Nothing + connection.Close() + connection = Nothing + Return True + End Function + End Class diff --git a/VBFileManagement/bin/Debug/VBFileManagement.dll b/VBFileManagement/bin/Debug/VBFileManagement.dll index a3e8b1e0..f32431bd 100644 Binary files a/VBFileManagement/bin/Debug/VBFileManagement.dll and b/VBFileManagement/bin/Debug/VBFileManagement.dll differ diff --git a/VBFileManagement/bin/Debug/VBFileManagement.pdb b/VBFileManagement/bin/Debug/VBFileManagement.pdb index 3f7ac119..5d98f371 100644 Binary files a/VBFileManagement/bin/Debug/VBFileManagement.pdb and b/VBFileManagement/bin/Debug/VBFileManagement.pdb differ diff --git a/VBFileManagement/obj/Debug/VBFileManagement.dll b/VBFileManagement/obj/Debug/VBFileManagement.dll index a3e8b1e0..f32431bd 100644 Binary files a/VBFileManagement/obj/Debug/VBFileManagement.dll and b/VBFileManagement/obj/Debug/VBFileManagement.dll differ diff --git a/VBFileManagement/obj/Debug/VBFileManagement.pdb b/VBFileManagement/obj/Debug/VBFileManagement.pdb index 3f7ac119..5d98f371 100644 Binary files a/VBFileManagement/obj/Debug/VBFileManagement.pdb and b/VBFileManagement/obj/Debug/VBFileManagement.pdb differ diff --git a/Vorlagen_Viewer/bin/Debug/Database.dll b/Vorlagen_Viewer/bin/Debug/Database.dll index 238059d4..d2585ecc 100644 Binary files a/Vorlagen_Viewer/bin/Debug/Database.dll and b/Vorlagen_Viewer/bin/Debug/Database.dll differ diff --git a/Vorlagen_Viewer/bin/Debug/Database.pdb b/Vorlagen_Viewer/bin/Debug/Database.pdb index 751a5659..eb9e7e5f 100644 Binary files a/Vorlagen_Viewer/bin/Debug/Database.pdb and b/Vorlagen_Viewer/bin/Debug/Database.pdb differ diff --git a/Vorlagen_Viewer/bin/Debug/Model.dll b/Vorlagen_Viewer/bin/Debug/Model.dll index f67700e0..69e9105c 100644 Binary files a/Vorlagen_Viewer/bin/Debug/Model.dll and b/Vorlagen_Viewer/bin/Debug/Model.dll differ diff --git a/Vorlagen_Viewer/bin/Debug/Model.pdb b/Vorlagen_Viewer/bin/Debug/Model.pdb index 5664e729..c6224b79 100644 Binary files a/Vorlagen_Viewer/bin/Debug/Model.pdb and b/Vorlagen_Viewer/bin/Debug/Model.pdb differ diff --git a/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache b/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache index 850e0f73..7d53d449 100644 Binary files a/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache and b/Vorlagen_Viewer/obj/Debug/Vorlagen_Viewer.csproj.AssemblyReference.cache differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/BarcodeLib.dll b/ZZ_BarcpdeFromFont/bin/Debug/BarcodeLib.dll index 10ab9429..f516114b 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/BarcodeLib.dll and b/ZZ_BarcpdeFromFont/bin/Debug/BarcodeLib.dll differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/BarcodeLib.pdb b/ZZ_BarcpdeFromFont/bin/Debug/BarcodeLib.pdb index 8d324c53..9ce038de 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/BarcodeLib.pdb and b/ZZ_BarcpdeFromFont/bin/Debug/BarcodeLib.pdb differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Database.dll b/ZZ_BarcpdeFromFont/bin/Debug/Database.dll index 238059d4..d2585ecc 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Database.dll and b/ZZ_BarcpdeFromFont/bin/Debug/Database.dll differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb b/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb index 751a5659..eb9e7e5f 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb and b/ZZ_BarcpdeFromFont/bin/Debug/Database.pdb differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Model.dll b/ZZ_BarcpdeFromFont/bin/Debug/Model.dll index 35cf0bd7..69e9105c 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Model.dll and b/ZZ_BarcpdeFromFont/bin/Debug/Model.dll differ diff --git a/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb b/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb index 0ab52c16..c6224b79 100644 Binary files a/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb and b/ZZ_BarcpdeFromFont/bin/Debug/Model.pdb differ diff --git a/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache b/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache index 13715636..9835ced6 100644 Binary files a/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache and b/ZZ_BarcpdeFromFont/obj/Debug/ZZ_BarcpdeFromFont.csproj.AssemblyReference.cache differ diff --git a/vbBarcodes/bin/Debug/Database.dll b/vbBarcodes/bin/Debug/Database.dll index 238059d4..d2585ecc 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 751a5659..eb9e7e5f 100644 Binary files a/vbBarcodes/bin/Debug/Database.pdb and b/vbBarcodes/bin/Debug/Database.pdb differ diff --git a/vbBarcodes/bin/Debug/Model.dll b/vbBarcodes/bin/Debug/Model.dll index f67700e0..69e9105c 100644 Binary files a/vbBarcodes/bin/Debug/Model.dll and b/vbBarcodes/bin/Debug/Model.dll differ diff --git a/vbBarcodes/bin/Debug/Model.pdb b/vbBarcodes/bin/Debug/Model.pdb index 5664e729..c6224b79 100644 Binary files a/vbBarcodes/bin/Debug/Model.pdb and b/vbBarcodes/bin/Debug/Model.pdb differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache index 4e0408ec..dcfe4824 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache and b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache differ