Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

An icon was added to change grids and display details #211

Merged
merged 1 commit into from
Oct 19, 2024
+60 −15
Merged

An icon was added to change grids and display details #211

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml
View file
Original file line number Diff line number Diff line change
@@ -50,12 +50,12 @@
gridLines="Vertical"
allowSorting="true">
<e-grid-columns>
<e-grid-column headerText="Id" field="Id" field="Id" template="#template" typeof="Text"></e-grid-column>
<e-grid-column headerText="Ism" field="FirstName" typeof="text"></e-grid-column>
<e-grid-column headerText="Familiya" field="LastName" typeof="text"></e-grid-column>
<e-grid-column headerText="Telefon raqam" field="PhoneNumber" typeof="text"></e-grid-column>
<e-grid-column headerText="Tug'ilgan yil" field="Bithdate" type="date" format="dd-MM-yyyy"></e-grid-column>
<e-grid-column headerText="Kasb" field="RoleName" typeof="text"></e-grid-column>
<e-grid-column width="180" type="text" textAlign="Center" template="#actionTemplate"></e-grid-column>
</e-grid-columns>
</ejs-grid>
</div>
@@ -96,8 +96,14 @@
</div>
</div>

<script id="template" type="text/x-template">
<div>
<a rel='nofollow' href="accounts/Details/${Id}">${Id}</a>
</div>
<script type="text/x-template" id="actionTemplate">
<button type="button" class="shadow-sm bg-white rounded e-btn e-flat mx-2" title="Tafsilot" onclick="onDetailsClick(${Id})">
<i class="bi bi-card-list text-info" style="font-size: 19px;"></i>
</button>
<button type="button" class="shadow-sm bg-white rounded e-btn e-flat" title="Tahrirlash" onclick="onEditClick(${Id})">
<i class="fa-solid fa-pen fa-lg text-warning" ></i>
</button>
<button type="button" class="shadow-sm bg-white rounded e-btn e-flat mx-2" title="O&#39;chirish" onclick="onDeleteClick(${Id})">
<i class="fa-solid fa-trash-can fa-lg text-danger"></i>
</button>
</script>
17 changes: 13 additions & 4 deletions CheckDrive.Web/CheckDrive.Web/Views/Cars/Index.cshtml
View file
Original file line number Diff line number Diff line change
@@ -44,16 +44,13 @@
gridLines="Vertical"
allowSorting="true">
<e-grid-columns>
<e-grid-column headerText="Id" field="Id" field="Id" template="#template" typeof="Text"></e-grid-column>
<e-grid-column headerText="Model" field="Model" typeof="Text"></e-grid-column>
<e-grid-column headerText="Davlat raqami" field="Number" typeof="text"></e-grid-column>
<e-grid-column headerText="Bosib o'tgan masofasi'" field="Mileage" typeof="text"></e-grid-column>
<e-grid-column headerText="Rangi" field="Color" typeof="text"></e-grid-column>
<e-grid-column headerText="Avtomobildagi yoqilg'i hajmi" field="RemainingFuel" typeof="text"></e-grid-column>
<e-grid-column headerText="O'rtacha yoqilg'i sarfi" field="MeduimFuelConsumption" typeof="text"></e-grid-column>
<e-grid-column headerText="Yoqilg'i baki sig'imi" field="FuelTankCapacity" typeof="text"></e-grid-column>
<e-grid-column headerText="Ishlab chiqarilgan yili" field="ManufacturedYear" typeof="text"></e-grid-column>
<e-grid-column headerText="Status" field="Status" type="string"></e-grid-column>
<e-grid-column width="180" type="text" textAlign="Center" template="#actionTemplate"></e-grid-column>
</e-grid-columns>
</ejs-grid>
</div>
@@ -101,3 +98,15 @@
<a rel='nofollow' href="cars/Details/${Id}">${Id}</a>
</div>
</script>

<script type="text/x-template" id="actionTemplate">
<button type="button" class="shadow-sm bg-white rounded e-btn e-flat mx-2" title="Tafsilot" onclick="onDetailsClick(${Id})">
<i class="bi bi-card-list text-info" style="font-size: 19px;"></i>
</button>
<button type="button" class="shadow-sm bg-white rounded e-btn e-flat" title="Tahrirlash" onclick="onEditClick(${Id})">
<i class="fa-solid fa-pen fa-lg text-warning" ></i>
</button>
<button type="button" class="shadow-sm bg-white rounded e-btn e-flat mx-2" title="O&#39;chirish" onclick="onDeleteClick(${Id})">
<i class="fa-solid fa-trash-can fa-lg text-danger"></i>
</button>
</script>
8 changes: 7 additions & 1 deletion CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/Index.cshtml
View file
Original file line number Diff line number Diff line change
@@ -39,13 +39,13 @@
<div class="col-12">
<ejs-grid id="dispatcherReview-list" dataSource="@ViewBag.DispatcherReviews" gridLines="Vertical" allowSorting="true" dataBound="onDataBound">
<e-grid-columns>
<e-grid-column headerText="Id" field="Id" type="number" template="#templat" textAlign=Center headerTextAlign=Center width="50"></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="Marka" field="CarName" type="string" textAlign=Center headerTextAlign=Center width="200"></e-grid-column>
<e-grid-column headerText="Dispetcher F.I.SH" field="DispatcherName" type="string" textAlign=Center headerTextAlign=Center></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="Operator F.I.SH" field="OperatorName" type="string" textAlign=Center headerTextAlign=Center width="200"></e-grid-column>
<e-grid-column headerText="Ro'yxatga olingan vaqt" field="Date" type="date" format="dd-MM-yyyy | HH:mm" textAlign=Center headerTextAlign=Center></e-grid-column>
<e-grid-column width="100" type="text" textAlign="Center" template="#actionTemplate"></e-grid-column>
</e-grid-columns>
</ejs-grid>
</div>
@@ -139,4 +139,10 @@
header.setAttribute('title', header.innerText.trim());
});
}
</script>

<script type="text/x-template" id="actionTemplate">
<button type="button" class="shadow-sm bg-white rounded e-btn e-flat mx-2" title="Tafsilot" onclick="onDetailsClick(${Id})">
<i class="bi bi-card-list text-info" style="font-size: 19px;"></i>
</button>
</script>
10 changes: 8 additions & 2 deletions CheckDrive.Web/CheckDrive.Web/Views/DoctorReviews/Index.cshtml
View file
Original file line number Diff line number Diff line change
@@ -31,12 +31,12 @@
<div class="row">
<div class="col-12">
<ejs-grid id="operatorReview-list" dataSource="@ViewBag.DoctorsReview" gridLines="Vertical" allowSorting="true" dataBound="onDataBound">
<e-grid-columns>
<e-grid-column headerText="Id" field="Id" template="#template" type="number" textAlign=Center headerTextAlign=Center width="50"></e-grid-column>
<e-grid-columns>
<e-grid-column headerText="Shifokor F.I.SH" field="DoctorName" type="string" textAlign=Center headerTextAlign=Center width="300"></e-grid-column>
<e-grid-column headerText="Haydovchi F.I.SH" field="DriverName" type="string" textAlign=Center headerTextAlign=Center width="300"></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="Sog'ligi" field="IsHealthy" template="#booleanColumnTemplate" textAlign=Center headerTextAlign=Center></e-grid-column>
<e-grid-column width="100" type="text" textAlign="Center" template="#actionTemplate"></e-grid-column>
</e-grid-columns>
</ejs-grid>
</div>
@@ -102,4 +102,10 @@
${else if(IsHealthy == 1)}
<span class="badge bg-success">Sog'lom</span>
${/if}
</script>

<script type="text/x-template" id="actionTemplate">
<button type="button" class="shadow-sm bg-white rounded e-btn e-flat mx-2" title="Tafsilot" onclick="onDetailsClick(${Id})">
<i class="bi bi-card-list text-info" style="font-size: 19px;"></i>
</button>
</script>
8 changes: 7 additions & 1 deletion CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/Index.cshtml
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,6 @@
<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>
@@ -54,6 +53,7 @@
<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 width="100" type="text" textAlign="Center" template="#actionTemplate"></e-grid-column>
</e-grid-columns>
</ejs-grid>
</div>
@@ -156,4 +156,10 @@
header.setAttribute('title', header.innerText.trim());
});
}
</script>

<script type="text/x-template" id="actionTemplate">
<button type="button" class="shadow-sm bg-white rounded e-btn e-flat mx-2" title="Tafsilot" onclick="onDetailsClick(${Id})">
<i class="bi bi-card-list text-info" style="font-size: 19px;"></i>
</button>
</script>
8 changes: 7 additions & 1 deletion CheckDrive.Web/CheckDrive.Web/Views/MechanicHandovers/Index.cshtml
View file
Original file line number Diff line number Diff line change
@@ -39,12 +39,12 @@
<div class="col-12">
<ejs-grid id="mechanicHandovers-list" dataSource="@ViewBag.MechanicHandovers" 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="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="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="Status" field="Status" template="#statusColumnTemplate" textAlign=Center headerTextAlign=Center width="100"></e-grid-column>
<e-grid-column width="100" type="text" textAlign="Center" template="#actionTemplate"></e-grid-column>
</e-grid-columns>
</ejs-grid>
</div>
@@ -157,4 +157,10 @@
${else if(Status == 4)}
<span class="badge bg-danger">Haydovchi tomonidan rad etilgan</span>
${/if}
</script>

<script type="text/x-template" id="actionTemplate">
<button type="button" class="shadow-sm bg-white rounded e-btn e-flat mx-2" title="Tafsilot" onclick="onDetailsClick(${Id})">
<i class="bi bi-card-list text-info" style="font-size: 19px;"></i>
</button>
</script>
8 changes: 7 additions & 1 deletion CheckDrive.Web/CheckDrive.Web/Views/OperatorReviews/Index.cshtml
View file
Original file line number Diff line number Diff line change
@@ -39,12 +39,12 @@
<div class="col-12">
<ejs-grid id="operatorReview-list" dataSource="@ViewBag.OperatorsReview" gridLines="Vertical" allowSorting="true" dataBound="onDataBound">
<e-grid-columns>
<e-grid-column headerText="Id" field="Id" type="number" template="#templat" textAlign=Center headerTextAlign=Center width="50"></e-grid-column>
<e-grid-column headerText="Operator F.I.SH" field="OperatorName" 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="CarModel" type="string" textAlign=Center headerTextAlign=Center ></e-grid-column>
<e-grid-column headerText="Ro'yxatdan o'tgan vaqt" field="Date" type="date" format="dd-MM-yyyy | HH:mm" type="string" textAlign=Center 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-column width="100" type="text" textAlign="Center" template="#actionTemplate"></e-grid-column>
</e-grid-columns>
</ejs-grid>
</div>
@@ -152,4 +152,10 @@
${else if(Status == 4)}
<span class="badge bg-danger">Haydovchi tomonidan rad etilgan</span>
${/if}
</script>

<script type="text/x-template" id="actionTemplate">
<button type="button" class="shadow-sm bg-white rounded e-btn e-flat mx-2" title="Tafsilot" onclick="onDetailsClick(${Id})">
<i class="bi bi-card-list text-info" style="font-size: 19px;"></i>
</button>
</script>