diff --git a/public/userarea/products/reportdetails.php b/public/userarea/products/reportdetails.php index b17e56e..83855ae 100644 --- a/public/userarea/products/reportdetails.php +++ b/public/userarea/products/reportdetails.php @@ -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 $queryPartsAndResults = " - SELECT - rp.*, - a.nameanalysisvoc AS testName, - cv.namecompoundsvocabulary AS analytsName, - pr.partsDescription, - pr.partsCode, - rp.result_UnitofMeasure, - rp.result_AnalytsRating AS analytsRating -- Renamed the field for clarity - FROM result_project rp - LEFT JOIN analysis_project ap ON rp.idanalysis_project = ap.idAnalysis_Project - LEFT JOIN analysisvocabulary a ON ap.result_TestName = a.idanalysisvocabulary - LEFT JOIN compundsvocabulary cv ON rp.result_AnalytsName = cv.idcompoundsvocabulary - LEFT JOIN parts pr ON rp.idPart = pr.idParts - WHERE rp.idreports = ? - ORDER BY ap.result_TestName, rp.idPart; +SELECT + rp.*, + a.nameanalysisvoc AS testName, + cv.namecompoundsvocabulary AS analytsName, + pr.partsDescription, + pr.partsCode, + rp.result_UnitofMeasure, + rp.result_AnalytsRating AS analytsRating, -- Renamed the field for clarity + ap.test_Rating AS analysisRating -- Rating from analysis_project +FROM result_project rp +LEFT JOIN analysis_project ap ON rp.idanalysis_project = ap.idAnalysis_Project +LEFT JOIN analysisvocabulary a ON ap.result_TestName = a.idanalysisvocabulary +LEFT JOIN compundsvocabulary cv ON rp.result_AnalytsName = cv.idcompoundsvocabulary +LEFT JOIN parts pr ON rp.idPart = pr.idParts +WHERE rp.idreports = ? +ORDER BY ap.result_TestName, rp.idPart; + "; @@ -96,16 +98,25 @@ while ($fileRow = $filesResult->fetch_assoc()) { .rating-pass { background-color: #28a745; color: white; + padding: 5px 10px; + border-radius: 4px; + font-size: 0.9rem; } .rating-fail { background-color: #dc3545; color: white; + padding: 5px 10px; + border-radius: 4px; + font-size: 0.9rem; } .rating-ambiguous { background-color: #ffc107; color: black; + padding: 5px 10px; + border-radius: 4px; + font-size: 0.9rem; } .report-header { @@ -357,7 +368,18 @@ while ($fileRow = $filesResult->fetch_assoc()) { // Stampa il titolo dell'analisi $currentTestName = $row['testName']; - echo '