diff --git a/API_NetFramework/bin/BarcodeLib.dll b/API_NetFramework/bin/BarcodeLib.dll index 9ed7a675..f82acea5 100644 Binary files a/API_NetFramework/bin/BarcodeLib.dll and b/API_NetFramework/bin/BarcodeLib.dll differ diff --git a/API_NetFramework/bin/BarcodeLib.pdb b/API_NetFramework/bin/BarcodeLib.pdb index 5ca5b4aa..3fbcbfae 100644 Binary files a/API_NetFramework/bin/BarcodeLib.pdb and b/API_NetFramework/bin/BarcodeLib.pdb differ diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index 3cb8e3aa..bd32419e 100644 Binary files a/API_NetFramework/bin/DOCGEN.dll and b/API_NetFramework/bin/DOCGEN.dll differ diff --git a/API_NetFramework/bin/DOCGEN.pdb b/API_NetFramework/bin/DOCGEN.pdb index 0fcd75b1..f489da3a 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll index 88fc9f7e..c33079f1 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 ce75c478..ad0c5226 100644 Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ diff --git a/API_NetFramework/bin/Helper.dll b/API_NetFramework/bin/Helper.dll index b0cf9b22..821177c5 100644 Binary files a/API_NetFramework/bin/Helper.dll and b/API_NetFramework/bin/Helper.dll differ diff --git a/API_NetFramework/bin/Helper.pdb b/API_NetFramework/bin/Helper.pdb index bda8e193..3ad377e2 100644 Binary files a/API_NetFramework/bin/Helper.pdb and b/API_NetFramework/bin/Helper.pdb differ diff --git a/API_NetFramework/bin/Logging.dll b/API_NetFramework/bin/Logging.dll index ece1e567..52e70b41 100644 Binary files a/API_NetFramework/bin/Logging.dll and b/API_NetFramework/bin/Logging.dll differ diff --git a/API_NetFramework/bin/Logging.pdb b/API_NetFramework/bin/Logging.pdb index 59d89021..e837a9d7 100644 Binary files a/API_NetFramework/bin/Logging.pdb and b/API_NetFramework/bin/Logging.pdb differ diff --git a/API_NetFramework/bin/Model.dll b/API_NetFramework/bin/Model.dll index 9961c01c..4b694900 100644 Binary files a/API_NetFramework/bin/Model.dll and b/API_NetFramework/bin/Model.dll differ diff --git a/API_NetFramework/bin/Model.pdb b/API_NetFramework/bin/Model.pdb index ccb34e26..df130a02 100644 Binary files a/API_NetFramework/bin/Model.pdb and b/API_NetFramework/bin/Model.pdb differ diff --git a/API_NetFramework/bin/OfficePrinter.dll b/API_NetFramework/bin/OfficePrinter.dll index f94fbf4e..46ee80da 100644 Binary files a/API_NetFramework/bin/OfficePrinter.dll and b/API_NetFramework/bin/OfficePrinter.dll differ diff --git a/API_NetFramework/bin/OfficePrinter.pdb b/API_NetFramework/bin/OfficePrinter.pdb index 5270d48a..79cbe1cc 100644 Binary files a/API_NetFramework/bin/OfficePrinter.pdb and b/API_NetFramework/bin/OfficePrinter.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index a2c516c0..773308fe 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 3cf445a2..d761d007 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 5fcf7f18..37fbb93b 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 a2c516c0..773308fe 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 3cf445a2..d761d007 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/BarcodeLib.dll b/BarcodeLib/bin/Debug/BarcodeLib.dll index 9ed7a675..f82acea5 100644 Binary files a/BarcodeLib/bin/Debug/BarcodeLib.dll and b/BarcodeLib/bin/Debug/BarcodeLib.dll differ diff --git a/BarcodeLib/bin/Debug/BarcodeLib.pdb b/BarcodeLib/bin/Debug/BarcodeLib.pdb index 5ca5b4aa..3fbcbfae 100644 Binary files a/BarcodeLib/bin/Debug/BarcodeLib.pdb and b/BarcodeLib/bin/Debug/BarcodeLib.pdb differ diff --git a/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll index 88fc9f7e..c33079f1 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 ce75c478..ad0c5226 100644 Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ diff --git a/BarcodeLib/bin/Debug/Helper.dll b/BarcodeLib/bin/Debug/Helper.dll index b0cf9b22..821177c5 100644 Binary files a/BarcodeLib/bin/Debug/Helper.dll and b/BarcodeLib/bin/Debug/Helper.dll differ diff --git a/BarcodeLib/bin/Debug/Helper.pdb b/BarcodeLib/bin/Debug/Helper.pdb index bda8e193..3ad377e2 100644 Binary files a/BarcodeLib/bin/Debug/Helper.pdb and b/BarcodeLib/bin/Debug/Helper.pdb differ diff --git a/BarcodeLib/bin/Debug/Logging.dll b/BarcodeLib/bin/Debug/Logging.dll index ece1e567..52e70b41 100644 Binary files a/BarcodeLib/bin/Debug/Logging.dll and b/BarcodeLib/bin/Debug/Logging.dll differ diff --git a/BarcodeLib/bin/Debug/Logging.pdb b/BarcodeLib/bin/Debug/Logging.pdb index 59d89021..e837a9d7 100644 Binary files a/BarcodeLib/bin/Debug/Logging.pdb and b/BarcodeLib/bin/Debug/Logging.pdb differ diff --git a/BarcodeLib/bin/Debug/Model.dll b/BarcodeLib/bin/Debug/Model.dll index 9961c01c..4b694900 100644 Binary files a/BarcodeLib/bin/Debug/Model.dll and b/BarcodeLib/bin/Debug/Model.dll differ diff --git a/BarcodeLib/bin/Debug/Model.pdb b/BarcodeLib/bin/Debug/Model.pdb index ccb34e26..df130a02 100644 Binary files a/BarcodeLib/bin/Debug/Model.pdb and b/BarcodeLib/bin/Debug/Model.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index d50daeff..31591c0e 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.dll b/BarcodeLib/obj/Debug/BarcodeLib.dll index 9ed7a675..f82acea5 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.dll and b/BarcodeLib/obj/Debug/BarcodeLib.dll differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.pdb b/BarcodeLib/obj/Debug/BarcodeLib.pdb index 5ca5b4aa..3fbcbfae 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.pdb and b/BarcodeLib/obj/Debug/BarcodeLib.pdb differ diff --git a/Client/Client.csproj b/Client/Client.csproj index f6132c81..9c053bc4 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -424,6 +424,7 @@ Approval.cs + Designer DocPreview.cs diff --git a/Client/Client.csproj.user b/Client/Client.csproj.user index 810e9904..97fa2c1f 100644 --- a/Client/Client.csproj.user +++ b/Client/Client.csproj.user @@ -1,7 +1,8 @@  - funktion=ucheck + + publish\ diff --git a/Client/Diverses/InputDialog.Designer.cs b/Client/Diverses/InputDialog.Designer.cs index a0718a54..1ff1c8e1 100644 --- a/Client/Diverses/InputDialog.Designer.cs +++ b/Client/Diverses/InputDialog.Designer.cs @@ -28,10 +28,13 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InputDialog)); this.textBox1 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.btnok = new System.Windows.Forms.Button(); this.btncancel = new System.Windows.Forms.Button(); + this.cbboxMitarbeiter = new Syncfusion.WinForms.ListView.SfComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.cbboxMitarbeiter)).BeginInit(); this.SuspendLayout(); // // textBox1 @@ -52,6 +55,7 @@ // // btnok // + this.btnok.Enabled = false; this.btnok.Location = new System.Drawing.Point(189, 103); this.btnok.Name = "btnok"; this.btnok.Size = new System.Drawing.Size(75, 23); @@ -70,20 +74,36 @@ this.btncancel.UseVisualStyleBackColor = true; this.btncancel.Click += new System.EventHandler(this.btncancel_Click); // + // cbboxMitarbeiter + // + this.cbboxMitarbeiter.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cbboxMitarbeiter.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; + this.cbboxMitarbeiter.Location = new System.Drawing.Point(18, 53); + this.cbboxMitarbeiter.Name = "cbboxMitarbeiter"; + this.cbboxMitarbeiter.Size = new System.Drawing.Size(345, 19); + this.cbboxMitarbeiter.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); + this.cbboxMitarbeiter.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.cbboxMitarbeiter.TabIndex = 7; + this.cbboxMitarbeiter.TabStop = false; + this.cbboxMitarbeiter.SelectedIndexChanged += new System.EventHandler(this.cbboxMitarbeiter_SelectedIndexChanged); + // // InputDialog // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(372, 131); + this.Controls.Add(this.cbboxMitarbeiter); this.Controls.Add(this.btncancel); this.Controls.Add(this.btnok); this.Controls.Add(this.label1); this.Controls.Add(this.textBox1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "InputDialog"; this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; this.Text = "InputDialog"; this.Load += new System.EventHandler(this.InputDialog_Load); + ((System.ComponentModel.ISupportInitialize)(this.cbboxMitarbeiter)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -95,5 +115,6 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Button btnok; private System.Windows.Forms.Button btncancel; + private Syncfusion.WinForms.ListView.SfComboBox cbboxMitarbeiter; } } \ No newline at end of file diff --git a/Client/Diverses/InputDialog.cs b/Client/Diverses/InputDialog.cs index b70f9536..fdfdd7cd 100644 --- a/Client/Diverses/InputDialog.cs +++ b/Client/Diverses/InputDialog.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Database; using OnDoc.Klassen; using Syncfusion.Windows.Forms; using Syncfusion.Windows.Forms.Tools; @@ -16,6 +17,8 @@ namespace OnDoc.Diverses public partial class InputDialog : SfForm { public string result = ""; + public string resulttext = ""; + private bool isMaDialog = false; public InputDialog() { InitializeComponent(); @@ -31,15 +34,32 @@ namespace OnDoc.Diverses textBox1.Text = defaultvalue; this.Text= caption; this.label1.Text=description; - + this.cbboxMitarbeiter.Visible = false; } + public InputDialog(bool Mitarbeiter,string description) + { + InitializeComponent(); + this.textBox1.Visible = false; + this.cbboxMitarbeiter.Visible = true; + this.label1.Text = description; + isMaDialog = true; + } private void btnok_Click(object sender, EventArgs e) { + if (isMaDialog) + { + result = cbboxMitarbeiter.SelectedValue.ToString(); + DialogResult = DialogResult.OK; + resulttext = cbboxMitarbeiter.Text; + return; + } if (textBox1.Text.Trim() != "") { + result = textBox1.Text; result = textBox1.Text; DialogResult = DialogResult.OK; + return; } } @@ -53,15 +73,36 @@ namespace OnDoc.Diverses { if (e.KeyCode == Keys.Enter) { - btnok_Click(sender, e); + if (textBox1.Text.Trim().Length>0 ) btnok_Click(sender, e); + } + else + { + if (textBox1.Text.Trim().Length > 0) btnok.Enabled = true; else btnok.Enabled = false; } } private void InputDialog_Load(object sender, EventArgs e) { + this.SetDesktopLocation(Cursor.Position.X, Cursor.Position.Y); textBox1.SelectionStart = 0; textBox1.SelectionLength = textBox1.Text.Length; + if (isMaDialog) + { + DB db = new DB(AppParams.connectionstring); + db.clear_parameter(); + db.Get_Tabledata("SP_Dokumentbearbeitung_Mitarbeiter", true, false); + cbboxMitarbeiter.DataSource = db.dsdaten.Tables[0]; + cbboxMitarbeiter.DisplayMember = "name"; + cbboxMitarbeiter.ValueMember = "mitarbeiternr"; + db = null; + cbboxMitarbeiter.Focus(); + } + } + + private void cbboxMitarbeiter_SelectedIndexChanged(object sender, EventArgs e) + { + btnok.Enabled = true; } } } diff --git a/Client/Diverses/InputDialog.resx b/Client/Diverses/InputDialog.resx index 1af7de15..1cea527a 100644 --- a/Client/Diverses/InputDialog.resx +++ b/Client/Diverses/InputDialog.resx @@ -117,4 +117,183 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 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 + 1wAAAABJRU5ErkJggg== + + \ No newline at end of file diff --git a/Client/DocMgmt/DokTypFavoritenOrdner.cs b/Client/DocMgmt/DokTypFavoritenOrdner.cs index 67ad3c5e..b07bf89a 100644 --- a/Client/DocMgmt/DokTypFavoritenOrdner.cs +++ b/Client/DocMgmt/DokTypFavoritenOrdner.cs @@ -262,7 +262,8 @@ db=null; private void button1_Click(object sender, EventArgs e) { - + InputDialog dlg = new InputDialog(); + } } } diff --git a/Client/DocMgmt/Dokumenterstellung.Designer.cs b/Client/DocMgmt/Dokumenterstellung.Designer.cs index 0f6a3368..0e94ee5f 100644 --- a/Client/DocMgmt/Dokumenterstellung.Designer.cs +++ b/Client/DocMgmt/Dokumenterstellung.Designer.cs @@ -37,9 +37,9 @@ this.GrpFnkt = new System.Windows.Forms.GroupBox(); this.label6 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.button5 = new System.Windows.Forms.Button(); + this.ribbonButtonVersandstrasse = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); - this.button4 = new System.Windows.Forms.Button(); + this.ribbonButtonArchiv = new System.Windows.Forms.Button(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.button3 = new System.Windows.Forms.Button(); @@ -95,9 +95,9 @@ this.GrpFnkt.BackColor = System.Drawing.Color.SeaShell; this.GrpFnkt.Controls.Add(this.label6); this.GrpFnkt.Controls.Add(this.label5); - this.GrpFnkt.Controls.Add(this.button5); + this.GrpFnkt.Controls.Add(this.ribbonButtonVersandstrasse); this.GrpFnkt.Controls.Add(this.label4); - this.GrpFnkt.Controls.Add(this.button4); + this.GrpFnkt.Controls.Add(this.ribbonButtonArchiv); this.GrpFnkt.Controls.Add(this.label3); this.GrpFnkt.Controls.Add(this.label2); this.GrpFnkt.Controls.Add(this.button3); @@ -132,16 +132,16 @@ this.label5.TabIndex = 10; this.label5.Text = "Archivieren"; // - // button5 + // ribbonButtonVersandstrasse // - this.button5.Image = global::OnDoc.Properties.Resources.Versandstrasse_48x48_32; - this.button5.Location = new System.Drawing.Point(338, 15); - this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(75, 81); - this.button5.TabIndex = 9; - this.button5.TextAlign = System.Drawing.ContentAlignment.BottomCenter; - this.button5.UseVisualStyleBackColor = true; - this.button5.Click += new System.EventHandler(this.button5_Click); + this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Versandstrasse_48x48_32; + this.ribbonButtonVersandstrasse.Location = new System.Drawing.Point(338, 15); + this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse"; + this.ribbonButtonVersandstrasse.Size = new System.Drawing.Size(75, 81); + this.ribbonButtonVersandstrasse.TabIndex = 9; + this.ribbonButtonVersandstrasse.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.ribbonButtonVersandstrasse.UseVisualStyleBackColor = true; + this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.button5_Click); // // label4 // @@ -152,16 +152,16 @@ this.label4.TabIndex = 8; this.label4.Text = "Archivieren"; // - // button4 + // ribbonButtonArchiv // - this.button4.Image = ((System.Drawing.Image)(resources.GetObject("button4.Image"))); - this.button4.Location = new System.Drawing.Point(257, 16); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(75, 81); - this.button4.TabIndex = 7; - this.button4.TextAlign = System.Drawing.ContentAlignment.BottomCenter; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.button4_Click); + this.ribbonButtonArchiv.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonArchiv.Image"))); + this.ribbonButtonArchiv.Location = new System.Drawing.Point(257, 16); + this.ribbonButtonArchiv.Name = "ribbonButtonArchiv"; + this.ribbonButtonArchiv.Size = new System.Drawing.Size(75, 81); + this.ribbonButtonArchiv.TabIndex = 7; + this.ribbonButtonArchiv.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.ribbonButtonArchiv.UseVisualStyleBackColor = true; + this.ribbonButtonArchiv.Click += new System.EventHandler(this.button4_Click); // // label3 // @@ -234,6 +234,10 @@ // // ucAllgemeineDokumentParam1 // + this.ucAllgemeineDokumentParam1.ausDokumentpaket = false; + this.ucAllgemeineDokumentParam1.barcode = false; + this.ucAllgemeineDokumentParam1.bpperson_error_type = 0; + this.ucAllgemeineDokumentParam1.check_error = ""; this.ucAllgemeineDokumentParam1.checkpartner = true; clsdocgendata1.bezeichnung = null; clsdocgendata1.digitaleunterschrift = false; @@ -258,12 +262,17 @@ clsdocgendata1.zustelladresse = null; this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata1; this.ucAllgemeineDokumentParam1.dokumenttypnr = 0; + this.ucAllgemeineDokumentParam1.genertated_dokumentid = null; + this.ucAllgemeineDokumentParam1.interop = false; this.ucAllgemeineDokumentParam1.Location = new System.Drawing.Point(5, 15); this.ucAllgemeineDokumentParam1.Name = "ucAllgemeineDokumentParam1"; this.ucAllgemeineDokumentParam1.partnernr = 0; + this.ucAllgemeineDokumentParam1.personendokument = false; this.ucAllgemeineDokumentParam1.profilnr = 0; + this.ucAllgemeineDokumentParam1.runmacros = false; this.ucAllgemeineDokumentParam1.Size = new System.Drawing.Size(1047, 617); this.ucAllgemeineDokumentParam1.TabIndex = 0; + this.ucAllgemeineDokumentParam1.uniqid = "f8c10a65-c251-4f8e-9ff7-4ae4d900a268"; // // Dokumenterstellung // @@ -299,9 +308,9 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label5; - private System.Windows.Forms.Button button5; + private System.Windows.Forms.Button ribbonButtonVersandstrasse; private System.Windows.Forms.Label label4; - private System.Windows.Forms.Button button4; + private System.Windows.Forms.Button ribbonButtonArchiv; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label2; private System.Windows.Forms.Button button3; diff --git a/Client/DocMgmt/Dokumenterstellung.cs b/Client/DocMgmt/Dokumenterstellung.cs index 1c88e435..44791ea2 100644 --- a/Client/DocMgmt/Dokumenterstellung.cs +++ b/Client/DocMgmt/Dokumenterstellung.cs @@ -18,6 +18,7 @@ using OnDoc.UIControls; using BroadcastListener.Classes; using BroadcastListener.Interfaces; using static BroadcastListener.Classes.Factory; +using OnDoc.Helper; namespace OnDoc.DocMgmt { @@ -89,6 +90,9 @@ namespace OnDoc.DocMgmt //{ // btnDokumenterstellen.Enabled = false; //} + Security security = new Security(); + security.set_security(this); + security = null; } @@ -108,6 +112,7 @@ namespace OnDoc.DocMgmt DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring); string dokumentid = docgen.GenDocID(dokdata); dokdata.Dokumentid = dokumentid; + ucAllgemeineDokumentParam1.genertated_dokumentid = dokumentid; this.dokumentid=dokdata.Dokumentid; Logging.DocLog.Info("Dokumenterstellung", "frmDokumenterstellung", dokumentid, ucAllgemeineDokumentParam1.partnernr.ToString(), "Dokumenterstellung"); if (dokumentid != "") @@ -162,9 +167,9 @@ namespace OnDoc.DocMgmt } if (ucAllgemeineDokumentParam1.docgendata.versandstrasse_moeglich == true) { - button5.Enabled = true; + ribbonButtonVersandstrasse.Enabled = true; } - else { button5.Enabled = false; } + else { ribbonButtonVersandstrasse.Enabled = false; } PnlPreview.Visible = true; PnlPreview.Dock = DockStyle.Fill; @@ -173,15 +178,15 @@ namespace OnDoc.DocMgmt db1.Get_Tabledata("Select coldstatus from dokument where dokumentid='"+dokumentid+"'",false,true); if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) == 1) { - button4.Enabled = false; - button5.Enabled = false; + ribbonButtonArchiv.Enabled = false; + ribbonButtonVersandstrasse.Enabled = false; } else { - button4.Enabled = true; - button5.Enabled = true; + ribbonButtonArchiv.Enabled = true; + ribbonButtonVersandstrasse.Enabled = true; } - if (ucAllgemeineDokumentParam1.docgendata.versandstrasse_moeglich == false) { button5.Enabled = false; } + if (ucAllgemeineDokumentParam1.docgendata.versandstrasse_moeglich == false) { ribbonButtonVersandstrasse.Enabled = false; } docPreview1.Show_Doc(dokumentid); docPreview1.Hide_Editbuttons(); } diff --git a/Client/DocMgmt/Dokumenterstellung.resx b/Client/DocMgmt/Dokumenterstellung.resx index e86777c3..aff784cf 100644 --- a/Client/DocMgmt/Dokumenterstellung.resx +++ b/Client/DocMgmt/Dokumenterstellung.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAADSdJREFUaEPV WXlQVecVj2s0JtNmmsykTdMl/6RtFpPaZNJpjUnUJjOJ4sbqklRMosgmJIpRaxFREzYFwQCKu+KGOwhP diff --git a/Client/DocMgmt/Dokumentpaket.cs b/Client/DocMgmt/Dokumentpaket.cs index 2f94a8c7..e1c27db1 100644 --- a/Client/DocMgmt/Dokumentpaket.cs +++ b/Client/DocMgmt/Dokumentpaket.cs @@ -23,10 +23,13 @@ using Syncfusion.WinForms.ListView; using OnDoc.UIControls.Administrator; using System.Diagnostics; using NLog.LayoutRenderers.Wrappers; +using BroadcastListener.Classes; +using BroadcastListener.Interfaces; +using static BroadcastListener.Classes.Factory; namespace OnDoc.DocMgmt { - public partial class Dokumentpaket : SfForm + public partial class Dokumentpaket : SfForm, IMessageListener1 { private List doclist = new List(); private DataTable dokumentpaket = new DataTable(); @@ -40,17 +43,36 @@ namespace OnDoc.DocMgmt InitializeComponent(); this.Style.TitleBar.BackColor = Theaming.Titelbar(); this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + Broadcaster().AddListener(this); + Closing += Form_Closing; } - + public Dokumentpaket(int profilnr) { InitializeComponent(); this.Style.TitleBar.BackColor = Theaming.Titelbar(); this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); this.profilnr = profilnr; - + Broadcaster().AddListener(this); + Closing += Form_Closing; + } + private void Form_Closing(object sender, CancelEventArgs e) + { + Broadcaster().RemoveListener(this); } + public void OnListen(string message, SenderInfo sender) + { + if (message == "DokumentPaket") + { + if (sender.Function == "NeuGenerierung") + { + string dokumentid = sender.Details; + dokList1.dokument_loeschen(dokumentid); + Generate_Docs(dokumentid); + } + } + } private bool NeuesDokumentpaket() { DokTypSelect dt = new DokTypSelect(); @@ -352,76 +374,99 @@ namespace OnDoc.DocMgmt } return true; } - + private void RibbonButtonGenerieren_Click(object sender, EventArgs e) { - if (check_all_doks()==false) + if (check_all_doks() == false) { return; } - string filter = "dokumentid in ('"; + if (!dokList1.grid_empty()) + { + if (MessageBox.Show("Die bereits generierten Dokumente löschen?", "Generierung", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + else + { + dokList1.delete_doks_in_list(); + } + } + progressBarAdv1.Minimum = 0; progressBarAdv1.Maximum = TabControlDokuments.TabPages.Count; progressBarAdv1.Value = 0; progressBarAdv1.Visible = true; + Generate_Docs(); + } + private void Generate_Docs(string idokumentid="") { + string filter = "dokumentid in ('"; foreach (TabPageAdv tab in TabControlDokuments.TabPages) { - progressBarAdv1.Value = progressBarAdv1.Value+1; + progressBarAdv1.Value = progressBarAdv1.Value + 1; Application.DoEvents(); UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0]; - // uc.partnernr = Convert.ToInt32(txtbpnummer.Text); - uc.Set_Edit_later(); - uc.Update_DocGenData(); - clsDocData dokdata = new clsDocData(); - uc.update_dokdata(ref dokdata); - uc.update_partner(); - DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring); - string dokumentid = docgen.GenDocID(dokdata); - dokdata.Dokumentid = dokumentid; - filter = filter + dokumentid + "','"; - dokumentid = dokdata.Dokumentid; - if (dokumentid != "") + if (idokumentid == "" || uc.genertated_dokumentid == idokumentid) { - Logging.DocLog.Info("Dokument erstellt", "Dokumentpaket", dokumentid, uc.partnernr.ToString(), "Dokument erstellt"); - DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir); - clsdok dok = new clsdok("", "", ""); - dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata); - if (uc.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten) + uc.Set_Edit_later(); + uc.Update_DocGenData(); + clsDocData dokdata = new clsDocData(); + uc.update_dokdata(ref dokdata); + uc.update_partner(); + DOCGEN.DocGen docgen = new DOCGEN.DocGen(AppParams.connectionstring); + string dokumentid = docgen.GenDocID(dokdata); + dokdata.Dokumentid = dokumentid; + uc.genertated_dokumentid = dokumentid; + uc.Show_Neugenerieren(); + filter = filter + dokumentid + "','"; + dokumentid = dokdata.Dokumentid; + if (dokumentid != "") { - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - db = null; - - System.Diagnostics.Process.Start("winword.exe", filename); - clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word"); + Logging.DocLog.Info("Dokument erstellt", "Dokumentpaket", dokumentid, uc.partnernr.ToString(), "Dokument erstellt"); + DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir); + clsdok dok = new clsdok("", "", ""); + dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata); + + if (uc.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten) + { + string filename = AppParams.tempdir + dokumentid + "." + dok.extension; + System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); + DB db = new DB(AppParams.connectionstring); + db.Save_To_DB(dokdata.Dokumentid, filename); + db = null; + + System.Diagnostics.Process.Start("winword.exe", filename); + clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word"); + + } + if (uc.docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF) + { + //Generator.DocToPDF(dokumentid, ref dok); + dok.extension = "pdf"; + string filename = AppParams.tempdir + dokumentid + "." + dok.extension; + System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); + DB db = new DB(AppParams.connectionstring); + db.Save_To_DB(dokdata.Dokumentid, filename); + } + + if (uc.docgendata.erstellungsart == Erstellungsart.DokumentSpäterBearbeiten) + { + string filename = AppParams.tempdir + dokumentid + "." + dok.extension; + System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); + DB db = new DB(AppParams.connectionstring); + db.Save_To_DB(dokdata.Dokumentid, filename); + db = null; + } } - if (uc.docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF) - { - //Generator.DocToPDF(dokumentid, ref dok); - dok.extension = "pdf"; - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - } + } + else + { + filter = filter + uc.genertated_dokumentid + "','"; - if (uc.docgendata.erstellungsart == Erstellungsart.DokumentSpäterBearbeiten) - { - string filename = AppParams.tempdir + dokumentid + "." + dok.extension; - System.IO.File.WriteAllBytes(filename, Convert.FromBase64String(dok.dokument)); - DB db = new DB(AppParams.connectionstring); - db.Save_To_DB(dokdata.Dokumentid, filename); - db = null; - } - } - - } progressBarAdv1.Visible = false; filter = filter.Substring(0, filter.Length - 2) + ")"; @@ -433,6 +478,8 @@ namespace OnDoc.DocMgmt { if (!NeuesDokumentpaket()) { return; } Update_PaketDetails(); + dokList1.datafilter = "dokumentid in ('n.a.')"; + dokList1.refresh_dokumente(); } diff --git a/Client/DocMgmt/frmToApproval.cs b/Client/DocMgmt/frmToApproval.cs index cd7bce87..8590ace2 100644 --- a/Client/DocMgmt/frmToApproval.cs +++ b/Client/DocMgmt/frmToApproval.cs @@ -70,7 +70,9 @@ namespace OnDoc.DocMgmt private void btntoapproval_Click(object sender, EventArgs e) { DB dB = new DB(AppParams.connectionstring); + dB.Get_Tabledata_for_Update("select top 1 * from dokument_bewilligung where id=-2", false, true); + if (pxapproval1.Visible == false) { DataRow dr = dB.daten.Tables[0].NewRow(); @@ -110,9 +112,7 @@ namespace OnDoc.DocMgmt } if (txtnachricht.Text.Trim() != "") { - dB.insert_note(AppParams.CurrentMitarbieter, "Hinweis zur Unterschriftenprüfung", txtnachricht.Text, dokumentid); - } } diff --git a/Client/Klassen/clsProcessWatch.cs b/Client/Klassen/clsProcessWatch.cs index c73c4a7c..41a16dfa 100644 --- a/Client/Klassen/clsProcessWatch.cs +++ b/Client/Klassen/clsProcessWatch.cs @@ -8,13 +8,14 @@ using System.Threading; using System.Threading.Tasks; using System.Timers; using Database; +using Syncfusion.Windows.Forms.Tools; namespace OnDoc.Klassen { public static class clsProcessWatch { - public static System.Timers.Timer watchtimer = new System.Timers.Timer(1500); + public static System.Timers.Timer watchtimer = new System.Timers.Timer(2000); static List FilestoCheck = new List(); @@ -76,13 +77,16 @@ namespace OnDoc.Klassen if (Check_Modified(fc) == true) { Save_File(fc.dokumentid, fc.filename); + Logging.DocLog.Info("Dokument gespeichert und geschlossen", "Processwatch", fc.dokumentid, "", fc.filename); RemoveFromList(fc.dokumentid); + Remove_Dok_in_Bearbeitung(fc.dokumentid); return; } else { Logging.DocLog.Info("Dokument ohne speichern geschlossen", "Processwatch", fc.dokumentid, "", fc.filename); RemoveFromList(fc.dokumentid); + Remove_Dok_in_Bearbeitung(fc.dokumentid); return; }; } @@ -90,7 +94,12 @@ namespace OnDoc.Klassen } - + } + private static void Remove_Dok_in_Bearbeitung(string dokumentid) + { + DB db = new DB(AppParams.connectionstring); + db.Dok_in_Bearbeietung(2, dokumentid, AppParams.CurrentMitarbieter); + db = null; } private static void Save_File(string dokumentid, string filename) { @@ -100,6 +109,7 @@ namespace OnDoc.Klassen db.Save_To_DB(dokumentid, filename); db.set_approvalstate(dokumentid, false); Logging.DocLog.Info("Dokument gespeichert", "Processwatch", dokumentid, "", filename); + db = null; } private static bool Check_Modified(FileToCheck fc) diff --git a/Client/Start.Designer.cs b/Client/Start.Designer.cs index f69c755c..6eed8fa7 100644 --- a/Client/Start.Designer.cs +++ b/Client/Start.Designer.cs @@ -43,9 +43,9 @@ this.dateiToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.profilEinstellungenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.beendenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.nativVorlagenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.dokList1 = new OnDoc.UICintrols.DokList(); - this.nativVorlagenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -104,6 +104,8 @@ this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(1584, 18); this.panel1.TabIndex = 3; + this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); + this.panel1.DoubleClick += new System.EventHandler(this.panel1_DoubleClick); // // openFileDialog1 // @@ -138,7 +140,7 @@ // profilEinstellungenToolStripMenuItem // this.profilEinstellungenToolStripMenuItem.Name = "profilEinstellungenToolStripMenuItem"; - this.profilEinstellungenToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.profilEinstellungenToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.profilEinstellungenToolStripMenuItem.Text = "Profil-Einstellungen"; this.profilEinstellungenToolStripMenuItem.ToolTipText = "Anpassungen von Profilen"; this.profilEinstellungenToolStripMenuItem.Click += new System.EventHandler(this.profilEinstellungenToolStripMenuItem_Click); @@ -146,11 +148,18 @@ // beendenToolStripMenuItem // this.beendenToolStripMenuItem.Name = "beendenToolStripMenuItem"; - this.beendenToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.beendenToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.beendenToolStripMenuItem.Text = "&Beenden"; this.beendenToolStripMenuItem.ToolTipText = "Anwendung beenden"; this.beendenToolStripMenuItem.Click += new System.EventHandler(this.beendenToolStripMenuItem_Click); // + // nativVorlagenToolStripMenuItem + // + this.nativVorlagenToolStripMenuItem.Name = "nativVorlagenToolStripMenuItem"; + this.nativVorlagenToolStripMenuItem.Size = new System.Drawing.Size(98, 20); + this.nativVorlagenToolStripMenuItem.Text = "&Nativ-Vorlagen"; + this.nativVorlagenToolStripMenuItem.Click += new System.EventHandler(this.nativVorlagenToolStripMenuItem_Click); + // // contextMenuStrip1 // this.contextMenuStrip1.Name = "contextMenuStrip1"; @@ -162,24 +171,19 @@ this.dokList1.docartnr = 0; this.dokList1.Dock = System.Windows.Forms.DockStyle.Fill; this.dokList1.forMaNr = 0; + this.dokList1.interop = false; this.dokList1.Location = new System.Drawing.Point(2, 26); this.dokList1.mitarbeiternr = 0; this.dokList1.Name = "dokList1"; this.dokList1.partnernr = 0; this.dokList1.profilnr = 0; + this.dokList1.runmacros = false; this.dokList1.selected_cellvalue = null; this.dokList1.selected_dokumentid = null; this.dokList1.Size = new System.Drawing.Size(1584, 772); this.dokList1.TabIndex = 4; this.dokList1.Load += new System.EventHandler(this.dokList1_Load); // - // nativVorlagenToolStripMenuItem - // - this.nativVorlagenToolStripMenuItem.Name = "nativVorlagenToolStripMenuItem"; - this.nativVorlagenToolStripMenuItem.Size = new System.Drawing.Size(98, 20); - this.nativVorlagenToolStripMenuItem.Text = "&Nativ-Vorlagen"; - this.nativVorlagenToolStripMenuItem.Click += new System.EventHandler(this.nativVorlagenToolStripMenuItem_Click); - // // Start // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Client/Start.cs b/Client/Start.cs index a3d4ba2f..2e0e622f 100644 --- a/Client/Start.cs +++ b/Client/Start.cs @@ -71,7 +71,6 @@ namespace OnDoc //Helper.Security security = new Helper.Security(); //security.set_security(dokList1); dokList1.load_Profile(); - dokList1.load_Mitarbeiter(); dokList1.refresh_dokumente(); dokList1.set_functions(); @@ -234,5 +233,26 @@ namespace OnDoc NativVorlagen nv = new NativVorlagen(); nv.Show(); } + + private void panel1_Paint(object sender, PaintEventArgs e) + { + + } + + private void panel1_DoubleClick(object sender, EventArgs e) + { + frmLogin frmLogin = new frmLogin(); + frmLogin.ShowDialog(); + if (frmLogin.DialogResult == DialogResult.OK) + { + AppParams.CurrentMitarbieter = frmLogin.selectedmitarbeiternr; + dokList1.mitarbeiternr = AppParams.CurrentMitarbieter; + //Helper.Security security = new Helper.Security(); + //security.set_security(dokList1); + dokList1.load_Profile(); + dokList1.refresh_dokumente(); + dokList1.set_functions(); + } + } } } diff --git a/Client/UIControls/Approval.cs b/Client/UIControls/Approval.cs index 5f20bd6e..7ac2127b 100644 --- a/Client/UIControls/Approval.cs +++ b/Client/UIControls/Approval.cs @@ -175,7 +175,7 @@ namespace OnDoc.UIControls } else { - db.Exec_SQL("Update dokument set approval1=1 where dokumentid='" + dr["dokumentid"].ToString()); + db.Exec_SQL("Update dokument set approval1=1 where dokumentid='" + dr["dokumentid"].ToString()+"'"); } db = null; } diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index 4e02b3e6..1cae9d9b 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -52,7 +52,6 @@ namespace OnDoc.UICintrols this.tsbtnpreviewbottom = new System.Windows.Forms.ToolStripButton(); this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - 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(); @@ -83,12 +82,10 @@ namespace OnDoc.UICintrols this.RibbonPanelDemo = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonTest1 = new System.Windows.Forms.RibbonButton(); this.RibbonPanelSuche = new System.Windows.Forms.RibbonPanel(); - this.ribbonGroupPartner = new System.Windows.Forms.RibbonItemGroup(); - this.ribbonLabelPartner = new System.Windows.Forms.RibbonLabel(); - this.ribbonTextPartner = new System.Windows.Forms.RibbonTextBox(); - this.ribbonButtonPartnerSuche = new System.Windows.Forms.RibbonButton(); this.ribbonGroupMitarbeiter = new System.Windows.Forms.RibbonItemGroup(); - this.ribbonLabelMitarbeiter = new System.Windows.Forms.RibbonLabel(); + this.ribbonButtonGetMA = new System.Windows.Forms.RibbonButton(); + this.ribbonDokumntID = new System.Windows.Forms.RibbonButton(); + this.ribbonButton3 = 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(); @@ -114,7 +111,10 @@ namespace OnDoc.UICintrols this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton(); this.lblToApprove = new System.Windows.Forms.Label(); this.timer1 = new System.Windows.Forms.Timer(this.components); - this.cbboxMitarbeiter = new Syncfusion.WinForms.ListView.SfComboBox(); + this.RibbonGroupFilter = new System.Windows.Forms.RibbonItemGroup(); + this.RibbonFilterLabel = new System.Windows.Forms.RibbonLabel(); + this.RibbonFilterDelete = new System.Windows.Forms.RibbonButton(); + this.docPreview1 = new OnDoc.UIControls.DocPreview(); ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit(); this.ctxMenuDokList.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -123,7 +123,6 @@ namespace OnDoc.UICintrols this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); this.panel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxMitarbeiter)).BeginInit(); this.SuspendLayout(); // // sfDataGrid1 @@ -329,15 +328,6 @@ namespace OnDoc.UICintrols this.splitContainer1.SplitterDistance = 343; this.splitContainer1.TabIndex = 2; // - // 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; - // // panel2 // this.panel2.BackColor = System.Drawing.Color.WhiteSmoke; @@ -628,50 +618,51 @@ namespace OnDoc.UICintrols // // RibbonPanelSuche // - this.RibbonPanelSuche.Items.Add(this.ribbonGroupPartner); this.RibbonPanelSuche.Items.Add(this.ribbonGroupMitarbeiter); + this.RibbonPanelSuche.Items.Add(this.RibbonGroupFilter); this.RibbonPanelSuche.Name = "RibbonPanelSuche"; - this.RibbonPanelSuche.Text = "Dokumente suchen"; - // - // ribbonGroupPartner - // - this.ribbonGroupPartner.Items.Add(this.ribbonLabelPartner); - this.ribbonGroupPartner.Items.Add(this.ribbonTextPartner); - this.ribbonGroupPartner.Items.Add(this.ribbonButtonPartnerSuche); - this.ribbonGroupPartner.Name = "ribbonGroupPartner"; - // - // ribbonLabelPartner - // - this.ribbonLabelPartner.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonLabelPartner.Name = "ribbonLabelPartner"; - this.ribbonLabelPartner.Text = "Partner-Nr"; - // - // ribbonTextPartner - // - this.ribbonTextPartner.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonTextPartner.Name = "ribbonTextPartner"; - this.ribbonTextPartner.TextBoxText = ""; - this.ribbonTextPartner.TextBoxKeyDown += new System.Windows.Forms.KeyEventHandler(this.ribbonTextPartnernr_TextBoxKeyDown); - // - // ribbonButtonPartnerSuche - // - this.ribbonButtonPartnerSuche.Image = global::OnDoc.Properties.Resources.save_16x16_32; - this.ribbonButtonPartnerSuche.LargeImage = global::OnDoc.Properties.Resources.save_16x16_32; - this.ribbonButtonPartnerSuche.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonButtonPartnerSuche.Name = "ribbonButtonPartnerSuche"; - this.ribbonButtonPartnerSuche.SmallImage = global::OnDoc.Properties.Resources.Search_16x16_32; - this.ribbonButtonPartnerSuche.Click += new System.EventHandler(this.ribbonPartnerSuche_Click); + this.RibbonPanelSuche.Text = "Dokumente suchen/Filter"; // // ribbonGroupMitarbeiter // - this.ribbonGroupMitarbeiter.Items.Add(this.ribbonLabelMitarbeiter); + this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButtonGetMA); + this.ribbonGroupMitarbeiter.Items.Add(this.ribbonDokumntID); + this.ribbonGroupMitarbeiter.Items.Add(this.ribbonButton3); this.ribbonGroupMitarbeiter.Name = "ribbonGroupMitarbeiter"; - // - // ribbonLabelMitarbeiter - // - this.ribbonLabelMitarbeiter.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonLabelMitarbeiter.Name = "ribbonLabelMitarbeiter"; - this.ribbonLabelMitarbeiter.Text = "Mitarbeiter"; + this.ribbonGroupMitarbeiter.Text = ""; + // + // ribbonButtonGetMA + // + this.ribbonButtonGetMA.Image = global::OnDoc.Properties.Resources.Pprofil_24x24_32; + this.ribbonButtonGetMA.LargeImage = global::OnDoc.Properties.Resources.Pprofil_24x24_32; + this.ribbonButtonGetMA.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonButtonGetMA.MinSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium; + this.ribbonButtonGetMA.Name = "ribbonButtonGetMA"; + this.ribbonButtonGetMA.SmallImage = global::OnDoc.Properties.Resources.Pprofil_16x16_32; + this.ribbonButtonGetMA.Text = "Mitarbeiter"; + this.ribbonButtonGetMA.Click += new System.EventHandler(this.ribbonGroupMitarbeiter_Click); + // + // ribbonDokumntID + // + this.ribbonDokumntID.Image = global::OnDoc.Properties.Resources.Copy_24x24_32; + this.ribbonDokumntID.LargeImage = global::OnDoc.Properties.Resources.Copy_24x24_32; + this.ribbonDokumntID.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonDokumntID.MinSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium; + this.ribbonDokumntID.Name = "ribbonDokumntID"; + this.ribbonDokumntID.SmallImage = global::OnDoc.Properties.Resources.Copy_16x16_32; + this.ribbonDokumntID.Text = "Dokument-ID"; + this.ribbonDokumntID.Click += new System.EventHandler(this.ribbonDokumntID_Click); + // + // ribbonButton3 + // + this.ribbonButton3.Image = global::OnDoc.Properties.Resources.Connect_24x24_32; + this.ribbonButton3.LargeImage = global::OnDoc.Properties.Resources.Connect_24x24_32; + this.ribbonButton3.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonButton3.MinSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium; + this.ribbonButton3.Name = "ribbonButton3"; + this.ribbonButton3.SmallImage = global::OnDoc.Properties.Resources.Connect_16x16_32; + this.ribbonButton3.Text = "Partner"; + this.ribbonButton3.Click += new System.EventHandler(this.ribbonButton3_Click_1); // // ribbonPanelVorschau // @@ -872,26 +863,45 @@ namespace OnDoc.UICintrols this.timer1.Interval = 60000; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // - // cbboxMitarbeiter - // - this.cbboxMitarbeiter.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cbboxMitarbeiter.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.cbboxMitarbeiter.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxMitarbeiter.Location = new System.Drawing.Point(966, 73); - this.cbboxMitarbeiter.Name = "cbboxMitarbeiter"; - this.cbboxMitarbeiter.Size = new System.Drawing.Size(121, 19); - this.cbboxMitarbeiter.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); - this.cbboxMitarbeiter.Style.EditorStyle.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.cbboxMitarbeiter.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbboxMitarbeiter.TabIndex = 7; - this.cbboxMitarbeiter.TabStop = false; - this.cbboxMitarbeiter.SelectedValueChanged += new System.EventHandler(this.cbboxMitarbeiter_SelectedValueChanged); + // RibbonGroupFilter + // + this.RibbonGroupFilter.Items.Add(this.RibbonFilterLabel); + this.RibbonGroupFilter.Items.Add(this.RibbonFilterDelete); + this.RibbonGroupFilter.Name = "RibbonGroupFilter"; + this.RibbonGroupFilter.Text = ""; + // + // RibbonFilterLabel + // + this.RibbonFilterLabel.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium; + this.RibbonFilterLabel.Name = "RibbonFilterLabel"; + this.RibbonFilterLabel.Text = ""; + this.RibbonFilterLabel.ToolTip = "Gewählter Filter"; + // + // RibbonFilterDelete + // + this.RibbonFilterDelete.Image = global::OnDoc.Properties.Resources.Remove_24x24_32; + this.RibbonFilterDelete.LargeImage = global::OnDoc.Properties.Resources.Remove_24x24_32; + this.RibbonFilterDelete.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.RibbonFilterDelete.Name = "RibbonFilterDelete"; + this.RibbonFilterDelete.SmallImage = global::OnDoc.Properties.Resources.Remove_16x16_32; + this.RibbonFilterDelete.Text = "Filter löschen"; + this.RibbonFilterDelete.ToolTip = "Filter löschen"; + this.RibbonFilterDelete.Visible = false; + this.RibbonFilterDelete.Click += new System.EventHandler(this.RibbonFilterDelete_Click); + // + // 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; // // DokList // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.cbboxMitarbeiter); this.Controls.Add(this.lblToApprove); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.panel2); @@ -910,7 +920,6 @@ namespace OnDoc.UICintrols this.splitContainer1.ResumeLayout(false); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.cbboxMitarbeiter)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -976,12 +985,7 @@ namespace OnDoc.UICintrols private System.Windows.Forms.RibbonPanel RibbonPanelDemo; private System.Windows.Forms.RibbonButton RibbonButtonTest1; private System.Windows.Forms.RibbonPanel RibbonPanelSuche; - private System.Windows.Forms.RibbonItemGroup ribbonGroupPartner; - private System.Windows.Forms.RibbonLabel ribbonLabelPartner; - private System.Windows.Forms.RibbonTextBox ribbonTextPartner; - private System.Windows.Forms.RibbonButton ribbonButtonPartnerSuche; private System.Windows.Forms.RibbonItemGroup ribbonGroupMitarbeiter; - private System.Windows.Forms.RibbonLabel ribbonLabelMitarbeiter; private System.Windows.Forms.RibbonPanel ribbonPanel3; private System.Windows.Forms.RibbonButton RibbonButtonBerechtigungsgruppe; private System.Windows.Forms.RibbonButton ribbonButton2; @@ -997,9 +1001,14 @@ namespace OnDoc.UICintrols private System.Windows.Forms.RibbonButton ribbonButtonToApproval; private System.Windows.Forms.Timer timer1; private System.Windows.Forms.RibbonButton ribbonButtonRefresh_Bewilligungen; - private Syncfusion.WinForms.ListView.SfComboBox cbboxMitarbeiter; private System.Windows.Forms.RibbonPanel RibbonPanelDiverses; private System.Windows.Forms.RibbonButton ribbonButtonBCK; private System.Windows.Forms.ToolStripMenuItem wordInterOPEditToolStripMenuItem; + private System.Windows.Forms.RibbonButton ribbonButtonGetMA; + private System.Windows.Forms.RibbonButton ribbonDokumntID; + private System.Windows.Forms.RibbonButton ribbonButton3; + private System.Windows.Forms.RibbonItemGroup RibbonGroupFilter; + private System.Windows.Forms.RibbonLabel RibbonFilterLabel; + private System.Windows.Forms.RibbonButton RibbonFilterDelete; } } diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index cf5f8b3c..a74544ba 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -40,6 +40,7 @@ using NLog.Config; using OnDoc.Versandstrasse; using Windows.UI.Input.Preview.Injection; using Windows.UI.WebUI; +using Windows.ApplicationModel.VoiceCommands; @@ -54,6 +55,7 @@ namespace OnDoc.UICintrols public int profilnr { get; set; } public int mitarbeiternr { get; set; } public string selected_dokumentid { get; set; } + public string selected_partnernr { get; set; } public string selected_cellvalue { get; set; } private string vorschauposition = ""; @@ -63,6 +65,8 @@ namespace OnDoc.UICintrols public bool interop { get; set; } = false; public bool runmacros { get; set; } = false; + public string Search_Docid { get; set; } = ""; + public DokList() { System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("de-DE"); @@ -70,7 +74,7 @@ namespace OnDoc.UICintrols Broadcaster().AddListener(this); //t_functions(); pos_elements(); - + } public void OnListen(string message, SenderInfo sender) { @@ -113,25 +117,33 @@ namespace OnDoc.UICintrols } } } - public void load_Mitarbeiter() + + + public bool grid_empty() { - DB db = new DB(AppParams.connectionstring); - db.clear_parameter(); - db.Get_Tabledata("SP_Dokumentbearbeitung_Mitarbeiter", true, false); - cbboxMitarbeiter.DataSource = db.dsdaten.Tables[0]; - cbboxMitarbeiter.DisplayMember = "name"; - cbboxMitarbeiter.ValueMember = "mitarbeiternr"; - //cbboxMitarbeiter.Left=ribbonTextPartner. - //ribbonComboBoxMitarbeiter.DropDownItems.Clear(); - //foreach (System.Data.DataRow r in db.dsdaten.Tables[0].Rows) - //{ - // RibbonLabel rl = new RibbonLabel(); - // rl.Text = r["name"].ToString(); - // rl.Tag = Convert.ToInt32(r["mitarbeiternr"]); - // ribbonComboBoxMitarbeiter.DropDownItems.Add(rl); - //} + if (this.sfDataGrid1.RowCount > 0) { return false; } else return true; + } + + public bool row_selected() + { + if (grid_empty() == true) { return false; } + var records = sfDataGrid1.View.GetSelectedRecords(); + if (records.Count < 1) { return false; } + return true; } + public void delete_doks_in_list() + { + var records = this.sfDataGrid1.View.Records; + + foreach (var record in records) + { + var a = record.Data; + var b = a as DataRowView; + string dokumentid = b["dokumentid"].ToString(); + dokument_loeschen(dokumentid); + } + } public void refresh_dokumente() { if (datafilter != "") @@ -146,7 +158,7 @@ namespace OnDoc.UICintrols // profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString()); System.Data.DataTable dokumente = new System.Data.DataTable(); - dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, false); + dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, Search_Docid, false); // TableHelper.SetColumnsOrder(dokumente, "trefferliste"); TableHelper.FormatTable(ref dokumente, "trefferliste_relaunch", ref this.sfDataGrid1); @@ -165,7 +177,7 @@ namespace OnDoc.UICintrols } catch { } System.Data.DataTable dokumente = new System.Data.DataTable(); - dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, false); + dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, Search_Docid, false); dokumente.DefaultView.RowFilter = datafilter; @@ -187,7 +199,9 @@ namespace OnDoc.UICintrols var dataRow = (e.DataRow.RowData as DataRowView).Row; documentid = dataRow["dokumentid"].ToString(); selected_dokumentid = documentid; + selected_partnernr = dataRow["Partner-Nr"].ToString(); selected_cellvalue = dataRow[e.DataColumn.ColumnIndex].ToString(); + if (dataRow["Bearbeitung_Zwingend"].ToString() == "1") { RibbonButtonArchivToOnBase.Enabled = false; @@ -195,14 +209,24 @@ namespace OnDoc.UICintrols } else { - RibbonButtonArchivToOnBase.Enabled = true; - archivierenToolStripMenuItem.Enabled = true; + if (dataRow["toapprove"].ToString() == "True" && dataRow["approved"].ToString() =="False") + { + RibbonButtonArchivToOnBase.Enabled = false; + archivierenToolStripMenuItem.Enabled = false; + + } + else + { + RibbonButtonArchivToOnBase.Enabled = true; + archivierenToolStripMenuItem.Enabled = true; + } } } catch { selected_dokumentid = ""; + selected_partnernr = ""; return; } @@ -225,15 +249,34 @@ namespace OnDoc.UICintrols private void dokumentBearbeitenToolStripMenuItem_Click(object sender, EventArgs e) { + if (!row_selected()) return; dokument_bearbeiten(); } public void dokument_bearbeiten() { - clsdok dok = GetDoc(false); if (dok.dokument == "") return; - Logging.DocLog.Info("Dokument bearbeiten", "OnDoc.Doklist", selected_dokumentid, "", "Dokument bearbeiten:" + interop.ToString()); - OpenDoc(dok, true,interop, runmacros); + DB db = new DB(AppParams.connectionstring); + if (db.Dok_in_Bearbeietung(3, selected_dokumentid, AppParams.CurrentMitarbieter) == false) + { + MessageBox.Show("Das Dokument wird aktuell bearbeitet.", "Dokumentbearbeitung", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + } + + db.Get_Tabledata("Select * from dokument where dokumentid='" + selected_dokumentid + "'", false, true); + if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["verantwortlich"]) != AppParams.CurrentMitarbieter) + { + if (MessageBox.Show("Durch die Bearbeitung wird die Dokument-Verantwortung übernommen.", "Dokumentbearbieutng", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK) + { + db.Exec_SQL("Update dokument set verantwortlich=" + AppParams.CurrentMitarbieter.ToString() + " where dokumentid='" + selected_dokumentid + "'"); + Logging.DocLog.Info("Verantwortung für Bearbeitung übernommen", "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung übernommen"); + } + } + db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter); + + db = null; + Logging.DocLog.Info("Dokument bearbeiten", "Doklist", selected_dokumentid, selected_partnernr, "Dokument bearbeiten: InterOP: " + interop.ToString()); + OpenDoc(dok, true, interop, runmacros); } private clsdok GetDoc(bool AsPDF) @@ -497,6 +540,7 @@ namespace OnDoc.UICintrols if (frmnewdok.dokumentid != "") { selected_dokumentid = frmnewdok.dokumentid; + selected_partnernr = frmnewdok.partnernr.ToString(); ; interop = frmnewdok.interop; runmacros = frmnewdok.runmacros; @@ -543,7 +587,7 @@ namespace OnDoc.UICintrols refresh_dokumente(); } - private void dokument_loeschen(string dokumentid) + public void dokument_loeschen(string dokumentid) { DB db = new DB(AppParams.connectionstring); db.Exec_SQL("Delete from dokument where dokumentid='" + dokumentid + "'"); @@ -565,15 +609,18 @@ namespace OnDoc.UICintrols } - - - private void RibbonButtonZuweisen_Click(object sender, EventArgs e) { - frmDocPreview dpv = new frmDocPreview(); - dpv.Show(); - - + if (!row_selected()) return; + InputDialog ma = new InputDialog(true, "Verantwortlichkeit wechseln zu"); + ma.ShowDialog(); + if (ma.DialogResult == DialogResult.OK) + { + DB dB = new DB(AppParams.connectionstring); + dB.Exec_SQL("Update dokument set verantwortlich=" + ma.result + " where dokumentid = '" + selected_dokumentid + "'"); + dB = null; + Logging.DocLog.Info("Verantwortung zugewiesen auf " + ma.result.ToString(), "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung zugewiesen"); + } } private void RibbonButtonCreateNewPaket_Click(object sender, EventArgs e) @@ -601,8 +648,8 @@ namespace OnDoc.UICintrols this.RibbonButtonFavoriten.Visible = false; this.RibbonPanelSuche.Visible = false; this.RibbonPannelAproval.Visible = false; - this.lblToApprove.Visible = false; - this.cbboxMitarbeiter.Visible = false; + this.lblToApprove.Visible = false; + this.RibbonPanelExit.Visible = false; this.RibbonPanelProfil.Visible = false; this.RibbonPanelCreate.Visible = false; @@ -644,7 +691,7 @@ namespace OnDoc.UICintrols { e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_ToApprove_24x24_32, e.Bounds.X + 20, e.Bounds.Y); } - } + } else { e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X + 20, e.Bounds.Y); @@ -731,27 +778,6 @@ namespace OnDoc.UICintrols } - private void ribbonPartnerSuche_Click(object sender, EventArgs e) - { - Partnersuche ps = new Partnersuche(); - ps.ShowDialog(); - if (ps.DialogResult == DialogResult.OK) - { - this.partnernr = ps.partnernr; - this.ribbonTextPartner.Text = this.partnernr.ToString(); - refresh_dokumente(); - - } - } - - private void ribbonTextPartnernr_TextBoxKeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - this.partnernr = Convert.ToInt32(ribbonTextPartner.TextBoxText.Trim()); - refresh_dokumente(); - } - } private void RibbonButtonBerechtigungsgruppe_Click(object sender, EventArgs e) { @@ -844,6 +870,8 @@ namespace OnDoc.UICintrols private void ribbonButtonApproval_Click(object sender, EventArgs e) { + Refresh_Bewilligungen(); + if (this.lblToApprove.Text == "") { MessageBox.Show("Es stehen keine Dokumente zur Unterschriftenprüfung an.", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information); return; } frmBewilligung bw = new frmBewilligung(); bw.Show(); @@ -851,6 +879,9 @@ namespace OnDoc.UICintrols private void ribbonButtonToApproval_Click(object sender, EventArgs e) { + + if (!row_selected()) return; + frmToApproval fa = new frmToApproval(); fa.dokumentid = selected_dokumentid; fa.ShowDialog(); @@ -888,20 +919,15 @@ namespace OnDoc.UICintrols if (ribbon2.ActiveTab.Text != "Funktionen") { lblToApprove.Visible = false; - cbboxMitarbeiter.Visible = false; + } else { lblToApprove.Visible = true; - cbboxMitarbeiter.Visible = true; + } } - private void cbboxMitarbeiter_SelectedValueChanged(object sender, EventArgs e) - { - this.forMaNr = Convert.ToInt32(cbboxMitarbeiter.SelectedValue); - refresh_dokumente(); - } private void pos_elements() { @@ -914,8 +940,7 @@ namespace OnDoc.UICintrols lblToApprove.Left = posx + (width / 2); } else { lblToApprove.Visible = false; } - posx = ribbonTextPartner.Bounds.X; - cbboxMitarbeiter.Left = posx; + } private void ribbonButton3_Click(object sender, EventArgs e) { @@ -931,25 +956,91 @@ namespace OnDoc.UICintrols Security security = new Security(); security.set_security(this); - //pos_elements(); + security = null; + //pos_elements(); } private void ribbon2_DockChanged(object sender, EventArgs e) { - + } private void DokList_DockChanged(object sender, EventArgs e) { - + } private void wordInterOPEditToolStripMenuItem_Click(object sender, EventArgs e) { clsdok dok = GetDoc(false); if (dok.dokument == "") return; - OpenDoc(dok, true,true); + OpenDoc(dok, true, true); + } + + private void ribbonGroupMitarbeiter_Click(object sender, EventArgs e) + { + InputDialog ma = new InputDialog(true, "Verantwortlicher Mitarbeiter wählen"); + ma.ShowDialog(); + + if (ma.DialogResult == DialogResult.OK) + { + Filter_Loeschen(); + this.RibbonFilterLabel.Text = ma.resulttext; + this.forMaNr = Convert.ToInt32(ma.result); + RibbonFilterLabel.Visible = true; + RibbonFilterDelete.Visible = true; + refresh_dokumente(); + } + + } + + private void ribbonButton3_Click_1(object sender, EventArgs e) + { + Partnersuche ps = new Partnersuche(); + ps.ShowDialog(); + if (ps.DialogResult == DialogResult.OK) + { + Filter_Loeschen(); + this.partnernr = ps.partnernr; + RibbonFilterLabel.Text = ps.partnernr + " " + ps.partnerkurzname; + RibbonFilterLabel.Visible = true; + RibbonFilterDelete.Visible = true; + refresh_dokumente(); + } + } + + private void ribbonDokumntID_Click(object sender, EventArgs e) + { + InputDialog dokid = new InputDialog("Dokument-ID", "Gesuchte Dokument-ID", ""); + dokid.ShowDialog(); + if (dokid.DialogResult == DialogResult.OK) + { + Filter_Loeschen(); + Search_Docid = dokid.result; + RibbonFilterLabel.Text = dokid.result; + RibbonFilterLabel.Visible = true; + RibbonFilterDelete.Visible = true; + refresh_dokumente(); + } + + } + + private void RibbonFilterDelete_Click(object sender, EventArgs e) + { + Filter_Loeschen(); + refresh_dokumente(); + } + + private void Filter_Loeschen() + { + this.partnernr = 0; + this.forMaNr = 0; + this.Search_Docid = ""; + this.RibbonFilterLabel.Visible = false; + this.RibbonFilterLabel.Text = ""; + RibbonFilterDelete.Visible = false; + } } - + } diff --git a/Client/UIControls/Partnersuche.Designer.cs b/Client/UIControls/Partnersuche.Designer.cs index fe259f37..a6de5667 100644 --- a/Client/UIControls/Partnersuche.Designer.cs +++ b/Client/UIControls/Partnersuche.Designer.cs @@ -112,6 +112,7 @@ // // sfButton1 // + this.sfButton1.Enabled = false; this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); this.sfButton1.Location = new System.Drawing.Point(394, 343); this.sfButton1.Name = "sfButton1"; diff --git a/Client/UIControls/Partnersuche.cs b/Client/UIControls/Partnersuche.cs index a3fc72a4..a09854ac 100644 --- a/Client/UIControls/Partnersuche.cs +++ b/Client/UIControls/Partnersuche.cs @@ -32,6 +32,7 @@ namespace OnDoc.UIControls private void Form1_Load(object sender, EventArgs e) { + this.SetDesktopLocation(Cursor.Position.X, Cursor.Position.Y); trefferlistedata.DataSource = clsPartner.get_partnerliste(); try { @@ -69,6 +70,12 @@ namespace OnDoc.UIControls catch { } } catch { } + try + { + if (trefferlistedata.View.Records.Count > 0) sfButton1.Enabled = true; else sfButton1.Enabled = false; + + } + catch { sfButton1.Enabled=false; } } diff --git a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs index b3f8f1ac..ea2874b0 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs @@ -71,6 +71,7 @@ this.lblDokumentDatum = new System.Windows.Forms.Label(); this.cbboxpostzustellung = new Syncfusion.WinForms.ListView.SfComboBox(); this.lblPostzustellung = new System.Windows.Forms.Label(); + this.btnErneutGenerierung = new System.Windows.Forms.Button(); this.GrpPartner.SuspendLayout(); this.groupBox5.SuspendLayout(); this.groupBox6.SuspendLayout(); @@ -254,7 +255,7 @@ this.gridDokwertlist.Size = new System.Drawing.Size(456, 376); this.gridDokwertlist.TabIndex = 0; this.gridDokwertlist.Text = "sfDataGrid1"; - this.gridDokwertlist.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellClick); + this.gridDokwertlist.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellDoubleClick); this.gridDokwertlist.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.gridDokwertlist_CellDoubleClick); // // lblBezeichnung @@ -562,10 +563,22 @@ this.lblPostzustellung.TabIndex = 0; this.lblPostzustellung.Text = "Postzustellung"; // + // btnErneutGenerierung + // + this.btnErneutGenerierung.Location = new System.Drawing.Point(900, 64); + this.btnErneutGenerierung.Name = "btnErneutGenerierung"; + this.btnErneutGenerierung.Size = new System.Drawing.Size(138, 23); + this.btnErneutGenerierung.TabIndex = 25; + this.btnErneutGenerierung.Text = "Erneut generieren"; + this.btnErneutGenerierung.UseVisualStyleBackColor = true; + this.btnErneutGenerierung.Visible = false; + this.btnErneutGenerierung.Click += new System.EventHandler(this.btnErneutGenerierung_Click); + // // UCAllgemeineDokumentParam // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.btnErneutGenerierung); this.Controls.Add(this.GrpInhalt); this.Controls.Add(this.GrpVerwendung); this.Controls.Add(this.GrpSpezifischeWerte); @@ -654,5 +667,6 @@ private System.Windows.Forms.Label lblPostzustellung; private System.Windows.Forms.TextBox txtPartnerZusteller; private System.Windows.Forms.TextBox txtPartnerInhaber; + private System.Windows.Forms.Button btnErneutGenerierung; } } diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs index 95aa3320..e3e77241 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.cs @@ -42,7 +42,8 @@ namespace OnDoc.UIControls public bool personendokument { get; set; } = false; public string uniqid { get; set; } = Guid.NewGuid().ToString(); public bool ausDokumentpaket { get; set; } = false; - + + public string genertated_dokumentid { get; set; } public UCAllgemeineDokumentParam() { @@ -531,25 +532,14 @@ namespace OnDoc.UIControls } - private void gridDokwertlist_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) + private void btnErneutGenerierung_Click(object sender, EventArgs e) { - try - { - - if (e.DataColumn.Index == 15) - { - var selectedItem = e.DataRow; - var dataRow = (e.DataRow.RowData as DataRowView).Row; - string datenherkunft = dataRow["datenherkunft"].ToString(); - string feldtyp = dataRow["feldtyp"].ToString(); - if (datenherkunft != "") - { - dataRow["feldwert"] = data_select(datenherkunft, feldtyp); - } - } - } - catch { } + Broadcaster().Broadcast("DokumentPaket", new SenderInfo("NeuGenerierung", "NeuGenerierung", genertated_dokumentid)); + } + public void Show_Neugenerieren() + { + btnErneutGenerierung.Visible = true; } } } diff --git a/Client/bin/Debug/BarcodeLib.dll b/Client/bin/Debug/BarcodeLib.dll index 9ed7a675..f82acea5 100644 Binary files a/Client/bin/Debug/BarcodeLib.dll and b/Client/bin/Debug/BarcodeLib.dll differ diff --git a/Client/bin/Debug/BarcodeLib.pdb b/Client/bin/Debug/BarcodeLib.pdb index 5ca5b4aa..3fbcbfae 100644 Binary files a/Client/bin/Debug/BarcodeLib.pdb and b/Client/bin/Debug/BarcodeLib.pdb differ diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index 3cb8e3aa..bd32419e 100644 Binary files a/Client/bin/Debug/DOCGEN.dll and b/Client/bin/Debug/DOCGEN.dll differ diff --git a/Client/bin/Debug/DOCGEN.pdb b/Client/bin/Debug/DOCGEN.pdb index 0fcd75b1..f489da3a 100644 Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll index 88fc9f7e..c33079f1 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 ce75c478..ad0c5226 100644 Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ diff --git a/Client/bin/Debug/ExcelNet.dll b/Client/bin/Debug/ExcelNet.dll index 0084e568..87a8034a 100644 Binary files a/Client/bin/Debug/ExcelNet.dll and b/Client/bin/Debug/ExcelNet.dll differ diff --git a/Client/bin/Debug/ExcelNet.pdb b/Client/bin/Debug/ExcelNet.pdb index e4be85ac..d4f5f79d 100644 Binary files a/Client/bin/Debug/ExcelNet.pdb and b/Client/bin/Debug/ExcelNet.pdb differ diff --git a/Client/bin/Debug/Helper.dll b/Client/bin/Debug/Helper.dll index b0cf9b22..821177c5 100644 Binary files a/Client/bin/Debug/Helper.dll and b/Client/bin/Debug/Helper.dll differ diff --git a/Client/bin/Debug/Helper.pdb b/Client/bin/Debug/Helper.pdb index bda8e193..3ad377e2 100644 Binary files a/Client/bin/Debug/Helper.pdb and b/Client/bin/Debug/Helper.pdb differ diff --git a/Client/bin/Debug/Logging.dll b/Client/bin/Debug/Logging.dll index ece1e567..52e70b41 100644 Binary files a/Client/bin/Debug/Logging.dll and b/Client/bin/Debug/Logging.dll differ diff --git a/Client/bin/Debug/Logging.pdb b/Client/bin/Debug/Logging.pdb index 59d89021..e837a9d7 100644 Binary files a/Client/bin/Debug/Logging.pdb and b/Client/bin/Debug/Logging.pdb differ diff --git a/Client/bin/Debug/Model.dll b/Client/bin/Debug/Model.dll index 9961c01c..4b694900 100644 Binary files a/Client/bin/Debug/Model.dll and b/Client/bin/Debug/Model.dll differ diff --git a/Client/bin/Debug/Model.pdb b/Client/bin/Debug/Model.pdb index ccb34e26..df130a02 100644 Binary files a/Client/bin/Debug/Model.pdb and b/Client/bin/Debug/Model.pdb differ diff --git a/Client/bin/Debug/OfficePrinter.dll b/Client/bin/Debug/OfficePrinter.dll index f94fbf4e..46ee80da 100644 Binary files a/Client/bin/Debug/OfficePrinter.dll and b/Client/bin/Debug/OfficePrinter.dll differ diff --git a/Client/bin/Debug/OfficePrinter.pdb b/Client/bin/Debug/OfficePrinter.pdb index 5270d48a..79cbe1cc 100644 Binary files a/Client/bin/Debug/OfficePrinter.pdb and b/Client/bin/Debug/OfficePrinter.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 9316f259..d9181940 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 e8c542ad..1b30fc52 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/OnDocOffice.dll b/Client/bin/Debug/OnDocOffice.dll index da66295f..b4077973 100644 Binary files a/Client/bin/Debug/OnDocOffice.dll and b/Client/bin/Debug/OnDocOffice.dll differ diff --git a/Client/bin/Debug/OnDocOffice.pdb b/Client/bin/Debug/OnDocOffice.pdb index 810bc012..9e928f28 100644 Binary files a/Client/bin/Debug/OnDocOffice.pdb and b/Client/bin/Debug/OnDocOffice.pdb differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index fb541cf3..5c7305c8 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 dbf807e9..f760fe7d 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.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache index 889b0c3c..4bd9dcef 100644 Binary files a/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/Client/obj/Debug/Client.csproj.GenerateResource.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index ba6bb3ce..eecb9dce 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.Diverses.InputDialog.resources b/Client/obj/Debug/OnDoc.Diverses.InputDialog.resources index 6c05a977..746de6e5 100644 Binary files a/Client/obj/Debug/OnDoc.Diverses.InputDialog.resources and b/Client/obj/Debug/OnDoc.Diverses.InputDialog.resources differ diff --git a/Client/obj/Debug/OnDoc.DocMgmt.Dokumenterstellung.resources b/Client/obj/Debug/OnDoc.DocMgmt.Dokumenterstellung.resources index 0b71ded7..50e6fc04 100644 Binary files a/Client/obj/Debug/OnDoc.DocMgmt.Dokumenterstellung.resources and b/Client/obj/Debug/OnDoc.DocMgmt.Dokumenterstellung.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 9316f259..d9181940 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 e8c542ad..1b30fc52 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index fb541cf3..5c7305c8 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/DocGen.csproj b/DOCGEN/DocGen.csproj index 4b58bf2b..cbae1281 100644 --- a/DOCGEN/DocGen.csproj +++ b/DOCGEN/DocGen.csproj @@ -40,6 +40,10 @@ ..\packages\BitMiracle.LibTiff.NET.2.4.649\lib\net40\BitMiracle.LibTiff.NET.dll + + False + ..\Logging\bin\Debug\Logging.dll + ..\packages\NLog.5.3.2\lib\net46\NLog.dll diff --git a/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs b/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs index 811a2e74..920ae80a 100644 --- a/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs +++ b/DOCGEN/Klassen/DocGenerator_from_EDOKA.cs @@ -65,6 +65,7 @@ namespace DOCGEN.Generator //if (dok.extension.ToUpper()=="DOTM") { dok.extension = "docm"; } return dok; case "XLSM": case "XLSX": case "XLST": case "XLS": case "XLT": + case "EXCEL": SyncFExcel sfexcel = new SyncFExcel(); generate_docdata(dokumentid, ref docdata); clsdok dokexcel = new clsdok("", "", ""); diff --git a/DOCGEN/bin/Debug/BarcodeLib.dll b/DOCGEN/bin/Debug/BarcodeLib.dll index 9ed7a675..f82acea5 100644 Binary files a/DOCGEN/bin/Debug/BarcodeLib.dll and b/DOCGEN/bin/Debug/BarcodeLib.dll differ diff --git a/DOCGEN/bin/Debug/BarcodeLib.pdb b/DOCGEN/bin/Debug/BarcodeLib.pdb index 5ca5b4aa..3fbcbfae 100644 Binary files a/DOCGEN/bin/Debug/BarcodeLib.pdb and b/DOCGEN/bin/Debug/BarcodeLib.pdb differ diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index 3cb8e3aa..bd32419e 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.dll and b/DOCGEN/bin/Debug/DOCGEN.dll differ diff --git a/DOCGEN/bin/Debug/DOCGEN.pdb b/DOCGEN/bin/Debug/DOCGEN.pdb index 0fcd75b1..f489da3a 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/bin/Debug/Database.dll b/DOCGEN/bin/Debug/Database.dll index 88fc9f7e..c33079f1 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 ce75c478..ad0c5226 100644 Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ diff --git a/DOCGEN/bin/Debug/Helper.dll b/DOCGEN/bin/Debug/Helper.dll index b0cf9b22..821177c5 100644 Binary files a/DOCGEN/bin/Debug/Helper.dll and b/DOCGEN/bin/Debug/Helper.dll differ diff --git a/DOCGEN/bin/Debug/Helper.pdb b/DOCGEN/bin/Debug/Helper.pdb index bda8e193..3ad377e2 100644 Binary files a/DOCGEN/bin/Debug/Helper.pdb and b/DOCGEN/bin/Debug/Helper.pdb differ diff --git a/DOCGEN/bin/Debug/Logging.dll b/DOCGEN/bin/Debug/Logging.dll index ece1e567..52e70b41 100644 Binary files a/DOCGEN/bin/Debug/Logging.dll and b/DOCGEN/bin/Debug/Logging.dll differ diff --git a/DOCGEN/bin/Debug/Logging.pdb b/DOCGEN/bin/Debug/Logging.pdb index 59d89021..e837a9d7 100644 Binary files a/DOCGEN/bin/Debug/Logging.pdb and b/DOCGEN/bin/Debug/Logging.pdb differ diff --git a/DOCGEN/bin/Debug/Model.dll b/DOCGEN/bin/Debug/Model.dll index 9961c01c..4b694900 100644 Binary files a/DOCGEN/bin/Debug/Model.dll and b/DOCGEN/bin/Debug/Model.dll differ diff --git a/DOCGEN/bin/Debug/Model.pdb b/DOCGEN/bin/Debug/Model.pdb index ccb34e26..df130a02 100644 Binary files a/DOCGEN/bin/Debug/Model.pdb and b/DOCGEN/bin/Debug/Model.pdb differ diff --git a/DOCGEN/bin/Debug/OfficePrinter.dll b/DOCGEN/bin/Debug/OfficePrinter.dll index f94fbf4e..46ee80da 100644 Binary files a/DOCGEN/bin/Debug/OfficePrinter.dll and b/DOCGEN/bin/Debug/OfficePrinter.dll differ diff --git a/DOCGEN/bin/Debug/OfficePrinter.pdb b/DOCGEN/bin/Debug/OfficePrinter.pdb index 5270d48a..79cbe1cc 100644 Binary files a/DOCGEN/bin/Debug/OfficePrinter.pdb and b/DOCGEN/bin/Debug/OfficePrinter.pdb differ diff --git a/DOCGEN/clsDocGen.cs b/DOCGEN/clsDocGen.cs index ce85fc23..357709dc 100644 --- a/DOCGEN/clsDocGen.cs +++ b/DOCGEN/clsDocGen.cs @@ -12,6 +12,7 @@ using System.Data; using System.Runtime.CompilerServices; using Model; using Database; +using NLog.Config; namespace DOCGEN { @@ -50,6 +51,7 @@ namespace DOCGEN if (DocData.UseEDOKA_Values.ToUpper() == "TRUE") { DokumentID=db.Create_EDOKA_Doc(this.DocData); + Logging.DocLog.Info("Dokument erstellt", "DocGen", DokumentID, docdata.PartnerNr.ToString(), docdata.Ersteller.ToString()); } else { DokumentID = ""; }; return DokumentID; diff --git a/DOCGEN/obj/Debug/DOCGEN.csproj.FileListAbsolute.txt b/DOCGEN/obj/Debug/DOCGEN.csproj.FileListAbsolute.txt index 7b0df487..06d961a5 100644 --- a/DOCGEN/obj/Debug/DOCGEN.csproj.FileListAbsolute.txt +++ b/DOCGEN/obj/Debug/DOCGEN.csproj.FileListAbsolute.txt @@ -80,6 +80,7 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\BarcodeLib.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\BitMiracle.LibTiff.NET.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Database.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Helper.dll +E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Logging.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Model.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\NLog.Database.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\NLog.dll @@ -98,7 +99,6 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Memory.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Numerics.Vectors.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Text.Encoding.CodePages.dll -E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Logging.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\FastReport.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\QRCoder.dll E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\FastReport.Compat.dll @@ -110,6 +110,7 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Helper.pdb E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Model.pdb E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\BarcodeLib.pdb E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\BitMiracle.LibTiff.NET.xml +E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Logging.pdb E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\NLog.xml E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\NLog.Database.xml E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\OfficePrinter.pdb @@ -127,7 +128,6 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Memory.xml E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Numerics.Vectors.xml E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Text.Encoding.CodePages.xml -E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Logging.pdb E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\FastReport.xml E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.Up2Date E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DOCGEN.dll diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index 3cb8e3aa..bd32419e 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.dll and b/DOCGEN/obj/Debug/DOCGEN.dll differ diff --git a/DOCGEN/obj/Debug/DOCGEN.pdb b/DOCGEN/obj/Debug/DOCGEN.pdb index 0fcd75b1..f489da3a 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.pdb and b/DOCGEN/obj/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DOCGEN/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index dc2fb4f8..cb6a7087 100644 Binary files a/DOCGEN/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/DOCGEN/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index 1ce1dc23..20d5709b 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.CoreCompileInputs.cache b/DOCGEN/obj/Debug/DocGen.csproj.CoreCompileInputs.cache index 153b9768..be8c1828 100644 --- a/DOCGEN/obj/Debug/DocGen.csproj.CoreCompileInputs.cache +++ b/DOCGEN/obj/Debug/DocGen.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -3f7140442142445ad7c9f4729d84022d6770a3c001af030551ccf3bd0d40bdd3 +0a239b9ab18e54ef74fccb23ad3fd662228282573aa6dcf292e80f21c2df4095 diff --git a/Database/bin/Debug/Database.dll b/Database/bin/Debug/Database.dll index 88fc9f7e..c33079f1 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 ce75c478..ad0c5226 100644 Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ diff --git a/Database/bin/Debug/Helper.dll b/Database/bin/Debug/Helper.dll index b0cf9b22..821177c5 100644 Binary files a/Database/bin/Debug/Helper.dll and b/Database/bin/Debug/Helper.dll differ diff --git a/Database/bin/Debug/Helper.pdb b/Database/bin/Debug/Helper.pdb index bda8e193..3ad377e2 100644 Binary files a/Database/bin/Debug/Helper.pdb and b/Database/bin/Debug/Helper.pdb differ diff --git a/Database/bin/Debug/Logging.dll b/Database/bin/Debug/Logging.dll index ece1e567..52e70b41 100644 Binary files a/Database/bin/Debug/Logging.dll and b/Database/bin/Debug/Logging.dll differ diff --git a/Database/bin/Debug/Logging.pdb b/Database/bin/Debug/Logging.pdb index 59d89021..e837a9d7 100644 Binary files a/Database/bin/Debug/Logging.pdb and b/Database/bin/Debug/Logging.pdb differ diff --git a/Database/bin/Debug/Model.dll b/Database/bin/Debug/Model.dll index 9961c01c..4b694900 100644 Binary files a/Database/bin/Debug/Model.dll and b/Database/bin/Debug/Model.dll differ diff --git a/Database/bin/Debug/Model.pdb b/Database/bin/Debug/Model.pdb index ccb34e26..df130a02 100644 Binary files a/Database/bin/Debug/Model.pdb and b/Database/bin/Debug/Model.pdb differ diff --git a/Database/db.cs b/Database/db.cs index 4e6da1b1..f8f6afb4 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -13,6 +13,7 @@ using System.Security.Cryptography; using System.Diagnostics.Eventing.Reader; using Logging; using System.Configuration; +using System.Runtime.CompilerServices; @@ -660,7 +661,7 @@ namespace Database return default; } - public DataTable Get_Dokumente(int partnernr, int dokumentartnr, int profilnr, int ForMa, bool alleDokumente = false) + public DataTable Get_Dokumente(int partnernr, int dokumentartnr, int profilnr, int ForMa, string searchdocid, bool alleDokumente = false) { int i; SqlConnection conn = new SqlConnection(connectionstring); @@ -701,6 +702,8 @@ namespace Database { scmCmdToExecute.Parameters.Add(new SqlParameter("@alledokumente", SqlDbType.Int, 4, ParameterDirection.Input, true, 10, 0, "", DataRowVersion.Proposed, 0)); } + scmCmdToExecute.Parameters.Add(new SqlParameter("@searchdocid", SqlDbType.VarChar, 22, ParameterDirection.Input, true, 10, 0, "", DataRowVersion.Proposed, searchdocid)); + scmCmdToExecute.Parameters.Add(new SqlParameter("@iErrorCode", SqlDbType.Int, 4, ParameterDirection.Output, true, 10, 0, "", DataRowVersion.Proposed, 0)); //if (this.txtnrpar00.Text.Length > 0) @@ -846,6 +849,35 @@ namespace Database } } + public bool Dok_in_Bearbeietung(int typ, string dokumentid, int mitarbeiter) + { + switch (typ) + { + case 1: + string sql = "Insert DokInBearbeitung (dokumentid, mitarbeiternr,datum,erstellung,dokumentname,stationsname) "; + sql = sql + " values('" + dokumentid + "'," + mitarbeiter.ToString() + ",getdate(),'','','')"; + Exec_SQL(sql); + return true; + case 2: + Exec_SQL("Delete from dokinbearbeitung where dokumentid='" + dokumentid + "'"); + return true; + case 3: + Get_Tabledata("Select count(*) from dokinbearbeitung where dokumentid='" + dokumentid + "'",false,true); + if (Convert.ToInt32(dsdaten.Tables[0].Rows[0][0]) > 0) return false; else return true; + default: + return true; + } + if (typ == 2) + { + } else + { + string sql = "Insert DokInBearbeitung (dokumentid, mitarbeiternr,datum,erstellung,dokumentname,stationsname) "; + sql = sql + " values('" + dokumentid + "'," + mitarbeiter.ToString()+",getdate(),'','','')"; + Exec_SQL(sql); + return true; + } + + } public Boolean save_vorlage_to_db(string filename, string office_vorlage_nr) { try @@ -1041,6 +1073,7 @@ namespace Database // Creates a SqlParameter and adds it to the command + public void InsertParameter(SqlCommand command, string parameterName, string sourceColumn, diff --git a/Database/obj/Debug/Database.csproj.AssemblyReference.cache b/Database/obj/Debug/Database.csproj.AssemblyReference.cache index 33ea8b83..b7da4e52 100644 Binary files a/Database/obj/Debug/Database.csproj.AssemblyReference.cache and b/Database/obj/Debug/Database.csproj.AssemblyReference.cache differ diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll index 88fc9f7e..c33079f1 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 ce75c478..ad0c5226 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache index 04a06224..03f7deeb 100644 Binary files a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache and b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.AssemblyReference.cache differ diff --git a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.CoreCompileInputs.cache b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.CoreCompileInputs.cache index 43d64227..a59b0964 100644 --- a/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.CoreCompileInputs.cache +++ b/DocIO_Demo_SHU/obj/Debug/DocIO_Demo_SHU.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -79b0dcdb4f976f0cb9c710ab7f0e60b2f5f4a4b7ae6b3af54955a5abe8d5be80 +07f8a02c7c996fdc3d53c5a969ab9737e14502f11fd048911c0e9a6a1153c841 diff --git a/ExcelNet/bin/Debug/ExcelNet.dll b/ExcelNet/bin/Debug/ExcelNet.dll index 0084e568..87a8034a 100644 Binary files a/ExcelNet/bin/Debug/ExcelNet.dll and b/ExcelNet/bin/Debug/ExcelNet.dll differ diff --git a/ExcelNet/bin/Debug/ExcelNet.pdb b/ExcelNet/bin/Debug/ExcelNet.pdb index e4be85ac..d4f5f79d 100644 Binary files a/ExcelNet/bin/Debug/ExcelNet.pdb and b/ExcelNet/bin/Debug/ExcelNet.pdb differ diff --git a/ExcelNet/obj/Debug/ExcelNet.dll b/ExcelNet/obj/Debug/ExcelNet.dll index 0084e568..87a8034a 100644 Binary files a/ExcelNet/obj/Debug/ExcelNet.dll and b/ExcelNet/obj/Debug/ExcelNet.dll differ diff --git a/ExcelNet/obj/Debug/ExcelNet.pdb b/ExcelNet/obj/Debug/ExcelNet.pdb index e4be85ac..d4f5f79d 100644 Binary files a/ExcelNet/obj/Debug/ExcelNet.pdb and b/ExcelNet/obj/Debug/ExcelNet.pdb differ diff --git a/Helper/bin/Debug/Helper.dll b/Helper/bin/Debug/Helper.dll index b0cf9b22..821177c5 100644 Binary files a/Helper/bin/Debug/Helper.dll and b/Helper/bin/Debug/Helper.dll differ diff --git a/Helper/bin/Debug/Helper.pdb b/Helper/bin/Debug/Helper.pdb index bda8e193..3ad377e2 100644 Binary files a/Helper/bin/Debug/Helper.pdb and b/Helper/bin/Debug/Helper.pdb differ diff --git a/Helper/obj/Debug/Helper.dll b/Helper/obj/Debug/Helper.dll index b0cf9b22..821177c5 100644 Binary files a/Helper/obj/Debug/Helper.dll and b/Helper/obj/Debug/Helper.dll differ diff --git a/Helper/obj/Debug/Helper.pdb b/Helper/obj/Debug/Helper.pdb index bda8e193..3ad377e2 100644 Binary files a/Helper/obj/Debug/Helper.pdb and b/Helper/obj/Debug/Helper.pdb differ diff --git a/Logging/bin/Debug/Logging.dll b/Logging/bin/Debug/Logging.dll index ece1e567..52e70b41 100644 Binary files a/Logging/bin/Debug/Logging.dll and b/Logging/bin/Debug/Logging.dll differ diff --git a/Logging/bin/Debug/Logging.pdb b/Logging/bin/Debug/Logging.pdb index 59d89021..e837a9d7 100644 Binary files a/Logging/bin/Debug/Logging.pdb and b/Logging/bin/Debug/Logging.pdb differ diff --git a/Logging/obj/Debug/Logging.dll b/Logging/obj/Debug/Logging.dll index ece1e567..52e70b41 100644 Binary files a/Logging/obj/Debug/Logging.dll and b/Logging/obj/Debug/Logging.dll differ diff --git a/Logging/obj/Debug/Logging.pdb b/Logging/obj/Debug/Logging.pdb index 59d89021..e837a9d7 100644 Binary files a/Logging/obj/Debug/Logging.pdb and b/Logging/obj/Debug/Logging.pdb differ diff --git a/Model/bin/Debug/Model.dll b/Model/bin/Debug/Model.dll index 9961c01c..4b694900 100644 Binary files a/Model/bin/Debug/Model.dll and b/Model/bin/Debug/Model.dll differ diff --git a/Model/bin/Debug/Model.pdb b/Model/bin/Debug/Model.pdb index ccb34e26..df130a02 100644 Binary files a/Model/bin/Debug/Model.pdb and b/Model/bin/Debug/Model.pdb differ diff --git a/Model/obj/Debug/Model.dll b/Model/obj/Debug/Model.dll index 9961c01c..4b694900 100644 Binary files a/Model/obj/Debug/Model.dll and b/Model/obj/Debug/Model.dll differ diff --git a/Model/obj/Debug/Model.pdb b/Model/obj/Debug/Model.pdb index ccb34e26..df130a02 100644 Binary files a/Model/obj/Debug/Model.pdb and b/Model/obj/Debug/Model.pdb differ diff --git a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache index ac633056..d669979f 100644 Binary files a/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache and b/NativVorlagen/obj/Debug/NativVorlagen.csproj.AssemblyReference.cache differ diff --git a/NativVorlagen/obj/Debug/NativVorlagen.csproj.CoreCompileInputs.cache b/NativVorlagen/obj/Debug/NativVorlagen.csproj.CoreCompileInputs.cache index b6637d8c..71c42a05 100644 --- a/NativVorlagen/obj/Debug/NativVorlagen.csproj.CoreCompileInputs.cache +++ b/NativVorlagen/obj/Debug/NativVorlagen.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -27bcfe09cae266b6b9e968d62d8221d5f040572d4146dbc95121164155619caf +a02a47650a022c316c6846ada65e4f92fba83b4f50c9b1c219ab4d3a6c592d20 diff --git a/OfficePrinter/bin/Debug/OfficePrinter.dll b/OfficePrinter/bin/Debug/OfficePrinter.dll index f94fbf4e..46ee80da 100644 Binary files a/OfficePrinter/bin/Debug/OfficePrinter.dll and b/OfficePrinter/bin/Debug/OfficePrinter.dll differ diff --git a/OfficePrinter/bin/Debug/OfficePrinter.pdb b/OfficePrinter/bin/Debug/OfficePrinter.pdb index 5270d48a..79cbe1cc 100644 Binary files a/OfficePrinter/bin/Debug/OfficePrinter.pdb and b/OfficePrinter/bin/Debug/OfficePrinter.pdb differ diff --git a/OfficePrinter/obj/Debug/OfficePrinter.dll b/OfficePrinter/obj/Debug/OfficePrinter.dll index f94fbf4e..46ee80da 100644 Binary files a/OfficePrinter/obj/Debug/OfficePrinter.dll and b/OfficePrinter/obj/Debug/OfficePrinter.dll differ diff --git a/OfficePrinter/obj/Debug/OfficePrinter.pdb b/OfficePrinter/obj/Debug/OfficePrinter.pdb index 5270d48a..79cbe1cc 100644 Binary files a/OfficePrinter/obj/Debug/OfficePrinter.pdb and b/OfficePrinter/obj/Debug/OfficePrinter.pdb differ diff --git a/OnDoc.sln b/OnDoc.sln index 621c07d5..6fad9bee 100644 --- a/OnDoc.sln +++ b/OnDoc.sln @@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnDocOffice", "OnDocOffice\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnDocWeb", "OnDocWeb\OnDocWeb.csproj", "{EA7C978E-5E01-4377-912D-58F0DD9EDB4D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnDocMessage", "OnDocMessage\OnDocMessage.csproj", "{EEA37744-913B-42A6-9BF8-6D251CEAB4C0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -105,6 +107,10 @@ Global {EA7C978E-5E01-4377-912D-58F0DD9EDB4D}.Debug|Any CPU.Build.0 = Debug|Any CPU {EA7C978E-5E01-4377-912D-58F0DD9EDB4D}.Release|Any CPU.ActiveCfg = Release|Any CPU {EA7C978E-5E01-4377-912D-58F0DD9EDB4D}.Release|Any CPU.Build.0 = Release|Any CPU + {EEA37744-913B-42A6-9BF8-6D251CEAB4C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EEA37744-913B-42A6-9BF8-6D251CEAB4C0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EEA37744-913B-42A6-9BF8-6D251CEAB4C0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EEA37744-913B-42A6-9BF8-6D251CEAB4C0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/OnDocMessage/Class1.cs b/OnDocMessage/Class1.cs new file mode 100644 index 00000000..156bdebc --- /dev/null +++ b/OnDocMessage/Class1.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Mail; +using System.Text; +using System.Threading.Tasks; + +namespace OnDocMessage +{ + public class SendMessage + { + public void sendmessage(string empfaenger, string betreff, string mail) + { + SmtpClient client = new SmtpClient(); + + } + } +} diff --git a/OnDocMessage/OnDocMessage.csproj b/OnDocMessage/OnDocMessage.csproj new file mode 100644 index 00000000..b446ee3b --- /dev/null +++ b/OnDocMessage/OnDocMessage.csproj @@ -0,0 +1,54 @@ + + + + + Debug + AnyCPU + eea37744-913b-42a6-9bf8-6d251ceab4c0 + Library + Properties + OnDocMessage + OnDocMessage + v4.8.1 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OnDocMessage/Properties/AssemblyInfo.cs b/OnDocMessage/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..82d27207 --- /dev/null +++ b/OnDocMessage/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen über eine Assembly werden über die folgenden +// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +// die einer Assembly zugeordnet sind. +[assembly: AssemblyTitle("OnDocMessage")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("HP Inc.")] +[assembly: AssemblyProduct("OnDocMessage")] +[assembly: AssemblyCopyright("Copyright © HP Inc. 2024")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly +// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von +// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird +[assembly: Guid("eea37744-913b-42a6-9bf8-6d251ceab4c0")] + +// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, +// indem Sie "*" wie unten gezeigt eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/OnDocMessage/bin/Debug/OnDocMessage.dll b/OnDocMessage/bin/Debug/OnDocMessage.dll new file mode 100644 index 00000000..2037796f Binary files /dev/null and b/OnDocMessage/bin/Debug/OnDocMessage.dll differ diff --git a/OnDocMessage/bin/Debug/OnDocMessage.pdb b/OnDocMessage/bin/Debug/OnDocMessage.pdb new file mode 100644 index 00000000..fba5ddf8 Binary files /dev/null and b/OnDocMessage/bin/Debug/OnDocMessage.pdb differ diff --git a/OnDocMessage/obj/Debug/.NETFramework,Version=v4.8.1.AssemblyAttributes.cs b/OnDocMessage/obj/Debug/.NETFramework,Version=v4.8.1.AssemblyAttributes.cs new file mode 100644 index 00000000..0af6d869 --- /dev/null +++ b/OnDocMessage/obj/Debug/.NETFramework,Version=v4.8.1.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8.1", FrameworkDisplayName = ".NET Framework 4.8.1")] diff --git a/OnDocMessage/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/OnDocMessage/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 00000000..63d55dbd Binary files /dev/null and b/OnDocMessage/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/OnDocMessage/obj/Debug/OnDocMessage.csproj.AssemblyReference.cache b/OnDocMessage/obj/Debug/OnDocMessage.csproj.AssemblyReference.cache new file mode 100644 index 00000000..e32cfc63 Binary files /dev/null and b/OnDocMessage/obj/Debug/OnDocMessage.csproj.AssemblyReference.cache differ diff --git a/OnDocMessage/obj/Debug/OnDocMessage.csproj.CoreCompileInputs.cache b/OnDocMessage/obj/Debug/OnDocMessage.csproj.CoreCompileInputs.cache new file mode 100644 index 00000000..b02d600f --- /dev/null +++ b/OnDocMessage/obj/Debug/OnDocMessage.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +8e32e0bcca6aede1ad934c222c298e85fb9c8349f23a31df8869a9d5da9449a6 diff --git a/OnDocMessage/obj/Debug/OnDocMessage.csproj.FileListAbsolute.txt b/OnDocMessage/obj/Debug/OnDocMessage.csproj.FileListAbsolute.txt new file mode 100644 index 00000000..97a918a6 --- /dev/null +++ b/OnDocMessage/obj/Debug/OnDocMessage.csproj.FileListAbsolute.txt @@ -0,0 +1,6 @@ +E:\Software-Projekte\OnDoc\OnDoc\OnDocMessage\bin\Debug\OnDocMessage.dll +E:\Software-Projekte\OnDoc\OnDoc\OnDocMessage\bin\Debug\OnDocMessage.pdb +E:\Software-Projekte\OnDoc\OnDoc\OnDocMessage\obj\Debug\OnDocMessage.csproj.AssemblyReference.cache +E:\Software-Projekte\OnDoc\OnDoc\OnDocMessage\obj\Debug\OnDocMessage.csproj.CoreCompileInputs.cache +E:\Software-Projekte\OnDoc\OnDoc\OnDocMessage\obj\Debug\OnDocMessage.dll +E:\Software-Projekte\OnDoc\OnDoc\OnDocMessage\obj\Debug\OnDocMessage.pdb diff --git a/OnDocMessage/obj/Debug/OnDocMessage.dll b/OnDocMessage/obj/Debug/OnDocMessage.dll new file mode 100644 index 00000000..2037796f Binary files /dev/null and b/OnDocMessage/obj/Debug/OnDocMessage.dll differ diff --git a/OnDocMessage/obj/Debug/OnDocMessage.pdb b/OnDocMessage/obj/Debug/OnDocMessage.pdb new file mode 100644 index 00000000..fba5ddf8 Binary files /dev/null and b/OnDocMessage/obj/Debug/OnDocMessage.pdb differ diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll index f2032b35..0199f9a1 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 ad0322cb..29169b2d 100644 Binary files a/OnDocOffice/bin/Debug/Database.pdb and b/OnDocOffice/bin/Debug/Database.pdb differ diff --git a/OnDocOffice/bin/Debug/Helper.dll b/OnDocOffice/bin/Debug/Helper.dll index b0cf9b22..821177c5 100644 Binary files a/OnDocOffice/bin/Debug/Helper.dll and b/OnDocOffice/bin/Debug/Helper.dll differ diff --git a/OnDocOffice/bin/Debug/Helper.pdb b/OnDocOffice/bin/Debug/Helper.pdb index bda8e193..3ad377e2 100644 Binary files a/OnDocOffice/bin/Debug/Helper.pdb and b/OnDocOffice/bin/Debug/Helper.pdb differ diff --git a/OnDocOffice/bin/Debug/Logging.dll b/OnDocOffice/bin/Debug/Logging.dll index d7e5cbed..52e70b41 100644 Binary files a/OnDocOffice/bin/Debug/Logging.dll and b/OnDocOffice/bin/Debug/Logging.dll differ diff --git a/OnDocOffice/bin/Debug/Logging.pdb b/OnDocOffice/bin/Debug/Logging.pdb index 76fae643..e837a9d7 100644 Binary files a/OnDocOffice/bin/Debug/Logging.pdb and b/OnDocOffice/bin/Debug/Logging.pdb differ diff --git a/OnDocOffice/bin/Debug/Model.dll b/OnDocOffice/bin/Debug/Model.dll index 9961c01c..4b694900 100644 Binary files a/OnDocOffice/bin/Debug/Model.dll and b/OnDocOffice/bin/Debug/Model.dll differ diff --git a/OnDocOffice/bin/Debug/Model.pdb b/OnDocOffice/bin/Debug/Model.pdb index ccb34e26..df130a02 100644 Binary files a/OnDocOffice/bin/Debug/Model.pdb and b/OnDocOffice/bin/Debug/Model.pdb differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.dll b/OnDocOffice/bin/Debug/OnDocOffice.dll index da66295f..b4077973 100644 Binary files a/OnDocOffice/bin/Debug/OnDocOffice.dll and b/OnDocOffice/bin/Debug/OnDocOffice.dll differ diff --git a/OnDocOffice/bin/Debug/OnDocOffice.pdb b/OnDocOffice/bin/Debug/OnDocOffice.pdb index 810bc012..9e928f28 100644 Binary files a/OnDocOffice/bin/Debug/OnDocOffice.pdb and b/OnDocOffice/bin/Debug/OnDocOffice.pdb differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index cbd60297..1c85c201 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.dll b/OnDocOffice/obj/Debug/OnDocOffice.dll index da66295f..b4077973 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.dll and b/OnDocOffice/obj/Debug/OnDocOffice.dll differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.pdb b/OnDocOffice/obj/Debug/OnDocOffice.pdb index 810bc012..9e928f28 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.pdb and b/OnDocOffice/obj/Debug/OnDocOffice.pdb differ diff --git a/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.dll b/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.dll index 0a68759f..b0ce142c 100644 Binary files a/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.dll and b/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.dll differ diff --git a/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.exe b/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.exe index 149a5223..7af9826b 100644 Binary files a/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.exe and b/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.exe differ diff --git a/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.pdb b/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.pdb index 9d1639f5..1bd48d96 100644 Binary files a/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.pdb and b/OnDocWPF/bin/Debug/net8.0-windows/OnDocWPF.pdb differ diff --git a/OnDocWPF/obj/Debug/net8.0-windows/App.g.cs b/OnDocWPF/obj/Debug/net8.0-windows/App.g.cs index 4e40f292..7d432e25 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/App.g.cs +++ b/OnDocWPF/obj/Debug/net8.0-windows/App.g.cs @@ -45,7 +45,7 @@ namespace OnDocWPF { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.8.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.10.0")] public void InitializeComponent() { #line 5 "..\..\..\App.xaml" @@ -60,7 +60,7 @@ namespace OnDocWPF { /// [System.STAThreadAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.8.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.10.0")] public static void Main() { OnDocWPF.App app = new OnDocWPF.App(); app.InitializeComponent(); diff --git a/OnDocWPF/obj/Debug/net8.0-windows/App.g.i.cs b/OnDocWPF/obj/Debug/net8.0-windows/App.g.i.cs index 4e40f292..7d432e25 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/App.g.i.cs +++ b/OnDocWPF/obj/Debug/net8.0-windows/App.g.i.cs @@ -45,7 +45,7 @@ namespace OnDocWPF { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.8.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.10.0")] public void InitializeComponent() { #line 5 "..\..\..\App.xaml" @@ -60,7 +60,7 @@ namespace OnDocWPF { /// [System.STAThreadAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.8.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.10.0")] public static void Main() { OnDocWPF.App app = new OnDocWPF.App(); app.InitializeComponent(); diff --git a/OnDocWPF/obj/Debug/net8.0-windows/MainWindow.g.cs b/OnDocWPF/obj/Debug/net8.0-windows/MainWindow.g.cs index 40b465c6..3e0bac19 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/MainWindow.g.cs +++ b/OnDocWPF/obj/Debug/net8.0-windows/MainWindow.g.cs @@ -102,7 +102,7 @@ namespace OnDocWPF { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.8.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.10.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -118,7 +118,7 @@ namespace OnDocWPF { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.8.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.10.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/OnDocWPF/obj/Debug/net8.0-windows/MainWindow.g.i.cs b/OnDocWPF/obj/Debug/net8.0-windows/MainWindow.g.i.cs index 40b465c6..3e0bac19 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/MainWindow.g.i.cs +++ b/OnDocWPF/obj/Debug/net8.0-windows/MainWindow.g.i.cs @@ -102,7 +102,7 @@ namespace OnDocWPF { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.8.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.10.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -118,7 +118,7 @@ namespace OnDocWPF { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.8.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.10.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs index e703ccbb..0b38473d 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+765a5ef3500c2d815bf0f357a960871f926d12e4")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b8a392b514686d3e1c1eb66bbb812263c44e35ec")] [assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache index 50d7d62d..5caf1cc5 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache @@ -1 +1 @@ -1aae5a07c5ffa583d756440e543a072b7fc0c40ee0d79d7c2c45fc0641550fc9 +16f32e0062767c3d45768b513fecd28174b6da6eafef8f8213a75a1d9c1d6e46 diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.csproj.CoreCompileInputs.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.csproj.CoreCompileInputs.cache index 4dc59c3e..8e61864b 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.csproj.CoreCompileInputs.cache +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -daa2de21cc93f722c01b4eb298a0ed656697515531c794577d378d2622d019bc +5783be0ff1e3dc416ba5a01ff1cd5f97812c3738bea64ba18d9b6718d925f16a diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.dll b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.dll index 0a68759f..b0ce142c 100644 Binary files a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.dll and b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.dll differ diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.pdb b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.pdb index 9d1639f5..1bd48d96 100644 Binary files a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.pdb and b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.pdb differ diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_MarkupCompile.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_MarkupCompile.cache index 3049ccd2..61cfee5e 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_MarkupCompile.cache +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_MarkupCompile.cache @@ -13,7 +13,7 @@ E:\Software-Projekte\OnDoc\OnDoc\OnDocWPF\App.xaml 11407045341 4-1737078657 -292-2000897861 +292-320235837 MainWindow.xaml; False diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_MarkupCompile.i.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_MarkupCompile.i.cache index c8093ac5..253754da 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_MarkupCompile.i.cache +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_MarkupCompile.i.cache @@ -13,7 +13,7 @@ E:\Software-Projekte\OnDoc\OnDoc\OnDocWPF\App.xaml 11407045341 6309023871 -292-2000897861 +292-320235837 MainWindow.xaml; False diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.AssemblyInfo.cs b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..0b38473d --- /dev/null +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b8a392b514686d3e1c1eb66bbb812263c44e35ec")] +[assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")] +[assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// Von der MSBuild WriteCodeFragment-Klasse generiert. + diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.AssemblyInfoInputs.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..5caf1cc5 --- /dev/null +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +16f32e0062767c3d45768b513fecd28174b6da6eafef8f8213a75a1d9c1d6e46 diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..c64d9d87 --- /dev/null +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,13 @@ +is_global = true +build_property.TargetFramework = net8.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = OnDocWPF_czjmzo12_wpftmp +build_property.ProjectDir = E:\Software-Projekte\OnDoc\OnDoc\OnDocWPF\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.GlobalUsings.g.cs b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.GlobalUsings.g.cs new file mode 100644 index 00000000..08bb19f9 --- /dev/null +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.GlobalUsings.g.cs @@ -0,0 +1,6 @@ +// +global using global::System; +global using global::System.Collections.Generic; +global using global::System.Linq; +global using global::System.Threading; +global using global::System.Threading.Tasks; diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.assets.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.assets.cache new file mode 100644 index 00000000..9d6cfd18 Binary files /dev/null and b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_czjmzo12_wpftmp.assets.cache differ diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.AssemblyInfo.cs b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..0b38473d --- /dev/null +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b8a392b514686d3e1c1eb66bbb812263c44e35ec")] +[assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")] +[assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// Von der MSBuild WriteCodeFragment-Klasse generiert. + diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.AssemblyInfoInputs.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..5caf1cc5 --- /dev/null +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +16f32e0062767c3d45768b513fecd28174b6da6eafef8f8213a75a1d9c1d6e46 diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..00bff28a --- /dev/null +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,13 @@ +is_global = true +build_property.TargetFramework = net8.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = OnDocWPF_n14xyqfo_wpftmp +build_property.ProjectDir = E:\Software-Projekte\OnDoc\OnDoc\OnDocWPF\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.GlobalUsings.g.cs b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.GlobalUsings.g.cs new file mode 100644 index 00000000..08bb19f9 --- /dev/null +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.GlobalUsings.g.cs @@ -0,0 +1,6 @@ +// +global using global::System; +global using global::System.Collections.Generic; +global using global::System.Linq; +global using global::System.Threading; +global using global::System.Threading.Tasks; diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.assets.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.assets.cache new file mode 100644 index 00000000..39ae6c3f Binary files /dev/null and b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF_n14xyqfo_wpftmp.assets.cache differ diff --git a/OnDocWPF/obj/Debug/net8.0-windows/apphost.exe b/OnDocWPF/obj/Debug/net8.0-windows/apphost.exe index 149a5223..7af9826b 100644 Binary files a/OnDocWPF/obj/Debug/net8.0-windows/apphost.exe and b/OnDocWPF/obj/Debug/net8.0-windows/apphost.exe differ diff --git a/OnDocWPF/obj/Debug/net8.0-windows/ref/OnDocWPF.dll b/OnDocWPF/obj/Debug/net8.0-windows/ref/OnDocWPF.dll index 5b628e72..b29a9e9e 100644 Binary files a/OnDocWPF/obj/Debug/net8.0-windows/ref/OnDocWPF.dll and b/OnDocWPF/obj/Debug/net8.0-windows/ref/OnDocWPF.dll differ diff --git a/OnDocWPF/obj/Debug/net8.0-windows/refint/OnDocWPF.dll b/OnDocWPF/obj/Debug/net8.0-windows/refint/OnDocWPF.dll index 5b628e72..b29a9e9e 100644 Binary files a/OnDocWPF/obj/Debug/net8.0-windows/refint/OnDocWPF.dll and b/OnDocWPF/obj/Debug/net8.0-windows/refint/OnDocWPF.dll differ diff --git a/OnDocWPF/obj/OnDocWPF.csproj.nuget.dgspec.json b/OnDocWPF/obj/OnDocWPF.csproj.nuget.dgspec.json index f6dc4a05..5529f1e3 100644 --- a/OnDocWPF/obj/OnDocWPF.csproj.nuget.dgspec.json +++ b/OnDocWPF/obj/OnDocWPF.csproj.nuget.dgspec.json @@ -83,7 +83,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.304/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.306/PortableRuntimeIdentifierGraph.json" } } } diff --git a/OnDocWPF/obj/project.assets.json b/OnDocWPF/obj/project.assets.json index 74dde55c..1a789b1e 100644 --- a/OnDocWPF/obj/project.assets.json +++ b/OnDocWPF/obj/project.assets.json @@ -902,7 +902,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.304/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.306/PortableRuntimeIdentifierGraph.json" } } } diff --git a/OnDocWPF/obj/project.nuget.cache b/OnDocWPF/obj/project.nuget.cache index e603d2fd..da9a9010 100644 --- a/OnDocWPF/obj/project.nuget.cache +++ b/OnDocWPF/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "krp2BkoPh68=", + "dgSpecHash": "4KcG+NltZ1Y=", "success": true, "projectFilePath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\OnDocWPF\\OnDocWPF.csproj", "expectedPackageFiles": [ diff --git a/OnDocWeb/bin/OnDocWeb.dll b/OnDocWeb/bin/OnDocWeb.dll index 33403c0d..45ba4d34 100644 Binary files a/OnDocWeb/bin/OnDocWeb.dll and b/OnDocWeb/bin/OnDocWeb.dll differ diff --git a/OnDocWeb/bin/OnDocWeb.pdb b/OnDocWeb/bin/OnDocWeb.pdb index 14772331..6aee9ffe 100644 Binary files a/OnDocWeb/bin/OnDocWeb.pdb and b/OnDocWeb/bin/OnDocWeb.pdb differ diff --git a/OnDocWeb/obj/Debug/OnDocWeb.csproj.AssemblyReference.cache b/OnDocWeb/obj/Debug/OnDocWeb.csproj.AssemblyReference.cache index 0569d7fb..168086d3 100644 Binary files a/OnDocWeb/obj/Debug/OnDocWeb.csproj.AssemblyReference.cache and b/OnDocWeb/obj/Debug/OnDocWeb.csproj.AssemblyReference.cache differ diff --git a/OnDocWeb/obj/Debug/OnDocWeb.dll b/OnDocWeb/obj/Debug/OnDocWeb.dll index 33403c0d..45ba4d34 100644 Binary files a/OnDocWeb/obj/Debug/OnDocWeb.dll and b/OnDocWeb/obj/Debug/OnDocWeb.dll differ diff --git a/OnDocWeb/obj/Debug/OnDocWeb.pdb b/OnDocWeb/obj/Debug/OnDocWeb.pdb index 14772331..6aee9ffe 100644 Binary files a/OnDocWeb/obj/Debug/OnDocWeb.pdb and b/OnDocWeb/obj/Debug/OnDocWeb.pdb differ