diff --git a/lib/controllers/providers/api/devices_provider.dart b/lib/controllers/providers/api/devices_provider.dart index 4bede208..2d55a2a7 100644 --- a/lib/controllers/providers/api/devices_provider.dart +++ b/lib/controllers/providers/api/devices_provider.dart @@ -147,31 +147,31 @@ class DevicesProvider extends ChangeNotifier { } } - /// return -2 if request in progress - /// return -1 if error happen when sending request - /// return state code if request complete may be 200, 404 or 403 - /// for more details check http state manager - /// lib\controllers\http_status_manger\http_status_manger.dart - Future> getDevicesListBySN({@required String host, @required User user, @required int hospitalId, @required String sn}) async { - Response response; - try { - response = await get( - Uri.parse(URLs.getEquipment + "?client=$hospitalId" + (sn == null || sn.isEmpty ? "" : "&serial_qr=$sn")), - ); - - _stateCode = response.statusCode; - List _page = []; - if (response.statusCode >= 200 && response.statusCode < 300) { - // client's request was successfully received - List categoriesListJson = json.decode(utf8.decode(response.bodyBytes)); - _page = categoriesListJson.map((device) => Device.fromJson(device)).toList(); - } - return _page; - } catch (error) { - _loading = false; - _stateCode = -1; - notifyListeners(); - return []; - } - } + // /// return -2 if request in progress + // /// return -1 if error happen when sending request + // /// return state code if request complete may be 200, 404 or 403 + // /// for more details check http state manager + // /// lib\controllers\http_status_manger\http_status_manger.dart + // Future> getDevicesListBySN({@required String host, @required User user, @required int hospitalId, @required String sn}) async { + // Response response; + // try { + // response = await get( + // Uri.parse(URLs.getEquipment + "?client=$hospitalId" + (sn == null || sn.isEmpty ? "" : "&serial_qr=$sn")), + // ); + // + // _stateCode = response.statusCode; + // List _page = []; + // if (response.statusCode >= 200 && response.statusCode < 300) { + // // client's request was successfully received + // List categoriesListJson = json.decode(utf8.decode(response.bodyBytes)); + // _page = categoriesListJson.map((device) => Device.fromJson(device)).toList(); + // } + // return _page; + // } catch (error) { + // _loading = false; + // _stateCode = -1; + // notifyListeners(); + // return []; + // } + // } } diff --git a/lib/views/widgets/equipment/device_item.dart b/lib/views/widgets/equipment/device_item.dart index e9fb9043..0e3b20e3 100644 --- a/lib/views/widgets/equipment/device_item.dart +++ b/lib/views/widgets/equipment/device_item.dart @@ -33,6 +33,13 @@ class DeviceItem extends StatelessWidget { subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ + Divider( + color: Theme.of(context).scaffoldBackgroundColor, + ), + Text( + "${_subtitle.assetNumber} : ${device.number}", + style: Theme.of(context).textTheme.subtitle1.copyWith(color: AColors.white), + ), Divider( color: Theme.of(context).scaffoldBackgroundColor, ), diff --git a/lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/single_device_picker.dart index e23d5b05..5162b3e7 100644 --- a/lib/views/widgets/equipment/single_device_picker.dart +++ b/lib/views/widgets/equipment/single_device_picker.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/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/devices_provider.dart'; @@ -33,20 +32,20 @@ class _SingleDevicePickerState extends State { TextEditingController numberController = TextEditingController(); TextEditingController snController = TextEditingController(); _getDevice(String result) async { + print(result); if (result == null) return; - showDialog( - barrierDismissible: false, - context: context, - builder: (dialogContext) { - return const Center(child: CircularProgressIndicator()); - }); - List devices = await _devicesProvider.getDevicesListBySN(host: _settingProvider.host, user: _userProvider.user, hospitalId: _userProvider.user.clientId, sn: result); - Navigator.of(context).pop(); - if (devices.isEmpty) { - Fluttertoast.showToast(msg: _subtitle.noDeviceFound); - return; - } - Navigator.of(context).pop(devices.first); + // List devices = await _devicesProvider.getDevicesListBySN(host: _settingProvider.host, user: _userProvider.user, hospitalId: _userProvider.user.clientId, sn: result); + _devicesProvider.reset(); + await _devicesProvider.getEquipment(user: _userProvider.user, host: _settingProvider.host, hospitalId: _userProvider.user.clientId, serialNumber: "", number: result); + _searchableList.clear(); + _searchableList.addAll(_devicesProvider.devices); + // Navigator.of(context).pop(); + // Navigator.of(context).pop(); + // if (devices.isEmpty) { + // Fluttertoast.showToast(msg: _subtitle.noDeviceFound); + // return; + // } + // Navigator.of(context).pop(devices.first); } @override