correction of table showing data

This commit is contained in:
2026-07-30 17:05:33 +05:30
parent bf1df3a817
commit 46d11ec01f

View File

@@ -116,21 +116,65 @@
<div class="card-header"> <div class="card-header">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li class="nav-item"> <li class="nav-item">
<button class="nav-link active" data-bs-toggle="tab" data-bs-target="#barTab"> <button class="nav-link active"
data-bs-toggle="tab"
data-bs-target="#barTab">
<i class="bi bi-bar-chart"></i> Bar Chart <i class="bi bi-bar-chart"></i> Bar Chart
</button> </button>
</li> </li>
<li class="nav-item">
<button class="nav-link"
data-bs-toggle="tab"
data-bs-target="#tableTab">
<i class="bi bi-table"></i> Data Table
</button>
</li>
</ul> </ul>
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="tab-content"> <div class="tab-content">
<!-- BAR -->
<!-- BAR TAB -->
<div class="tab-pane fade show active" id="barTab">
<div style="height:600px"> <div style="height:600px">
<canvas id="barChart"></canvas> <canvas id="barChart"></canvas>
</div> </div>
</div>
<!-- TABLE TAB -->
<div class="tab-pane fade" id="tableTab">
<div class="table-responsive">
<table class="table table-bordered table-hover" id="resultTable">
<thead class="table-dark">
<tr>
<th>Sr No</th>
<th>Strata Type & Depth</th>
<th class="text-end">Client Qty</th>
<th class="text-end">Sub Contractor Qty</th>
<th class="text-end">Difference</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
</div>
</div> </div>
</div> </div>
@@ -144,7 +188,6 @@
<script> <script>
let barChart; let barChart;
let pieChart;
let raBillChoice; let raBillChoice;
/* Load RA Bills */ /* Load RA Bills */
@@ -209,10 +252,10 @@
fetch(`/dashboard/api/trench-analysis?subcontractor=${subcontractor}&category=${category}&ra_bill=${raBills.join(",")}`) fetch(`/dashboard/api/trench-analysis?subcontractor=${subcontractor}&category=${category}&ra_bill=${raBills.join(",")}`)
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
console.log(data); console.log(data);
drawBar(data); drawBar(data);
drawTable(data);
}) })
.catch(err => console.error(err)); .catch(err => console.error(err));
@@ -238,7 +281,7 @@
borderWidth: 1 borderWidth: 1
}, },
{ {
label: "Sub Contractor Qty", label: "Sub-Contractor Qty",
data: data.sub_qty, data: data.sub_qty,
backgroundColor: "#fd7e14", backgroundColor: "#fd7e14",
borderColor: "#fd7e14", borderColor: "#fd7e14",
@@ -284,6 +327,33 @@
} }
}); });
}
/* TABLE */
function drawTable(data){
let html='';
for(let i=0;i<data.labels.length;i++){
html+=`
<tr>
<td class="text-center">${i + 1}</td>
<td>${data.labels[i]}</td>
<td class="text-end">${data.client_qty[i]}</td>
<td class="text-end">${data.sub_qty[i]}</td>
<td class="text-end fw-bold ${data.client_qty[i]- data.sub_qty[i] >= 0 ? 'text-success' : 'text-danger'}">
${data.client_qty[i]- data.sub_qty[i]}
</td>
</tr>
`;
}
document.querySelector("#resultTable tbody").innerHTML = html;
} }
/* EVENTS */ /* EVENTS */