Skip to content

Commit c6e12d6

Browse files
Pek5892Pek5892
committed
refactor: miglioria gestione link moduli
1 parent 1612510 commit c6e12d6

31 files changed

Lines changed: 204 additions & 173 deletions

File tree

‎mail.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
154154
<div class="row">
155155
<div class="col-md-6">
156-
{[ "type": "select", "multiple": "1", "label": "'.tr('Stampe').'", "name": "prints[]", "value": "'.implode(',', $selected).'", "values": "query=SELECT `zz_prints`.`id`, `title` AS text FROM `zz_prints` LEFT JOIN `zz_prints_lang` ON (`zz_prints`.`id` = `zz_prints_lang`.`id_record` AND `zz_prints_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') WHERE `id_module` = '.prepare($id_module).' AND `enabled`=1 AND `is_record`=1", "link": "stampa" ]}
156+
{[ "type": "select", "multiple": "1", "label": "'.tr('Stampe').'", "name": "prints[]", "value": "'.implode(',', $selected).'", "values": "query=SELECT `zz_prints`.`id`, `title` AS text FROM `zz_prints` LEFT JOIN `zz_prints_lang` ON (`zz_prints`.`id` = `zz_prints_lang`.`id_record` AND `zz_prints_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') WHERE `id_module` = '.prepare($id_module).' AND `enabled`=1 AND `is_record`=1", "link": "module:Stampe" ]}
157157
</div>';
158158

159159
$uploads = [];

‎modules/anagrafiche/ajax/select.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
$results = [
9090
'results' => $rs,
9191
'recordsFiltered' => $data['recordsFiltered'],
92+
'link' => 'module:Anagrafiche',
9293
];
9394

9495
break;

‎modules/articoli/ajax/select.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@
217217
$results = [
218218
'results' => $rs,
219219
'recordsFiltered' => $data['recordsFiltered'],
220+
'link' => 'module:Articoli',
220221
];
221222

222223
break;
@@ -235,6 +236,8 @@
235236
$search_fields[] = '`title` LIKE '.prepare('%'.$search.'%');
236237
}
237238

239+
$custom['link'] = 'module:Categorie';
240+
238241
break;
239242

240243
/*
@@ -255,6 +258,8 @@
255258
if (!empty($search)) {
256259
$search_fields[] = '`title` LIKE '.prepare('%'.$search.'%');
257260
}
261+
262+
$custom['link'] = 'module:Categorie';
258263
}
259264
break;
260265

‎modules/banche/ajax/select.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,7 @@
4444
$search_fields[] = 'iban LIKE '.prepare('%'.$search.'%');
4545
}
4646

47+
$custom['link'] = 'module:Banche';
48+
4749
break;
4850
}

‎modules/categorie_documenti/ajax/select.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@
3636
$search_fields[] = '`title` LIKE '.prepare('%'.$search.'%');
3737
}
3838

39+
$custom['link'] = 'module:Categorie documenti';
40+
3941
break;
4042
}

‎modules/categorie_files/ajax/select.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@
3636
$search_fields[] = '`zz_files_categories`.`name` LIKE '.prepare('%'.$search.'%');
3737
}
3838

39+
$custom['link'] = 'module:Categorie files';
40+
3941
break;
4042
}

‎modules/causali/ajax/select.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,7 @@
3434
$search_fields[] = '`title` LIKE '.prepare('%'.$search.'%');
3535
}
3636

37+
$custom['link'] = 'module:Causali';
38+
3739
break;
3840
}

‎modules/contratti/ajax/select.php‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
`in_tipiintervento_lang`.`title` AS idtipointervento_descrizione,
4040
`in_tipiintervento`.`tempo_standard` AS tempo_standard
4141
FROM
42-
`co_contratti`
42+
`co_contratti`
4343
INNER JOIN `an_anagrafiche` ON `co_contratti`.`idanagrafica`=`an_anagrafiche`.`idanagrafica`
4444
LEFT JOIN `in_tipiintervento` ON (`co_contratti`.`idtipointervento`=`in_tipiintervento`.`id`)
4545
LEFT JOIN `in_tipiintervento_lang` ON (`in_tipiintervento`.`id`=`in_tipiintervento_lang`.`id_record` AND `in_tipiintervento_lang`.`id_lang`='.prepare(Models\Locale::getDefault()->id).')
46-
|where|
46+
|where|
4747
ORDER BY
4848
`co_contratti`.`id`';
4949

@@ -64,6 +64,7 @@
6464
$data = AJAX::selectResults($query, $where, $filter, $search_fields, $limit, $custom);
6565
$rs = $data['results'];
6666

67+
$contratti_results = [];
6768
foreach ($rs as $r) {
6869
$contratto = Contratto::find($r['id']);
6970
$ore_erogate = $contratto->interventi->sum('ore_totali');
@@ -83,7 +84,7 @@
8384
'_PREVISTE_' => Translator::numberToLocale($ore_previste, 2),
8485
]) : $r['descrizione']);
8586

86-
$results[] = [
87+
$contratti_results[] = [
8788
'id' => $r['id'],
8889
'text' => $descrizione,
8990
'descrizione' => $descrizione,
@@ -93,6 +94,12 @@
9394
];
9495
}
9596

97+
$results = [
98+
'results' => $contratti_results,
99+
'recordsFiltered' => $data['recordsFiltered'],
100+
'link' => 'module:Contratti',
101+
];
102+
96103
break;
97104

98105
case 'categorie_contratti':
@@ -108,6 +115,8 @@
108115
$search_fields[] = '`title` LIKE '.prepare('%'.$search.'%');
109116
}
110117

118+
$custom['link'] = 'module:Categorie contratti';
119+
111120
break;
112121

113122
/*
@@ -127,6 +136,8 @@
127136
if (!empty($search)) {
128137
$search_fields[] = '`title` LIKE '.prepare('%'.$search.'%');
129138
}
139+
140+
$custom['link'] = 'module:Categorie contratti';
130141
}
131142
break;
132143
}

‎modules/contratti/edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151

152152
<div class="row">
153153
<div class="col-md-3">
154-
{[ "type": "select", "label": "<?php echo tr('Pagamento'); ?>", "name": "idpagamento", "values": "query=SELECT `co_pagamenti`.`id`, `co_pagamenti_lang`.`title` AS `descrizione` FROM `co_pagamenti` LEFT JOIN `co_pagamenti_lang` ON (`co_pagamenti`.`id` = `co_pagamenti_lang`.`id_record` AND `co_pagamenti_lang`.`id_lang` = <?php echo prepare(Models\Locale::getDefault()->id); ?>) GROUP BY `descrizione` ORDER BY `descrizione`", "value": "$idpagamento$" ]}
154+
{[ "type": "select", "label": "<?php echo tr('Pagamento'); ?>", "name": "idpagamento", "values": "query=SELECT `co_pagamenti`.`id`, `co_pagamenti_lang`.`title` AS `descrizione` FROM `co_pagamenti` LEFT JOIN `co_pagamenti_lang` ON (`co_pagamenti`.`id` = `co_pagamenti_lang`.`id_record` AND `co_pagamenti_lang`.`id_lang` = <?php echo prepare(Models\Locale::getDefault()->id); ?>) GROUP BY `descrizione` ORDER BY `descrizione`", "value": "$idpagamento$", "link": "module:Pagamenti" ]}
155155
</div>
156156

157157
<div class="col-md-3">

‎modules/dashboard/ajax.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@
580580
}
581581

582582
echo '
583-
<div id="id-'.$sessione['id'].'" class="fc-event fc-event-'.$class.'" data-id="'.$sessione['id'].'" data-idcontratto="'.$sessione['idcontratto'].'" data-ref="'.$sessione['ref'].'" data-id_tecnico="'.$sessione['id_tecnico'].'">'.($sessione['ref'] == 'intervento' ? Modules::link($modulo_riferimento, $id_riferimento, '<i class="fa fa-wrench"></i>', null, 'title="'.tr('Visualizza scheda').'" class="btn btn-'.$class.' btn-xs pull-right"') : Modules::link($modulo_riferimento, $id_riferimento, '<i class="fa fa-file-text-o"></i>', null, 'title="'.tr('Visualizza scheda').'" class="btn btn-'.$class.' btn-xs pull-right"')).'
583+
<div id="id-'.$sessione['id'].'" class="fc-event fc-event-'.$class.'" data-id="'.$sessione['id'].'" data-idcontratto="'.$sessione['idcontratto'].'" data-ref="'.$sessione['ref'].'" data-id_tecnico="'.$sessione['id_tecnico'].'">'.($sessione['ref'] == 'intervento' ? Modules::link($modulo_riferimento, $id_riferimento, '<i class="fa fa-wrench"></i>', null, 'class="btn btn-'.$class.' btn-xs pull-right"') : Modules::link($modulo_riferimento, $id_riferimento, '<i class="fa fa-file-text-o"></i>', null, 'class="btn btn-'.$class.' btn-xs pull-right"')).'
584584
<b>'.$sessione['ragione_sociale'].'</b>
585585
<br>'.dateFormat($sessione['data_richiesta']).' ('.$sessione['tipo_intervento'].')
586586
'.(!empty($sessione['richiesta']) ? '<div class="request-wrapper"><span class="request-text">'.(strlen(strip_tags((string) $sessione['richiesta'])) > 200 ? substr(strip_tags((string) $sessione['richiesta']), 0, 200).'...' : strip_tags((string) $sessione['richiesta'])).'</span><span class="request-full">'.strip_tags((string) $sessione['richiesta']).'</span><a href="#" class="request-toggle">'.tr('Mostra tutto').'</a></div>' : '').'

0 commit comments

Comments
 (0)