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

reportsdetails fixed

Browse Source
This commit is contained in:
Claudio 2024-09-24 16:05:49 +02:00
parent 0e4f47038f
commit 4583537638
2 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/userarea/index.php
View File

@ -1,4 +1,25 @@
<?php include('include/headscript.php'); ?> <?php include('include/headscript.php'); ?>
<?php
// Connessione al database
$conn = new mysqli($servername, $username, $password, $database);
// Query per ottenere i moduli attivi e disattivi
$query = "
SELECT idmodules, activemod
FROM activemodules
WHERE idcompany = ?
";
$stmt = $conn->prepare($query);
$stmt->bind_param("i", $idcompany);
$stmt->execute();
$result = $stmt->get_result();
$modulesStatus = [];
while ($row = $result->fetch_assoc()) {
$modulesStatus[$row['idmodules']] = $row['activemod'];
}
?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">

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

@ -22,13 +22,15 @@ $queryPartsAndResults = "
SELECT rp.*, SELECT rp.*,
a.nameanalysisvoc AS testName, a.nameanalysisvoc AS testName,
cv.namecompoundsvocabulary AS analytsName, cv.namecompoundsvocabulary AS analytsName,
pr.partsDescription pr.partsDescription,
rp.result_UnitofMeasure -- Aggiunge l'unità di misura
FROM result_project rp FROM result_project rp
LEFT JOIN analysisvocabulary a ON rp.result_TestName = a.idanalysisvocabulary LEFT JOIN analysisvocabulary a ON rp.result_TestName = a.idanalysisvocabulary
LEFT JOIN compundsvocabulary cv ON rp.result_AnalytsName = cv.idcompoundsvocabulary LEFT JOIN compundsvocabulary cv ON rp.result_AnalytsName = cv.idcompoundsvocabulary
LEFT JOIN parts pr ON rp.idPart = pr.idParts LEFT JOIN parts pr ON rp.idPart = pr.idParts
WHERE rp.idreports = ? WHERE rp.idreports = ?
ORDER BY rp.result_TestName, rp.idPart"; ORDER BY rp.result_TestName, rp.idPart";
$stmtParts = $conn->prepare($queryPartsAndResults); $stmtParts = $conn->prepare($queryPartsAndResults);
$stmtParts->bind_param("i", $idreports); $stmtParts->bind_param("i", $idreports);
$stmtParts->execute(); $stmtParts->execute();
@ -256,7 +258,14 @@ $partsAndResults = $stmtParts->get_result();
// Stampa i dettagli dell'analita // Stampa i dettagli dell'analita
echo '<tr>'; echo '<tr>';
echo '<td>' . (!empty($row['analytsName']) ? $row['analytsName'] . ' (ID: ' . $row['result_AnalytsName'] . ')' : '&nbsp;') . '</td>'; echo '<td>' . (!empty($row['analytsName']) ? $row['analytsName'] . ' (ID: ' . $row['result_AnalytsName'] . ')' : '&nbsp;') . '</td>';
echo '<td>' . (!empty($row['result_Value']) ? htmlspecialchars($row['result_Value'], ENT_QUOTES, 'UTF-8') : '&nbsp;') . '</td>'; echo '<td>' . (!empty($row['result_Value']) ? htmlspecialchars($row['result_Value'], ENT_QUOTES, 'UTF-8') : '&nbsp;');
// Aggiungi l'unità di misura se presente
if (!empty($row['result_UnitofMeasure'])) {
echo ' ' . htmlspecialchars($row['result_UnitofMeasure'], ENT_QUOTES, 'UTF-8'); // Aggiunge l'unità di misura accanto al valore
}
echo '</td>';
echo '<td class="' . $ratingClass . '">' . (!empty($row['test_Rating']) ? htmlspecialchars($row['test_Rating'], ENT_QUOTES, 'UTF-8') : '&nbsp;') . '</td>'; echo '<td class="' . $ratingClass . '">' . (!empty($row['test_Rating']) ? htmlspecialchars($row['test_Rating'], ENT_QUOTES, 'UTF-8') : '&nbsp;') . '</td>';
echo '</tr>'; echo '</tr>';
} }
@ -299,18 +308,35 @@ $partsAndResults = $stmtParts->get_result();
// Filtro per Part Name // Filtro per Part Name
$('#searchPart').on('keyup', function() { $('#searchPart').on('keyup', function() {
var value = $(this).val().toLowerCase(); var value = $(this).val().toLowerCase();
// Filtra le parti
$('h6').each(function() { $('h6').each(function() {
var part = $(this); var part = $(this);
var partTable = part.next('table');
if (part.text().toLowerCase().includes(value)) { if (part.text().toLowerCase().includes(value)) {
part.show(); part.show();
part.next('table').show(); partTable.show();
} else { } else {
part.hide(); part.hide();
part.next('table').hide(); partTable.hide();
}
});
// Dopo aver filtrato le parti, verifica se l'analisi ha parti visibili
$('.section-separator').each(function() {
var analysisTitle = $(this); // Il titolo dell'analisi
var hasVisibleParts = analysisTitle.nextUntil('.section-separator', 'h6:visible').length > 0; // Verifica se ci sono parti visibili
if (!hasVisibleParts) {
analysisTitle.hide(); // Nasconde l'intestazione dell'analisi se nessuna parte è visibile
} else {
analysisTitle.show(); // Mostra l'intestazione dell'analisi se almeno una parte è visibile
} }
}); });
}); });
// Filtro per Rating // Filtro per Rating
$('#searchRating').on('change', function() { $('#searchRating').on('change', function() {
var selectedRating = $(this).val().toLowerCase(); // Prende il rating selezionato var selectedRating = $(this).val().toLowerCase(); // Prende il rating selezionato
@ -340,12 +366,15 @@ $partsAndResults = $stmtParts->get_result();
if (visibleRows === 0) { if (visibleRows === 0) {
table.hide(); table.hide();
table.prev('h6').hide(); // Nasconde anche il titolo della parte table.prev('h6').hide(); // Nasconde anche il titolo della parte
table.prevAll('.section-separator:first').hide(); // Nasconde il titolo dell'analisi
} else { } else {
table.show(); table.show();
table.prev('h6').show(); // Mostra il titolo della parte table.prev('h6').show(); // Mostra il titolo della parte
table.prevAll('.section-separator:first').show(); // Mostra il titolo dell'analisi
} }
}); });
}); });
}); });
</script> </script>
<!-- plugin JS --> <!-- plugin JS -->