Sergey/PIbd-21_RazubaevSM_PlumbingRepair_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21. Razubaev SM Lab work 8 hard #17

Closed
Sergey wants to merge 10 commits from lab_8_hard into lab_7_hard
pull from: lab_8_hard
merge into: Sergey:lab_7_hard
Conversation 0 Commits 10 Files Changed 70 +25 -19
6 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 188d246b30 - Show all commits

4
PlumbingRepair/PlumbingRepairContracts/ViewModels/OrderViewModel.cs
View File

@ -36,10 +36,10 @@ namespace PlumbingRepairContracts.ViewModels
[Column(title: "Статус", width: 150)]
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
[Column(title: "Дата создания", width: 150, formatDate: true)]
[Column(title: "Дата создания", width: 200, formatDate: true)]
public DateTime DateCreate { get; set; } = DateTime.Now;
[Column(title: "Дата выполнения", width: 150, formatDate: true)]
[Column(title: "Дата выполнения", width: 200, formatDate: true)]
public DateTime? DateImplement { get; set; }
}
}

1
PlumbingRepair/PlumbingRepairDatabaseImplement/Models/MessageInfo.cs
View File

@ -33,7 +33,6 @@ namespace PlumbingRepairDatabaseImplement.Models
[DataMember]
public string? ReplyText { get; private set; }
public virtual Client? Client { get; set; }
public virtual Client? Client { get; private set; }

28
PlumbingRepair/PlumbingRepairView/FormMain.Designer.cs generated
View File

@ -48,9 +48,9 @@
this.работыПоМагазинамToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.выполнениеРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.списокВсехЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.письмаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.созданиеБэкапаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.списокВсехЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
@ -58,7 +58,7 @@
// buttonRef
//
this.buttonRef.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonRef.Location = new System.Drawing.Point(1113, 227);
this.buttonRef.Location = new System.Drawing.Point(1590, 227);
this.buttonRef.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.buttonRef.Name = "buttonRef";
this.buttonRef.Size = new System.Drawing.Size(249, 45);
@ -70,7 +70,7 @@
// buttonIssuedOrder
//
this.buttonIssuedOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonIssuedOrder.Location = new System.Drawing.Point(1113, 151);
this.buttonIssuedOrder.Location = new System.Drawing.Point(1590, 151);
this.buttonIssuedOrder.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.buttonIssuedOrder.Name = "buttonIssuedOrder";
this.buttonIssuedOrder.Size = new System.Drawing.Size(249, 45);
@ -82,7 +82,7 @@
// buttonCreateOrder
//
this.buttonCreateOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonCreateOrder.Location = new System.Drawing.Point(1113, 83);
this.buttonCreateOrder.Location = new System.Drawing.Point(1590, 83);
this.buttonCreateOrder.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.buttonCreateOrder.Name = "buttonCreateOrder";
this.buttonCreateOrder.Size = new System.Drawing.Size(249, 45);
@ -108,7 +108,7 @@
this.dataGridView.RowHeadersVisible = false;
this.dataGridView.RowHeadersWidth = 62;
this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView.Size = new System.Drawing.Size(1055, 533);
this.dataGridView.Size = new System.Drawing.Size(1532, 533);
this.dataGridView.TabIndex = 6;
//
// menuStrip1
@ -122,7 +122,7 @@
this.созданиеБэкапаToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1377, 33);
this.menuStrip1.Size = new System.Drawing.Size(1854, 33);
this.menuStrip1.TabIndex = 12;
this.menuStrip1.Text = "menuStrip1";
//
@ -243,13 +243,6 @@
this.выполнениеРаботToolStripMenuItem.Text = "Запуск работ";
this.выполнениеРаботToolStripMenuItem.Click += new System.EventHandler(this.выполнениеРаботToolStripMenuItem_Click);
//
// списокВсехЗаказовToolStripMenuItem
//
this.списокВсехЗаказовToolStripMenuItem.Name = "списокВсехЗаказовToolStripMenuItem";
this.списокВсехЗаказовToolStripMenuItem.Size = new System.Drawing.Size(319, 34);
this.списокВсехЗаказовToolStripMenuItem.Text = "Список всех заказов";
this.списокВсехЗаказовToolStripMenuItem.Click += new System.EventHandler(this.OrdersByDateToolStripMenuItem_Click);
//
// письмаToolStripMenuItem
//
this.письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
@ -264,11 +257,18 @@
this.созданиеБэкапаToolStripMenuItem.Text = "Создание бэкапа";
this.созданиеБэкапаToolStripMenuItem.Click += new System.EventHandler(this.backupToolStripMenuItem_Click);
//
// списокВсехЗаказовToolStripMenuItem
//
this.списокВсехЗаказовToolStripMenuItem.Name = "списокВсехЗаказовToolStripMenuItem";
this.списокВсехЗаказовToolStripMenuItem.Size = new System.Drawing.Size(319, 34);
this.списокВсехЗаказовToolStripMenuItem.Text = "Список всех заказов";
this.списокВсехЗаказовToolStripMenuItem.Click += new System.EventHandler(this.OrdersByDateToolStripMenuItem_Click);
//
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1377, 602);
this.ClientSize = new System.Drawing.Size(1854, 602);
this.Controls.Add(this.buttonRef);
this.Controls.Add(this.buttonIssuedOrder);
this.Controls.Add(this.buttonCreateOrder);

5
PlumbingRepair/PlumbingRepairView/FormMain.cs
View File

@ -69,7 +69,10 @@ namespace PlumbingRepairView
private void ButtonCreateOrder_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
form.ShowDialog();
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
}

5
PlumbingRepair/PlumbingRepairView/FormShops.cs
View File

@ -40,7 +40,10 @@ namespace PlumbingRepairView
private void ButtonAdd_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormShop>();
form.ShowDialog();
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
}
private void ButtonUpd_Click(object sender, EventArgs e)

1
PlumbingRepair/PlumbingRepairView/Program.cs
View File

@ -78,6 +78,7 @@ namespace PlumbingRepairView
DependencyManager.Instance.RegisterType<FormMails>();
DependencyManager.Instance.RegisterType<FormShops>();
DependencyManager.Instance.RegisterType<FormShop>();
DependencyManager.Instance.RegisterType<FormStoreReplenishment>();
}