Skip to content

Commit 678eae7

Browse files
committed
refactor: avviso personalizzazioni in Aggiornamenti
1 parent d43d9fa commit 678eae7

5 files changed

Lines changed: 1005 additions & 456 deletions

File tree

assets/src/css/style.css

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3642,6 +3642,18 @@ section.content, .main-footer {
36423642
background-color: #f0f9f0 !important;
36433643
}
36443644

3645+
.requirements-card-header-warning {
3646+
background-color: #fff8f0 !important;
3647+
}
3648+
3649+
.requirements-card-header-info {
3650+
background-color: #f0f8ff !important;
3651+
}
3652+
3653+
.requirements-card-header-primary {
3654+
background-color: #f0f7ff !important;
3655+
}
3656+
36453657
.requirements-card-header-danger {
36463658
background-color: #fff1f1 !important;
36473659
}
@@ -3655,6 +3667,18 @@ section.content, .main-footer {
36553667
color: #28a745 !important;
36563668
}
36573669

3670+
.requirements-card-title-warning {
3671+
color: #ffc107 !important;
3672+
}
3673+
3674+
.requirements-card-title-info {
3675+
color: #17a2b8 !important;
3676+
}
3677+
3678+
.requirements-card-title-primary {
3679+
color: #007bff !important;
3680+
}
3681+
36583682
.requirements-card-title-danger {
36593683
color: #dc3545 !important;
36603684
}

include/init/requirements.php

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -486,27 +486,30 @@
486486
foreach ($requirements as $key => $values) {
487487
$statuses = array_column($values, 'status');
488488
$general_status = true;
489+
$error_count = 0;
490+
489491
foreach ($statuses as $status) {
490492
$general_status &= $status;
493+
if (!$status) {
494+
$error_count++;
495+
}
491496
}
492497

493-
echo '
494-
<div class="card card-outline card-'.($general_status ? 'success collapsed-card' : 'danger').' requirements-card">
495-
<div class="card-header with-border requirements-card-header requirements-card-header-'.($general_status ? 'success' : 'danger').'">
496-
<h3 class="card-title requirements-card-title requirements-card-title-'.($general_status ? 'success' : 'danger').'">
497-
<i class="fa fa-'.($general_status ? 'check-circle' : 'exclamation-circle').' mr-2"></i>'.$key.'
498-
</h3>';
498+
$card_color = $general_status ? 'success' : 'danger';
499+
$card_icon = $general_status ? 'fa-check-circle' : 'fa-exclamation-circle';
499500

500-
if ($general_status) {
501-
echo '
501+
echo '
502+
<div class="card card-outline card-'.$card_color.' requirements-card mb-3 collapsable collapsed-card">
503+
<div class="card-header with-border requirements-card-header requirements-card-header-'.$card_color.'">
504+
<h3 class="card-title requirements-card-title requirements-card-title-'.$card_color.'">
505+
<i class="fa '.$card_icon.' mr-2 requirements-icon"></i>'.$key.'
506+
'.($error_count > 0 ? '<span class="badge badge-danger ml-2">'.$error_count.'</span>' : '').'
507+
</h3>
502508
<div class="card-tools pull-right">
503509
<button type="button" class="btn btn-tool" data-card-widget="collapse">
504510
<i class="fa fa-plus"></i>
505511
</button>
506-
</div>';
507-
}
508-
509-
echo '
512+
</div>
510513
</div>
511514
<div class="card-body no-padding">
512515
<table class="table table-striped requirements-table">

modules/aggiornamenti/controlli.php

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,16 +213,22 @@ function formatBytes(bytes, decimals = 2) {
213213
* @returns {*|jQuery|HTMLElement}
214214
*/
215215
function initcard(controllo, success, records) {
216-
let cssClass = "";
217-
let icon = "minus";
218-
if (success) {
219-
cssClass = "card-success";
220-
icon = "check text-success";
216+
let cssClass = "card-outline";
217+
let headerClass = "requirements-card-header requirements-card-header-success";
218+
let titleClass = "requirements-card-title requirements-card-title-success";
219+
let icon = "check-circle";
220+
221+
if (!success) {
222+
cssClass = "card-outline card-danger";
223+
headerClass = "requirements-card-header requirements-card-header-danger";
224+
titleClass = "requirements-card-title requirements-card-title-danger";
225+
icon = "exclamation-circle";
221226
}
222227
223-
let card = `<div class="card ` + cssClass + `" id="controllo-` + controllo["id"] + `">
224-
<div class="card-header with-border">
225-
<h3 class="card-title">` + controllo["name"];
228+
let card = `<div class="card ` + cssClass + ` requirements-card mb-3 collapsable collapsed-card" id="controllo-` + controllo["id"] + `">
229+
<div class="card-header with-border ` + headerClass + `">
230+
<h3 class="card-title ` + titleClass + `">
231+
<i class="fa fa-` + icon + ` mr-2 requirements-icon"></i>` + controllo["name"];
226232
227233
// Aggiungi badge inline per il controllo IntegritaFile
228234
if (controllo["class"] === "Modules\\\\Aggiornamenti\\\\Controlli\\\\IntegritaFile" && !success && records.length > 0) {
@@ -249,6 +255,9 @@ function initcard(controllo, success, records) {
249255
</span>`;
250256
}
251257
}
258+
} else if (!success && records.length > 0) {
259+
// Per altri controlli, mostra il contatore di errori
260+
card += ` <span class="badge badge-danger ml-2">${records.length}</span>`;
252261
}
253262
254263
card += `</h3>
@@ -265,7 +274,7 @@ function initcard(controllo, success, records) {
265274
266275
card += `
267276
<button type="button" class="btn btn-tool" data-card-widget="collapse">
268-
<i class="fa fa-` + icon + `"></i>
277+
<i class="fa fa-plus"></i>
269278
</button>
270279
</div>
271280
</div>`

0 commit comments

Comments
 (0)