Merge branch 'zaid-development' into 'master'

Fixing New Service Screen

See merge request haroon6138/cloudsolutions-atoms!6

lib/controllers/providers/api/devices_provider.dart

@@ -42,10 +42,7 @@ class DevicesProvider 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<int> getEquipment(
-      {required String host,
-      required User user,
-      required String hospitalId}) async {
+  Future<int> getEquipment({required String host, required User user, required String hospitalId}) async {
     if (_loading == true) {
       return -2;
     }
@@ -67,8 +64,7 @@ class DevicesProvider extends ChangeNotifier {
     if (response.statusCode >= 200 && response.statusCode < 300) {
       // client's request was successfully received
       List equipmentListJson = json.decode(utf8.decode(response.bodyBytes));
-      _devices =
-          equipmentListJson.map((device) => Device.fromJson(device)).toList();
+      _devices = equipmentListJson.map((device) => Device.fromJson(device)).toList();
     }
     _loading = false;
     notifyListeners();
@@ -98,9 +94,7 @@ class DevicesProvider extends ChangeNotifier {
       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();
+        page = categoriesListJson.map((device) => Device.fromJson(device)).toList();
       }
       return page;
     } catch (error) {
@@ -122,8 +116,7 @@ class DevicesProvider extends ChangeNotifier {
     Response response;
     try {
       response = await get(
-        Uri.parse(
-            "$host${URLs.getEquipment}?client=$hospitalId${sn.isEmpty ? "" : "&serial_qr=$sn"}"),
+        Uri.parse("$host${URLs.getEquipment}?client=$hospitalId${sn.isEmpty ? "" : "&serial_qr=$sn"}"),
       );
 
       _stateCode = response.statusCode;
@@ -131,9 +124,7 @@ class DevicesProvider extends ChangeNotifier {
       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();
+        page = categoriesListJson.map((device) => Device.fromJson(device)).toList();
       }
       return page;
     } catch (error) {

lib/views/widgets/departments/department_button.dart

@@ -8,18 +8,18 @@ import '../../app_style/sizing.dart';
 import 'single_department_picker.dart';
 
 class DepartmentButton extends StatelessWidget {
-  final Function(Department)? onDepartmentPick;
+  final Function(Department) onDepartmentPick;
   final Department? department;
 
-  const DepartmentButton({Key? key, this.department, this.onDepartmentPick}) : super(key: key);
+  const DepartmentButton({Key? key, this.department, required this.onDepartmentPick}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    Subtitle? _subtitle = AppLocalization.of(context)?.subtitle;
+    Subtitle? subtitle = AppLocalization.of(context)?.subtitle;
     return ElevatedButton(
         style: ElevatedButton.styleFrom(
           elevation: 0,
-          padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
           shape: RoundedRectangleBorder(
             borderRadius: BorderRadius.circular(AppStyle.borderRadius * AppStyle.getScaleFactor(context)),
           ),
@@ -32,7 +32,7 @@ class DepartmentButton extends StatelessWidget {
               child: Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 8),
                 child: Text(
-                  department?.name ?? _subtitle?.pickUnite??"",
+                  department?.name ?? subtitle?.pickUnite ?? "",
                   style: Theme.of(context).textTheme.bodyText1,
                   textScaleFactor: AppStyle.getScaleFactor(context),
                   textDirection: TextDirection.rtl,
@@ -44,8 +44,8 @@ class DepartmentButton extends StatelessWidget {
           ],
         ),
         onPressed: () async {
-          Department _department = await Navigator.of(context).pushNamed(SingleDepartmentPicker.id) as Department;
-          onDepartmentPick!(_department);
+          Department department = await Navigator.of(context).pushNamed(SingleDepartmentPicker.id) as Department;
+          onDepartmentPick(department);
         });
   }
 }

lib/views/widgets/equipment/device_button.dart

@@ -8,11 +8,10 @@ import '../../app_style/sizing.dart';
 import 'single_device_picker.dart';
 
 class DeviceButton extends StatelessWidget {
-  final Function(Device)? onDevicePick;
+  final Function(Device?) onDevicePick;
   final Device? device;
 
-  const DeviceButton({Key? key, required this.device, this.onDevicePick})
-      : super(key: key);
+  const DeviceButton({Key? key, required this.device, required this.onDevicePick}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -20,11 +19,9 @@ class DeviceButton extends StatelessWidget {
     return ElevatedButton(
         style: ElevatedButton.styleFrom(
           elevation: 0,
-          padding: EdgeInsets.symmetric(
-              horizontal: 16, vertical: device == null ? 12 : 8),
+          padding: EdgeInsets.symmetric(horizontal: 16, vertical: device == null ? 12 : 8),
           shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(
-                AppStyle.borderRadius * AppStyle.getScaleFactor(context)),
+            borderRadius: BorderRadius.circular(AppStyle.borderRadius * AppStyle.getScaleFactor(context)),
           ),
           foregroundColor: AColors.primaryColor,
           backgroundColor: AColors.inputFieldBackgroundColor,
@@ -71,14 +68,12 @@ class DeviceButton extends StatelessWidget {
                       ],
                     ),
                   )),
-            const Icon(Icons.keyboard_arrow_down,
-                size: 28, color: AColors.grey3A),
+            const Icon(Icons.keyboard_arrow_down, size: 28, color: AColors.grey3A),
           ],
         ),
         onPressed: () async {
-          Device _device = await Navigator.of(context)
-              .pushNamed(SingleDevicePicker.id) as Device;
-          onDevicePick!(_device);
+          Device? device = await Navigator.of(context).pushNamed(SingleDevicePicker.id) as Device?;
+          onDevicePick(device);
         });
   }
 }

lib/views/widgets/equipment/single_device_picker.dart

@@ -14,9 +14,13 @@ import '../loaders/loading_manager.dart';
 import '../loaders/no_item_found.dart';
 import '../qr/scan_qr.dart';
 import 'device_item.dart';
+
 class SingleDevicePicker extends StatefulWidget {
-  static final String id = "/single-device-Picker";
+  static const String id = "/single-device-Picker";
   final bool sandraChoice = true;
+
+  const SingleDevicePicker({super.key});
+
   @override
   _SingleDevicePickerState createState() => _SingleDevicePickerState();
 }
@@ -25,25 +29,20 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
   DevicesProvider? _devicesProvider;
   UserProvider? _userProvider;
   SettingProvider? _settingProvider;
-  List<Device> _searchableList = [];
+  final List<Device> _searchableList = [];
   bool _firstTime = true;
   Subtitle? _subtitle;
 
-  _getDevice(String result) async {
+  _getDevice(String? result) async {
     if (result == null) return;
     showDialog(
         barrierDismissible: false,
         context: context,
         builder: (dialogContext) {
           return const Center(child: CircularProgressIndicator());
-        }
-    );
-    List<Device> devices = await _devicesProvider!.getDevicesListBySN(
-        host: _settingProvider?.host??"",
-        user: _userProvider?.user??User(),
-        hospitalId: _userProvider?.user?.hospital?.id??"",
-        sn: result
-    );
+        });
+    List<Device> devices =
+        await _devicesProvider!.getDevicesListBySN(host: _settingProvider?.host ?? "", user: _userProvider?.user ?? User(), hospitalId: _userProvider?.user?.hospital?.id ?? "", sn: result);
     Navigator.of(context).pop();
     if (devices.isEmpty) {
       Fluttertoast.showToast(msg: _subtitle?.noDeviceFound ?? "");
@@ -68,24 +67,20 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
     _userProvider = Provider.of<UserProvider>(context);
     _settingProvider = Provider.of<SettingProvider>(context);
 
-    if(_firstTime && _devicesProvider?.devices != null){
-      _searchableList.addAll(_devicesProvider?.devices??[]);
-      _firstTime = false;
-    }
     _subtitle = AppLocalization.of(context)?.subtitle;
     return Scaffold(
       resizeToAvoidBottomInset: false,
       body: LoadingManager(
-        isLoading: _devicesProvider?.isLoading??false,
-        stateCode: _devicesProvider?.stateCode??0,
+        isLoading: _devicesProvider?.isLoading,
+        stateCode: _devicesProvider?.stateCode,
         isFailedLoading: _devicesProvider?.devices == null,
         onRefresh: () async {
           _devicesProvider?.reset();
-          await _devicesProvider?.getEquipment(
-              user: _userProvider?.user??User(),
-              host: _settingProvider?.host??"",
-              hospitalId: _userProvider?.user?.hospital?.id??""
-          );
+          await _devicesProvider?.getEquipment(user: _userProvider?.user ?? User(), host: _settingProvider?.host ?? "", hospitalId: _userProvider?.user?.hospital?.id ?? "");
+          if (_firstTime) {
+            _searchableList.addAll(_devicesProvider?.devices ?? []);
+            _firstTime = false;
+          }
         },
         child: Column(
           children: [
@@ -100,26 +95,20 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
                     suffixIcon: const Icon(Icons.search_rounded),
                     onChange: (value) {
                       _searchableList.clear();
-                      _searchableList.addAll(_devicesProvider!.devices!.where(
-                              (element) => element.serialNumber!.toLowerCase().contains(
-                              value.toLowerCase()
-                          )
-                      ).toList());
+                      _searchableList.addAll(_devicesProvider!.devices!.where((element) => element.serialNumber!.toLowerCase().contains(value.toLowerCase())).toList());
                       setState(() {});
                     },
                   ),
-                  const SizedBox(height: 8,),
+                  const SizedBox(
+                    height: 8,
+                  ),
                   ATextFormField(
                     hintText: "Search by Number",
                     style: Theme.of(context).textTheme.subtitle1,
                     suffixIcon: const Icon(Icons.search_rounded),
                     onChange: (value) {
                       _searchableList.clear();
-                      _searchableList.addAll(_devicesProvider!.devices!.where(
-                              (element) => element.number!.toLowerCase().contains(
-                              value.toLowerCase()
-                          )
-                      ).toList());
+                      _searchableList.addAll(_devicesProvider!.devices!.where((element) => element.number!.toLowerCase().contains(value.toLowerCase())).toList());
                       setState(() {});
                     },
                   ),
@@ -127,9 +116,11 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
               ),
             ),
             Expanded(
-              child: _searchableList.isEmpty ?
-              NoItemFound(message: _subtitle?.noDeviceFound??"",):
-              ListView.builder(
+              child: _searchableList.isEmpty
+                  ? NoItemFound(
+                      message: _subtitle?.noDeviceFound ?? "",
+                    )
+                  : ListView.builder(
                       padding: EdgeInsets.zero,
                       shrinkWrap: true,
                       itemCount: _searchableList.length,

lib/views/widgets/loaders/loading_manager.dart

@@ -5,6 +5,7 @@ import '../../../controllers/localization/localization.dart';
 import '../../../models/subtitle.dart';
 import 'app_loading.dart';
 import 'failed_loading.dart';
+
 class LoadingManager extends StatefulWidget {
   final bool? isLoading;
   final bool? isFailedLoading;
@@ -15,7 +16,7 @@ class LoadingManager extends StatefulWidget {
   final Future<void> Function()? onRefresh;
   final Widget? child;
 
-  LoadingManager({
+  const LoadingManager({
     Key? key,
     this.isLoading,
     this.isFailedLoading,
@@ -32,7 +33,6 @@ class LoadingManager extends StatefulWidget {
 }
 
 class _LoadingManagerState extends State<LoadingManager> {
-
   @override
   void initState() {
     if (widget.onRefresh != null && widget.stateCode == null) {
@@ -57,12 +57,11 @@ class _LoadingManagerState extends State<LoadingManager> {
     // if loading of still not start in loading (true or null)
     // return loading widget
     if (widget.isLoading != false || widget.stateCode == null) {
-      placeHolder = ALoading();
+      placeHolder = const ALoading();
     } else if ((widget.isFailedLoading ?? false) && !(widget.isNotPage ?? false)) {
       // if failed return failed widget
       placeHolder = FailedLoading(
-        message: HttpStatusManger.getStatusMessage(
-            status: widget.stateCode, subtitle: subtitle),
+        message: HttpStatusManger.getStatusMessage(status: widget.stateCode, subtitle: subtitle),
         onReload: widget.onRefresh,
       );
     }