Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new

# Conflicts:
#	lib/models/visits/visits_search.dart
#	lib/views/pages/device_transfer/device_transfer_details.dart
#	lib/views/pages/user/visits/visit_details.dart
#	lib/views/widgets/search/service_request_search_bar.dart
#	lib/views/widgets/search/visits_search_bar.dart

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",

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;
@@ -25,6 +27,8 @@ class VisitsSearch {
     this.contactStatus,
     this.expectedDateFrom,
     this.expectedDateTo,
+    this.deviceNumber,
+    this.deviceName
     this.mostRecent,
   });
 
@@ -40,6 +44,8 @@ class VisitsSearch {
     expectedDateTo = newSearch.expectedDateTo;
     statusValue = newSearch.statusValue;
     mostRecent = newSearch.mostRecent;
+    deviceNumber=newSearch.deviceNumber;
+    deviceName=newSearch.deviceName;
   }
 
   Map<String, dynamic> toMap() {

lib/views/pages/device_transfer/device_transfer_details.dart

@@ -5,6 +5,7 @@ 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';
@@ -32,8 +33,6 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
   bool _isSender = false;
   bool _isReceiver = false;
   UserProvider _userProvider;
-  SettingProvider _settingProvider;
-  DeviceTransferProvider _deviceTransferProvider;
   bool _isLoading = false;
   Subtitle _subtitle;
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
@@ -46,9 +45,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
   }
 
   Future<void> _getDeviceTransfer() async {
-    print("====== object");
     _model = await Provider.of<DeviceTransferProvider>(context).getRequestById(assetTransferId: widget.model.id);
-    print("====== object2");
   }
 
   @override
@@ -57,12 +54,14 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
       key: _scaffoldKey,
       body: SafeArea(
         child: FutureBuilder(
-            future: _getDeviceTransfer(),
+        future: _getDeviceTransfer(),
             builder: (context, snapshot) {
               if (snapshot.connectionState == ConnectionState.waiting) {
                 return const ALoading();
               } else {
-                _subtitle = AppLocalization.of(context).subtitle;
+                _subtitle = AppLocalization
+                    .of(context)
+                    .subtitle;
                 _userProvider = Provider.of<UserProvider>(context);
                 _settingProvider = Provider.of<SettingProvider>(context);
                 _deviceTransferProvider = Provider.of<DeviceTransferProvider>(context);
@@ -78,7 +77,10 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                     child: Column(
                       children: [
                         Container(
-                          color: Theme.of(context).colorScheme.primary,
+                          color: Theme
+                              .of(context)
+                              .colorScheme
+                              .primary,
                           padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 4),
                           child: Row(
                             children: [
@@ -87,7 +89,11 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                                 child: Center(
                                   child: Text(
                                     _subtitle.details,
-                                    style: Theme.of(context).textTheme.headline6.copyWith(color: AColors.white, fontStyle: FontStyle.italic),
+                                    style: Theme
+                                        .of(context)
+                                        .textTheme
+                                        .headline6
+                                        .copyWith(color: AColors.white, fontStyle: FontStyle.italic),
                                   ),
                                 ),
                               ),
@@ -145,19 +151,23 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                                 Row(
                                   children: [
                                     Expanded(
-                                      child: Text("Sender", style: Theme.of(context).textTheme.headline6),
+                                      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(
+                                          Navigator.of(context).push(MaterialPageRoute(
-                                                    builder: (_) => UpdateDeviceTransfer(
+                                              builder: (_) =>
-                                                          model: _model,
+                                                  UpdateDeviceTransfer(
-                                                          isSender: true,
+                                                    model: _model,
-                                                        )));
+                                                    isSender: true,
-                                              }
+                                                  )));
+                                        }
                                             : null,
                                       ),
                                   ],
@@ -165,33 +175,38 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                                 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),
+                                      child: Text("Receiver", style: Theme
+                                          .of(context)
+                                          .textTheme
+                                          .headline6),
                                     ),
                                     if (_userProvider.user?.type == UsersTypes.engineer)
                                       ASmallButton(
                                         text: _subtitle.edit,
                                         onPressed: (_isReceiver || false)
-                                            ? () async {
+                                            ? () {
-                                                Navigator.of(context).push(
+                                          Navigator.of(context).push(MaterialPageRoute(
-                                                  MaterialPageRoute(
+                                              builder: (_) =>
-                                                    builder: (_) => UpdateDeviceTransfer(
+                                                  UpdateDeviceTransfer(
-                                                      model: _model,
+                                                    model: _model,
-                                                      isSender: false,
+                                                    isSender: false,
-                                                    ),
+                                                  )));
-                                                  ),
+                                        }
-                                                );
-                                              }
                                             : null,
                                       ),
                                   ],
                                 ),
                                 const SizedBox(height: 12),
-                                DeviceTransferInfoSection(info: _model.receiver),
+                                DeviceTransferInfoSection(
+                                  info: _model.receiver,
+                                  isSender: false,
+                                ),
                               ],
                             ),
                           ),
@@ -201,8 +216,9 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                   ),
                 );
               }
-            }),
+            }
-      ),
+        )
+      )
     );
   }
 }

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(

lib/views/pages/user/visits/visit_details.dart

@@ -73,21 +73,22 @@ class VisitDetailsPage extends StatelessWidget {
                   ),
                   MaterialButton(
                     padding: EdgeInsets.zero,
-                    onPressed: visit.images.isEmpty || (visit.images?.first?.isEmpty ?? false)
+                    onPressed:() {
-                        ? () {}
+                      if(visit.images.isEmpty || (visit.images?.first?.isEmpty ?? false)) {
-                        : () {
+                        Navigator.of(context).push(MaterialPageRoute(
-                            Navigator.of(context).push(MaterialPageRoute(
+                            builder: (_) =>
-                                builder: (_) => Scaffold(
+                                Scaffold(
-                                      body: InteractiveViewer(
+                                  body: InteractiveViewer(
-                                        child: Center(
+                                    child: Center(
-                                          child: ImageLoader(
+                                      child: ImageLoader(
-                                            url: visit.images.first,
+                                        url: visit.images.first,
-                                            boxFit: BoxFit.contain,
+                                        boxFit: BoxFit.contain,
-                                          ),
-                                        ),
                                       ),
-                                    )));
+                                    ),
-                          },
+                                  ),
+                                )));
+                      }
+                    },
                     child: SizedBox(
                       height: 140 * AppStyle.getScaleFactor(context),
                       width: MediaQuery.of(context).size.width,
@@ -117,6 +118,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,
@@ -158,10 +163,6 @@ class VisitDetailsPage extends StatelessWidget {
                     title: _subtitle.hospital,
                     content: visit.hospitalName,
                   ),
-                  RequestInfoRow(
-                    title: _subtitle.deviceName,
-                    content: visit.deviceEnglishName,
-                  ),
                 ],
               ),
             ),

lib/views/widgets/device_trancfer/device_transfer_info_section.dart

@@ -11,8 +11,9 @@ import '../../../controllers/providers/api/user_provider.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) {
@@ -30,7 +31,7 @@ class DeviceTransferInfoSection extends StatelessWidget {
           info: info.department.name,
         ),
         RequestInfoRow(
-          title: subtitle.engineerName,
+          title: isSender? "Sender Name " : "Receiver Name",
           info: info.userName,
         ),
         RequestInfoRow(
@@ -46,7 +47,7 @@ class DeviceTransferInfoSection extends StatelessWidget {
           info: info.comment,
         ),
         RequestInfoRow(
-          title: "Assigned FE",
+          title: "Assigned Engineer",
           info: info.assignedEmployeeName,
         ),
         RequestInfoRow(

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(

lib/views/widgets/search/service_request_search_bar.dart

@@ -1,3 +1,4 @@
+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';
@@ -69,7 +70,7 @@ class _ServiceRequestsSearchDialogState extends State<ServiceRequestsSearchDialo
         child: Padding(
           padding: const EdgeInsets.all(16.0),
           child: SingleChildScrollView(
-            child: Column(
+            child:Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Row(
@@ -116,6 +117,25 @@ class _ServiceRequestsSearchDialogState extends State<ServiceRequestsSearchDialo
                 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.deviceSerialNumber,
                   hintText: _subtitle.serialNumber,
@@ -187,7 +207,9 @@ class _ServiceRequestsSearchDialogState extends State<ServiceRequestsSearchDialo
                   height: 16 * AppStyle.getScaleFactor(context),
                 ),
                 const ASubTitle("Status"),
-                const SizedBox(height: 4),
+                const SizedBox(
+                  height: 4,
+                ),
                 ServiceRequestStatusMenu(
                   initialValue: _search.statusValue,
                   onSelect: (status) {

lib/views/widgets/search/visits_search_bar.dart

@@ -97,6 +97,47 @@ class _VisitsSearchDialogState extends State<VisitsSearchDialog> with TickerProv
                 setState(() {});
               },
             ),
+            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,

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(