Skip to content

Commit 06989c5

Browse files
SharifovDeveloperSharifovDeveloper
authored
Merge pull request #111 from DiyorMarket/ClearedUnnecessaryLineAndUpdateHandoverCreate
Cleared unnecessary line and update handover create
2 parents 4de3077 + e113005 commit 06989c5

11 files changed

+22
-60
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using CheckDrive.ApiContracts.Account;
22
using CheckDrive.Web.Stores.User;
3-
using CheckDrive.Web.ViewModels;
43
using Microsoft.AspNetCore.Mvc;
54
using System.IdentityModel.Tokens.Jwt;
65
using System.Security.Claims;

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using CheckDrive.ApiContracts.Car;
2-
using CheckDrive.Web.Models;
32
using CheckDrive.Web.Stores.Cars;
43
using Microsoft.AspNetCore.Mvc;
54

@@ -14,9 +13,9 @@ public CarsController(ICarDataStore carDataStore)
1413
_carDataStore = carDataStore;
1514
}
1615

17-
public async Task<IActionResult> Index(string? searchString,int? pageNumber)
16+
public async Task<IActionResult> Index(string? searchString, int? pageNumber)
1817
{
19-
var cars = await _carDataStore.GetCarsAsync(searchString,pageNumber);
18+
var cars = await _carDataStore.GetCarsAsync(searchString, pageNumber);
2019

2120
ViewBag.SearchString = searchString;
2221
ViewBag.Cars = cars.Data;

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

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ private void SetViewBagProperties(DashboardViewModel dashboard)
3333
ViewBag.DriversCount = summary.DriversCount;
3434

3535
ViewBag.EmployeesCountByRole = dashboard.EmployeesCountByRoles;
36-
3736
ViewBag.SplineChartData = dashboard.SplineCharts;
3837
}
3938
}

‎CheckDrive.Web/CheckDrive.Web/Controllers/DispatcherReviewsController.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using CheckDrive.ApiContracts.Car;
22
using CheckDrive.ApiContracts.Dispatcher;
33
using CheckDrive.ApiContracts.DispatcherReview;
4-
using CheckDrive.Web.Models;
54
using CheckDrive.Web.Stores.Cars;
65
using CheckDrive.Web.Stores.DispatcherReviews;
76
using CheckDrive.Web.Stores.Dispatchers;

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

-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
using CheckDrive.ApiContracts;
22
using CheckDrive.ApiContracts.Mechanic;
33
using CheckDrive.ApiContracts.MechanicAcceptance;
4-
using CheckDrive.Web.Stores.Cars;
5-
using CheckDrive.Web.Stores.Drivers;
64
using CheckDrive.Web.Stores.MechanicAcceptances;
7-
using CheckDrive.Web.Stores.MechanicHandovers;
85
using CheckDrive.Web.Stores.Mechanics;
96
using CheckDrive.Web.Stores.OperatorReviews;
107
using Microsoft.AspNetCore.Mvc;
11-
using Microsoft.AspNetCore.Mvc.Rendering;
12-
using NuGet.Versioning;
13-
using System.Linq;
148

159
namespace CheckDrive.Web.Controllers
1610
{
@@ -58,7 +52,6 @@ public async Task<IActionResult> Index(int? pageNumber, string? searchString, Da
5852
return View();
5953
}
6054

61-
6255
public async Task<IActionResult> PersonalIndex(string? searchString, int? pageNumber)
6356
{
6457
var response = await _mechanicAcceptanceDataStore.GetMechanicAcceptancesAsync(pageNumber, searchString, null, null, 6);
@@ -95,7 +88,6 @@ public async Task<IActionResult> CreateByButton()
9588
return View();
9689
}
9790

98-
9991
[HttpPost]
10092
[ValidateAntiForgeryToken]
10193
public async Task<IActionResult> Create([Bind("IsAccepted,Comments,MechanicId,Distance,CarId,DriverId")] MechanicAcceptanceForCreateDto mechanicAcceptanceForCreateDto)
@@ -115,7 +107,6 @@ public async Task<IActionResult> Create([Bind("IsAccepted,Comments,MechanicId,Di
115107

116108
return View(mechanicAcceptanceForCreateDto);
117109
}
118-
119110
public async Task<IActionResult> CreateByLink(int driverId, int carId, string carName, string driverName)
120111
{
121112
var accountIdStr = TempData["AccountId"] as string;
@@ -167,7 +158,6 @@ public async Task<IActionResult> Edit(int id, MechanicAcceptanceForUpdateDto mec
167158

168159
return View(mechanicAcceptance);
169160
}
170-
171161
public async Task<IActionResult> Delete(int id)
172162
{
173163
var mechanicAcceptance = await _mechanicAcceptanceDataStore.GetMechanicAcceptanceAsync(id);

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

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using CheckDrive.ApiContracts;
22
using CheckDrive.ApiContracts.MechanicHandover;
3-
using CheckDrive.Web.Models;
43
using CheckDrive.Web.Stores.Cars;
54
using CheckDrive.Web.Stores.DoctorReviews;
65
using CheckDrive.Web.Stores.Drivers;
@@ -85,7 +84,7 @@ public async Task<IActionResult> Create(int? driverId)
8584
var cars = await GETCars();
8685

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

9089
var accountIdStr = TempData["AccountId"] as string;
9190
TempData.Keep("AccountId");
@@ -158,9 +157,6 @@ public async Task<IActionResult> Create([Bind("IsHanded,Comments,MechanicId,Dist
158157
return View(mechanicHandoverForCreateDto);
159158
}
160159

161-
162-
163-
164160
[HttpPost]
165161
[ValidateAntiForgeryToken]
166162
public async Task<IActionResult> Edit(int id, MechanicHandoverForUpdateDto mechanicHandover)
@@ -213,13 +209,11 @@ public async Task<IActionResult> DeleteConfirmed(int id)
213209
await _mechanicHandoverDataStore.DeleteMechanicHandoverAsync(id);
214210
return RedirectToAction(nameof(Index));
215211
}
216-
217212
private async Task<bool> MechanicHandoverExists(int id)
218213
{
219214
var mechanicAcceptance = await _mechanicHandoverDataStore.GetMechanicHandoverAsync(id);
220215
return mechanicAcceptance != null;
221216
}
222-
223217
private async Task<List<SelectListItem>> GETCars()
224218
{
225219
var carResponse = await _carDataStore.GetCarsAsync(null, null);
@@ -232,7 +226,6 @@ private async Task<List<SelectListItem>> GETCars()
232226
.ToList();
233227
return cars;
234228
}
235-
236229
private async Task<List<SelectListItem>> GETDrivers()
237230
{
238231
var driverResponse = await _driverDataStore.GetDriversAsync(null, null);

‎CheckDrive.Web/CheckDrive.Web/Controllers/MechanicsController.cs

+1-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@ public MechanicsController(IMechanicDataStore mechanicDataStore)
1212
{
1313
_mechanicDataStore = mechanicDataStore;
1414
}
15-
1615
public async Task<IActionResult> Index()
1716
{
1817
var mechanics = await _mechanicDataStore.GetMechanicsAsync();
1918
return View(mechanics);
2019
}
21-
2220
public async Task<IActionResult> Details(int id)
2321
{
2422
var mechanic = await _mechanicDataStore.GetMechanicAsync(id);
@@ -28,12 +26,11 @@ public async Task<IActionResult> Details(int id)
2826
}
2927
return View(mechanic);
3028
}
31-
3229
public IActionResult Create()
3330
{
3431
return View();
3532
}
36-
33+
3734
[HttpPost]
3835
[ValidateAntiForgeryToken]
3936
public async Task<IActionResult> Create([Bind("AccountId")] Mechanic mechanic)
@@ -45,7 +42,6 @@ public async Task<IActionResult> Create([Bind("AccountId")] Mechanic mechanic)
4542
}
4643
return View(mechanic);
4744
}
48-
4945
public async Task<IActionResult> Edit(int id)
5046
{
5147
var mechanic = await _mechanicDataStore.GetMechanicAsync(id);
@@ -86,7 +82,6 @@ public async Task<IActionResult> Edit(int id, [Bind("Id,AccountId")] Mechanic me
8682
}
8783
return View(mechanic);
8884
}
89-
9085
public async Task<IActionResult> Delete(int id)
9186
{
9287
var mechanic = await _mechanicDataStore.GetMechanicAsync(id);
@@ -104,7 +99,6 @@ public async Task<IActionResult> DeleteConfirmed(int id)
10499
await _mechanicDataStore.DeleteMechanicAsync(id);
105100
return RedirectToAction(nameof(Index));
106101
}
107-
108102
private async Task<bool> MechanicExists(int id)
109103
{
110104
var mechanic = await _mechanicDataStore.GetMechanicAsync(id);

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

-11
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ public async Task<IActionResult> Index(int? pageNumber, string? searchString, Da
6262
return View();
6363

6464
}
65-
6665
public async Task<IActionResult> PersonalIndex(int? pageNumber, string? searchString)
6766
{
6867
var reviewsResponse = await _operatorReviewDataStore.GetOperatorReviews(pageNumber, searchString, null, null, 4);
@@ -76,7 +75,6 @@ public async Task<IActionResult> PersonalIndex(int? pageNumber, string? searchSt
7675

7776
return View(reviewsResponse.Data);
7877
}
79-
8078
public async Task<IActionResult> Details(int id)
8179
{
8280
var operatorReview = await _operatorReviewDataStore.GetOperatorReview(id);
@@ -86,7 +84,6 @@ public async Task<IActionResult> Details(int id)
8684
}
8785
return View(operatorReview);
8886
}
89-
9087
public async Task<IActionResult> Create(int? driverId, string? driverName, int? carId, string? carModel, double? fuelTankCapacity, double? remainingFuel)
9188
{
9289
var drivers = await GETDrivers();
@@ -168,7 +165,6 @@ public async Task<IActionResult> Create(int? driverId, string? driverName, int?
168165

169166
return View(model);
170167
}
171-
172168
public async Task<IActionResult> GetCarByDriverId(int driverId)
173169
{
174170
var mechanicHandovers = await _mechanicHandover.GetMechanicHandoversAsync(null, null, DateTime.Today, "Completed", 1);
@@ -224,7 +220,6 @@ public async Task<IActionResult> Create([Bind("OilAmount,Comments,Status,Date,Op
224220

225221
return View(operatorReview);
226222
}
227-
228223
public async Task<IActionResult> Edit(int id)
229224
{
230225
var operatorReview = await _operatorReviewDataStore.GetOperatorReview(id);
@@ -265,7 +260,6 @@ public async Task<IActionResult> Edit(int id, [Bind("Id,OilAmount,Comments,Statu
265260
}
266261
return View(operatorReview);
267262
}
268-
269263
public async Task<IActionResult> Delete(int id)
270264
{
271265
var operatorReview = await _operatorReviewDataStore.GetOperatorReview(id);
@@ -283,13 +277,11 @@ public async Task<IActionResult> DeleteConfirmed(int id)
283277
await _operatorReviewDataStore.DeleteOperatorReview(id);
284278
return RedirectToAction(nameof(Index));
285279
}
286-
287280
private async Task<bool> OperatorReviewExists(int id)
288281
{
289282
var operatorReview = await _operatorReviewDataStore.GetOperatorReview(id);
290283
return operatorReview != null;
291284
}
292-
293285
private async Task<List<SelectListItem>> GETDrivers()
294286
{
295287
var driverResponse = await _driverDataStore.GetDriversAsync(null, null);
@@ -302,7 +294,6 @@ private async Task<List<SelectListItem>> GETDrivers()
302294
.ToList();
303295
return drivers;
304296
}
305-
306297
private async Task<List<SelectListItem>> GETCars()
307298
{
308299
var carResponse = await _carDataStore.GetCarsAsync(null, null);
@@ -315,13 +306,11 @@ private async Task<List<SelectListItem>> GETCars()
315306
.ToList();
316307
return cars;
317308
}
318-
319309
private async Task<double> GetMaxOilAmount(int carId)
320310
{
321311
var car = await _carDataStore.GetCarAsync(carId);
322312
return car.FuelTankCapacity - car.RemainingFuel;
323313
}
324-
325314
private List<string> GetOilMarks()
326315
{
327316
return Enum.GetValues(typeof(OilMarksForDto))

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</button>
1515
<ul class="dropdown-menu" aria-labelledby="userDropdown">
1616
<li><a class="dropdown-item" style="color: red" href="@Url.Action("Login", "Auth")">Profildan Chiqish</a></li>
17-
<li><a class="dropdown-item" style="color: darkblue" href="@Url.Action("PersonalIndex", "MechanicHandovers")">Mexanik(Qabul qiluvchi)</a></li>
17+
<li><a class="dropdown-item" style="color: darkblue" href="@Url.Action("PersonalIndex", "MechanicHandovers")">Mexanik(Topshiruvchi)</a></li>
1818
</ul>
1919
</div>
2020
</div>
@@ -79,11 +79,11 @@
7979
{
8080
@if ((bool)item.IsAccepted)
8181
{
82-
<span class="badge bg-success shadow">Qabul qilindi</span>
82+
<span class="badge bg-success ">Qabul qilindi</span>
8383
}
8484
else
8585
{
86-
<span class="badge bg-danger shadow">Rad etildi</span>
86+
<span class="badge bg-danger ">Rad etildi</span>
8787
}
8888
}
8989
</td>
@@ -93,27 +93,27 @@
9393
<td class="text-center">
9494
@if (item.Status == CheckDrive.ApiContracts.StatusForDto.Pending)
9595
{
96-
<span class="badge bg-pending shadow">Kutilmoqda</span>
96+
<span class="badge bg-pending ">Kutilmoqda</span>
9797
}
9898
else if (item.Status == CheckDrive.ApiContracts.StatusForDto.Unassigned)
9999
{
100-
<span class="badge bg-unassigned shadow">Yaratilmagan</span>
100+
<span class="badge bg-unassigned ">Yaratilmagan</span>
101101
}
102102
else if (item.Status == CheckDrive.ApiContracts.StatusForDto.Completed)
103103
{
104-
<span class="badge bg-success shadow">Yakunlangan</span>
104+
<span class="badge bg-success ">Yakunlangan</span>
105105
}
106106
else if (item.Status == CheckDrive.ApiContracts.StatusForDto.RejectedByDriver)
107107
{
108-
<span class="badge bg-danger shadow">Haydovchi tomonidan rad etilgan</span>
108+
<span class="badge bg-danger ">Haydovchi tomonidan rad etilgan</span>
109109
}
110110
else if (item.Status == CheckDrive.ApiContracts.StatusForDto.Rejected)
111111
{
112-
<span class="badge bg-danger shadow">Rad etilgan</span>
112+
<span class="badge bg-danger ">Rad etilgan</span>
113113
}
114114
else
115115
{
116-
<span class="badge bg-empty shadow">No`malum holat</span>
116+
<span class="badge bg-empty ">No`malum holat</span>
117117
}
118118
</td>
119119
</tr>

‎CheckDrive.Web/CheckDrive.Web/Views/MechanicHandovers/Create.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<label asp-for="IsHanded" class="form-check-label" for="flexSwitchCheckDefault">Topshirish</label>
5656
</div>
5757
<div class="form-group w-50 mt-3">
58-
<label asp-for="Distance" class="control-label mt-2">Qabul qilish masofasi</label>
58+
<label asp-for="Distance" class="control-label mt-2">Boshlang'ich' masofasi</label>
5959
<input asp-for="Distance" class="form-control" type="number" min="0" step="1" />
6060
<span asp-validation-for="Distance" class="text-danger"></span>
6161
</div>

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@
7979
{
8080
@if ((bool)item.IsHanded)
8181
{
82-
<span class="badge bg-success shadow">Topshirildi</span>
82+
<span class="badge bg-success ">Topshirildi</span>
8383
}
8484
else
8585
{
86-
<span class="badge bg-danger shadow">Topshirilmadi</span>
86+
<span class="badge bg-danger ">Topshirilmadi</span>
8787
}
8888
}
8989
</td>
@@ -93,27 +93,27 @@
9393
<td class="text-center">
9494
@if (item.Status == CheckDrive.ApiContracts.StatusForDto.Pending)
9595
{
96-
<span class="badge bg-pending shadow">Kutilmoqda</span>
96+
<span class="badge bg-pending ">Kutilmoqda</span>
9797
}
9898
else if (item.Status == CheckDrive.ApiContracts.StatusForDto.Unassigned)
9999
{
100-
<span class="badge bg-unassigned shadow">Yaratilmagan</span>
100+
<span class="badge bg-unassigned ">Yaratilmagan</span>
101101
}
102102
else if (item.Status == CheckDrive.ApiContracts.StatusForDto.Completed)
103103
{
104-
<span class="badge bg-success shadow">Yakunlangan</span>
104+
<span class="badge bg-success ">Yakunlangan</span>
105105
}
106106
else if (item.Status == CheckDrive.ApiContracts.StatusForDto.RejectedByDriver)
107107
{
108-
<span class="badge bg-danger shadow">Haydovchi tomonidan rad etilgan</span>
108+
<span class="badge bg-danger ">Haydovchi tomonidan rad etilgan</span>
109109
}
110110
else if (item.Status == CheckDrive.ApiContracts.StatusForDto.Rejected)
111111
{
112-
<span class="badge bg-danger shadow">Rad etilgan</span>
112+
<span class="badge bg-danger ">Rad etilgan</span>
113113
}
114114
else
115115
{
116-
<span class="badge bg-empty shadow">No`malum holat</span>
116+
<span class="badge bg-empty ">No`malum holat</span>
117117
}
118118
</td>
119119
</tr>

0 commit comments

Comments
 (0)