Grigorii_Zagidulin/PIbd-22_Zagidulin_G.A._Workshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PIbd-22 ZagidulinG.A. LabWork04 #4

Closed
Grigorii_Zagidulin wants to merge 5 commits from Lab4 into Lab3
pull from: Lab4
merge into: Grigorii_Zagidulin:Lab3
Conversation 1 Commits 5 Files Changed 22 +7 -7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9cfe868c17 - Show all commits

2
Workshop/Forms/FormCheque.cs
View File

@ -58,7 +58,7 @@ namespace Workshop.Forms
return list.GroupBy(
x => x.ProductId,
x => x.Amount,
(id, counts) => ChequeProduct.CreateEntity(0, id, counts.Sum())).ToList();
(id, counts) => ChequeProduct.CreateEntity(id, 0, counts.Sum())).ToList();
}
}
}

6
Workshop/Reports/ChartReport.cs
View File

@ -44,12 +44,12 @@ internal class ChartReport
{
return _creatingRepository
.ReadProductCreates(dateFrom: dateTimeStart, dateTo: dateTimeEnd)
.GroupBy(x => x.ProductId, (key, group) => new
.GroupBy(x => x.ProductName, (key, group) => new
{
Id = key,
ProductName = key,
Count = group.Count()
})
.Select(x => (x.Id.ToString(), (double)x.Count))
.Select(x => (x.ProductName.ToString(), (double)x.Count))
.ToList();
}
}

6
Workshop/Repositories/Implementations/ChequeRepository.cs
View File

@ -43,7 +43,7 @@ INSERT INTO CHEQUE_PRODUCT (ProductID, ChequeID, Amount)
VALUES (@ProductId, @ChequeID, @Amount)";
foreach (var elem in cheque.ChequeProduct)
{
connection.Execute(querySubInsert, new {chequeId, elem.ProductId, elem.Amount});
connection.Execute(querySubInsert, new { elem.ProductId, chequeId, elem.Amount});
}
transaction.Commit();
}
@ -61,9 +61,9 @@ VALUES (@ProductId, @ChequeID, @Amount)";
{
var builder = new QueryBuilder();
if (dateFrom.HasValue)
builder.AddCondition("cp.CreatingDate >= @dateFrom");
builder.AddCondition("c.Date >= @dateFrom");
if (dateTo.HasValue)
builder.AddCondition("cp.CreatingDate <= @dateTo");
builder.AddCondition("c.Date <= @dateTo");
if (productId.HasValue)
builder.AddCondition("cp.ProductId = @productId");
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);