SEND063

frontend/pweb/lib/pages/report/table/badge.dart

@@ -14,37 +14,34 @@ class OperationStatusBadge extends StatelessWidget {
 
   const OperationStatusBadge({super.key, required this.status});
 
-  Color _badgeColor(BuildContext context) {
-    final l10n = AppLocalizations.of(context)!;
-    return operationStatusView(l10n, status).color;
-  }
-
-  Color _textColor(Color background) {
-    // computeLuminance returns 0 for black, 1 for white
-    return background.computeLuminance() > 0.5 ? Colors.black : Colors.white;
-  }  
-
   @override
   Widget build(BuildContext context) {
-    final label = status.localized(context);
-    final bg = _badgeColor(context);
-    final fg = _textColor(bg);
+    final l10n = AppLocalizations.of(context)!;
+    final view = operationStatusView(
+      l10n,
+      Theme.of(context).colorScheme,
+      status,
+    );
+    final label = view.label;
+    final bg = view.backgroundColor;
+    final fg = view.foregroundColor;
 
     return badges.Badge(
       badgeStyle: badges.BadgeStyle(
         shape: badges.BadgeShape.square,
         badgeColor: bg,
-        borderRadius: BorderRadius.circular(12),      // fully rounded
+        borderRadius: BorderRadius.circular(12), // fully rounded
         padding: const EdgeInsets.symmetric(
-          horizontal: 6, vertical: 2                     // tighter padding
+          horizontal: 6,
+          vertical: 2, // tighter padding
         ),
       ),
       badgeContent: Text(
-        label.toUpperCase(),                           // or keep sentence case
+        label.toUpperCase(), // or keep sentence case
         style: TextStyle(
           color: fg,
-          fontSize: 11,                                 // smaller text
-          fontWeight: FontWeight.w500,                  // medium weight
+          fontSize: 11, // smaller text
+          fontWeight: FontWeight.w500, // medium weight
         ),
       ),
     );

frontend/pweb/lib/pages/report/table/filters.dart

@@ -31,9 +31,7 @@ class OperationFilters extends StatelessWidget {
         : '${dateToLocalFormat(context, selectedRange!.start)} – ${dateToLocalFormat(context, selectedRange!.end)}';
 
     return Card(
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(12),
-      ),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
       elevation: 0,
       child: Padding(
         padding: const EdgeInsets.all(16),
@@ -61,12 +59,12 @@ class OperationFilters extends StatelessWidget {
             OutlinedButton.icon(
               onPressed: onPickRange,
               icon: const Icon(Icons.date_range_outlined, size: 18),
-              label: Text(
-                periodLabel,
-                overflow: TextOverflow.ellipsis,
-              ),
+              label: Text(periodLabel, overflow: TextOverflow.ellipsis),
               style: OutlinedButton.styleFrom(
-                padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 12,
+                  vertical: 10,
+                ),
                 shape: RoundedRectangleBorder(
                   borderRadius: BorderRadius.circular(10),
                 ),
@@ -76,11 +74,7 @@ class OperationFilters extends StatelessWidget {
             Wrap(
               spacing: 10,
               runSpacing: 8,
-              children: const [
-                OperationStatus.success,
-                OperationStatus.processing,
-                OperationStatus.error,
-              ].map((status) {
+              children: OperationStatus.values.map((status) {
                 final label = status.localized(context);
                 final isSelected = selectedStatuses.contains(status);
                 return FilterChip(