Merge pull request #204 from DiyorMarket/Update-MechanicHandover-in-manager-

Update MechanicHandover in manager.

Author: Mirazyzz

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/Views/MechanicHandovers/Index.cshtml

@@ -5,15 +5,13 @@
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
 
-<h1>Mexanik (Topshiruvchi)</h1>
-
 <form asp-controller="MechanicHandovers" asp-action="Index">
     <div class="row">
         <div class="d-flex justify-content-between">
             <!-- Search -->
             <div class="col-md-4 mb-4">
                 <div class="input-group">
-                    <input type="text" class="form-control rounded-left" placeholder="mexanik yoki haydoshchini izlash..." name="searchString" value="@ViewBag.SearchString">
+                    <input type="text" class="form-control rounded-left" placeholder="mexanik yoki haydovchini izlash..." name="searchString" value="@ViewBag.SearchString">
                     <div class="input-group-append">
                         <button type="submit" class="btn btn-primary">
                             <i class="fa fa-search"></i> Qidirish
@@ -41,16 +39,12 @@
     <div class="col-12">
         <ejs-grid id="mechanicHandovers-list" dataSource="@ViewBag.MechanicHandovers" gridLines="Vertical" allowSorting="true" dataBound="onDataBound">
             <e-grid-columns>
-                <e-grid-column headerText="Id" field="Id" template="#templat" type="number" width="60"></e-grid-column>
-                <e-grid-column headerText="Mexanik F.I.SH" field="MechanicName" type="string"></e-grid-column>
-                <e-grid-column headerText="Haydovchi F.I.SH" field="DriverName" type="string"></e-grid-column>
-                <e-grid-column headerText="Mashina" field="CarName" template="#template" type="string"></e-grid-column>
-                <e-grid-column headerText="Boshlang'ich masofa" field="Distance" type="number"></e-grid-column>
-                <e-grid-column headerText="Yoqilg`i qoldig`i" field="RemainingFuel" type="number"></e-grid-column>
-                <e-grid-column headerText="Ro'yxatdan o'tgan vaqt" field="Date" type="date" format="dd-MM-yyyy  |  HH:mm"></e-grid-column>
-                <e-grid-column headerText="Topshirish" field="IsHanded" type="string" width="100"></e-grid-column>
-                <e-grid-column headerText="Izoh" field="Comments" type="string"></e-grid-column>
-                <e-grid-column headerText="Status" field="Status" type="number"></e-grid-column>
+                <e-grid-column headerText="Id" field="Id" template="#templat" type="number" textAlign=Center headerTextAlign=Center width="50"></e-grid-column>
+                <e-grid-column headerText="Mexanik F.I.SH" field="MechanicName" type="string" textAlign=Center headerTextAlign=Center width="200"></e-grid-column>
+                <e-grid-column headerText="Haydovchi F.I.SH" field="DriverName" type="string" textAlign=Center headerTextAlign=Center width="200"></e-grid-column>
+                <e-grid-column headerText="Mashina" field="CarName" template="#template" type="string" textAlign=Center headerTextAlign=Center></e-grid-column>
+                <e-grid-column headerText="Ro'yxatdan o'tgan vaqt" field="Date" type="date" format="dd-MM-yyyy  |  HH:mm" textAlign=Center headerTextAlign=Center></e-grid-column>
+                <e-grid-column headerText="Status" field="Status" template="#statusColumnTemplate" textAlign=Center headerTextAlign=Center width="100"></e-grid-column>
             </e-grid-columns>
         </ejs-grid>
     </div>
@@ -151,4 +145,16 @@
         });
     }
 
+</script>
+
+<script id="statusColumnTemplate" type="text/x-template">
+    ${if(Status == 0)}
+        <span class="badge bg-warning">Kutilmoqda</span>
+    ${else if(Status == 1)}
+        <span class="badge bg-success">Yakunlangan</span>
+    ${else if(Status == 2)}
+        <span class="badge bg-danger">Rad etilgan</span>
+    ${else if(Status == 4)}
+        <span class="badge bg-danger">Haydovchi tomonidan rad etilgan</span>
+    ${/if}
 </script>