Compare commits

...

4 Commits

Author SHA1 Message Date
Pek5892 ce8ac0f846 Fix redirect 2024-04-10 10:32:23 +02:00
Pek5892 eb15f24ac9 Fix per php8.1 2024-04-10 10:28:30 +02:00
Pek5892 c20ba3eeee Fix backup 2024-04-10 10:09:24 +02:00
Pek5892 f373036f15 Ottimizzazione 2024-04-10 09:49:42 +02:00
4 changed files with 22 additions and 10 deletions

View File

@ -17,6 +17,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
use Models\Plugin;
include_once __DIR__.'/core.php';
if (!empty($id_record) && !empty($id_module)) {
@ -51,13 +53,13 @@ echo '
</a>
</li>';
$plugins = $dbo->fetchArray('SELECT `zz_plugins`.`id`,`title` FROM `zz_plugins` LEFT JOIN `zz_plugins_lang` ON (`zz_plugins`.`id` = `zz_plugins_lang`.`id_record` AND `zz_plugins_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') WHERE `idmodule_to`='.prepare($id_module)." AND `position`='tab_main' AND `enabled` = 1");
$plugins = Plugin::where('idmodule_to', $id_module)->where('position', 'tab_main')->where('enabled', 1)->get();
// Tab dei plugin
foreach ($plugins as $plugin) {
echo '
<li>
<a data-toggle="tab" href="#tab_'.$plugin['id'].'" id="link-tab_'.$plugin['id'].'">'.$plugin['title'].'</a>
<a data-toggle="tab" href="#tab_'.$plugin->id.'" id="link-tab_'.$plugin->id.'">'.$plugin->title.'</a>
</li>';
}
@ -77,9 +79,9 @@ foreach ($plugins as $plugin) {
$record = $module_record;
echo '
<div id="tab_'.$plugin['id'].'" class="tab-pane">';
<div id="tab_'.$plugin->id.'" class="tab-pane">';
$id_plugin = $plugin['id'];
$id_plugin = $plugin->id;
include base_dir().'/include/manager.php';

View File

@ -297,7 +297,7 @@ function slashes($string)
*/
function isAjaxRequest()
{
return Whoops\Util\Misc::isAjaxRequest() && filter('ajax') !== null && filter('op') !== '';
return Whoops\Util\Misc::isAjaxRequest() && filter('ajax') !== null && filter('ajax') !== '';
}
/**

View File

@ -98,10 +98,11 @@ if (filter('op') == 'restore') {
return;
}
if (filter('number') == null) {
$number = filter('number');
if ($number === null) {
$path = $_FILES['blob']['tmp_name'];
} else {
$number = filter('number');
$number != '' ? $number : 0;
$number = intval($number);
$backups = Backup::getList();

View File

@ -513,7 +513,12 @@ ORDER BY
`ragione_sociale` ASC");
$dataset = '';
$where = implode(',', (array) json_decode($_SESSION['superselect']['idtipiintervento'])) != '' ? '`in_interventi_tecnici`.`idtipointervento` IN('.implode(',', (array) json_decode($_SESSION['superselect']['idtipiintervento'])).')' : '1=1';
if ($_SESSION['superselect']['idtipiintervento']) {
$where = '`in_interventi_tecnici`.`idtipointervento` IN('.implode(',', (array) json_decode($_SESSION['superselect']['idtipiintervento'])).')';
} else {
$where = '1=1';
}
foreach ($tecnici as $tecnico) {
$sessioni = $dbo->fetchArray('SELECT SUM(`in_interventi_tecnici`.`ore`) AS result, CONCAT(CAST(SUM(`in_interventi_tecnici`.`ore`) AS char(20)),\' ore\') AS ore_lavorate, YEAR(`in_interventi_tecnici`.`orario_inizio`) AS year, MONTH(`in_interventi_tecnici`.`orario_inizio`) AS month FROM `in_interventi_tecnici` INNER JOIN `in_interventi` ON `in_interventi_tecnici`.`idintervento` = `in_interventi`.`id` LEFT JOIN `in_statiintervento` ON `in_interventi`.`idstatointervento`=`in_statiintervento`.`id` WHERE `in_interventi_tecnici`.`idtecnico` = '.prepare($tecnico['id']).' AND `in_interventi_tecnici`.`orario_inizio` BETWEEN '.prepare($start).' AND '.prepare($end).' AND `in_statiintervento`.`is_completato` AND '.$where.' GROUP BY YEAR(`in_interventi_tecnici`.`orario_inizio`), MONTH(`in_interventi_tecnici`.`orario_inizio`) ORDER BY YEAR(`in_interventi_tecnici`.`orario_inizio`) ASC, MONTH(`in_interventi_tecnici`.`orario_inizio`) ASC');
@ -542,8 +547,12 @@ echo '
<h3 class="box-title">'.tr('Ore di lavoro per tecnico').'</h3>
<div class="row">
<div class="col-md-3 pull-right">
{["type": "select", "multiple": "1", "label": "'.tr('Tipi attività').'", "name": "idtipiintervento[]", "ajax-source": "tipiintervento", "value": "'.implode(',', (array) json_decode($_SESSION['superselect']['idtipiintervento'])).'", "placeholder": "Tutti" ]}
<div class="col-md-3 pull-right">';
if ($_SESSION['superselect']['idtipiintervento']) {
echo'
{["type": "select", "multiple": "1", "label": "'.tr('Tipi attività').'", "name": "idtipiintervento[]", "ajax-source": "tipiintervento", "value": "'.implode(',', (array) json_decode($_SESSION['superselect']['idtipiintervento'])).'", "placeholder": "Tutti" ]}';
}
echo'
</div>
</div>