Skip to content

Commit 393ad5b

Browse files
khojianvarkhojianvar
authored
Merge pull request #109 from DiyorMarket/Update-codes-in-pages
Update-codes-in-pages
2 parents e1537be + bd2687a commit 393ad5b

12 files changed

+172
-139
lines changed

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@
1414

1515
namespace CheckDrive.Web.Controllers
1616
{
17-
public class MechanicAcceptancesController(IMechanicAcceptanceDataStore mechanicAcceptanceDataStore, IDriverDataStore driverDataStore, ICarDataStore carDataStore, IMechanicDataStore mechanicDataStore, IOperatorReviewDataStore operatorReviewDataStore, IMechanicHandoverDataStore mechanicHandoverDataStore) : Controller
17+
public class MechanicAcceptancesController(IMechanicAcceptanceDataStore mechanicAcceptanceDataStore, IMechanicDataStore mechanicDataStore, IOperatorReviewDataStore operatorReviewDataStore) : Controller
1818
{
1919
private readonly IMechanicAcceptanceDataStore _mechanicAcceptanceDataStore = mechanicAcceptanceDataStore;
20-
private readonly IDriverDataStore _driverDataStore = driverDataStore;
21-
private readonly ICarDataStore _carDataStore = carDataStore;
2220
private readonly IMechanicDataStore _mechanicDataStore = mechanicDataStore;
2321
private readonly IOperatorReviewDataStore _operatorReviewDataStore = operatorReviewDataStore;
24-
private readonly IMechanicHandoverDataStore _mechanicHandoverDataStore = mechanicHandoverDataStore;
2522

2623
public async Task<IActionResult> Index(int? pageNumber, string? searchString, DateTime? date)
2724
{
@@ -77,7 +74,7 @@ public async Task<IActionResult> PersonalIndex(string? searchString, int? pageNu
7774
}
7875
public async Task<IActionResult> CreateByButton()
7976
{
80-
var operatorResponse = await _operatorReviewDataStore.GetOperatorReviews(null, null, DateTime.Today, true, 1);
77+
var operatorResponse = await _operatorReviewDataStore.GetOperatorReviews(null, null, DateTime.Today, "Completed", 1);
8178
var mechanicAcceptanceResponse = await _mechanicAcceptanceDataStore.GetMechanicAcceptancesAsync(null, null, DateTime.Today, null, null);
8279

8380
var mechanicDriverIds = mechanicAcceptanceResponse.Data.Select(ma => ma.DriverId).ToHashSet();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public async Task<IActionResult> Create(int? driverId)
8585
var cars = await GETCars();
8686

8787
var doctorReviews = await _doctorReviewDataStore.GetDoctorReviewsAsync(null, null, DateTime.Today, true, 1);
88-
var mechanicHandovers = await _mechanicHandoverDataStore.GetMechanicHandoversAsync(null, null, DateTime.Today, true, 1);
88+
var mechanicHandovers = await _mechanicHandoverDataStore.GetMechanicHandoversAsync(null, null, DateTime.Today, "Completed", 1);
8989

9090
var accountIdStr = TempData["AccountId"] as string;
9191
TempData.Keep("AccountId");

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public async Task<IActionResult> Create(int? driverId, string? driverName, int?
106106
new SelectListItem { Value = operatorr.Id.ToString(), Text = $"{operatorr.FirstName} {operatorr.LastName}" }
107107
};
108108

109-
var response = await _operatorReviewDataStore.GetOperatorReviews(null, null, DateTime.Today, true, 1);
109+
var response = await _operatorReviewDataStore.GetOperatorReviews(null, null, DateTime.Today, "Completed", 1);
110110
var oilMarks = GetOilMarks();
111111
var mechanicHandovers = await _mechanicHandover.GetMechanicHandoversAsync(null, null, DateTime.Today, null, 1);
112112

@@ -171,7 +171,7 @@ public async Task<IActionResult> Create(int? driverId, string? driverName, int?
171171

172172
public async Task<IActionResult> GetCarByDriverId(int driverId)
173173
{
174-
var mechanicHandovers = await _mechanicHandover.GetMechanicHandoversAsync(null, null, DateTime.Today, true, 1);
174+
var mechanicHandovers = await _mechanicHandover.GetMechanicHandoversAsync(null, null, DateTime.Today, "Completed", 1);
175175
var handover = mechanicHandovers.Data.FirstOrDefault(m => m.DriverId == driverId);
176176

177177
if (handover != null)

‎CheckDrive.Web/CheckDrive.Web/Stores/MechanicAcceptances/IMechanicAcceptanceDataStore.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace CheckDrive.Web.Stores.MechanicAcceptances
55
{
66
public interface IMechanicAcceptanceDataStore
77
{
8-
Task<GetMechanicAcceptanceResponse> GetMechanicAcceptancesAsync(int? pageNumber, string? searchString, DateTime? date, bool? isAccepted, int? roleId);
8+
Task<GetMechanicAcceptanceResponse> GetMechanicAcceptancesAsync(int? pageNumber, string? searchString, DateTime? date, string? status, int? roleId);
99
Task<GetMechanicAcceptanceResponse> GetMechanicAcceptancesAsync();
1010
Task<MechanicAcceptanceDto> GetMechanicAcceptanceAsync(int id);
1111
Task<MechanicAcceptanceDto> CreateMechanicAcceptanceAsync(MechanicAcceptanceForCreateDto acceptanceForCreateDto);

‎CheckDrive.Web/CheckDrive.Web/Stores/MechanicAcceptances/MechanicAcceptanceDataStore.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using CheckDrive.ApiContracts.MechanicAcceptance;
2+
using CheckDrive.DTOs;
23
using CheckDrive.Web.Models;
34
using CheckDrive.Web.Responses;
45
using CheckDrive.Web.Service;
@@ -19,13 +20,13 @@ public async Task<GetMechanicAcceptanceResponse> GetMechanicAcceptancesAsync(
1920
int? pageNumber,
2021
string? searchString,
2122
DateTime? date,
22-
bool? isAccepted,
23+
string? status,
2324
int? roleId)
2425
{
2526
StringBuilder query = new StringBuilder();
2627

27-
if (isAccepted is not null)
28-
query.Append($"isHealthy={isAccepted}&");
28+
if (!string.IsNullOrWhiteSpace(status))
29+
query.Append($"status={status}&");
2930

3031
if (roleId != 0)
3132
query.Append($"roleId={roleId}&");

‎CheckDrive.Web/CheckDrive.Web/Stores/MechanicHandovers/IMechanicHandoverDataStore.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace CheckDrive.Web.Stores.MechanicHandovers
55
{
66
public interface IMechanicHandoverDataStore
77
{
8-
Task<GetMechanicHandoverResponse> GetMechanicHandoversAsync(int? pageNumber, string? searchString, DateTime? date, bool? isHanded, int? roleId);
8+
Task<GetMechanicHandoverResponse> GetMechanicHandoversAsync(int? pageNumber, string? searchString, DateTime? date, string? status, int? roleId);
99
Task<GetMechanicHandoverResponse> GetMechanicHandoversAsync();
1010
Task<MechanicHandoverDto> GetMechanicHandoverAsync(int id);
1111
Task<MechanicHandoverDto> CreateMechanicHandoverAsync(MechanicHandoverForCreateDto mechanicHandoverForCreateDto);

‎CheckDrive.Web/CheckDrive.Web/Stores/MechanicHandovers/MechanicHandoverDataStore.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ public async Task<GetMechanicHandoverResponse> GetMechanicHandoversAsync(
1919
int? pageNumber,
2020
string? searchString,
2121
DateTime? date,
22-
bool? isHanded,
22+
string? status,
2323
int? roleId)
2424
{
2525
StringBuilder query = new("");
2626

27-
if (isHanded is not null)
28-
query.Append($"isHealthy={isHanded}&");
27+
if (!string.IsNullOrWhiteSpace(status))
28+
query.Append($"status={status}&");
2929

3030
if (roleId != 0)
3131
query.Append($"roleId={roleId}&");

‎CheckDrive.Web/CheckDrive.Web/Stores/OperatorReviews/IOperatorReviewDataStore.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace CheckDrive.Web.Stores.OperatorReviews
66
{
77
public interface IOperatorReviewDataStore
88
{
9-
Task<GetOperatorReviewResponse> GetOperatorReviews(int? pageNumber, string? searchString, DateTime? date, bool? isGiven, int? roleId);
9+
Task<GetOperatorReviewResponse> GetOperatorReviews(int? pageNumber, string? searchString, DateTime? date, string? status, int? roleId);
1010
Task<OperatorReviewDto> GetOperatorReview(int id);
1111
Task<OperatorReviewDto> CreateOperatorReview(OperatorReviewForCreateDto review);
1212
Task<OperatorReview> UpdateOperatorReview(int id, OperatorReview operatorReview);

‎CheckDrive.Web/CheckDrive.Web/Stores/OperatorReviews/OperatorReviewDataStore.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ public async Task<GetOperatorReviewResponse> GetOperatorReviews(
1515
int? pageNumber,
1616
string? searchString,
1717
DateTime? date,
18-
bool? isGiven,
18+
string? status,
1919
int? roleId)
2020
{
2121
StringBuilder query = new("");
2222

23-
if (isGiven is not null)
24-
query.Append($"isGiven={isGiven}&");
23+
if (!string.IsNullOrWhiteSpace(status))
24+
query.Append($"status={status}&");
2525

2626
if (roleId != 0)
2727
query.Append($"roleId={roleId}&");

‎CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/PersonalIndex.cshtml

+45-32
Original file line numberDiff line numberDiff line change
@@ -37,42 +37,55 @@
3737
</tr>
3838
</thead>
3939
<tbody>
40-
@foreach (var review in Model)
40+
@if(Model != null && Model.Any())
4141
{
42-
<tr>
43-
<td class="text-center vertical-align-middle">@review.DriverName</td>
44-
<td class="text-center vertical-align-middle">@review.CarName</td>
45-
<td class="text-center vertical-align-middle">@review.CarMeduimFuelConsumption</td>
46-
<td class="text-center vertical-align-middle">
47-
@if (!string.IsNullOrEmpty(review.DispatcherName))
48-
{
49-
@review.DistanceCovered;
50-
}
51-
else
52-
{
53-
<a href="@Url.Action("Create", new {distanceCovered = review.DistanceCovered, fuelSpended = review.FuelSpended, operatorId = review.OperatorId, mechanicId = review.MechanicId, driverId = review.DriverId, mechanicHandoverId = review.MechanicHandoverId, mechanicAcceptanceId = review.MechanicAcceptanceId, carId = review.CarId, operatorReviewId = review.OperatorReviewId })">
42+
@foreach (var review in Model)
43+
{
44+
<tr>
45+
<td class="text-center vertical-align-middle">@review.DriverName</td>
46+
<td class="text-center vertical-align-middle">@review.CarName</td>
47+
<td class="text-center vertical-align-middle">@review.CarMeduimFuelConsumption</td>
48+
<td class="text-center vertical-align-middle">
49+
@if (!string.IsNullOrEmpty(review.DispatcherName))
50+
{
5451
@review.DistanceCovered
55-
</a>
56-
}
57-
</td>
58-
<td class="text-center vertical-align-middle">@review.InitialDistance</td>
59-
<td class="text-center vertical-align-middle">@review.FinalDistance</td>
60-
<td class="text-center vertical-align-middle">
61-
@if (!string.IsNullOrEmpty(review.DispatcherName))
62-
{
63-
@review.FuelSpended;
64-
}
65-
else
66-
{
67-
<a href="@Url.Action("Create", new {distanceCovered = review.DistanceCovered, fuelSpended = review.FuelSpended, operatorId = review.OperatorId, mechanicId = review.MechanicId, driverId = review.DriverId, mechanicHandoverId = review.MechanicHandoverId, mechanicAcceptanceId = review.MechanicAcceptanceId, carId = review.CarId, operatorReviewId = review.OperatorReviewId })">
52+
;
53+
}
54+
else
55+
{
56+
<a href="@Url.Action("Create", new {distanceCovered = review.DistanceCovered, fuelSpended = review.FuelSpended, operatorId = review.OperatorId, mechanicId = review.MechanicId, driverId = review.DriverId, mechanicHandoverId = review.MechanicHandoverId, mechanicAcceptanceId = review.MechanicAcceptanceId, carId = review.CarId, operatorReviewId = review.OperatorReviewId })">
57+
@review.DistanceCovered
58+
</a>
59+
}
60+
</td>
61+
<td class="text-center vertical-align-middle">@review.InitialDistance</td>
62+
<td class="text-center vertical-align-middle">@review.FinalDistance</td>
63+
<td class="text-center vertical-align-middle">
64+
@if (!string.IsNullOrEmpty(review.DispatcherName))
65+
{
6866
@review.FuelSpended
69-
</a>
70-
}
67+
;
68+
}
69+
else
70+
{
71+
<a href="@Url.Action("Create", new {distanceCovered = review.DistanceCovered, fuelSpended = review.FuelSpended, operatorId = review.OperatorId, mechanicId = review.MechanicId, driverId = review.DriverId, mechanicHandoverId = review.MechanicHandoverId, mechanicAcceptanceId = review.MechanicAcceptanceId, carId = review.CarId, operatorReviewId = review.OperatorReviewId })">
72+
@review.FuelSpended
73+
</a>
74+
}
75+
</td>
76+
<td class="text-center vertical-align-middle">@review.PouredFuel</td>
77+
<td class="text-center vertical-align-middle">@review.OperatorName</td>
78+
<td class="text-center vertical-align-middle">@review.MechanicName</td>
79+
<td class="text-center vertical-align-middle">@review.Date</td>
80+
</tr>
81+
}
82+
}
83+
else
84+
{
85+
<tr>
86+
<td colspan="6" class="text-center">
87+
Maʼlumotlar mavjud emas
7188
</td>
72-
<td class="text-center vertical-align-middle">@review.PouredFuel</td>
73-
<td class="text-center vertical-align-middle">@review.OperatorName</td>
74-
<td class="text-center vertical-align-middle">@review.MechanicName</td>
75-
<td class="text-center vertical-align-middle">@review.Date</td>
7689
</tr>
7790
}
7891
</tbody>

‎CheckDrive.Web/CheckDrive.Web/Views/DoctorReviews/PersonalIndex.cshtml

+34-23
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,46 @@
5555
</tr>
5656
</thead>
5757
<tbody>
58-
@foreach (var review in Model)
58+
@if(Model != null && Model.Any())
5959
{
60-
<tr>
61-
<td class="text-center vertical-align-middle">
62-
@if (!string.IsNullOrEmpty(review.DoctorName))
63-
{
64-
@review.DriverName
65-
}
66-
else
67-
{
68-
<a href="/DoctorReviews/Create?driverId=@review.DriverId&driverName=@review.DriverName">@review.DriverName</a>
69-
}
70-
</td>
71-
<td class="text-center vertical-align-middle">@review.DoctorName</td>
72-
<td class="text-center vertical-align-middle">
73-
@if (!string.IsNullOrEmpty(review.DoctorName))
74-
{
75-
@if (review.IsHealthy == true)
60+
@foreach (var review in Model)
61+
{
62+
<tr>
63+
<td class="text-center vertical-align-middle">
64+
@if (!string.IsNullOrEmpty(review.DoctorName))
65+
{
66+
@review.DriverName
67+
}
68+
else
7669
{
77-
<span class="badge bg-success shadow">Sog`lom</span>
70+
<a href="/DoctorReviews/Create?driverId=@review.DriverId&driverName=@review.DriverName">@review.DriverName</a>
7871
}
79-
else if (review.IsHealthy == false)
72+
</td>
73+
<td class="text-center vertical-align-middle">@review.DoctorName</td>
74+
<td class="text-center vertical-align-middle">
75+
@if (!string.IsNullOrEmpty(review.DoctorName))
8076
{
81-
<span class="badge bg-danger shadow">Kasal</span>
77+
@if (review.IsHealthy == true)
78+
{
79+
<span class="badge bg-success shadow">Sog`lom</span>
80+
}
81+
else if (review.IsHealthy == false)
82+
{
83+
<span class="badge bg-danger shadow">Kasal</span>
84+
}
8285
}
83-
}
86+
</td>
87+
<td class="text-center vertical-align-middle">@review.Comments</td>
88+
<td class="text-center vertical-align-middle">@review.Date</td>
89+
</tr>
90+
}
91+
}
92+
else
93+
{
94+
<tr>
95+
<td colspan="5" class="text-center">
96+
Maʼlumotlar mavjud emas
8497
</td>
85-
<td class="text-center vertical-align-middle">@review.Comments</td>
86-
<td class="text-center vertical-align-middle">@review.Date</td>
8798
</tr>
8899
}
89100
</tbody>

0 commit comments

Comments
 (0)