2 Commits

Author SHA1 Message Date
redz1029 7716460363 UI Phase 2 (L4): ISR status-pill consistency + shared status-kind mapper
The IT Service Requests list tile still used the legacy StatusPill (violet
"DRAFT"); make it semantic like the detail header. Extract the ISR status ->
StatusKind mapping into a shared helper so list and detail stay in sync.

- New isr_status_kind.dart (public isrStatusKind); removed the private duplicate
  from the detail screen.
- _RequestTile now uses StatusPill.kind(isrStatusKind(status), ...).

(The request cards were already content-dense; no layout change needed.)
Verified: flutter analyze lib clean; flutter build web green.

Co-Authored-By: claude-flow <ruv@ruv.net>
2026-09-26 16:11:14 +08:00
redz1029 ab5d385325 UI Phase 2 (L7): tighten Reports chart grid layout
Reduce dead whitespace and align the Reports charts to the cyber card language.
Layout only — charts, data and PDF export untouched.

- report_card_wrapper.dart: flat tonal fill + hairline outline + token radius
  (was surfaceContainerLow + hard 16 radius, no border); uppercase telemetry
  card title to match section headers.
- status_charts.dart / request_distribution_charts.dart: donut charts now use a
  fixed 150px donut with an Expanded legend beside it (was an Expanded donut +
  cramped right legend, leaving a large central gap); card height 220 -> 180.

Verified: flutter analyze lib clean; flutter build web green; visual QA (Reports)
in dark.

Co-Authored-By: claude-flow <ruv@ruv.net>
2026-09-26 16:06:32 +08:00
6 changed files with 128 additions and 91 deletions
@@ -0,0 +1,16 @@
import '../../models/it_service_request.model.dart';
import '../../theme/app_status_colors.dart';
/// Maps an IT service request status to a semantic [StatusKind] so its color
/// carries meaning consistently across the list and detail screens
/// (amber=pending approval, grey=scheduled, blue=in progress, green=completed,
/// grey=cancelled).
StatusKind isrStatusKind(String status) => switch (status) {
ItServiceRequestStatus.pendingApproval => StatusKind.warning,
ItServiceRequestStatus.scheduled => StatusKind.neutral,
ItServiceRequestStatus.inProgress => StatusKind.info,
ItServiceRequestStatus.inProgressDryRun => StatusKind.info,
ItServiceRequestStatus.completed => StatusKind.success,
ItServiceRequestStatus.cancelled => StatusKind.neutral,
_ => StatusKind.neutral,
};
@@ -31,6 +31,7 @@ import '../../widgets/mono_text.dart';
import '../../widgets/responsive_body.dart'; import '../../widgets/responsive_body.dart';
import '../../theme/app_status_colors.dart'; import '../../theme/app_status_colors.dart';
import '../../widgets/status_pill.dart'; import '../../widgets/status_pill.dart';
import 'isr_status_kind.dart';
import 'it_service_request_pdf.dart'; import 'it_service_request_pdf.dart';
class ItServiceRequestDetailScreen extends ConsumerStatefulWidget { class ItServiceRequestDetailScreen extends ConsumerStatefulWidget {
@@ -557,7 +558,7 @@ class _ItServiceRequestDetailScreenState
MonoText(request.requestNumber!), MonoText(request.requestNumber!),
const SizedBox(width: 12), const SizedBox(width: 12),
StatusPill.kind( StatusPill.kind(
_isrStatusKind(request.status), isrStatusKind(request.status),
label: ItServiceRequestStatus.label(request.status), label: ItServiceRequestStatus.label(request.status),
), ),
const Spacer(), const Spacer(),
@@ -2246,15 +2247,3 @@ class _EvidenceSectionState extends ConsumerState<_EvidenceSection> {
} }
} }
/// Maps an IT service request status to a semantic [StatusKind]
/// (amber=pending approval, blue=scheduled/in-progress, green=completed,
/// grey=cancelled).
StatusKind _isrStatusKind(String status) => switch (status) {
ItServiceRequestStatus.pendingApproval => StatusKind.warning,
ItServiceRequestStatus.scheduled => StatusKind.info,
ItServiceRequestStatus.inProgress => StatusKind.info,
ItServiceRequestStatus.inProgressDryRun => StatusKind.info,
ItServiceRequestStatus.completed => StatusKind.success,
ItServiceRequestStatus.cancelled => StatusKind.neutral,
_ => StatusKind.neutral,
};
@@ -19,6 +19,7 @@ import '../../utils/app_time.dart';
import '../../utils/snackbar.dart'; import '../../utils/snackbar.dart';
import '../../theme/app_status_colors.dart'; import '../../theme/app_status_colors.dart';
import '../../widgets/app_status_summary.dart'; import '../../widgets/app_status_summary.dart';
import 'isr_status_kind.dart';
import '../../widgets/m3_card.dart'; import '../../widgets/m3_card.dart';
import '../../widgets/mono_text.dart'; import '../../widgets/mono_text.dart';
import '../../widgets/reconnect_overlay.dart'; import '../../widgets/reconnect_overlay.dart';
@@ -669,7 +670,10 @@ class _RequestTile extends StatelessWidget {
if (request.requestNumber != null) if (request.requestNumber != null)
MonoText(request.requestNumber!), MonoText(request.requestNumber!),
const Spacer(), const Spacer(),
StatusPill(label: ItServiceRequestStatus.label(request.status)), StatusPill.kind(
isrStatusKind(request.status),
label: ItServiceRequestStatus.label(request.status),
),
], ],
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
@@ -1,6 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:skeletonizer/skeletonizer.dart'; import 'package:skeletonizer/skeletonizer.dart';
import '../../../theme/app_surfaces.dart';
/// Wraps each report chart widget in a themed Card with a title, loading /// Wraps each report chart widget in a themed Card with a title, loading
/// skeleton and error state handling. Exposes a [GlobalKey] on the inner /// skeleton and error state handling. Exposes a [GlobalKey] on the inner
/// [RepaintBoundary] so the PDF exporter can capture the rendered chart /// [RepaintBoundary] so the PDF exporter can capture the rendered chart
@@ -74,15 +76,25 @@ class ReportCardWrapper extends StatelessWidget {
body = child; body = child;
} }
final radius = AppSurfaces.of(context).cardRadius;
final isDark = colors.brightness == Brightness.dark;
final cardContent = Column( final cardContent = Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.fromLTRB(16, 14, 16, 4), padding: const EdgeInsets.fromLTRB(16, 12, 16, 10),
child: Text(title, style: text.titleSmall), child: Text(
title.toUpperCase(),
style: text.labelMedium?.copyWith(
fontWeight: FontWeight.w700,
letterSpacing: 0.6,
color: colors.onSurfaceVariant,
), ),
const Divider(height: 1), ),
),
Divider(height: 1, color: colors.outlineVariant),
Padding( Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: height != null ? SizedBox(height: height, child: body) : body, child: height != null ? SizedBox(height: height, child: body) : body,
@@ -93,8 +105,12 @@ class ReportCardWrapper extends StatelessWidget {
final card = Card( final card = Card(
elevation: 0, elevation: 0,
shadowColor: Colors.transparent, shadowColor: Colors.transparent,
color: colors.surfaceContainerLow, surfaceTintColor: Colors.transparent,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)), color: isDark ? colors.surfaceContainer : colors.surfaceContainerLowest,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(radius),
side: BorderSide(color: colors.outlineVariant),
),
child: cardContent, child: cardContent,
); );
@@ -77,10 +77,11 @@ class _RequestTypeChartState extends ConsumerState<RequestTypeChart> {
return ReportCardWrapper( return ReportCardWrapper(
title: 'Request Type Distribution', title: 'Request Type Distribution',
repaintBoundaryKey: widget.repaintKey, repaintBoundaryKey: widget.repaintKey,
height: 220, height: 180,
child: Row( child: Row(
children: [ children: [
Expanded( SizedBox(
width: 150,
child: PieChart( child: PieChart(
PieChartData( PieChartData(
pieTouchData: PieTouchData( pieTouchData: PieTouchData(
@@ -116,8 +117,9 @@ class _RequestTypeChartState extends ConsumerState<RequestTypeChart> {
), ),
), ),
), ),
const SizedBox(width: 12), const SizedBox(width: 16),
Column( Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: data.asMap().entries.map((entry) { children: data.asMap().entries.map((entry) {
@@ -133,6 +135,7 @@ class _RequestTypeChartState extends ConsumerState<RequestTypeChart> {
); );
}).toList(), }).toList(),
), ),
),
], ],
), ),
); );
@@ -208,10 +211,11 @@ class _RequestCategoryChartState extends ConsumerState<RequestCategoryChart> {
return ReportCardWrapper( return ReportCardWrapper(
title: 'Request Category Distribution', title: 'Request Category Distribution',
repaintBoundaryKey: widget.repaintKey, repaintBoundaryKey: widget.repaintKey,
height: 220, height: 180,
child: Row( child: Row(
children: [ children: [
Expanded( SizedBox(
width: 150,
child: PieChart( child: PieChart(
PieChartData( PieChartData(
pieTouchData: PieTouchData( pieTouchData: PieTouchData(
@@ -247,8 +251,9 @@ class _RequestCategoryChartState extends ConsumerState<RequestCategoryChart> {
), ),
), ),
), ),
const SizedBox(width: 12), const SizedBox(width: 16),
Column( Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: data.asMap().entries.map((entry) { children: data.asMap().entries.map((entry) {
@@ -264,6 +269,7 @@ class _RequestCategoryChartState extends ConsumerState<RequestCategoryChart> {
); );
}).toList(), }).toList(),
), ),
),
], ],
), ),
); );
+14 -8
View File
@@ -52,10 +52,11 @@ class _TicketsByStatusChartState extends ConsumerState<TicketsByStatusChart> {
return ReportCardWrapper( return ReportCardWrapper(
title: 'Tickets by Status', title: 'Tickets by Status',
repaintBoundaryKey: widget.repaintKey, repaintBoundaryKey: widget.repaintKey,
height: 220, height: 180,
child: Row( child: Row(
children: [ children: [
Expanded( SizedBox(
width: 150,
child: PieChart( child: PieChart(
PieChartData( PieChartData(
pieTouchData: PieTouchData( pieTouchData: PieTouchData(
@@ -92,8 +93,9 @@ class _TicketsByStatusChartState extends ConsumerState<TicketsByStatusChart> {
), ),
), ),
), ),
const SizedBox(width: 12), const SizedBox(width: 16),
Column( Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: data.asMap().entries.map((entry) { children: data.asMap().entries.map((entry) {
@@ -109,6 +111,7 @@ class _TicketsByStatusChartState extends ConsumerState<TicketsByStatusChart> {
); );
}).toList(), }).toList(),
), ),
),
], ],
), ),
); );
@@ -178,10 +181,11 @@ class _TasksByStatusChartState extends ConsumerState<TasksByStatusChart> {
return ReportCardWrapper( return ReportCardWrapper(
title: 'Tasks by Status', title: 'Tasks by Status',
repaintBoundaryKey: widget.repaintKey, repaintBoundaryKey: widget.repaintKey,
height: 220, height: 180,
child: Row( child: Row(
children: [ children: [
Expanded( SizedBox(
width: 150,
child: PieChart( child: PieChart(
PieChartData( PieChartData(
pieTouchData: PieTouchData( pieTouchData: PieTouchData(
@@ -218,8 +222,9 @@ class _TasksByStatusChartState extends ConsumerState<TasksByStatusChart> {
), ),
), ),
), ),
const SizedBox(width: 12), const SizedBox(width: 16),
Column( Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: data.asMap().entries.map((entry) { children: data.asMap().entries.map((entry) {
@@ -235,6 +240,7 @@ class _TasksByStatusChartState extends ConsumerState<TasksByStatusChart> {
); );
}).toList(), }).toList(),
), ),
),
], ],
), ),
); );