From c393f29829068ea185f5ff7079444ca81a230511 Mon Sep 17 00:00:00 2001 From: nextwo <1234> Date: Thu, 3 Aug 2023 14:10:52 +0300 Subject: [PATCH] some changes --- assets/subtitles/en_subtitle.json | 2 +- lib/models/visits/visits_search.dart | 6 +++ .../device_transfer_details.dart | 2 + .../pages/user/requests/request_details.dart | 2 +- .../pages/user/visits/visit_details.dart | 9 ++-- .../device_transfer_info_section.dart | 7 ++-- .../requests/service_request_item.dart | 7 ++++ .../search/service_request_search_bar.dart | 19 +++++++++ .../widgets/search/visits_search_bar.dart | 41 +++++++++++++++++++ lib/views/widgets/visits/visit_item.dart | 10 +++++ 10 files changed, 96 insertions(+), 9 deletions(-) diff --git a/assets/subtitles/en_subtitle.json b/assets/subtitles/en_subtitle.json index d1412bf5..4b5352f9 100644 --- a/assets/subtitles/en_subtitle.json +++ b/assets/subtitles/en_subtitle.json @@ -73,7 +73,7 @@ "deviceImages": "Asset Images", "deviceModel": "Asset Model", "deviceRequired": "Asset Required", - "deviceSN": "Asset SN", + "deviceSN": "Asset Serial Number", "engineerName": "Engineer Name", "engineerPhone": "Engineer Phone", "facebook": "facebook", diff --git a/lib/models/visits/visits_search.dart b/lib/models/visits/visits_search.dart index 5c3692bd..981b5c42 100644 --- a/lib/models/visits/visits_search.dart +++ b/lib/models/visits/visits_search.dart @@ -3,6 +3,8 @@ import 'package:test_sa/models/lookup.dart'; class VisitsSearch { String deviceSerialNumber; + String deviceName; + String deviceNumber; Hospital hospital; String brand; Lookup model; @@ -24,6 +26,8 @@ class VisitsSearch { this.contactStatus, this.expectedDateFrom, this.expectedDateTo, + this.deviceNumber, + this.deviceName }); fromSearch(VisitsSearch newSearch) { @@ -37,6 +41,8 @@ class VisitsSearch { expectedDateFrom = newSearch.expectedDateFrom; expectedDateTo = newSearch.expectedDateTo; statusValue = newSearch.statusValue; + 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 75892db3..7980f79c 100644 --- a/lib/views/pages/device_transfer/device_transfer_details.dart +++ b/lib/views/pages/device_transfer/device_transfer_details.dart @@ -149,6 +149,7 @@ class _DeviceTransferDetailsState extends State { const SizedBox(height: 12), DeviceTransferInfoSection( info: widget.model.sender, + isSender: true, ), const SizedBox(height: 8), Row( @@ -173,6 +174,7 @@ class _DeviceTransferDetailsState extends State { const SizedBox(height: 12), DeviceTransferInfoSection( info: widget.model.receiver, + isSender: false, ), ], ), diff --git a/lib/views/pages/user/requests/request_details.dart b/lib/views/pages/user/requests/request_details.dart index 61e835b2..8c15faf5 100644 --- a/lib/views/pages/user/requests/request_details.dart +++ b/lib/views/pages/user/requests/request_details.dart @@ -186,7 +186,7 @@ class RequestDetailsPage extends StatelessWidget { padding: EdgeInsets.symmetric(horizontal: 16), children: [ RequestInfoRow( - title: _subtitle.code, + title: _subtitle.callId, info: serviceRequest.requestCode, ), RequestInfoRow( diff --git a/lib/views/pages/user/visits/visit_details.dart b/lib/views/pages/user/visits/visit_details.dart index 73cb60d4..e75408cd 100644 --- a/lib/views/pages/user/visits/visit_details.dart +++ b/lib/views/pages/user/visits/visit_details.dart @@ -74,6 +74,7 @@ class VisitDetailsPage extends StatelessWidget { MaterialButton( padding: EdgeInsets.zero, onPressed: () { + if(visit.images.first != null) Navigator.of(context).push(MaterialPageRoute( builder: (_) => Scaffold( body: InteractiveViewer( @@ -115,6 +116,10 @@ class VisitDetailsPage extends StatelessWidget { title: "Asset Number", info: visit.deviceNumber, ), + RequestInfoRow( + title: _subtitle.deviceName, + content: visit.deviceEnglishName, + ), RequestInfoRow( title: _subtitle.deviceSN, info: visit.deviceSerialNumber, @@ -156,10 +161,6 @@ class VisitDetailsPage extends StatelessWidget { title: _subtitle.hospital, content: visit.hospitalName, ), - RequestInfoRow( - title: _subtitle.deviceName, - content: visit.deviceEnglishName, - ), ], ), ), 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 1a8da07b..468354c4 100644 --- a/lib/views/widgets/device_trancfer/device_transfer_info_section.dart +++ b/lib/views/widgets/device_trancfer/device_transfer_info_section.dart @@ -8,8 +8,9 @@ import 'package:test_sa/views/widgets/requests/request_status.dart'; class DeviceTransferInfoSection extends StatelessWidget { final DeviceTransferInfo info; + final bool isSender; final VoidCallback onEdit; - const DeviceTransferInfoSection({Key key, this.info, this.onEdit}) : super(key: key); + const DeviceTransferInfoSection({Key key, this.info, this.onEdit, this.isSender}) : super(key: key); @override Widget build(BuildContext context) { @@ -25,7 +26,7 @@ class DeviceTransferInfoSection extends StatelessWidget { info: info.department.name, ), RequestInfoRow( - title: subtitle.engineerName, + title: isSender? "Sender Name " : "Receiver Name", info: info.userName, ), RequestInfoRow( @@ -41,7 +42,7 @@ class DeviceTransferInfoSection extends StatelessWidget { info: info.comment, ), RequestInfoRow( - title: "Assigned FE", + title: "Assigned Engineer", info: info.assignedEmployeeName, ), RequestInfoRow( diff --git a/lib/views/widgets/requests/service_request_item.dart b/lib/views/widgets/requests/service_request_item.dart index 2580deef..0b650427 100644 --- a/lib/views/widgets/requests/service_request_item.dart +++ b/lib/views/widgets/requests/service_request_item.dart @@ -133,6 +133,13 @@ class ServiceRequestItem extends StatelessWidget { Divider( color: onItemColor, ), + Text( + request.deviceNumber, + style: Theme.of(context).textTheme.subtitle2.copyWith(color: onItemColor, fontSize: 12, fontWeight: FontWeight.normal), + ), + Divider( + color: onItemColor, + ), Row( children: [ Expanded( diff --git a/lib/views/widgets/search/service_request_search_bar.dart b/lib/views/widgets/search/service_request_search_bar.dart index c5b31e29..e6b54022 100644 --- a/lib/views/widgets/search/service_request_search_bar.dart +++ b/lib/views/widgets/search/service_request_search_bar.dart @@ -90,6 +90,25 @@ class _ServiceRequestsSearchDialogState extends State with TickerProv ) ], ), + SizedBox( + height: 8.0 * AppStyle.getScaleFactor(context), + ), + ATextFormField( + initialValue: _search.deviceNumber, + hintText: _subtitle.assetNumber, + style: Theme.of(context).textTheme.headline6, + textInputAction: TextInputAction.search, + onAction: () { + if (!_formKey.currentState.validate()) { + return; + } + _formKey.currentState.save(); + Navigator.of(context).pop(_search); + }, + onSaved: (value) { + _search.deviceNumber = value; + }, + ), + SizedBox( + height: 8.0 * AppStyle.getScaleFactor(context), + ), + ATextFormField( + initialValue: _search.deviceName, + hintText: _subtitle.assetName, + style: Theme.of(context).textTheme.headline6, + textInputAction: TextInputAction.search, + onAction: () { + if (!_formKey.currentState.validate()) { + return; + } + _formKey.currentState.save(); + Navigator.of(context).pop(_search); + }, + onSaved: (value) { + _search.deviceName = value; + }, + ), + SizedBox( + height: 8.0 * AppStyle.getScaleFactor(context), + ), ATextFormField( initialValue: _search.deviceSerialNumber, hintText: _subtitle.serialNumber, diff --git a/lib/views/widgets/visits/visit_item.dart b/lib/views/widgets/visits/visit_item.dart index e6ca6676..31d0e9d0 100644 --- a/lib/views/widgets/visits/visit_item.dart +++ b/lib/views/widgets/visits/visit_item.dart @@ -82,6 +82,16 @@ class VisitItem extends StatelessWidget { Divider( color: onItemColor, ), + Text( + visit.deviceNumber ?? "", + style: Theme.of(context).textTheme.subtitle1.copyWith( + color: onItemColor, + fontSize: 14, + ), + ), + Divider( + color: onItemColor, + ), Row( children: [ Expanded(