Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate dispatcher page for admin #58

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CheckDrive.Web/CheckDrive.Web/CheckDrive.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
<Compile Include="Controllers\OperatorsController.cs" />
<Compile Include="Controllers\TechniciansController.cs" />


<PackageReference Include="CheckDrive.ApiContracts" Version="1.2.1" />
<PackageReference Include="CheckDrive.ApiContracts" Version="1.2.2" />
<PackageReference Include="CheckDrive.DTOs" Version="1.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using CheckDrive.Web.Models;
 using CheckDrive.Web.Models;
using CheckDrive.Web.Stores.DispatcherReviews;
using Microsoft.AspNetCore.Mvc;

Expand All @@ -13,10 +13,38 @@ public DispatcherReviewsController(IDispatcherReviewDataStore dispatcherReviewDa
_dispatcherReviewDataStore = dispatcherReviewDataStore;
}

public async Task<IActionResult> Index()
public async Task<IActionResult> Index(int? pagenumber)
{
var reviews = await _dispatcherReviewDataStore.GetDispatcherReviews();
return View(reviews);
var response = await _dispatcherReviewDataStore.GetDispatcherReviews(pagenumber);


if (response is null)
{
return BadRequest();
}
ViewBag.PageSize = response.PageSize;
ViewBag.PageCount = response.TotalPages;
ViewBag.TotalCount = response.TotalCount;
ViewBag.CurrentPage = response.PageNumber;
ViewBag.HasPreviousPage = response.HasPreviousPage;
ViewBag.HasNextPage = response.HasNextPage;

var dispatcherReviewResponse = response.Data.Select(r => new
{
r.Id,
FuelSpended = r.FuelSpended.ToString("0.00").PadLeft(4, '0'),
r.DistanceCovered,
r.Date,
r.CarMeduimFuelConsumption,
r.CarName,
r.DispatcherName,
r.MechanicName,
r.OperatorName,
r.DriverName
}).ToList();

ViewBag.DispatcherReviews = dispatcherReviewResponse;
return View();
}

public async Task<IActionResult> Details(int id)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static IServiceCollection ConfigureDataStores(this IServiceCollection ser
{
services.AddScoped<IAccountDataStore, AccountDataStore>();
services.AddScoped<ICarDataStore, CarDataStore>();
services.AddScoped<IDispatcherReviewDataStore, MockDispatcherReviewDataStore>();
services.AddScoped<IDispatcherReviewDataStore, DispatcherReviewDataStore>();
services.AddScoped<IDispatcherDataStore, MockDispatcherDataStore>();
services.AddScoped<IDoctorDataStore, DoctorDataStore>();
services.AddScoped<IDoctorReviewDataStore, DoctorReviewDataStore>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using CheckDrive.Web.Models;
using CheckDrive.ApiContracts.DispatcherReview;

namespace CheckDrive.Web.Responses
{
public class GetDispatcherReviewResponse : GetBaseResponse<DispatcherReview>
public class GetDispatcherReviewResponse : GetBaseResponse<DispatcherReviewDto>
{
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
using CheckDrive.Web.Models;
using CheckDrive.Web.Responses;
using CheckDrive.Web.Service;
using Newtonsoft.Json;
using System.Text;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;

namespace CheckDrive.Web.Stores.DispatcherReviews
{
public class DispatcherReviewDataStore(ApiClient api) : IDispatcherReviewDataStore
{
private readonly ApiClient _api = api;
public async Task<GetDispatcherReviewResponse> GetDispatcherReviews(int? pageNumber)
{
StringBuilder query = new("");

if (pageNumber != null)
{
query.Append($"pageNumber={pageNumber}");
}
var response = await _api.GetAsync("dispatchers/reviews?" + query.ToString());

if (!response.IsSuccessStatusCode)
{
throw new Exception("Could not fetch drivers.");
}

var json = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
var result = JsonConvert.DeserializeObject<GetDispatcherReviewResponse>(json);

return result;
}
public Task<DispatcherReview> GetDispatcherReview(int id)
{
throw new NotImplementedException();
}
public Task<DispatcherReview> CreateDispatcherReview(DispatcherReview review)
{
throw new NotImplementedException();
}
public Task<DispatcherReview> UpdateDispatcherReview(int id, DispatcherReview review)
{
throw new NotImplementedException();
}

public Task DeleteDispatcherReview(int id)
{
throw new NotImplementedException();
}
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using CheckDrive.Web.Models;
using CheckDrive.Web.Responses;

namespace CheckDrive.Web.Stores.DispatcherReviews
{
public interface IDispatcherReviewDataStore
{
Task<List<DispatcherReview>> GetDispatcherReviews();
Task<GetDispatcherReviewResponse> GetDispatcherReviews(int? pageNumber);
Task<DispatcherReview> GetDispatcherReview(int id);
Task<DispatcherReview> CreateDispatcherReview(DispatcherReview review);
Task<DispatcherReview> UpdateDispatcherReview(int id, DispatcherReview review);
Expand Down

This file was deleted.

60 changes: 60 additions & 0 deletions CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/Index.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
@model IEnumerable<CheckDrive.ApiContracts.DispatcherReview.DispatcherReviewDto>

@{
ViewData["Title"] = "Index";
Layout = "~/Views/Shared/_Layout.cshtml";
}

<div class="row">
<div class="col-12">
<ejs-grid id="dispatcherReview-list" dataSource="@ViewBag.DispatcherReviews" gridLines="Vertical" allowSorting="true">
<e-grid-columns>
<e-grid-column headerText="Id" field="Id" typeof="text"></e-grid-column>
<e-grid-column headerText="Dispetcher F.I.SH" field="DispatcherName" typeof="text" class="customcss"></e-grid-column>
<e-grid-column headerText="Haydovchi F.I.SH" field="DriverName" typeof="text" class="customcss"></e-grid-column>
<e-grid-column headerText="Mexanik F.I.SH" field="MechanicName" typeof="text" class="customcss"></e-grid-column>
<e-grid-column headerText="Operator F.I.SH" field="OperatorName" typeof="text" class="customcss"></e-grid-column>
<e-grid-column headerText="Marka" field="CarName" typeof="text" class="customcss"></e-grid-column>
<e-grid-column headerText="O'rtacha yoqilg'i sarfi" field="CarMeduimFuelConsumption" typeof="number" class="customcss"></e-grid-column>
<e-grid-column headerText="Bosib o'tilgan masofa" field="DistanceCovered" typeof="number" class="customcss"></e-grid-column>
<e-grid-column headerText="Sarflangan Yoqilg'i" field="FuelSpended" typeof="number" class="customcss"></e-grid-column>
</e-grid-columns>
</ejs-grid>
</div>
</div>
<div class="d-flex justify-content-between align-items-center my-3">
<nav aria-label="Page navigation">
<ul class="pagination">
@if (ViewBag.HasPreviousPage)
{
<li class="page-item">
<a class="page-link" href="@Url.Action("Index", new { pageNumber = 1 })" aria-label="First">
<span aria-hidden="true">&laquo;</span>
</a>
</li>
<li class="page-item">
<a class="page-link" href="@Url.Action("Index", new { pageNumber = ViewBag.CurrentPage - 1 })">@(@ViewBag.CurrentPage - 1)</a>
</li>
}

<li class="page-item active">
<span class="page-link">@ViewBag.CurrentPage</span>
</li>

@if (ViewBag.HasNextPage)
{
<li class="page-item">
<a class="page-link" href="@Url.Action("Index", new { pageNumber = ViewBag.CurrentPage + 1 })">@(@ViewBag.CurrentPage + 1)</a>
</li>
<li class="page-item">
<a class="page-link" href="@Url.Action("Index", new { pageNumber = ViewBag.PageCount })" aria-label="Last">
<span aria-hidden="true">&raquo;</span>
</a>
</li>
}
</ul>
</nav>
<div class="p-2">
<p class="h6 mb-0">@ViewBag.CurrentPage of @ViewBag.PageCount pages (@ViewBag.TotalCount items)</p>
</div>
</div>
2 changes: 1 addition & 1 deletion CheckDrive.Web/CheckDrive.Web/Views/Shared/_SideBar.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
{
text = "Dispetcherlar",
iconCss = "fa-solid fa-person-chalkboard",
url = "/dispatchers"
url = "/DispatcherReviews"
});

menuItems.Add(new
Expand Down