Skip to content

Commit 7120ae7

Browse files
author
Appeon
committed
Update Source Code
1 parent 6973263 commit 7120ae7

32 files changed

+5536
-5210
lines changed

‎Appeon.DataStoreDemo.Service.SqlServer/Services/Impl/SalesOrderService.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,22 @@ public async Task<int> DeleteByKeyAsync(
3838

3939
salesOrderDetail.RemoveAll(x => x.ProductID > 0);
4040
salesOrder.RemoveAt(0);
41-
42-
await _context.BeginTransactionAsync();
41+
42+
await _context.BeginTransactionAsync(cancellationToken);
4343

4444
int updateCount = 0;
4545

4646
try
4747
{
4848
await salesOrderDetail.UpdateAsync(cancellationToken);
49+
4950
updateCount = await salesOrder.UpdateAsync(cancellationToken);
5051

51-
salesOrder.Update();
52+
await _context.CommitAsync(cancellationToken);
5253
}
5354
catch (System.Exception)
5455
{
55-
await _context.RollbackAsync();
56+
await _context.RollbackAsync(cancellationToken);
5657
}
5758

5859
return updateCount;

‎Appeon.DataStoreDemo.Web/.config/dotnet-tools.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"dotnet-ef": {
6+
"version": "5.0.6",
7+
"commands": [
8+
"dotnet-ef"
9+
]
10+
}
11+
}
12+
}

‎Appeon.DataStoreDemo.Web/Appeon.DataStoreDemo.Web.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<None Remove="Pages\NewFolder\**" />
1212
</ItemGroup>
1313

14-
<ItemGroup>
15-
<ProjectReference Include="..\..\DataStore-Example\Appeon.DataStoreDemo.Service.SqlServer\Appeon.DataStoreDemo.Service.SqlServer.csproj" />
16-
</ItemGroup>
14+
<ItemGroup>
15+
<ProjectReference Include="..\Appeon.DataStoreDemo.Service.SqlServer\Appeon.DataStoreDemo.Service.SqlServer.csproj" />
16+
</ItemGroup>
1717

1818
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
1919
<TypeScriptTarget>ES5</TypeScriptTarget>

‎Appeon.DataStoreDemo.Web/Appeon.DataStoreDemo.Web.csproj.user‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
4+
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
5+
</PropertyGroup>
6+
<PropertyGroup>
7+
<ActiveDebugProfile>Appeon.MvcModelMapperDemo</ActiveDebugProfile>
8+
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
9+
</PropertyGroup>
10+
</Project>

‎Appeon.DataStoreDemo.Web/Models/BasePageModel.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,12 @@ protected void ConvertData(SalesOrder SalesOrder)
7272
}
7373
}
7474
}
75+
76+
protected void DataValidation(SalesOrder SalesOrder)
77+
{
78+
if (SalesOrder.DueDate < SalesOrder.OrderDate || SalesOrder.ShipDate < SalesOrder.OrderDate)
79+
80+
throw new Exception("The \"Due Date\" and \"Ship Date\" must not be less than the \"Order Date\"!");
81+
}
7582
}
7683
}

‎Appeon.DataStoreDemo.Web/Pages/Header.cshtml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<div class="navbar nav_title" style="border: 0;">
2-
<a href="~/Index" class="site_title">
2+
<a href="https://www.appeon.com" class="site_title" target="_blank">
33
<img src="~/images/appeon.svg">
4-
<i class="fa fa-paw"></i> <span>Appeon Demo!</span>
54
</a>
5+
<div>
6+
<i class="fa fa-paw"></i><span>&nbsp;&nbsp;Appeon Demo!</span>
7+
</div>
68
</div>
79
<div class="clearfix"></div>
810
<!-- menu profile quick info -->

‎Appeon.DataStoreDemo.Web/Pages/Index.cshtml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<meta charset="utf-8">
1414
<meta http-equiv="X-UA-Compatible" content="IE=edge">
1515
<meta name="viewport" content="width=device-width, initial-scale=1">
16-
<link rel="icon" href="~/images/favicon.ico" type="image/ico" />
16+
<link rel="icon" href="~/images/RapidSharp.ico" type="image/ico" />
1717

18-
<title>Appeon ModelMapper Demo!</title>
18+
<title>.NET DataStore Razor Pages</title>
1919

2020
<!-- Bootstrap -->
2121
<link href="~/vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
@@ -129,7 +129,7 @@
129129
<!-- footer content -->
130130
<footer>
131131
<div class="pull-right">
132-
Copyright © 2019 Appeon. All rights reserved.
132+
Copyright © 2021 Appeon. All rights reserved.
133133
</div>
134134
<div class="clearfix"></div>
135135
</footer>
@@ -140,12 +140,14 @@
140140
<script src="~/vendors/jquery/dist/jquery.min.js"></script>
141141
<!-- Bootstrap -->
142142
<script src="~/vendors/bootstrap/dist/js/bootstrap.min.js"></script>
143+
<script src="~/lib/bootstrap/dist/js/bootstrap-confirm.js"></script>
143144
<!-- bootstrap-daterangepicker -->
144145
<script src="~/vendors/moment/min/moment.min.js"></script>
145146
<script src="~/vendors/bootstrap-daterangepicker/daterangepicker.js"></script>
146147
<script src="~/vendors/echarts/dist/echarts.min.js"></script>
147148
<!-- Custom Theme Scripts -->
148149
<script src="~/js/custom.min.js"></script>
150+
<script src="~/js/bootstarpbox.js"></script>
149151
<script>
150152
$(document).ready(function () {
151153
var Json_Categorys = @Html.Raw(Model.categoryReportByYear.Json_Categorys);

‎Appeon.DataStoreDemo.Web/Pages/Index.cshtml.cs‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ private async Task queryTotalReportAsync()
4646
{
4747
totalData = await _reportService.SearchReportForSalesOrderTotalAsync();
4848
//转换json
49-
String Json_totalData = Newtonsoft.Json.JsonConvert.SerializeObject(totalData);
49+
var Json_totalData = Newtonsoft.Json.JsonConvert.SerializeObject(totalData);
5050
categoryReportByYear.Json_totalData = Json_totalData;
5151
}
5252

5353
private async Task queryPieReportAsync(CancellationToken cancellationToken = default)
5454
{
55-
String curDate = "2013-01-01";
55+
var curDate = "2013-01-01";
5656
var curYear = DateTime.Parse(curDate).Year.ToString();
5757
var lastYear = DateTime.Parse(curDate).AddYears(-1).Year.ToString();
5858
var masterModel = new CategorySalesReportByYear();
@@ -61,12 +61,14 @@ private async Task queryPieReportAsync(CancellationToken cancellationToken = def
6161
categoryReportByYear = await _reportService
6262
.SearchReportForSales(masterModel, subModel, curYear, lastYear, cancellationToken);
6363

64+
var salesReportByCategory = categoryReportByYear
65+
.SalesReportByCategory
66+
.OrderBy(a => a.ProductCategoryName);
67+
6468
//转换json
65-
String categorys = JsonConvert.SerializeObject(categoryReportByYear.SalesReportByCategory
66-
.Select(x => x.ProductCategoryName));
69+
var categorys = JsonConvert.SerializeObject(salesReportByCategory.Select(x => x.ProductCategoryName));
6770

68-
String categorysData = JsonConvert.SerializeObject(categoryReportByYear.SalesReportByCategory
69-
.Select(x => new
71+
var categorysData = JsonConvert.SerializeObject(salesReportByCategory.Select(x => new
7072
{
7173
name = x.ProductCategoryName,
7274
value = x.TotalSalesqty
@@ -109,11 +111,13 @@ private async Task queryBarReportByYearAsnyc(CancellationToken cancellationToken
109111
/// <param name="yearMonth"></param>
110112
private void ConvertDataForReport(ProductCategorySalesReport productCategorySalesReport, object[] yearMonth)
111113
{
112-
List<string> ProCategoryName = productCategorySalesReport
114+
var ProCategoryName = productCategorySalesReport
113115
.OrderReportMonth1
114116
.Select(x => x.ProductCategoryName)
115117
.ToList();
116118

119+
ProCategoryName.Sort();
120+
117121
List<int> salesQtys = null;
118122
Dictionary<string, List<int>> result = new Dictionary<string, List<int>>();
119123
foreach (var name in ProCategoryName)
@@ -134,8 +138,8 @@ private void ConvertDataForReport(ProductCategorySalesReport productCategorySale
134138
result.Add(name, salesQtys);
135139
}
136140

137-
String proCat = JsonConvert.SerializeObject(ProCategoryName);
138-
String proCatQty = JsonConvert.SerializeObject(result
141+
var proCat = JsonConvert.SerializeObject(ProCategoryName);
142+
var proCatQty = JsonConvert.SerializeObject(result
139143
.Select(x => new
140144
{
141145
name = x.Key,

‎Appeon.DataStoreDemo.Web/Pages/Login.cshtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<meta charset="utf-8">
1313
<meta http-equiv="X-UA-Compatible" content="IE=edge">
1414
<meta name="viewport" content="width=device-width, initial-scale=1">
15-
<link rel="icon" href="~/images/favicon.ico" type="image/ico" />
15+
<link rel="icon" href="~/images/RapidSharp.ico" type="image/ico" />
1616

1717
<title>Appeon ModelMapper Demo </title>
1818

@@ -42,9 +42,9 @@
4242
<div class="login_wrapper">
4343
<div class="animate form login_form">
4444
<form class="form-horizontal form-label-left input_mask" method="post" id="loginForm">
45-
<div class="col-xs-12 form-group text-center">
45+
@*<div class="col-xs-12 form-group text-center">
4646
<img src="~/images/snap_logo.svg">
47-
</div>
47+
</div>*@
4848
<div class="col-xs-12 form-group has-feedback">
4949
<input type="text" class="form-control has-feedback-left" asp-for="Login.Firstname" placeholder="Username">
5050
<span class="fa fa-user form-control-feedback left" aria-hidden="true"></span>

‎Appeon.DataStoreDemo.Web/Pages/Profile.cshtml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
<div class="nav_menu">
33
<nav>
44
<div class="nav toggle">
5-
<a id="menu_toggle"><i class="fa fa-bars"></i></a>
6-
5+
<a id="menu_toggle"><i class="fa fa-close"></i></a>
76
</div>
87
<ul class="nav navbar-nav navbar-right">
98

@@ -14,7 +13,7 @@
1413

1514
</a>
1615
<ul class="dropdown-menu dropdown-usermenu pull-right">
17-
<li><a href="">Help</a></li>
16+
@*<li><a href="">Help</a></li>*@
1817
<li><a href="~/Login"><i class="fa fa-sign-out pull-right"></i> Log Out</a></li>
1918
</ul>
2019
</li>

0 commit comments

Comments
 (0)