#1264 #1291 [Control] add: remove trad NoVerdict and picto dashboard

Evarisk · Jul 4, 2023 · 514cd9b · 514cd9b
1 parent 6deb5d2
commit 514cd9b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/class/control.class.php b/class/control.class.php
@@ -813,7 +813,7 @@ public function getNbControlsByVerdict(): array
 
         $array['labels'] = [
             0 => [
-                'label' => $langs->transnoentities('NoVerdict'),
+                'label' => 'N/A',
                 'color' => '#999999'
             ],
             1 => [
@@ -870,7 +870,7 @@ public function getNbControlsTagsByVerdict(): array
 
         $array['labels'] = [
             0 => [
-                'label' => $langs->transnoentities('NoVerdict'),
+                'label' => 'N/A',
                 'color' => '#999999'
             ],
             1 => [
@@ -1018,7 +1018,7 @@ public function getControlListsByQcFrequency(): array
                                 $arrayControlListsByQcFrequency[$control->id]['ControlDate']['value']    = dol_print_date($control->date_creation, 'day');
                                 $arrayControlListsByQcFrequency[$control->id]['NextControl']['value']    = '<div class="wpeo-button button-'. $nextControlColor .'">' . $nextControl . '<br>' . $langs->trans('Days') . '</div>';
                                 $arrayControlListsByQcFrequency[$control->id]['NextControl']['morecss']  = 'dashboard-control';
-                                $arrayControlListsByQcFrequency[$control->id]['Verdict']['value']        = '<div class="wpeo-button button-'. $verdictColor .'">' . $control->fields['verdict']['arrayofkeyval'][(!empty($control->verdict)) ?: 3] . '</div>';
+                                $arrayControlListsByQcFrequency[$control->id]['Verdict']['value']        = '<div class="wpeo-button button-'. $verdictColor .'">' . (!empty($control->verdict) ? $langs->transnoentities($control->fields['verdict']['arrayofkeyval'][$control->verdict]) : '<i class="fas fa-minus"></i>') . '</div>';
                                 $arrayControlListsByQcFrequency[$control->id]['Verdict']['morecss']      = 'dashboard-control';
                             }
                         }

diff --git a/langs/fr_FR/dolismq.lang b/langs/fr_FR/dolismq.lang
@@ -237,7 +237,6 @@ AddUser                            = Créer utilisateur
 AddControlIntoCategory             = Assigner cette catégorie au contrôle
 ProductOrServiceLinked             = Produit ou service contrôlé
 CanSetVerdict                      = Définir le verdict du contrôle
-NoVerdict                          = Pas de verdict
 ControlsRepartition                = Répartition des contrôles par verdict
 ControlsTagsRepartition            = Répartition des contrôles par verdict et par catégories
 ControlsByFiscalYear               = Rapport des contrôles sur l'exercice fiscal

diff --git a/public/control/public_control.php b/public/control/public_control.php
@@ -105,7 +105,7 @@
 				<div class="wpeo-table table-flex">
 					<div class="table-row">
 						<div class="table-cell"><?php echo '<i class="far fa-check-circle"></i> ' . $langs->trans('Verdict'); ?></div>
-						<div class="table-cell table-end"><?php echo (!empty($object->verdict) ? $langs->transnoentities($object->fields['verdict']['arrayofkeyval'][$object->verdict]) : $langs->transnoentities('NoVerdict')); ?></div>
+						<div class="table-cell table-end"><?php echo (!empty($object->verdict) ? $langs->transnoentities($object->fields['verdict']['arrayofkeyval'][$object->verdict]) : 'N/A'); ?></div>
 					</div>
 					<div class="table-row">
 						<div class="wpeo-table table-cell table-full">