From 60a2e372a3039f575471fb0b2b16a8222711d6e0 Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Tue, 8 Aug 2023 10:43:29 +0300 Subject: [PATCH] Change To Powered By Cloud Solutions, and remove engineer name from the track device transfer info, in addition to merge with majd's branch --- .../employee/engineers_provider.dart | 7 +- .../gas_refill/gas_status_provider.dart | 3 - .../gas_refill/gas_types_provider.dart | 3 - ...vice_report_equipment_status_provider.dart | 5 +- .../service_report_status_provider.dart | 5 +- .../providers/settings/setting_provider.dart | 5 +- lib/extensions/int_extensions.dart | 1 - lib/extensions/widget_extensions.dart | 1 - lib/models/pantry/pentry.dart | 4 +- lib/models/visits/visits_search.dart | 6 +- .../device_transfer_details.dart | 295 ++++++++---------- .../search_sub_workorder_page.dart | 1 - .../user/gas_refill/request_gas_refill.dart | 2 +- lib/views/pages/user/land_page.dart | 2 +- .../report/create_service_report.dart | 2 +- .../visits/update_visits_group_sheet.dart | 5 - .../pages/user/visits/visit_details.dart | 7 +- .../departments/department_button.dart | 1 - .../device_transfer_info_section.dart | 8 +- .../widgets/hospitals/hospital_button.dart | 1 - .../notifications/notification_item.dart | 1 - .../parts/auto_complete_parts_field.dart | 1 - .../requests/service_request_item.dart | 1 - .../search/service_request_search_bar.dart | 3 +- .../widgets/status/multi_status_menu.dart | 1 - .../service_report_equipment_status.dart | 2 +- lib/views/widgets/visits/visit_item.dart | 7 +- 27 files changed, 165 insertions(+), 215 deletions(-) diff --git a/lib/controllers/providers/api/status_drop_down/employee/engineers_provider.dart b/lib/controllers/providers/api/status_drop_down/employee/engineers_provider.dart index d6fe0011..c075faa5 100644 --- a/lib/controllers/providers/api/status_drop_down/employee/engineers_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/employee/engineers_provider.dart @@ -1,13 +1,12 @@ import 'dart:convert'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:http/http.dart'; import 'package:test_sa/controllers/api_routes/api_manager.dart'; import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/models/engineer.dart'; -import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/models/user.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:http/http.dart'; class EngineersProvider extends ChangeNotifier { //reset provider data diff --git a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart index ce7332a7..7dc22e8d 100644 --- a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart @@ -1,8 +1,5 @@ import 'dart:convert'; -import 'package:test_sa/controllers/api_routes/urls.dart'; -import 'package:test_sa/models/lookup.dart'; -import 'package:test_sa/models/user.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:http/http.dart'; diff --git a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart index e9b3836f..0050c4f5 100644 --- a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart @@ -1,8 +1,5 @@ import 'dart:convert'; -import 'package:test_sa/controllers/api_routes/urls.dart'; -import 'package:test_sa/models/lookup.dart'; -import 'package:test_sa/models/user.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:http/http.dart'; diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_equipment_status_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_equipment_status_provider.dart index 82ac1f49..1931d54c 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_equipment_status_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_equipment_status_provider.dart @@ -1,12 +1,9 @@ import 'dart:convert'; -import 'package:test_sa/controllers/api_routes/api_manager.dart'; -import 'package:test_sa/controllers/api_routes/urls.dart'; -import 'package:test_sa/models/lookup.dart'; -import 'package:test_sa/models/user.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:http/http.dart'; +import 'package:test_sa/controllers/api_routes/api_manager.dart'; import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/models/user.dart'; diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart index fed9a24f..af3c9f86 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart @@ -1,12 +1,9 @@ import 'dart:convert'; -import 'package:test_sa/controllers/api_routes/api_manager.dart'; -import 'package:test_sa/controllers/api_routes/urls.dart'; -import 'package:test_sa/models/lookup.dart'; -import 'package:test_sa/models/user.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:http/http.dart'; +import 'package:test_sa/controllers/api_routes/api_manager.dart'; import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/models/user.dart'; diff --git a/lib/controllers/providers/settings/setting_provider.dart b/lib/controllers/providers/settings/setting_provider.dart index 0e8db564..a38b20c1 100644 --- a/lib/controllers/providers/settings/setting_provider.dart +++ b/lib/controllers/providers/settings/setting_provider.dart @@ -1,10 +1,11 @@ import 'dart:async'; import 'dart:convert'; -import 'package:test_sa/controllers/api_routes/urls.dart'; -import 'package:test_sa/models/user.dart'; import 'package:flutter/foundation.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:test_sa/controllers/api_routes/urls.dart'; +import 'package:test_sa/models/user.dart'; + import '../settings/app_settings.dart'; class SettingProvider extends ChangeNotifier { diff --git a/lib/extensions/int_extensions.dart b/lib/extensions/int_extensions.dart index 5f1e672e..d4d867ad 100644 --- a/lib/extensions/int_extensions.dart +++ b/lib/extensions/int_extensions.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:test_sa/views/app_style/colors.dart'; diff --git a/lib/extensions/widget_extensions.dart b/lib/extensions/widget_extensions.dart index 5a8f3ce5..f88f8c08 100644 --- a/lib/extensions/widget_extensions.dart +++ b/lib/extensions/widget_extensions.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; extension WidgetExtensions on Widget { Widget onPress(VoidCallback onTap) => InkWell(onTap: onTap, child: this); diff --git a/lib/models/pantry/pentry.dart b/lib/models/pantry/pentry.dart index 28f1d8e6..6bc88579 100644 --- a/lib/models/pantry/pentry.dart +++ b/lib/models/pantry/pentry.dart @@ -101,8 +101,8 @@ class Pentry { map["vChecklists"] = ppmCheckLists.map((e) => e.toMap(visitId)).toList(); map["vCalibrationTools"] = calibrationTools.map((e) => e.toMap(visitId)).toList(); map["vKits"] = pmKits.map((e) => e.toMap(visitId)).toList(); - map["nurseSignature"] = signatureNurse;//"${DateTime.now().toIso8601String()}.png|$signatureNurse"; - map["engSignature"] = signatureEngineer;//"${DateTime.now().toIso8601String()}.png|$signatureEngineer"; + map["nurseSignature"] = signatureNurse; //"${DateTime.now().toIso8601String()}.png|$signatureNurse"; + map["engSignature"] = signatureEngineer; //"${DateTime.now().toIso8601String()}.png|$signatureEngineer"; return map; } diff --git a/lib/models/visits/visits_search.dart b/lib/models/visits/visits_search.dart index a18bfa11..4e6159f2 100644 --- a/lib/models/visits/visits_search.dart +++ b/lib/models/visits/visits_search.dart @@ -28,7 +28,7 @@ class VisitsSearch { this.expectedDateFrom, this.expectedDateTo, this.deviceNumber, - this.deviceName + this.deviceName, this.mostRecent, }); @@ -44,8 +44,8 @@ class VisitsSearch { expectedDateTo = newSearch.expectedDateTo; statusValue = newSearch.statusValue; mostRecent = newSearch.mostRecent; - deviceNumber=newSearch.deviceNumber; - deviceName=newSearch.deviceName; + deviceNumber = newSearch.deviceNumber; + deviceName = newSearch.deviceName; } Map toMap() { diff --git a/lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart index 22c33c99..c4ebb783 100644 --- a/lib/views/pages/device_transfer/device_transfer_details.dart +++ b/lib/views/pages/device_transfer/device_transfer_details.dart @@ -3,9 +3,7 @@ import 'package:provider/provider.dart'; import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/device_transfer_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; -import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/models/device/device_transfer.dart'; -import 'package:test_sa/models/device/device_transfer_info.dart'; import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; @@ -54,171 +52,152 @@ class _DeviceTransferDetailsState extends State { key: _scaffoldKey, body: SafeArea( child: FutureBuilder( - future: _getDeviceTransfer(), - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.waiting) { - return const ALoading(); - } else { - _subtitle = AppLocalization - .of(context) - .subtitle; - _userProvider = Provider.of(context); - _settingProvider = Provider.of(context); - _deviceTransferProvider = Provider.of(context); - _isSender = _userProvider.user.userID == _model.sender?.userId; - _isReceiver = _userProvider.user.userID == _model.receiver?.userId; - return Form( - key: _formKey, - child: LoadingManager( - isLoading: _isLoading, - isFailedLoading: false, - stateCode: 200, - onRefresh: () async {}, - child: Column( - children: [ - Container( - color: Theme - .of(context) - .colorScheme - .primary, - padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 4), - child: Row( - children: [ - const ABackButton(), - Expanded( - child: Center( - child: Text( - _subtitle.details, - style: Theme - .of(context) - .textTheme - .headline6 - .copyWith(color: AColors.white, fontStyle: FontStyle.italic), - ), + future: _getDeviceTransfer(), + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.waiting) { + return const ALoading(); + } else { + _subtitle = AppLocalization.of(context).subtitle; + _userProvider = Provider.of(context); + _isSender = _userProvider.user.userID == _model.sender?.userId; + _isReceiver = _userProvider.user.userID == _model.receiver?.userId; + return Form( + key: _formKey, + child: LoadingManager( + isLoading: _isLoading, + isFailedLoading: false, + stateCode: 200, + onRefresh: () async {}, + child: Column( + children: [ + Container( + color: Theme.of(context).colorScheme.primary, + padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 4), + child: Row( + children: [ + const ABackButton(), + Expanded( + child: Center( + child: Text( + _subtitle.details, + style: Theme.of(context).textTheme.headline6.copyWith(color: AColors.white, fontStyle: FontStyle.italic), ), ), - const SizedBox(width: 58), - ], - ), + ), + const SizedBox(width: 58), + ], ), - Expanded( - child: SingleChildScrollView( - padding: EdgeInsets.all(16 * AppStyle.getScaleFactor(context)), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - RequestInfoRow( - title: "Transfer Id", - info: _model.title?.toString(), - ), - RequestInfoRow( - title: _subtitle.assetName, - info: _model.device.assetName, - ), - RequestInfoRow( - title: _subtitle.assetSN, - info: _model.device.serialNumber, - ), - RequestInfoRow( - title: _subtitle.assetNumber, - info: _model.device.number, - ), - RequestInfoRow( - title: _subtitle.destinationSite, - info: _model.device.destSiteName, - ), - RequestInfoRow( - title: _subtitle.building, - info: _model.device.destBuildingName, - ), - RequestInfoRow( - title: _subtitle.floor, - info: _model.device.destFloor, - ), - RequestInfoRow( - title: _subtitle.department, - info: _model.device.destDepartmentName, - ), - RequestInfoRow( - title: _subtitle.room, - info: _model.device.destRoom, - ), - RequestInfoRow( - title: _subtitle.actions, - info: "", - ), - const SizedBox(height: 8), - Row( - children: [ - Expanded( - child: Text("Sender", style: Theme - .of(context) - .textTheme - .headline6), + ), + Expanded( + child: SingleChildScrollView( + padding: EdgeInsets.all(16 * AppStyle.getScaleFactor(context)), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + RequestInfoRow( + title: "Transfer Id", + info: _model.title?.toString(), + ), + RequestInfoRow( + title: _subtitle.assetName, + info: _model.device.assetName, + ), + RequestInfoRow( + title: _subtitle.assetSN, + info: _model.device.serialNumber, + ), + RequestInfoRow( + title: _subtitle.assetNumber, + info: _model.device.number, + ), + RequestInfoRow( + title: _subtitle.destinationSite, + info: _model.device.destSiteName, + ), + RequestInfoRow( + title: _subtitle.building, + info: _model.device.destBuildingName, + ), + RequestInfoRow( + title: _subtitle.floor, + info: _model.device.destFloor, + ), + RequestInfoRow( + title: _subtitle.department, + info: _model.device.destDepartmentName, + ), + RequestInfoRow( + title: _subtitle.room, + info: _model.device.destRoom, + ), + RequestInfoRow( + title: _subtitle.actions, + info: "", + ), + const SizedBox(height: 8), + Row( + children: [ + Expanded( + child: Text("Sender", style: Theme.of(context).textTheme.headline6), + ), + if (_userProvider.user?.type == UsersTypes.engineer) + ASmallButton( + text: _subtitle.edit, + onPressed: (_isSender || _isReceiver || false) + ? () { + Navigator.of(context).push(MaterialPageRoute( + builder: (_) => UpdateDeviceTransfer( + model: _model, + isSender: true, + ))); + } + : null, ), - if (_userProvider.user?.type == UsersTypes.engineer) - ASmallButton( - text: _subtitle.edit, - onPressed: (_isSender || _isReceiver || false) - ? () { - Navigator.of(context).push(MaterialPageRoute( - builder: (_) => - UpdateDeviceTransfer( - model: _model, - isSender: true, - ))); - } - : null, - ), - ], - ), - const SizedBox(height: 12), - DeviceTransferInfoSection( - info: _model.sender, - isSender: true, - ), - const SizedBox(height: 8), - Row( - children: [ - Expanded( - child: Text("Receiver", style: Theme - .of(context) - .textTheme - .headline6), + ], + ), + const SizedBox(height: 12), + DeviceTransferInfoSection( + info: _model.sender, + isSender: true, + ), + const SizedBox(height: 8), + Row( + children: [ + Expanded( + child: Text("Receiver", style: Theme.of(context).textTheme.headline6), + ), + if (_userProvider.user?.type == UsersTypes.engineer) + ASmallButton( + text: _subtitle.edit, + onPressed: (_isReceiver || false) + ? () { + Navigator.of(context).push(MaterialPageRoute( + builder: (_) => UpdateDeviceTransfer( + model: _model, + isSender: false, + ))); + } + : null, ), - if (_userProvider.user?.type == UsersTypes.engineer) - ASmallButton( - text: _subtitle.edit, - onPressed: (_isReceiver || false) - ? () { - Navigator.of(context).push(MaterialPageRoute( - builder: (_) => - UpdateDeviceTransfer( - model: _model, - isSender: false, - ))); - } - : null, - ), - ], - ), - const SizedBox(height: 12), - DeviceTransferInfoSection( - info: _model.receiver, - isSender: false, - ), - ], - ), + ], + ), + const SizedBox(height: 12), + DeviceTransferInfoSection( + info: _model.receiver, + isSender: false, + ), + ], ), ), - ], - ), + ), + ], ), - ); - } + ), + ); } - ) - ) + }, + ), + ), ); } } diff --git a/lib/views/pages/sub_workorder/search_sub_workorder_page.dart b/lib/views/pages/sub_workorder/search_sub_workorder_page.dart index 32fcec04..41f3dc07 100644 --- a/lib/views/pages/sub_workorder/search_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/search_sub_workorder_page.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/api/service_requests_provider.dart'; import 'package:test_sa/models/engineer.dart'; diff --git a/lib/views/pages/user/gas_refill/request_gas_refill.dart b/lib/views/pages/user/gas_refill/request_gas_refill.dart index c8c6c8fb..abcb5efe 100644 --- a/lib/views/pages/user/gas_refill/request_gas_refill.dart +++ b/lib/views/pages/user/gas_refill/request_gas_refill.dart @@ -276,7 +276,7 @@ class _RequestGasRefillState extends State { }, ), const SizedBox(height: 8), - ASubTitle(_subtitle.workingHours), + if (widget.gasRefillModel != null) ASubTitle(_subtitle.workingHours), if (widget.gasRefillModel != null) const SizedBox(height: 8), if (widget.gasRefillModel != null) Row( diff --git a/lib/views/pages/user/land_page.dart b/lib/views/pages/user/land_page.dart index f3f666ea..f5947593 100644 --- a/lib/views/pages/user/land_page.dart +++ b/lib/views/pages/user/land_page.dart @@ -391,7 +391,7 @@ class _LandPageState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - "Powered By NewTrack", + "Powered By Cloud Solutions", style: Theme.of(context).textTheme.headline6.copyWith(fontWeight: FontWeight.w500, color: AColors.grey3A, fontSize: 12), textScaleFactor: AppStyle.getScaleFactor(context), ), 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 4eac7042..f06c1c48 100644 --- a/lib/views/pages/user/requests/report/create_service_report.dart +++ b/lib/views/pages/user/requests/report/create_service_report.dart @@ -281,7 +281,7 @@ class _CreateServiceReportState extends State with TickerPr const SizedBox( height: 8, ), - ASubTitle(_subtitle.assetType ??""), + ASubTitle(_subtitle.assetType ?? ""), _validate && _serviceReport.assetType == null ? ASubTitle( _subtitle.requiredWord, diff --git a/lib/views/pages/user/visits/update_visits_group_sheet.dart b/lib/views/pages/user/visits/update_visits_group_sheet.dart index 7068b2aa..611671f2 100644 --- a/lib/views/pages/user/visits/update_visits_group_sheet.dart +++ b/lib/views/pages/user/visits/update_visits_group_sheet.dart @@ -1,10 +1,5 @@ -import 'package:flutter/material.dart'; -import 'dart:convert'; -import 'dart:io'; - import 'package:flutter/material.dart'; import 'package:test_sa/controllers/localization/localization.dart'; -import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/visits/visit.dart'; import 'package:test_sa/models/visits/visits_group.dart'; diff --git a/lib/views/pages/user/visits/visit_details.dart b/lib/views/pages/user/visits/visit_details.dart index 508b7665..72143a2d 100644 --- a/lib/views/pages/user/visits/visit_details.dart +++ b/lib/views/pages/user/visits/visit_details.dart @@ -73,11 +73,10 @@ class VisitDetailsPage extends StatelessWidget { ), MaterialButton( padding: EdgeInsets.zero, - onPressed:() { - if(visit.images.isEmpty || (visit.images?.first?.isEmpty ?? false)) { + onPressed: () { + if (visit.images.isEmpty || (visit.images?.first?.isEmpty ?? false)) { Navigator.of(context).push(MaterialPageRoute( - builder: (_) => - Scaffold( + builder: (_) => Scaffold( body: InteractiveViewer( child: Center( child: ImageLoader( diff --git a/lib/views/widgets/departments/department_button.dart b/lib/views/widgets/departments/department_button.dart index 47bc81ce..5aa8b0e4 100644 --- a/lib/views/widgets/departments/department_button.dart +++ b/lib/views/widgets/departments/department_button.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/models/department.dart'; import 'package:test_sa/models/subtitle.dart'; diff --git a/lib/views/widgets/device_trancfer/device_transfer_info_section.dart b/lib/views/widgets/device_trancfer/device_transfer_info_section.dart index 5420d504..6cadd895 100644 --- a/lib/views/widgets/device_trancfer/device_transfer_info_section.dart +++ b/lib/views/widgets/device_trancfer/device_transfer_info_section.dart @@ -30,10 +30,10 @@ class DeviceTransferInfoSection extends StatelessWidget { title: subtitle.department, info: info.department.name, ), - RequestInfoRow( - title: isSender? "Sender Name " : "Receiver Name", - info: info.userName, - ), + // RequestInfoRow( + // title: subtitle.engineerName, + // info: info.userName, + // ), RequestInfoRow( title: subtitle.workingHours, info: info.workingHours, diff --git a/lib/views/widgets/hospitals/hospital_button.dart b/lib/views/widgets/hospitals/hospital_button.dart index 86fb867e..33ce319c 100644 --- a/lib/views/widgets/hospitals/hospital_button.dart +++ b/lib/views/widgets/hospitals/hospital_button.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/models/hospital.dart'; import 'package:test_sa/models/subtitle.dart'; diff --git a/lib/views/widgets/notifications/notification_item.dart b/lib/views/widgets/notifications/notification_item.dart index c548f628..7661e55e 100644 --- a/lib/views/widgets/notifications/notification_item.dart +++ b/lib/views/widgets/notifications/notification_item.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:test_sa/models/app_notification.dart'; import 'package:test_sa/views/app_style/colors.dart'; diff --git a/lib/views/widgets/parts/auto_complete_parts_field.dart b/lib/views/widgets/parts/auto_complete_parts_field.dart index d499b815..4a537cc7 100644 --- a/lib/views/widgets/parts/auto_complete_parts_field.dart +++ b/lib/views/widgets/parts/auto_complete_parts_field.dart @@ -7,7 +7,6 @@ import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/models/part.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; -import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; class AutoCompletePartsField extends StatefulWidget { final String initialValue; diff --git a/lib/views/widgets/requests/service_request_item.dart b/lib/views/widgets/requests/service_request_item.dart index 0b650427..1827801d 100644 --- a/lib/views/widgets/requests/service_request_item.dart +++ b/lib/views/widgets/requests/service_request_item.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/views/widgets/search/service_request_search_bar.dart b/lib/views/widgets/search/service_request_search_bar.dart index 1a82b0a2..adabc6d8 100644 --- a/lib/views/widgets/search/service_request_search_bar.dart +++ b/lib/views/widgets/search/service_request_search_bar.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/models/lookup.dart'; @@ -70,7 +69,7 @@ class _ServiceRequestsSearchDialogState extends State