diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index 00742519..85d89af5 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 7ddfd298..3f4f2bdf 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 7280b31e..ca7f2ad0 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 18e13af0..966f2720 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 709316af..bf71e439 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 47969700..3536bbbd 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 b433d500..1bcc5967 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 8fbd78e0..8085b9de 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index 5e380ac9..e0999f5d 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -12469,3 +12469,60 @@ done 2025-05-05 09:24:31.7176|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002508829 2025-05-05 09:24:32.3699|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002508829 2025-05-05 09:24:32.3849|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002508829 +2025-05-30 13:57:38.7521|DEBUG|OnDoc| +2025-05-30 13:57:38.7922|DEBUG|OnDoc| +2025-05-30 13:57:38.8183|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-05-30 13:57:38.8183|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-05-30 13:57:38.9035|DEBUG|OnDoc| +2025-05-30 13:57:38.9139|DEBUG|OnDoc| +2025-05-30 13:57:38.9435|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: xmniederkofler +2025-05-30 13:57:38.9435|INFO|OnDoc|Unterschrift-Bezug - nicht vorhanden: xmniederkofler DEMO-Unterschrfit verwendet +2025-05-30 13:57:38.9435|INFO|OnDoc|Unterschrift-Bezug: xmniederkofler +2025-05-30 13:58:05.0811|DEBUG|OnDoc| +2025-05-30 13:58:05.0811|DEBUG|OnDoc| +2025-05-30 13:58:05.1063|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-05-30 13:58:05.1063|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-05-30 13:58:05.1470|DEBUG|OnDoc| +2025-05-30 13:58:05.1470|DEBUG|OnDoc| +2025-05-30 13:58:05.1741|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-05-30 13:58:05.1741|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-05-30 13:58:20.0625|DEBUG|OnDoc|Mailversand: 2 +2025-05-30 13:58:20.0967|DEBUG|OnDoc| +2025-05-30 13:58:20.1078|DEBUG|OnDoc| +2025-05-30 13:58:20.1238|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-05-30 13:58:48.5727|DEBUG|OnDoc|Mailversand: 1 +2025-05-30 13:58:48.5975|DEBUG|OnDoc| +2025-05-30 13:58:48.5995|DEBUG|OnDoc| +2025-05-30 13:58:48.5995|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-05-30 13:59:49.1842|DEBUG|OnDoc|Mailversand: 2 +2025-05-30 13:59:49.2094|DEBUG|OnDoc| +2025-05-30 13:59:49.2094|DEBUG|OnDoc| +2025-05-30 13:59:49.2277|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-05-30 14:53:52.3170|DEBUG|OnDoc|Mailversand: 2 +2025-05-30 14:53:52.3452|DEBUG|OnDoc| +2025-05-30 14:53:52.3502|DEBUG|OnDoc| +2025-05-30 14:53:52.3666|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-05-30 15:03:08.7854|DEBUG|OnDoc|Mailversand: 2 +2025-05-30 15:03:08.8122|DEBUG|OnDoc| +2025-05-30 15:03:08.8122|DEBUG|OnDoc| +2025-05-30 15:03:08.8305|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-05-30 15:03:28.0960|DEBUG|OnDoc|Mailversand: 1 +2025-05-30 15:03:28.1196|DEBUG|OnDoc| +2025-05-30 15:03:28.1196|DEBUG|OnDoc| +2025-05-30 15:03:28.1362|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-05-30 15:04:11.1477|DEBUG|OnDoc| +2025-05-30 15:04:11.1477|DEBUG|OnDoc| +2025-05-30 15:04:11.1733|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234 +2025-05-30 15:04:11.1733|INFO|OnDoc|Unterschrift-Bezug: 1234 +2025-05-30 15:04:11.2129|DEBUG|OnDoc| +2025-05-30 15:04:11.2129|DEBUG|OnDoc| +2025-05-30 15:04:11.2380|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-05-30 15:04:11.2400|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-05-30 15:04:33.8907|DEBUG|OnDoc|Mailversand: 2 +2025-05-30 15:04:33.9183|DEBUG|OnDoc| +2025-05-30 15:04:33.9183|DEBUG|OnDoc| +2025-05-30 15:04:33.9353|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. +2025-05-30 15:04:53.4861|DEBUG|OnDoc|Mailversand: 1 +2025-05-30 15:04:53.5145|DEBUG|OnDoc| +2025-05-30 15:04:53.5145|DEBUG|OnDoc| +2025-05-30 15:04:53.5348|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 710bd7ae..02a91c51 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 b433d500..1bcc5967 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 8fbd78e0..8085b9de 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 7280b31e..ca7f2ad0 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 18e13af0..966f2720 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 709316af..bf71e439 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 47969700..3536bbbd 100644 Binary files a/BarcodeLib/bin/Debug/Model.pdb and b/BarcodeLib/bin/Debug/Model.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index 71d66844..a26677f0 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/Client/App.config b/Client/App.config index 6f00c972..2e2f35c9 100644 --- a/Client/App.config +++ b/Client/App.config @@ -49,11 +49,14 @@ E:\Software-Projekte\EDOKA\Cleint_Erneuerung_DMS_Framwork48 - Kopie\EDOKA\bin\edoka.exe + + E:\Software-Projekte\OnDoc\TKB-Vorlagen\ + 20000 - - E:\Software-Projekte\OnDoc\TKB-Vorlagen\ + + E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe diff --git a/Client/Client.csproj.user b/Client/Client.csproj.user index 2199162d..d0ffe724 100644 --- a/Client/Client.csproj.user +++ b/Client/Client.csproj.user @@ -1,7 +1,8 @@  - ondoc://%3ffunktion=createdoc&app=onbase&partnernr=1000208&struktur=Korrespondenz&id=OFFEDK0082025002508796 + + publish\ diff --git a/Client/Diverses/FrmExternalDocEdit.cs b/Client/Diverses/FrmExternalDocEdit.cs index 12c80a80..35264bd9 100644 --- a/Client/Diverses/FrmExternalDocEdit.cs +++ b/Client/Diverses/FrmExternalDocEdit.cs @@ -94,12 +94,13 @@ namespace OnDoc.Diverses } else { + //MessageBox.Show(status); if (status == "aktiv") { lblmessage.Text = "Das Dokument mit der ID '" + dokumentid + "' ist in OnBase aktiv und kann nicht bearbeitet werden."; sfButton3.Enabled = false; } - if (status == "inaktiv / in aufbewahrung") + if (status.Trim() == "inaktiv") { lblmessage.Text = "Das Dokument mit der ID '" + dokumentid + "' ist in OnBase im Status 'Inaktiv / in Aufbewahrung' und kann nicht bearbeitet werden."; sfButton3.Enabled = false; diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index f573de5a..d01859ac 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -40,10 +40,9 @@ this.pictureBox1.ErrorImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.ErrorImage"))); this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); this.pictureBox1.InitialImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.InitialImage"))); - this.pictureBox1.Location = new System.Drawing.Point(139, 31); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pictureBox1.Location = new System.Drawing.Point(104, 25); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(348, 318); + this.pictureBox1.Size = new System.Drawing.Size(261, 258); this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // @@ -51,36 +50,33 @@ // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(219, 374); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(164, 304); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(151, 31); + this.label1.Size = new System.Drawing.Size(122, 26); this.label1.TabIndex = 1; - this.label1.Text = "Version 1.5"; + this.label1.Text = "Version 1.6"; // // label2 // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(215, 406); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(159, 330); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(154, 31); + this.label2.Size = new System.Drawing.Size(130, 26); this.label2.TabIndex = 2; - this.label2.Text = "5. Mai 2025"; + this.label2.Text = "5. Juni 2025"; this.label2.Click += new System.EventHandler(this.label2_Click); // // SplashScreen // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(625, 487); + this.ClientSize = new System.Drawing.Size(469, 396); this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.Controls.Add(this.pictureBox1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "SplashScreen"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "SplashScreen"; diff --git a/Client/Diverses/valueselector.Designer.cs b/Client/Diverses/valueselector.Designer.cs index 1217e312..d14b2948 100644 --- a/Client/Diverses/valueselector.Designer.cs +++ b/Client/Diverses/valueselector.Designer.cs @@ -54,6 +54,9 @@ this.GridData.Style.HeaderStyle.FilterIconColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(29)))), ((int)(((byte)(29))))); this.GridData.TabIndex = 1; this.GridData.Text = "sfDataGrid1"; + this.GridData.QueryCellStyle += new Syncfusion.WinForms.DataGrid.Events.QueryCellStyleEventHandler(this.GridData_QueryCellStyle); + this.GridData.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.GridData_DrawCell); + this.GridData.QueryRowStyle += new Syncfusion.WinForms.DataGrid.Events.QueryRowStyleEventHandler(this.GridData_QueryRowStyle); this.GridData.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.GridData_CellClick); this.GridData.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.GridData_CellDoubleClick); // diff --git a/Client/Diverses/valueselector.cs b/Client/Diverses/valueselector.cs index be235aa2..f0584284 100644 --- a/Client/Diverses/valueselector.cs +++ b/Client/Diverses/valueselector.cs @@ -4,11 +4,13 @@ using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; +using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using OnDoc.Klassen; using Syncfusion.WinForms.Controls; +using Syncfusion.WinForms.DataGrid.Enums; using Windows.UI.Xaml.Controls; namespace OnDoc.Diverses @@ -106,5 +108,64 @@ namespace OnDoc.Diverses { sfCalendar1_DoubleClick(sender, e); } + + private void GridData_DrawCell(object sender, Syncfusion.WinForms.DataGrid.Events.DrawCellEventArgs e) + { + //try + //{ + // if (e.Column.MappingName == "SAREC00") + // { + // e.Handled = true; + // var selectedItem = e.DataRow; + // var dataRow = (e.DataRow.RowData as DataRowView).Row; + + // e.Style.Font.Strikeout = true; + // 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 { } + } + + private void GridData_QueryCellStyle(object sender, Syncfusion.WinForms.DataGrid.Events.QueryCellStyleEventArgs e) + { + //try + //{ + // if (e.Column.MappingName == "SAREC00") + // { + + // var selectedItem = e.DataRow; + // var dataRow = (e.DataRow.RowData as DataRowView).Row; + + // e.Style.Font.Strikeout = true; + + // return; + // } + //} + //catch { } + } + + private void GridData_QueryRowStyle(object sender, Syncfusion.WinForms.DataGrid.Events.QueryRowStyleEventArgs e) + { + try + { + if (e.RowType == RowType.DefaultRow) + { + var dataRowView = e.RowData as DataRowView; + if (dataRowView != null) + { + var dataRow = dataRowView.Row; + var cellValue = dataRow["SAREC00"].ToString(); + + if (cellValue == "7") + e.Style.Font.Strikeout = true; + } + } + } + catch { } + + } } } diff --git a/Client/Klassen/clsAppParams.cs b/Client/Klassen/clsAppParams.cs index 6e85c1a4..7a859b22 100644 --- a/Client/Klassen/clsAppParams.cs +++ b/Client/Klassen/clsAppParams.cs @@ -65,6 +65,8 @@ namespace OnDoc.Klassen public static string Environment { get; set; } = ""; public static bool versandstrassewindows_open { get; set; } = false; + + public static bool AutomArchivierung { get; set; } = false; static AppParams() { @@ -102,6 +104,7 @@ namespace OnDoc.Klassen SignatureColor = db.dsdaten.Tables[0].Rows[0][19].ToString(); SignaturePassword = db.dsdaten.Tables[0].Rows[0][20].ToString(); Environment = db.dsdaten.Tables[0].Rows[0][21].ToString(); + AutomArchivierung = db.dsdaten.Tables[0].Rows[0][22].ToString() == "TRUE"; } else { diff --git a/Client/Properties/Settings.Designer.cs b/Client/Properties/Settings.Designer.cs index 3a593c07..549d6750 100644 --- a/Client/Properties/Settings.Designer.cs +++ b/Client/Properties/Settings.Designer.cs @@ -203,5 +203,18 @@ namespace OnDoc.Properties { this["OfficeWatchTimerIntervall"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("E:\\Software-Projekte\\TKBDiverse\\TKBOfficeLib\\PluginStart\\bin\\Debug\\pluginstart.ex" + + "e")] + public string PrinterSettings { + get { + return ((string)(this["PrinterSettings"])); + } + set { + this["PrinterSettings"] = value; + } + } } } diff --git a/Client/Properties/Settings.settings b/Client/Properties/Settings.settings index 46186e03..cbed4d04 100644 --- a/Client/Properties/Settings.settings +++ b/Client/Properties/Settings.settings @@ -41,11 +41,14 @@ E:\Software-Projekte\EDOKA\Cleint_Erneuerung_DMS_Framwork48 - Kopie\EDOKA\bin\edoka.exe - - 5000 - E:\Software-Projekte\OnDoc\TKB-Vorlagen\ + + 20000 + + + E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe + \ No newline at end of file diff --git a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs index c244b73b..a8e9f6af 100644 --- a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs +++ b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs @@ -148,6 +148,7 @@ this.label16 = new System.Windows.Forms.Label(); this.rbNr = new System.Windows.Forms.RadioButton(); this.label15 = new System.Windows.Forms.Label(); + this.chkversandstrassefirstdok = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit(); this.tabControlAdv1.SuspendLayout(); this.tabPageAdv1.SuspendLayout(); @@ -211,6 +212,7 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.chkversandstrassefirstdok); this.groupBox1.Controls.Add(this.cbebanking_moeglich); this.groupBox1.Controls.Add(this.cbversandstrasse_moeglich); this.groupBox1.Location = new System.Drawing.Point(15, 628); @@ -225,7 +227,7 @@ this.cbebanking_moeglich.AutoSize = true; this.cbebanking_moeglich.Location = new System.Drawing.Point(19, 43); this.cbebanking_moeglich.Name = "cbebanking_moeglich"; - this.cbebanking_moeglich.Size = new System.Drawing.Size(131, 17); + this.cbebanking_moeglich.Size = new System.Drawing.Size(152, 19); this.cbebanking_moeglich.TabIndex = 1; this.cbebanking_moeglich.Text = "E-Banking zugelassen"; this.cbebanking_moeglich.UseVisualStyleBackColor = true; @@ -235,7 +237,7 @@ this.cbversandstrasse_moeglich.AutoSize = true; this.cbversandstrasse_moeglich.Location = new System.Drawing.Point(19, 20); this.cbversandstrasse_moeglich.Name = "cbversandstrasse_moeglich"; - this.cbversandstrasse_moeglich.Size = new System.Drawing.Size(79, 17); + this.cbversandstrasse_moeglich.Size = new System.Drawing.Size(92, 19); this.cbversandstrasse_moeglich.TabIndex = 0; this.cbversandstrasse_moeglich.Text = "zugelassen"; this.cbversandstrasse_moeglich.UseVisualStyleBackColor = true; @@ -243,6 +245,7 @@ // toolStrip2 // this.toolStrip2.AutoSize = false; + this.toolStrip2.ImageScalingSize = new System.Drawing.Size(20, 20); this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButton1, this.tsbtncopy, @@ -270,7 +273,7 @@ this.tsbtncopy.Image = global::OnDoc.Properties.Resources.Copy_16x16_32; this.tsbtncopy.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbtncopy.Name = "tsbtncopy"; - this.tsbtncopy.Size = new System.Drawing.Size(23, 39); + this.tsbtncopy.Size = new System.Drawing.Size(29, 39); this.tsbtncopy.Text = "Dokumenttyp kopieren"; this.tsbtncopy.Click += new System.EventHandler(this.tsbtncopy_Click); // @@ -280,7 +283,7 @@ this.toolStripButton3.Image = global::OnDoc.Properties.Resources.officevorlage_16x16_32; this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(23, 39); + this.toolStripButton3.Size = new System.Drawing.Size(29, 39); this.toolStripButton3.Text = "Vorlage anzeigen"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // @@ -304,7 +307,7 @@ this.lblStandard.AutoSize = true; this.lblStandard.Location = new System.Drawing.Point(336, 28); this.lblStandard.Name = "lblStandard"; - this.lblStandard.Size = new System.Drawing.Size(50, 13); + this.lblStandard.Size = new System.Drawing.Size(57, 15); this.lblStandard.TabIndex = 26; this.lblStandard.Text = "Standard"; this.lblStandard.Visible = false; @@ -370,7 +373,7 @@ this.cbUnterschriftpruefung.AutoSize = true; this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 19); this.cbUnterschriftpruefung.Name = "cbUnterschriftpruefung"; - this.cbUnterschriftpruefung.Size = new System.Drawing.Size(176, 17); + this.cbUnterschriftpruefung.Size = new System.Drawing.Size(203, 19); this.cbUnterschriftpruefung.TabIndex = 1; this.cbUnterschriftpruefung.Text = "Unterschriftenprüfung zwingend"; this.cbUnterschriftpruefung.UseVisualStyleBackColor = true; @@ -380,7 +383,7 @@ this.chkBewilliigungZwingend.AutoSize = true; this.chkBewilliigungZwingend.Location = new System.Drawing.Point(277, 19); this.chkBewilliigungZwingend.Name = "chkBewilliigungZwingend"; - this.chkBewilliigungZwingend.Size = new System.Drawing.Size(179, 17); + this.chkBewilliigungZwingend.Size = new System.Drawing.Size(209, 19); this.chkBewilliigungZwingend.TabIndex = 0; this.chkBewilliigungZwingend.Text = "Bewilligung Dokument zwingend"; this.chkBewilliigungZwingend.UseVisualStyleBackColor = true; @@ -410,7 +413,7 @@ this.label18.AutoSize = true; this.label18.Location = new System.Drawing.Point(277, 13); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(105, 13); + this.label18.Size = new System.Drawing.Size(126, 15); this.label18.TabIndex = 29; this.label18.Text = "Kompatibilitätsmodus"; // @@ -419,7 +422,7 @@ this.chkfilloffice.AutoSize = true; this.chkfilloffice.Location = new System.Drawing.Point(277, 63); this.chkfilloffice.Name = "chkfilloffice"; - this.chkfilloffice.Size = new System.Drawing.Size(117, 17); + this.chkfilloffice.Size = new System.Drawing.Size(135, 19); this.chkfilloffice.TabIndex = 28; this.chkfilloffice.Text = "Befüllung mit Office"; this.chkfilloffice.UseVisualStyleBackColor = true; @@ -682,7 +685,7 @@ this.rbDokumenterstellungPerson.AutoSize = true; this.rbDokumenterstellungPerson.Location = new System.Drawing.Point(293, 32); this.rbDokumenterstellungPerson.Name = "rbDokumenterstellungPerson"; - this.rbDokumenterstellungPerson.Size = new System.Drawing.Size(155, 17); + this.rbDokumenterstellungPerson.Size = new System.Drawing.Size(181, 19); this.rbDokumenterstellungPerson.TabIndex = 22; this.rbDokumenterstellungPerson.Text = "Dokumenterstellung Person"; this.rbDokumenterstellungPerson.UseVisualStyleBackColor = true; @@ -693,7 +696,7 @@ this.rbDokumenterstellungBP.Checked = true; this.rbDokumenterstellungBP.Location = new System.Drawing.Point(293, 13); this.rbDokumenterstellungBP.Name = "rbDokumenterstellungBP"; - this.rbDokumenterstellungBP.Size = new System.Drawing.Size(136, 17); + this.rbDokumenterstellungBP.Size = new System.Drawing.Size(158, 19); this.rbDokumenterstellungBP.TabIndex = 21; this.rbDokumenterstellungBP.TabStop = true; this.rbDokumenterstellungBP.Text = "Dokumenterstellung BP"; @@ -925,6 +928,7 @@ this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill; this.sfDataGrid1.Location = new System.Drawing.Point(3, 16); this.sfDataGrid1.Name = "sfDataGrid1"; + this.sfDataGrid1.PreviewRowHeight = 35; this.sfDataGrid1.Size = new System.Drawing.Size(484, 672); this.sfDataGrid1.TabIndex = 1; this.sfDataGrid1.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellClick); @@ -955,6 +959,7 @@ // toolStrip1 // this.toolStrip1.AutoSize = false; + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsbtnsave}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); @@ -1035,7 +1040,7 @@ this.chkaktiv.AutoSize = true; this.chkaktiv.Location = new System.Drawing.Point(135, 576); this.chkaktiv.Name = "chkaktiv"; - this.chkaktiv.Size = new System.Drawing.Size(15, 14); + this.chkaktiv.Size = new System.Drawing.Size(18, 17); this.chkaktiv.TabIndex = 35; this.chkaktiv.Tag = "aktiv"; this.chkaktiv.UseVisualStyleBackColor = true; @@ -1046,7 +1051,7 @@ this.label14.AutoSize = true; this.label14.Location = new System.Drawing.Point(18, 577); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(31, 13); + this.label14.Size = new System.Drawing.Size(31, 15); this.label14.TabIndex = 34; this.label14.Text = "Aktiv"; // @@ -1074,7 +1079,7 @@ this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(18, 230); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(97, 13); + this.label13.Size = new System.Drawing.Size(110, 15); this.label13.TabIndex = 31; this.label13.Text = "Tech-Bezeichnung"; // @@ -1092,7 +1097,7 @@ this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(18, 204); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(88, 13); + this.label12.Size = new System.Drawing.Size(102, 15); this.label12.TabIndex = 29; this.label12.Text = "Feldbezeichnung"; // @@ -1110,7 +1115,7 @@ this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(18, 513); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(92, 13); + this.label11.Size = new System.Drawing.Size(107, 15); this.label11.TabIndex = 27; this.label11.Text = "ESS-Image height"; // @@ -1128,7 +1133,7 @@ this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(18, 487); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(88, 13); + this.label10.Size = new System.Drawing.Size(102, 15); this.label10.TabIndex = 25; this.label10.Text = "ESS-Image width"; // @@ -1146,7 +1151,7 @@ this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(18, 461); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(77, 13); + this.label8.Size = new System.Drawing.Size(89, 15); this.label8.TabIndex = 23; this.label8.Text = "ESS-Image left"; // @@ -1164,7 +1169,7 @@ this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(18, 435); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(82, 13); + this.label7.Size = new System.Drawing.Size(94, 15); this.label7.TabIndex = 21; this.label7.Text = "ESS-Image Top"; // @@ -1183,7 +1188,7 @@ this.lblessfieldname.AutoSize = true; this.lblessfieldname.Location = new System.Drawing.Point(18, 409); this.lblessfieldname.Name = "lblessfieldname"; - this.lblessfieldname.Size = new System.Drawing.Size(77, 13); + this.lblessfieldname.Size = new System.Drawing.Size(91, 15); this.lblessfieldname.TabIndex = 19; this.lblessfieldname.Text = "ESS-Feldname"; // @@ -1201,7 +1206,7 @@ this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(18, 383); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(62, 13); + this.label9.Size = new System.Drawing.Size(72, 15); this.label9.TabIndex = 17; this.label9.Text = "ESS-Klasse"; // @@ -1219,7 +1224,7 @@ this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(18, 330); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(82, 13); + this.label6.Size = new System.Drawing.Size(95, 15); this.label6.TabIndex = 15; this.label6.Text = "Ende-Texmarke"; // @@ -1237,7 +1242,7 @@ this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(18, 304); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(90, 13); + this.label5.Size = new System.Drawing.Size(105, 15); this.label5.TabIndex = 13; this.label5.Text = "Beginn-Texmarke"; // @@ -1256,7 +1261,7 @@ this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(18, 278); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(53, 13); + this.label4.Size = new System.Drawing.Size(63, 15); this.label4.TabIndex = 11; this.label4.Text = "Feldname"; // @@ -1265,7 +1270,7 @@ this.chkzwingend.AutoSize = true; this.chkzwingend.Location = new System.Drawing.Point(135, 152); this.chkzwingend.Name = "chkzwingend"; - this.chkzwingend.Size = new System.Drawing.Size(15, 14); + this.chkzwingend.Size = new System.Drawing.Size(18, 17); this.chkzwingend.TabIndex = 10; this.chkzwingend.Tag = "Zwingend"; this.chkzwingend.UseVisualStyleBackColor = true; @@ -1276,7 +1281,7 @@ this.lbelzwingend.AutoSize = true; this.lbelzwingend.Location = new System.Drawing.Point(18, 153); this.lbelzwingend.Name = "lbelzwingend"; - this.lbelzwingend.Size = new System.Drawing.Size(54, 13); + this.lbelzwingend.Size = new System.Drawing.Size(61, 15); this.lbelzwingend.TabIndex = 9; this.lbelzwingend.Text = "Zwingend"; // @@ -1294,7 +1299,7 @@ this.lblsort.AutoSize = true; this.lblsort.Location = new System.Drawing.Point(18, 178); this.lblsort.Name = "lblsort"; - this.lblsort.Size = new System.Drawing.Size(111, 13); + this.lblsort.Size = new System.Drawing.Size(129, 15); this.lblsort.TabIndex = 7; this.lblsort.Text = "Sortier-Reihenfolge UI"; // @@ -1304,7 +1309,7 @@ this.chkui.Enabled = false; this.chkui.Location = new System.Drawing.Point(135, 129); this.chkui.Name = "chkui"; - this.chkui.Size = new System.Drawing.Size(15, 14); + this.chkui.Size = new System.Drawing.Size(18, 17); this.chkui.TabIndex = 6; this.chkui.Tag = "UI"; this.chkui.UseVisualStyleBackColor = true; @@ -1315,7 +1320,7 @@ this.lbluidesc.AutoSize = true; this.lbluidesc.Location = new System.Drawing.Point(18, 129); this.lbluidesc.Name = "lbluidesc"; - this.lbluidesc.Size = new System.Drawing.Size(18, 13); + this.lbluidesc.Size = new System.Drawing.Size(19, 15); this.lbluidesc.TabIndex = 5; this.lbluidesc.Text = "UI"; // @@ -1324,7 +1329,7 @@ this.lblfeldregelid.AutoSize = true; this.lblfeldregelid.Location = new System.Drawing.Point(132, 40); this.lblfeldregelid.Name = "lblfeldregelid"; - this.lblfeldregelid.Size = new System.Drawing.Size(50, 13); + this.lblfeldregelid.Size = new System.Drawing.Size(59, 15); this.lblfeldregelid.TabIndex = 3; this.lblfeldregelid.Text = "Feldregel"; // @@ -1333,7 +1338,7 @@ this.lblfeldregeliddesc.AutoSize = true; this.lblfeldregeliddesc.Location = new System.Drawing.Point(18, 43); this.lblfeldregeliddesc.Name = "lblfeldregeliddesc"; - this.lblfeldregeliddesc.Size = new System.Drawing.Size(50, 13); + this.lblfeldregeliddesc.Size = new System.Drawing.Size(59, 15); this.lblfeldregeliddesc.TabIndex = 2; this.lblfeldregeliddesc.Text = "Feldregel"; // @@ -1342,7 +1347,7 @@ this.lblID.AutoSize = true; this.lblID.Location = new System.Drawing.Point(132, 17); this.lblID.Name = "lblID"; - this.lblID.Size = new System.Drawing.Size(18, 13); + this.lblID.Size = new System.Drawing.Size(19, 15); this.lblID.TabIndex = 1; this.lblID.Text = "ID"; // @@ -1351,7 +1356,7 @@ this.lbliddesc.AutoSize = true; this.lbliddesc.Location = new System.Drawing.Point(18, 20); this.lbliddesc.Name = "lbliddesc"; - this.lbliddesc.Size = new System.Drawing.Size(18, 13); + this.lbliddesc.Size = new System.Drawing.Size(19, 15); this.lbliddesc.TabIndex = 0; this.lbliddesc.Text = "ID"; // @@ -1434,7 +1439,7 @@ this.chkboxaktive.CheckState = System.Windows.Forms.CheckState.Checked; this.chkboxaktive.Location = new System.Drawing.Point(205, 43); this.chkboxaktive.Name = "chkboxaktive"; - this.chkboxaktive.Size = new System.Drawing.Size(55, 17); + this.chkboxaktive.Size = new System.Drawing.Size(60, 19); this.chkboxaktive.TabIndex = 10; this.chkboxaktive.Text = "aktive"; this.chkboxaktive.UseVisualStyleBackColor = true; @@ -1453,7 +1458,7 @@ this.rbBezeichnung.AutoSize = true; this.rbBezeichnung.Location = new System.Drawing.Point(111, 42); this.rbBezeichnung.Name = "rbBezeichnung"; - this.rbBezeichnung.Size = new System.Drawing.Size(87, 17); + this.rbBezeichnung.Size = new System.Drawing.Size(100, 19); this.rbBezeichnung.TabIndex = 9; this.rbBezeichnung.Text = "Bezeichnung"; this.rbBezeichnung.UseVisualStyleBackColor = true; @@ -1464,7 +1469,7 @@ this.label16.AutoSize = true; this.label16.Location = new System.Drawing.Point(12, 15); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(29, 13); + this.label16.Size = new System.Drawing.Size(34, 15); this.label16.TabIndex = 5; this.label16.Text = "Filter"; // @@ -1474,7 +1479,7 @@ this.rbNr.Checked = true; this.rbNr.Location = new System.Drawing.Point(69, 42); this.rbNr.Name = "rbNr"; - this.rbNr.Size = new System.Drawing.Size(36, 17); + this.rbNr.Size = new System.Drawing.Size(41, 19); this.rbNr.TabIndex = 8; this.rbNr.TabStop = true; this.rbNr.Text = "Nr"; @@ -1486,10 +1491,20 @@ this.label15.AutoSize = true; this.label15.Location = new System.Drawing.Point(12, 44); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(26, 13); + this.label15.Size = new System.Drawing.Size(29, 15); this.label15.TabIndex = 7; this.label15.Text = "Sort"; // + // chkversandstrassefirstdok + // + this.chkversandstrassefirstdok.AutoSize = true; + this.chkversandstrassefirstdok.Location = new System.Drawing.Point(163, 20); + this.chkversandstrassefirstdok.Name = "chkversandstrassefirstdok"; + this.chkversandstrassefirstdok.Size = new System.Drawing.Size(188, 19); + this.chkversandstrassefirstdok.TabIndex = 2; + this.chkversandstrassefirstdok.Text = "Als erstes Dokument möglich"; + this.chkversandstrassefirstdok.UseVisualStyleBackColor = true; + // // Dokumenttyp // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1656,5 +1671,6 @@ private System.Windows.Forms.Label label18; private System.Windows.Forms.CheckBox chkfilloffice; private System.Windows.Forms.ComboBox cbboxcompatibilitymode; + private System.Windows.Forms.CheckBox chkversandstrassefirstdok; } } \ No newline at end of file diff --git a/Client/UIControls/Administrator/Dokumenttyp.cs b/Client/UIControls/Administrator/Dokumenttyp.cs index 12581f65..407df0fd 100644 --- a/Client/UIControls/Administrator/Dokumenttyp.cs +++ b/Client/UIControls/Administrator/Dokumenttyp.cs @@ -176,6 +176,7 @@ namespace OnDoc.UIControls.Administrator r["physisches_archiv"] = cbboxarchiv.SelectedValue; this.cbversandstrasse_moeglich.Checked = r["versandstrasse_moeglich"].ToString() == "True"; + this.chkversandstrassefirstdok.Checked = r["versandstrasse_firstdoc"].ToString() == "True"; this.cbebanking_moeglich.Checked = r["ebanking_moeglich"].ToString() == "True"; db.Get_Tabledata("Select vorlagenfeldregelnr, bezeichnung from vorlagenfeldregel where aktiv=1 order by bezeichnung", false, true); @@ -345,6 +346,7 @@ namespace OnDoc.UIControls.Administrator r["mutierer"] = AppParams.CurrentMitarbeiter; r["mutiert_am"] = DateTime.Now; r["versandstrasse_moeglich"] = cbversandstrasse_moeglich.Checked == true; + r["versandstrasse_firstdoc"] = chkversandstrassefirstdok.Checked == true; r["ebanking_moeglich"] = cbebanking_moeglich.Checked == true; r["BearbeitungDirket"] = chkbearbeitungdirekt.Checked == true; r["interop"] = chkinterop.Checked == true; diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index 14467cc0..8ad0b385 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -149,6 +149,8 @@ namespace OnDoc.UICintrols this.ribbonLabel1 = new System.Windows.Forms.RibbonLabel(); this.RibbonCBProfil = new System.Windows.Forms.RibbonComboBox(); this.ribbonButton1 = new System.Windows.Forms.RibbonButton(); + this.RibbonPrinter = new System.Windows.Forms.RibbonPanel(); + this.ribbonbuttonPrinterSettings = new System.Windows.Forms.RibbonButton(); this.RibbonTabNativVorlagen = new System.Windows.Forms.RibbonTab(); this.ribbonPanelNativVorlagen = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonNativVorlagen = new System.Windows.Forms.RibbonButton(); @@ -1258,6 +1260,7 @@ namespace OnDoc.UICintrols // this.ribbonTabProfil.Name = "ribbonTabProfil"; this.ribbonTabProfil.Panels.Add(this.RibbonPanelProfil); + this.ribbonTabProfil.Panels.Add(this.RibbonPrinter); this.ribbonTabProfil.Text = "Profil"; // // RibbonPanelProfil @@ -1291,13 +1294,30 @@ namespace OnDoc.UICintrols // // ribbonButton1 // - this.ribbonButton1.Image = global::OnDoc.Properties.Resources.Pprofil_16x16_32; - this.ribbonButton1.LargeImage = global::OnDoc.Properties.Resources.Pprofil_16x16_32; + this.ribbonButton1.Image = global::OnDoc.Properties.Resources.Pprofil_32x32_32; + this.ribbonButton1.LargeImage = global::OnDoc.Properties.Resources.Pprofil_32x32_32; this.ribbonButton1.Name = "ribbonButton1"; - this.ribbonButton1.SmallImage = global::OnDoc.Properties.Resources.Pprofil_16x16_32; + this.ribbonButton1.SmallImage = global::OnDoc.Properties.Resources.postausgang_24x24_32; this.ribbonButton1.ToolTip = "Profil bearbeiten"; this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click); // + // RibbonPrinter + // + this.RibbonPrinter.ButtonMoreEnabled = false; + this.RibbonPrinter.ButtonMoreVisible = false; + this.RibbonPrinter.Items.Add(this.ribbonbuttonPrinterSettings); + this.RibbonPrinter.Name = "RibbonPrinter"; + this.RibbonPrinter.Text = "Drucker"; + // + // ribbonbuttonPrinterSettings + // + this.ribbonbuttonPrinterSettings.Image = global::OnDoc.Properties.Resources.Printer_32x32_32; + this.ribbonbuttonPrinterSettings.LargeImage = global::OnDoc.Properties.Resources.Printer_32x32_32; + this.ribbonbuttonPrinterSettings.Name = "ribbonbuttonPrinterSettings"; + this.ribbonbuttonPrinterSettings.SmallImage = global::OnDoc.Properties.Resources.Printer_24x24_32; + this.ribbonbuttonPrinterSettings.Text = "Druckereinstellungen für Word"; + this.ribbonbuttonPrinterSettings.Click += new System.EventHandler(this.ribbonbuttonPrinterSettings_Click); + // // RibbonTabNativVorlagen // this.RibbonTabNativVorlagen.Name = "RibbonTabNativVorlagen"; @@ -1736,5 +1756,7 @@ namespace OnDoc.UICintrols private System.Windows.Forms.RibbonButton ribbonbuttonpersonpersonsymbol; private System.Windows.Forms.RibbonButton ribbonbuttonpostausgang; private System.Windows.Forms.ToolStripMenuItem zumVersandpaketHinzufügenToolStripMenuItem; + private System.Windows.Forms.RibbonPanel RibbonPrinter; + private System.Windows.Forms.RibbonButton ribbonbuttonPrinterSettings; } } diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 7f7e4292..6d895e28 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -3160,6 +3160,11 @@ namespace OnDoc.UICintrols { ribbonButtonVersandstrasse_Click(sender, e); } + + private void ribbonbuttonPrinterSettings_Click(object sender, EventArgs e) + { + Process.Start(Properties.Settings.Default.PrinterSettings); + } } diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx index c61769f6..df6718bb 100644 --- a/Client/UIControls/DokList.resx +++ b/Client/UIControls/DokList.resx @@ -190,7 +190,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM @@ -205,7 +205,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM @@ -220,7 +220,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM diff --git a/Client/UIControls/Serienbrief.Designer.cs b/Client/UIControls/Serienbrief.Designer.cs index 61dcf25c..fdbf488b 100644 --- a/Client/UIControls/Serienbrief.Designer.cs +++ b/Client/UIControls/Serienbrief.Designer.cs @@ -67,6 +67,12 @@ this.groupBox6 = new System.Windows.Forms.GroupBox(); this.cbboxzustaendigmitarbeiter = new Syncfusion.WinForms.ListView.SfComboBox(); this.rbzustaendigmitarbeiter = new System.Windows.Forms.RadioButton(); + this.pnlLoad = new System.Windows.Forms.Panel(); + this.sfdatagridsbload = new Syncfusion.WinForms.DataGrid.SfDataGrid(); + this.btnsbloadcancel = new System.Windows.Forms.Button(); + this.btnsbloadok = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label1 = new System.Windows.Forms.Label(); this.rbzustaendigkube = new System.Windows.Forms.RadioButton(); this.groupBox5 = new System.Windows.Forms.GroupBox(); this.DateTermin = new Syncfusion.WinForms.Input.SfDateTimeEdit(); @@ -79,12 +85,6 @@ this.lblPostzustellung = new System.Windows.Forms.Label(); this.lblBezeichnung = new System.Windows.Forms.Label(); this.txtbezeichnung = new System.Windows.Forms.TextBox(); - this.pnlLoad = new System.Windows.Forms.Panel(); - this.sfdatagridsbload = new Syncfusion.WinForms.DataGrid.SfDataGrid(); - this.btnsbloadcancel = new System.Windows.Forms.Button(); - this.btnsbloadok = new System.Windows.Forms.Button(); - this.panel1 = new System.Windows.Forms.Panel(); - this.label1 = new System.Windows.Forms.Label(); this.panelLoad = new System.Windows.Forms.Panel(); this.label4 = new System.Windows.Forms.Label(); this.GrpEmpfaenger = new System.Windows.Forms.GroupBox(); @@ -154,12 +154,12 @@ ((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftlinks)).BeginInit(); this.groupBox6.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.cbboxzustaendigmitarbeiter)).BeginInit(); - this.groupBox5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxverantwortlich)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).BeginInit(); this.pnlLoad.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.sfdatagridsbload)).BeginInit(); this.panel1.SuspendLayout(); + this.groupBox5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.cbboxverantwortlich)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).BeginInit(); this.panelLoad.SuspendLayout(); this.GrpEmpfaenger.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.sfDataGridEmpfaenger)).BeginInit(); @@ -208,7 +208,7 @@ this.rbbpb.AutoSize = true; this.rbbpb.Location = new System.Drawing.Point(166, 24); this.rbbpb.Name = "rbbpb"; - this.rbbpb.Size = new System.Drawing.Size(84, 19); + this.rbbpb.Size = new System.Drawing.Size(73, 17); this.rbbpb.TabIndex = 2; this.rbbpb.Text = "PP-B-Post"; this.rbbpb.UseVisualStyleBackColor = true; @@ -218,7 +218,7 @@ this.rbppa.AutoSize = true; this.rbppa.Location = new System.Drawing.Point(87, 24); this.rbppa.Name = "rbppa"; - this.rbppa.Size = new System.Drawing.Size(83, 19); + this.rbppa.Size = new System.Drawing.Size(73, 17); this.rbppa.TabIndex = 1; this.rbppa.Text = "PP-A-Post"; this.rbppa.UseVisualStyleBackColor = true; @@ -229,7 +229,7 @@ this.rbppohne.Checked = true; this.rbppohne.Location = new System.Drawing.Point(20, 23); this.rbppohne.Name = "rbppohne"; - this.rbppohne.Size = new System.Drawing.Size(60, 19); + this.rbppohne.Size = new System.Drawing.Size(52, 17); this.rbppohne.TabIndex = 0; this.rbppohne.TabStop = true; this.rbppohne.Text = "Keine"; @@ -279,7 +279,7 @@ this.lblProgressTitel.AutoSize = true; this.lblProgressTitel.Location = new System.Drawing.Point(12, 9); this.lblProgressTitel.Name = "lblProgressTitel"; - this.lblProgressTitel.Size = new System.Drawing.Size(0, 15); + this.lblProgressTitel.Size = new System.Drawing.Size(0, 13); this.lblProgressTitel.TabIndex = 19; // // label3 @@ -287,7 +287,7 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(435, 78); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(28, 15); + this.label3.Size = new System.Drawing.Size(25, 13); this.label3.TabIndex = 18; this.label3.Text = "100"; // @@ -296,7 +296,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 78); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(14, 15); + this.label2.Size = new System.Drawing.Size(13, 13); this.label2.TabIndex = 17; this.label2.Text = "0"; // @@ -348,7 +348,7 @@ this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(4, 26); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(259, 15); + this.label6.Size = new System.Drawing.Size(224, 13); this.label6.TabIndex = 1; this.label6.Text = "Druckereinstellungen Ein-/Doppelseitig prüfen"; // @@ -357,7 +357,7 @@ this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(4, 7); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(205, 15); + this.label5.Size = new System.Drawing.Size(183, 13); this.label5.TabIndex = 0; this.label5.Text = "Der Druck erfolgt vie Acrobat Reader"; // @@ -469,7 +469,7 @@ this.cbformularohneunterschrfit.AutoSize = true; this.cbformularohneunterschrfit.Location = new System.Drawing.Point(22, 19); this.cbformularohneunterschrfit.Name = "cbformularohneunterschrfit"; - this.cbformularohneunterschrfit.Size = new System.Drawing.Size(175, 19); + this.cbformularohneunterschrfit.Size = new System.Drawing.Size(150, 17); this.cbformularohneunterschrfit.TabIndex = 11; this.cbformularohneunterschrfit.Text = "Formular ohne Unterschrift"; this.cbformularohneunterschrfit.UseVisualStyleBackColor = true; @@ -481,7 +481,7 @@ this.cbdigitaleunterschrfiten.AutoSize = true; this.cbdigitaleunterschrfiten.Location = new System.Drawing.Point(189, 18); this.cbdigitaleunterschrfiten.Name = "cbdigitaleunterschrfiten"; - this.cbdigitaleunterschrfiten.Size = new System.Drawing.Size(147, 19); + this.cbdigitaleunterschrfiten.Size = new System.Drawing.Size(126, 17); this.cbdigitaleunterschrfiten.TabIndex = 10; this.cbdigitaleunterschrfiten.Text = "Faksimile Unterschrift"; this.cbdigitaleunterschrfiten.UseVisualStyleBackColor = true; @@ -516,7 +516,7 @@ this.lblUnterschriftrechts.AutoSize = true; this.lblUnterschriftrechts.Location = new System.Drawing.Point(17, 79); this.lblUnterschriftrechts.Name = "lblUnterschriftrechts"; - this.lblUnterschriftrechts.Size = new System.Drawing.Size(105, 15); + this.lblUnterschriftrechts.Size = new System.Drawing.Size(93, 13); this.lblUnterschriftrechts.TabIndex = 7; this.lblUnterschriftrechts.Text = "Unterschrift rechts"; // @@ -525,7 +525,7 @@ this.lblUnterschriftlinks.AutoSize = true; this.lblUnterschriftlinks.Location = new System.Drawing.Point(17, 50); this.lblUnterschriftlinks.Name = "lblUnterschriftlinks"; - this.lblUnterschriftlinks.Size = new System.Drawing.Size(97, 15); + this.lblUnterschriftlinks.Size = new System.Drawing.Size(85, 13); this.lblUnterschriftlinks.TabIndex = 6; this.lblUnterschriftlinks.Text = "Unterschrift links"; // @@ -559,18 +559,91 @@ this.rbzustaendigmitarbeiter.AutoSize = true; this.rbzustaendigmitarbeiter.Location = new System.Drawing.Point(22, 42); this.rbzustaendigmitarbeiter.Name = "rbzustaendigmitarbeiter"; - this.rbzustaendigmitarbeiter.Size = new System.Drawing.Size(82, 19); + 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; // + // pnlLoad + // + this.pnlLoad.BackColor = System.Drawing.Color.Silver; + this.pnlLoad.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.pnlLoad.Controls.Add(this.sfdatagridsbload); + this.pnlLoad.Controls.Add(this.btnsbloadcancel); + this.pnlLoad.Controls.Add(this.btnsbloadok); + this.pnlLoad.Controls.Add(this.panel1); + this.pnlLoad.Location = new System.Drawing.Point(796, 123); + this.pnlLoad.Name = "pnlLoad"; + this.pnlLoad.Size = new System.Drawing.Size(957, 634); + this.pnlLoad.TabIndex = 4; + this.pnlLoad.Visible = false; + // + // sfdatagridsbload + // + 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.PreviewRowHeight = 35; + this.sfdatagridsbload.ShowToolTip = true; + this.sfdatagridsbload.Size = new System.Drawing.Size(953, 489); + this.sfdatagridsbload.TabIndex = 3; + this.sfdatagridsbload.Text = "sfDataGrid1"; + this.sfdatagridsbload.ToolTipOpening += new Syncfusion.WinForms.DataGrid.Events.ToolTipOpeningEventHandler(this.sfdatagridsbload_ToolTipOpening); + 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); + this.sfdatagridsbload.DoubleClick += new System.EventHandler(this.sfdatagridsbload_DoubleClick); + // + // btnsbloadcancel + // + this.btnsbloadcancel.Location = new System.Drawing.Point(9, 600); + this.btnsbloadcancel.Name = "btnsbloadcancel"; + this.btnsbloadcancel.Size = new System.Drawing.Size(75, 23); + this.btnsbloadcancel.TabIndex = 2; + this.btnsbloadcancel.Text = "Abbrechen"; + this.btnsbloadcancel.UseVisualStyleBackColor = true; + this.btnsbloadcancel.Click += new System.EventHandler(this.btnsbloadcancel_Click); + // + // btnsbloadok + // + this.btnsbloadok.Location = new System.Drawing.Point(870, 600); + this.btnsbloadok.Name = "btnsbloadok"; + this.btnsbloadok.Size = new System.Drawing.Size(75, 23); + this.btnsbloadok.TabIndex = 0; + this.btnsbloadok.Text = "Öffnen"; + this.btnsbloadok.UseVisualStyleBackColor = true; + this.btnsbloadok.Click += new System.EventHandler(this.bntsbloadok_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.label1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(953, 47); + this.panel1.TabIndex = 1; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(385, 13); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(154, 20); + this.label1.TabIndex = 0; + this.label1.Text = "Serienbrief öffnen"; + // // rbzustaendigkube // this.rbzustaendigkube.AutoSize = true; this.rbzustaendigkube.Location = new System.Drawing.Point(22, 19); this.rbzustaendigkube.Name = "rbzustaendigkube"; - this.rbzustaendigkube.Size = new System.Drawing.Size(179, 19); + this.rbzustaendigkube.Size = new System.Drawing.Size(155, 17); this.rbzustaendigkube.TabIndex = 0; this.rbzustaendigkube.TabStop = true; this.rbzustaendigkube.Text = "Kundenberater des Kunden"; @@ -610,7 +683,7 @@ this.lblTermin.AutoSize = true; this.lblTermin.Location = new System.Drawing.Point(312, 114); this.lblTermin.Name = "lblTermin"; - this.lblTermin.Size = new System.Drawing.Size(46, 15); + this.lblTermin.Size = new System.Drawing.Size(39, 13); this.lblTermin.TabIndex = 4; this.lblTermin.Text = "Termin"; this.lblTermin.Visible = false; @@ -630,7 +703,7 @@ this.lblDokumentDatum.AutoSize = true; this.lblDokumentDatum.Location = new System.Drawing.Point(9, 114); this.lblDokumentDatum.Name = "lblDokumentDatum"; - this.lblDokumentDatum.Size = new System.Drawing.Size(105, 15); + this.lblDokumentDatum.Size = new System.Drawing.Size(90, 13); this.lblDokumentDatum.TabIndex = 2; this.lblDokumentDatum.Text = "Dokument-Datum"; // @@ -663,7 +736,7 @@ this.lblVerantwortlich.AutoSize = true; this.lblVerantwortlich.Location = new System.Drawing.Point(9, 59); this.lblVerantwortlich.Name = "lblVerantwortlich"; - this.lblVerantwortlich.Size = new System.Drawing.Size(84, 15); + this.lblVerantwortlich.Size = new System.Drawing.Size(74, 13); this.lblVerantwortlich.TabIndex = 10; this.lblVerantwortlich.Text = "Verantwortlich"; // @@ -672,7 +745,7 @@ this.lblPostzustellung.AutoSize = true; this.lblPostzustellung.Location = new System.Drawing.Point(9, 86); this.lblPostzustellung.Name = "lblPostzustellung"; - this.lblPostzustellung.Size = new System.Drawing.Size(87, 15); + this.lblPostzustellung.Size = new System.Drawing.Size(75, 13); this.lblPostzustellung.TabIndex = 0; this.lblPostzustellung.Text = "Postzustellung"; // @@ -681,7 +754,7 @@ this.lblBezeichnung.AutoSize = true; this.lblBezeichnung.Location = new System.Drawing.Point(9, 23); this.lblBezeichnung.Name = "lblBezeichnung"; - this.lblBezeichnung.Size = new System.Drawing.Size(79, 15); + this.lblBezeichnung.Size = new System.Drawing.Size(69, 13); this.lblBezeichnung.TabIndex = 8; this.lblBezeichnung.Text = "Bezeichnung"; // @@ -692,79 +765,6 @@ this.txtbezeichnung.Size = new System.Drawing.Size(354, 20); this.txtbezeichnung.TabIndex = 9; // - // pnlLoad - // - this.pnlLoad.BackColor = System.Drawing.Color.Silver; - this.pnlLoad.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.pnlLoad.Controls.Add(this.sfdatagridsbload); - this.pnlLoad.Controls.Add(this.btnsbloadcancel); - this.pnlLoad.Controls.Add(this.btnsbloadok); - this.pnlLoad.Controls.Add(this.panel1); - this.pnlLoad.Location = new System.Drawing.Point(178, 82); - this.pnlLoad.Name = "pnlLoad"; - this.pnlLoad.Size = new System.Drawing.Size(957, 634); - this.pnlLoad.TabIndex = 4; - this.pnlLoad.Visible = false; - // - // sfdatagridsbload - // - 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.PreviewRowHeight = 35; - this.sfdatagridsbload.ShowToolTip = true; - this.sfdatagridsbload.Size = new System.Drawing.Size(953, 489); - this.sfdatagridsbload.TabIndex = 3; - this.sfdatagridsbload.Text = "sfDataGrid1"; - this.sfdatagridsbload.ToolTipOpening += new Syncfusion.WinForms.DataGrid.Events.ToolTipOpeningEventHandler(this.sfdatagridsbload_ToolTipOpening); - 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); - this.sfdatagridsbload.DoubleClick += new System.EventHandler(this.sfdatagridsbload_DoubleClick); - // - // btnsbloadcancel - // - this.btnsbloadcancel.Location = new System.Drawing.Point(9, 600); - this.btnsbloadcancel.Name = "btnsbloadcancel"; - this.btnsbloadcancel.Size = new System.Drawing.Size(75, 23); - this.btnsbloadcancel.TabIndex = 2; - this.btnsbloadcancel.Text = "Abbrechen"; - this.btnsbloadcancel.UseVisualStyleBackColor = true; - this.btnsbloadcancel.Click += new System.EventHandler(this.btnsbloadcancel_Click); - // - // btnsbloadok - // - this.btnsbloadok.Location = new System.Drawing.Point(870, 600); - this.btnsbloadok.Name = "btnsbloadok"; - this.btnsbloadok.Size = new System.Drawing.Size(75, 23); - this.btnsbloadok.TabIndex = 0; - this.btnsbloadok.Text = "Öffnen"; - this.btnsbloadok.UseVisualStyleBackColor = true; - this.btnsbloadok.Click += new System.EventHandler(this.bntsbloadok_Click); - // - // panel1 - // - this.panel1.Controls.Add(this.label1); - this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(953, 47); - this.panel1.TabIndex = 1; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(385, 13); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(183, 25); - this.label1.TabIndex = 0; - this.label1.Text = "Serienbrief öffnen"; - // // panelLoad // this.panelLoad.BackColor = System.Drawing.Color.Silver; @@ -781,7 +781,7 @@ this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.Location = new System.Drawing.Point(12, 37); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(561, 25); + this.label4.Size = new System.Drawing.Size(469, 20); this.label4.TabIndex = 0; this.label4.Text = "Serienbrief wird initialisiert - bitte einen Moment warten...."; // @@ -824,33 +824,33 @@ this.erneutGenerierenToolStripMenuItem, this.vorschauToolStripMenuItem}); this.ctxmenuEmpfaenger.Name = "ctxmenuEmpfaenger"; - this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(248, 100); + this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(211, 92); // // partnerHinzufügenToolStripMenuItem // this.partnerHinzufügenToolStripMenuItem.Name = "partnerHinzufügenToolStripMenuItem"; - this.partnerHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(247, 24); + this.partnerHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.partnerHinzufügenToolStripMenuItem.Text = "Partner hinzufügen"; this.partnerHinzufügenToolStripMenuItem.Click += new System.EventHandler(this.partnerHinzufügenToolStripMenuItem_Click); // // partnerLöschenToolStripMenuItem // this.partnerLöschenToolStripMenuItem.Name = "partnerLöschenToolStripMenuItem"; - this.partnerLöschenToolStripMenuItem.Size = new System.Drawing.Size(247, 24); + this.partnerLöschenToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.partnerLöschenToolStripMenuItem.Text = "Partner löschen"; this.partnerLöschenToolStripMenuItem.Click += new System.EventHandler(this.partnerLöschenToolStripMenuItem_Click); // // erneutGenerierenToolStripMenuItem // this.erneutGenerierenToolStripMenuItem.Name = "erneutGenerierenToolStripMenuItem"; - this.erneutGenerierenToolStripMenuItem.Size = new System.Drawing.Size(247, 24); + this.erneutGenerierenToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.erneutGenerierenToolStripMenuItem.Text = "Generierung zurücksetzen"; this.erneutGenerierenToolStripMenuItem.Click += new System.EventHandler(this.erneutGenerierenToolStripMenuItem_Click); // // vorschauToolStripMenuItem // this.vorschauToolStripMenuItem.Name = "vorschauToolStripMenuItem"; - this.vorschauToolStripMenuItem.Size = new System.Drawing.Size(247, 24); + this.vorschauToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.vorschauToolStripMenuItem.Text = "Vorschau"; this.vorschauToolStripMenuItem.Click += new System.EventHandler(this.vorschauToolStripMenuItem_Click); // @@ -954,34 +954,34 @@ this.druckstapelAufbereitenToolStripMenuItem, this.archivierenUndAbschliessenToolStripMenuItem}); this.ctxmenutree.Name = "ctxmenutree"; - this.ctxmenutree.Size = new System.Drawing.Size(316, 100); + this.ctxmenutree.Size = new System.Drawing.Size(266, 92); this.ctxmenutree.Opening += new System.ComponentModel.CancelEventHandler(this.ctxmenutree_Opening); // // partnerlistePrüfenToolStripMenuItem // this.partnerlistePrüfenToolStripMenuItem.Name = "partnerlistePrüfenToolStripMenuItem"; - this.partnerlistePrüfenToolStripMenuItem.Size = new System.Drawing.Size(315, 24); + this.partnerlistePrüfenToolStripMenuItem.Size = new System.Drawing.Size(265, 22); this.partnerlistePrüfenToolStripMenuItem.Text = "Partnerliste prüfen"; this.partnerlistePrüfenToolStripMenuItem.Click += new System.EventHandler(this.partnerlistePrüfenToolStripMenuItem_Click); // // dokumentgenerierungZurücksetzenToolStripMenuItem // this.dokumentgenerierungZurücksetzenToolStripMenuItem.Name = "dokumentgenerierungZurücksetzenToolStripMenuItem"; - this.dokumentgenerierungZurücksetzenToolStripMenuItem.Size = new System.Drawing.Size(315, 24); + this.dokumentgenerierungZurücksetzenToolStripMenuItem.Size = new System.Drawing.Size(265, 22); this.dokumentgenerierungZurücksetzenToolStripMenuItem.Text = "Dokumentgenerierung zurücksetzen"; this.dokumentgenerierungZurücksetzenToolStripMenuItem.Click += new System.EventHandler(this.dokumentgenerierungZurücksetzenToolStripMenuItem_Click); // // druckstapelAufbereitenToolStripMenuItem // this.druckstapelAufbereitenToolStripMenuItem.Name = "druckstapelAufbereitenToolStripMenuItem"; - this.druckstapelAufbereitenToolStripMenuItem.Size = new System.Drawing.Size(315, 24); + this.druckstapelAufbereitenToolStripMenuItem.Size = new System.Drawing.Size(265, 22); this.druckstapelAufbereitenToolStripMenuItem.Text = "Druckstapel aufbereiten"; this.druckstapelAufbereitenToolStripMenuItem.Click += new System.EventHandler(this.druckstapelAufbereitenToolStripMenuItem_Click); // // archivierenUndAbschliessenToolStripMenuItem // this.archivierenUndAbschliessenToolStripMenuItem.Name = "archivierenUndAbschliessenToolStripMenuItem"; - this.archivierenUndAbschliessenToolStripMenuItem.Size = new System.Drawing.Size(315, 24); + this.archivierenUndAbschliessenToolStripMenuItem.Size = new System.Drawing.Size(265, 22); this.archivierenUndAbschliessenToolStripMenuItem.Text = "Archivieren und abschliessen"; this.archivierenUndAbschliessenToolStripMenuItem.Click += new System.EventHandler(this.archivierenUndAbschliessenToolStripMenuItem_Click); // @@ -1391,14 +1391,14 @@ this.groupBox6.ResumeLayout(false); this.groupBox6.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.cbboxzustaendigmitarbeiter)).EndInit(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxverantwortlich)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).EndInit(); this.pnlLoad.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.sfdatagridsbload)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + this.groupBox5.ResumeLayout(false); + this.groupBox5.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.cbboxverantwortlich)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).EndInit(); this.panelLoad.ResumeLayout(false); this.panelLoad.PerformLayout(); this.GrpEmpfaenger.ResumeLayout(false); diff --git a/Client/UIControls/Serienbrief.cs b/Client/UIControls/Serienbrief.cs index b18f0d2d..6bf632cc 100644 --- a/Client/UIControls/Serienbrief.cs +++ b/Client/UIControls/Serienbrief.cs @@ -62,6 +62,7 @@ namespace OnDoc.UIControls private int serienbriefnr = 0; private DOCGEN.DocGen dg = null; private DOCGEN.DocGet dget = null; + private bool ResetSignature = false; SerienbriefBearbeitung sbedit; //private DataSet dsempfaenger = new DataSet(); private int selectedsbnr = 0; @@ -232,6 +233,7 @@ namespace OnDoc.UIControls ribbonbuttonloadtemplate.Enabled = enabled; ribbonbuttonsavetemplate.Enabled = enabled; + } if (type == 4) { @@ -273,6 +275,7 @@ namespace OnDoc.UIControls this.ribbonPanel3.Enabled = enabled; this.ribbonPanel5.Enabled = enabled; this.ribbonPanel6.Enabled = enabled; + this.ribbonPanel7.Enabled = enabled; this.ribbonPanel8.Enabled = enabled; this.ribbonPanel9.Enabled = enabled; @@ -338,7 +341,7 @@ namespace OnDoc.UIControls ExcelEngine excelEngine = new ExcelEngine(); IApplication application = excelEngine.Excel; IWorkbook workbook = application.Workbooks.Open(filename); - IWorksheet sheet = workbook.Worksheets[0]; + IWorksheet sheet = workbook.Worksheets[sheetname]; importdata = sheet.ExportDataTable(sheet.UsedRange, ExcelExportDataTableOptions.ColumnNames); sheet = null; workbook.Close(); @@ -379,7 +382,7 @@ namespace OnDoc.UIControls else { selected_sheetname = sheets[0]; } Import_sf_Excel(openFileDialog1.FileName, selected_sheetname, ref importdata); - + importdata.Columns[0].ColumnName = "Partnernr"; //reader.Excel_To_Datatabable(openFileDialog1.FileName, selected_sheetname, true, ref importdata); init_progressbar("Daten importieren", importdata.Rows.Count); if (importdata.Rows.Count > 2500) @@ -392,9 +395,9 @@ namespace OnDoc.UIControls MessageBox.Show("Die ausgewählten Daten können nicht verwendet werden.", "Import", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - if (importdata.Columns[0].Caption != "Partnernr") + if (importdata.Columns[0].Caption != "Partnernr" && importdata.Columns[0].Caption != "Kundenr" && importdata.Columns[0].Caption != "Kunden-Nr") { - MessageBox.Show("Die importierten Daten enthalten keine Spalte 'Partnernr'. Der Vorgang wird abgebrochen.", "Import", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Die importierten Daten enthalten keine Spalte 'Partnernr' oder 'Kundenr'. Der Vorgang wird abgebrochen.", "Import", MessageBoxButtons.OK, MessageBoxIcon.Error); importdata.Rows.Clear(); importdata.Columns.Clear(); return; @@ -830,6 +833,7 @@ namespace OnDoc.UIControls } private void update_serienbriefdaten(bool newsb) { + sb.bezeichnung = this.txtbezeichnung.Text; sb.verantwortlich = Convert.ToInt32(this.cbboxverantwortlich.SelectedValue.ToString()); try @@ -881,6 +885,8 @@ namespace OnDoc.UIControls try { sb.unterschriftrechts = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue.ToString()); } catch { sb.unterschriftrechts = 0; } try { if (cbboxunterschriftlinks.Text.Trim() == "") { sb.unterschriftlinks = 0; } } catch { sb.unterschriftlinks = 0; } try { if (cbboxunterschriftrechts.Text.Trim() == "") { sb.unterschriftrechts = 0; } } catch { sb.unterschriftrechts = 0; } + if (GrpDokumentInhalt.Enabled == true) + { try { if (cbdigitaleunterschrfiten.Checked) @@ -914,6 +920,7 @@ namespace OnDoc.UIControls sb.ohneunterschrift = 0; } + } try { sb.team = Convert.ToInt32(cbboxteam.SelectedValue.ToString()); } catch { sb.team = 0; } sb.archivdatum = Convert.ToDateTime(DateDokumentDatum.Value); @@ -1142,6 +1149,16 @@ namespace OnDoc.UIControls sb.barcode_fontsize = AppParams.barcodefontsize; sb.barcode_textposition = AppParams.barcodetextposition; sb.barcode_zusatz = ""; + + db.Get_Tabledata("Select bezeichnung,office_vorlagenr, isnull(vertrag,0) as vertrag, isnull(physisches_archiv,0) as archiv from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true); + sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString(); + sb.officevorlagenr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]); + sb.vertrag = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]); + + db.Get_Tabledata("Select beschreibung from physischesarchiv where physischesarchivnr = " + db.dsdaten.Tables[0].Rows[0][3].ToString(), false, true); + sb.barcode_zusatz = db.dsdaten.Tables[0].Rows[0][0].ToString(); + if (sb.barcode_zusatz != "") { sb.barcode_zusatz = " " + sb.barcode_zusatz; } + sb.filename = db.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir); @@ -1151,6 +1168,7 @@ namespace OnDoc.UIControls enable_disable_functions(6, false); if (sb.status == 1) { enable_disable_functions(7, false); } db = null; + ResetSignature = false; } private void update_screen() { @@ -1855,7 +1873,8 @@ namespace OnDoc.UIControls if (vorschauid != -1 && Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid) { - string pdfdoc_preview = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey)); + //string pdfdoc_preview = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey)); + string pdfdoc_preview = dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey); if (!sbmain) { sbedit.Update_Preview(pdfdoc_preview); @@ -1870,8 +1889,8 @@ namespace OnDoc.UIControls } else { - string pdfdoc = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey)); - + //string pdfdoc = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey)); + string pdfdoc = dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey); fh.SaveBase64ToFile(pdfdoc, AppParams.tempdir + filename); db.save_serienbrief_datei(sb.serienbriefnr, Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]), AppParams.tempdir + filename, dokumentid); System.IO.File.Delete(AppParams.tempdir + filename); @@ -2150,7 +2169,15 @@ namespace OnDoc.UIControls DataView dv = new DataView(sb.dsempfaenger.Tables[0]); - dv.RowFilter = "Status = 1"; + dv.RowFilter = "Status = 1 and BLKUNDE = 0"; + dv.RowFilter = "BLKUNDE <> 0"; + if (dv.Count > 0) + { + btnblexport.Visible = true; + System.Windows.Forms.Application.DoEvents(); + + } + dv.RowFilter = "Status = 1 and BLKUNDE = 0"; dv.Sort = "Partnernr"; PdfDocument finalDoc = new PdfDocument(); @@ -2206,6 +2233,7 @@ namespace OnDoc.UIControls } } } + save_stapel(stapel, ref streams); } //if (blcount > 0) @@ -2998,5 +3026,9 @@ namespace OnDoc.UIControls { } + + + + } } diff --git a/Client/UIControls/Serienbrief.resx b/Client/UIControls/Serienbrief.resx index 863e51f6..9111fe0b 100644 --- a/Client/UIControls/Serienbrief.resx +++ b/Client/UIControls/Serienbrief.resx @@ -133,19 +133,19 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC + vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC + vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== + vQAADr0BR/uQrQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== diff --git a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs index 831814f0..cd5cc8d6 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs @@ -80,6 +80,9 @@ this.lblPostzustellung = new System.Windows.Forms.Label(); this.btnErneutGenerierung = new System.Windows.Forms.Button(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.ChkTagesEndArchivierung = new System.Windows.Forms.CheckBox(); + this.lblautomaarchivierung1 = new System.Windows.Forms.Label(); + this.lblautomarchivierung2 = new System.Windows.Forms.Label(); this.GrpPartner.SuspendLayout(); this.groupBox5.SuspendLayout(); this.groupBox6.SuspendLayout(); @@ -234,9 +237,9 @@ this.GrpVerwendung.Controls.Add(this.rbDokumentbearbeiten); this.GrpVerwendung.Controls.Add(this.rbEditlater); this.GrpVerwendung.Controls.Add(this.rbasPDFarchivieren); - this.GrpVerwendung.Location = new System.Drawing.Point(579, 93); + this.GrpVerwendung.Location = new System.Drawing.Point(579, 124); this.GrpVerwendung.Name = "GrpVerwendung"; - this.GrpVerwendung.Size = new System.Drawing.Size(459, 113); + this.GrpVerwendung.Size = new System.Drawing.Size(459, 82); this.GrpVerwendung.TabIndex = 23; this.GrpVerwendung.TabStop = false; this.GrpVerwendung.Text = "Dokumentvewendung"; @@ -323,18 +326,18 @@ // // txtbezeichnung // - this.txtbezeichnung.Location = new System.Drawing.Point(684, 14); + this.txtbezeichnung.Location = new System.Drawing.Point(715, 14); this.txtbezeichnung.Name = "txtbezeichnung"; - this.txtbezeichnung.Size = new System.Drawing.Size(354, 20); + this.txtbezeichnung.Size = new System.Drawing.Size(323, 20); this.txtbezeichnung.TabIndex = 18; // // 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(684, 40); + this.cbboxverantwortlich.Location = new System.Drawing.Point(715, 40); this.cbboxverantwortlich.Name = "cbboxverantwortlich"; - this.cbboxverantwortlich.Size = new System.Drawing.Size(354, 19); + this.cbboxverantwortlich.Size = new System.Drawing.Size(323, 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 = 21; @@ -664,10 +667,42 @@ this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // + // ChkTagesEndArchivierung + // + this.ChkTagesEndArchivierung.AutoSize = true; + this.ChkTagesEndArchivierung.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.ChkTagesEndArchivierung.Location = new System.Drawing.Point(716, 70); + this.ChkTagesEndArchivierung.Name = "ChkTagesEndArchivierung"; + this.ChkTagesEndArchivierung.Size = new System.Drawing.Size(15, 14); + this.ChkTagesEndArchivierung.TabIndex = 26; + this.ChkTagesEndArchivierung.UseVisualStyleBackColor = true; + this.ChkTagesEndArchivierung.VisibleChanged += new System.EventHandler(this.ChkTagesEndArchivierung_VisibleChanged); + // + // lblautomaarchivierung1 + // + this.lblautomaarchivierung1.AutoSize = true; + this.lblautomaarchivierung1.Location = new System.Drawing.Point(573, 69); + this.lblautomaarchivierung1.Name = "lblautomaarchivierung1"; + this.lblautomaarchivierung1.Size = new System.Drawing.Size(133, 13); + this.lblautomaarchivierung1.TabIndex = 27; + this.lblautomaarchivierung1.Text = "Automatische Archivierung"; + // + // lblautomarchivierung2 + // + this.lblautomarchivierung2.AutoSize = true; + this.lblautomarchivierung2.Location = new System.Drawing.Point(574, 84); + this.lblautomarchivierung2.Name = "lblautomarchivierung2"; + this.lblautomarchivierung2.Size = new System.Drawing.Size(131, 13); + this.lblautomarchivierung2.TabIndex = 28; + this.lblautomarchivierung2.Text = "bei Tagesendverarbeitung"; + // // UCAllgemeineDokumentParam // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lblautomarchivierung2); + this.Controls.Add(this.lblautomaarchivierung1); + this.Controls.Add(this.ChkTagesEndArchivierung); this.Controls.Add(this.btnErneutGenerierung); this.Controls.Add(this.GrpInhalt); this.Controls.Add(this.GrpVerwendung); @@ -765,5 +800,8 @@ private System.Windows.Forms.TextBox DateTerminText; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.Label lblohneUnterschrift; + private System.Windows.Forms.CheckBox ChkTagesEndArchivierung; + private System.Windows.Forms.Label lblautomaarchivierung1; + private System.Windows.Forms.Label lblautomarchivierung2; } } diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs index baa429b7..e9b9e204 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.cs @@ -32,6 +32,7 @@ using Syncfusion.WinForms.Input; using System.Globalization; using System.Threading; using System.ComponentModel.Design; +using Syncfusion.Windows.Forms.Tools.Win32API; namespace OnDoc.UIControls @@ -76,6 +77,7 @@ namespace OnDoc.UIControls public bool FillOffice = false; public string CompatibilityMode = ""; public bool signiert = false; + public string dokumentid { get; set; } = ""; @@ -562,24 +564,27 @@ namespace OnDoc.UIControls } private void Refresh_Team(int id = 0) { - - DB dbteam = new DB(AppParams.connectionstring); - dbteam.clear_parameter(); - dbteam.add_parameter("@profilnr", profilnr.ToString()); - if (id == 0) - { - dbteam.add_parameter("@mitarbeiternr", cbboxzustaendigmitarbeiter.SelectedValue.ToString()); - } - else + try { - dbteam.add_parameter("@mitarbeiternr", id.ToString()); + DB dbteam = new DB(AppParams.connectionstring); + dbteam.clear_parameter(); + dbteam.add_parameter("@profilnr", profilnr.ToString()); + if (id == 0) + { + dbteam.add_parameter("@mitarbeiternr", cbboxzustaendigmitarbeiter.SelectedValue.ToString()); + } + else + { + dbteam.add_parameter("@mitarbeiternr", id.ToString()); + } + dbteam.Get_Tabledata("sp_dokumentbearbeitung_team", true, false); + cbboxteam.DataSource = null; + cbboxteam.DataSource = dbteam.dsdaten.Tables[0]; + cbboxteam.ValueMember = "teamnr"; + cbboxteam.DisplayMember = "bezeichnung"; + cbboxteam.SelectedIndex = 0; } - dbteam.Get_Tabledata("sp_dokumentbearbeitung_team", true, false); - cbboxteam.DataSource = null; - cbboxteam.DataSource = dbteam.dsdaten.Tables[0]; - cbboxteam.ValueMember = "teamnr"; - cbboxteam.DisplayMember = "bezeichnung"; - cbboxteam.SelectedIndex = 0; + catch { } } public void Set_Edit_later() @@ -821,6 +826,7 @@ namespace OnDoc.UIControls dokdata.Erstellung_in_Office = this.Erstellung_in_Office; dokdata.FillOffice = this.FillOffice; dokdata.CompatibilityMode = this.CompatibilityMode; + if (dokdata.Barcode == false && this.bedingt_retournierbar == true) { dokdata.Barcode = true; } if (DateTerminText.Text == "") @@ -874,6 +880,11 @@ namespace OnDoc.UIControls dokdata.sign = true; } } + dokdata.AutomArchivierung = false; + if (this.ChkTagesEndArchivierung.Visible) + { + if (this.ChkTagesEndArchivierung.Checked) { dokdata.AutomArchivierung = true; } + } } private void sfButton1_Click(object sender, EventArgs e) @@ -897,7 +908,7 @@ namespace OnDoc.UIControls private void UCAllgemeineDokumentParam_Load(object sender, EventArgs e) { - + this.ChkTagesEndArchivierung.Visible = AppParams.AutomArchivierung; } private void gridDokwertlist_CellDoubleClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) @@ -1176,7 +1187,6 @@ namespace OnDoc.UIControls if (Convert.ToDateTime(dr["termin"]).Year < 2000) { this.DateTerminText.Text = ""; - } else { @@ -1186,6 +1196,14 @@ namespace OnDoc.UIControls this.signiert = Convert.ToBoolean(dr["signiert"]) == true; this.cbfaksimile.Checked = Convert.ToBoolean(dr["faksimile"]) == true; + try + { + this.ChkTagesEndArchivierung.Checked = Convert.ToBoolean(dr["automatischearchivierung"]); + } + catch + { + this.ChkTagesEndArchivierung.Checked = false; + } if (dr["zustelladresse"].ToString() != "") this.txtPartnerZusteller.Text = dr["zustelladresse"].ToString(); @@ -1205,5 +1223,11 @@ namespace OnDoc.UIControls { DateTermin.MonthCalendar.FirstDayOfWeek=DayOfWeek.Monday; } + + private void ChkTagesEndArchivierung_VisibleChanged(object sender, EventArgs e) + { + lblautomaarchivierung1.Visible = ChkTagesEndArchivierung.Visible; + lblautomarchivierung2.Visible = ChkTagesEndArchivierung.Visible; + } } } diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index 00742519..85d89af5 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 7ddfd298..3f4f2bdf 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 7280b31e..ca7f2ad0 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 18e13af0..966f2720 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 709316af..bf71e439 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 47969700..3536bbbd 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 0b66ba8a..db4f52e0 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 aff540a3..39327685 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/OnDocClient.zip b/Client/bin/Debug/OnDocClient.zip index 0f25a40a..1e19383e 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index 0899c76b..09494a6c 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 148f04fb..f9e0c5bd 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 5d47de64..5a13ae12 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources index b72f7eba..2031307b 100644 Binary files a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources and b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources differ diff --git a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources index 3cedfc57..4550ceba 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 0b66ba8a..db4f52e0 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 aff540a3..39327685 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 0c91142a..510dca0a 100644 Binary files a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index 0899c76b..09494a6c 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 e41ab6b6..6fe8175d 100644 --- a/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs +++ b/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs @@ -119,7 +119,7 @@ if (docdata.Bezeichnung.Contains("QDF")) dt.Rows[0][0] = fh.Base64FromFile(filename); ws = null; } - dok.dokument = sfword.Generate_Word(dt.Rows[0][0].ToString(), docdata); + dok.dokument = sfword.Generate_Word(dt.Rows[0][0].ToString(), docdata,"","","",false,editdoc); Logging.Logging.Debug("Generate_Word", "Ende", dokumentid); Thread.Sleep(OfficeSleep); } diff --git a/DOCGEN/Klassen/SyncFWord.cs b/DOCGEN/Klassen/SyncFWord.cs index c894e6d9..b3b19602 100644 --- a/DOCGEN/Klassen/SyncFWord.cs +++ b/DOCGEN/Klassen/SyncFWord.cs @@ -226,7 +226,7 @@ namespace DOCGEN.Klassen // signature.OwnerParagraph.AppendPicture(img); mssign = null; } - public string Generate_Word(string base64, clsDocData docdata, string img_UL = "", string img_UR = "", string img_faktura = "", bool serienbrief=false) + public string Generate_Word(string base64, clsDocData docdata, string img_UL = "", string img_UR = "", string img_faktura = "", bool serienbrief=false, bool editdoc=false) { string formattype = ""; MemoryStream ms = new MemoryStream(Helper.EncodeExtensions.DecodeBase642ByteArray(base64)); @@ -275,7 +275,8 @@ namespace DOCGEN.Klassen if (docdata.Barcode == true) { - Insert_Barcode(document, docdata); + //20250531 - Barcode nicht beim Serienbrief + if (!serienbrief && !editdoc) Insert_Barcode(document, docdata); } if (docdata.PrintLogo == true) { @@ -543,26 +544,56 @@ namespace DOCGEN.Klassen } if (dm.BookMark != "") { - if (document.ProtectionType == ProtectionType.NoProtection) + string variable = ""; + string inhalt = ""; + + if (dm.BookMark.Contains(":")) { - WParagraph paragraph = document.Sections[0].Paragraphs[0] as WParagraph; - //BookmarkStart bookmarkStart = new BookmarkStart(document, dm.BookMark); - //paragraph.Items.Insert(0, bookmarkStart); + string phrase = dm.BookMark; + string[] parts = phrase.Split(':'); + variable= parts[0]; + inhalt= parts[1]; + } else { } - BookmarkStart bookmarkStart = new BookmarkStart(document, dm.BookMark); - BookmarkEnd bookmarkEnd = new BookmarkEnd(document, dm.BookMark); - paragraph.Items.Insert(0, bookmarkStart); - paragraph.Items.Insert(2, bookmarkEnd); + if (document.ProtectionType == ProtectionType.NoProtection) + { + if (variable != "") + { + try + { + document.Variables.Add(variable, inhalt); + } + catch { } + } + if (variable == "") + { + WParagraph paragraph = document.Sections[0].Paragraphs[0] as WParagraph; + BookmarkStart bookmarkStart = new BookmarkStart(document, dm.BookMark); + BookmarkEnd bookmarkEnd = new BookmarkEnd(document, dm.BookMark); + paragraph.Items.Insert(0, bookmarkStart); + paragraph.Items.Insert(1, bookmarkEnd); + } } else { document.Protect(ProtectionType.NoProtection, "Australia"); - WParagraph paragraph = document.Sections[0].Paragraphs[0] as WParagraph; - BookmarkStart bookmarkStart = new BookmarkStart(document, dm.BookMark); - BookmarkEnd bookmarkEnd = new BookmarkEnd(document, dm.BookMark); - paragraph.Items.Insert(0, bookmarkStart); - paragraph.Items.Insert(2, bookmarkEnd); + if (variable != "") + { + try + { + document.Variables.Add(variable, inhalt); + } + catch { } + } + if (variable == "") + { + WParagraph paragraph = document.Sections[0].Paragraphs[0] as WParagraph; + BookmarkStart bookmarkStart = new BookmarkStart(document, dm.BookMark); + BookmarkEnd bookmarkEnd = new BookmarkEnd(document, dm.BookMark); + paragraph.Items.Insert(0, bookmarkStart); + paragraph.Items.Insert(1, bookmarkEnd); + } document.Protect(ProtectionType.AllowOnlyFormFields, "Australia"); } } @@ -885,7 +916,112 @@ namespace DOCGEN.Klassen } } + public System.Drawing.Image Get_Barcodeimage(clsDocData docData) + { + System.Drawing.Image barcodeimage; + BarcodeLib.Barcode Barcode = new BarcodeLib.Barcode(); + switch (docData.barcode_type) + { + case "0": + barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5, docData.Dokumentid.Substring(6, 16), docData.Dokumentid.Substring(6, 16) + docData.barcode_zusatz, docData.barcode_textposition, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize), 0); + BarcodeLib.clsBarI25 barbarcode = new BarcodeLib.clsBarI25(); + if (docData.barcode_horizontal == 0) + { + barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 66, 600, 100, docData.barcode_zusatz, "Futur Book", 16, 270); + } + else + { + barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 66, 600, 100, docData.barcode_zusatz, "Futur Book", 16, 0); + } + //barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5C, docData.Dokumentid.Substring(9, 13), docData.Dokumentid.Substring(6, 16) + docData.barcode_zusatz, docData.barcode_textposition, docData.barcode_font, Convert.ToInt32(docData.barcode_fontsize), 0); + + return barcodeimage; + break; + case "1": + barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAscii, docData.barcode_content, 6, 6, 0, "Right", docData.barcode_text + docData.barcode_zusatz, docData.Zusatz_Font, docData.Zusatz_FontSize); + barcodeimage = AutoSizeImage(barcodeimage, docData.barcode_width, docData.barcode_height, false); + return barcodeimage; + break; + default: + barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5C, docData.Dokumentid.Substring(9, 13), docData.Dokumentid.Substring(6, 16) + docData.barcode_zusatz, docData.barcode_textposition, docData.barcode_font, Convert.ToInt32(docData.barcode_fontsize), 0); + return barcodeimage; + break; + } + // System.Drawing.Image barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5C, docData.Dokumentid.Substring(9, 13), docData.Dokumentid.Substring(9, 13), docData.barcode_textposition "Below", "Arial", 6, 0); + + } public void Insert_Barcode(WordDocument document, clsDocData docData) + { + System.Drawing.Image barcodeimage; + barcodeimage = Get_Barcodeimage(docData); + System.Drawing.Image barcodeimage2; + barcodeimage2 = barcodeimage; + + + + WPicture picture = new WPicture(document); + WPicture picture2 = new WPicture(document); + picture.LoadImage(barcodeimage); + picture2.LoadImage(barcodeimage); + + picture.VerticalPosition = docData.barcode_left; + picture.HorizontalPosition = docData.barcode_top; + picture.HorizontalOrigin = HorizontalOrigin.Page; + picture.VerticalOrigin = VerticalOrigin.Page; + picture.TextWrappingStyle = TextWrappingStyle.Square; + picture.TextWrappingType = TextWrappingType.Largest; + picture2.VerticalPosition = docData.barcode_left; + picture2.HorizontalPosition = docData.barcode_top; + picture2.HorizontalOrigin = HorizontalOrigin.Page; + picture2.VerticalOrigin = VerticalOrigin.Page; + picture2.TextWrappingStyle = TextWrappingStyle.Square; + picture2.TextWrappingType = TextWrappingType.Largest; + + if (docData.barcode_horizontal == 0) + { + picture.Rotation = 0; + picture.Height = docData.barcode_height; ; + picture.Width = docData.barcode_width; + picture.VerticalPosition = docData.barcode_top; ; + picture.HorizontalPosition = docData.barcode_left; + picture2.Rotation = 0; + picture2.Height = docData.barcode_height; ; + picture2.Width = docData.barcode_width; + picture2.VerticalPosition = docData.barcode_top; ; + picture2.HorizontalPosition = docData.barcode_left; + } + else + { + picture.Rotation = 0; + picture.Height = docData.barcode_height; + picture.Width = docData.barcode_width; + picture.VerticalPosition = docData.barcode_top; ; + picture.HorizontalPosition = docData.barcode_left; + picture2.Rotation = 0; + picture2.Height = docData.barcode_height; + picture2.Width = docData.barcode_width; + picture2.VerticalPosition = docData.barcode_top; ; + picture2.HorizontalPosition = docData.barcode_left; + } + if (docData.barcode_type == "0") + { + } + + //foreach (IWSection section in document.Sections) + //{ + IWSection section = document.Sections[0]; + if (section.PageSetup.DifferentFirstPage == true) + { + WParagraph FirstfooterPar = new WParagraph(document); + FirstfooterPar.ChildEntities.Add(picture); + section.HeadersFooters.FirstPageFooter.Paragraphs.Add(FirstfooterPar); + } + WParagraph footerPar = new WParagraph(document); + footerPar.ChildEntities.Add(picture2); + section.HeadersFooters.Footer.Paragraphs.Add(footerPar); + //} + } + public void xInsert_Barcode(WordDocument document, clsDocData docData) { System.Drawing.Image barcodeimage; BarcodeLib.Barcode Barcode = new BarcodeLib.Barcode(); @@ -894,7 +1030,6 @@ namespace DOCGEN.Klassen case "0": //int rotation = 0; //if (docData.barcode_horizontal == 0) { rotation = 270; } - barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5, docData.Dokumentid.Substring(6, 16), docData.Dokumentid.Substring(6, 16) + docData.barcode_zusatz, docData.barcode_textposition, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize), 0); BarcodeLib.clsBarI25 barbarcode = new BarcodeLib.clsBarI25(); //barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 36, 350, 50, " "+docData.barcode_zusatz, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize), 0); @@ -906,16 +1041,17 @@ namespace DOCGEN.Klassen if (docData.barcode_horizontal == 0) { - barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 300, 50, docData.barcode_zusatz, "Futur Book", 8,270); + barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 66, 600, 100, docData.barcode_zusatz, "Futur Book", 16,0); //barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 429, 52, docData.barcode_zusatz, "Futur Book", 8, 270); } else { - barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 300, 50, docData.barcode_zusatz, "Futur Book", 8, 0); + barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 66, 600, 100, docData.barcode_zusatz, "Futur Book", 16, 0); //barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 429, 52, docData.barcode_zusatz, "Futur Book", 8, 0); } + //barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5, docData.Dokumentid.Substring(6, 16), docData.Dokumentid.Substring(6, 16) + docData.barcode_zusatz, docData.barcode_textposition, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize), 0); //barcodeimage = ScaleImage(barcodeimage, docData.barcode_width, docData.barcode_height); //barcodeimage = resizeImage(barcodeimage, new Size(docData.barcode_width,docData.barcode_height)); @@ -947,6 +1083,7 @@ namespace DOCGEN.Klassen WPicture picture = new WPicture(document); picture.LoadImage(barcodeimage); + //picture.Height = docData.barcode_height; //picture.Width = docData.barcode_width; @@ -961,9 +1098,9 @@ namespace DOCGEN.Klassen //picture.Height = barcodeimage.Height; if (docData.barcode_horizontal == 0) { - picture.Rotation = 0; - // picture.Height = docData.barcode_width; - //picture.Width = docData.barcode_height; + picture.Rotation = 270; + picture.Height = docData.barcode_height; ; + picture.Width = docData.barcode_width; picture.VerticalPosition = docData.barcode_top; ; picture.HorizontalPosition = docData.barcode_left; @@ -994,11 +1131,11 @@ namespace DOCGEN.Klassen section.HeadersFooters.Footer.AddParagraph().ChildEntities.Add(picture); section.HeadersFooters.FirstPageFooter.AddParagraph().ChildEntities.Add(picture2); - if (section.HeadersFooters.FirstPageFooter.Paragraphs.Count < 1) - { - section.HeadersFooters.FirstPageFooter.AddParagraph(); - section.HeadersFooters.FirstPageFooter.Paragraphs[0].ChildEntities.Add(picture); - } + //if (section.HeadersFooters.FirstPageFooter.Paragraphs.Count < 1) + //{ + section.HeadersFooters.FirstPageFooter.AddParagraph(); + section.HeadersFooters.FirstPageFooter.Paragraphs[0].ChildEntities.Add(picture); + //} Syncfusion.DocIO.DLS.IWParagraph paragraph = section.Body.LastParagraph; diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index 00742519..85d89af5 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 7ddfd298..3f4f2bdf 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 7280b31e..ca7f2ad0 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 18e13af0..966f2720 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 709316af..bf71e439 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 47969700..3536bbbd 100644 Binary files a/DOCGEN/bin/Debug/Model.pdb and b/DOCGEN/bin/Debug/Model.pdb differ diff --git a/DOCGEN/clsDocGen.cs b/DOCGEN/clsDocGen.cs index 9b88fb6d..2e92facc 100644 --- a/DOCGEN/clsDocGen.cs +++ b/DOCGEN/clsDocGen.cs @@ -117,6 +117,8 @@ namespace DOCGEN return Convert.ToBase64String(bytes); } } + + public string generate_serienbrief(string vorlage,serienbrief sb, string dokumentid, string resturi, string apikey) { SyncFWord sfword = new SyncFWord(resturi,apikey); @@ -145,8 +147,45 @@ namespace DOCGEN dd.barcode_text = sb.barcode_text; dok.dokument = sfword.Generate_Word(vorlage,dd, sb.img_unterschriftlinks,sb.img_unterschrfitrechts,sb.img_faktura,true); + DocGet dget = new DocGet(this.connectionstring); + string pdfdoc = dget.Convert_Word_To_PDF(dok.dokument); + if (dd.Barcode) + { + + System.Drawing.Image barcode = sfword.Get_Barcodeimage(dd); + + var stream = new MemoryStream(Convert.FromBase64String(pdfdoc)); + PdfLoadedDocument loadedDocument = new PdfLoadedDocument(stream); + PdfBitmap image = new PdfBitmap(barcode); + for (int i = 0; i < loadedDocument.Pages.Count; i++) + { + PdfLoadedPage loadedPage = loadedDocument.Pages[i] as PdfLoadedPage; + PdfGraphics graphics = loadedPage.Graphics; + if (dd.barcode_horizontal == 1) + { + graphics.DrawImage(image, dd.barcode_left, dd.barcode_top, dd.barcode_width, dd.barcode_height); + } + else + { + graphics.DrawImage(image, dd.barcode_left, dd.barcode_top, dd.barcode_width, dd.barcode_height); + } + } + loadedDocument.ConvertToPDFA(PdfConformanceLevel.Pdf_A1B); + MemoryStream outputStream = new MemoryStream(); + loadedDocument.Save(outputStream); + byte[] bytes; + bytes = outputStream.ToArray(); + dok.dokument = Convert.ToBase64String(bytes); + dget = null; + outputStream = null; + + } else + { + dok.dokument = pdfdoc; + } db = null; - dok.doktype = "W"; + + dok.doktype = "P"; sfword = null; return dok.dokument; diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index 00742519..85d89af5 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 7ddfd298..3f4f2bdf 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 89c25863..f3f330ba 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 7280b31e..ca7f2ad0 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 18e13af0..966f2720 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 709316af..bf71e439 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 47969700..3536bbbd 100644 Binary files a/Database/bin/Debug/Model.pdb and b/Database/bin/Debug/Model.pdb differ diff --git a/Database/db.cs b/Database/db.cs index 2efb5bba..ff40e4f6 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -643,11 +643,16 @@ namespace Database if (DocData.As_Faksimile == "True") { as_faksimile = 1; } int signiert = 0; if (DocData.sign==true) { signiert = 1; } + int automarchivierung = 0; + if (DocData.AutomArchivierung == true) + { + automarchivierung = 1; + } //if (bearbeitung_zwingend == 4) { bearbeitung_zwingend = 1; } else { bearbeitung_zwingend = 0; } //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() + ", signiert="+signiert.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() + ", signiert="+signiert.ToString()+ ", automatischearchivierung="+automarchivierung.ToString()+" where dokumentid = '" + dokumentid + "'"); try { diff --git a/Database/obj/Debug/Database.csproj.AssemblyReference.cache b/Database/obj/Debug/Database.csproj.AssemblyReference.cache index 1ee43b6b..12f436f8 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 7280b31e..ca7f2ad0 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 18e13af0..966f2720 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/Model/bin/Debug/Model.dll b/Model/bin/Debug/Model.dll index 709316af..bf71e439 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 47969700..3536bbbd 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 b37aefa0..fc940e5d 100644 --- a/Model/clsDocData.cs +++ b/Model/clsDocData.cs @@ -84,6 +84,8 @@ namespace Model public bool remove_signature { get; set; } = false; public bool sign { get; set; } = false; + public bool AutomArchivierung { get; set; } = false; + public List avq_authl_ref { get; set; } public string prefix { get; set; } = ""; diff --git a/Model/obj/Debug/Model.dll b/Model/obj/Debug/Model.dll index 709316af..bf71e439 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 47969700..3536bbbd 100644 Binary files a/Model/obj/Debug/Model.pdb and b/Model/obj/Debug/Model.pdb differ diff --git a/OnDoc.sln b/OnDoc.sln index 16c7f879..573874fa 100644 --- a/OnDoc.sln +++ b/OnDoc.sln @@ -81,6 +81,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Versandstrasse", "Versandst EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnDoc_Paketversand", "OnDoc_Paketversand\OnDoc_Paketversand.csproj", "{4E3AEF97-CD4B-4BE9-902B-A31EAE88AFCF}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnDoc_ArchivierungBatch", "OnDoc_ArchivierungBatch\OnDoc_ArchivierungBatch.csproj", "{8F9B5281-A768-432D-AD35-5BC449CD2452}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -231,6 +233,10 @@ Global {4E3AEF97-CD4B-4BE9-902B-A31EAE88AFCF}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E3AEF97-CD4B-4BE9-902B-A31EAE88AFCF}.Release|Any CPU.ActiveCfg = Release|Any CPU {4E3AEF97-CD4B-4BE9-902B-A31EAE88AFCF}.Release|Any CPU.Build.0 = Release|Any CPU + {8F9B5281-A768-432D-AD35-5BC449CD2452}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8F9B5281-A768-432D-AD35-5BC449CD2452}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8F9B5281-A768-432D-AD35-5BC449CD2452}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8F9B5281-A768-432D-AD35-5BC449CD2452}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/OnDocOffice/bin/Debug/DOCGEN.dll b/OnDocOffice/bin/Debug/DOCGEN.dll index 00742519..85d89af5 100644 Binary files a/OnDocOffice/bin/Debug/DOCGEN.dll and b/OnDocOffice/bin/Debug/DOCGEN.dll differ diff --git a/OnDocOffice/bin/Debug/DOCGEN.pdb b/OnDocOffice/bin/Debug/DOCGEN.pdb index 7ddfd298..3f4f2bdf 100644 Binary files a/OnDocOffice/bin/Debug/DOCGEN.pdb and b/OnDocOffice/bin/Debug/DOCGEN.pdb differ diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll index 7280b31e..ca7f2ad0 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 18e13af0..966f2720 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 709316af..bf71e439 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 47969700..3536bbbd 100644 Binary files a/OnDocOffice/bin/Debug/Model.pdb and b/OnDocOffice/bin/Debug/Model.pdb differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index 6a40cca2..2783a3e0 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs index 267d1158..91e14dfb 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a65bc81881f2d036f7b490e8eb2b230f02d71571")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+10343fcbabd0c4165f25b09b92018bde06f0a16f")] [assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache index 1126e9e8..e1f5598b 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache @@ -1 +1 @@ -4c3796d8f11570f6ae601ee600fbeec0828f6284afa106fd56104bfe28edf0c6 +248e3fd9127fde3cd15b5835c64d3570b5d49c4e462b80e3b827368b26cf53ef diff --git a/OnDoc_ArchivierungBatch/App.config b/OnDoc_ArchivierungBatch/App.config new file mode 100644 index 00000000..460dda13 --- /dev/null +++ b/OnDoc_ArchivierungBatch/App.config @@ -0,0 +1,57 @@ + + + + +
+
+ + + + + + + + + Data source=shu01\shu00;initial catalog=edoka_dms;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + + https://localhost:44334/ + + + pZkuG6l6ORCEckqQimPK58PO1A9EnkMtL5oCgRX9WiWnD4xeH7ikGzhWnTBy/vk8J4Iiz8gCSx9uFHA4+DvITG0roO97sk82d/0BCjVlwLWINpXlJfGYEF3X96AdoCQvb3ruwv/tVqEHsSU5aNfyxBAe+EhLTHQ8t7ysgJZWh98= + + + Data source=shu01\shu00;initial catalog=edoka_journale;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + + dm@tkb.ch + + + INT: + + + x:\ondoc_archivierung_batch_log.txt + + + + + Data source=shu01\shu00;initial catalog=edoka_dms;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + + https://localhost:44334/ + + + pZkuG6l6ORCEckqQimPK58PO1A9EnkMtL5oCgRX9WiWnD4xeH7ikGzhWnTBy/vk8J4Iiz8gCSx9uFHA4+DvITG0roO97sk82d/0BCjVlwLWINpXlJfGYEF3X96AdoCQvb3ruwv/tVqEHsSU5aNfyxBAe+EhLTHQ8t7ysgJZWh98= + + + Data source=shu01\shu00;initial catalog=edoka_journale;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + + dm@tkb.ch + + + INT: + + + + diff --git a/OnDoc_ArchivierungBatch/OnDoc_ArchivierungBatch.csproj b/OnDoc_ArchivierungBatch/OnDoc_ArchivierungBatch.csproj new file mode 100644 index 00000000..058b73ad --- /dev/null +++ b/OnDoc_ArchivierungBatch/OnDoc_ArchivierungBatch.csproj @@ -0,0 +1,62 @@ + + + + + Debug + AnyCPU + {8F9B5281-A768-432D-AD35-5BC449CD2452} + Exe + OnDoc_ArchivierungBatch + OnDoc_ArchivierungBatch + v4.8 + 512 + true + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + True + True + Settings.settings + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + \ No newline at end of file diff --git a/OnDoc_ArchivierungBatch/Program.cs b/OnDoc_ArchivierungBatch/Program.cs new file mode 100644 index 00000000..1edf4913 --- /dev/null +++ b/OnDoc_ArchivierungBatch/Program.cs @@ -0,0 +1,180 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Net; +using System.Net.Mail; +using System.Security.Policy; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Schema; + +namespace OnDoc_ArchivierungBatch +{ + internal class Program + { + private static string connectionstring { get; set; } = ""; + private static DataSet dsdaten = new DataSet(); + private static DataTable SP_Parameters = new DataTable(); + private static int total = 0; + private static int ok = 0; + private static int error = 0; + + static void Main(string[] args) + { + write_log("Start"); + run(); + write_log("Total Dokumente:" + total.ToString()); + write_log("Total OK: "+ok.ToString()); + write_log("Total Fehler: "+ error.ToString()); + write_log("Ende"); + } + + private static void write_log(string entry) + { + File.AppendAllText(Properties.Settings.Default.logfile, DateTime.Now.ToString() + " - " + entry + Environment.NewLine); + } + private static void archivedoc(string documentid) + { + write_log(documentid); + string URL = Properties.Settings.Default.RESTURI + "api/ /ArchiveDocFromDatabase?dokumentid=" + documentid; + + HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest; + webRequest.Method = WebRequestMethods.Http.Get; + webRequest.Headers["Authorization"] = "Bearer " + Properties.Settings.Default.APIKey; + try + { + using (HttpWebResponse response = webRequest.GetResponse() as HttpWebResponse) + { + if (response.StatusCode == HttpStatusCode.OK) + { + StreamReader reader = new StreamReader(response.GetResponseStream()); + string responseContent = reader.ReadToEnd(); + if (responseContent.Contains("Hinweismeldung:")) + { + write_log("Die Archivierung des Dokumentes " + documentid + " wurde nicht durchgeführt:" + Environment.NewLine + responseContent); + error = error + 1; + return; + } + ok = ok + 1; + } + else + { + write_log("Die Archivierung des Dokumentes " + documentid + " wurde abgebrochen." + Environment.NewLine + "Fehler: " + response.StatusDescription); + error = error + 1; + + } + } + } + catch (Exception ex) + { + write_log("Die Archivierung des Dokumentes " + documentid + " konnte nicht durchgeführt werden." + Environment.NewLine + "Fehler: " + ex.Message); + error = error + 1; + + } + } + private static void run() + { + connectionstring = Properties.Settings.Default.Connectionstring; + Get_Tabledata("Select dokumentid from dokument where automatischearchivierung=1 and isnull(utomatischarchiviertam,0)=0"); + + foreach (System.Data.DataRow dr in dsdaten.Tables[0].Rows) + { + archivedoc(dr[0].ToString()); + } + } + + + private static DataTable Get_Tabledata(string Tablename, bool StoredProc = false, bool is_SQL_String = false, DataTable sp_params = null) + { + try + { + + if (sp_params == null && SP_Parameters.Rows.Count > 0) + { + sp_params = SP_Parameters.Copy(); + } + + SqlConnection sqlconnect = new SqlConnection(); + DataSet ds = new DataSet(); + ds.Tables.Clear(); + dsdaten.Tables.Clear(); + + + sqlconnect.ConnectionString = connectionstring; + SqlDataAdapter da = new SqlDataAdapter("", sqlconnect); + SqlCommand sqlcmd = new SqlCommand(); + sqlcmd.Connection = sqlconnect; + + + + if (StoredProc == true) + { + sqlcmd.CommandType = CommandType.StoredProcedure; + if (Tablename.IndexOf("@@Mandantnr@@") > 0) + Tablename = Tablename.Replace("@@Mandantnr@@", ""); + sqlcmd.CommandText = Tablename; + try + { + foreach (DataRow r in sp_params.Rows) + { + sqlcmd.Parameters.Add(r["Paramname"].ToString(), SqlDbType.VarChar); + sqlcmd.Parameters[sqlcmd.Parameters.Count - 1].Value = r["Paramvalue"].ToString(); + } + } + catch { }; + + } + else + { + sqlcmd.CommandType = CommandType.Text; + sqlcmd.CommandText = "Select * from " + Tablename; + } + if (is_SQL_String == true) + sqlcmd.CommandText = Tablename; + da.SelectCommand = sqlcmd; + sqlconnect.Open(); + da.Fill(dsdaten, "Daten1"); + sqlconnect.Close(); + + return dsdaten.Tables[0]; + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + + return null; + } + } + private static void sendmail(string empfaenger, string betreff, string message) + { + MailMessage mail = new MailMessage(); + SmtpClient SmtpServer = new SmtpClient(); + mail.To.Add(empfaenger); + mail.From = new MailAddress("OnDoc@tkb.ch"); + mail.Subject = Properties.Settings.Default.prefix_betreff + betreff; + mail.IsBodyHtml = true; + mail.Body = message; + SmtpServer.Host = "smtp.tgcorp.ch"; + SmtpServer.Port = 25; + SmtpServer.DeliveryMethod = System.Net.Mail.SmtpDeliveryMethod.Network; + try + { + SmtpServer.Send(mail); + write_log("Mailversand an " + empfaenger + " nicht erfolgt" ); + } + catch (Exception ex) + { + write_log("Mailversand an " + empfaenger + " nicht erfolgt"); + + } + mail = null; + SmtpServer = null; + } + } + +} + + \ No newline at end of file diff --git a/OnDoc_ArchivierungBatch/Properties/AssemblyInfo.cs b/OnDoc_ArchivierungBatch/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..0b698e00 --- /dev/null +++ b/OnDoc_ArchivierungBatch/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen über eine Assembly werden über die folgenden +// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +// die einer Assembly zugeordnet sind. +[assembly: AssemblyTitle("OnDoc_ArchivierungBatch")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("HP Inc.")] +[assembly: AssemblyProduct("OnDoc_ArchivierungBatch")] +[assembly: AssemblyCopyright("Copyright © HP Inc. 2025")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly +// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von +// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird +[assembly: Guid("8f9b5281-a768-432d-ad35-5bc449cd2452")] + +// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, +// indem Sie "*" wie unten gezeigt eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/OnDoc_ArchivierungBatch/Properties/Settings.Designer.cs b/OnDoc_ArchivierungBatch/Properties/Settings.Designer.cs new file mode 100644 index 00000000..e4fdd08c --- /dev/null +++ b/OnDoc_ArchivierungBatch/Properties/Settings.Designer.cs @@ -0,0 +1,114 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// +//------------------------------------------------------------------------------ + +namespace OnDoc_ArchivierungBatch.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.10.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Data source=shu01\\shu00;initial catalog=edoka_dms;;persist security info=false;wo" + + "rkstation id=;packet size=4096;user id=sa;password=*shu29")] + public string Connectionstring { + get { + return ((string)(this["Connectionstring"])); + } + set { + this["Connectionstring"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("https://localhost:44334/")] + public string RESTURI { + get { + return ((string)(this["RESTURI"])); + } + set { + this["RESTURI"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("pZkuG6l6ORCEckqQimPK58PO1A9EnkMtL5oCgRX9WiWnD4xeH7ikGzhWnTBy/vk8J4Iiz8gCSx9uFHA4+" + + "DvITG0roO97sk82d/0BCjVlwLWINpXlJfGYEF3X96AdoCQvb3ruwv/tVqEHsSU5aNfyxBAe+EhLTHQ8t" + + "7ysgJZWh98=")] + public string APIKey { + get { + return ((string)(this["APIKey"])); + } + set { + this["APIKey"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Data source=shu01\\shu00;initial catalog=edoka_journale;;persist security info=fal" + + "se;workstation id=;packet size=4096;user id=sa;password=*shu29")] + public string LogConnectionstring { + get { + return ((string)(this["LogConnectionstring"])); + } + set { + this["LogConnectionstring"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("dm@tkb.ch")] + public string adminmail { + get { + return ((string)(this["adminmail"])); + } + set { + this["adminmail"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("INT: ")] + public string prefix_betreff { + get { + return ((string)(this["prefix_betreff"])); + } + set { + this["prefix_betreff"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("x:\\ondoc_archivierung_batch_log.txt")] + public string logfile { + get { + return ((string)(this["logfile"])); + } + set { + this["logfile"] = value; + } + } + } +} diff --git a/OnDoc_ArchivierungBatch/Properties/Settings.settings b/OnDoc_ArchivierungBatch/Properties/Settings.settings new file mode 100644 index 00000000..5dc3de95 --- /dev/null +++ b/OnDoc_ArchivierungBatch/Properties/Settings.settings @@ -0,0 +1,27 @@ + + + + + + Data source=shu01\shu00;initial catalog=edoka_dms;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + + https://localhost:44334/ + + + pZkuG6l6ORCEckqQimPK58PO1A9EnkMtL5oCgRX9WiWnD4xeH7ikGzhWnTBy/vk8J4Iiz8gCSx9uFHA4+DvITG0roO97sk82d/0BCjVlwLWINpXlJfGYEF3X96AdoCQvb3ruwv/tVqEHsSU5aNfyxBAe+EhLTHQ8t7ysgJZWh98= + + + Data source=shu01\shu00;initial catalog=edoka_journale;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + + dm@tkb.ch + + + INT: + + + x:\ondoc_archivierung_batch_log.txt + + + \ No newline at end of file diff --git a/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe new file mode 100644 index 00000000..9a2a356e Binary files /dev/null and b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe differ diff --git a/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe.config b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe.config new file mode 100644 index 00000000..460dda13 --- /dev/null +++ b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.exe.config @@ -0,0 +1,57 @@ + + + + +
+
+ + + + + + + + + Data source=shu01\shu00;initial catalog=edoka_dms;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + + https://localhost:44334/ + + + pZkuG6l6ORCEckqQimPK58PO1A9EnkMtL5oCgRX9WiWnD4xeH7ikGzhWnTBy/vk8J4Iiz8gCSx9uFHA4+DvITG0roO97sk82d/0BCjVlwLWINpXlJfGYEF3X96AdoCQvb3ruwv/tVqEHsSU5aNfyxBAe+EhLTHQ8t7ysgJZWh98= + + + Data source=shu01\shu00;initial catalog=edoka_journale;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + + dm@tkb.ch + + + INT: + + + x:\ondoc_archivierung_batch_log.txt + + + + + Data source=shu01\shu00;initial catalog=edoka_dms;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + + https://localhost:44334/ + + + pZkuG6l6ORCEckqQimPK58PO1A9EnkMtL5oCgRX9WiWnD4xeH7ikGzhWnTBy/vk8J4Iiz8gCSx9uFHA4+DvITG0roO97sk82d/0BCjVlwLWINpXlJfGYEF3X96AdoCQvb3ruwv/tVqEHsSU5aNfyxBAe+EhLTHQ8t7ysgJZWh98= + + + Data source=shu01\shu00;initial catalog=edoka_journale;;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29 + + + dm@tkb.ch + + + INT: + + + + diff --git a/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.pdb b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.pdb new file mode 100644 index 00000000..b452a5a3 Binary files /dev/null and b/OnDoc_ArchivierungBatch/bin/Debug/OnDoc_ArchivierungBatch.pdb differ diff --git a/OnDoc_ArchivierungBatch/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/OnDoc_ArchivierungBatch/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs new file mode 100644 index 00000000..15efebfc --- /dev/null +++ b/OnDoc_ArchivierungBatch/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")] diff --git a/OnDoc_ArchivierungBatch/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/OnDoc_ArchivierungBatch/obj/Debug/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 00000000..696d6820 Binary files /dev/null and b/OnDoc_ArchivierungBatch/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/OnDoc_ArchivierungBatch/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/OnDoc_ArchivierungBatch/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 00000000..d8847c0f Binary files /dev/null and b/OnDoc_ArchivierungBatch/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.csproj.AssemblyReference.cache b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.csproj.AssemblyReference.cache new file mode 100644 index 00000000..6943b8f3 Binary files /dev/null and b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.csproj.AssemblyReference.cache differ diff --git a/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.csproj.CoreCompileInputs.cache b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.csproj.CoreCompileInputs.cache new file mode 100644 index 00000000..0a032c90 --- /dev/null +++ b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +8e21d4f72618b178ede1b0d3350c598adaffa977e3573ca2c08ed55ce9b884ec diff --git a/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.csproj.FileListAbsolute.txt b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.csproj.FileListAbsolute.txt new file mode 100644 index 00000000..eba46fbf --- /dev/null +++ b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.csproj.FileListAbsolute.txt @@ -0,0 +1,7 @@ +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_ArchivierungBatch\obj\Debug\OnDoc_ArchivierungBatch.csproj.AssemblyReference.cache +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_ArchivierungBatch\obj\Debug\OnDoc_ArchivierungBatch.csproj.CoreCompileInputs.cache +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_ArchivierungBatch\bin\Debug\OnDoc_ArchivierungBatch.exe.config +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_ArchivierungBatch\bin\Debug\OnDoc_ArchivierungBatch.exe +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_ArchivierungBatch\bin\Debug\OnDoc_ArchivierungBatch.pdb +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_ArchivierungBatch\obj\Debug\OnDoc_ArchivierungBatch.exe +E:\Software-Projekte\OnDoc\OnDoc\OnDoc_ArchivierungBatch\obj\Debug\OnDoc_ArchivierungBatch.pdb diff --git a/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.exe b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.exe new file mode 100644 index 00000000..9a2a356e Binary files /dev/null and b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.exe differ diff --git a/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.pdb b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.pdb new file mode 100644 index 00000000..b452a5a3 Binary files /dev/null and b/OnDoc_ArchivierungBatch/obj/Debug/OnDoc_ArchivierungBatch.pdb differ