From f1b0c2e2befebe32ef303da2ee43c0bbbc13387f Mon Sep 17 00:00:00 2001 From: Luca Date: Wed, 28 Feb 2018 23:44:30 +0100 Subject: [PATCH] Fix vari --- assets/src/css/style.css | 3 --- lib/init.js | 2 +- modules/anagrafiche/import.php | 2 +- modules/import/actions.php | 2 +- modules/import/edit.php | 7 ++++--- modules/interventi/edit.php | 2 +- templates/contratti/body.php | 2 +- templates/contratti_cons/body.php | 4 ++-- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/assets/src/css/style.css b/assets/src/css/style.css index d5c2a8650..9b44b514d 100644 --- a/assets/src/css/style.css +++ b/assets/src/css/style.css @@ -568,7 +568,4 @@ input.small-width { min-height: 140px; margin: 5%; } -} -.bound{ - cursor: pointer; } \ No newline at end of file diff --git a/lib/init.js b/lib/init.js index 31066714a..9df4beda3 100644 --- a/lib/init.js +++ b/lib/init.js @@ -3,7 +3,7 @@ $(document).ready(function () { $('[data-href]').not('.ask, .bound').click(function () { launch_modal($(this).data('title'), $(this).data('href'), 1, $(this).data('target')); }); - $('[data-href]').not('.ask, .bound').addClass('bound'); + $('[data-href]').not('.ask, .bound').addClass('bound clickable'); // Tooltip $('.tip').not('.tooltipstered').each(function () { diff --git a/modules/anagrafiche/import.php b/modules/anagrafiche/import.php index c7f3cb4e0..189adf5ab 100644 --- a/modules/anagrafiche/import.php +++ b/modules/anagrafiche/import.php @@ -4,7 +4,7 @@ include_once __DIR__.'/../../core.php'; switch (post('op')) { case 'import': - $i = 0; + foreach ($data as $key => $value) { if (!empty($value)){ diff --git a/modules/import/actions.php b/modules/import/actions.php index 398182e45..064805c4d 100644 --- a/modules/import/actions.php +++ b/modules/import/actions.php @@ -48,7 +48,7 @@ switch (post('op')) { // Richiamo delle operazioni specifiche include $imports[$id_record]['import']; - $_SESSION['infos'][] = tr('Importazione completata. '.$i.' righe processate.'); + $_SESSION['infos'][] = tr('Importazione completata. '.count($csv).' righe processate.'); break; } diff --git a/modules/import/edit.php b/modules/import/edit.php index 1a4122880..7df1b5dac 100644 --- a/modules/import/edit.php +++ b/modules/import/edit.php @@ -96,11 +96,12 @@ if (empty($id_record)) { '; ?>
- {[ "type": "span", "label": "", "name": "codice", "value": "$codice$", "extra": "" ]} + {[ "type": "span", "label": "", "name": "codice", "value": "$codice$", "extra": "" ]}
diff --git a/templates/contratti/body.php b/templates/contratti/body.php index dd5b03219..29e28445f 100644 --- a/templates/contratti/body.php +++ b/templates/contratti/body.php @@ -2,7 +2,7 @@ include_once __DIR__.'/../../core.php'; -$report_name = 'contratto_'.$id_record.'.pdf'; +$report_name = sanitizeFilename('contratto_'.$records[0]['numero'].'.pdf'); $autofill = [ 'count' => 0, // Conteggio delle righe diff --git a/templates/contratti_cons/body.php b/templates/contratti_cons/body.php index 27b150781..f69412cb0 100644 --- a/templates/contratti_cons/body.php +++ b/templates/contratti_cons/body.php @@ -4,7 +4,7 @@ include_once __DIR__.'/../../core.php'; include_once $docroot.'/modules/interventi/modutil.php'; -$report_name = 'contratto_'.$id_record.'_cons.pdf'; +$report_name = sanitizeFilename('contratto_'.$records[0]['numero'].'_cons.pdf'); echo '
@@ -371,7 +371,7 @@ if (!empty($interventi)) { echo '
'.tr('Intervento num. _NUM_ del _DATE_', [ - '_NUM_' => $int['id'], + '_NUM_' => $int['codice'], '_DATE_' => Translator::dateToLocale($int['inizio']), ]).'.';