diff --git a/ProjectTourismCompany/ProjectTourismCompany/Entities/Company.cs b/ProjectTourismCompany/ProjectTourismCompany/Entities/Company.cs index 36853b0..1b5e39d 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Entities/Company.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Entities/Company.cs @@ -11,14 +11,10 @@ public class Company public int Id { get; private set; } public string Name { get; private set; } = string.Empty; public int CountryId { get; private set; } - public IEnumerable CompanyTrip - { - get; - private set; - } = []; - public static Company CreateCompany(int id, string name, int countryId, IEnumerable companyTrip) + + public static Company CreateCompany(int id, string name, int countryId) { - return new Company() { Id = id, Name = name, CountryId = countryId, CompanyTrip = companyTrip }; + return new Company() { Id = id, Name = name, CountryId = countryId}; } } diff --git a/ProjectTourismCompany/ProjectTourismCompany/Entities/Trip.cs b/ProjectTourismCompany/ProjectTourismCompany/Entities/Trip.cs index 1442654..e0d65ad 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Entities/Trip.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Entities/Trip.cs @@ -19,8 +19,14 @@ public class Trip public string EndCity { get; private set;} =string.Empty; public int CompanyId { get; private set; } public TravelType TravelType { get; private set; } - - public static Trip CreateOpeartion(int id, string title, int price, int humanCapacity, DateTime startDate, DateTime endDate, string startCity, string endCity, TravelType travelType) + + public IEnumerable CompanyTrip + { + get; + private set; + } = []; + + public static Trip CreateOpeartion(int id, string title, int price, int humanCapacity, DateTime startDate, DateTime endDate, string startCity, string endCity, TravelType travelType, IEnumerable companyTrip) { return new Trip { @@ -33,6 +39,7 @@ public class Trip StartCity = startCity, EndCity = endCity, TravelType = travelType, + CompanyTrip = companyTrip }; } } diff --git a/ProjectTourismCompany/ProjectTourismCompany/FormTourismCompany.cs b/ProjectTourismCompany/ProjectTourismCompany/FormTourismCompany.cs index 57e8988..f199ce5 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/FormTourismCompany.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/FormTourismCompany.cs @@ -83,5 +83,6 @@ public partial class FormTourismCompany : Form MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); } + } } diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormChecks.Designer.cs b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormChecks.Designer.cs index 4979bab..711e716 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormChecks.Designer.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormChecks.Designer.cs @@ -96,6 +96,7 @@ Controls.Add(dataGridViewChecks); Name = "FormChecks"; Text = "Чеки"; + Load += FormChecks_Load; ((System.ComponentModel.ISupportInitialize)dataGridViewChecks).EndInit(); panel1.ResumeLayout(false); ResumeLayout(false); diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormClients.Designer.cs b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormClients.Designer.cs index a05284c..8b05ca4 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormClients.Designer.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormClients.Designer.cs @@ -110,6 +110,7 @@ Name = "FormClients"; StartPosition = FormStartPosition.CenterParent; Text = "Клиенты"; + Load += FormClients_Load; panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridViewClient).EndInit(); ResumeLayout(false); diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompanies.Designer.cs b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompanies.Designer.cs index 903e133..adf58b3 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompanies.Designer.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompanies.Designer.cs @@ -110,6 +110,7 @@ Name = "FormCompanies"; StartPosition = FormStartPosition.CenterParent; Text = "Компании"; + Load += FormCompanies_Load; ((System.ComponentModel.ISupportInitialize)dataGridViewCompanies).EndInit(); panel1.ResumeLayout(false); ResumeLayout(false); diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.Designer.cs b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.Designer.cs index 0969b20..9e7d532 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.Designer.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.Designer.cs @@ -32,14 +32,8 @@ textBoxName = new TextBox(); buttonCancel = new Button(); buttonSave = new Button(); - groupBox1 = new GroupBox(); - dataGridView1 = new DataGridView(); comboBoxCountry = new ComboBox(); label2 = new Label(); - ColumnTitle = new DataGridViewComboBoxColumn(); - ColumnAdditionalPrice = new DataGridViewTextBoxColumn(); - groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); SuspendLayout(); // // label1 @@ -62,7 +56,7 @@ // buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonCancel.BackColor = Color.IndianRed; - buttonCancel.Location = new Point(305, 318); + buttonCancel.Location = new Point(17, 117); buttonCancel.Name = "buttonCancel"; buttonCancel.Size = new Size(135, 51); buttonCancel.TabIndex = 17; @@ -74,7 +68,7 @@ // buttonSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonSave.BackColor = Color.LimeGreen; - buttonSave.Location = new Point(446, 318); + buttonSave.Location = new Point(158, 117); buttonSave.Name = "buttonSave"; buttonSave.Size = new Size(135, 51); buttonSave.TabIndex = 16; @@ -82,31 +76,6 @@ buttonSave.UseVisualStyleBackColor = false; buttonSave.Click += ButtonSave_Click; // - // groupBox1 - // - groupBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - groupBox1.Controls.Add(dataGridView1); - groupBox1.Location = new Point(283, 6); - groupBox1.Name = "groupBox1"; - groupBox1.Size = new Size(298, 306); - groupBox1.TabIndex = 19; - groupBox1.TabStop = false; - groupBox1.Text = "groupBox1"; - // - // dataGridView1 - // - dataGridView1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView1.Columns.AddRange(new DataGridViewColumn[] { ColumnTitle, ColumnAdditionalPrice }); - dataGridView1.Location = new Point(3, 23); - dataGridView1.MultiSelect = false; - dataGridView1.Name = "dataGridView1"; - dataGridView1.RowHeadersVisible = false; - dataGridView1.RowHeadersWidth = 51; - dataGridView1.Size = new Size(292, 280); - dataGridView1.TabIndex = 0; - // // comboBoxCountry // comboBoxCountry.FormattingEnabled = true; @@ -124,27 +93,13 @@ label2.TabIndex = 21; label2.Text = "Страна"; // - // ColumnTitle - // - ColumnTitle.HeaderText = "Название путевки"; - ColumnTitle.MinimumWidth = 6; - ColumnTitle.Name = "ColumnTitle"; - // - // ColumnAdditionalPrice - // - ColumnAdditionalPrice.HeaderText = "Надбавка фирмы"; - ColumnAdditionalPrice.MinimumWidth = 6; - ColumnAdditionalPrice.Name = "ColumnAdditionalPrice"; - ColumnAdditionalPrice.SortMode = DataGridViewColumnSortMode.NotSortable; - // // FormCompany // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(593, 381); + ClientSize = new Size(305, 180); Controls.Add(label2); Controls.Add(comboBoxCountry); - Controls.Add(groupBox1); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(textBoxName); @@ -152,8 +107,6 @@ Name = "FormCompany"; StartPosition = FormStartPosition.CenterParent; Text = "Компания"; - groupBox1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -164,11 +117,7 @@ private TextBox textBoxName; private Button buttonCancel; private Button buttonSave; - private GroupBox groupBox1; - private DataGridView dataGridView1; private ComboBox comboBoxCountry; private Label label2; - private DataGridViewComboBoxColumn ColumnTitle; - private DataGridViewTextBoxColumn ColumnAdditionalPrice; } } \ No newline at end of file diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.cs b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.cs index 9fa9cb5..cd50c86 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.cs @@ -57,10 +57,6 @@ public partial class FormCompany : Form comboBoxCountry.DataSource = countryRepository.ReadCountries(); comboBoxCountry.DisplayMember = "CountryName"; comboBoxCountry.ValueMember = "Id"; - - ColumnTitle.DataSource = tripRepository.ReadTrips(); - ColumnTitle.DisplayMember = "Title"; - ColumnTitle.ValueMember = "Id"; } @@ -68,12 +64,11 @@ public partial class FormCompany : Form { try { - if (dataGridView1.RowCount < 1 || - comboBoxCountry.SelectedIndex < 0) + if (string.IsNullOrEmpty(textBoxName.Text)) { throw new Exception("Имеются незаполненные поля"); } - _companyRepository.CreateCompany(Company.CreateCompany(0, textBoxName.Text, (int)comboBoxCountry.SelectedIndex!, CreateListCompanyTripFromDataGrid())); + _companyRepository.CreateCompany(Company.CreateCompany(0, textBoxName.Text, (int)comboBoxCountry.SelectedItem!)); Close(); } catch (Exception ex) @@ -84,20 +79,5 @@ public partial class FormCompany : Form } private void ButtonCancel_Click(object sender, EventArgs e) => Close(); - private List CreateListCompanyTripFromDataGrid() - { - var list = new List(); - foreach (DataGridViewRow row in dataGridView1.Rows) - { - if (row.Cells["ColumnAdditionalPrice"].Value == null || - row.Cells["ColumnTitle"].Value == null) - { - continue; - } - list.Add(CompanyTrip.CreateCompanyTrip(0, 0, - Convert.ToInt32(row.Cells["ColumnTitle"].Value), - Convert.ToInt32(row.Cells["ColumnAdditionalPrice"].Value))); - } - return list; - } + } diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.resx b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.resx index 25abefb..af32865 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.resx +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCompany.resx @@ -117,10 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - \ No newline at end of file diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCountries.Designer.cs b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCountries.Designer.cs index 9e6ebca..1701ee7 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCountries.Designer.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCountries.Designer.cs @@ -45,7 +45,6 @@ dataGridView1.AllowUserToResizeRows = false; dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView1.ColumnHeadersVisible = false; dataGridView1.Dock = DockStyle.Fill; dataGridView1.Location = new Point(0, 0); dataGridView1.MultiSelect = false; @@ -54,7 +53,7 @@ dataGridView1.RowHeadersVisible = false; dataGridView1.RowHeadersWidth = 51; dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView1.Size = new Size(800, 450); + dataGridView1.Size = new Size(642, 450); dataGridView1.TabIndex = 0; // // panel1 @@ -106,11 +105,12 @@ AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(800, 450); - Controls.Add(panel1); Controls.Add(dataGridView1); + Controls.Add(panel1); Name = "FormCountries"; StartPosition = FormStartPosition.CenterParent; Text = "Страны"; + Load += FormCountries_Load; ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); panel1.ResumeLayout(false); ResumeLayout(false); diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCountries.cs b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCountries.cs index 3e6380d..17c828a 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCountries.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormCountries.cs @@ -24,9 +24,10 @@ public partial class FormCountries : Form InitializeComponent(); _container = container ?? throw new ArgumentNullException(nameof(container)); _countryRepository = countryRepository ?? throw new ArgumentNullException(nameof(countryRepository)); + } - private void FormCompanies_Load(object sender, EventArgs e) + private void FormCountries_Load(object sender, EventArgs e) { try { diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.Designer.cs b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.Designer.cs index d2e3da6..4520584 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.Designer.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.Designer.cs @@ -46,8 +46,14 @@ buttonSave = new Button(); label1 = new Label(); textBoxTitle = new TextBox(); + groupBox1 = new GroupBox(); + dataGridView1 = new DataGridView(); + columnCompanyName = new DataGridViewComboBoxColumn(); + ColumnAdditionalPrice = new DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)numericUpDownPrice).BeginInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownHumanCapacity).BeginInit(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); SuspendLayout(); // // labelPrice @@ -172,7 +178,7 @@ // buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; buttonCancel.BackColor = Color.IndianRed; - buttonCancel.Location = new Point(214, 512); + buttonCancel.Location = new Point(605, 512); buttonCancel.Name = "buttonCancel"; buttonCancel.Size = new Size(135, 51); buttonCancel.TabIndex = 15; @@ -184,7 +190,7 @@ // buttonSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonSave.BackColor = Color.LimeGreen; - buttonSave.Location = new Point(361, 512); + buttonSave.Location = new Point(796, 512); buttonSave.Name = "buttonSave"; buttonSave.Size = new Size(135, 51); buttonSave.TabIndex = 14; @@ -208,11 +214,57 @@ textBoxTitle.Size = new Size(220, 27); textBoxTitle.TabIndex = 17; // + // groupBox1 + // + groupBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + groupBox1.Controls.Add(dataGridView1); + groupBox1.Location = new Point(499, 12); + groupBox1.Name = "groupBox1"; + groupBox1.Size = new Size(432, 476); + groupBox1.TabIndex = 20; + groupBox1.TabStop = false; + groupBox1.Text = "groupBox1"; + // + // dataGridView1 + // + dataGridView1.AllowUserToDeleteRows = false; + dataGridView1.AllowUserToResizeColumns = false; + dataGridView1.AllowUserToResizeRows = false; + dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView1.Columns.AddRange(new DataGridViewColumn[] { columnCompanyName, ColumnAdditionalPrice }); + dataGridView1.Dock = DockStyle.Fill; + dataGridView1.Location = new Point(3, 23); + dataGridView1.MultiSelect = false; + dataGridView1.Name = "dataGridView1"; + dataGridView1.ReadOnly = true; + dataGridView1.RowHeadersVisible = false; + dataGridView1.RowHeadersWidth = 51; + dataGridView1.Size = new Size(426, 450); + dataGridView1.TabIndex = 0; + // + // columnCompanyName + // + columnCompanyName.HeaderText = "Название компании"; + columnCompanyName.MinimumWidth = 6; + columnCompanyName.Name = "columnCompanyName"; + columnCompanyName.ReadOnly = true; + // + // ColumnAdditionalPrice + // + ColumnAdditionalPrice.HeaderText = "Добавочная стоимость"; + ColumnAdditionalPrice.MinimumWidth = 6; + ColumnAdditionalPrice.Name = "ColumnAdditionalPrice"; + ColumnAdditionalPrice.ReadOnly = true; + ColumnAdditionalPrice.Resizable = DataGridViewTriState.True; + ColumnAdditionalPrice.SortMode = DataGridViewColumnSortMode.NotSortable; + // // FormTrip // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(508, 573); + ClientSize = new Size(943, 573); + Controls.Add(groupBox1); Controls.Add(textBoxTitle); Controls.Add(label1); Controls.Add(buttonCancel); @@ -236,6 +288,8 @@ Text = "Туры"; ((System.ComponentModel.ISupportInitialize)numericUpDownPrice).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownHumanCapacity).EndInit(); + groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -260,5 +314,9 @@ private Button buttonSave; private Label label1; private TextBox textBoxTitle; + private GroupBox groupBox1; + private DataGridView dataGridView1; + private DataGridViewComboBoxColumn columnCompanyName; + private DataGridViewTextBoxColumn ColumnAdditionalPrice; } } \ No newline at end of file diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.cs b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.cs index 5d086e3..3466669 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.cs @@ -2,6 +2,7 @@ using ProjectTourismCompany.Entities; using ProjectTourismCompany.Entities.Enums; using ProjectTourismCompany.Repositories; +using ProjectTourismCompany.Repositories.Implementations; using System; using System.Collections.Generic; using System.ComponentModel; @@ -56,7 +57,7 @@ Enum.GetValues(typeof(TravelType))) } } } - public FormTrip(ITripRepository tripRepository) + public FormTrip(ITripRepository tripRepository, ICompanyRepository companyRepository) { InitializeComponent(); _tripRepository = tripRepository ?? throw new ArgumentNullException(nameof(tripRepository)); @@ -64,14 +65,16 @@ Enum.GetValues(typeof(TravelType))) { checkedListBoxTravelType.Items.Add(elem); } - + columnCompanyName.DataSource = companyRepository.ReadCompanies(); + columnCompanyName.DisplayMember = "Name"; + columnCompanyName.ValueMember = "Id"; } private void ButtonSave_Click(object sender, EventArgs e) { try { if (string.IsNullOrWhiteSpace(textBoxStartCity.Text) || - string.IsNullOrWhiteSpace(textBoxEndCity.Text)) + string.IsNullOrWhiteSpace(textBoxEndCity.Text) || dataGridView1.RowCount < 1) { throw new Exception("Имеются незаполненные поля"); } @@ -105,6 +108,24 @@ Enum.GetValues(typeof(TravelType))) } return Trip.CreateOpeartion(id, textBoxTitle.Text, (int)numericUpDownPrice.Value, (int)numericUpDownHumanCapacity.Value, dateTimePickerStartDate.Value, dateTimePickerEndDate.Value, - textBoxStartCity.Text, textBoxEndCity.Text, tr); + textBoxStartCity.Text, textBoxEndCity.Text, tr, CreateListCompanyTripFromDataGrid()); + } + + + private List CreateListCompanyTripFromDataGrid() + { + var list = new List(); + foreach (DataGridViewRow row in dataGridView1.Rows) + { + if (row.Cells["ColumnAdditionalPrice"].Value == null || + row.Cells["ColumnCompanyName"].Value == null) + { + continue; + } + list.Add(CompanyTrip.CreateCompanyTrip(0, 0, + Convert.ToInt32(row.Cells["ColumnCompanyName"].Value), + Convert.ToInt32(row.Cells["ColumnAdditionalPrice"].Value))); + } + return list; } } diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.resx b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.resx index af32865..5b6b78e 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.resx +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrip.resx @@ -117,4 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + \ No newline at end of file diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrips.Designer.cs b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrips.Designer.cs index 87dc442..e57b191 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrips.Designer.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrips.Designer.cs @@ -48,26 +48,25 @@ dataGridView1.MultiSelect = false; dataGridView1.Name = "dataGridView1"; dataGridView1.ReadOnly = true; - dataGridView1.RowHeadersVisible = false; dataGridView1.RowHeadersWidth = 51; dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView1.Size = new Size(1098, 538); + dataGridView1.Size = new Size(645, 450); dataGridView1.TabIndex = 0; // // panel1 // panel1.Controls.Add(buttonAddTrip); panel1.Dock = DockStyle.Right; - panel1.Location = new Point(970, 0); + panel1.Location = new Point(645, 0); panel1.Name = "panel1"; - panel1.Size = new Size(128, 538); + panel1.Size = new Size(155, 450); panel1.TabIndex = 1; // // buttonAddTrip // buttonAddTrip.BackgroundImage = Properties.Resources.plus; buttonAddTrip.BackgroundImageLayout = ImageLayout.Stretch; - buttonAddTrip.Location = new Point(23, 29); + buttonAddTrip.Location = new Point(34, 31); buttonAddTrip.Name = "buttonAddTrip"; buttonAddTrip.Size = new Size(94, 80); buttonAddTrip.TabIndex = 5; @@ -78,12 +77,13 @@ // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1098, 538); - Controls.Add(panel1); + ClientSize = new Size(800, 450); Controls.Add(dataGridView1); + Controls.Add(panel1); Name = "FormTrips"; StartPosition = FormStartPosition.CenterParent; Text = "Туры"; + Load += FormTrips_Load; ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); panel1.ResumeLayout(false); ResumeLayout(false); diff --git a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrips.cs b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrips.cs index 178adaa..a50652e 100644 --- a/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrips.cs +++ b/ProjectTourismCompany/ProjectTourismCompany/Forms/FormTrips.cs @@ -28,7 +28,7 @@ public partial class FormTrips : Form } - private void FormChecks_Load(object sender, EventArgs e) + private void FormTrips_Load(object sender, EventArgs e) { try { @@ -60,5 +60,6 @@ public partial class FormTrips : Form private void LoadList() => dataGridView1.DataSource = _tripRepository.ReadTrips(); + }