Skip to content

Commit b2178fa

Browse files
committed
MVC examples view models extracted to separate files
1 parent 159d1ff commit b2178fa

17 files changed

+150
-165
lines changed

src/Examples/Examples.Data/Examples.Data.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,6 @@
133133
<Compile Include="TransactionHistoryArchive.cs" />
134134
<Compile Include="UnitMeasure.cs" />
135135
<Compile Include="Vendor.cs" />
136-
<Compile Include="ViewModels\EmployeeViewModel.cs" />
137-
<Compile Include="ViewModels\PersonViewModel.cs" />
138-
<Compile Include="ViewModels\ProductModelViewModel.cs" />
139-
<Compile Include="ViewModels\ProductViewModel.cs" />
140136
<Compile Include="WorkOrder.cs" />
141137
<Compile Include="WorkOrderRouting.cs" />
142138
</ItemGroup>

src/Examples/Examples.Data/ViewModels/EmployeeViewModel.cs

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/Examples/Examples.Data/ViewModels/PersonViewModel.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/Examples/Examples.Data/ViewModels/ProductModelViewModel.cs

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/Examples/Examples.Data/ViewModels/ProductViewModel.cs

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 2 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
namespace Examples.Mvc.Controllers
22
{
3-
using System;
43
using System.Linq;
54
using System.Web.Mvc;
65
using Examples.Data;
6+
using Examples.Mvc.ViewModels;
77
using JQDT.MVC;
88

99
public class CustomersController : Controller
@@ -31,7 +31,7 @@ public ActionResult GetCustomersData()
3131
Person = new PersonViewModel
3232
{
3333
FirstName = x.Person.FirstName,
34-
LastName = x.Person.LastName,
34+
LastName = x.Person.LastName,
3535
},
3636
Store = new StoreViewModel
3737
{
@@ -42,65 +42,4 @@ public ActionResult GetCustomersData()
4242
return this.View(data);
4343
}
4444
}
45-
46-
public class CustomerViewModel
47-
{
48-
public string AccountNumber { get; set; }
49-
50-
public int CustomerID { get; set; }
51-
52-
public PersonViewModel Person { get; set; }
53-
54-
public StoreViewModel Store { get; set; }
55-
}
56-
57-
public class PersonViewModel
58-
{
59-
public int BusinessEntityID { get; set; }
60-
61-
public string PersonType { get; set; }
62-
63-
public bool NameStyle { get; set; }
64-
65-
public string Title { get; set; }
66-
67-
public string FirstName { get; set; }
68-
69-
public string MiddleName { get; set; }
70-
71-
public string LastName { get; set; }
72-
73-
public string Suffix { get; set; }
74-
75-
public int EmailPromotion { get; set; }
76-
77-
public string AdditionalContactInfo { get; set; }
78-
79-
public string Demographics { get; set; }
80-
81-
public Guid rowguid { get; set; }
82-
83-
public DateTime ModifiedDate { get; set; }
84-
85-
public virtual Employee Employee { get; set; }
86-
87-
public virtual BusinessEntity BusinessEntity { get; set; }
88-
}
89-
90-
public class StoreViewModel
91-
{
92-
public int BusinessEntityID { get; set; }
93-
94-
public string Name { get; set; }
95-
96-
public int? SalesPersonID { get; set; }
97-
98-
public string Demographics { get; set; }
99-
100-
public string rowguid { get; set; }
101-
102-
public DateTime ModifiedDate { get; set; }
103-
104-
public virtual BusinessEntity BusinessEntity { get; set; }
105-
}
10645
}
Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
namespace Examples.Mvc.Controllers
22
{
3-
using System;
43
using System.Linq;
54
using System.Web.Mvc;
65
using Examples.Data;
6+
using Examples.Mvc.ViewModels;
77
using JQDT.MVC;
88

99
public class ProductsController : Controller
@@ -54,53 +54,4 @@ public ActionResult GetProductsData()
5454
return this.View(data);
5555
}
5656
}
57-
58-
public partial class ProductViewModel
59-
{
60-
public string Name { get; set; }
61-
62-
public string Color { get; set; }
63-
64-
public short ReorderPoint { get; set; }
65-
66-
public decimal ListPrice { get; set; }
67-
68-
public int DaysToManufacture { get; set; }
69-
70-
public DateTime SellStartDate { get; set; }
71-
72-
public DateTime? DiscontinuedDate { get; set; }
73-
74-
public virtual UnitMeasureViewModel UnitMeasure { get; set; }
75-
76-
public virtual ProductModelViewModel ProductModel { get; set; }
77-
78-
public virtual ProductSubcategoryViewModel ProductSubcategory { get; set; }
79-
}
80-
81-
public partial class UnitMeasureViewModel
82-
{
83-
public string Name { get; set; }
84-
}
85-
86-
public partial class ProductModelViewModel
87-
{
88-
public string Name { get; set; }
89-
90-
public DateTime? ModifiedDate { get; set; }
91-
}
92-
93-
public partial class ProductSubcategoryViewModel
94-
{
95-
public string Name { get; set; }
96-
97-
public virtual ProductCategoryViewModel ProductCategory { get; set; }
98-
}
99-
100-
public partial class ProductCategoryViewModel
101-
{
102-
public int ProductCategoryID { get; set; }
103-
104-
public string Name { get; set; }
105-
}
10657
}

src/Examples/Examples.Mvc/Controllers/VendorsController.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
using System.Linq;
2-
using System.Web.Mvc;
3-
using Examples.Data;
4-
using Examples.Data.ViewModels;
5-
using JQDT.MVC;
6-
7-
namespace Examples.Mvc.Controllers
1+
namespace Examples.Mvc.Controllers
82
{
3+
using System.Linq;
4+
using System.Web.Mvc;
5+
using Examples.Data;
6+
using JQDT.MVC;
7+
98
public class VendorsController : Controller
109
{
1110
private readonly AdventureWorks context;
1211

1312
public VendorsController()
1413
{
1514
this.context = new Examples.Data.AdventureWorks();
16-
}
15+
}
1716

1817
public ActionResult Index()
1918
{

src/Examples/Examples.Mvc/Examples.Mvc.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,14 @@
154154
<Compile Include="App_Start\BundleConfig.cs" />
155155
<Compile Include="App_Start\FilterConfig.cs" />
156156
<Compile Include="App_Start\RouteConfig.cs" />
157+
<Compile Include="ViewModels\CustomerViewModel.cs" />
158+
<Compile Include="ViewModels\PersonViewModel.cs" />
159+
<Compile Include="ViewModels\StoreViewModel.cs" />
160+
<Compile Include="ViewModels\ProductCategoryViewModel.cs" />
161+
<Compile Include="ViewModels\ProductModelViewModel.cs" />
162+
<Compile Include="ViewModels\ProductSubcategoryViewModel.cs" />
163+
<Compile Include="ViewModels\ProductViewModel.cs" />
164+
<Compile Include="ViewModels\UnitMeasureViewModel.cs" />
157165
<Compile Include="Controllers\VendorsController.cs" />
158166
<Compile Include="Controllers\CustomersController.cs" />
159167
<Compile Include="Controllers\HomeController.cs" />
@@ -263,7 +271,6 @@
263271
</ItemGroup>
264272
<ItemGroup>
265273
<Folder Include="App_Data\" />
266-
<Folder Include="ViewModels\" />
267274
</ItemGroup>
268275
<ItemGroup>
269276
<None Include="packages.config" />
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
namespace Examples.Mvc.ViewModels
2+
{
3+
public class CustomerViewModel
4+
{
5+
public string AccountNumber { get; set; }
6+
7+
public int CustomerID { get; set; }
8+
9+
public PersonViewModel Person { get; set; }
10+
11+
public StoreViewModel Store { get; set; }
12+
}
13+
}

0 commit comments

Comments
 (0)