loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Merge branch 'master' of https://github.com/devcode-it/openstamanager

This commit is contained in:
Pek5892 2023-09-15 15:12:47 +02:00
parent 8a6a64378d bdfec7c2eb
commit f755335720
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail.php
View File

@ -150,7 +150,7 @@ echo '
<div class="row">
<div class="col-md-6">
{[ "type": "select", "multiple": "1", "label": "'.tr('Stampe').'", "name": "prints[]", "value": "'.implode(',', $selected).'", "values": "query=SELECT id, title AS text FROM zz_prints WHERE id_module = '.prepare($id_module).' AND enabled=1 AND is_record=1" ]}
{[ "type": "select", "multiple": "1", "label": "'.tr('Stampe').'", "name": "prints[]", "value": "'.implode(',', $selected).'", "values": "query=SELECT id, title AS text FROM zz_prints WHERE id_module = '.prepare($id_module).' AND enabled=1 AND is_record=1", "link": "stampa" ]}
</div>';
$uploads = [];
@ -163,9 +163,9 @@ if ($smtp['pec'] == 1 && $module['name'] == 'Fatture di vendita') {
echo '
<div class="col-md-6">
{[ "type": "select", "multiple": "1", "label": "'.tr('Allegati').'", "name": "uploads[]", "value": "'.implode(',', $uploads).'", "help": "'.tr('Allegati del documento o caricati nell\'anagrafica dell\'azienda.').'", "values": "query=SELECT id, name AS text FROM zz_files WHERE id_module = '.prepare($id_module).' AND id_record = '.prepare($id_record)." UNION SELECT id, CONCAT(name, ' (Azienda)') AS text FROM zz_files WHERE id_module = ".prepare(Modules::get('Anagrafiche')['id'])." AND id_record = (SELECT valore FROM zz_settings WHERE nome = 'Azienda predefinita')\"]}
{[ "type": "select", "multiple": "1", "label": "'.tr('Allegati').'", "name": "uploads[]", "value": "'.implode(',', $uploads).'", "help": "'.tr('Allegati del documento o caricati nell\'anagrafica dell\'azienda.').'", "values": "query=SELECT id, name AS text FROM zz_files WHERE id_module = '.prepare($id_module).' AND id_record = '.prepare($id_record).' UNION SELECT id, CONCAT(name, \' (Azienda)\') AS text FROM zz_files WHERE id_module = '.prepare(Modules::get('Anagrafiche')['id']).' AND id_record = (SELECT valore FROM zz_settings WHERE nome = \'Azienda predefinita\')", "link": "allegato" ]}
</div>
</div>";
</div>';
echo '

2
modules/stampe/edit.php
View File

@ -54,7 +54,7 @@ $id_files = $dbo->select('zz_files_print', 'id_file', ['id_print' => $id_record]
</div>
<div class="col-md-6">
{[ "type": "select", "multiple": "1", "label": "<?php echo tr('File da accodare'); ?>", "name": "id_files[]", "value": "<?php echo implode(',', array_column($id_files, 'id_file')); ?>", "ajax-source": "allegati", "select-options": <?php echo json_encode(['id_module' => $id_module, 'id_record' => $id_record]); ?> ]}
{[ "type": "select", "multiple": "1", "label": "<?php echo tr('File da accodare'); ?>", "name": "id_files[]", "value": "<?php echo implode(',', array_column($id_files, 'id_file')); ?>", "ajax-source": "allegati", "select-options": <?php echo json_encode(['id_module' => $id_module, 'id_record' => $id_record]); ?>, "link": "allegato" ]}
</div>
</div>

37
src/HTMLBuilder/Handler/SelectHandler.php
View File

@ -20,6 +20,7 @@
namespace HTMLBuilder\Handler;
use AJAX;
use Prints;
/**
* Gestione dell'input di tipo "select".
@ -71,7 +72,7 @@ class SelectHandler implements HandlerInterface
unset($values['select-options']);
if (!empty($values['value']) || is_numeric($values['value'])) {
$result .= $this->select2($source, $values['value'], $infos);
$result .= $this->select2($source, $values['value'], $infos, $values['link']);
}
} else {
if (!in_array('multiple', $extras)) {
@ -81,21 +82,21 @@ class SelectHandler implements HandlerInterface
// Gestione del select dal formato JSON completo, convertito in array
if (is_array($values['values'])) {
$result .= $this->selectArray($values['values'], $values['value']);
$result .= $this->selectArray($values['values'], $values['value'], $values['link']);
}
// Gestione del select da query specifica (se il campo "values" è impostato a "query=SQL")
elseif (string_starts_with($values['values'], 'query=')) {
$query = substr($values['values'], strlen('query='));
$result .= $this->selectQuery($query, $values['value']);
$result .= $this->selectQuery($query, $values['value'], $values['link']);
}
// Gestione del select dal formato JSON parziale (valori singoli)
elseif (string_starts_with($values['values'], 'list=')) {
$list = substr($values['values'], strlen('list='));
$result .= $this->selectList(json_decode('{'.$list.'}', true), $values);
$result .= $this->selectList(json_decode('{'.$list.'}', true), $values, $values['link']);
}
}
@ -136,7 +137,7 @@ class SelectHandler implements HandlerInterface
*
* @return string
*/
protected function select2($op, $elements, $info)
protected function select2($op, $elements, $info, $link = null)
{
// Richiamo del file dedicato alle richieste AJAX per ottenere il valore iniziale del select
$response = AJAX::select($op, $elements, null, 0, 100, $info);
@ -154,6 +155,14 @@ class SelectHandler implements HandlerInterface
$attributes[] = 'selected';
}
if ($link == 'stampa') {
$element['title'] = ' ';
$element['text'] = '<a href="'.Prints::getHref($element['id'], get('id_record')).'" class="text-black" target="_blank">'.$element['text'].' <i class="fa fa-external-link"></i></a>';
} elseif ($link == 'allegato') {
$element['title'] = ' ';
$element['text'] = '<a href="'.base_path().'/view.php?file_id='.$element['id'].'" class="text-black" target="_blank">'.$element['text'].' <i class="fa fa-external-link"></i></a>';
}
if (!empty($element['_bgcolor_'])) {
$attributes[] = 'style="background:'.$element['_bgcolor_'].'; color:'.color_inverse($element['_bgcolor_'].';"');
}
@ -178,7 +187,7 @@ class SelectHandler implements HandlerInterface
*
* @return string
*/
protected function selectArray($array, $values)
protected function selectArray($array, $values, $link = null)
{
$result = '';
@ -194,6 +203,14 @@ class SelectHandler implements HandlerInterface
$element['text'] = empty($element['text']) ? $element['descrizione'] : $element['text'];
if ($link == 'stampa') {
$element['title'] = ' ';
$element['text'] = '<a href="'.Prints::getHref($element['id'], get('id_record')).'" class="text-black" target="_blank">'.$element['text'].' <i class="fa fa-external-link"></i></a>';
} elseif ($link == 'allegato') {
$element['title'] = ' ';
$element['text'] = '<a href="'.base_path().'/view.php?file_id='.$element['id'].'" class="text-black" target="_blank">'.$element['text'].' <i class="fa fa-external-link"></i></a>';
}
$attributes = [];
if (in_array($element['id'], $values)) {
$attributes[] = 'selected';
@ -225,13 +242,13 @@ class SelectHandler implements HandlerInterface
*
* @return string
*/
protected function selectQuery($query, $values)
protected function selectQuery($query, $values, $link = null)
{
$database = database();
$array = $database->fetchArray($query);
return $this->selectArray($array, $values);
return $this->selectArray($array, $values, $link);
}
/**
@ -243,7 +260,7 @@ class SelectHandler implements HandlerInterface
*
* @return string
*/
protected function selectList($datas, &$values)
protected function selectList($datas, &$values, $link = null)
{
$array = [];
@ -255,6 +272,6 @@ class SelectHandler implements HandlerInterface
}
}
return $this->selectArray($array, $values['value']);
return $this->selectArray($array, $values['value'], $link);
}
}