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

update table on charts

Browse Source
This commit is contained in:
solocla
2024-11-26 14:21:53 +01:00
parent 22c95fa063
commit 1e1e078489
6 changed files with 446 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/userarea/easyspec/detail-rsl.php
+9 -9
View File
@@ -272,7 +272,7 @@
<h6 class="card-subtitle">Choose the analysis to add to the RSL for the material <?php echo $name_material; ?></h6><br>
<?php
$analysislist = new WA_MySQLi_RS("analysislist", $repnew, 0);
$analysislist->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();
?>
<form method="post" id="addanalysis">
@@ -282,8 +282,8 @@
<select name="analysis" class="form-select form-control-sm" id="analysis">
<?php while (!$analysislist->atEnd()) { //dyn select
?>
<option value="<?php echo ($analysislist->getColumnVal("idanalysis")); ?>">
<?php echo ($analysislist->getColumnVal("name_analysis")); ?>
<option value="<?php echo ($analysislist->getColumnVal("idanalysisvocabulary")); ?>">
<?php echo ($analysislist->getColumnVal("nameanalysisvoc")); ?>
</option>
<?php $analysislist->moveNext(); ?>
<?php } //dyn select
@@ -294,7 +294,7 @@
<input name="material_id" type="hidden" id="material_id" value="<?php echo $material_id; ?>">
<input name="id" type="hidden" id="id" value="<?php echo ($tablequery->getColumnVal("id")); ?>">
<input type="submit" class="btn btn-primary btn-sm" value="Submit">
<button type="button" id="openPopuppreset" class="btn btn-success btn-sm ml-2">Analysis Preset</button>
<!-- <button type="button" id="openPopuppreset" class="btn btn-success btn-sm ml-2">Analysis Preset</button> -->
</div>
</div>
</form>
@@ -354,7 +354,7 @@
<tbody class="table-danger">
<?php
$tablequery2 = new WA_MySQLi_RS("tablequery2", $repnew, 0);
$tablequery2->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");
?>
<tr class="parent" id="row<?php echo $idanalysis; ?>">
<td><?php echo ($tablequery2->getColumnVal("name_analysis")); ?></td>
<td><?php echo ($tablequery2->getColumnVal("nameanalysisvoc")); ?></td>
<td>
<label for="standards-<?php echo $idanalysis; ?>"></label>
<div class="select-container">
@@ -449,7 +449,7 @@
</script>
<?php
$companalysis = new WA_MySQLi_RS("companalysis", $repnew, 0);
$companalysis->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(); ?>
<?php
$umlist = new WA_MySQLi_RS("umlist", $repnew, 1);
@@ -481,9 +481,9 @@
<?php $testo = "Prova suggerimento"; ?>
<td class="sa-trigger" data-testo="<?php echo $testo; ?>">
<i class="fas fa-info-circle" data-toggle="tooltip" data-placement="top" title="Suggestion"></i>
<?php echo ($companalysis->getColumnVal("name_component")); ?>
<?php echo ($companalysis->getColumnVal("namecompoundsvocabulary")); ?>
</td>
<td><?php echo ($companalysis->getColumnVal("cas_component")); ?></td>
<td><?php echo ($companalysis->getColumnVal("cascompoundvocabulary")); ?></td>
<td></td>
<td></td>
<td></td>
public/userarea/easyspec/insert-analysis.php
+3 -7
View File
@@ -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";
public/userarea/easyspec/update-analysis.php
+6 -6
View File
@@ -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") {
<?php $idanalysis = $_GET['idanalysis']; ?>
<?php
$updatequery = new WA_MySQLi_RS("updatequery", $repnew, 0);
$updatequery->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();
?>
<!-- end row -->
@@ -145,7 +145,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
<div class="col-sm-9">
<div class="input-group">
<input name="name_analysis" type="text" class="form-control" id="name_analysis" value="<?php echo htmlspecialchars($updatequery->getColumnVal("name_analysis")); ?>">
<input name="name_analysis" type="text" class="form-control" id="name_analysis" value="<?php echo htmlspecialchars($updatequery->getColumnVal("nameanalysisvoc")); ?>">
</div>
</div>
</div>