From 534aab3ceb673f2edf697d59fca900cab5428d4f Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 8 May 2023 15:24:22 +0300 Subject: [PATCH] latest code merge changes --- lib/models/lookup.dart | 67 + lib/views/pages/user/land_page.dart | 3 +- .../auto_complete_devices_field.dart | 1 + .../widgets/equipment/device_button.dart | 5 +- .../parts/auto_complete_parts_field.dart | 1 - .../service_request_update_dialog.dart | 56 +- lib/views/widgets/visits/visit_item.dart | 28 +- pubspec.lock | 1167 ----------------- 8 files changed, 113 insertions(+), 1215 deletions(-) delete mode 100644 pubspec.lock diff --git a/lib/models/lookup.dart b/lib/models/lookup.dart index e69de29b..c523c489 100644 --- a/lib/models/lookup.dart +++ b/lib/models/lookup.dart @@ -0,0 +1,67 @@ +class Lookup{ + + //old name label + final String name; + // old name key + final int value; + final int id; + + const Lookup({ + this.name, + this.value, + this.id, + }); + + @override + bool operator == (Object other) => + identical(this, other) || other is Lookup && + ((value != null && value == other.value) + || ( id != null && id == other.id )) ; + + + @override + int get hashCode => id?.hashCode ?? value?.hashCode; + + toMap(){ + return { + "id": id, + "name": name, + "value": value + }; + } + + factory Lookup.fromStatus(Lookup old){ + if(old == null) return null; + return Lookup( + name: old.name, + id: old.id, + value: old.value, + ); + } + + factory Lookup.fromJson(Map parsedJson){ + if(parsedJson == null) return null; + return Lookup( + name: parsedJson["name"], + id: parsedJson["id"], + value: parsedJson["value"], + ); + } + +// factory Lookup.fromJson(Map parsedJson){ +// if(parsedJson["id"] == null && parsedJson["uid"] == null) return null; +// return Lookup( +// name: parsedJson["value"], +// id: parsedJson["id"] is int +// ? parsedJson["id"] +// : int.tryParse(parsedJson["id"] ?? parsedJson["uid"]), +// ); +// } + +// factory Lookup.fromIntIdJson(Map parsedJson){ +// return Lookup( +// name: parsedJson["value"], +// id: parsedJson["id"], +// ); +// } +} \ No newline at end of file diff --git a/lib/views/pages/user/land_page.dart b/lib/views/pages/user/land_page.dart index eb4a57e6..190b365c 100644 --- a/lib/views/pages/user/land_page.dart +++ b/lib/views/pages/user/land_page.dart @@ -26,6 +26,7 @@ import 'package:test_sa/views/pages/device_transfer/request_device_transfer.dart import 'package:test_sa/views/pages/device_transfer/track_device_transfer.dart'; import 'package:test_sa/views/pages/user/gas_refill/request_gas_refill.dart'; import 'package:test_sa/views/pages/user/gas_refill/track_gas_refill.dart'; +import 'package:test_sa/views/pages/user/notifications/notifications_page.dart'; import 'package:test_sa/views/pages/user/requests/create_request.dart'; import 'package:test_sa/views/pages/user/visits/regular_visits_page.dart'; import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; @@ -284,7 +285,7 @@ class _LandPageState extends State { ), 12.width, Text( - _userProvider.user.userName, + _userProvider.user?.userName ?? "??", style: Theme.of(context).textTheme.headline6.copyWith( fontWeight: FontWeight.w600, ), diff --git a/lib/views/widgets/equipment/auto_complete_devices_field.dart b/lib/views/widgets/equipment/auto_complete_devices_field.dart index 85abcaec..3c6fbc99 100644 --- a/lib/views/widgets/equipment/auto_complete_devices_field.dart +++ b/lib/views/widgets/equipment/auto_complete_devices_field.dart @@ -7,6 +7,7 @@ import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/models/device/device.dart'; 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'; class AutoCompleteDeviceField extends StatefulWidget { final Device initialValue; final int hospitalId; diff --git a/lib/views/widgets/equipment/device_button.dart b/lib/views/widgets/equipment/device_button.dart index 0177179e..824547d2 100644 --- a/lib/views/widgets/equipment/device_button.dart +++ b/lib/views/widgets/equipment/device_button.dart @@ -6,6 +6,7 @@ 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 'package:test_sa/views/widgets/equipment/single_device_picker.dart'; + class DeviceButton extends StatelessWidget { final Function(Device) onDevicePick; final Device device; @@ -59,14 +60,14 @@ class DeviceButton extends StatelessWidget { color: Theme.of(context).textTheme.subtitle1.color, ), Text( - "${_subtitle.brand} : " + device.brand, + "${_subtitle.brand} : ${device.modelDefinition.manufacturerName}", style: Theme.of(context).textTheme.subtitle2, ), Divider( color: Theme.of(context).textTheme.subtitle1.color, ), Text( - "${_subtitle.model} : " + device.model, + "${_subtitle.model} : ${device.modelDefinition.modelName}", style: Theme.of(context).textTheme.subtitle2, ), ], diff --git a/lib/views/widgets/parts/auto_complete_parts_field.dart b/lib/views/widgets/parts/auto_complete_parts_field.dart index 2f4582f6..893d2f91 100644 --- a/lib/views/widgets/parts/auto_complete_parts_field.dart +++ b/lib/views/widgets/parts/auto_complete_parts_field.dart @@ -12,7 +12,6 @@ class AutoCompletePartsField extends StatefulWidget { final String initialValue; final bool clearAfterPick; final Function(Part) onPick; - final bool clearAfterPick; const AutoCompletePartsField({Key key, this.initialValue, this.onPick, this.clearAfterPick = true}) : super(key: key); diff --git a/lib/views/widgets/requests/service_request_update_dialog.dart b/lib/views/widgets/requests/service_request_update_dialog.dart index 6b5ce0d8..e2680384 100644 --- a/lib/views/widgets/requests/service_request_update_dialog.dart +++ b/lib/views/widgets/requests/service_request_update_dialog.dart @@ -14,24 +14,20 @@ 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/date_and_time/date_picker.dart'; import 'package:test_sa/views/widgets/status/employee/assigned_to_mune.dart'; -import 'package:test_sa/views/widgets/hospitals/hospital_auto_complete_field.dart'; -import 'package:flutter/material.dart'; -import 'package:test_sa/views/widgets/status/employee/employee_mune.dart'; - -import '../app_text_form_field.dart'; class ServiceRequestsUpdateDialog extends StatefulWidget { final ServiceRequest request; + const ServiceRequestsUpdateDialog({ - Key key, this.request, + Key key, + this.request, }) : super(key: key); + @override State createState() => _ServiceRequestsUpdateDialogState(); } -class _ServiceRequestsUpdateDialogState extends State - with TickerProviderStateMixin{ - +class _ServiceRequestsUpdateDialogState extends State with TickerProviderStateMixin { DateTime _dateTime; Lookup _employee; Subtitle _subtitle; @@ -42,7 +38,7 @@ class _ServiceRequestsUpdateDialogState extends State _formKey = GlobalKey(); _update() async { - if(_dateTime == null && _employee == null){ + if (_dateTime == null && _employee == null) { Fluttertoast.showToast( msg: _subtitle.noDateFound, ); @@ -59,13 +55,8 @@ class _ServiceRequestsUpdateDialogState extends State(context,listen: false); - _settingProvider = Provider.of(context,listen: false); - _serviceRequestsProvider = Provider.of(context,listen: false); - return Column( + _subtitle = AppLocalization.of(context).subtitle; + _userProvider = Provider.of(context, listen: false); + _settingProvider = Provider.of(context, listen: false); + _serviceRequestsProvider = Provider.of(context, listen: false); + return Column( mainAxisSize: MainAxisSize.min, children: [ SizedBox( - // height: MediaQuery.of(context).size.height / 1.2, + // height: MediaQuery.of(context).size.height / 1.2, child: Form( key: _formKey, child: Padding( @@ -99,18 +90,19 @@ class _ServiceRequestsUpdateDialogState extends State=2.18.0 <3.0.0" - flutter: ">=3.3.0"