diff --git a/RenovationWork/RenovationWork/FormMain.Designer.cs b/RenovationWork/RenovationWork/FormMain.Designer.cs index 70986c7..acdddf8 100644 --- a/RenovationWork/RenovationWork/FormMain.Designer.cs +++ b/RenovationWork/RenovationWork/FormMain.Designer.cs @@ -40,13 +40,13 @@ OrdersToolStripMenuItem = new ToolStripMenuItem(); StartWorkingToolStripMenuItem = new ToolStripMenuItem(); mailToolStripMenuItem = new ToolStripMenuItem(); + backupToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); buttonOrderReady = new Button(); buttonIssuedOrder = new Button(); buttonRef = new Button(); - backupToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -56,7 +56,7 @@ menuStrip.Items.AddRange(new ToolStripItem[] { refbooksToolStripMenuItem, ReportsToolStripMenuItem, StartWorkingToolStripMenuItem, mailToolStripMenuItem, backupToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; - menuStrip.Size = new Size(1125, 24); + menuStrip.Size = new Size(1233, 24); menuStrip.TabIndex = 0; menuStrip.Text = "menuStrip1"; // @@ -137,18 +137,26 @@ mailToolStripMenuItem.Text = "Письма"; mailToolStripMenuItem.Click += mailToolStripMenuItem_Click; // + // backupToolStripMenuItem + // + backupToolStripMenuItem.Name = "backupToolStripMenuItem"; + backupToolStripMenuItem.Size = new Size(51, 20); + backupToolStripMenuItem.Text = "бекап"; + backupToolStripMenuItem.Click += backupToolStripMenuItem_Click; + // // dataGridView // dataGridView.BackgroundColor = SystemColors.ControlLightLight; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Location = new Point(12, 27); dataGridView.Name = "dataGridView"; - dataGridView.Size = new Size(942, 341); + dataGridView.Size = new Size(1049, 341); dataGridView.TabIndex = 1; // // buttonCreateOrder // - buttonCreateOrder.Location = new Point(960, 27); + buttonCreateOrder.ImageAlign = ContentAlignment.MiddleRight; + buttonCreateOrder.Location = new Point(1067, 27); buttonCreateOrder.Name = "buttonCreateOrder"; buttonCreateOrder.Size = new Size(157, 23); buttonCreateOrder.TabIndex = 2; @@ -158,7 +166,8 @@ // // buttonTakeOrderInWork // - buttonTakeOrderInWork.Location = new Point(960, 56); + buttonTakeOrderInWork.ImageAlign = ContentAlignment.MiddleRight; + buttonTakeOrderInWork.Location = new Point(1067, 71); buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; buttonTakeOrderInWork.Size = new Size(157, 45); buttonTakeOrderInWork.TabIndex = 3; @@ -168,7 +177,8 @@ // // buttonOrderReady // - buttonOrderReady.Location = new Point(960, 107); + buttonOrderReady.ImageAlign = ContentAlignment.MiddleRight; + buttonOrderReady.Location = new Point(1067, 122); buttonOrderReady.Name = "buttonOrderReady"; buttonOrderReady.Size = new Size(157, 23); buttonOrderReady.TabIndex = 4; @@ -178,7 +188,8 @@ // // buttonIssuedOrder // - buttonIssuedOrder.Location = new Point(960, 136); + buttonIssuedOrder.ImageAlign = ContentAlignment.MiddleRight; + buttonIssuedOrder.Location = new Point(1067, 151); buttonIssuedOrder.Name = "buttonIssuedOrder"; buttonIssuedOrder.Size = new Size(157, 23); buttonIssuedOrder.TabIndex = 5; @@ -188,7 +199,8 @@ // // buttonRef // - buttonRef.Location = new Point(960, 165); + buttonRef.ImageAlign = ContentAlignment.MiddleRight; + buttonRef.Location = new Point(1067, 180); buttonRef.Name = "buttonRef"; buttonRef.Size = new Size(157, 23); buttonRef.TabIndex = 6; @@ -196,18 +208,11 @@ buttonRef.UseVisualStyleBackColor = true; buttonRef.Click += buttonRef_Click; // - // backupToolStripMenuItem - // - backupToolStripMenuItem.Name = "backupToolStripMenuItem"; - backupToolStripMenuItem.Size = new Size(51, 20); - backupToolStripMenuItem.Text = "бекап"; - backupToolStripMenuItem.Click += backupToolStripMenuItem_Click; - // // FormMain // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1125, 370); + ClientSize = new Size(1233, 370); Controls.Add(buttonRef); Controls.Add(buttonIssuedOrder); Controls.Add(buttonOrderReady); diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs index 7e8f816..fb955c2 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs @@ -17,7 +17,7 @@ namespace RenovationWorkContracts.ViewModels public int Id { get; set; } [Column(visible: false)] public int ClientId { get; set; } - [Column(title: "Имя клиента", width: 190)] + [Column(title: "Имя клиента", width: 150)] public string ClientFIO { get; set; } = string.Empty; [Column(visible: false)] public int RepairId { get; set; } diff --git a/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj b/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj index 5f92369..7869786 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj +++ b/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj @@ -21,7 +21,7 @@ - +