Merge pull request #105 from DiyorMarket/Mechanic-fix-create-page

fix-create-page

Author: khojianvar

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

@@ -71,9 +71,9 @@ public async Task<IActionResult> Index(int? pagenumber, string? searchString, Da
             return View();
         }
 
-        public async Task<IActionResult> PersonalIndex(int? pagenumber)
+        public async Task<IActionResult> PersonalIndex(int? pagenumber, string? searchString)
         {
-            var reviewsResponse = await _dispatcherReviewDataStore.GetDispatcherReviews(pagenumber, null, null, 5);
+            var reviewsResponse = await _dispatcherReviewDataStore.GetDispatcherReviews(pagenumber, searchString, null, 5);
 
             ViewBag.PageSize = reviewsResponse.PageSize;
             ViewBag.PageCount = reviewsResponse.TotalPages;

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

@@ -11,11 +11,7 @@
 
         <form id="mechanicHandoverForm" asp-action="Create" method="post">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <div class="form-check form-switch">
-                <input asp-for="IsHanded" class="form-check-input" type="checkbox" role="switch" id="flexSwitchCheckDefault">
-                <label asp-for="IsHanded" class="form-check-label" for="flexSwitchCheckDefault">Topshirish</label>
-            </div>
-            <div class="form-group w-50">
+            <div class="form-group w-50 mt-3">
                 <label asp-for="DriverId" class="control-label mt-2">Haydovchi</label>
                 @if (ViewBag.SelectedDriverId != null && ViewBag.SelectedDriverId != 0)
                 {
@@ -38,10 +34,10 @@
                     }
                 }
             </div>
-            <div class="form-group w-50">
+            <div class="form-group w-50 mt-3">
                 <input type="text" asp-for="MechanicId" class="form-control border border-dark d-none" />
             </div>
-            <div class="form-group w-50">
+            <div class="form-group w-50 mt-3">
                 <label asp-for="CarId" class="control-label mt-2">Mashina</label>
                 @if (ViewBag.Cars == null || !((IEnumerable<SelectListItem>)ViewBag.Cars.Items).Any())
                 {
@@ -54,18 +50,22 @@
                     <select asp-for="CarId" class="form-control border border-dark" asp-items="@ViewBag.Cars"></select>
                 }
             </div>
-            <div class="form-group w-50">
+            <div class="form-check form-switch mt-3">
+                <input asp-for="IsHanded" class="form-check-input" type="checkbox" role="switch" id="flexSwitchCheckDefault">
+                <label asp-for="IsHanded" class="form-check-label" for="flexSwitchCheckDefault">Topshirish</label>
+            </div>
+            <div class="form-group w-50 mt-3">
                 <label asp-for="Distance" class="control-label mt-2">Qabul qilish masofasi</label>
                 <input asp-for="Distance" class="form-control" type="number" min="0" step="1" />
                 <span asp-validation-for="Distance" class="text-danger"></span>
             </div>
 
-            <div class="form-group w-50">
+            <div class="form-group w-50 mt-3">
                 <label asp-for="Comments" class="control-label mt-2">Izoh</label>
                 <textarea asp-for="Comments" class="form-control" rows="4"></textarea>
             </div>
-            <div class="form-group mt-3 w-50">
-                <a asp-action="PersonalIndex" class="btn btn-info">
+            <div class="form-group mt-3 w-50 mt-3">
+                <a asp-action="PersonalIndex" class="btn btn-outline-info">
                     <i class="fa-solid fa-arrow-left-long"></i> Orqaga
                 </a>
                 @{
@@ -90,11 +90,25 @@
     <script>
         document.addEventListener('DOMContentLoaded', function () {
             var form = document.getElementById('mechanicHandoverForm');
+            var checkbox = document.getElementById('flexSwitchCheckDefault');
+            var checkboxLabel = document.querySelector('label[for="flexSwitchCheckDefault"]');
+
+            function toggleCheckboxHighlight() {
+                if (!checkbox.checked) {
+                    checkbox.classList.add('border-danger');
+                    checkboxLabel.classList.add('text-danger');
+                } else {
+                    checkbox.classList.remove('border-danger');
+                    checkboxLabel.classList.remove('text-danger');
+                }
+            }
+
+            toggleCheckboxHighlight(); // Initial check
+            checkbox.addEventListener('change', toggleCheckboxHighlight);
+
             form.addEventListener('submit', function (event) {
                 var distance = document.getElementById('Distance').value;
-                var isGivenInput = document.getElementById('flexSwitchCheckDefault');
-                var isGiven = isGivenInput.checked;
-
+                var isGiven = checkbox.checked;
                 var distanceValue = Number(distance);
 
                 if (distanceValue === 0 && isGiven) {
@@ -107,4 +121,15 @@
             });
         });
     </script>
-}
+}
+
+<style>
+    .border-danger {
+        border-color: red !important;
+        background-color: #f8d7da !important;
+    }
+
+    .text-danger {
+        color: red !important;
+    }
+</style>