fix
This commit is contained in:
parent
8bd3c5138a
commit
e6867ecc4c
LawFirm
LawFirmBusinessLogic
LawFirmClientApp/Views/Home
LawFirmDatabaseImplement/Implements
LawFirmView
@ -51,7 +51,7 @@ namespace LawFirmBusinessLogic.BusinessLogics
|
|||||||
{
|
{
|
||||||
record.Blanks.Add(new Tuple<string, int>(blank.BlankName, document.DocumentBlanks[blank.Id].Item2));
|
record.Blanks.Add(new Tuple<string, int>(blank.BlankName, document.DocumentBlanks[blank.Id].Item2));
|
||||||
record.TotalCount +=
|
record.TotalCount +=
|
||||||
document.DocumentBlanks[blank.Id].Item2;
|
document.DocumentBlanks[blank.Id].Item2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
list.Add(record);
|
list.Add(record);
|
||||||
|
@ -23,10 +23,10 @@ namespace LawFirmBusinessLogic.OfficePackage
|
|||||||
= "Normal",
|
= "Normal",
|
||||||
ParagraphAlignment = PdfParagraphAlignmentType.Center
|
ParagraphAlignment = PdfParagraphAlignmentType.Center
|
||||||
});
|
});
|
||||||
CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm" });
|
CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "3cm" });
|
||||||
CreateRow(new PdfRowParameters
|
CreateRow(new PdfRowParameters
|
||||||
{
|
{
|
||||||
Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Сумма" },
|
Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Статус заказа", "Сумма" },
|
||||||
Style = "NormalTitle",
|
Style = "NormalTitle",
|
||||||
ParagraphAlignment = PdfParagraphAlignmentType.Center
|
ParagraphAlignment = PdfParagraphAlignmentType.Center
|
||||||
});
|
});
|
||||||
@ -34,7 +34,7 @@ namespace LawFirmBusinessLogic.OfficePackage
|
|||||||
{
|
{
|
||||||
CreateRow(new PdfRowParameters
|
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",
|
Style = "Normal",
|
||||||
ParagraphAlignment = PdfParagraphAlignmentType.Left
|
ParagraphAlignment = PdfParagraphAlignmentType.Left
|
||||||
});
|
});
|
||||||
|
@ -102,8 +102,7 @@ namespace LawFirmBusinessLogic.OfficePackage.Implements
|
|||||||
docRun.AppendChild(new Text
|
docRun.AppendChild(new Text
|
||||||
{
|
{
|
||||||
Text = run.Item1,
|
Text = run.Item1,
|
||||||
Space =
|
Space = SpaceProcessingModeValues.Preserve
|
||||||
SpaceProcessingModeValues.Preserve
|
|
||||||
});
|
});
|
||||||
docParagraph.AppendChild(docRun);
|
docParagraph.AppendChild(docRun);
|
||||||
}
|
}
|
||||||
|
@ -29,25 +29,27 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<script>
|
@section scripts{
|
||||||
$('#document').on('change', function () {
|
<script>
|
||||||
check();
|
$('#document').on('change', function () {
|
||||||
});
|
check();
|
||||||
$('#count').on('change', function () {
|
});
|
||||||
check();
|
$('#count').on('change', function () {
|
||||||
});
|
check();
|
||||||
function check() {
|
});
|
||||||
var count = $('#count').val();
|
function check() {
|
||||||
var document = $('#document').val();
|
var count = $('#count').val();
|
||||||
if (count && document) {
|
var document = $('#document').val();
|
||||||
$.ajax({
|
if (count && document) {
|
||||||
method: "POST",
|
$.ajax({
|
||||||
url: "/Home/Calc",
|
method: "POST",
|
||||||
data: { count: count, document: document },
|
url: "/Home/Calc",
|
||||||
success: function (result) {
|
data: { count: count, document: document },
|
||||||
$("#sum").val(result);
|
success: function (result) {
|
||||||
}
|
$("#sum").val(result);
|
||||||
});
|
}
|
||||||
};
|
});
|
||||||
}
|
};
|
||||||
</script>
|
}
|
||||||
|
</script>
|
||||||
|
}
|
@ -32,7 +32,9 @@ namespace LawFirmDatabaseImplement.Implements
|
|||||||
&& x.Password.Equals(model.Password))
|
&& x.Password.Equals(model.Password))
|
||||||
?.GetViewModel;
|
?.GetViewModel;
|
||||||
if (model.Email != null)
|
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;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,4 +27,10 @@
|
|||||||
<ProjectReference Include="..\LawFirmListImplement\LawFirmListImplement.csproj" />
|
<ProjectReference Include="..\LawFirmListImplement\LawFirmListImplement.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Update="ReportOrders.rdlc">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user