qa-report #26

Merged
usama.jameel merged 4 commits from qa-report into main 2025-05-27 07:01:32 +00:00
5 changed files with 566 additions and 461 deletions

View File

@ -45,6 +45,7 @@ public class DashboardService {
LocalDateTime today = LocalDateTime.now().withHour(0).withMinute(0).withSecond(1); LocalDateTime today = LocalDateTime.now().withHour(0).withMinute(0).withSecond(1);
String startDate1 = today.format(formatter); String startDate1 = today.format(formatter);
String endDate1 = LocalDateTime.now().withHour(23).withMinute(59).withSecond(59).format(formatter); String endDate1 = LocalDateTime.now().withHour(23).withMinute(59).withSecond(59).format(formatter);
String forPreviousDate = LocalDateTime.now().minusDays(1).withHour(23).withMinute(59).withSecond(59).format(formatter);
//set inventory accounts //set inventory accounts
List<InventoryAccount> inventoryAccounts = inventoryAccountDAO.findAll(); List<InventoryAccount> inventoryAccounts = inventoryAccountDAO.findAll();
@ -72,12 +73,14 @@ public class DashboardService {
//set stitching related details //set stitching related details
Long approvedStitchingOfflineItems = 0L; Long approvedStitchingOfflineItems = 0L;
Long remaininfQcAlterPieces = 0L;
Long approvedStitchingOfflineItemsThenReject = 0L; Long approvedStitchingOfflineItemsThenReject = 0L;
long qcReject = 0L; long qcReject = 0L;
if (stitchingItemIds != null && !stitchingItemIds.isEmpty()) { if (stitchingItemIds != null && !stitchingItemIds.isEmpty()) {
approvedStitchingOfflineItems = stitchingOfflineItemDAO.findByQCOperationDateAndApproved(startDate1, endDate1, "APPROVED"); approvedStitchingOfflineItems = stitchingOfflineItemDAO.findByQCOperationDateAndApproved(startDate1, endDate1, "APPROVED");
qcReject = stitchingOfflineItemDAO.findByQCOperationDateAndIds(startDate1, endDate1, "REJECT", stitchingItemIds); qcReject = stitchingOfflineItemDAO.findByQCOperationDateAndIds(startDate1, endDate1, "REJECT", stitchingItemIds);
approvedStitchingOfflineItemsThenReject = stitchingOfflineItemDAO.findByQCOperationDateAndIds(startDate1, endDate1, "REJECT",stitchingOutIds); remaininfQcAlterPieces = stitchingOfflineItemDAO.findByQCOperationDateAndIds(null, forPreviousDate, "REJECT", stitchingItemIds);
approvedStitchingOfflineItemsThenReject = stitchingOfflineItemDAO.findByQCOperationDateAndIds(startDate1, endDate1, "REJECT", stitchingOutIds);
} }
@ -87,12 +90,14 @@ public class DashboardService {
Long washFinishedItem = 0L; Long washFinishedItem = 0L;
Long approved = 0L; Long approved = 0L;
Long operationNotPerformed = 0L; Long operationNotPerformed = 0L;
Long remainingAlterationPieceFinish = 0L;
if (finishing != null && !finishing.isEmpty()) { if (finishing != null && !finishing.isEmpty()) {
approved = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "APPROVED", finishing); approved = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "APPROVED", finishing);
operationNotPerformed = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "-", finishing); operationNotPerformed = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "-", finishing);
rejectFinishedItem = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "REJECT", finishing); rejectFinishedItem = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "REJECT", finishing);
washFinishedItem = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "WASHED", finishing); washFinishedItem = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "WASHED", finishing);
alterationPieceFinish = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "ALTER", finishing); alterationPieceFinish = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "ALTER", finishing);
remainingAlterationPieceFinish = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(null, forPreviousDate, "ALTER", finishing);
} }
//set packaging details //set packaging details
@ -118,7 +123,7 @@ public class DashboardService {
efficiency = (float) approvedStitchingOfflineItems / shiftTargetMinutesWise; efficiency = (float) approvedStitchingOfflineItems / shiftTargetMinutesWise;
} }
progress.put("Stitching", (float) approvedStitchingOfflineItems + qcReject + approvedStitchingOfflineItemsThenReject); progress.put("Stitching", (float) approvedStitchingOfflineItems + qcReject);
progress.put("totalWips", (float) stitchingItemIds.size() - qcReject); progress.put("totalWips", (float) stitchingItemIds.size() - qcReject);
progress.put("Alteration", (float) qcReject + approvedStitchingOfflineItemsThenReject); progress.put("Alteration", (float) qcReject + approvedStitchingOfflineItemsThenReject);
@ -128,8 +133,11 @@ public class DashboardService {
progress.put("wash", (float) washFinishedItem); progress.put("wash", (float) washFinishedItem);
progress.put("packaging", (float) packagingItems); progress.put("packaging", (float) packagingItems);
progress.put("totalPackaging", (float) packagingItemIDs.size());
progress.put("remainingFinishAlter", (float) remainingAlterationPieceFinish);
progress.put("remainingQCAlter", (float) remaininfQcAlterPieces);
progress.put("Efficiency",efficiency); progress.put("Efficiency", efficiency);
return progress; return progress;
} }

View File

@ -532,6 +532,7 @@ public class InventoryService {
long fromAccount = lastInvTransaction.getAccountId(); long fromAccount = lastInvTransaction.getAccountId();
createInventoryTransactionLeg(transaction, preCreatedItem, fromAccount, InventoryTransactionLeg.Type.OUT.name(), InventoryArtifactType.FINISHED_ITEM.name()); createInventoryTransactionLeg(transaction, preCreatedItem, fromAccount, InventoryTransactionLeg.Type.OUT.name(), InventoryArtifactType.FINISHED_ITEM.name());
} }
stitchingOfflineItem.setIsQa(true);
preCreatedItem.setIsQa(true); preCreatedItem.setIsQa(true);
finishedItemsForUlter.add(preCreatedItem); finishedItemsForUlter.add(preCreatedItem);
// create IN in finishing Account Finished Item // create IN in finishing Account Finished Item
@ -543,8 +544,8 @@ public class InventoryService {
preCreatedItem.setIsQa(false); preCreatedItem.setIsQa(false);
finishedItemsForUlter.add(preCreatedItem); finishedItemsForUlter.add(preCreatedItem);
} }
}
stitchingOfflineItem.setIsQa(false); stitchingOfflineItem.setIsQa(false);
}
stitchingOfflineItem.setQaStatus(qaStatus); stitchingOfflineItem.setQaStatus(qaStatus);
stitchingOfflineItem.setQcDoneAt(LocalDateTime.now()); stitchingOfflineItem.setQcDoneAt(LocalDateTime.now());
updatedStitchedItems.add(stitchingOfflineItem); updatedStitchedItems.add(stitchingOfflineItem);

View File

@ -4,7 +4,7 @@ document.addEventListener("DOMContentLoaded", function () {
return; return;
} }
function createGaugeChart(progress, color, divId, title, height, width , fontSize, fontYAxis, fontXAxis, fontColor, total, actual, aGrade, bGrade, cGrade) { function createGaugeChart(progress, color, divId, title, height, width, fontSize, fontYAxis, fontXAxis, fontColor, total, actual, aGrade, bGrade, cGrade) {
Highcharts.chart(divId, { Highcharts.chart(divId, {
chart: { chart: {
type: 'solidgauge', type: 'solidgauge',
@ -54,12 +54,12 @@ document.addEventListener("DOMContentLoaded", function () {
style: { style: {
fontSize: fontSize + 'px', fontSize: fontSize + 'px',
fontWeight: 'bold', fontWeight: 'bold',
color:fontColor color: fontColor
}, },
zIndex: 10 zIndex: 10
}, },
tooltip: { tooltip: {
pointFormat: title == 'Finishing Progress' ? 'Percentage: ' + progress + '%<br>Total: ' + total + '<br>Completed: ' + actual + '<br>A Grade: ' + aGrade + '<br>B Grade: ' + bGrade + '<br>C Grade: ' + cGrade : 'Percentage: ' + progress + '%<br>Total: ' + total + '<br>Completed:'+actual pointFormat: title == 'Finishing Progress' ? 'Percentage: ' + progress + '%<br>Total: ' + total + '<br>Completed: ' + actual + '<br>A Grade: ' + aGrade + '<br>B Grade: ' + bGrade + '<br>C Grade: ' + cGrade : 'Percentage: ' + progress + '%<br>Total: ' + total + '<br>Completed:' + actual
}, },
color: color, color: color,
showInLegend: false showInLegend: false
@ -69,6 +69,7 @@ document.addEventListener("DOMContentLoaded", function () {
} }
}); });
} }
function createBarChart(divId, height, width, title, aHeading, aData, bHeading, bData, cHeading, cData, dHeading, dData, dates, fontSize, maxValue) { function createBarChart(divId, height, width, title, aHeading, aData, bHeading, bData, cHeading, cData, dHeading, dData, dates, fontSize, maxValue) {
if (!document.getElementById(divId)) { if (!document.getElementById(divId)) {
return; return;
@ -94,7 +95,7 @@ document.addEventListener("DOMContentLoaded", function () {
labels: { labels: {
rotation: -45, rotation: -45,
style: { style: {
fontSize: 10-fontSize, fontSize: 10 - fontSize,
fontWeight: 'bold' fontWeight: 'bold'
} }
} }
@ -136,35 +137,66 @@ document.addEventListener("DOMContentLoaded", function () {
}] }]
}); });
} }
function dashboardChart(divId, height, width, title, aHeading, aData, bHeading, bData, cHeading, cData,dates, fontSize, maxValue) {
if (!document.getElementById(divId)) { function dashboardChart(
return; divId, height, width, title,
} aHeading, aData, bHeading, bData, cHeading, cData,
dates, fontSize, fontSizeText, maxValue
) {
if (!document.getElementById(divId)) return;
Highcharts.chart(divId, { Highcharts.chart(divId, {
chart: { chart: {
type: 'bar', type: 'bar',
height: height,
width: width
}, },
title: { title: {
text: title text: title,
style: {
fontSize: fontSize
}
}, },
xAxis: { xAxis: {
categories: dates,
labels: {
enabled: false
},
title: {
text: null
},
lineWidth: 2
}, },
yAxis: { yAxis: {
max: maxValue, max: maxValue,
min: 0, min: 0,
title: { title: {
align: 'high' text: null,
align: 'high',
style: {
fontSize: fontSizeText
}
}, },
labels: { labels: {
overflow: 'justify' style: {
fontSize: fontSizeText
}
}, },
gridLineWidth: 0 gridLineWidth: 0
}, },
legend: {
itemStyle: {
fontSize: fontSizeText
}
},
plotOptions: { plotOptions: {
bar: { bar: {
borderRadius: '50%', borderRadius: '50%',
dataLabels: { dataLabels: {
enabled: true enabled: true,
style: {
fontSize: fontSizeText
}
}, },
groupPadding: 0.1 groupPadding: 0.1
} }
@ -172,20 +204,25 @@ document.addEventListener("DOMContentLoaded", function () {
credits: { credits: {
enabled: false enabled: false
}, },
series: [{ series: [
{
name: aHeading, name: aHeading,
data: aData data: aData
}, { },
{
name: bHeading, name: bHeading,
data: bData data: bData
}, { },
{
name: cHeading, name: cHeading,
data: cData data: cData
}] }
]
}); });
} }
function createSingleBarChart(divId, height, width, title,Heading, Data, dates, fontSize, maxValue) {
function createSingleBarChart(divId, height, width, title, Heading, Data, dates, fontSize, maxValue) {
if (!document.getElementById(divId)) { if (!document.getElementById(divId)) {
return; return;
} }
@ -210,7 +247,7 @@ document.addEventListener("DOMContentLoaded", function () {
labels: { labels: {
rotation: -45, rotation: -45,
style: { style: {
fontSize: 10-fontSize, fontSize: 10 - fontSize,
fontWeight: 'bold' fontWeight: 'bold'
} }
} }
@ -235,7 +272,7 @@ document.addEventListener("DOMContentLoaded", function () {
}, },
legend: { legend: {
itemStyle: { itemStyle: {
fontSize: 10-fontSize, fontSize: 10 - fontSize,
fontWeight: 'bold' fontWeight: 'bold'
} }
}, },
@ -250,6 +287,7 @@ document.addEventListener("DOMContentLoaded", function () {
} }
initializeGauges(); initializeGauges();
function initializeGauges() { function initializeGauges() {
const gaugeDivs2 = document.querySelectorAll('.gauge-chart2'); const gaugeDivs2 = document.querySelectorAll('.gauge-chart2');
@ -296,16 +334,16 @@ document.addEventListener("DOMContentLoaded", function () {
const maxValue = Number(div.getAttribute('data-totalProduction')); const maxValue = Number(div.getAttribute('data-totalProduction'));
const aHeading = 'Cutting'; const aHeading = 'Cutting';
const aData = JSON.parse(div.getAttribute('data-cutting')); const aData = JSON.parse(div.getAttribute('data-cutting'));
const bHeading='Stitching'; const bHeading = 'Stitching';
const bData =JSON.parse(div.getAttribute('data-stitching')); const bData = JSON.parse(div.getAttribute('data-stitching'));
const cHeading='End Line Quality Checking'; const cHeading = 'End Line Quality Checking';
const cData =JSON.parse(div.getAttribute('data-quality')); const cData = JSON.parse(div.getAttribute('data-quality'));
const dHeading="Finish Items"; const dHeading = "Finish Items";
const dData =JSON.parse(div.getAttribute('data-finishing')); const dData = JSON.parse(div.getAttribute('data-finishing'));
const dates = div.getAttribute('data-dates'); const dates = div.getAttribute('data-dates');
const datesArray = dates.split(','); const datesArray = dates.split(',');
const divId = div.id; const divId = div.id;
createBarChart( divId, height, width, title, aHeading, aData, bHeading, bData, cHeading, cData, dHeading, dData, datesArray, fontSize, maxValue); createBarChart(divId, height, width, title, aHeading, aData, bHeading, bData, cHeading, cData, dHeading, dData, datesArray, fontSize, maxValue);
}); });
const dashboardBarChart = document.querySelectorAll('.dashboardBarChart'); // fixed name const dashboardBarChart = document.querySelectorAll('.dashboardBarChart'); // fixed name
@ -314,25 +352,26 @@ document.addEventListener("DOMContentLoaded", function () {
const height = div.getAttribute('data-height'); const height = div.getAttribute('data-height');
const width = div.getAttribute('data-width'); const width = div.getAttribute('data-width');
const fontSize = div.getAttribute('data-fontSize'); const fontSize = div.getAttribute('data-fontSize');
const rawValue = div.getAttribute('data-totalProduction') || "0"; const rawValue = div.getAttribute('data-totalProduction') || "0";
const cleanValue = rawValue.replace(/[^0-9.-]+/g, ''); const cleanValue = rawValue.replace(/[^0-9.-]+/g, '');
const maxValue = Number(cleanValue); const maxValue = Number(cleanValue);
const cHeading = 'Achieved';
const cDataString = div.getAttribute('data-achieved');
const cleanValueAchieved = cDataString.replace(/[^0-9.-]+/g, '');
const cData = [Number(cleanValueAchieved)];
const aHeading = 'Stitching'; const aHeading = 'Stitching';
const aDataString = div.getAttribute('data-stitching'); const aDataString = div.getAttribute('data-stitching');
const cleanValueStitch = aDataString.replace(/[^0-9.-]+/g, ''); const cleanValueStitch = aDataString.replace(/[^0-9.-]+/g, '');
const aData = [Number(cleanValueStitch)]; const aData = [Number(cleanValueStitch)];
const bHeading = 'Packaging'; const bHeading = 'Finishing';
const bDataString =div.getAttribute('data-packaging'); const bDataString = div.getAttribute('data-finishing');
const packaging = bDataString.replace(/[^0-9.-]+/g, ''); const packaging = bDataString.replace(/[^0-9.-]+/g, '');
const bData = [Number(packaging)]; const bData = [Number(packaging)];
const cHeading = 'Packaging';
const cDataString = div.getAttribute('data-packaging');
const cleanValueAchieved = cDataString.replace(/[^0-9.-]+/g, '');
const cData = [Number(cleanValueAchieved)];
const dates = [div.getAttribute('data-dates')]; const dates = [div.getAttribute('data-dates')];
const divId = div.id; const divId = div.id;
dashboardChart( dashboardChart(
@ -348,6 +387,7 @@ document.addEventListener("DOMContentLoaded", function () {
cData, cData,
dates, dates,
fontSize, fontSize,
'20',
maxValue maxValue
); );
}); });
@ -364,7 +404,7 @@ document.addEventListener("DOMContentLoaded", function () {
const dates = div.getAttribute('data-dates'); const dates = div.getAttribute('data-dates');
const datesArray = dates.split(','); const datesArray = dates.split(',');
const divId = div.id; const divId = div.id;
createSingleBarChart( divId, height, width, title, Heading, Data, datesArray, fontSize, maxValue); createSingleBarChart(divId, height, width, title, Heading, Data, datesArray, fontSize, maxValue);
}); });
} }
}); });

View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml"> <html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
<head th:fragment="head (title)"> <head th:fragment="head (title)">
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta http-equiv="refresh" content="60" th:if="${refresh == true}"> <meta http-equiv="refresh" content="60" th:if="${refresh == true}">
@ -32,10 +32,10 @@
animation: blinker 1s linear infinite; animation: blinker 1s linear infinite;
} }
</style> </style>
</head> </head>
<body> <body>
<header class="row page-header font-sm" th:fragment="page-header"> <header class="row page-header font-sm" th:fragment="page-header">
<!--<editor-fold desc="Description">--> <!--<editor-fold desc="Description">-->
<div class="col-sm"> <div class="col-sm">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark " role="navigation"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark " role="navigation">
@ -45,11 +45,13 @@
<ul class="navbar-nav"> <ul class="navbar-nav">
<li class="nav-item" sec:authorize="hasAnyRole('ROLE_PURCHASE_ORDER', 'ROLE_ADMIN')"> <li class="nav-item" sec:authorize="hasAnyRole('ROLE_PURCHASE_ORDER', 'ROLE_ADMIN')">
<a th:href="@{/purchase-order/}" class="nav-link" <a th:href="@{/purchase-order/}" class="nav-link"
th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/purchase-order') ? 'active' : ''}">Purchase Order</a> th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/purchase-order') ? 'active' : ''}">Purchase
Order</a>
</li> </li>
<li class="nav-item" sec:authorize="hasAnyRole('ROLE_JOB_CARD', 'ROLE_ADMIN')"> <li class="nav-item" sec:authorize="hasAnyRole('ROLE_JOB_CARD', 'ROLE_ADMIN')">
<a th:href="@{/job-cards/}" class="nav-link" <a th:href="@{/job-cards/}" class="nav-link"
th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/job-cards') ? 'active' : ''}">Job Cards</a> th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/job-cards') ? 'active' : ''}">Job
Cards</a>
</li> </li>
<li class="nav-item" sec:authorize="hasAnyRole('ROLE_CUTTING', 'ROLE_ADMIN')"> <li class="nav-item" sec:authorize="hasAnyRole('ROLE_CUTTING', 'ROLE_ADMIN')">
<a th:href="@{/cutting/}" class="nav-link" <a th:href="@{/cutting/}" class="nav-link"
@ -61,7 +63,8 @@
</li> </li>
<li class="nav-item" sec:authorize="hasAnyRole('ROLE_QUALITY_CONTROL', 'ROLE_ADMIN')"> <li class="nav-item" sec:authorize="hasAnyRole('ROLE_QUALITY_CONTROL', 'ROLE_ADMIN')">
<a th:href="@{/quality-control/}" class="nav-link" <a th:href="@{/quality-control/}" class="nav-link"
th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/quality-control') ? 'active' : ''}">Quality Control</a> th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/quality-control') ? 'active' : ''}">Quality
Control</a>
</li> </li>
<li class="nav-item" sec:authorize="hasAnyRole('ROLE_FINISHING', 'ROLE_ADMIN')"> <li class="nav-item" sec:authorize="hasAnyRole('ROLE_FINISHING', 'ROLE_ADMIN')">
<a th:href="@{/finishing/}" class="nav-link" <a th:href="@{/finishing/}" class="nav-link"
@ -117,15 +120,15 @@
</div> </div>
</nav> </nav>
<!-- second level purchase Order--> <!-- second level purchase Order-->
<!-- <nav class="navbar navbar-light bg-light navbar-expand-lg justify-content-between"--> <!-- <nav class="navbar navbar-light bg-light navbar-expand-lg justify-content-between"-->
<!-- th:if="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/purchase-order')}">--> <!-- th:if="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/purchase-order')}">-->
<!-- <ul class="navbar-nav">--> <!-- <ul class="navbar-nav">-->
<!-- <li class="nav-item"--> <!-- <li class="nav-item"-->
<!-- th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/purchase-order') ? 'active' : ''}">--> <!-- th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/purchase-order') ? 'active' : ''}">-->
<!-- <a th:href="@{/purchase-order/}" class="nav-link">Cards</a>--> <!-- <a th:href="@{/purchase-order/}" class="nav-link">Cards</a>-->
<!-- </li>--> <!-- </li>-->
<!-- </ul>--> <!-- </ul>-->
<!-- </nav>--> <!-- </nav>-->
<!-- second level job cards--> <!-- second level job cards-->
<nav class="navbar navbar-light bg-light navbar-expand-lg justify-content-between" <nav class="navbar navbar-light bg-light navbar-expand-lg justify-content-between"
th:if="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/job-cards')}"> th:if="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/job-cards')}">
@ -215,10 +218,10 @@
th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/quality-control/qc-finished-items') ? 'active' : ''}"> th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/quality-control/qc-finished-items') ? 'active' : ''}">
<a th:href="@{/quality-control/qc-finished-items}" class="nav-link">QC Finished Item</a> <a th:href="@{/quality-control/qc-finished-items}" class="nav-link">QC Finished Item</a>
</li> </li>
<!-- <li class="nav-item"--> <!-- <li class="nav-item"-->
<!-- th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/quality-control/inventory-accounts') ? 'active' : ''}">--> <!-- th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/quality-control/inventory-accounts') ? 'active' : ''}">-->
<!-- <a th:href="@{/quality-control/inventory-accounts}" class="nav-link">Inventory Accounts</a>--> <!-- <a th:href="@{/quality-control/inventory-accounts}" class="nav-link">Inventory Accounts</a>-->
<!-- </li>--> <!-- </li>-->
</ul> </ul>
</nav> </nav>
<!-- second level stitching --> <!-- second level stitching -->
@ -254,9 +257,9 @@
</ul> </ul>
</nav> </nav>
</div> </div>
</header> </header>
<!-- table loading skeleton --> <!-- table loading skeleton -->
<div class="table-loading-skeleton" th:fragment="table-loading-skeleton"> <div class="table-loading-skeleton" th:fragment="table-loading-skeleton">
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between">
<div> <div>
<div class="skeleton-box" style="width:35px;"></div> <div class="skeleton-box" style="width:35px;"></div>
@ -273,11 +276,11 @@
<div class="skeleton-box"></div> <div class="skeleton-box"></div>
</div> </div>
</div> </div>
</div> </div>
<div th:fragment="page-footer-scripts"> <div th:fragment="page-footer-scripts">
<script th:src="@{/js/vendor/lazyload-db.js}"></script> <script th:src="@{/js/vendor/lazyload-db.js}"></script>
<script th:src="@{/js/main.js}"></script> <script th:src="@{/js/main.js}"></script>
</div> </div>
</body> </body>
</html> </html>

View File

@ -19,7 +19,7 @@
</div> </div>
</header> </header>
<main class="container-fluid main-content"> <main id="main1" class="container-fluid main-content">
<div class="row page-main g-4 p-3"> <div class="row page-main g-4 p-3">
<div class="col-lg-6"> <div class="col-lg-6">
<!-- Title Row --> <!-- Title Row -->
@ -71,7 +71,8 @@
<div class="px-4" style="height: 150px"> <div class="px-4" style="height: 150px">
<h1 class="card-text text-danger fw-bold blink" style="font-size: 4rem;" <h1 class="card-text text-danger fw-bold blink" style="font-size: 4rem;"
th:text="${(phases.get('Alteration') != null ? phases.get('Alteration').intValue() : 0) + ' Pcs'}"></h1> th:text="${(phases.get('Alteration') != null ? phases.get('Alteration').intValue() : 0) + ' Pcs'}"></h1>
<h2 class="card-title text-danger fw-bold text-uppercase blink" style="font-size: 3rem;">ALTERATION</h2> <h2 class="card-title text-danger fw-bold text-uppercase blink" style="font-size: 3rem;">
ALTERATION</h2>
</div> </div>
</div> </div>
@ -108,7 +109,7 @@
<div class="ps-2 text-center"> <div class="ps-2 text-center">
<h1 class="fw-bold m-0" <h1 class="fw-bold m-0"
th:text="${phases.get('finishing')?.intValue() ?: 0} + ' Pcs'"></h1> th:text="${phases.get('finishing')?.intValue() ?: 0} + ' Pcs'"></h1>
<h4 class="pt-2 fw-bold text-uppercase m-0" >Finishing</h4> <h4 class="pt-2 fw-bold text-uppercase m-0">Finishing</h4>
</div> </div>
</div> </div>
<div class="card-body p-0 text-center d-flex justify-content-center"> <div class="card-body p-0 text-center d-flex justify-content-center">
@ -148,8 +149,60 @@
</div> </div>
</div> </div>
</main> </main>
</div> <main id="main2" class="container-fluid main-content" style="display: none;">
<div class="row page-main g-4 p-3">
<div class="col-lg-12 d-flex border border-black-50">
<div id="dashboardBarChart" class="dashboardBarChart w-100"
style="min-height: 476px;"
th:data-title="${detail.get('articleName')} + ' (' + ${date} + ')'"
th:data-dates="${date}"
th:data-stitching="${phases.get('Stitching')?.intValue() ?: 0}"
th:data-finishing="${phases.get('finishing')?.intValue() ?: 0}"
th:data-packaging="${phases.get('packaging')?.intValue() ?: 0}"
th:data-totalProduction="${detail.get('Shift Target')}"
th:data-fontSize="35">
</div>
</div>
</div>
<div class="row page-main g-4 p-3">
<div class="col-lg-4">
<div class="h-100 border border-black-50 p-3 d-flex flex-column align-items-center justify-content-center text-center text-white rounded"
style="background-color: #516ec4;">
<h1 class="fw-bold pt-5 pb-2" style="font-size: 6rem;"
th:text="${phases.get('remainingQCAlter')?.intValue()}">0%</h1>
<h4 class="fw-bold m-0 pt-2 pb-5" style="font-size: 4rem;">Remaining QC Alter Pcs</h4>
</div>
</div>
<div class="col-lg-4">
<div class="h-100 border border-black-50 p-3 d-flex flex-column align-items-center justify-content-center text-center text-white rounded"
style="background-color: #72788a;">
<h1 class="fw-bold pt-5 pb-2" style="font-size: 6rem;"
th:text="${phases.get('remainingFinishAlter')?.intValue()}">0</h1>
<h1 class="fw-bold m-0 pt-2 pb-5" style="font-size: 4rem;">Remaining Finish Alter Pcs </h1>
</div>
</div>
<div class="col-lg-4">
<div class="h-100 border border-black-50 p-5 d-flex flex-column align-items-center justify-content-center text-center text-white rounded"
style="background-color: #4bb85f;">
<h1 class="fw-bold pt-5 pb-2" style="font-size: 7rem;"
th:text="${phases.get('totalPackaging')?.intValue()}">0</h1>
<h1 class="fw-bold m-0 pt-2 pb-5" style="font-size: 4rem;">OverAll Packing</h1>
</div>
</div>
</div>
</main>
</div>
<script>
setTimeout(function () {
document.getElementById("main1").style.display = "none";
document.getElementById("main2").style.display = "block";
}, 30000);
</script>
<script th:src="@{/js/charts.js}"></script> <script th:src="@{/js/charts.js}"></script>
</body> </body>
</html> </html>