diff --git a/include/bottom.php b/include/bottom.php index 545be7cfe..847c4328e 100644 --- a/include/bottom.php +++ b/include/bottom.php @@ -87,24 +87,43 @@ if (Auth::check()) { result = JSON.parse(data); $("#hook-loader-" + hook.id).remove(); - message = \'
  • \' + result.message + \'
    • \'; - - // Inserimento della notifica - if(result.notify) { - hooks_count = $("#hooks-count"); - number = parseInt(hooks_count.text()); - number = isNaN(number) ? 0 : number; - - hooks_count.text(parseInt(number) + 1); - - $("#hooks").prepend(message); - } else { - $("#hooks").append(message); - } + + + + notification = \'
  • \' + result.message + \'
    • \'; + + // Inserimento della notifica + if(result.notify) { + hooks_count = $("#hooks-count"); + number = parseInt(hooks_count.text()); + number = isNaN(number) ? 0 : number; + + hooks_count.text(parseInt(number) + 1); + + $("#hooks").prepend(notification); + } else { + $("#hooks").append(notification); + } + + // Rimozione eventuale della rotella di caricamento if($(".hook-element").length == hooks.length) { - $("#hooks-loading").hide(); + + $(".notifications-menu .dropdown-toggle").attr(\'data-toggle\',\'dropdown\'); + $(".notifications-menu .dropdown-toggle").removeClass(\'disabled\'); + + $("#hooks-loading").hide(); + + if (hooks.length>0){ + $("#hooks-header").append(\''.tr('Hai _NUM_ notific_END_', [ + '_NUM_' => '\' + (parseInt(number) + 1) + \'', + '_END_' => '\' + ((parseInt(number) === 0) ? \''.tr('a').'\' : \''.tr('he').'\') + \'', + ]).'\'); + }else{ + $("#hooks-header").append(\''.tr('Nessuna notifica').'\'); + } + } }, }); diff --git a/include/top.php b/include/top.php index 55a5ecb89..0cf0d69e3 100644 --- a/include/top.php +++ b/include/top.php @@ -228,8 +228,8 @@ if (Auth::check()) {
      -
    • - +
    • + @@ -237,6 +237,7 @@ if (Auth::check()) {
        +
        • diff --git a/lib/functions.js b/lib/functions.js index 305a9f63f..8c910c44e 100644 --- a/lib/functions.js +++ b/lib/functions.js @@ -118,7 +118,7 @@ $(document).ready(function () { // Messaggi automatici di eliminazione $(document).on('click', '.ask', function () { - popup(this); + message(this); }); // Pulsanti di Datatables @@ -176,7 +176,7 @@ $(document).ready(function () { $(this).attr("data-id_records", table.data('selected')); $(this).data("id_records", table.data('selected')); - popup(this); + message(this); $(this).attr("data-id_records", ""); $(this).data("id_records", ""); @@ -1307,7 +1307,7 @@ function setContrast(backgroundcolor) { } } -function popup(element) { +function message(element) { data = $.extend({}, $(element).data()); var title = globals.translations.deleteTitle; diff --git a/plugins/importFE/src/InvoiceHook.php b/plugins/importFE/src/InvoiceHook.php index f0f56a173..7734a12ac 100644 --- a/plugins/importFE/src/InvoiceHook.php +++ b/plugins/importFE/src/InvoiceHook.php @@ -29,12 +29,15 @@ class InvoiceHook extends HookManager $message = tr('Ci sono _NUM_ fatture passive da importare', [ '_NUM_' => $count, ]); + $icon = 'fa fa-file-text-o text-yellow'; } else { $message = tr('Nessuna fattura passiva da importare'); + $icon = 'fa fa-file-text-o text-green'; + $link = '#'; } return [ - 'icon' => 'fa fa-file-text-o', + 'icon' => $icon, 'link' => $link, 'message' => $message, 'notify' => !empty($count), diff --git a/plugins/receiptFE/src/ReceiptHook.php b/plugins/receiptFE/src/ReceiptHook.php index e2b2f640d..26918509c 100644 --- a/plugins/receiptFE/src/ReceiptHook.php +++ b/plugins/receiptFE/src/ReceiptHook.php @@ -29,12 +29,15 @@ class ReceiptHook extends HookManager $message = tr('Ci sono _NUM_ ricevute da importare', [ '_NUM_' => $count, ]); + $icon = 'fa fa-ticket text-yellow'; } else { $message = tr('Nessuna ricevuta da importare'); + $icon = 'fa fa-ticket text-green'; + $link = '#'; } return [ - 'icon' => 'fa fa-ticket', + 'icon' => $icon, 'link' => $link, 'message' => $message, 'notify' => !empty($count),