Skip to content

Commit dbbe24a

Browse files
Redey1290Redey1290
committed
Refactor work order index
1 parent d4d08fc commit dbbe24a

File tree

1 file changed

+52
-85
lines changed

1 file changed

+52
-85
lines changed

‎src/Dsp.WebCore/Areas/House/Views/WorkOrders/Index.cshtml‎

Lines changed: 52 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,15 @@
3232
closedFilter.closed = !Model.Filter.closed;
3333

3434
var pagerModel = new PagerModel
35-
{
36-
Previous = previousPageFilter,
37-
Incrementer = Model.Filter,
38-
Next = nextPageFilter,
39-
CurrentPage = Model.Filter.page,
40-
PageSize = Model.Filter.pageSize,
41-
ResultCount = Model.ResultCount,
42-
TotalPages = Model.TotalPages
43-
};
44-
45-
var elevatedPermissions =
46-
User.IsInRole("Administrator") ||
47-
User.IsInRole("House Manager") ||
48-
User.IsInRole("ACB House Manager");
35+
{
36+
Previous = previousPageFilter,
37+
Incrementer = Model.Filter,
38+
Next = nextPageFilter,
39+
CurrentPage = Model.Filter.page,
40+
PageSize = Model.Filter.pageSize,
41+
ResultCount = Model.ResultCount,
42+
TotalPages = Model.TotalPages
43+
};
4944
}
5045

5146
<div class="container-fluid">
@@ -64,7 +59,7 @@
6459
</div>
6560
<div class="col">
6661
<div class="dropdown">
67-
<a class="btn btn-secondary dropdown-toggle" role="button" data-bs-toggle="dropdown" aria-expanded="false">
62+
<a class="btn btn-outline-dark dropdown-toggle" role="button" data-bs-toggle="dropdown" aria-expanded="false">
6863
Sort
6964
</a>
7065

@@ -95,82 +90,54 @@
9590
</div>
9691
<div class="col text-end">
9792
<a href="@Url.Action("Create", "WorkOrders")" class="btn btn-success">Create</a>
98-
@if (elevatedPermissions)
99-
{
100-
<button type="button" class="btn btn-default dropdown-toggle"
101-
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
102-
<span class="caret"></span>
103-
<span class="sr-only">Toggle Dropdown</span>
104-
</button>
105-
<ul class="dropdown-menu dropdown-menu-right">
106-
<li>
107-
<a href="@Url.Action("CreateOld", "WorkOrders", new {area = "House"})" class="">
108-
Create Past Work Order
109-
</a>
110-
</li>
111-
@if (User.IsInRole("Administrator"))
112-
{
113-
<li>
114-
<a href="@Url.Action("Index", "WorkOrderPriorities", new {area = "House"})" class="">
115-
Priorities
116-
</a>
117-
</li>
118-
<li>
119-
<a href="@Url.Action("Index", "WorkOrderStatuses", new {area = "House"})" class="">
120-
Statuses
121-
</a>
122-
</li>
123-
}
124-
</ul>
125-
}
12693
</div>
12794
</div>
128-
@if (Model.WorkOrders.Any())
129-
{
130-
<div class="card">
131-
<div class="card-header">
132-
<i class="fa fa-exclamation-circle"></i> @Model.OpenCount <small>Open</small>
133-
<i class="fa fa-check-circle ps-2"></i> @Model.ClosedCount <small>Closed</small>
134-
@if (!string.IsNullOrEmpty(Model.Filter.s))
135-
{
136-
<i class="fa fa-magnifying-glass ps-2"></i> <small>Search term: <em>@Model.Filter.s</em></small>
137-
}
138-
</div>
95+
@if (Model.WorkOrders.Any())
96+
{
97+
<div class="card">
98+
<div class="card-header">
99+
<i class="fa fa-exclamation-circle"></i> @Model.OpenCount <small>Open</small>
100+
<i class="fa fa-check-circle ps-2"></i> @Model.ClosedCount <small>Closed</small>
101+
@if (!string.IsNullOrEmpty(Model.Filter.s))
102+
{
103+
<i class="fa fa-magnifying-glass ps-2"></i> <small>Search term: <em>@Model.Filter.s</em></small>
104+
}
105+
</div>
139106

140-
<ul class="list-group list-group-flush">
141-
@foreach (var w in Model.WorkOrders)
142-
{
143-
var status = w.IsOpen ? "Open" : "Closed";
144-
var statusLabelColor = w.IsOpen ? "bg-warning" : "bg-success";
145-
var timeSinceCreation = (DateTime.UtcNow - w.CreatedOn).ToUserFriendlyString();
107+
<ul class="list-group list-group-flush">
108+
@foreach (var w in Model.WorkOrders)
109+
{
110+
var status = w.IsOpen ? "Open" : "Closed";
111+
var statusLabelColor = w.IsOpen ? "bg-warning" : "bg-success";
112+
var timeSinceCreation = (DateTime.UtcNow - w.CreatedOn).ToUserFriendlyString();
146113

147-
<a href="@Url.Action("Details", new {id = w.WorkOrderId})" class="list-group-item">
148-
<div class="fw-bold">
149-
@w.Title
150-
<span class="badge @statusLabelColor float-end">
151-
@status
152-
</span>
153-
</div>
114+
<a href="@Url.Action("Details", new {id = w.WorkOrderId})" class="list-group-item">
115+
<div class="fw-bold">
116+
@w.Title
117+
<span class="badge @statusLabelColor float-end">
118+
@status
119+
</span>
120+
</div>
154121

155-
opened @timeSinceCreation
156-
@if (w.IsClosed)
157-
{
158-
var timeSinceClosure = (DateTime.UtcNow - w.ClosedOn.Value).ToUserFriendlyString();
122+
opened @timeSinceCreation
123+
@if (w.IsClosed)
124+
{
125+
var timeSinceClosure = (DateTime.UtcNow - w.ClosedOn.Value).ToUserFriendlyString();
159126

160-
@:| closed @timeSinceClosure
161-
}
162-
</a>
163-
}
164-
</ul>
165-
<partial name="~/Views/Shared/_PagerPartial.cshtml" model="pagerModel"></partial>
166-
</div>
167-
}
168-
else
169-
{
170-
<div class="alert alert-warning">
171-
No work orders found.
172-
</div>
173-
}
127+
@:| closed @timeSinceClosure
128+
}
129+
</a>
130+
}
131+
</ul>
132+
<partial name="~/Views/Shared/_PagerPartial.cshtml" model="pagerModel"></partial>
133+
</div>
134+
}
135+
else
136+
{
137+
<div class="alert alert-warning">
138+
No work orders found.
139+
</div>
140+
}
174141
</div>
175142
</div>
176143
</div>

0 commit comments

Comments
 (0)