From 259b42dd63e7233c0be9a54541b42e7ea7317dad Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Sun, 13 Oct 2024 14:56:34 +0500
Subject: [PATCH 01/12] Update "Ishchilar" text size
---
CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml
index 805c2724..a585446e 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml
@@ -4,7 +4,7 @@
ViewData["Title"] = "Index";
Layout = "~/Views/Shared/_Layout.cshtml";
}
-<h2>Ishchilar</h2>
+<h1>Ishchilar</h1>
<form asp-controller="Accounts" asp-action="Index">
<div class="row">
From 017286d754c4f92fe1c11d4084dc6febce0bef58 Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Sun, 13 Oct 2024 14:57:50 +0500
Subject: [PATCH 02/12] Update MechanicAcceptance page in manager.
---
.../MechanicAcceptancesController.cs | 10 +-----
.../Views/MechanicAcceptances/Index.cshtml | 36 +++++++++++++------
2 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs b/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
index 1b51717f..bc215b90 100644
--- a/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
@@ -41,15 +41,7 @@ public async Task<IActionResult> Index(int? pageNumber, string? searchString, Da
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.Status,
r.Date,
r.Distance,
r.DriverName,
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
index 9d125c01..2344379c 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
@@ -44,16 +44,16 @@
<div class="col-12">
<ejs-grid id="mechanicAcceptances-list" dataSource="@ViewBag.MechanicAcceptances" 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="Qabul qilish masofasi" field="Distance" type="number" width="90"></e-grid-column>
- <e-grid-column headerText="Yoqilg`i qoldig`i" field="RemainingFuel" type="number" width="90"></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="Qabul qilish" field="IsAccepted" 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="string"></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="150"></e-grid-column>
+ <e-grid-column headerText="Haydovchi F.I.SH" field="DriverName" type="string" textAlign=Center headerTextAlign=Center width="150"></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="Qabul qilish masofasi" headertext="" field="Distance" type="number" textAlign=Center headerTextAlign=Center width="90"></e-grid-column>
+ <e-grid-column headerText="Yoqilg`i qoldig`i" field="RemainingFuel" type="number" textAlign=Center headerTextAlign=Center width="90"></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="Qabul qilish" field="IsAccepted" textAlign=Center headerTextAlign=Center width="100"></e-grid-column>
+ <e-grid-column headerText="Izoh" field="Comments" type="string" 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>
@@ -156,4 +156,18 @@
header.setAttribute('title', header.innerText.trim());
});
}
-</script>
\ No newline at end of file
+</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>
+
+
From c5aea58a200b8c9ed85eca0e7fdf0d551a8026f0 Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:00:18 +0500
Subject: [PATCH 03/12] Update background color
---
CheckDrive.Web/CheckDrive.Web/wwwroot/css/site.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/wwwroot/css/site.css b/CheckDrive.Web/CheckDrive.Web/wwwroot/css/site.css
index bd7d6e2c..17593502 100644
--- a/CheckDrive.Web/CheckDrive.Web/wwwroot/css/site.css
+++ b/CheckDrive.Web/CheckDrive.Web/wwwroot/css/site.css
@@ -86,7 +86,7 @@ body {
}
.e-grid .e-gridcontent, .e-grid .e-table {
- background-color: whitesmoke;
+ background-color: #fafafa;
}
.e-grid .e-gridheader {
From d12a48f7fd8d53d4199fb9891e7e73ddf78e0b3e Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:01:44 +0500
Subject: [PATCH 04/12] delete the unnecessary columns
---
.../CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
index 2344379c..dcf5860e 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
@@ -45,14 +45,10 @@
<ejs-grid id="mechanicAcceptances-list" dataSource="@ViewBag.MechanicAcceptances" gridLines="Vertical" allowSorting="true" dataBound="onDataBound">
<e-grid-columns>
<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="150"></e-grid-column>
- <e-grid-column headerText="Haydovchi F.I.SH" field="DriverName" type="string" textAlign=Center headerTextAlign=Center width="150"></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="Qabul qilish masofasi" headertext="" field="Distance" type="number" textAlign=Center headerTextAlign=Center width="90"></e-grid-column>
- <e-grid-column headerText="Yoqilg`i qoldig`i" field="RemainingFuel" type="number" textAlign=Center headerTextAlign=Center width="90"></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="Qabul qilish" field="IsAccepted" textAlign=Center headerTextAlign=Center width="100"></e-grid-column>
- <e-grid-column headerText="Izoh" field="Comments" type="string" 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>
From d81ef4fe9ee60d6eca281793f5b44e9b2414dc44 Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:42:16 +0500
Subject: [PATCH 05/12] delete the unnecessary codes
---
.../MechanicAcceptancesController.cs | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs b/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
index bc215b90..0c73f552 100644
--- a/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
@@ -36,22 +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,
- r.Status,
- r.Date,
- r.Distance,
- r.DriverName,
- r.MechanicName,
- r.RemainingFuel,
- r.CarName,
- r.CarId
- }).ToList();
-
- ViewBag.MechanicAcceptances = mechanicAcceptances;
+ ViewBag.MechanicAcceptances = response.Data;
return View();
}
From ade85d2afe450510bee2ae7ae5ea313995a00ec1 Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Tue, 15 Oct 2024 14:20:38 +0500
Subject: [PATCH 06/12] delete "Mexanik (Qabul qiluvchi) text
---
.../CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml | 2 --
1 file changed, 2 deletions(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
index dcf5860e..6afc61b5 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
@@ -5,8 +5,6 @@
Layout = "~/Views/Shared/_Layout.cshtml";
}
-<h1>Mexanik (Qabul qiluvchi)</h1>
-
<form asp-controller="MechanicAcceptances" asp-action="Index">
<div class="row">
<div class="d-flex justify-content-between">
From 4cc06b00e2c156c4ad99f1b58a72832eb957c3a0 Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Sun, 13 Oct 2024 14:56:34 +0500
Subject: [PATCH 07/12] Update "Ishchilar" text size
---
CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml
index 805c2724..a585446e 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml
@@ -4,7 +4,7 @@
ViewData["Title"] = "Index";
Layout = "~/Views/Shared/_Layout.cshtml";
}
-<h2>Ishchilar</h2>
+<h1>Ishchilar</h1>
<form asp-controller="Accounts" asp-action="Index">
<div class="row">
From 406a6472a019a7460fc8eeaed8fa709eefe24d62 Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Sun, 13 Oct 2024 14:57:50 +0500
Subject: [PATCH 08/12] Update MechanicAcceptance page in manager.
---
.../MechanicAcceptancesController.cs | 10 +-----
.../Views/MechanicAcceptances/Index.cshtml | 36 +++++++++++++------
2 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs b/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
index 1b51717f..bc215b90 100644
--- a/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
@@ -41,15 +41,7 @@ public async Task<IActionResult> Index(int? pageNumber, string? searchString, Da
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.Status,
r.Date,
r.Distance,
r.DriverName,
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
index 9d125c01..2344379c 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
@@ -44,16 +44,16 @@
<div class="col-12">
<ejs-grid id="mechanicAcceptances-list" dataSource="@ViewBag.MechanicAcceptances" 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="Qabul qilish masofasi" field="Distance" type="number" width="90"></e-grid-column>
- <e-grid-column headerText="Yoqilg`i qoldig`i" field="RemainingFuel" type="number" width="90"></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="Qabul qilish" field="IsAccepted" 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="string"></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="150"></e-grid-column>
+ <e-grid-column headerText="Haydovchi F.I.SH" field="DriverName" type="string" textAlign=Center headerTextAlign=Center width="150"></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="Qabul qilish masofasi" headertext="" field="Distance" type="number" textAlign=Center headerTextAlign=Center width="90"></e-grid-column>
+ <e-grid-column headerText="Yoqilg`i qoldig`i" field="RemainingFuel" type="number" textAlign=Center headerTextAlign=Center width="90"></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="Qabul qilish" field="IsAccepted" textAlign=Center headerTextAlign=Center width="100"></e-grid-column>
+ <e-grid-column headerText="Izoh" field="Comments" type="string" 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>
@@ -156,4 +156,18 @@
header.setAttribute('title', header.innerText.trim());
});
}
-</script>
\ No newline at end of file
+</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>
+
+
From ebef5a584168a574552e0fafa19b3c10db2992b0 Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:00:18 +0500
Subject: [PATCH 09/12] Update background color
---
CheckDrive.Web/CheckDrive.Web/wwwroot/css/site.css | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/wwwroot/css/site.css b/CheckDrive.Web/CheckDrive.Web/wwwroot/css/site.css
index 312b9092..3deaa3c4 100644
--- a/CheckDrive.Web/CheckDrive.Web/wwwroot/css/site.css
+++ b/CheckDrive.Web/CheckDrive.Web/wwwroot/css/site.css
@@ -51,19 +51,14 @@ body {
border-radius: 10px;
}
-.e-grid .e-gridcontent, .e-grid .e-table {
- background-color: white;
-}
-
.e-grid .e-gridheader {
border: 5px;
border-radius:50px;
padding: 10px;
background-color: ghostwhite;
}
-
- .e-grid .e-row:hover .e-rowcell {
- background-color: rgb(204, 229, 255) !important;
+ .e-grid .e-gridcontent, .e-grid .e-table {
+ background-color: #fafafa;
}
.e-grid .e-rowcell.e-selectionbackground {
From 5fdb8781f5e87d35e77e91080887c8001311f4e7 Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:01:44 +0500
Subject: [PATCH 10/12] delete the unnecessary columns
---
.../CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
index 2344379c..dcf5860e 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
@@ -45,14 +45,10 @@
<ejs-grid id="mechanicAcceptances-list" dataSource="@ViewBag.MechanicAcceptances" gridLines="Vertical" allowSorting="true" dataBound="onDataBound">
<e-grid-columns>
<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="150"></e-grid-column>
- <e-grid-column headerText="Haydovchi F.I.SH" field="DriverName" type="string" textAlign=Center headerTextAlign=Center width="150"></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="Qabul qilish masofasi" headertext="" field="Distance" type="number" textAlign=Center headerTextAlign=Center width="90"></e-grid-column>
- <e-grid-column headerText="Yoqilg`i qoldig`i" field="RemainingFuel" type="number" textAlign=Center headerTextAlign=Center width="90"></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="Qabul qilish" field="IsAccepted" textAlign=Center headerTextAlign=Center width="100"></e-grid-column>
- <e-grid-column headerText="Izoh" field="Comments" type="string" 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>
From 25a322f9f0687efbab2f6ae2d9c8923ddd7175c5 Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:42:16 +0500
Subject: [PATCH 11/12] delete the unnecessary codes
---
.../MechanicAcceptancesController.cs | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs b/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
index bc215b90..0c73f552 100644
--- a/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Controllers/MechanicAcceptancesController.cs
@@ -36,22 +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,
- r.Status,
- r.Date,
- r.Distance,
- r.DriverName,
- r.MechanicName,
- r.RemainingFuel,
- r.CarName,
- r.CarId
- }).ToList();
-
- ViewBag.MechanicAcceptances = mechanicAcceptances;
+ ViewBag.MechanicAcceptances = response.Data;
return View();
}
From f4febca3122b7daa9c47b5043a31af788d5e6989 Mon Sep 17 00:00:00 2001
From: Diyor Akhmatov <128776299+diyorzz@users.noreply.github.com>
Date: Tue, 15 Oct 2024 14:20:38 +0500
Subject: [PATCH 12/12] delete "Mexanik (Qabul qiluvchi) text
---
.../CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml | 2 --
1 file changed, 2 deletions(-)
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
index dcf5860e..6afc61b5 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
@@ -5,8 +5,6 @@
Layout = "~/Views/Shared/_Layout.cshtml";
}
-<h1>Mexanik (Qabul qiluvchi)</h1>
-
<form asp-controller="MechanicAcceptances" asp-action="Index">
<div class="row">
<div class="d-flex justify-content-between">