я доделаль
This commit is contained in:
parent
c872fc7182
commit
92960716b5
@ -41,75 +41,84 @@
|
||||
// label1
|
||||
//
|
||||
label1.AutoSize = true;
|
||||
label1.Location = new Point(12, 9);
|
||||
label1.Location = new Point(10, 7);
|
||||
label1.Name = "label1";
|
||||
label1.Size = new Size(71, 20);
|
||||
label1.Size = new Size(56, 15);
|
||||
label1.TabIndex = 0;
|
||||
label1.Text = "Изделие:";
|
||||
//
|
||||
// label2
|
||||
//
|
||||
label2.AutoSize = true;
|
||||
label2.Location = new Point(12, 52);
|
||||
label2.Location = new Point(10, 39);
|
||||
label2.Name = "label2";
|
||||
label2.Size = new Size(93, 20);
|
||||
label2.Size = new Size(75, 15);
|
||||
label2.TabIndex = 1;
|
||||
label2.Text = "Количество:";
|
||||
//
|
||||
// label3
|
||||
//
|
||||
label3.AutoSize = true;
|
||||
label3.Location = new Point(12, 95);
|
||||
label3.Location = new Point(10, 71);
|
||||
label3.Name = "label3";
|
||||
label3.Size = new Size(58, 20);
|
||||
label3.Size = new Size(48, 15);
|
||||
label3.TabIndex = 2;
|
||||
label3.Text = "Сумма:";
|
||||
//
|
||||
// comboBoxTravel
|
||||
//
|
||||
comboBoxTravel.FormattingEnabled = true;
|
||||
comboBoxTravel.Location = new Point(125, 6);
|
||||
comboBoxTravel.Location = new Point(109, 4);
|
||||
comboBoxTravel.Margin = new Padding(3, 2, 3, 2);
|
||||
comboBoxTravel.Name = "comboBoxTravel";
|
||||
comboBoxTravel.Size = new Size(278, 28);
|
||||
comboBoxTravel.Size = new Size(244, 23);
|
||||
comboBoxTravel.TabIndex = 3;
|
||||
comboBoxTravel.SelectedIndexChanged += ComboBoxTravel_SelectedIndexChanged;
|
||||
//
|
||||
// textBoxCount
|
||||
//
|
||||
textBoxCount.Location = new Point(125, 49);
|
||||
textBoxCount.Location = new Point(109, 37);
|
||||
textBoxCount.Margin = new Padding(3, 2, 3, 2);
|
||||
textBoxCount.Name = "textBoxCount";
|
||||
textBoxCount.Size = new Size(278, 27);
|
||||
textBoxCount.Size = new Size(244, 23);
|
||||
textBoxCount.TabIndex = 4;
|
||||
textBoxCount.TextChanged += textBoxCount_TextChanged;
|
||||
//
|
||||
// textBoxSum
|
||||
//
|
||||
textBoxSum.Location = new Point(125, 92);
|
||||
textBoxSum.Location = new Point(109, 69);
|
||||
textBoxSum.Margin = new Padding(3, 2, 3, 2);
|
||||
textBoxSum.Name = "textBoxSum";
|
||||
textBoxSum.Size = new Size(278, 27);
|
||||
textBoxSum.Size = new Size(244, 23);
|
||||
textBoxSum.TabIndex = 5;
|
||||
//
|
||||
// buttonSave
|
||||
//
|
||||
buttonSave.Location = new Point(181, 148);
|
||||
buttonSave.Location = new Point(158, 111);
|
||||
buttonSave.Margin = new Padding(3, 2, 3, 2);
|
||||
buttonSave.Name = "buttonSave";
|
||||
buttonSave.Size = new Size(94, 29);
|
||||
buttonSave.Size = new Size(82, 22);
|
||||
buttonSave.TabIndex = 6;
|
||||
buttonSave.Text = "Сохранить";
|
||||
buttonSave.UseVisualStyleBackColor = true;
|
||||
buttonSave.Click += buttonSave_Click;
|
||||
//
|
||||
// buttonCancel
|
||||
//
|
||||
buttonCancel.Location = new Point(309, 148);
|
||||
buttonCancel.Location = new Point(270, 111);
|
||||
buttonCancel.Margin = new Padding(3, 2, 3, 2);
|
||||
buttonCancel.Name = "buttonCancel";
|
||||
buttonCancel.Size = new Size(94, 29);
|
||||
buttonCancel.Size = new Size(82, 22);
|
||||
buttonCancel.TabIndex = 7;
|
||||
buttonCancel.Text = "Отмена";
|
||||
buttonCancel.UseVisualStyleBackColor = true;
|
||||
buttonCancel.Click += buttonCancel_Click;
|
||||
//
|
||||
// FormCreateOrder
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(8F, 20F);
|
||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(423, 200);
|
||||
ClientSize = new Size(370, 150);
|
||||
Controls.Add(buttonCancel);
|
||||
Controls.Add(buttonSave);
|
||||
Controls.Add(textBoxSum);
|
||||
@ -118,8 +127,10 @@
|
||||
Controls.Add(label3);
|
||||
Controls.Add(label2);
|
||||
Controls.Add(label1);
|
||||
Margin = new Padding(3, 2, 3, 2);
|
||||
Name = "FormCreateOrder";
|
||||
Text = "Заказ";
|
||||
Load += FormCreateOrder_Load;
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
|
45
TravelCompany/TravelCompany/FormMain.Designer.cs
generated
45
TravelCompany/TravelCompany/FormMain.Designer.cs
generated
@ -46,13 +46,14 @@
|
||||
// dataGridView
|
||||
//
|
||||
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dataGridView.Location = new Point(1, 41);
|
||||
dataGridView.Location = new Point(1, 31);
|
||||
dataGridView.Margin = new Padding(3, 2, 3, 2);
|
||||
dataGridView.Name = "dataGridView";
|
||||
dataGridView.ReadOnly = true;
|
||||
dataGridView.RowHeadersWidth = 51;
|
||||
dataGridView.RowTemplate.Height = 29;
|
||||
dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
|
||||
dataGridView.Size = new Size(877, 569);
|
||||
dataGridView.Size = new Size(767, 427);
|
||||
dataGridView.TabIndex = 0;
|
||||
//
|
||||
// toolStrip1
|
||||
@ -61,7 +62,7 @@
|
||||
toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 });
|
||||
toolStrip1.Location = new Point(0, 0);
|
||||
toolStrip1.Name = "toolStrip1";
|
||||
toolStrip1.Size = new Size(1063, 27);
|
||||
toolStrip1.Size = new Size(930, 25);
|
||||
toolStrip1.TabIndex = 1;
|
||||
toolStrip1.Text = "toolStrip1";
|
||||
//
|
||||
@ -72,26 +73,29 @@
|
||||
toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image");
|
||||
toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
|
||||
toolStripDropDownButton1.Name = "toolStripDropDownButton1";
|
||||
toolStripDropDownButton1.Size = new Size(108, 24);
|
||||
toolStripDropDownButton1.Size = new Size(88, 22);
|
||||
toolStripDropDownButton1.Text = "Справочник";
|
||||
//
|
||||
// компонентыToolStripMenuItem
|
||||
//
|
||||
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
|
||||
компонентыToolStripMenuItem.Size = new Size(252, 26);
|
||||
компонентыToolStripMenuItem.Size = new Size(202, 22);
|
||||
компонентыToolStripMenuItem.Text = "Компоненты";
|
||||
компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click;
|
||||
//
|
||||
// туристическиеПутевкиToolStripMenuItem
|
||||
//
|
||||
туристическиеПутевкиToolStripMenuItem.Name = "туристическиеПутевкиToolStripMenuItem";
|
||||
туристическиеПутевкиToolStripMenuItem.Size = new Size(252, 26);
|
||||
туристическиеПутевкиToolStripMenuItem.Size = new Size(202, 22);
|
||||
туристическиеПутевкиToolStripMenuItem.Text = "Туристические путевки";
|
||||
туристическиеПутевкиToolStripMenuItem.Click += путевкиToolStripMenuItem_Click;
|
||||
//
|
||||
// buttonCreateeOrder
|
||||
//
|
||||
buttonCreateeOrder.Location = new Point(891, 103);
|
||||
buttonCreateeOrder.Location = new Point(780, 77);
|
||||
buttonCreateeOrder.Margin = new Padding(3, 2, 3, 2);
|
||||
buttonCreateeOrder.Name = "buttonCreateeOrder";
|
||||
buttonCreateeOrder.Size = new Size(155, 39);
|
||||
buttonCreateeOrder.Size = new Size(136, 29);
|
||||
buttonCreateeOrder.TabIndex = 2;
|
||||
buttonCreateeOrder.Text = "Создать заказ";
|
||||
buttonCreateeOrder.UseVisualStyleBackColor = true;
|
||||
@ -99,9 +103,10 @@
|
||||
//
|
||||
// buttonTakeOrderInWork
|
||||
//
|
||||
buttonTakeOrderInWork.Location = new Point(891, 148);
|
||||
buttonTakeOrderInWork.Location = new Point(780, 111);
|
||||
buttonTakeOrderInWork.Margin = new Padding(3, 2, 3, 2);
|
||||
buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
|
||||
buttonTakeOrderInWork.Size = new Size(155, 53);
|
||||
buttonTakeOrderInWork.Size = new Size(136, 40);
|
||||
buttonTakeOrderInWork.TabIndex = 3;
|
||||
buttonTakeOrderInWork.Text = "Отдать на выполнение";
|
||||
buttonTakeOrderInWork.UseVisualStyleBackColor = true;
|
||||
@ -109,9 +114,10 @@
|
||||
//
|
||||
// buttonOrderReady
|
||||
//
|
||||
buttonOrderReady.Location = new Point(891, 207);
|
||||
buttonOrderReady.Location = new Point(780, 155);
|
||||
buttonOrderReady.Margin = new Padding(3, 2, 3, 2);
|
||||
buttonOrderReady.Name = "buttonOrderReady";
|
||||
buttonOrderReady.Size = new Size(155, 39);
|
||||
buttonOrderReady.Size = new Size(136, 29);
|
||||
buttonOrderReady.TabIndex = 4;
|
||||
buttonOrderReady.Text = "Заказ готов";
|
||||
buttonOrderReady.UseVisualStyleBackColor = true;
|
||||
@ -119,9 +125,10 @@
|
||||
//
|
||||
// buttonIssuedOrder
|
||||
//
|
||||
buttonIssuedOrder.Location = new Point(891, 252);
|
||||
buttonIssuedOrder.Location = new Point(780, 189);
|
||||
buttonIssuedOrder.Margin = new Padding(3, 2, 3, 2);
|
||||
buttonIssuedOrder.Name = "buttonIssuedOrder";
|
||||
buttonIssuedOrder.Size = new Size(155, 39);
|
||||
buttonIssuedOrder.Size = new Size(136, 29);
|
||||
buttonIssuedOrder.TabIndex = 5;
|
||||
buttonIssuedOrder.Text = "Заказ выдан";
|
||||
buttonIssuedOrder.UseVisualStyleBackColor = true;
|
||||
@ -129,9 +136,10 @@
|
||||
//
|
||||
// buttonRefresh
|
||||
//
|
||||
buttonRefresh.Location = new Point(891, 297);
|
||||
buttonRefresh.Location = new Point(780, 223);
|
||||
buttonRefresh.Margin = new Padding(3, 2, 3, 2);
|
||||
buttonRefresh.Name = "buttonRefresh";
|
||||
buttonRefresh.Size = new Size(155, 39);
|
||||
buttonRefresh.Size = new Size(136, 29);
|
||||
buttonRefresh.TabIndex = 6;
|
||||
buttonRefresh.Text = "Обновить список";
|
||||
buttonRefresh.UseVisualStyleBackColor = true;
|
||||
@ -139,9 +147,9 @@
|
||||
//
|
||||
// FormMain
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(8F, 20F);
|
||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(1063, 610);
|
||||
ClientSize = new Size(930, 458);
|
||||
Controls.Add(buttonRefresh);
|
||||
Controls.Add(buttonIssuedOrder);
|
||||
Controls.Add(buttonOrderReady);
|
||||
@ -149,6 +157,7 @@
|
||||
Controls.Add(buttonCreateeOrder);
|
||||
Controls.Add(toolStrip1);
|
||||
Controls.Add(dataGridView);
|
||||
Margin = new Padding(3, 2, 3, 2);
|
||||
Name = "FormMain";
|
||||
Text = "Туристическая фирма";
|
||||
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
|
||||
|
@ -57,7 +57,7 @@ namespace TravelCompanyView
|
||||
form.ShowDialog();
|
||||
}
|
||||
}
|
||||
private void консервыToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
private void путевкиToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var service = Program.ServiceProvider?.GetService(typeof(FormTravels));
|
||||
|
||||
|
@ -124,7 +124,7 @@
|
||||
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEKSURBVEhL3ZG9DsFQHMXvczDZvIOtXsHObuhqkViI3Quw
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEKSURBVEhL3ZG9DsFQHMXvczDZvIOtXsHObuhqkViI3Quw
|
||||
6CYmNoMYJJ0NBiFFIoIytOuf0+TeXP3yde+iyS+3OcP53Z4y3/dJJ4HAsiwyTVMp6BQCBIZhKAWdEcHV
|
||||
vSlBmeB82NFy1KLluEWOPRC5MoHdMWhazwi4RJlALgf4EuT6BI+5kCsTrGddUY658E+QvyXYHq9UnRyC
|
||||
U87f4aUApcXhnrI9Jzg/laQKFntXlHM+lSQK5psL5fvbp/JvJLGCQqmSWM5JkiCT84igXGtSrruKLQ0T
|
||||
|
66
TravelCompany/TravelCompany/FormTravel.Designer.cs
generated
66
TravelCompany/TravelCompany/FormTravel.Designer.cs
generated
@ -49,33 +49,35 @@
|
||||
//
|
||||
// textBoxPrice
|
||||
//
|
||||
textBoxPrice.Location = new Point(123, 45);
|
||||
textBoxPrice.Location = new Point(108, 34);
|
||||
textBoxPrice.Margin = new Padding(3, 2, 3, 2);
|
||||
textBoxPrice.Name = "textBoxPrice";
|
||||
textBoxPrice.Size = new Size(169, 27);
|
||||
textBoxPrice.Size = new Size(148, 23);
|
||||
textBoxPrice.TabIndex = 9;
|
||||
//
|
||||
// textBoxName
|
||||
//
|
||||
textBoxName.Location = new Point(123, 12);
|
||||
textBoxName.Location = new Point(108, 9);
|
||||
textBoxName.Margin = new Padding(3, 2, 3, 2);
|
||||
textBoxName.Name = "textBoxName";
|
||||
textBoxName.Size = new Size(287, 27);
|
||||
textBoxName.Size = new Size(252, 23);
|
||||
textBoxName.TabIndex = 8;
|
||||
//
|
||||
// label2
|
||||
//
|
||||
label2.AutoSize = true;
|
||||
label2.Location = new Point(28, 52);
|
||||
label2.Location = new Point(24, 39);
|
||||
label2.Name = "label2";
|
||||
label2.Size = new Size(86, 20);
|
||||
label2.Size = new Size(70, 15);
|
||||
label2.TabIndex = 7;
|
||||
label2.Text = "Стоимость:";
|
||||
//
|
||||
// label1
|
||||
//
|
||||
label1.AutoSize = true;
|
||||
label1.Location = new Point(28, 19);
|
||||
label1.Location = new Point(24, 14);
|
||||
label1.Name = "label1";
|
||||
label1.Size = new Size(80, 20);
|
||||
label1.Size = new Size(62, 15);
|
||||
label1.TabIndex = 6;
|
||||
label1.Text = "Название:";
|
||||
//
|
||||
@ -86,30 +88,30 @@
|
||||
groupBox1.Controls.Add(buttonUpd);
|
||||
groupBox1.Controls.Add(buttonAdd);
|
||||
groupBox1.Controls.Add(dataGridView);
|
||||
groupBox1.Location = new Point(12, 93);
|
||||
groupBox1.Location = new Point(10, 70);
|
||||
groupBox1.Margin = new Padding(3, 2, 3, 2);
|
||||
groupBox1.Name = "groupBox1";
|
||||
groupBox1.Size = new Size(743, 433);
|
||||
groupBox1.Padding = new Padding(3, 2, 3, 2);
|
||||
groupBox1.Size = new Size(650, 325);
|
||||
groupBox1.TabIndex = 10;
|
||||
groupBox1.TabStop = false;
|
||||
groupBox1.Text = "Компоненты";
|
||||
//
|
||||
// buttonRef
|
||||
//
|
||||
buttonRef.Location = new Point(615, 224);
|
||||
buttonRef.Margin = new Padding(3, 4, 3, 4);
|
||||
buttonRef.Location = new Point(538, 168);
|
||||
buttonRef.Name = "buttonRef";
|
||||
buttonRef.Size = new Size(111, 37);
|
||||
buttonRef.Size = new Size(97, 28);
|
||||
buttonRef.TabIndex = 7;
|
||||
buttonRef.Text = "Обновить";
|
||||
buttonRef.UseVisualStyleBackColor = true;
|
||||
buttonRef.Click += buttonDel_Click;
|
||||
buttonRef.Click += buttonRef_Click;
|
||||
//
|
||||
// buttonDel
|
||||
//
|
||||
buttonDel.Location = new Point(615, 172);
|
||||
buttonDel.Margin = new Padding(3, 4, 3, 4);
|
||||
buttonDel.Location = new Point(538, 129);
|
||||
buttonDel.Name = "buttonDel";
|
||||
buttonDel.Size = new Size(111, 37);
|
||||
buttonDel.Size = new Size(97, 28);
|
||||
buttonDel.TabIndex = 6;
|
||||
buttonDel.Text = "Удалить";
|
||||
buttonDel.UseVisualStyleBackColor = true;
|
||||
@ -117,10 +119,9 @@
|
||||
//
|
||||
// buttonUpd
|
||||
//
|
||||
buttonUpd.Location = new Point(615, 113);
|
||||
buttonUpd.Margin = new Padding(3, 4, 3, 4);
|
||||
buttonUpd.Location = new Point(538, 85);
|
||||
buttonUpd.Name = "buttonUpd";
|
||||
buttonUpd.Size = new Size(111, 37);
|
||||
buttonUpd.Size = new Size(97, 28);
|
||||
buttonUpd.TabIndex = 5;
|
||||
buttonUpd.Text = "Изменить";
|
||||
buttonUpd.UseVisualStyleBackColor = true;
|
||||
@ -128,10 +129,9 @@
|
||||
//
|
||||
// buttonAdd
|
||||
//
|
||||
buttonAdd.Location = new Point(615, 52);
|
||||
buttonAdd.Margin = new Padding(3, 4, 3, 4);
|
||||
buttonAdd.Location = new Point(538, 39);
|
||||
buttonAdd.Name = "buttonAdd";
|
||||
buttonAdd.Size = new Size(111, 37);
|
||||
buttonAdd.Size = new Size(97, 28);
|
||||
buttonAdd.TabIndex = 4;
|
||||
buttonAdd.Text = "Добавить";
|
||||
buttonAdd.UseVisualStyleBackColor = true;
|
||||
@ -141,11 +141,12 @@
|
||||
//
|
||||
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dataGridView.Columns.AddRange(new DataGridViewColumn[] { Number, Component, Count });
|
||||
dataGridView.Location = new Point(0, 26);
|
||||
dataGridView.Location = new Point(0, 20);
|
||||
dataGridView.Margin = new Padding(3, 2, 3, 2);
|
||||
dataGridView.Name = "dataGridView";
|
||||
dataGridView.RowHeadersWidth = 51;
|
||||
dataGridView.RowTemplate.Height = 29;
|
||||
dataGridView.Size = new Size(598, 407);
|
||||
dataGridView.Size = new Size(523, 305);
|
||||
dataGridView.TabIndex = 0;
|
||||
//
|
||||
// Number
|
||||
@ -171,10 +172,9 @@
|
||||
//
|
||||
// buttonCancel
|
||||
//
|
||||
buttonCancel.Location = new Point(617, 562);
|
||||
buttonCancel.Margin = new Padding(3, 4, 3, 4);
|
||||
buttonCancel.Location = new Point(540, 422);
|
||||
buttonCancel.Name = "buttonCancel";
|
||||
buttonCancel.Size = new Size(130, 37);
|
||||
buttonCancel.Size = new Size(114, 28);
|
||||
buttonCancel.TabIndex = 11;
|
||||
buttonCancel.Text = "Отмена";
|
||||
buttonCancel.UseVisualStyleBackColor = true;
|
||||
@ -182,10 +182,9 @@
|
||||
//
|
||||
// buttonSave
|
||||
//
|
||||
buttonSave.Location = new Point(462, 562);
|
||||
buttonSave.Margin = new Padding(3, 4, 3, 4);
|
||||
buttonSave.Location = new Point(404, 422);
|
||||
buttonSave.Name = "buttonSave";
|
||||
buttonSave.Size = new Size(130, 37);
|
||||
buttonSave.Size = new Size(114, 28);
|
||||
buttonSave.TabIndex = 12;
|
||||
buttonSave.Text = "Сохранить";
|
||||
buttonSave.UseVisualStyleBackColor = true;
|
||||
@ -193,9 +192,9 @@
|
||||
//
|
||||
// FormTravel
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(8F, 20F);
|
||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(759, 612);
|
||||
ClientSize = new Size(664, 459);
|
||||
Controls.Add(buttonCancel);
|
||||
Controls.Add(buttonSave);
|
||||
Controls.Add(groupBox1);
|
||||
@ -203,6 +202,7 @@
|
||||
Controls.Add(textBoxName);
|
||||
Controls.Add(label2);
|
||||
Controls.Add(label1);
|
||||
Margin = new Padding(3, 2, 3, 2);
|
||||
Name = "FormTravel";
|
||||
Text = "Туристическая путевка";
|
||||
groupBox1.ResumeLayout(false);
|
||||
|
Loading…
Reference in New Issue
Block a user