Check point

CheckDrive.Web/CheckDrive.Web/CheckDrive.Web.csproj

@@ -17,6 +17,7 @@
     <Compile Include="Controllers\AuthController.cs" />
     <Compile Include="Controllers\CarsController.cs" />
     <Compile Include="Controllers\DashboardController.cs" />
+    <Compile Include="Controllers\DebtsController.cs" />
     <Compile Include="Controllers\DispatcherReviewsController.cs" />
     <Compile Include="Controllers\DoctorReviewsController.cs" />
     <Compile Include="Controllers\DoctorsController.cs" />
@@ -31,12 +32,33 @@
     <Compile Include="Controllers\OperatorsController.cs" />
     <Compile Include="Controllers\TechniciansController.cs" />
     <None Include="wwwroot\css\LogOutButtun.css" />
+    <None Include="wwwroot\font-awesome\js\all.js" />
+    <None Include="wwwroot\font-awesome\js\all.min.js" />
+    <None Include="wwwroot\font-awesome\js\brands.js" />
+    <None Include="wwwroot\font-awesome\js\brands.min.js" />
+    <None Include="wwwroot\font-awesome\js\conflict-detection.js" />
+    <None Include="wwwroot\font-awesome\js\conflict-detection.min.js" />
+    <None Include="wwwroot\font-awesome\js\fontawesome.js" />
+    <None Include="wwwroot\font-awesome\js\fontawesome.min.js" />
+    <None Include="wwwroot\font-awesome\js\regular.js" />
+    <None Include="wwwroot\font-awesome\js\regular.min.js" />
+    <None Include="wwwroot\font-awesome\js\solid.js" />
+    <None Include="wwwroot\font-awesome\js\solid.min.js" />
+    <None Include="wwwroot\font-awesome\js\v4-shims.js" />
+    <None Include="wwwroot\font-awesome\js\v4-shims.min.js" />
+    <None Include="wwwroot\font-awesome\sprites\brands.svg" />
+    <None Include="wwwroot\font-awesome\sprites\regular.svg" />
+    <None Include="wwwroot\font-awesome\sprites\solid.svg" />
+    <None Include="wwwroot\font-awesome\webfonts\fa-brands-400.woff2" />
+    <None Include="wwwroot\font-awesome\webfonts\fa-regular-400.woff2" />
+    <None Include="wwwroot\font-awesome\webfonts\fa-solid-900.woff2" />
+    <None Include="wwwroot\font-awesome\webfonts\fa-v4compatibility.woff2" />
     <PackageReference Include="CheckDrive.ApiContracts" Version="1.4.9" />
     <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.3" />
-    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="25.1.42" />
-    <PackageReference Include="Syncfusion.Licensing" Version="25.2.3" />
+    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="27.1.50" />
+    <PackageReference Include="Syncfusion.Licensing" Version="27.1.50" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.0" />
     <PackageReference Include="System.Security.Claims" Version="4.3.0" />
 

CheckDrive.Web/CheckDrive.Web/Constants/Configurations.cs

@@ -3,6 +3,6 @@
     public static class Configurations
     {
         public const string JwtToken = "JwtToken";
-        public const string SynfusionLicenseKey = "Mgo+DSMBMAY9C3t2UFhhQlJBfV5AQmBIYVp/TGpJfl96cVxMZVVBJAtUQF1hTX5UdERiXX1ZcHNXRGFa";
+        public const string SynfusionLicenseKey = "Mgo+DSMBPh8sVXJzS0d+WFlPd11dXmJWd1p/THNYflR1fV9DaUwxOX1dQl9nSXdRc0VkW3pfdX1WQ2E=";
     }
 }

CheckDrive.Web/CheckDrive.Web/Controllers/AccountsController.cs

@@ -27,7 +27,7 @@ public async Task<IActionResult> Index(string? searchString, int? roleId, DateTi
         {
             var accounts = await _accountDataStore.GetAccountsAsync(searchString, roleId, birthDate, pageNumber);
 
-            var roles = await GETRoles();
+            var roles = await GetRolesAsync();
 
             roles.Insert(0, new RoleDto
             {
@@ -88,7 +88,7 @@ public async Task<IActionResult> Details(int id)
         }
         public async Task<IActionResult> Create()
         {
-            var roles = await GETRoles();
+            var roles = await GetRolesAsync();
             ViewBag.Roles = new SelectList(roles, "Id", "Name");
             return View();
         }
@@ -102,15 +102,17 @@ public async Task<IActionResult> Create([Bind("Login,Password,PhoneNumber,FirstN
                 var newAccount = await _accountDataStore.CreateAccountAsync(account);
                 return RedirectToAction("Details", new {id = newAccount.Id});
             }
-            var roles = await GETRoles();
+            var roles = await GetRolesAsync();
             ViewBag.Roles = new SelectList(roles, "Id", "Name");
             return View(account);
         }
 
         public async Task<IActionResult> Edit(int id)
         {
             var account = await _accountDataStore.GetAccountAsync(id);
-
+            var roles = await GetRolesAsync();
+            ViewBag.Roles = new SelectList(roles, "Id", "Name");
+
             return View(account);
         }
 
@@ -122,7 +124,7 @@ public async Task<IActionResult> Edit(int id, [Bind("Id,Login,Password,PhoneNumb
             if (ModelState.IsValid)
             {
                 var newAccount = await _accountDataStore.UpdateAccountAsync(id, account);
-                return RedirectToAction("Details", new { id = newAccount.Id });
+                return RedirectToAction(nameof(Index));
             }
             return View(account);
         }
@@ -145,7 +147,7 @@ public async Task<IActionResult> DeleteConfirmed(int id)
             return RedirectToAction(nameof(Index));
         }
 
-        private async Task<List<RoleDto>> GETRoles()
+        private async Task<List<RoleDto>> GetRolesAsync()
         {
             var roleResponse = await _roleStore.GetRoles();
             var roles = roleResponse.Data.ToList();

CheckDrive.Web/CheckDrive.Web/Controllers/AuthController.cs

@@ -25,24 +25,23 @@
     {
         if (HttpContext.Request.Cookies.TryGetValue("tasty-cookies", out _))
         {
-            string token = HttpContext.Request.Cookies["tasty-cookies"];
-            var tokenHandler = new JwtSecurityTokenHandler();
-            var jwtToken = tokenHandler.ReadToken(token) as JwtSecurityToken;
-            if (jwtToken == null)
-            {
-                return RedirectToAction("Login", "Account");
-            }
-            var roleId = jwtToken.Claims.First(claim => claim.Type == ClaimTypes.Role).Value;
-            var accountId = jwtToken.Claims.First(claim => claim.Type == ClaimTypes.NameIdentifier).Value;
+                string token = HttpContext.Request.Cookies["tasty-cookies"];
+                var tokenHandler = new JwtSecurityTokenHandler();
+                var jwtToken = tokenHandler.ReadToken(token) as JwtSecurityToken;
+                if (jwtToken == null)
+                {
+                    return RedirectToAction("Login", "Account");
+                }
+                var roleId = jwtToken.Claims.First(claim => claim.Type == ClaimTypes.Role).Value;
+                var accountId = jwtToken.Claims.First(claim => claim.Type == ClaimTypes.NameIdentifier).Value;
             int accountIds = Int32.Parse(accountId);
-          
+
             switch (roleId)
             {
                 case "1":
-
                     TempData["UserName"] = _accountDataStore.GetAccountAsync(accountIds)
                     .Result.FirstName;
-                TempData.Keep("UserName");
+                    TempData.Keep("UserName");
                     return RedirectToAction("Index", "Dashboard");
                 case "3":
                     TempData["AccountId"] = accountId;

CheckDrive.Web/CheckDrive.Web/Controllers/CarsController.cs

@@ -109,7 +109,7 @@ public async Task<IActionResult> Create([Bind("Model,Color,Number,RemainingFuel,
             if (ModelState.IsValid)
             {
                 var newCar = await _carDataStore.CreateCarAsync(car);
-                return RedirectToAction("Details", new { id = newCar.Id });
+                return RedirectToAction(nameof(Index));
             }
             return View(car);
         }
@@ -131,7 +131,7 @@ public async Task<IActionResult> Edit(int id, [Bind("Id,Model,Color,Number,Remai
             if (ModelState.IsValid)
             {
                 var newCar = await _carDataStore.UpdateCarAsync(id, car);
-                return RedirectToAction("Details", new { id = newCar.Id });
+                return RedirectToAction(nameof(Index));
             }
             return View(car);
         }

CheckDrive.Web/CheckDrive.Web/Controllers/DashboardController.cs

@@ -1,8 +1,9 @@
 using CheckDrive.Web.Stores.Accounts;
 using CheckDrive.Web.Stores.Dashbord;
-using CheckDrive.Web.ViewModels;
+using CheckDrive.Web.Stores.Debts;
+using CheckDrive.Web.Stores.MockDashboard;
+using CheckDrive.Web.ViewModels.Dashboard;
 using Microsoft.AspNetCore.Mvc;
-using NuGet.Common;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 
@@ -12,47 +13,68 @@ public class DashboardController : Controller
     {
         private readonly IDashboardStore _store;
         private readonly IAccountDataStore _accountDataStore;
-        public DashboardController(IDashboardStore store, IAccountDataStore accountDataStore)
+        private readonly IMockDashboardStore _mockDashboardStore;
+        private readonly IDebtsStore _debtsStore;
+        public DashboardController(IDashboardStore store, 
+            IAccountDataStore accountDataStore,
+            IMockDashboardStore mockDashboardStore,
+            IDebtsStore debtsStore)
         {
             _store = store;
             _accountDataStore = accountDataStore;
+            _mockDashboardStore = mockDashboardStore;
+            _debtsStore = debtsStore;
         }
 
         public async Task<IActionResult> Index()
         {
             string token = HttpContext.Request.Cookies["tasty-cookies"];
+
             var tokenHandler = new JwtSecurityTokenHandler();
             var jwtToken = tokenHandler.ReadToken(token) as JwtSecurityToken;
+
             if (jwtToken == null)
             {
                 return RedirectToAction("Login", "Account");
             }
+
             var accountId = jwtToken.Claims.First(claim => claim.Type == ClaimTypes.NameIdentifier).Value;
             int accountIds = Int32.Parse(accountId);
 
             TempData["UserName"] = _accountDataStore.GetAccountAsync(accountIds)
                 .Result.FirstName;
             TempData.Keep("UserName");
+
             var dashboard = await _store.GetDashboard();
+            var mockDashboard = await _mockDashboardStore.GetDashboard();
+            var debts = _debtsStore.GetAll("" , "");
+
+
+            dashboard.Debts=debts;
+            dashboard.OilAmount=mockDashboard.OilAmount;
 
             if (dashboard is null)
             {
                 return BadRequest();
             }
+
             SetViewBagProperties(dashboard);
 
             return View();
         }
+
         private void SetViewBagProperties(DashboardViewModel dashboard)
         {
             var summary = dashboard.Summary;
-
+            
             ViewBag.MonthlyFuelConsumption = summary.MonthlyFuelConsumption.ToString("0.00");
             ViewBag.CarsCount = summary.CarsCount;
             ViewBag.DriversCount = summary.DriversCount;
 
             ViewBag.EmployeesCountByRole = dashboard.EmployeesCountByRoles;
             ViewBag.SplineChartData = dashboard.SplineCharts;
+            ViewBag.OilAmount=dashboard.OilAmount;
+            ViewBag.Debts = dashboard.Debts;
         }
     }
 }

CheckDrive.Web/CheckDrive.Web/Controllers/DebtsController.cs

@@ -0,0 +1,22 @@
+using CheckDrive.Web.Stores.Debts;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CheckDrive.Web.Controllers;
+
+public class DebtsController : Controller
+{
+    private readonly IDebtsStore _store;
+    public DebtsController(IDebtsStore debtsStore)
+    {
+        _store = debtsStore ?? throw new ArgumentNullException(nameof(debtsStore));
+    }
+    public ActionResult Index(string? searchText, string? status)
+    {
+        var debts = _store.GetAll(searchText,status);
+
+        ViewBag.Status = _store.GetEnum();
+        ViewBag.SearchText = searchText;
+        ViewBag.SelectedStatus = status;
+        return View(debts);
+    }
+}

CheckDrive.Web/CheckDrive.Web/Controllers/DoctorReviewsController.cs

@@ -42,7 +42,7 @@ public async Task<IActionResult> Index(int? pageNumber, string? searchString, Da
                 r.DriverName,
                 r.DoctorName,
                 r.Date,
-                IsHealthy = (bool)r.IsHealthy ? "Sog`lom" : "Kasal",
+                IsHealthy = (bool)r.IsHealthy ? 1 : 0,
                 r.Comments
             }).ToList();
 

CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs

@@ -36,30 +36,7 @@ public async Task<IActionResult> Index(int? pageNumber, string? searchString, Da
             ViewBag.HasPreviousPage = response.HasPreviousPage;
             ViewBag.HasNextPage = response.HasNextPage;
 
-            var mechanicAcceptances = response.Data.Select(r => new
-            {
-                r.Id,
-                IsAccepted = (bool)r.IsAccepted ? "Qabul qilindi" : "Rad etildi",
-                r.Comments,
-                Status = ((StatusForDto)r.Status) switch
-                {
-                    StatusForDto.Pending => "Kutilmoqda",
-                    StatusForDto.Completed => "Yakunlangan",
-                    StatusForDto.Rejected => "Rad etilgan",
-                    StatusForDto.Unassigned => "Tayinlanmagan",
-                    StatusForDto.RejectedByDriver => "Haydovchi tomonidan rad etilgan",
-                    _ => "No`malum holat"
-                },
-                r.Date,
-                r.Distance,
-                r.DriverName,
-                r.MechanicName,
-                r.RemainingFuel,
-                r.CarName,
-                r.CarId
-            }).ToList();
-
-            ViewBag.MechanicAcceptances = mechanicAcceptances;
+            ViewBag.MechanicAcceptances = response.Data;
 
             return View();
         }

CheckDrive.Web/CheckDrive.Web/Controllers/MechanicHandoversController.cs

@@ -31,30 +31,7 @@ public async Task<IActionResult> Index(int? pageNumber, string? searchString, Da
             ViewBag.HasPreviousPage = response.HasPreviousPage;
             ViewBag.HasNextPage = response.HasNextPage;
 
-            var mechanicHandovers = response.Data.Select(r => new
-            {
-                r.Id,
-                IsHanded = (bool)r.IsHanded ? "Topshirildi" : "Topshirilmadi",
-                r.Comments,
-                Status = ((StatusForDto)r.Status) switch
-                {
-                    StatusForDto.Pending => "Kutilmoqda",
-                    StatusForDto.Completed => "Yakunlangan",
-                    StatusForDto.Rejected => "Rad etilgan",
-                    StatusForDto.Unassigned => "Tayinlanmagan",
-                    StatusForDto.RejectedByDriver => "Haydovchi tomonidan rad etilgan",
-                    _ => "No`malum holat"
-                },
-                r.Date,
-                r.Distance,
-                r.DriverName,
-                r.MechanicName,
-                r.RemainingFuel,
-                r.CarName,
-                r.CarId
-            }).ToList();
-
-            ViewBag.MechanicHandovers = mechanicHandovers;
+            ViewBag.MechanicHandovers = response.Data;
 
             return View();
         }

CheckDrive.Web/CheckDrive.Web/Controllers/OperatorReviewsController.cs

@@ -44,38 +44,16 @@
             ViewBag.HasPreviousPage = operatorReviews.HasPreviousPage;
             ViewBag.HasNextPage = operatorReviews.HasNextPage;
 
-            var operatorReviewss = operatorReviews.Data.Select(r => new
-            {
-                r.Id,
-                r.OperatorName,
-                r.DriverName,
-                r.OilAmount,
-                r.OilMarks,
-                CarModel = $"{r.CarModel} ({r.CarNumber})",
-                r.Date,
-                IsGiven = (bool)r.IsGiven ? "Quyildi" : "Quyilmadi",
-                r.Comments,
-                Status = ((StatusForDto)r.Status) switch
-                {
-                    StatusForDto.Pending => "Kutilmoqda",
-                    StatusForDto.Completed => "Yakunlangan",
-                    StatusForDto.Rejected => "Rad etilgan",
-                    StatusForDto.Unassigned => "Tayinlanmagan",
-                    StatusForDto.RejectedByDriver => "Haydovchi tomonidan rad etilgan",
-                    _ => "No`malum holat"
-                }
-            }).ToList();
+            ViewBag.OperatorsReview = operatorReviews.Data;
 
-            ViewBag.OperatorsReview = operatorReviewss;
             return View();
-
         }
 
         public async Task<IActionResult> HistoryIndexForPersonalPage(int? pageNumber, string? searchString, DateTime? date)
         {
             var accountIdStr = TempData["AccountId"] as string;
             TempData.Keep("AccountId");
             int accountId = int.Parse(accountIdStr);
 
             var response = await _operatorReviewDataStore.GetOperatorReviews(pageNumber, searchString, date, null, null, accountId);
 
@@ -129,7 +107,7 @@
             if (int.TryParse(accountIdStr, out int accountId))
             {
                 var operatorResponse = await _operatorDataStore.GetOperators(accountId);
                 operatorr = operatorResponse.Data.First();
             }
             ViewBag.OperatorId = operatorr.Id;
 
@@ -140,7 +118,7 @@
             ViewBag.SelectedCarId = carId;
             ViewBag.FuelTankCapacity = fuelTankCapacity ?? null;
             ViewBag.RemainingFuel = remainingFuel ?? null;
             ViewBag.OilMarks = oilMarks.Data.Select(o => new SelectListItem
             {
                 Value = o.Id.ToString(),
                 Text = o.OilMark
@@ -148,7 +126,7 @@
 
             var response = await _operatorReviewDataStore.GetOperatorReviews(null, null, null, null, 4, null);
 
             ViewBag.Drivers = response.Data
                         .Select(d => new SelectListItem
                         {
                             Value = d.DriverId.ToString(),
@@ -176,7 +154,7 @@
         public async Task<IActionResult> GetCarByDriverId(int driverId)
         {
             var response = await _operatorReviewDataStore.GetOperatorReviews(null, null, null, null, 4, null);
             var handover = response.Data.FirstOrDefault(m => m.DriverId == driverId);
 
             if (handover != null)
             {
@@ -229,7 +207,7 @@
             var cars = await _carDataStore.GetCarsAsync(1, null);
             var oilMarks = await _oilMarkDataStore.GetOilMarksAsync();
 
             ViewBag.DriverSelectList = new SelectList(drivers.Data.Select(driver => new
             {
                 Id = driver.Id,
                 DisplayText = $"{driver.FirstName} {driver.LastName}"