diff --git a/.vs/Diplom O/v16/.suo b/.vs/Diplom O/v16/.suo index e09b209..b3bf72e 100644 Binary files a/.vs/Diplom O/v16/.suo and b/.vs/Diplom O/v16/.suo differ diff --git a/.vs/Diplom O/v16/TestStore/0/000.testlog b/.vs/Diplom O/v16/TestStore/0/000.testlog new file mode 100644 index 0000000..7b37652 Binary files /dev/null and b/.vs/Diplom O/v16/TestStore/0/000.testlog differ diff --git a/.vs/Diplom O/v16/TestStore/0/testlog.manifest b/.vs/Diplom O/v16/TestStore/0/testlog.manifest new file mode 100644 index 0000000..e92ede2 Binary files /dev/null and b/.vs/Diplom O/v16/TestStore/0/testlog.manifest differ diff --git a/DataBase/FuncDB.cs b/DataBase/FuncDB.cs index 854c2a1..ef5bb73 100644 --- a/DataBase/FuncDB.cs +++ b/DataBase/FuncDB.cs @@ -172,14 +172,14 @@ namespace Diplom_O.DataBase select a).ToArray() : (from a in db.Chely where - a.FName.ToLower().Contains(f) || - a.SName.ToLower().Contains(f) || - a.TName.ToLower().Contains(f) || + (!string.IsNullOrEmpty(a.FName) && a.FName.ToLower().Contains(f)) || + (!string.IsNullOrEmpty(a.SName) && a.SName.ToLower().Contains(f)) || + (!string.IsNullOrEmpty(a.TName) && a.TName.ToLower().Contains(f)) || a.Birthday.ToString("yyyy.MM.dd").ToLower().Contains(f) || - a.Address.ToLower().Contains(f) || - a.INN.ToLower().Contains(f) || - a.SNILS.ToLower().Contains(f) || - a.Pasport.ToLower().Contains(f) + (!string.IsNullOrEmpty(a.Address) && a.Address.ToLower().Contains(f)) || + (!string.IsNullOrEmpty(a.INN) && a.INN.ToLower().Contains(f)) || + (!string.IsNullOrEmpty(a.SNILS) && a.SNILS.ToLower().Contains(f)) || + (!string.IsNullOrEmpty(a.Pasport) && a.Pasport.ToLower().Contains(f)) select a).ToArray(); } } @@ -320,5 +320,21 @@ namespace Diplom_O.DataBase } catch { throw; } } + + public static ChelToChel GetChelToChel(int id) + { + try + { + using (var db = new MainDB()) + { + var res = from a in db.ChelToChely + where a.Id == id + select a; + try { return res.Single(); } + catch { return null; } + } + } + catch { throw; } + } } } diff --git a/Diplom O.csproj b/Diplom O.csproj index b5b3bda..d4873b8 100644 --- a/Diplom O.csproj +++ b/Diplom O.csproj @@ -283,6 +283,12 @@ + + Form + + + SelectChelForm.cs + Form @@ -310,6 +316,9 @@ True Resources.resx + + SelectChelForm.cs + WorkChelForm.cs diff --git a/MainForms/ChelForm.Designer.cs b/MainForms/ChelForm.Designer.cs index 82bbbe6..c8ca0b8 100644 --- a/MainForms/ChelForm.Designer.cs +++ b/MainForms/ChelForm.Designer.cs @@ -29,312 +29,282 @@ namespace Diplom_O /// private void InitializeComponent() { - this.menuStrip = new System.Windows.Forms.MenuStrip(); - this.shtatMI = new System.Windows.Forms.ToolStripMenuItem(); - this.rabitnikiMI = new System.Windows.Forms.ToolStripMenuItem(); - this.otpBolMI = new System.Windows.Forms.ToolStripMenuItem(); - this.chelRodMI = new System.Windows.Forms.ToolStripMenuItem(); - this.errorLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.rodGridView = new System.Windows.Forms.DataGridView(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.delRodButton = new System.Windows.Forms.Button(); - this.button1 = new System.Windows.Forms.Button(); - this.changeRodButton = new System.Windows.Forms.Button(); - this.addRodButton = new System.Windows.Forms.Button(); - this.chelGridView = new System.Windows.Forms.DataGridView(); - this.selectButton = new System.Windows.Forms.Button(); - this.delButton = new System.Windows.Forms.Button(); - this.changeButton = new System.Windows.Forms.Button(); - this.addButton = new System.Windows.Forms.Button(); - this.showWorkerCheckBox = new System.Windows.Forms.CheckBox(); - this.dropFindButton = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.findBox = new System.Windows.Forms.TextBox(); - this.menuStrip.SuspendLayout(); - this.statusStrip1.SuspendLayout(); - this.groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.rodGridView)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.chelGridView)).BeginInit(); - this.SuspendLayout(); - // - // menuStrip - // - this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip = new System.Windows.Forms.MenuStrip(); + this.shtatMI = new System.Windows.Forms.ToolStripMenuItem(); + this.rabitnikiMI = new System.Windows.Forms.ToolStripMenuItem(); + this.otpBolMI = new System.Windows.Forms.ToolStripMenuItem(); + this.chelRodMI = new System.Windows.Forms.ToolStripMenuItem(); + this.errorLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.rodGridView = new System.Windows.Forms.DataGridView(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.chelRodLabel = new System.Windows.Forms.LinkLabel(); + this.delRodButton = new System.Windows.Forms.Button(); + this.addRodButton = new System.Windows.Forms.Button(); + this.chelGridView = new System.Windows.Forms.DataGridView(); + this.delButton = new System.Windows.Forms.Button(); + this.changeButton = new System.Windows.Forms.Button(); + this.addButton = new System.Windows.Forms.Button(); + this.showWorkerCheckBox = new System.Windows.Forms.CheckBox(); + this.dropFindButton = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.findBox = new System.Windows.Forms.TextBox(); + this.menuStrip.SuspendLayout(); + this.statusStrip1.SuspendLayout(); + this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.rodGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.chelGridView)).BeginInit(); + this.SuspendLayout(); + // + // menuStrip + // + this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.shtatMI, this.rabitnikiMI, this.otpBolMI, this.chelRodMI}); - this.menuStrip.Location = new System.Drawing.Point(0, 0); - this.menuStrip.Name = "menuStrip"; - this.menuStrip.Size = new System.Drawing.Size(1144, 24); - this.menuStrip.TabIndex = 1; - this.menuStrip.Text = "menuStrip1"; - // - // shtatMI - // - this.shtatMI.Name = "shtatMI"; - this.shtatMI.Size = new System.Drawing.Size(46, 20); - this.shtatMI.Text = "Штат"; - // - // rabitnikiMI - // - this.rabitnikiMI.Name = "rabitnikiMI"; - this.rabitnikiMI.Size = new System.Drawing.Size(78, 20); - this.rabitnikiMI.Text = "Работники"; - // - // otpBolMI - // - this.otpBolMI.Name = "otpBolMI"; - this.otpBolMI.Size = new System.Drawing.Size(100, 20); - this.otpBolMI.Text = "Отпуск/Больн."; - // - // chelRodMI - // - this.chelRodMI.Name = "chelRodMI"; - this.chelRodMI.Size = new System.Drawing.Size(95, 20); - this.chelRodMI.Text = "Люди/Родств."; - // - // errorLabel - // - this.errorLabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold); - this.errorLabel.ForeColor = System.Drawing.Color.Red; - this.errorLabel.Name = "errorLabel"; - this.errorLabel.Size = new System.Drawing.Size(137, 17); - this.errorLabel.Text = "Отображение ошибки"; - this.errorLabel.Visible = false; - // - // statusStrip1 - // - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip.Location = new System.Drawing.Point(0, 0); + this.menuStrip.Name = "menuStrip"; + this.menuStrip.Size = new System.Drawing.Size(1186, 24); + this.menuStrip.TabIndex = 1; + this.menuStrip.Text = "menuStrip1"; + // + // shtatMI + // + this.shtatMI.Name = "shtatMI"; + this.shtatMI.Size = new System.Drawing.Size(46, 20); + this.shtatMI.Text = "Штат"; + // + // rabitnikiMI + // + this.rabitnikiMI.Name = "rabitnikiMI"; + this.rabitnikiMI.Size = new System.Drawing.Size(78, 20); + this.rabitnikiMI.Text = "Работники"; + // + // otpBolMI + // + this.otpBolMI.Name = "otpBolMI"; + this.otpBolMI.Size = new System.Drawing.Size(100, 20); + this.otpBolMI.Text = "Отпуск/Больн."; + // + // chelRodMI + // + this.chelRodMI.Name = "chelRodMI"; + this.chelRodMI.Size = new System.Drawing.Size(95, 20); + this.chelRodMI.Text = "Люди/Родств."; + // + // errorLabel + // + this.errorLabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold); + this.errorLabel.ForeColor = System.Drawing.Color.Red; + this.errorLabel.Name = "errorLabel"; + this.errorLabel.Size = new System.Drawing.Size(137, 17); + this.errorLabel.Text = "Отображение ошибки"; + this.errorLabel.Visible = false; + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.errorLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 386); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1144, 22); - this.statusStrip1.TabIndex = 16; - this.statusStrip1.Text = "statusStrip1"; - // - // groupBox1 - // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.statusStrip1.Location = new System.Drawing.Point(0, 386); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(1186, 22); + this.statusStrip1.TabIndex = 16; + this.statusStrip1.Text = "statusStrip1"; + // + // groupBox1 + // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox1.Controls.Add(this.rodGridView); - this.groupBox1.Controls.Add(this.comboBox1); - this.groupBox1.Controls.Add(this.linkLabel1); - this.groupBox1.Controls.Add(this.delRodButton); - this.groupBox1.Controls.Add(this.button1); - this.groupBox1.Controls.Add(this.changeRodButton); - this.groupBox1.Controls.Add(this.addRodButton); - this.groupBox1.Location = new System.Drawing.Point(802, 27); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(330, 356); - this.groupBox1.TabIndex = 26; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Родственники"; - // - // rodGridView - // - this.rodGridView.AllowUserToAddRows = false; - this.rodGridView.AllowUserToDeleteRows = false; - this.rodGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.groupBox1.Controls.Add(this.rodGridView); + this.groupBox1.Controls.Add(this.comboBox1); + this.groupBox1.Controls.Add(this.chelRodLabel); + this.groupBox1.Controls.Add(this.delRodButton); + this.groupBox1.Controls.Add(this.addRodButton); + this.groupBox1.Location = new System.Drawing.Point(844, 27); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(330, 356); + this.groupBox1.TabIndex = 26; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Родственники"; + // + // rodGridView + // + this.rodGridView.AllowUserToAddRows = false; + this.rodGridView.AllowUserToDeleteRows = false; + this.rodGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.rodGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.rodGridView.Location = new System.Drawing.Point(6, 85); - this.rodGridView.MultiSelect = false; - this.rodGridView.Name = "rodGridView"; - this.rodGridView.ReadOnly = true; - this.rodGridView.RowHeadersVisible = false; - this.rodGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.rodGridView.Size = new System.Drawing.Size(318, 265); - this.rodGridView.TabIndex = 32; - // - // comboBox1 - // - this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Items.AddRange(new object[] { + this.rodGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.rodGridView.Location = new System.Drawing.Point(6, 85); + this.rodGridView.MultiSelect = false; + this.rodGridView.Name = "rodGridView"; + this.rodGridView.ReadOnly = true; + this.rodGridView.RowHeadersVisible = false; + this.rodGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.rodGridView.Size = new System.Drawing.Size(318, 265); + this.rodGridView.TabIndex = 12; + // + // comboBox1 + // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { "Родственная связь"}); - this.comboBox1.Location = new System.Drawing.Point(168, 21); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(156, 21); - this.comboBox1.TabIndex = 31; - // - // linkLabel1 - // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(37, 24); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(81, 13); - this.linkLabel1.TabIndex = 30; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "Фамилия И.О."; - // - // delRodButton - // - this.delRodButton.Location = new System.Drawing.Point(168, 56); - this.delRodButton.Name = "delRodButton"; - this.delRodButton.Size = new System.Drawing.Size(75, 23); - this.delRodButton.TabIndex = 29; - this.delRodButton.Text = "Удалить"; - this.delRodButton.UseVisualStyleBackColor = true; - // - // button1 - // - this.button1.Location = new System.Drawing.Point(6, 19); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(25, 23); - this.button1.TabIndex = 27; - this.button1.Text = "..."; - this.button1.UseVisualStyleBackColor = true; - // - // changeRodButton - // - this.changeRodButton.Location = new System.Drawing.Point(87, 56); - this.changeRodButton.Name = "changeRodButton"; - this.changeRodButton.Size = new System.Drawing.Size(75, 23); - this.changeRodButton.TabIndex = 28; - this.changeRodButton.Text = "Изменить"; - this.changeRodButton.UseVisualStyleBackColor = true; - // - // addRodButton - // - this.addRodButton.Location = new System.Drawing.Point(6, 56); - this.addRodButton.Name = "addRodButton"; - this.addRodButton.Size = new System.Drawing.Size(75, 23); - this.addRodButton.TabIndex = 27; - this.addRodButton.Text = "Добавить"; - this.addRodButton.UseVisualStyleBackColor = true; - // - // chelGridView - // - this.chelGridView.AllowUserToAddRows = false; - this.chelGridView.AllowUserToDeleteRows = false; - this.chelGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.comboBox1.Location = new System.Drawing.Point(168, 21); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(156, 21); + this.comboBox1.TabIndex = 7; + // + // chelRodLabel + // + this.chelRodLabel.AutoSize = true; + this.chelRodLabel.Location = new System.Drawing.Point(6, 24); + this.chelRodLabel.Name = "chelRodLabel"; + this.chelRodLabel.Size = new System.Drawing.Size(81, 13); + this.chelRodLabel.TabIndex = 6; + this.chelRodLabel.TabStop = true; + this.chelRodLabel.Text = "Фамилия И.О."; + this.chelRodLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.chelRodLabel_Clicked); + // + // delRodButton + // + this.delRodButton.Location = new System.Drawing.Point(87, 56); + this.delRodButton.Name = "delRodButton"; + this.delRodButton.Size = new System.Drawing.Size(75, 23); + this.delRodButton.TabIndex = 10; + this.delRodButton.Text = "Удалить"; + this.delRodButton.UseVisualStyleBackColor = true; + // + // addRodButton + // + this.addRodButton.Location = new System.Drawing.Point(6, 56); + this.addRodButton.Name = "addRodButton"; + this.addRodButton.Size = new System.Drawing.Size(75, 23); + this.addRodButton.TabIndex = 8; + this.addRodButton.Text = "Добавить"; + this.addRodButton.UseVisualStyleBackColor = true; + // + // chelGridView + // + this.chelGridView.AllowUserToAddRows = false; + this.chelGridView.AllowUserToDeleteRows = false; + this.chelGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.chelGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.chelGridView.Location = new System.Drawing.Point(12, 56); - this.chelGridView.MultiSelect = false; - this.chelGridView.Name = "chelGridView"; - this.chelGridView.ReadOnly = true; - this.chelGridView.RowHeadersVisible = false; - this.chelGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.chelGridView.Size = new System.Drawing.Size(784, 298); - this.chelGridView.TabIndex = 35; - // - // selectButton - // - this.selectButton.Location = new System.Drawing.Point(12, 27); - this.selectButton.Name = "selectButton"; - this.selectButton.Size = new System.Drawing.Size(75, 23); - this.selectButton.TabIndex = 34; - this.selectButton.Text = "Выбрать"; - this.selectButton.UseVisualStyleBackColor = true; - this.selectButton.Visible = false; - // - // delButton - // - this.delButton.Location = new System.Drawing.Point(255, 27); - this.delButton.Name = "delButton"; - this.delButton.Size = new System.Drawing.Size(75, 23); - this.delButton.TabIndex = 33; - this.delButton.Text = "Удалить"; - this.delButton.UseVisualStyleBackColor = true; - this.delButton.Click += new System.EventHandler(this.delButton_Click); - // - // changeButton - // - this.changeButton.Location = new System.Drawing.Point(174, 27); - this.changeButton.Name = "changeButton"; - this.changeButton.Size = new System.Drawing.Size(75, 23); - this.changeButton.TabIndex = 32; - this.changeButton.Text = "Изменить"; - this.changeButton.UseVisualStyleBackColor = true; - this.changeButton.Click += new System.EventHandler(this.changeButton_Click); - // - // addButton - // - this.addButton.Location = new System.Drawing.Point(93, 27); - this.addButton.Name = "addButton"; - this.addButton.Size = new System.Drawing.Size(75, 23); - this.addButton.TabIndex = 31; - this.addButton.Text = "Добавить"; - this.addButton.UseVisualStyleBackColor = true; - this.addButton.Click += new System.EventHandler(this.addButton_Click); - // - // showWorkerCheckBox - // - this.showWorkerCheckBox.AutoSize = true; - this.showWorkerCheckBox.Checked = true; - this.showWorkerCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.showWorkerCheckBox.Location = new System.Drawing.Point(336, 31); - this.showWorkerCheckBox.Name = "showWorkerCheckBox"; - this.showWorkerCheckBox.Size = new System.Drawing.Size(204, 17); - this.showWorkerCheckBox.TabIndex = 30; - this.showWorkerCheckBox.Text = "Поrазать/скрыть трудоустроенных"; - this.showWorkerCheckBox.UseVisualStyleBackColor = true; - // - // dropFindButton - // - this.dropFindButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.dropFindButton.Location = new System.Drawing.Point(721, 360); - this.dropFindButton.Name = "dropFindButton"; - this.dropFindButton.Size = new System.Drawing.Size(75, 23); - this.dropFindButton.TabIndex = 29; - this.dropFindButton.Text = "Сбросить"; - this.dropFindButton.UseVisualStyleBackColor = true; - // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 365); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(39, 13); - this.label1.TabIndex = 28; - this.label1.Text = "Поиск"; - // - // findBox - // - this.findBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.chelGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.chelGridView.Location = new System.Drawing.Point(12, 56); + this.chelGridView.MultiSelect = false; + this.chelGridView.Name = "chelGridView"; + this.chelGridView.ReadOnly = true; + this.chelGridView.RowHeadersVisible = false; + this.chelGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.chelGridView.Size = new System.Drawing.Size(826, 298); + this.chelGridView.TabIndex = 11; + // + // delButton + // + this.delButton.Location = new System.Drawing.Point(174, 27); + this.delButton.Name = "delButton"; + this.delButton.Size = new System.Drawing.Size(75, 23); + this.delButton.TabIndex = 2; + this.delButton.Text = "Удалить"; + this.delButton.UseVisualStyleBackColor = true; + this.delButton.Click += new System.EventHandler(this.delButton_Click); + // + // changeButton + // + this.changeButton.Location = new System.Drawing.Point(93, 27); + this.changeButton.Name = "changeButton"; + this.changeButton.Size = new System.Drawing.Size(75, 23); + this.changeButton.TabIndex = 1; + this.changeButton.Text = "Изменить"; + this.changeButton.UseVisualStyleBackColor = true; + this.changeButton.Click += new System.EventHandler(this.changeButton_Click); + // + // addButton + // + this.addButton.Location = new System.Drawing.Point(12, 27); + this.addButton.Name = "addButton"; + this.addButton.Size = new System.Drawing.Size(75, 23); + this.addButton.TabIndex = 0; + this.addButton.Text = "Добавить"; + this.addButton.UseVisualStyleBackColor = true; + this.addButton.Click += new System.EventHandler(this.addButton_Click); + // + // showWorkerCheckBox + // + this.showWorkerCheckBox.AutoSize = true; + this.showWorkerCheckBox.Checked = true; + this.showWorkerCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.showWorkerCheckBox.Location = new System.Drawing.Point(255, 31); + this.showWorkerCheckBox.Name = "showWorkerCheckBox"; + this.showWorkerCheckBox.Size = new System.Drawing.Size(204, 17); + this.showWorkerCheckBox.TabIndex = 3; + this.showWorkerCheckBox.Text = "Поrазать/скрыть трудоустроенных"; + this.showWorkerCheckBox.UseVisualStyleBackColor = true; + this.showWorkerCheckBox.CheckedChanged += new System.EventHandler(this.checkBox_CheckedChanged); + // + // dropFindButton + // + this.dropFindButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.dropFindButton.Location = new System.Drawing.Point(763, 360); + this.dropFindButton.Name = "dropFindButton"; + this.dropFindButton.Size = new System.Drawing.Size(75, 23); + this.dropFindButton.TabIndex = 5; + this.dropFindButton.Text = "Сбросить"; + this.dropFindButton.UseVisualStyleBackColor = true; + this.dropFindButton.Click += new System.EventHandler(this.dropFindButton_Click); + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 365); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(39, 13); + this.label1.TabIndex = 28; + this.label1.Text = "Поиск"; + // + // findBox + // + this.findBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.findBox.Location = new System.Drawing.Point(57, 362); - this.findBox.Name = "findBox"; - this.findBox.Size = new System.Drawing.Size(658, 20); - this.findBox.TabIndex = 27; - // - // ChelForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1144, 408); - this.Controls.Add(this.chelGridView); - this.Controls.Add(this.selectButton); - this.Controls.Add(this.delButton); - this.Controls.Add(this.changeButton); - this.Controls.Add(this.addButton); - this.Controls.Add(this.showWorkerCheckBox); - this.Controls.Add(this.dropFindButton); - this.Controls.Add(this.label1); - this.Controls.Add(this.findBox); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.menuStrip); - this.Name = "ChelForm"; - this.Text = "Люди / Родственники"; - this.menuStrip.ResumeLayout(false); - this.menuStrip.PerformLayout(); - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.rodGridView)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.chelGridView)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.findBox.Location = new System.Drawing.Point(57, 362); + this.findBox.Name = "findBox"; + this.findBox.Size = new System.Drawing.Size(700, 20); + this.findBox.TabIndex = 4; + this.findBox.TextChanged += new System.EventHandler(this.findBox_TextChanged); + // + // ChelForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1186, 408); + this.Controls.Add(this.chelGridView); + this.Controls.Add(this.delButton); + this.Controls.Add(this.changeButton); + this.Controls.Add(this.addButton); + this.Controls.Add(this.showWorkerCheckBox); + this.Controls.Add(this.dropFindButton); + this.Controls.Add(this.label1); + this.Controls.Add(this.findBox); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.menuStrip); + this.Name = "ChelForm"; + this.Text = "Люди / Родственники"; + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.rodGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.chelGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -350,13 +320,10 @@ namespace Diplom_O private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.DataGridView rodGridView; private System.Windows.Forms.ComboBox comboBox1; - private System.Windows.Forms.LinkLabel linkLabel1; + private System.Windows.Forms.LinkLabel chelRodLabel; private System.Windows.Forms.Button delRodButton; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Button changeRodButton; private System.Windows.Forms.Button addRodButton; private System.Windows.Forms.DataGridView chelGridView; - private System.Windows.Forms.Button selectButton; private System.Windows.Forms.Button delButton; private System.Windows.Forms.Button changeButton; private System.Windows.Forms.Button addButton; diff --git a/MainForms/ChelForm.cs b/MainForms/ChelForm.cs index 2426096..d406aaf 100644 --- a/MainForms/ChelForm.cs +++ b/MainForms/ChelForm.cs @@ -42,14 +42,12 @@ namespace Diplom_O }); filterDrop.Start(); } - private void dropFindButton_Click(object sender, EventArgs e) { findBox.Text = ""; filterDrop = new Task(() => { return; }); resetChelTable(); } - private void resetChelTable() { try @@ -111,22 +109,16 @@ namespace Diplom_O catch (Exception e) { ShowError(e.Message); return null; } } - public Shtat formResult = null; - public ChelForm(bool select = false) + public ChelForm() { try { InitializeComponent(); - Init(select); + chelRodMI.Enabled = false; resetChelTable(); } catch { this.Close(); } } - public void Init(bool s) - { - if (s) selectButton.Visible = true; - chelRodMI.Enabled = false; - } private void addButton_Click(object sender, EventArgs e) { @@ -178,10 +170,18 @@ namespace Diplom_O } ShowError("Ошибка перехода на новую форму."); } - private void checkBox_CheckedChanged(object sender, EventArgs e) { resetChelTable(); } - } + + private Chel chelRod = null; + private void chelRodLabel_Clicked(object sender, LinkLabelLinkClickedEventArgs e) + { + var chelForm = new SupportForms.SelectChelForm(); + chelForm.ShowDialog(); + if(chelForm.isCanceled) + + } + } } diff --git a/MainForms/ShtatForm.Designer.cs b/MainForms/ShtatForm.Designer.cs index 7158fda..6365f19 100644 --- a/MainForms/ShtatForm.Designer.cs +++ b/MainForms/ShtatForm.Designer.cs @@ -29,215 +29,215 @@ namespace Diplom_O /// private void InitializeComponent() { - this.menuStrip = new System.Windows.Forms.MenuStrip(); - this.shtatMI = new System.Windows.Forms.ToolStripMenuItem(); - this.rabitnikiMI = new System.Windows.Forms.ToolStripMenuItem(); - this.otpBolMI = new System.Windows.Forms.ToolStripMenuItem(); - this.chelRodMI = new System.Windows.Forms.ToolStripMenuItem(); - this.findBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.dropFindButton = new System.Windows.Forms.Button(); - this.freeShtatCheckBox = new System.Windows.Forms.CheckBox(); - this.addButton = new System.Windows.Forms.Button(); - this.changeButton = new System.Windows.Forms.Button(); - this.delButton = new System.Windows.Forms.Button(); - this.selectButton = new System.Windows.Forms.Button(); - this.shtatGridView = new System.Windows.Forms.DataGridView(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.errorLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.menuStrip.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.shtatGridView)).BeginInit(); - this.statusStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // menuStrip - // - this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip = new System.Windows.Forms.MenuStrip(); + this.shtatMI = new System.Windows.Forms.ToolStripMenuItem(); + this.rabitnikiMI = new System.Windows.Forms.ToolStripMenuItem(); + this.otpBolMI = new System.Windows.Forms.ToolStripMenuItem(); + this.chelRodMI = new System.Windows.Forms.ToolStripMenuItem(); + this.findBox = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.dropFindButton = new System.Windows.Forms.Button(); + this.freeShtatCheckBox = new System.Windows.Forms.CheckBox(); + this.addButton = new System.Windows.Forms.Button(); + this.changeButton = new System.Windows.Forms.Button(); + this.delButton = new System.Windows.Forms.Button(); + this.selectButton = new System.Windows.Forms.Button(); + this.shtatGridView = new System.Windows.Forms.DataGridView(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.errorLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.menuStrip.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.shtatGridView)).BeginInit(); + this.statusStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // menuStrip + // + this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.shtatMI, this.rabitnikiMI, this.otpBolMI, this.chelRodMI}); - this.menuStrip.Location = new System.Drawing.Point(0, 0); - this.menuStrip.Name = "menuStrip"; - this.menuStrip.Size = new System.Drawing.Size(342, 24); - this.menuStrip.TabIndex = 0; - this.menuStrip.Text = "menuStrip1"; - // - // shtatMI - // - this.shtatMI.Name = "shtatMI"; - this.shtatMI.Size = new System.Drawing.Size(46, 20); - this.shtatMI.Text = "Штат"; - this.shtatMI.Click += new System.EventHandler(this.MI_Click); - // - // rabitnikiMI - // - this.rabitnikiMI.Name = "rabitnikiMI"; - this.rabitnikiMI.Size = new System.Drawing.Size(78, 20); - this.rabitnikiMI.Text = "Работники"; - this.rabitnikiMI.Click += new System.EventHandler(this.MI_Click); - // - // otpBolMI - // - this.otpBolMI.Name = "otpBolMI"; - this.otpBolMI.Size = new System.Drawing.Size(100, 20); - this.otpBolMI.Text = "Отпуск/Больн."; - this.otpBolMI.Click += new System.EventHandler(this.MI_Click); - // - // chelRodMI - // - this.chelRodMI.Name = "chelRodMI"; - this.chelRodMI.Size = new System.Drawing.Size(95, 20); - this.chelRodMI.Text = "Люди/Родств."; - this.chelRodMI.Click += new System.EventHandler(this.MI_Click); - // - // findBox - // - this.findBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.menuStrip.Location = new System.Drawing.Point(0, 0); + this.menuStrip.Name = "menuStrip"; + this.menuStrip.Size = new System.Drawing.Size(342, 24); + this.menuStrip.TabIndex = 8; + this.menuStrip.Text = "menuStrip1"; + // + // shtatMI + // + this.shtatMI.Name = "shtatMI"; + this.shtatMI.Size = new System.Drawing.Size(46, 20); + this.shtatMI.Text = "Штат"; + this.shtatMI.Click += new System.EventHandler(this.MI_Click); + // + // rabitnikiMI + // + this.rabitnikiMI.Name = "rabitnikiMI"; + this.rabitnikiMI.Size = new System.Drawing.Size(78, 20); + this.rabitnikiMI.Text = "Работники"; + this.rabitnikiMI.Click += new System.EventHandler(this.MI_Click); + // + // otpBolMI + // + this.otpBolMI.Name = "otpBolMI"; + this.otpBolMI.Size = new System.Drawing.Size(100, 20); + this.otpBolMI.Text = "Отпуск/Больн."; + this.otpBolMI.Click += new System.EventHandler(this.MI_Click); + // + // chelRodMI + // + this.chelRodMI.Name = "chelRodMI"; + this.chelRodMI.Size = new System.Drawing.Size(95, 20); + this.chelRodMI.Text = "Люди/Родств."; + this.chelRodMI.Click += new System.EventHandler(this.MI_Click); + // + // findBox + // + this.findBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.findBox.Location = new System.Drawing.Point(57, 490); - this.findBox.Name = "findBox"; - this.findBox.Size = new System.Drawing.Size(192, 20); - this.findBox.TabIndex = 1; - this.findBox.TextChanged += new System.EventHandler(this.findBox_TextChanged); - // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 493); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(39, 13); - this.label1.TabIndex = 3; - this.label1.Text = "Поиск"; - // - // dropFindButton - // - this.dropFindButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.dropFindButton.Location = new System.Drawing.Point(255, 488); - this.dropFindButton.Name = "dropFindButton"; - this.dropFindButton.Size = new System.Drawing.Size(75, 23); - this.dropFindButton.TabIndex = 4; - this.dropFindButton.Text = "Сбросить"; - this.dropFindButton.UseVisualStyleBackColor = true; - this.dropFindButton.TextChanged += new System.EventHandler(this.dropFindButton_Click); - // - // freeShtatCheckBox - // - this.freeShtatCheckBox.AutoSize = true; - this.freeShtatCheckBox.Checked = true; - this.freeShtatCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.freeShtatCheckBox.Location = new System.Drawing.Point(12, 56); - this.freeShtatCheckBox.Name = "freeShtatCheckBox"; - this.freeShtatCheckBox.Size = new System.Drawing.Size(218, 17); - this.freeShtatCheckBox.TabIndex = 6; - this.freeShtatCheckBox.Text = "Поrазать/скрыть занятые должности"; - this.freeShtatCheckBox.UseVisualStyleBackColor = true; - this.freeShtatCheckBox.CheckedChanged += new System.EventHandler(this.checkBox_CheckedChanged); - // - // addButton - // - this.addButton.Location = new System.Drawing.Point(93, 27); - this.addButton.Name = "addButton"; - this.addButton.Size = new System.Drawing.Size(75, 23); - this.addButton.TabIndex = 7; - this.addButton.Text = "Добавить"; - this.addButton.UseVisualStyleBackColor = true; - this.addButton.Click += new System.EventHandler(this.addButton_Click); - // - // changeButton - // - this.changeButton.Location = new System.Drawing.Point(174, 27); - this.changeButton.Name = "changeButton"; - this.changeButton.Size = new System.Drawing.Size(75, 23); - this.changeButton.TabIndex = 8; - this.changeButton.Text = "Изменить"; - this.changeButton.UseVisualStyleBackColor = true; - this.changeButton.Click += new System.EventHandler(this.changeButton_Click); - // - // delButton - // - this.delButton.Location = new System.Drawing.Point(255, 27); - this.delButton.Name = "delButton"; - this.delButton.Size = new System.Drawing.Size(75, 23); - this.delButton.TabIndex = 9; - this.delButton.Text = "Удалить"; - this.delButton.UseVisualStyleBackColor = true; - this.delButton.Click += new System.EventHandler(this.delButton_Click); - // - // selectButton - // - this.selectButton.Location = new System.Drawing.Point(12, 27); - this.selectButton.Name = "selectButton"; - this.selectButton.Size = new System.Drawing.Size(75, 23); - this.selectButton.TabIndex = 13; - this.selectButton.Text = "Выбрать"; - this.selectButton.UseVisualStyleBackColor = true; - this.selectButton.Visible = false; - // - // shtatGridView - // - this.shtatGridView.AllowUserToAddRows = false; - this.shtatGridView.AllowUserToDeleteRows = false; - this.shtatGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.findBox.Location = new System.Drawing.Point(57, 490); + this.findBox.Name = "findBox"; + this.findBox.Size = new System.Drawing.Size(192, 20); + this.findBox.TabIndex = 5; + this.findBox.TextChanged += new System.EventHandler(this.findBox_TextChanged); + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 493); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(39, 13); + this.label1.TabIndex = 3; + this.label1.Text = "Поиск"; + // + // dropFindButton + // + this.dropFindButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.dropFindButton.Location = new System.Drawing.Point(255, 488); + this.dropFindButton.Name = "dropFindButton"; + this.dropFindButton.Size = new System.Drawing.Size(75, 23); + this.dropFindButton.TabIndex = 6; + this.dropFindButton.Text = "Сбросить"; + this.dropFindButton.UseVisualStyleBackColor = true; + this.dropFindButton.TextChanged += new System.EventHandler(this.dropFindButton_Click); + // + // freeShtatCheckBox + // + this.freeShtatCheckBox.AutoSize = true; + this.freeShtatCheckBox.Checked = true; + this.freeShtatCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.freeShtatCheckBox.Location = new System.Drawing.Point(12, 56); + this.freeShtatCheckBox.Name = "freeShtatCheckBox"; + this.freeShtatCheckBox.Size = new System.Drawing.Size(218, 17); + this.freeShtatCheckBox.TabIndex = 4; + this.freeShtatCheckBox.Text = "Поrазать/скрыть занятые должности"; + this.freeShtatCheckBox.UseVisualStyleBackColor = true; + this.freeShtatCheckBox.CheckedChanged += new System.EventHandler(this.checkBox_CheckedChanged); + // + // addButton + // + this.addButton.Location = new System.Drawing.Point(93, 27); + this.addButton.Name = "addButton"; + this.addButton.Size = new System.Drawing.Size(75, 23); + this.addButton.TabIndex = 1; + this.addButton.Text = "Добавить"; + this.addButton.UseVisualStyleBackColor = true; + this.addButton.Click += new System.EventHandler(this.addButton_Click); + // + // changeButton + // + this.changeButton.Location = new System.Drawing.Point(174, 27); + this.changeButton.Name = "changeButton"; + this.changeButton.Size = new System.Drawing.Size(75, 23); + this.changeButton.TabIndex = 2; + this.changeButton.Text = "Изменить"; + this.changeButton.UseVisualStyleBackColor = true; + this.changeButton.Click += new System.EventHandler(this.changeButton_Click); + // + // delButton + // + this.delButton.Location = new System.Drawing.Point(255, 27); + this.delButton.Name = "delButton"; + this.delButton.Size = new System.Drawing.Size(75, 23); + this.delButton.TabIndex = 3; + this.delButton.Text = "Удалить"; + this.delButton.UseVisualStyleBackColor = true; + this.delButton.Click += new System.EventHandler(this.delButton_Click); + // + // selectButton + // + this.selectButton.Location = new System.Drawing.Point(12, 27); + this.selectButton.Name = "selectButton"; + this.selectButton.Size = new System.Drawing.Size(75, 23); + this.selectButton.TabIndex = 0; + this.selectButton.Text = "Выбрать"; + this.selectButton.UseVisualStyleBackColor = true; + this.selectButton.Visible = false; + // + // shtatGridView + // + this.shtatGridView.AllowUserToAddRows = false; + this.shtatGridView.AllowUserToDeleteRows = false; + this.shtatGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.shtatGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.shtatGridView.Location = new System.Drawing.Point(12, 79); - this.shtatGridView.MultiSelect = false; - this.shtatGridView.Name = "shtatGridView"; - this.shtatGridView.ReadOnly = true; - this.shtatGridView.RowHeadersVisible = false; - this.shtatGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.shtatGridView.Size = new System.Drawing.Size(318, 403); - this.shtatGridView.TabIndex = 14; - // - // statusStrip1 - // - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.shtatGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.shtatGridView.Location = new System.Drawing.Point(12, 79); + this.shtatGridView.MultiSelect = false; + this.shtatGridView.Name = "shtatGridView"; + this.shtatGridView.ReadOnly = true; + this.shtatGridView.RowHeadersVisible = false; + this.shtatGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.shtatGridView.Size = new System.Drawing.Size(318, 403); + this.shtatGridView.TabIndex = 7; + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.errorLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 514); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(342, 22); - this.statusStrip1.TabIndex = 15; - this.statusStrip1.Text = "statusStrip1"; - // - // errorLabel - // - this.errorLabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold); - this.errorLabel.ForeColor = System.Drawing.Color.Red; - this.errorLabel.Name = "errorLabel"; - this.errorLabel.Size = new System.Drawing.Size(137, 17); - this.errorLabel.Text = "Отображение ошибки"; - this.errorLabel.Visible = false; - // - // ShtatForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(342, 536); - this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.shtatGridView); - this.Controls.Add(this.selectButton); - this.Controls.Add(this.delButton); - this.Controls.Add(this.changeButton); - this.Controls.Add(this.addButton); - this.Controls.Add(this.freeShtatCheckBox); - this.Controls.Add(this.dropFindButton); - this.Controls.Add(this.label1); - this.Controls.Add(this.findBox); - this.Controls.Add(this.menuStrip); - this.MainMenuStrip = this.menuStrip; - this.Name = "ShtatForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Штат"; - this.menuStrip.ResumeLayout(false); - this.menuStrip.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.shtatGridView)).EndInit(); - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.statusStrip1.Location = new System.Drawing.Point(0, 514); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(342, 22); + this.statusStrip1.TabIndex = 15; + this.statusStrip1.Text = "statusStrip1"; + // + // errorLabel + // + this.errorLabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold); + this.errorLabel.ForeColor = System.Drawing.Color.Red; + this.errorLabel.Name = "errorLabel"; + this.errorLabel.Size = new System.Drawing.Size(137, 17); + this.errorLabel.Text = "Отображение ошибки"; + this.errorLabel.Visible = false; + // + // ShtatForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(342, 536); + this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.shtatGridView); + this.Controls.Add(this.selectButton); + this.Controls.Add(this.delButton); + this.Controls.Add(this.changeButton); + this.Controls.Add(this.addButton); + this.Controls.Add(this.freeShtatCheckBox); + this.Controls.Add(this.dropFindButton); + this.Controls.Add(this.label1); + this.Controls.Add(this.findBox); + this.Controls.Add(this.menuStrip); + this.MainMenuStrip = this.menuStrip; + this.Name = "ShtatForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Штат"; + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.shtatGridView)).EndInit(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/SupportForms/SelectChelForm.Designer.cs b/SupportForms/SelectChelForm.Designer.cs new file mode 100644 index 0000000..5472a77 --- /dev/null +++ b/SupportForms/SelectChelForm.Designer.cs @@ -0,0 +1,165 @@ + +namespace Diplom_O.SupportForms +{ + partial class SelectChelForm + { + /// + /// 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() + { + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.errorLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.chelGridView = new System.Windows.Forms.DataGridView(); + this.dropFindButton = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.findBox = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.canceledButton = new System.Windows.Forms.Button(); + this.statusStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.chelGridView)).BeginInit(); + this.SuspendLayout(); + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.errorLabel}); + this.statusStrip1.Location = new System.Drawing.Point(0, 529); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(352, 22); + this.statusStrip1.TabIndex = 2; + this.statusStrip1.Text = "statusStrip1"; + // + // errorLabel + // + this.errorLabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold); + this.errorLabel.ForeColor = System.Drawing.Color.Red; + this.errorLabel.Name = "errorLabel"; + this.errorLabel.Size = new System.Drawing.Size(57, 17); + this.errorLabel.Text = "Ошибка."; + this.errorLabel.Visible = false; + // + // chelGridView + // + this.chelGridView.AllowUserToAddRows = false; + this.chelGridView.AllowUserToDeleteRows = false; + this.chelGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.chelGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.chelGridView.Location = new System.Drawing.Point(12, 41); + this.chelGridView.MultiSelect = false; + this.chelGridView.Name = "chelGridView"; + this.chelGridView.ReadOnly = true; + this.chelGridView.RowHeadersVisible = false; + this.chelGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.chelGridView.Size = new System.Drawing.Size(328, 456); + this.chelGridView.TabIndex = 4; + // + // dropFindButton + // + this.dropFindButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.dropFindButton.Location = new System.Drawing.Point(265, 503); + this.dropFindButton.Name = "dropFindButton"; + this.dropFindButton.Size = new System.Drawing.Size(75, 23); + this.dropFindButton.TabIndex = 3; + this.dropFindButton.Text = "Сбросить"; + this.dropFindButton.UseVisualStyleBackColor = true; + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 508); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(39, 13); + this.label1.TabIndex = 37; + this.label1.Text = "Поиск"; + // + // findBox + // + this.findBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.findBox.Location = new System.Drawing.Point(57, 505); + this.findBox.Name = "findBox"; + this.findBox.Size = new System.Drawing.Size(202, 20); + this.findBox.TabIndex = 2; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(12, 12); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 0; + this.button1.Text = "Выбрать"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.workButton_Click); + // + // canceledButton + // + this.canceledButton.Location = new System.Drawing.Point(93, 12); + this.canceledButton.Name = "canceledButton"; + this.canceledButton.Size = new System.Drawing.Size(75, 23); + this.canceledButton.TabIndex = 1; + this.canceledButton.Text = "Отмена"; + this.canceledButton.UseVisualStyleBackColor = true; + this.canceledButton.Click += new System.EventHandler(this.canceledButton_Click); + // + // SelectChelForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(352, 551); + this.ControlBox = false; + this.Controls.Add(this.canceledButton); + this.Controls.Add(this.button1); + this.Controls.Add(this.chelGridView); + this.Controls.Add(this.dropFindButton); + this.Controls.Add(this.label1); + this.Controls.Add(this.findBox); + this.Controls.Add(this.statusStrip1); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "SelectChelForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Человек"; + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.chelGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.ToolStripStatusLabel errorLabel; + private System.Windows.Forms.DataGridView chelGridView; + private System.Windows.Forms.Button dropFindButton; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox findBox; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button canceledButton; + } +} \ No newline at end of file diff --git a/SupportForms/SelectChelForm.cs b/SupportForms/SelectChelForm.cs new file mode 100644 index 0000000..39bd180 --- /dev/null +++ b/SupportForms/SelectChelForm.cs @@ -0,0 +1,108 @@ +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; +using Diplom_O.DataBase; + +namespace Diplom_O.SupportForms +{ + public partial class SelectChelForm : Form + { + private Task errDrop; + private void ShowError(string msg = null) + { + errorLabel.Text = string.IsNullOrEmpty(msg) ? "Неизвестная ошибка." : msg; + errorLabel.Visible = true; + errDrop = new Task(() => + { + var fd = errDrop.Id; + Task.Delay(5000).Wait(); + if (errDrop.Id == fd) + if (InvokeRequired) Invoke((Action)(() => { errorLabel.Visible = false; })); + else errorLabel.Visible = false; + }); + errDrop.Start(); + } + + private void resetChelTable() + { + try + { + { + chelGridView.Rows.Clear(); + chelGridView.Columns.Clear(); + var c = chelGridView.Columns; + c.Add("Id", "№"); + c.Add("FName", "Фамилия"); + c.Add("SName", "Имя"); + c.Add("TName", "Отчество"); + c.Add("Birthday", "Дата рождения"); + c.Add("Male", "Пол"); + c[0].Width = 40; + c[1].Width = 120; + c[1].Width = 120; + c[1].Width = 120; + c[4].Width = 80; + c[5].Width = 80; + } + { + var arr = FuncDB.ListChel(findBox.Text); + var r = chelGridView.Rows; + foreach (var chel in arr) + r.Add(new object[] { + chel.Id, + chel.FName, + chel.SName, + chel.TName, + chel.Birthday.ToString("yyyy.MM.dd"), + chel.Male ? "Муж" : "Жен" + }); + } + if (chelGridView.Rows.Count > 0) + chelGridView.Rows[0].Selected = true; + } + catch (Exception e) { ShowError(e.Message); } + } + private Chel selectedChel() + { + try + { + if (chelGridView.SelectedRows.Count != 1) throw new Exception("Человек не выбран."); + var chel = FuncDB.GetChel((int)chelGridView.SelectedRows[0].Cells[0].Value); + return chel; + } + catch (Exception e) { ShowError(e.Message); return null; } + } + + public bool isCanceled = false; + private Chel chel = null; + public SelectChelForm(Chel chel = null) + { + InitializeComponent(); + resetChelTable(); + } + + private void workButton_Click(object sender, EventArgs e) + { + try + { + chel = selectedChel(); + this.Close(); + } + catch (Exception ex) { + chel = null; + ShowError(ex.Message); + } + } + private void canceledButton_Click(object sender, EventArgs e) + { + isCanceled = true; + this.Close(); + } + } +} diff --git a/SupportForms/SelectChelForm.resx b/SupportForms/SelectChelForm.resx new file mode 100644 index 0000000..42dfef1 --- /dev/null +++ b/SupportForms/SelectChelForm.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + + True + + \ No newline at end of file diff --git a/SupportForms/WorkChelForm.Designer.cs b/SupportForms/WorkChelForm.Designer.cs index e80b52f..d186be6 100644 --- a/SupportForms/WorkChelForm.Designer.cs +++ b/SupportForms/WorkChelForm.Designer.cs @@ -29,260 +29,260 @@ namespace Diplom_O.SupportForms /// private void InitializeComponent() { - this.fNameBox = new System.Windows.Forms.TextBox(); - this.sNameBox = new System.Windows.Forms.TextBox(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.errorLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.workButton = new System.Windows.Forms.Button(); - this.canceledButton = new System.Windows.Forms.Button(); - this.tNameBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.addressBox = new System.Windows.Forms.RichTextBox(); - this.pasportBox = new System.Windows.Forms.RichTextBox(); - this.maleBox = new System.Windows.Forms.ComboBox(); - this.birthdayBox = new System.Windows.Forms.DateTimePicker(); - this.snilsBox = new System.Windows.Forms.MaskedTextBox(); - this.innBox = new System.Windows.Forms.MaskedTextBox(); - this.statusStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // fNameBox - // - this.fNameBox.Location = new System.Drawing.Point(104, 12); - this.fNameBox.Name = "fNameBox"; - this.fNameBox.Size = new System.Drawing.Size(216, 20); - this.fNameBox.TabIndex = 0; - // - // sNameBox - // - this.sNameBox.Location = new System.Drawing.Point(104, 38); - this.sNameBox.Name = "sNameBox"; - this.sNameBox.Size = new System.Drawing.Size(216, 20); - this.sNameBox.TabIndex = 1; - // - // statusStrip1 - // - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fNameBox = new System.Windows.Forms.TextBox(); + this.sNameBox = new System.Windows.Forms.TextBox(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.errorLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.workButton = new System.Windows.Forms.Button(); + this.canceledButton = new System.Windows.Forms.Button(); + this.tNameBox = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.addressBox = new System.Windows.Forms.RichTextBox(); + this.pasportBox = new System.Windows.Forms.RichTextBox(); + this.maleBox = new System.Windows.Forms.ComboBox(); + this.birthdayBox = new System.Windows.Forms.DateTimePicker(); + this.snilsBox = new System.Windows.Forms.MaskedTextBox(); + this.innBox = new System.Windows.Forms.MaskedTextBox(); + this.statusStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // fNameBox + // + this.fNameBox.Location = new System.Drawing.Point(104, 12); + this.fNameBox.Name = "fNameBox"; + this.fNameBox.Size = new System.Drawing.Size(216, 20); + this.fNameBox.TabIndex = 0; + // + // sNameBox + // + this.sNameBox.Location = new System.Drawing.Point(104, 38); + this.sNameBox.Name = "sNameBox"; + this.sNameBox.Size = new System.Drawing.Size(216, 20); + this.sNameBox.TabIndex = 1; + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.errorLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 428); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(332, 22); - this.statusStrip1.TabIndex = 2; - this.statusStrip1.Text = "statusStrip1"; - // - // errorLabel - // - this.errorLabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold); - this.errorLabel.ForeColor = System.Drawing.Color.Red; - this.errorLabel.Name = "errorLabel"; - this.errorLabel.Size = new System.Drawing.Size(57, 17); - this.errorLabel.Text = "Ошибка."; - this.errorLabel.Visible = false; - // - // workButton - // - this.workButton.Location = new System.Drawing.Point(245, 402); - this.workButton.Name = "workButton"; - this.workButton.Size = new System.Drawing.Size(75, 23); - this.workButton.TabIndex = 5; - this.workButton.Text = "Добавить"; - this.workButton.UseVisualStyleBackColor = true; - this.workButton.Click += new System.EventHandler(this.workButton_Click); - // - // canceledButton - // - this.canceledButton.Location = new System.Drawing.Point(164, 402); - this.canceledButton.Name = "canceledButton"; - this.canceledButton.Size = new System.Drawing.Size(75, 23); - this.canceledButton.TabIndex = 6; - this.canceledButton.Text = "Отмена"; - this.canceledButton.UseVisualStyleBackColor = true; - this.canceledButton.Click += new System.EventHandler(this.canceledButton_Click); - // - // tNameBox - // - this.tNameBox.Location = new System.Drawing.Point(104, 64); - this.tNameBox.Name = "tNameBox"; - this.tNameBox.Size = new System.Drawing.Size(216, 20); - this.tNameBox.TabIndex = 7; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(42, 15); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(56, 13); - this.label1.TabIndex = 29; - this.label1.Text = "Фамилия"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(69, 41); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(29, 13); - this.label2.TabIndex = 30; - this.label2.Text = "Имя"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(44, 67); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(54, 13); - this.label3.TabIndex = 31; - this.label3.Text = "Отчетсво"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(71, 93); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(27, 13); - this.label4.TabIndex = 32; - this.label4.Text = "Пол"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(12, 119); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(86, 13); - this.label5.TabIndex = 33; - this.label5.Text = "Дата рождения"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(12, 145); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(38, 13); - this.label6.TabIndex = 34; - this.label6.Text = "Адрес"; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(12, 249); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(31, 13); - this.label7.TabIndex = 35; - this.label7.Text = "ИНН"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(12, 275); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(45, 13); - this.label8.TabIndex = 36; - this.label8.Text = "СНИЛС"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(12, 301); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(50, 13); - this.label9.TabIndex = 37; - this.label9.Text = "Паспорт"; - // - // addressBox - // - this.addressBox.Location = new System.Drawing.Point(104, 142); - this.addressBox.Name = "addressBox"; - this.addressBox.Size = new System.Drawing.Size(216, 98); - this.addressBox.TabIndex = 38; - this.addressBox.Text = ""; - // - // pasportBox - // - this.pasportBox.Location = new System.Drawing.Point(104, 298); - this.pasportBox.Name = "pasportBox"; - this.pasportBox.Size = new System.Drawing.Size(216, 98); - this.pasportBox.TabIndex = 39; - this.pasportBox.Text = ""; - // - // maleBox - // - this.maleBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.maleBox.FormattingEnabled = true; - this.maleBox.Items.AddRange(new object[] { + this.statusStrip1.Location = new System.Drawing.Point(0, 428); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(332, 22); + this.statusStrip1.TabIndex = 2; + this.statusStrip1.Text = "statusStrip1"; + // + // errorLabel + // + this.errorLabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold); + this.errorLabel.ForeColor = System.Drawing.Color.Red; + this.errorLabel.Name = "errorLabel"; + this.errorLabel.Size = new System.Drawing.Size(57, 17); + this.errorLabel.Text = "Ошибка."; + this.errorLabel.Visible = false; + // + // workButton + // + this.workButton.Location = new System.Drawing.Point(245, 402); + this.workButton.Name = "workButton"; + this.workButton.Size = new System.Drawing.Size(75, 23); + this.workButton.TabIndex = 9; + this.workButton.Text = "Добавить"; + this.workButton.UseVisualStyleBackColor = true; + this.workButton.Click += new System.EventHandler(this.workButton_Click); + // + // canceledButton + // + this.canceledButton.Location = new System.Drawing.Point(164, 402); + this.canceledButton.Name = "canceledButton"; + this.canceledButton.Size = new System.Drawing.Size(75, 23); + this.canceledButton.TabIndex = 10; + this.canceledButton.Text = "Отмена"; + this.canceledButton.UseVisualStyleBackColor = true; + this.canceledButton.Click += new System.EventHandler(this.canceledButton_Click); + // + // tNameBox + // + this.tNameBox.Location = new System.Drawing.Point(104, 64); + this.tNameBox.Name = "tNameBox"; + this.tNameBox.Size = new System.Drawing.Size(216, 20); + this.tNameBox.TabIndex = 2; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(42, 15); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(56, 13); + this.label1.TabIndex = 29; + this.label1.Text = "Фамилия"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(69, 41); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(29, 13); + this.label2.TabIndex = 30; + this.label2.Text = "Имя"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(44, 67); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(54, 13); + this.label3.TabIndex = 31; + this.label3.Text = "Отчетсво"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(71, 93); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(27, 13); + this.label4.TabIndex = 32; + this.label4.Text = "Пол"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(12, 119); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(86, 13); + this.label5.TabIndex = 33; + this.label5.Text = "Дата рождения"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(12, 145); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(38, 13); + this.label6.TabIndex = 34; + this.label6.Text = "Адрес"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(12, 249); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(31, 13); + this.label7.TabIndex = 35; + this.label7.Text = "ИНН"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(12, 275); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(45, 13); + this.label8.TabIndex = 36; + this.label8.Text = "СНИЛС"; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(12, 301); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(50, 13); + this.label9.TabIndex = 37; + this.label9.Text = "Паспорт"; + // + // addressBox + // + this.addressBox.Location = new System.Drawing.Point(104, 142); + this.addressBox.Name = "addressBox"; + this.addressBox.Size = new System.Drawing.Size(216, 98); + this.addressBox.TabIndex = 5; + this.addressBox.Text = ""; + // + // pasportBox + // + this.pasportBox.Location = new System.Drawing.Point(104, 298); + this.pasportBox.Name = "pasportBox"; + this.pasportBox.Size = new System.Drawing.Size(216, 98); + this.pasportBox.TabIndex = 8; + this.pasportBox.Text = ""; + // + // maleBox + // + this.maleBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.maleBox.FormattingEnabled = true; + this.maleBox.Items.AddRange(new object[] { "Мужчина", "Женщина"}); - this.maleBox.Location = new System.Drawing.Point(104, 90); - this.maleBox.Name = "maleBox"; - this.maleBox.Size = new System.Drawing.Size(216, 21); - this.maleBox.TabIndex = 40; - // - // birthdayBox - // - this.birthdayBox.CustomFormat = "yyyy.MM.dd"; - this.birthdayBox.Location = new System.Drawing.Point(104, 116); - this.birthdayBox.Name = "birthdayBox"; - this.birthdayBox.Size = new System.Drawing.Size(216, 20); - this.birthdayBox.TabIndex = 41; - // - // snilsBox - // - this.snilsBox.Location = new System.Drawing.Point(104, 272); - this.snilsBox.Mask = "000-000-000 00"; - this.snilsBox.Name = "snilsBox"; - this.snilsBox.Size = new System.Drawing.Size(216, 20); - this.snilsBox.TabIndex = 42; - // - // innBox - // - this.innBox.Location = new System.Drawing.Point(104, 246); - this.innBox.Mask = "000000000000"; - this.innBox.Name = "innBox"; - this.innBox.Size = new System.Drawing.Size(216, 20); - this.innBox.TabIndex = 43; - // - // WorkChelForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(332, 450); - this.ControlBox = false; - this.Controls.Add(this.innBox); - this.Controls.Add(this.snilsBox); - this.Controls.Add(this.birthdayBox); - this.Controls.Add(this.maleBox); - this.Controls.Add(this.pasportBox); - this.Controls.Add(this.addressBox); - this.Controls.Add(this.label9); - this.Controls.Add(this.label8); - this.Controls.Add(this.label7); - this.Controls.Add(this.label6); - this.Controls.Add(this.label5); - this.Controls.Add(this.label4); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.tNameBox); - this.Controls.Add(this.canceledButton); - this.Controls.Add(this.workButton); - this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.sNameBox); - this.Controls.Add(this.fNameBox); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "WorkChelForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Штатное место"; - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.maleBox.Location = new System.Drawing.Point(104, 90); + this.maleBox.Name = "maleBox"; + this.maleBox.Size = new System.Drawing.Size(216, 21); + this.maleBox.TabIndex = 3; + // + // birthdayBox + // + this.birthdayBox.CustomFormat = "yyyy.MM.dd"; + this.birthdayBox.Location = new System.Drawing.Point(104, 116); + this.birthdayBox.Name = "birthdayBox"; + this.birthdayBox.Size = new System.Drawing.Size(216, 20); + this.birthdayBox.TabIndex = 4; + // + // snilsBox + // + this.snilsBox.Location = new System.Drawing.Point(104, 272); + this.snilsBox.Mask = "000-000-000 00"; + this.snilsBox.Name = "snilsBox"; + this.snilsBox.Size = new System.Drawing.Size(216, 20); + this.snilsBox.TabIndex = 7; + // + // innBox + // + this.innBox.Location = new System.Drawing.Point(104, 246); + this.innBox.Mask = "000000000000"; + this.innBox.Name = "innBox"; + this.innBox.Size = new System.Drawing.Size(216, 20); + this.innBox.TabIndex = 6; + // + // WorkChelForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(332, 450); + this.ControlBox = false; + this.Controls.Add(this.innBox); + this.Controls.Add(this.snilsBox); + this.Controls.Add(this.birthdayBox); + this.Controls.Add(this.maleBox); + this.Controls.Add(this.pasportBox); + this.Controls.Add(this.addressBox); + this.Controls.Add(this.label9); + this.Controls.Add(this.label8); + this.Controls.Add(this.label7); + this.Controls.Add(this.label6); + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.tNameBox); + this.Controls.Add(this.canceledButton); + this.Controls.Add(this.workButton); + this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.sNameBox); + this.Controls.Add(this.fNameBox); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "WorkChelForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Штатное место"; + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/SupportForms/WorkShtatForm.Designer.cs b/SupportForms/WorkShtatForm.Designer.cs index e542948..7a2f73c 100644 --- a/SupportForms/WorkShtatForm.Designer.cs +++ b/SupportForms/WorkShtatForm.Designer.cs @@ -29,119 +29,119 @@ namespace Diplom_O.SupportForms /// private void InitializeComponent() { - this.doljBox = new System.Windows.Forms.TextBox(); - this.kolvoBox = new System.Windows.Forms.TextBox(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.errorLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.workButton = new System.Windows.Forms.Button(); - this.canceledButton = new System.Windows.Forms.Button(); - this.busySizeLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.statusStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // doljBox - // - this.doljBox.Location = new System.Drawing.Point(87, 12); - this.doljBox.Name = "doljBox"; - this.doljBox.Size = new System.Drawing.Size(162, 20); - this.doljBox.TabIndex = 0; - // - // kolvoBox - // - this.kolvoBox.Location = new System.Drawing.Point(87, 38); - this.kolvoBox.Name = "kolvoBox"; - this.kolvoBox.Size = new System.Drawing.Size(162, 20); - this.kolvoBox.TabIndex = 1; - // - // statusStrip1 - // - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.doljBox = new System.Windows.Forms.TextBox(); + this.kolvoBox = new System.Windows.Forms.TextBox(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.errorLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.busySizeLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.workButton = new System.Windows.Forms.Button(); + this.canceledButton = new System.Windows.Forms.Button(); + this.statusStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // doljBox + // + this.doljBox.Location = new System.Drawing.Point(87, 12); + this.doljBox.Name = "doljBox"; + this.doljBox.Size = new System.Drawing.Size(162, 20); + this.doljBox.TabIndex = 0; + // + // kolvoBox + // + this.kolvoBox.Location = new System.Drawing.Point(87, 38); + this.kolvoBox.Name = "kolvoBox"; + this.kolvoBox.Size = new System.Drawing.Size(162, 20); + this.kolvoBox.TabIndex = 1; + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.errorLabel, this.busySizeLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 90); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(262, 22); - this.statusStrip1.TabIndex = 2; - this.statusStrip1.Text = "statusStrip1"; - // - // errorLabel - // - this.errorLabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold); - this.errorLabel.ForeColor = System.Drawing.Color.Red; - this.errorLabel.Name = "errorLabel"; - this.errorLabel.Size = new System.Drawing.Size(57, 17); - this.errorLabel.Text = "Ошибка."; - this.errorLabel.Visible = false; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(16, 15); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(65, 13); - this.label1.TabIndex = 3; - this.label1.Text = "Должность"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 41); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(69, 13); - this.label2.TabIndex = 4; - this.label2.Text = "Кол-во мест"; - // - // workButton - // - this.workButton.Location = new System.Drawing.Point(175, 64); - this.workButton.Name = "workButton"; - this.workButton.Size = new System.Drawing.Size(75, 23); - this.workButton.TabIndex = 5; - this.workButton.Text = "Добавить"; - this.workButton.UseVisualStyleBackColor = true; - this.workButton.Click += new System.EventHandler(this.workButton_Click); - // - // canceledButton - // - this.canceledButton.Location = new System.Drawing.Point(94, 64); - this.canceledButton.Name = "canceledButton"; - this.canceledButton.Size = new System.Drawing.Size(75, 23); - this.canceledButton.TabIndex = 6; - this.canceledButton.Text = "Отмена"; - this.canceledButton.UseVisualStyleBackColor = true; - this.canceledButton.Click += new System.EventHandler(this.canceledButton_Click); - // - // busySizeLabel - // - this.busySizeLabel.Name = "busySizeLabel"; - this.busySizeLabel.Size = new System.Drawing.Size(51, 17); - this.busySizeLabel.Text = "Занято: "; - this.busySizeLabel.Visible = false; - // - // WorkShtatForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(262, 112); - this.ControlBox = false; - this.Controls.Add(this.canceledButton); - this.Controls.Add(this.workButton); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.kolvoBox); - this.Controls.Add(this.doljBox); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "WorkShtatForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Штатное место"; - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.statusStrip1.Location = new System.Drawing.Point(0, 90); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(262, 22); + this.statusStrip1.TabIndex = 2; + this.statusStrip1.Text = "statusStrip1"; + // + // errorLabel + // + this.errorLabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold); + this.errorLabel.ForeColor = System.Drawing.Color.Red; + this.errorLabel.Name = "errorLabel"; + this.errorLabel.Size = new System.Drawing.Size(57, 17); + this.errorLabel.Text = "Ошибка."; + this.errorLabel.Visible = false; + // + // busySizeLabel + // + this.busySizeLabel.Name = "busySizeLabel"; + this.busySizeLabel.Size = new System.Drawing.Size(51, 17); + this.busySizeLabel.Text = "Занято: "; + this.busySizeLabel.Visible = false; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(16, 15); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(65, 13); + this.label1.TabIndex = 3; + this.label1.Text = "Должность"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(12, 41); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(69, 13); + this.label2.TabIndex = 4; + this.label2.Text = "Кол-во мест"; + // + // workButton + // + this.workButton.Location = new System.Drawing.Point(175, 64); + this.workButton.Name = "workButton"; + this.workButton.Size = new System.Drawing.Size(75, 23); + this.workButton.TabIndex = 2; + this.workButton.Text = "Добавить"; + this.workButton.UseVisualStyleBackColor = true; + this.workButton.Click += new System.EventHandler(this.workButton_Click); + // + // canceledButton + // + this.canceledButton.Location = new System.Drawing.Point(94, 64); + this.canceledButton.Name = "canceledButton"; + this.canceledButton.Size = new System.Drawing.Size(75, 23); + this.canceledButton.TabIndex = 3; + this.canceledButton.Text = "Отмена"; + this.canceledButton.UseVisualStyleBackColor = true; + this.canceledButton.Click += new System.EventHandler(this.canceledButton_Click); + // + // WorkShtatForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(262, 112); + this.ControlBox = false; + this.Controls.Add(this.canceledButton); + this.Controls.Add(this.workButton); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.kolvoBox); + this.Controls.Add(this.doljBox); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "WorkShtatForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Штатное место"; + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/bin/Debug/Diplom O.exe b/bin/Debug/Diplom O.exe index 3cd7c7c..518aec5 100644 Binary files a/bin/Debug/Diplom O.exe and b/bin/Debug/Diplom O.exe differ diff --git a/bin/Debug/Diplom O.pdb b/bin/Debug/Diplom O.pdb index 9ecf9c1..831a202 100644 Binary files a/bin/Debug/Diplom O.pdb and b/bin/Debug/Diplom O.pdb differ diff --git a/bin/Debug/Diplom_O.db b/bin/Debug/Diplom_O.db index 33641e5..54d99f3 100644 Binary files a/bin/Debug/Diplom_O.db and b/bin/Debug/Diplom_O.db differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index d5b15b7..95f4beb 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 29bedaf..b10f439 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/Diplom O.csproj.CoreCompileInputs.cache b/obj/Debug/Diplom O.csproj.CoreCompileInputs.cache index cb05887..1fdddb0 100644 --- a/obj/Debug/Diplom O.csproj.CoreCompileInputs.cache +++ b/obj/Debug/Diplom O.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -204ad71c07c2e68492bf31d8fc5ca1880f83504e +1148ccb2a31d1ac77568480045306c60e78ce74a diff --git a/obj/Debug/Diplom O.csproj.FileListAbsolute.txt b/obj/Debug/Diplom O.csproj.FileListAbsolute.txt index d036d3b..0e2770b 100644 --- a/obj/Debug/Diplom O.csproj.FileListAbsolute.txt +++ b/obj/Debug/Diplom O.csproj.FileListAbsolute.txt @@ -63,3 +63,69 @@ D:\GIT\Diplom O\obj\Debug\Diplom O.csproj.CopyComplete D:\GIT\Diplom O\obj\Debug\Diplom_O.SupportForms.WorkShtatForm.resources D:\GIT\Diplom O\obj\Debug\Diplom_O.ChelForm.resources D:\GIT\Diplom O\obj\Debug\Diplom_O.SupportForms.WorkChelForm.resources +F:\GIT\Diplom_O\bin\Debug\runtimes\win-x86\native\e_sqlite3.dll +F:\GIT\Diplom_O\bin\Debug\runtimes\win-x64\native\e_sqlite3.dll +F:\GIT\Diplom_O\bin\Debug\runtimes\win-arm\native\e_sqlite3.dll +F:\GIT\Diplom_O\bin\Debug\Diplom O.exe.config +F:\GIT\Diplom_O\bin\Debug\Diplom O.exe +F:\GIT\Diplom_O\bin\Debug\Diplom O.pdb +F:\GIT\Diplom_O\bin\Debug\Microsoft.Data.Sqlite.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.EntityFrameworkCore.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.EntityFrameworkCore.Relational.Design.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.EntityFrameworkCore.Relational.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.EntityFrameworkCore.Sqlite.Design.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.EntityFrameworkCore.Sqlite.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Caching.Abstractions.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Caching.Memory.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.DependencyInjection.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Logging.Abstractions.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Logging.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Options.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Primitives.dll +F:\GIT\Diplom_O\bin\Debug\Remotion.Linq.dll +F:\GIT\Diplom_O\bin\Debug\SQLitePCLRaw.batteries_v2.dll +F:\GIT\Diplom_O\bin\Debug\SQLitePCLRaw.core.dll +F:\GIT\Diplom_O\bin\Debug\SQLitePCLRaw.nativelibrary.dll +F:\GIT\Diplom_O\bin\Debug\SQLitePCLRaw.provider.dynamic_cdecl.dll +F:\GIT\Diplom_O\bin\Debug\System.Buffers.dll +F:\GIT\Diplom_O\bin\Debug\System.Collections.Immutable.dll +F:\GIT\Diplom_O\bin\Debug\System.Diagnostics.DiagnosticSource.dll +F:\GIT\Diplom_O\bin\Debug\System.Interactive.Async.dll +F:\GIT\Diplom_O\bin\Debug\System.Memory.dll +F:\GIT\Diplom_O\bin\Debug\System.Numerics.Vectors.dll +F:\GIT\Diplom_O\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +F:\GIT\Diplom_O\bin\Debug\Microsoft.Data.Sqlite.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.EntityFrameworkCore.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.EntityFrameworkCore.Relational.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.EntityFrameworkCore.Relational.Design.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.EntityFrameworkCore.Sqlite.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.EntityFrameworkCore.Sqlite.Design.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Caching.Abstractions.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Caching.Memory.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.DependencyInjection.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Logging.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Logging.Abstractions.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Options.xml +F:\GIT\Diplom_O\bin\Debug\Microsoft.Extensions.Primitives.xml +F:\GIT\Diplom_O\bin\Debug\Remotion.Linq.xml +F:\GIT\Diplom_O\bin\Debug\System.Buffers.xml +F:\GIT\Diplom_O\bin\Debug\System.Collections.Immutable.xml +F:\GIT\Diplom_O\bin\Debug\System.Diagnostics.DiagnosticSource.xml +F:\GIT\Diplom_O\bin\Debug\System.Interactive.Async.xml +F:\GIT\Diplom_O\bin\Debug\System.Memory.xml +F:\GIT\Diplom_O\bin\Debug\System.Numerics.Vectors.xml +F:\GIT\Diplom_O\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml +F:\GIT\Diplom_O\obj\Debug\Diplom O.csproj.AssemblyReference.cache +F:\GIT\Diplom_O\obj\Debug\Diplom_O.ChelForm.resources +F:\GIT\Diplom_O\obj\Debug\Diplom_O.ShtatForm.resources +F:\GIT\Diplom_O\obj\Debug\Diplom_O.Properties.Resources.resources +F:\GIT\Diplom_O\obj\Debug\Diplom_O.SupportForms.WorkChelForm.resources +F:\GIT\Diplom_O\obj\Debug\Diplom_O.SupportForms.WorkShtatForm.resources +F:\GIT\Diplom_O\obj\Debug\Diplom O.csproj.GenerateResource.cache +F:\GIT\Diplom_O\obj\Debug\Diplom O.csproj.CoreCompileInputs.cache +F:\GIT\Diplom_O\obj\Debug\Diplom O.csproj.CopyComplete +F:\GIT\Diplom_O\obj\Debug\Diplom O.exe +F:\GIT\Diplom_O\obj\Debug\Diplom O.pdb +F:\GIT\Diplom_O\obj\Debug\Diplom_O.SupportForms.SelectChelForm.resources diff --git a/obj/Debug/Diplom O.csproj.GenerateResource.cache b/obj/Debug/Diplom O.csproj.GenerateResource.cache index 05d49ff..079f2bd 100644 Binary files a/obj/Debug/Diplom O.csproj.GenerateResource.cache and b/obj/Debug/Diplom O.csproj.GenerateResource.cache differ diff --git a/obj/Debug/Diplom O.exe b/obj/Debug/Diplom O.exe index 3cd7c7c..518aec5 100644 Binary files a/obj/Debug/Diplom O.exe and b/obj/Debug/Diplom O.exe differ diff --git a/obj/Debug/Diplom O.pdb b/obj/Debug/Diplom O.pdb index 9ecf9c1..831a202 100644 Binary files a/obj/Debug/Diplom O.pdb and b/obj/Debug/Diplom O.pdb differ diff --git a/obj/Debug/Diplom_O.SupportForms.SelectChelForm.resources b/obj/Debug/Diplom_O.SupportForms.SelectChelForm.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/obj/Debug/Diplom_O.SupportForms.SelectChelForm.resources differ