small change

This commit is contained in:
2025-01-21 10:23:49 +01:00
parent 251fbfcd33
commit 9b74f92a4c
57 changed files with 331 additions and 286 deletions
+3 -1
View File
@@ -26,6 +26,7 @@ if (isset($formnameedit)) {
$UpdateQuery->bindColumn("iddpicategory", "i", "" . ((isset($_POST["categorydpi"])) ? $_POST["categorydpi"] : "") . "", "WA_DEFAULT"); $UpdateQuery->bindColumn("iddpicategory", "i", "" . ((isset($_POST["categorydpi"])) ? $_POST["categorydpi"] : "") . "", "WA_DEFAULT");
$UpdateQuery->bindColumn("virusset", "s", "" . ((isset($_POST["virusprotection"])) ? $_POST["virusprotection"] : "") . "", "WA_DEFAULT"); $UpdateQuery->bindColumn("virusset", "s", "" . ((isset($_POST["virusprotection"])) ? $_POST["virusprotection"] : "") . "", "WA_DEFAULT");
$UpdateQuery->bindColumn("chemicalsset", "s", "" . ((isset($_POST["chemicalagent"])) ? $_POST["chemicalagent"] : "") . "", "WA_DEFAULT"); $UpdateQuery->bindColumn("chemicalsset", "s", "" . ((isset($_POST["chemicalagent"])) ? $_POST["chemicalagent"] : "") . "", "WA_DEFAULT");
$UpdateQuery->bindColumn("active", "s", "" . ((isset($_POST["active"])) ? $_POST["active"] : "") . "", "WA_DEFAULT");
$UpdateQuery->addFilter("idstandards", "=", "i", "" . ($idstandards) . ""); $UpdateQuery->addFilter("idstandards", "=", "i", "" . ($idstandards) . "");
$UpdateQuery->execute(); $UpdateQuery->execute();
$UpdateGoTo = ""; $UpdateGoTo = "";
@@ -152,6 +153,7 @@ $standardlist->execute();
<th>Virus</th> <th>Virus</th>
<th>Chemical</th> <th>Chemical</th>
<th>Active</th>
<th><?php echo $action; ?></th> <th><?php echo $action; ?></th>
</tr> </tr>
@@ -183,7 +185,7 @@ $standardlist->execute();
</div> </div>
<?php } ?> <?php } ?>
</td> </td>
<td><?php echo ($standardlist->getColumnVal("active")); ?></td>
<td> <td>
<a href="edit-standard.php?idstandards=<?php echo ($standardlist->getColumnVal("idstandards")); ?>" class="mr-2"><i class="fas fa-edit text-info font-16"></i></a> <a href="edit-standard.php?idstandards=<?php echo ($standardlist->getColumnVal("idstandards")); ?>" class="mr-2"><i class="fas fa-edit text-info font-16"></i></a>
<a href="edit-protcategory.php?idstandards=<?php echo ($standardlist->getColumnVal("idstandards")); ?>">PC</a> <a href="edit-protcategory.php?idstandards=<?php echo ($standardlist->getColumnVal("idstandards")); ?>">PC</a>
+7 -3
View File
@@ -243,11 +243,15 @@ $chemicalagentlist->execute();
<div class="progress-bar" role="progressbar" style="width: 95%;" aria-valuenow="95" aria-valuemin="0" aria-valuemax="100">95%</div> <div class="progress-bar" role="progressbar" style="width: 95%;" aria-valuenow="95" aria-valuemin="0" aria-valuemax="100">95%</div>
</div> </div>
<!-- send to client to sign --> <!-- send to client to sign -->
<?php if ((Auth::user()->hasRole('Admin')) || (Auth::user()->hasRole('CustomerService')) || (Auth::user()->hasRole('Superuser'))) : ?>
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<?php if ((Auth::user()->hasRole('Admin')) || (Auth::user()->hasRole('CustomerService')) || (Auth::user()->hasRole('Superuser'))) : ?>
<h4 class="mt-0 header-title">Invia a Cliente per Firma</h4> <h4 class="mt-0 header-title">Invia a Cliente per Firma</h4>
<?php endif; ?>
<?php if ((Auth::user()->hasRole('User'))) : ?>
<h4 class="mt-0 header-title"><?php echo $respsign; ?></h4>
<?php endif; ?>
<form action="previewtrf.php" method="post" name="myForm2" id="myForm2" class="form-parsley"> <form action="previewtrf.php" method="post" name="myForm2" id="myForm2" class="form-parsley">
@@ -287,7 +291,7 @@ $chemicalagentlist->execute();
<?php endif; ?>
<!-- card for optional TRF --> <!-- card for optional TRF -->
<?php if ((Auth::user()->hasRole('Admin')) || (Auth::user()->hasRole('User')) || (Auth::user()->hasRole('Superuser'))) : ?> <?php if ((Auth::user()->hasRole('Admin')) || (Auth::user()->hasRole('User')) || (Auth::user()->hasRole('Superuser'))) : ?>
+99 -66
View File
@@ -1,49 +1,48 @@
<?php
include('include/headscript.php'); ?>
<?php <?php
include('include/headscript.php'); ?> // pickup the get variable
if (isset($_GET["idstandards"])) {
<?php $idstandards = $_GET["idstandards"];
// pickup the get variable }
if (isset($_GET["idstandards"])) {
$idstandards=$_GET["idstandards"];
}
?> ?>
<?php <?php
$standarddetail = new WA_MySQLi_RS("standarddetail",$cmctrfdb,0); $standarddetail = new WA_MySQLi_RS("standarddetail", $cmctrfdb, 0);
$standarddetail->setQuery("SELECT * FROM standards WHERE standards.idstandards='$idstandards' ORDER BY standards.idarticletype, standards.standardcode"); $standarddetail->setQuery("SELECT * FROM standards WHERE standards.idstandards='$idstandards' ORDER BY standards.idarticletype, standards.standardcode");
$standarddetail->execute(); $standarddetail->execute();
?> ?>
<?php <?php
$articletypelist = new WA_MySQLi_RS("articletypelist",$cmctrfdb,0); $articletypelist = new WA_MySQLi_RS("articletypelist", $cmctrfdb, 0);
$articletypelist->setQuery("SELECT * FROM article_type ORDER BY article_type.name_articletype"); $articletypelist->setQuery("SELECT * FROM article_type ORDER BY article_type.name_articletype");
$articletypelist->execute(); $articletypelist->execute();
?> ?>
<?php <?php
$articlecharacteristiclist = new WA_MySQLi_RS("articlecharacteristiclist",$cmctrfdb,0); $articlecharacteristiclist = new WA_MySQLi_RS("articlecharacteristiclist", $cmctrfdb, 0);
$articlecharacteristiclist->setQuery("SELECT * FROM article_characteristic ORDER BY article_characteristic.idarticletype, article_characteristic.name_articlecharacteristic"); $articlecharacteristiclist->setQuery("SELECT * FROM article_characteristic ORDER BY article_characteristic.idarticletype, article_characteristic.name_articlecharacteristic");
$articlecharacteristiclist->execute(); $articlecharacteristiclist->execute();
?> ?>
<?php <?php
$categorydpilist = new WA_MySQLi_RS("categorydpilist",$cmctrfdb,0); $categorydpilist = new WA_MySQLi_RS("categorydpilist", $cmctrfdb, 0);
$categorydpilist->setQuery("SELECT * FROM dpicategory ORDER BY dpicategory.value_dpicategory"); $categorydpilist->setQuery("SELECT * FROM dpicategory ORDER BY dpicategory.value_dpicategory");
$categorydpilist->execute();?> $categorydpilist->execute(); ?>
<?php <?php
$idarticletypen=$standarddetail->getColumnVal("idarticletype"); $idarticletypen = $standarddetail->getColumnVal("idarticletype");
$articletypesel = new WA_MySQLi_RS("articletypesel",$cmctrfdb,1); $articletypesel = new WA_MySQLi_RS("articletypesel", $cmctrfdb, 1);
$articletypesel->setQuery("SELECT * FROM article_type WHERE article_type.idarticletype='$idarticletypen'"); $articletypesel->setQuery("SELECT * FROM article_type WHERE article_type.idarticletype='$idarticletypen'");
$articletypesel->execute();?> $articletypesel->execute(); ?>
<?php <?php
$idarticlecharacteristicn=$standarddetail->getColumnVal("idarticlecharacteristic"); $idarticlecharacteristicn = $standarddetail->getColumnVal("idarticlecharacteristic");
$artcharactcheck = new WA_MySQLi_RS("artcharactcheck",$cmctrfdb,1); $artcharactcheck = new WA_MySQLi_RS("artcharactcheck", $cmctrfdb, 1);
$artcharactcheck->setQuery("SELECT * FROM article_characteristic WHERE article_characteristic.idarticlecharacteristic='$idarticlecharacteristicn'"); $artcharactcheck->setQuery("SELECT * FROM article_characteristic WHERE article_characteristic.idarticlecharacteristic='$idarticlecharacteristicn'");
$artcharactcheck->execute();?> $artcharactcheck->execute(); ?>
<?php <?php
$iddpicategoryn=$standarddetail->getColumnVal("iddpicategory"); $iddpicategoryn = $standarddetail->getColumnVal("iddpicategory");
$dpicategorycheck = new WA_MySQLi_RS("dpicategorycheck",$cmctrfdb,1); $dpicategorycheck = new WA_MySQLi_RS("dpicategorycheck", $cmctrfdb, 1);
$dpicategorycheck->setQuery("SELECT * FROM dpicategory WHERE dpicategory.iddpicategory='$iddpicategoryn'"); $dpicategorycheck->setQuery("SELECT * FROM dpicategory WHERE dpicategory.iddpicategory='$iddpicategoryn'");
$dpicategorycheck->execute(); $dpicategorycheck->execute();
?> ?>
@@ -53,19 +52,19 @@ if (isset($formnameedit)) {
$UpdateQuery = new WA_MySQLi_Query($cmctrfdb); $UpdateQuery = new WA_MySQLi_Query($cmctrfdb);
$UpdateQuery->Action = "update"; $UpdateQuery->Action = "update";
$UpdateQuery->Table = "standards"; $UpdateQuery->Table = "standards";
$UpdateQuery->bindColumn("fmidstandards", "i", "".((isset($_POST["fmcode"]))?$_POST["fmcode"]:"") ."", "WA_DEFAULT"); $UpdateQuery->bindColumn("fmidstandards", "i", "" . ((isset($_POST["fmcode"])) ? $_POST["fmcode"] : "") . "", "WA_DEFAULT");
$UpdateQuery->bindColumn("standardname", "s", "".((isset($_POST["itastdname"]))?$_POST["itastdname"]:"") ."", "WA_DEFAULT"); $UpdateQuery->bindColumn("standardname", "s", "" . ((isset($_POST["itastdname"])) ? $_POST["itastdname"] : "") . "", "WA_DEFAULT");
$UpdateQuery->bindColumn("standardname_eng", "s", "".((isset($_POST["engstdname"]))?$_POST["engstdname"]:"") ."", "WA_DEFAULT"); $UpdateQuery->bindColumn("standardname_eng", "s", "" . ((isset($_POST["engstdname"])) ? $_POST["engstdname"] : "") . "", "WA_DEFAULT");
$UpdateQuery->bindColumn("standardcode", "s", "".((isset($_POST["standardcode"]))?$_POST["standardcode"]:"") ."", "WA_DEFAULT"); $UpdateQuery->bindColumn("standardcode", "s", "" . ((isset($_POST["standardcode"])) ? $_POST["standardcode"] : "") . "", "WA_DEFAULT");
$UpdateQuery->bindColumn("idarticletype", "i", "".((isset($_POST["idarticletype"]))?$_POST["idarticletype"]:"") ."", "WA_DEFAULT"); $UpdateQuery->bindColumn("idarticletype", "i", "" . ((isset($_POST["idarticletype"])) ? $_POST["idarticletype"] : "") . "", "WA_DEFAULT");
$UpdateQuery->bindColumn("idarticlecharacteristic", "i", "".((isset($_POST["articlecharact"]))?$_POST["articlecharact"]:"") ."", "WA_DEFAULT"); $UpdateQuery->bindColumn("idarticlecharacteristic", "i", "" . ((isset($_POST["articlecharact"])) ? $_POST["articlecharact"] : "") . "", "WA_DEFAULT");
$UpdateQuery->bindColumn("iddpicategory", "i", "".((isset($_POST["categorydpi"]))?$_POST["categorydpi"]:"") ."", "WA_DEFAULT"); $UpdateQuery->bindColumn("iddpicategory", "i", "" . ((isset($_POST["categorydpi"])) ? $_POST["categorydpi"] : "") . "", "WA_DEFAULT");
$UpdateQuery->bindColumn("virusset", "s", "".((isset($_POST["virusprotection"]))?$_POST["virusprotection"]:"") ."", "WA_DEFAULT"); $UpdateQuery->bindColumn("virusset", "s", "" . ((isset($_POST["virusprotection"])) ? $_POST["virusprotection"] : "") . "", "WA_DEFAULT");
$UpdateQuery->bindColumn("chemicalsset", "s", "".((isset($_POST["chemicalagent"]))?$_POST["chemicalagent"]:"") ."", "WA_DEFAULT"); $UpdateQuery->bindColumn("chemicalsset", "s", "" . ((isset($_POST["chemicalagent"])) ? $_POST["chemicalagent"] : "") . "", "WA_DEFAULT");
$UpdateQuery->addFilter("idstandards", "=", "i", "".($idstandards) .""); $UpdateQuery->addFilter("idstandards", "=", "i", "" . ($idstandards) . "");
$UpdateQuery->execute(); $UpdateQuery->execute();
$UpdateGoTo = ""; $UpdateGoTo = "";
if (function_exists("rel2abs")) $UpdateGoTo = $UpdateGoTo?rel2abs($UpdateGoTo,dirname(__FILE__)):""; if (function_exists("rel2abs")) $UpdateGoTo = $UpdateGoTo ? rel2abs($UpdateGoTo, dirname(__FILE__)) : "";
$UpdateQuery->redirect($UpdateGoTo); $UpdateQuery->redirect($UpdateGoTo);
} }
?> ?>
@@ -97,16 +96,16 @@ if (isset($formnameedit)) {
<!-- submit form with button --> <!-- submit form with button -->
<script> <script>
function formSubmit() { function formSubmit() {
document.forms["myForm"].submit(); document.forms["myForm"].submit();
} }
</script> </script>
</head> </head>
<body> <body>
<!-- Top Bar Start --> <!-- Top Bar Start -->
<?php include('include/topbar.php'); ?> <?php include('include/topbar.php'); ?>
@@ -154,28 +153,28 @@ function formSubmit() {
<div class="form-group row"> <div class="form-group row">
<label for="standardcode" class="col-sm-2 col-form-label text-right">Standard Code</label> <label for="standardcode" class="col-sm-2 col-form-label text-right">Standard Code</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input class="form-control" type="text" value="<?php echo($standarddetail->getColumnVal("standardcode")); ?>" id="standardcode" name="standardcode"> <input class="form-control" type="text" value="<?php echo ($standarddetail->getColumnVal("standardcode")); ?>" id="standardcode" name="standardcode">
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="itastdname" class="col-sm-2 col-form-label text-right">Nome STD Italiano</label> <label for="itastdname" class="col-sm-2 col-form-label text-right">Nome STD Italiano</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input class="form-control" type="text" value="<?php echo($standarddetail->getColumnVal("standardname")); ?>" id="itastdname" name="itastdname"> <input class="form-control" type="text" value="<?php echo ($standarddetail->getColumnVal("standardname")); ?>" id="itastdname" name="itastdname">
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="engstdname" class="col-sm-2 col-form-label text-right">Nome STD Inglese</label> <label for="engstdname" class="col-sm-2 col-form-label text-right">Nome STD Inglese</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input class="form-control" type="text" value="<?php echo($standarddetail->getColumnVal("standardname_eng")); ?>" id="engstdname" name="engstdname"> <input class="form-control" type="text" value="<?php echo ($standarddetail->getColumnVal("standardname_eng")); ?>" id="engstdname" name="engstdname">
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="fmcode" class="col-sm-2 col-form-label text-right">Codice FM</label> <label for="fmcode" class="col-sm-2 col-form-label text-right">Codice FM</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input class="form-control" type="text" value="<?php echo($standarddetail->getColumnVal("fmidstandards")); ?>" id="fmcode" name="fmcode"> <input class="form-control" type="text" value="<?php echo ($standarddetail->getColumnVal("fmidstandards")); ?>" id="fmcode" name="fmcode">
</div> </div>
</div> </div>
@@ -183,16 +182,20 @@ function formSubmit() {
<label class="col-sm-2 col-form-label text-right">Tipologia Articolo</label> <label class="col-sm-2 col-form-label text-right">Tipologia Articolo</label>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="form-control" name="idarticletype" id="idarticletype"> <select class="form-control" name="idarticletype" id="idarticletype">
<option value="" <?php if (!(strcmp("", ($articletypesel->getColumnVal("idarticletype"))))) {echo "selected=\"selected\"";} ?>>Seleziona</option> <option value="" <?php if (!(strcmp("", ($articletypesel->getColumnVal("idarticletype"))))) {
echo "selected=\"selected\"";
} ?>>Seleziona</option>
<?php <?php
while(!$articletypelist->atEnd()) { //dyn select while (!$articletypelist->atEnd()) { //dyn select
?> ?>
<option value="<?php echo($articletypelist->getColumnVal("idarticletype")); ?>"<?php if (!(strcmp($articletypelist->getColumnVal("idarticletype"), ($articletypesel->getColumnVal("idarticletype"))))) {echo "selected=\"selected\"";} ?>><?php echo($articletypelist->getColumnVal("name_articletype")); ?></option> <option value="<?php echo ($articletypelist->getColumnVal("idarticletype")); ?>" <?php if (!(strcmp($articletypelist->getColumnVal("idarticletype"), ($articletypesel->getColumnVal("idarticletype"))))) {
echo "selected=\"selected\"";
} ?>><?php echo ($articletypelist->getColumnVal("name_articletype")); ?></option>
<?php <?php
$articletypelist->moveNext(); $articletypelist->moveNext();
} //dyn select } //dyn select
$articletypelist->moveFirst(); $articletypelist->moveFirst();
?> ?>
</select> </select>
</div> </div>
</div> </div>
@@ -201,16 +204,20 @@ $articletypelist->moveFirst();
<label class="col-sm-2 col-form-label text-right">Caratteristiche Articolo</label> <label class="col-sm-2 col-form-label text-right">Caratteristiche Articolo</label>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="form-control" id="articlecharact" name="articlecharact"> <select class="form-control" id="articlecharact" name="articlecharact">
<option value="" <?php if (!(strcmp("", ($standarddetail->getColumnVal("idarticlecharacteristic"))))) {echo "selected=\"selected\"";} ?>>Seleziona</option> <option value="" <?php if (!(strcmp("", ($standarddetail->getColumnVal("idarticlecharacteristic"))))) {
echo "selected=\"selected\"";
} ?>>Seleziona</option>
<?php <?php
while(!$articlecharacteristiclist->atEnd()) { //dyn select while (!$articlecharacteristiclist->atEnd()) { //dyn select
?> ?>
<option value="<?php echo($articlecharacteristiclist->getColumnVal("idarticlecharacteristic")); ?>"<?php if (!(strcmp($articlecharacteristiclist->getColumnVal("idarticlecharacteristic"), ($standarddetail->getColumnVal("idarticlecharacteristic"))))) {echo "selected=\"selected\"";} ?>><?php echo($articlecharacteristiclist->getColumnVal("name_articlecharacteristic")); ?></option> <option value="<?php echo ($articlecharacteristiclist->getColumnVal("idarticlecharacteristic")); ?>" <?php if (!(strcmp($articlecharacteristiclist->getColumnVal("idarticlecharacteristic"), ($standarddetail->getColumnVal("idarticlecharacteristic"))))) {
echo "selected=\"selected\"";
} ?>><?php echo ($articlecharacteristiclist->getColumnVal("name_articlecharacteristic")); ?></option>
<?php <?php
$articlecharacteristiclist->moveNext(); $articlecharacteristiclist->moveNext();
} //dyn select } //dyn select
$articlecharacteristiclist->moveFirst(); $articlecharacteristiclist->moveFirst();
?> ?>
</select> </select>
</div> </div>
</div> </div>
@@ -219,27 +226,53 @@ $articlecharacteristiclist->moveFirst();
<label class="col-sm-2 col-form-label text-right">Categoria DPI</label> <label class="col-sm-2 col-form-label text-right">Categoria DPI</label>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="form-control" id="categorydpi" name="categorydpi"> <select class="form-control" id="categorydpi" name="categorydpi">
<option value="" <?php if (!(strcmp("", ($standarddetail->getColumnVal("iddpicategory"))))) {echo "selected=\"selected\"";} ?>>Seleziona</option> <option value="" <?php if (!(strcmp("", ($standarddetail->getColumnVal("iddpicategory"))))) {
echo "selected=\"selected\"";
} ?>>Seleziona</option>
<?php <?php
while(!$categorydpilist->atEnd()) { //dyn select while (!$categorydpilist->atEnd()) { //dyn select
?> ?>
<option value="<?php echo($categorydpilist->getColumnVal("iddpicategory")); ?>"<?php if (!(strcmp($categorydpilist->getColumnVal("iddpicategory"), ($standarddetail->getColumnVal("iddpicategory"))))) {echo "selected=\"selected\"";} ?>><?php echo($categorydpilist->getColumnVal("value_dpicategory")); ?></option> <option value="<?php echo ($categorydpilist->getColumnVal("iddpicategory")); ?>" <?php if (!(strcmp($categorydpilist->getColumnVal("iddpicategory"), ($standarddetail->getColumnVal("iddpicategory"))))) {
echo "selected=\"selected\"";
} ?>><?php echo ($categorydpilist->getColumnVal("value_dpicategory")); ?></option>
<?php <?php
$categorydpilist->moveNext(); $categorydpilist->moveNext();
} //dyn select } //dyn select
$categorydpilist->moveFirst(); $categorydpilist->moveFirst();
?> ?>
</select> </select>
</div> </div>
</div> </div>
<div class="form-group row">
<label class="col-sm-2 col-form-label text-right">Active</label>
<div class="col-sm-10">
<select class="form-control" id="active" name="active">
<option value="" <?php if (!(strcmp("", ($standarddetail->getColumnVal("active"))))) {
echo "selected=\"selected\"";
} ?>>Seleziona</option>
<option value="Y" <?php if (!(strcmp("Y", ($standarddetail->getColumnVal("active"))))) {
echo "selected=\"selected\"";
} ?>>Y</option>
<option value="N" <?php if (!(strcmp("N", ($standarddetail->getColumnVal("active"))))) {
echo "selected=\"selected\"";
} ?>>N</option>
</select>
</div>
</div>
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<input <?php if (!(strcmp(($standarddetail->getColumnVal("virusset")),"Y"))) {echo "checked=\"checked\"";} ?> type="checkbox" class="custom-control-input" id="virusprotection" name="virusprotection" value="Y" data-parsley-multiple="groups" data-parsley-mincheck="2"> <input <?php if (!(strcmp(($standarddetail->getColumnVal("virusset")), "Y"))) {
echo "checked=\"checked\"";
} ?> type="checkbox" class="custom-control-input" id="virusprotection" name="virusprotection" value="Y" data-parsley-multiple="groups" data-parsley-mincheck="2">
<label class="custom-control-label" for="virusprotection">Protezione Virus</label> <label class="custom-control-label" for="virusprotection">Protezione Virus</label>
</div> </div>
<br> <br>
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<input <?php if (!(strcmp(($standarddetail->getColumnVal("chemicalsset")),"Y"))) {echo "checked=\"checked\"";} ?> type="checkbox" class="custom-control-input" id="chemicalagent" name="chemicalagent" value="Y" data-parsley-multiple="groups" data-parsley-mincheck="2"> <input <?php if (!(strcmp(($standarddetail->getColumnVal("chemicalsset")), "Y"))) {
echo "checked=\"checked\"";
} ?> type="checkbox" class="custom-control-input" id="chemicalagent" name="chemicalagent" value="Y" data-parsley-multiple="groups" data-parsley-mincheck="2">
<label class="custom-control-label" for="chemicalagent">Agenti Chimici</label> <label class="custom-control-label" for="chemicalagent">Agenti Chimici</label>
</div> </div>
<br> <br>
@@ -266,7 +299,7 @@ $categorydpilist->moveFirst();
</div><!-- container --> </div><!-- container -->
<!-- footer start --> <!-- footer start -->
<?php include('include/footer.php'); ?> <?php include('include/footer.php'); ?>
</footer><!--end footer--> </footer><!--end footer-->
</div> </div>
@@ -292,6 +325,6 @@ $categorydpilist->moveFirst();
<!-- App js --> <!-- App js -->
<script src="assets/js/app.js"></script> <script src="assets/js/app.js"></script>
</body> </body>
</html> </html>
+1 -1
View File
@@ -68,7 +68,7 @@
<a class="dropdown-item" href="profile"><i class="ti-user text-muted mr-2"></i> <?php echo $profile; ?></a> <a class="dropdown-item" href="profile"><i class="ti-user text-muted mr-2"></i> <?php echo $profile; ?></a>
<a class="dropdown-item" href="companyprofile.php"><i class="ti-wallet text-muted mr-2"></i> <?php echo $mycompany; ?></a> <a class="dropdown-item" href="companyprofile.php"><i class="ti-wallet text-muted mr-2"></i> <?php echo $mycompany; ?></a>
<a class="dropdown-item" href="signaturetok.php"><i class="ti-wallet text-muted mr-2"></i> <?php echo $signaturetokentitle; ?></a> <a class="dropdown-item" href="signaturetok.php"><i class="ti-wallet text-muted mr-2"></i> <?php echo $signaturetokentitle; ?></a>
<a class="dropdown-item" href="newusercolleague2.php"><i class="ti-wallet text-muted mr-2"></i> Aggiungi Utente</a> <a class="dropdown-item" href="newusercolleague2.php"><i class="ti-wallet text-muted mr-2"></i> <?php echo $adduserundersamecompany; ?></a>
<a class="dropdown-item" href="#"><i class="ti-settings text-muted mr-2"></i> <?php echo $settings; ?></a> <a class="dropdown-item" href="#"><i class="ti-settings text-muted mr-2"></i> <?php echo $settings; ?></a>
<div class="dropdown-divider mb-0"></div> <div class="dropdown-divider mb-0"></div>
<a class="dropdown-item" href="logout"><i class="ti-power-off text-muted mr-2"></i> <?php echo $logoutst; ?></a> <a class="dropdown-item" href="logout"><i class="ti-power-off text-muted mr-2"></i> <?php echo $logoutst; ?></a>
+2
View File
@@ -346,3 +346,5 @@ $uploadCompanyLogoTitle = "Upload Company Logo";
$selectImageToUploadTitle = "Select the image to upload (only JPG, JPEG, PNG):"; $selectImageToUploadTitle = "Select the image to upload (only JPG, JPEG, PNG):";
$uploadButtonTitle = "Upload"; $uploadButtonTitle = "Upload";
$companyLogoAltTitle = "Company Logo"; $companyLogoAltTitle = "Company Logo";
$respsign = "Send to Sign to another colleagues of the same company";
$adduserundersamecompany = "Add User";
+2
View File
@@ -350,3 +350,5 @@ $uploadCompanyLogoTitle = "Carica Logo Aziendale";
$selectImageToUploadTitle = "Seleziona l'immagine da caricare (solo JPG, JPEG, PNG):"; $selectImageToUploadTitle = "Seleziona l'immagine da caricare (solo JPG, JPEG, PNG):";
$uploadButtonTitle = "Carica"; $uploadButtonTitle = "Carica";
$companyLogoAltTitle = "Logo Aziendale"; $companyLogoAltTitle = "Logo Aziendale";
$respsign = "Invia a collega della stessa azienda per Firma";
$adduserundersamecompany = "Aggiungi utente";
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -30,7 +30,10 @@ $pdf->Cell(40, 6, $addresspdf, 1, 0, 'L');
$contactsaddress = html_entity_decode($contactsinfoData['address']); $contactsaddress = html_entity_decode($contactsinfoData['address']);
$contactsaddress = iconv('UTF-8', 'windows-1252', $contactsaddress); $contactsaddress = mb_convert_encoding($contactsaddress, 'ISO-8859-1', 'UTF-8'); // Conversione diretta
$contactsaddress = iconv('ISO-8859-1', 'windows-1252//TRANSLIT', $contactsaddress);
$pdf->Cell(150, 6, $contactsaddress, 1, 0, 'L', TRUE); $pdf->Cell(150, 6, $contactsaddress, 1, 0, 'L', TRUE);
$pdf->Ln(); $pdf->Ln();
$pdf->Cell(40, 6, $citytitleb, 1, 0, 'L'); $pdf->Cell(40, 6, $citytitleb, 1, 0, 'L');
+2 -1
View File
@@ -19,7 +19,8 @@ $pdf->SetFillColor(232, 242, 255);
$pdf->Cell(150, 6, $companyname, 1, 0, 'L', TRUE); $pdf->Cell(150, 6, $companyname, 1, 0, 'L', TRUE);
$pdf->Ln(); $pdf->Ln();
$pdf->Cell(40, 6, $addresspdf, 1, 0, 'L'); $pdf->Cell(40, 6, $addresspdf, 1, 0, 'L');
$pdf->Cell(150, 6, $contactsinfoData['address'], 1, 0, 'L', TRUE); $pdf->Cell(150, 6, iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $contactsinfoData['address']), 1, 0, 'L', TRUE);
$pdf->Ln(); $pdf->Ln();
$pdf->Cell(40, 6, $citytitleb, 1, 0, 'L'); $pdf->Cell(40, 6, $citytitleb, 1, 0, 'L');
$pdf->Cell(55, 6, $contactsinfoData['city'], 1, 0, 'L', TRUE); $pdf->Cell(55, 6, $contactsinfoData['city'], 1, 0, 'L', TRUE);
+7 -1
View File
@@ -4,9 +4,15 @@ if (Auth::user()->hasRole('User')) :
$nameuser = $_SESSION["nameuser"]; $nameuser = $_SESSION["nameuser"];
//$pdf->Cell(120,6,'Intendo sottoporre questo modello a sorveglianza (presso CIMAC)',1,0,'C'); //$pdf->Cell(120,6,'Intendo sottoporre questo modello a sorveglianza (presso CIMAC)',1,0,'C');
//$pdf->Cell(70,6,$trfData['surveillanceselectoption'],1,0,'C',TRUE); //$pdf->Cell(70,6,$trfData['surveillanceselectoption'],1,0,'C',TRUE);
if (!mb_check_encoding($statement, 'UTF-8')) {
$statement = utf8_encode($statement); // Forza la codifica in UTF-8
}
$statement = html_entity_decode($statement); $statement = html_entity_decode($statement);
$statement = iconv('UTF-8', 'windows-1252', $statement); $statement = mb_convert_encoding($statement, 'windows-1252', 'UTF-8');
//$statement = iconv('UTF-8', 'iso-8859-1', $statement); //$statement = iconv('UTF-8', 'iso-8859-1', $statement);
$addstatement = html_entity_decode($addstatement); $addstatement = html_entity_decode($addstatement);
$addstatement = iconv('UTF-8', 'windows-1252', $addstatement); $addstatement = iconv('UTF-8', 'windows-1252', $addstatement);
//$addstatement = iconv('UTF-8', 'iso-8859-1', $addstatement); //$addstatement = iconv('UTF-8', 'iso-8859-1', $addstatement);
+2
View File
@@ -0,0 +1,2 @@
<?php
phpinfo();
+4
View File
@@ -259,6 +259,7 @@ if ($tokenid != $tokensignatureon) {
require 'phpmailer/src/PHPMailer.php'; require 'phpmailer/src/PHPMailer.php';
require 'phpmailer/src/SMTP.php'; require 'phpmailer/src/SMTP.php';
//mail to client //mail to client
$mail = new PHPMailer(true); $mail = new PHPMailer(true);
try { try {
$mail->isSMTP(); // Set mailer to use SMTP $mail->isSMTP(); // Set mailer to use SMTP
@@ -283,14 +284,17 @@ if ($tokenid != $tokensignatureon) {
$mail->Subject = $appformn . 'r' . $revnumb; $mail->Subject = $appformn . 'r' . $revnumb;
$mail->Body = $htmlContent; $mail->Body = $htmlContent;
$mail->AltBody = 'This is the body in plain text for non-HTML mail clients'; $mail->AltBody = 'This is the body in plain text for non-HTML mail clients';
error_log("Attempting to send email to: $emailuser with idtrf: $idtrf");
if ($adminconfirm == 'N') { if ($adminconfirm == 'N') {
$mail->send(); $mail->send();
error_log("Email sent successfully to: $emailuser with idtrf: $idtrf");
} }
// echo 'Message has been sent'; // echo 'Message has been sent';
} catch (Exception $e) { } catch (Exception $e) {
echo "Message could not be sent CL. Mailer Error: {$mail->ErrorInfo}"; echo "Message could not be sent CL. Mailer Error: {$mail->ErrorInfo}";
} }
// mail to CS // mail to CS
$mail = new PHPMailer(true); $mail = new PHPMailer(true);
try { try {
$mail->isSMTP(); // Set mailer to use SMTP $mail->isSMTP(); // Set mailer to use SMTP
+2 -16
View File
@@ -552,21 +552,7 @@ include('include/trfqueryscript.php'); ?>
if (!empty($rows)) { if (!empty($rows)) {
foreach ($rows as $row) { foreach ($rows as $row) {
// Controllo se l'idarticletype è uguale a 4
if ($row['idarticletype'] == 4) {
// Mostra l'opzione solo se l'utente è admin o superuser
if (Auth::user()->hasRole('Admin') || Auth::user()->hasRole('Superuser')) {
?>
<option value="<?php echo $row['idarticletype']; ?>" <?php if (!(strcmp($row['idarticletype'], ($trfnumberfinal->getColumnVal("idarticletype"))))) {
echo "selected=\"selected\"";
} ?>>
<?php
echo ($_SESSION['langselect'] == 'it') ? $row['name_articletype'] : $row['name_articletypeeng'];
?>
</option>
<?php
}
} else {
// Mostra normalmente gli altri articletype // Mostra normalmente gli altri articletype
?> ?>
<option value="<?php echo $row['idarticletype']; ?>" <?php if (!(strcmp($row['idarticletype'], ($trfnumberfinal->getColumnVal("idarticletype"))))) { <option value="<?php echo $row['idarticletype']; ?>" <?php if (!(strcmp($row['idarticletype'], ($trfnumberfinal->getColumnVal("idarticletype"))))) {
@@ -577,7 +563,7 @@ include('include/trfqueryscript.php'); ?>
?> ?>
</option> </option>
<?php <?php
}
} }
} }
?> ?>
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB