diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll index 84626b78..7280b31e 100644 Binary files a/API_NetFramework/bin/Database.dll and b/API_NetFramework/bin/Database.dll differ diff --git a/API_NetFramework/bin/Database.pdb b/API_NetFramework/bin/Database.pdb index c7b27663..18e13af0 100644 Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index dbad1ac3..e6d61d19 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index 7e81cfae..2186c873 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index 6a4902b8..ae77ea08 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -12265,3 +12265,36 @@ done 2025-04-18 08:24:05.4156|DEBUG|OnDoc|Start Transfer to OnBase 2025-04-18 08:24:05.4156|DEBUG|OnDoc|Ende Transfer to OnBase 2025-04-18 08:24:05.4301|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1032777_20250418082405.json.pdf +2025-04-21 12:23:24.5333|DEBUG|OnDoc| +2025-04-21 12:23:24.5757|DEBUG|OnDoc| +2025-04-21 12:23:24.6342|DEBUG|OnDoc| +2025-04-21 12:23:24.6412|DEBUG|OnDoc| +2025-04-21 12:23:24.6637|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002508362 +2025-04-21 12:23:24.6637|DEBUG|OnDoc| +2025-04-21 12:23:24.6972|DEBUG|OnDoc| +2025-04-21 12:23:24.6972|DEBUG|OnDoc| +2025-04-21 12:23:24.7017|DEBUG|OnDoc| +2025-04-21 12:23:24.7017|DEBUG|OnDoc| +2025-04-21 12:23:24.9187|DEBUG|OnDoc| +2025-04-21 12:23:24.9212|DEBUG|OnDoc| +2025-04-21 12:23:24.9212|DEBUG|OnDoc| +2025-04-21 12:23:26.1793|DEBUG|OnDoc|Start Transfer to OnBase +2025-04-21 12:23:26.3218|DEBUG|OnDoc|Ende Transfer to OnBase +2025-04-21 12:23:26.3441|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002508362 +2025-04-21 12:23:26.3441|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002508362 +2025-04-21 12:23:26.3441|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002508362 +2025-04-21 12:23:26.3441|DEBUG|OnDoc| +2025-04-21 12:23:26.3576|DEBUG|OnDoc| +2025-04-21 12:23:26.3576|DEBUG|OnDoc| +2025-04-21 12:23:26.4071|DEBUG|OnDoc| +2025-04-21 12:23:26.4071|DEBUG|OnDoc| +2025-04-21 12:23:26.4071|DEBUG|OnDoc| +2025-04-21 12:23:26.4071|DEBUG|OnDoc| +2025-04-21 12:23:26.4071|DEBUG|OnDoc| +2025-04-21 12:23:26.4300|DEBUG|OnDoc|Start Transfer to OnBase +2025-04-21 12:23:26.4362|DEBUG|OnDoc|Ende Transfer to OnBase +2025-04-21 12:23:26.4362|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1000208_20250421122326.json.pdf +2025-04-21 12:31:19.1607|DEBUG|OnDoc| +2025-04-21 12:31:19.1871|DEBUG|OnDoc| +2025-04-21 12:31:19.2156|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-04-21 12:31:19.2181|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index f9a68dce..d9d28142 100644 Binary files a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll index dbad1ac3..e6d61d19 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb index 7e81cfae..2186c873 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll index 84626b78..7280b31e 100644 Binary files a/BarcodeLib/bin/Debug/Database.dll and b/BarcodeLib/bin/Debug/Database.dll differ diff --git a/BarcodeLib/bin/Debug/Database.pdb b/BarcodeLib/bin/Debug/Database.pdb index c7b27663..18e13af0 100644 Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index 4c9deb16..11c86acf 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/Client/Client.csproj b/Client/Client.csproj index 13dc60dd..356aef6b 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -447,6 +447,12 @@ frmCalendar.cs + + Form + + + FrmExternalDocEdit.cs + Form @@ -757,6 +763,9 @@ frmCalendar.cs + + FrmExternalDocEdit.cs + frmLogin.cs @@ -1198,11 +1207,6 @@ - - - - - @@ -1353,6 +1357,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Client/Client.csproj.user b/Client/Client.csproj.user index d0ffe724..e2030494 100644 --- a/Client/Client.csproj.user +++ b/Client/Client.csproj.user @@ -1,8 +1,7 @@  - - + ondoc://%3ffunktion=createdoc&partnernr=1032777&vorlagenr=27&id=OFFEDK0082024002461933 publish\ diff --git a/Client/Diverses/FrmExternalDocEdit.Designer.cs b/Client/Diverses/FrmExternalDocEdit.Designer.cs new file mode 100644 index 00000000..9af33d3e --- /dev/null +++ b/Client/Diverses/FrmExternalDocEdit.Designer.cs @@ -0,0 +1,197 @@ +namespace OnDoc.Diverses +{ + partial class FrmExternalDocEdit + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmExternalDocEdit)); + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.lblKunde = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.lbldokument = new System.Windows.Forms.Label(); + this.sfButton1 = new Syncfusion.WinForms.Controls.SfButton(); + this.sfButton2 = new Syncfusion.WinForms.Controls.SfButton(); + this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton(); + this.lblmessage = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(2, 110); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(153, 23); + this.button1.TabIndex = 0; + this.button1.Text = "Neues Dokument erstellen"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Visible = false; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // button2 + // + this.button2.Location = new System.Drawing.Point(170, 110); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(196, 23); + this.button2.TabIndex = 1; + this.button2.Text = "Dokument kopieren und bearbeiten"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Visible = false; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // button3 + // + this.button3.Location = new System.Drawing.Point(372, 110); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(230, 23); + this.button3.TabIndex = 2; + this.button3.Text = "Bestehendes Dokument wiederbearbeiten"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Visible = false; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(5, 28); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(53, 17); + this.label1.TabIndex = 3; + this.label1.Text = "Kunde:"; + // + // lblKunde + // + this.lblKunde.AutoSize = true; + this.lblKunde.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblKunde.Location = new System.Drawing.Point(109, 28); + this.lblKunde.Name = "lblKunde"; + this.lblKunde.Size = new System.Drawing.Size(0, 17); + this.lblKunde.TabIndex = 4; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(5, 62); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(76, 17); + this.label2.TabIndex = 5; + this.label2.Text = "Dokument:"; + // + // lbldokument + // + this.lbldokument.AutoSize = true; + this.lbldokument.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbldokument.Location = new System.Drawing.Point(109, 62); + this.lbldokument.Name = "lbldokument"; + this.lbldokument.Size = new System.Drawing.Size(0, 17); + this.lbldokument.TabIndex = 6; + // + // sfButton1 + // + this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); + this.sfButton1.Location = new System.Drawing.Point(6, 110); + this.sfButton1.Name = "sfButton1"; + this.sfButton1.Size = new System.Drawing.Size(162, 28); + this.sfButton1.TabIndex = 7; + this.sfButton1.Text = "Neues Dokument erstellen"; + this.sfButton1.Click += new System.EventHandler(this.sfButton1_Click); + // + // sfButton2 + // + this.sfButton2.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); + this.sfButton2.Location = new System.Drawing.Point(174, 110); + this.sfButton2.Name = "sfButton2"; + this.sfButton2.Size = new System.Drawing.Size(211, 28); + this.sfButton2.TabIndex = 8; + this.sfButton2.Text = "Dokument kopieren und bearbeiten"; + this.sfButton2.Click += new System.EventHandler(this.sfButton2_Click); + // + // sfButton3 + // + this.sfButton3.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); + this.sfButton3.Location = new System.Drawing.Point(391, 110); + this.sfButton3.Name = "sfButton3"; + this.sfButton3.Size = new System.Drawing.Size(256, 28); + this.sfButton3.TabIndex = 9; + this.sfButton3.Text = "Bestehendes Dokument wiederbearbeiten"; + this.sfButton3.Click += new System.EventHandler(this.sfButton3_Click); + // + // lblmessage + // + this.lblmessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblmessage.Location = new System.Drawing.Point(112, 62); + this.lblmessage.Name = "lblmessage"; + this.lblmessage.Size = new System.Drawing.Size(529, 34); + this.lblmessage.TabIndex = 10; + this.lblmessage.Text = "label3"; + // + // FrmExternalDocEdit + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(646, 156); + this.Controls.Add(this.lblmessage); + this.Controls.Add(this.sfButton3); + this.Controls.Add(this.sfButton2); + this.Controls.Add(this.sfButton1); + this.Controls.Add(this.lbldokument); + this.Controls.Add(this.label2); + this.Controls.Add(this.lblKunde); + this.Controls.Add(this.label1); + this.Controls.Add(this.button3); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "FrmExternalDocEdit"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; + this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; + this.Text = "Neues Dokument OnDoc"; + this.Load += new System.EventHandler(this.FrmExternalDocEdit_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label lblKunde; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label lbldokument; + private Syncfusion.WinForms.Controls.SfButton sfButton1; + private Syncfusion.WinForms.Controls.SfButton sfButton2; + private Syncfusion.WinForms.Controls.SfButton sfButton3; + private System.Windows.Forms.Label lblmessage; + } +} \ No newline at end of file diff --git a/Client/Diverses/FrmExternalDocEdit.cs b/Client/Diverses/FrmExternalDocEdit.cs new file mode 100644 index 00000000..adf1eb11 --- /dev/null +++ b/Client/Diverses/FrmExternalDocEdit.cs @@ -0,0 +1,156 @@ +using Database; +using OnDoc.Klassen; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Web.Caching; +using System.Windows.Forms; +using Syncfusion.Windows.Forms.Tools; +using Syncfusion.WinForms.Controls; + +namespace OnDoc.Diverses +{ + public partial class FrmExternalDocEdit : SfForm + { + private string dokumentid; + public int returnid = 0; + public int dokumenttypnr = 0; + public FrmExternalDocEdit() + { + InitializeComponent(); + this.Style.TitleBar.BackColor = Theaming.Titelbar(); + this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + this.Style.ShadowOpacity = Theaming.ShadowOpacity; + this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; + } + + public FrmExternalDocEdit(string dokumentid) + { + InitializeComponent(); + this.dokumentid= dokumentid; + this.Style.TitleBar.BackColor = Theaming.Titelbar(); + this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + this.Style.ShadowOpacity = Theaming.ShadowOpacity; + this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; + } + + private void FrmExternalDocEdit_Load(object sender, EventArgs e) + { + if (dokumentid.ToString() == "") + { + label2.Visible = false; + sfButton2.Enabled = false; + sfButton3.Enabled = false; + } + DB db = new DB(AppParams.connectionstring); + if (dokumentid.ToString() != "") + { + try + { + if (dokumentid.Substring(0, 9).ToUpper() != "OFFEDK008") + { + lblmessage.Text = "Das gewählte Dokument ist kein OnDoc-Dokument und kann nicht bearbeitet werden."; + label2.Visible = false; + sfButton2.Enabled = false; + sfButton3.Enabled = false; + } + } + catch + { + lblmessage.Text = "Das gewählte Dokument ist kein OnDoc-Dokument und kann nicht bearbeitet werden."; + label2.Visible = false; + sfButton2.Enabled = false; + sfButton3.Enabled = false; + } + + lblmessage.Text = ""; + + db.Get_Tabledata("Select count(*) from doks where dokumentid='" + ExternalCall.dokumentid + "'", false, true); + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) == 0) + { + lblmessage.Text = "Das gewählte Dokument mit der ID '" + dokumentid + "' steht für die Bearbeitung nicht mehr zur Verfügung."; + label2.Visible = false; + + sfButton2.Enabled = false; + sfButton3.Enabled = false; + } + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0) + { + db.Get_Tabledata("Select dokumentid, status_bezeichnungnr, aktiv from dokument_trefferliste where aktiv=1 and dokumentid='" + ExternalCall.dokumentid + "'", false, true); + if (db.dsdaten.Tables[0].Rows.Count > 0 && Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) == -1 && Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 1) + { + lblmessage.Text = "Das Dokument mit der ID " + dokumentid + " wird bereits in OnDoc bearbeitet."; + label2.Visible = false; + + sfButton2.Enabled = false; + sfButton3.Enabled = false; + } + } + } + try + { + if (sfButton3.Enabled) + { + db.Get_Tabledata("SELECT dbo.dokument.dokumentid, dbo.dokument.bezeichnung, dbo.dokument.dokumenttypnr, dbo.dokument.nrpar00, dbo.Partner.BKPAR00 FROM dbo.dokument INNER JOIN dbo.Partner ON dbo.dokument.nrpar00 = dbo.Partner.NRPAR00 WHERE dbo.dokument.dokumentid = '" + ExternalCall.dokumentid + "'", false, true); + this.lbldokument.Text = db.dsdaten.Tables[0].Rows[0][1].ToString(); + this.lblKunde.Text = db.dsdaten.Tables[0].Rows[0][3].ToString() + " " + db.dsdaten.Tables[0].Rows[0][4].ToString(); + this.dokumenttypnr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]); + lblmessage.Visible= false; + }else + { + db.Get_Tabledata("SELECT NRPAR00, bkpar00 from dbo.Partner WHERE nrpar00 = " + ExternalCall.partnernr.ToString() , false, true); + this.lblKunde.Text = db.dsdaten.Tables[0].Rows[0][0].ToString() + " " + db.dsdaten.Tables[0].Rows[0][1].ToString(); + + } + + + } + catch { } + finally { db = null; } + } + + + private void button1_Click(object sender, EventArgs e) + { + this.returnid = 1; + this.Close(); + } + + private void button2_Click(object sender, EventArgs e) + { + this.returnid = 2; + this.Close(); + + } + + private void button3_Click(object sender, EventArgs e) + { + this.returnid = 3; + this.Close(); + + } + + private void sfButton1_Click(object sender, EventArgs e) + { + this.returnid = 1; + this.Close(); + } + + private void sfButton2_Click(object sender, EventArgs e) + { + this.returnid = 2; + this.Close(); + } + + private void sfButton3_Click(object sender, EventArgs e) + { + this.returnid = 3; + this.Close(); + } + } +} diff --git a/Client/Diverses/FrmExternalDocEdit.resx b/Client/Diverses/FrmExternalDocEdit.resx new file mode 100644 index 00000000..e594f603 --- /dev/null +++ b/Client/Diverses/FrmExternalDocEdit.resx @@ -0,0 +1,466 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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 + //+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf//qN2//6jdv/sl27wlV9FOgAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAQ75lv9/+kd///o3f//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2 + //+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf//qN2/+yXbvCVYEU7AAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ75lv9/+kd///pHf//qN2//6jdv/+o3b//qN2 + //6jdv/+o3b//qN2//+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf/7Jhu + 8pVfRToAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/4P////wAA//gH////AAD//AD///8A + AP/8AD///wAAgAAAAB//AACAAAAAH/8AAIAAHgAf/wAAgAAPAB//AACD/g+AH/8AAIP/B8Af/wAAg/8H + 4B//AACD/wPwH/8AAIMAAPgf/wAAgwAA/A//AACDAAB+B/8AAIMAAB8D/wAAg//4H4H/AACD//wPwP8A + AIP//gPgfwAAgwAAA/A/AACDAAAB4B8AAIMAAABADwAAgwAAAAAHAACD///wAwMAAIP///gHgQAAg/// + /A8DAACDAAAOBgcAAIMAAA4ADwAAgwAADgAfAACDAAAOAD8AAIP///4AfwAAg////hD/AACD///+Gf8A + AIP///4f/wAAg////h//AACD//gAH/8AAIP/+AAf/wAAg//4AB//AACD//gAP/8AAIP/+GB//wAAg//4 + QP//AACD//gB//8AAIP/+AP//wAAg//4B///AACD//gP//8AAIAAAB///wAAgAAAP///AACAAAB///8A + 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 + + + \ No newline at end of file diff --git a/Client/Diverses/MitarbeiterProfil.Designer.cs b/Client/Diverses/MitarbeiterProfil.Designer.cs index f5b6f28b..861807c5 100644 --- a/Client/Diverses/MitarbeiterProfil.Designer.cs +++ b/Client/Diverses/MitarbeiterProfil.Designer.cs @@ -31,7 +31,7 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MitarbeiterProfil)); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); - Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); + Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); this.ribbon1 = new System.Windows.Forms.Ribbon(); this.ribbonTab1 = new System.Windows.Forms.RibbonTab(); this.RibbonPanelExit = new System.Windows.Forms.RibbonPanel(); @@ -43,6 +43,7 @@ this.ribbonTab2 = new System.Windows.Forms.RibbonTab(); this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel(); this.RibbonMitarbeiterButtonSave = new System.Windows.Forms.RibbonButton(); + this.ribbonTab3 = new System.Windows.Forms.RibbonTab(); this.GrpBoxProfile = new System.Windows.Forms.GroupBox(); this.lbprofile = new System.Windows.Forms.ListBox(); this.GrpBoxDetails = new System.Windows.Forms.GroupBox(); @@ -90,43 +91,42 @@ this.btnDeleteImage = new System.Windows.Forms.Button(); this.btnSaveSignature = new System.Windows.Forms.Button(); this.sign1 = new WinSign.Sign(); - this.ribbonTab3 = new System.Windows.Forms.RibbonTab(); this.GrpGAS = new System.Windows.Forms.GroupBox(); - this.treeViewAdvAdresse = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); - this.label19 = new System.Windows.Forms.Label(); - this.TreeViewADVPersadresse = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); - this.label20 = new System.Windows.Forms.Label(); - this.btnSavePersAdressen = new System.Windows.Forms.Button(); this.panelpersadresse = new System.Windows.Forms.Panel(); - this.label21 = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.label22 = new System.Windows.Forms.Label(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.label23 = new System.Windows.Forms.Label(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.label24 = new System.Windows.Forms.Label(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.label25 = new System.Windows.Forms.Label(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.label26 = new System.Windows.Forms.Label(); + this.textBox8 = new System.Windows.Forms.TextBox(); + this.label28 = new System.Windows.Forms.Label(); + this.btnCancelPersAddr = new System.Windows.Forms.Button(); + this.btnSavePersAddr = new System.Windows.Forms.Button(); this.textBox7 = new System.Windows.Forms.TextBox(); this.label27 = new System.Windows.Forms.Label(); - this.btnSavePersAddr = new System.Windows.Forms.Button(); - this.btnCancelPersAddr = new System.Windows.Forms.Button(); + this.textBox6 = new System.Windows.Forms.TextBox(); + this.label26 = new System.Windows.Forms.Label(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label25 = new System.Windows.Forms.Label(); + this.textBox4 = new System.Windows.Forms.TextBox(); + this.label24 = new System.Windows.Forms.Label(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label23 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label22 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label21 = new System.Windows.Forms.Label(); + this.label30 = new System.Windows.Forms.Label(); + this.label31 = new System.Windows.Forms.Label(); + this.label32 = new System.Windows.Forms.Label(); + this.label29 = new System.Windows.Forms.Label(); + this.txtadresse = new System.Windows.Forms.TextBox(); this.btnNewPersAddr = new System.Windows.Forms.Button(); - this.textBox8 = new System.Windows.Forms.TextBox(); - this.label28 = new System.Windows.Forms.Label(); + this.btnSavePersAdressen = new System.Windows.Forms.Button(); + this.label20 = new System.Windows.Forms.Label(); + this.TreeViewADVPersadresse = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.adresseLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.txtadresse = new System.Windows.Forms.TextBox(); - this.label29 = new System.Windows.Forms.Label(); + this.adresseBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.label19 = new System.Windows.Forms.Label(); + this.treeViewAdvAdresse = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components); this.persönlicheAdresseErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.label30 = new System.Windows.Forms.Label(); - this.label31 = new System.Windows.Forms.Label(); - this.label32 = new System.Windows.Forms.Label(); - this.adresseBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.GrpBoxProfile.SuspendLayout(); this.GrpBoxDetails.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.cbboxTeam)).BeginInit(); @@ -136,10 +136,10 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.GrpGetSignature.SuspendLayout(); this.GrpGAS.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.TreeViewADVPersadresse)).BeginInit(); this.panelpersadresse.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.TreeViewADVPersadresse)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).BeginInit(); this.contextMenuStrip2.SuspendLayout(); this.SuspendLayout(); // @@ -255,6 +255,12 @@ this.RibbonMitarbeiterButtonSave.Text = "Speichern"; this.RibbonMitarbeiterButtonSave.Click += new System.EventHandler(this.RibbonMitarbeiterButtonSave_Click); // + // ribbonTab3 + // + this.ribbonTab3.Name = "ribbonTab3"; + this.ribbonTab3.Text = "Versandstrasse-Rückantwort"; + this.ribbonTab3.ActiveChanged += new System.EventHandler(this.ribbonTab3_ActiveChanged); + // // GrpBoxProfile // this.GrpBoxProfile.Controls.Add(this.lbprofile); @@ -741,12 +747,6 @@ this.sign1.Size = new System.Drawing.Size(616, 228); this.sign1.TabIndex = 20; // - // ribbonTab3 - // - this.ribbonTab3.Name = "ribbonTab3"; - this.ribbonTab3.Text = "Versandstrasse-Rückantwort"; - this.ribbonTab3.ActiveChanged += new System.EventHandler(this.ribbonTab3_ActiveChanged); - // // GrpGAS // this.GrpGAS.Controls.Add(this.panelpersadresse); @@ -769,126 +769,6 @@ this.GrpGAS.Text = "Rückantwort-Adressen"; this.GrpGAS.Visible = false; // - // treeViewAdvAdresse - // - this.treeViewAdvAdresse.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window); - treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black; - this.treeViewAdvAdresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); - this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(275, 288); - this.treeViewAdvAdresse.ContextMenuStrip = this.contextMenuStrip2; - // - // - // - this.treeViewAdvAdresse.HelpTextControl.BaseThemeName = null; - this.treeViewAdvAdresse.HelpTextControl.Location = new System.Drawing.Point(0, 0); - this.treeViewAdvAdresse.HelpTextControl.Name = ""; - this.treeViewAdvAdresse.HelpTextControl.Size = new System.Drawing.Size(392, 112); - this.treeViewAdvAdresse.HelpTextControl.TabIndex = 0; - this.treeViewAdvAdresse.HelpTextControl.Visible = true; - this.treeViewAdvAdresse.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; - this.treeViewAdvAdresse.Location = new System.Drawing.Point(6, 40); - this.treeViewAdvAdresse.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220))))); - this.treeViewAdvAdresse.Name = "treeViewAdvAdresse"; - this.treeViewAdvAdresse.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText; - this.treeViewAdvAdresse.Size = new System.Drawing.Size(275, 288); - this.treeViewAdvAdresse.TabIndex = 4; - this.treeViewAdvAdresse.Text = "treeViewAdv2"; - this.treeViewAdvAdresse.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; - this.treeViewAdvAdresse.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true; - // - // - // - this.treeViewAdvAdresse.ToolTipControl.BaseThemeName = null; - this.treeViewAdvAdresse.ToolTipControl.Location = new System.Drawing.Point(0, 0); - this.treeViewAdvAdresse.ToolTipControl.Name = ""; - this.treeViewAdvAdresse.ToolTipControl.Size = new System.Drawing.Size(392, 112); - this.treeViewAdvAdresse.ToolTipControl.TabIndex = 0; - this.treeViewAdvAdresse.ToolTipControl.Visible = true; - this.treeViewAdvAdresse.AfterSelect += new System.EventHandler(this.treeViewAdvAdresse_AfterSelect); - this.treeViewAdvAdresse.Click += new System.EventHandler(this.treeViewAdvAdresse_Click); - this.treeViewAdvAdresse.DoubleClick += new System.EventHandler(this.treeViewAdvAdresse_DoubleClick); - // - // label19 - // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(7, 23); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(97, 13); - this.label19.TabIndex = 5; - this.label19.Text = "Standard-Adressen"; - // - // TreeViewADVPersadresse - // - this.TreeViewADVPersadresse.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window); - treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.Black; - this.TreeViewADVPersadresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)}); - this.TreeViewADVPersadresse.BeforeTouchSize = new System.Drawing.Size(346, 113); - this.TreeViewADVPersadresse.ContextMenuStrip = this.contextMenuStrip1; - // - // - // - this.TreeViewADVPersadresse.HelpTextControl.BaseThemeName = null; - this.TreeViewADVPersadresse.HelpTextControl.Location = new System.Drawing.Point(0, 0); - this.TreeViewADVPersadresse.HelpTextControl.Name = ""; - this.TreeViewADVPersadresse.HelpTextControl.Size = new System.Drawing.Size(392, 112); - this.TreeViewADVPersadresse.HelpTextControl.TabIndex = 0; - this.TreeViewADVPersadresse.HelpTextControl.Visible = true; - this.TreeViewADVPersadresse.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; - this.TreeViewADVPersadresse.Location = new System.Drawing.Point(300, 40); - this.TreeViewADVPersadresse.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220))))); - this.TreeViewADVPersadresse.Name = "TreeViewADVPersadresse"; - this.TreeViewADVPersadresse.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText; - this.TreeViewADVPersadresse.Size = new System.Drawing.Size(346, 113); - this.TreeViewADVPersadresse.TabIndex = 6; - this.TreeViewADVPersadresse.Text = "treeViewAdv2"; - this.TreeViewADVPersadresse.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; - this.TreeViewADVPersadresse.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true; - // - // - // - this.TreeViewADVPersadresse.ToolTipControl.BaseThemeName = null; - this.TreeViewADVPersadresse.ToolTipControl.Location = new System.Drawing.Point(0, 0); - this.TreeViewADVPersadresse.ToolTipControl.Name = ""; - this.TreeViewADVPersadresse.ToolTipControl.Size = new System.Drawing.Size(392, 112); - this.TreeViewADVPersadresse.ToolTipControl.TabIndex = 0; - this.TreeViewADVPersadresse.ToolTipControl.Visible = true; - this.TreeViewADVPersadresse.AfterSelect += new System.EventHandler(this.TreeViewADVPersadresse_AfterSelect); - this.TreeViewADVPersadresse.Click += new System.EventHandler(this.TreeViewADVPersadresse_Click); - this.TreeViewADVPersadresse.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TreeViewADVPersadresse_KeyDown); - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(298, 22); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(210, 13); - this.label20.TabIndex = 7; - this.label20.Text = "Gewählte Standard-/ persönliche Adressen"; - // - // btnSavePersAdressen - // - this.btnSavePersAdressen.Location = new System.Drawing.Point(571, 159); - this.btnSavePersAdressen.Name = "btnSavePersAdressen"; - this.btnSavePersAdressen.Size = new System.Drawing.Size(75, 23); - this.btnSavePersAdressen.TabIndex = 8; - this.btnSavePersAdressen.Text = "Speichern"; - this.btnSavePersAdressen.UseVisualStyleBackColor = true; - this.btnSavePersAdressen.Click += new System.EventHandler(this.btnSavePersAdressen_Click); - // // panelpersadresse // this.panelpersadresse.BackColor = System.Drawing.Color.Gainsboro; @@ -912,76 +792,81 @@ this.panelpersadresse.Controls.Add(this.label21); this.panelpersadresse.Location = new System.Drawing.Point(144, 29); this.panelpersadresse.Name = "panelpersadresse"; - this.panelpersadresse.Size = new System.Drawing.Size(352, 304); + this.panelpersadresse.Size = new System.Drawing.Size(352, 254); this.panelpersadresse.TabIndex = 9; this.panelpersadresse.Visible = false; // - // label21 - // - this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(22, 48); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(39, 13); - this.label21.TabIndex = 0; - this.label21.Text = "Zeile 1"; + // textBox8 // - // textBox1 + this.textBox8.Location = new System.Drawing.Point(97, 13); + this.textBox8.Name = "textBox8"; + this.textBox8.Size = new System.Drawing.Size(237, 20); + this.textBox8.TabIndex = 0; // - this.textBox1.Location = new System.Drawing.Point(97, 48); - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(237, 20); - this.textBox1.TabIndex = 1; - this.textBox1.TabStop = false; - this.textBox1.Text = "Thurgauer Kantonalban"; + // label28 // - // textBox2 + this.label28.AutoSize = true; + this.label28.Location = new System.Drawing.Point(22, 13); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(69, 13); + this.label28.TabIndex = 16; + this.label28.Text = "Bezeichnung"; // - this.textBox2.Location = new System.Drawing.Point(97, 71); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(237, 20); - this.textBox2.TabIndex = 1; + // btnCancelPersAddr // - // label22 + this.btnCancelPersAddr.Location = new System.Drawing.Point(15, 220); + this.btnCancelPersAddr.Name = "btnCancelPersAddr"; + this.btnCancelPersAddr.Size = new System.Drawing.Size(75, 23); + this.btnCancelPersAddr.TabIndex = 7; + this.btnCancelPersAddr.Text = "Abbrechen"; + this.btnCancelPersAddr.UseVisualStyleBackColor = true; + this.btnCancelPersAddr.Click += new System.EventHandler(this.btnCancelPersAddr_Click); // - this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(22, 71); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(39, 13); - this.label22.TabIndex = 2; - this.label22.Text = "Zeile 2"; + // btnSavePersAddr // - // textBox3 + this.btnSavePersAddr.Location = new System.Drawing.Point(259, 220); + this.btnSavePersAddr.Name = "btnSavePersAddr"; + this.btnSavePersAddr.Size = new System.Drawing.Size(75, 23); + this.btnSavePersAddr.TabIndex = 8; + this.btnSavePersAddr.Text = "Speichern "; + this.btnSavePersAddr.UseVisualStyleBackColor = true; + this.btnSavePersAddr.Click += new System.EventHandler(this.btnSavePersAddr_Click); // - this.textBox3.Location = new System.Drawing.Point(97, 93); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(237, 20); - this.textBox3.TabIndex = 2; + // textBox7 // - // label23 + this.textBox7.Location = new System.Drawing.Point(97, 185); + this.textBox7.Name = "textBox7"; + this.textBox7.Size = new System.Drawing.Size(237, 20); + this.textBox7.TabIndex = 6; + this.textBox7.Visible = false; // - this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(22, 93); - this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(39, 13); - this.label23.TabIndex = 4; - this.label23.Text = "Zeile 3"; + // label27 // - // textBox4 + this.label27.AutoSize = true; + this.label27.Location = new System.Drawing.Point(22, 185); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(39, 13); + this.label27.TabIndex = 12; + this.label27.Text = "Zeile 7"; + this.label27.Visible = false; // - this.textBox4.Location = new System.Drawing.Point(97, 116); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(237, 20); - this.textBox4.TabIndex = 3; + // textBox6 // - // label24 + this.textBox6.Location = new System.Drawing.Point(97, 162); + this.textBox6.Name = "textBox6"; + this.textBox6.Size = new System.Drawing.Size(237, 20); + this.textBox6.TabIndex = 5; + this.textBox6.Visible = false; // - this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(22, 116); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(39, 13); - this.label24.TabIndex = 6; - this.label24.Text = "Zeile 4"; + // label26 + // + this.label26.AutoSize = true; + this.label26.Location = new System.Drawing.Point(22, 162); + this.label26.Name = "label26"; + this.label26.Size = new System.Drawing.Size(39, 13); + this.label26.TabIndex = 10; + this.label26.Text = "Zeile 6"; + this.label26.Visible = false; // // textBox5 // @@ -999,57 +884,118 @@ this.label25.TabIndex = 8; this.label25.Text = "Zeile 5"; // - // textBox6 + // textBox4 // - this.textBox6.Location = new System.Drawing.Point(97, 162); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(237, 20); - this.textBox6.TabIndex = 5; + this.textBox4.Location = new System.Drawing.Point(97, 116); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(237, 20); + this.textBox4.TabIndex = 3; // - // label26 + // label24 // - this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(22, 162); - this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(39, 13); - this.label26.TabIndex = 10; - this.label26.Text = "Zeile 6"; + this.label24.AutoSize = true; + this.label24.Location = new System.Drawing.Point(22, 116); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(39, 13); + this.label24.TabIndex = 6; + this.label24.Text = "Zeile 4"; // - // textBox7 + // textBox3 // - this.textBox7.Location = new System.Drawing.Point(97, 185); - this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(237, 20); - this.textBox7.TabIndex = 6; + this.textBox3.Location = new System.Drawing.Point(97, 93); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(237, 20); + this.textBox3.TabIndex = 2; // - // label27 + // label23 // - this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(22, 185); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(39, 13); - this.label27.TabIndex = 12; - this.label27.Text = "Zeile 7"; + this.label23.AutoSize = true; + this.label23.Location = new System.Drawing.Point(22, 93); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(39, 13); + this.label23.TabIndex = 4; + this.label23.Text = "Zeile 3"; // - // btnSavePersAddr + // textBox2 // - this.btnSavePersAddr.Location = new System.Drawing.Point(259, 252); - this.btnSavePersAddr.Name = "btnSavePersAddr"; - this.btnSavePersAddr.Size = new System.Drawing.Size(75, 23); - this.btnSavePersAddr.TabIndex = 8; - this.btnSavePersAddr.Text = "Speichern "; - this.btnSavePersAddr.UseVisualStyleBackColor = true; - this.btnSavePersAddr.Click += new System.EventHandler(this.btnSavePersAddr_Click); + this.textBox2.Location = new System.Drawing.Point(97, 71); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(237, 20); + this.textBox2.TabIndex = 1; // - // btnCancelPersAddr + // label22 // - this.btnCancelPersAddr.Location = new System.Drawing.Point(15, 252); - this.btnCancelPersAddr.Name = "btnCancelPersAddr"; - this.btnCancelPersAddr.Size = new System.Drawing.Size(75, 23); - this.btnCancelPersAddr.TabIndex = 7; - this.btnCancelPersAddr.Text = "Abbrechen"; - this.btnCancelPersAddr.UseVisualStyleBackColor = true; - this.btnCancelPersAddr.Click += new System.EventHandler(this.btnCancelPersAddr_Click); + this.label22.AutoSize = true; + this.label22.Location = new System.Drawing.Point(22, 71); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(39, 13); + this.label22.TabIndex = 2; + this.label22.Text = "Zeile 2"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(97, 48); + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(237, 20); + this.textBox1.TabIndex = 1; + this.textBox1.TabStop = false; + this.textBox1.Text = "Thurgauer Kantonalbank"; + // + // label21 + // + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(22, 48); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(39, 13); + this.label21.TabIndex = 0; + this.label21.Text = "Zeile 1"; + // + // label30 + // + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(298, 186); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(153, 13); + this.label30.TabIndex = 15; + this.label30.Text = "- Mit Speichersymbol speichern"; + // + // label31 + // + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(298, 172); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(225, 13); + this.label31.TabIndex = 14; + this.label31.Text = "- Element anwählen und Tasten Ctrl Up/Down"; + // + // label32 + // + this.label32.AutoSize = true; + this.label32.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label32.Location = new System.Drawing.Point(298, 159); + this.label32.Name = "label32"; + this.label32.Size = new System.Drawing.Size(69, 13); + this.label32.TabIndex = 13; + this.label32.Text = "Sortierung:"; + // + // label29 + // + this.label29.AutoSize = true; + this.label29.Location = new System.Drawing.Point(298, 215); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(87, 13); + this.label29.TabIndex = 12; + this.label29.Text = "Adress-Vorschau"; + // + // txtadresse + // + this.txtadresse.Location = new System.Drawing.Point(301, 231); + this.txtadresse.Multiline = true; + this.txtadresse.Name = "txtadresse"; + this.txtadresse.ReadOnly = true; + this.txtadresse.Size = new System.Drawing.Size(274, 97); + this.txtadresse.TabIndex = 11; // // btnNewPersAddr // @@ -1061,21 +1007,70 @@ this.btnNewPersAddr.UseVisualStyleBackColor = true; this.btnNewPersAddr.Click += new System.EventHandler(this.btnNewPersAddr_Click); // - // textBox8 + // btnSavePersAdressen // - this.textBox8.Location = new System.Drawing.Point(97, 13); - this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(237, 20); - this.textBox8.TabIndex = 0; + this.btnSavePersAdressen.Location = new System.Drawing.Point(571, 159); + this.btnSavePersAdressen.Name = "btnSavePersAdressen"; + this.btnSavePersAdressen.Size = new System.Drawing.Size(75, 23); + this.btnSavePersAdressen.TabIndex = 8; + this.btnSavePersAdressen.Text = "Speichern"; + this.btnSavePersAdressen.UseVisualStyleBackColor = true; + this.btnSavePersAdressen.Click += new System.EventHandler(this.btnSavePersAdressen_Click); // - // label28 + // label20 // - this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(22, 13); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(69, 13); - this.label28.TabIndex = 16; - this.label28.Text = "Bezeichnung"; + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(298, 22); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(210, 13); + this.label20.TabIndex = 7; + this.label20.Text = "Gewählte Standard-/ persönliche Adressen"; + // + // TreeViewADVPersadresse + // + this.TreeViewADVPersadresse.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window); + treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black; + this.TreeViewADVPersadresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); + this.TreeViewADVPersadresse.BeforeTouchSize = new System.Drawing.Size(346, 113); + this.TreeViewADVPersadresse.ContextMenuStrip = this.contextMenuStrip1; + // + // + // + this.TreeViewADVPersadresse.HelpTextControl.BaseThemeName = null; + this.TreeViewADVPersadresse.HelpTextControl.Location = new System.Drawing.Point(0, 0); + this.TreeViewADVPersadresse.HelpTextControl.Name = ""; + this.TreeViewADVPersadresse.HelpTextControl.Size = new System.Drawing.Size(392, 112); + this.TreeViewADVPersadresse.HelpTextControl.TabIndex = 0; + this.TreeViewADVPersadresse.HelpTextControl.Visible = true; + this.TreeViewADVPersadresse.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; + this.TreeViewADVPersadresse.Location = new System.Drawing.Point(300, 40); + this.TreeViewADVPersadresse.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220))))); + this.TreeViewADVPersadresse.Name = "TreeViewADVPersadresse"; + this.TreeViewADVPersadresse.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText; + this.TreeViewADVPersadresse.Size = new System.Drawing.Size(346, 113); + this.TreeViewADVPersadresse.TabIndex = 6; + this.TreeViewADVPersadresse.Text = "treeViewAdv2"; + this.TreeViewADVPersadresse.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; + this.TreeViewADVPersadresse.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true; + // + // + // + this.TreeViewADVPersadresse.ToolTipControl.BaseThemeName = null; + this.TreeViewADVPersadresse.ToolTipControl.Location = new System.Drawing.Point(0, 0); + this.TreeViewADVPersadresse.ToolTipControl.Name = ""; + this.TreeViewADVPersadresse.ToolTipControl.Size = new System.Drawing.Size(392, 112); + this.TreeViewADVPersadresse.ToolTipControl.TabIndex = 0; + this.TreeViewADVPersadresse.ToolTipControl.Visible = true; + this.TreeViewADVPersadresse.AfterSelect += new System.EventHandler(this.TreeViewADVPersadresse_AfterSelect); + this.TreeViewADVPersadresse.Click += new System.EventHandler(this.TreeViewADVPersadresse_Click); + this.TreeViewADVPersadresse.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TreeViewADVPersadresse_KeyDown); // // contextMenuStrip1 // @@ -1092,23 +1087,67 @@ this.adresseLöschenToolStripMenuItem.Text = "Adresse löschen"; this.adresseLöschenToolStripMenuItem.Click += new System.EventHandler(this.adresseLöschenToolStripMenuItem_Click); // - // txtadresse + // adresseBearbeitenToolStripMenuItem // - this.txtadresse.Location = new System.Drawing.Point(301, 231); - this.txtadresse.Multiline = true; - this.txtadresse.Name = "txtadresse"; - this.txtadresse.ReadOnly = true; - this.txtadresse.Size = new System.Drawing.Size(274, 97); - this.txtadresse.TabIndex = 11; + this.adresseBearbeitenToolStripMenuItem.Name = "adresseBearbeitenToolStripMenuItem"; + this.adresseBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.adresseBearbeitenToolStripMenuItem.Text = "Adresse bearbeiten"; + this.adresseBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.adresseBearbeitenToolStripMenuItem_Click); // - // label29 + // label19 // - this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(298, 215); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(87, 13); - this.label29.TabIndex = 12; - this.label29.Text = "Adress-Vorschau"; + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(7, 23); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(97, 13); + this.label19.TabIndex = 5; + this.label19.Text = "Standard-Adressen"; + // + // treeViewAdvAdresse + // + this.treeViewAdvAdresse.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window); + treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black; + this.treeViewAdvAdresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)}); + this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(275, 288); + this.treeViewAdvAdresse.ContextMenuStrip = this.contextMenuStrip2; + // + // + // + this.treeViewAdvAdresse.HelpTextControl.BaseThemeName = null; + this.treeViewAdvAdresse.HelpTextControl.Location = new System.Drawing.Point(0, 0); + this.treeViewAdvAdresse.HelpTextControl.Name = ""; + this.treeViewAdvAdresse.HelpTextControl.Size = new System.Drawing.Size(392, 112); + this.treeViewAdvAdresse.HelpTextControl.TabIndex = 0; + this.treeViewAdvAdresse.HelpTextControl.Visible = true; + this.treeViewAdvAdresse.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText; + this.treeViewAdvAdresse.Location = new System.Drawing.Point(6, 40); + this.treeViewAdvAdresse.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220))))); + this.treeViewAdvAdresse.Name = "treeViewAdvAdresse"; + this.treeViewAdvAdresse.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText; + this.treeViewAdvAdresse.Size = new System.Drawing.Size(275, 288); + this.treeViewAdvAdresse.TabIndex = 4; + this.treeViewAdvAdresse.Text = "treeViewAdv2"; + this.treeViewAdvAdresse.ThemeStyle.TreeNodeAdvStyle.CheckBoxTickThickness = 0; + this.treeViewAdvAdresse.ThemeStyle.TreeNodeAdvStyle.EnsureDefaultOptionedChild = true; + // + // + // + this.treeViewAdvAdresse.ToolTipControl.BaseThemeName = null; + this.treeViewAdvAdresse.ToolTipControl.Location = new System.Drawing.Point(0, 0); + this.treeViewAdvAdresse.ToolTipControl.Name = ""; + this.treeViewAdvAdresse.ToolTipControl.Size = new System.Drawing.Size(392, 112); + this.treeViewAdvAdresse.ToolTipControl.TabIndex = 0; + this.treeViewAdvAdresse.ToolTipControl.Visible = true; + this.treeViewAdvAdresse.AfterSelect += new System.EventHandler(this.treeViewAdvAdresse_AfterSelect); + this.treeViewAdvAdresse.Click += new System.EventHandler(this.treeViewAdvAdresse_Click); + this.treeViewAdvAdresse.DoubleClick += new System.EventHandler(this.treeViewAdvAdresse_DoubleClick); // // contextMenuStrip2 // @@ -1124,41 +1163,6 @@ this.persönlicheAdresseErstellenToolStripMenuItem.Text = "Persönliche Adresse erstellen"; this.persönlicheAdresseErstellenToolStripMenuItem.Click += new System.EventHandler(this.persönlicheAdresseErstellenToolStripMenuItem_Click); // - // label30 - // - this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(298, 186); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(153, 13); - this.label30.TabIndex = 15; - this.label30.Text = "- Mit Speichersymbol speichern"; - // - // label31 - // - this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(298, 172); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(225, 13); - this.label31.TabIndex = 14; - this.label31.Text = "- Element anwählen und Tasten Ctrl Up/Down"; - // - // label32 - // - this.label32.AutoSize = true; - this.label32.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label32.Location = new System.Drawing.Point(298, 159); - this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(69, 13); - this.label32.TabIndex = 13; - this.label32.Text = "Sortierung:"; - // - // adresseBearbeitenToolStripMenuItem - // - this.adresseBearbeitenToolStripMenuItem.Name = "adresseBearbeitenToolStripMenuItem"; - this.adresseBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.adresseBearbeitenToolStripMenuItem.Text = "Adresse bearbeiten"; - this.adresseBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.adresseBearbeitenToolStripMenuItem_Click); - // // MitarbeiterProfil // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1192,11 +1196,11 @@ this.GrpGetSignature.PerformLayout(); this.GrpGAS.ResumeLayout(false); this.GrpGAS.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.TreeViewADVPersadresse)).EndInit(); this.panelpersadresse.ResumeLayout(false); this.panelpersadresse.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.TreeViewADVPersadresse)).EndInit(); this.contextMenuStrip1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.treeViewAdvAdresse)).EndInit(); this.contextMenuStrip2.ResumeLayout(false); this.ResumeLayout(false); diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index 71f3fd8d..e68c37d6 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -64,7 +64,7 @@ this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(146, 26); this.label2.TabIndex = 2; - this.label2.Text = "20. April 2025"; + this.label2.Text = "23. April 2025"; // // SplashScreen // diff --git a/Client/Klassen/clsAppParams.cs b/Client/Klassen/clsAppParams.cs index 9906f2e7..ddffa139 100644 --- a/Client/Klassen/clsAppParams.cs +++ b/Client/Klassen/clsAppParams.cs @@ -60,6 +60,8 @@ namespace OnDoc.Klassen public static string SignatureColor { get; set; } = "0,0,102"; public static string SignaturePassword { get; set; } = ""; + + public static bool versandstrassewindows_open { get; set; } = false; static AppParams() { @@ -168,6 +170,8 @@ namespace OnDoc.Klassen public static string Interaktion { get; set; } = "Yes"; public static string showdoc { get; set; } = "Yes"; + public static string app { get; set; } = ""; + public static string dokumentid { get; set; } = ""; public static string unterschriftenpruefung { get; set; } = "No"; @@ -242,52 +246,56 @@ namespace OnDoc.Klassen case "interaktion": Interaktion = value; break; + case "app": + app = value; + break; case "showdoc": + showdoc = value; break; case "id": try { dokumentid = value; - if (dokumentid.Length > 9) - { - if (dokumentid.Substring(0, 9).ToUpper() == "OFFEDK008") - { - DB db2 = new DB(AppParams.connectionstring); - db2.Get_Tabledata("Select count(*) from doks where dokumentid = '" + dokumentid+"'", false, true); - if (db2.dsdaten.Tables[0].Rows.Count < 1) - { - dokumentid = ""; - break; - } - db2.Get_Tabledata("Select * from dokument where dokumentid='" + dokumentid+"'", false, true); - if (db2.dsdaten.Tables[0].Rows.Count > 0) - { - if (MessageBox.Show("Das Dokument "+ Environment.NewLine+Environment.NewLine + dokumentid+Environment.NewLine + db2.dsdaten.Tables[0].Rows[0]["Bezeichnung"].ToString()+ Environment.NewLine+Environment.NewLine + " bearbeiten (Ja) oder ein neues Dokument erstellen (Nein)", "OnDoc", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) - { - dokumentid = ""; - } - else - { - db2.Get_Tabledata("Select * from dokument_trefferliste where dokumentid='"+dokumentid+"'", false, true); - if (db2.dsdaten.Tables[0].Rows[0]["status_bezeichnungnr"].ToString() == "-1") - { - db2.Get_Tabledata("Select * from mitarbeiter where mitarbeiternr=" + db2.dsdaten.Tables[0].Rows[0]["verantwortlich"].ToString(), false, true); - if (db2.dsdaten.Tables[0].Rows.Count > 0) - { - string user = db2.dsdaten.Tables[0].Rows[0]["name"].ToString(); - user = user + db2.dsdaten.Tables[0].Rows[0]["vorname"].ToString(); - user = user + ", "+ db2.dsdaten.Tables[0].Rows[0]["tgnummer"].ToString(); - MessageBox.Show("Das Dokument ist bereits bei " + user + " in Bearbeitung.", "OnDoc", MessageBoxButtons.OK, MessageBoxIcon.Information); - dokumentid = ""; + //if (dokumentid.Length > 9) + //{ + // if (dokumentid.Substring(0, 9).ToUpper() == "OFFEDK008") + // { + // DB db2 = new DB(AppParams.connectionstring); + // db2.Get_Tabledata("Select count(*) from doks where dokumentid = '" + dokumentid+"'", false, true); + // if (db2.dsdaten.Tables[0].Rows.Count < 1) + // { + // dokumentid = ""; + // break; + // } + // db2.Get_Tabledata("Select * from dokument where dokumentid='" + dokumentid+"'", false, true); + // if (db2.dsdaten.Tables[0].Rows.Count > 0) + // { + // if (MessageBox.Show("Das Dokument "+ Environment.NewLine+Environment.NewLine + dokumentid+Environment.NewLine + db2.dsdaten.Tables[0].Rows[0]["Bezeichnung"].ToString()+ Environment.NewLine+Environment.NewLine + " bearbeiten (Ja) oder ein neues Dokument erstellen (Nein)", "OnDoc", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + // { + // dokumentid = ""; + // } + // else + // { + // db2.Get_Tabledata("Select * from dokument_trefferliste where dokumentid='"+dokumentid+"'", false, true); + // if (db2.dsdaten.Tables[0].Rows[0]["status_bezeichnungnr"].ToString() == "-1") + // { + // db2.Get_Tabledata("Select * from mitarbeiter where mitarbeiternr=" + db2.dsdaten.Tables[0].Rows[0]["verantwortlich"].ToString(), false, true); + // if (db2.dsdaten.Tables[0].Rows.Count > 0) + // { + // string user = db2.dsdaten.Tables[0].Rows[0]["name"].ToString(); + // user = user + db2.dsdaten.Tables[0].Rows[0]["vorname"].ToString(); + // user = user + ", "+ db2.dsdaten.Tables[0].Rows[0]["tgnummer"].ToString(); + // MessageBox.Show("Das Dokument ist bereits bei " + user + " in Bearbeitung.", "OnDoc", MessageBoxButtons.OK, MessageBoxIcon.Information); + // dokumentid = ""; - } - } - } - } - db = null; - } - } + // } + // } + // } + // } + // db = null; + // } + //} } catch { dokumentid = ""; diff --git a/Client/Properties/Resources.Designer.cs b/Client/Properties/Resources.Designer.cs index fb9c0fc6..4df39bd0 100644 --- a/Client/Properties/Resources.Designer.cs +++ b/Client/Properties/Resources.Designer.cs @@ -1010,6 +1010,56 @@ namespace OnDoc.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Envelope_16x16_32 { + get { + object obj = ResourceManager.GetObject("Envelope_16x16_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Envelope_24x24_32 { + get { + object obj = ResourceManager.GetObject("Envelope_24x24_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Envelope_256x256_32 { + get { + object obj = ResourceManager.GetObject("Envelope_256x256_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Envelope_32x32_32 { + get { + object obj = ResourceManager.GetObject("Envelope_32x32_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Envelope_48x48_32 { + get { + object obj = ResourceManager.GetObject("Envelope_48x48_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// @@ -1113,9 +1163,49 @@ namespace OnDoc.Properties { /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Excel_Edit_16x16_32 { + internal static System.Drawing.Bitmap Excel_Couvertiert_16x16_32 { + get { + object obj = ResourceManager.GetObject("Excel_Couvertiert_16x16_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Excel_Couvertiert_24x24_32 { + get { + object obj = ResourceManager.GetObject("Excel_Couvertiert_24x24_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Excel_Couvertiert_256x256_32 { + get { + object obj = ResourceManager.GetObject("Excel_Couvertiert_256x256_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Excel_Couvertiert_32x32_32 { + get { + object obj = ResourceManager.GetObject("Excel_Couvertiert_32x32_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Excel_Couvertiert_48x48_32 { get { - object obj = ResourceManager.GetObject("Excel_Edit_16x16_32", resourceCulture); + object obj = ResourceManager.GetObject("Excel_Couvertiert_48x48_32", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -2103,9 +2193,49 @@ namespace OnDoc.Properties { /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap PDF_48x48_32 { + internal static System.Drawing.Bitmap PDF_Covertiert_16x16_32 { + get { + object obj = ResourceManager.GetObject("PDF_Covertiert_16x16_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap PDF_Covertiert_24x24_32 { + get { + object obj = ResourceManager.GetObject("PDF_Covertiert_24x24_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap PDF_Covertiert_256x256_32 { + get { + object obj = ResourceManager.GetObject("PDF_Covertiert_256x256_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap PDF_Covertiert_32x32_32 { + get { + object obj = ResourceManager.GetObject("PDF_Covertiert_32x32_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap PDF_Covertiert_48x48_32 { get { - object obj = ResourceManager.GetObject("PDF_48x48_32", resourceCulture); + object obj = ResourceManager.GetObject("PDF_Covertiert_48x48_32", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -2260,6 +2390,56 @@ namespace OnDoc.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap postausgang_16x16_32 { + get { + object obj = ResourceManager.GetObject("postausgang_16x16_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap postausgang_24x24_32 { + get { + object obj = ResourceManager.GetObject("postausgang_24x24_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap postausgang_256x256_32 { + get { + object obj = ResourceManager.GetObject("postausgang_256x256_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap postausgang_32x32_32 { + get { + object obj = ResourceManager.GetObject("postausgang_32x32_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap postausgang_48x48_32 { + get { + object obj = ResourceManager.GetObject("postausgang_48x48_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// @@ -3210,6 +3390,56 @@ namespace OnDoc.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Word_Couvertiert_16x16_32 { + get { + object obj = ResourceManager.GetObject("Word_Couvertiert_16x16_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Word_Couvertiert_24x24_32 { + get { + object obj = ResourceManager.GetObject("Word_Couvertiert_24x24_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Word_Couvertiert_256x256_32 { + get { + object obj = ResourceManager.GetObject("Word_Couvertiert_256x256_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Word_Couvertiert_32x32_32 { + get { + object obj = ResourceManager.GetObject("Word_Couvertiert_32x32_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Word_Couvertiert_48x48_32 { + get { + object obj = ResourceManager.GetObject("Word_Couvertiert_48x48_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// diff --git a/Client/Properties/Resources.resx b/Client/Properties/Resources.resx index fd1523c0..ecbf0378 100644 --- a/Client/Properties/Resources.resx +++ b/Client/Properties/Resources.resx @@ -403,6 +403,21 @@ ..\Resources\EditSerienbrief_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Envelope_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Envelope_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Envelope_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Envelope_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Envelope_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Excel_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -433,8 +448,20 @@ ..\Resources\Excel_approved_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Excel_Edit_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Excel_Couvertiert_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Excel_Couvertiert_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Excel_Couvertiert_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Excel_Couvertiert_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Excel_Couvertiert_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Excel_Edit_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -730,8 +757,20 @@ ..\Resources\PDF_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\PDF_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\PDF_Covertiert_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\PDF_Covertiert_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\PDF_Covertiert_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\PDF_Covertiert_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\PDF_Covertiert_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Person_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -778,6 +817,21 @@ ..\Resources\Person_gray_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\postausgang_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\postausgang_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\postausgang_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\postausgang_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\postausgang_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Pprofil_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1063,6 +1117,21 @@ ..\Resources\Word_approved_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Word_Couvertiert_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Word_Couvertiert_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Word_Couvertiert_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Word_Couvertiert_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Word_Couvertiert_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Word_Edit_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Client/Resources/Envelope_16x16-32.png b/Client/Resources/Envelope_16x16-32.png new file mode 100644 index 00000000..f1912ea3 Binary files /dev/null and b/Client/Resources/Envelope_16x16-32.png differ diff --git a/Client/Resources/Envelope_24x24-32.png b/Client/Resources/Envelope_24x24-32.png new file mode 100644 index 00000000..777519ea Binary files /dev/null and b/Client/Resources/Envelope_24x24-32.png differ diff --git a/Client/Resources/Envelope_256x256-32.png b/Client/Resources/Envelope_256x256-32.png new file mode 100644 index 00000000..e29db1c3 Binary files /dev/null and b/Client/Resources/Envelope_256x256-32.png differ diff --git a/Client/Resources/Envelope_32x32-32.png b/Client/Resources/Envelope_32x32-32.png new file mode 100644 index 00000000..8d3c1381 Binary files /dev/null and b/Client/Resources/Envelope_32x32-32.png differ diff --git a/Client/Resources/Envelope_48x48-32.png b/Client/Resources/Envelope_48x48-32.png new file mode 100644 index 00000000..149a102b Binary files /dev/null and b/Client/Resources/Envelope_48x48-32.png differ diff --git a/Client/Resources/Excel_Couvertiert_16x16-32.png b/Client/Resources/Excel_Couvertiert_16x16-32.png new file mode 100644 index 00000000..fa9e2482 Binary files /dev/null and b/Client/Resources/Excel_Couvertiert_16x16-32.png differ diff --git a/Client/Resources/Excel_Couvertiert_24x24-32.png b/Client/Resources/Excel_Couvertiert_24x24-32.png new file mode 100644 index 00000000..a1196abc Binary files /dev/null and b/Client/Resources/Excel_Couvertiert_24x24-32.png differ diff --git a/Client/Resources/Excel_Couvertiert_256x256-32.png b/Client/Resources/Excel_Couvertiert_256x256-32.png new file mode 100644 index 00000000..849e1fcf Binary files /dev/null and b/Client/Resources/Excel_Couvertiert_256x256-32.png differ diff --git a/Client/Resources/Excel_Couvertiert_32x32-32.png b/Client/Resources/Excel_Couvertiert_32x32-32.png new file mode 100644 index 00000000..0807daf5 Binary files /dev/null and b/Client/Resources/Excel_Couvertiert_32x32-32.png differ diff --git a/Client/Resources/Excel_Couvertiert_48x48-32.png b/Client/Resources/Excel_Couvertiert_48x48-32.png new file mode 100644 index 00000000..0e5d2901 Binary files /dev/null and b/Client/Resources/Excel_Couvertiert_48x48-32.png differ diff --git a/Client/Resources/PDF_Covertiert_16x16-32.png b/Client/Resources/PDF_Covertiert_16x16-32.png new file mode 100644 index 00000000..c82ca378 Binary files /dev/null and b/Client/Resources/PDF_Covertiert_16x16-32.png differ diff --git a/Client/Resources/PDF_Covertiert_16x16-321.png b/Client/Resources/PDF_Covertiert_16x16-321.png new file mode 100644 index 00000000..caef510d Binary files /dev/null and b/Client/Resources/PDF_Covertiert_16x16-321.png differ diff --git a/Client/Resources/PDF_Covertiert_24x24-32.png b/Client/Resources/PDF_Covertiert_24x24-32.png new file mode 100644 index 00000000..1a8d2aa9 Binary files /dev/null and b/Client/Resources/PDF_Covertiert_24x24-32.png differ diff --git a/Client/Resources/PDF_Covertiert_24x24-321.png b/Client/Resources/PDF_Covertiert_24x24-321.png new file mode 100644 index 00000000..c4789b37 Binary files /dev/null and b/Client/Resources/PDF_Covertiert_24x24-321.png differ diff --git a/Client/Resources/PDF_Covertiert_256x256-32.png b/Client/Resources/PDF_Covertiert_256x256-32.png new file mode 100644 index 00000000..5e7f4134 Binary files /dev/null and b/Client/Resources/PDF_Covertiert_256x256-32.png differ diff --git a/Client/Resources/PDF_Covertiert_256x256-321.png b/Client/Resources/PDF_Covertiert_256x256-321.png new file mode 100644 index 00000000..92b52d18 Binary files /dev/null and b/Client/Resources/PDF_Covertiert_256x256-321.png differ diff --git a/Client/Resources/PDF_Covertiert_32x32-32.png b/Client/Resources/PDF_Covertiert_32x32-32.png new file mode 100644 index 00000000..88e73808 Binary files /dev/null and b/Client/Resources/PDF_Covertiert_32x32-32.png differ diff --git a/Client/Resources/PDF_Covertiert_32x32-321.png b/Client/Resources/PDF_Covertiert_32x32-321.png new file mode 100644 index 00000000..b404dc55 Binary files /dev/null and b/Client/Resources/PDF_Covertiert_32x32-321.png differ diff --git a/Client/Resources/PDF_Covertiert_48x48-32.png b/Client/Resources/PDF_Covertiert_48x48-32.png new file mode 100644 index 00000000..c9232f75 Binary files /dev/null and b/Client/Resources/PDF_Covertiert_48x48-32.png differ diff --git a/Client/Resources/Versandstrasse_16x16-32.png b/Client/Resources/Versandstrasse_16x16-32.png index 02fd55b5..c918de6a 100644 Binary files a/Client/Resources/Versandstrasse_16x16-32.png and b/Client/Resources/Versandstrasse_16x16-32.png differ diff --git a/Client/Resources/Versandstrasse_24x24-32.png b/Client/Resources/Versandstrasse_24x24-32.png index b0727977..6680cc98 100644 Binary files a/Client/Resources/Versandstrasse_24x24-32.png and b/Client/Resources/Versandstrasse_24x24-32.png differ diff --git a/Client/Resources/Versandstrasse_256x256-32.png b/Client/Resources/Versandstrasse_256x256-32.png index ec22151e..a031e670 100644 Binary files a/Client/Resources/Versandstrasse_256x256-32.png and b/Client/Resources/Versandstrasse_256x256-32.png differ diff --git a/Client/Resources/Versandstrasse_32x32-32.png b/Client/Resources/Versandstrasse_32x32-32.png index 5150cc10..c6bba518 100644 Binary files a/Client/Resources/Versandstrasse_32x32-32.png and b/Client/Resources/Versandstrasse_32x32-32.png differ diff --git a/Client/Resources/Versandstrasse_48x48-32.png b/Client/Resources/Versandstrasse_48x48-32.png index 70f4d6a9..92bbd955 100644 Binary files a/Client/Resources/Versandstrasse_48x48-32.png and b/Client/Resources/Versandstrasse_48x48-32.png differ diff --git a/Client/Resources/Word_Couvertiert_16x16-32.png b/Client/Resources/Word_Couvertiert_16x16-32.png new file mode 100644 index 00000000..5c3762a6 Binary files /dev/null and b/Client/Resources/Word_Couvertiert_16x16-32.png differ diff --git a/Client/Resources/Word_Couvertiert_24x24-32.png b/Client/Resources/Word_Couvertiert_24x24-32.png new file mode 100644 index 00000000..e184c123 Binary files /dev/null and b/Client/Resources/Word_Couvertiert_24x24-32.png differ diff --git a/Client/Resources/Word_Couvertiert_256x256-32.png b/Client/Resources/Word_Couvertiert_256x256-32.png new file mode 100644 index 00000000..74d290c0 Binary files /dev/null and b/Client/Resources/Word_Couvertiert_256x256-32.png differ diff --git a/Client/Resources/Word_Couvertiert_32x32-32.png b/Client/Resources/Word_Couvertiert_32x32-32.png new file mode 100644 index 00000000..31b56d08 Binary files /dev/null and b/Client/Resources/Word_Couvertiert_32x32-32.png differ diff --git a/Client/Resources/Word_Couvertiert_48x48-32.png b/Client/Resources/Word_Couvertiert_48x48-32.png new file mode 100644 index 00000000..6d0f83a7 Binary files /dev/null and b/Client/Resources/Word_Couvertiert_48x48-32.png differ diff --git a/Client/Resources/postausgang_16x16-32.png b/Client/Resources/postausgang_16x16-32.png new file mode 100644 index 00000000..bf193016 Binary files /dev/null and b/Client/Resources/postausgang_16x16-32.png differ diff --git a/Client/Resources/postausgang_24x24-32.png b/Client/Resources/postausgang_24x24-32.png new file mode 100644 index 00000000..0618620e Binary files /dev/null and b/Client/Resources/postausgang_24x24-32.png differ diff --git a/Client/Resources/postausgang_256x256-32.png b/Client/Resources/postausgang_256x256-32.png new file mode 100644 index 00000000..b526fd2a Binary files /dev/null and b/Client/Resources/postausgang_256x256-32.png differ diff --git a/Client/Resources/postausgang_32x32-32.png b/Client/Resources/postausgang_32x32-32.png new file mode 100644 index 00000000..83488b1c Binary files /dev/null and b/Client/Resources/postausgang_32x32-32.png differ diff --git a/Client/Resources/postausgang_48x48-32.png b/Client/Resources/postausgang_48x48-32.png new file mode 100644 index 00000000..36aaa66b Binary files /dev/null and b/Client/Resources/postausgang_48x48-32.png differ diff --git a/Client/Start.cs b/Client/Start.cs index 3b15131b..ada5d41f 100644 --- a/Client/Start.cs +++ b/Client/Start.cs @@ -7,7 +7,9 @@ using OnDoc.Klassen; using Syncfusion.WinForms.Controls; using Syncfusion.XlsIO; using Syncfusion.XlsIO.Implementation; +using Syncfusion.XlsIO.Implementation.XmlSerialization.Constants; using System; +using System.CodeDom; using System.Data; using System.Data.SqlClient; using System.Deployment.Application; @@ -275,12 +277,78 @@ namespace OnDoc if (ExternalCall.function.ToLower() == "createdoc") { - if (ExternalCall.dokumentid !="") + if (ExternalCall.app == "onbase") { - DB db = new DB(); - db.dokument_reaktivieren(ExternalCall.dokumentid, AppParams.CurrentMitarbeiter.ToString()); - db = null; - dokList1.dokument_bearbeiten(ExternalCall.dokumentid, false); + if (ExternalCall.dokumentid != "") + { + FrmExternalDocEdit fe = new FrmExternalDocEdit(ExternalCall.dokumentid); + fe.ShowDialog(); + switch (fe.returnid) + { + case 0: + return; + break; + case 1: + if (ExternalCall.partnernr != "") + { + dokList1.createnewdoc(Convert.ToInt32(ExternalCall.partnernr), 0); + + } + else + { + dokList1.createnewdoc(0, Convert.ToInt32(0)); + + } + + return; + break; + case 2: + + DB db = new DB(AppParams.connectionstring); + string newdocid = db.copydoc(ExternalCall.dokumentid, AppParams.CurrentMitarbeiter); + + if (newdocid == "") + { + MessageBox.Show("Das Dokument ID:'" + ExternalCall.dokumentid + "' konnte nicht kopiert werden.", "Dokument kopieren", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + else + { + Logging.DocLog.Info("Dokumentkopie von '" + ExternalCall.dokumentid + "' erstellt", "OnDoc.DocList'", newdocid, "", "Dokumentkopie erstellt"); + db.dokument_reaktivieren(newdocid, AppParams.CurrentMitarbeiter.ToString()); + dokList1.dokument_bearbeiten(newdocid, false); + } + db = null; + return; + break; + case 3: + Logging.DocLog.Info("Archiviertes Dokument wieder bearbeiten '" + ExternalCall.dokumentid ,"OnDoc",ExternalCall.dokumentid, "", "Dokument erneut bearbeiten"); + DB db1 = new DB(AppParams.connectionstring); + db1.dokument_reaktivieren(ExternalCall.dokumentid, AppParams.CurrentMitarbeiter.ToString()); + + dokList1.dokument_bearbeiten(ExternalCall.dokumentid, false); + db1 = null; + return; + break; + } + + } + else + { + if (ExternalCall.partnernr != "") + { + dokList1.createnewdoc(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr)); + } + else + { + dokList1.createnewdoc(0, Convert.ToInt32(ExternalCall.dokumenttypnr)); + + } + return; + } + + //db.dokument_reaktivieren(ExternalCall.dokumentid, AppParams.CurrentMitarbeiter.ToString()); + //db = null; + //dokList1.dokument_bearbeiten(ExternalCall.dokumentid, false); return; } diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index 5cd0b273..14467cc0 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -33,153 +33,155 @@ namespace OnDoc.UICintrols this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DokList)); this.ctxMenuDokList = new System.Windows.Forms.ContextMenuStrip(this.components); + this.dokumentAnzeigenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dokumentBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dokumentLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.zurUnterschriftenPrüfungToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dokumentUnterzeichnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.archivierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dokumentAnVersandstrasseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.druckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); + this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dokumentKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.barcodeDemoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.vertragPDFDEMOToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.zellenwertInZwischenablageKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pDFGenerierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dokumentAnVersandstrasseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.gruppenÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.gruppenSchliessenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.zumVersandpaketHinzufügenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.tsrbvorschau = new System.Windows.Forms.ToolStripComboBox(); + this.tsbtnpreviewno = new System.Windows.Forms.ToolStripButton(); + this.tsbtnpreviewbottom = new System.Windows.Forms.ToolStripButton(); + this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid(); + this.docPreview1 = new OnDoc.UIControls.DocPreview(); this.panel2 = new System.Windows.Forms.Panel(); this.lblTitel = new System.Windows.Forms.Label(); this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel(); this.ribbon2 = new System.Windows.Forms.Ribbon(); this.RibbonTabUserFunctions = new System.Windows.Forms.RibbonTab(); this.ribbonPanelNeu = new System.Windows.Forms.RibbonPanel(); - this.RibbonPanelExit = new System.Windows.Forms.RibbonPanel(); - this.RibbonPanelBearbeiten = new System.Windows.Forms.RibbonPanel(); - this.ribbonPanelZuweisung = new System.Windows.Forms.RibbonPanel(); - this.RibbonPannelAproval = new System.Windows.Forms.RibbonPanel(); - this.ribbonItemGroupApproveCounter = new System.Windows.Forms.RibbonItemGroup(); - this.ribbonLabelToApprove = new System.Windows.Forms.RibbonLabel(); - this.RibbonPanelArchiv = new System.Windows.Forms.RibbonPanel(); - this.RibbonPanelDemo = new System.Windows.Forms.RibbonPanel(); - this.RibbonPanelSuche = new System.Windows.Forms.RibbonPanel(); - this.ribbonGroupMitarbeiter = new System.Windows.Forms.RibbonItemGroup(); - this.RibbonGroupFilter = new System.Windows.Forms.RibbonItemGroup(); - this.RibbonFilterLabel = new System.Windows.Forms.RibbonLabel(); - this.ribbonPannelDiverseVorlagen = new System.Windows.Forms.RibbonPanel(); - this.RibbonPanelDoklist = new System.Windows.Forms.RibbonPanel(); - this.ribbonTabAnsicht = new System.Windows.Forms.RibbonTab(); - this.RibbonPannelAnsicht = new System.Windows.Forms.RibbonPanel(); - this.ribbonItemGroup2 = new System.Windows.Forms.RibbonItemGroup(); - this.ribboncomboboxansicht = new System.Windows.Forms.RibbonLabel(); - this.ribbonCBAnsicht = new System.Windows.Forms.RibbonComboBox(); - this.ribbonItemGroup3 = new System.Windows.Forms.RibbonItemGroup(); - this.ribbonPanelVorschau = new System.Windows.Forms.RibbonPanel(); - this.ribbonPanelAttribute = new System.Windows.Forms.RibbonPanel(); - this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); - this.ribbonTabDokpaket_Serienbrief = new System.Windows.Forms.RibbonTab(); - this.RibbonPanelCreate = new System.Windows.Forms.RibbonPanel(); - this.ribbonTabProfil = new System.Windows.Forms.RibbonTab(); - this.RibbonPanelProfil = new System.Windows.Forms.RibbonPanel(); - this.ribbonItemGroup1 = new System.Windows.Forms.RibbonItemGroup(); - this.ribbonLabel1 = new System.Windows.Forms.RibbonLabel(); - this.RibbonCBProfil = new System.Windows.Forms.RibbonComboBox(); - this.RibbonTabNativVorlagen = new System.Windows.Forms.RibbonTab(); - this.ribbonPanelNativVorlagen = new System.Windows.Forms.RibbonPanel(); - this.RibbonTabAdmin = new System.Windows.Forms.RibbonTab(); - this.RibbonPanelDiverses = new System.Windows.Forms.RibbonPanel(); - this.ribbonAnmelden = new System.Windows.Forms.RibbonPanel(); - this.ribbonVorlagen = new System.Windows.Forms.RibbonPanel(); - this.ribbonBerechtigung = new System.Windows.Forms.RibbonPanel(); - this.ribbonpanelanalyse = new System.Windows.Forms.RibbonPanel(); - this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel(); - this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel(); - this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig(); - this.timer1 = new System.Windows.Forms.Timer(this.components); - this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig(); - this.ctxMenuGroups = new System.Windows.Forms.ContextMenuStrip(this.components); - this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.ribbonGroupPerson = new System.Windows.Forms.RibbonItemGroup(); - this.ribbonLabelPerson = new System.Windows.Forms.RibbonLabel(); - this.docPreview1 = new OnDoc.UIControls.DocPreview(); - this.dokwerte1 = new OnDoc.UIControls.Dokwerte(); - this.dokumentAnzeigenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dokumentBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dokumentLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.zurUnterschriftenPrüfungToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.archivierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.druckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dokumentKopierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tsbtnpreviewno = new System.Windows.Forms.ToolStripButton(); - this.tsbtnpreviewbottom = new System.Windows.Forms.ToolStripButton(); - this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton(); this.RibbonButtonNewDoc = new System.Windows.Forms.RibbonButton(); this.RibbonButtonFavoriten = new System.Windows.Forms.RibbonButton(); + this.RibbonPanelExit = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonExit = new System.Windows.Forms.RibbonButton(); + this.RibbonPanelBearbeiten = new System.Windows.Forms.RibbonPanel(); this.ribbibButtonShowDoc = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditEditDoc = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditDelete = new System.Windows.Forms.RibbonButton(); + this.ribbonPanelZuweisung = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonZuweisen = new System.Windows.Forms.RibbonButton(); this.ribbonButtonToApproval = new System.Windows.Forms.RibbonButton(); + this.RibbonPannelAproval = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonApproval = new System.Windows.Forms.RibbonButton(); + this.ribbonItemGroupApproveCounter = new System.Windows.Forms.RibbonItemGroup(); this.ribbonButtonRefresh_Bewilligungen = new System.Windows.Forms.RibbonButton(); + this.ribbonLabelToApprove = new System.Windows.Forms.RibbonLabel(); + this.RibbonPanelArchiv = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonArchivToOnBase = new System.Windows.Forms.RibbonButton(); this.ribbonButtonVersandstrasse = new System.Windows.Forms.RibbonButton(); + this.ribbonbuttonpostausgang = new System.Windows.Forms.RibbonButton(); + this.RibbonPanelDemo = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonTest1 = new System.Windows.Forms.RibbonButton(); + this.RibbonPanelSuche = new System.Windows.Forms.RibbonPanel(); + this.ribbonGroupMitarbeiter = new System.Windows.Forms.RibbonItemGroup(); this.ribbonButtonGetMA = new System.Windows.Forms.RibbonButton(); this.ribbonDokumntID = new System.Windows.Forms.RibbonButton(); this.ribbonButton3 = new System.Windows.Forms.RibbonButton(); + this.RibbonGroupFilter = new System.Windows.Forms.RibbonItemGroup(); this.ribbonbuttonnewparterdoc = new System.Windows.Forms.RibbonButton(); this.ribbonbuttonPartnerlist = new System.Windows.Forms.RibbonButton(); this.ribbonbuttonbpsymbol = new System.Windows.Forms.RibbonButton(); this.ribbonbuttonpersonsymbol = new System.Windows.Forms.RibbonButton(); + this.RibbonFilterLabel = new System.Windows.Forms.RibbonLabel(); this.RibbonPartnerSaldiert = new System.Windows.Forms.RibbonButton(); this.RibbonFilterDelete = new System.Windows.Forms.RibbonButton(); + this.ribbonGroupPerson = new System.Windows.Forms.RibbonItemGroup(); this.ribbonButtonNewPersonDok = new System.Windows.Forms.RibbonButton(); this.ribbonbuttonPersonlist = new System.Windows.Forms.RibbonButton(); this.ribbonbuttonpersonpersonsymbol = new System.Windows.Forms.RibbonButton(); + this.ribbonLabelPerson = new System.Windows.Forms.RibbonLabel(); this.ribbonPersonSaldiert = new System.Windows.Forms.RibbonButton(); this.ribbonFilterDeletePerson = new System.Windows.Forms.RibbonButton(); + this.ribbonPannelDiverseVorlagen = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonNativ = new System.Windows.Forms.RibbonButton(); + this.RibbonPanelDoklist = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonRefresh = new System.Windows.Forms.RibbonButton(); + this.ribbonTabAnsicht = new System.Windows.Forms.RibbonTab(); + this.RibbonPannelAnsicht = new System.Windows.Forms.RibbonPanel(); + this.ribbonItemGroup2 = new System.Windows.Forms.RibbonItemGroup(); + this.ribboncomboboxansicht = new System.Windows.Forms.RibbonLabel(); + this.ribbonCBAnsicht = new System.Windows.Forms.RibbonComboBox(); + this.ribbonItemGroup3 = new System.Windows.Forms.RibbonItemGroup(); this.RibbonButtonViewStandard = new System.Windows.Forms.RibbonButton(); this.RibbonButtonViewSave = new System.Windows.Forms.RibbonButton(); this.RibbonButtonViewDelete = new System.Windows.Forms.RibbonButton(); this.ribbonSaveGridView = new System.Windows.Forms.RibbonButton(); + this.ribbonPanelVorschau = new System.Windows.Forms.RibbonPanel(); this.RibbonBtnVorschauNo = new System.Windows.Forms.RibbonButton(); this.RibbonBtnVorschauUnten = new System.Windows.Forms.RibbonButton(); this.RibbonButtonVorschauRechts = new System.Windows.Forms.RibbonButton(); this.RibbonBtnVorschauSepparat = new System.Windows.Forms.RibbonButton(); + this.ribbonPanelAttribute = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonAttributeEinAusblenden = new System.Windows.Forms.RibbonButton(); + this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); this.ribbonButton6 = new System.Windows.Forms.RibbonButton(); + this.ribbonTabDokpaket_Serienbrief = new System.Windows.Forms.RibbonTab(); + this.RibbonPanelCreate = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonCreateNewPaket = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditPaket = new System.Windows.Forms.RibbonButton(); this.RibbonButtonCreateNewSerienbrief = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditSerienbrief = new System.Windows.Forms.RibbonButton(); + this.ribbonTabProfil = new System.Windows.Forms.RibbonTab(); + this.RibbonPanelProfil = new System.Windows.Forms.RibbonPanel(); + this.ribbonItemGroup1 = new System.Windows.Forms.RibbonItemGroup(); + this.ribbonLabel1 = new System.Windows.Forms.RibbonLabel(); + this.RibbonCBProfil = new System.Windows.Forms.RibbonComboBox(); this.ribbonButton1 = new System.Windows.Forms.RibbonButton(); + this.RibbonTabNativVorlagen = new System.Windows.Forms.RibbonTab(); + this.ribbonPanelNativVorlagen = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonNativVorlagen = new System.Windows.Forms.RibbonButton(); + this.RibbonTabAdmin = new System.Windows.Forms.RibbonTab(); + this.RibbonPanelDiverses = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonBCK = new System.Windows.Forms.RibbonButton(); this.ribbonbtnqdf = new System.Windows.Forms.RibbonButton(); + this.ribbonAnmelden = new System.Windows.Forms.RibbonPanel(); this.ribbonbuttonlogin = new System.Windows.Forms.RibbonButton(); + this.ribbonVorlagen = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonDokumenttyp = new System.Windows.Forms.RibbonButton(); this.RibbonButtonVorlagen = new System.Windows.Forms.RibbonButton(); this.ribbonButtonVorlagenfeldregel = new System.Windows.Forms.RibbonButton(); + this.ribbonBerechtigung = new System.Windows.Forms.RibbonPanel(); this.ribbonButton2 = new System.Windows.Forms.RibbonButton(); this.RibbonButtonBerechtigungsgruppe = new System.Windows.Forms.RibbonButton(); this.ribbonButtonSysadmins = new System.Windows.Forms.RibbonButton(); + this.ribbonpanelanalyse = new System.Windows.Forms.RibbonPanel(); this.ribbonbuttonedklog = new System.Windows.Forms.RibbonButton(); this.ribbonbuttonedkverarbeitung = new System.Windows.Forms.RibbonButton(); + this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel(); this.ribbonButton4 = new System.Windows.Forms.RibbonButton(); + this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonDokinBearbeitung = new System.Windows.Forms.RibbonButton(); + this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig(); + this.timer1 = new System.Windows.Forms.Timer(this.components); + this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig(); + this.ctxMenuGroups = new System.Windows.Forms.ContextMenuStrip(this.components); + this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton(); this.ribbonButton5 = new System.Windows.Forms.RibbonButton(); + this.dokwerte1 = new OnDoc.UIControls.Dokwerte(); this.ctxMenuDokList.SuspendLayout(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -202,6 +204,7 @@ namespace OnDoc.UICintrols this.zurUnterschriftenPrüfungToolStripMenuItem, this.dokumentUnterzeichnenToolStripMenuItem, this.archivierenToolStripMenuItem, + this.dokumentAnVersandstrasseToolStripMenuItem, this.druckenToolStripMenuItem, this.toolStripMenuItem4, this.dokumentFürPartnerErstellenToolStripMenuItem, @@ -211,22 +214,54 @@ namespace OnDoc.UICintrols this.vertragPDFDEMOToolStripMenuItem, this.zellenwertInZwischenablageKopierenToolStripMenuItem, this.pDFGenerierenToolStripMenuItem, - this.dokumentAnVersandstrasseToolStripMenuItem, this.wordInterOPEditToolStripMenuItem, this.attributeAnzeigenVersteckenToolStripMenuItem, this.historyToolStripMenuItem, this.toolStripMenuItem3, this.gruppenÖffnenToolStripMenuItem, - this.gruppenSchliessenToolStripMenuItem}); + this.gruppenSchliessenToolStripMenuItem, + this.zumVersandpaketHinzufügenToolStripMenuItem}); this.ctxMenuDokList.Name = "ctxMenuDokList"; - this.ctxMenuDokList.Size = new System.Drawing.Size(284, 522); + this.ctxMenuDokList.Size = new System.Drawing.Size(284, 548); this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening); // + // dokumentAnzeigenToolStripMenuItem + // + this.dokumentAnzeigenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.ShowDoc_16x16_32; + this.dokumentAnzeigenToolStripMenuItem.Name = "dokumentAnzeigenToolStripMenuItem"; + this.dokumentAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); + this.dokumentAnzeigenToolStripMenuItem.Text = "Dokument anzeigen"; + this.dokumentAnzeigenToolStripMenuItem.Click += new System.EventHandler(this.dokumentAnzeigenToolStripMenuItem_Click); + // + // dokumentBearbeitenToolStripMenuItem + // + this.dokumentBearbeitenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.EditDoc_16x16_32; + this.dokumentBearbeitenToolStripMenuItem.Name = "dokumentBearbeitenToolStripMenuItem"; + this.dokumentBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); + this.dokumentBearbeitenToolStripMenuItem.Text = "Dokument bearbeiten"; + this.dokumentBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.dokumentBearbeitenToolStripMenuItem_Click); + // + // dokumentLöschenToolStripMenuItem + // + this.dokumentLöschenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.DeleteDoc_16x16_32; + this.dokumentLöschenToolStripMenuItem.Name = "dokumentLöschenToolStripMenuItem"; + this.dokumentLöschenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); + this.dokumentLöschenToolStripMenuItem.Text = "Dokument löschen"; + this.dokumentLöschenToolStripMenuItem.Click += new System.EventHandler(this.dokumentLöschenToolStripMenuItem_Click); + // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Size = new System.Drawing.Size(280, 6); // + // zurUnterschriftenPrüfungToolStripMenuItem + // + this.zurUnterschriftenPrüfungToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Approval_16x16_32; + this.zurUnterschriftenPrüfungToolStripMenuItem.Name = "zurUnterschriftenPrüfungToolStripMenuItem"; + this.zurUnterschriftenPrüfungToolStripMenuItem.Size = new System.Drawing.Size(283, 26); + this.zurUnterschriftenPrüfungToolStripMenuItem.Text = "Zur Unterschriften-Prüfung"; + this.zurUnterschriftenPrüfungToolStripMenuItem.Click += new System.EventHandler(this.zurUnterschriftenPrüfungToolStripMenuItem_Click); + // // dokumentUnterzeichnenToolStripMenuItem // this.dokumentUnterzeichnenToolStripMenuItem.Name = "dokumentUnterzeichnenToolStripMenuItem"; @@ -235,11 +270,53 @@ namespace OnDoc.UICintrols this.dokumentUnterzeichnenToolStripMenuItem.Visible = false; this.dokumentUnterzeichnenToolStripMenuItem.Click += new System.EventHandler(this.dokumentUnterzeichnenToolStripMenuItem_Click); // + // archivierenToolStripMenuItem + // + this.archivierenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("archivierenToolStripMenuItem.Image"))); + this.archivierenToolStripMenuItem.Name = "archivierenToolStripMenuItem"; + this.archivierenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); + this.archivierenToolStripMenuItem.Text = "Archivieren"; + this.archivierenToolStripMenuItem.Click += new System.EventHandler(this.archivierenToolStripMenuItem_Click); + // + // dokumentAnVersandstrasseToolStripMenuItem + // + this.dokumentAnVersandstrasseToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Envelope_16x16_32; + this.dokumentAnVersandstrasseToolStripMenuItem.Name = "dokumentAnVersandstrasseToolStripMenuItem"; + this.dokumentAnVersandstrasseToolStripMenuItem.Size = new System.Drawing.Size(283, 26); + this.dokumentAnVersandstrasseToolStripMenuItem.Text = "Versandstrasse"; + this.dokumentAnVersandstrasseToolStripMenuItem.Visible = false; + this.dokumentAnVersandstrasseToolStripMenuItem.Click += new System.EventHandler(this.dokumentAnVersandstrasseToolStripMenuItem_Click); + // + // druckenToolStripMenuItem + // + this.druckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Printer_16x16_32; + this.druckenToolStripMenuItem.Name = "druckenToolStripMenuItem"; + this.druckenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); + this.druckenToolStripMenuItem.Text = "Drucken"; + this.druckenToolStripMenuItem.Visible = false; + this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click); + // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; this.toolStripMenuItem4.Size = new System.Drawing.Size(280, 6); // + // dokumentFürPartnerErstellenToolStripMenuItem + // + this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32; + this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem"; + this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); + this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Kunde erstellen"; + this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click); + // + // dokumentKopierenToolStripMenuItem + // + this.dokumentKopierenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Copy_16x16_32; + this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem"; + this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); + this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren"; + this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click); + // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; @@ -276,13 +353,6 @@ namespace OnDoc.UICintrols this.pDFGenerierenToolStripMenuItem.Visible = false; this.pDFGenerierenToolStripMenuItem.Click += new System.EventHandler(this.pDFGenerierenToolStripMenuItem_Click); // - // dokumentAnVersandstrasseToolStripMenuItem - // - this.dokumentAnVersandstrasseToolStripMenuItem.Name = "dokumentAnVersandstrasseToolStripMenuItem"; - this.dokumentAnVersandstrasseToolStripMenuItem.Size = new System.Drawing.Size(283, 26); - this.dokumentAnVersandstrasseToolStripMenuItem.Text = "Dokument an Versandstrasse"; - this.dokumentAnVersandstrasseToolStripMenuItem.Visible = false; - // // wordInterOPEditToolStripMenuItem // this.wordInterOPEditToolStripMenuItem.Name = "wordInterOPEditToolStripMenuItem"; @@ -291,6 +361,14 @@ namespace OnDoc.UICintrols this.wordInterOPEditToolStripMenuItem.Visible = false; this.wordInterOPEditToolStripMenuItem.Click += new System.EventHandler(this.wordInterOPEditToolStripMenuItem_Click); // + // attributeAnzeigenVersteckenToolStripMenuItem + // + this.attributeAnzeigenVersteckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Attribut_16x16_32; + this.attributeAnzeigenVersteckenToolStripMenuItem.Name = "attributeAnzeigenVersteckenToolStripMenuItem"; + this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); + this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute ein- / ausblenden"; + this.attributeAnzeigenVersteckenToolStripMenuItem.Click += new System.EventHandler(this.attributeAnzeigenVersteckenToolStripMenuItem_Click); + // // historyToolStripMenuItem // this.historyToolStripMenuItem.Name = "historyToolStripMenuItem"; @@ -317,6 +395,14 @@ namespace OnDoc.UICintrols this.gruppenSchliessenToolStripMenuItem.Text = "Alle Gruppen einklappen"; this.gruppenSchliessenToolStripMenuItem.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem_Click); // + // zumVersandpaketHinzufügenToolStripMenuItem + // + this.zumVersandpaketHinzufügenToolStripMenuItem.Name = "zumVersandpaketHinzufügenToolStripMenuItem"; + this.zumVersandpaketHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); + this.zumVersandpaketHinzufügenToolStripMenuItem.Text = "Zu einem Couvert hinzufügen"; + this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = false; + this.zumVersandpaketHinzufügenToolStripMenuItem.Click += new System.EventHandler(this.zumVersandpaketHinzufügenToolStripMenuItem_Click); + // // toolStrip1 // this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -358,6 +444,33 @@ namespace OnDoc.UICintrols this.tsrbvorschau.SelectedIndexChanged += new System.EventHandler(this.tsrbvorschau_SelectedIndexChanged); this.tsrbvorschau.TextChanged += new System.EventHandler(this.tsrbvorschau_TextChanged); // + // tsbtnpreviewno + // + this.tsbtnpreviewno.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbtnpreviewno.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewno.Image"))); + this.tsbtnpreviewno.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbtnpreviewno.Name = "tsbtnpreviewno"; + this.tsbtnpreviewno.Size = new System.Drawing.Size(24, 22); + this.tsbtnpreviewno.Text = "Keine Vorschau"; + // + // tsbtnpreviewbottom + // + this.tsbtnpreviewbottom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbtnpreviewbottom.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewbottom.Image"))); + this.tsbtnpreviewbottom.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbtnpreviewbottom.Name = "tsbtnpreviewbottom"; + this.tsbtnpreviewbottom.Size = new System.Drawing.Size(24, 22); + this.tsbtnpreviewbottom.Text = "Vorschau unten"; + // + // tsbtnpreviewright + // + this.tsbtnpreviewright.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbtnpreviewright.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewright.Image"))); + this.tsbtnpreviewright.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbtnpreviewright.Name = "tsbtnpreviewright"; + this.tsbtnpreviewright.Size = new System.Drawing.Size(24, 22); + this.tsbtnpreviewright.Text = "Vorschau rechts"; + // // splitContainer1 // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -406,6 +519,16 @@ namespace OnDoc.UICintrols this.sfDataGrid1.ColumnResizing += new Syncfusion.WinForms.DataGrid.Events.ColumnResizingEventHandler(this.sfDataGrid1_ColumnResizing); this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent); // + // docPreview1 + // + this.docPreview1.BackColor = System.Drawing.SystemColors.Control; + this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; + this.docPreview1.Location = new System.Drawing.Point(0, 0); + this.docPreview1.Name = "docPreview1"; + this.docPreview1.Size = new System.Drawing.Size(1709, 347); + this.docPreview1.TabIndex = 0; + this.docPreview1.ZoomPercentage = 0; + // // panel2 // this.panel2.BackColor = System.Drawing.Color.WhiteSmoke; @@ -494,482 +617,7 @@ namespace OnDoc.UICintrols this.ribbonPanelNeu.Name = "ribbonPanelNeu"; this.ribbonPanelNeu.Text = "Neu"; // - // RibbonPanelExit - // - this.RibbonPanelExit.ButtonMoreVisible = false; - this.RibbonPanelExit.Items.Add(this.RibbonButtonExit); - this.RibbonPanelExit.Name = "RibbonPanelExit"; - this.RibbonPanelExit.Text = "Beenden"; - this.RibbonPanelExit.Visible = false; - // - // RibbonPanelBearbeiten - // - this.RibbonPanelBearbeiten.ButtonMoreVisible = false; - this.RibbonPanelBearbeiten.Items.Add(this.ribbibButtonShowDoc); - this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonEditEditDoc); - this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonEditDelete); - this.RibbonPanelBearbeiten.Name = "RibbonPanelBearbeiten"; - this.RibbonPanelBearbeiten.Text = "Dokument"; - // - // ribbonPanelZuweisung - // - this.ribbonPanelZuweisung.ButtonMoreVisible = false; - this.ribbonPanelZuweisung.Items.Add(this.RibbonButtonZuweisen); - this.ribbonPanelZuweisung.Items.Add(this.ribbonButtonToApproval); - this.ribbonPanelZuweisung.Name = "ribbonPanelZuweisung"; - this.ribbonPanelZuweisung.Text = "Zuweisen"; - // - // RibbonPannelAproval - // - this.RibbonPannelAproval.ButtonMoreVisible = false; - this.RibbonPannelAproval.Items.Add(this.ribbonButtonApproval); - this.RibbonPannelAproval.Items.Add(this.ribbonItemGroupApproveCounter); - this.RibbonPannelAproval.Name = "RibbonPannelAproval"; - this.RibbonPannelAproval.Text = "Unterschriftenprüfung"; - // - // ribbonItemGroupApproveCounter - // - this.ribbonItemGroupApproveCounter.Items.Add(this.ribbonButtonRefresh_Bewilligungen); - this.ribbonItemGroupApproveCounter.Items.Add(this.ribbonLabelToApprove); - this.ribbonItemGroupApproveCounter.Name = "ribbonItemGroupApproveCounter"; - // - // ribbonLabelToApprove - // - this.ribbonLabelToApprove.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonLabelToApprove.Name = "ribbonLabelToApprove"; - // - // RibbonPanelArchiv - // - this.RibbonPanelArchiv.ButtonMoreVisible = false; - this.RibbonPanelArchiv.Items.Add(this.RibbonButtonArchivToOnBase); - this.RibbonPanelArchiv.Items.Add(this.ribbonButtonVersandstrasse); - this.RibbonPanelArchiv.Name = "RibbonPanelArchiv"; - this.RibbonPanelArchiv.Text = "Archiv"; - // - // RibbonPanelDemo - // - this.RibbonPanelDemo.Items.Add(this.RibbonButtonTest1); - this.RibbonPanelDemo.Name = "RibbonPanelDemo"; - this.RibbonPanelDemo.Text = "Test-Funktionen"; - this.RibbonPanelDemo.Visible = false; - // - // RibbonPanelSuche - // - this.RibbonPanelSuche.ButtonMoreVisible = false; - this.RibbonPanelSuche.Items.Add(this.ribbonGroupMitarbeiter); - this.RibbonPanelSuche.Items.Add(this.RibbonGroupFilter); - this.RibbonPanelSuche.Items.Add(this.ribbonGroupPerson); - this.RibbonPanelSuche.Name = "RibbonPanelSuche"; - this.RibbonPanelSuche.Text = "Dokumente suchen/Filter"; - // - // ribbonGroupMitarbeiter - // - this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButtonGetMA); - this.ribbonGroupMitarbeiter.Items.Add(this.ribbonDokumntID); - this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButton3); - this.ribbonGroupMitarbeiter.Name = "ribbonGroupMitarbeiter"; - this.ribbonGroupMitarbeiter.Text = ""; - // - // RibbonGroupFilter - // - this.RibbonGroupFilter.Items.Add(this.ribbonbuttonnewparterdoc); - this.RibbonGroupFilter.Items.Add(this.ribbonbuttonPartnerlist); - this.RibbonGroupFilter.Items.Add(this.ribbonbuttonbpsymbol); - this.RibbonGroupFilter.Items.Add(this.ribbonbuttonpersonsymbol); - this.RibbonGroupFilter.Items.Add(this.RibbonFilterLabel); - this.RibbonGroupFilter.Items.Add(this.RibbonPartnerSaldiert); - this.RibbonGroupFilter.Items.Add(this.RibbonFilterDelete); - this.RibbonGroupFilter.Name = "RibbonGroupFilter"; - this.RibbonGroupFilter.Text = ""; - // - // RibbonFilterLabel - // - this.RibbonFilterLabel.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.RibbonFilterLabel.Name = "RibbonFilterLabel"; - this.RibbonFilterLabel.Text = ""; - this.RibbonFilterLabel.ToolTip = "Gewählter Filter"; - // - // ribbonPannelDiverseVorlagen - // - this.ribbonPannelDiverseVorlagen.Items.Add(this.ribbonButtonNativ); - this.ribbonPannelDiverseVorlagen.Name = "ribbonPannelDiverseVorlagen"; - this.ribbonPannelDiverseVorlagen.Text = "Nativ"; - this.ribbonPannelDiverseVorlagen.Visible = false; - // - // RibbonPanelDoklist - // - this.RibbonPanelDoklist.ButtonMoreVisible = false; - this.RibbonPanelDoklist.Items.Add(this.RibbonButtonRefresh); - this.RibbonPanelDoklist.Name = "RibbonPanelDoklist"; - this.RibbonPanelDoklist.Text = "Dokumentliste"; - // - // ribbonTabAnsicht - // - this.ribbonTabAnsicht.Name = "ribbonTabAnsicht"; - this.ribbonTabAnsicht.Panels.Add(this.RibbonPannelAnsicht); - this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelVorschau); - this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelAttribute); - this.ribbonTabAnsicht.Panels.Add(this.ribbonPanel1); - this.ribbonTabAnsicht.Text = "Ansicht"; - // - // RibbonPannelAnsicht - // - this.RibbonPannelAnsicht.ButtonMoreVisible = false; - this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup2); - this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup3); - this.RibbonPannelAnsicht.Name = "RibbonPannelAnsicht"; - this.RibbonPannelAnsicht.Text = "Ansicht"; - // - // ribbonItemGroup2 - // - this.ribbonItemGroup2.Items.Add(this.ribboncomboboxansicht); - this.ribbonItemGroup2.Items.Add(this.ribbonCBAnsicht); - this.ribbonItemGroup2.Name = "ribbonItemGroup2"; - // - // ribboncomboboxansicht - // - this.ribboncomboboxansicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribboncomboboxansicht.Name = "ribboncomboboxansicht"; - this.ribboncomboboxansicht.Text = "Ansicht"; - // - // ribbonCBAnsicht - // - this.ribbonCBAnsicht.AllowTextEdit = false; - this.ribbonCBAnsicht.DrawIconsBar = false; - this.ribbonCBAnsicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonCBAnsicht.Name = "ribbonCBAnsicht"; - this.ribbonCBAnsicht.SelectedIndex = -1; - this.ribbonCBAnsicht.TextBoxText = ""; - this.ribbonCBAnsicht.DropDownItemClicked += new System.Windows.Forms.RibbonComboBox.RibbonItemEventHandler(this.ribbonCBAnsicht_DropDownItemClicked); - // - // ribbonItemGroup3 - // - this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewStandard); - this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewSave); - this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewDelete); - this.ribbonItemGroup3.Items.Add(this.ribbonSaveGridView); - this.ribbonItemGroup3.Name = "ribbonItemGroup3"; - // - // ribbonPanelVorschau - // - this.ribbonPanelVorschau.ButtonMoreVisible = false; - this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauNo); - this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauUnten); - this.ribbonPanelVorschau.Items.Add(this.RibbonButtonVorschauRechts); - this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauSepparat); - this.ribbonPanelVorschau.Name = "ribbonPanelVorschau"; - this.ribbonPanelVorschau.Text = "Vorschau ein-/ausblenden"; - // - // ribbonPanelAttribute - // - this.ribbonPanelAttribute.ButtonMoreVisible = false; - this.ribbonPanelAttribute.Items.Add(this.RibbonButtonAttributeEinAusblenden); - this.ribbonPanelAttribute.Name = "ribbonPanelAttribute"; - this.ribbonPanelAttribute.Text = "Attribute"; - // - // ribbonPanel1 - // - this.ribbonPanel1.ButtonMoreVisible = false; - this.ribbonPanel1.Items.Add(this.ribbonButton6); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Text = "Dokumentliste"; - // - // ribbonTabDokpaket_Serienbrief - // - this.ribbonTabDokpaket_Serienbrief.Name = "ribbonTabDokpaket_Serienbrief"; - this.ribbonTabDokpaket_Serienbrief.Panels.Add(this.RibbonPanelCreate); - this.ribbonTabDokpaket_Serienbrief.Text = "Dokumentpakete / Serienbrief"; - // - // RibbonPanelCreate - // - this.RibbonPanelCreate.ButtonMoreVisible = false; - this.RibbonPanelCreate.Items.Add(this.RibbonButtonCreateNewPaket); - this.RibbonPanelCreate.Items.Add(this.RibbonButtonEditPaket); - this.RibbonPanelCreate.Items.Add(this.RibbonButtonCreateNewSerienbrief); - this.RibbonPanelCreate.Items.Add(this.RibbonButtonEditSerienbrief); - this.RibbonPanelCreate.Name = "RibbonPanelCreate"; - this.RibbonPanelCreate.Text = "Serienbriefe / Dokumentpakete"; - // - // ribbonTabProfil - // - this.ribbonTabProfil.Name = "ribbonTabProfil"; - this.ribbonTabProfil.Panels.Add(this.RibbonPanelProfil); - this.ribbonTabProfil.Text = "Profil"; - // - // RibbonPanelProfil - // - this.RibbonPanelProfil.ButtonMoreVisible = false; - this.RibbonPanelProfil.Items.Add(this.ribbonItemGroup1); - this.RibbonPanelProfil.Items.Add(this.ribbonButton1); - this.RibbonPanelProfil.Name = "RibbonPanelProfil"; - this.RibbonPanelProfil.Text = "Profil"; - // - // ribbonItemGroup1 - // - this.ribbonItemGroup1.Items.Add(this.ribbonLabel1); - this.ribbonItemGroup1.Items.Add(this.RibbonCBProfil); - this.ribbonItemGroup1.Name = "ribbonItemGroup1"; - // - // ribbonLabel1 - // - this.ribbonLabel1.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonLabel1.Name = "ribbonLabel1"; - this.ribbonLabel1.Text = "Profil"; - // - // RibbonCBProfil - // - this.RibbonCBProfil.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.RibbonCBProfil.Name = "RibbonCBProfil"; - this.RibbonCBProfil.SelectedIndex = -1; - this.RibbonCBProfil.TextBoxText = ""; - this.RibbonCBProfil.DropDownItemClicked += new System.Windows.Forms.RibbonComboBox.RibbonItemEventHandler(this.RibbonCBProfil_DropDownItemClicked); - this.RibbonCBProfil.Click += new System.EventHandler(this.RibbonCBProfil_Click); - // - // RibbonTabNativVorlagen - // - this.RibbonTabNativVorlagen.Name = "RibbonTabNativVorlagen"; - this.RibbonTabNativVorlagen.Panels.Add(this.ribbonPanelNativVorlagen); - this.RibbonTabNativVorlagen.Text = "Nativ-Vorlagen"; - // - // ribbonPanelNativVorlagen - // - this.ribbonPanelNativVorlagen.ButtonMoreVisible = false; - this.ribbonPanelNativVorlagen.Items.Add(this.ribbonButtonNativVorlagen); - this.ribbonPanelNativVorlagen.Name = "ribbonPanelNativVorlagen"; - this.ribbonPanelNativVorlagen.Text = ""; - // - // RibbonTabAdmin - // - this.RibbonTabAdmin.Name = "RibbonTabAdmin"; - this.RibbonTabAdmin.Panels.Add(this.RibbonPanelDiverses); - this.RibbonTabAdmin.Panels.Add(this.ribbonAnmelden); - this.RibbonTabAdmin.Panels.Add(this.ribbonVorlagen); - this.RibbonTabAdmin.Panels.Add(this.ribbonBerechtigung); - this.RibbonTabAdmin.Panels.Add(this.ribbonpanelanalyse); - this.RibbonTabAdmin.Panels.Add(this.ribbonPanel3); - this.RibbonTabAdmin.Panels.Add(this.ribbonPanel4); - this.RibbonTabAdmin.Text = "Administration"; - // - // RibbonPanelDiverses - // - this.RibbonPanelDiverses.ButtonMoreVisible = false; - this.RibbonPanelDiverses.Items.Add(this.ribbonButtonBCK); - this.RibbonPanelDiverses.Items.Add(this.ribbonbtnqdf); - this.RibbonPanelDiverses.Name = "RibbonPanelDiverses"; - this.RibbonPanelDiverses.Text = "Diverse Funktionen"; - // - // ribbonAnmelden - // - this.ribbonAnmelden.ButtonMoreVisible = false; - this.ribbonAnmelden.Items.Add(this.ribbonbuttonlogin); - this.ribbonAnmelden.Name = "ribbonAnmelden"; - this.ribbonAnmelden.Text = ""; - // - // ribbonVorlagen - // - this.ribbonVorlagen.ButtonMoreVisible = false; - this.ribbonVorlagen.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left; - this.ribbonVorlagen.Items.Add(this.RibbonButtonDokumenttyp); - this.ribbonVorlagen.Items.Add(this.RibbonButtonVorlagen); - this.ribbonVorlagen.Items.Add(this.ribbonButtonVorlagenfeldregel); - this.ribbonVorlagen.Name = "ribbonVorlagen"; - this.ribbonVorlagen.Text = ""; - // - // ribbonBerechtigung - // - this.ribbonBerechtigung.ButtonMoreVisible = false; - this.ribbonBerechtigung.Items.Add(this.ribbonButton2); - this.ribbonBerechtigung.Items.Add(this.RibbonButtonBerechtigungsgruppe); - this.ribbonBerechtigung.Items.Add(this.ribbonButtonSysadmins); - this.ribbonBerechtigung.Name = "ribbonBerechtigung"; - this.ribbonBerechtigung.Text = "Berechtigungen"; - // - // ribbonpanelanalyse - // - this.ribbonpanelanalyse.ButtonMoreVisible = false; - this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedklog); - this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedkverarbeitung); - this.ribbonpanelanalyse.Name = "ribbonpanelanalyse"; - this.ribbonpanelanalyse.Text = "Analyse-Tools"; - // - // ribbonPanel3 - // - this.ribbonPanel3.ButtonMoreVisible = false; - this.ribbonPanel3.Items.Add(this.ribbonButton4); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Text = ""; - this.ribbonPanel3.Click += new System.EventHandler(this.ribbonPanel3_Click); - // - // ribbonPanel4 - // - this.ribbonPanel4.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left; - this.ribbonPanel4.Items.Add(this.ribbonButtonDokinBearbeitung); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Text = "Diverses"; - // - // timer1 - // - this.timer1.Interval = 600000; - this.timer1.Tick += new System.EventHandler(this.timer1_Tick); - // - // ctxMenuGroups - // - this.ctxMenuGroups.ImageScalingSize = new System.Drawing.Size(20, 20); - this.ctxMenuGroups.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.gruppenÖffnenToolStripMenuItem1, - this.gruppenSchliessenToolStripMenuItem1}); - this.ctxMenuGroups.Name = "ctxMenuGroups"; - this.ctxMenuGroups.Size = new System.Drawing.Size(206, 48); - // - // gruppenÖffnenToolStripMenuItem1 - // - this.gruppenÖffnenToolStripMenuItem1.Name = "gruppenÖffnenToolStripMenuItem1"; - this.gruppenÖffnenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22); - this.gruppenÖffnenToolStripMenuItem1.Text = "Alle Gruppen aufklappen"; - this.gruppenÖffnenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem1_Click); - // - // gruppenSchliessenToolStripMenuItem1 - // - this.gruppenSchliessenToolStripMenuItem1.Name = "gruppenSchliessenToolStripMenuItem1"; - this.gruppenSchliessenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22); - this.gruppenSchliessenToolStripMenuItem1.Text = "Alle Gruppen einklappen"; - this.gruppenSchliessenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem1_Click); - // - // ribbonGroupPerson - // - this.ribbonGroupPerson.Items.Add(this.ribbonButtonNewPersonDok); - this.ribbonGroupPerson.Items.Add(this.ribbonbuttonPersonlist); - this.ribbonGroupPerson.Items.Add(this.ribbonbuttonpersonpersonsymbol); - this.ribbonGroupPerson.Items.Add(this.ribbonLabelPerson); - this.ribbonGroupPerson.Items.Add(this.ribbonPersonSaldiert); - this.ribbonGroupPerson.Items.Add(this.ribbonFilterDeletePerson); - this.ribbonGroupPerson.Name = "ribbonGroupPerson"; - this.ribbonGroupPerson.Visible = false; - // - // ribbonLabelPerson - // - this.ribbonLabelPerson.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonLabelPerson.Name = "ribbonLabelPerson"; - // - // docPreview1 - // - this.docPreview1.BackColor = System.Drawing.SystemColors.Control; - this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; - this.docPreview1.Location = new System.Drawing.Point(0, 0); - this.docPreview1.Name = "docPreview1"; - this.docPreview1.Size = new System.Drawing.Size(1709, 347); - this.docPreview1.TabIndex = 0; - this.docPreview1.ZoomPercentage = 0; - // - // dokwerte1 - // - this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right; - this.dokwerte1.Location = new System.Drawing.Point(1709, 153); - this.dokwerte1.Name = "dokwerte1"; - this.dokwerte1.Size = new System.Drawing.Size(0, 694); - this.dokwerte1.TabIndex = 7; - // - // dokumentAnzeigenToolStripMenuItem - // - this.dokumentAnzeigenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.ShowDoc_16x16_32; - this.dokumentAnzeigenToolStripMenuItem.Name = "dokumentAnzeigenToolStripMenuItem"; - this.dokumentAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); - this.dokumentAnzeigenToolStripMenuItem.Text = "Dokument anzeigen"; - this.dokumentAnzeigenToolStripMenuItem.Click += new System.EventHandler(this.dokumentAnzeigenToolStripMenuItem_Click); - // - // dokumentBearbeitenToolStripMenuItem - // - this.dokumentBearbeitenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.EditDoc_16x16_32; - this.dokumentBearbeitenToolStripMenuItem.Name = "dokumentBearbeitenToolStripMenuItem"; - this.dokumentBearbeitenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); - this.dokumentBearbeitenToolStripMenuItem.Text = "Dokument bearbeiten"; - this.dokumentBearbeitenToolStripMenuItem.Click += new System.EventHandler(this.dokumentBearbeitenToolStripMenuItem_Click); - // - // dokumentLöschenToolStripMenuItem - // - this.dokumentLöschenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.DeleteDoc_16x16_32; - this.dokumentLöschenToolStripMenuItem.Name = "dokumentLöschenToolStripMenuItem"; - this.dokumentLöschenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); - this.dokumentLöschenToolStripMenuItem.Text = "Dokument löschen"; - this.dokumentLöschenToolStripMenuItem.Click += new System.EventHandler(this.dokumentLöschenToolStripMenuItem_Click); - // - // zurUnterschriftenPrüfungToolStripMenuItem - // - this.zurUnterschriftenPrüfungToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Approval_16x16_32; - this.zurUnterschriftenPrüfungToolStripMenuItem.Name = "zurUnterschriftenPrüfungToolStripMenuItem"; - this.zurUnterschriftenPrüfungToolStripMenuItem.Size = new System.Drawing.Size(283, 26); - this.zurUnterschriftenPrüfungToolStripMenuItem.Text = "Zur Unterschriften-Prüfung"; - this.zurUnterschriftenPrüfungToolStripMenuItem.Click += new System.EventHandler(this.zurUnterschriftenPrüfungToolStripMenuItem_Click); - // - // archivierenToolStripMenuItem - // - this.archivierenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("archivierenToolStripMenuItem.Image"))); - this.archivierenToolStripMenuItem.Name = "archivierenToolStripMenuItem"; - this.archivierenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); - this.archivierenToolStripMenuItem.Text = "Archivieren"; - this.archivierenToolStripMenuItem.Click += new System.EventHandler(this.archivierenToolStripMenuItem_Click); - // - // druckenToolStripMenuItem - // - this.druckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Printer_16x16_32; - this.druckenToolStripMenuItem.Name = "druckenToolStripMenuItem"; - this.druckenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); - this.druckenToolStripMenuItem.Text = "Drucken"; - this.druckenToolStripMenuItem.Visible = false; - this.druckenToolStripMenuItem.Click += new System.EventHandler(this.druckenToolStripMenuItem_Click); - // - // dokumentFürPartnerErstellenToolStripMenuItem - // - this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32; - this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem"; - this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); - this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Kunde erstellen"; - this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click); - // - // dokumentKopierenToolStripMenuItem - // - this.dokumentKopierenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Copy_16x16_32; - this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem"; - this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); - this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren"; - this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click); - // - // attributeAnzeigenVersteckenToolStripMenuItem - // - this.attributeAnzeigenVersteckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Attribut_16x16_32; - this.attributeAnzeigenVersteckenToolStripMenuItem.Name = "attributeAnzeigenVersteckenToolStripMenuItem"; - this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(283, 26); - this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute ein- / ausblenden"; - this.attributeAnzeigenVersteckenToolStripMenuItem.Click += new System.EventHandler(this.attributeAnzeigenVersteckenToolStripMenuItem_Click); - // - // tsbtnpreviewno - // - this.tsbtnpreviewno.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbtnpreviewno.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewno.Image"))); - this.tsbtnpreviewno.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbtnpreviewno.Name = "tsbtnpreviewno"; - this.tsbtnpreviewno.Size = new System.Drawing.Size(24, 22); - this.tsbtnpreviewno.Text = "Keine Vorschau"; - // - // tsbtnpreviewbottom - // - this.tsbtnpreviewbottom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbtnpreviewbottom.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewbottom.Image"))); - this.tsbtnpreviewbottom.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbtnpreviewbottom.Name = "tsbtnpreviewbottom"; - this.tsbtnpreviewbottom.Size = new System.Drawing.Size(24, 22); - this.tsbtnpreviewbottom.Text = "Vorschau unten"; - // - // tsbtnpreviewright - // - this.tsbtnpreviewright.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbtnpreviewright.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnpreviewright.Image"))); - this.tsbtnpreviewright.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbtnpreviewright.Name = "tsbtnpreviewright"; - this.tsbtnpreviewright.Size = new System.Drawing.Size(24, 22); - this.tsbtnpreviewright.Text = "Vorschau rechts"; - // - // RibbonButtonNewDoc + // RibbonButtonNewDoc // this.RibbonButtonNewDoc.Image = global::OnDoc.Properties.Resources.NewDoc_32x32_32; this.RibbonButtonNewDoc.LargeImage = global::OnDoc.Properties.Resources.NewDoc_32x32_32; @@ -988,6 +636,14 @@ namespace OnDoc.UICintrols this.RibbonButtonFavoriten.Text = "Favorit"; this.RibbonButtonFavoriten.Click += new System.EventHandler(this.RibbonButtonFavoriten_Click); // + // RibbonPanelExit + // + this.RibbonPanelExit.ButtonMoreVisible = false; + this.RibbonPanelExit.Items.Add(this.RibbonButtonExit); + this.RibbonPanelExit.Name = "RibbonPanelExit"; + this.RibbonPanelExit.Text = "Beenden"; + this.RibbonPanelExit.Visible = false; + // // RibbonButtonExit // this.RibbonButtonExit.Image = global::OnDoc.Properties.Resources.CloseApplication_32x32_32; @@ -998,6 +654,15 @@ namespace OnDoc.UICintrols this.RibbonButtonExit.TextAlignment = System.Windows.Forms.RibbonItem.RibbonItemTextAlignment.Center; this.RibbonButtonExit.Click += new System.EventHandler(this.RibbonButtonExit_Click); // + // RibbonPanelBearbeiten + // + this.RibbonPanelBearbeiten.ButtonMoreVisible = false; + this.RibbonPanelBearbeiten.Items.Add(this.ribbibButtonShowDoc); + this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonEditEditDoc); + this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonEditDelete); + this.RibbonPanelBearbeiten.Name = "RibbonPanelBearbeiten"; + this.RibbonPanelBearbeiten.Text = "Dokument"; + // // ribbibButtonShowDoc // this.ribbibButtonShowDoc.Image = global::OnDoc.Properties.Resources.ShowDoc_32x32_32; @@ -1025,6 +690,14 @@ namespace OnDoc.UICintrols this.RibbonButtonEditDelete.Text = "Löschen"; this.RibbonButtonEditDelete.Click += new System.EventHandler(this.RibbonButtonEditDelete_Click); // + // ribbonPanelZuweisung + // + this.ribbonPanelZuweisung.ButtonMoreVisible = false; + this.ribbonPanelZuweisung.Items.Add(this.RibbonButtonZuweisen); + this.ribbonPanelZuweisung.Items.Add(this.ribbonButtonToApproval); + this.ribbonPanelZuweisung.Name = "ribbonPanelZuweisung"; + this.ribbonPanelZuweisung.Text = "Zuweisen"; + // // RibbonButtonZuweisen // this.RibbonButtonZuweisen.Image = global::OnDoc.Properties.Resources.Zuweisen_32x32_32; @@ -1043,6 +716,14 @@ namespace OnDoc.UICintrols this.ribbonButtonToApproval.Text = "zur Unterschriften-Prüfung"; this.ribbonButtonToApproval.Click += new System.EventHandler(this.ribbonButtonToApproval_Click); // + // RibbonPannelAproval + // + this.RibbonPannelAproval.ButtonMoreVisible = false; + this.RibbonPannelAproval.Items.Add(this.ribbonButtonApproval); + this.RibbonPannelAproval.Items.Add(this.ribbonItemGroupApproveCounter); + this.RibbonPannelAproval.Name = "RibbonPannelAproval"; + this.RibbonPannelAproval.Text = "Unterschriftenprüfung"; + // // ribbonButtonApproval // this.ribbonButtonApproval.Image = global::OnDoc.Properties.Resources.Approval_32x32_32; @@ -1052,6 +733,12 @@ namespace OnDoc.UICintrols this.ribbonButtonApproval.Text = "Offene Prüfungen"; this.ribbonButtonApproval.Click += new System.EventHandler(this.ribbonButtonApproval_Click_1); // + // ribbonItemGroupApproveCounter + // + this.ribbonItemGroupApproveCounter.Items.Add(this.ribbonButtonRefresh_Bewilligungen); + this.ribbonItemGroupApproveCounter.Items.Add(this.ribbonLabelToApprove); + this.ribbonItemGroupApproveCounter.Name = "ribbonItemGroupApproveCounter"; + // // ribbonButtonRefresh_Bewilligungen // this.ribbonButtonRefresh_Bewilligungen.Image = global::OnDoc.Properties.Resources.Refresh_16x16_32; @@ -1061,6 +748,20 @@ namespace OnDoc.UICintrols this.ribbonButtonRefresh_Bewilligungen.SmallImage = global::OnDoc.Properties.Resources.Refresh_16x16_32; this.ribbonButtonRefresh_Bewilligungen.Click += new System.EventHandler(this.ribbonButtonRefresh_Bewilligungen_Click); // + // ribbonLabelToApprove + // + this.ribbonLabelToApprove.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonLabelToApprove.Name = "ribbonLabelToApprove"; + // + // RibbonPanelArchiv + // + this.RibbonPanelArchiv.ButtonMoreVisible = false; + this.RibbonPanelArchiv.Items.Add(this.RibbonButtonArchivToOnBase); + this.RibbonPanelArchiv.Items.Add(this.ribbonButtonVersandstrasse); + this.RibbonPanelArchiv.Items.Add(this.ribbonbuttonpostausgang); + this.RibbonPanelArchiv.Name = "RibbonPanelArchiv"; + this.RibbonPanelArchiv.Text = "Archiv"; + // // RibbonButtonArchivToOnBase // this.RibbonButtonArchivToOnBase.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonArchivToOnBase.Image"))); @@ -1072,13 +773,29 @@ namespace OnDoc.UICintrols // // ribbonButtonVersandstrasse // - this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Versandstrasse_32x32_32; - this.ribbonButtonVersandstrasse.LargeImage = global::OnDoc.Properties.Resources.Versandstrasse_32x32_32; + this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Envelope_32x32_32; + this.ribbonButtonVersandstrasse.LargeImage = global::OnDoc.Properties.Resources.Envelope_32x32_32; this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse"; - this.ribbonButtonVersandstrasse.SmallImage = global::OnDoc.Properties.Resources.Versandstrasse_24x24_32; + this.ribbonButtonVersandstrasse.SmallImage = global::OnDoc.Properties.Resources.Envelope_24x24_32; this.ribbonButtonVersandstrasse.Text = "Versandstrasse"; this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.ribbonButtonVersandstrasse_Click); // + // ribbonbuttonpostausgang + // + this.ribbonbuttonpostausgang.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonpostausgang.Image"))); + this.ribbonbuttonpostausgang.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonpostausgang.LargeImage"))); + this.ribbonbuttonpostausgang.Name = "ribbonbuttonpostausgang"; + this.ribbonbuttonpostausgang.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonpostausgang.SmallImage"))); + this.ribbonbuttonpostausgang.Text = "Postausgang"; + this.ribbonbuttonpostausgang.Click += new System.EventHandler(this.ribbonbuttonpostausgang_Click); + // + // RibbonPanelDemo + // + this.RibbonPanelDemo.Items.Add(this.RibbonButtonTest1); + this.RibbonPanelDemo.Name = "RibbonPanelDemo"; + this.RibbonPanelDemo.Text = "Test-Funktionen"; + this.RibbonPanelDemo.Visible = false; + // // RibbonButtonTest1 // this.RibbonButtonTest1.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonTest1.Image"))); @@ -1088,6 +805,23 @@ namespace OnDoc.UICintrols this.RibbonButtonTest1.Text = "Test 1"; this.RibbonButtonTest1.Click += new System.EventHandler(this.RibbonButtonTest1_Click); // + // RibbonPanelSuche + // + this.RibbonPanelSuche.ButtonMoreVisible = false; + this.RibbonPanelSuche.Items.Add(this.ribbonGroupMitarbeiter); + this.RibbonPanelSuche.Items.Add(this.RibbonGroupFilter); + this.RibbonPanelSuche.Items.Add(this.ribbonGroupPerson); + this.RibbonPanelSuche.Name = "RibbonPanelSuche"; + this.RibbonPanelSuche.Text = "Dokumente suchen/Filter"; + // + // ribbonGroupMitarbeiter + // + this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButtonGetMA); + this.ribbonGroupMitarbeiter.Items.Add(this.ribbonDokumntID); + this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButton3); + this.ribbonGroupMitarbeiter.Name = "ribbonGroupMitarbeiter"; + this.ribbonGroupMitarbeiter.Text = ""; + // // ribbonButtonGetMA // this.ribbonButtonGetMA.Image = global::OnDoc.Properties.Resources.Pprofil_24x24_32; @@ -1121,6 +855,18 @@ namespace OnDoc.UICintrols this.ribbonButton3.Text = "Kunde"; this.ribbonButton3.Click += new System.EventHandler(this.ribbonButton3_Click_1); // + // RibbonGroupFilter + // + this.RibbonGroupFilter.Items.Add(this.ribbonbuttonnewparterdoc); + this.RibbonGroupFilter.Items.Add(this.ribbonbuttonPartnerlist); + this.RibbonGroupFilter.Items.Add(this.ribbonbuttonbpsymbol); + this.RibbonGroupFilter.Items.Add(this.ribbonbuttonpersonsymbol); + this.RibbonGroupFilter.Items.Add(this.RibbonFilterLabel); + this.RibbonGroupFilter.Items.Add(this.RibbonPartnerSaldiert); + this.RibbonGroupFilter.Items.Add(this.RibbonFilterDelete); + this.RibbonGroupFilter.Name = "RibbonGroupFilter"; + this.RibbonGroupFilter.Text = ""; + // // ribbonbuttonnewparterdoc // this.ribbonbuttonnewparterdoc.Image = global::OnDoc.Properties.Resources.NewDoc_24x24_32; @@ -1165,6 +911,13 @@ namespace OnDoc.UICintrols this.ribbonbuttonpersonsymbol.ToolTip = "Kundentyp Person"; this.ribbonbuttonpersonsymbol.Visible = false; // + // RibbonFilterLabel + // + this.RibbonFilterLabel.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.RibbonFilterLabel.Name = "RibbonFilterLabel"; + this.RibbonFilterLabel.Text = ""; + this.RibbonFilterLabel.ToolTip = "Gewählter Filter"; + // // RibbonPartnerSaldiert // this.RibbonPartnerSaldiert.Image = global::OnDoc.Properties.Resources.Partner_Saldiert_24x24_32; @@ -1187,6 +940,17 @@ namespace OnDoc.UICintrols this.RibbonFilterDelete.Visible = false; this.RibbonFilterDelete.Click += new System.EventHandler(this.RibbonFilterDelete_Click); // + // ribbonGroupPerson + // + this.ribbonGroupPerson.Items.Add(this.ribbonButtonNewPersonDok); + this.ribbonGroupPerson.Items.Add(this.ribbonbuttonPersonlist); + this.ribbonGroupPerson.Items.Add(this.ribbonbuttonpersonpersonsymbol); + this.ribbonGroupPerson.Items.Add(this.ribbonLabelPerson); + this.ribbonGroupPerson.Items.Add(this.ribbonPersonSaldiert); + this.ribbonGroupPerson.Items.Add(this.ribbonFilterDeletePerson); + this.ribbonGroupPerson.Name = "ribbonGroupPerson"; + this.ribbonGroupPerson.Visible = false; + // // ribbonButtonNewPersonDok // this.ribbonButtonNewPersonDok.Image = global::OnDoc.Properties.Resources.NewDoc_32x32_32; @@ -1217,6 +981,11 @@ namespace OnDoc.UICintrols this.ribbonbuttonpersonpersonsymbol.SmallImage = global::OnDoc.Properties.Resources.Person_Black_16x16_32; this.ribbonbuttonpersonpersonsymbol.ToolTip = "Kundentyp Person"; // + // ribbonLabelPerson + // + this.ribbonLabelPerson.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonLabelPerson.Name = "ribbonLabelPerson"; + // // ribbonPersonSaldiert // this.ribbonPersonSaldiert.Image = ((System.Drawing.Image)(resources.GetObject("ribbonPersonSaldiert.Image"))); @@ -1233,6 +1002,13 @@ namespace OnDoc.UICintrols this.ribbonFilterDeletePerson.Name = "ribbonFilterDeletePerson"; this.ribbonFilterDeletePerson.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonFilterDeletePerson.SmallImage"))); // + // ribbonPannelDiverseVorlagen + // + this.ribbonPannelDiverseVorlagen.Items.Add(this.ribbonButtonNativ); + this.ribbonPannelDiverseVorlagen.Name = "ribbonPannelDiverseVorlagen"; + this.ribbonPannelDiverseVorlagen.Text = "Nativ"; + this.ribbonPannelDiverseVorlagen.Visible = false; + // // ribbonButtonNativ // this.ribbonButtonNativ.Image = global::OnDoc.Properties.Resources.Native_32x32_32; @@ -1241,6 +1017,13 @@ namespace OnDoc.UICintrols this.ribbonButtonNativ.SmallImage = global::OnDoc.Properties.Resources.Native_24x24_32; this.ribbonButtonNativ.Click += new System.EventHandler(this.ribbonButtonNativ_Click); // + // RibbonPanelDoklist + // + this.RibbonPanelDoklist.ButtonMoreVisible = false; + this.RibbonPanelDoklist.Items.Add(this.RibbonButtonRefresh); + this.RibbonPanelDoklist.Name = "RibbonPanelDoklist"; + this.RibbonPanelDoklist.Text = "Dokumentliste"; + // // RibbonButtonRefresh // this.RibbonButtonRefresh.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32; @@ -1250,6 +1033,53 @@ namespace OnDoc.UICintrols this.RibbonButtonRefresh.Text = "Aktualisieren"; this.RibbonButtonRefresh.Click += new System.EventHandler(this.RibbonButtonRefresh_Click); // + // ribbonTabAnsicht + // + this.ribbonTabAnsicht.Name = "ribbonTabAnsicht"; + this.ribbonTabAnsicht.Panels.Add(this.RibbonPannelAnsicht); + this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelVorschau); + this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelAttribute); + this.ribbonTabAnsicht.Panels.Add(this.ribbonPanel1); + this.ribbonTabAnsicht.Text = "Ansicht"; + // + // RibbonPannelAnsicht + // + this.RibbonPannelAnsicht.ButtonMoreVisible = false; + this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup2); + this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup3); + this.RibbonPannelAnsicht.Name = "RibbonPannelAnsicht"; + this.RibbonPannelAnsicht.Text = "Ansicht"; + // + // ribbonItemGroup2 + // + this.ribbonItemGroup2.Items.Add(this.ribboncomboboxansicht); + this.ribbonItemGroup2.Items.Add(this.ribbonCBAnsicht); + this.ribbonItemGroup2.Name = "ribbonItemGroup2"; + // + // ribboncomboboxansicht + // + this.ribboncomboboxansicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribboncomboboxansicht.Name = "ribboncomboboxansicht"; + this.ribboncomboboxansicht.Text = "Ansicht"; + // + // ribbonCBAnsicht + // + this.ribbonCBAnsicht.AllowTextEdit = false; + this.ribbonCBAnsicht.DrawIconsBar = false; + this.ribbonCBAnsicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonCBAnsicht.Name = "ribbonCBAnsicht"; + this.ribbonCBAnsicht.SelectedIndex = -1; + this.ribbonCBAnsicht.TextBoxText = ""; + this.ribbonCBAnsicht.DropDownItemClicked += new System.Windows.Forms.RibbonComboBox.RibbonItemEventHandler(this.ribbonCBAnsicht_DropDownItemClicked); + // + // ribbonItemGroup3 + // + this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewStandard); + this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewSave); + this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewDelete); + this.ribbonItemGroup3.Items.Add(this.ribbonSaveGridView); + this.ribbonItemGroup3.Name = "ribbonItemGroup3"; + // // RibbonButtonViewStandard // this.RibbonButtonViewStandard.Image = global::OnDoc.Properties.Resources.Default_24x24_32; @@ -1291,6 +1121,16 @@ namespace OnDoc.UICintrols this.ribbonSaveGridView.Visible = false; this.ribbonSaveGridView.Click += new System.EventHandler(this.ribbonButton4_Click_1); // + // ribbonPanelVorschau + // + this.ribbonPanelVorschau.ButtonMoreVisible = false; + this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauNo); + this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauUnten); + this.ribbonPanelVorschau.Items.Add(this.RibbonButtonVorschauRechts); + this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauSepparat); + this.ribbonPanelVorschau.Name = "ribbonPanelVorschau"; + this.ribbonPanelVorschau.Text = "Vorschau ein-/ausblenden"; + // // RibbonBtnVorschauNo // this.RibbonBtnVorschauNo.Image = global::OnDoc.Properties.Resources.Preview_Now_32x32_32; @@ -1330,6 +1170,13 @@ namespace OnDoc.UICintrols this.RibbonBtnVorschauSepparat.Text = "Eigenes Fenster"; this.RibbonBtnVorschauSepparat.Click += new System.EventHandler(this.RibbonBtnVorschauSepparat_Click); // + // ribbonPanelAttribute + // + this.ribbonPanelAttribute.ButtonMoreVisible = false; + this.ribbonPanelAttribute.Items.Add(this.RibbonButtonAttributeEinAusblenden); + this.ribbonPanelAttribute.Name = "ribbonPanelAttribute"; + this.ribbonPanelAttribute.Text = "Attribute"; + // // RibbonButtonAttributeEinAusblenden // this.RibbonButtonAttributeEinAusblenden.Image = global::OnDoc.Properties.Resources.Attribut_32x32_32; @@ -1339,6 +1186,13 @@ namespace OnDoc.UICintrols this.RibbonButtonAttributeEinAusblenden.Text = "Attribute ein-/ausblenden"; this.RibbonButtonAttributeEinAusblenden.Click += new System.EventHandler(this.RibbonButtonAttributeEinAusblenden_Click); // + // ribbonPanel1 + // + this.ribbonPanel1.ButtonMoreVisible = false; + this.ribbonPanel1.Items.Add(this.ribbonButton6); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Text = "Dokumentliste"; + // // ribbonButton6 // this.ribbonButton6.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32; @@ -1348,6 +1202,22 @@ namespace OnDoc.UICintrols this.ribbonButton6.Text = "Aktualisieren"; this.ribbonButton6.Click += new System.EventHandler(this.ribbonButton6_Click); // + // ribbonTabDokpaket_Serienbrief + // + this.ribbonTabDokpaket_Serienbrief.Name = "ribbonTabDokpaket_Serienbrief"; + this.ribbonTabDokpaket_Serienbrief.Panels.Add(this.RibbonPanelCreate); + this.ribbonTabDokpaket_Serienbrief.Text = "Dokumentpakete / Serienbrief"; + // + // RibbonPanelCreate + // + this.RibbonPanelCreate.ButtonMoreVisible = false; + this.RibbonPanelCreate.Items.Add(this.RibbonButtonCreateNewPaket); + this.RibbonPanelCreate.Items.Add(this.RibbonButtonEditPaket); + this.RibbonPanelCreate.Items.Add(this.RibbonButtonCreateNewSerienbrief); + this.RibbonPanelCreate.Items.Add(this.RibbonButtonEditSerienbrief); + this.RibbonPanelCreate.Name = "RibbonPanelCreate"; + this.RibbonPanelCreate.Text = "Serienbriefe / Dokumentpakete"; + // // RibbonButtonCreateNewPaket // this.RibbonButtonCreateNewPaket.Image = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32; @@ -1384,6 +1254,41 @@ namespace OnDoc.UICintrols this.RibbonButtonEditSerienbrief.Text = "Serienbrief bearbeiten"; this.RibbonButtonEditSerienbrief.Visible = false; // + // ribbonTabProfil + // + this.ribbonTabProfil.Name = "ribbonTabProfil"; + this.ribbonTabProfil.Panels.Add(this.RibbonPanelProfil); + this.ribbonTabProfil.Text = "Profil"; + // + // RibbonPanelProfil + // + this.RibbonPanelProfil.ButtonMoreVisible = false; + this.RibbonPanelProfil.Items.Add(this.ribbonItemGroup1); + this.RibbonPanelProfil.Items.Add(this.ribbonButton1); + this.RibbonPanelProfil.Name = "RibbonPanelProfil"; + this.RibbonPanelProfil.Text = "Profil"; + // + // ribbonItemGroup1 + // + this.ribbonItemGroup1.Items.Add(this.ribbonLabel1); + this.ribbonItemGroup1.Items.Add(this.RibbonCBProfil); + this.ribbonItemGroup1.Name = "ribbonItemGroup1"; + // + // ribbonLabel1 + // + this.ribbonLabel1.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonLabel1.Name = "ribbonLabel1"; + this.ribbonLabel1.Text = "Profil"; + // + // RibbonCBProfil + // + this.RibbonCBProfil.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.RibbonCBProfil.Name = "RibbonCBProfil"; + this.RibbonCBProfil.SelectedIndex = -1; + this.RibbonCBProfil.TextBoxText = ""; + this.RibbonCBProfil.DropDownItemClicked += new System.Windows.Forms.RibbonComboBox.RibbonItemEventHandler(this.RibbonCBProfil_DropDownItemClicked); + this.RibbonCBProfil.Click += new System.EventHandler(this.RibbonCBProfil_Click); + // // ribbonButton1 // this.ribbonButton1.Image = global::OnDoc.Properties.Resources.Pprofil_16x16_32; @@ -1393,6 +1298,19 @@ namespace OnDoc.UICintrols this.ribbonButton1.ToolTip = "Profil bearbeiten"; this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click); // + // RibbonTabNativVorlagen + // + this.RibbonTabNativVorlagen.Name = "RibbonTabNativVorlagen"; + this.RibbonTabNativVorlagen.Panels.Add(this.ribbonPanelNativVorlagen); + this.RibbonTabNativVorlagen.Text = "Nativ-Vorlagen"; + // + // ribbonPanelNativVorlagen + // + this.ribbonPanelNativVorlagen.ButtonMoreVisible = false; + this.ribbonPanelNativVorlagen.Items.Add(this.ribbonButtonNativVorlagen); + this.ribbonPanelNativVorlagen.Name = "ribbonPanelNativVorlagen"; + this.ribbonPanelNativVorlagen.Text = ""; + // // ribbonButtonNativVorlagen // this.ribbonButtonNativVorlagen.Image = global::OnDoc.Properties.Resources.Native_32x32_32; @@ -1402,6 +1320,26 @@ namespace OnDoc.UICintrols this.ribbonButtonNativVorlagen.Text = "Nativ-Vorlagen-Auswahl"; this.ribbonButtonNativVorlagen.Click += new System.EventHandler(this.ribbonButtonNativVorlagen_Click); // + // RibbonTabAdmin + // + this.RibbonTabAdmin.Name = "RibbonTabAdmin"; + this.RibbonTabAdmin.Panels.Add(this.RibbonPanelDiverses); + this.RibbonTabAdmin.Panels.Add(this.ribbonAnmelden); + this.RibbonTabAdmin.Panels.Add(this.ribbonVorlagen); + this.RibbonTabAdmin.Panels.Add(this.ribbonBerechtigung); + this.RibbonTabAdmin.Panels.Add(this.ribbonpanelanalyse); + this.RibbonTabAdmin.Panels.Add(this.ribbonPanel3); + this.RibbonTabAdmin.Panels.Add(this.ribbonPanel4); + this.RibbonTabAdmin.Text = "Administration"; + // + // RibbonPanelDiverses + // + this.RibbonPanelDiverses.ButtonMoreVisible = false; + this.RibbonPanelDiverses.Items.Add(this.ribbonButtonBCK); + this.RibbonPanelDiverses.Items.Add(this.ribbonbtnqdf); + this.RibbonPanelDiverses.Name = "RibbonPanelDiverses"; + this.RibbonPanelDiverses.Text = "Diverse Funktionen"; + // // ribbonButtonBCK // this.ribbonButtonBCK.Image = global::OnDoc.Properties.Resources.Barcode_32x32_32__2_; @@ -1420,6 +1358,13 @@ namespace OnDoc.UICintrols this.ribbonbtnqdf.Text = "Log"; this.ribbonbtnqdf.Click += new System.EventHandler(this.ribbonbtnqdf_Click); // + // ribbonAnmelden + // + this.ribbonAnmelden.ButtonMoreVisible = false; + this.ribbonAnmelden.Items.Add(this.ribbonbuttonlogin); + this.ribbonAnmelden.Name = "ribbonAnmelden"; + this.ribbonAnmelden.Text = ""; + // // ribbonbuttonlogin // this.ribbonbuttonlogin.Image = global::OnDoc.Properties.Resources.Login_32x32_32; @@ -1429,6 +1374,16 @@ namespace OnDoc.UICintrols this.ribbonbuttonlogin.Text = "Anmelden"; this.ribbonbuttonlogin.Click += new System.EventHandler(this.ribbonbuttonlogin_Click); // + // ribbonVorlagen + // + this.ribbonVorlagen.ButtonMoreVisible = false; + this.ribbonVorlagen.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left; + this.ribbonVorlagen.Items.Add(this.RibbonButtonDokumenttyp); + this.ribbonVorlagen.Items.Add(this.RibbonButtonVorlagen); + this.ribbonVorlagen.Items.Add(this.ribbonButtonVorlagenfeldregel); + this.ribbonVorlagen.Name = "ribbonVorlagen"; + this.ribbonVorlagen.Text = ""; + // // RibbonButtonDokumenttyp // this.RibbonButtonDokumenttyp.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonDokumenttyp.Image"))); @@ -1456,6 +1411,15 @@ namespace OnDoc.UICintrols this.ribbonButtonVorlagenfeldregel.Text = "Vorlagenfeldregel"; this.ribbonButtonVorlagenfeldregel.Click += new System.EventHandler(this.ribbonButtonVorlagenfeldregel_Click); // + // ribbonBerechtigung + // + this.ribbonBerechtigung.ButtonMoreVisible = false; + this.ribbonBerechtigung.Items.Add(this.ribbonButton2); + this.ribbonBerechtigung.Items.Add(this.RibbonButtonBerechtigungsgruppe); + this.ribbonBerechtigung.Items.Add(this.ribbonButtonSysadmins); + this.ribbonBerechtigung.Name = "ribbonBerechtigung"; + this.ribbonBerechtigung.Text = "Berechtigungen"; + // // ribbonButton2 // this.ribbonButton2.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButton2.Image"))); @@ -1483,6 +1447,14 @@ namespace OnDoc.UICintrols this.ribbonButtonSysadmins.Text = "Sys-Admins"; this.ribbonButtonSysadmins.Click += new System.EventHandler(this.ribbonButtonSysadmins_Click); // + // ribbonpanelanalyse + // + this.ribbonpanelanalyse.ButtonMoreVisible = false; + this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedklog); + this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedkverarbeitung); + this.ribbonpanelanalyse.Name = "ribbonpanelanalyse"; + this.ribbonpanelanalyse.Text = "Analyse-Tools"; + // // ribbonbuttonedklog // this.ribbonbuttonedklog.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonedklog.Image"))); @@ -1501,6 +1473,14 @@ namespace OnDoc.UICintrols this.ribbonbuttonedkverarbeitung.Text = "EDK OnDoc_EDOKA"; this.ribbonbuttonedkverarbeitung.Click += new System.EventHandler(this.ribbonbuttonedkverarbeitung_Click); // + // ribbonPanel3 + // + this.ribbonPanel3.ButtonMoreVisible = false; + this.ribbonPanel3.Items.Add(this.ribbonButton4); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Text = ""; + this.ribbonPanel3.Click += new System.EventHandler(this.ribbonPanel3_Click); + // // ribbonButton4 // this.ribbonButton4.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButton4.Image"))); @@ -1509,6 +1489,13 @@ namespace OnDoc.UICintrols this.ribbonButton4.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton4.SmallImage"))); this.ribbonButton4.Text = "Art der Dokumentgenerierung"; // + // ribbonPanel4 + // + this.ribbonPanel4.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left; + this.ribbonPanel4.Items.Add(this.ribbonButtonDokinBearbeitung); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Text = "Diverses"; + // // ribbonButtonDokinBearbeitung // this.ribbonButtonDokinBearbeitung.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonDokinBearbeitung.Image"))); @@ -1518,6 +1505,34 @@ namespace OnDoc.UICintrols this.ribbonButtonDokinBearbeitung.Text = "Dokumente in Bearbeitung"; this.ribbonButtonDokinBearbeitung.Click += new System.EventHandler(this.ribbonButtonDokinBearbeitung_Click); // + // timer1 + // + this.timer1.Interval = 600000; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // + // ctxMenuGroups + // + this.ctxMenuGroups.ImageScalingSize = new System.Drawing.Size(20, 20); + this.ctxMenuGroups.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.gruppenÖffnenToolStripMenuItem1, + this.gruppenSchliessenToolStripMenuItem1}); + this.ctxMenuGroups.Name = "ctxMenuGroups"; + this.ctxMenuGroups.Size = new System.Drawing.Size(206, 48); + // + // gruppenÖffnenToolStripMenuItem1 + // + this.gruppenÖffnenToolStripMenuItem1.Name = "gruppenÖffnenToolStripMenuItem1"; + this.gruppenÖffnenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22); + this.gruppenÖffnenToolStripMenuItem1.Text = "Alle Gruppen aufklappen"; + this.gruppenÖffnenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem1_Click); + // + // gruppenSchliessenToolStripMenuItem1 + // + this.gruppenSchliessenToolStripMenuItem1.Name = "gruppenSchliessenToolStripMenuItem1"; + this.gruppenSchliessenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22); + this.gruppenSchliessenToolStripMenuItem1.Text = "Alle Gruppen einklappen"; + this.gruppenSchliessenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem1_Click); + // // RibbonButtonCreateNewDoc // this.RibbonButtonCreateNewDoc.Image = global::OnDoc.Properties.Resources.NewDoc_32x32_32; @@ -1535,6 +1550,14 @@ namespace OnDoc.UICintrols this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage"))); this.ribbonButton5.Text = "Load"; // + // dokwerte1 + // + this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right; + this.dokwerte1.Location = new System.Drawing.Point(1709, 153); + this.dokwerte1.Name = "dokwerte1"; + this.dokwerte1.Size = new System.Drawing.Size(0, 694); + this.dokwerte1.TabIndex = 7; + // // DokList // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1711,5 +1734,7 @@ namespace OnDoc.UICintrols private System.Windows.Forms.RibbonButton ribbonbuttonbpsymbol; private System.Windows.Forms.RibbonButton ribbonbuttonpersonsymbol; private System.Windows.Forms.RibbonButton ribbonbuttonpersonpersonsymbol; + private System.Windows.Forms.RibbonButton ribbonbuttonpostausgang; + private System.Windows.Forms.ToolStripMenuItem zumVersandpaketHinzufügenToolStripMenuItem; } } diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index ceb363c3..88b84a15 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -55,6 +55,8 @@ using NLog.LayoutRenderers; using Syncfusion.Windows.Forms.PivotAnalysis; using System.Xml.Linq; using Syncfusion.Windows.Forms.Chart; +using Syncfusion.Grouping; +using Syncfusion.Olap.MDXQueryParser; @@ -92,6 +94,8 @@ namespace OnDoc.UICintrols public string Search_Docid { get; set; } = ""; private System.Data.DataTable Ansichten { get; set; } + OnDoc.Versandstrasse.Versandstrasse vs; + public DokList() { @@ -269,7 +273,7 @@ namespace OnDoc.UICintrols } catch { } } - + public void refresh_edk_partner(int partnernr) { this.personnr = 0; @@ -319,7 +323,7 @@ namespace OnDoc.UICintrols finally { db = null; } } - public void refresh_dokumente(string layout = "", bool person=false) + public void refresh_dokumente(string layout = "", bool person = false) { update_currentview(); @@ -417,6 +421,7 @@ namespace OnDoc.UICintrols if (bearbeitung_zwingend == "True") { RibbonButtonArchivToOnBase.Enabled = false; + ribbonButtonVersandstrasse.Enabled = false; archivierenToolStripMenuItem.Enabled = false; } else @@ -424,12 +429,14 @@ namespace OnDoc.UICintrols if (toApprove == "True" && approved == "False") { RibbonButtonArchivToOnBase.Enabled = false; + ribbonButtonVersandstrasse.Enabled = false; archivierenToolStripMenuItem.Enabled = false; } else { RibbonButtonArchivToOnBase.Enabled = true; + ribbonButtonVersandstrasse.Enabled = true; archivierenToolStripMenuItem.Enabled = true; } } @@ -478,6 +485,7 @@ namespace OnDoc.UICintrols if (dataRow["Bearbeitung_Zwingend"].ToString() == "1") { RibbonButtonArchivToOnBase.Enabled = false; + ribbonButtonVersandstrasse.Enabled = false; archivierenToolStripMenuItem.Enabled = false; } else @@ -485,12 +493,14 @@ namespace OnDoc.UICintrols if (dataRow["toapprove"].ToString() == "True" && dataRow["approved"].ToString() == "False") { RibbonButtonArchivToOnBase.Enabled = false; + ribbonButtonVersandstrasse.Enabled = false; archivierenToolStripMenuItem.Enabled = false; } else { RibbonButtonArchivToOnBase.Enabled = true; + ribbonButtonVersandstrasse.Enabled = true; archivierenToolStripMenuItem.Enabled = true; } } @@ -559,6 +569,26 @@ namespace OnDoc.UICintrols } catch { } } + + public int check_couvert(string dokumentid) + { + int res = 0; + DB db1 = new DB(AppParams.connectionstring); + try + { + db1.clear_parameter(); + db1.add_parameter("@dokumentid", dokumentid); + db1.Get_Tabledata("select dbo.check_versandcouvert('" + dokumentid + "')", false, true); + return Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]); + } + catch { return 0; } + finally + { + db1 = null; + } + return 0; + + } public void dokument_bearbeiten(string dokid, bool newdok = false) { if (dokid != "") { selected_dokumentid = dokid; } @@ -587,6 +617,15 @@ namespace OnDoc.UICintrols return; break; } + try + { + if (check_couvert(selected_dokumentid) > 0) + { + MessageBox.Show("Das Dokument ist bereits für die Versandstrasse couvertiert und kann nicht bearbeitet werden.", "Dokumentbearbeitung", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + } + } + catch { } db.Get_Tabledata("Select * from dokument_trefferliste where dokumentid='" + dokid + "'", false, true); if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Status_Bezeichnungnr"]) == -2) { @@ -1138,7 +1177,23 @@ namespace OnDoc.UICintrols public void dokument_loeschen(string dokumentid) { - + try + { + int res = check_couvert(dokumentid); + switch (res) + { + case 0: + break; + case 1: + MessageBox.Show("Das Dokument " + dokumentid + " ist in einem Couvert für die Versandstrasse und kann nicht gelöscht werden.", "Dokument archivieren", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + case 2: + MessageBox.Show("Das Dokument " + dokumentid + " wird z.Zt. für die Versandstrasse vorbereitet und kann nichtgelöscht werden.", "Dokument archivieren", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + break; + } + } + catch { } DB db = new DB(AppParams.connectionstring); db.Exec_SQL("Update dokument set aktiv=0, mutiertam=getdate(), mutierer=" + AppParams.CurrentMitarbeiter.ToString() + " where dokumentid='" + dokumentid + "'"); //db.Exec_SQL("Delete from dokument where dokumentid='" + dokumentid + "'"); @@ -1342,6 +1397,15 @@ namespace OnDoc.UICintrols { e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_Edit_24x24_32, e.Bounds.X + 20, e.Bounds.Y); } + try + { + if (dataRow["Couvertiert"].ToString() != "0") + { + e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_Couvertiert_24x24_32, e.Bounds.X + 20, e.Bounds.Y); + } + } + + catch { } // return; } @@ -1367,12 +1431,31 @@ namespace OnDoc.UICintrols { e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_Edit_24x24_32, e.Bounds.X + 20, e.Bounds.Y); } + try + { + if (dataRow["Couvertiert"].ToString() != "0") + { + e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_Couvertiert_24x24_32, e.Bounds.X + 20, e.Bounds.Y); + } + } + + catch { } } if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "P") { e.Graphics.DrawImage(OnDoc.Properties.Resources.PDF_24x24_32, e.Bounds.X + 20, e.Bounds.Y); + try + { + if (dataRow["Couvertiert"].ToString() != "0") + { + e.Graphics.DrawImage(OnDoc.Properties.Resources.PDF_Covertiert_24x24_32, e.Bounds.X + 20, e.Bounds.Y); + } + } + + catch { } } + //e.Graphics.DrawImage(Image.FromFile(@"../../US.jpg"), e.Bounds.X + 20, e.Bounds.Y); Pen borderPen = new Pen(Color.LightGray); e.Graphics.DrawLine(borderPen, e.Bounds.Right, e.Bounds.Top, e.Bounds.Right, e.Bounds.Bottom); @@ -1559,6 +1642,25 @@ namespace OnDoc.UICintrols var datarow = record as DataRowView; string documentid = datarow["dokumentid"].ToString(); db.Get_Tabledata("Select * from dokument_trefferliste where dokumentid='" + documentid + "'", false, true); + try + { + int res = check_couvert(documentid); + switch (res) + { + case 0: + break; + case 1: + MessageBox.Show("Das Dokument " + documentid + " ist in einem Couvert für die Versandstrasse und kann nicht manuell archiviert werden.", "Dokument archivieren", MessageBoxButtons.OK, MessageBoxIcon.Information); + db = null; + return; + case 2: + MessageBox.Show("Das Dokument " + documentid + " wird z.Zt. für die Versandstrasse vorbereitet und kann nicht manuell archiviert werden.", "Dokument archivieren", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + break; + } + + } + catch { } if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Status_Bezeichnungnr"]) == -2) { MessageBox.Show("Das Dokument " + documentid + " wurde zwischenzeitlich archiviert und kann nicht erneut archiviert werden.", "Dokument archivieren", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -1627,7 +1729,7 @@ namespace OnDoc.UICintrols } - private Boolean check_versandpaket_bp(ref List pakete,int partnernr) + private Boolean check_versandpaket_bp(ref List pakete, int partnernr) { foreach (Versandpaket vp in pakete) { @@ -1637,7 +1739,7 @@ namespace OnDoc.UICintrols } - private void reserve_vs_dokument(string dokumentid,int fnkt) + private void reserve_vs_dokument(string dokumentid, int fnkt) { DB db = new DB(AppParams.connectionstring); db.clear_parameter(); @@ -1649,50 +1751,197 @@ namespace OnDoc.UICintrols } private void ribbonButtonVersandstrasse_Click(object sender, EventArgs e) { - + if (AppParams.versandstrassewindows_open) + { + zumVersandpaketHinzufügenToolStripMenuItem_Click(sender, e); + return; + } + var records = sfDataGrid1.View.GetSelectedRecords(); + if (records.Count < 1) { return; } int i = 0; - List versandpakete = new List (); + List versandpakete = new List(); + + //var datarow2 = records[0] as DataRowView; + //System.Data.DataTable dt = new System.Data.DataTable(); + //foreach (System.Data.DataColumn dc in datarow2.DataView.Table.Columns) + //{ + // dt.Columns.Add(dc.ColumnName); + // if (dc.ColumnName=="[Partner-Nr]") { dc.DataType = typeof(Int32); } + //} + //int i1 = 0; + //foreach (var rec in records) + //{ + // var datarow3 = rec as DataRowView; + // dt.ImportRow(datarow3.DataView.Table.Rows[0]); + // i1=i1+1; + + //} + + //dt.DefaultView.Sort="[Partner-Nr]"; + + //foreach (System.Data.DataRow datarow in dt.Rows) + //{ + // if (check_couvert(datarow["dokumentid"].ToString()) > 0) + // { + // MessageBox.Show("Das Dokument " + datarow["dokumentid"].ToString() + " ist bereits couvertiert oder wird aktuell couvertiert und kann nicht erneut für die Versandstrasse verwendet werden", "Versandstrasse", MessageBoxButtons.OK, MessageBoxIcon.Error); + // if (records.Count == 1) { return; } + // } + // else + // { + // if (check_versandpaket_bp(ref versandpakete, Convert.ToInt32(datarow["partner-nr"]))) + // { + // foreach (Versandpaket versandpaket in versandpakete) + // { + // if (versandpaket.partnernr == Convert.ToInt32(datarow["partner-nr"])) + // { + // versandpaket.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString())); + // reserve_vs_dokument(datarow["dokumentid"].ToString(), 1); + // } + // } + // } + // else + // { + // Versandpaket vp = new Versandpaket(); + // vp.Dokument = new List(); + // vp.partnernr = Convert.ToInt32(datarow["partner-nr"]); + // vp.Versandoption = "B2_POST"; + // vp.Mitteilung = ""; + // vp.GAS = ""; + // vp.GASAdresse = ""; + // vp.PaketNr = Guid.NewGuid().ToString(); + // vp.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString())); + + // reserve_vs_dokument(datarow["dokumentid"].ToString(), 1); + // i++; + // versandpakete.Add(vp); + + // } + // } + //} + + + //BP-Dokumente foreach (var record in records) { var datarow = record as DataRowView; - - if (check_versandpaket_bp(ref versandpakete, Convert.ToInt32(datarow["partner-nr"]))) - { - foreach(Versandpaket versandpaket in versandpakete) + if (Convert.ToInt32(datarow["partner-nr"]) < 99999999) + { + + if (check_couvert(datarow["dokumentid"].ToString()) > 0) { - if (versandpaket.partnernr== Convert.ToInt32(datarow["partner-nr"])) + MessageBox.Show("Das Dokument " + datarow["dokumentid"].ToString() + " ist bereits couvertiert oder wird aktuell couvertiert und kann nicht erneut für die Versandstrasse verwendet werden", "Versandstrasse", MessageBoxButtons.OK, MessageBoxIcon.Error); + if (records.Count == 1) { return; } + } + else + { + + //BP-Pakete + bool docadded = false; + if (check_versandpaket_bp(ref versandpakete, Convert.ToInt32(datarow["partner-nr"]))) + { + foreach (Versandpaket versandpaket in versandpakete) + { + if (versandpaket.partnernr == Convert.ToInt32(datarow["partner-nr"])) + { + versandpaket.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString())); + docadded = true; + reserve_vs_dokument(datarow["dokumentid"].ToString(), 1); + } + } + } + else { - versandpaket.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString())); + Versandpaket vp = new Versandpaket(); + vp.Dokument = new List(); + vp.partnernr = Convert.ToInt32(datarow["partner-nr"]); + vp.Versandoption = "B2_POST"; + vp.Mitteilung = ""; + vp.GAS = ""; + vp.GASAdresse = ""; + vp.PaketNr = Guid.NewGuid().ToString(); + vp.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString())); + reserve_vs_dokument(datarow["dokumentid"].ToString(), 1); + i++; + versandpakete.Add(vp); + } } + } - else + } + //Personen-Dokumente + DB db = new DB(AppParams.connectionstring); + foreach (var record in records) + { + var datarow = record as DataRowView; + bool docadded = false; + if (Convert.ToInt32(datarow["partner-nr"]) > 99999999) { - Versandpaket vp = new Versandpaket(); - vp.Dokument = new List (); - vp.partnernr = Convert.ToInt32(datarow["partner-nr"]); - vp.Versandoption = "B2_POST"; - vp.Mitteilung = ""; - vp.GAS = ""; - vp.GASAdresse = ""; - vp.PaketNr = Guid.NewGuid().ToString(); - vp.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString())); - - reserve_vs_dokument(datarow["dokumentid"].ToString(), 1); - i++; - versandpakete.Add(vp); + if (check_couvert(datarow["dokumentid"].ToString()) > 0) + { + MessageBox.Show("Das Dokument " + datarow["dokumentid"].ToString() + " ist bereits couvertiert oder wird aktuell couvertiert und kann nicht erneut für die Versandstrasse verwendet werden", "Versandstrasse", MessageBoxButtons.OK, MessageBoxIcon.Error); + if (records.Count == 1) { return; } + } + else + { + foreach (Versandpaket vp in versandpakete) + { + string sql = " SELECT top 1 dbo.Partner.NRPAR00 FROM dbo.Partner INNER JOIN "; + sql = sql + " dbo.Partner_Rel ON dbo.Partner.NRPAR00 = dbo.Partner_Rel.Person_Nummer INNER JOIN dbo.Partner AS Partner_1 ON dbo.Partner_Rel.BP_Nr = Partner_1.NRPAR00 "; + sql = sql + " WHERE(dbo.Partner_Rel.Aktiv = 1) AND(Partner_1.NRPAR00 = " + vp.partnernr + ")"; + db.Get_Tabledata(sql, false, true); + if (db.dsdaten.Tables[0].Rows.Count > 0 && Convert.ToInt32(datarow["partner-nr"]) == Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0])) + { + vp.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString())); + reserve_vs_dokument(datarow["dokumentid"].ToString(), 1); + docadded = true; + break; + } + } + if (!docadded) + { + Versandpaket vp = new Versandpaket(); + vp.Dokument = new List(); + vp.partnernr = Convert.ToInt32(datarow["partner-nr"]); + vp.Versandoption = "B2_POST"; + vp.Mitteilung = ""; + vp.GAS = ""; + vp.GASAdresse = ""; + vp.PaketNr = Guid.NewGuid().ToString(); + vp.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString())); + reserve_vs_dokument(datarow["dokumentid"].ToString(), 1); + i++; + versandpakete.Add(vp); + } + } } } - OnDoc.Versandstrasse.Versandstrasse vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete); - vs.ShowDialog(); - dokumentAnVersandstrasseToolStripMenuItem.Visible = true; + db = null; + try + + { + vs.Show(); + AppParams.versandstrassewindows_open = true; + vs.BringToFront(); + this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = true; + } + catch + { + + vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete); + vs.Show(); + AppParams.versandstrassewindows_open = true; + this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = true; + } + + //dokumentAnVersandstrasseToolStripMenuItem.Visible = true; refresh_dokumente(); - + } private void RibbonButtonFavoriten_Click(object sender, EventArgs e) @@ -1917,10 +2166,11 @@ namespace OnDoc.UICintrols RibbonFilterDelete.Visible = true; ribbonbuttonnewparterdoc.Visible = true; if (ps.partnersaldiert) { RibbonPartnerSaldiert.Visible = true; ribbonPersonSaldiert.Visible = true; } else { RibbonPartnerSaldiert.Visible = false; ribbonPersonSaldiert.Visible = false; } - if (ps.partnernr < 100000000) { + if (ps.partnernr < 100000000) + { ribbonbuttonbpsymbol.Visible = true; ribbonbuttonpersonsymbol.Visible = false; - refresh_person(); + refresh_person(); } else { @@ -1997,7 +2247,7 @@ namespace OnDoc.UICintrols } - + //private void refresh_view(string base64string) private void refresh_view(System.Data.DataRow dataRow) { @@ -2037,13 +2287,13 @@ namespace OnDoc.UICintrols using (MemoryStream ms = new MemoryStream(bytes)) { - this.sfDataGrid1.Deserialize(ms); - + this.sfDataGrid1.Deserialize(ms); + } sfDataGrid1.ShowToolTip = true; sfDataGrid1.FilterRowPosition = RowPosition.Top; - + tsrbvorschau.SelectedIndex = Convert.ToInt32(dataRow["Preview"]); RibbonButtonAttributeEinAusblenden.Checked = Convert.ToInt32(dataRow["Attributes"]) == 1; @@ -2450,6 +2700,7 @@ namespace OnDoc.UICintrols RibbonButtonZuweisen.Enabled = false; ribbonButtonToApproval.Enabled = false; RibbonButtonArchivToOnBase.Enabled = false; + ribbonButtonVersandstrasse.Enabled = false; dokumentBearbeitenToolStripMenuItem.Enabled = false; dokumentLöschenToolStripMenuItem.Enabled = false; druckenToolStripMenuItem.Enabled = false; @@ -2470,6 +2721,7 @@ namespace OnDoc.UICintrols RibbonButtonZuweisen.Enabled = true; ribbonButtonToApproval.Enabled = true; RibbonButtonArchivToOnBase.Enabled = true; + ribbonButtonVersandstrasse.Enabled = true; dokumentBearbeitenToolStripMenuItem.Enabled = true; dokumentLöschenToolStripMenuItem.Enabled = true; archivierenToolStripMenuItem.Enabled = true; @@ -2520,6 +2772,7 @@ namespace OnDoc.UICintrols RibbonButtonZuweisen.Enabled = false; ribbonButtonToApproval.Enabled = false; RibbonButtonArchivToOnBase.Enabled = false; + ribbonButtonVersandstrasse.Enabled = false; dokumentBearbeitenToolStripMenuItem.Enabled = false; dokumentLöschenToolStripMenuItem.Enabled = false; archivierenToolStripMenuItem.Enabled = false; @@ -2536,6 +2789,7 @@ namespace OnDoc.UICintrols RibbonButtonZuweisen.Enabled = true; ribbonButtonToApproval.Enabled = true; RibbonButtonArchivToOnBase.Enabled = true; + ribbonButtonVersandstrasse.Enabled = true; dokumentBearbeitenToolStripMenuItem.Enabled = true; dokumentLöschenToolStripMenuItem.Enabled = true; archivierenToolStripMenuItem.Enabled = true; @@ -2590,12 +2844,14 @@ namespace OnDoc.UICintrols { RibbonButtonArchivToOnBase.Enabled = false; archivierenToolStripMenuItem.Enabled = false; + ribbonButtonVersandstrasse.Enabled = false; break; } if (datarow["ToApprove"].ToString() == "True" && datarow["approved"].ToString() == "False") { RibbonButtonArchivToOnBase.Enabled = false; archivierenToolStripMenuItem.Enabled = false; + ribbonButtonVersandstrasse.Enabled = false; break; } } @@ -2705,7 +2961,7 @@ namespace OnDoc.UICintrols private void ctxMenuDokList_Opening(object sender, CancelEventArgs e) { - + if (AppParams.versandstrassewindows_open) { this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = true; } else { this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = false; } if (this.sfDataGrid1.GroupColumnDescriptions.Count > 0) { @@ -2720,6 +2976,21 @@ namespace OnDoc.UICintrols toolStripMenuItem3.Visible = false; } + var records = sfDataGrid1.View.GetSelectedRecords(); + if (records.Count > 1) + { + dokumentFürPartnerErstellenToolStripMenuItem.Enabled = false; + dokumentKopierenToolStripMenuItem.Enabled = false; + zellenwertInZwischenablageKopierenToolStripMenuItem.Enabled = false; + historyToolStripMenuItem.Enabled = false; + } + else + { + dokumentFürPartnerErstellenToolStripMenuItem.Enabled = true; + dokumentKopierenToolStripMenuItem.Enabled = true; + zellenwertInZwischenablageKopierenToolStripMenuItem.Enabled = true; + historyToolStripMenuItem.Enabled = true; + } //var location = this.PointToClient(Cursor.Position); @@ -2815,7 +3086,7 @@ namespace OnDoc.UICintrols private void ribbonButtonNewPersonDok_Click(object sender, EventArgs e) { - createnewdoc(this.personnr,0); + createnewdoc(this.personnr, 0); } private void ribbonbuttonPartnerlist_Click(object sender, EventArgs e) @@ -2827,6 +3098,59 @@ namespace OnDoc.UICintrols { refresh_dokumente("", true); } + + private void ribbonbuttonpostausgang_Click(object sender, EventArgs e) + { + List versandpakete = new List(); + try + { + vs.Show(); + AppParams.versandstrassewindows_open = true; + vs.BringToFront(); + this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = true; + } + catch + { + vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete); + vs.Show(); + AppParams.versandstrassewindows_open = true; + this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = true; + } + refresh_dokumente(); + } + + private void zumVersandpaketHinzufügenToolStripMenuItem_Click(object sender, EventArgs e) + { + + + if (!row_selected()) return; + var records = sfDataGrid1.View.GetSelectedRecords(); + + foreach (var record in records) + { + var datarow = record as DataRowView; + string documentid = datarow["dokumentid"].ToString(); + if (check_couvert(documentid) > 0) + { + MessageBox.Show("Das Dokument " + datarow["dokumentid"].ToString() + " ist bereits couvertiert oder wird aktuell couvertiert und kann nicht erneut für die Versandstrasse verwendet werden", "Versandstrasse", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + vs.add_doc(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString())); + try + { + reserve_vs_dokument(datarow["dokumentid"].ToString(), 1); + vs.BringToFront(); + } + catch { } + } + + + } + + private void dokumentAnVersandstrasseToolStripMenuItem_Click(object sender, EventArgs e) + { + ribbonButtonVersandstrasse_Click(sender, e); + } } diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx index 295a528e..df6718bb 100644 --- a/Client/UIControls/DokList.resx +++ b/Client/UIControls/DokList.resx @@ -190,7 +190,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM @@ -205,7 +205,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM @@ -220,7 +220,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM @@ -315,6 +315,79 @@ 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 + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAABOtJREFUWEfV + lvtPU2cYx51Zsr9hP+0XTZZsWbIsmf6wRE2Wmcwf5mQOpnFxJqhxKuq8TJ3KxAoIgtwUYbNmgAois0OR + 27iUq0gFykWg9DKgpfTe00Pbc3n7Xc7BFtpyKTUs2ZN8kpNzzvM+n/Oc97zvWePz+RApKwmfz7d5TSQR + WsQPIQQ8IeB4HnqLHQqVFr2acVhdtHhtOak3EyA8HDSNcyV/Yt3hS1gbdwRvxSVgTWwC3tl1DBvOpOJO + rVyUW0wiYoGQJPCER9uEHH/0S/HBsSS8HXcU648k4vPL2dh0KRPvxp/F2tgEfJ8lRa1KBpNrGj5C5g/j + HysygaC2+wjqNFWIrdmO3dU7IFO0YkA3AY7jxKfleR4My6GuZwB1A3LkdElQqMiE0WkI60TEAvMS8Moy + iN3VMdhVE4MGXS0IWbjFwjmGY1CvrkTOcwnu9uRixkuH3rMyAY7ncLbtOGKrv0KlqgKEn51oi4VwjeNZ + yIbviZ1o0dUH3b9iAQ/rQYehDZ2GdrA8O3+gIEKD9joxah6Ezq6JXkBINNoc+PV+JdIqauByuwMFx6fN + OCktR0r5UzjpmTChxeQiFhAShcn37bXbyHtSj7NFj3Dy9zI09w+jrKULz14oEZdWiBN3SlHU1I7HHQrU + KPpgoyiUyrvQrx1H58gYKrt6wHBBnYtcQFhw3j90AXZ6hvSM6ciG08l478B5HC64h60XM7D+0EV8eOQy + 5ANDyHv6NzacSsbO1FzsyShEaUsnNp1Lx57MQpQ0tkcnQHgemy+k48XIGO43d2BH8k18kXgDTcpX9s/O + pGJPlhSyzpfYcj4NWxMzsT0lH9LaZvyYX4xPjidh4+lUXC19gpb+4SgFCEHHkArbkrLwdcpNdI9qkFDw + AC9VGnZ/7l1s+iUd267k4FHrc+xMy8eXSdn4WVqKmJRcPJB3YF+2FN+k3kKvWhedgM83u+ZTXi8ohhFX + Q0EqFP9kI6+lhWM3y8Ls8VgsHq+4bkQp4IOH5ZA9ZEJynxFq50xQwYVmuRDC3Lk2asZHTXqcGJgWc/yx + YgEhWWFy4apyGllDJhhpT5hEaPEKvR0fN03iU/kkNNTspxu9wOuN6C+dHZI+IzIHTdBapsCwXlwrt2Hf + DSP2ZujxQ4ZhSfaK6JflaIEV41OOjcGbESFgOA5VEzY81Fhwqugg4m9/B0mZC31qZ1hHFoKQ2XGWgvYw + iM+1YkRn3hz2PyAsSkInjI4p/FR0ANvTt4gCSrUTeU9pXLpHhVHf653fepGiRhdO3zHhYgkV4EKxAwNa + F2aWEph7EiJuv+NmLa4+pDGqZ9A26ERNt00cRK13iccNvXbQ7vC941aVC7J2M6Zt7gCSMie6RxxwewkS + fnMHBBKXQxBQaig8aptBYQ0FpY6BwcqhuJlFRScXKD5fIP+ZC3UKG7wMGyClnBIFaLcX+/0diCREAbUz + qNBi4RcorHYgPmsSCQXWAAfzpvBS5RQF4nMsqyuwFKsioJ1yYWySgkpgYmE8DLd6AjeraFyXuXH9sRvp + i2CwMtELdA9bQ2sGRdeIG21DbrQOBjNumi36xq/gxStLaM2gKG+lUNw4S1HDHErt3N/Vqgr4I7TYQvz/ + BCRlNLJkNpQ0uZaluFFg7nUsxN16Bw7lU5EL3G8wSCUl/0TMlQjIeKiTerzsutBa/3n8C/oDciF2Rt5Y + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAypJREFUSEut + lN1P01AYh73zzsQ/wwsvvDMxUf8ATbzwwhgVY+KFmiBGIRiQGFAGigFBw7fgYNKVCMgGG0MENkCGA8eE + OGAOphPZB2y0++hK159pDXMrAzv1TZ6kPafv+5yenrf7eJ5HJkiD5/nufXuFtIDAsseHSs0Qrjxvw4Xq + lygitJi0f0E8Ht8hyUjAcjFoHT04pajB/vM5OHSrBEfyynAgKxcHs3Ix5pgAzVApEtkCLs6heqYC5/Rn + 0DtnwKp/QxzjOA7hKIPJhUU0zzyF0lqbIpEtGHTpxeIDzr7EVkjx0D/QMP0EvXY14nw8M8GQy4CB5d2L + b+MKOGB2mxDbYuQLqEgEd5WvUUxoEGNZUTL4cR65LSTGPy+J91KEPNkC1YgZ7SPv8ahrgL9Y2YRrdSpc + qnqB7IYOVGvfopTUoqpHj5zGDqhGJnD7BYF+i02eQFhNh9EM5btxXtHZj2P55RiyzkcO3yxB08AoTj94 + iuzGVzhbXovsBhVOFFTgTrMabUPj8gXCKSkmelHRrQdp+oCFb6tciVqDOy0kuicsuE/04nGXDvdUXdBZ + rChs78bYvF2+QMDsoTC+tgkuzV4nY/BQ3KOl9SjNbmUmsPpDeGhbw6SH2lVgDYRx1OhG7pxXnJMl2E4W + ErSuIEptazA6P2NuxYm8lgAUah/KSH9aFKRPnE9Hfus66vs8N1IEQtdafTQKiJu4WncNdToa9m8MRj+F + U4gwidVjg9rC8GwII7ZwgiDNonOMwnONP2fHz04QbdB+6KeNaH4bg3khCsJIYWqRAWmioJ0KIcomegCf + liN4pgnCssSI1GhDsH8N4Y05lhBcTsesI6io14dgdcagnQqDYXm8s7GYXeHE4r8FYdT2BWBzhkVqNJui + oNO0+UuwW7TqXSfrdKGUYtIQxrxBFv2WEAwfGRHhen0zBtIU/HsBHdmC2xeG27sTOsKKz8oS1OroRNHk + WHCzUI8xUJsYEBKWvmcgED7ediS/wYwjgsqeQArzrmjKYfknQfLYbsgWSBOlJHd9MqTxDwKDefV4Ubs/ + WtS2tgc/okXK9BQqvVFi2HtdWve/x0/ErdtHFA7y0wAAAABJRU5ErkJggg== diff --git a/Client/UIControls/Serienbrief.Designer.cs b/Client/UIControls/Serienbrief.Designer.cs index 123bd9e3..61dcf25c 100644 --- a/Client/UIControls/Serienbrief.Designer.cs +++ b/Client/UIControls/Serienbrief.Designer.cs @@ -129,17 +129,17 @@ this.ribbonPanel9 = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonArchivierenUndAbschlessen = new System.Windows.Forms.RibbonButton(); this.ribbonButtonVersandstrasse = new System.Windows.Forms.RibbonButton(); + this.ribbonpaneladmin = new System.Windows.Forms.RibbonPanel(); + this.ribbonButtonAddmin = new System.Windows.Forms.RibbonButton(); this.ribbonTabPruefung = new System.Windows.Forms.RibbonTab(); this.ribbonPanel10 = new System.Windows.Forms.RibbonPanel(); this.ribbonbuttonGeprueft = new System.Windows.Forms.RibbonButton(); this.ribbonbuttonAbgelehnt = new System.Windows.Forms.RibbonButton(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.docPreview1 = new OnDoc.UIControls.DocPreview(); this.folderBrowser1 = new Syncfusion.Windows.Forms.FolderBrowser(this.components); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); - this.ribbonpaneladmin = new System.Windows.Forms.RibbonPanel(); - this.ribbonButtonAddmin = new System.Windows.Forms.RibbonButton(); - this.docPreview1 = new OnDoc.UIControls.DocPreview(); this.GrpDokumentInhalt.SuspendLayout(); this.grpFaktura.SuspendLayout(); this.pnlprogress.SuspendLayout(); @@ -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(73, 17); + this.rbbpb.Size = new System.Drawing.Size(84, 19); 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(73, 17); + this.rbppa.Size = new System.Drawing.Size(83, 19); 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(52, 17); + this.rbppohne.Size = new System.Drawing.Size(60, 19); 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, 13); + this.lblProgressTitel.Size = new System.Drawing.Size(0, 15); 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(25, 13); + this.label3.Size = new System.Drawing.Size(28, 15); 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(13, 13); + this.label2.Size = new System.Drawing.Size(14, 15); 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(224, 13); + this.label6.Size = new System.Drawing.Size(259, 15); 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(183, 13); + this.label5.Size = new System.Drawing.Size(205, 15); 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(150, 17); + this.cbformularohneunterschrfit.Size = new System.Drawing.Size(175, 19); 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(126, 17); + this.cbdigitaleunterschrfiten.Size = new System.Drawing.Size(147, 19); 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(93, 13); + this.lblUnterschriftrechts.Size = new System.Drawing.Size(105, 15); 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(85, 13); + this.lblUnterschriftlinks.Size = new System.Drawing.Size(97, 15); this.lblUnterschriftlinks.TabIndex = 6; this.lblUnterschriftlinks.Text = "Unterschrift links"; // @@ -559,7 +559,7 @@ this.rbzustaendigmitarbeiter.AutoSize = true; this.rbzustaendigmitarbeiter.Location = new System.Drawing.Point(22, 42); this.rbzustaendigmitarbeiter.Name = "rbzustaendigmitarbeiter"; - this.rbzustaendigmitarbeiter.Size = new System.Drawing.Size(72, 17); + this.rbzustaendigmitarbeiter.Size = new System.Drawing.Size(82, 19); this.rbzustaendigmitarbeiter.TabIndex = 1; this.rbzustaendigmitarbeiter.TabStop = true; this.rbzustaendigmitarbeiter.Text = "Zuständig"; @@ -570,7 +570,7 @@ 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.Size = new System.Drawing.Size(179, 19); this.rbzustaendigkube.TabIndex = 0; this.rbzustaendigkube.TabStop = true; this.rbzustaendigkube.Text = "Kundenberater des Kunden"; @@ -610,7 +610,7 @@ this.lblTermin.AutoSize = true; this.lblTermin.Location = new System.Drawing.Point(312, 114); this.lblTermin.Name = "lblTermin"; - this.lblTermin.Size = new System.Drawing.Size(39, 13); + this.lblTermin.Size = new System.Drawing.Size(46, 15); this.lblTermin.TabIndex = 4; this.lblTermin.Text = "Termin"; this.lblTermin.Visible = false; @@ -630,7 +630,7 @@ this.lblDokumentDatum.AutoSize = true; this.lblDokumentDatum.Location = new System.Drawing.Point(9, 114); this.lblDokumentDatum.Name = "lblDokumentDatum"; - this.lblDokumentDatum.Size = new System.Drawing.Size(90, 13); + this.lblDokumentDatum.Size = new System.Drawing.Size(105, 15); this.lblDokumentDatum.TabIndex = 2; this.lblDokumentDatum.Text = "Dokument-Datum"; // @@ -663,7 +663,7 @@ this.lblVerantwortlich.AutoSize = true; this.lblVerantwortlich.Location = new System.Drawing.Point(9, 59); this.lblVerantwortlich.Name = "lblVerantwortlich"; - this.lblVerantwortlich.Size = new System.Drawing.Size(74, 13); + this.lblVerantwortlich.Size = new System.Drawing.Size(84, 15); this.lblVerantwortlich.TabIndex = 10; this.lblVerantwortlich.Text = "Verantwortlich"; // @@ -672,7 +672,7 @@ this.lblPostzustellung.AutoSize = true; this.lblPostzustellung.Location = new System.Drawing.Point(9, 86); this.lblPostzustellung.Name = "lblPostzustellung"; - this.lblPostzustellung.Size = new System.Drawing.Size(75, 13); + this.lblPostzustellung.Size = new System.Drawing.Size(87, 15); this.lblPostzustellung.TabIndex = 0; this.lblPostzustellung.Text = "Postzustellung"; // @@ -681,7 +681,7 @@ this.lblBezeichnung.AutoSize = true; this.lblBezeichnung.Location = new System.Drawing.Point(9, 23); this.lblBezeichnung.Name = "lblBezeichnung"; - this.lblBezeichnung.Size = new System.Drawing.Size(69, 13); + this.lblBezeichnung.Size = new System.Drawing.Size(79, 15); this.lblBezeichnung.TabIndex = 8; this.lblBezeichnung.Text = "Bezeichnung"; // @@ -714,6 +714,7 @@ this.sfdatagridsbload.Dock = System.Windows.Forms.DockStyle.Top; this.sfdatagridsbload.Location = new System.Drawing.Point(0, 47); this.sfdatagridsbload.Name = "sfdatagridsbload"; + this.sfdatagridsbload.PreviewRowHeight = 35; this.sfdatagridsbload.ShowToolTip = true; this.sfdatagridsbload.Size = new System.Drawing.Size(953, 489); this.sfdatagridsbload.TabIndex = 3; @@ -760,7 +761,7 @@ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.Location = new System.Drawing.Point(385, 13); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(154, 20); + this.label1.Size = new System.Drawing.Size(183, 25); this.label1.TabIndex = 0; this.label1.Text = "Serienbrief öffnen"; // @@ -780,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(469, 20); + this.label4.Size = new System.Drawing.Size(561, 25); this.label4.TabIndex = 0; this.label4.Text = "Serienbrief wird initialisiert - bitte einen Moment warten...."; // @@ -806,6 +807,7 @@ this.sfDataGridEmpfaenger.Dock = System.Windows.Forms.DockStyle.Fill; this.sfDataGridEmpfaenger.Location = new System.Drawing.Point(233, 16); this.sfDataGridEmpfaenger.Name = "sfDataGridEmpfaenger"; + this.sfDataGridEmpfaenger.PreviewRowHeight = 35; this.sfDataGridEmpfaenger.SelectionMode = Syncfusion.WinForms.DataGrid.Enums.GridSelectionMode.Extended; this.sfDataGridEmpfaenger.Size = new System.Drawing.Size(666, 572); this.sfDataGridEmpfaenger.TabIndex = 4; @@ -815,39 +817,40 @@ // // ctxmenuEmpfaenger // + this.ctxmenuEmpfaenger.ImageScalingSize = new System.Drawing.Size(20, 20); this.ctxmenuEmpfaenger.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.partnerHinzufügenToolStripMenuItem, this.partnerLöschenToolStripMenuItem, this.erneutGenerierenToolStripMenuItem, this.vorschauToolStripMenuItem}); this.ctxmenuEmpfaenger.Name = "ctxmenuEmpfaenger"; - this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(211, 92); + this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(248, 100); // // partnerHinzufügenToolStripMenuItem // this.partnerHinzufügenToolStripMenuItem.Name = "partnerHinzufügenToolStripMenuItem"; - this.partnerHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.partnerHinzufügenToolStripMenuItem.Size = new System.Drawing.Size(247, 24); 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(210, 22); + this.partnerLöschenToolStripMenuItem.Size = new System.Drawing.Size(247, 24); 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(210, 22); + this.erneutGenerierenToolStripMenuItem.Size = new System.Drawing.Size(247, 24); 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(210, 22); + this.vorschauToolStripMenuItem.Size = new System.Drawing.Size(247, 24); this.vorschauToolStripMenuItem.Text = "Vorschau"; this.vorschauToolStripMenuItem.Click += new System.EventHandler(this.vorschauToolStripMenuItem_Click); // @@ -944,40 +947,41 @@ // // ctxmenutree // + this.ctxmenutree.ImageScalingSize = new System.Drawing.Size(20, 20); this.ctxmenutree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.partnerlistePrüfenToolStripMenuItem, this.dokumentgenerierungZurücksetzenToolStripMenuItem, this.druckstapelAufbereitenToolStripMenuItem, this.archivierenUndAbschliessenToolStripMenuItem}); this.ctxmenutree.Name = "ctxmenutree"; - this.ctxmenutree.Size = new System.Drawing.Size(266, 92); + this.ctxmenutree.Size = new System.Drawing.Size(316, 100); 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(265, 22); + this.partnerlistePrüfenToolStripMenuItem.Size = new System.Drawing.Size(315, 24); 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(265, 22); + this.dokumentgenerierungZurücksetzenToolStripMenuItem.Size = new System.Drawing.Size(315, 24); 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(265, 22); + this.druckstapelAufbereitenToolStripMenuItem.Size = new System.Drawing.Size(315, 24); 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(265, 22); + this.archivierenUndAbschliessenToolStripMenuItem.Size = new System.Drawing.Size(315, 24); this.archivierenUndAbschliessenToolStripMenuItem.Text = "Archivieren und abschliessen"; this.archivierenUndAbschliessenToolStripMenuItem.Click += new System.EventHandler(this.archivierenUndAbschliessenToolStripMenuItem_Click); // @@ -988,6 +992,7 @@ this.GridEmpfänger.EditMode = Syncfusion.WinForms.DataGrid.Enums.EditMode.SingleClick; this.GridEmpfänger.Location = new System.Drawing.Point(3, 16); this.GridEmpfänger.Name = "GridEmpfänger"; + this.GridEmpfänger.PreviewRowHeight = 35; this.GridEmpfänger.Size = new System.Drawing.Size(896, 572); this.GridEmpfänger.TabIndex = 2; this.GridEmpfänger.Text = "sfDataGrid1"; @@ -1270,13 +1275,29 @@ // ribbonButtonVersandstrasse // this.ribbonButtonVersandstrasse.Enabled = false; - this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Versandstrasse_32x32_32; - this.ribbonButtonVersandstrasse.LargeImage = global::OnDoc.Properties.Resources.Versandstrasse_32x32_32; + this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Envelope_32x32_32; + this.ribbonButtonVersandstrasse.LargeImage = global::OnDoc.Properties.Resources.Envelope_32x32_32; this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse"; - this.ribbonButtonVersandstrasse.SmallImage = global::OnDoc.Properties.Resources.ShowDoc_24x24_32; + this.ribbonButtonVersandstrasse.SmallImage = global::OnDoc.Properties.Resources.Envelope_24x24_32; this.ribbonButtonVersandstrasse.Text = "Versandstrasse"; this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.ribbonButtonVersandstrasse_Click); // + // ribbonpaneladmin + // + this.ribbonpaneladmin.Items.Add(this.ribbonButtonAddmin); + this.ribbonpaneladmin.Name = "ribbonpaneladmin"; + this.ribbonpaneladmin.Text = ""; + // + // ribbonButtonAddmin + // + this.ribbonButtonAddmin.CheckOnClick = true; + this.ribbonButtonAddmin.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.Image"))); + this.ribbonButtonAddmin.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.LargeImage"))); + this.ribbonButtonAddmin.Name = "ribbonButtonAddmin"; + this.ribbonButtonAddmin.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.SmallImage"))); + this.ribbonButtonAddmin.Text = "Grid erweitern"; + this.ribbonButtonAddmin.Click += new System.EventHandler(this.ribbonButton1_Click_1); + // // ribbonTabPruefung // this.ribbonTabPruefung.Name = "ribbonTabPruefung"; @@ -1330,22 +1351,6 @@ this.splitContainer1.SplitterDistance = 902; this.splitContainer1.TabIndex = 5; // - // ribbonpaneladmin - // - this.ribbonpaneladmin.Items.Add(this.ribbonButtonAddmin); - this.ribbonpaneladmin.Name = "ribbonpaneladmin"; - this.ribbonpaneladmin.Text = ""; - // - // ribbonButtonAddmin - // - this.ribbonButtonAddmin.CheckOnClick = true; - this.ribbonButtonAddmin.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.Image"))); - this.ribbonButtonAddmin.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.LargeImage"))); - this.ribbonButtonAddmin.Name = "ribbonButtonAddmin"; - this.ribbonButtonAddmin.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.SmallImage"))); - this.ribbonButtonAddmin.Text = "Grid erweitern"; - this.ribbonButtonAddmin.Click += new System.EventHandler(this.ribbonButton1_Click_1); - // // docPreview1 // this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; diff --git a/Client/UIControls/Serienbrief.resx b/Client/UIControls/Serienbrief.resx index 6c01962f..863e51f6 100644 --- a/Client/UIControls/Serienbrief.resx +++ b/Client/UIControls/Serienbrief.resx @@ -133,19 +133,19 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC + wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC + wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== + wQAADsEBuJFr7QAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== diff --git a/Client/Versandstrasse/Versandstrasse.Designer.cs b/Client/Versandstrasse/Versandstrasse.Designer.cs index afa318f1..362b3142 100644 --- a/Client/Versandstrasse/Versandstrasse.Designer.cs +++ b/Client/Versandstrasse/Versandstrasse.Designer.cs @@ -30,15 +30,15 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Versandstrasse)); - Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings5 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); - Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings5 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); - Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings5 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); - Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); - Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); - Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings6 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); - Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings6 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); - Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings6 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); + Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings1 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); + Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings1 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); + Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings1 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); + Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); + Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings2 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); + Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings2 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); + Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings2 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); + Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.imageList1 = new System.Windows.Forms.ImageList(this.components); @@ -102,7 +102,6 @@ this.versandCouvertLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.versandCouvertÖffnenbearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.imageList2 = new System.Windows.Forms.ImageList(this.components); - this.ribbonButton3 = new System.Windows.Forms.RibbonButton(); this.ribbon1 = new System.Windows.Forms.Ribbon(); this.ribbonTab1 = new System.Windows.Forms.RibbonTab(); this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); @@ -116,15 +115,19 @@ this.pnlcouvert = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel(); this.lblprieveiwbezeichnung = new System.Windows.Forms.Label(); + this.panel2 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.lblerror = new System.Windows.Forms.Label(); this.pnlpostkorb = new System.Windows.Forms.Panel(); this.lblpostausgang = new System.Windows.Forms.Label(); this.pnlprogress = new System.Windows.Forms.Panel(); + this.label1 = new System.Windows.Forms.Label(); this.progressBarAdv1 = new Syncfusion.Windows.Forms.Tools.ProgressBarAdv(); this.lblProgressTitel = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.label1 = new System.Windows.Forms.Label(); + this.ribbonButton3 = new System.Windows.Forms.RibbonButton(); this.contextMenuStrip1.SuspendLayout(); this.panelPrepare.SuspendLayout(); this.GrpPaketDetails.SuspendLayout(); @@ -140,6 +143,8 @@ this.contextMenuStrip2.SuspendLayout(); this.pnlcouvert.SuspendLayout(); this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.panel3.SuspendLayout(); this.pnlpostkorb.SuspendLayout(); this.pnlprogress.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).BeginInit(); @@ -214,31 +219,31 @@ this.pdfViewerControl1.IsBookmarkEnabled = true; this.pdfViewerControl1.IsTextSearchEnabled = true; this.pdfViewerControl1.IsTextSelectionEnabled = true; - this.pdfViewerControl1.Location = new System.Drawing.Point(879, 54); - messageBoxSettings5.EnableNotification = true; - this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings5; + this.pdfViewerControl1.Location = new System.Drawing.Point(848, 54); + messageBoxSettings1.EnableNotification = true; + this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings1; this.pdfViewerControl1.MinimumZoomPercentage = 50; this.pdfViewerControl1.Name = "pdfViewerControl1"; this.pdfViewerControl1.PageBorderThickness = 1; - pdfViewerPrinterSettings5.Copies = 1; - pdfViewerPrinterSettings5.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; - pdfViewerPrinterSettings5.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; - pdfViewerPrinterSettings5.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings5.PrintLocation"))); - pdfViewerPrinterSettings5.ShowPrintStatusDialog = true; - this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings5; + pdfViewerPrinterSettings1.Copies = 1; + pdfViewerPrinterSettings1.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; + pdfViewerPrinterSettings1.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; + pdfViewerPrinterSettings1.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings1.PrintLocation"))); + pdfViewerPrinterSettings1.ShowPrintStatusDialog = true; + this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings1; this.pdfViewerControl1.ReferencePath = null; this.pdfViewerControl1.ScrollDisplacementValue = 0; this.pdfViewerControl1.ShowHorizontalScrollBar = true; this.pdfViewerControl1.ShowToolBar = true; this.pdfViewerControl1.ShowVerticalScrollBar = true; - this.pdfViewerControl1.Size = new System.Drawing.Size(282, 614); + this.pdfViewerControl1.Size = new System.Drawing.Size(313, 614); this.pdfViewerControl1.SpaceBetweenPages = 8; this.pdfViewerControl1.TabIndex = 10; this.pdfViewerControl1.Text = "pdfViewerControl1"; - textSearchSettings5.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); - textSearchSettings5.HighlightAllInstance = true; - textSearchSettings5.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); - this.pdfViewerControl1.TextSearchSettings = textSearchSettings5; + textSearchSettings1.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); + textSearchSettings1.HighlightAllInstance = true; + textSearchSettings1.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); + this.pdfViewerControl1.TextSearchSettings = textSearchSettings1; this.pdfViewerControl1.ThemeName = "Default"; this.pdfViewerControl1.VerticalScrollOffset = 0; this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; @@ -253,7 +258,7 @@ this.GrpPaketDetails.Controls.Add(this.groupBox1); this.GrpPaketDetails.Controls.Add(this.button1); this.GrpPaketDetails.Dock = System.Windows.Forms.DockStyle.Left; - this.GrpPaketDetails.Location = new System.Drawing.Point(433, 0); + this.GrpPaketDetails.Location = new System.Drawing.Point(402, 0); this.GrpPaketDetails.Name = "GrpPaketDetails"; this.GrpPaketDetails.Size = new System.Drawing.Size(446, 668); this.GrpPaketDetails.TabIndex = 9; @@ -307,15 +312,15 @@ // treeViewAdvAdresse // this.treeViewAdvAdresse.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window); - treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.Black; + treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black; this.treeViewAdvAdresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)}); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); this.treeViewAdvAdresse.BeforeTouchSize = new System.Drawing.Size(259, 193); // // @@ -689,9 +694,9 @@ this.rbapost.AutoSize = true; this.rbapost.Location = new System.Drawing.Point(142, 21); this.rbapost.Name = "rbapost"; - this.rbapost.Size = new System.Drawing.Size(211, 17); + this.rbapost.Size = new System.Drawing.Size(56, 17); this.rbapost.TabIndex = 3; - this.rbapost.Text = "A-Post (Versand tagfertig bis 16:00 Uhr)"; + this.rbapost.Text = "A-Post"; this.rbapost.UseVisualStyleBackColor = true; this.rbapost.CheckedChanged += new System.EventHandler(this.rbapost_CheckedChanged); // @@ -733,21 +738,21 @@ this.treeViewAdv1.AllowDrop = true; this.treeViewAdv1.BackColor = System.Drawing.Color.White; this.treeViewAdv1.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))); - treeNodeAdvStyleInfo4.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo4.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo4.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo4.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - treeNodeAdvStyleInfo4.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo4.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo4.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); + treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo2.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo4)}); - this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(433, 668); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)}); + this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(402, 568); this.treeViewAdv1.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat; this.treeViewAdv1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdv1.ContextMenuStrip = this.contextMenuStrip1; - this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Left; + this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Fill; this.treeViewAdv1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.treeViewAdv1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); // @@ -774,7 +779,7 @@ this.treeViewAdv1.SelectedNodeBackground = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(197)))), ((int)(((byte)(197)))), ((int)(((byte)(197)))))); this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); this.treeViewAdv1.ShowFocusRect = false; - this.treeViewAdv1.Size = new System.Drawing.Size(433, 668); + this.treeViewAdv1.Size = new System.Drawing.Size(402, 568); this.treeViewAdv1.Style = Syncfusion.Windows.Forms.Tools.TreeStyle.Office2016Colorful; this.treeViewAdv1.TabIndex = 7; this.treeViewAdv1.Text = "treeViewAdv2"; @@ -816,17 +821,17 @@ this.pdfViewerControl2.IsTextSearchEnabled = true; this.pdfViewerControl2.IsTextSelectionEnabled = true; this.pdfViewerControl2.Location = new System.Drawing.Point(482, 0); - messageBoxSettings6.EnableNotification = true; - this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings6; + messageBoxSettings2.EnableNotification = true; + this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings2; this.pdfViewerControl2.MinimumZoomPercentage = 50; this.pdfViewerControl2.Name = "pdfViewerControl2"; this.pdfViewerControl2.PageBorderThickness = 1; - pdfViewerPrinterSettings6.Copies = 1; - pdfViewerPrinterSettings6.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; - pdfViewerPrinterSettings6.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; - pdfViewerPrinterSettings6.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings6.PrintLocation"))); - pdfViewerPrinterSettings6.ShowPrintStatusDialog = true; - this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings6; + pdfViewerPrinterSettings2.Copies = 1; + pdfViewerPrinterSettings2.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; + pdfViewerPrinterSettings2.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; + pdfViewerPrinterSettings2.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings2.PrintLocation"))); + pdfViewerPrinterSettings2.ShowPrintStatusDialog = true; + this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings2; this.pdfViewerControl2.ReferencePath = null; this.pdfViewerControl2.ScrollDisplacementValue = 0; this.pdfViewerControl2.ShowHorizontalScrollBar = true; @@ -836,10 +841,10 @@ this.pdfViewerControl2.SpaceBetweenPages = 8; this.pdfViewerControl2.TabIndex = 11; this.pdfViewerControl2.Text = "pdfViewerControl2"; - textSearchSettings6.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); - textSearchSettings6.HighlightAllInstance = true; - textSearchSettings6.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); - this.pdfViewerControl2.TextSearchSettings = textSearchSettings6; + textSearchSettings2.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); + textSearchSettings2.HighlightAllInstance = true; + textSearchSettings2.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); + this.pdfViewerControl2.TextSearchSettings = textSearchSettings2; this.pdfViewerControl2.ThemeName = "Default"; this.pdfViewerControl2.VerticalScrollOffset = 0; this.pdfViewerControl2.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; @@ -963,16 +968,16 @@ this.treeViewAdvCouverts.AllowMouseBasedSelection = true; this.treeViewAdvCouverts.BackColor = System.Drawing.Color.White; this.treeViewAdvCouverts.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))); - treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1; - treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true; - treeNodeAdvStyleInfo1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); - treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); + treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1; + treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true; + treeNodeAdvStyleInfo3.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); + treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43))))); this.treeViewAdvCouverts.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] { - new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)}); + new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)}); this.treeViewAdvCouverts.BeforeTouchSize = new System.Drawing.Size(476, 397); this.treeViewAdvCouverts.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat; this.treeViewAdvCouverts.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -1061,14 +1066,6 @@ this.imageList2.Images.SetKeyName(1, "B1.png"); this.imageList2.Images.SetKeyName(2, "B2.png"); // - // ribbonButton3 - // - this.ribbonButton3.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButton3.Image"))); - this.ribbonButton3.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton3.LargeImage"))); - this.ribbonButton3.Name = "ribbonButton3"; - this.ribbonButton3.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton3.SmallImage"))); - this.ribbonButton3.Text = "Anzeige Adressposition"; - // // ribbon1 // this.ribbon1.CaptionBarVisible = false; @@ -1092,6 +1089,7 @@ this.ribbon1.Tabs.Add(this.ribbonTab1); this.ribbon1.Tabs.Add(this.ribbonTab2); this.ribbon1.TabSpacing = 4; + this.ribbon1.TabIndexChanged += new System.EventHandler(this.ribbon1_TabIndexChanged); this.ribbon1.Click += new System.EventHandler(this.ribbon1_Click); // // ribbonTab1 @@ -1127,7 +1125,6 @@ // // ribbonButtonDokPreview // - this.ribbonButtonDokPreview.Checked = true; this.ribbonButtonDokPreview.Image = global::OnDoc.Properties.Resources.Preview_Rechts_32x32_32; this.ribbonButtonDokPreview.LargeImage = global::OnDoc.Properties.Resources.Preview_Rechts_32x32_32; this.ribbonButtonDokPreview.Name = "ribbonButtonDokPreview"; @@ -1139,7 +1136,7 @@ // this.ribbonchkadresse.Checked = true; this.ribbonchkadresse.Name = "ribbonchkadresse"; - this.ribbonchkadresse.Text = "Vorschau Adresspotistion"; + this.ribbonchkadresse.Text = "Vorschau Adressposition"; this.ribbonchkadresse.CheckBoxCheckChanged += new System.EventHandler(this.ribbonchkadresse_Click); this.ribbonchkadresse.Click += new System.EventHandler(this.ribbonchkadresse_Click); // @@ -1172,7 +1169,7 @@ this.pnlcouvert.Controls.Add(this.pdfViewerControl1); this.pnlcouvert.Controls.Add(this.panel1); this.pnlcouvert.Controls.Add(this.GrpPaketDetails); - this.pnlcouvert.Controls.Add(this.treeViewAdv1); + this.pnlcouvert.Controls.Add(this.panel2); this.pnlcouvert.Location = new System.Drawing.Point(22, 120); this.pnlcouvert.Name = "pnlcouvert"; this.pnlcouvert.Size = new System.Drawing.Size(1161, 668); @@ -1183,9 +1180,9 @@ this.panel1.BackColor = System.Drawing.Color.LightGray; this.panel1.Controls.Add(this.lblprieveiwbezeichnung); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(879, 0); + this.panel1.Location = new System.Drawing.Point(848, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(282, 54); + this.panel1.Size = new System.Drawing.Size(313, 54); this.panel1.TabIndex = 10; // // lblprieveiwbezeichnung @@ -1197,6 +1194,34 @@ this.lblprieveiwbezeichnung.Size = new System.Drawing.Size(0, 20); this.lblprieveiwbezeichnung.TabIndex = 0; // + // panel2 + // + this.panel2.Controls.Add(this.treeViewAdv1); + this.panel2.Controls.Add(this.panel3); + this.panel2.Dock = System.Windows.Forms.DockStyle.Left; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(402, 668); + this.panel2.TabIndex = 11; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.LightGray; + this.panel3.Controls.Add(this.lblerror); + this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel3.Location = new System.Drawing.Point(0, 568); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(402, 100); + this.panel3.TabIndex = 8; + // + // lblerror + // + this.lblerror.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblerror.Location = new System.Drawing.Point(3, 8); + this.lblerror.Name = "lblerror"; + this.lblerror.Size = new System.Drawing.Size(396, 87); + this.lblerror.TabIndex = 0; + // // pnlpostkorb // this.pnlpostkorb.Controls.Add(this.pdfViewerControl2); @@ -1232,6 +1257,15 @@ this.pnlprogress.TabIndex = 25; this.pnlprogress.Visible = false; // + // label1 + // + 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.TabIndex = 21; + this.label1.Text = "Fortschritt Dokumentversand"; + // // progressBarAdv1 // this.progressBarAdv1.BackgroundStyle = Syncfusion.Windows.Forms.Tools.ProgressBarBackgroundStyles.Office2016Colorful; @@ -1290,14 +1324,13 @@ this.progressBar1.Size = new System.Drawing.Size(448, 23); this.progressBar1.TabIndex = 16; // - // label1 + // ribbonButton3 // - 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.TabIndex = 21; - this.label1.Text = "Fortschritt Dokumentversand"; + this.ribbonButton3.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButton3.Image"))); + this.ribbonButton3.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton3.LargeImage"))); + this.ribbonButton3.Name = "ribbonButton3"; + this.ribbonButton3.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton3.SmallImage"))); + this.ribbonButton3.Text = "Anzeige Adressposition"; // // Versandstrasse // @@ -1316,6 +1349,8 @@ this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; this.Text = "Versandstrasse"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Versandstrasse_FormClosing); + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Versandstrasse_FormClosed); this.Load += new System.EventHandler(this.Versandstrasse_Load); this.Resize += new System.EventHandler(this.Versandstrasse_Resize); this.contextMenuStrip1.ResumeLayout(false); @@ -1340,6 +1375,8 @@ this.pnlcouvert.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel3.ResumeLayout(false); this.pnlpostkorb.ResumeLayout(false); this.pnlprogress.ResumeLayout(false); this.pnlprogress.PerformLayout(); @@ -1436,5 +1473,8 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label2; private System.Windows.Forms.ProgressBar progressBar1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Label lblerror; } } \ No newline at end of file diff --git a/Client/Versandstrasse/Versandstrasse.cs b/Client/Versandstrasse/Versandstrasse.cs index b027b64e..4ce541f5 100644 --- a/Client/Versandstrasse/Versandstrasse.cs +++ b/Client/Versandstrasse/Versandstrasse.cs @@ -26,6 +26,7 @@ using Syncfusion.Olap.MDXQueryParser; using Windows.Media.Streaming.Adaptive; using System.Data.SqlTypes; using NLog.LayoutRenderers.Wrappers; +using System.Security.Cryptography; namespace OnDoc.Versandstrasse { @@ -51,20 +52,23 @@ namespace OnDoc.Versandstrasse new QueryAllowedPositionsEventHandler(this.TreeDragDrop_QueryAllowedPositionsForNode); this.treeViewDragHighlightTracker.QueryDragInsertInfo += new QueryDragInsertInfoEventHandler(treeViewDragHighlightTracker_QueryDragInsertInfo); - this.pakete = pakete; - this.serienbrief = pakete[0].isSerienbrief; - - if (serienbrief) - { - this.ribbonButtonNewCouvert.Enabled = false; - this.ribbonTab2.Enabled = false; - this.sb = pakete[0].sb; - this.btnPrepare.Text = "Versand prüfen"; - } - else + if (pakete.Count > 0) { - ribbonButtonNewCouvert.Enabled = true; + this.pakete = pakete; + this.serienbrief = pakete[0].isSerienbrief; + + if (serienbrief) + { + this.ribbonButtonNewCouvert.Enabled = false; + this.ribbonTab2.Enabled = false; + this.sb = pakete[0].sb; + this.btnPrepare.Text = "Versand prüfen"; + } + else + { + ribbonButtonNewCouvert.Enabled = true; + } } } @@ -72,7 +76,7 @@ namespace OnDoc.Versandstrasse { bool hasprivateaddresses = false; DB db = new DB(AppParams.connectionstring); - db.Get_Tabledata("Select * from Antwortadresse_mitarbeiter 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; @@ -115,26 +119,50 @@ namespace OnDoc.Versandstrasse Reload_Tree(); load_adressen(); - treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0]; - this.pnlcouvert.Visible = true; - this.pnlpostkorb.Visible = false; - this.pnlpostkorb.Dock = DockStyle.Fill; - this.pnlcouvert.Dock = DockStyle.Fill; - 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); - - lblpostausgang.MaximumSize = new Size(500, 60); DB db = new DB(AppParams.connectionstring); - db.Get_Tabledata("Select * from OnDoc_Versandstrasse_Texte order by id",false,true); + db.Get_Tabledata("Select * from OnDoc_Versandstrasse_Texte order by id", false, true); lblprueftext.Text = db.dsdaten.Tables[0].Rows[0]["textblock"].ToString(); lblprueftextSB.Text = db.dsdaten.Tables[0].Rows[1]["textblock"].ToString(); lblprueftextsb2.Text = db.dsdaten.Tables[0].Rows[2]["textblock"].ToString(); lblpostausgang.Text = db.dsdaten.Tables[0].Rows[3]["textblock"].ToString(); + + lblpostausgang.MaximumSize = new Size(500, 60); db = null; + + if (treeViewAdv1.Nodes.Count > 0) + { + treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0]; + this.pnlcouvert.Visible = true; + this.pnlpostkorb.Visible = false; + this.pnlpostkorb.Dock = DockStyle.Fill; + this.pnlcouvert.Dock = DockStyle.Fill; + } + else + { + this.lblpostausgang.Visible = true; + this.lblpostausgang.Left = this.Width - lblpostausgang.Width; + this.pnlcouvert.Visible = false; + + this.pnlpostkorb.Visible = true; + this.pnlpostkorb.Dock = DockStyle.Fill; + + Refresh_VersandCouverts(); + ribbon1.Select(); + ribbon1_Click(sender, e); + ribbon1.Tabs[0].Visible = true; + ribbonTab2_ActiveChanged(sender, e); + this.lblpostausgang.Left = this.Width - lblpostausgang.Width; + + } + 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.Text = "Prüfe die Angaben und das PDF. Mit Klick auf «Couvert in Postausgang legen» wird das Couvert im Postausgang bereitgelegt. Der Versand vom Postausgang erfolgt um 15.45 Uhr. Bis 15.45 Uhr kann das Couvert noch geöffnet/bearbeitet oder gelöscht werden."; //lblprueftextSB.MaximumSize = new Size(panelVerify.Width, 50); //lblprueftextSB.Text = "Prüfe die Angaben und das PDF. Mit Klick auf «Couvert in Postausgang legen» wird das Couvert im Postausgang bereitgelegt. Der Versand vom Postausgang erfolgt um 15.45 Uhr. Bis 15.45 Uhr kann das Couvert noch geöffnet/bearbeitet oder gelöscht werden."; @@ -198,16 +226,27 @@ namespace OnDoc.Versandstrasse if (node.Level == 1) { Verify_Couvert(node); } } } + + string errormessage = ""; + private void add_errormessage(string message) + { + if (errormessage.Trim() != "") + { + errormessage = errormessage + Environment.NewLine +"- "+ message; + }else { errormessage = "- "+message; } + } private bool Verify_Couvert(TreeNodeAdv node) { - + errormessage = ""; + lblerror.Visible = false; Versandpaket vp = node.TagObject as Versandpaket; if (vp.isSerienbrief) { set_nodeimage(node, 1); return true; } + DB db = new DB(AppParams.connectionstring); if (vp.partnernr == 0 && node.Nodes.Count==1) { @@ -220,6 +259,7 @@ namespace OnDoc.Versandstrasse if (chkGAS.Checked && txtadresse.Text == "") { + add_errormessage("Keine Rückantowrtadresse gewählt"); return false; } int currentbp = vp.partnernr; @@ -228,6 +268,31 @@ namespace OnDoc.Versandstrasse int anzbp = 1; bool versandbereit = true; + if (vp.partnernr > 99999999) { + versandbereit = false; + add_errormessage("Couvert muss für ein BP sein"); + + } + + string kdenummern = ""; + foreach (TreeNodeAdv dokumentnode in node.Nodes) + { + Versanddokument vd = dokumentnode.TagObject as Versanddokument; + if (kdenummern != "") { kdenummern = kdenummern + ";"; } + kdenummern = kdenummern + vd.Partnernr.ToString(); + + } + if (kdenummern != "") + { + db.clear_parameter(); + 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) { + versandbereit = false; + add_errormessage(db.dsdaten.Tables[0].Rows[0][1].ToString()); + } + + } foreach (TreeNodeAdv dokumentnode in node.Nodes) { @@ -235,24 +300,25 @@ namespace OnDoc.Versandstrasse db.Get_Tabledata("SELECT dbo.dokument.nrpar00, dbo.dokument.dokumentid, isnull(dbo.dokumenttyp.Versandstrasse_moeglich,0) as vsm, isnull(dbo.dokumenttyp.versandstrasse_firstdoc,0) as firstdoc FROM dbo.dokument INNER JOIN " + " dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr where dbo.dokument.dokumentid='" + dokumentnode.Tag + "'", false, true); //BP-Verifikation - if (currentbp != Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["nrpar00"])) - { - currentbp = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["nrpar00"]); - anzbp = anzbp + 1; - } + //if (currentbp != Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["nrpar00"])) + //{ + + // currentbp = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["nrpar00"]); + // anzbp = anzbp + 1; + //} //Versandstrasse möglich if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0) { set_nodeimage(dokumentnode, 0); - + add_errormessage("Nicht versandfähige Dokumente im Couvert"); versandbereit = false; } else { if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0) { - if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; } + if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; add_errormessage("Versandfähiges Dokument Position 1 fehlt"); } else { set_nodeimage(dokumentnode, 5); @@ -263,19 +329,23 @@ namespace OnDoc.Versandstrasse } if (node.Nodes.Count == 0) { + add_errormessage("Kene Dokumente im Couvert"); versandbereit = false; } nodecounter++; } - if (node.Nodes.Count < 1) { versandbereit = false; } + if (node.Nodes.Count < 1) { versandbereit = false;add_errormessage("Keine Dokumetne im Couvert"); } if (anzbp > 1) { versandbereit = false; } if (versandbereit == true) { + lblerror.Visible = false; set_nodeimage(node, 1); return true; } else { + lblerror.Visible = true; + lblerror.Text = errormessage; set_nodeimage(node, 0); return false; } @@ -807,7 +877,7 @@ namespace OnDoc.Versandstrasse dr[2] = jsonstring; dr["aktiv"] = 1; dr["versandoption"] = vp.Versandoption.ToString(); - dr["Bemerkung"] = vp.bemerkung; + dr["Bemerkung"] = vp.bemerkung; // db.daten.Tables[0].Rows.Add(dr); db.Update_Data(); @@ -820,6 +890,7 @@ namespace OnDoc.Versandstrasse dr1[2] = vd.DokumentID; dr1[3] = 1; db.daten.Tables[0].Rows.Add(dr1); + } db.Update_Data(); treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode); @@ -1148,8 +1219,13 @@ namespace OnDoc.Versandstrasse TreeNodeAdv node = treeViewAdv1.SelectedNode; if (node.Level > 1) { + Versanddokument vd = node.TagObject as Versanddokument; 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); @@ -1160,8 +1236,10 @@ namespace OnDoc.Versandstrasse { reserve_vs_dokument(tn.Tag.ToString(), 2); } - + Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket; + pakete.Remove(vp); treeViewAdv1.SelectedNode.Remove(); + } } catch { } @@ -1320,5 +1398,57 @@ namespace OnDoc.Versandstrasse 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); + e.Cancel = true; + } + } + + private void ribbon1_TabIndexChanged(object sender, EventArgs e) + { + int a = 0; + } + + public void add_doc (Versanddokument vs) + { + bool zugewiesen = false; + foreach (Versandpaket vp in pakete) + { + if (vp.partnernr.ToString() == vs.Partnernr) + { + vp.Dokument.Add(vs); + zugewiesen = true; + Reload_Tree(); + break; + } + } + if (!zugewiesen) + { + Versandpaket vp = new Versandpaket(); + vp.Dokument = new List(); + vp.partnernr = Convert.ToInt32(vs.Partnernr); + vp.Versandoption = "B2_POST"; + vp.Mitteilung = ""; + vp.GAS = ""; + vp.GASAdresse = ""; + vp.PaketNr = Guid.NewGuid().ToString(); + + vp.Dokument.Add(vs); + pakete.Add(vp); + zugewiesen = true; + Reload_Tree(); + + } + + } + + private void Versandstrasse_FormClosed(object sender, FormClosedEventArgs e) + { + AppParams.versandstrassewindows_open = false; + } } } diff --git a/Client/Versandstrasse/Versandstrasse.resx b/Client/Versandstrasse/Versandstrasse.resx index 8fce40c6..e5a4b68c 100644 --- a/Client/Versandstrasse/Versandstrasse.resx +++ b/Client/Versandstrasse/Versandstrasse.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0 - DAAAAk1TRnQBSQFMAgEBBgEAAdABAAHQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBgEAAfgBAAH4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -193,62 +193,62 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU - DAAAAk1TRnQBSQFMAgEBBQEAAdgBAAHYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 - AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA - AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm - AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM - AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA - ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz - AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ - AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM - AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA - AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA - AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ - AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ - AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA - AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm - ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ - Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz - AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA - AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM - AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM - ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM - Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA - AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM - AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ - AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz - AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm - AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wIAAfEBEwoAAfIyAAHx - AgABDgkQAfIyAAETAQAB7wHzC/EB9DEAAQ4B8wwAARExAAEQAfEEAAQONgABEAHxAwAB6wH/AwAB/wFD - NAABEAHxAwABkgEAAfQC8QG8AQ40AAEQAfEDAAHtAQAB8TgAARAB8QMAAQ8B/wEAAfIBbTYAARAB8QQA - AUMB8QL/AZI1AAEQAfEDAAHqAfABEQETAv8BDjQAARAB8QMAAe8BAAGSAQAB8wEAARA0AAEQAfEDAAET - Av8B9AEAAfM0AALyAfEEAAFtAfAB8gEHAQ82AAHxPwAB9AERCwAB7DQAAb0GFgG9CAAB9AHCAcACVQHA - AcIB9AgAAf8BvQEWARcBjwGxAb0B/wUAAfABswqKAbMB8AQAAb0IRwG9BQAB/wHCCFUBwgH/BAAB/wG9 - ARcCjwJvAWoCjwG9Af8CAAHwDtMB8AIAAb0KRwG9AwAB/wHAClUBwAH/AgAB/wG3A48BjgEWAm8BagKP - AbcB/wEAAbMO0wGzAQABvQxHAb0CAAHCA1UBlwGYB1UBwgIAAb0DjwIXAhYBbwEXAWoCjwG9AQABig7T - AYoBvQ5HAb0B9ANVAZcB8gH/AQgHVQH0Af8BFwGPARcB8wH/Ab0BFwEWAb0B/wHzAWoCjwH/AYoH0wHN - BtMBigEWDkcBFgHCA1UB8QP/AQgGVQHCAb0CjwHjA/8CvQP/ARcBagGPAb0BigbTAbMBvAGzBdMBigEW - ARcBtwGUAUcBFwEWAUcB4wG3ARYBFwGUAkcBFgHAAlUBwgL/AcEC/wHCAZcEVQHAARYDjwG9Bv8BvQJv - AWoBsQGKBtMBswH/Aa0F0wGKARYBFwG9AfQBFgGUAbcBFwH/ARYB9AEWAf8BvQEXARYCVQHBAv8BwAFV - AZ4C/wHiAZcEVQEXA48BFwG9BP8BvQIWAm8BjwGKBtMBswH/Aa0F0wGKAhYB9AG9ARcBtwG9AeMB/wEW - AfQBFgH0ArcBFgJVAZ8B/wGeA1UBwAL/AQABlwNVARcDjwEXAb0E/wG9ARcCFgFvARcBigbTAbMB/wGt - BdMBigEWARcBtwGUAeMCtwLjAbcBFgEXAbcBlAEXARYBwAhVAcAC/wHzAZcBVQHAARYDjwG9Bv8BvQEX - AY4BjwEWAYoG0wGzAf8BrQXTAYoBFg5HARYBwglVAZcB9AH/AZ8BVQHCAb0CjwHjA/8CvQP/ARcCjwG9 - AYoF0wEGAfEB8AGyBdMBigG9DkcBvQH0ClUBlwGfAZcBVQH0Af8BFwGPARcB8wH/Ab0CFwG9Af8B8wKP - ARcB/wGKBtMCzQbTAYoBAAG9DEcBvQIAAcIMVQHCAgABvQKPARcB4wSPAeMBFwKPAb0BAAGKDtMBigIA - Ab0KRwG9AwAB/wHAClUBwAH/AgAB/wG3Co8BtwH/AQABsw7TAbMDAAG9CEcBvQUAAf8BwghVAcIB/wQA - Af8BvQEXBo8BFwG9Af8CAAHwDtMB8AQAAb0GFgG9CAAB9AHCAcACVQHAAcIB9AgAAf8BvQEWAhcBFgG9 - Af8FAAHwAbMKigGzAfABAAFCAU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/AQABgAED - BwABAx8AAeAGAAEBBwABAQgAAYAWAAEBARAHAAEgDgABwAcAAcAHAAHwAQ8B8AEPAfABDwGAAQEB4AEH - AcABAwHAAQMCAAHAAQMBgAEBAYABAQIAAYABAQGAAQEBgAEBQgABgAEBAYABAQGAAQECAAHAAQMBgAEB - AYABAQIAAeABBwHAAQMBwAEDAgAB8AEPAfABDwHwAQ8BgAEBCw== + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS + DAAAAk1TRnQBSQFMAgEBBQIAAQEBAAEBARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + AUADAAEgAwABAQEAAQgGAAEIGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA + AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA + AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm + AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ + AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm + AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz + AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm + AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm + AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA + ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm + AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm + ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm + AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA + AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ + AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz + AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/ + AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA + AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM + AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm + ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ + AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/ + ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM + ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm + AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM + AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA + AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA + ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7 + Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/8CAAHxARMKAAHyMgAB8QIA + AQ4JEAHyMgABEwEAAe8B8wvxAfQxAAEOAfMMAAERMQABEAHxBAAEDjYAARAB8QMAAesB/wMAAf8BQzQA + ARAB8QMAAZIBAAH0AvEBvAEONAABEAHxAwAB7QEAAfE4AAEQAfEDAAEPAf8BAAHyAW02AAEQAfEEAAFD + AfEC/wGSNQABEAHxAwAB6gHwAREBEwL/AQ40AAEQAfEDAAHvAQABkgEAAfMBAAEQNAABEAHxAwABEwL/ + AfQBAAHzNAAC8gHxBAABbQHwAfIBBwEPNgAB8T8AAfQBEQsAAew0AAG9BhYBvQgAAfQBwgHAAlUBwAHC + AfQIAAH/Ab0BFgEXAY8BsQG9Af8FAAHwAbMKigGzAfAEAAG9CEcBvQUAAf8BwghVAcIB/wQAAf8BvQEX + Ao8CbwFqAo8BvQH/AgAB8A7TAfACAAG9CkcBvQMAAf8BwApVAcAB/wIAAf8BtwOPAY4BFgJvAWoCjwG3 + Af8BAAGzDtMBswEAAb0MRwG9AgABwgNVAZcBmAdVAcICAAG9A48CFwIWAW8BFwFqAo8BvQEAAYoO0wGK + Ab0ORwG9AfQDVQGXAfIB/wEIB1UB9AH/ARcBjwEXAfMB/wG9ARcBFgG9Af8B8wFqAo8B/wGKB9MBzQbT + AYoBFg5HARYBwgNVAfED/wEIBlUBwgG9Ao8B4wP/Ar0D/wEXAWoBjwG9AYoG0wGzAbwBswXTAYoBFgEX + AbcBlAFHARcBFgFHAeMBtwEWARcBlAJHARYBwAJVAcIC/wHBAv8BwgGXBFUBwAEWA48BvQb/Ab0CbwFq + AbEBigbTAbMB/wGtBdMBigEWARcBvQH0ARYBlAG3ARcB/wEWAfQBFgH/Ab0BFwEWAlUBwQL/AcABVQGe + Av8B4gGXBFUBFwOPARcBvQT/Ab0CFgJvAY8BigbTAbMB/wGtBdMBigIWAfQBvQEXAbcBvQHjAf8BFgH0 + ARYB9AK3ARYCVQGfAf8BngNVAcAC/wEAAZcDVQEXA48BFwG9BP8BvQEXAhYBbwEXAYoG0wGzAf8BrQXT + AYoBFgEXAbcBlAHjArcC4wG3ARYBFwG3AZQBFwEWAcAIVQHAAv8B8wGXAVUBwAEWA48BvQb/Ab0BFwGO + AY8BFgGKBtMBswH/Aa0F0wGKARYORwEWAcIJVQGXAfQB/wGfAVUBwgG9Ao8B4wP/Ar0D/wEXAo8BvQGK + BdMBBgHxAfABsgXTAYoBvQ5HAb0B9ApVAZcBnwGXAVUB9AH/ARcBjwEXAfMB/wG9AhcBvQH/AfMCjwEX + Af8BigbTAs0G0wGKAQABvQxHAb0CAAHCDFUBwgIAAb0CjwEXAeMEjwHjARcCjwG9AQABig7TAYoCAAG9 + CkcBvQMAAf8BwApVAcAB/wIAAf8BtwqPAbcB/wEAAbMO0wGzAwABvQhHAb0FAAH/AcIIVQHCAf8EAAH/ + Ab0BFwaPARcBvQH/AgAB8A7TAfAEAAG9BhYBvQgAAfQBwgHAAlUBwAHCAfQIAAH/Ab0BFgIXARYBvQH/ + BQAB8AGzCooBswHwAQABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/wEAAYABAwcA + AQMfAAHgBgABAQcAAQEIAAGAFgABAQEQBwABIA4AAcAHAAHABwAB8AEPAfABDwHwAQ8BgAEBAeABBwHA + AQMBwAEDAgABwAEDAYABAQGAAQECAAGAAQEBgAEBAYABAUIAAYABAQGAAQEBgAEBAgABwAEDAYABAQGA + AQECAAHgAQcBwAEDAcABAwIAAfABDwHwAQ8B8AEPAYABAQs= - + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh @@ -259,7 +259,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAX5SURBVEhLjZR7 + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAX5SURBVEhLjZR7 TFNnGIfr9A/318yWJcuSzXgbIgKClKtQqQWKpQUKlLsUmVPczGZczBzIKaKCglwEa4XKHbHAgFIFuUix yMUCpS20BUuhlFLuE0Hxzru0s6U2ce5JTnLe9/y+90nOd86HQpmwnzmI4P6agQOcRdh/ZxHcGpbApfEZ OLWsgEPrC7BrewW27W9hT+cqWD4CsOgBMBcC7OgH2Mx9mmg67wO8mDIz74ppcC+S12FK5DTXMgXNpXyM @@ -291,7 +291,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAARiSURBVEhLtVRr + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAARiSURBVEhLtVRr TFtlGD4z3mayX/pnMfHPBJe4YcRRCvQGSBnQlkIQWkBKgRZYe3rZZH8wQd0FNtgUMlcuLgSTzbjBpllk XAqFAZMAm2ODJc7aQVsQ8JKNgSRTz2O+U1vKYeAS45s8Oe/znfd5nnznnO9QYoXhWEyy4a9IqR6RUt0a RO0thVBmvCVMs2ynOCVS0LESpeUPSaoJIrkRvAQdC75UD7ImVpgglBunqJjkfTjTNoiByWnYr6+i98Y0 @@ -316,7 +316,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAQHSURBVEhLpZQL + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAQHSURBVEhLpZQL TFNXGMdP9sxc5pibGQnZlkjGQCMdq1Me45Z3WyhMwhCwQMco9EFBWYDN1k7mdNUsPqJ7CcVM3IYIiDJ0 W8sgUafByaOtLUOIG7DhQMi8Zo/K67/condwI9CxX/Ll5Hzn/r9fcm7uJWQRrFtH+YniJNXePr5yQsjT 3PNFk5ycfH9gYOAjnl5esTsNu/GtyQRVnuaP4FDB8SUeHhJCyIPczH8imKLCqfDIT5lBMeLYloGBATid @@ -337,7 +337,7 @@ /wM19F1wo1uqCAAAAABJRU5ErkJggg== - + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh @@ -355,7 +355,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq - CQAAAk1TRnQBSQFMAgEBAwEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAAcABAAHAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -400,19 +400,19 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC + vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC + vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== + vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll index 84626b78..7280b31e 100644 Binary files a/Client/bin/Debug/Database.dll and b/Client/bin/Debug/Database.dll differ diff --git a/Client/bin/Debug/Database.pdb b/Client/bin/Debug/Database.pdb index c7b27663..18e13af0 100644 Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 60b4b437..83823a99 100644 Binary files a/Client/bin/Debug/OnDoc.exe and b/Client/bin/Debug/OnDoc.exe differ diff --git a/Client/bin/Debug/OnDoc.pdb b/Client/bin/Debug/OnDoc.pdb index 2c2a8484..79257c8f 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/OnDocClient.zip b/Client/bin/Debug/OnDocClient.zip index 9864f5c0..8ac4461d 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index 162622f6..70407c0b 100644 Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index dcf16d17..60c52fd4 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache index a8c142fd..00fe39cc 100644 --- a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache +++ b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -65ae806e012952db5e8ce8c767250f579a0fda646b606deb2730010e6e5ecdd5 +5bdb5c25c09853ca6cfbd988d4db7b2a4c87987533acdf99613244a7267c3aab diff --git a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt index f4753406..a647cb4c 100644 --- a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt +++ b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt @@ -378,3 +378,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.Up2Date E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.pdb E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.FrmDokumentwerte.resources +E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.FrmExternalDocEdit.resources diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index a6e9d983..01e3cd78 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 646254ef..ae6aa5eb 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Client/obj/Debug/OnDoc.Diverses.FrmExternalDocEdit.resources b/Client/obj/Debug/OnDoc.Diverses.FrmExternalDocEdit.resources new file mode 100644 index 00000000..f2da8fc6 Binary files /dev/null and b/Client/obj/Debug/OnDoc.Diverses.FrmExternalDocEdit.resources differ diff --git a/Client/obj/Debug/OnDoc.Properties.Resources.resources b/Client/obj/Debug/OnDoc.Properties.Resources.resources index d7375684..2d63ecc7 100644 Binary files a/Client/obj/Debug/OnDoc.Properties.Resources.resources and b/Client/obj/Debug/OnDoc.Properties.Resources.resources differ diff --git a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources index 2bc5f2f5..2031307b 100644 Binary files a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources and b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources differ diff --git a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources index 9f7a4e86..3cedfc57 100644 Binary files a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources and b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources differ diff --git a/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources index 8b813e7e..9bedfcee 100644 Binary files a/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources and b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 60b4b437..83823a99 100644 Binary files a/Client/obj/Debug/OnDoc.exe and b/Client/obj/Debug/OnDoc.exe differ diff --git a/Client/obj/Debug/OnDoc.pdb b/Client/obj/Debug/OnDoc.pdb index 2c2a8484..79257c8f 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 5c523693..c443da5f 100644 Binary files a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index 162622f6..70407c0b 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/bin/Debug/Database.dll b/DOCGEN/bin/Debug/Database.dll index 84626b78..7280b31e 100644 Binary files a/DOCGEN/bin/Debug/Database.dll and b/DOCGEN/bin/Debug/Database.dll differ diff --git a/DOCGEN/bin/Debug/Database.pdb b/DOCGEN/bin/Debug/Database.pdb index c7b27663..18e13af0 100644 Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index cc81e583..711887c4 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/Database/bin/Debug/Database.dll b/Database/bin/Debug/Database.dll index 84626b78..7280b31e 100644 Binary files a/Database/bin/Debug/Database.dll and b/Database/bin/Debug/Database.dll differ diff --git a/Database/bin/Debug/Database.pdb b/Database/bin/Debug/Database.pdb index c7b27663..18e13af0 100644 Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ diff --git a/Database/db.cs b/Database/db.cs index 2304c1fd..2efb5bba 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -2261,7 +2261,7 @@ namespace Database public bool dokument_reaktivieren(string dokumentid, string mitarbeiternr) { clear_parameter(); - add_parameter("@fnkt", "11"); + add_parameter("@fnkt", "12"); add_parameter("@dokumentid", dokumentid); add_parameter("@value1", mitarbeiternr); Get_Tabledata("sp_edoka_onbase", true, false); diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll index 84626b78..7280b31e 100644 Binary files a/Database/obj/Debug/Database.dll and b/Database/obj/Debug/Database.dll differ diff --git a/Database/obj/Debug/Database.pdb b/Database/obj/Debug/Database.pdb index c7b27663..18e13af0 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/Images/Icons/Icons/Blue/Envelope.ico b/Images/Icons/Icons/Blue/Envelope.ico new file mode 100644 index 00000000..443632b5 Binary files /dev/null and b/Images/Icons/Icons/Blue/Envelope.ico differ diff --git a/Images/Icons/Icons/Blue/Excel_Couvertiert.ico b/Images/Icons/Icons/Blue/Excel_Couvertiert.ico new file mode 100644 index 00000000..f20b225d Binary files /dev/null and b/Images/Icons/Icons/Blue/Excel_Couvertiert.ico differ diff --git a/Images/Icons/Icons/Blue/Images/Envelope_16x16-32.png b/Images/Icons/Icons/Blue/Images/Envelope_16x16-32.png new file mode 100644 index 00000000..f1912ea3 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Envelope_16x16-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Envelope_24x24-32.png b/Images/Icons/Icons/Blue/Images/Envelope_24x24-32.png new file mode 100644 index 00000000..777519ea Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Envelope_24x24-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Envelope_256x256-32.png b/Images/Icons/Icons/Blue/Images/Envelope_256x256-32.png new file mode 100644 index 00000000..e29db1c3 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Envelope_256x256-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Envelope_32x32-32.png b/Images/Icons/Icons/Blue/Images/Envelope_32x32-32.png new file mode 100644 index 00000000..8d3c1381 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Envelope_32x32-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Envelope_48x48-32.png b/Images/Icons/Icons/Blue/Images/Envelope_48x48-32.png new file mode 100644 index 00000000..149a102b Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Envelope_48x48-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_16x16-32.png b/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_16x16-32.png new file mode 100644 index 00000000..fa9e2482 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_16x16-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_24x24-32.png b/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_24x24-32.png new file mode 100644 index 00000000..a1196abc Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_24x24-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_256x256-32.png b/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_256x256-32.png new file mode 100644 index 00000000..849e1fcf Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_256x256-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_32x32-32.png b/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_32x32-32.png new file mode 100644 index 00000000..0807daf5 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_32x32-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_48x48-32.png b/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_48x48-32.png new file mode 100644 index 00000000..0e5d2901 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Excel_Couvertiert_48x48-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/PDF_Covertiert_16x16-32.png b/Images/Icons/Icons/Blue/Images/PDF_Covertiert_16x16-32.png new file mode 100644 index 00000000..c82ca378 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/PDF_Covertiert_16x16-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/PDF_Covertiert_24x24-32.png b/Images/Icons/Icons/Blue/Images/PDF_Covertiert_24x24-32.png new file mode 100644 index 00000000..1a8d2aa9 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/PDF_Covertiert_24x24-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/PDF_Covertiert_256x256-32.png b/Images/Icons/Icons/Blue/Images/PDF_Covertiert_256x256-32.png new file mode 100644 index 00000000..5e7f4134 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/PDF_Covertiert_256x256-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/PDF_Covertiert_32x32-32.png b/Images/Icons/Icons/Blue/Images/PDF_Covertiert_32x32-32.png new file mode 100644 index 00000000..88e73808 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/PDF_Covertiert_32x32-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/PDF_Covertiert_48x48-32.png b/Images/Icons/Icons/Blue/Images/PDF_Covertiert_48x48-32.png new file mode 100644 index 00000000..c9232f75 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/PDF_Covertiert_48x48-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Versandstrasse_16x16-32.png b/Images/Icons/Icons/Blue/Images/Versandstrasse_16x16-32.png index 02fd55b5..c918de6a 100644 Binary files a/Images/Icons/Icons/Blue/Images/Versandstrasse_16x16-32.png and b/Images/Icons/Icons/Blue/Images/Versandstrasse_16x16-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Versandstrasse_24x24-32.png b/Images/Icons/Icons/Blue/Images/Versandstrasse_24x24-32.png index b0727977..6680cc98 100644 Binary files a/Images/Icons/Icons/Blue/Images/Versandstrasse_24x24-32.png and b/Images/Icons/Icons/Blue/Images/Versandstrasse_24x24-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Versandstrasse_256x256-32.png b/Images/Icons/Icons/Blue/Images/Versandstrasse_256x256-32.png index ec22151e..a031e670 100644 Binary files a/Images/Icons/Icons/Blue/Images/Versandstrasse_256x256-32.png and b/Images/Icons/Icons/Blue/Images/Versandstrasse_256x256-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Versandstrasse_32x32-32.png b/Images/Icons/Icons/Blue/Images/Versandstrasse_32x32-32.png index 5150cc10..c6bba518 100644 Binary files a/Images/Icons/Icons/Blue/Images/Versandstrasse_32x32-32.png and b/Images/Icons/Icons/Blue/Images/Versandstrasse_32x32-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Versandstrasse_48x48-32.png b/Images/Icons/Icons/Blue/Images/Versandstrasse_48x48-32.png index 70f4d6a9..92bbd955 100644 Binary files a/Images/Icons/Icons/Blue/Images/Versandstrasse_48x48-32.png and b/Images/Icons/Icons/Blue/Images/Versandstrasse_48x48-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Word_Couvertiert_16x16-32.png b/Images/Icons/Icons/Blue/Images/Word_Couvertiert_16x16-32.png new file mode 100644 index 00000000..5c3762a6 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Word_Couvertiert_16x16-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Word_Couvertiert_24x24-32.png b/Images/Icons/Icons/Blue/Images/Word_Couvertiert_24x24-32.png new file mode 100644 index 00000000..e184c123 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Word_Couvertiert_24x24-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Word_Couvertiert_256x256-32.png b/Images/Icons/Icons/Blue/Images/Word_Couvertiert_256x256-32.png new file mode 100644 index 00000000..74d290c0 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Word_Couvertiert_256x256-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Word_Couvertiert_32x32-32.png b/Images/Icons/Icons/Blue/Images/Word_Couvertiert_32x32-32.png new file mode 100644 index 00000000..31b56d08 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Word_Couvertiert_32x32-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Word_Couvertiert_48x48-32.png b/Images/Icons/Icons/Blue/Images/Word_Couvertiert_48x48-32.png new file mode 100644 index 00000000..6d0f83a7 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Word_Couvertiert_48x48-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/postausgang_16x16-32.png b/Images/Icons/Icons/Blue/Images/postausgang_16x16-32.png new file mode 100644 index 00000000..bf193016 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/postausgang_16x16-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/postausgang_24x24-32.png b/Images/Icons/Icons/Blue/Images/postausgang_24x24-32.png new file mode 100644 index 00000000..0618620e Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/postausgang_24x24-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/postausgang_256x256-32.png b/Images/Icons/Icons/Blue/Images/postausgang_256x256-32.png new file mode 100644 index 00000000..b526fd2a Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/postausgang_256x256-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/postausgang_32x32-32.png b/Images/Icons/Icons/Blue/Images/postausgang_32x32-32.png new file mode 100644 index 00000000..83488b1c Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/postausgang_32x32-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/postausgang_48x48-32.png b/Images/Icons/Icons/Blue/Images/postausgang_48x48-32.png new file mode 100644 index 00000000..36aaa66b Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/postausgang_48x48-32.png differ diff --git a/Images/Icons/Icons/Blue/PDF_Covertiert.ico b/Images/Icons/Icons/Blue/PDF_Covertiert.ico new file mode 100644 index 00000000..42c04d66 Binary files /dev/null and b/Images/Icons/Icons/Blue/PDF_Covertiert.ico differ diff --git a/Images/Icons/Icons/Blue/Versandstrasse.ico b/Images/Icons/Icons/Blue/Versandstrasse.ico index 245ec9cf..7207be4d 100644 Binary files a/Images/Icons/Icons/Blue/Versandstrasse.ico and b/Images/Icons/Icons/Blue/Versandstrasse.ico differ diff --git a/Images/Icons/Icons/Blue/Versandstrasse_Original.ico b/Images/Icons/Icons/Blue/Versandstrasse_Original.ico new file mode 100644 index 00000000..245ec9cf Binary files /dev/null and b/Images/Icons/Icons/Blue/Versandstrasse_Original.ico differ diff --git a/Images/Icons/Icons/Blue/Word_Couvertiert.ico b/Images/Icons/Icons/Blue/Word_Couvertiert.ico new file mode 100644 index 00000000..efee05a1 Binary files /dev/null and b/Images/Icons/Icons/Blue/Word_Couvertiert.ico differ diff --git a/Images/Icons/Icons/Blue/postausgang.ico b/Images/Icons/Icons/Blue/postausgang.ico new file mode 100644 index 00000000..e9b7f430 Binary files /dev/null and b/Images/Icons/Icons/Blue/postausgang.ico differ diff --git a/Images/VS/couvert.png b/Images/VS/couvert.png new file mode 100644 index 00000000..4a274069 Binary files /dev/null and b/Images/VS/couvert.png differ diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll index 84626b78..7280b31e 100644 Binary files a/OnDocOffice/bin/Debug/Database.dll and b/OnDocOffice/bin/Debug/Database.dll differ diff --git a/OnDocOffice/bin/Debug/Database.pdb b/OnDocOffice/bin/Debug/Database.pdb index c7b27663..18e13af0 100644 Binary files a/OnDocOffice/bin/Debug/Database.pdb and b/OnDocOffice/bin/Debug/Database.pdb differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index a9b9f9d0..c576b0c8 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ