Update 20250606

This commit is contained in:
Stefan Hutter
2025-06-06 09:13:32 +02:00
parent 10343fcbab
commit 85ff87dc62
106 changed files with 1312 additions and 298 deletions

View File

@@ -49,11 +49,14 @@
<setting name="edokapath" serializeAs="String">
<value>E:\Software-Projekte\EDOKA\Cleint_Erneuerung_DMS_Framwork48 - Kopie\EDOKA\bin\edoka.exe</value>
</setting>
<setting name="NativVorlagen" serializeAs="String">
<value>E:\Software-Projekte\OnDoc\TKB-Vorlagen\</value>
</setting>
<setting name="OfficeWatchTimerIntervall" serializeAs="String">
<value>20000</value>
</setting>
<setting name="NativVorlagen" serializeAs="String">
<value>E:\Software-Projekte\OnDoc\TKB-Vorlagen\</value>
<setting name="PrinterSettings" serializeAs="String">
<value>E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe</value>
</setting>
</OnDoc.Properties.Settings>
</userSettings>

View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<StartArguments>ondoc://%3ffunktion=createdoc&amp;app=onbase&amp;partnernr=1000208&amp;struktur=Korrespondenz&amp;id=OFFEDK0082025002508796</StartArguments>
<StartArguments>
</StartArguments>
</PropertyGroup>
<PropertyGroup>
<PublishUrlHistory>publish\</PublishUrlHistory>

View File

@@ -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;

View File

@@ -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";

View File

@@ -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);
//

View File

@@ -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 { }
}
}
}

View File

@@ -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
{

View File

@@ -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;
}
}
}
}

View File

@@ -41,11 +41,14 @@
<Setting Name="edokapath" Type="System.String" Scope="User">
<Value Profile="(Default)">E:\Software-Projekte\EDOKA\Cleint_Erneuerung_DMS_Framwork48 - Kopie\EDOKA\bin\edoka.exe</Value>
</Setting>
<Setting Name="OfficeWatchTimerIntervall" Type="System.String" Scope="User">
<Value Profile="(Default)">5000</Value>
</Setting>
<Setting Name="NativVorlagen" Type="System.String" Scope="User">
<Value Profile="(Default)">E:\Software-Projekte\OnDoc\TKB-Vorlagen\</Value>
</Setting>
<Setting Name="OfficeWatchTimerIntervall" Type="System.String" Scope="User">
<Value Profile="(Default)">20000</Value>
</Setting>
<Setting Name="PrinterSettings" Type="System.String" Scope="User">
<Value Profile="(Default)">E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe</Value>
</Setting>
</Settings>
</SettingsFile>

View File

@@ -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;
}
}

View File

@@ -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;

View File

@@ -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;
}
}

View File

@@ -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);
}
}

View File

@@ -190,7 +190,7 @@
<data name="tsbtnpreviewno.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
@@ -205,7 +205,7 @@
<data name="tsbtnpreviewbottom.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
@@ -220,7 +220,7 @@
<data name="tsbtnpreviewright.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM

View File

@@ -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,139 +559,12 @@
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;
//
// 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.TabIndex = 0;
this.rbzustaendigkube.TabStop = true;
this.rbzustaendigkube.Text = "Kundenberater des Kunden";
this.rbzustaendigkube.UseVisualStyleBackColor = true;
//
// groupBox5
//
this.groupBox5.Controls.Add(this.DateTermin);
this.groupBox5.Controls.Add(this.lblTermin);
this.groupBox5.Controls.Add(this.DateDokumentDatum);
this.groupBox5.Controls.Add(this.lblDokumentDatum);
this.groupBox5.Controls.Add(this.cbboxverantwortlich);
this.groupBox5.Controls.Add(this.cbboxpostzustellung);
this.groupBox5.Controls.Add(this.lblVerantwortlich);
this.groupBox5.Controls.Add(this.lblPostzustellung);
this.groupBox5.Controls.Add(this.lblBezeichnung);
this.groupBox5.Controls.Add(this.txtbezeichnung);
this.groupBox5.Location = new System.Drawing.Point(6, 23);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(534, 145);
this.groupBox5.TabIndex = 12;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Allgemein";
//
// DateTermin
//
this.DateTermin.DateTimeIcon = null;
this.DateTermin.Location = new System.Drawing.Point(367, 110);
this.DateTermin.Name = "DateTermin";
this.DateTermin.Size = new System.Drawing.Size(107, 21);
this.DateTermin.TabIndex = 5;
this.DateTermin.ToolTipText = "";
this.DateTermin.Visible = false;
//
// lblTermin
//
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.TabIndex = 4;
this.lblTermin.Text = "Termin";
this.lblTermin.Visible = false;
//
// DateDokumentDatum
//
this.DateDokumentDatum.DateTimeIcon = null;
this.DateDokumentDatum.Location = new System.Drawing.Point(120, 110);
this.DateDokumentDatum.Name = "DateDokumentDatum";
this.DateDokumentDatum.Size = new System.Drawing.Size(107, 21);
this.DateDokumentDatum.TabIndex = 3;
this.DateDokumentDatum.ToolTipText = "";
this.DateDokumentDatum.DropDownOpening += new System.ComponentModel.CancelEventHandler(this.DateDokumentDatum_DropDownOpening);
//
// lblDokumentDatum
//
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.TabIndex = 2;
this.lblDokumentDatum.Text = "Dokument-Datum";
//
// 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(120, 53);
this.cbboxverantwortlich.Name = "cbboxverantwortlich";
this.cbboxverantwortlich.Size = new System.Drawing.Size(354, 19);
this.cbboxverantwortlich.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxverantwortlich.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxverantwortlich.TabIndex = 11;
this.cbboxverantwortlich.TabStop = false;
//
// cbboxpostzustellung
//
this.cbboxpostzustellung.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxpostzustellung.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxpostzustellung.Location = new System.Drawing.Point(120, 78);
this.cbboxpostzustellung.Name = "cbboxpostzustellung";
this.cbboxpostzustellung.Size = new System.Drawing.Size(354, 19);
this.cbboxpostzustellung.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxpostzustellung.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxpostzustellung.TabIndex = 1;
this.cbboxpostzustellung.TabStop = false;
//
// lblVerantwortlich
//
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.TabIndex = 10;
this.lblVerantwortlich.Text = "Verantwortlich";
//
// lblPostzustellung
//
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.TabIndex = 0;
this.lblPostzustellung.Text = "Postzustellung";
//
// lblBezeichnung
//
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.TabIndex = 8;
this.lblBezeichnung.Text = "Bezeichnung";
//
// txtbezeichnung
//
this.txtbezeichnung.Location = new System.Drawing.Point(120, 20);
this.txtbezeichnung.Name = "txtbezeichnung";
this.txtbezeichnung.Size = new System.Drawing.Size(354, 20);
this.txtbezeichnung.TabIndex = 9;
//
// pnlLoad
//
this.pnlLoad.BackColor = System.Drawing.Color.Silver;
@@ -700,7 +573,7 @@
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.Location = new System.Drawing.Point(796, 123);
this.pnlLoad.Name = "pnlLoad";
this.pnlLoad.Size = new System.Drawing.Size(957, 634);
this.pnlLoad.TabIndex = 4;
@@ -761,10 +634,137 @@
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.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(155, 17);
this.rbzustaendigkube.TabIndex = 0;
this.rbzustaendigkube.TabStop = true;
this.rbzustaendigkube.Text = "Kundenberater des Kunden";
this.rbzustaendigkube.UseVisualStyleBackColor = true;
//
// groupBox5
//
this.groupBox5.Controls.Add(this.DateTermin);
this.groupBox5.Controls.Add(this.lblTermin);
this.groupBox5.Controls.Add(this.DateDokumentDatum);
this.groupBox5.Controls.Add(this.lblDokumentDatum);
this.groupBox5.Controls.Add(this.cbboxverantwortlich);
this.groupBox5.Controls.Add(this.cbboxpostzustellung);
this.groupBox5.Controls.Add(this.lblVerantwortlich);
this.groupBox5.Controls.Add(this.lblPostzustellung);
this.groupBox5.Controls.Add(this.lblBezeichnung);
this.groupBox5.Controls.Add(this.txtbezeichnung);
this.groupBox5.Location = new System.Drawing.Point(6, 23);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(534, 145);
this.groupBox5.TabIndex = 12;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Allgemein";
//
// DateTermin
//
this.DateTermin.DateTimeIcon = null;
this.DateTermin.Location = new System.Drawing.Point(367, 110);
this.DateTermin.Name = "DateTermin";
this.DateTermin.Size = new System.Drawing.Size(107, 21);
this.DateTermin.TabIndex = 5;
this.DateTermin.ToolTipText = "";
this.DateTermin.Visible = false;
//
// lblTermin
//
this.lblTermin.AutoSize = true;
this.lblTermin.Location = new System.Drawing.Point(312, 114);
this.lblTermin.Name = "lblTermin";
this.lblTermin.Size = new System.Drawing.Size(39, 13);
this.lblTermin.TabIndex = 4;
this.lblTermin.Text = "Termin";
this.lblTermin.Visible = false;
//
// DateDokumentDatum
//
this.DateDokumentDatum.DateTimeIcon = null;
this.DateDokumentDatum.Location = new System.Drawing.Point(120, 110);
this.DateDokumentDatum.Name = "DateDokumentDatum";
this.DateDokumentDatum.Size = new System.Drawing.Size(107, 21);
this.DateDokumentDatum.TabIndex = 3;
this.DateDokumentDatum.ToolTipText = "";
this.DateDokumentDatum.DropDownOpening += new System.ComponentModel.CancelEventHandler(this.DateDokumentDatum_DropDownOpening);
//
// lblDokumentDatum
//
this.lblDokumentDatum.AutoSize = true;
this.lblDokumentDatum.Location = new System.Drawing.Point(9, 114);
this.lblDokumentDatum.Name = "lblDokumentDatum";
this.lblDokumentDatum.Size = new System.Drawing.Size(90, 13);
this.lblDokumentDatum.TabIndex = 2;
this.lblDokumentDatum.Text = "Dokument-Datum";
//
// 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(120, 53);
this.cbboxverantwortlich.Name = "cbboxverantwortlich";
this.cbboxverantwortlich.Size = new System.Drawing.Size(354, 19);
this.cbboxverantwortlich.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxverantwortlich.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxverantwortlich.TabIndex = 11;
this.cbboxverantwortlich.TabStop = false;
//
// cbboxpostzustellung
//
this.cbboxpostzustellung.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxpostzustellung.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxpostzustellung.Location = new System.Drawing.Point(120, 78);
this.cbboxpostzustellung.Name = "cbboxpostzustellung";
this.cbboxpostzustellung.Size = new System.Drawing.Size(354, 19);
this.cbboxpostzustellung.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxpostzustellung.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxpostzustellung.TabIndex = 1;
this.cbboxpostzustellung.TabStop = false;
//
// lblVerantwortlich
//
this.lblVerantwortlich.AutoSize = true;
this.lblVerantwortlich.Location = new System.Drawing.Point(9, 59);
this.lblVerantwortlich.Name = "lblVerantwortlich";
this.lblVerantwortlich.Size = new System.Drawing.Size(74, 13);
this.lblVerantwortlich.TabIndex = 10;
this.lblVerantwortlich.Text = "Verantwortlich";
//
// lblPostzustellung
//
this.lblPostzustellung.AutoSize = true;
this.lblPostzustellung.Location = new System.Drawing.Point(9, 86);
this.lblPostzustellung.Name = "lblPostzustellung";
this.lblPostzustellung.Size = new System.Drawing.Size(75, 13);
this.lblPostzustellung.TabIndex = 0;
this.lblPostzustellung.Text = "Postzustellung";
//
// lblBezeichnung
//
this.lblBezeichnung.AutoSize = true;
this.lblBezeichnung.Location = new System.Drawing.Point(9, 23);
this.lblBezeichnung.Name = "lblBezeichnung";
this.lblBezeichnung.Size = new System.Drawing.Size(69, 13);
this.lblBezeichnung.TabIndex = 8;
this.lblBezeichnung.Text = "Bezeichnung";
//
// txtbezeichnung
//
this.txtbezeichnung.Location = new System.Drawing.Point(120, 20);
this.txtbezeichnung.Name = "txtbezeichnung";
this.txtbezeichnung.Size = new System.Drawing.Size(354, 20);
this.txtbezeichnung.TabIndex = 9;
//
// 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);

View File

@@ -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
{
}
}
}

View File

@@ -133,19 +133,19 @@
<data name="ribbonButtonAddmin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonAddmin.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonAddmin.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wQAADsEBuJFr7QAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
vQAADr0BR/uQrQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -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;
}
}

View File

@@ -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)
try
{
dbteam.add_parameter("@mitarbeiternr", cbboxzustaendigmitarbeiter.SelectedValue.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;
}
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;
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;
}
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.