shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 20250729

Browse Source
This commit is contained in:
Stefan Hutter
2025-07-29 19:28:12 +02:00
parent e33c7ede5b
commit f700066d6a
104 changed files with 761 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/App.config
View File

@@ -59,7 +59,7 @@
<value>E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe</value>
</setting>
<setting name="GASSize" serializeAs="String">
<value>False</value>
<value>True</value>
</setting>
</OnDoc.Properties.Settings>
</userSettings>

10
Client/Client.csproj
View File

@@ -1371,6 +1371,16 @@
</ItemGroup>
<ItemGroup>
<Content Include="OnDoc.ico" />
<None Include="Resources\Achtung_256x256-32.png" />
<None Include="Resources\Achtung_48x48-32.png" />
<None Include="Resources\Achtung_32x32-32.png" />
<None Include="Resources\Achtung_24x24-32.png" />
<None Include="Resources\Achtung_16x16-32.png" />
<None Include="Resources\OK_256x256-32.png" />
<None Include="Resources\OK_48x48-32.png" />
<None Include="Resources\OK_32x32-32.png" />
<None Include="Resources\OK_24x24-32.png" />
<None Include="Resources\OK_16x16-32.png" />
<None Include="Resources\Versandstrasse_256x256-32.png" />
<None Include="Resources\Versandstrasse_48x48-32.png" />
<None Include="Resources\Versandstrasse_32x32-32.png" />

2
Client/Diverses/SplashScreen.Designer.cs generated
View File

@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(135, 26);
this.label2.TabIndex = 2;
this.label2.Text = "28. Juli 2025";
this.label2.Text = "29. Juli 2025";
this.label2.Click += new System.EventHandler(this.label2_Click);
//
// SplashScreen

3
Client/Diverses/frmMail.cs
View File

@@ -66,6 +66,7 @@ namespace OnDoc.Diverses
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select name,vorname,tgnummer, email from mitarbeiter where mitarbeiternr=" + AppParams.CurrentMitarbeiter.ToString(), false, true);
string absender = "";
try
{
absender = db.dsdaten.Tables[0].Rows[0]["Name"].ToString() + " " + db.dsdaten.Tables[0].Rows[0]["Vorname"].ToString() + ", " + db.dsdaten.Tables[0].Rows[0]["tgnummer"].ToString();
@@ -96,7 +97,7 @@ namespace OnDoc.Diverses
string starthtml = "<html>";
string endhtml = "</html>";
string startabsatz = "Guten Tag "+empfaenger+"<br>" + "<br>";
if (!multipledocuments()) { startabsatz = startabsatz + "<br>" + "Link zum Dokument:<br>"; } else { startabsatz = startabsatz + "<br>" + "Links zum Dokumenten:<br>"; }
if (!multipledocuments()) { startabsatz = startabsatz + "<br>" + "Link zum Dokument:<br>- "; } else { startabsatz = startabsatz + "<br>" + "Links zu den Dokumenten:<br>"; }
text = text + starthtml;
text = text + startabsatz;
text = text + this.doclist;

40
Client/DocMgmt/SerienbriefTemplateLoad.Designer.cs generated
View File

@@ -33,7 +33,10 @@
this.sfButton1 = new Syncfusion.WinForms.Controls.SfButton();
this.sfButton2 = new Syncfusion.WinForms.Controls.SfButton();
this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton();
this.label1 = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// sfDataGrid1
@@ -42,9 +45,12 @@
this.sfDataGrid1.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.LastColumnFill;
this.sfDataGrid1.Location = new System.Drawing.Point(5, 19);
this.sfDataGrid1.Name = "sfDataGrid1";
this.sfDataGrid1.Size = new System.Drawing.Size(417, 150);
this.sfDataGrid1.PreviewRowHeight = 35;
this.sfDataGrid1.Size = new System.Drawing.Size(444, 150);
this.sfDataGrid1.TabIndex = 0;
this.sfDataGrid1.Text = "sfDataGrid1";
this.sfDataGrid1.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.sfDataGrid1_DrawCell);
this.sfDataGrid1.QueryRowStyle += new Syncfusion.WinForms.DataGrid.Events.QueryRowStyleEventHandler(this.sfDataGrid1_QueryRowStyle);
this.sfDataGrid1.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellClick);
this.sfDataGrid1.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellDoubleClick);
//
@@ -52,7 +58,7 @@
//
this.sfButton1.Enabled = false;
this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F);
this.sfButton1.Location = new System.Drawing.Point(326, 175);
this.sfButton1.Location = new System.Drawing.Point(353, 221);
this.sfButton1.Name = "sfButton1";
this.sfButton1.Size = new System.Drawing.Size(96, 28);
this.sfButton1.TabIndex = 1;
@@ -62,7 +68,7 @@
// sfButton2
//
this.sfButton2.Font = new System.Drawing.Font("Segoe UI Semibold", 9F);
this.sfButton2.Location = new System.Drawing.Point(5, 175);
this.sfButton2.Location = new System.Drawing.Point(5, 221);
this.sfButton2.Name = "sfButton2";
this.sfButton2.Size = new System.Drawing.Size(96, 28);
this.sfButton2.TabIndex = 2;
@@ -73,18 +79,38 @@
//
this.sfButton3.Enabled = false;
this.sfButton3.Font = new System.Drawing.Font("Segoe UI Semibold", 9F);
this.sfButton3.Location = new System.Drawing.Point(439, 19);
this.sfButton3.Location = new System.Drawing.Point(469, 19);
this.sfButton3.Name = "sfButton3";
this.sfButton3.Size = new System.Drawing.Size(96, 28);
this.sfButton3.TabIndex = 3;
this.sfButton3.Text = "Löschen";
this.sfButton3.Click += new System.EventHandler(this.sfButton3_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(51, 176);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(35, 13);
this.label1.TabIndex = 5;
this.label1.Text = "label1";
//
// pictureBox1
//
this.pictureBox1.Image = global::OnDoc.Properties.Resources.Achtung_24x24_32;
this.pictureBox1.Location = new System.Drawing.Point(5, 174);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(25, 28);
this.pictureBox1.TabIndex = 6;
this.pictureBox1.TabStop = false;
//
// SerienbriefTemplateLoad
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(570, 218);
this.ClientSize = new System.Drawing.Size(570, 269);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label1);
this.Controls.Add(this.sfButton3);
this.Controls.Add(this.sfButton2);
this.Controls.Add(this.sfButton1);
@@ -96,7 +122,9 @@
this.Text = "Vorlage laden";
this.Load += new System.EventHandler(this.SerienbriefTemplateLoad_Load);
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
@@ -106,5 +134,7 @@
private Syncfusion.WinForms.Controls.SfButton sfButton1;
private Syncfusion.WinForms.Controls.SfButton sfButton2;
private Syncfusion.WinForms.Controls.SfButton sfButton3;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.PictureBox pictureBox1;
}
}

84
Client/DocMgmt/SerienbriefTemplateLoad.cs
View File

@@ -12,6 +12,8 @@ using Syncfusion.Windows.Forms.Tools;
using Syncfusion.WinForms.Controls;
using Database;
using System.Security.RightsManagement;
using Syncfusion.WinForms.DataGrid.Enums;
using NLog.LayoutRenderers.Wrappers;
namespace OnDoc.DocMgmt
{
@@ -21,6 +23,7 @@ namespace OnDoc.DocMgmt
public string selectedID = "";
public string file = "";
public string usedfelder = "";
string basedokumenttypnr = "";
public SerienbriefTemplateLoad()
{
InitializeComponent();
@@ -30,7 +33,7 @@ namespace OnDoc.DocMgmt
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
}
public SerienbriefTemplateLoad(string mitarbeiternr)
public SerienbriefTemplateLoad(string mitarbeiternr, string basedokumenttypnr)
{
InitializeComponent();
this.Style.TitleBar.BackColor = Theaming.Titelbar();
@@ -38,18 +41,36 @@ namespace OnDoc.DocMgmt
this.Style.ShadowOpacity = Theaming.ShadowOpacity;
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
this.mitarbeiternr=mitarbeiternr;
this.basedokumenttypnr =basedokumenttypnr;
}
private void SerienbriefTemplateLoad_Load(object sender, EventArgs e)
{
pictureBox1.Visible = false;
this.label1.Visible = false;
load_data();
}
private void load_data() {
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select ID,Bezeichnung, isnull(usedfelder,'') as UsedFelder from ondoc_sb_vorlage where aktiv=1 and mitarbeiternr="+ mitarbeiternr, false, true);
db.Get_Tabledata("Select '0' as S,ID,Bezeichnung, isnull(usedfelder,'') as UsedFelder, case when isnull(doktyp,'') ='' then 'A' else doktyp end as DokTyp from ondoc_sb_vorlage where aktiv=1 and mitarbeiternr="+ mitarbeiternr, false, true);
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
if (dr[4].ToString() != basedokumenttypnr)
{
dr[0] = '1';
}
else
{
dr[0] = '2';
}
}
db.dsdaten.Tables[0].AcceptChanges();
this.sfDataGrid1.DataSource = db.dsdaten.Tables[0];
this.sfDataGrid1.Columns[0].Visible = false;
this.sfDataGrid1.Columns[2].Visible = false;
this.sfDataGrid1.Columns[1].Visible = false;
this.sfDataGrid1.Columns[3].Visible = false;
this.sfDataGrid1.Columns[4].Visible = false;
this.sfDataGrid1.Columns[0].HeaderText = "";
sfDataGrid1.RowHeight = 28;
db = null;
}
@@ -110,5 +131,60 @@ namespace OnDoc.DocMgmt
}
}
private void sfDataGrid1_DrawCell(object sender, Syncfusion.WinForms.DataGrid.Events.DrawCellEventArgs e)
{
try
{
if (e.Column.MappingName == "S")
{
try
{
e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center;
e.Handled = true;
var selectedItem = e.DataRow;
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (Convert.ToInt32(dataRow["S"]) == 2)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.OK_24x24_32, e.Bounds.X + 10, e.Bounds.Y+2);
}
if (Convert.ToInt32(dataRow["S"]) == 1)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Achtung_24x24_32, e.Bounds.X + 10, e.Bounds.Y+2);
}
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-1, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom);
return;
}
catch { }
e.Handled = false;
}
}
catch { }
}
private void sfDataGrid1_QueryRowStyle(object sender, Syncfusion.WinForms.DataGrid.Events.QueryRowStyleEventArgs e)
{
if (e.RowType == RowType.DefaultRow)
{
var dataRowView = e.RowData as DataRowView;
var dataRow = dataRowView.Row;
var cellValue = dataRow[4].ToString();
if (cellValue != basedokumenttypnr)
{
//e.Style.TextColor = Color.Gray;
pictureBox1.Visible = true;
label1.Visible = true;
label1.Text = "Die Vorlage entspricht nicht dem Vorlagentyp des Serienbriefes." + Environment.NewLine;
label1.Text = label1.Text + "Das kann sich auf Einstellungen für Versandstrasse, Archivierung usw. auswirken.";
}
}
}
}
}

100
Client/Properties/Resources.Designer.cs generated
View File

@@ -60,6 +60,56 @@ namespace OnDoc.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Achtung_16x16_32 {
get {
object obj = ResourceManager.GetObject("Achtung_16x16_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Achtung_24x24_32 {
get {
object obj = ResourceManager.GetObject("Achtung_24x24_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Achtung_256x256_32 {
get {
object obj = ResourceManager.GetObject("Achtung_256x256_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Achtung_32x32_32 {
get {
object obj = ResourceManager.GetObject("Achtung_32x32_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Achtung_48x48_32 {
get {
object obj = ResourceManager.GetObject("Achtung_48x48_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
@@ -2000,6 +2050,56 @@ namespace OnDoc.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap OK_16x16_32 {
get {
object obj = ResourceManager.GetObject("OK_16x16_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap OK_24x24_32 {
get {
object obj = ResourceManager.GetObject("OK_24x24_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap OK_256x256_32 {
get {
object obj = ResourceManager.GetObject("OK_256x256_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap OK_32x32_32 {
get {
object obj = ResourceManager.GetObject("OK_32x32_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap OK_48x48_32 {
get {
object obj = ResourceManager.GetObject("OK_48x48_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>

30
Client/Properties/Resources.resx
View File

@@ -118,6 +118,21 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Achtung_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Achtung_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Achtung_24x24_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Achtung_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Achtung_256x256_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Achtung_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Achtung_32x32_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Achtung_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Achtung_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Achtung_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="add_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\add_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -700,6 +715,21 @@
<data name="officevorlage_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\officevorlage_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="OK_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\OK_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="OK_24x24_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\OK_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="OK_256x256_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\OK_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="OK_32x32_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\OK_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="OK_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\OK_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="OnBase_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\OnBase_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

2
Client/Properties/Settings.Designer.cs generated
View File

@@ -219,7 +219,7 @@ namespace OnDoc.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public string GASSize {
get {
return ((string)(this["GASSize"]));

2
Client/Properties/Settings.settings
View File

@@ -51,7 +51,7 @@
<Value Profile="(Default)">E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe</Value>
</Setting>
<Setting Name="GASSize" Type="System.String" Scope="User">
<Value Profile="(Default)">False</Value>
<Value Profile="(Default)">True</Value>
</Setting>
</Settings>
</SettingsFile>

BIN
Client/Resources/Achtung_16x16-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 560 B

BIN
Client/Resources/Achtung_24x24-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 939 B

BIN
Client/Resources/Achtung_256x256-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
Client/Resources/Achtung_32x32-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Client/Resources/Achtung_48x48-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
Client/Resources/OK_16x16-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 629 B

BIN
Client/Resources/OK_24x24-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 946 B

BIN
Client/Resources/OK_256x256-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
Client/Resources/OK_32x32-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Client/Resources/OK_48x48-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

9
Client/UIControls/DokList.cs
View File

@@ -3206,6 +3206,7 @@ namespace OnDoc.UICintrols
private void dokumentLinkPerMailVersendenToolStripMenuItem_Click(object sender, EventArgs e)
{
string ul = "<ul>";
string endul = "</ul>";
string li = "<li>";
@@ -3222,7 +3223,7 @@ namespace OnDoc.UICintrols
}
Cursor = Cursors.WaitCursor;
DB db = new DB(AppParams.connectionstring);
string doklist = "";
doklist = ul;
foreach (var record in records)
@@ -3231,10 +3232,12 @@ namespace OnDoc.UICintrols
string documentid = datarow["dokumentid"].ToString();
string partnernr= datarow["Partner-Nr"].ToString();
string bezeichnung = datarow["DokBez"].ToString();
doklist = doklist + li + "<a href=ondoc::?funktion=showdoc&id=" + documentid + ">" + documentid + "</a> Partner:" + partnernr + " Dokument: " + bezeichnung + endli;
db.Get_Tabledata("Select '('+ltrim(rtrim(str(nrpar00)))+') '+bkpar00 from partner where nrpar00=" + partnernr.ToString(), false, true);
string partner = db.dsdaten.Tables[0].Rows[0][0].ToString();
doklist = doklist + li + "<a href=ondoc::?funktion=showdoc&id=" + documentid + ">" + bezeichnung + " - "+partner+"</a>"+ endli;
}
doklist = doklist + endul;
db = null;
frmMail fmail = new frmMail(doklist);
fmail.ShowDialog();
Cursor = Cursors.Default;

4
Client/UIControls/Serienbrief.cs
View File

@@ -2582,7 +2582,7 @@ namespace OnDoc.UIControls
dr[4] = DateTime.Now;
dr[5] = AppParams.CurrentMitarbeiter;
dr[6] = true;
dr[7] = dokytype;
dr[7] = sb.dokumenttypnr.ToString();
dr[8] = bez;
dr[9] = json;
db.daten.Tables[0].Rows.Add(dr);
@@ -2597,7 +2597,7 @@ namespace OnDoc.UIControls
private void ribbonbuttonloadtemplate_Click(object sender, EventArgs e)
{
SerienbriefTemplateLoad sbt = new SerienbriefTemplateLoad(AppParams.CurrentMitarbeiter.ToString());
SerienbriefTemplateLoad sbt = new SerienbriefTemplateLoad(AppParams.CurrentMitarbeiter.ToString(), sb.dokumenttypnr.ToString());
sbt.ShowDialog();
if (sbt.DialogResult == DialogResult.OK)
{

234
Client/Versandstrasse/Versandstrasse.Designer.cs generated
View File

@@ -30,14 +30,14 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Versandstrasse));
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings11 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings11 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings11 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings3 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings3 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings3 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings12 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings12 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings12 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings4 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings4 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings4 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -49,6 +49,9 @@
this.GrpPaketDetails = new System.Windows.Forms.GroupBox();
this.btnPrepare = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.pnlcouvertgroesse = new System.Windows.Forms.Panel();
this.rbc5normal = new System.Windows.Forms.RadioButton();
this.rbc5mini = new System.Windows.Forms.RadioButton();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.txtadresse = new System.Windows.Forms.TextBox();
@@ -131,13 +134,11 @@
this.progressBar1 = new System.Windows.Forms.ProgressBar();
this.ribbonButton3 = new System.Windows.Forms.RibbonButton();
this.lblserienbrief = new System.Windows.Forms.Label();
this.pnlcouvertgroesse = new System.Windows.Forms.Panel();
this.rbc5mini = new System.Windows.Forms.RadioButton();
this.rbc5normal = new System.Windows.Forms.RadioButton();
this.contextMenuStrip1.SuspendLayout();
this.panelPrepare.SuspendLayout();
this.GrpPaketDetails.SuspendLayout();
this.groupBox3.SuspendLayout();
this.pnlcouvertgroesse.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).BeginInit();
this.panelVerify.SuspendLayout();
this.panelverifysb.SuspendLayout();
@@ -154,7 +155,6 @@
this.pnlpostkorb.SuspendLayout();
this.pnlprogress.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).BeginInit();
this.pnlcouvertgroesse.SuspendLayout();
this.SuspendLayout();
//
// contextMenuStrip1
@@ -163,14 +163,14 @@
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.löschenToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(119, 26);
this.contextMenuStrip1.Size = new System.Drawing.Size(132, 28);
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
this.contextMenuStrip1.Click += new System.EventHandler(this.contextMenuStrip1_Click);
//
// löschenToolStripMenuItem
//
this.löschenToolStripMenuItem.Name = "löschenToolStripMenuItem";
this.löschenToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.löschenToolStripMenuItem.Size = new System.Drawing.Size(131, 24);
this.löschenToolStripMenuItem.Text = "Löschen";
this.löschenToolStripMenuItem.Click += new System.EventHandler(this.löschenToolStripMenuItem_Click);
//
@@ -211,7 +211,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(198, 28);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(437, 20);
this.label4.Size = new System.Drawing.Size(525, 25);
this.label4.TabIndex = 0;
this.label4.Text = "Versand wird vorbereit - bitte einen Moment warten....";
this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter;
@@ -227,17 +227,17 @@
this.pdfViewerControl1.IsTextSearchEnabled = true;
this.pdfViewerControl1.IsTextSelectionEnabled = true;
this.pdfViewerControl1.Location = new System.Drawing.Point(908, 54);
messageBoxSettings11.EnableNotification = true;
this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings11;
messageBoxSettings3.EnableNotification = true;
this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings3;
this.pdfViewerControl1.MinimumZoomPercentage = 50;
this.pdfViewerControl1.Name = "pdfViewerControl1";
this.pdfViewerControl1.PageBorderThickness = 1;
pdfViewerPrinterSettings11.Copies = 1;
pdfViewerPrinterSettings11.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings11.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings11.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings11.PrintLocation")));
pdfViewerPrinterSettings11.ShowPrintStatusDialog = true;
this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings11;
pdfViewerPrinterSettings3.Copies = 1;
pdfViewerPrinterSettings3.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings3.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings3.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings3.PrintLocation")));
pdfViewerPrinterSettings3.ShowPrintStatusDialog = true;
this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings3;
this.pdfViewerControl1.ReferencePath = null;
this.pdfViewerControl1.ScrollDisplacementValue = 0;
this.pdfViewerControl1.ShowHorizontalScrollBar = true;
@@ -247,10 +247,10 @@
this.pdfViewerControl1.SpaceBetweenPages = 8;
this.pdfViewerControl1.TabIndex = 10;
this.pdfViewerControl1.Text = "pdfViewerControl1";
textSearchSettings11.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings11.HighlightAllInstance = true;
textSearchSettings11.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl1.TextSearchSettings = textSearchSettings11;
textSearchSettings3.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings3.HighlightAllInstance = true;
textSearchSettings3.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl1.TextSearchSettings = textSearchSettings3;
this.pdfViewerControl1.ThemeName = "Default";
this.pdfViewerControl1.VerticalScrollOffset = 0;
this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default;
@@ -300,12 +300,46 @@
this.groupBox3.TabIndex = 2;
this.groupBox3.TabStop = false;
//
// pnlcouvertgroesse
//
this.pnlcouvertgroesse.Controls.Add(this.rbc5normal);
this.pnlcouvertgroesse.Controls.Add(this.rbc5mini);
this.pnlcouvertgroesse.Location = new System.Drawing.Point(2, 33);
this.pnlcouvertgroesse.Name = "pnlcouvertgroesse";
this.pnlcouvertgroesse.Size = new System.Drawing.Size(260, 21);
this.pnlcouvertgroesse.TabIndex = 14;
this.pnlcouvertgroesse.Visible = false;
//
// rbc5normal
//
this.rbc5normal.AutoSize = true;
this.rbc5normal.Location = new System.Drawing.Point(123, 2);
this.rbc5normal.Name = "rbc5normal";
this.rbc5normal.Size = new System.Drawing.Size(158, 19);
this.rbc5normal.TabIndex = 1;
this.rbc5normal.TabStop = true;
this.rbc5normal.Text = "C5 Normal (bis 15 Blatt)";
this.rbc5normal.UseVisualStyleBackColor = true;
this.rbc5normal.CheckedChanged += new System.EventHandler(this.rbc5normal_CheckedChanged);
//
// rbc5mini
//
this.rbc5mini.AutoSize = true;
this.rbc5mini.Location = new System.Drawing.Point(5, 2);
this.rbc5mini.Name = "rbc5mini";
this.rbc5mini.Size = new System.Drawing.Size(134, 19);
this.rbc5mini.TabIndex = 0;
this.rbc5mini.TabStop = true;
this.rbc5mini.Text = "C5 Mini (bis 5 Blatt)";
this.rbc5mini.UseVisualStyleBackColor = true;
this.rbc5mini.CheckedChanged += new System.EventHandler(this.rbc5mini_CheckedChanged);
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(3, 36);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(147, 13);
this.label5.Size = new System.Drawing.Size(167, 15);
this.label5.TabIndex = 13;
this.label5.Text = "(Rückversand: max. 5 Blätter)";
//
@@ -314,7 +348,7 @@
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(267, 41);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(93, 13);
this.label6.Size = new System.Drawing.Size(106, 15);
this.label6.TabIndex = 10;
this.label6.Text = "Gewählte Adresse";
//
@@ -377,7 +411,7 @@
this.chkGAS.AutoSize = true;
this.chkGAS.Location = new System.Drawing.Point(6, 13);
this.chkGAS.Name = "chkGAS";
this.chkGAS.Size = new System.Drawing.Size(181, 17);
this.chkGAS.Size = new System.Drawing.Size(203, 19);
this.chkGAS.TabIndex = 0;
this.chkGAS.Text = "Frankiertes Rückantwortcouvert ";
this.chkGAS.UseVisualStyleBackColor = true;
@@ -411,7 +445,7 @@
this.txtAnzahlSeiten.Location = new System.Drawing.Point(151, 152);
this.txtAnzahlSeiten.Name = "txtAnzahlSeiten";
this.txtAnzahlSeiten.ReadOnly = true;
this.txtAnzahlSeiten.Size = new System.Drawing.Size(265, 13);
this.txtAnzahlSeiten.Size = new System.Drawing.Size(265, 16);
this.txtAnzahlSeiten.TabIndex = 17;
//
// txtAnzahlDokumente
@@ -421,7 +455,7 @@
this.txtAnzahlDokumente.Location = new System.Drawing.Point(151, 133);
this.txtAnzahlDokumente.Name = "txtAnzahlDokumente";
this.txtAnzahlDokumente.ReadOnly = true;
this.txtAnzahlDokumente.Size = new System.Drawing.Size(265, 13);
this.txtAnzahlDokumente.Size = new System.Drawing.Size(265, 16);
this.txtAnzahlDokumente.TabIndex = 16;
//
// label15
@@ -430,7 +464,7 @@
this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label15.Location = new System.Drawing.Point(10, 152);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(89, 13);
this.label15.Size = new System.Drawing.Size(113, 17);
this.label15.TabIndex = 15;
this.label15.Text = "Anzahl Seiten:";
//
@@ -440,7 +474,7 @@
this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label14.Location = new System.Drawing.Point(9, 133);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(117, 13);
this.label14.Size = new System.Drawing.Size(148, 17);
this.label14.TabIndex = 14;
this.label14.Text = "Anzahl Dokumente:";
//
@@ -474,7 +508,7 @@
this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label7.Location = new System.Drawing.Point(5, 14);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(72, 13);
this.label7.Size = new System.Drawing.Size(93, 17);
this.label7.TabIndex = 10;
this.label7.Text = "Versandart:";
//
@@ -494,7 +528,7 @@
this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label8.Location = new System.Drawing.Point(5, 40);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(132, 13);
this.label8.Size = new System.Drawing.Size(167, 17);
this.label8.TabIndex = 11;
this.label8.Text = "Rückantwort-Adresse:";
//
@@ -505,7 +539,7 @@
this.txtVersandoption.Location = new System.Drawing.Point(151, 14);
this.txtVersandoption.Name = "txtVersandoption";
this.txtVersandoption.ReadOnly = true;
this.txtVersandoption.Size = new System.Drawing.Size(265, 13);
this.txtVersandoption.Size = new System.Drawing.Size(265, 16);
this.txtVersandoption.TabIndex = 12;
//
// lblprueftext
@@ -513,7 +547,7 @@
this.lblprueftext.AutoSize = true;
this.lblprueftext.Location = new System.Drawing.Point(10, 174);
this.lblprueftext.Name = "lblprueftext";
this.lblprueftext.Size = new System.Drawing.Size(43, 13);
this.lblprueftext.Size = new System.Drawing.Size(48, 15);
this.lblprueftext.TabIndex = 6;
this.lblprueftext.Text = "Prüftext";
//
@@ -557,7 +591,7 @@
this.lblprueftextsb2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblprueftextsb2.Location = new System.Drawing.Point(9, 184);
this.lblprueftextsb2.Name = "lblprueftextsb2";
this.lblprueftextsb2.Size = new System.Drawing.Size(51, 13);
this.lblprueftextsb2.Size = new System.Drawing.Size(64, 17);
this.lblprueftextsb2.TabIndex = 20;
this.lblprueftextsb2.Text = "Prüftext";
//
@@ -568,7 +602,7 @@
this.txtAnzahlDokumetneSB.Location = new System.Drawing.Point(151, 126);
this.txtAnzahlDokumetneSB.Name = "txtAnzahlDokumetneSB";
this.txtAnzahlDokumetneSB.ReadOnly = true;
this.txtAnzahlDokumetneSB.Size = new System.Drawing.Size(265, 13);
this.txtAnzahlDokumetneSB.Size = new System.Drawing.Size(265, 16);
this.txtAnzahlDokumetneSB.TabIndex = 19;
//
// txtRückantwortSB
@@ -588,7 +622,7 @@
this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label16.Location = new System.Drawing.Point(9, 126);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(117, 13);
this.label16.Size = new System.Drawing.Size(148, 17);
this.label16.TabIndex = 18;
this.label16.Text = "Anzahl Dokumente:";
//
@@ -598,7 +632,7 @@
this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label9.Location = new System.Drawing.Point(6, 7);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(72, 13);
this.label9.Size = new System.Drawing.Size(93, 17);
this.label9.TabIndex = 14;
this.label9.Text = "Versandart:";
//
@@ -608,7 +642,7 @@
this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label10.Location = new System.Drawing.Point(6, 33);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(132, 13);
this.label10.Size = new System.Drawing.Size(167, 17);
this.label10.TabIndex = 15;
this.label10.Text = "Rückantwort-Adresse:";
//
@@ -619,7 +653,7 @@
this.txtversandartsb.Location = new System.Drawing.Point(152, 7);
this.txtversandartsb.Name = "txtversandartsb";
this.txtversandartsb.ReadOnly = true;
this.txtversandartsb.Size = new System.Drawing.Size(265, 13);
this.txtversandartsb.Size = new System.Drawing.Size(265, 16);
this.txtversandartsb.TabIndex = 16;
//
// btnsendserienbrief
@@ -652,7 +686,7 @@
this.lblprueftextSB.AutoSize = true;
this.lblprueftextSB.Location = new System.Drawing.Point(9, 154);
this.lblprueftextSB.Name = "lblprueftextSB";
this.lblprueftextSB.Size = new System.Drawing.Size(43, 13);
this.lblprueftextSB.Size = new System.Drawing.Size(48, 15);
this.lblprueftextSB.TabIndex = 6;
this.lblprueftextSB.Text = "Prüftext";
//
@@ -678,7 +712,7 @@
this.rbb1post.Checked = true;
this.rbb1post.Location = new System.Drawing.Point(74, 21);
this.rbb1post.Name = "rbb1post";
this.rbb1post.Size = new System.Drawing.Size(62, 17);
this.rbb1post.Size = new System.Drawing.Size(71, 19);
this.rbb1post.TabIndex = 5;
this.rbb1post.TabStop = true;
this.rbb1post.Text = "B1-Post";
@@ -690,7 +724,7 @@
this.rbb2post.AutoSize = true;
this.rbb2post.Location = new System.Drawing.Point(6, 21);
this.rbb2post.Name = "rbb2post";
this.rbb2post.Size = new System.Drawing.Size(62, 17);
this.rbb2post.Size = new System.Drawing.Size(71, 19);
this.rbb2post.TabIndex = 4;
this.rbb2post.Text = "B2-Post";
this.rbb2post.UseVisualStyleBackColor = true;
@@ -701,7 +735,7 @@
this.rbversandoption3.AutoSize = true;
this.rbversandoption3.Location = new System.Drawing.Point(222, 21);
this.rbversandoption3.Name = "rbversandoption3";
this.rbversandoption3.Size = new System.Drawing.Size(207, 17);
this.rbversandoption3.Size = new System.Drawing.Size(238, 19);
this.rbversandoption3.TabIndex = 2;
this.rbversandoption3.Text = "Hauptadresse, Postversand erzwingen";
this.rbversandoption3.UseVisualStyleBackColor = true;
@@ -712,7 +746,7 @@
this.rbapost.AutoSize = true;
this.rbapost.Location = new System.Drawing.Point(142, 21);
this.rbapost.Name = "rbapost";
this.rbapost.Size = new System.Drawing.Size(56, 17);
this.rbapost.Size = new System.Drawing.Size(63, 19);
this.rbapost.TabIndex = 3;
this.rbapost.Text = "A-Post";
this.rbapost.UseVisualStyleBackColor = true;
@@ -723,7 +757,7 @@
this.rbversandoption2.AutoSize = true;
this.rbversandoption2.Location = new System.Drawing.Point(222, 21);
this.rbversandoption2.Name = "rbversandoption2";
this.rbversandoption2.Size = new System.Drawing.Size(197, 17);
this.rbversandoption2.Size = new System.Drawing.Size(228, 19);
this.rbversandoption2.TabIndex = 1;
this.rbversandoption2.Text = "Hauptadresse, E-Banking erzwingen";
this.rbversandoption2.UseVisualStyleBackColor = true;
@@ -734,7 +768,7 @@
this.rbversandoption1.AutoSize = true;
this.rbversandoption1.Location = new System.Drawing.Point(222, 21);
this.rbversandoption1.Name = "rbversandoption1";
this.rbversandoption1.Size = new System.Drawing.Size(166, 17);
this.rbversandoption1.Size = new System.Drawing.Size(191, 19);
this.rbversandoption1.TabIndex = 0;
this.rbversandoption1.Text = "Hauptadresse und Versandart";
this.rbversandoption1.UseVisualStyleBackColor = true;
@@ -780,7 +814,7 @@
this.treeViewAdv1.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.HelpTextControl.Location = new System.Drawing.Point(732, 0);
this.treeViewAdv1.HelpTextControl.Name = "helpText";
this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(49, 15);
this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(55, 17);
this.treeViewAdv1.HelpTextControl.TabIndex = 0;
this.treeViewAdv1.HelpTextControl.Text = "help text";
this.treeViewAdv1.HideSelection = false;
@@ -817,7 +851,7 @@
this.treeViewAdv1.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.ToolTipControl.Location = new System.Drawing.Point(642, 0);
this.treeViewAdv1.ToolTipControl.Name = "toolTip";
this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(41, 15);
this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(46, 17);
this.treeViewAdv1.ToolTipControl.TabIndex = 1;
this.treeViewAdv1.ToolTipControl.Text = "toolTip";
this.treeViewAdv1.TransparentControls = true;
@@ -839,17 +873,17 @@
this.pdfViewerControl2.IsTextSearchEnabled = true;
this.pdfViewerControl2.IsTextSelectionEnabled = true;
this.pdfViewerControl2.Location = new System.Drawing.Point(482, 0);
messageBoxSettings12.EnableNotification = true;
this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings12;
messageBoxSettings4.EnableNotification = true;
this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings4;
this.pdfViewerControl2.MinimumZoomPercentage = 50;
this.pdfViewerControl2.Name = "pdfViewerControl2";
this.pdfViewerControl2.PageBorderThickness = 1;
pdfViewerPrinterSettings12.Copies = 1;
pdfViewerPrinterSettings12.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings12.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings12.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings12.PrintLocation")));
pdfViewerPrinterSettings12.ShowPrintStatusDialog = true;
this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings12;
pdfViewerPrinterSettings4.Copies = 1;
pdfViewerPrinterSettings4.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings4.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings4.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings4.PrintLocation")));
pdfViewerPrinterSettings4.ShowPrintStatusDialog = true;
this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings4;
this.pdfViewerControl2.ReferencePath = null;
this.pdfViewerControl2.ScrollDisplacementValue = 0;
this.pdfViewerControl2.ShowHorizontalScrollBar = true;
@@ -859,10 +893,10 @@
this.pdfViewerControl2.SpaceBetweenPages = 8;
this.pdfViewerControl2.TabIndex = 11;
this.pdfViewerControl2.Text = "pdfViewerControl2";
textSearchSettings12.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings12.HighlightAllInstance = true;
textSearchSettings12.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl2.TextSearchSettings = textSearchSettings12;
textSearchSettings4.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings4.HighlightAllInstance = true;
textSearchSettings4.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl2.TextSearchSettings = textSearchSettings4;
this.pdfViewerControl2.ThemeName = "Default";
this.pdfViewerControl2.VerticalScrollOffset = 0;
this.pdfViewerControl2.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default;
@@ -906,7 +940,7 @@
this.textBox4.Location = new System.Drawing.Point(156, 165);
this.textBox4.Name = "textBox4";
this.textBox4.ReadOnly = true;
this.textBox4.Size = new System.Drawing.Size(265, 13);
this.textBox4.Size = new System.Drawing.Size(265, 16);
this.textBox4.TabIndex = 25;
//
// label17
@@ -915,7 +949,7 @@
this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label17.Location = new System.Drawing.Point(12, 165);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(89, 13);
this.label17.Size = new System.Drawing.Size(113, 17);
this.label17.TabIndex = 24;
this.label17.Text = "Anzahl Seiten:";
//
@@ -926,7 +960,7 @@
this.textBox3.Location = new System.Drawing.Point(156, 141);
this.textBox3.Name = "textBox3";
this.textBox3.ReadOnly = true;
this.textBox3.Size = new System.Drawing.Size(265, 13);
this.textBox3.Size = new System.Drawing.Size(265, 16);
this.textBox3.TabIndex = 23;
//
// label13
@@ -935,7 +969,7 @@
this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label13.Location = new System.Drawing.Point(12, 141);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(117, 13);
this.label13.Size = new System.Drawing.Size(148, 17);
this.label13.TabIndex = 22;
this.label13.Text = "Anzahl Dokumente:";
//
@@ -956,7 +990,7 @@
this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label11.Location = new System.Drawing.Point(10, 19);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(72, 13);
this.label11.Size = new System.Drawing.Size(93, 17);
this.label11.TabIndex = 18;
this.label11.Text = "Versandart:";
//
@@ -966,7 +1000,7 @@
this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label12.Location = new System.Drawing.Point(10, 45);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(132, 13);
this.label12.Size = new System.Drawing.Size(167, 17);
this.label12.TabIndex = 19;
this.label12.Text = "Rückantwort-Adresse:";
//
@@ -977,7 +1011,7 @@
this.textBox2.Location = new System.Drawing.Point(156, 19);
this.textBox2.Name = "textBox2";
this.textBox2.ReadOnly = true;
this.textBox2.Size = new System.Drawing.Size(265, 13);
this.textBox2.Size = new System.Drawing.Size(265, 16);
this.textBox2.TabIndex = 20;
//
// treeViewAdvCouverts
@@ -1010,7 +1044,7 @@
this.treeViewAdvCouverts.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdvCouverts.HelpTextControl.Location = new System.Drawing.Point(732, 0);
this.treeViewAdvCouverts.HelpTextControl.Name = "helpText";
this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(49, 15);
this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(55, 17);
this.treeViewAdvCouverts.HelpTextControl.TabIndex = 0;
this.treeViewAdvCouverts.HelpTextControl.Text = "help text";
this.treeViewAdvCouverts.HideSelection = false;
@@ -1047,7 +1081,7 @@
this.treeViewAdvCouverts.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdvCouverts.ToolTipControl.Location = new System.Drawing.Point(642, 0);
this.treeViewAdvCouverts.ToolTipControl.Name = "toolTip";
this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(41, 15);
this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(46, 17);
this.treeViewAdvCouverts.ToolTipControl.TabIndex = 1;
this.treeViewAdvCouverts.ToolTipControl.Text = "toolTip";
this.treeViewAdvCouverts.TransparentControls = true;
@@ -1060,19 +1094,19 @@
this.versandCouvertLöschenToolStripMenuItem,
this.versandCouvertÖffnenbearbeitenToolStripMenuItem});
this.contextMenuStrip2.Name = "contextMenuStrip2";
this.contextMenuStrip2.Size = new System.Drawing.Size(262, 48);
this.contextMenuStrip2.Size = new System.Drawing.Size(313, 52);
//
// versandCouvertLöschenToolStripMenuItem
//
this.versandCouvertLöschenToolStripMenuItem.Name = "versandCouvertLöschenToolStripMenuItem";
this.versandCouvertLöschenToolStripMenuItem.Size = new System.Drawing.Size(261, 22);
this.versandCouvertLöschenToolStripMenuItem.Size = new System.Drawing.Size(312, 24);
this.versandCouvertLöschenToolStripMenuItem.Text = "Versand-Couvert löschen";
this.versandCouvertLöschenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertLöschenToolStripMenuItem_Click);
//
// versandCouvertÖffnenbearbeitenToolStripMenuItem
//
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Name = "versandCouvertÖffnenbearbeitenToolStripMenuItem";
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Size = new System.Drawing.Size(261, 22);
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Size = new System.Drawing.Size(312, 24);
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Text = "Versand-Couvert öffnen/bearbeiten";
this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertÖffnenbearbeitenToolStripMenuItem_Click);
//
@@ -1209,7 +1243,7 @@
this.lblprieveiwbezeichnung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblprieveiwbezeichnung.Location = new System.Drawing.Point(7, 16);
this.lblprieveiwbezeichnung.Name = "lblprieveiwbezeichnung";
this.lblprieveiwbezeichnung.Size = new System.Drawing.Size(0, 20);
this.lblprieveiwbezeichnung.Size = new System.Drawing.Size(0, 25);
this.lblprieveiwbezeichnung.TabIndex = 0;
//
// panel2
@@ -1267,7 +1301,7 @@
this.lblpostausgang.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblpostausgang.Location = new System.Drawing.Point(1238, 49);
this.lblpostausgang.Name = "lblpostausgang";
this.lblpostausgang.Size = new System.Drawing.Size(135, 20);
this.lblpostausgang.Size = new System.Drawing.Size(166, 25);
this.lblpostausgang.TabIndex = 24;
this.lblpostausgang.Text = "labelpostausgang";
this.lblpostausgang.Visible = false;
@@ -1292,7 +1326,7 @@
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(9, 22);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(143, 13);
this.label1.Size = new System.Drawing.Size(163, 15);
this.label1.TabIndex = 21;
this.label1.Text = "Fortschritt Dokumentversand";
//
@@ -1326,7 +1360,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, 13);
this.lblProgressTitel.Size = new System.Drawing.Size(0, 15);
this.lblProgressTitel.TabIndex = 19;
//
// label3
@@ -1334,7 +1368,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(25, 13);
this.label3.Size = new System.Drawing.Size(28, 15);
this.label3.TabIndex = 18;
this.label3.Text = "100";
//
@@ -1343,7 +1377,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(13, 13);
this.label2.Size = new System.Drawing.Size(14, 15);
this.label2.TabIndex = 17;
this.label2.Text = "0";
//
@@ -1368,43 +1402,11 @@
this.lblserienbrief.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblserienbrief.Location = new System.Drawing.Point(1236, 48);
this.lblserienbrief.Name = "lblserienbrief";
this.lblserienbrief.Size = new System.Drawing.Size(101, 20);
this.lblserienbrief.Size = new System.Drawing.Size(125, 25);
this.lblserienbrief.TabIndex = 26;
this.lblserienbrief.Text = "lblSerienbrief";
this.lblserienbrief.Visible = false;
//
// pnlcouvertgroesse
//
this.pnlcouvertgroesse.Controls.Add(this.rbc5normal);
this.pnlcouvertgroesse.Controls.Add(this.rbc5mini);
this.pnlcouvertgroesse.Location = new System.Drawing.Point(2, 33);
this.pnlcouvertgroesse.Name = "pnlcouvertgroesse";
this.pnlcouvertgroesse.Size = new System.Drawing.Size(260, 21);
this.pnlcouvertgroesse.TabIndex = 14;
this.pnlcouvertgroesse.Visible = false;
//
// rbc5mini
//
this.rbc5mini.AutoSize = true;
this.rbc5mini.Location = new System.Drawing.Point(5, 2);
this.rbc5mini.Name = "rbc5mini";
this.rbc5mini.Size = new System.Drawing.Size(115, 17);
this.rbc5mini.TabIndex = 0;
this.rbc5mini.TabStop = true;
this.rbc5mini.Text = "C5 Mini (bis 5 Blatt)";
this.rbc5mini.UseVisualStyleBackColor = true;
//
// rbc5normal
//
this.rbc5normal.AutoSize = true;
this.rbc5normal.Location = new System.Drawing.Point(123, 2);
this.rbc5normal.Name = "rbc5normal";
this.rbc5normal.Size = new System.Drawing.Size(135, 17);
this.rbc5normal.TabIndex = 1;
this.rbc5normal.TabStop = true;
this.rbc5normal.Text = "C5 Normal (bis 15 Blatt)";
this.rbc5normal.UseVisualStyleBackColor = true;
//
// Versandstrasse
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1433,6 +1435,8 @@
this.GrpPaketDetails.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.pnlcouvertgroesse.ResumeLayout(false);
this.pnlcouvertgroesse.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).EndInit();
this.panelVerify.ResumeLayout(false);
this.panelVerify.PerformLayout();
@@ -1455,8 +1459,6 @@
this.pnlprogress.ResumeLayout(false);
this.pnlprogress.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).EndInit();
this.pnlcouvertgroesse.ResumeLayout(false);
this.pnlcouvertgroesse.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();

354
Client/Versandstrasse/Versandstrasse.cs
View File

@@ -78,7 +78,7 @@ namespace OnDoc.Versandstrasse
{
bool hasprivateaddresses = false;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from Antwortadresse_mitarbeiter where mitarbeiternr = "+AppParams.CurrentMitarbeiter.ToString()+" order by reihenfolge", false, true);
db.Get_Tabledata("Select * from Antwortadresse_mitarbeiter where mitarbeiternr = " + AppParams.CurrentMitarbeiter.ToString() + " order by reihenfolge", false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
hasprivateaddresses = true;
@@ -111,18 +111,18 @@ namespace OnDoc.Versandstrasse
//treeViewAdvAdresse.SelectedNode = 0;
treeViewAdvAdresse.Enabled = false;
db = null;
}
private void Versandstrasse_Load(object sender, EventArgs e)
{
if (Properties.Settings.Default.GASSize == "True")
{
this.label5.Visible = false;
this.pnlcouvertgroesse.Visible = true;
this.pnlcouvertgroesse.Enabled= false;
this.pnlcouvertgroesse.Enabled = false;
this.rbc5mini.Checked = true;
this.rbc5normal.Checked = false;
}
@@ -147,8 +147,8 @@ namespace OnDoc.Versandstrasse
db = null;
if (treeViewAdv1.Nodes.Count > 0)
{
if (treeViewAdv1.Nodes.Count > 0)
{
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0];
this.pnlcouvert.Visible = true;
this.pnlpostkorb.Visible = false;
@@ -167,7 +167,7 @@ namespace OnDoc.Versandstrasse
this.lblserienbrief.Left = this.Width - lblserienbrief.Width;
}
}
else
else
{
this.lblpostausgang.Visible = true;
this.lblpostausgang.Left = this.Width - lblpostausgang.Width;
@@ -175,7 +175,7 @@ namespace OnDoc.Versandstrasse
this.pnlpostkorb.Visible = true;
this.pnlpostkorb.Dock = DockStyle.Fill;
Refresh_VersandCouverts();
ribbon1.Select();
ribbon1_Click(sender, e);
@@ -185,9 +185,9 @@ namespace OnDoc.Versandstrasse
}
panelPrepare.Left = this.Width - this.panelPrepare.Width;
lblprueftext.MaximumSize = new Size(panelVerify.Width-10, 50);
lblprueftextSB.MaximumSize = new Size(panelVerify.Width-10, 50);
lblprueftextsb2.MaximumSize = new Size(panelVerify.Width-10, 50);
lblprueftext.MaximumSize = new Size(panelVerify.Width - 10, 50);
lblprueftextSB.MaximumSize = new Size(panelVerify.Width - 10, 50);
lblprueftextsb2.MaximumSize = new Size(panelVerify.Width - 10, 50);
@@ -220,12 +220,12 @@ namespace OnDoc.Versandstrasse
{
db.Get_Tabledata("Select nrpar00, bkpar00 from partner where nrpar00=" + pakete[i].partnernr.ToString(), false, true);
DruckJob = new TreeNodeAdv();
DruckJob.Text = "Versand-Couvert - " + db.dsdaten.Tables[0].Rows[0][0].ToString()+ ", " + db.dsdaten.Tables[0].Rows[0][1].ToString();
DruckJob.Text = "Versand-Couvert - " + db.dsdaten.Tables[0].Rows[0][0].ToString() + ", " + db.dsdaten.Tables[0].Rows[0][1].ToString();
DruckJob.Tag = "Druckpaket";
//pakete[i].partnernr = i;
DruckJob.TagObject = pakete[i];
set_nodeimage(DruckJob, 0);
treeViewAdv1.Nodes.Add(DruckJob);
@@ -235,7 +235,7 @@ namespace OnDoc.Versandstrasse
//db.Get_Tabledata("Select * from [applikation] where applikationsnr = 1", false, true);
//if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Showlogin"]) == true) { button3.Visible = true; } else { button3.Visible = false; }
db = null;
db = null;
treeViewAdv1.ExpandAll();
foreach (TreeNodeAdv node in treeViewAdv1.Nodes)
{
@@ -278,12 +278,13 @@ namespace OnDoc.Versandstrasse
List<errormsg> errors = new List<errormsg>();
private void add_errormessage(int nr, string message)
{
bool found = false;
foreach (errormsg ermsg in errors) {
foreach (errormsg ermsg in errors)
{
if (ermsg.number == nr) { found = true; break; }
}
if (!found)
@@ -304,7 +305,7 @@ namespace OnDoc.Versandstrasse
db1.Get_Tabledata("Select isnull(versandstrasse_moeglich,0), isnull(versandstrasse_firstdoc,0) from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true);
if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) == 0 || Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][1]) == 0)
{
richTextBox1.Clear();
richTextBox1.BulletIndent = 20;
richTextBox1.SelectionBullet = true;
@@ -325,12 +326,12 @@ namespace OnDoc.Versandstrasse
Versanddokument vd = node.Nodes[0].TagObject as Versanddokument;
if (vd.Partnernr.ToString() != vp.partnernr.ToString())
{
db.Get_Tabledata("SELECT dbo.Partner.NRPAR00, dbo.Partner.BKPAR00 FROM partner where nrpar00="+vd.Partnernr, false, true);
db.Get_Tabledata("SELECT dbo.Partner.NRPAR00, dbo.Partner.BKPAR00 FROM partner where nrpar00=" + vd.Partnernr, false, true);
node.Text = "Versand-Couvert" + " - " + db.dsdaten.Tables[0].Rows[0][0].ToString() + " " + db.dsdaten.Tables[0].Rows[0][1].ToString();
vp.partnernr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
}
}
if (vp.partnernr == 0 && node.Nodes.Count==1)
if (vp.partnernr == 0 && node.Nodes.Count == 1)
{
TreeNodeAdv tn = node.Nodes[0];
db.Get_Tabledata("SELECT dbo.Partner.NRPAR00, dbo.Partner.BKPAR00 FROM dbo.dokument INNER JOIN dbo.Partner ON dbo.dokument.nrpar00 = dbo.Partner.NRPAR00 WHERE dbo.dokument.dokumentid='" + tn.Tag + "'", false, true);
@@ -350,9 +351,10 @@ namespace OnDoc.Versandstrasse
int anzbp = 1;
bool versandbereit = true;
if (vp.partnernr > 99999999) {
if (vp.partnernr > 99999999)
{
versandbereit = false;
add_errormessage(6,"Im Versand-Couvert liegen ausschliesslich Personen-Dokumente. Der Versand braucht technisch ein BP-Dokument.");
add_errormessage(6, "Im Versand-Couvert liegen ausschliesslich Personen-Dokumente. Der Versand braucht technisch ein BP-Dokument.");
}
string kdenummern = "";
@@ -360,18 +362,19 @@ namespace OnDoc.Versandstrasse
{
Versanddokument vd = dokumentnode.TagObject as Versanddokument;
if (kdenummern != "") { kdenummern = kdenummern + ";"; }
kdenummern = kdenummern + vd.Partnernr.ToString();
kdenummern = kdenummern + vd.Partnernr.ToString();
}
if (kdenummern != "")
{
db.clear_parameter();
db.add_parameter("@kundennummer",kdenummern);
db.add_parameter("@kundennummer", kdenummern);
db.Get_Tabledata("ondoc_versandstrasse_check_kdenr", true, false);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0])!=0) {
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) != 0)
{
versandbereit = false;
add_errormessage(Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0].ToString()), db.dsdaten.Tables[0].Rows[0][1].ToString());
add_errormessage(Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0].ToString()), db.dsdaten.Tables[0].Rows[0][1].ToString());
}
}
@@ -393,7 +396,7 @@ namespace OnDoc.Versandstrasse
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0)
{
set_nodeimage(dokumentnode, 0);
add_errormessage(4,"Im Versand-Couvert liegt ein Dokument, welches nicht via Versandstrasse verschickt werden kann");
add_errormessage(4, "Im Versand-Couvert liegt ein Dokument, welches nicht via Versandstrasse verschickt werden kann");
versandbereit = false;
}
else
@@ -406,13 +409,14 @@ namespace OnDoc.Versandstrasse
}
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0)
{
if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; add_errormessage(2,"Im Versand-Couvert liegt an erster Position ein Dokument, welches nicht als vorderstes Dokument tauglich ist"); }
if (nodecounter == 0) { set_nodeimage(dokumentnode, 4); versandbereit = false; add_errormessage(2, "Im Versand-Couvert liegt an erster Position ein Dokument, welches nicht als vorderstes Dokument tauglich ist"); }
else
{
set_nodeimage(dokumentnode, 5);
}
db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='" + dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) > 0){
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) > 0)
{
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0)
{
set_nodeimage(dokumentnode, 4);
@@ -425,9 +429,11 @@ namespace OnDoc.Versandstrasse
}
else
{
db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='"+dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) >1 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) >1 ){
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0){
db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='" + dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 1 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) > 1)
{
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0)
{
set_nodeimage(dokumentnode, 2);
versandbereit = false;
add_errormessage(7, "Im Versand-Couvert sind Dokumente mit fehlender faksimiler Unterschrift");
@@ -442,7 +448,7 @@ namespace OnDoc.Versandstrasse
}
nodecounter++;
}
if (node.Nodes.Count < 1) { versandbereit = false;add_errormessage(1, "Im Versand-Couvert liegen keine Dokumente"); }
if (node.Nodes.Count < 1) { versandbereit = false; add_errormessage(1, "Im Versand-Couvert liegen keine Dokumente"); }
if (anzbp > 1) { versandbereit = false; }
if (versandbereit == true)
{
@@ -465,11 +471,11 @@ namespace OnDoc.Versandstrasse
if (!errormessage.Contains(emsg.message))
{
//if (errormessage != "") { errormessage = errormessage + Environment.NewLine; }
errormessage = errormessage + emsg.message+"\n";
errormessage = errormessage + emsg.message + "\n";
}
}
richTextBox1.SelectedText = errormessage.Substring(0,errormessage.Length-1);
richTextBox1.SelectedText = errormessage.Substring(0, errormessage.Length - 1);
}
lblerror.Visible = true;
@@ -484,9 +490,9 @@ namespace OnDoc.Versandstrasse
foreach (Versanddokument vd in pakete[0].Dokument)
{
TreeNodeAdv tn = new TreeNodeAdv();
tn.Text = vd.Bezeichnung+" ("+vd.DokumentID+")";
tn.Text = vd.Bezeichnung + " (" + vd.DokumentID + ")";
tn.Tag = vd.dokument;
set_nodeimage(tn, 3);
treeViewAdv1.Nodes[0].Nodes.Add(tn);
}
@@ -538,8 +544,9 @@ namespace OnDoc.Versandstrasse
TreeViewDropPositions dropPosition = this.treeViewDragHighlightTracker.DropPosition;
this.treeViewDragHighlightTracker.ClearHighlightNode();
this.currentSourceNode = null;
if (sourceNode.Level == 0) {
return;
if (sourceNode.Level == 0)
{
return;
}
if (destinationNode != null)
@@ -553,18 +560,18 @@ namespace OnDoc.Versandstrasse
sourceNode.Move(destinationNode, NodePositions.Next);
break;
case TreeViewDropPositions.OnNode:
Versandpaket sourcepaket = sourceNode.Parent.TagObject as Versandpaket;
TreeNodeAdv savenode = sourceNode.Parent;
sourceNode.Move(destinationNode.Nodes);
//Versanddokument dem neuen Versandpaket zuordnen
Versandpaket paket = destinationNode.TagObject as Versandpaket;
Versanddokument vd = sourceNode.TagObject as Versanddokument;
paket.Dokument.Add(vd);
destinationNode.TagObject = paket;
foreach (Versanddokument vd1 in sourcepaket.Dokument)
{
if (vd1.DokumentID == vd.DokumentID)
@@ -619,8 +626,8 @@ namespace OnDoc.Versandstrasse
TreeNodeAdv xdestinationNode = this.treeViewDragHighlightTracker.HighlightNode;
TreeViewDropPositions dropPosition = this.treeViewDragHighlightTracker.DropPosition;
if (sourceNode.Level==1) { return false; }
if (sourceNode.Level == 1) { return false; }
if (destinationNode == null || destinationNode == sourceNode)
return false;
@@ -706,7 +713,7 @@ namespace OnDoc.Versandstrasse
private void treeViewAdv1_NodeMouseClick(object sender, TreeViewAdvMouseClickEventArgs e)
{
}
private void button1_Click(object sender, EventArgs e)
@@ -736,7 +743,7 @@ namespace OnDoc.Versandstrasse
this.txtRückantwort.Text = txtadresse.Text.ToString();
this.txtRückantwortSB.Text = txtRückantwort.Text;
this.txtversandartsb.Text = txtVersandoption.Text;
if (serienbrief)
{
clsVersandstrasse vs = new clsVersandstrasse();
@@ -755,11 +762,11 @@ namespace OnDoc.Versandstrasse
panelPrepare.Visible = true;
panelPrepare.Left = (this.Width - panelPrepare.Width) / 2;
panelverifysb.Visible = false;
btnsendserienbrief.Visible = false;
btnSendFinal.Visible = true;
btnsendserienbrief.Visible = false;
btnSendFinal.Visible = true;
Application.DoEvents();
Cursor = Cursors.WaitCursor;
try
@@ -774,7 +781,7 @@ namespace OnDoc.Versandstrasse
{
clsVersandstrasse vs = new clsVersandstrasse();
vsdok.dokument = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath);
}
}
}
@@ -830,16 +837,30 @@ namespace OnDoc.Versandstrasse
treeViewAdv1.SelectedNode.TagObject = paket;
panelVerify.Visible = true;
this.txtAnzahlSeiten.Text = pdfViewerControl1.PageCount.ToString();
if (Properties.Settings.Default.GASSize == "True")
{
if (Convert.ToInt32(txtAnzahlSeiten.Text) > 30)
{
if (chkGAS.Checked && rbc5mini.Checked)
{
rbc5normal.Checked = true;
MessageBox.Show("Aufgrund der Anzahl Seiten wurde automatisch C5 Normal für das Rückantwort-Couvert gesetzt.", "Rückantwort-Couvert", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
}
this.txtAnzahlDokumente.Text = paket.Dokument.Count().ToString();
lblprieveiwbezeichnung.Text = "Aufbereitetes PDF";
}
catch (Exception ex) { MessageBox.Show(ex.Message);
}
catch (Exception ex)
{
MessageBox.Show(ex.Message);
}
panelPrepare.Visible = false;
Cursor = Cursors.Default;
Application.DoEvents();
}
}
private string save_stapel(ref Stream[] streams)
{
@@ -894,7 +915,7 @@ namespace OnDoc.Versandstrasse
private void btnSendFinal_Click(object sender, EventArgs e)
{
if (serienbrief)
{
@@ -910,12 +931,12 @@ namespace OnDoc.Versandstrasse
}
foreach (TreeNodeAdv node in treeViewAdv1.Nodes[0].Nodes)
{
svp.finaldoc = node.TagObject.ToString();
svp.send_onbase_doc = true;
string dokumentid = node.Text.Substring(node.Text.Length-23, 22);
string dokumentid = node.Text.Substring(node.Text.Length - 23, 22);
string _sqlWhere = @"dokumentid = '" + dokumentid + "'";
DataTable _newDataTable = sb.dsempfaenger.Tables[0].Select(_sqlWhere, "").CopyToDataTable();
svp.partnernr = Convert.ToInt32(_newDataTable.Rows[0]["partnernr"].ToString());
@@ -924,10 +945,10 @@ namespace OnDoc.Versandstrasse
vd.dokument = node.TagObject.ToString();
vd.inteintragnr = Convert.ToInt32(_newDataTable.Rows[0]["inteintragnr"].ToString());
svp.bemerkung = vd.DokumentID +" / " + sb.serienbriefnr.ToString() + "_" + _newDataTable.Rows[0]["inteintragnr"].ToString();
svp.bemerkung = vd.DokumentID + " / " + sb.serienbriefnr.ToString() + "_" + _newDataTable.Rows[0]["inteintragnr"].ToString();
svp.Dokument.Clear();
svp.Dokument.Add(vd);
DB db = new DB(AppParams.connectionstring);
//db.clear_parameter();
//db.add_parameter("@tgnummer", AppParams.currenttgnummer);
@@ -941,12 +962,12 @@ namespace OnDoc.Versandstrasse
this.progressBarAdv1.Value = this.progressBarAdv1.Value + 1;
send_vs(ref svp, false);
}
sb.status = 1;
pdfViewerControl1.Unload();
@@ -968,7 +989,7 @@ namespace OnDoc.Versandstrasse
}
foreach (TreeNodeAdv node in treeViewAdv1.SelectedNode.Nodes)
{
foreach(Versanddokument vdok in vp.Dokument)
foreach (Versanddokument vdok in vp.Dokument)
{
if (node.Tag == vdok.DokumentID) { vdl.Add(vdok); }
}
@@ -992,19 +1013,20 @@ namespace OnDoc.Versandstrasse
DB db = new DB(AppParams.connectionstring);
string dokumente = "";
if (vp.Dokument.Count > 1) { vp.send_onbase_doc = false; }
else {
foreach (Versanddokument vd in vp.Dokument)
else
{
dokumente = dokumente + vd.DokumentID + ";";
string sql = "SELECT dbo.dokumenttyp.ErstellungInOffice FROM dbo.dokument INNER JOIN dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr WHERE (dbo.dokument.dokumentid = '" + vd.DokumentID + "')";
db.Get_Tabledata(sql, false, true);
if (db.dsdaten.Tables[0].Rows[0][0].ToString() == "True")
foreach (Versanddokument vd in vp.Dokument)
{
//vd.dokument = "";
vp.send_onbase_doc = false;
dokumente = dokumente + vd.DokumentID + ";";
string sql = "SELECT dbo.dokumenttyp.ErstellungInOffice FROM dbo.dokument INNER JOIN dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr WHERE (dbo.dokument.dokumentid = '" + vd.DokumentID + "')";
db.Get_Tabledata(sql, false, true);
if (db.dsdaten.Tables[0].Rows[0][0].ToString() == "True")
{
//vd.dokument = "";
vp.send_onbase_doc = false;
}
}
}
}
//db.clear_parameter();
//db.add_parameter("@tgnummer", AppParams.currenttgnummer);
//db.add_parameter("@partnernr", vp.partnernr.ToString());
@@ -1022,37 +1044,37 @@ namespace OnDoc.Versandstrasse
string jsonstring = JsonConvert.SerializeObject(vp);
//vp.send_onbase_doc = true;
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.add_parameter("@ersteller", AppParams.CurrentMitarbeiter.ToString());
db.Get_Tabledata("ondoc_create_versandpaket", true, false);
int paketid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
db.Get_Tabledata_for_Update("Select top 1 * from Ondoc_Versandstrasse_Paket where id=" + paketid.ToString(), false, true);
DataRow dr = db.daten.Tables[0].Rows[0];
dr[2] = jsonstring;
dr["aktiv"] = 1;
dr["versandoption"] = vp.Versandoption.ToString();
dr["Bemerkung"] = vp.bemerkung;
// db.daten.Tables[0].Rows.Add(dr);
db.Update_Data();
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.add_parameter("@ersteller", AppParams.CurrentMitarbeiter.ToString());
db.Get_Tabledata("ondoc_create_versandpaket", true, false);
int paketid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
db.daten.Tables.Clear();
db.Get_Tabledata_for_Update("Select * from ondoc_versandstrasse_paket_dokumentid where couvert_id = -1", false, true);
foreach (Versanddokument vd in vp.Dokument)
{
DataRow dr1 = db.daten.Tables[0].NewRow();
dr1[1] = paketid;
dr1[2] = vd.DokumentID;
dr1[3] = 1;
db.daten.Tables[0].Rows.Add(dr1);
}
db.Update_Data();
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
db.Get_Tabledata_for_Update("Select top 1 * from Ondoc_Versandstrasse_Paket where id=" + paketid.ToString(), false, true);
DataRow dr = db.daten.Tables[0].Rows[0];
dr[2] = jsonstring;
dr["aktiv"] = 1;
dr["versandoption"] = vp.Versandoption.ToString();
dr["Bemerkung"] = vp.bemerkung;
// db.daten.Tables[0].Rows.Add(dr);
db.Update_Data();
db.daten.Tables.Clear();
db.Get_Tabledata_for_Update("Select * from ondoc_versandstrasse_paket_dokumentid where couvert_id = -1", false, true);
foreach (Versanddokument vd in vp.Dokument)
{
DataRow dr1 = db.daten.Tables[0].NewRow();
dr1[1] = paketid;
dr1[2] = vd.DokumentID;
dr1[3] = 1;
db.daten.Tables[0].Rows.Add(dr1);
}
db.Update_Data();
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
if (!direktversenden)
{
return;
@@ -1140,10 +1162,11 @@ namespace OnDoc.Versandstrasse
{
txtadresse.Text = txtadresse.Text + dr["zeile7"].ToString() + Environment.NewLine;
}
catch { }
catch { }
}
catch {
catch
{
txtadresse.Text = "";
}
@@ -1204,8 +1227,9 @@ namespace OnDoc.Versandstrasse
{
foreach (TreeNodeAdv tn in treeViewAdvAdresse.Nodes)
{
if (tn.Tag.ToString() == paket.GASAdresse) {
treeViewAdvAdresse.SelectedNode = tn;
if (tn.Tag.ToString() == paket.GASAdresse)
{
treeViewAdvAdresse.SelectedNode = tn;
}
}
}
@@ -1225,7 +1249,7 @@ namespace OnDoc.Versandstrasse
}
else
{
dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null,null,"",this.ribbonchkadresse.Checked);
dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, null, "", this.ribbonchkadresse.Checked);
}
var stream = new MemoryStream(Convert.FromBase64String(dok));
@@ -1235,8 +1259,8 @@ namespace OnDoc.Versandstrasse
GrpPaketDetails.Enabled = false;
}
}
catch (Exception ex) { }
finally { Cursor.Current=Cursors.Default; }
catch (Exception ex) { }
finally { Cursor.Current = Cursors.Default; }
}
private void button2_Click(object sender, EventArgs e)
@@ -1246,7 +1270,7 @@ namespace OnDoc.Versandstrasse
private void contextMenuStrip1_Click(object sender, EventArgs e)
{
}
private void toolStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
@@ -1258,37 +1282,37 @@ namespace OnDoc.Versandstrasse
{
}
private void Refresh_VersandCouverts()
{
DB db = new DB(AppParams.connectionstring);
DB db2 = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
treeViewAdvCouverts.Nodes.Clear();
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
{
DB db = new DB(AppParams.connectionstring);
DB db2 = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
treeViewAdvCouverts.Nodes.Clear();
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(dr["paket"].ToString());
TreeNodeAdv tn = new TreeNodeAdv();
db2.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + vp.partnernr.ToString(), false, true);
tn.Text = vp.partnernr.ToString() + " - " + db2.dsdaten.Tables[0].Rows[0][0].ToString();
tn.TagObject = vp.finaldoc;
tn.Tag = dr[0].ToString();
if (vp.Versandoption.ToString() == "A_POST") { set_nodeimage(tn, 0); }
if (vp.Versandoption.ToString() == "B1_POST") { set_nodeimage(tn, 1); }
if (vp.Versandoption.ToString() == "B2_POST") { set_nodeimage(tn, 2); }
treeViewAdvCouverts.Nodes.Add(tn);
foreach (Versanddokument vd in vp.Dokument)
{
Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(dr["paket"].ToString());
TreeNodeAdv tn = new TreeNodeAdv();
db2.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + vp.partnernr.ToString(), false, true);
tn.Text = vp.partnernr.ToString() + " - " + db2.dsdaten.Tables[0].Rows[0][0].ToString();
tn.TagObject = vp.finaldoc;
tn.Tag = dr[0].ToString();
if (vp.Versandoption.ToString() == "A_POST") { set_nodeimage(tn, 0); }
if (vp.Versandoption.ToString() == "B1_POST") { set_nodeimage(tn, 1); }
if (vp.Versandoption.ToString() == "B2_POST") { set_nodeimage(tn, 2); }
treeViewAdvCouverts.Nodes.Add(tn);
foreach (Versanddokument vd in vp.Dokument)
{
TreeNodeAdv tn2 = new TreeNodeAdv();
tn2.Text = vd.Bezeichnung;
tn2.Tag = vd.DokumentID;
tn2.TagObject = vd.dokument;
tn.Nodes.Add(tn2);
}
TreeNodeAdv tn2 = new TreeNodeAdv();
tn2.Text = vd.Bezeichnung;
tn2.Tag = vd.DokumentID;
tn2.TagObject = vd.dokument;
tn.Nodes.Add(tn2);
}
db = null;
db2 = null;
}
db = null;
db2 = null;
}
@@ -1321,7 +1345,7 @@ namespace OnDoc.Versandstrasse
}
else
{
this.textBox4.Text = "";
this.textBox4.Text = "";
this.textBox3.Text = "";
this.textBox2.Text = "";
this.textBox1.Text = "";
@@ -1338,7 +1362,7 @@ namespace OnDoc.Versandstrasse
foreach (TreeNodeAdv tn in treeViewAdvCouverts.SelectedNodes)
{
db.Exec_SQL("Update ondoc_versandstrasse_paket set geloescht=getdate(), aktiv=0, geloescht_durch=" + AppParams.CurrentMitarbeiter.ToString() + " where id=" + tn.Tag.ToString());
}
db = null;
pdfViewerControl2.Unload();
@@ -1352,10 +1376,10 @@ namespace OnDoc.Versandstrasse
if (treeViewAdvCouverts.SelectedNode.Level != 1) { return; }
int id = Convert.ToInt32(treeViewAdvCouverts.SelectedNode.Tag);
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from Ondoc_Versandstrasse_Paket where id=" +id.ToString(), false, true);
db.Get_Tabledata("Select * from Ondoc_Versandstrasse_Paket where id=" + id.ToString(), false, true);
Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(db.dsdaten.Tables[0].Rows[0]["Paket"].ToString());
pakete.Add(vp);
foreach (TreeNodeAdv tn in treeViewAdvCouverts.SelectedNodes)
{
db.Exec_SQL("Update ondoc_versandstrasse_paket set geloescht=getdate(), aktiv=0, reopen=1,geloescht_durch=" + AppParams.CurrentMitarbeiter.ToString() + " where id=" + id.ToString());
@@ -1367,7 +1391,7 @@ namespace OnDoc.Versandstrasse
lblprieveiwbezeichnung.Text = "";
Reload_Tree();
ribbon1.TabIndex = 0;
}
@@ -1383,11 +1407,11 @@ namespace OnDoc.Versandstrasse
node = node.Parent;
Versandpaket vp = node.TagObject as Versandpaket;
reserve_vs_dokument(treeViewAdv1.SelectedNode.Tag.ToString(), 2);
vp.Dokument.Remove(vd);
treeViewAdv1.SelectedNode.Remove();
Verify_Couvert(node);
}
else
@@ -1424,7 +1448,7 @@ namespace OnDoc.Versandstrasse
private void contextMenuStrip1_Opening(object sender, CancelEventArgs e)
{
if (treeViewAdv1.SelectedNode.Level>1 && treeViewAdv1.SelectedNode.Parent.Text.Contains("Serienbrief"))
if (treeViewAdv1.SelectedNode.Level > 1 && treeViewAdv1.SelectedNode.Parent.Text.Contains("Serienbrief"))
{
löschenToolStripMenuItem.Enabled = false;
}
@@ -1457,7 +1481,7 @@ namespace OnDoc.Versandstrasse
private void tsbtnpreviewdoc_Click(object sender, EventArgs e)
{
}
private void tsbtncheckaddress_Click(object sender, EventArgs e)
@@ -1466,7 +1490,7 @@ namespace OnDoc.Versandstrasse
private void ribbonButton1_Click(object sender, EventArgs e)
{
}
private void ribbonButtonNewCouvert_Click(object sender, EventArgs e)
@@ -1496,7 +1520,7 @@ namespace OnDoc.Versandstrasse
{
this.lblpostausgang.Visible = false;
this.pnlcouvert.Visible = true;
this.pnlcouvert.Dock= DockStyle.Fill;
this.pnlcouvert.Dock = DockStyle.Fill;
this.pnlpostkorb.Visible = false;
}
}
@@ -1506,11 +1530,11 @@ namespace OnDoc.Versandstrasse
if (this.ribbonTab2.Active)
{
this.lblpostausgang.Visible = true;
this.lblpostausgang.Left = this.Width-lblpostausgang.Width;
this.lblpostausgang.Left = this.Width - lblpostausgang.Width;
this.pnlcouvert.Visible = false;
this.pnlpostkorb.Visible = true;
this.pnlpostkorb.Dock= DockStyle.Fill;
this.pnlpostkorb.Dock = DockStyle.Fill;
Refresh_VersandCouverts();
}
}
@@ -1551,22 +1575,22 @@ namespace OnDoc.Versandstrasse
}
else
{
ribbonbuttondokpreviewpostkorb.Checked= true;
ribbonbuttondokpreviewpostkorb.Checked = true;
treeViewAdv1_AfterSelect(sender, e);
}
}
private void Versandstrasse_Resize(object sender, EventArgs e)
{
this.treeViewAdvCouverts.Height = this.Height - this.ribbon1.Height-this.grpCouvertDetails.Height;
this.treeViewAdvCouverts.Height = this.Height - this.ribbon1.Height - this.grpCouvertDetails.Height;
panelPrepare.Left = this.Width - this.panelPrepare.Width;
}
private void Versandstrasse_FormClosing(object sender, FormClosingEventArgs e)
{
if (this.treeViewAdv1.Nodes.Count > 0)
{
MessageBox.Show("Vor dem Schliessen sind die pendenten Couverts zu löschen oder in den Postausgang zu legen.","Schliessen",MessageBoxButtons.OK,MessageBoxIcon.Information);
if (this.treeViewAdv1.Nodes.Count > 0)
{
MessageBox.Show("Vor dem Schliessen sind die pendenten Couverts zu löschen oder in den Postausgang zu legen.", "Schliessen", MessageBoxButtons.OK, MessageBoxIcon.Information);
e.Cancel = true;
}
}
@@ -1576,7 +1600,7 @@ namespace OnDoc.Versandstrasse
int a = 0;
}
public void add_doc (Versanddokument vs)
public void add_doc(Versanddokument vs)
{
bool zugewiesen = false;
foreach (Versandpaket vp in pakete)
@@ -1605,7 +1629,7 @@ namespace OnDoc.Versandstrasse
pakete.Add(vp);
zugewiesen = true;
Reload_Tree();
}
}
@@ -1614,5 +1638,15 @@ namespace OnDoc.Versandstrasse
{
AppParams.versandstrassewindows_open = false;
}
private void rbc5mini_CheckedChanged(object sender, EventArgs e)
{
this.panelVerify.Visible = false;
}
private void rbc5normal_CheckedChanged(object sender, EventArgs e)
{
this.panelVerify.Visible = false;
}
}
}

10
Client/Versandstrasse/Versandstrasse.resx
View File

@@ -128,7 +128,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0
DAAAAk1TRnQBSQFMAgEBBgEAASABAQEgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBBgEAASgBAQEoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -194,7 +194,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU
DAAAAk1TRnQBSQFMAgEBBQEAASgBAQEoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBBQEAATABAQEwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -248,7 +248,7 @@
AYABAQIAAeABBwHAAQMBwAEDAgAB8AEPAfABDwHwAQ8BgAEBCw==
</value>
</data>
<data name="pdfViewerPrinterSettings11.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<data name="pdfViewerPrinterSettings3.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
@@ -337,7 +337,7 @@
/wM19F1wo1uqCAAAAABJRU5ErkJggg==
</value>
</data>
<data name="pdfViewerPrinterSettings12.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<data name="pdfViewerPrinterSettings4.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
@@ -355,7 +355,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq
CQAAAk1TRnQBSQFMAgEBAwEAAegBAAHoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBAwEAAfABAAHwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocClient.zip
View File

Binary file not shown.

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.Properties.Resources.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.