* Task/Ticket desktop dialogs — widened from 520 → 600dp, and tasks now uses SizedBox(width: 600) instead of ConstrainedBox(maxWidth:) which was the root cause of the "still small" issue (max-only never forced expansion)
* Pass Slip + Leave — both dialogs gained an isSheet flag; callers now branch on AppBreakpoints.tablet: bottom sheet on mobile, dialog on desktop
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
|
||||
import '../../theme/m3_motion.dart';
|
||||
import '../../providers/reports_provider.dart';
|
||||
import '../../widgets/app_page_header.dart';
|
||||
import 'report_date_filter.dart';
|
||||
@@ -162,138 +163,129 @@ class _ReportsScreenState extends ConsumerState<ReportsScreen> {
|
||||
builder: (context, constraints) {
|
||||
final isWide = constraints.maxWidth >= 600;
|
||||
|
||||
final chartSections = <Widget>[
|
||||
if (_anyEnabled(enabled, [
|
||||
ReportWidgetType.ticketsByStatus,
|
||||
ReportWidgetType.tasksByStatus,
|
||||
]))
|
||||
_responsiveRow(
|
||||
isWide: isWide,
|
||||
children: [
|
||||
if (enabled.contains(ReportWidgetType.ticketsByStatus))
|
||||
TicketsByStatusChart(
|
||||
repaintKey: _keys[ReportWidgetType.ticketsByStatus],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.tasksByStatus))
|
||||
TasksByStatusChart(
|
||||
repaintKey: _keys[ReportWidgetType.tasksByStatus],
|
||||
),
|
||||
],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.conversionRate))
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: ConversionRateCard(
|
||||
repaintKey: _keys[ReportWidgetType.conversionRate],
|
||||
),
|
||||
),
|
||||
if (_anyEnabled(enabled, [
|
||||
ReportWidgetType.requestType,
|
||||
ReportWidgetType.requestCategory,
|
||||
]))
|
||||
_responsiveRow(
|
||||
isWide: isWide,
|
||||
children: [
|
||||
if (enabled.contains(ReportWidgetType.requestType))
|
||||
RequestTypeChart(
|
||||
repaintKey: _keys[ReportWidgetType.requestType],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.requestCategory))
|
||||
RequestCategoryChart(
|
||||
repaintKey: _keys[ReportWidgetType.requestCategory],
|
||||
),
|
||||
],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.monthlyOverview))
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: MonthlyOverviewChart(
|
||||
repaintKey: _keys[ReportWidgetType.monthlyOverview],
|
||||
),
|
||||
),
|
||||
if (_anyEnabled(enabled, [
|
||||
ReportWidgetType.tasksByHour,
|
||||
ReportWidgetType.ticketsByHour,
|
||||
]))
|
||||
_responsiveRow(
|
||||
isWide: isWide,
|
||||
children: [
|
||||
if (enabled.contains(ReportWidgetType.tasksByHour))
|
||||
TasksByHourChart(
|
||||
repaintKey: _keys[ReportWidgetType.tasksByHour],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.ticketsByHour))
|
||||
TicketsByHourChart(
|
||||
repaintKey: _keys[ReportWidgetType.ticketsByHour],
|
||||
),
|
||||
],
|
||||
),
|
||||
if (_anyEnabled(enabled, [
|
||||
ReportWidgetType.topOfficesTickets,
|
||||
ReportWidgetType.topTicketSubjects,
|
||||
]))
|
||||
_responsiveRow(
|
||||
isWide: isWide,
|
||||
children: [
|
||||
if (enabled.contains(ReportWidgetType.topOfficesTickets))
|
||||
TopOfficesTicketsChart(
|
||||
repaintKey: _keys[ReportWidgetType.topOfficesTickets],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.topTicketSubjects))
|
||||
TopTicketSubjectsChart(
|
||||
repaintKey: _keys[ReportWidgetType.topTicketSubjects],
|
||||
),
|
||||
],
|
||||
),
|
||||
if (_anyEnabled(enabled, [
|
||||
ReportWidgetType.topOfficesTasks,
|
||||
ReportWidgetType.topTaskSubjects,
|
||||
]))
|
||||
_responsiveRow(
|
||||
isWide: isWide,
|
||||
children: [
|
||||
if (enabled.contains(ReportWidgetType.topOfficesTasks))
|
||||
TopOfficesTasksChart(
|
||||
repaintKey: _keys[ReportWidgetType.topOfficesTasks],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.topTaskSubjects))
|
||||
TopTaskSubjectsChart(
|
||||
repaintKey: _keys[ReportWidgetType.topTaskSubjects],
|
||||
),
|
||||
],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.avgResolution))
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: AvgResolutionChart(
|
||||
repaintKey: _keys[ReportWidgetType.avgResolution],
|
||||
),
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.staffWorkload))
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: StaffWorkloadChart(
|
||||
repaintKey: _keys[ReportWidgetType.staffWorkload],
|
||||
),
|
||||
),
|
||||
];
|
||||
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
// ── Status donuts (paired on desktop) ──
|
||||
if (_anyEnabled(enabled, [
|
||||
ReportWidgetType.ticketsByStatus,
|
||||
ReportWidgetType.tasksByStatus,
|
||||
]))
|
||||
_responsiveRow(
|
||||
isWide: isWide,
|
||||
children: [
|
||||
if (enabled.contains(ReportWidgetType.ticketsByStatus))
|
||||
TicketsByStatusChart(
|
||||
repaintKey: _keys[ReportWidgetType.ticketsByStatus],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.tasksByStatus))
|
||||
TasksByStatusChart(
|
||||
repaintKey: _keys[ReportWidgetType.tasksByStatus],
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
// ── Conversion rate KPI ──
|
||||
if (enabled.contains(ReportWidgetType.conversionRate))
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: ConversionRateCard(
|
||||
repaintKey: _keys[ReportWidgetType.conversionRate],
|
||||
),
|
||||
),
|
||||
|
||||
// ── Request type + category donuts ──
|
||||
if (_anyEnabled(enabled, [
|
||||
ReportWidgetType.requestType,
|
||||
ReportWidgetType.requestCategory,
|
||||
]))
|
||||
_responsiveRow(
|
||||
isWide: isWide,
|
||||
children: [
|
||||
if (enabled.contains(ReportWidgetType.requestType))
|
||||
RequestTypeChart(
|
||||
repaintKey: _keys[ReportWidgetType.requestType],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.requestCategory))
|
||||
RequestCategoryChart(
|
||||
repaintKey: _keys[ReportWidgetType.requestCategory],
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
// ── Monthly overview (full width) ──
|
||||
if (enabled.contains(ReportWidgetType.monthlyOverview))
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: MonthlyOverviewChart(
|
||||
repaintKey: _keys[ReportWidgetType.monthlyOverview],
|
||||
),
|
||||
),
|
||||
|
||||
// ── Hourly charts (paired) ──
|
||||
if (_anyEnabled(enabled, [
|
||||
ReportWidgetType.tasksByHour,
|
||||
ReportWidgetType.ticketsByHour,
|
||||
]))
|
||||
_responsiveRow(
|
||||
isWide: isWide,
|
||||
children: [
|
||||
if (enabled.contains(ReportWidgetType.tasksByHour))
|
||||
TasksByHourChart(
|
||||
repaintKey: _keys[ReportWidgetType.tasksByHour],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.ticketsByHour))
|
||||
TicketsByHourChart(
|
||||
repaintKey: _keys[ReportWidgetType.ticketsByHour],
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
// ── Top offices + subjects for Tickets (paired) ──
|
||||
if (_anyEnabled(enabled, [
|
||||
ReportWidgetType.topOfficesTickets,
|
||||
ReportWidgetType.topTicketSubjects,
|
||||
]))
|
||||
_responsiveRow(
|
||||
isWide: isWide,
|
||||
children: [
|
||||
if (enabled.contains(ReportWidgetType.topOfficesTickets))
|
||||
TopOfficesTicketsChart(
|
||||
repaintKey: _keys[ReportWidgetType.topOfficesTickets],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.topTicketSubjects))
|
||||
TopTicketSubjectsChart(
|
||||
repaintKey: _keys[ReportWidgetType.topTicketSubjects],
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
// ── Top offices + subjects for Tasks (paired) ──
|
||||
if (_anyEnabled(enabled, [
|
||||
ReportWidgetType.topOfficesTasks,
|
||||
ReportWidgetType.topTaskSubjects,
|
||||
]))
|
||||
_responsiveRow(
|
||||
isWide: isWide,
|
||||
children: [
|
||||
if (enabled.contains(ReportWidgetType.topOfficesTasks))
|
||||
TopOfficesTasksChart(
|
||||
repaintKey: _keys[ReportWidgetType.topOfficesTasks],
|
||||
),
|
||||
if (enabled.contains(ReportWidgetType.topTaskSubjects))
|
||||
TopTaskSubjectsChart(
|
||||
repaintKey: _keys[ReportWidgetType.topTaskSubjects],
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
// ── Avg resolution (full width) ──
|
||||
if (enabled.contains(ReportWidgetType.avgResolution))
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: AvgResolutionChart(
|
||||
repaintKey: _keys[ReportWidgetType.avgResolution],
|
||||
),
|
||||
),
|
||||
|
||||
// ── Staff workload (full width) ──
|
||||
if (enabled.contains(ReportWidgetType.staffWorkload))
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: StaffWorkloadChart(
|
||||
repaintKey: _keys[ReportWidgetType.staffWorkload],
|
||||
),
|
||||
for (int i = 0; i < chartSections.length; i++)
|
||||
M3FadeSlideIn(
|
||||
delay: Duration(milliseconds: i.clamp(0, 4) * 80),
|
||||
child: chartSections[i],
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user