From 11b8e815b20deb67802a727bc5faf333488d09cf Mon Sep 17 00:00:00 2001 From: Maxim Date: Mon, 16 Dec 2024 21:44:10 +0400 Subject: [PATCH] hot fix pull requests --- ProjectGSM/Forms/FormAdvocates.Designer.cs | 42 ++++---- ProjectGSM/Forms/FormAdvocates.cs | 6 +- ProjectGSM/Forms/FormBase.Designer.cs | 118 -------------------- ProjectGSM/Forms/FormBase.cs | 20 ---- ProjectGSM/Forms/FormBase.resx | 120 --------------------- ProjectGSM/Forms/FormCaseReport.cs | 5 - 6 files changed, 24 insertions(+), 287 deletions(-) delete mode 100644 ProjectGSM/Forms/FormBase.Designer.cs delete mode 100644 ProjectGSM/Forms/FormBase.cs delete mode 100644 ProjectGSM/Forms/FormBase.resx diff --git a/ProjectGSM/Forms/FormAdvocates.Designer.cs b/ProjectGSM/Forms/FormAdvocates.Designer.cs index d4f88e5..943b4f7 100644 --- a/ProjectGSM/Forms/FormAdvocates.Designer.cs +++ b/ProjectGSM/Forms/FormAdvocates.Designer.cs @@ -32,9 +32,9 @@ deleteButton = new Button(); editButton = new Button(); addButton = new Button(); - dataGridView1 = new DataGridView(); + dataGridViewAdvocats = new DataGridView(); panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)dataGridViewAdvocats).BeginInit(); SuspendLayout(); // // panel1 @@ -86,36 +86,36 @@ // // dataGridView1 // - dataGridView1.AllowUserToAddRows = false; - dataGridView1.AllowUserToDeleteRows = false; - dataGridView1.AllowUserToResizeColumns = false; - dataGridView1.AllowUserToResizeRows = false; - dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridView1.BackgroundColor = SystemColors.Info; - dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView1.Dock = DockStyle.Fill; - dataGridView1.Location = new Point(0, 0); - dataGridView1.MultiSelect = false; - dataGridView1.Name = "dataGridView1"; - dataGridView1.ReadOnly = true; - dataGridView1.RowHeadersVisible = false; - dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView1.Size = new Size(604, 450); - dataGridView1.TabIndex = 1; + dataGridViewAdvocats.AllowUserToAddRows = false; + dataGridViewAdvocats.AllowUserToDeleteRows = false; + dataGridViewAdvocats.AllowUserToResizeColumns = false; + dataGridViewAdvocats.AllowUserToResizeRows = false; + dataGridViewAdvocats.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridViewAdvocats.BackgroundColor = SystemColors.Info; + dataGridViewAdvocats.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewAdvocats.Dock = DockStyle.Fill; + dataGridViewAdvocats.Location = new Point(0, 0); + dataGridViewAdvocats.MultiSelect = false; + dataGridViewAdvocats.Name = "dataGridViewAdvocats"; + dataGridViewAdvocats.ReadOnly = true; + dataGridViewAdvocats.RowHeadersVisible = false; + dataGridViewAdvocats.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridViewAdvocats.Size = new Size(604, 450); + dataGridViewAdvocats.TabIndex = 1; // // FormAdvocates // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(746, 450); - Controls.Add(dataGridView1); + Controls.Add(dataGridViewAdvocats); Controls.Add(panel1); Name = "FormAdvocates"; StartPosition = FormStartPosition.CenterScreen; Text = "Адвокаты"; Load += FormClients_Load; panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ((System.ComponentModel.ISupportInitialize)dataGridViewAdvocats).EndInit(); ResumeLayout(false); } @@ -125,6 +125,6 @@ private Button deleteButton; private Button editButton; private Button addButton; - private DataGridView dataGridView1; + private DataGridView dataGridViewAdvocats; } } \ No newline at end of file diff --git a/ProjectGSM/Forms/FormAdvocates.cs b/ProjectGSM/Forms/FormAdvocates.cs index 00a8683..9d04851 100644 --- a/ProjectGSM/Forms/FormAdvocates.cs +++ b/ProjectGSM/Forms/FormAdvocates.cs @@ -102,20 +102,20 @@ namespace ProjectGSM.Forms } - private void LoadList() => dataGridView1.DataSource = + private void LoadList() => dataGridViewAdvocats.DataSource = _advocateRepository.ReadAdvocates(); private bool TryGetIdentifierFromSelectedRow(out int id) { id = 0; - if (dataGridView1.SelectedRows.Count < 1) + if (dataGridViewAdvocats.SelectedRows.Count < 1) { MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; } id = - Convert.ToInt32(dataGridView1.SelectedRows[0].Cells["Id"].Value); + Convert.ToInt32(dataGridViewAdvocats.SelectedRows[0].Cells["Id"].Value); return true; } diff --git a/ProjectGSM/Forms/FormBase.Designer.cs b/ProjectGSM/Forms/FormBase.Designer.cs deleted file mode 100644 index e874d26..0000000 --- a/ProjectGSM/Forms/FormBase.Designer.cs +++ /dev/null @@ -1,118 +0,0 @@ -namespace ProjectGSM.Forms -{ - partial class FormBase - { - /// - /// 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() - { - textBox1 = new TextBox(); - label1 = new Label(); - label2 = new Label(); - numericUpDown1 = new NumericUpDown(); - button1 = new Button(); - button2 = new Button(); - ((System.ComponentModel.ISupportInitialize)numericUpDown1).BeginInit(); - SuspendLayout(); - // - // textBox1 - // - textBox1.Location = new Point(185, 43); - textBox1.Name = "textBox1"; - textBox1.Size = new Size(120, 23); - textBox1.TabIndex = 0; - // - // label1 - // - label1.AutoSize = true; - label1.Location = new Point(61, 51); - label1.Name = "label1"; - label1.Size = new Size(38, 15); - label1.TabIndex = 1; - label1.Text = "label1"; - // - // label2 - // - label2.AutoSize = true; - label2.Location = new Point(61, 106); - label2.Name = "label2"; - label2.Size = new Size(38, 15); - label2.TabIndex = 2; - label2.Text = "label2"; - // - // numericUpDown1 - // - numericUpDown1.Location = new Point(185, 98); - numericUpDown1.Name = "numericUpDown1"; - numericUpDown1.Size = new Size(120, 23); - numericUpDown1.TabIndex = 3; - // - // button1 - // - button1.Location = new Point(85, 268); - button1.Name = "button1"; - button1.Size = new Size(104, 35); - button1.TabIndex = 4; - button1.Text = "Сохранить"; - button1.UseVisualStyleBackColor = true; - // - // button2 - // - button2.Location = new Point(211, 268); - button2.Name = "button2"; - button2.Size = new Size(104, 35); - button2.TabIndex = 5; - button2.Text = "Отмена"; - button2.UseVisualStyleBackColor = true; - // - // FormBase - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(385, 336); - Controls.Add(button2); - Controls.Add(button1); - Controls.Add(numericUpDown1); - Controls.Add(label2); - Controls.Add(label1); - Controls.Add(textBox1); - Name = "FormBase"; - StartPosition = FormStartPosition.CenterScreen; - Text = "Клиент"; - ((System.ComponentModel.ISupportInitialize)numericUpDown1).EndInit(); - ResumeLayout(false); - PerformLayout(); - } - - #endregion - - private TextBox textBox1; - private Label label1; - private Label label2; - private NumericUpDown numericUpDown1; - private Button button1; - private Button button2; - } -} \ No newline at end of file diff --git a/ProjectGSM/Forms/FormBase.cs b/ProjectGSM/Forms/FormBase.cs deleted file mode 100644 index 6d60bbf..0000000 --- a/ProjectGSM/Forms/FormBase.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace ProjectGSM.Forms -{ - public partial class FormBase : Form - { - public FormBase() - { - InitializeComponent(); - } - } -} diff --git a/ProjectGSM/Forms/FormBase.resx b/ProjectGSM/Forms/FormBase.resx deleted file mode 100644 index 8b2ff64..0000000 --- a/ProjectGSM/Forms/FormBase.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - \ No newline at end of file diff --git a/ProjectGSM/Forms/FormCaseReport.cs b/ProjectGSM/Forms/FormCaseReport.cs index aef9cb0..8384770 100644 --- a/ProjectGSM/Forms/FormCaseReport.cs +++ b/ProjectGSM/Forms/FormCaseReport.cs @@ -85,10 +85,5 @@ namespace ProjectGSM.Forms MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - private void buttonMakeReport_Click_1(object sender, EventArgs e) - { - - } } } \ No newline at end of file