This commit is contained in:
Danil Markov 2023-04-10 20:21:33 +04:00
parent 8bd3c5138a
commit e6867ecc4c
7 changed files with 634 additions and 625 deletions

View File

@ -51,7 +51,7 @@ namespace LawFirmBusinessLogic.BusinessLogics
{
record.Blanks.Add(new Tuple<string, int>(blank.BlankName, document.DocumentBlanks[blank.Id].Item2));
record.TotalCount +=
document.DocumentBlanks[blank.Id].Item2;
document.DocumentBlanks[blank.Id].Item2;
}
}
list.Add(record);

View File

@ -23,10 +23,10 @@ namespace LawFirmBusinessLogic.OfficePackage
= "Normal",
ParagraphAlignment = PdfParagraphAlignmentType.Center
});
CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm" });
CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "3cm" });
CreateRow(new PdfRowParameters
{
Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Сумма" },
Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Статус заказа", "Сумма" },
Style = "NormalTitle",
ParagraphAlignment = PdfParagraphAlignmentType.Center
});
@ -34,7 +34,7 @@ namespace LawFirmBusinessLogic.OfficePackage
{
CreateRow(new PdfRowParameters
{
Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.DocumentName, order.Sum.ToString() },
Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.DocumentName, order.OrderStatus, order.Sum.ToString() },
Style = "Normal",
ParagraphAlignment = PdfParagraphAlignmentType.Left
});

View File

@ -102,8 +102,7 @@ namespace LawFirmBusinessLogic.OfficePackage.Implements
docRun.AppendChild(new Text
{
Text = run.Item1,
Space =
SpaceProcessingModeValues.Preserve
Space = SpaceProcessingModeValues.Preserve
});
docParagraph.AppendChild(docRun);
}

View File

@ -29,25 +29,27 @@
</div>
</div>
</form>
<script>
$('#document').on('change', function () {
check();
});
$('#count').on('change', function () {
check();
});
function check() {
var count = $('#count').val();
var document = $('#document').val();
if (count && document) {
$.ajax({
method: "POST",
url: "/Home/Calc",
data: { count: count, document: document },
success: function (result) {
$("#sum").val(result);
}
});
};
}
</script>
@section scripts{
<script>
$('#document').on('change', function () {
check();
});
$('#count').on('change', function () {
check();
});
function check() {
var count = $('#count').val();
var document = $('#document').val();
if (count && document) {
$.ajax({
method: "POST",
url: "/Home/Calc",
data: { count: count, document: document },
success: function (result) {
$("#sum").val(result);
}
});
};
}
</script>
}

View File

@ -32,7 +32,9 @@ namespace LawFirmDatabaseImplement.Implements
&& x.Password.Equals(model.Password))
?.GetViewModel;
if (model.Email != null)
return context.Clients.FirstOrDefault(x => x.Email.Equals(model.Email))?.GetViewModel;
return context.Clients
.FirstOrDefault(x => x.Email
.Equals(model.Email))?.GetViewModel;
return null;
}

View File

@ -27,4 +27,10 @@
<ProjectReference Include="..\LawFirmListImplement\LawFirmListImplement.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="ReportOrders.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>

File diff suppressed because it is too large Load Diff