diff --git a/LawFirm/LawFirm/FormLaw.Designer.cs b/LawFirm/LawFirm/FormLaw.Designer.cs
deleted file mode 100644
index 738032f..0000000
--- a/LawFirm/LawFirm/FormLaw.Designer.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-namespace LawFirm.Forms
-{
- partial class FormLaw
- {
- ///
- /// 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()
- {
- label1 = new Label();
- label2 = new Label();
- buttonAdd = new Button();
- buttonUpd = new Button();
- buttonDel = new Button();
- buttonRef = new Button();
- dataGridView = new DataGridView();
- Number = new DataGridViewTextBoxColumn();
- Component = new DataGridViewTextBoxColumn();
- Count = new DataGridViewTextBoxColumn();
- textBoxName = new TextBox();
- textBoxPrice = new TextBox();
- groupBox1 = new GroupBox();
- buttonSave = new Button();
- buttonCancel = new Button();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- groupBox1.SuspendLayout();
- SuspendLayout();
- //
- // label1
- //
- label1.AutoSize = true;
- label1.Location = new Point(16, 15);
- label1.Name = "label1";
- label1.Size = new Size(62, 15);
- label1.TabIndex = 0;
- label1.Text = "Название:";
- //
- // label2
- //
- label2.AutoSize = true;
- label2.Location = new Point(16, 41);
- label2.Name = "label2";
- label2.Size = new Size(70, 15);
- label2.TabIndex = 1;
- label2.Text = "Стоимость:";
- //
- // buttonAdd
- //
- buttonAdd.Location = new Point(574, 44);
- buttonAdd.Name = "buttonAdd";
- buttonAdd.Size = new Size(97, 28);
- buttonAdd.TabIndex = 0;
- buttonAdd.Text = "Добавить";
- buttonAdd.UseVisualStyleBackColor = true;
- buttonAdd.Click += buttonAdd_Click;
- //
- // buttonUpd
- //
- buttonUpd.Location = new Point(574, 90);
- buttonUpd.Name = "buttonUpd";
- buttonUpd.Size = new Size(97, 28);
- buttonUpd.TabIndex = 1;
- buttonUpd.Text = "Изменить";
- buttonUpd.UseVisualStyleBackColor = true;
- buttonUpd.Click += buttonUpd_Click;
- //
- // buttonDel
- //
- buttonDel.Location = new Point(574, 134);
- buttonDel.Name = "buttonDel";
- buttonDel.Size = new Size(97, 28);
- buttonDel.TabIndex = 2;
- buttonDel.Text = "Удалить";
- buttonDel.UseVisualStyleBackColor = true;
- buttonDel.Click += buttonDel_Click;
- //
- // buttonRef
- //
- buttonRef.Location = new Point(574, 173);
- buttonRef.Name = "buttonRef";
- buttonRef.Size = new Size(97, 28);
- buttonRef.TabIndex = 3;
- buttonRef.Text = "Обновить";
- buttonRef.UseVisualStyleBackColor = true;
- buttonRef.Click += buttonRef_Click;
- //
- // dataGridView
- //
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Columns.AddRange(new DataGridViewColumn[] { Number, Component, Count });
- dataGridView.Location = new Point(0, 20);
- dataGridView.Name = "dataGridView";
- dataGridView.ReadOnly = true;
- dataGridView.RowHeadersWidth = 51;
- dataGridView.RowTemplate.Height = 24;
- dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
- dataGridView.ShowEditingIcon = false;
- dataGridView.Size = new Size(549, 332);
- dataGridView.TabIndex = 4;
- //
- // Number
- //
- Number.HeaderText = "Номер";
- Number.MinimumWidth = 6;
- Number.Name = "Number";
- Number.ReadOnly = true;
- Number.Width = 60;
- //
- // Component
- //
- Component.HeaderText = "Компонент";
- Component.MinimumWidth = 6;
- Component.Name = "Component";
- Component.ReadOnly = true;
- Component.Width = 125;
- //
- // Count
- //
- Count.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- Count.HeaderText = "Количество";
- Count.MinimumWidth = 6;
- Count.Name = "Count";
- Count.ReadOnly = true;
- //
- // textBoxName
- //
- textBoxName.Location = new Point(94, 14);
- textBoxName.Name = "textBoxName";
- textBoxName.Size = new Size(246, 23);
- textBoxName.TabIndex = 3;
- //
- // textBoxPrice
- //
- textBoxPrice.Location = new Point(94, 39);
- textBoxPrice.Name = "textBoxPrice";
- textBoxPrice.ReadOnly = true;
- textBoxPrice.Size = new Size(85, 23);
- textBoxPrice.TabIndex = 4;
- textBoxPrice.TabStop = false;
- //
- // groupBox1
- //
- groupBox1.Controls.Add(buttonRef);
- groupBox1.Controls.Add(buttonDel);
- groupBox1.Controls.Add(dataGridView);
- groupBox1.Controls.Add(buttonUpd);
- groupBox1.Controls.Add(buttonAdd);
- groupBox1.Location = new Point(14, 71);
- groupBox1.Name = "groupBox1";
- groupBox1.Size = new Size(689, 367);
- groupBox1.TabIndex = 5;
- groupBox1.TabStop = false;
- groupBox1.Text = "Компоненты";
- //
- // buttonSave
- //
- buttonSave.Location = new Point(397, 454);
- buttonSave.Name = "buttonSave";
- buttonSave.Size = new Size(114, 28);
- buttonSave.TabIndex = 0;
- buttonSave.Text = "Сохранить";
- buttonSave.UseVisualStyleBackColor = true;
- buttonSave.Click += buttonSave_Click;
- //
- // buttonCancel
- //
- buttonCancel.Location = new Point(533, 454);
- buttonCancel.Name = "buttonCancel";
- buttonCancel.Size = new Size(114, 28);
- buttonCancel.TabIndex = 0;
- buttonCancel.Text = "Отмена";
- buttonCancel.UseVisualStyleBackColor = true;
- buttonCancel.Click += buttonCancel_Click;
- //
- // FormLaw
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(711, 497);
- Controls.Add(groupBox1);
- Controls.Add(textBoxPrice);
- Controls.Add(textBoxName);
- Controls.Add(label2);
- Controls.Add(buttonCancel);
- Controls.Add(buttonSave);
- Controls.Add(label1);
- Name = "FormLaw";
- Text = "Юридическая консультация";
- Load += FormLaw_Load;
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- groupBox1.ResumeLayout(false);
- ResumeLayout(false);
- PerformLayout();
- }
-
- #endregion
-
- private Label label1;
- private Label label2;
- private Button buttonRef;
- private Button buttonDel;
- private Button buttonUpd;
- private Button buttonAdd;
- private DataGridView dataGridView;
- private TextBox textBoxName;
- private TextBox textBoxPrice;
- private GroupBox groupBox1;
- private DataGridViewTextBoxColumn Number;
- private DataGridViewTextBoxColumn Component;
- private DataGridViewTextBoxColumn Count;
- private Button buttonSave;
- private Button buttonCancel;
- }
-}
\ No newline at end of file
diff --git a/LawFirm/LawFirm/FormLawComponent.Designer.cs b/LawFirm/LawFirm/FormLawComponent.Designer.cs
deleted file mode 100644
index 5676e5c..0000000
--- a/LawFirm/LawFirm/FormLawComponent.Designer.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-namespace LawFirm.Forms
-{
- partial class FormLawComponent
- {
- ///
- /// 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()
- {
- buttonSave = new Button();
- buttonCancel = new Button();
- label1 = new Label();
- label2 = new Label();
- comboBoxComponent = new ComboBox();
- textBoxCount = new TextBox();
- SuspendLayout();
- //
- // buttonSave
- //
- buttonSave.Location = new Point(174, 75);
- buttonSave.Name = "buttonSave";
- buttonSave.Size = new Size(86, 27);
- buttonSave.TabIndex = 0;
- buttonSave.Text = "Сохранить";
- buttonSave.UseVisualStyleBackColor = true;
- buttonSave.Click += buttonSave_Click;
- //
- // buttonCancel
- //
- buttonCancel.Location = new Point(270, 75);
- buttonCancel.Name = "buttonCancel";
- buttonCancel.Size = new Size(86, 27);
- buttonCancel.TabIndex = 1;
- buttonCancel.Text = "Отмена";
- buttonCancel.UseVisualStyleBackColor = true;
- buttonCancel.Click += buttonCancel_Click;
- //
- // label1
- //
- label1.AutoSize = true;
- label1.Location = new Point(12, 14);
- label1.Name = "label1";
- label1.Size = new Size(72, 15);
- label1.TabIndex = 2;
- label1.Text = "Компонент:";
- //
- // label2
- //
- label2.AutoSize = true;
- label2.Location = new Point(12, 44);
- label2.Name = "label2";
- label2.Size = new Size(75, 15);
- label2.TabIndex = 3;
- label2.Text = "Количество:";
- //
- // comboBoxComponent
- //
- comboBoxComponent.FormattingEnabled = true;
- comboBoxComponent.Location = new Point(106, 9);
- comboBoxComponent.Name = "comboBoxComponent";
- comboBoxComponent.Size = new Size(250, 23);
- comboBoxComponent.TabIndex = 4;
- //
- // textBoxCount
- //
- textBoxCount.Location = new Point(106, 44);
- textBoxCount.Name = "textBoxCount";
- textBoxCount.Size = new Size(250, 23);
- textBoxCount.TabIndex = 5;
- //
- // FormLawComponent
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(373, 112);
- Controls.Add(textBoxCount);
- Controls.Add(comboBoxComponent);
- Controls.Add(label2);
- Controls.Add(label1);
- Controls.Add(buttonCancel);
- Controls.Add(buttonSave);
- Name = "FormLawComponent";
- Text = "Компонент юридической консультации";
- ResumeLayout(false);
- PerformLayout();
- }
-
- #endregion
-
- private Button buttonSave;
- private Button buttonCancel;
- private Label label1;
- private Label label2;
- private ComboBox comboBoxComponent;
- private TextBox textBoxCount;
- }
-}
\ No newline at end of file
diff --git a/LawFirm/LawFirm/FormLaws.Designer.cs b/LawFirm/LawFirm/FormLaws.Designer.cs
deleted file mode 100644
index edf4628..0000000
--- a/LawFirm/LawFirm/FormLaws.Designer.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-namespace LawFirm.Forms
-{
- partial class FormLaws
- {
- ///
- /// 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()
- {
- buttonRef = new Button();
- buttonDel = new Button();
- buttonUpd = new Button();
- buttonAdd = new Button();
- dataGridView = new DataGridView();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- SuspendLayout();
- //
- // buttonRef
- //
- buttonRef.Location = new Point(648, 135);
- buttonRef.Name = "buttonRef";
- buttonRef.Size = new Size(112, 26);
- buttonRef.TabIndex = 9;
- buttonRef.Text = "Обновить";
- buttonRef.UseVisualStyleBackColor = true;
- buttonRef.Click += buttonRef_Click;
- //
- // buttonDel
- //
- buttonDel.Location = new Point(648, 97);
- buttonDel.Name = "buttonDel";
- buttonDel.Size = new Size(112, 26);
- buttonDel.TabIndex = 8;
- buttonDel.Text = "Удалить";
- buttonDel.UseVisualStyleBackColor = true;
- buttonDel.Click += buttonDel_Click;
- //
- // buttonUpd
- //
- buttonUpd.Location = new Point(648, 58);
- buttonUpd.Name = "buttonUpd";
- buttonUpd.Size = new Size(112, 26);
- buttonUpd.TabIndex = 7;
- buttonUpd.Text = "Изменить";
- buttonUpd.UseVisualStyleBackColor = true;
- buttonUpd.Click += buttonUpd_Click;
- //
- // buttonAdd
- //
- buttonAdd.Location = new Point(648, 20);
- buttonAdd.Name = "buttonAdd";
- buttonAdd.Size = new Size(112, 26);
- buttonAdd.TabIndex = 6;
- buttonAdd.Text = "Добавить";
- buttonAdd.UseVisualStyleBackColor = true;
- buttonAdd.Click += buttonAdd_Click;
- //
- // dataGridView
- //
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Location = new Point(-1, 0);
- dataGridView.Name = "dataGridView";
- dataGridView.ReadOnly = true;
- dataGridView.RowHeadersWidth = 51;
- dataGridView.RowTemplate.Height = 24;
- dataGridView.Size = new Size(620, 426);
- dataGridView.TabIndex = 5;
- //
- // FormLaws
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(783, 428);
- Controls.Add(buttonRef);
- Controls.Add(buttonDel);
- Controls.Add(buttonUpd);
- Controls.Add(buttonAdd);
- Controls.Add(dataGridView);
- Margin = new Padding(3, 2, 3, 2);
- Name = "FormLaws";
- Text = "Список юридических консультаций";
- Load += FormLaws_Load;
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- ResumeLayout(false);
- }
-
- #endregion
-
- private Button buttonRef;
- private Button buttonDel;
- private Button buttonUpd;
- private Button buttonAdd;
- private DataGridView dataGridView;
- }
-}
\ No newline at end of file
diff --git a/LawFirm/LawFirm/FormMain.Designer.cs b/LawFirm/LawFirm/FormMain.Designer.cs
index ea79c90..489fdc2 100644
--- a/LawFirm/LawFirm/FormMain.Designer.cs
+++ b/LawFirm/LawFirm/FormMain.Designer.cs
@@ -1,4 +1,4 @@
-namespace LawFirm.Forms
+namespace LawFirmView
{
partial class FormMain
{
@@ -28,150 +28,147 @@
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain));
- toolStrip1 = new ToolStrip();
- toolStripDropDownButton1 = new ToolStripDropDownButton();
- компонентыToolStripMenuItem = new ToolStripMenuItem();
- ПутёвкиToolStripMenuItem = new ToolStripMenuItem();
- buttonCreateOrder = new Button();
- buttonTakeOrderInWork = new Button();
- buttonOrderReady = new Button();
- buttonIssuedOrder = new Button();
- buttonRef = new Button();
- dataGridView = new DataGridView();
- toolStrip1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- SuspendLayout();
+ this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+ this.toolStripMenuItemCatalogs = new System.Windows.Forms.ToolStripMenuItem();
+ this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.пакетыДокументовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.dataGridView = new System.Windows.Forms.DataGridView();
+ this.buttonCreateOrder = new System.Windows.Forms.Button();
+ this.buttonTakeOrderInWork = new System.Windows.Forms.Button();
+ this.buttonOrderReady = new System.Windows.Forms.Button();
+ this.buttonIssuedOrder = new System.Windows.Forms.Button();
+ this.buttonRef = new System.Windows.Forms.Button();
+ this.menuStrip1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ this.SuspendLayout();
//
- // toolStrip1
+ // menuStrip1
//
- toolStrip1.ImageScalingSize = new Size(20, 20);
- toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 });
- toolStrip1.Location = new Point(0, 0);
- toolStrip1.Name = "toolStrip1";
- toolStrip1.Size = new Size(969, 25);
- toolStrip1.TabIndex = 0;
- toolStrip1.Text = "toolStrip1";
+ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripMenuItemCatalogs});
+ this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip1.Name = "menuStrip1";
+ this.menuStrip1.Size = new System.Drawing.Size(910, 24);
+ this.menuStrip1.TabIndex = 0;
+ this.menuStrip1.Text = "Справочники";
//
- // toolStripDropDownButton1
+ // toolStripMenuItemCatalogs
//
- toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
- toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, ПутёвкиToolStripMenuItem });
- toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image");
- toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
- toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- toolStripDropDownButton1.Size = new Size(88, 22);
- toolStripDropDownButton1.Text = "Справочник";
+ this.toolStripMenuItemCatalogs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.компонентыToolStripMenuItem,
+ this.пакетыДокументовToolStripMenuItem});
+ this.toolStripMenuItemCatalogs.Name = "toolStripMenuItemCatalogs";
+ this.toolStripMenuItemCatalogs.Size = new System.Drawing.Size(94, 20);
+ this.toolStripMenuItemCatalogs.Text = "Справочники";
//
// компонентыToolStripMenuItem
//
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
компонентыToolStripMenuItem.Size = new Size(183, 22);
- компонентыToolStripMenuItem.Text = "Компоненты";
+ компонентыToolStripMenuItem.Text = "Бланки документов";
компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click;
//
- // ПутёвкиToolStripMenuItem
+ // пакетыДокументовToolStripMenuItem
//
ПутёвкиToolStripMenuItem.Name = "ПутёвкиToolStripMenuItem";
ПутёвкиToolStripMenuItem.Size = new Size(183, 22);
- ПутёвкиToolStripMenuItem.Text = "Юридические конс.";
+ ПутёвкиToolStripMenuItem.Text = "Пакеты документов";
ПутёвкиToolStripMenuItem.Click += консервыToolStripMenuItem_Click;
//
- // buttonCreateOrder
- //
- buttonCreateOrder.Location = new Point(800, 56);
- buttonCreateOrder.Name = "buttonCreateOrder";
- buttonCreateOrder.Size = new Size(141, 24);
- buttonCreateOrder.TabIndex = 1;
- buttonCreateOrder.Text = "Создать заказ";
- buttonCreateOrder.UseVisualStyleBackColor = true;
- buttonCreateOrder.Click += buttonCreateOrder_Click;
- //
- // buttonTakeOrderInWork
- //
- buttonTakeOrderInWork.Location = new Point(800, 100);
- buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
- buttonTakeOrderInWork.Size = new Size(141, 24);
- buttonTakeOrderInWork.TabIndex = 2;
- buttonTakeOrderInWork.Text = "Отдать на выполнение";
- buttonTakeOrderInWork.UseVisualStyleBackColor = true;
- buttonTakeOrderInWork.Click += buttonTakeOrderInWork_Click;
- //
- // buttonOrderReady
- //
- buttonOrderReady.Location = new Point(800, 142);
- buttonOrderReady.Name = "buttonOrderReady";
- buttonOrderReady.Size = new Size(141, 24);
- buttonOrderReady.TabIndex = 3;
- buttonOrderReady.Text = "Заказ готов";
- buttonOrderReady.UseVisualStyleBackColor = true;
- buttonOrderReady.Click += buttonOrderReady_Click;
- //
- // buttonIssuedOrder
- //
- buttonIssuedOrder.Location = new Point(800, 181);
- buttonIssuedOrder.Name = "buttonIssuedOrder";
- buttonIssuedOrder.Size = new Size(141, 24);
- buttonIssuedOrder.TabIndex = 4;
- buttonIssuedOrder.Text = "Заказ выдан";
- buttonIssuedOrder.UseVisualStyleBackColor = true;
- buttonIssuedOrder.Click += buttonIssuedOrder_Click;
- //
- // buttonRef
- //
- buttonRef.Location = new Point(800, 222);
- buttonRef.Name = "buttonRef";
- buttonRef.Size = new Size(141, 24);
- buttonRef.TabIndex = 5;
- buttonRef.Text = "Обновить список";
- buttonRef.UseVisualStyleBackColor = true;
- buttonRef.Click += buttonRef_Click;
- //
// dataGridView
//
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Location = new Point(0, 26);
- dataGridView.Name = "dataGridView";
- dataGridView.ReadOnly = true;
- dataGridView.RowHeadersWidth = 51;
- dataGridView.RowTemplate.Height = 24;
- dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
- dataGridView.Size = new Size(763, 435);
- dataGridView.TabIndex = 6;
+ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView.Location = new System.Drawing.Point(0, 27);
+ this.dataGridView.Name = "dataGridView";
+ this.dataGridView.RowTemplate.Height = 25;
+ this.dataGridView.Size = new System.Drawing.Size(736, 411);
+ this.dataGridView.TabIndex = 1;
+ //
+ // buttonCreateOrder
+ //
+ this.buttonCreateOrder.Location = new System.Drawing.Point(742, 39);
+ this.buttonCreateOrder.Name = "buttonCreateOrder";
+ this.buttonCreateOrder.Size = new System.Drawing.Size(156, 26);
+ this.buttonCreateOrder.TabIndex = 2;
+ this.buttonCreateOrder.Text = "Создать заказ";
+ this.buttonCreateOrder.UseVisualStyleBackColor = true;
+ this.buttonCreateOrder.Click += new System.EventHandler(this.buttonCreateOrder_Click);
+ //
+ // buttonTakeOrderInWork
+ //
+ this.buttonTakeOrderInWork.Location = new System.Drawing.Point(742, 71);
+ this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
+ this.buttonTakeOrderInWork.Size = new System.Drawing.Size(156, 23);
+ this.buttonTakeOrderInWork.TabIndex = 3;
+ this.buttonTakeOrderInWork.Text = "Отдать на выполнение";
+ this.buttonTakeOrderInWork.UseVisualStyleBackColor = true;
+ this.buttonTakeOrderInWork.Click += new System.EventHandler(this.buttonTakeOrderInWork_Click);
+ //
+ // buttonOrderReady
+ //
+ this.buttonOrderReady.Location = new System.Drawing.Point(742, 100);
+ this.buttonOrderReady.Name = "buttonOrderReady";
+ this.buttonOrderReady.Size = new System.Drawing.Size(156, 23);
+ this.buttonOrderReady.TabIndex = 4;
+ this.buttonOrderReady.Text = "Заказ готов";
+ this.buttonOrderReady.UseVisualStyleBackColor = true;
+ this.buttonOrderReady.Click += new System.EventHandler(this.buttonOrderReady_Click);
+ //
+ // buttonIssuedOrder
+ //
+ this.buttonIssuedOrder.Location = new System.Drawing.Point(742, 129);
+ this.buttonIssuedOrder.Name = "buttonIssuedOrder";
+ this.buttonIssuedOrder.Size = new System.Drawing.Size(156, 23);
+ this.buttonIssuedOrder.TabIndex = 5;
+ this.buttonIssuedOrder.Text = "Заказ выдан";
+ this.buttonIssuedOrder.UseVisualStyleBackColor = true;
+ this.buttonIssuedOrder.Click += new System.EventHandler(this.buttonIssuedOrder_Click);
+ //
+ // buttonRef
+ //
+ this.buttonRef.Location = new System.Drawing.Point(742, 158);
+ this.buttonRef.Name = "buttonRef";
+ this.buttonRef.Size = new System.Drawing.Size(156, 23);
+ this.buttonRef.TabIndex = 6;
+ this.buttonRef.Text = "Обновить список";
+ this.buttonRef.UseVisualStyleBackColor = true;
+ this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click);
//
// FormMain
//
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(969, 461);
- Controls.Add(dataGridView);
- Controls.Add(buttonRef);
- Controls.Add(buttonIssuedOrder);
- Controls.Add(buttonOrderReady);
- Controls.Add(buttonTakeOrderInWork);
- Controls.Add(buttonCreateOrder);
- Controls.Add(toolStrip1);
- Name = "FormMain";
- Text = "Юридическая фирма";
- Load += FormMain_Load;
- toolStrip1.ResumeLayout(false);
- toolStrip1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- ResumeLayout(false);
- PerformLayout();
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(910, 477);
+ this.Controls.Add(this.buttonRef);
+ this.Controls.Add(this.buttonIssuedOrder);
+ this.Controls.Add(this.buttonOrderReady);
+ this.Controls.Add(this.buttonTakeOrderInWork);
+ this.Controls.Add(this.buttonCreateOrder);
+ this.Controls.Add(this.dataGridView);
+ this.Controls.Add(this.menuStrip1);
+ this.MainMenuStrip = this.menuStrip1;
+ this.Name = "FormMain";
+ this.Text = "FormMain";
+ this.Load += new System.EventHandler(this.FormMain_Load);
+ this.menuStrip1.ResumeLayout(false);
+ this.menuStrip1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
}
#endregion
- private ToolStrip toolStrip1;
+ private MenuStrip menuStrip1;
+ private ToolStripMenuItem toolStripMenuItemCatalogs;
+ private ToolStripMenuItem компонентыToolStripMenuItem;
+ private ToolStripMenuItem пакетыДокументовToolStripMenuItem;
+ private DataGridView dataGridView;
private Button buttonCreateOrder;
private Button buttonTakeOrderInWork;
private Button buttonOrderReady;
private Button buttonIssuedOrder;
private Button buttonRef;
- private DataGridView dataGridView;
- private ToolStripDropDownButton toolStripDropDownButton1;
- private ToolStripMenuItem компонентыToolStripMenuItem;
- private ToolStripMenuItem ПутёвкиToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/LawFirm/LawFirm/LawFirmView.csproj b/LawFirm/LawFirm/LawFirmView.csproj
index 3d9407a..2f16f76 100644
--- a/LawFirm/LawFirm/LawFirmView.csproj
+++ b/LawFirm/LawFirm/LawFirmView.csproj
@@ -9,11 +9,7 @@
-
-
-
-
-
+
diff --git a/LawFirm/LawFirm/Program.cs b/LawFirm/LawFirm/Program.cs
index 52dc0ee..8365a78 100644
--- a/LawFirm/LawFirm/Program.cs
+++ b/LawFirm/LawFirm/Program.cs
@@ -1,16 +1,19 @@
using LawFirmContracts.BusinessLogicsContracts;
using LawFirmBusinessLogic.BusinessLogic;
+using LawFirmContracts.BusinessLogicsContracts;
using LawFirmContracts.StoragesContracts;
using LawFirmFileImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
+using System;
using LawFirm.Forms;
using LawFirmBusinessLogic.BusinessLogic;
using LawFirmContracts.BusinessLogicsContracts;
using LawFirmContracts.StoragesContracts;
+namespace LawFirmView
namespace LawFirm.Forms
{
internal static class Program
@@ -29,7 +32,6 @@ namespace LawFirm.Forms
var services = new ServiceCollection();
ConfigureServices(services);
_serviceProvider = services.BuildServiceProvider();
-
Application.Run(_serviceProvider.GetRequiredService());
}
private static void ConfigureServices(ServiceCollection services)
@@ -41,19 +43,22 @@ namespace LawFirm.Forms
});
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
}
+
}
}
\ No newline at end of file