diff --git a/AA-Forms/FormBenutzerVW.Designer.cs b/AA-Forms/FormBenutzerVW.Designer.cs index 6c2631c..1848eda 100644 --- a/AA-Forms/FormBenutzerVW.Designer.cs +++ b/AA-Forms/FormBenutzerVW.Designer.cs @@ -29,66 +29,18 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormBenutzerVW)); + this.objectListViewBenutzer = new BrightIdeasSoftware.ObjectListView(); this.buttonNewUser = new System.Windows.Forms.Button(); this.buttonAbbrechen = new System.Windows.Forms.Button(); this.buttonSpeichern = new System.Windows.Forms.Button(); - this.objectListViewBenutzer = new BrightIdeasSoftware.ObjectListView(); ((System.ComponentModel.ISupportInitialize)(this.objectListViewBenutzer)).BeginInit(); this.SuspendLayout(); // - // buttonNewUser - // - this.buttonNewUser.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonNewUser.BackColor = System.Drawing.Color.Yellow; - this.buttonNewUser.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonNewUser.Image = ((System.Drawing.Image)(resources.GetObject("buttonNewUser.Image"))); - this.buttonNewUser.Location = new System.Drawing.Point(11, 406); - this.buttonNewUser.Margin = new System.Windows.Forms.Padding(2); - this.buttonNewUser.Name = "buttonNewUser"; - this.buttonNewUser.Size = new System.Drawing.Size(107, 32); - this.buttonNewUser.TabIndex = 45; - this.buttonNewUser.Text = "Neuer User"; - this.buttonNewUser.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.buttonNewUser.UseVisualStyleBackColor = false; - this.buttonNewUser.Click += new System.EventHandler(this.buttonNewUser_Click); - // - // buttonAbbrechen - // - this.buttonAbbrechen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonAbbrechen.BackColor = System.Drawing.Color.Red; - this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonAbbrechen.Image = ((System.Drawing.Image)(resources.GetObject("buttonAbbrechen.Image"))); - this.buttonAbbrechen.Location = new System.Drawing.Point(759, 406); - this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(2); - this.buttonAbbrechen.Name = "buttonAbbrechen"; - this.buttonAbbrechen.Size = new System.Drawing.Size(30, 32); - this.buttonAbbrechen.TabIndex = 39; - this.buttonAbbrechen.TextAlign = System.Drawing.ContentAlignment.BottomCenter; - this.buttonAbbrechen.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; - this.buttonAbbrechen.UseVisualStyleBackColor = false; - this.buttonAbbrechen.Click += new System.EventHandler(this.buttonAbbrechen_Click); - // - // buttonSpeichern - // - this.buttonSpeichern.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonSpeichern.BackColor = System.Drawing.Color.Lime; - this.buttonSpeichern.Enabled = false; - this.buttonSpeichern.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonSpeichern.Image"))); - this.buttonSpeichern.Location = new System.Drawing.Point(725, 406); - this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(2); - this.buttonSpeichern.Name = "buttonSpeichern"; - this.buttonSpeichern.Size = new System.Drawing.Size(30, 32); - this.buttonSpeichern.TabIndex = 38; - this.buttonSpeichern.TextAlign = System.Drawing.ContentAlignment.BottomCenter; - this.buttonSpeichern.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; - this.buttonSpeichern.UseVisualStyleBackColor = false; - this.buttonSpeichern.Visible = false; - // // objectListViewBenutzer // this.objectListViewBenutzer.AlternateRowBackColor = System.Drawing.Color.LightSteelBlue; this.objectListViewBenutzer.CellEditActivation = BrightIdeasSoftware.ObjectListView.CellEditActivateMode.DoubleClick; + this.objectListViewBenutzer.CellEditUseWholeCell = false; this.objectListViewBenutzer.Cursor = System.Windows.Forms.Cursors.Default; this.objectListViewBenutzer.Dock = System.Windows.Forms.DockStyle.Top; this.objectListViewBenutzer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -112,12 +64,66 @@ this.objectListViewBenutzer.SubItemChecking += new System.EventHandler(this.objectListViewBenutzer_SubItemChecking); this.objectListViewBenutzer.SelectedIndexChanged += new System.EventHandler(this.objectListViewBenutzer_SelectedIndexChanged); // + // buttonNewUser + // + this.buttonNewUser.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonNewUser.BackColor = System.Drawing.Color.Yellow; + this.buttonNewUser.FlatAppearance.BorderSize = 0; + this.buttonNewUser.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonNewUser.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonNewUser.Location = new System.Drawing.Point(11, 406); + this.buttonNewUser.Margin = new System.Windows.Forms.Padding(2); + this.buttonNewUser.Name = "buttonNewUser"; + this.buttonNewUser.Size = new System.Drawing.Size(150, 41); + this.buttonNewUser.TabIndex = 45; + this.buttonNewUser.Text = "Neuer User"; + this.buttonNewUser.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.buttonNewUser.UseVisualStyleBackColor = false; + this.buttonNewUser.Click += new System.EventHandler(this.buttonNewUser_Click); + // + // buttonAbbrechen + // + this.buttonAbbrechen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonAbbrechen.BackColor = System.Drawing.Color.Red; + this.buttonAbbrechen.FlatAppearance.BorderSize = 0; + this.buttonAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonAbbrechen.Image = global::Deckungsbeitrag.Properties.Resources.Close_WhiteNoHalo_16x; + this.buttonAbbrechen.Location = new System.Drawing.Point(748, 406); + this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(2); + this.buttonAbbrechen.Name = "buttonAbbrechen"; + this.buttonAbbrechen.Size = new System.Drawing.Size(41, 41); + this.buttonAbbrechen.TabIndex = 39; + this.buttonAbbrechen.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.buttonAbbrechen.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.buttonAbbrechen.UseVisualStyleBackColor = false; + this.buttonAbbrechen.Click += new System.EventHandler(this.buttonAbbrechen_Click); + // + // buttonSpeichern + // + this.buttonSpeichern.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonSpeichern.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.buttonSpeichern.Enabled = false; + this.buttonSpeichern.FlatAppearance.BorderSize = 0; + this.buttonSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonSpeichern.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonSpeichern.Image"))); + this.buttonSpeichern.Location = new System.Drawing.Point(703, 406); + this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(2); + this.buttonSpeichern.Name = "buttonSpeichern"; + this.buttonSpeichern.Size = new System.Drawing.Size(41, 41); + this.buttonSpeichern.TabIndex = 38; + this.buttonSpeichern.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.buttonSpeichern.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.buttonSpeichern.UseVisualStyleBackColor = false; + this.buttonSpeichern.Visible = false; + // // FormBenutzerVW // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.ClientSize = new System.Drawing.Size(800, 446); + this.ClientSize = new System.Drawing.Size(800, 455); this.Controls.Add(this.objectListViewBenutzer); this.Controls.Add(this.buttonNewUser); this.Controls.Add(this.buttonAbbrechen); diff --git a/AA-Forms/FormBenutzerVW.cs b/AA-Forms/FormBenutzerVW.cs index 2e13a89..f3f26f5 100644 --- a/AA-Forms/FormBenutzerVW.cs +++ b/AA-Forms/FormBenutzerVW.cs @@ -1,5 +1,6 @@ using BrightIdeasSoftware; using DatenDB; +using Deckungsbeitrag.AA_Forms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -65,17 +66,8 @@ namespace Deckungsbeitrag /// private void buttonNewUser_Click(object sender, EventArgs e) { - Benutzer benutzer = new Benutzer(); - this.objectListViewBenutzer.AddObject(benutzer); - - this.objectListViewBenutzer.RowFormatter = delegate (OLVListItem olvItem) { if (olvItem.Index == 0) olvItem.BackColor = Color.LightYellow; }; - this.objectListViewBenutzer.SelectedObject = benutzer; - this.objectListViewBenutzer.FocusedItem = this.objectListViewBenutzer.ModelToItem(benutzer); - this.objectListViewBenutzer.FocusedItem.Selected = true; - this.objectListViewBenutzer.FocusedItem.EnsureVisible(); - - int firstColumnIndex = 0; - this.objectListViewBenutzer.StartCellEdit((OLVListItem)this.objectListViewBenutzer.FocusedItem, firstColumnIndex); + FormNeuerBenutzer neuerBenutzer = new FormNeuerBenutzer(); + neuerBenutzer.Show(); } private void buttonAbbrechen_Click(object sender, EventArgs e) { diff --git a/AA-Forms/FormBenutzerVW.resx b/AA-Forms/FormBenutzerVW.resx index ba0fc55..a68c736 100644 --- a/AA-Forms/FormBenutzerVW.resx +++ b/AA-Forms/FormBenutzerVW.resx @@ -118,24 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAJlJREFUOE/dUMkRgCAMtA6rsAYqoAj+VGAnVGMN/OXPP1+cMMKsQRS/MrOTA3az - YZrgEFEqOGtNRDv0OdfIaYjbOtc8xpistUkplcE59xoRJGJEMoqwk+70Aq4luSCEkFe8TEfimwDfDTkY - WgFdyPjwiUsjgC6wfsOtEFp2ztXHnHf/AkXk3t77DNkfFjDGZMj+sEAPfxb4ggOJrCeBgrTaGAAAAABJ - RU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAKhJREFUOE9jYEAC3759M0DmYwM41Xz79q3i27dv/799+5aJLgcDIDmomgp0iYpX - N6/+3xbp/v/t/TtYDQGJgeS2hDj8f37xLMIQkJNApoI0L1Tj/b/WWRfDEJhmkBxIDcgQqEsg3kFXgGwI - PjmE+/AYgk0MQzMMYDOEaM0wgG4ISZpBgCID0DWT5AVsmokORFyaiYpGaiUk8pMykgLyMxMM4MyqSABd - DQCo07laP2majgAAAABJRU5ErkJggg== - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO diff --git a/AA-Forms/FormExpedit.Designer.cs b/AA-Forms/FormExpedit.Designer.cs index 1448508..5fc7dbc 100644 --- a/AA-Forms/FormExpedit.Designer.cs +++ b/AA-Forms/FormExpedit.Designer.cs @@ -49,21 +49,6 @@ this.pictureBoxPlus = new System.Windows.Forms.PictureBox(); this.pictureBoxEntwurf = new System.Windows.Forms.PictureBox(); this.buttonKundeNr = new System.Windows.Forms.Button(); - this.tabControlAuftragList = new System.Windows.Forms.TabControl(); - this.tabPageAll = new System.Windows.Forms.TabPage(); - this.objectListViewAuftrag = new BrightIdeasSoftware.ObjectListView(); - this.tabPageStandart = new System.Windows.Forms.TabPage(); - this.listViewStandart = new System.Windows.Forms.ListView(); - this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader9 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader10 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader11 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader12 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.tabPageSonder = new System.Windows.Forms.TabPage(); - this.objectListViewSonder = new BrightIdeasSoftware.ObjectListView(); - this.tabPageSTH = new System.Windows.Forms.TabPage(); - this.listViewSTH = new System.Windows.Forms.ListView(); this.buttonSWS_Drucken = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); @@ -82,18 +67,21 @@ this.StandBearbeitet = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.FehlmengeBearbeitet = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.KorrekturBearbeitet = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tabPageSonder = new System.Windows.Forms.TabPage(); + this.objectListViewSonder = new BrightIdeasSoftware.ObjectListView(); + this.tabPageAll = new System.Windows.Forms.TabPage(); + this.objectListViewAuftrag = new BrightIdeasSoftware.ObjectListView(); + this.tabControlAuftragList = new System.Windows.Forms.TabControl(); this.groupBoxEtikett.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxMinus)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxEntwurf)).BeginInit(); - this.tabControlAuftragList.SuspendLayout(); - this.tabPageAll.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.objectListViewAuftrag)).BeginInit(); - this.tabPageStandart.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dGArtikel)).BeginInit(); this.tabPageSonder.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.objectListViewSonder)).BeginInit(); - this.tabPageSTH.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dGArtikel)).BeginInit(); + this.tabPageAll.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.objectListViewAuftrag)).BeginInit(); + this.tabControlAuftragList.SuspendLayout(); this.SuspendLayout(); // // label10 @@ -116,7 +104,7 @@ this.buttonDrucken.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonDrucken.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonDrucken.Location = new System.Drawing.Point(9, 362); - this.buttonDrucken.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonDrucken.Margin = new System.Windows.Forms.Padding(2); this.buttonDrucken.Name = "buttonDrucken"; this.buttonDrucken.Size = new System.Drawing.Size(286, 41); this.buttonDrucken.TabIndex = 13; @@ -132,7 +120,7 @@ this.buttonAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAbbrechen.Location = new System.Drawing.Point(1272, 726); - this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(2); this.buttonAbbrechen.Name = "buttonAbbrechen"; this.buttonAbbrechen.Size = new System.Drawing.Size(200, 41); this.buttonAbbrechen.TabIndex = 1; @@ -161,9 +149,9 @@ this.groupBoxEtikett.Controls.Add(this.buttonKundeNr); this.groupBoxEtikett.ForeColor = System.Drawing.Color.White; this.groupBoxEtikett.Location = new System.Drawing.Point(1170, 310); - this.groupBoxEtikett.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBoxEtikett.Margin = new System.Windows.Forms.Padding(2); this.groupBoxEtikett.Name = "groupBoxEtikett"; - this.groupBoxEtikett.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBoxEtikett.Padding = new System.Windows.Forms.Padding(2); this.groupBoxEtikett.Size = new System.Drawing.Size(302, 412); this.groupBoxEtikett.TabIndex = 2; this.groupBoxEtikett.TabStop = false; @@ -217,7 +205,7 @@ this.rBDI.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.rBDI.ForeColor = System.Drawing.Color.Black; this.rBDI.Location = new System.Drawing.Point(72, 89); - this.rBDI.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.rBDI.Margin = new System.Windows.Forms.Padding(2); this.rBDI.Name = "rBDI"; this.rBDI.Size = new System.Drawing.Size(45, 45); this.rBDI.TabIndex = 38; @@ -238,7 +226,7 @@ this.rBMI.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.rBMI.ForeColor = System.Drawing.Color.Black; this.rBMI.Location = new System.Drawing.Point(131, 89); - this.rBMI.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.rBMI.Margin = new System.Windows.Forms.Padding(2); this.rBMI.Name = "rBMI"; this.rBMI.Size = new System.Drawing.Size(45, 45); this.rBMI.TabIndex = 39; @@ -259,7 +247,7 @@ this.rBDO.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.rBDO.ForeColor = System.Drawing.Color.Black; this.rBDO.Location = new System.Drawing.Point(188, 89); - this.rBDO.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.rBDO.Margin = new System.Windows.Forms.Padding(2); this.rBDO.Name = "rBDO"; this.rBDO.Size = new System.Drawing.Size(45, 45); this.rBDO.TabIndex = 40; @@ -280,7 +268,7 @@ this.rBFR.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.rBFR.ForeColor = System.Drawing.Color.Black; this.rBFR.Location = new System.Drawing.Point(245, 89); - this.rBFR.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.rBFR.Margin = new System.Windows.Forms.Padding(2); this.rBFR.Name = "rBFR"; this.rBFR.Size = new System.Drawing.Size(45, 45); this.rBFR.TabIndex = 41; @@ -301,7 +289,7 @@ this.rBMO.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.rBMO.ForeColor = System.Drawing.Color.Black; this.rBMO.Location = new System.Drawing.Point(13, 89); - this.rBMO.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.rBMO.Margin = new System.Windows.Forms.Padding(2); this.rBMO.Name = "rBMO"; this.rBMO.Size = new System.Drawing.Size(45, 45); this.rBMO.TabIndex = 37; @@ -346,7 +334,7 @@ this.pictureBoxMinus.BackColor = System.Drawing.Color.Gray; this.pictureBoxMinus.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxMinus.Image"))); this.pictureBoxMinus.Location = new System.Drawing.Point(181, 181); - this.pictureBoxMinus.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pictureBoxMinus.Margin = new System.Windows.Forms.Padding(2); this.pictureBoxMinus.Name = "pictureBoxMinus"; this.pictureBoxMinus.Size = new System.Drawing.Size(38, 40); this.pictureBoxMinus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -361,7 +349,7 @@ this.pictureBoxPlus.Enabled = false; this.pictureBoxPlus.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxPlus.Image"))); this.pictureBoxPlus.Location = new System.Drawing.Point(257, 181); - this.pictureBoxPlus.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pictureBoxPlus.Margin = new System.Windows.Forms.Padding(2); this.pictureBoxPlus.Name = "pictureBoxPlus"; this.pictureBoxPlus.Size = new System.Drawing.Size(38, 40); this.pictureBoxPlus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -374,7 +362,7 @@ this.pictureBoxEntwurf.Anchor = System.Windows.Forms.AnchorStyles.Top; this.pictureBoxEntwurf.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBoxEntwurf.Location = new System.Drawing.Point(9, 232); - this.pictureBoxEntwurf.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pictureBoxEntwurf.Margin = new System.Windows.Forms.Padding(2); this.pictureBoxEntwurf.Name = "pictureBoxEntwurf"; this.pictureBoxEntwurf.Size = new System.Drawing.Size(286, 80); this.pictureBoxEntwurf.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -391,7 +379,7 @@ this.buttonKundeNr.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonKundeNr.ForeColor = System.Drawing.Color.Black; this.buttonKundeNr.Location = new System.Drawing.Point(9, 37); - this.buttonKundeNr.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonKundeNr.Margin = new System.Windows.Forms.Padding(2); this.buttonKundeNr.Name = "buttonKundeNr"; this.buttonKundeNr.Size = new System.Drawing.Size(286, 41); this.buttonKundeNr.TabIndex = 35; @@ -399,174 +387,6 @@ this.buttonKundeNr.UseVisualStyleBackColor = false; this.buttonKundeNr.Click += new System.EventHandler(this.buttonKundeNr_Click); // - // tabControlAuftragList - // - this.tabControlAuftragList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tabControlAuftragList.Controls.Add(this.tabPageAll); - this.tabControlAuftragList.Controls.Add(this.tabPageStandart); - this.tabControlAuftragList.Controls.Add(this.tabPageSonder); - this.tabControlAuftragList.Controls.Add(this.tabPageSTH); - this.tabControlAuftragList.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabControlAuftragList.Location = new System.Drawing.Point(4, 9); - this.tabControlAuftragList.Name = "tabControlAuftragList"; - this.tabControlAuftragList.SelectedIndex = 0; - this.tabControlAuftragList.Size = new System.Drawing.Size(625, 713); - this.tabControlAuftragList.TabIndex = 0; - this.tabControlAuftragList.Visible = false; - this.tabControlAuftragList.SelectedIndexChanged += new System.EventHandler(this.tabControlAuftragList_SelectedIndexChanged); - this.tabControlAuftragList.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabControlAuftragList_Selected); - // - // tabPageAll - // - this.tabPageAll.Controls.Add(this.objectListViewAuftrag); - this.tabPageAll.Location = new System.Drawing.Point(4, 34); - this.tabPageAll.Name = "tabPageAll"; - this.tabPageAll.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); - this.tabPageAll.Size = new System.Drawing.Size(617, 675); - this.tabPageAll.TabIndex = 0; - this.tabPageAll.Text = "Aufträge heute"; - this.tabPageAll.UseVisualStyleBackColor = true; - // - // objectListViewAuftrag - // - this.objectListViewAuftrag.CellEditUseWholeCell = false; - this.objectListViewAuftrag.Cursor = System.Windows.Forms.Cursors.Default; - this.objectListViewAuftrag.Dock = System.Windows.Forms.DockStyle.Fill; - this.objectListViewAuftrag.FullRowSelect = true; - this.objectListViewAuftrag.GridLines = true; - this.objectListViewAuftrag.HideSelection = false; - this.objectListViewAuftrag.Location = new System.Drawing.Point(3, 3); - this.objectListViewAuftrag.Name = "objectListViewAuftrag"; - this.objectListViewAuftrag.Size = new System.Drawing.Size(611, 669); - this.objectListViewAuftrag.TabIndex = 1; - this.objectListViewAuftrag.UseCompatibleStateImageBehavior = false; - this.objectListViewAuftrag.UseHotControls = false; - this.objectListViewAuftrag.View = System.Windows.Forms.View.Details; - this.objectListViewAuftrag.ButtonClick += new System.EventHandler(this.objectListViewAuftrag_ButtonClick); - this.objectListViewAuftrag.CellClick += new System.EventHandler(this.objectListViewAuftrag_CellClick); - // - // tabPageStandart - // - this.tabPageStandart.Controls.Add(this.listViewStandart); - this.tabPageStandart.Location = new System.Drawing.Point(4, 34); - this.tabPageStandart.Name = "tabPageStandart"; - this.tabPageStandart.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); - this.tabPageStandart.Size = new System.Drawing.Size(617, 515); - this.tabPageStandart.TabIndex = 2; - this.tabPageStandart.Text = "Standartaufträge"; - this.tabPageStandart.UseVisualStyleBackColor = true; - // - // listViewStandart - // - this.listViewStandart.BackColor = System.Drawing.Color.WhiteSmoke; - this.listViewStandart.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader7, - this.columnHeader8, - this.columnHeader9, - this.columnHeader10, - this.columnHeader11, - this.columnHeader12}); - this.listViewStandart.Dock = System.Windows.Forms.DockStyle.Fill; - this.listViewStandart.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.listViewStandart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.listViewStandart.FullRowSelect = true; - this.listViewStandart.GridLines = true; - this.listViewStandart.HideSelection = false; - this.listViewStandart.Location = new System.Drawing.Point(3, 3); - this.listViewStandart.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.listViewStandart.MultiSelect = false; - this.listViewStandart.Name = "listViewStandart"; - this.listViewStandart.Size = new System.Drawing.Size(611, 509); - this.listViewStandart.TabIndex = 1; - this.listViewStandart.UseCompatibleStateImageBehavior = false; - this.listViewStandart.View = System.Windows.Forms.View.Details; - // - // columnHeader7 - // - this.columnHeader7.Width = 0; - // - // columnHeader8 - // - this.columnHeader8.Text = "Liefertag"; - this.columnHeader8.Width = 150; - // - // columnHeader9 - // - this.columnHeader9.Text = "Kunde Name"; - this.columnHeader9.Width = 200; - // - // columnHeader10 - // - this.columnHeader10.Text = "Region"; - this.columnHeader10.Width = 150; - // - // columnHeader11 - // - this.columnHeader11.Text = "Cont"; - this.columnHeader11.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.columnHeader11.Width = 150; - // - // columnHeader12 - // - this.columnHeader12.Text = "Auftragsart"; - this.columnHeader12.Width = 265; - // - // tabPageSonder - // - this.tabPageSonder.Controls.Add(this.objectListViewSonder); - this.tabPageSonder.Location = new System.Drawing.Point(4, 34); - this.tabPageSonder.Name = "tabPageSonder"; - this.tabPageSonder.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); - this.tabPageSonder.Size = new System.Drawing.Size(617, 515); - this.tabPageSonder.TabIndex = 1; - this.tabPageSonder.Text = "Sonderaufträge"; - this.tabPageSonder.UseVisualStyleBackColor = true; - // - // objectListViewSonder - // - this.objectListViewSonder.CellEditUseWholeCell = false; - this.objectListViewSonder.Cursor = System.Windows.Forms.Cursors.Default; - this.objectListViewSonder.Dock = System.Windows.Forms.DockStyle.Fill; - this.objectListViewSonder.FullRowSelect = true; - this.objectListViewSonder.GridLines = true; - this.objectListViewSonder.HideSelection = false; - this.objectListViewSonder.Location = new System.Drawing.Point(3, 3); - this.objectListViewSonder.Name = "objectListViewSonder"; - this.objectListViewSonder.Size = new System.Drawing.Size(611, 509); - this.objectListViewSonder.TabIndex = 2; - this.objectListViewSonder.UseCompatibleStateImageBehavior = false; - this.objectListViewSonder.UseHotControls = false; - this.objectListViewSonder.View = System.Windows.Forms.View.Details; - this.objectListViewSonder.ButtonClick += new System.EventHandler(this.objectListViewAuftrag_ButtonClick); - this.objectListViewSonder.CellClick += new System.EventHandler(this.objectListViewAuftrag_CellClick); - // - // tabPageSTH - // - this.tabPageSTH.Controls.Add(this.listViewSTH); - this.tabPageSTH.Location = new System.Drawing.Point(4, 34); - this.tabPageSTH.Name = "tabPageSTH"; - this.tabPageSTH.Size = new System.Drawing.Size(617, 515); - this.tabPageSTH.TabIndex = 3; - this.tabPageSTH.Text = "Standerhöhungen"; - this.tabPageSTH.UseVisualStyleBackColor = true; - // - // listViewSTH - // - this.listViewSTH.CheckBoxes = true; - this.listViewSTH.Dock = System.Windows.Forms.DockStyle.Fill; - this.listViewSTH.FullRowSelect = true; - this.listViewSTH.GridLines = true; - this.listViewSTH.HideSelection = false; - this.listViewSTH.Location = new System.Drawing.Point(0, 0); - this.listViewSTH.Name = "listViewSTH"; - this.listViewSTH.Size = new System.Drawing.Size(617, 515); - this.listViewSTH.TabIndex = 0; - this.listViewSTH.UseCompatibleStateImageBehavior = false; - this.listViewSTH.View = System.Windows.Forms.View.Details; - this.listViewSTH.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.listViewSonder_ItemChecked); - // // buttonSWS_Drucken // this.buttonSWS_Drucken.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -575,7 +395,7 @@ this.buttonSWS_Drucken.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonSWS_Drucken.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonSWS_Drucken.Location = new System.Drawing.Point(1068, 727); - this.buttonSWS_Drucken.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonSWS_Drucken.Margin = new System.Windows.Forms.Padding(2); this.buttonSWS_Drucken.Name = "buttonSWS_Drucken"; this.buttonSWS_Drucken.Size = new System.Drawing.Size(200, 41); this.buttonSWS_Drucken.TabIndex = 35; @@ -653,7 +473,7 @@ this.buttonNeuerAuftrag.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonNeuerAuftrag.ForeColor = System.Drawing.Color.Black; this.buttonNeuerAuftrag.Location = new System.Drawing.Point(1179, 264); - this.buttonNeuerAuftrag.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonNeuerAuftrag.Margin = new System.Windows.Forms.Padding(2); this.buttonNeuerAuftrag.Name = "buttonNeuerAuftrag"; this.buttonNeuerAuftrag.Size = new System.Drawing.Size(286, 41); this.buttonNeuerAuftrag.TabIndex = 43; @@ -779,6 +599,81 @@ this.KorrekturBearbeitet.Name = "KorrekturBearbeitet"; this.KorrekturBearbeitet.Width = 150; // + // tabPageSonder + // + this.tabPageSonder.Controls.Add(this.objectListViewSonder); + this.tabPageSonder.Location = new System.Drawing.Point(4, 34); + this.tabPageSonder.Name = "tabPageSonder"; + this.tabPageSonder.Padding = new System.Windows.Forms.Padding(3); + this.tabPageSonder.Size = new System.Drawing.Size(617, 675); + this.tabPageSonder.TabIndex = 1; + this.tabPageSonder.Text = "Sonderaufträge"; + this.tabPageSonder.UseVisualStyleBackColor = true; + // + // objectListViewSonder + // + this.objectListViewSonder.CellEditUseWholeCell = false; + this.objectListViewSonder.Cursor = System.Windows.Forms.Cursors.Default; + this.objectListViewSonder.Dock = System.Windows.Forms.DockStyle.Fill; + this.objectListViewSonder.FullRowSelect = true; + this.objectListViewSonder.GridLines = true; + this.objectListViewSonder.HideSelection = false; + this.objectListViewSonder.Location = new System.Drawing.Point(3, 3); + this.objectListViewSonder.Name = "objectListViewSonder"; + this.objectListViewSonder.Size = new System.Drawing.Size(611, 669); + this.objectListViewSonder.TabIndex = 2; + this.objectListViewSonder.UseCompatibleStateImageBehavior = false; + this.objectListViewSonder.UseHotControls = false; + this.objectListViewSonder.View = System.Windows.Forms.View.Details; + this.objectListViewSonder.ButtonClick += new System.EventHandler(this.objectListViewAuftrag_ButtonClick); + this.objectListViewSonder.CellClick += new System.EventHandler(this.objectListViewAuftrag_CellClick); + // + // tabPageAll + // + this.tabPageAll.Controls.Add(this.objectListViewAuftrag); + this.tabPageAll.Location = new System.Drawing.Point(4, 34); + this.tabPageAll.Name = "tabPageAll"; + this.tabPageAll.Padding = new System.Windows.Forms.Padding(3); + this.tabPageAll.Size = new System.Drawing.Size(617, 675); + this.tabPageAll.TabIndex = 0; + this.tabPageAll.Text = "Aufträge heute"; + this.tabPageAll.UseVisualStyleBackColor = true; + // + // objectListViewAuftrag + // + this.objectListViewAuftrag.CellEditUseWholeCell = false; + this.objectListViewAuftrag.Cursor = System.Windows.Forms.Cursors.Default; + this.objectListViewAuftrag.Dock = System.Windows.Forms.DockStyle.Fill; + this.objectListViewAuftrag.FullRowSelect = true; + this.objectListViewAuftrag.GridLines = true; + this.objectListViewAuftrag.HideSelection = false; + this.objectListViewAuftrag.Location = new System.Drawing.Point(3, 3); + this.objectListViewAuftrag.Name = "objectListViewAuftrag"; + this.objectListViewAuftrag.Size = new System.Drawing.Size(611, 669); + this.objectListViewAuftrag.TabIndex = 1; + this.objectListViewAuftrag.UseCompatibleStateImageBehavior = false; + this.objectListViewAuftrag.UseHotControls = false; + this.objectListViewAuftrag.View = System.Windows.Forms.View.Details; + this.objectListViewAuftrag.ButtonClick += new System.EventHandler(this.objectListViewAuftrag_ButtonClick); + this.objectListViewAuftrag.CellClick += new System.EventHandler(this.objectListViewAuftrag_CellClick); + // + // tabControlAuftragList + // + this.tabControlAuftragList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tabControlAuftragList.Controls.Add(this.tabPageAll); + this.tabControlAuftragList.Controls.Add(this.tabPageSonder); + this.tabControlAuftragList.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabControlAuftragList.Location = new System.Drawing.Point(4, 9); + this.tabControlAuftragList.Name = "tabControlAuftragList"; + this.tabControlAuftragList.SelectedIndex = 0; + this.tabControlAuftragList.Size = new System.Drawing.Size(625, 713); + this.tabControlAuftragList.TabIndex = 0; + this.tabControlAuftragList.Visible = false; + this.tabControlAuftragList.SelectedIndexChanged += new System.EventHandler(this.tabControlAuftragList_SelectedIndexChanged); + this.tabControlAuftragList.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabControlAuftragList_Selected); + // // FormExpedit // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -799,7 +694,7 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.HelpButton = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.MinimizeBox = false; this.Name = "FormExpedit"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; @@ -812,14 +707,12 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxMinus)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxEntwurf)).EndInit(); - this.tabControlAuftragList.ResumeLayout(false); - this.tabPageAll.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.objectListViewAuftrag)).EndInit(); - this.tabPageStandart.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dGArtikel)).EndInit(); this.tabPageSonder.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.objectListViewSonder)).EndInit(); - this.tabPageSTH.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dGArtikel)).EndInit(); + this.tabPageAll.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.objectListViewAuftrag)).EndInit(); + this.tabControlAuftragList.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -833,19 +726,6 @@ private System.Windows.Forms.GroupBox groupBoxEtikett; private System.Windows.Forms.PictureBox pictureBoxMinus; private System.Windows.Forms.PictureBox pictureBoxPlus; - private System.Windows.Forms.TabControl tabControlAuftragList; - private System.Windows.Forms.TabPage tabPageAll; - private System.Windows.Forms.TabPage tabPageSonder; - private System.Windows.Forms.TabPage tabPageStandart; - private System.Windows.Forms.TabPage tabPageSTH; - private System.Windows.Forms.ListView listViewSTH; - private System.Windows.Forms.ListView listViewStandart; - private System.Windows.Forms.ColumnHeader columnHeader7; - private System.Windows.Forms.ColumnHeader columnHeader8; - private System.Windows.Forms.ColumnHeader columnHeader9; - private System.Windows.Forms.ColumnHeader columnHeader10; - private System.Windows.Forms.ColumnHeader columnHeader11; - private System.Windows.Forms.ColumnHeader columnHeader12; private System.Windows.Forms.Label label1; private System.Windows.Forms.Button buttonSWS_Drucken; private System.Windows.Forms.Button buttonKundeNr; @@ -864,9 +744,7 @@ private System.Windows.Forms.Button buttonNeuerAuftrag; private System.Windows.Forms.DataGridView dGArtikel; private System.Windows.Forms.Label label5; - private BrightIdeasSoftware.ObjectListView objectListViewAuftrag; private System.Windows.Forms.TextBox textBoxCont; - private BrightIdeasSoftware.ObjectListView objectListViewSonder; private System.Windows.Forms.DataGridViewTextBoxColumn KundeArtikelID; private System.Windows.Forms.DataGridViewTextBoxColumn KundeID; private System.Windows.Forms.DataGridViewTextBoxColumn ArtikelNR; @@ -877,5 +755,10 @@ private System.Windows.Forms.DataGridViewTextBoxColumn StandBearbeitet; private System.Windows.Forms.DataGridViewTextBoxColumn FehlmengeBearbeitet; private System.Windows.Forms.DataGridViewTextBoxColumn KorrekturBearbeitet; + private System.Windows.Forms.TabPage tabPageSonder; + private BrightIdeasSoftware.ObjectListView objectListViewSonder; + private System.Windows.Forms.TabPage tabPageAll; + private BrightIdeasSoftware.ObjectListView objectListViewAuftrag; + private System.Windows.Forms.TabControl tabControlAuftragList; } } \ No newline at end of file diff --git a/AA-Forms/FormExpedit.cs b/AA-Forms/FormExpedit.cs index c3c0446..95da82f 100644 --- a/AA-Forms/FormExpedit.cs +++ b/AA-Forms/FormExpedit.cs @@ -62,10 +62,57 @@ namespace Deckungsbeitrag { Cursor.Current = Cursors.WaitCursor; this.SuspendLayout(); + + // Controls aktivieren und deaktivieren nach BenutzerRolle + switch (this.benutzer.Rolle) + { + case BenutzerRolle.Verwaltung: + this.buttonDrucken.Enabled = this.buttonNeuerAuftrag.Enabled = this.buttonSWS_Drucken.Enabled = false; + this.groupBoxEtikett.Enabled = false; - //Andere Tab Pages ausblenden. - this.tabControlAuftragList.TabPages.Remove(tabPageStandart); - this.tabControlAuftragList.TabPages.Remove(tabPageSTH); + // WENN Rolle Frottee (Expedit Frottee) dann ButtonClick deaktiviert. Nur Expedit kann abschließen + this.objectListViewAuftrag.ButtonClick -= objectListViewAuftrag_ButtonClick; + break; + case BenutzerRolle.Fahrer: + this.buttonDrucken.Enabled = this.buttonNeuerAuftrag.Enabled = this.buttonSWS_Drucken.Enabled = false; + this.groupBoxEtikett.Enabled = false; + + // WENN Rolle Frottee (Expedit Frottee) dann ButtonClick deaktiviert. Nur Expedit kann abschließen + this.objectListViewAuftrag.ButtonClick -= objectListViewAuftrag_ButtonClick; + break; + case BenutzerRolle.Admin: + this.objectListViewAuftrag.ButtonClick += objectListViewAuftrag_ButtonClick; + break; + case BenutzerRolle.Waschstrasse: + this.buttonDrucken.Enabled = this.buttonNeuerAuftrag.Enabled = this.buttonSWS_Drucken.Enabled = false; + this.groupBoxEtikett.Enabled = false; + + // WENN Rolle Frottee (Expedit Frottee) dann ButtonClick deaktiviert. Nur Expedit kann abschließen + this.objectListViewAuftrag.ButtonClick -= objectListViewAuftrag_ButtonClick; + break; + case BenutzerRolle.Master: + this.objectListViewAuftrag.ButtonClick += objectListViewAuftrag_ButtonClick; + break; + case BenutzerRolle.Expedit: + this.objectListViewAuftrag.ButtonClick += objectListViewAuftrag_ButtonClick; + break; + case BenutzerRolle.Frottee: + this.buttonDrucken.Enabled = this.buttonNeuerAuftrag.Enabled = this.buttonSWS_Drucken.Enabled = false; + this.groupBoxEtikett.Enabled = false; + + // WENN Rolle Frottee (Expedit Frottee) dann ButtonClick deaktiviert. Nur Expedit kann abschließen + this.objectListViewAuftrag.ButtonClick -= objectListViewAuftrag_ButtonClick; + break; + case BenutzerRolle.Flach: + this.buttonDrucken.Enabled = this.buttonNeuerAuftrag.Enabled = this.buttonSWS_Drucken.Enabled = false; + this.groupBoxEtikett.Enabled = false; + + // WENN Rolle Frottee (Expedit Frottee) dann ButtonClick deaktiviert. Nur Expedit kann abschließen + this.objectListViewAuftrag.ButtonClick -= objectListViewAuftrag_ButtonClick; + break; + default: + break; + } //Auftragslisten erstellen und in ObjectListViews laden. GetLists(); diff --git a/AA-Forms/FormMain.Designer.cs b/AA-Forms/FormMain.Designer.cs index fcbeb15..f05181d 100644 --- a/AA-Forms/FormMain.Designer.cs +++ b/AA-Forms/FormMain.Designer.cs @@ -31,20 +31,6 @@ namespace Deckungsbeitrag { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); this.toolStripMenu = new System.Windows.Forms.ToolStrip(); - this.tSBBenutzerVW = new System.Windows.Forms.ToolStripButton(); - this.tSBAuftragVW = new System.Windows.Forms.ToolStripButton(); - this.tSBAufgabeVW = new System.Windows.Forms.ToolStripButton(); - this.tSBArtikelVW = new System.Windows.Forms.ToolStripButton(); - this.toolStripZaehlscheine = new System.Windows.Forms.ToolStripButton(); - this.tSBExpedit = new System.Windows.Forms.ToolStripButton(); - this.toolStripDB = new System.Windows.Forms.ToolStripButton(); - this.tSBKosten = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.tSBScannTest = new System.Windows.Forms.ToolStripButton(); - this.tSBHilfe = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonImport = new System.Windows.Forms.ToolStripButton(); - this.tSBEinstellung = new System.Windows.Forms.ToolStripButton(); - this.toolStripBeenden = new System.Windows.Forms.ToolStripButton(); this.panelMain = new System.Windows.Forms.Panel(); this.groupBoxStatistik = new System.Windows.Forms.GroupBox(); this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); @@ -79,10 +65,25 @@ namespace Deckungsbeitrag this.buttonAufAbruf = new System.Windows.Forms.Button(); this.buttonAusgeliefert = new System.Windows.Forms.Button(); this.groupBoxScannTest = new System.Windows.Forms.GroupBox(); - this.pictureBoxScannTest = new System.Windows.Forms.PictureBox(); this.textBoxScannTest = new System.Windows.Forms.TextBox(); this.buttonScannTest = new System.Windows.Forms.Button(); this.labelScannTest = new System.Windows.Forms.Label(); + this.buttonNeuerUser = new System.Windows.Forms.Button(); + this.tSBBenutzerVW = new System.Windows.Forms.ToolStripButton(); + this.tSBAuftragVW = new System.Windows.Forms.ToolStripButton(); + this.tSBAufgabeVW = new System.Windows.Forms.ToolStripButton(); + this.tSBArtikelVW = new System.Windows.Forms.ToolStripButton(); + this.toolStripZaehlscheine = new System.Windows.Forms.ToolStripButton(); + this.tSBExpedit = new System.Windows.Forms.ToolStripButton(); + this.toolStripDB = new System.Windows.Forms.ToolStripButton(); + this.tSBKosten = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.tSBScannTest = new System.Windows.Forms.ToolStripButton(); + this.tSBHilfe = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonImport = new System.Windows.Forms.ToolStripButton(); + this.tSBEinstellung = new System.Windows.Forms.ToolStripButton(); + this.toolStripBeenden = new System.Windows.Forms.ToolStripButton(); + this.pictureBoxScannTest = new System.Windows.Forms.PictureBox(); this.toolStripMenu.SuspendLayout(); this.panelMain.SuspendLayout(); this.groupBoxStatistik.SuspendLayout(); @@ -124,279 +125,11 @@ namespace Deckungsbeitrag this.toolStripMenu.TabIndex = 0; this.toolStripMenu.Text = "toolStripMenu"; // - // tSBBenutzerVW - // - this.tSBBenutzerVW.AutoSize = false; - this.tSBBenutzerVW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.tSBBenutzerVW.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tSBBenutzerVW.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tSBBenutzerVW.ForeColor = System.Drawing.Color.White; - this.tSBBenutzerVW.Image = ((System.Drawing.Image)(resources.GetObject("tSBBenutzerVW.Image"))); - this.tSBBenutzerVW.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBBenutzerVW.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.tSBBenutzerVW.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tSBBenutzerVW.Name = "tSBBenutzerVW"; - this.tSBBenutzerVW.Size = new System.Drawing.Size(180, 40); - this.tSBBenutzerVW.Text = "BENUTZERVERWALTUNG"; - this.tSBBenutzerVW.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBBenutzerVW.Click += new System.EventHandler(this.tSBBenutzerVW_Click); - this.tSBBenutzerVW.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); - this.tSBBenutzerVW.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); - this.tSBBenutzerVW.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); - // - // tSBAuftragVW - // - this.tSBAuftragVW.AutoSize = false; - this.tSBAuftragVW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.tSBAuftragVW.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tSBAuftragVW.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tSBAuftragVW.ForeColor = System.Drawing.Color.White; - this.tSBAuftragVW.Image = ((System.Drawing.Image)(resources.GetObject("tSBAuftragVW.Image"))); - this.tSBAuftragVW.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBAuftragVW.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.tSBAuftragVW.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tSBAuftragVW.Name = "tSBAuftragVW"; - this.tSBAuftragVW.Size = new System.Drawing.Size(180, 40); - this.tSBAuftragVW.Text = "AUFTRAGVERWALTUNG"; - this.tSBAuftragVW.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBAuftragVW.ToolTipText = "Auftragkontrolle und -bearbeitung"; - this.tSBAuftragVW.Click += new System.EventHandler(this.tSBAuftragVW_Click); - this.tSBAuftragVW.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); - this.tSBAuftragVW.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); - this.tSBAuftragVW.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); - // - // tSBAufgabeVW - // - this.tSBAufgabeVW.AutoSize = false; - this.tSBAufgabeVW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.tSBAufgabeVW.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tSBAufgabeVW.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tSBAufgabeVW.ForeColor = System.Drawing.Color.White; - this.tSBAufgabeVW.Image = ((System.Drawing.Image)(resources.GetObject("tSBAufgabeVW.Image"))); - this.tSBAufgabeVW.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBAufgabeVW.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.tSBAufgabeVW.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tSBAufgabeVW.Name = "tSBAufgabeVW"; - this.tSBAufgabeVW.Size = new System.Drawing.Size(180, 40); - this.tSBAufgabeVW.Text = "AUFGABENVERWALTUNG"; - this.tSBAufgabeVW.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBAufgabeVW.Click += new System.EventHandler(this.tSBAufgabeVW_Click); - this.tSBAufgabeVW.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); - this.tSBAufgabeVW.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); - this.tSBAufgabeVW.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); - // - // tSBArtikelVW - // - this.tSBArtikelVW.AutoSize = false; - this.tSBArtikelVW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.tSBArtikelVW.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tSBArtikelVW.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tSBArtikelVW.ForeColor = System.Drawing.Color.White; - this.tSBArtikelVW.Image = ((System.Drawing.Image)(resources.GetObject("tSBArtikelVW.Image"))); - this.tSBArtikelVW.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBArtikelVW.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.tSBArtikelVW.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tSBArtikelVW.Name = "tSBArtikelVW"; - this.tSBArtikelVW.Size = new System.Drawing.Size(180, 40); - this.tSBArtikelVW.Text = "ARTIKELVERWALTUNG"; - this.tSBArtikelVW.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBArtikelVW.ToolTipText = "Artikel bearbeiten"; - this.tSBArtikelVW.Click += new System.EventHandler(this.tSBArtikelVW_Click); - this.tSBArtikelVW.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); - this.tSBArtikelVW.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); - this.tSBArtikelVW.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); - // - // toolStripZaehlscheine - // - this.toolStripZaehlscheine.AutoSize = false; - this.toolStripZaehlscheine.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.toolStripZaehlscheine.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripZaehlscheine.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.toolStripZaehlscheine.ForeColor = System.Drawing.Color.White; - this.toolStripZaehlscheine.Image = ((System.Drawing.Image)(resources.GetObject("toolStripZaehlscheine.Image"))); - this.toolStripZaehlscheine.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolStripZaehlscheine.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.toolStripZaehlscheine.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripZaehlscheine.Name = "toolStripZaehlscheine"; - this.toolStripZaehlscheine.Size = new System.Drawing.Size(180, 40); - this.toolStripZaehlscheine.Text = "KUNDENVERWALTUNG"; - this.toolStripZaehlscheine.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolStripZaehlscheine.ToolTipText = "Kunde bearbeiten"; - this.toolStripZaehlscheine.Click += new System.EventHandler(this.toolStripZaehlscheine_Click); - this.toolStripZaehlscheine.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); - this.toolStripZaehlscheine.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); - this.toolStripZaehlscheine.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); - // - // tSBExpedit - // - this.tSBExpedit.AutoSize = false; - this.tSBExpedit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.tSBExpedit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tSBExpedit.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tSBExpedit.ForeColor = System.Drawing.Color.White; - this.tSBExpedit.Image = ((System.Drawing.Image)(resources.GetObject("tSBExpedit.Image"))); - this.tSBExpedit.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBExpedit.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.tSBExpedit.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tSBExpedit.Name = "tSBExpedit"; - this.tSBExpedit.Size = new System.Drawing.Size(180, 40); - this.tSBExpedit.Text = "EXPEDIT"; - this.tSBExpedit.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBExpedit.Click += new System.EventHandler(this.tSBExpedit_Click); - this.tSBExpedit.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); - this.tSBExpedit.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); - this.tSBExpedit.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); - // - // toolStripDB - // - this.toolStripDB.AutoSize = false; - this.toolStripDB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.toolStripDB.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripDB.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.toolStripDB.ForeColor = System.Drawing.Color.White; - this.toolStripDB.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDB.Image"))); - this.toolStripDB.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolStripDB.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.toolStripDB.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripDB.Name = "toolStripDB"; - this.toolStripDB.Size = new System.Drawing.Size(180, 40); - this.toolStripDB.Text = "DECKUNGSBEITRAG"; - this.toolStripDB.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolStripDB.Click += new System.EventHandler(this.toolStripDB_Click); - this.toolStripDB.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); - this.toolStripDB.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); - this.toolStripDB.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); - // - // tSBKosten - // - this.tSBKosten.AutoSize = false; - this.tSBKosten.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.tSBKosten.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tSBKosten.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tSBKosten.ForeColor = System.Drawing.Color.White; - this.tSBKosten.Image = ((System.Drawing.Image)(resources.GetObject("tSBKosten.Image"))); - this.tSBKosten.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBKosten.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.tSBKosten.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tSBKosten.Name = "tSBKosten"; - this.tSBKosten.Size = new System.Drawing.Size(180, 40); - this.tSBKosten.Text = "KOSTENLISTE"; - this.tSBKosten.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBKosten.Click += new System.EventHandler(this.tSBKosten_Click); - this.tSBKosten.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); - this.tSBKosten.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); - this.tSBKosten.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); - // - // toolStripButton1 - // - this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton1.AutoSize = false; - this.toolStripButton1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.BackgroundImage"))); - this.toolStripButton1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton1.Enabled = false; - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(180, 70); - this.toolStripButton1.Text = "toolStripButton1"; - // - // tSBScannTest - // - this.tSBScannTest.AutoSize = false; - this.tSBScannTest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.tSBScannTest.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tSBScannTest.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tSBScannTest.ForeColor = System.Drawing.Color.White; - this.tSBScannTest.Image = ((System.Drawing.Image)(resources.GetObject("tSBScannTest.Image"))); - this.tSBScannTest.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBScannTest.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.tSBScannTest.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tSBScannTest.Name = "tSBScannTest"; - this.tSBScannTest.Size = new System.Drawing.Size(180, 40); - this.tSBScannTest.Text = "SCANN TEST"; - this.tSBScannTest.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBScannTest.Click += new System.EventHandler(this.tSBScannTest_Click); - this.tSBScannTest.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); - this.tSBScannTest.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); - this.tSBScannTest.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); - // - // tSBHilfe - // - this.tSBHilfe.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.tSBHilfe.AutoSize = false; - this.tSBHilfe.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.tSBHilfe.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tSBHilfe.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tSBHilfe.ForeColor = System.Drawing.Color.White; - this.tSBHilfe.Image = ((System.Drawing.Image)(resources.GetObject("tSBHilfe.Image"))); - this.tSBHilfe.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBHilfe.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.tSBHilfe.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tSBHilfe.Name = "tSBHilfe"; - this.tSBHilfe.Size = new System.Drawing.Size(180, 40); - this.tSBHilfe.Text = "HILFE"; - this.tSBHilfe.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBHilfe.Click += new System.EventHandler(this.tSBHilfe_Click); - // - // toolStripButtonImport - // - this.toolStripButtonImport.AutoSize = false; - this.toolStripButtonImport.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.toolStripButtonImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButtonImport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.toolStripButtonImport.ForeColor = System.Drawing.Color.White; - this.toolStripButtonImport.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonImport.Image"))); - this.toolStripButtonImport.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolStripButtonImport.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.toolStripButtonImport.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonImport.Name = "toolStripButtonImport"; - this.toolStripButtonImport.Size = new System.Drawing.Size(180, 40); - this.toolStripButtonImport.Text = "IMPORT"; - this.toolStripButtonImport.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolStripButtonImport.Click += new System.EventHandler(this.toolStripButtonImport_Click); - this.toolStripButtonImport.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); - this.toolStripButtonImport.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); - this.toolStripButtonImport.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); - // - // tSBEinstellung - // - this.tSBEinstellung.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.tSBEinstellung.AutoSize = false; - this.tSBEinstellung.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tSBEinstellung.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tSBEinstellung.ForeColor = System.Drawing.Color.White; - this.tSBEinstellung.Image = ((System.Drawing.Image)(resources.GetObject("tSBEinstellung.Image"))); - this.tSBEinstellung.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBEinstellung.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tSBEinstellung.Name = "tSBEinstellung"; - this.tSBEinstellung.Size = new System.Drawing.Size(180, 40); - this.tSBEinstellung.Text = "EINSTELLUNG"; - this.tSBEinstellung.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.tSBEinstellung.Click += new System.EventHandler(this.tSBEinstellung_Click); - // - // toolStripBeenden - // - this.toolStripBeenden.AutoSize = false; - this.toolStripBeenden.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.toolStripBeenden.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripBeenden.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.toolStripBeenden.ForeColor = System.Drawing.Color.White; - this.toolStripBeenden.Image = ((System.Drawing.Image)(resources.GetObject("toolStripBeenden.Image"))); - this.toolStripBeenden.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolStripBeenden.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.toolStripBeenden.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripBeenden.Name = "toolStripBeenden"; - this.toolStripBeenden.Size = new System.Drawing.Size(180, 40); - this.toolStripBeenden.Text = "BEENDEN"; - this.toolStripBeenden.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolStripBeenden.Click += new System.EventHandler(this.toolStripBeenden_Click); - this.toolStripBeenden.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); - this.toolStripBeenden.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); - this.toolStripBeenden.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); - // // panelMain // + this.panelMain.AllowDrop = true; this.panelMain.BackColor = System.Drawing.Color.White; + this.panelMain.Controls.Add(this.buttonNeuerUser); this.panelMain.Controls.Add(this.groupBoxStatistik); this.panelMain.Controls.Add(this.groupBoxUpdate); this.panelMain.Controls.Add(this.buttonNeuerAuftrag); @@ -408,6 +141,8 @@ namespace Deckungsbeitrag this.panelMain.Name = "panelMain"; this.panelMain.Size = new System.Drawing.Size(938, 689); this.panelMain.TabIndex = 5; + this.panelMain.DragDrop += new System.Windows.Forms.DragEventHandler(this.panelMain_DragDrop); + this.panelMain.DragEnter += new System.Windows.Forms.DragEventHandler(this.panelMain_DragEnter); this.panelMain.Paint += new System.Windows.Forms.PaintEventHandler(this.panelMain_Paint); // // groupBoxStatistik @@ -727,12 +462,13 @@ namespace Deckungsbeitrag this.buttonNeuerAuftrag.Location = new System.Drawing.Point(8, 9); this.buttonNeuerAuftrag.Margin = new System.Windows.Forms.Padding(2); this.buttonNeuerAuftrag.Name = "buttonNeuerAuftrag"; - this.buttonNeuerAuftrag.Size = new System.Drawing.Size(169, 52); + this.buttonNeuerAuftrag.Size = new System.Drawing.Size(200, 41); this.buttonNeuerAuftrag.TabIndex = 56; this.buttonNeuerAuftrag.Text = "Neuer Auftrag"; this.buttonNeuerAuftrag.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.buttonNeuerAuftrag.UseVisualStyleBackColor = false; this.buttonNeuerAuftrag.Click += new System.EventHandler(this.buttonNeuerAuftrag_Click); + this.buttonNeuerAuftrag.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Button_MouseDown); // // groupBoxAuftrag // @@ -747,7 +483,7 @@ namespace Deckungsbeitrag this.groupBoxAuftrag.Controls.Add(this.rBAlle); this.groupBoxAuftrag.Controls.Add(this.buttonAufAbruf); this.groupBoxAuftrag.Controls.Add(this.buttonAusgeliefert); - this.groupBoxAuftrag.Location = new System.Drawing.Point(447, 23); + this.groupBoxAuftrag.Location = new System.Drawing.Point(662, 150); this.groupBoxAuftrag.Name = "groupBoxAuftrag"; this.groupBoxAuftrag.Size = new System.Drawing.Size(663, 479); this.groupBoxAuftrag.TabIndex = 51; @@ -906,16 +642,6 @@ namespace Deckungsbeitrag this.groupBoxScannTest.TabStop = false; this.groupBoxScannTest.Visible = false; // - // pictureBoxScannTest - // - this.pictureBoxScannTest.Location = new System.Drawing.Point(6, 10); - this.pictureBoxScannTest.Name = "pictureBoxScannTest"; - this.pictureBoxScannTest.Size = new System.Drawing.Size(179, 160); - this.pictureBoxScannTest.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBoxScannTest.TabIndex = 14; - this.pictureBoxScannTest.TabStop = false; - this.pictureBoxScannTest.Visible = false; - // // textBoxScannTest // this.textBoxScannTest.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -948,6 +674,306 @@ namespace Deckungsbeitrag this.labelScannTest.Text = "label1"; this.labelScannTest.Visible = false; // + // buttonNeuerUser + // + this.buttonNeuerUser.BackColor = System.Drawing.Color.Yellow; + this.buttonNeuerUser.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.buttonNeuerUser.FlatAppearance.BorderSize = 0; + this.buttonNeuerUser.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonNeuerUser.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonNeuerUser.ForeColor = System.Drawing.Color.Black; + this.buttonNeuerUser.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.buttonNeuerUser.Location = new System.Drawing.Point(8, 65); + this.buttonNeuerUser.Margin = new System.Windows.Forms.Padding(2); + this.buttonNeuerUser.Name = "buttonNeuerUser"; + this.buttonNeuerUser.Size = new System.Drawing.Size(200, 41); + this.buttonNeuerUser.TabIndex = 62; + this.buttonNeuerUser.Text = "Neuer User"; + this.buttonNeuerUser.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.buttonNeuerUser.UseVisualStyleBackColor = false; + this.buttonNeuerUser.Click += new System.EventHandler(this.buttonNeuerUser_Click); + this.buttonNeuerUser.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Button_MouseDown); + // + // tSBBenutzerVW + // + this.tSBBenutzerVW.AutoSize = false; + this.tSBBenutzerVW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.tSBBenutzerVW.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tSBBenutzerVW.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tSBBenutzerVW.ForeColor = System.Drawing.Color.White; + this.tSBBenutzerVW.Image = ((System.Drawing.Image)(resources.GetObject("tSBBenutzerVW.Image"))); + this.tSBBenutzerVW.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBBenutzerVW.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tSBBenutzerVW.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tSBBenutzerVW.Name = "tSBBenutzerVW"; + this.tSBBenutzerVW.Size = new System.Drawing.Size(180, 40); + this.tSBBenutzerVW.Text = "BENUTZERVERWALTUNG"; + this.tSBBenutzerVW.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBBenutzerVW.Click += new System.EventHandler(this.tSBBenutzerVW_Click); + this.tSBBenutzerVW.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); + this.tSBBenutzerVW.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); + this.tSBBenutzerVW.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); + // + // tSBAuftragVW + // + this.tSBAuftragVW.AutoSize = false; + this.tSBAuftragVW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.tSBAuftragVW.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tSBAuftragVW.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tSBAuftragVW.ForeColor = System.Drawing.Color.White; + this.tSBAuftragVW.Image = ((System.Drawing.Image)(resources.GetObject("tSBAuftragVW.Image"))); + this.tSBAuftragVW.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBAuftragVW.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tSBAuftragVW.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tSBAuftragVW.Name = "tSBAuftragVW"; + this.tSBAuftragVW.Size = new System.Drawing.Size(180, 40); + this.tSBAuftragVW.Text = "AUFTRAGVERWALTUNG"; + this.tSBAuftragVW.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBAuftragVW.ToolTipText = "Auftragkontrolle und -bearbeitung"; + this.tSBAuftragVW.Click += new System.EventHandler(this.tSBAuftragVW_Click); + this.tSBAuftragVW.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); + this.tSBAuftragVW.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); + this.tSBAuftragVW.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); + // + // tSBAufgabeVW + // + this.tSBAufgabeVW.AutoSize = false; + this.tSBAufgabeVW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.tSBAufgabeVW.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tSBAufgabeVW.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tSBAufgabeVW.ForeColor = System.Drawing.Color.White; + this.tSBAufgabeVW.Image = ((System.Drawing.Image)(resources.GetObject("tSBAufgabeVW.Image"))); + this.tSBAufgabeVW.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBAufgabeVW.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tSBAufgabeVW.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tSBAufgabeVW.Name = "tSBAufgabeVW"; + this.tSBAufgabeVW.Size = new System.Drawing.Size(180, 40); + this.tSBAufgabeVW.Text = "AUFGABENVERWALTUNG"; + this.tSBAufgabeVW.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBAufgabeVW.Click += new System.EventHandler(this.tSBAufgabeVW_Click); + this.tSBAufgabeVW.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); + this.tSBAufgabeVW.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); + this.tSBAufgabeVW.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); + // + // tSBArtikelVW + // + this.tSBArtikelVW.AutoSize = false; + this.tSBArtikelVW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.tSBArtikelVW.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tSBArtikelVW.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tSBArtikelVW.ForeColor = System.Drawing.Color.White; + this.tSBArtikelVW.Image = ((System.Drawing.Image)(resources.GetObject("tSBArtikelVW.Image"))); + this.tSBArtikelVW.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBArtikelVW.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tSBArtikelVW.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tSBArtikelVW.Name = "tSBArtikelVW"; + this.tSBArtikelVW.Size = new System.Drawing.Size(180, 40); + this.tSBArtikelVW.Text = "ARTIKELVERWALTUNG"; + this.tSBArtikelVW.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBArtikelVW.ToolTipText = "Artikel bearbeiten"; + this.tSBArtikelVW.Click += new System.EventHandler(this.tSBArtikelVW_Click); + this.tSBArtikelVW.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); + this.tSBArtikelVW.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); + this.tSBArtikelVW.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); + // + // toolStripZaehlscheine + // + this.toolStripZaehlscheine.AutoSize = false; + this.toolStripZaehlscheine.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.toolStripZaehlscheine.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripZaehlscheine.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.toolStripZaehlscheine.ForeColor = System.Drawing.Color.White; + this.toolStripZaehlscheine.Image = ((System.Drawing.Image)(resources.GetObject("toolStripZaehlscheine.Image"))); + this.toolStripZaehlscheine.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolStripZaehlscheine.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.toolStripZaehlscheine.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripZaehlscheine.Name = "toolStripZaehlscheine"; + this.toolStripZaehlscheine.Size = new System.Drawing.Size(180, 40); + this.toolStripZaehlscheine.Text = "KUNDENVERWALTUNG"; + this.toolStripZaehlscheine.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolStripZaehlscheine.ToolTipText = "Kunde bearbeiten"; + this.toolStripZaehlscheine.Click += new System.EventHandler(this.toolStripZaehlscheine_Click); + this.toolStripZaehlscheine.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); + this.toolStripZaehlscheine.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); + this.toolStripZaehlscheine.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); + // + // tSBExpedit + // + this.tSBExpedit.AutoSize = false; + this.tSBExpedit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.tSBExpedit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tSBExpedit.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tSBExpedit.ForeColor = System.Drawing.Color.White; + this.tSBExpedit.Image = ((System.Drawing.Image)(resources.GetObject("tSBExpedit.Image"))); + this.tSBExpedit.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBExpedit.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tSBExpedit.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tSBExpedit.Name = "tSBExpedit"; + this.tSBExpedit.Size = new System.Drawing.Size(180, 40); + this.tSBExpedit.Text = "EXPEDIT"; + this.tSBExpedit.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBExpedit.Click += new System.EventHandler(this.tSBExpedit_Click); + this.tSBExpedit.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); + this.tSBExpedit.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); + this.tSBExpedit.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); + // + // toolStripDB + // + this.toolStripDB.AutoSize = false; + this.toolStripDB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.toolStripDB.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripDB.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.toolStripDB.ForeColor = System.Drawing.Color.White; + this.toolStripDB.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDB.Image"))); + this.toolStripDB.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolStripDB.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.toolStripDB.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripDB.Name = "toolStripDB"; + this.toolStripDB.Size = new System.Drawing.Size(180, 40); + this.toolStripDB.Text = "DECKUNGSBEITRAG"; + this.toolStripDB.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolStripDB.Click += new System.EventHandler(this.toolStripDB_Click); + this.toolStripDB.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); + this.toolStripDB.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); + this.toolStripDB.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); + // + // tSBKosten + // + this.tSBKosten.AutoSize = false; + this.tSBKosten.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.tSBKosten.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tSBKosten.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tSBKosten.ForeColor = System.Drawing.Color.White; + this.tSBKosten.Image = ((System.Drawing.Image)(resources.GetObject("tSBKosten.Image"))); + this.tSBKosten.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBKosten.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tSBKosten.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tSBKosten.Name = "tSBKosten"; + this.tSBKosten.Size = new System.Drawing.Size(180, 40); + this.tSBKosten.Text = "KOSTENLISTE"; + this.tSBKosten.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBKosten.Click += new System.EventHandler(this.tSBKosten_Click); + this.tSBKosten.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); + this.tSBKosten.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); + this.tSBKosten.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); + // + // toolStripButton1 + // + this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton1.AutoSize = false; + this.toolStripButton1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.BackgroundImage"))); + this.toolStripButton1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton1.Enabled = false; + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(180, 70); + this.toolStripButton1.Text = "toolStripButton1"; + // + // tSBScannTest + // + this.tSBScannTest.AutoSize = false; + this.tSBScannTest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.tSBScannTest.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tSBScannTest.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tSBScannTest.ForeColor = System.Drawing.Color.White; + this.tSBScannTest.Image = ((System.Drawing.Image)(resources.GetObject("tSBScannTest.Image"))); + this.tSBScannTest.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBScannTest.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tSBScannTest.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tSBScannTest.Name = "tSBScannTest"; + this.tSBScannTest.Size = new System.Drawing.Size(180, 40); + this.tSBScannTest.Text = "SCANN TEST"; + this.tSBScannTest.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBScannTest.Click += new System.EventHandler(this.tSBScannTest_Click); + this.tSBScannTest.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); + this.tSBScannTest.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); + this.tSBScannTest.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); + // + // tSBHilfe + // + this.tSBHilfe.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.tSBHilfe.AutoSize = false; + this.tSBHilfe.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.tSBHilfe.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tSBHilfe.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tSBHilfe.ForeColor = System.Drawing.Color.White; + this.tSBHilfe.Image = ((System.Drawing.Image)(resources.GetObject("tSBHilfe.Image"))); + this.tSBHilfe.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBHilfe.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tSBHilfe.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tSBHilfe.Name = "tSBHilfe"; + this.tSBHilfe.Size = new System.Drawing.Size(180, 40); + this.tSBHilfe.Text = "HILFE"; + this.tSBHilfe.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBHilfe.Click += new System.EventHandler(this.tSBHilfe_Click); + // + // toolStripButtonImport + // + this.toolStripButtonImport.AutoSize = false; + this.toolStripButtonImport.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.toolStripButtonImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripButtonImport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.toolStripButtonImport.ForeColor = System.Drawing.Color.White; + this.toolStripButtonImport.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonImport.Image"))); + this.toolStripButtonImport.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolStripButtonImport.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.toolStripButtonImport.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonImport.Name = "toolStripButtonImport"; + this.toolStripButtonImport.Size = new System.Drawing.Size(180, 40); + this.toolStripButtonImport.Text = "IMPORT"; + this.toolStripButtonImport.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolStripButtonImport.Click += new System.EventHandler(this.toolStripButtonImport_Click); + this.toolStripButtonImport.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); + this.toolStripButtonImport.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); + this.toolStripButtonImport.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); + // + // tSBEinstellung + // + this.tSBEinstellung.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.tSBEinstellung.AutoSize = false; + this.tSBEinstellung.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tSBEinstellung.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tSBEinstellung.ForeColor = System.Drawing.Color.White; + this.tSBEinstellung.Image = ((System.Drawing.Image)(resources.GetObject("tSBEinstellung.Image"))); + this.tSBEinstellung.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBEinstellung.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tSBEinstellung.Name = "tSBEinstellung"; + this.tSBEinstellung.Size = new System.Drawing.Size(180, 40); + this.tSBEinstellung.Text = "EINSTELLUNG"; + this.tSBEinstellung.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.tSBEinstellung.Click += new System.EventHandler(this.tSBEinstellung_Click); + // + // toolStripBeenden + // + this.toolStripBeenden.AutoSize = false; + this.toolStripBeenden.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.toolStripBeenden.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripBeenden.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.toolStripBeenden.ForeColor = System.Drawing.Color.White; + this.toolStripBeenden.Image = ((System.Drawing.Image)(resources.GetObject("toolStripBeenden.Image"))); + this.toolStripBeenden.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolStripBeenden.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.toolStripBeenden.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripBeenden.Name = "toolStripBeenden"; + this.toolStripBeenden.Size = new System.Drawing.Size(180, 40); + this.toolStripBeenden.Text = "BEENDEN"; + this.toolStripBeenden.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolStripBeenden.Click += new System.EventHandler(this.toolStripBeenden_Click); + this.toolStripBeenden.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter); + this.toolStripBeenden.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave); + this.toolStripBeenden.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint); + // + // pictureBoxScannTest + // + this.pictureBoxScannTest.Location = new System.Drawing.Point(6, 10); + this.pictureBoxScannTest.Name = "pictureBoxScannTest"; + this.pictureBoxScannTest.Size = new System.Drawing.Size(179, 160); + this.pictureBoxScannTest.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBoxScannTest.TabIndex = 14; + this.pictureBoxScannTest.TabStop = false; + this.pictureBoxScannTest.Visible = false; + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1038,6 +1064,7 @@ namespace Deckungsbeitrag private System.Windows.Forms.Label labelStatistik2; private System.Windows.Forms.Label labelZahl1; private System.Windows.Forms.DateTimePicker dateTimePicker1; + private System.Windows.Forms.Button buttonNeuerUser; } } diff --git a/AA-Forms/FormMain.cs b/AA-Forms/FormMain.cs index 92d0dfd..f1527a8 100644 --- a/AA-Forms/FormMain.cs +++ b/AA-Forms/FormMain.cs @@ -1,5 +1,6 @@ using BrightIdeasSoftware; using DatenDB; +using Deckungsbeitrag.AA_Forms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -23,6 +24,7 @@ namespace Deckungsbeitrag bool open = false; private bool isDragging = false; private Point dragStartPoint; + private Point newLocation; public FormMain() { @@ -176,7 +178,7 @@ namespace Deckungsbeitrag else { this.groupBoxAuftrag.Visible = this.buttonAufAbruf.Visible = this.buttonAusgeliefert.Visible = this.rBAlle.Visible = this.rBAusgeliefert.Visible = this.rBFertig.Visible = this.rBVorbereitet.Visible = this.rBAufAbruf.Visible = this.objectListViewAuftrag.Enabled = this.objectListViewAuftrag.Visible = false; - this.groupBoxStatistik.Visible = this.buttonNeuerAuftrag.Visible = this.buttonNeuerAuftrag.Enabled = this.groupBoxUpdate.Visible = true; + this.groupBoxStatistik.Visible = this.buttonNeuerAuftrag.Visible = this.buttonNeuerAuftrag.Enabled = true; } } private void tSBScannTest_Click(object sender, EventArgs e) @@ -546,8 +548,6 @@ namespace Deckungsbeitrag meldung.NurEinAuftrag(); } } - - private void objectListViewAuftrag_ItemChecked(object sender, ItemCheckedEventArgs e) { if (this.objectListViewAuftrag.CheckedItems.Count > 0) this.buttonAusgeliefert.Visible = true; @@ -639,7 +639,6 @@ namespace Deckungsbeitrag Funktionen.Columns_Resize(this.objectListViewAuftrag); } - private void FormMain_HelpButtonClicked(object sender, CancelEventArgs e) { string[] keys = { @@ -657,7 +656,6 @@ namespace Deckungsbeitrag //e.Cancel = true; } - private void tSBHilfe_Click(object sender, EventArgs e) { FormMain_HelpButtonClicked(this, null); @@ -722,6 +720,12 @@ namespace Deckungsbeitrag { GetStatistik(); } + + /// + /// Drag & Drop für GroupBox. + /// + /// + /// private void groupBox_Paint(object sender, PaintEventArgs e) { GroupBox gb = (GroupBox)sender; @@ -738,7 +742,6 @@ namespace Deckungsbeitrag ctr.MouseUp += groupBox_MouseUp; } } - private void groupBox_MouseDown(object sender, MouseEventArgs e) { GroupBox gb; @@ -756,7 +759,6 @@ namespace Deckungsbeitrag } } - private Point newLocation; private void groupBox_MouseMove(object sender, MouseEventArgs e) { GroupBox gb; @@ -784,7 +786,6 @@ namespace Deckungsbeitrag //TODO: GroupBox Realtime verschieben testen. Sonst Endposition nehmen. gb.Location hier entfernen und unten einkommentieren. } } - private void groupBox_MouseUp(object sender, MouseEventArgs e) { GroupBox gb; @@ -801,6 +802,52 @@ namespace Deckungsbeitrag //TODO: GroupBox wird an Endposition verschoben. gb.Location = newLocation; } + Properties.Settings.Default.Location_GroupBoxStatistik_Main = gb.Location; + Properties.Settings.Default.Save(); + } + + /// + /// Drag & Drop für Buttons. + /// + /// + /// + private void Button_MouseDown(object sender, MouseEventArgs e) + { + Button btn = (Button)sender; + if (btn != null && e.Button == MouseButtons.Left) + { + btn.DoDragDrop(btn, DragDropEffects.Move); + } + } + private void panelMain_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Button))) + e.Effect = DragDropEffects.Move; + else + e.Effect = DragDropEffects.None; + } + private void panelMain_DragDrop(object sender, DragEventArgs e) + { + Button btn = e.Data.GetData(typeof(Button)) as Button; + if (btn != null) + { + Point p = this.panelMain.PointToClient(new Point(e.X, e.Y)); + btn.Location = p; + } + if (btn.Name.Contains("NeuerUser")) Properties.Settings.Default.Location_ButtonNeuerUser_Main = btn.Location; + if (btn.Name.Contains("NeuerAuftrag")) Properties.Settings.Default.Location_ButtonNeuerAuftrag_Main = btn.Location; + Properties.Settings.Default.Save(); + } + + /// + /// Buttons auf MainPanel. Schnellzugriff für Neuer User und Neuer Auftrag. + /// + /// + /// + private void buttonNeuerUser_Click(object sender, EventArgs e) + { + FormNeuerBenutzer neuerBenutzer = new FormNeuerBenutzer(); + neuerBenutzer.ShowDialog(); } } diff --git a/AA-Forms/FormNeuerBenutzer.Designer.cs b/AA-Forms/FormNeuerBenutzer.Designer.cs new file mode 100644 index 0000000..00b5d17 --- /dev/null +++ b/AA-Forms/FormNeuerBenutzer.Designer.cs @@ -0,0 +1,289 @@ +namespace Deckungsbeitrag.AA_Forms +{ + partial class FormNeuerBenutzer + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormNeuerBenutzer)); + this.labelVorname = new System.Windows.Forms.Label(); + this.textBoxVorname = new System.Windows.Forms.TextBox(); + this.comboBoxRolle = new System.Windows.Forms.ComboBox(); + this.labelNachname = new System.Windows.Forms.Label(); + this.labelBenutzername = new System.Windows.Forms.Label(); + this.textBoxNachname = new System.Windows.Forms.TextBox(); + this.textBoxBenutzername = new System.Windows.Forms.TextBox(); + this.labelRolle = new System.Windows.Forms.Label(); + this.labelFuehrerschein = new System.Windows.Forms.Label(); + this.textBoxFuehrerschein = new System.Windows.Forms.TextBox(); + this.dateTimePickerFSGueltig = new System.Windows.Forms.DateTimePicker(); + this.labelFSGueltig = new System.Windows.Forms.Label(); + this.groupBoxFuehrerschein = new System.Windows.Forms.GroupBox(); + this.buttonAbbrechen = new System.Windows.Forms.Button(); + this.buttonSpeichern = new System.Windows.Forms.Button(); + this.groupBoxFuehrerschein.SuspendLayout(); + this.SuspendLayout(); + // + // labelVorname + // + this.labelVorname.AutoSize = true; + this.labelVorname.CausesValidation = false; + this.labelVorname.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelVorname.ForeColor = System.Drawing.Color.White; + this.labelVorname.Location = new System.Drawing.Point(12, 9); + this.labelVorname.Name = "labelVorname"; + this.labelVorname.Size = new System.Drawing.Size(74, 20); + this.labelVorname.TabIndex = 0; + this.labelVorname.Text = "Vorname"; + // + // textBoxVorname + // + this.textBoxVorname.CausesValidation = false; + this.textBoxVorname.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBoxVorname.Location = new System.Drawing.Point(16, 32); + this.textBoxVorname.Name = "textBoxVorname"; + this.textBoxVorname.Size = new System.Drawing.Size(150, 26); + this.textBoxVorname.TabIndex = 0; + this.textBoxVorname.Leave += new System.EventHandler(this.textBoxVorname_Leave); + // + // comboBoxRolle + // + this.comboBoxRolle.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.comboBoxRolle.FormattingEnabled = true; + this.comboBoxRolle.Location = new System.Drawing.Point(16, 165); + this.comboBoxRolle.Name = "comboBoxRolle"; + this.comboBoxRolle.Size = new System.Drawing.Size(306, 28); + this.comboBoxRolle.TabIndex = 3; + this.comboBoxRolle.DropDown += new System.EventHandler(this.comboBoxRolle_DropDown); + this.comboBoxRolle.SelectedValueChanged += new System.EventHandler(this.comboBoxRolle_SelectedValueChanged); + this.comboBoxRolle.Leave += new System.EventHandler(this.comboBoxRolle_Leave); + this.comboBoxRolle.Validating += new System.ComponentModel.CancelEventHandler(this.comboBoxRolle_Validating); + // + // labelNachname + // + this.labelNachname.AutoSize = true; + this.labelNachname.CausesValidation = false; + this.labelNachname.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelNachname.ForeColor = System.Drawing.Color.White; + this.labelNachname.Location = new System.Drawing.Point(168, 9); + this.labelNachname.Name = "labelNachname"; + this.labelNachname.Size = new System.Drawing.Size(86, 20); + this.labelNachname.TabIndex = 5; + this.labelNachname.Text = "Nachname"; + // + // labelBenutzername + // + this.labelBenutzername.AutoSize = true; + this.labelBenutzername.CausesValidation = false; + this.labelBenutzername.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelBenutzername.ForeColor = System.Drawing.Color.White; + this.labelBenutzername.Location = new System.Drawing.Point(12, 73); + this.labelBenutzername.Name = "labelBenutzername"; + this.labelBenutzername.Size = new System.Drawing.Size(114, 20); + this.labelBenutzername.TabIndex = 6; + this.labelBenutzername.Text = "Benutzername"; + // + // textBoxNachname + // + this.textBoxNachname.CausesValidation = false; + this.textBoxNachname.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBoxNachname.Location = new System.Drawing.Point(172, 32); + this.textBoxNachname.Name = "textBoxNachname"; + this.textBoxNachname.Size = new System.Drawing.Size(150, 26); + this.textBoxNachname.TabIndex = 1; + this.textBoxNachname.Leave += new System.EventHandler(this.textBoxNachname_Leave); + // + // textBoxBenutzername + // + this.textBoxBenutzername.CharacterCasing = System.Windows.Forms.CharacterCasing.Lower; + this.textBoxBenutzername.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBoxBenutzername.Location = new System.Drawing.Point(16, 96); + this.textBoxBenutzername.Name = "textBoxBenutzername"; + this.textBoxBenutzername.Size = new System.Drawing.Size(306, 26); + this.textBoxBenutzername.TabIndex = 2; + this.textBoxBenutzername.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxBenutzername_Validating); + // + // labelRolle + // + this.labelRolle.AutoSize = true; + this.labelRolle.CausesValidation = false; + this.labelRolle.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelRolle.ForeColor = System.Drawing.Color.White; + this.labelRolle.Location = new System.Drawing.Point(12, 142); + this.labelRolle.Name = "labelRolle"; + this.labelRolle.Size = new System.Drawing.Size(106, 20); + this.labelRolle.TabIndex = 9; + this.labelRolle.Text = "Rolle/Bosition"; + // + // labelFuehrerschein + // + this.labelFuehrerschein.AutoSize = true; + this.labelFuehrerschein.CausesValidation = false; + this.labelFuehrerschein.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelFuehrerschein.ForeColor = System.Drawing.Color.White; + this.labelFuehrerschein.Location = new System.Drawing.Point(4, 16); + this.labelFuehrerschein.Name = "labelFuehrerschein"; + this.labelFuehrerschein.Size = new System.Drawing.Size(102, 20); + this.labelFuehrerschein.TabIndex = 10; + this.labelFuehrerschein.Text = "Führerschein"; + // + // textBoxFuehrerschein + // + this.textBoxFuehrerschein.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBoxFuehrerschein.Location = new System.Drawing.Point(8, 39); + this.textBoxFuehrerschein.Name = "textBoxFuehrerschein"; + this.textBoxFuehrerschein.Size = new System.Drawing.Size(292, 26); + this.textBoxFuehrerschein.TabIndex = 11; + this.textBoxFuehrerschein.Leave += new System.EventHandler(this.textBoxFuehrerschein_Leave); + this.textBoxFuehrerschein.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxFuehrerschein_Validating); + // + // dateTimePickerFSGueltig + // + this.dateTimePickerFSGueltig.CausesValidation = false; + this.dateTimePickerFSGueltig.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dateTimePickerFSGueltig.Format = System.Windows.Forms.DateTimePickerFormat.Short; + this.dateTimePickerFSGueltig.Location = new System.Drawing.Point(8, 105); + this.dateTimePickerFSGueltig.Name = "dateTimePickerFSGueltig"; + this.dateTimePickerFSGueltig.Size = new System.Drawing.Size(127, 26); + this.dateTimePickerFSGueltig.TabIndex = 12; + this.dateTimePickerFSGueltig.Leave += new System.EventHandler(this.dateTimePickerFSGueltig_Leave); + // + // labelFSGueltig + // + this.labelFSGueltig.AutoSize = true; + this.labelFSGueltig.CausesValidation = false; + this.labelFSGueltig.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelFSGueltig.ForeColor = System.Drawing.Color.White; + this.labelFSGueltig.Location = new System.Drawing.Point(6, 82); + this.labelFSGueltig.Name = "labelFSGueltig"; + this.labelFSGueltig.Size = new System.Drawing.Size(75, 20); + this.labelFSGueltig.TabIndex = 13; + this.labelFSGueltig.Text = "Gültig bis"; + // + // groupBoxFuehrerschein + // + this.groupBoxFuehrerschein.Controls.Add(this.labelFuehrerschein); + this.groupBoxFuehrerschein.Controls.Add(this.labelFSGueltig); + this.groupBoxFuehrerschein.Controls.Add(this.dateTimePickerFSGueltig); + this.groupBoxFuehrerschein.Controls.Add(this.textBoxFuehrerschein); + this.groupBoxFuehrerschein.Enabled = false; + this.groupBoxFuehrerschein.ForeColor = System.Drawing.Color.White; + this.groupBoxFuehrerschein.Location = new System.Drawing.Point(16, 209); + this.groupBoxFuehrerschein.Name = "groupBoxFuehrerschein"; + this.groupBoxFuehrerschein.Size = new System.Drawing.Size(306, 137); + this.groupBoxFuehrerschein.TabIndex = 14; + this.groupBoxFuehrerschein.TabStop = false; + this.groupBoxFuehrerschein.Visible = false; + this.groupBoxFuehrerschein.Validating += new System.ComponentModel.CancelEventHandler(this.groupBoxFuehrerschein_Validating); + // + // buttonAbbrechen + // + this.buttonAbbrechen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonAbbrechen.BackColor = System.Drawing.Color.Red; + this.buttonAbbrechen.CausesValidation = false; + this.buttonAbbrechen.FlatAppearance.BorderColor = System.Drawing.Color.Red; + this.buttonAbbrechen.FlatAppearance.BorderSize = 0; + this.buttonAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonAbbrechen.Image = ((System.Drawing.Image)(resources.GetObject("buttonAbbrechen.Image"))); + this.buttonAbbrechen.Location = new System.Drawing.Point(281, 210); + this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(2); + this.buttonAbbrechen.Name = "buttonAbbrechen"; + this.buttonAbbrechen.Size = new System.Drawing.Size(41, 41); + this.buttonAbbrechen.TabIndex = 5; + this.buttonAbbrechen.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.buttonAbbrechen.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.buttonAbbrechen.UseVisualStyleBackColor = false; + this.buttonAbbrechen.Click += new System.EventHandler(this.buttonAbbrechen_Click); + // + // buttonSpeichern + // + this.buttonSpeichern.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonSpeichern.BackColor = System.Drawing.Color.Gray; + this.buttonSpeichern.CausesValidation = false; + this.buttonSpeichern.Enabled = false; + this.buttonSpeichern.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.buttonSpeichern.FlatAppearance.BorderSize = 0; + this.buttonSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonSpeichern.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonSpeichern.Image"))); + this.buttonSpeichern.Location = new System.Drawing.Point(16, 210); + this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(2); + this.buttonSpeichern.Name = "buttonSpeichern"; + this.buttonSpeichern.Size = new System.Drawing.Size(41, 41); + this.buttonSpeichern.TabIndex = 4; + this.buttonSpeichern.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.buttonSpeichern.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.buttonSpeichern.UseVisualStyleBackColor = false; + this.buttonSpeichern.Click += new System.EventHandler(this.buttonSpeichern_Click); + // + // FormNeuerBenutzer + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.ClientSize = new System.Drawing.Size(339, 261); + this.Controls.Add(this.buttonAbbrechen); + this.Controls.Add(this.buttonSpeichern); + this.Controls.Add(this.groupBoxFuehrerschein); + this.Controls.Add(this.labelRolle); + this.Controls.Add(this.textBoxBenutzername); + this.Controls.Add(this.textBoxNachname); + this.Controls.Add(this.labelBenutzername); + this.Controls.Add(this.labelNachname); + this.Controls.Add(this.comboBoxRolle); + this.Controls.Add(this.textBoxVorname); + this.Controls.Add(this.labelVorname); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "FormNeuerBenutzer"; + this.Text = "NEUER BENUTZER"; + this.Load += new System.EventHandler(this.FormNeuerBenutzer_Load); + this.groupBoxFuehrerschein.ResumeLayout(false); + this.groupBoxFuehrerschein.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label labelVorname; + private System.Windows.Forms.TextBox textBoxVorname; + private System.Windows.Forms.ComboBox comboBoxRolle; + private System.Windows.Forms.Label labelNachname; + private System.Windows.Forms.Label labelBenutzername; + private System.Windows.Forms.TextBox textBoxNachname; + private System.Windows.Forms.TextBox textBoxBenutzername; + private System.Windows.Forms.Label labelRolle; + private System.Windows.Forms.Label labelFuehrerschein; + private System.Windows.Forms.TextBox textBoxFuehrerschein; + private System.Windows.Forms.DateTimePicker dateTimePickerFSGueltig; + private System.Windows.Forms.Label labelFSGueltig; + private System.Windows.Forms.GroupBox groupBoxFuehrerschein; + private System.Windows.Forms.Button buttonAbbrechen; + private System.Windows.Forms.Button buttonSpeichern; + } +} \ No newline at end of file diff --git a/AA-Forms/FormNeuerBenutzer.cs b/AA-Forms/FormNeuerBenutzer.cs new file mode 100644 index 0000000..f7476a5 --- /dev/null +++ b/AA-Forms/FormNeuerBenutzer.cs @@ -0,0 +1,246 @@ +using DatenDB; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Deckungsbeitrag.AA_Forms +{ + public partial class FormNeuerBenutzer : Form + { + private Fehlermeldungen meldung = new Fehlermeldungen(); + bool[] tosave = { false, false, false }; + public FormNeuerBenutzer() + { + InitializeComponent(); + } + + private void FormNeuerBenutzer_Load(object sender, EventArgs e) + { + this.comboBoxRolle.DataSource = Enum.GetValues(typeof(BenutzerRolle)); + this.comboBoxRolle.SelectedIndex = -1; + this.dateTimePickerFSGueltig.Value = DateTime.Today; + } + private void buttonSpeichern_Click(object sender, EventArgs e) + { + Benutzer ben = new Benutzer(); + ben.Aktiv = true; + ben.Vorname = textBoxVorname.Text; + ben.Nachname = textBoxNachname.Text; + ben.BenutzerName = textBoxBenutzername.Text; + ben.Rolle = (BenutzerRolle)comboBoxRolle.SelectedValue; + if(ben.Rolle == BenutzerRolle.Fahrer) + { + ben.Schein = int.Parse(textBoxFuehrerschein.Text); + ben.GueltigBis = dateTimePickerFSGueltig.Value; + } + ben.BenutzerID = null; + + if (ben.Save() != 1) meldung.Speicherfehler(); + else + { + string s = $"Benutzer {ben.BenutzerName} erfolgreich gespeichert."; + meldung.SpeichernErfolgreich(s); + this.DialogResult = DialogResult.OK; + this.Close(); + } + } + private void buttonAbbrechen_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } + + /// + /// Wenn SelectedValueChanged wird auch tosave geändert. Validierung wird auch hier ausgelöst. + /// + /// + /// + private void comboBoxRolle_SelectedValueChanged(object sender, EventArgs e) + { + if (this.comboBoxRolle.SelectedValue != null) + { + if ((BenutzerRolle)this.comboBoxRolle.SelectedValue == BenutzerRolle.Fahrer) + { + this.Height = 450; + this.groupBoxFuehrerschein.Enabled = this.groupBoxFuehrerschein.Visible = true; + this.textBoxFuehrerschein.Focus(); + tosave[2] = false; + } + else tosave[2] = true; + + CancelEventArgs ce = new CancelEventArgs(); + comboBoxRolle_Validating(comboBoxRolle, ce); + } + else tosave[2] = false; + + } + + + /// + /// Speicherbuttonstatus Regelung tosave werdem geprüft. + /// + private void Enable_Speichern() + { + if (!Array.TrueForAll(tosave, b => b == true)) + { + this.buttonSpeichern.Enabled = false; + this.buttonSpeichern.BackColor = Color.Gray; + } + else + { + this.buttonSpeichern.Enabled = true; + this.buttonSpeichern.BackColor = Color.FromArgb(0, 192, 0); + this.buttonSpeichern.Focus(); + } + } + + /// + /// TextBox Benutzername validieren und Speicherbuttonstatus regeln. + /// + /// + /// + private void textBoxBenutzername_Validating(object sender, CancelEventArgs e) + { + if (textBoxBenutzername.Text == string.Empty) + { + string s = $"Der Benutzername ist verpflichtend."; + meldung.EingabeFehltoderFalsch(s); + e.Cancel = true; + textBoxBenutzername.Focus(); + textBoxBenutzername.BackColor = Color.Red; + } + else textBoxBenutzername.BackColor = SystemColors.Window; + + tosave[0] = !e.Cancel; + Enable_Speichern(); + } + + /// + /// ComboBox BenutzerRolle validieren und Speicherbuttonstatus regeln. + /// + /// + /// + private void comboBoxRolle_Validating(object sender, CancelEventArgs e) + { + if (string.IsNullOrWhiteSpace(comboBoxRolle.Text)) + { + string s = $"Die BenutzerRolle muss ausgewählt sein."; + meldung.EingabeFehltoderFalsch(s); + e.Cancel = true; + comboBoxRolle.Focus(); + comboBoxRolle.BackColor = Color.Red; + } + else + { + comboBoxRolle.BackColor = SystemColors.Window; + if ((BenutzerRolle)comboBoxRolle.SelectedValue == BenutzerRolle.Fahrer) tosave[2] = false; + else tosave[2] = true; + } + + tosave[1] = !e.Cancel; + Enable_Speichern(); + } + + /// + /// GroupBox Führerschein validieren wenn sichtbar. Speicherbuttonstatus regeln wenn sichtbar. + /// + /// + /// + private void groupBoxFuehrerschein_Validating(object sender, CancelEventArgs e) + { + if (string.IsNullOrWhiteSpace(textBoxFuehrerschein.Text) || dateTimePickerFSGueltig.Value == DateTime.Today) + { + string s = $"Wenn Benutzerrolle ist Fahrer, müssen Führerscheinnummer und Ablaufdatum ausgefüllt werden.{Environment.NewLine}Möchtest du die Benutzerrolle wechseln?"; + if (meldung.BenutzerRolleWechseln(s) == DialogResult.No) + { + e.Cancel = true; + groupBoxFuehrerschein.ForeColor = Color.Red; + tosave[2] = !e.Cancel; + } + else + { + groupBoxFuehrerschein.Visible = false; + this.Height = 300; + tosave[2] = e.Cancel; + } + } + else { groupBoxFuehrerschein.ForeColor = Color.White; tosave[2] = !e.Cancel; } + + + Enable_Speichern(); + } + + /// + /// TextBox Führerschein validieren. Keine Regelung für Speicherbuttonstatus. + /// + /// + /// + private void textBoxFuehrerschein_Validating(object sender, CancelEventArgs e) + { + if (!string.IsNullOrWhiteSpace(textBoxFuehrerschein.Text)) + { + if (int.TryParse(textBoxFuehrerschein.Text, out int value)) textBoxFuehrerschein.BackColor = SystemColors.Window; + else + { + meldung.Eingabefehler(); + e.Cancel = true; + textBoxFuehrerschein.BackColor = Color.Red; + } + } + else textBoxFuehrerschein.BackColor = SystemColors.Window; + } + + /// + /// Leave-Events zur unterstützung der Speicherbuttonstatus Regelung. + /// + /// + /// + private void dateTimePickerFSGueltig_Leave(object sender, EventArgs e) + { + CancelEventArgs ce = new CancelEventArgs(); + groupBoxFuehrerschein_Validating(groupBoxFuehrerschein, ce); + } + private void comboBoxRolle_Leave(object sender, EventArgs e) + { + CancelEventArgs ce = new CancelEventArgs(); + comboBoxRolle_Validating(comboBoxRolle, ce); + } + private void textBoxFuehrerschein_Leave(object sender, EventArgs e) + { + CancelEventArgs ce = new CancelEventArgs(); + textBoxFuehrerschein_Validating(textBoxFuehrerschein, ce); + } + + /// + /// Leave-Events ohne Auswirkung auf Speicherbuttonstatus Regelung. + /// + /// + /// + private void textBoxVorname_Leave(object sender, EventArgs e) + { + this.textBoxBenutzername.Text = textBoxVorname.Text; + } + private void textBoxNachname_Leave(object sender, EventArgs e) + { + this.textBoxBenutzername.Text += textBoxNachname.Text; + } + + /// + /// ComboBox Hintergrundfarbe verändern wenn DropDown geöffnet wird. + /// + /// + /// + private void comboBoxRolle_DropDown(object sender, EventArgs e) + { + comboBoxRolle.BackColor = SystemColors.Window; + } + + } +} diff --git a/AA-Forms/FormNeuerBenutzer.resx b/AA-Forms/FormNeuerBenutzer.resx new file mode 100644 index 0000000..0249b21 --- /dev/null +++ b/AA-Forms/FormNeuerBenutzer.resx @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAHNJREFUOE+1krEJwDAMBD1IyrTZv02XJbLLBYEKh5eFHRHBF5b+D2TUgFaRNFbV + P3bgBLY2KJsBF3BEAAtb3RHEwzazMogAesMLEs0EkBil514FDCASTgEBRMLu+QlQWiEIz3/iyJiABVA+ + pPIpf5I0VvUA30mnWXzROjQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAG5JREFUOE9j+PbtW/i3b9/efPv27T+JGKQnnAHE0C5Y858heA5JGKQHpBdkAIYk + sRisF9mAD+8/EoWHswGk4kFqALp/0TH9DEDno4sjG3CneP4xDA3ofHRxZANkkA1BV0jQABCAGQISACkC + 0cRiAGlM6tRr9T1CAAAAAElFTkSuQmCC + + + + + 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 + QmCC + + + \ No newline at end of file diff --git a/AA-Klassen/Fehlermeldungen.cs b/AA-Klassen/Fehlermeldungen.cs index 253a8e2..bdbda15 100644 --- a/AA-Klassen/Fehlermeldungen.cs +++ b/AA-Klassen/Fehlermeldungen.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Web; using System.Windows.Forms; using ZXing; @@ -226,5 +227,42 @@ namespace DatenDB return result; } + + /// + /// INFO - Speichern erfolgreich. + /// + /// if null -> Standarttext "Speichern erfolgreich abgeschlossen" + public void SpeichernErfolgreich(string s) + { + if(s == null) s = $"Speichern erfolgreich abgeschlossen."; + + string caption = "INFO"; + MessageBoxButtons buttons = MessageBoxButtons.OK; + MessageBoxIcon icon = MessageBoxIcon.Information; + MessageBox.Show(s, caption, buttons, icon); + } + public void EingabeFehltoderFalsch(string s) + { + if (s == null) s = $"Die Eingabe fehlt oder ist falsch."; + + string caption = "FEHLER"; + MessageBoxButtons buttons = MessageBoxButtons.OK; + MessageBoxIcon icon = MessageBoxIcon.Error; + MessageBox.Show(s, caption, buttons, icon); + } + public DialogResult BenutzerRolleWechseln(string s) + { + DialogResult result; + if (string.IsNullOrWhiteSpace(s)) s = $"Wechseln?"; + string caption = "FRAGE"; + MessageBoxButtons buttons = MessageBoxButtons.YesNo; + MessageBoxIcon icon = MessageBoxIcon.Question; + + if (MessageBox.Show(s, caption, buttons, icon) == DialogResult.Yes) result = DialogResult.Yes; + else result = DialogResult.No; + + return result; + } + } } diff --git a/App.config b/App.config index f713250..0bba7eb 100644 --- a/App.config +++ b/App.config @@ -136,6 +136,15 @@ + + 0, 0 + + + 0, 0 + + + 0, 0 + diff --git a/Program.cs b/Program.cs index 0808c98..c86508f 100644 --- a/Program.cs +++ b/Program.cs @@ -29,6 +29,7 @@ namespace Deckungsbeitrag //TODO: Wenn mit Anmeldung dann if-Clause entfernen und Switch alleine verwenden. if (userid.StartsWith("ms") | userid.StartsWith("ps")) { + // Maschinen Einstiegspunkt. Keine Anmeldung notwendig. Application.Run(new FormFehlmengeCount(userid)); } else @@ -39,31 +40,31 @@ namespace Deckungsbeitrag // Switch on BenutzerRolle für Weiterleitung zum richtigen Screen switch (loginForm.Person.Rolle) { - case BenutzerRolle.Verwaltung: + case BenutzerRolle.Verwaltung: //Büropersonal ohne aktive Hallenbeschäftigung Application.Run(new FormMain(loginForm.Person)); break; - case BenutzerRolle.Fahrer: + case BenutzerRolle.Fahrer: //Zustellfahrer Application.Run(new FormMain(loginForm.Person)); break; - case BenutzerRolle.Admin: + case BenutzerRolle.Admin: //Höheres Büropersonal oder Claudia und Kevin Application.Run(new FormMain(loginForm.Person)); break; - case BenutzerRolle.Waschstrasse: + case BenutzerRolle.Waschstrasse: //Bediener einer Waschstraße Application.Run(new FormNeuerAuftrag(loginForm.Person)); break; - case BenutzerRolle.Master: + case BenutzerRolle.Master: //Entwickler oder Claudia und Kevin Application.Run(new FormMain(loginForm.Person)); break; - case BenutzerRolle.Expedit: + case BenutzerRolle.Expedit: //Endkontrolle Lieferungen und Lieferscheine (Mirka) Application.Run(new FormExpedit(loginForm.Person, screens)); break; - case BenutzerRolle.Frottee: - //TODO: Wenn alles ohne Anmeldung dann entfernen. - Application.Run(new FormFehlmengeCount(loginForm.Person)); + case BenutzerRolle.Frottee: //Containerbestückung Frotteewäsche + //BenutzerRolle Frottee = Expedit Frottee da die Maschine keine Anmeldung erfordert. + Application.Run(new FormExpedit(loginForm.Person, screens)); break; - case BenutzerRolle.Flach: - //TODO: Wenn alles ohne Anmeldung dann entfernen. - Application.Run(new FormFehlmengeCount(loginForm.Person)); + case BenutzerRolle.Flach: //Containerbestückung Flachwäsche + //BenutzerRolle Flach = Expedit Frottee da die Maschine keine Anmeldung erfordert. + Application.Run(new FormExpedit(loginForm.Person, screens)); break; default: break; diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 6f6557e..eb9be5f 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -80,6 +80,16 @@ namespace Deckungsbeitrag.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Close_WhiteNoHalo_16x { + get { + object obj = ResourceManager.GetObject("Close_WhiteNoHalo_16x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 0874c81..2b58089 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -118,16 +118,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\UpdatedScript_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Checkmark_blue_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Close_red_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\UpdatedScript_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\question-sign_icon-icons.com_73445.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Close_red_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Close_WhiteNoHalo_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index 7eff23a..1983063 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -227,5 +227,41 @@ namespace Deckungsbeitrag.Properties { this["AuftBald"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] + public global::System.Drawing.Point Location_GroupBoxStatistik_Main { + get { + return ((global::System.Drawing.Point)(this["Location_GroupBoxStatistik_Main"])); + } + set { + this["Location_GroupBoxStatistik_Main"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] + public global::System.Drawing.Point Location_ButtonNeuerUser_Main { + get { + return ((global::System.Drawing.Point)(this["Location_ButtonNeuerUser_Main"])); + } + set { + this["Location_ButtonNeuerUser_Main"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] + public global::System.Drawing.Point Location_ButtonNeuerAuftrag_Main { + get { + return ((global::System.Drawing.Point)(this["Location_ButtonNeuerAuftrag_Main"])); + } + set { + this["Location_ButtonNeuerAuftrag_Main"] = value; + } + } } } diff --git a/Properties/Settings.settings b/Properties/Settings.settings index 76594ec..5dd959d 100644 --- a/Properties/Settings.settings +++ b/Properties/Settings.settings @@ -56,5 +56,14 @@ + + 0, 0 + + + 0, 0 + + + 0, 0 + \ No newline at end of file diff --git a/Resources/Close_WhiteNoHalo_16x.png b/Resources/Close_WhiteNoHalo_16x.png new file mode 100644 index 0000000..e6d0b10 Binary files /dev/null and b/Resources/Close_WhiteNoHalo_16x.png differ diff --git a/Verwaltung.csproj b/Verwaltung.csproj index 3154419..66665fd 100644 --- a/Verwaltung.csproj +++ b/Verwaltung.csproj @@ -152,6 +152,12 @@ + + Form + + + FormNeuerBenutzer.cs + @@ -416,6 +422,9 @@ FormNeuerAuftrag.cs + + FormNeuerBenutzer.cs + FormProgrammauswahl.cs @@ -466,6 +475,7 @@ + diff --git a/Verwaltung.sln b/Verwaltung.sln index 5cefad7..13c0bd2 100644 --- a/Verwaltung.sln +++ b/Verwaltung.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 17.3.32922.545 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Verwaltung", "Verwaltung.csproj", "{1CDFBC6A-240A-4D59-9F9E-35041D9ACCC6}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Wirl-Verwaltung", "..\Wirl-Verwaltung\Wirl-Verwaltung.vdproj", "{8B60A0EA-FF1C-543C-A60A-AC87FFB0250C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,8 @@ Global {1CDFBC6A-240A-4D59-9F9E-35041D9ACCC6}.Debug|Any CPU.Build.0 = Debug|Any CPU {1CDFBC6A-240A-4D59-9F9E-35041D9ACCC6}.Release|Any CPU.ActiveCfg = Release|Any CPU {1CDFBC6A-240A-4D59-9F9E-35041D9ACCC6}.Release|Any CPU.Build.0 = Release|Any CPU + {8B60A0EA-FF1C-543C-A60A-AC87FFB0250C}.Debug|Any CPU.ActiveCfg = Debug + {8B60A0EA-FF1C-543C-A60A-AC87FFB0250C}.Release|Any CPU.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE