diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll index fce1e02f..fbbe3f94 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 531e8b2e..921de626 100644 Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index 743dfc8b..731a3194 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 45b2ff86..aa4038c3 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index 289d5401..f57b523d 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -22160,3 +22160,15 @@ done 2025-07-29 17:40:25.7927|DEBUG|OnDoc| 2025-07-29 17:44:05.3089|DEBUG|OnDoc| 2025-07-29 17:44:05.3440|DEBUG|OnDoc| +2025-07-30 09:30:28.2023|DEBUG|OnDoc| +2025-07-30 09:30:28.2687|DEBUG|OnDoc| +2025-07-30 09:32:02.0922|DEBUG|OnDoc| +2025-07-30 09:32:02.1267|DEBUG|OnDoc| +2025-07-30 09:34:24.3400|DEBUG|OnDoc| +2025-07-30 09:34:24.3773|DEBUG|OnDoc| +2025-07-30 09:35:01.1074|DEBUG|OnDoc| +2025-07-30 09:35:01.1683|DEBUG|OnDoc| +2025-07-30 09:36:07.9436|DEBUG|OnDoc| +2025-07-30 09:36:07.9787|DEBUG|OnDoc| +2025-07-30 09:37:31.5283|DEBUG|OnDoc| +2025-07-30 09:37:31.5856|DEBUG|OnDoc| diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index f1320850..d2917432 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 743dfc8b..731a3194 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 45b2ff86..aa4038c3 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll index fce1e02f..fbbe3f94 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 531e8b2e..921de626 100644 Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index ac501d1c..295ec364 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/Client/Client.csproj b/Client/Client.csproj index f1657492..b7f77d24 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -656,6 +656,12 @@ AdminDokTypGenerierung.cs + + Form + + + Admin_Taableeditor.cs + Form @@ -881,6 +887,9 @@ AdminDokTypGenerierung.cs Designer + + Admin_Taableeditor.cs + Dokumenttyp.cs diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index cb4a26c9..58de0577 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -54,7 +54,7 @@ this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(122, 26); this.label1.TabIndex = 1; - this.label1.Text = "Version 1.6"; + this.label1.Text = "Version 1.7"; // // label2 // @@ -64,7 +64,7 @@ this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(135, 26); this.label2.TabIndex = 2; - this.label2.Text = "29. Juli 2025"; + this.label2.Text = "30. Juli 2025"; this.label2.Click += new System.EventHandler(this.label2_Click); // // SplashScreen diff --git a/Client/UIControls/Administrator/Admin_Taableeditor.Designer.cs b/Client/UIControls/Administrator/Admin_Taableeditor.Designer.cs new file mode 100644 index 00000000..791bf910 --- /dev/null +++ b/Client/UIControls/Administrator/Admin_Taableeditor.Designer.cs @@ -0,0 +1,78 @@ +namespace OnDoc.UIControls.Administrator +{ + partial class Admin_Taableeditor + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.listBox1 = new System.Windows.Forms.ListBox(); + this.groupBox1.SuspendLayout(); + this.SuspendLayout(); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.listBox1); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox1.Location = new System.Drawing.Point(2, 2); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(327, 514); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Tabellen"; + // + // listBox1 + // + this.listBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.listBox1.FormattingEnabled = true; + this.listBox1.Location = new System.Drawing.Point(3, 16); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(321, 495); + this.listBox1.TabIndex = 0; + this.listBox1.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged); + // + // Admin_Taableeditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(331, 518); + this.Controls.Add(this.groupBox1); + this.Name = "Admin_Taableeditor"; + this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; + this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; + this.Text = "Admin_TabellenEditor"; + this.Load += new System.EventHandler(this.Admin_Taableeditor_Load); + this.groupBox1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.ListBox listBox1; + } +} \ No newline at end of file diff --git a/Client/UIControls/Administrator/Admin_Taableeditor.cs b/Client/UIControls/Administrator/Admin_Taableeditor.cs new file mode 100644 index 00000000..ab38fe9b --- /dev/null +++ b/Client/UIControls/Administrator/Admin_Taableeditor.cs @@ -0,0 +1,80 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Database; +using OnDoc.Klassen; +using Syncfusion.Windows.Forms.Tools; +using Syncfusion.WinForms.Controls; + +namespace OnDoc.UIControls.Administrator +{ + public partial class Admin_Taableeditor : SfForm + { + public string TableName { get; set; } = ""; + Database.DB db = new Database.DB(AppParams.connectionstring); + DataTable tables = new DataTable(); + public Admin_Taableeditor() + { + InitializeComponent(); + this.Style.TitleBar.BackColor = Theaming.Titelbar(); + this.Style.TitleBar.ForeColor = Theaming.TitelFontColor(); + this.Style.ShadowOpacity = Theaming.ShadowOpacity; + this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; + } + + private void Admin_Taableeditor_Load(object sender, EventArgs e) + { + db.Get_Tabledata("Select * from ondoc_admin_tables", false, true); + tables = db.dsdaten.Tables[0].Copy(); + foreach (DataRow dr in tables.Rows) + { + listBox1.Items.Add(dr["beschreibung"].ToString()); + } + + //update_data(); + } + + + + private void toolStripButton2_Click(object sender, EventArgs e) + { + db.Update_Data(); + ToastMessage.ShowToast("Speichern", "Daten erfolgreich gespeichert"); + } + + private void listBox1_SelectedIndexChanged(object sender, EventArgs e) + { + try + { + foreach (DataRow dr in tables.Rows) + { + if (dr["beschreibung"].ToString()== listBox1.SelectedItem.ToString()) + { + TableEditor te = new TableEditor(); + if (dr["SQL"].ToString().Length > 10) { te.SQL = dr["sql"].ToString(); } + te.TableName= dr["tablename"].ToString(); + if (Convert.ToInt32(dr["AllowDelete"]) == 0) { te.deletemode(false); } else { te.deletemode(true); } + if (Convert.ToInt32(dr["AllowEdit"]) == 0) { te.editmode(false); } else { te.editmode(true); } + if (Convert.ToInt32(dr["AllowaddNew"]) == 0) { te.addmode(false); } else { te.addmode(true); } + te.Show(); + //update_data(); + //if (Convert.ToInt32(dr["AllowDelete"]) == 0) { sfDataGrid1.AllowDeleting = false; } else { sfDataGrid1.AllowDeleting = true;} + + //if (Convert.ToInt32(dr["AllowEdit"]) == 0) { sfDataGrid1.AllowEditing = false; } else { sfDataGrid1.AllowEditing = true; } + + //if (Convert.ToInt32(dr["AllowAddNew"]) == 0) { sfDataGrid. = false; } else { sfDataGrid1.AllowEditing = true; } + } + } + //TableName = listBox1.SelectedItem.ToString(); + //update_data(); + } + catch { } + } + } +} diff --git a/Client/UIControls/Administrator/Admin_Taableeditor.resx b/Client/UIControls/Administrator/Admin_Taableeditor.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/Client/UIControls/Administrator/Admin_Taableeditor.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs index a8e9f6af..f2979110 100644 --- a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs +++ b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs @@ -43,6 +43,7 @@ this.tabControlAdv1 = new Syncfusion.Windows.Forms.Tools.TabControlAdv(); this.tabPageAdv1 = new Syncfusion.Windows.Forms.Tools.TabPageAdv(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.chkversandstrassefirstdok = new System.Windows.Forms.CheckBox(); this.cbebanking_moeglich = new System.Windows.Forms.CheckBox(); this.cbversandstrasse_moeglich = new System.Windows.Forms.CheckBox(); this.toolStrip2 = new System.Windows.Forms.ToolStrip(); @@ -148,7 +149,6 @@ this.label16 = new System.Windows.Forms.Label(); this.rbNr = new System.Windows.Forms.RadioButton(); this.label15 = new System.Windows.Forms.Label(); - this.chkversandstrassefirstdok = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit(); this.tabControlAdv1.SuspendLayout(); this.tabPageAdv1.SuspendLayout(); @@ -222,12 +222,22 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "Versandstrasse"; // + // chkversandstrassefirstdok + // + this.chkversandstrassefirstdok.AutoSize = true; + this.chkversandstrassefirstdok.Location = new System.Drawing.Point(163, 20); + this.chkversandstrassefirstdok.Name = "chkversandstrassefirstdok"; + this.chkversandstrassefirstdok.Size = new System.Drawing.Size(162, 17); + this.chkversandstrassefirstdok.TabIndex = 2; + this.chkversandstrassefirstdok.Text = "Als erstes Dokument möglich"; + this.chkversandstrassefirstdok.UseVisualStyleBackColor = true; + // // cbebanking_moeglich // this.cbebanking_moeglich.AutoSize = true; this.cbebanking_moeglich.Location = new System.Drawing.Point(19, 43); this.cbebanking_moeglich.Name = "cbebanking_moeglich"; - this.cbebanking_moeglich.Size = new System.Drawing.Size(152, 19); + this.cbebanking_moeglich.Size = new System.Drawing.Size(131, 17); this.cbebanking_moeglich.TabIndex = 1; this.cbebanking_moeglich.Text = "E-Banking zugelassen"; this.cbebanking_moeglich.UseVisualStyleBackColor = true; @@ -237,7 +247,7 @@ this.cbversandstrasse_moeglich.AutoSize = true; this.cbversandstrasse_moeglich.Location = new System.Drawing.Point(19, 20); this.cbversandstrasse_moeglich.Name = "cbversandstrasse_moeglich"; - this.cbversandstrasse_moeglich.Size = new System.Drawing.Size(92, 19); + this.cbversandstrasse_moeglich.Size = new System.Drawing.Size(79, 17); this.cbversandstrasse_moeglich.TabIndex = 0; this.cbversandstrasse_moeglich.Text = "zugelassen"; this.cbversandstrasse_moeglich.UseVisualStyleBackColor = true; @@ -273,7 +283,7 @@ this.tsbtncopy.Image = global::OnDoc.Properties.Resources.Copy_16x16_32; this.tsbtncopy.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbtncopy.Name = "tsbtncopy"; - this.tsbtncopy.Size = new System.Drawing.Size(29, 39); + this.tsbtncopy.Size = new System.Drawing.Size(24, 39); this.tsbtncopy.Text = "Dokumenttyp kopieren"; this.tsbtncopy.Click += new System.EventHandler(this.tsbtncopy_Click); // @@ -283,7 +293,7 @@ this.toolStripButton3.Image = global::OnDoc.Properties.Resources.officevorlage_16x16_32; this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(29, 39); + this.toolStripButton3.Size = new System.Drawing.Size(24, 39); this.toolStripButton3.Text = "Vorlage anzeigen"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // @@ -307,7 +317,7 @@ this.lblStandard.AutoSize = true; this.lblStandard.Location = new System.Drawing.Point(336, 28); this.lblStandard.Name = "lblStandard"; - this.lblStandard.Size = new System.Drawing.Size(57, 15); + this.lblStandard.Size = new System.Drawing.Size(50, 13); this.lblStandard.TabIndex = 26; this.lblStandard.Text = "Standard"; this.lblStandard.Visible = false; @@ -373,7 +383,7 @@ this.cbUnterschriftpruefung.AutoSize = true; this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 19); this.cbUnterschriftpruefung.Name = "cbUnterschriftpruefung"; - this.cbUnterschriftpruefung.Size = new System.Drawing.Size(203, 19); + this.cbUnterschriftpruefung.Size = new System.Drawing.Size(176, 17); this.cbUnterschriftpruefung.TabIndex = 1; this.cbUnterschriftpruefung.Text = "Unterschriftenprüfung zwingend"; this.cbUnterschriftpruefung.UseVisualStyleBackColor = true; @@ -383,7 +393,7 @@ this.chkBewilliigungZwingend.AutoSize = true; this.chkBewilliigungZwingend.Location = new System.Drawing.Point(277, 19); this.chkBewilliigungZwingend.Name = "chkBewilliigungZwingend"; - this.chkBewilliigungZwingend.Size = new System.Drawing.Size(209, 19); + this.chkBewilliigungZwingend.Size = new System.Drawing.Size(179, 17); this.chkBewilliigungZwingend.TabIndex = 0; this.chkBewilliigungZwingend.Text = "Bewilligung Dokument zwingend"; this.chkBewilliigungZwingend.UseVisualStyleBackColor = true; @@ -413,7 +423,7 @@ this.label18.AutoSize = true; this.label18.Location = new System.Drawing.Point(277, 13); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(126, 15); + this.label18.Size = new System.Drawing.Size(105, 13); this.label18.TabIndex = 29; this.label18.Text = "Kompatibilitätsmodus"; // @@ -422,7 +432,7 @@ this.chkfilloffice.AutoSize = true; this.chkfilloffice.Location = new System.Drawing.Point(277, 63); this.chkfilloffice.Name = "chkfilloffice"; - this.chkfilloffice.Size = new System.Drawing.Size(135, 19); + this.chkfilloffice.Size = new System.Drawing.Size(117, 17); this.chkfilloffice.TabIndex = 28; this.chkfilloffice.Text = "Befüllung mit Office"; this.chkfilloffice.UseVisualStyleBackColor = true; @@ -685,7 +695,7 @@ this.rbDokumenterstellungPerson.AutoSize = true; this.rbDokumenterstellungPerson.Location = new System.Drawing.Point(293, 32); this.rbDokumenterstellungPerson.Name = "rbDokumenterstellungPerson"; - this.rbDokumenterstellungPerson.Size = new System.Drawing.Size(181, 19); + this.rbDokumenterstellungPerson.Size = new System.Drawing.Size(155, 17); this.rbDokumenterstellungPerson.TabIndex = 22; this.rbDokumenterstellungPerson.Text = "Dokumenterstellung Person"; this.rbDokumenterstellungPerson.UseVisualStyleBackColor = true; @@ -696,7 +706,7 @@ this.rbDokumenterstellungBP.Checked = true; this.rbDokumenterstellungBP.Location = new System.Drawing.Point(293, 13); this.rbDokumenterstellungBP.Name = "rbDokumenterstellungBP"; - this.rbDokumenterstellungBP.Size = new System.Drawing.Size(158, 19); + this.rbDokumenterstellungBP.Size = new System.Drawing.Size(136, 17); this.rbDokumenterstellungBP.TabIndex = 21; this.rbDokumenterstellungBP.TabStop = true; this.rbDokumenterstellungBP.Text = "Dokumenterstellung BP"; @@ -729,8 +739,8 @@ // Grp1 // this.Grp1.Controls.Add(this.label17); - this.Grp1.Controls.Add(this.cbboxarchiv); this.Grp1.Controls.Add(this.cbboxFachverantwortung); + this.Grp1.Controls.Add(this.cbboxarchiv); this.Grp1.Controls.Add(this.cbboxOwner); this.Grp1.Controls.Add(this.cbboxofficevorlage); this.Grp1.Controls.Add(this.txtFachverantwortung); @@ -773,13 +783,14 @@ // this.cbboxFachverantwortung.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cbboxFachverantwortung.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center; - this.cbboxFachverantwortung.Location = new System.Drawing.Point(120, 136); + this.cbboxFachverantwortung.Location = new System.Drawing.Point(331, 137); this.cbboxFachverantwortung.Name = "cbboxFachverantwortung"; - this.cbboxFachverantwortung.Size = new System.Drawing.Size(336, 25); + this.cbboxFachverantwortung.Size = new System.Drawing.Size(141, 25); this.cbboxFachverantwortung.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cbboxFachverantwortung.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.cbboxFachverantwortung.TabIndex = 28; this.cbboxFachverantwortung.TabStop = false; + this.cbboxFachverantwortung.Visible = false; // // cbboxOwner // @@ -806,11 +817,10 @@ // // txtFachverantwortung // - this.txtFachverantwortung.Location = new System.Drawing.Point(102, 109); + this.txtFachverantwortung.Location = new System.Drawing.Point(118, 139); this.txtFachverantwortung.Name = "txtFachverantwortung"; - this.txtFachverantwortung.Size = new System.Drawing.Size(14, 20); + this.txtFachverantwortung.Size = new System.Drawing.Size(336, 20); this.txtFachverantwortung.TabIndex = 17; - this.txtFachverantwortung.Visible = false; // // Label34 // @@ -822,7 +832,7 @@ // // Label26 // - this.Label26.Location = new System.Drawing.Point(16, 117); + this.Label26.Location = new System.Drawing.Point(16, 115); this.Label26.Name = "Label26"; this.Label26.Size = new System.Drawing.Size(100, 16); this.Label26.TabIndex = 14; @@ -1040,7 +1050,7 @@ this.chkaktiv.AutoSize = true; this.chkaktiv.Location = new System.Drawing.Point(135, 576); this.chkaktiv.Name = "chkaktiv"; - this.chkaktiv.Size = new System.Drawing.Size(18, 17); + this.chkaktiv.Size = new System.Drawing.Size(15, 14); this.chkaktiv.TabIndex = 35; this.chkaktiv.Tag = "aktiv"; this.chkaktiv.UseVisualStyleBackColor = true; @@ -1051,7 +1061,7 @@ this.label14.AutoSize = true; this.label14.Location = new System.Drawing.Point(18, 577); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(31, 15); + this.label14.Size = new System.Drawing.Size(31, 13); this.label14.TabIndex = 34; this.label14.Text = "Aktiv"; // @@ -1079,7 +1089,7 @@ this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(18, 230); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(110, 15); + this.label13.Size = new System.Drawing.Size(97, 13); this.label13.TabIndex = 31; this.label13.Text = "Tech-Bezeichnung"; // @@ -1097,7 +1107,7 @@ this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(18, 204); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(102, 15); + this.label12.Size = new System.Drawing.Size(88, 13); this.label12.TabIndex = 29; this.label12.Text = "Feldbezeichnung"; // @@ -1115,7 +1125,7 @@ this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(18, 513); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(107, 15); + this.label11.Size = new System.Drawing.Size(92, 13); this.label11.TabIndex = 27; this.label11.Text = "ESS-Image height"; // @@ -1133,7 +1143,7 @@ this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(18, 487); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(102, 15); + this.label10.Size = new System.Drawing.Size(88, 13); this.label10.TabIndex = 25; this.label10.Text = "ESS-Image width"; // @@ -1151,7 +1161,7 @@ this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(18, 461); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(89, 15); + this.label8.Size = new System.Drawing.Size(77, 13); this.label8.TabIndex = 23; this.label8.Text = "ESS-Image left"; // @@ -1169,7 +1179,7 @@ this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(18, 435); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(94, 15); + this.label7.Size = new System.Drawing.Size(82, 13); this.label7.TabIndex = 21; this.label7.Text = "ESS-Image Top"; // @@ -1188,7 +1198,7 @@ this.lblessfieldname.AutoSize = true; this.lblessfieldname.Location = new System.Drawing.Point(18, 409); this.lblessfieldname.Name = "lblessfieldname"; - this.lblessfieldname.Size = new System.Drawing.Size(91, 15); + this.lblessfieldname.Size = new System.Drawing.Size(77, 13); this.lblessfieldname.TabIndex = 19; this.lblessfieldname.Text = "ESS-Feldname"; // @@ -1206,7 +1216,7 @@ this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(18, 383); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(72, 15); + this.label9.Size = new System.Drawing.Size(62, 13); this.label9.TabIndex = 17; this.label9.Text = "ESS-Klasse"; // @@ -1224,7 +1234,7 @@ this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(18, 330); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(95, 15); + this.label6.Size = new System.Drawing.Size(82, 13); this.label6.TabIndex = 15; this.label6.Text = "Ende-Texmarke"; // @@ -1242,7 +1252,7 @@ this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(18, 304); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(105, 15); + this.label5.Size = new System.Drawing.Size(90, 13); this.label5.TabIndex = 13; this.label5.Text = "Beginn-Texmarke"; // @@ -1261,7 +1271,7 @@ this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(18, 278); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(63, 15); + this.label4.Size = new System.Drawing.Size(53, 13); this.label4.TabIndex = 11; this.label4.Text = "Feldname"; // @@ -1270,7 +1280,7 @@ this.chkzwingend.AutoSize = true; this.chkzwingend.Location = new System.Drawing.Point(135, 152); this.chkzwingend.Name = "chkzwingend"; - this.chkzwingend.Size = new System.Drawing.Size(18, 17); + this.chkzwingend.Size = new System.Drawing.Size(15, 14); this.chkzwingend.TabIndex = 10; this.chkzwingend.Tag = "Zwingend"; this.chkzwingend.UseVisualStyleBackColor = true; @@ -1281,7 +1291,7 @@ this.lbelzwingend.AutoSize = true; this.lbelzwingend.Location = new System.Drawing.Point(18, 153); this.lbelzwingend.Name = "lbelzwingend"; - this.lbelzwingend.Size = new System.Drawing.Size(61, 15); + this.lbelzwingend.Size = new System.Drawing.Size(54, 13); this.lbelzwingend.TabIndex = 9; this.lbelzwingend.Text = "Zwingend"; // @@ -1299,7 +1309,7 @@ this.lblsort.AutoSize = true; this.lblsort.Location = new System.Drawing.Point(18, 178); this.lblsort.Name = "lblsort"; - this.lblsort.Size = new System.Drawing.Size(129, 15); + this.lblsort.Size = new System.Drawing.Size(111, 13); this.lblsort.TabIndex = 7; this.lblsort.Text = "Sortier-Reihenfolge UI"; // @@ -1309,7 +1319,7 @@ this.chkui.Enabled = false; this.chkui.Location = new System.Drawing.Point(135, 129); this.chkui.Name = "chkui"; - this.chkui.Size = new System.Drawing.Size(18, 17); + this.chkui.Size = new System.Drawing.Size(15, 14); this.chkui.TabIndex = 6; this.chkui.Tag = "UI"; this.chkui.UseVisualStyleBackColor = true; @@ -1320,7 +1330,7 @@ this.lbluidesc.AutoSize = true; this.lbluidesc.Location = new System.Drawing.Point(18, 129); this.lbluidesc.Name = "lbluidesc"; - this.lbluidesc.Size = new System.Drawing.Size(19, 15); + this.lbluidesc.Size = new System.Drawing.Size(18, 13); this.lbluidesc.TabIndex = 5; this.lbluidesc.Text = "UI"; // @@ -1329,7 +1339,7 @@ this.lblfeldregelid.AutoSize = true; this.lblfeldregelid.Location = new System.Drawing.Point(132, 40); this.lblfeldregelid.Name = "lblfeldregelid"; - this.lblfeldregelid.Size = new System.Drawing.Size(59, 15); + this.lblfeldregelid.Size = new System.Drawing.Size(50, 13); this.lblfeldregelid.TabIndex = 3; this.lblfeldregelid.Text = "Feldregel"; // @@ -1338,7 +1348,7 @@ this.lblfeldregeliddesc.AutoSize = true; this.lblfeldregeliddesc.Location = new System.Drawing.Point(18, 43); this.lblfeldregeliddesc.Name = "lblfeldregeliddesc"; - this.lblfeldregeliddesc.Size = new System.Drawing.Size(59, 15); + this.lblfeldregeliddesc.Size = new System.Drawing.Size(50, 13); this.lblfeldregeliddesc.TabIndex = 2; this.lblfeldregeliddesc.Text = "Feldregel"; // @@ -1347,7 +1357,7 @@ this.lblID.AutoSize = true; this.lblID.Location = new System.Drawing.Point(132, 17); this.lblID.Name = "lblID"; - this.lblID.Size = new System.Drawing.Size(19, 15); + this.lblID.Size = new System.Drawing.Size(18, 13); this.lblID.TabIndex = 1; this.lblID.Text = "ID"; // @@ -1356,7 +1366,7 @@ this.lbliddesc.AutoSize = true; this.lbliddesc.Location = new System.Drawing.Point(18, 20); this.lbliddesc.Name = "lbliddesc"; - this.lbliddesc.Size = new System.Drawing.Size(19, 15); + this.lbliddesc.Size = new System.Drawing.Size(18, 13); this.lbliddesc.TabIndex = 0; this.lbliddesc.Text = "ID"; // @@ -1439,7 +1449,7 @@ this.chkboxaktive.CheckState = System.Windows.Forms.CheckState.Checked; this.chkboxaktive.Location = new System.Drawing.Point(205, 43); this.chkboxaktive.Name = "chkboxaktive"; - this.chkboxaktive.Size = new System.Drawing.Size(60, 19); + this.chkboxaktive.Size = new System.Drawing.Size(55, 17); this.chkboxaktive.TabIndex = 10; this.chkboxaktive.Text = "aktive"; this.chkboxaktive.UseVisualStyleBackColor = true; @@ -1458,7 +1468,7 @@ this.rbBezeichnung.AutoSize = true; this.rbBezeichnung.Location = new System.Drawing.Point(111, 42); this.rbBezeichnung.Name = "rbBezeichnung"; - this.rbBezeichnung.Size = new System.Drawing.Size(100, 19); + this.rbBezeichnung.Size = new System.Drawing.Size(87, 17); this.rbBezeichnung.TabIndex = 9; this.rbBezeichnung.Text = "Bezeichnung"; this.rbBezeichnung.UseVisualStyleBackColor = true; @@ -1469,7 +1479,7 @@ this.label16.AutoSize = true; this.label16.Location = new System.Drawing.Point(12, 15); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(34, 15); + this.label16.Size = new System.Drawing.Size(29, 13); this.label16.TabIndex = 5; this.label16.Text = "Filter"; // @@ -1479,7 +1489,7 @@ this.rbNr.Checked = true; this.rbNr.Location = new System.Drawing.Point(69, 42); this.rbNr.Name = "rbNr"; - this.rbNr.Size = new System.Drawing.Size(41, 19); + this.rbNr.Size = new System.Drawing.Size(36, 17); this.rbNr.TabIndex = 8; this.rbNr.TabStop = true; this.rbNr.Text = "Nr"; @@ -1491,20 +1501,10 @@ this.label15.AutoSize = true; this.label15.Location = new System.Drawing.Point(12, 44); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(29, 15); + this.label15.Size = new System.Drawing.Size(26, 13); this.label15.TabIndex = 7; this.label15.Text = "Sort"; // - // chkversandstrassefirstdok - // - this.chkversandstrassefirstdok.AutoSize = true; - this.chkversandstrassefirstdok.Location = new System.Drawing.Point(163, 20); - this.chkversandstrassefirstdok.Name = "chkversandstrassefirstdok"; - this.chkversandstrassefirstdok.Size = new System.Drawing.Size(188, 19); - this.chkversandstrassefirstdok.TabIndex = 2; - this.chkversandstrassefirstdok.Text = "Als erstes Dokument möglich"; - this.chkversandstrassefirstdok.UseVisualStyleBackColor = true; - // // Dokumenttyp // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Client/UIControls/Administrator/Dokumenttyp.cs b/Client/UIControls/Administrator/Dokumenttyp.cs index 407df0fd..8e306fc5 100644 --- a/Client/UIControls/Administrator/Dokumenttyp.cs +++ b/Client/UIControls/Administrator/Dokumenttyp.cs @@ -107,7 +107,6 @@ namespace OnDoc.UIControls.Administrator cbboxFachverantwortung.DataSource = db.dsdaten.Tables[0]; cbboxFachverantwortung.DisplayMember = "MA"; cbboxFachverantwortung.ValueMember = "id"; - cbboxOwner.DataSource = db.dsdaten.Tables[0]; cbboxOwner.DisplayMember = "MA"; cbboxOwner.ValueMember = "id"; @@ -127,11 +126,14 @@ namespace OnDoc.UIControls.Administrator db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr = " + dokumenttypnr.ToString(), false, true); DataRow r = db.dsdaten.Tables[0].Rows[0]; + + this.TxTBezeichnung.Text = r["bezeichnung"].ToString(); this.TxTBeschreibung.Text = r["beschreibung"].ToString(); this.cbaktiv.Checked = Convert.ToBoolean(r["aktiv"]); this.cbboxofficevorlage.SelectedValue = r["office_vorlagenr"].ToString(); - this.cbboxFachverantwortung.SelectedValue = r["fachverantwortung"].ToString(); + //this.cbboxFachverantwortung.SelectedValue = r["fachverantwortung"].ToString(); + txtFachverantwortung.Text = r["fachverantwortung"].ToString(); this.cbboxOwner.SelectedValue = r["owner"].ToString(); this.cbVertrag.Checked = Convert.ToBoolean(r["vertrag"]) == true; this.cbbezeichnungmutierbar.Checked = Convert.ToBoolean(r["bezeichnungmut"]) == true; @@ -332,6 +334,7 @@ namespace OnDoc.UIControls.Administrator r["beschreibung"] = this.TxTBeschreibung.Text; r["office_vorlagenr"] = this.cbboxofficevorlage.SelectedValue; r["fachverantwortung"] = this.cbboxFachverantwortung.SelectedValue; + r["fachverantwortung"] = txtFachverantwortung.Text; r["owner"] = this.cbboxOwner.SelectedValue; r["vertrag"] = this.cbVertrag.Checked; r["bezeichnungmut"] = this.cbbezeichnungmutierbar.Checked; diff --git a/Client/UIControls/Administrator/TableEditor.Designer.cs b/Client/UIControls/Administrator/TableEditor.Designer.cs index 1e637fa2..d9d884b8 100644 --- a/Client/UIControls/Administrator/TableEditor.Designer.cs +++ b/Client/UIControls/Administrator/TableEditor.Designer.cs @@ -31,8 +31,8 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TableEditor)); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit(); this.SuspendLayout(); @@ -42,9 +42,9 @@ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButton1, this.toolStripButton2}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Location = new System.Drawing.Point(2, 2); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(964, 25); + this.toolStrip1.Size = new System.Drawing.Size(960, 25); this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; // @@ -58,29 +58,30 @@ this.toolStripButton1.Text = "toolStripButton1"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // toolStripButton2 + // + this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton2.Image = global::OnDoc.Properties.Resources.save_32x32_32; + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(23, 22); + this.toolStripButton2.Text = "toolStripButton2"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // sfDataGrid1 // this.sfDataGrid1.AccessibleName = "Table"; this.sfDataGrid1.AddNewRowPosition = Syncfusion.WinForms.DataGrid.Enums.RowPosition.Top; + this.sfDataGrid1.AllowDeleting = true; this.sfDataGrid1.AllowResizingColumns = true; this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill; - this.sfDataGrid1.Location = new System.Drawing.Point(0, 25); + this.sfDataGrid1.Location = new System.Drawing.Point(2, 27); this.sfDataGrid1.Name = "sfDataGrid1"; - this.sfDataGrid1.Size = new System.Drawing.Size(964, 490); + this.sfDataGrid1.Size = new System.Drawing.Size(960, 486); this.sfDataGrid1.TabIndex = 1; this.sfDataGrid1.Text = "sfDataGrid1"; this.sfDataGrid1.AddNewRowInitiating += new Syncfusion.WinForms.DataGrid.Events.AddNewRowInitiatingEventHandler(this.sfDataGrid1_AddNewRowInitiating); // - // toolStripButton2 - // - this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton2.Image = global::OnDoc.Properties.Resources.save_32x32_32; - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(23, 22); - this.toolStripButton2.Text = "toolStripButton2"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); - // // TableEditor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -91,6 +92,8 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.Name = "TableEditor"; + this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; + this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; this.Text = "TableEditor"; this.Load += new System.EventHandler(this.TableEditor_Load); this.toolStrip1.ResumeLayout(false); diff --git a/Client/UIControls/Administrator/TableEditor.cs b/Client/UIControls/Administrator/TableEditor.cs index e06e5df6..69f53c89 100644 --- a/Client/UIControls/Administrator/TableEditor.cs +++ b/Client/UIControls/Administrator/TableEditor.cs @@ -12,6 +12,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Syncfusion.Windows.Forms.Tools; using Syncfusion.WinForms.Controls; +using Syncfusion.WinForms.DataGrid.Enums; namespace OnDoc.UIControls.Administrator @@ -20,6 +21,7 @@ namespace OnDoc.UIControls.Administrator { public string TableName { get; set; } = ""; + public string SQL { get; set; } = ""; Database.DB db = new Database.DB(AppParams.connectionstring); @@ -32,7 +34,7 @@ namespace OnDoc.UIControls.Administrator this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; } - public TableEditor(string tablename) + public TableEditor(string tablename, bool allowdelete) { InitializeComponent(); this.Style.TitleBar.BackColor = Theaming.Titelbar(); @@ -41,6 +43,7 @@ namespace OnDoc.UIControls.Administrator this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity; TableName = tablename; this.Text = tablename; + this.sfDataGrid1.AllowDeleting = allowdelete; } private void TableEditor_Load(object sender, EventArgs e) { @@ -49,12 +52,23 @@ namespace OnDoc.UIControls.Administrator private void update_data() { - db.Get_Tabledata_for_Update("Select * from "+ TableName,false,true); + if (this.SQL != "") + { + db.Get_Tabledata_for_Update(SQL, false, true); + this.toolStripButton2.Enabled = false; + } + else + { + db.Get_Tabledata_for_Update("Select * from " + TableName, false, true); + this.toolStripButton2.Enabled = true; + } + sfDataGrid1.DataSource = db.daten.Tables[0]; } private void toolStripButton2_Click(object sender, EventArgs e) { + db.Update_Data(); ToastMessage.ShowToast("Speichern", "Daten erfolgreich gespeichert"); @@ -76,5 +90,20 @@ namespace OnDoc.UIControls.Administrator } + + public void editmode(bool allow) + { + sfDataGrid1.AllowEditing = allow; + } + + public void deletemode(bool allow) + { + sfDataGrid1.AllowDeleting = allow; + } + + public void addmode(bool allow) + { + if (!allow) { sfDataGrid1.AddNewRowPosition = RowPosition.None; } else { sfDataGrid1.AddNewRowPosition = RowPosition.Top; } + } } } diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index 40ce19e2..6cda9f92 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -176,6 +176,7 @@ namespace OnDoc.UICintrols this.ribbonButton4 = new System.Windows.Forms.RibbonButton(); this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel(); this.ribbonButtonDokinBearbeitung = new System.Windows.Forms.RibbonButton(); + this.rbbtnvsreserveddoks = new System.Windows.Forms.RibbonButton(); this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig(); @@ -1522,6 +1523,7 @@ namespace OnDoc.UICintrols // this.ribbonPanel4.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left; this.ribbonPanel4.Items.Add(this.ribbonButtonDokinBearbeitung); + this.ribbonPanel4.Items.Add(this.rbbtnvsreserveddoks); this.ribbonPanel4.Name = "ribbonPanel4"; this.ribbonPanel4.Text = "Diverses"; // @@ -1534,6 +1536,15 @@ namespace OnDoc.UICintrols this.ribbonButtonDokinBearbeitung.Text = "Dokumente in Bearbeitung"; this.ribbonButtonDokinBearbeitung.Click += new System.EventHandler(this.ribbonButtonDokinBearbeitung_Click); // + // rbbtnvsreserveddoks + // + this.rbbtnvsreserveddoks.Image = ((System.Drawing.Image)(resources.GetObject("rbbtnvsreserveddoks.Image"))); + this.rbbtnvsreserveddoks.LargeImage = ((System.Drawing.Image)(resources.GetObject("rbbtnvsreserveddoks.LargeImage"))); + this.rbbtnvsreserveddoks.Name = "rbbtnvsreserveddoks"; + this.rbbtnvsreserveddoks.SmallImage = ((System.Drawing.Image)(resources.GetObject("rbbtnvsreserveddoks.SmallImage"))); + this.rbbtnvsreserveddoks.Text = "Tabellen-Editor"; + this.rbbtnvsreserveddoks.Click += new System.EventHandler(this.rbbtnvsreserveddoks_Click); + // // timer1 // this.timer1.Interval = 600000; @@ -1768,5 +1779,6 @@ namespace OnDoc.UICintrols private System.Windows.Forms.RibbonPanel RibbonPrinter; private System.Windows.Forms.RibbonButton ribbonbuttonPrinterSettings; private System.Windows.Forms.ToolStripMenuItem dokumentLinkPerMailVersendenToolStripMenuItem; + private System.Windows.Forms.RibbonButton rbbtnvsreserveddoks; } } diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 212c685a..e4124a4e 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -1569,7 +1569,7 @@ namespace OnDoc.UICintrols private void RibbonButtonBerechtigungsgruppe_Click(object sender, EventArgs e) { - TableEditor tb = new TableEditor("Relaunch_Berechtigungsgruppe"); + TableEditor tb = new TableEditor("Relaunch_Berechtigungsgruppe",false); tb.Show(); } @@ -2708,7 +2708,7 @@ namespace OnDoc.UICintrols private void ribbonButtonVorlagenfeldregel_Click(object sender, EventArgs e) { - TableEditor tb = new TableEditor("Vorlagenfeldregel"); + TableEditor tb = new TableEditor("Vorlagenfeldregel",true); tb.Show(); } @@ -2854,7 +2854,7 @@ namespace OnDoc.UICintrols private void ribbonButtonSysadmins_Click(object sender, EventArgs e) { - TableEditor tb = new TableEditor("ondoc_admin"); + TableEditor tb = new TableEditor("ondoc_admin",false); tb.Show(); } @@ -2866,7 +2866,7 @@ namespace OnDoc.UICintrols private void ribbonbuttonedkverarbeitung_Click(object sender, EventArgs e) { - TableEditor tb = new TableEditor("OnDoc_EDK_Routing"); + TableEditor tb = new TableEditor("OnDoc_EDK_Routing",true); tb.Show(); } @@ -3121,7 +3121,7 @@ namespace OnDoc.UICintrols private void ribbonButtonDokinBearbeitung_Click(object sender, EventArgs e) { - TableEditor te = new TableEditor("DokInBearbeitung"); + TableEditor te = new TableEditor("DokInBearbeitung",true); te.Show(); } @@ -3242,6 +3242,12 @@ namespace OnDoc.UICintrols fmail.ShowDialog(); Cursor = Cursors.Default; } + + private void rbbtnvsreserveddoks_Click(object sender, EventArgs e) + { + Admin_Taableeditor at = new Admin_Taableeditor(); + at.Show(); + } } diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx index df6718bb..5246f185 100644 --- a/Client/UIControls/DokList.resx +++ b/Client/UIControls/DokList.resx @@ -622,6 +622,24 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg== diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll index fce1e02f..fbbe3f94 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 531e8b2e..921de626 100644 Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 8910190b..21f7c236 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 cb595688..2ce85841 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/OnDocClient.zip b/Client/bin/Debug/OnDocClient.zip index 89fffbae..67706eea 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index af51c310..91be8215 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 01340935..26f874ed 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache index ba66055e..698d345a 100644 --- a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache +++ b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -4c586517a50a46a07c0703e6e2a0ba574ad3b69fd42363b416cfcdceca050f8b +ac014e4bfe7ad83cd93f30aebca930bac438bffdaf7d39416745d8ec9da43810 diff --git a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt index cd7cff89..3aab3f51 100644 --- a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt +++ b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt @@ -392,3 +392,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\ru\Alternet.Common.v9.resource E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\uk\Alternet.Common.v9.resources.dll E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\MiniHTMLTextBox.dll E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\MiniHTMLTextBox.pdb +E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.Admin_Taableeditor.resources diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 5a13ae12..23c4d14b 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources index 2031307b..a6f45106 100644 Binary files a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources and b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources differ diff --git a/Client/obj/Debug/OnDoc.UIControls.Administrator.Admin_Taableeditor.resources b/Client/obj/Debug/OnDoc.UIControls.Administrator.Admin_Taableeditor.resources new file mode 100644 index 00000000..6c05a977 Binary files /dev/null and b/Client/obj/Debug/OnDoc.UIControls.Administrator.Admin_Taableeditor.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 8910190b..21f7c236 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 cb595688..2ce85841 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 af51c310..91be8215 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/bin/Debug/Database.dll b/DOCGEN/bin/Debug/Database.dll index fce1e02f..fbbe3f94 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 531e8b2e..921de626 100644 Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index 1d61041b..c2eb806b 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/Database/bin/Debug/Database.dll b/Database/bin/Debug/Database.dll index fce1e02f..fbbe3f94 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 531e8b2e..921de626 100644 Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ diff --git a/Database/db.cs b/Database/db.cs index 384c6501..cc97fc71 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -210,6 +210,7 @@ namespace Database public DataSet daten = new DataSet(); public void Get_Tabledata_for_Update(string Tablename, bool StoredProc = false, bool is_SQL_String = false) { + var sqlconnect = new SqlConnection(); var ds = new DataSet(); ds.Tables.Clear(); diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll index fce1e02f..fbbe3f94 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 531e8b2e..921de626 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll index fce1e02f..fbbe3f94 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 531e8b2e..921de626 100644 Binary files a/OnDocOffice/bin/Debug/Database.pdb and b/OnDocOffice/bin/Debug/Database.pdb differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index a75d0235..99e61ad4 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ