From 1e1ac215ea714f2506a30323bd38ce8042004dec Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Thu, 19 Oct 2023 10:29:14 +0300 Subject: [PATCH] Rename asset to be device as it was before --- assets/translations/ar.json | 8 ++++-- assets/translations/en.json | 6 +++- .../api/asset_transfer_provider.dart | 2 +- .../providers/api/devices_provider.dart | 16 +++++------ .../{asset => device}/asset_transfer.dart | 0 .../asset_transfer_attachment.dart | 0 .../asset_transfer_search.dart | 4 +-- .../{asset/asset.dart => device/device.dart} | 14 +++++----- .../device_transfer_info.dart | 0 .../device_transfer_search.dart | 4 +-- lib/models/{asset => device}/model.dart | 0 .../{asset => device}/model_definition.dart | 2 +- lib/models/{asset => device}/supplier.dart | 0 .../technical_guidance_book.dart | 0 lib/models/enums/translation_keys.dart | 5 ++++ lib/models/service_report.dart | 6 ++-- .../service_request/service_request.dart | 6 ++-- .../device_transfer_details.dart | 2 +- .../request_device_transfer.dart | 2 +- .../update_device_transfer.dart | 2 +- .../pages/user/requests/create_request.dart | 16 +++++------ .../device_transfer_info_section.dart | 2 +- .../device_trancfer/device_transfer_item.dart | 2 +- .../device_trancfer/device_transfer_list.dart | 2 +- .../auto_complete_devices_field.dart | 6 ++-- lib/views/widgets/equipment/device_item.dart | 6 ++-- lib/views/widgets/equipment/pick_asset.dart | 28 +++++++++---------- .../equipment/single_device_picker.dart | 6 ++-- .../auto_complete_devices_field.dart | 4 +-- .../search/asset_transfer_search_dialog.dart | 6 ++-- 30 files changed, 85 insertions(+), 72 deletions(-) rename lib/models/{asset => device}/asset_transfer.dart (100%) rename lib/models/{asset => device}/asset_transfer_attachment.dart (100%) rename lib/models/{asset => device}/asset_transfer_search.dart (97%) rename lib/models/{asset/asset.dart => device/device.dart} (98%) rename lib/models/{asset => device}/device_transfer_info.dart (100%) rename lib/models/{asset => device}/device_transfer_search.dart (97%) rename lib/models/{asset => device}/model.dart (100%) rename lib/models/{asset => device}/model_definition.dart (98%) rename lib/models/{asset => device}/supplier.dart (100%) rename lib/models/{asset => device}/technical_guidance_book.dart (100%) diff --git a/assets/translations/ar.json b/assets/translations/ar.json index d93fe7f1..4a88decb 100644 --- a/assets/translations/ar.json +++ b/assets/translations/ar.json @@ -8,7 +8,7 @@ "passwordLengthMessage" : "يجب أن تتكون كلمة السر من 6 خانات على الأقل", "overview" : "نظرة عامة", "myRequests" : "طلباتي", - "myAssets" : "ممتلكاتي", + "myAssets" : "أجهزتي", "contactUs": "اتصل بنا", "welcome" : "مرحبا،", "openWhatsapp" : "الإنتقال الى الواتس اب", @@ -38,5 +38,9 @@ "floor" : "الطابق", "youHaveToAddRequests" : "يجب إضافة طلبات", "createdSuccessfully" : "إكتمل الطلب بنجاح", - "failedToCompleteRequest" : "فشل إتمام الطلب" + "failedToCompleteRequest" : "فشل إتمام الطلب", + "assetNo" : "رقم الجهاز", + "manufacture" : "صناعة", + "model" : "الطراز", + "serialNumber" : "الرقم التسلسلي" } \ No newline at end of file diff --git a/assets/translations/en.json b/assets/translations/en.json index b2ebe0c6..72cdd60f 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -38,5 +38,9 @@ "floor" : "Floor", "youHaveToAddRequests" : "You have to add requests", "createdSuccessfully" : "Created successfully", - "failedToCompleteRequest" : "Failed to complete request" + "failedToCompleteRequest" : "Failed to complete request", + "assetNo" : "Asset No.", + "manufacture" : "Manufacture", + "model" : "Model", + "serialNumber" : "Serial Number" } \ No newline at end of file diff --git a/lib/controllers/providers/api/asset_transfer_provider.dart b/lib/controllers/providers/api/asset_transfer_provider.dart index 9b92436b..7ae55334 100644 --- a/lib/controllers/providers/api/asset_transfer_provider.dart +++ b/lib/controllers/providers/api/asset_transfer_provider.dart @@ -5,7 +5,7 @@ import 'package:flutter/cupertino.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/asset/asset_transfer.dart'; +import 'package:test_sa/models/device/asset_transfer.dart'; import 'package:test_sa/models/user.dart'; import '../../../models/hospital.dart'; diff --git a/lib/controllers/providers/api/devices_provider.dart b/lib/controllers/providers/api/devices_provider.dart index f30f9f8c..ee609976 100644 --- a/lib/controllers/providers/api/devices_provider.dart +++ b/lib/controllers/providers/api/devices_provider.dart @@ -7,7 +7,7 @@ import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/models/user.dart'; -import '../../../models/asset/asset.dart'; +import '../../../models/device/device.dart'; class AssetProvider extends ChangeNotifier { //reset provider data @@ -26,9 +26,9 @@ class AssetProvider extends ChangeNotifier { int get stateCode => _stateCode; - List _devices = []; + List _devices = []; - List get devices => _devices; + List get devices => _devices; // when categories in-process _loading = true // done _loading = true @@ -77,7 +77,7 @@ class AssetProvider extends ChangeNotifier { if (response.statusCode >= 200 && response.statusCode < 300) { // client's request was successfully received List equipmentListJson = json.decode(response.body)["data"]; - var dList = equipmentListJson.map((asset) => Asset.fromJson(asset)).toList(); + var dList = equipmentListJson.map((asset) => Device.fromJson(asset)).toList(); try { if (isQr) { dList = dList.where((element) => number?.toLowerCase() == element?.assetNumber?.toLowerCase())?.toList() ?? []; @@ -100,7 +100,7 @@ class AssetProvider extends ChangeNotifier { /// 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> getDevicesList({ + Future> getDevicesList({ @required String host, @required User user, @required int hospitalId, @@ -122,12 +122,12 @@ class AssetProvider extends ChangeNotifier { // "${number?.isEmpty == false ? "&assetNo=$number" : ""}" // ), // ); - List page = []; + List page = []; if (response.statusCode >= 200 && response.statusCode < 300) { // client's request was successfully received List equipmentListJson = json.decode(response.body)["data"]; - page = equipmentListJson.map((asset) => Asset.fromJson(asset)).toList(); - _devices.addAll(equipmentListJson.map((asset) => Asset.fromJson(asset)).toList()); + page = equipmentListJson.map((asset) => Device.fromJson(asset)).toList(); + _devices.addAll(equipmentListJson.map((asset) => Device.fromJson(asset)).toList()); notifyListeners(); } return page; diff --git a/lib/models/asset/asset_transfer.dart b/lib/models/device/asset_transfer.dart similarity index 100% rename from lib/models/asset/asset_transfer.dart rename to lib/models/device/asset_transfer.dart diff --git a/lib/models/asset/asset_transfer_attachment.dart b/lib/models/device/asset_transfer_attachment.dart similarity index 100% rename from lib/models/asset/asset_transfer_attachment.dart rename to lib/models/device/asset_transfer_attachment.dart diff --git a/lib/models/asset/asset_transfer_search.dart b/lib/models/device/asset_transfer_search.dart similarity index 97% rename from lib/models/asset/asset_transfer_search.dart rename to lib/models/device/asset_transfer_search.dart index 79a5587d..d08b4f5c 100644 --- a/lib/models/asset/asset_transfer_search.dart +++ b/lib/models/device/asset_transfer_search.dart @@ -1,8 +1,8 @@ -import 'asset.dart'; import 'asset_transfer.dart'; +import 'device.dart'; class AssetTransferSearch extends AssetTransfer { - Asset asset; + Device asset; int pageNumber = 10, pageSize; bool mostRecent; diff --git a/lib/models/asset/asset.dart b/lib/models/device/device.dart similarity index 98% rename from lib/models/asset/asset.dart rename to lib/models/device/device.dart index 5da88f7b..b4523600 100644 --- a/lib/models/asset/asset.dart +++ b/lib/models/device/device.dart @@ -1,5 +1,5 @@ -import 'package:test_sa/models/asset/supplier.dart'; -import 'package:test_sa/models/asset/technical_guidance_book.dart'; +import 'package:test_sa/models/device/supplier.dart'; +import 'package:test_sa/models/device/technical_guidance_book.dart'; import 'package:test_sa/models/lookup.dart'; import '../new_models/building.dart'; @@ -8,8 +8,8 @@ import '../new_models/floor.dart'; import '../new_models/site.dart'; import 'model_definition.dart'; -class Asset { - Asset({ +class Device { + Device({ this.id, this.assetSerialNo, this.systemID, @@ -60,7 +60,7 @@ class Asset { this.tagCode, }); - Asset.fromJson(dynamic json) { + Device.fromJson(dynamic json) { id = json['id']; assetSerialNo = json['assetSerialNo']; systemID = json['systemID']; @@ -163,7 +163,7 @@ class Asset { List technicalGuidanceBooks; String comment; String tagCode; - Asset copyWith({ + Device copyWith({ num id, String assetSerialNo, String systemID, @@ -213,7 +213,7 @@ class Asset { String comment, String tagCode, }) => - Asset( + Device( id: id ?? this.id, assetSerialNo: assetSerialNo ?? this.assetSerialNo, systemID: systemID ?? this.systemID, diff --git a/lib/models/asset/device_transfer_info.dart b/lib/models/device/device_transfer_info.dart similarity index 100% rename from lib/models/asset/device_transfer_info.dart rename to lib/models/device/device_transfer_info.dart diff --git a/lib/models/asset/device_transfer_search.dart b/lib/models/device/device_transfer_search.dart similarity index 97% rename from lib/models/asset/device_transfer_search.dart rename to lib/models/device/device_transfer_search.dart index 038cc840..30562098 100644 --- a/lib/models/asset/device_transfer_search.dart +++ b/lib/models/device/device_transfer_search.dart @@ -1,9 +1,9 @@ import '../hospital.dart'; -import 'asset.dart'; +import 'device.dart'; @Deprecated("Use asset_transfer_search.dart instead of this one") class DeviceTransferSearch { - Asset device; + Device device; String title, room; bool mostRecent; Hospital hospital; diff --git a/lib/models/asset/model.dart b/lib/models/device/model.dart similarity index 100% rename from lib/models/asset/model.dart rename to lib/models/device/model.dart diff --git a/lib/models/asset/model_definition.dart b/lib/models/device/model_definition.dart similarity index 98% rename from lib/models/asset/model_definition.dart rename to lib/models/device/model_definition.dart index 5d4e7311..e68720fc 100644 --- a/lib/models/asset/model_definition.dart +++ b/lib/models/device/model_definition.dart @@ -1,4 +1,4 @@ -import 'package:test_sa/models/asset/supplier.dart'; +import 'package:test_sa/models/device/supplier.dart'; class ModelDefinition { ModelDefinition({ diff --git a/lib/models/asset/supplier.dart b/lib/models/device/supplier.dart similarity index 100% rename from lib/models/asset/supplier.dart rename to lib/models/device/supplier.dart diff --git a/lib/models/asset/technical_guidance_book.dart b/lib/models/device/technical_guidance_book.dart similarity index 100% rename from lib/models/asset/technical_guidance_book.dart rename to lib/models/device/technical_guidance_book.dart diff --git a/lib/models/enums/translation_keys.dart b/lib/models/enums/translation_keys.dart index 69c9368e..c6f25896 100644 --- a/lib/models/enums/translation_keys.dart +++ b/lib/models/enums/translation_keys.dart @@ -39,4 +39,9 @@ enum TranslationKeys { createdSuccessfully, failedToCompleteRequest, youHaveToAddRequests, + assetNo, + manufacture, + model, + serialNumber, + device, } diff --git a/lib/models/service_report.dart b/lib/models/service_report.dart index 7a4bd061..3d5d1865 100644 --- a/lib/models/service_report.dart +++ b/lib/models/service_report.dart @@ -2,7 +2,7 @@ import 'dart:typed_data'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:test_sa/controllers/api_routes/urls.dart'; -import 'package:test_sa/models/asset/asset.dart'; +import 'package:test_sa/models/device/device.dart'; import 'package:test_sa/models/engineer.dart'; import 'package:test_sa/models/fault_description.dart'; import 'package:test_sa/models/lookup.dart'; @@ -35,7 +35,7 @@ class ServiceReport { String invoiceCode; List parts; List files; - Asset device; + Device device; String quantity; String jobSheetNumber; TimerModel timer; @@ -235,7 +235,7 @@ class ServiceReport { durationInSecond: ((parsedJson["workingHours"] ?? 0) * 60 * 60).toInt(), ), //workPreformed: parsedJson["work_performed"], - device: Asset.fromJson(parsedJson["callRequest"]["asset"]), + device: Device.fromJson(parsedJson["callRequest"]["asset"]), signatureNurse: URLs.getFileUrl(parsedJson["nurseSignature"]), signatureEngineer: URLs.getFileUrl(parsedJson["engSignature"]), comment: parsedJson['comment'], diff --git a/lib/models/service_request/service_request.dart b/lib/models/service_request/service_request.dart index 5808fce9..5769d0c1 100644 --- a/lib/models/service_request/service_request.dart +++ b/lib/models/service_request/service_request.dart @@ -1,5 +1,5 @@ import 'package:test_sa/controllers/api_routes/urls.dart'; -import 'package:test_sa/models/asset/asset.dart'; +import 'package:test_sa/models/device/device.dart'; import 'package:test_sa/models/fault_description.dart'; import 'package:test_sa/models/lookup.dart'; @@ -42,7 +42,7 @@ class ServiceRequest { Lookup requestedThrough; Lookup firstAction; Lookup loanAvailability; - Asset device; + Device device; ServiceRequest({ this.id, @@ -128,7 +128,7 @@ class ServiceRequest { visitDate: DateTime.tryParse(parsedJson["visitDate"] ?? "").toString().split(" ").first, nextVisitDate: DateTime.tryParse(parsedJson["nextVisitDate"] ?? ""), //workPerformed: parsedJson["workOrder"] != null ? parsedJson["workOrder"]["workPerformed"] : null, - device: Asset.fromJson(parsedJson["asset"]), + device: Device.fromJson(parsedJson["asset"]), reviewComment: parsedJson["reviewComment"], type: Lookup.fromJson(parsedJson['typeofRequest']), defectType: Lookup.fromJson(parsedJson['defectType']), diff --git a/lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart index 754a04a2..f156099b 100644 --- a/lib/views/pages/device_transfer/device_transfer_details.dart +++ b/lib/views/pages/device_transfer/device_transfer_details.dart @@ -3,7 +3,7 @@ import 'package:provider/provider.dart'; import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/asset_transfer_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; -import 'package:test_sa/models/asset/asset_transfer.dart'; +import 'package:test_sa/models/device/asset_transfer.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'; diff --git a/lib/views/pages/device_transfer/request_device_transfer.dart b/lib/views/pages/device_transfer/request_device_transfer.dart index df46a036..a3fa1206 100644 --- a/lib/views/pages/device_transfer/request_device_transfer.dart +++ b/lib/views/pages/device_transfer/request_device_transfer.dart @@ -4,7 +4,7 @@ import 'package:test_sa/controllers/providers/api/asset_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/extensions/int_extensions.dart'; -import 'package:test_sa/models/asset/asset_transfer.dart'; +import 'package:test_sa/models/device/asset_transfer.dart'; import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/widgets/buttons/app_button.dart'; diff --git a/lib/views/pages/device_transfer/update_device_transfer.dart b/lib/views/pages/device_transfer/update_device_transfer.dart index fad59ba7..6a8b09ac 100644 --- a/lib/views/pages/device_transfer/update_device_transfer.dart +++ b/lib/views/pages/device_transfer/update_device_transfer.dart @@ -4,7 +4,7 @@ import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/api/asset_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/asset/asset_transfer.dart'; +import 'package:test_sa/models/device/asset_transfer.dart'; import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/widgets/buttons/app_button.dart'; diff --git a/lib/views/pages/user/requests/create_request.dart b/lib/views/pages/user/requests/create_request.dart index 9aa84227..19117587 100644 --- a/lib/views/pages/user/requests/create_request.dart +++ b/lib/views/pages/user/requests/create_request.dart @@ -32,7 +32,7 @@ import 'package:test_sa/views/widgets/titles/app_sub_title.dart'; import '../../../../controllers/providers/api/status_drop_down/service_reqest/service_request_through_provider.dart'; import '../../../../controllers/providers/api/status_drop_down/service_reqest/service_request_type_provider.dart'; -import '../../../../models/asset/asset.dart'; +import '../../../../models/device/device.dart'; import '../../../../models/enums/translation_keys.dart'; import '../../../../new_views/common_widgets/default_app_bar.dart'; import '../../../widgets/status/service_request/service_request_first_action.dart'; @@ -57,7 +57,7 @@ class CreateRequestPageState extends State { final List _deviceImages = []; bool _isLoading = false; bool _showDatePicker = false; - Asset _device; + Device _asset; Subtitle _subtitle; final GlobalKey _formKey = GlobalKey(); final GlobalKey _scaffoldKey = GlobalKey(); @@ -72,7 +72,7 @@ class CreateRequestPageState extends State { _commentController = TextEditingController(); if (widget.serviceRequest != null) { _serviceRequest = widget.serviceRequest; - _device = _serviceRequest.device; + _asset = _serviceRequest.device; _deviceImages.addAll(_serviceRequest.devicePhotos.map((e) => File(e)).toList()); _showDatePicker = _serviceRequest.firstAction != null && _serviceRequest.firstAction.name == "Need a visit"; if (_showDatePicker && _serviceRequest.visitDate != null) { @@ -143,9 +143,9 @@ class CreateRequestPageState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ PickAsset( - asset: _device, - onPickAsset: (device) { - _device = device; + device: _asset, + onPickAsset: (asset) { + _asset = asset; setState(() {}); }, ), @@ -315,7 +315,7 @@ class CreateRequestPageState extends State { AppFilledButton( onPressed: () async { if (!_formKey.currentState.validate()) return; - if (_device?.id == null) { + if (_asset?.id == null) { Fluttertoast.showToast(msg: _subtitle.pickDevice); return; } @@ -328,7 +328,7 @@ class CreateRequestPageState extends State { return; } _formKey.currentState.save(); - _serviceRequest.deviceId = _device?.id; + _serviceRequest.deviceId = _asset?.id; if (widget.serviceRequest == null) { _serviceRequest.type = Provider.of(context, listen: false).getDefaultItem(); } 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 d6e66d49..8fb25863 100644 --- a/lib/views/widgets/device_trancfer/device_transfer_info_section.dart +++ b/lib/views/widgets/device_trancfer/device_transfer_info_section.dart @@ -7,7 +7,7 @@ import 'package:test_sa/views/widgets/requests/info_row.dart'; import 'package:test_sa/views/widgets/requests/request_status.dart'; import '../../../controllers/providers/api/user_provider.dart'; -import '../../../models/asset/device_transfer_info.dart'; +import '../../../models/device/device_transfer_info.dart'; import '../images/multi_image_picker.dart'; class DeviceTransferInfoSection extends StatelessWidget { diff --git a/lib/views/widgets/device_trancfer/device_transfer_item.dart b/lib/views/widgets/device_trancfer/device_transfer_item.dart index 924b84fa..42048df4 100644 --- a/lib/views/widgets/device_trancfer/device_transfer_item.dart +++ b/lib/views/widgets/device_trancfer/device_transfer_item.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; -import 'package:test_sa/models/asset/asset_transfer.dart'; +import 'package:test_sa/models/device/asset_transfer.dart'; import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/user.dart'; import 'package:test_sa/views/app_style/sizing.dart'; diff --git a/lib/views/widgets/device_trancfer/device_transfer_list.dart b/lib/views/widgets/device_trancfer/device_transfer_list.dart index dd72a3c6..22e85ac0 100644 --- a/lib/views/widgets/device_trancfer/device_transfer_list.dart +++ b/lib/views/widgets/device_trancfer/device_transfer_list.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:test_sa/controllers/localization/localization.dart'; -import 'package:test_sa/models/asset/asset_transfer.dart'; +import 'package:test_sa/models/device/asset_transfer.dart'; import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/pages/device_transfer/device_transfer_details.dart'; import 'package:test_sa/views/widgets/device_trancfer/device_transfer_item.dart'; diff --git a/lib/views/widgets/equipment/auto_complete_devices_field.dart b/lib/views/widgets/equipment/auto_complete_devices_field.dart index 541378ab..1745e911 100644 --- a/lib/views/widgets/equipment/auto_complete_devices_field.dart +++ b/lib/views/widgets/equipment/auto_complete_devices_field.dart @@ -8,10 +8,10 @@ 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'; -import '../../../models/asset/asset.dart'; +import '../../../models/device/device.dart'; class AutoCompleteDeviceField extends StatefulWidget { - final Asset initialValue; + final Device initialValue; final int hospitalId; final Function(int) onPick; @@ -60,7 +60,7 @@ class _AutoCompleteDeviceFieldState extends State { border: Border.all(color: AColors.black), borderRadius: BorderRadius.circular(AppStyle.borderRadius * AppStyle.getScaleFactor(context)), boxShadow: [AppStyle.boxShadow]), - child: TypeAheadField( + child: TypeAheadField( textFieldConfiguration: TextFieldConfiguration( style: Theme.of(context).textTheme.headline6, controller: _controller, diff --git a/lib/views/widgets/equipment/device_item.dart b/lib/views/widgets/equipment/device_item.dart index 08118523..517f2734 100644 --- a/lib/views/widgets/equipment/device_item.dart +++ b/lib/views/widgets/equipment/device_item.dart @@ -4,11 +4,11 @@ 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'; -import '../../../models/asset/asset.dart'; +import '../../../models/device/device.dart'; class DeviceItem extends StatelessWidget { - final Asset device; - final Function(Asset) onPressed; + final Device device; + final Function(Device) onPressed; const DeviceItem({Key key, this.device, this.onPressed}) : super(key: key); diff --git a/lib/views/widgets/equipment/pick_asset.dart b/lib/views/widgets/equipment/pick_asset.dart index 317c8eab..95e6f943 100644 --- a/lib/views/widgets/equipment/pick_asset.dart +++ b/lib/views/widgets/equipment/pick_asset.dart @@ -7,13 +7,13 @@ import 'package:test_sa/models/enums/translation_keys.dart'; import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart'; import 'package:test_sa/views/widgets/equipment/single_device_picker.dart'; -import '../../../models/asset/asset.dart'; +import '../../../models/device/device.dart'; class PickAsset extends StatelessWidget { - final Function(Asset) onPickAsset; - final Asset asset; + final Function(Device) onPickAsset; + final Device device; - const PickAsset({Key key, this.asset, this.onPickAsset}) : super(key: key); + const PickAsset({Key key, this.device, this.onPickAsset}) : super(key: key); @override Widget build(BuildContext context) { @@ -21,28 +21,28 @@ class PickAsset extends StatelessWidget { children: [ AppTextFormField( enable: false, - labelText: TranslationKeys.submitRequest, + labelText: TranslationKeys.device, initialValue: context.translate(TranslationKeys.site), suffixIcon: "qr".toSvgAsset(height: 24, fit: BoxFit.fitHeight).paddingOnly(end: 16), ).onPress(() async { - Asset device = await Navigator.of(context).pushNamed(SingleDevicePicker.id) as Asset; + Device device = await Navigator.of(context).pushNamed(SingleDevicePicker.id) as Device; onPickAsset(device); }), - if (asset != null) 8.height, - if (asset != null) + if (device != null) 8.height, + if (device != null) Card( child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ context.translate(TranslationKeys.myAssets).heading5(context), 8.height, - "${context.translate(TranslationKeys.myAssets)}: ${asset.assetNumber}".bodyText(context), - "${context.translate(TranslationKeys.myAssets)}: ${asset.id}".bodyText(context), - "${context.translate(TranslationKeys.myAssets)}: ${asset.assetNumber}".bodyText(context), - "${context.translate(TranslationKeys.myAssets)}: ${asset.assetNumber}".bodyText(context), + "${context.translate(TranslationKeys.assetNo)}: ${device.assetNumber}".bodyText(context), + "${context.translate(TranslationKeys.manufacture)}: ${device.modelDefinition?.manufacturerName}".bodyText(context), + "${context.translate(TranslationKeys.model)}: ${device.modelDefinition?.modelName}".bodyText(context), + "${context.translate(TranslationKeys.serialNumber)}: ${device.assetNumber}".bodyText(context), const Divider().defaultStyle(context), - "${context.translate(TranslationKeys.myAssets)}: ${asset.assetNumber}".bodyText(context), - "${context.translate(TranslationKeys.myAssets)}: ${asset.assetNumber}".bodyText(context), + "${context.translate(TranslationKeys.department)}: ${device.department?.departmentName}".bodyText(context), + "${context.translate(TranslationKeys.site)}: ${device.site?.custName}".bodyText(context), ], ).paddingAll(16), ), diff --git a/lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/single_device_picker.dart index 3d715623..e67d5e65 100644 --- a/lib/views/widgets/equipment/single_device_picker.dart +++ b/lib/views/widgets/equipment/single_device_picker.dart @@ -10,7 +10,7 @@ import 'package:test_sa/views/widgets/loaders/lazy_loading.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/loaders/no_item_found.dart'; -import '../../../models/asset/asset.dart'; +import '../../../models/device/device.dart'; import '../app_text_form_field.dart'; import '../qr/scan_qr.dart'; @@ -26,8 +26,8 @@ class _SingleDevicePickerState extends State { AssetProvider _devicesProvider; UserProvider _userProvider; SettingProvider _settingProvider; - List _searchableList = []; - List _initList = []; + List _searchableList = []; + List _initList = []; bool _firstTime = true; Subtitle _subtitle; diff --git a/lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart b/lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart index 8fd2119e..c098279e 100644 --- a/lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart +++ b/lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart @@ -8,7 +8,7 @@ import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; -import '../../../../models/asset/asset.dart'; +import '../../../../models/device/device.dart'; class AutoCompleteDeviceNumberField extends StatefulWidget { final Lookup initialValue; @@ -52,7 +52,7 @@ class _AutoCompleteDeviceNumberFieldState extends State( + child: TypeAheadField( textFieldConfiguration: TextFieldConfiguration( style: Theme.of(context).textTheme.headline6, controller: _controller, diff --git a/lib/views/widgets/search/asset_transfer_search_dialog.dart b/lib/views/widgets/search/asset_transfer_search_dialog.dart index a2801577..6c492466 100644 --- a/lib/views/widgets/search/asset_transfer_search_dialog.dart +++ b/lib/views/widgets/search/asset_transfer_search_dialog.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:test_sa/controllers/localization/localization.dart'; -import 'package:test_sa/models/asset/asset_transfer.dart'; +import 'package:test_sa/models/device/asset_transfer.dart'; import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/widgets/buttons/app_small_button.dart'; import 'package:test_sa/views/widgets/equipment/pick_asset.dart'; -import '../../../models/asset/asset_transfer_search.dart'; +import '../../../models/device/asset_transfer_search.dart'; import '../app_text_form_field.dart'; import '../switch_button.dart'; @@ -80,7 +80,7 @@ class AssetTransferSearchDialogState extends State wi ), SizedBox(height: 8.0 * AppStyle.getScaleFactor(context)), PickAsset( - asset: _search.asset, + device: _search.asset, onPickAsset: (device) { _search.asset = device; setState(() {});