Skip to content

Commit b71d71c

Browse files
khojianvarkhojianvar
authored
Merge pull request #102 from DiyorMarket/Doctor-page-code-fix
Doctor-page-fix-code
2 parents 7cc8c2c + f41d334 commit b71d71c

File tree

2 files changed

+53
-24
lines changed

2 files changed

+53
-24
lines changed

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

+49-20
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@
1111
<hr class="w-50" />
1212
<form id="doctorReviewForm" asp-action="Create" method="post">
1313
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
14-
<div class="form-check form-switch">
15-
<input asp-for="IsHealthy" class="form-check-input" type="checkbox" role="switch" id="flexSwitchCheckDefault" value="true">
16-
<label asp-for="IsHealthy" class="form-check-label" for="flexSwitchCheckDefault">@Html.DisplayNameFor(model => model.IsHealthy)</label>
17-
</div>
18-
<div class="form-group w-50">
14+
<div class="form-group w-50 mt-3">
15+
<label asp-for="DriverId">Haydovchi F.I.</label>
1916
@if (ViewBag.SelectedDriverId != null && ViewBag.SelectedDriverId != 0)
2017
{
2118
<select class="form-control border border-dark" disabled>
@@ -37,21 +34,25 @@
3734
}
3835
}
3936
</div>
40-
37+
<div class="form-check form-switch mt-3">
38+
<input asp-for="IsHealthy" class="form-check-input is-invalid" type="checkbox" role="switch" id="flexSwitchCheckDefault" value="true">
39+
<label asp-for="IsHealthy" class="form-check-label" for="flexSwitchCheckDefault">Sog`ligi</label>
40+
<div id="checkboxError" class="text-danger mt-2"></div>
41+
</div>
4142
<div class="form-group w-50">
4243
<select asp-for="DoctorId" class="form-control border border-dark d-none" asp-items="@ViewBag.Doctors"></select>
43-
<input type="hidden" asp-for="DoctorId" value="@ViewBag.DoctorId" />
44+
<input type="hidden" asp-for="DoctorId" value="@ViewBag.DoctorId" />
4445
</div>
45-
<div class="form-group w-50">
46+
<div class="form-group w-50 mt-3">
4647
<label asp-for="Comments" for="exampleFormControlTextarea1">Izoh</label>
4748
<textarea asp-for="Comments" class="form-control" rows="4"></textarea>
4849
</div>
49-
<div class="form-group mt-3 w-50">
50+
<div class="form-group mt-3 w-50 mt-3">
5051
<a asp-action="PersonalIndex" class="btn btn-outline-info">
51-
<i class="fa-solid fa-arrow-left-long"></i> Back
52+
<i class="fa-solid fa-arrow-left-long"></i> Orqaga
5253
</a>
53-
<button class="btn btn-outline-success" type="submit">
54-
<i class="fa fa-plus"></i> Create
54+
<button class="btn btn-success" type="submit">
55+
<i class="fa fa-plus"></i> Yaratish
5556
</button>
5657
</div>
5758
</form>
@@ -61,14 +62,42 @@
6162
<script>
6263
document.addEventListener('DOMContentLoaded', function () {
6364
var form = document.getElementById('doctorReviewForm');
64-
form.addEventListener('submit', function () {
65-
var checkbox = document.getElementById('flexSwitchCheckDefault');
66-
var hiddenInput = document.createElement('input');
67-
hiddenInput.type = 'hidden';
68-
hiddenInput.name = 'IsHealthy';
69-
hiddenInput.value = checkbox.checked ? 'true' : 'false';
70-
form.appendChild(hiddenInput);
65+
var checkbox = document.getElementById('flexSwitchCheckDefault');
66+
var checkboxError = document.getElementById('checkboxError');
67+
68+
// Check initially if the checkbox is not checked
69+
if (!checkbox.checked) {
70+
checkbox.classList.add('is-invalid');
71+
checkboxError.classList.remove('d-none');
72+
}
73+
74+
form.addEventListener('submit', function (event) {
75+
if (!checkbox.checked) {
76+
event.preventDefault(); // Prevent form submission
77+
checkbox.classList.add('is-invalid'); // Add invalid class
78+
checkboxError.classList.remove('d-none'); // Show error message
79+
} else {
80+
checkbox.classList.remove('is-invalid'); // Remove invalid class
81+
checkboxError.classList.add('d-none'); // Hide error message
82+
}
83+
});
84+
85+
// Remove invalid class and error message when checkbox is checked
86+
checkbox.addEventListener('change', function () {
87+
if (checkbox.checked) {
88+
checkbox.classList.remove('is-invalid');
89+
checkboxError.classList.add('d-none');
90+
} else {
91+
checkbox.classList.add('is-invalid');
92+
checkboxError.classList.remove('d-none');
93+
}
7194
});
7295
});
7396
</script>
74-
97+
98+
<style>
99+
.is-invalid {
100+
border-color: red !important;
101+
background-color: #f8d7da !important;
102+
}
103+
</style>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<!-- Search -->
2626
<div class="col-md-4">
2727
<div class="input-group">
28-
<input type="text" class="form-control rounded-left" placeholder="Haydovchini kiriting ..." name="searchString" value="@ViewBag.SearchString">
28+
<input type="text" class="form-control rounded-left" placeholder="Haydovchini qidirish ..." name="searchString" value="@ViewBag.SearchString">
2929
<div class="input-group-append">
3030
<button type="submit" class="btn btn-primary">
3131
<i class="fa fa-search"></i> Qidirish
@@ -47,7 +47,7 @@
4747
<table class="table table-bordered table-striped table-hover paper-shadow">
4848
<thead>
4949
<tr>
50-
<th class="text-center vertical-align-middle">Haydovshi F.I.</th>
50+
<th class="text-center vertical-align-middle">Haydovchi F.I.</th>
5151
<th class="text-center vertical-align-middle">Shifokor F.I.</th>
5252
<th class="text-center vertical-align-middle">Sog`lig`i</th>
5353
<th class="text-center vertical-align-middle">Izoh</th>
@@ -74,11 +74,11 @@
7474
{
7575
@if (review.IsHealthy == true)
7676
{
77-
<span class="badge bg-success shadow">Healthy</span>
77+
<span class="badge bg-success shadow">Sog`lom</span>
7878
}
7979
else if (review.IsHealthy == false)
8080
{
81-
<span class="badge bg-danger shadow">Sick</span>
81+
<span class="badge bg-danger shadow">Kasal</span>
8282
}
8383
}
8484
</td>

0 commit comments

Comments
 (0)