solocla/reportify_mncl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added badge rating

Browse Source
This commit is contained in:
Claudio 2024-11-20 12:14:51 +01:00
parent f9c4d4f77b
commit 18735127bb
1 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
public/userarea/products/reportdetails.php
View File

@ -19,21 +19,23 @@ $reportDetails = $stmt->get_result()->fetch_assoc();
// Query per ottenere le parti e i risultati del report con il nome dell'analista e delle parti // Query per ottenere le parti e i risultati del report con il nome dell'analista e delle parti
$queryPartsAndResults = " $queryPartsAndResults = "
SELECT SELECT
rp.*, rp.*,
a.nameanalysisvoc AS testName, a.nameanalysisvoc AS testName,
cv.namecompoundsvocabulary AS analytsName, cv.namecompoundsvocabulary AS analytsName,
pr.partsDescription, pr.partsDescription,
pr.partsCode, pr.partsCode,
rp.result_UnitofMeasure, rp.result_UnitofMeasure,
rp.result_AnalytsRating AS analytsRating -- Renamed the field for clarity rp.result_AnalytsRating AS analytsRating, -- Renamed the field for clarity
FROM result_project rp ap.test_Rating AS analysisRating -- Rating from analysis_project
LEFT JOIN analysis_project ap ON rp.idanalysis_project = ap.idAnalysis_Project FROM result_project rp
LEFT JOIN analysisvocabulary a ON ap.result_TestName = a.idanalysisvocabulary LEFT JOIN analysis_project ap ON rp.idanalysis_project = ap.idAnalysis_Project
LEFT JOIN compundsvocabulary cv ON rp.result_AnalytsName = cv.idcompoundsvocabulary LEFT JOIN analysisvocabulary a ON ap.result_TestName = a.idanalysisvocabulary
LEFT JOIN parts pr ON rp.idPart = pr.idParts LEFT JOIN compundsvocabulary cv ON rp.result_AnalytsName = cv.idcompoundsvocabulary
WHERE rp.idreports = ? LEFT JOIN parts pr ON rp.idPart = pr.idParts
ORDER BY ap.result_TestName, rp.idPart; WHERE rp.idreports = ?
ORDER BY ap.result_TestName, rp.idPart;
"; ";
@ -96,16 +98,25 @@ while ($fileRow = $filesResult->fetch_assoc()) {
.rating-pass { .rating-pass {
background-color: #28a745; background-color: #28a745;
color: white; color: white;
padding: 5px 10px;
border-radius: 4px;
font-size: 0.9rem;
} }
.rating-fail { .rating-fail {
background-color: #dc3545; background-color: #dc3545;
color: white; color: white;
padding: 5px 10px;
border-radius: 4px;
font-size: 0.9rem;
} }
.rating-ambiguous { .rating-ambiguous {
background-color: #ffc107; background-color: #ffc107;
color: black; color: black;
padding: 5px 10px;
border-radius: 4px;
font-size: 0.9rem;
} }
.report-header { .report-header {
@ -357,7 +368,18 @@ while ($fileRow = $filesResult->fetch_assoc()) {
// Stampa il titolo dell'analisi // Stampa il titolo dell'analisi
$currentTestName = $row['testName']; $currentTestName = $row['testName'];
echo '<div class="section-separator">Analysis: ' . $currentTestName . '</div>'; $currentTestRating = $row['analysisRating'];
$testRatingClass = '';
if (strtolower($currentTestRating) === 'pass' || strtolower($currentTestRating) === 'complies' || strtolower($currentTestRating) === 'p') {
$testRatingClass = 'rating-pass';
} elseif (strtolower($currentTestRating) === 'fail' || strtolower($currentTestRating) === "doesn't comply" || strtolower($currentTestRating) === 'f') {
$testRatingClass = 'rating-fail';
} else {
$testRatingClass = 'rating-ambiguous';
}
echo '<div class="section-separator">Analysis: ' . $currentTestName . ' <span class="badge ' . $testRatingClass . '">' . htmlspecialchars($currentTestRating, ENT_QUOTES, 'UTF-8') . '</span></div>';
// Reset della parte corrente // Reset della parte corrente
$currentPart = ''; $currentPart = '';