diff --git a/lib/views/pages/user/requests/report/create_service_report.dart b/lib/views/pages/user/requests/report/create_service_report.dart index 80e14e25..374c305c 100644 --- a/lib/views/pages/user/requests/report/create_service_report.dart +++ b/lib/views/pages/user/requests/report/create_service_report.dart @@ -545,7 +545,6 @@ class _CreateServiceReportState extends State with TickerPr ServiceReportFaultDescription( requestId: widget.request?.id, initialValue: _serviceReport.faultDescription, - enabled: false, onSelect: (status) { if (status != null) { _serviceReport.faultDescription = status; diff --git a/lib/views/pages/user/requests/report/edit_service_report.dart b/lib/views/pages/user/requests/report/edit_service_report.dart index 1eea6ea9..7cc3fc01 100644 --- a/lib/views/pages/user/requests/report/edit_service_report.dart +++ b/lib/views/pages/user/requests/report/edit_service_report.dart @@ -716,9 +716,10 @@ class _EditServiceReportState extends State with TickerProvid requestId: widget.request?.id, initialValue: _serviceReport.faultDescription, onSelect: (status) { - print("faluttt:${status?.toJson()}"); _serviceReport.faultDescription = status; - if (mounted) setState(() {}); + WidgetsBinding.instance.addPostFrameCallback((timeStamp) { + if (mounted) setState(() {}); + }); }, ), const SizedBox(height: 8), diff --git a/lib/views/widgets/status/report/fault_desc_menu.dart b/lib/views/widgets/status/report/fault_desc_menu.dart index 84de4304..a2b670de 100644 --- a/lib/views/widgets/status/report/fault_desc_menu.dart +++ b/lib/views/widgets/status/report/fault_desc_menu.dart @@ -7,9 +7,8 @@ class FaultDescriptionMenu extends StatefulWidget { final List statuses; final FaultDescription initialStatus; final Function(FaultDescription) onSelect; - final bool enabled; - const FaultDescriptionMenu({Key key, this.statuses, this.onSelect, this.initialStatus, this.enabled}) : super(key: key); + const FaultDescriptionMenu({Key key, this.statuses, this.onSelect, this.initialStatus}) : super(key: key); @override _SingleStatusMenuState createState() => _SingleStatusMenuState(); @@ -72,42 +71,39 @@ class _SingleStatusMenuState extends State { // AppStyle.boxShadow // ] ), - child: IgnorePointer( - ignoring: !widget.enabled, - child: DropdownButton( - value: _selectedStatus, - iconSize: 24, - icon: const Icon(Icons.keyboard_arrow_down_rounded), - elevation: 0, - isExpanded: true, - hint: Text( - "Select", - style: Theme.of(context).textTheme.subtitle1, - ), - style: TextStyle(color: Theme.of(context).primaryColor), - underline: SizedBox.shrink(), - onChanged: (FaultDescription newValue) { - setState(() { - _selectedStatus = newValue; - }); - widget.onSelect(newValue); - }, - items: widget.statuses.map>( - (FaultDescription value) { - return DropdownMenuItem( - value: value, - child: Text( - value.defectName ?? "", - style: Theme.of(context).textTheme.subtitle1.copyWith( - color: Theme.of(context).primaryColor, - fontSize: 11, - //fontWeight: FontWeight.bold - ), - ), - ); - }, - ).toList(), + child: DropdownButton( + value: _selectedStatus, + iconSize: 24, + icon: const Icon(Icons.keyboard_arrow_down_rounded), + elevation: 0, + isExpanded: true, + hint: Text( + "Select", + style: Theme.of(context).textTheme.subtitle1, ), + style: TextStyle(color: Theme.of(context).primaryColor), + underline: SizedBox.shrink(), + onChanged: (FaultDescription newValue) { + setState(() { + _selectedStatus = newValue; + }); + widget.onSelect(newValue); + }, + items: widget.statuses.map>( + (FaultDescription value) { + return DropdownMenuItem( + value: value, + child: Text( + value.defectName ?? "", + style: Theme.of(context).textTheme.subtitle1.copyWith( + color: Theme.of(context).primaryColor, + fontSize: 11, + //fontWeight: FontWeight.bold + ), + ), + ); + }, + ).toList(), ), ); } diff --git a/lib/views/widgets/status/report/service_report_fault_description.dart b/lib/views/widgets/status/report/service_report_fault_description.dart index fc90a3e7..78576877 100644 --- a/lib/views/widgets/status/report/service_report_fault_description.dart +++ b/lib/views/widgets/status/report/service_report_fault_description.dart @@ -11,9 +11,9 @@ class ServiceReportFaultDescription extends StatelessWidget { final String requestId; final Function(FaultDescription) onSelect; final FaultDescription initialValue; - final bool enabled; - const ServiceReportFaultDescription({Key key, this.requestId, this.onSelect, this.initialValue, this.enabled = true}) : super(key: key); + const ServiceReportFaultDescription({Key key, this.requestId, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { SettingProvider settingProvider = Provider.of(context); @@ -27,19 +27,11 @@ class ServiceReportFaultDescription extends StatelessWidget { menuProvider.reset(); await menuProvider.getCallRequestForWorkOrder(user: userProvider.user, host: settingProvider.host, requestId: requestId); }, - child: Builder(builder: (context) { - if (initialValue == null && !enabled && menuProvider.items.isNotEmpty) { - WidgetsBinding.instance.addPostFrameCallback((timeStamp) { - onSelect(menuProvider.items.first); - }); - } - return FaultDescriptionMenu( - initialStatus: initialValue, - statuses: menuProvider.items, - onSelect: onSelect, - enabled: enabled, - ); - }), + child: FaultDescriptionMenu( + initialStatus: initialValue, + statuses: menuProvider.items, + onSelect: onSelect, + ), ); } }