Skip to content

Commit 11bdfd4

Browse files
arman-boyakhchyanarman-boyakhchyan
committed
Add FW Fixes & Update to Fluent
1 parent fcfd6e1 commit 11bdfd4

17 files changed

Lines changed: 4997 additions & 611 deletions

File tree

‎ASP.NET Core/Views/Home/Index.cshtml‎

Lines changed: 77 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,85 @@
11
@using ASP_NET_Core.Models
22
@using DevExtreme.AspNet.Mvc.Factories
33

4-
@(Html.DevExtreme().DataGrid<Employee>()
5-
.ID("grid-container")
6-
.DataSource(d => d
7-
.Mvc().Controller("EmployeeData")
8-
.LoadAction("Get")
9-
.Key("EmployeeID")
10-
)
11-
.AllowColumnResizing(true)
12-
.ColumnAutoWidth(true)
13-
.ColumnFixing(c => c.Enabled(true))
14-
.AllowColumnReordering(true)
15-
.ColumnChooser(c => c.Enabled(true))
16-
.Columns(columns => {
17-
columns.AddFor(m => m.FullName)
18-
.Fixed(true)
19-
.ValidationRules(v => v.AddRequired());
20-
columns.AddFor(m => m.Position)
21-
.ValidationRules(v => v.AddRequired());
22-
columns.AddFor(m => m.BirthDate)
23-
.DataType(GridColumnDataType.Date)
24-
.Width(100)
25-
.ValidationRules(v => v.AddRequired());
26-
columns.AddFor(m => m.HireDate)
27-
.DataType(GridColumnDataType.Date)
28-
.Width(100)
29-
.ValidationRules(v => v.AddRequired());
30-
columns.AddFor(m => m.Country)
31-
.GroupIndex(0)
32-
.SortOrder(SortOrder.Asc)
33-
.ValidationRules(v => v.AddRequired());
34-
columns.AddFor(m => m.Address);
35-
columns.AddFor(m => m.HomePhone);
36-
columns.AddFor(m => m.PostalCode).Visible(false);
37-
})
38-
.FilterRow(f => f.Visible(true))
39-
.SearchPanel(s => s.Visible(true))
40-
.GroupPanel(p => p.Visible(true))
41-
.Selection(s => s.Mode(SelectionMode.Single))
42-
.OnSelectionChanged("handleSelectionChanged")
43-
.Summary(s => s
44-
.GroupItems(groupItems => {
45-
groupItems.Add().SummaryType(SummaryType.Count);
4+
<div id="app-container">
5+
@(Html.DevExtreme().DataGrid<Employee>()
6+
.ID("grid-container")
7+
.DataSource(d => d
8+
.Mvc().Controller("EmployeeData")
9+
.LoadAction("Get")
10+
.Key("EmployeeID")
11+
)
12+
.AllowColumnResizing(true)
13+
.ColumnAutoWidth(true)
14+
.ColumnFixing(c => c.Enabled(true))
15+
.AllowColumnReordering(true)
16+
.ColumnChooser(c => c.Enabled(true))
17+
.Columns(columns => {
18+
columns.AddFor(m => m.FullName)
19+
.Fixed(true)
20+
.ValidationRules(v => v.AddRequired());
21+
columns.AddFor(m => m.Position)
22+
.ValidationRules(v => v.AddRequired());
23+
columns.AddFor(m => m.BirthDate)
24+
.DataType(GridColumnDataType.Date)
25+
.Width(100)
26+
.ValidationRules(v => v.AddRequired());
27+
columns.AddFor(m => m.HireDate)
28+
.DataType(GridColumnDataType.Date)
29+
.Width(100)
30+
.ValidationRules(v => v.AddRequired());
31+
columns.AddFor(m => m.Country)
32+
.GroupIndex(0)
33+
.SortOrder(SortOrder.Asc)
34+
.ValidationRules(v => v.AddRequired());
35+
columns.AddFor(m => m.Address);
36+
columns.AddFor(m => m.HomePhone);
37+
columns.AddFor(m => m.PostalCode).Visible(false);
4638
})
39+
.FilterRow(f => f.Visible(true))
40+
.SearchPanel(s => s.Visible(true))
41+
.GroupPanel(p => p.Visible(true))
42+
.Selection(s => s.Mode(SelectionMode.Single))
43+
.OnSelectionChanged("handleSelectionChanged")
44+
.Summary(s => s
45+
.GroupItems(groupItems => {
46+
groupItems.Add().SummaryType(SummaryType.Count);
47+
})
48+
)
49+
.Editing(e => e
50+
.Mode(GridEditMode.Popup)
51+
.AllowAdding(true)
52+
.AllowDeleting(true)
53+
.AllowUpdating(true)
54+
)
55+
@* .Grouping(g => g.AutoExpandAll()) *@
56+
.Toolbar(t => t.Items(items => {
57+
items.Add().Name(DataGridToolbarItem.GroupPanel);
58+
items.Add()
59+
.Location(ToolbarItemLocation.After)
60+
.Widget(w => w.Button()
61+
.Text("Collapse All")
62+
.Width(136)
63+
.OnClick("handleCollapseAllButtonClick")
64+
);
65+
items.Add().Name(DataGridToolbarItem.AddRowButton).ShowText(ToolbarItemShowTextMode.Always);
66+
items.Add().Name(DataGridToolbarItem.ExportButton);
67+
items.Add().Name(DataGridToolbarItem.ColumnChooserButton);
68+
items.Add().Name(DataGridToolbarItem.SearchPanel);
69+
}))
70+
.MasterDetail(m => m
71+
.Enabled(true)
72+
.Template(new JS ("masterDetailTemplate"))
73+
)
74+
.Export(e => e
75+
.Enabled(true)
76+
.Formats(new[] { DataGridExportFormat.Pdf, DataGridExportFormat.Xlsx })
77+
)
78+
.OnExporting("handleDataGridExporting")
79+
.RemoteOperations(true)
4780
)
48-
.Editing(e => e
49-
.Mode(GridEditMode.Popup)
50-
.AllowAdding(true)
51-
.AllowDeleting(true)
52-
.AllowUpdating(true)
53-
)
54-
@* .Grouping(g => g.AutoExpandAll()) *@
55-
.Toolbar(t => t.Items(items => {
56-
items.Add().Name(DataGridToolbarItem.GroupPanel);
57-
items.Add()
58-
.Location(ToolbarItemLocation.After)
59-
.Widget(w => w.Button()
60-
.Text("Collapse All")
61-
.Width(136)
62-
.OnClick("handleCollapseAllButtonClick")
63-
);
64-
items.Add().Name(DataGridToolbarItem.AddRowButton).ShowText(ToolbarItemShowTextMode.Always);
65-
items.Add().Name(DataGridToolbarItem.ExportButton);
66-
items.Add().Name(DataGridToolbarItem.ColumnChooserButton);
67-
items.Add().Name(DataGridToolbarItem.SearchPanel);
68-
}))
69-
.MasterDetail(m => m
70-
.Enabled(true)
71-
.Template(new JS ("masterDetailTemplate"))
72-
)
73-
.Export(e => e
74-
.Enabled(true)
75-
.Formats(new[] { DataGridExportFormat.Pdf, DataGridExportFormat.Xlsx })
76-
)
77-
.OnExporting("handleDataGridExporting")
78-
.RemoteOperations(true)
79-
)
81+
<p id="selected-employee"></p>
82+
</div>
8083

8184
<script>
8285
function handleSelectionChanged(e) {

‎ASP.NET Core/gulpfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ let defaultScripts = [
3737
let dxtStyles = [
3838
"node_modules/bootstrap/dist/css/bootstrap.css",
3939
"node_modules/devextreme-dist/css/dx.common.css",
40-
"node_modules/devextreme-dist/css/dx.material.blue.dark.css"],
40+
"node_modules/devextreme-dist/css/dx.fluent.blue.light.css"],
4141
ganttStyles = ["node_modules/devexpress-gantt/dist/dx-gantt.min.css"],
4242
diagramStyles = ["node_modules/devexpress-diagram/dist/dx-diagram.min.css"];
4343

‎ASP.NET Core/wwwroot/css/Site.css‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.demo-container {
2-
margin: 50px;
3-
width: 90vw;
2+
margin: 50px;
43
}
4+
55
body {
6-
margin: 8px;
6+
margin: 8px;
77
}
88

99
.employee-photo {
@@ -21,8 +21,13 @@ body {
2121
height: 500px;
2222
}
2323

24+
#app-container {
25+
position: relative;
26+
}
27+
2428
#selected-employee {
2529
position: absolute;
30+
margin-top: 16px;
2631
left: 50%;
2732
transform: translate(-50%, 0);
2833
}

‎Angular/angular.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"src/assets"
3838
],
3939
"styles": [
40-
"node_modules/devextreme/dist/css/dx.material.blue.light.compact.css",
40+
"node_modules/devextreme/dist/css/dx.fluent.blue.light.css",
4141
"src/styles.scss"
4242
],
4343
"scripts": []

0 commit comments

Comments
 (0)