diff --git a/public/userarea/easyspec/detail-rsl.php b/public/userarea/easyspec/detail-rsl.php index 55d128a..7054220 100644 --- a/public/userarea/easyspec/detail-rsl.php +++ b/public/userarea/easyspec/detail-rsl.php @@ -272,7 +272,7 @@
Choose the analysis to add to the RSL for the material

setQuery("SELECT * FROM analysis WHERE analysis.company_id='$idcompany' ORDER BY analysis.name_analysis"); + $analysislist->setQuery("SELECT * FROM analysisvocabulary WHERE analysisvocabulary.preferred='Y' ORDER BY analysisvocabulary.nameanalysisvoc"); $analysislist->execute(); ?>
@@ -282,8 +282,8 @@ "> - +
@@ -354,7 +354,7 @@ setQuery("SELECT * FROM `analysis_rsl` LEFT JOIN analysis ON analysis_rsl.analysis_id=analysis.idanalysis LEFT JOIN standards ON `analysis_rsl`.idmethods=standards.idstandards WHERE analysis_rsl.rsl_id='$idrsl' AND analysis_rsl.material_id='$material_id'"); + $tablequery2->setQuery("SELECT * FROM `analysis_rsl` LEFT JOIN analysisvocabulary ON analysis_rsl.analysis_id=analysisvocabulary.idanalysisvocabulary LEFT JOIN standards ON `analysis_rsl`.idmethods=standards.idstandards WHERE analysis_rsl.rsl_id='$idrsl' AND analysis_rsl.material_id='$material_id'"); $tablequery2->execute(); ?> @@ -365,7 +365,7 @@ $idanalysis = $tablequery2->getColumnVal("analysis_id"); ?> - getColumnVal("name_analysis")); ?> + getColumnVal("nameanalysisvoc")); ?>
@@ -449,7 +449,7 @@ setQuery("SELECT * FROM analysis_component LEFT JOIN component ON analysis_component.idcomponent=component.idcomponent WHERE analysis_component.idanalysis='$idanalysis'"); + $companalysis->setQuery("SELECT * FROM analysis_component LEFT JOIN compundsvocabulary ON analysis_component.idcomponent=compundsvocabulary.idcompoundsvocabulary WHERE analysis_component.idanalysis='$idanalysis'"); $companalysis->execute(); ?> - getColumnVal("name_component")); ?> + getColumnVal("namecompoundsvocabulary")); ?> - getColumnVal("cas_component")); ?> + getColumnVal("cascompoundvocabulary")); ?> diff --git a/public/userarea/easyspec/insert-analysis.php b/public/userarea/easyspec/insert-analysis.php index 90a9820..2e2a2e8 100644 --- a/public/userarea/easyspec/insert-analysis.php +++ b/public/userarea/easyspec/insert-analysis.php @@ -25,16 +25,12 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $InsertQuery = new WA_MySQLi_Query($repnew); $InsertQuery->Action = "insert"; - $InsertQuery->Table = "`analysis`"; + $InsertQuery->Table = "`analysisvocabulary`"; $InsertQuery->bindColumn("idanalysis", "s", "" . ((isset($_POST["idanalysis"])) ? $_POST["idanalysis"] : "") . "", "WA_DEFAULT"); - $InsertQuery->bindColumn("name_analysis", "s", "" . ((isset($_POST["name_analysis"])) ? $_POST["name_analysis"] : "") . "", "WA_DEFAULT"); + $InsertQuery->bindColumn("nameanalysisvoc", "s", "" . ((isset($_POST["name_analysis"])) ? $_POST["name_analysis"] : "") . "", "WA_DEFAULT"); $InsertQuery->bindColumn("description_analysis", "s", "" . ((isset($_POST["description_analysis"])) ? $_POST["description_analysis"] : "") . "", "WA_DEFAULT"); $InsertQuery->bindColumn("family_analysis", "s", "" . ((isset($_POST["family_analysis"])) ? $_POST["family_analysis"] : "") . "", "WA_DEFAULT"); - $InsertQuery->bindColumn("company_id", "s", "" . ((isset($_POST["company_id"])) ? $_POST["company_id"] : "") . "", "WA_DEFAULT"); - $InsertQuery->bindColumn("department_id", "s", "" . ((isset($_POST["department_id"])) ? $_POST["department_id"] : "") . "", "WA_DEFAULT"); - $InsertQuery->bindColumn("created_at", "s", "" . ((isset($_POST["created_at"])) ? $_POST["created_at"] : "") . "", "WA_DEFAULT"); - $InsertQuery->bindColumn("updated_at", "s", "" . ((isset($_POST["updated_at"])) ? $_POST["updated_at"] : "") . "", "WA_DEFAULT"); - $InsertQuery->bindColumn("preset", "s", "" . ((isset($_POST["preset"])) ? $_POST["preset"] : "") . "", "WA_DEFAULT"); + $InsertQuery->bindColumn("preferred", "s", "Y", "WA_DEFAULT"); $InsertQuery->saveInSession(""); $InsertQuery->execute(); $InsertGoTo = "analysis.php"; diff --git a/public/userarea/easyspec/update-analysis.php b/public/userarea/easyspec/update-analysis.php index adbb250..59b7c44 100644 --- a/public/userarea/easyspec/update-analysis.php +++ b/public/userarea/easyspec/update-analysis.php @@ -5,12 +5,11 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $UpdateQuery = new WA_MySQLi_Query($repnew); $UpdateQuery->Action = "update"; - $UpdateQuery->Table = "`analysis`"; - $UpdateQuery->bindColumn("name_analysis", "s", "" . ((isset($_POST["name_analysis"])) ? $_POST["name_analysis"] : "") . "", "WA_DEFAULT"); + $UpdateQuery->Table = "`analysisvocabulary`"; + $UpdateQuery->bindColumn("nameanalysisvoc", "s", "" . ((isset($_POST["name_analysis"])) ? $_POST["name_analysis"] : "") . "", "WA_DEFAULT"); $UpdateQuery->bindColumn("description_analysis", "s", "" . ((isset($_POST["description_analysis"])) ? $_POST["description_analysis"] : "") . "", "WA_DEFAULT"); - $UpdateQuery->bindColumn("updated_at", "s", "" . ((isset($_POST["updated_at"])) ? $_POST["updated_at"] : "") . "", "WA_DEFAULT"); $UpdateQuery->bindColumn("family_analysis", "s", "" . ((isset($_POST["family_analysis"])) ? $_POST["family_analysis"] : "") . "", "WA_DEFAULT"); - $UpdateQuery->addFilter("idanalysis", "=", "i", "" . ($_GET['idanalysis']) . ""); + $UpdateQuery->addFilter("idanalysisvocabulary", "=", "i", "" . ($_GET['idanalysis']) . ""); $UpdateQuery->execute(); $UpdateGoTo = "analysis.php"; if (function_exists("rel2abs")) $UpdateGoTo = $UpdateGoTo ? rel2abs($UpdateGoTo, dirname(__FILE__)) : ""; @@ -125,8 +124,9 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { setQuery("SELECT * FROM analysis LEFT JOIN family_analysis ON analysis.family_analysis=family_analysis.idfamilyanalysis WHERE analysis.idanalysis='$idanalysis'"); + $updatequery->setQuery("SELECT * FROM analysisvocabulary LEFT JOIN family_analysis ON analysisvocabulary.family_analysis=family_analysis.idfamilyanalysis WHERE analysisvocabulary.idanalysisvocabulary='$idanalysis'"); $updatequery->execute(); + ?> @@ -145,7 +145,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
- "> + ">
diff --git a/public/userarea/include/parsedatachart.php b/public/userarea/include/parsedatachart.php index 5529fc4..e4cf92f 100644 --- a/public/userarea/include/parsedatachart.php +++ b/public/userarea/include/parsedatachart.php @@ -202,7 +202,7 @@ LEFT JOIN products ON result_project.idproducts = products.idproducts WHERE LOWER(result_project.result_Rating) = 'fail' GROUP BY namesupplier ORDER BY counter DESC -LIMIT 10; +LIMIT 30; "; $resultworstsupplier = mysqli_query($repnew, $worstsupplier) or die("Error in Selecting " . mysqli_error($repnew)); diff --git a/public/userarea/ratego/ratego.php b/public/userarea/ratego/ratego.php index 463e3ac..bd3a3bb 100644 --- a/public/userarea/ratego/ratego.php +++ b/public/userarea/ratego/ratego.php @@ -21,6 +21,17 @@ + + + + + + + + + + + @@ -167,13 +178,18 @@ order: [ [6, 'desc'] ], // Ordina per rating di default - pageLength: 50, // Mostra 10 righe per pagina - responsive: true, // Adatta il layout alla finestra + pageLength: 50, + responsive: true, + dom: 'lBfrtip', // Aggiunge l'area per i pulsanti + buttons: [ + 'copy', 'csv', 'excel', 'pdf', 'print' // Tipi di esportazione + ], initComplete: function(settings, json) { updateChart(json); // Aggiorna il grafico dopo aver caricato la tabella } }); + // Funzione per calcolare i rating e aggiornare grafico e tabella $('#calculate-rating').on('click', function() { $.ajax({ diff --git a/public/userarea/statkpi/statkpi.php b/public/userarea/statkpi/statkpi.php index affe8db..33df936 100644 --- a/public/userarea/statkpi/statkpi.php +++ b/public/userarea/statkpi/statkpi.php @@ -280,7 +280,8 @@ include('parsedatachart.php');
- + @@ -553,17 +554,27 @@ include('parsedatachart.php');
Reports Overview
+ + + +
+
Worst Analysis
-
+
+ + + +
+
@@ -572,44 +583,64 @@ include('parsedatachart.php');
Worst Suppliers by Failed Report Percentage
+ + + +
+
Number of Products by Supplier
-
+
+ + + +
+
Analysis Distribution
+ + + +
+
Analytes with Most Failures
+ + + +
+
@@ -648,6 +679,10 @@ include('parsedatachart.php');
Products Distribution by Phase
+ + + +
@@ -658,12 +693,17 @@ include('parsedatachart.php');
Phase Rating Distribution
+ + + +
+ @@ -679,6 +719,7 @@ include('parsedatachart.php'); +