Konstantin/ProjectFamilyBudget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3 лабораторная работа

Browse Source
This commit is contained in:
Корсаков К. 2024-12-20 15:49:40 +04:00
parent a1f04bea39
commit 46c7949db2
26 changed files with 1951 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ProjectFamilyBudget/ProjectFamilyBudget/Entities/PeopleExpense.cs
View File

@ -22,4 +22,14 @@ public class PeopleExpense
ExpensePeopleExpenses = expensePeopleExpenses
};
}
public static PeopleExpense CreateOperation(TempExpensePeopleExpense tempExpensePeopleExpense, IEnumerable<ExpensePeopleExpense> expensePeopleExpenses)
{
return new PeopleExpense
{
Id = tempExpensePeopleExpense.Id,
PeopleId = tempExpensePeopleExpense.PeopleId,
DataReciept = tempExpensePeopleExpense.DataReciept,
ExpensePeopleExpenses = expensePeopleExpenses
};
}
}

10
ProjectFamilyBudget/ProjectFamilyBudget/Entities/PeopleIncome.cs
View File

@ -23,4 +23,14 @@ public class PeopleIncome
IncomePeopleIncomes = incomePeopleIncomes
};
}
public static PeopleIncome CreateOperation(TempIncomePeopleIncome tempIncomePeopleIncome, IEnumerable<IncomePeopleIncome> incomePeopleIncomes)
{
return new PeopleIncome
{
Id = tempIncomePeopleIncome.Id,
PeopleId = tempIncomePeopleIncome.PeopleId,
DataReciept = tempIncomePeopleIncome.DataReciept,
IncomePeopleIncomes = incomePeopleIncomes
};
}
}

16
ProjectFamilyBudget/ProjectFamilyBudget/Entities/TempExpensePeopleExpense.cs Normal file
View File

@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectFamilyBudget.Entities;
public class TempExpensePeopleExpense
{
public int Id { get; private set; }
public int PeopleId { get; private set; }
public DateTime DataReciept { get; private set; }
public int ExpenseId { get; private set; }
public int Sum { get; private set; }
}

16
ProjectFamilyBudget/ProjectFamilyBudget/Entities/TempIncomePeopleIncome.cs Normal file
View File

@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectFamilyBudget.Entities;
public class TempIncomePeopleIncome
{
public int Id { get; private set; }
public int PeopleId { get; private set; }
public DateTime DataReciept { get; private set; }
public int IncomeId { get; private set; }
public int Sum { get; private set; }
}

79
ProjectFamilyBudget/ProjectFamilyBudget/FormFamilyBudget.Designer.cs generated
View File

@ -1,24 +1,24 @@
namespace ProjectFamilyBudget
{
partial class FormFamilyBudget
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
components.Dispose();
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
@ -37,6 +37,9 @@
PeopleIncomeToolStripMenuItem = new ToolStripMenuItem();
PeopleExpenseToolStripMenuItem = new ToolStripMenuItem();
отчетыToolStripMenuItem = new ToolStripMenuItem();
DirectoryReportToolStripMenuItem = new ToolStripMenuItem();
moneyReportToolStripMenuItem = new ToolStripMenuItem();
expensePeopleReportToolStripMenuItem = new ToolStripMenuItem();
menuStrip.SuspendLayout();
SuspendLayout();
//
@ -102,10 +105,35 @@
//
// отчетыToolStripMenuItem
//
отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DirectoryReportToolStripMenuItem, moneyReportToolStripMenuItem, expensePeopleReportToolStripMenuItem });
отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
отчетыToolStripMenuItem.Size = new Size(73, 24);
отчетыToolStripMenuItem.Text = "Отчеты";
//
// DirectoryReportToolStripMenuItem
//
DirectoryReportToolStripMenuItem.Name = "DirectoryReportToolStripMenuItem";
DirectoryReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W;
DirectoryReportToolStripMenuItem.Size = new Size(350, 26);
DirectoryReportToolStripMenuItem.Text = "Документ со справочниками";
DirectoryReportToolStripMenuItem.Click += DirectoryReportToolStripMenuItem_Click;
//
// moneyReportToolStripMenuItem
//
moneyReportToolStripMenuItem.Name = "moneyReportToolStripMenuItem";
moneyReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.E;
moneyReportToolStripMenuItem.Size = new Size(350, 26);
moneyReportToolStripMenuItem.Text = "Движение денег";
moneyReportToolStripMenuItem.Click += MoneyReportToolStripMenuItem_Click;
//
// expensePeopleReportToolStripMenuItem
//
expensePeopleReportToolStripMenuItem.Name = "expensePeopleReportToolStripMenuItem";
expensePeopleReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P;
expensePeopleReportToolStripMenuItem.Size = new Size(350, 26);
expensePeopleReportToolStripMenuItem.Text = "Траты людей";
expensePeopleReportToolStripMenuItem.Click += ExpensePeopleReportToolStripMenuItem_Click;
//
// FormFamilyBudget
//
AutoScaleDimensions = new SizeF(8F, 20F);
@ -128,13 +156,16 @@
#endregion
private MenuStrip menuStrip;
private ToolStripMenuItem справочникиToolStripMenuItem;
private ToolStripMenuItem PeopleToolStripMenuItem;
private ToolStripMenuItem IncomeToolStripMenuItem;
private ToolStripMenuItem ExpenseToolStripMenuItem;
private ToolStripMenuItem операцииToolStripMenuItem;
private ToolStripMenuItem отчетыToolStripMenuItem;
private ToolStripMenuItem PeopleIncomeToolStripMenuItem;
private ToolStripMenuItem PeopleExpenseToolStripMenuItem;
}
private ToolStripMenuItem справочникиToolStripMenuItem;
private ToolStripMenuItem PeopleToolStripMenuItem;
private ToolStripMenuItem IncomeToolStripMenuItem;
private ToolStripMenuItem ExpenseToolStripMenuItem;
private ToolStripMenuItem операцииToolStripMenuItem;
private ToolStripMenuItem отчетыToolStripMenuItem;
private ToolStripMenuItem PeopleIncomeToolStripMenuItem;
private ToolStripMenuItem PeopleExpenseToolStripMenuItem;
private ToolStripMenuItem DirectoryReportToolStripMenuItem;
private ToolStripMenuItem moneyReportToolStripMenuItem;
private ToolStripMenuItem expensePeopleReportToolStripMenuItem;
}
}

163
ProjectFamilyBudget/ProjectFamilyBudget/FormFamilyBudget.cs
View File

@ -1,91 +1,120 @@
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 ProjectFamilyBudget.Forms;
using Unity;
namespace ProjectFamilyBudget;
public partial class FormFamilyBudget : Form
namespace ProjectFamilyBudget
{
private readonly IUnityContainer _container;
public FormFamilyBudget(IUnityContainer container)
public partial class FormFamilyBudget : Form
{
InitializeComponent();
_container = container ??
throw new ArgumentNullException(nameof(container));
}
private readonly IUnityContainer _container;
public FormFamilyBudget(IUnityContainer container)
{
InitializeComponent();
_container = container ??
throw new ArgumentNullException(nameof(container));
}
private void PeopleToolStripMenuItem_Click(object sender, EventArgs e)
{
try
private void PeopleToolStripMenuItem_Click(object sender, EventArgs e)
{
_container.Resolve<FormPeoples>().ShowDialog();
try
{
_container.Resolve<FormPeoples>().ShowDialog();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Ошибка при загрузке",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void IncomeToolStripMenuItem_Click(object sender, EventArgs e)
{
try
private void IncomeToolStripMenuItem_Click(object sender, EventArgs e)
{
_container.Resolve<FormIncomes>().ShowDialog();
try
{
_container.Resolve<FormIncomes>().ShowDialog();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Ошибка при загрузке",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void ExpenseToolStripMenuItem_Click(object sender, EventArgs e)
{
try
private void ExpenseToolStripMenuItem_Click(object sender, EventArgs e)
{
_container.Resolve<FormExpenses>().ShowDialog();
try
{
_container.Resolve<FormExpenses>().ShowDialog();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Ошибка при загрузке",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void PeopleIncomeToolStripMenuItem_Click(object sender, EventArgs e)
{
try
private void PeopleIncomeToolStripMenuItem_Click(object sender, EventArgs e)
{
_container.Resolve<FormPeopleIncomes>().ShowDialog();
try
{
_container.Resolve<FormPeopleIncomes>().ShowDialog();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Ошибка при загрузке",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void PeopleExpenseToolStripMenuItem_Click(object sender, EventArgs e)
{
try
private void PeopleExpenseToolStripMenuItem_Click(object sender, EventArgs e)
{
_container.Resolve<FormPeopleExpenses>().ShowDialog();
try
{
_container.Resolve<FormPeopleExpenses>().ShowDialog();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
catch (Exception ex)
private void DirectoryReportToolStripMenuItem_Click(object sender, EventArgs e)
{
MessageBox.Show(ex.Message, "Ошибка при загрузке",
MessageBoxButtons.OK, MessageBoxIcon.Error);
try
{
_container.Resolve<FormDirectoryReport>().ShowDialog();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void MoneyReportToolStripMenuItem_Click(object sender, EventArgs e)
{
try
{
_container.Resolve<FormMoneyReport>().ShowDialog();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void ExpensePeopleReportToolStripMenuItem_Click(object sender, EventArgs e)
{
try
{
_container.Resolve<FormExpenseReport>().ShowDialog();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}

100
ProjectFamilyBudget/ProjectFamilyBudget/Forms/FormDirectoryReport.Designer.cs generated Normal file
View File

@ -0,0 +1,100 @@
namespace ProjectFamilyBudget.Forms
{
partial class FormDirectoryReport
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
checkBoxPeople = new CheckBox();
checkBoxIncome = new CheckBox();
checkBoxExpense = new CheckBox();
buttonCreate = new Button();
SuspendLayout();
//
// checkBoxPeople
//
checkBoxPeople.AutoSize = true;
checkBoxPeople.Location = new Point(22, 22);
checkBoxPeople.Name = "checkBoxPeople";
checkBoxPeople.Size = new Size(57, 19);
checkBoxPeople.TabIndex = 0;
checkBoxPeople.Text = "Люди";
checkBoxPeople.UseVisualStyleBackColor = true;
//
// checkBoxIncome
//
checkBoxIncome.AutoSize = true;
checkBoxIncome.Location = new Point(22, 64);
checkBoxIncome.Name = "checkBoxIncome";
checkBoxIncome.Size = new Size(69, 19);
checkBoxIncome.TabIndex = 1;
checkBoxIncome.Text = "Доходы";
checkBoxIncome.UseVisualStyleBackColor = true;
//
// checkBoxExpense
//
checkBoxExpense.AutoSize = true;
checkBoxExpense.Location = new Point(22, 111);
checkBoxExpense.Name = "checkBoxExpense";
checkBoxExpense.Size = new Size(73, 19);
checkBoxExpense.TabIndex = 2;
checkBoxExpense.Text = "Расходы";
checkBoxExpense.UseVisualStyleBackColor = true;
//
// buttonCreate
//
buttonCreate.Location = new Point(165, 54);
buttonCreate.Name = "buttonCreate";
buttonCreate.Size = new Size(134, 37);
buttonCreate.TabIndex = 3;
buttonCreate.Text = "Сформировать";
buttonCreate.UseVisualStyleBackColor = true;
buttonCreate.Click += buttonCreate_Click;
//
// FormDirectoryReport
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(337, 157);
Controls.Add(buttonCreate);
Controls.Add(checkBoxExpense);
Controls.Add(checkBoxIncome);
Controls.Add(checkBoxPeople);
Name = "FormDirectoryReport";
StartPosition = FormStartPosition.CenterParent;
Text = "Выгрузка справочников";
ResumeLayout(false);
PerformLayout();
}
#endregion
private CheckBox checkBoxPeople;
private CheckBox checkBoxIncome;
private CheckBox checkBoxExpense;
private Button buttonCreate;
}
}

62
ProjectFamilyBudget/ProjectFamilyBudget/Forms/FormDirectoryReport.cs Normal file
View File

@ -0,0 +1,62 @@
using ProjectFamilyBudget.Reports;
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 Unity;
namespace ProjectFamilyBudget.Forms
{
public partial class FormDirectoryReport : Form
{
private readonly IUnityContainer _container;
public FormDirectoryReport(IUnityContainer container)
{
InitializeComponent();
_container = container ?? throw new ArgumentNullException(nameof(container));
}
private void buttonCreate_Click(object sender, EventArgs e)
{
try
{
if (!checkBoxPeople.Checked && !checkBoxIncome.Checked && !checkBoxExpense.Checked)
{
throw new Exception("Не выбран ни один справочник для выгрузки");
}
var sfd = new SaveFileDialog()
{
Filter = "Docx Files | *.docx"
};
if (sfd.ShowDialog() != DialogResult.OK)
{
throw new Exception("Не выбран файла для отчета");
}
if
(_container.Resolve<DocReport>().CreateDoc(sfd.FileName, checkBoxPeople.Checked, checkBoxIncome.Checked,
checkBoxExpense.Checked))
{
MessageBox.Show("Документ сформирован",
"Формирование документа",
MessageBoxButtons.OK,
MessageBoxIcon.Information);
}
else
{
MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах",
"Формирование документа",
MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Ошибка при создании отчета", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}

120
ProjectFamilyBudget/ProjectFamilyBudget/Forms/FormDirectoryReport.resx Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

131
ProjectFamilyBudget/ProjectFamilyBudget/Forms/FormExpenseReport.Designer.cs generated Normal file
View File

@ -0,0 +1,131 @@
namespace ProjectFamilyBudget.Forms
{
partial class FormExpenseReport
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
buttonSelectFile = new Button();
labelFile = new Label();
label = new Label();
dateTimePicker = new DateTimePicker();
buttonCreate = new Button();
label1 = new Label();
comboBoxSelectExpense = new ComboBox();
SuspendLayout();
//
// buttonSelectFile
//
buttonSelectFile.Location = new Point(12, 12);
buttonSelectFile.Name = "buttonSelectFile";
buttonSelectFile.Size = new Size(75, 23);
buttonSelectFile.TabIndex = 0;
buttonSelectFile.Text = "Выбрать";
buttonSelectFile.UseVisualStyleBackColor = true;
buttonSelectFile.Click += buttonSelectFile_Click;
//
// labelFile
//
labelFile.AutoSize = true;
labelFile.Location = new Point(108, 16);
labelFile.Name = "labelFile";
labelFile.Size = new Size(36, 15);
labelFile.TabIndex = 1;
labelFile.Text = "Файл";
//
// label
//
label.AutoSize = true;
label.Location = new Point(12, 66);
label.Name = "label";
label.Size = new Size(32, 15);
label.TabIndex = 2;
label.Text = "Дата";
//
// dateTimePicker
//
dateTimePicker.Location = new Point(69, 60);
dateTimePicker.Name = "dateTimePicker";
dateTimePicker.Size = new Size(227, 23);
dateTimePicker.TabIndex = 3;
//
// buttonCreate
//
buttonCreate.Location = new Point(95, 144);
buttonCreate.Name = "buttonCreate";
buttonCreate.Size = new Size(123, 23);
buttonCreate.TabIndex = 4;
buttonCreate.Text = "Сформировать";
buttonCreate.UseVisualStyleBackColor = true;
buttonCreate.Click += buttonCreate_Click;
//
// label1
//
label1.AutoSize = true;
label1.Location = new Point(12, 107);
label1.Name = "label1";
label1.Size = new Size(45, 15);
label1.TabIndex = 5;
label1.Text = "Расход";
//
// comboBoxSelectExpense
//
comboBoxSelectExpense.FormattingEnabled = true;
comboBoxSelectExpense.Location = new Point(69, 104);
comboBoxSelectExpense.Name = "comboBoxSelectExpense";
comboBoxSelectExpense.Size = new Size(227, 23);
comboBoxSelectExpense.TabIndex = 6;
//
// FormExpenseReport
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(321, 179);
Controls.Add(comboBoxSelectExpense);
Controls.Add(label1);
Controls.Add(buttonCreate);
Controls.Add(dateTimePicker);
Controls.Add(label);
Controls.Add(labelFile);
Controls.Add(buttonSelectFile);
Name = "FormExpenseReport";
StartPosition = FormStartPosition.CenterParent;
Text = "Траты людей";
ResumeLayout(false);
PerformLayout();
}
#endregion
private Button buttonSelectFile;
private Label labelFile;
private Label label;
private DateTimePicker dateTimePicker;
private Button buttonCreate;
private Label label1;
private ComboBox comboBoxSelectExpense;
}
}

77
ProjectFamilyBudget/ProjectFamilyBudget/Forms/FormExpenseReport.cs Normal file
View File

@ -0,0 +1,77 @@
using ProjectFamilyBudget.Reports;
using ProjectFamilyBudget.Repositories;
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 Unity;
namespace ProjectFamilyBudget.Forms
{
public partial class FormExpenseReport : Form
{
private string _fileName = string.Empty;
private readonly IUnityContainer _container;
public FormExpenseReport(IUnityContainer container, IExpense expense)
{
InitializeComponent();
_container = container ?? throw new ArgumentNullException(nameof(container));
comboBoxSelectExpense.DataSource = expense.ReadExpense();
comboBoxSelectExpense.DisplayMember = "Name";
comboBoxSelectExpense.ValueMember = "Id";
}
private void buttonSelectFile_Click(object sender, EventArgs e)
{
var sfd = new SaveFileDialog()
{
Filter = "Pdf Files | *.pdf"
};
if (sfd.ShowDialog() == DialogResult.OK)
{
_fileName = sfd.FileName;
labelFile.Text = Path.GetFileName(_fileName);
}
}
private void buttonCreate_Click(object sender, EventArgs e)
{
try
{
if (string.IsNullOrWhiteSpace(_fileName))
{
throw new Exception("Отсутствует имя файла для отчета");
}
if (comboBoxSelectExpense.SelectedIndex < 0)
{
throw new Exception("Не выбран расход");
}
if
(_container.Resolve<ChartReport>().CreateChart(_fileName, (int)comboBoxSelectExpense.SelectedValue!,dateTimePicker.Value))
{
MessageBox.Show("Документ сформирован",
"Формирование документа",
MessageBoxButtons.OK,
MessageBoxIcon.Information);
}
else
{
MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах",
"Формирование документа",
MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Ошибка при создании очета",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}

120
ProjectFamilyBudget/ProjectFamilyBudget/Forms/FormExpenseReport.resx Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

186
ProjectFamilyBudget/ProjectFamilyBudget/Forms/FormMoneyReport.Designer.cs generated Normal file
View File

@ -0,0 +1,186 @@
namespace ProjectFamilyBudget.Forms
{
partial class FormMoneyReport
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
label1 = new Label();
label2 = new Label();
label3 = new Label();
label4 = new Label();
label5 = new Label();
textBoxFilePath = new TextBox();
buttonSelectFilePath = new Button();
comboBoxSelectIncome = new ComboBox();
comboBoxSelectExpense = new ComboBox();
dateTimePickerStart = new DateTimePicker();
dateTimePickerEnd = new DateTimePicker();
buttonMakeReport = new Button();
SuspendLayout();
//
// label1
//
label1.AutoSize = true;
label1.Location = new Point(21, 19);
label1.Name = "label1";
label1.Size = new Size(87, 15);
label1.TabIndex = 0;
label1.Text = "Путь до файла";
//
// label2
//
label2.AutoSize = true;
label2.Location = new Point(21, 64);
label2.Name = "label2";
label2.Size = new Size(41, 15);
label2.TabIndex = 1;
label2.Text = "Доход";
//
// label3
//
label3.AutoSize = true;
label3.Location = new Point(21, 111);
label3.Name = "label3";
label3.Size = new Size(45, 15);
label3.TabIndex = 2;
label3.Text = "Расход";
//
// label4
//
label4.AutoSize = true;
label4.Location = new Point(21, 164);
label4.Name = "label4";
label4.Size = new Size(74, 15);
label4.TabIndex = 3;
label4.Text = "Дата начала";
//
// label5
//
label5.AutoSize = true;
label5.Location = new Point(21, 205);
label5.Name = "label5";
label5.Size = new Size(68, 15);
label5.TabIndex = 4;
label5.Text = "Дата конца";
//
// textBoxFilePath
//
textBoxFilePath.Location = new Point(137, 16);
textBoxFilePath.Name = "textBoxFilePath";
textBoxFilePath.Size = new Size(152, 23);
textBoxFilePath.TabIndex = 5;
//
// buttonSelectFilePath
//
buttonSelectFilePath.Location = new Point(295, 16);
buttonSelectFilePath.Name = "buttonSelectFilePath";
buttonSelectFilePath.Size = new Size(25, 23);
buttonSelectFilePath.TabIndex = 6;
buttonSelectFilePath.Text = "..";
buttonSelectFilePath.UseVisualStyleBackColor = true;
buttonSelectFilePath.Click += buttonSelectFilePath_Click;
//
// comboBoxSelectIncome
//
comboBoxSelectIncome.FormattingEnabled = true;
comboBoxSelectIncome.Location = new Point(137, 61);
comboBoxSelectIncome.Name = "comboBoxSelectIncome";
comboBoxSelectIncome.Size = new Size(183, 23);
comboBoxSelectIncome.TabIndex = 7;
//
// comboBoxSelectExpense
//
comboBoxSelectExpense.FormattingEnabled = true;
comboBoxSelectExpense.Location = new Point(137, 108);
comboBoxSelectExpense.Name = "comboBoxSelectExpense";
comboBoxSelectExpense.Size = new Size(183, 23);
comboBoxSelectExpense.TabIndex = 8;
//
// dateTimePickerStart
//
dateTimePickerStart.Location = new Point(137, 158);
dateTimePickerStart.Name = "dateTimePickerStart";
dateTimePickerStart.Size = new Size(183, 23);
dateTimePickerStart.TabIndex = 9;
//
// dateTimePickerEnd
//
dateTimePickerEnd.Location = new Point(137, 199);
dateTimePickerEnd.Name = "dateTimePickerEnd";
dateTimePickerEnd.Size = new Size(183, 23);
dateTimePickerEnd.TabIndex = 10;
//
// buttonMakeReport
//
buttonMakeReport.Location = new Point(103, 237);
buttonMakeReport.Name = "buttonMakeReport";
buttonMakeReport.Size = new Size(138, 23);
buttonMakeReport.TabIndex = 11;
buttonMakeReport.Text = "Сформировать";
buttonMakeReport.UseVisualStyleBackColor = true;
buttonMakeReport.Click += buttonMakeReport_Click;
//
// FormMoneyReport
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(343, 282);
Controls.Add(buttonMakeReport);
Controls.Add(dateTimePickerEnd);
Controls.Add(dateTimePickerStart);
Controls.Add(comboBoxSelectExpense);
Controls.Add(comboBoxSelectIncome);
Controls.Add(buttonSelectFilePath);
Controls.Add(textBoxFilePath);
Controls.Add(label5);
Controls.Add(label4);
Controls.Add(label3);
Controls.Add(label2);
Controls.Add(label1);
Name = "FormMoneyReport";
StartPosition = FormStartPosition.CenterParent;
Text = "Отчет по движению денег";
ResumeLayout(false);
PerformLayout();
}
#endregion
private Label label1;
private Label label2;
private Label label3;
private Label label4;
private Label label5;
private TextBox textBoxFilePath;
private Button buttonSelectFilePath;
private ComboBox comboBoxSelectIncome;
private ComboBox comboBoxSelectExpense;
private DateTimePicker dateTimePickerStart;
private DateTimePicker dateTimePickerEnd;
private Button buttonMakeReport;
}
}

84
ProjectFamilyBudget/ProjectFamilyBudget/Forms/FormMoneyReport.cs Normal file
View File

@ -0,0 +1,84 @@
using ProjectFamilyBudget.Reports;
using ProjectFamilyBudget.Repositories;
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 Unity;
namespace ProjectFamilyBudget.Forms
{
public partial class FormMoneyReport : Form
{
private readonly IUnityContainer _container;
public FormMoneyReport(IUnityContainer container, IIncome income, IExpense expense)
{
InitializeComponent();
_container = container ?? throw new ArgumentNullException(nameof(container));
comboBoxSelectIncome.DataSource = income.ReadIncome();
comboBoxSelectIncome.DisplayMember = "Name";
comboBoxSelectIncome.ValueMember = "Id";
comboBoxSelectExpense.DataSource = expense.ReadExpense();
comboBoxSelectExpense.DisplayMember = "Name";
comboBoxSelectExpense.ValueMember = "Id";
}
private void buttonSelectFilePath_Click(object sender, EventArgs e)
{
var sfd = new SaveFileDialog()
{
Filter = "Excel Files | *.xlsx"
};
if (sfd.ShowDialog() != DialogResult.OK)
{
return;
}
textBoxFilePath.Text = sfd.FileName;
}
private void buttonMakeReport_Click(object sender, EventArgs e)
{
try
{
if (string.IsNullOrWhiteSpace(textBoxFilePath.Text))
{
throw new Exception("Отсутствует имя файла для отчета");
}
if (comboBoxSelectIncome.SelectedIndex < 0 || comboBoxSelectExpense.SelectedIndex < 0)
{
throw new Exception("Не выбран доход или расход");
}
if (dateTimePickerEnd.Value <= dateTimePickerStart.Value)
{
throw new Exception("Дата начала должна быть раньше даты окончания");
}
if (_container.Resolve<TableReport>().CreateTable(textBoxFilePath.Text, (int)comboBoxSelectIncome.SelectedValue!,
(int)comboBoxSelectExpense.SelectedValue!, dateTimePickerStart.Value, dateTimePickerEnd.Value))
{
MessageBox.Show("Документ сформирован",
"Формирование документа",
MessageBoxButtons.OK,
MessageBoxIcon.Information);
}
else
{
MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах",
"Формирование документа",
MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Ошибка при создании очета",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}

120
ProjectFamilyBudget/ProjectFamilyBudget/Forms/FormMoneyReport.resx Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

4
ProjectFamilyBudget/ProjectFamilyBudget/Forms/FormPeopleExpense.cs
View File

@ -62,8 +62,8 @@ namespace ProjectFamilyBudget.Forms
list.Add(ExpensePeopleExpense.CreateElement(0, Convert.ToInt32(row.Cells["ColumnExpense"].Value)
, Convert.ToInt32(row.Cells["ColumnSum"].Value)));
}
return list;
return list.GroupBy(x => x.ExpenseId, x => x.Sum, (id, counts) =>
ExpensePeopleExpense.CreateElement(0, id, counts.Sum())).ToList();
}
}
}

4
ProjectFamilyBudget/ProjectFamilyBudget/Forms/FormPeopleIncome.cs
View File

@ -63,8 +63,8 @@ namespace ProjectFamilyBudget.Forms
list.Add(IncomePeopleIncome.CreateElement(0, Convert.ToInt32(row.Cells["ColumnIncome"].Value)
, Convert.ToInt32(row.Cells["ColumnSum"].Value)));
}
return list;
return list.GroupBy(x => x.IncomeId, x => x.Sum, (id, counts) =>
IncomePeopleIncome.CreateElement(0, id, counts.Sum())).ToList();
}
}
}

2
ProjectFamilyBudget/ProjectFamilyBudget/ProjectFamilyBudget.csproj
View File

@ -10,11 +10,13 @@
<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.35" />
<PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Npgsql" Version="8.0.5" />
<PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
<PackageReference Include="Serilog" Version="4.1.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />

51
ProjectFamilyBudget/ProjectFamilyBudget/Reports/ChartReport.cs Normal file
View File

@ -0,0 +1,51 @@
using Microsoft.Extensions.Logging;
using ProjectFamilyBudget.Entities;
using ProjectFamilyBudget.Repositories;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectFamilyBudget.Reports;
public class ChartReport
{
private readonly IPeopleExpense _peopleExpense;
private readonly ILogger<ChartReport> _logger;
public ChartReport(IPeopleExpense peopleExpense, ILogger<ChartReport> logger)
{
_peopleExpense = peopleExpense ?? throw new ArgumentNullException(nameof(peopleExpense));
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
}
public bool CreateChart(string filePath, int expenseId, DateTime dateTime)
{
try
{
new PdfBuilder(filePath)
.AddHeader("Траты людей")
.AddPieChart("Виды трат", GetData(expenseId, dateTime))
.Build();
return true;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при формировании документа");
return false;
}
}
private List<(string Caption, double Value)> GetData(int expenseId, DateTime dateTime)
{
return _peopleExpense
.ReadPeopleExpense()
.Where(x => x.DataReciept.Date == dateTime.Date)
.GroupBy(x => x.PeopleId, (key, group) => new
{
Id = key,
Count = group.Sum(x => x.ExpensePeopleExpenses.FirstOrDefault(y => y.ExpenseId == expenseId)?.Sum ?? 0)
})
.Select(x => (x.Id.ToString(), (double)x.Count))
.ToList();
}
}

82
ProjectFamilyBudget/ProjectFamilyBudget/Reports/DocReport.cs Normal file
View File

@ -0,0 +1,82 @@
using Microsoft.Extensions.Logging;
using ProjectFamilyBudget.Repositories;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectFamilyBudget.Reports;
public class DocReport
{
private readonly IPeople _peopleRepository;
private readonly IIncome _incomeRepository;
private readonly IExpense _expenseRepository;
private readonly ILogger<DocReport> _logger;
public DocReport(IPeople peopleRepository, IIncome incomeRepository, IExpense expenseRepository, ILogger<DocReport> logger)
{
_peopleRepository = peopleRepository ?? throw new ArgumentNullException(nameof(peopleRepository));
_incomeRepository = incomeRepository ?? throw new ArgumentNullException(nameof(incomeRepository));
_expenseRepository = expenseRepository ?? throw new ArgumentNullException(nameof(expenseRepository));
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
}
public bool CreateDoc(string filePath, bool includePeoples, bool includeIncomes, bool includeExpenses)
{
try
{
var builder = new WordBuilder(filePath).AddHeader("Документ со справочниками");
if (includePeoples)
{
builder.AddParagraph("Люди").AddTable([2400, 2400, 1200, 2400], GetPeoples());
}
if (includeIncomes)
{
builder.AddParagraph("Доходы").AddTable([2400, 2400, 2400], GetIncomes());
}
if (includeExpenses)
{
builder.AddParagraph("Расходы").AddTable([2400, 2400, 2400], GetExpenses());
}
builder.Build();
return true;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при формировании документа");
return false;
}
}
private List<string[]> GetPeoples()
{
return [
["Имя человека", "Фамилия человека", "Возраст", "Член семьи"],
.. _peopleRepository
.ReadPeople()
.Select(x => new string[] { x.Name, x.LastName, x.Age.ToString(), x.MemberType.ToString() }),
];
}
private List<string[]> GetIncomes()
{
return [
["Тип дохода", "Название", "Категория дохода"],
.. _incomeRepository
.ReadIncome()
.Select(x => new string[] { x.IncomeType.ToString(), x.Name, x.IncomeCategory }),
];
}
private List<string[]> GetExpenses()
{
return [
["Тип расхода", "Название", "Категория расхода"],
.. _expenseRepository
.ReadExpense()
.Select(x => new string[] { x.ExpenseType.ToString(), x.Name, x.ExpenseCategory }),
];
}
}

314
ProjectFamilyBudget/ProjectFamilyBudget/Reports/ExcelBuilder.cs Normal file
View File

@ -0,0 +1,314 @@
using DocumentFormat.OpenXml;
using DocumentFormat.OpenXml.Packaging;
using DocumentFormat.OpenXml.Spreadsheet;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectFamilyBudget.Reports;
public class ExcelBuilder
{
private readonly string _filePath;
private readonly SheetData _sheetData;
private readonly MergeCells _mergeCells;
private readonly Columns _columns;
private uint _rowIndex = 0;
public ExcelBuilder(string filePath)
{
if (string.IsNullOrWhiteSpace(filePath))
{
throw new ArgumentNullException(nameof(filePath));
}
if (File.Exists(filePath))
{
File.Delete(filePath);
}
_filePath = filePath;
_sheetData = new SheetData();
_mergeCells = new MergeCells();
_columns = new Columns();
_rowIndex = 1;
}
public ExcelBuilder AddHeader(string header, int startIndex, int count)
{
CreateCell(startIndex, _rowIndex, header, StyleIndex.BoldTextWithoutBorder);
for (int i = startIndex + 1; i < startIndex + count; ++i)
{
CreateCell(i, _rowIndex, "", StyleIndex.SimpleTextWithoutBorder);
}
_mergeCells.Append(new MergeCell()
{
Reference = new StringValue($"{GetExcelColumnName(startIndex)}{_rowIndex}:{GetExcelColumnName(startIndex + count - 1)}{_rowIndex}")
});
_rowIndex++;
return this;
}
public ExcelBuilder AddParagraph(string text, int columnIndex)
{
CreateCell(columnIndex, _rowIndex++, text, StyleIndex.SimpleTextWithoutBorder);
return this;
}
public ExcelBuilder AddTable(int[] columnsWidths, List<string[]> data)
{
if (columnsWidths == null || columnsWidths.Length == 0)
{
throw new ArgumentNullException(nameof(columnsWidths));
}
if (data == null || data.Count == 0)
{
throw new ArgumentNullException(nameof(data));
}
if (data.Any(x => x.Length != columnsWidths.Length))
{
throw new InvalidOperationException("widths.Length != data.Length");
}
uint counter = 1;
int coef = 2;
_columns.Append(columnsWidths.Select(x => new Column
{
Min = counter,
Max = counter++,
Width = x * coef,
CustomWidth = true
}));
for (var j = 0; j < data.First().Length; ++j)
{
CreateCell(j, _rowIndex, data.First()[j], StyleIndex.BoldTextWithBorder);
}
_rowIndex++;
for (var i = 1; i < data.Count - 1; ++i)
{
for (var j = 0; j < data[i].Length; ++j)
{
CreateCell(j, _rowIndex, data[i][j], StyleIndex.SimpleTextWithBorder);
}
_rowIndex++;
}
for (var j = 0; j < data.Last().Length; ++j)
{
CreateCell(j, _rowIndex, data.Last()[j], StyleIndex.BoldTextWithBorder);
}
_rowIndex++;
return this;
}
public void Build()
{
using var spreadsheetDocument = SpreadsheetDocument.Create(_filePath, SpreadsheetDocumentType.Workbook);
var workbookpart = spreadsheetDocument.AddWorkbookPart();
GenerateStyle(workbookpart);
workbookpart.Workbook = new Workbook();
var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
worksheetPart.Worksheet = new Worksheet();
if (_columns.HasChildren)
{
worksheetPart.Worksheet.Append(_columns);
}
worksheetPart.Worksheet.Append(_sheetData);
var sheets = spreadsheetDocument.WorkbookPart!.Workbook.AppendChild(new Sheets());
var sheet = new Sheet()
{
Id = spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
SheetId = 1,
Name = "Лист 1"
};
sheets.Append(sheet);
if (_mergeCells.HasChildren)
{
worksheetPart.Worksheet.InsertAfter(_mergeCells,
worksheetPart.Worksheet.Elements<SheetData>().First());
}
}
private static void GenerateStyle(WorkbookPart workbookPart)
{
var workbookStylesPart = workbookPart.AddNewPart<WorkbookStylesPart>();
workbookStylesPart.Stylesheet = new Stylesheet();
var fonts = new Fonts()
{
Count = 2,
KnownFonts = BooleanValue.FromBoolean(true)
};
fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
{
FontSize = new FontSize() { Val = 11 },
FontName = new FontName() { Val = "Calibri" },
FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 },
FontScheme = new FontScheme()
{
Val = new EnumValue<FontSchemeValues>(FontSchemeValues.Minor)
}
});
fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
{
FontSize = new FontSize() { Val = 11 },
FontName = new FontName() { Val = "Calibri" },
FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 },
FontScheme = new FontScheme()
{
Val = new EnumValue<FontSchemeValues>(FontSchemeValues.Minor)
},
Bold = new Bold() { Val = true }
});
workbookStylesPart.Stylesheet.Append(fonts);
// Default Fill
var fills = new Fills() { Count = 1 };
fills.Append(new Fill
{
PatternFill = new PatternFill()
{
PatternType = new EnumValue<PatternValues>(PatternValues.None)
}
});
workbookStylesPart.Stylesheet.Append(fills);
// Default Border
var borders = new Borders() { Count = 2 };
borders.Append(new Border
{
LeftBorder = new LeftBorder(),
RightBorder = new RightBorder(),
TopBorder = new TopBorder(),
BottomBorder = new BottomBorder(),
DiagonalBorder = new DiagonalBorder()
});
borders.Append(new Border
{
LeftBorder = new LeftBorder() { Style = BorderStyleValues.Thin },
RightBorder = new RightBorder() { Style = BorderStyleValues.Thin },
TopBorder = new TopBorder() { Style = BorderStyleValues.Thin },
BottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin },
DiagonalBorder = new DiagonalBorder()
});
workbookStylesPart.Stylesheet.Append(borders);
// Default cell format and a date cell format
var cellFormats = new CellFormats() { Count = 4 };
cellFormats.Append(new CellFormat
{
NumberFormatId = 0,
FormatId = 0,
FontId = 0,
BorderId = 0,
FillId = 0,
Alignment = new Alignment()
{
Horizontal = HorizontalAlignmentValues.Left,
Vertical = VerticalAlignmentValues.Center,
WrapText = true
}
});
cellFormats.Append(new CellFormat
{
NumberFormatId = 0,
FormatId = 0,
FontId = 0,
BorderId = 1,
FillId = 0,
Alignment = new Alignment()
{
Horizontal = HorizontalAlignmentValues.Right,
Vertical = VerticalAlignmentValues.Center,
WrapText = true
}
});
cellFormats.Append(new CellFormat
{
NumberFormatId = 0,
FormatId = 0,
FontId = 1,
BorderId = 0,
FillId = 0,
Alignment = new Alignment()
{
Horizontal = HorizontalAlignmentValues.Center,
Vertical = VerticalAlignmentValues.Center,
WrapText = true
}
});
cellFormats.Append(new CellFormat
{
NumberFormatId = 0,
FormatId = 0,
FontId = 1,
BorderId = 1,
FillId = 0,
Alignment = new Alignment()
{
Horizontal = HorizontalAlignmentValues.Center,
Vertical = VerticalAlignmentValues.Center,
WrapText = true
}
});
workbookStylesPart.Stylesheet.Append(cellFormats);
}
private enum StyleIndex
{
SimpleTextWithoutBorder = 0,
SimpleTextWithBorder = 1,
BoldTextWithoutBorder = 2,
BoldTextWithBorder = 3,
}
private void CreateCell(int columnIndex, uint rowIndex, string text, StyleIndex styleIndex)
{
var columnName = GetExcelColumnName(columnIndex);
var cellReference = columnName + rowIndex;
var row = _sheetData.Elements<Row>().FirstOrDefault(r => r.RowIndex! == rowIndex);
if (row == null)
{
row = new Row() { RowIndex = rowIndex };
_sheetData.Append(row);
}
var newCell = row.Elements<Cell>().FirstOrDefault(c => c.CellReference != null &&
c.CellReference.Value == columnName + rowIndex);
if (newCell == null)
{
Cell? refCell = null;
foreach (Cell cell in row.Elements<Cell>())
{
if (cell.CellReference?.Value != null &&
cell.CellReference.Value.Length == cellReference.Length)
{
if (string.Compare(cell.CellReference.Value, cellReference, true) > 0)
{
refCell = cell;
break;
}
}
}
newCell = new Cell() { CellReference = cellReference };
row.InsertBefore(newCell, refCell);
}
newCell.CellValue = new CellValue(text);
newCell.DataType = CellValues.String;
newCell.StyleIndex = (uint)styleIndex;
}
private static string GetExcelColumnName(int columnNumber)
{
columnNumber += 1;
int dividend = columnNumber;
string columnName = string.Empty;
int modulo;
while (dividend > 0)
{
modulo = (dividend - 1) % 26;
columnName = Convert.ToChar(65 + modulo).ToString() + columnName;
dividend = (dividend - modulo) / 26;
}
return columnName;
}
}

90
ProjectFamilyBudget/ProjectFamilyBudget/Reports/PdfBuilder.cs Normal file
View File

@ -0,0 +1,90 @@
using MigraDoc.DocumentObjectModel;
using MigraDoc.DocumentObjectModel.Shapes.Charts;
using MigraDoc.Rendering;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectFamilyBudget.Reports;
public class PdfBuilder
{
private readonly string _filePath;
private readonly Document _document;
public PdfBuilder(string filePath)
{
if (string.IsNullOrWhiteSpace(filePath))
{
throw new ArgumentNullException(nameof(filePath));
}
if (File.Exists(filePath))
{
File.Delete(filePath);
}
_filePath = filePath;
_document = new Document();
DefineStyles();
}
public PdfBuilder AddHeader(string header)
{
_document.AddSection().AddParagraph(header, "NormalBold");
return this;
}
public PdfBuilder AddPieChart(string title, List<(string Caption, double Value)> data)
{
if (data == null || data.Count == 0)
{
return this;
}
var chart = new Chart(ChartType.Pie2D);
var series = chart.SeriesCollection.AddSeries();
series.Add(data.Select(x => x.Value).ToArray());
var xseries = chart.XValues.AddXSeries();
xseries.Add(data.Select(x => x.Caption).ToArray());
chart.DataLabel.Type = DataLabelType.Percent;
chart.DataLabel.Position = DataLabelPosition.OutsideEnd;
chart.Width = Unit.FromCentimeter(16);
chart.Height = Unit.FromCentimeter(12);
chart.TopArea.AddParagraph(title);
chart.XAxis.MajorTickMark = TickMarkType.Outside;
chart.YAxis.MajorTickMark = TickMarkType.Outside;
chart.YAxis.HasMajorGridlines = true;
chart.PlotArea.LineFormat.Width = 1;
chart.PlotArea.LineFormat.Visible = true;
chart.TopArea.AddLegend();
_document.LastSection.Add(chart);
return this;
}
public void Build()
{
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
var renderer = new PdfDocumentRenderer(true)
{
Document = _document
};
renderer.RenderDocument();
renderer.PdfDocument.Save(_filePath);
}
private void DefineStyles()
{
var headerStyle = _document.Styles.AddStyle("NormalBold", "Normal");
headerStyle.Font.Bold = true;
headerStyle.Font.Size = 14;
}
}

60
ProjectFamilyBudget/ProjectFamilyBudget/Reports/TableReport.cs Normal file
View File

@ -0,0 +1,60 @@
using Microsoft.Extensions.Logging;
using ProjectFamilyBudget.Repositories;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectFamilyBudget.Reports;
public class TableReport
{
private readonly IPeopleIncome _peopleIncomeRepository;
private readonly IPeopleExpense _peopleExpenseRepository;
private readonly ILogger<TableReport> _logger;
internal static readonly string[] item = ["Человек", "Дата", "Заработано", "Потрачено"];
public TableReport(IPeopleIncome peopleIncomeRepository, IPeopleExpense peopleExpenseRepository, ILogger<TableReport> logger)
{
_peopleIncomeRepository = peopleIncomeRepository ?? throw new ArgumentNullException(nameof(peopleIncomeRepository));
_peopleExpenseRepository = peopleExpenseRepository ?? throw new ArgumentNullException(nameof(peopleExpenseRepository));
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
}
public bool CreateTable(string filePath, int incomeId, int expenseId, DateTime startDate, DateTime endDate)
{
try
{
new ExcelBuilder(filePath)
.AddHeader("Сводка по движению денег", 0, 4)
.AddParagraph("за период", 0)
.AddTable([15, 10, 15, 15], GetData(incomeId, expenseId, startDate, endDate))
.Build();
return true;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка при формировании документа");
return false;
}
}
private List<string[]> GetData(int incomeId,int expenseId, DateTime startDate, DateTime endDate)
{
var data = _peopleIncomeRepository
.ReadPeopleIncome()
.Where(x => x.DataReciept >= startDate && x.DataReciept <= endDate && x.IncomePeopleIncomes.Any(y => y.IncomeId == incomeId))
.Select(x => new { x.PeopleId, Date = x.DataReciept, CountIn = x.IncomePeopleIncomes.FirstOrDefault(y => y.IncomeId == incomeId)?.Sum, CountOut = (int?)null })
.Union(
_peopleExpenseRepository
.ReadPeopleExpense()
.Where(x => x.DataReciept >= startDate && x.DataReciept <= endDate && x.ExpensePeopleExpenses.Any(y => y.ExpenseId == expenseId))
.Select(x => new { x.PeopleId, Date = x.DataReciept, CountIn = (int?)null, CountOut = x.ExpensePeopleExpenses.FirstOrDefault(y => y.ExpenseId == expenseId)?.Sum }))
.OrderBy(x => x.Date);
return
new List<string[]>() { item }
.Union(data.Select(x => new string[] {x.PeopleId.ToString(), x.Date.ToString(), x.CountIn?.ToString() ?? string.Empty,x.CountOut?.ToString() ?? string.Empty }))
.Union(
[[ "Всего", "", data.Sum(x => x.CountIn ?? 0).ToString(), data.Sum(x => x.CountOut ?? 0).ToString() ]]
)
.ToList();
}
}

134
ProjectFamilyBudget/ProjectFamilyBudget/Reports/WordBuilder.cs Normal file
View File

@ -0,0 +1,134 @@
using DocumentFormat.OpenXml.Packaging;
using DocumentFormat.OpenXml;
using DocumentFormat.OpenXml.Wordprocessing;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectFamilyBudget.Reports;
public class WordBuilder
{
private readonly string _filePath;
private readonly Document _document;
private readonly Body _body;
public WordBuilder(string filePath)
{
if (string.IsNullOrWhiteSpace(filePath))
{
throw new ArgumentNullException(nameof(filePath));
}
if (File.Exists(filePath))
{
File.Delete(filePath);
}
_filePath = filePath;
_document = new Document();
_body = _document.AppendChild(new Body());
}
public WordBuilder AddHeader(string header)
{
var paragraph = _body.AppendChild(new Paragraph());
var run = paragraph.AppendChild(new Run());
var runProperties = run.AppendChild(new RunProperties());
runProperties.AppendChild(new Bold());
run.AppendChild(new Text(header));
return this;
}
public WordBuilder AddParagraph(string text)
{
var paragraph = _body.AppendChild(new Paragraph());
var run = paragraph.AppendChild(new Run());
run.AppendChild(new Text(text));
return this;
}
public WordBuilder AddTable(int[] widths, List<string[]> data)
{
if (widths == null || widths.Length == 0)
{
throw new ArgumentNullException(nameof(widths));
}
if (data == null || data.Count == 0)
{
throw new ArgumentNullException(nameof(data));
}
if (data.Any(x => x.Length != widths.Length))
{
throw new InvalidOperationException("widths.Length != data.Length");
}
var table = new Table();
table.AppendChild(new TableProperties(
new TableBorders(
new TopBorder()
{
Val = new
EnumValue<BorderValues>(BorderValues.Single),
Size = 12
},
new BottomBorder()
{
Val = new
EnumValue<BorderValues>(BorderValues.Single),
Size = 12
},
new LeftBorder()
{
Val = new
EnumValue<BorderValues>(BorderValues.Single),
Size = 12
},
new RightBorder()
{
Val = new
EnumValue<BorderValues>(BorderValues.Single),
Size = 12
},
new InsideHorizontalBorder()
{
Val = new
EnumValue<BorderValues>(BorderValues.Single),
Size = 12
},
new InsideVerticalBorder()
{
Val = new
EnumValue<BorderValues>(BorderValues.Single),
Size = 12
}
)
));
var tr = new TableRow();
for (var j = 0; j < widths.Length; ++j)
{
tr.Append(new TableCell(
new TableCellProperties(new TableCellWidth()
{
Width =
widths[j].ToString()
}),
new Paragraph(new Run(new RunProperties(new Bold()), new
Text(data.First()[j])))));
}
table.Append(tr);
table.Append(data.Skip(1).Select(x =>
new TableRow(x.Select(y => new TableCell(new Paragraph(new Run(new Text(y))))))));
_body.Append(table);
return this;
}
public void Build()
{
using var wordDocument = WordprocessingDocument.Create(_filePath,
WordprocessingDocumentType.Document);
var mainPart = wordDocument.AddMainDocumentPart();
mainPart.Document = _document;
}
}

8
ProjectFamilyBudget/ProjectFamilyBudget/Repositories/Implementations/PeopleExpenseRepository.cs
View File

@ -91,11 +91,13 @@ public class PeopleExpenseRepository : IPeopleExpense
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = "SELECT * FROM PeopleExpense";
var peopleExpenses = connection.Query<PeopleExpense>(querySelect);
var querySelect = @"SELECT pe.*, epe.ExpenseId, epe.Sum FROM PeopleExpense pe
INNER JOIN ExpensePeopleExpense epe on epe.PeopleExpenseId = pe.Id";
var peopleExpenses = connection.Query<TempExpensePeopleExpense>(querySelect);
_logger.LogDebug("Полученные объекты: {json}",
JsonConvert.SerializeObject(peopleExpenses));
return peopleExpenses;
return peopleExpenses.GroupBy(x => x.Id, y => y, (key, value) => PeopleExpense.CreateOperation(value.First(),
value.Select(z => ExpensePeopleExpense.CreateElement(0, z.ExpenseId, z.Sum)))).ToList();
}
catch (Exception ex)
{

11
ProjectFamilyBudget/ProjectFamilyBudget/Repositories/Implementations/PeopleIncomeRepository.cs
View File

@ -94,11 +94,12 @@ public class PeopleIncomeRepository : IPeopleIncome
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = "SELECT * FROM PeopleIncome";
var peopleIncomes = connection.Query<PeopleIncome>(querySelect);
_logger.LogDebug("Полученные объекты: {json}",
JsonConvert.SerializeObject(peopleIncomes));
return peopleIncomes;
var querySelect = @"SELECT pi.*, ipi.IncomeId, ipi.Sum FROM PeopleIncome pi
INNER JOIN IncomePeopleIncome ipi on ipi.PeopleIncomeId = pi.Id";
var peopleIncomes = connection.Query<TempIncomePeopleIncome>(querySelect);
_logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(peopleIncomes));
return peopleIncomes.GroupBy(x => x.Id, y => y, (key, value) => PeopleIncome.CreateOperation(value.First(),
value.Select(z => IncomePeopleIncome.CreateElement(0, z.IncomeId, z.Sum)))).ToList();
}
catch (Exception ex)
{