This commit is contained in:
strwbrry1 2024-12-22 00:59:57 +04:00
parent f05a059b8a
commit 85c14b543e
7 changed files with 137 additions and 139 deletions

View File

@ -40,9 +40,10 @@
// //
// buttonCancel // buttonCancel
// //
buttonCancel.Location = new Point(217, 195); buttonCancel.Location = new Point(190, 146);
buttonCancel.Margin = new Padding(3, 2, 3, 2);
buttonCancel.Name = "buttonCancel"; buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(94, 29); buttonCancel.Size = new Size(82, 22);
buttonCancel.TabIndex = 13; buttonCancel.TabIndex = 13;
buttonCancel.Text = "Отмена"; buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
@ -50,9 +51,10 @@
// //
// buttonSave // buttonSave
// //
buttonSave.Location = new Point(18, 195); buttonSave.Location = new Point(16, 146);
buttonSave.Margin = new Padding(3, 2, 3, 2);
buttonSave.Name = "buttonSave"; buttonSave.Name = "buttonSave";
buttonSave.Size = new Size(94, 29); buttonSave.Size = new Size(82, 22);
buttonSave.TabIndex = 12; buttonSave.TabIndex = 12;
buttonSave.Text = "Сохранить"; buttonSave.Text = "Сохранить";
buttonSave.UseVisualStyleBackColor = true; buttonSave.UseVisualStyleBackColor = true;
@ -60,57 +62,60 @@
// //
// textBoxEmail // textBoxEmail
// //
textBoxEmail.Location = new Point(150, 118); textBoxEmail.Location = new Point(131, 88);
textBoxEmail.Margin = new Padding(3, 2, 3, 2);
textBoxEmail.Name = "textBoxEmail"; textBoxEmail.Name = "textBoxEmail";
textBoxEmail.Size = new Size(161, 27); textBoxEmail.Size = new Size(141, 23);
textBoxEmail.TabIndex = 11; textBoxEmail.TabIndex = 11;
// //
// textBoxPhone // textBoxPhone
// //
textBoxPhone.Location = new Point(150, 68); textBoxPhone.Location = new Point(131, 51);
textBoxPhone.Margin = new Padding(3, 2, 3, 2);
textBoxPhone.Name = "textBoxPhone"; textBoxPhone.Name = "textBoxPhone";
textBoxPhone.Size = new Size(161, 27); textBoxPhone.Size = new Size(141, 23);
textBoxPhone.TabIndex = 10; textBoxPhone.TabIndex = 10;
// //
// label2 // label2
// //
label2.AutoSize = true; label2.AutoSize = true;
label2.Location = new Point(18, 121); label2.Location = new Point(16, 91);
label2.Name = "label2"; label2.Name = "label2";
label2.Size = new Size(51, 20); label2.Size = new Size(41, 15);
label2.TabIndex = 9; label2.TabIndex = 9;
label2.Text = "Почта"; label2.Text = "Почта";
// //
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.Location = new Point(18, 71); label1.Location = new Point(16, 53);
label1.Name = "label1"; label1.Name = "label1";
label1.Size = new Size(69, 20); label1.Size = new Size(55, 15);
label1.TabIndex = 8; label1.TabIndex = 8;
label1.Text = "Телефон"; label1.Text = "Телефон";
// //
// textBoxName // textBoxName
// //
textBoxName.Location = new Point(150, 22); textBoxName.Location = new Point(131, 16);
textBoxName.Margin = new Padding(3, 2, 3, 2);
textBoxName.Name = "textBoxName"; textBoxName.Name = "textBoxName";
textBoxName.Size = new Size(161, 27); textBoxName.Size = new Size(141, 23);
textBoxName.TabIndex = 14; textBoxName.TabIndex = 14;
// //
// label3 // label3
// //
label3.AutoSize = true; label3.AutoSize = true;
label3.Location = new Point(18, 25); label3.Location = new Point(16, 19);
label3.Name = "label3"; label3.Name = "label3";
label3.Size = new Size(39, 20); label3.Size = new Size(31, 15);
label3.TabIndex = 8; label3.TabIndex = 8;
label3.Text = "Имя"; label3.Text = "Имя";
// //
// FormContactPerson // FormContactPerson
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(341, 249); ClientSize = new Size(298, 187);
Controls.Add(textBoxName); Controls.Add(textBoxName);
Controls.Add(buttonCancel); Controls.Add(buttonCancel);
Controls.Add(buttonSave); Controls.Add(buttonSave);
@ -119,8 +124,9 @@
Controls.Add(label2); Controls.Add(label2);
Controls.Add(label3); Controls.Add(label3);
Controls.Add(label1); Controls.Add(label1);
Margin = new Padding(3, 2, 3, 2);
Name = "FormContactPerson"; Name = "FormContactPerson";
Text = "FormContactPerson"; Text = "Контактная персона";
ResumeLayout(false); ResumeLayout(false);
PerformLayout(); PerformLayout();
} }

View File

@ -38,9 +38,10 @@
// //
// buttonCancel // buttonCancel
// //
buttonCancel.Location = new Point(202, 122); buttonCancel.Location = new Point(177, 92);
buttonCancel.Margin = new Padding(3, 2, 3, 2);
buttonCancel.Name = "buttonCancel"; buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(94, 29); buttonCancel.Size = new Size(82, 22);
buttonCancel.TabIndex = 13; buttonCancel.TabIndex = 13;
buttonCancel.Text = "Отмена"; buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
@ -48,9 +49,10 @@
// //
// buttonSave // buttonSave
// //
buttonSave.Location = new Point(19, 122); buttonSave.Location = new Point(17, 92);
buttonSave.Margin = new Padding(3, 2, 3, 2);
buttonSave.Name = "buttonSave"; buttonSave.Name = "buttonSave";
buttonSave.Size = new Size(94, 29); buttonSave.Size = new Size(82, 22);
buttonSave.TabIndex = 12; buttonSave.TabIndex = 12;
buttonSave.Text = "Сохранить"; buttonSave.Text = "Сохранить";
buttonSave.UseVisualStyleBackColor = true; buttonSave.UseVisualStyleBackColor = true;
@ -59,9 +61,9 @@
// label2 // label2
// //
label2.AutoSize = true; label2.AutoSize = true;
label2.Location = new Point(19, 63); label2.Location = new Point(17, 47);
label2.Name = "label2"; label2.Name = "label2";
label2.Size = new Size(114, 20); label2.Size = new Size(89, 15);
label2.TabIndex = 9; label2.TabIndex = 9;
label2.Text = "Тип материала"; label2.Text = "Тип материала";
// //
@ -69,40 +71,43 @@
// //
comboBoxMaterialType.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxMaterialType.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxMaterialType.FormattingEnabled = true; comboBoxMaterialType.FormattingEnabled = true;
comboBoxMaterialType.Location = new Point(145, 60); comboBoxMaterialType.Location = new Point(127, 45);
comboBoxMaterialType.Margin = new Padding(3, 2, 3, 2);
comboBoxMaterialType.Name = "comboBoxMaterialType"; comboBoxMaterialType.Name = "comboBoxMaterialType";
comboBoxMaterialType.Size = new Size(151, 28); comboBoxMaterialType.Size = new Size(133, 23);
comboBoxMaterialType.TabIndex = 14; comboBoxMaterialType.TabIndex = 14;
// //
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.Location = new Point(19, 18); label1.Location = new Point(17, 14);
label1.Name = "label1"; label1.Name = "label1";
label1.Size = new Size(114, 20); label1.Size = new Size(89, 15);
label1.TabIndex = 15; label1.TabIndex = 15;
label1.Text = "Тип материала"; label1.Text = "Тип материала";
// //
// textBoxName // textBoxName
// //
textBoxName.Location = new Point(145, 15); textBoxName.Location = new Point(127, 11);
textBoxName.Margin = new Padding(3, 2, 3, 2);
textBoxName.Name = "textBoxName"; textBoxName.Name = "textBoxName";
textBoxName.Size = new Size(151, 27); textBoxName.Size = new Size(133, 23);
textBoxName.TabIndex = 16; textBoxName.TabIndex = 16;
// //
// FormMaterial // FormMaterial
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(308, 161); ClientSize = new Size(270, 121);
Controls.Add(textBoxName); Controls.Add(textBoxName);
Controls.Add(label1); Controls.Add(label1);
Controls.Add(comboBoxMaterialType); Controls.Add(comboBoxMaterialType);
Controls.Add(buttonCancel); Controls.Add(buttonCancel);
Controls.Add(buttonSave); Controls.Add(buttonSave);
Controls.Add(label2); Controls.Add(label2);
Margin = new Padding(3, 2, 3, 2);
Name = "FormMaterial"; Name = "FormMaterial";
Text = "FormMaterial"; Text = "Материал";
ResumeLayout(false); ResumeLayout(false);
PerformLayout(); PerformLayout();
} }

View File

@ -45,44 +45,48 @@
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Dock = DockStyle.Fill; dataGridView.Dock = DockStyle.Fill;
dataGridView.Location = new Point(0, 0); dataGridView.Location = new Point(0, 0);
dataGridView.Margin = new Padding(3, 2, 3, 2);
dataGridView.MultiSelect = false; dataGridView.MultiSelect = false;
dataGridView.Name = "dataGridView"; dataGridView.Name = "dataGridView";
dataGridView.ReadOnly = true; dataGridView.ReadOnly = true;
dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersVisible = false;
dataGridView.RowHeadersWidth = 51; dataGridView.RowHeadersWidth = 51;
dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView.Size = new Size(648, 450); dataGridView.Size = new Size(567, 338);
dataGridView.TabIndex = 5; dataGridView.TabIndex = 5;
// //
// panelButtons // panelButtons
// //
panelButtons.Controls.Add(buttonAdd); panelButtons.Controls.Add(buttonAdd);
panelButtons.Dock = DockStyle.Right; panelButtons.Dock = DockStyle.Right;
panelButtons.Location = new Point(648, 0); panelButtons.Location = new Point(567, 0);
panelButtons.Margin = new Padding(3, 2, 3, 2);
panelButtons.Name = "panelButtons"; panelButtons.Name = "panelButtons";
panelButtons.Size = new Size(152, 450); panelButtons.Size = new Size(133, 338);
panelButtons.TabIndex = 4; panelButtons.TabIndex = 4;
// //
// buttonAdd // buttonAdd
// //
buttonAdd.BackgroundImageLayout = ImageLayout.Center; buttonAdd.BackgroundImageLayout = ImageLayout.Center;
buttonAdd.Image = (Image)resources.GetObject("buttonAdd.Image"); buttonAdd.Image = (Image)resources.GetObject("buttonAdd.Image");
buttonAdd.Location = new Point(23, 12); buttonAdd.Location = new Point(20, 9);
buttonAdd.Margin = new Padding(3, 2, 3, 2);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(115, 115); buttonAdd.Size = new Size(101, 86);
buttonAdd.TabIndex = 0; buttonAdd.TabIndex = 0;
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += buttonAdd_Click; buttonAdd.Click += buttonAdd_Click;
// //
// FormMaterialAdmissions // FormMaterialAdmissions
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450); ClientSize = new Size(700, 338);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Controls.Add(panelButtons); Controls.Add(panelButtons);
Margin = new Padding(3, 2, 3, 2);
Name = "FormMaterialAdmissions"; Name = "FormMaterialAdmissions";
Text = "FormMaterialAdmissions"; Text = "Приемы материалов";
Load += FormMaterial_admissions_Load; Load += FormMaterial_admissions_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
panelButtons.ResumeLayout(false); panelButtons.ResumeLayout(false);

View File

@ -47,13 +47,14 @@
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Dock = DockStyle.Fill; dataGridView.Dock = DockStyle.Fill;
dataGridView.Location = new Point(0, 0); dataGridView.Location = new Point(0, 0);
dataGridView.Margin = new Padding(3, 2, 3, 2);
dataGridView.MultiSelect = false; dataGridView.MultiSelect = false;
dataGridView.Name = "dataGridView"; dataGridView.Name = "dataGridView";
dataGridView.ReadOnly = true; dataGridView.ReadOnly = true;
dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersVisible = false;
dataGridView.RowHeadersWidth = 51; dataGridView.RowHeadersWidth = 51;
dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView.Size = new Size(648, 450); dataGridView.Size = new Size(567, 338);
dataGridView.TabIndex = 3; dataGridView.TabIndex = 3;
// //
// panelButtons // panelButtons
@ -62,17 +63,19 @@
panelButtons.Controls.Add(buttonEdit); panelButtons.Controls.Add(buttonEdit);
panelButtons.Controls.Add(buttonAdd); panelButtons.Controls.Add(buttonAdd);
panelButtons.Dock = DockStyle.Right; panelButtons.Dock = DockStyle.Right;
panelButtons.Location = new Point(648, 0); panelButtons.Location = new Point(567, 0);
panelButtons.Margin = new Padding(3, 2, 3, 2);
panelButtons.Name = "panelButtons"; panelButtons.Name = "panelButtons";
panelButtons.Size = new Size(152, 450); panelButtons.Size = new Size(133, 338);
panelButtons.TabIndex = 2; panelButtons.TabIndex = 2;
// //
// buttonRemove // buttonRemove
// //
buttonRemove.Image = (Image)resources.GetObject("buttonRemove.Image"); buttonRemove.Image = (Image)resources.GetObject("buttonRemove.Image");
buttonRemove.Location = new Point(23, 254); buttonRemove.Location = new Point(20, 190);
buttonRemove.Margin = new Padding(3, 2, 3, 2);
buttonRemove.Name = "buttonRemove"; buttonRemove.Name = "buttonRemove";
buttonRemove.Size = new Size(115, 115); buttonRemove.Size = new Size(101, 86);
buttonRemove.TabIndex = 2; buttonRemove.TabIndex = 2;
buttonRemove.UseVisualStyleBackColor = true; buttonRemove.UseVisualStyleBackColor = true;
buttonRemove.Click += buttonRemove_Click; buttonRemove.Click += buttonRemove_Click;
@ -81,9 +84,10 @@
// //
buttonEdit.BackgroundImageLayout = ImageLayout.Stretch; buttonEdit.BackgroundImageLayout = ImageLayout.Stretch;
buttonEdit.Image = (Image)resources.GetObject("buttonEdit.Image"); buttonEdit.Image = (Image)resources.GetObject("buttonEdit.Image");
buttonEdit.Location = new Point(23, 133); buttonEdit.Location = new Point(20, 100);
buttonEdit.Margin = new Padding(3, 2, 3, 2);
buttonEdit.Name = "buttonEdit"; buttonEdit.Name = "buttonEdit";
buttonEdit.Size = new Size(115, 115); buttonEdit.Size = new Size(101, 86);
buttonEdit.TabIndex = 1; buttonEdit.TabIndex = 1;
buttonEdit.UseVisualStyleBackColor = true; buttonEdit.UseVisualStyleBackColor = true;
buttonEdit.Click += buttonEdit_Click; buttonEdit.Click += buttonEdit_Click;
@ -92,23 +96,25 @@
// //
buttonAdd.BackgroundImageLayout = ImageLayout.Center; buttonAdd.BackgroundImageLayout = ImageLayout.Center;
buttonAdd.Image = (Image)resources.GetObject("buttonAdd.Image"); buttonAdd.Image = (Image)resources.GetObject("buttonAdd.Image");
buttonAdd.Location = new Point(23, 12); buttonAdd.Location = new Point(20, 9);
buttonAdd.Margin = new Padding(3, 2, 3, 2);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(115, 115); buttonAdd.Size = new Size(101, 86);
buttonAdd.TabIndex = 0; buttonAdd.TabIndex = 0;
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += buttonAdd_Click; buttonAdd.Click += buttonAdd_Click;
// //
// FormMaterials // FormMaterials
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450); ClientSize = new Size(700, 338);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Controls.Add(panelButtons); Controls.Add(panelButtons);
Margin = new Padding(3, 2, 3, 2);
Name = "FormMaterials"; Name = "FormMaterials";
StartPosition = FormStartPosition.CenterParent; StartPosition = FormStartPosition.CenterParent;
Text = "FormMaterials"; Text = "Материалы";
Load += FormMaterials_Load; Load += FormMaterials_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
panelButtons.ResumeLayout(false); panelButtons.ResumeLayout(false);

View File

@ -53,9 +53,10 @@
// //
// buttonCancel // buttonCancel
// //
buttonCancel.Location = new Point(211, 401); buttonCancel.Location = new Point(185, 301);
buttonCancel.Margin = new Padding(3, 2, 3, 2);
buttonCancel.Name = "buttonCancel"; buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(94, 29); buttonCancel.Size = new Size(82, 22);
buttonCancel.TabIndex = 13; buttonCancel.TabIndex = 13;
buttonCancel.Text = "Отмена"; buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
@ -63,9 +64,10 @@
// //
// buttonSave // buttonSave
// //
buttonSave.Location = new Point(12, 401); buttonSave.Location = new Point(10, 301);
buttonSave.Margin = new Padding(3, 2, 3, 2);
buttonSave.Name = "buttonSave"; buttonSave.Name = "buttonSave";
buttonSave.Size = new Size(94, 29); buttonSave.Size = new Size(82, 22);
buttonSave.TabIndex = 12; buttonSave.TabIndex = 12;
buttonSave.Text = "Сохранить"; buttonSave.Text = "Сохранить";
buttonSave.UseVisualStyleBackColor = true; buttonSave.UseVisualStyleBackColor = true;
@ -73,18 +75,19 @@
// //
// textBoxDesc // textBoxDesc
// //
textBoxDesc.Location = new Point(144, 12); textBoxDesc.Location = new Point(126, 9);
textBoxDesc.Margin = new Padding(3, 2, 3, 2);
textBoxDesc.Multiline = true; textBoxDesc.Multiline = true;
textBoxDesc.Name = "textBoxDesc"; textBoxDesc.Name = "textBoxDesc";
textBoxDesc.Size = new Size(161, 129); textBoxDesc.Size = new Size(141, 98);
textBoxDesc.TabIndex = 10; textBoxDesc.TabIndex = 10;
// //
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.Location = new Point(12, 15); label1.Location = new Point(10, 11);
label1.Name = "label1"; label1.Name = "label1";
label1.Size = new Size(79, 20); label1.Size = new Size(62, 15);
label1.TabIndex = 8; label1.TabIndex = 8;
label1.Text = "Описание"; label1.Text = "Описание";
// //
@ -92,36 +95,38 @@
// //
comboBoxOrderType.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxOrderType.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxOrderType.FormattingEnabled = true; comboBoxOrderType.FormattingEnabled = true;
comboBoxOrderType.Location = new Point(144, 147); comboBoxOrderType.Location = new Point(126, 110);
comboBoxOrderType.Margin = new Padding(3, 2, 3, 2);
comboBoxOrderType.Name = "comboBoxOrderType"; comboBoxOrderType.Name = "comboBoxOrderType";
comboBoxOrderType.Size = new Size(161, 28); comboBoxOrderType.Size = new Size(141, 23);
comboBoxOrderType.TabIndex = 16; comboBoxOrderType.TabIndex = 16;
// //
// label2 // label2
// //
label2.AutoSize = true; label2.AutoSize = true;
label2.Location = new Point(12, 150); label2.Location = new Point(10, 112);
label2.Name = "label2"; label2.Name = "label2";
label2.Size = new Size(102, 20); label2.Size = new Size(80, 15);
label2.TabIndex = 15; label2.TabIndex = 15;
label2.Text = "Тип продукта"; label2.Text = "Тип продукта";
// //
// numericUpDownAmount // numericUpDownAmount
// //
numericUpDownAmount.Location = new Point(144, 196); numericUpDownAmount.Location = new Point(126, 147);
numericUpDownAmount.Margin = new Padding(3, 2, 3, 2);
numericUpDownAmount.Maximum = new decimal(new int[] { 10000, 0, 0, 0 }); numericUpDownAmount.Maximum = new decimal(new int[] { 10000, 0, 0, 0 });
numericUpDownAmount.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDownAmount.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
numericUpDownAmount.Name = "numericUpDownAmount"; numericUpDownAmount.Name = "numericUpDownAmount";
numericUpDownAmount.Size = new Size(161, 27); numericUpDownAmount.Size = new Size(141, 23);
numericUpDownAmount.TabIndex = 18; numericUpDownAmount.TabIndex = 18;
numericUpDownAmount.Value = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDownAmount.Value = new decimal(new int[] { 1, 0, 0, 0 });
// //
// label3 // label3
// //
label3.AutoSize = true; label3.AutoSize = true;
label3.Location = new Point(12, 198); label3.Location = new Point(10, 148);
label3.Name = "label3"; label3.Name = "label3";
label3.Size = new Size(58, 20); label3.Size = new Size(46, 15);
label3.TabIndex = 17; label3.TabIndex = 17;
label3.Text = "Кол-во"; label3.Text = "Кол-во";
// //
@ -129,35 +134,36 @@
// //
comboBoxStatus.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxStatus.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxStatus.FormattingEnabled = true; comboBoxStatus.FormattingEnabled = true;
comboBoxStatus.Location = new Point(144, 238); comboBoxStatus.Location = new Point(126, 178);
comboBoxStatus.Margin = new Padding(3, 2, 3, 2);
comboBoxStatus.Name = "comboBoxStatus"; comboBoxStatus.Name = "comboBoxStatus";
comboBoxStatus.Size = new Size(161, 28); comboBoxStatus.Size = new Size(141, 23);
comboBoxStatus.TabIndex = 20; comboBoxStatus.TabIndex = 20;
// //
// label4 // label4
// //
label4.AutoSize = true; label4.AutoSize = true;
label4.Location = new Point(12, 241); label4.Location = new Point(10, 181);
label4.Name = "label4"; label4.Name = "label4";
label4.Size = new Size(52, 20); label4.Size = new Size(43, 15);
label4.TabIndex = 19; label4.TabIndex = 19;
label4.Text = "Статус"; label4.Text = "Статус";
// //
// label5 // label5
// //
label5.AutoSize = true; label5.AutoSize = true;
label5.Location = new Point(12, 275); label5.Location = new Point(10, 206);
label5.Name = "label5"; label5.Name = "label5";
label5.Size = new Size(97, 20); label5.Size = new Size(75, 15);
label5.TabIndex = 21; label5.TabIndex = 21;
label5.Text = "ID заказчика"; label5.Text = "ID заказчика";
// //
// label6 // label6
// //
label6.AutoSize = true; label6.AutoSize = true;
label6.Location = new Point(12, 309); label6.Location = new Point(10, 232);
label6.Name = "label6"; label6.Name = "label6";
label6.Size = new Size(112, 20); label6.Size = new Size(88, 15);
label6.TabIndex = 23; label6.TabIndex = 23;
label6.Text = "ID типографии"; label6.Text = "ID типографии";
// //
@ -165,26 +171,30 @@
// //
comboBoxCustomerID.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxCustomerID.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxCustomerID.FormattingEnabled = true; comboBoxCustomerID.FormattingEnabled = true;
comboBoxCustomerID.Location = new Point(144, 272); comboBoxCustomerID.Location = new Point(126, 204);
comboBoxCustomerID.Margin = new Padding(3, 2, 3, 2);
comboBoxCustomerID.Name = "comboBoxCustomerID"; comboBoxCustomerID.Name = "comboBoxCustomerID";
comboBoxCustomerID.Size = new Size(161, 28); comboBoxCustomerID.Size = new Size(141, 23);
comboBoxCustomerID.TabIndex = 26; comboBoxCustomerID.TabIndex = 26;
// //
// comboBoxPrintingUD // comboBoxPrintingUD
// //
comboBoxPrintingUD.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxPrintingUD.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxPrintingUD.FormattingEnabled = true; comboBoxPrintingUD.FormattingEnabled = true;
comboBoxPrintingUD.Location = new Point(144, 306); comboBoxPrintingUD.Location = new Point(126, 230);
comboBoxPrintingUD.Margin = new Padding(3, 2, 3, 2);
comboBoxPrintingUD.Name = "comboBoxPrintingUD"; comboBoxPrintingUD.Name = "comboBoxPrintingUD";
comboBoxPrintingUD.Size = new Size(161, 28); comboBoxPrintingUD.Size = new Size(141, 23);
comboBoxPrintingUD.TabIndex = 27; comboBoxPrintingUD.TabIndex = 27;
// //
// groupBox1 // groupBox1
// //
groupBox1.Controls.Add(dataGridViewMaterials); groupBox1.Controls.Add(dataGridViewMaterials);
groupBox1.Location = new Point(311, 238); groupBox1.Location = new Point(272, 178);
groupBox1.Margin = new Padding(3, 2, 3, 2);
groupBox1.Name = "groupBox1"; groupBox1.Name = "groupBox1";
groupBox1.Size = new Size(358, 192); groupBox1.Padding = new Padding(3, 2, 3, 2);
groupBox1.Size = new Size(313, 144);
groupBox1.TabIndex = 29; groupBox1.TabIndex = 29;
groupBox1.TabStop = false; groupBox1.TabStop = false;
groupBox1.Text = "groupBox1"; groupBox1.Text = "groupBox1";
@ -194,10 +204,11 @@
dataGridViewMaterials.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridViewMaterials.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewMaterials.Columns.AddRange(new DataGridViewColumn[] { columnMaterialType, columnMaterial }); dataGridViewMaterials.Columns.AddRange(new DataGridViewColumn[] { columnMaterialType, columnMaterial });
dataGridViewMaterials.Dock = DockStyle.Fill; dataGridViewMaterials.Dock = DockStyle.Fill;
dataGridViewMaterials.Location = new Point(3, 23); dataGridViewMaterials.Location = new Point(3, 18);
dataGridViewMaterials.Margin = new Padding(3, 2, 3, 2);
dataGridViewMaterials.Name = "dataGridViewMaterials"; dataGridViewMaterials.Name = "dataGridViewMaterials";
dataGridViewMaterials.RowHeadersWidth = 51; dataGridViewMaterials.RowHeadersWidth = 51;
dataGridViewMaterials.Size = new Size(352, 166); dataGridViewMaterials.Size = new Size(307, 124);
dataGridViewMaterials.TabIndex = 0; dataGridViewMaterials.TabIndex = 0;
// //
// columnMaterialType // columnMaterialType
@ -216,9 +227,9 @@
// //
// FormOrder // FormOrder
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(674, 451); ClientSize = new Size(590, 338);
Controls.Add(groupBox1); Controls.Add(groupBox1);
Controls.Add(comboBoxPrintingUD); Controls.Add(comboBoxPrintingUD);
Controls.Add(comboBoxCustomerID); Controls.Add(comboBoxCustomerID);
@ -234,9 +245,10 @@
Controls.Add(buttonSave); Controls.Add(buttonSave);
Controls.Add(textBoxDesc); Controls.Add(textBoxDesc);
Controls.Add(label1); Controls.Add(label1);
Margin = new Padding(3, 2, 3, 2);
Name = "FormOrder"; Name = "FormOrder";
StartPosition = FormStartPosition.CenterParent; StartPosition = FormStartPosition.CenterParent;
Text = "FormOrder"; Text = "Заказ";
((System.ComponentModel.ISupportInitialize)numericUpDownAmount).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownAmount).EndInit();
groupBox1.ResumeLayout(false); groupBox1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridViewMaterials).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridViewMaterials).EndInit();

View File

@ -16,34 +16,6 @@ namespace ProjectPublishing.Forms
public partial class FormOrder : Form public partial class FormOrder : Form
{ {
private readonly IOrderRepository _orderRepository; private readonly IOrderRepository _orderRepository;
//private int? _orderId;
//public int Id
//{
// set
// {
// try
// {
// var material = _orderRepository.ReadOrderById(value);
// if (material == null)
// {
// throw new InvalidDataException(nameof(material));
// }
// textBoxDesc.Text = material.Description;
// numericUpDownAmount.Value = material.Amount;
// comboBoxOrderType.SelectedItem = material.ProductType;
// comboBoxStatus.SelectedItem = material.Status;
// comboBoxCustomerID.SelectedItem = material.CustomerId;
// comboBoxPrintingUD.SelectedItem = material.PrintingId;
// _orderId = value;
// }
// catch (Exception ex)
// {
// MessageBox.Show(ex.Message, "Ошибка при получении данных", MessageBoxButtons.OK, MessageBoxIcon.Error);
// return;
// }
// }
//}
public FormOrder(IOrderRepository orderRepository, ICustomerRepository customerRepository, IPrintingHouseRepository printingHouseRepository, IMaterialRepository materialRepository) public FormOrder(IOrderRepository orderRepository, ICustomerRepository customerRepository, IPrintingHouseRepository printingHouseRepository, IMaterialRepository materialRepository)
{ {
@ -92,18 +64,6 @@ namespace ProjectPublishing.Forms
private void buttonCancel_Click(object sender, EventArgs e) => Close(); private void buttonCancel_Click(object sender, EventArgs e) => Close();
//private Order CreateOrder(int id) => Order.CreateOrder
// (
// id,
// textBoxDesc.Text,
// (ProductType)comboBoxOrderType.SelectedItem!,
// (int)numericUpDownAmount.Value,
// (OrderStatus)comboBoxStatus.SelectedItem!,
// (int)comboBoxCustomerID.SelectedValue!,
// (int)comboBoxPrintingUD.SelectedValue!,
// (int)comboBoxMaterialsID.SelectedValue!
// );
private List<OrderMaterials> CreateListFromDataGrid() private List<OrderMaterials> CreateListFromDataGrid()
{ {
var list = new List<OrderMaterials>(); var list = new List<OrderMaterials>();

View File

@ -46,13 +46,14 @@
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Dock = DockStyle.Fill; dataGridView.Dock = DockStyle.Fill;
dataGridView.Location = new Point(0, 0); dataGridView.Location = new Point(0, 0);
dataGridView.Margin = new Padding(3, 2, 3, 2);
dataGridView.MultiSelect = false; dataGridView.MultiSelect = false;
dataGridView.Name = "dataGridView"; dataGridView.Name = "dataGridView";
dataGridView.ReadOnly = true; dataGridView.ReadOnly = true;
dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersVisible = false;
dataGridView.RowHeadersWidth = 51; dataGridView.RowHeadersWidth = 51;
dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView.Size = new Size(648, 450); dataGridView.Size = new Size(567, 338);
dataGridView.TabIndex = 5; dataGridView.TabIndex = 5;
// //
// panelButtons // panelButtons
@ -60,17 +61,19 @@
panelButtons.Controls.Add(buttonRemove); panelButtons.Controls.Add(buttonRemove);
panelButtons.Controls.Add(buttonAdd); panelButtons.Controls.Add(buttonAdd);
panelButtons.Dock = DockStyle.Right; panelButtons.Dock = DockStyle.Right;
panelButtons.Location = new Point(648, 0); panelButtons.Location = new Point(567, 0);
panelButtons.Margin = new Padding(3, 2, 3, 2);
panelButtons.Name = "panelButtons"; panelButtons.Name = "panelButtons";
panelButtons.Size = new Size(152, 450); panelButtons.Size = new Size(133, 338);
panelButtons.TabIndex = 4; panelButtons.TabIndex = 4;
// //
// buttonRemove // buttonRemove
// //
buttonRemove.Image = (Image)resources.GetObject("buttonRemove.Image"); buttonRemove.Image = (Image)resources.GetObject("buttonRemove.Image");
buttonRemove.Location = new Point(23, 254); buttonRemove.Location = new Point(20, 190);
buttonRemove.Margin = new Padding(3, 2, 3, 2);
buttonRemove.Name = "buttonRemove"; buttonRemove.Name = "buttonRemove";
buttonRemove.Size = new Size(115, 115); buttonRemove.Size = new Size(101, 86);
buttonRemove.TabIndex = 2; buttonRemove.TabIndex = 2;
buttonRemove.UseVisualStyleBackColor = true; buttonRemove.UseVisualStyleBackColor = true;
buttonRemove.Click += buttonRemove_Click; buttonRemove.Click += buttonRemove_Click;
@ -79,23 +82,25 @@
// //
buttonAdd.BackgroundImageLayout = ImageLayout.Center; buttonAdd.BackgroundImageLayout = ImageLayout.Center;
buttonAdd.Image = (Image)resources.GetObject("buttonAdd.Image"); buttonAdd.Image = (Image)resources.GetObject("buttonAdd.Image");
buttonAdd.Location = new Point(23, 12); buttonAdd.Location = new Point(20, 9);
buttonAdd.Margin = new Padding(3, 2, 3, 2);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(115, 115); buttonAdd.Size = new Size(101, 86);
buttonAdd.TabIndex = 0; buttonAdd.TabIndex = 0;
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += buttonAdd_Click; buttonAdd.Click += buttonAdd_Click;
// //
// FormOrders // FormOrders
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450); ClientSize = new Size(700, 338);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Controls.Add(panelButtons); Controls.Add(panelButtons);
Margin = new Padding(3, 2, 3, 2);
Name = "FormOrders"; Name = "FormOrders";
StartPosition = FormStartPosition.CenterParent; StartPosition = FormStartPosition.CenterParent;
Text = "FormOrders"; Text = "Заказы";
Load += FormOrders_Load; Load += FormOrders_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
panelButtons.ResumeLayout(false); panelButtons.ResumeLayout(false);