diff --git a/android/app/build.gradle b/android/app/build.gradle index 11d962c1..5529b7b7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -49,8 +49,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. minSdkVersion 21 targetSdkVersion 33 - versionCode 4 - versionName '1.0.4' + versionCode 5 + versionName '1.0.5' } signingConfigs { diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index 18076255..92ca681d 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -6,7 +6,7 @@ class URLs { //static const host1 = "https://atomsuat.hmg.com"; // old uat url static const host1 = "https://atomsm.hmg.com"; // production url - /// static const host1 = "https://atomsmdev.hmg.com"; // local UAT url + // static const host1 = "https://atomsmdev.hmg.com"; // local UAT url // static const host1 = "http://109.123.243.118:9000"; @@ -21,7 +21,8 @@ class URLs { // static String getFileUrl(String file) => (file == null || file.isEmpty) ? null :1 (file.contains("/") ? file : "$_host/attachment/$file"); // API Routes - static get login => "$_baseUrl/MobileAuth/LoginIntegration"; // post + // static get login => "$_baseUrl/MobileAuth/Login"; // web login + static get login => "$_baseUrl/MobileAuth/LoginIntegration"; // mobile login static get register => "$_baseUrl/handle/create/user"; // post static get updateProfile => "$_baseUrl/update/user/profile"; // post static get getHospitals => "$_baseUrl/Customer/GetCustomers"; // get diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart index 922242a9..47d56f0f 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart @@ -19,18 +19,24 @@ class ServiceReportAssistantsEmployeeProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; + set setStateCode(int statusCode) => _stateCode = statusCode; + // contain user data // when user not login or register _user = null List _assistantEmployees; + List get assistantEmployees => _assistantEmployees; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); @@ -41,14 +47,14 @@ class ServiceReportAssistantsEmployeeProvider 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 getAssistantEmployees() async { + Future getAssistantEmployees(num assetId) async { if (_loading == true) return -2; _loading = true; notifyListeners(); Response response; try { response = await ApiManager.instance.get( - "${URLs.getEngineers}", + "${URLs.getEngineers}&assetId=$assetId", ); // response = await get( // Uri.parse( diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart index 6e4df099..2c0af9b4 100644 --- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart @@ -258,7 +258,10 @@ class _CreateSubWorkOrderPageState extends State { useSafeArea: true, isScrollControlled: true, backgroundColor: Colors.transparent, - builder: (context) => WorkOrderDetailsBottomSheet(subWorkOrder: _subWorkOrders), + builder: (context) => WorkOrderDetailsBottomSheet( + subWorkOrder: _subWorkOrders, + assetId: widget.workOrder?.callRequest?.asset?.id, + ), ); //log(_subWorkOrders?.toJson()?.toString()); }, diff --git a/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart b/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart index 5ed1e253..ac993824 100644 --- a/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart +++ b/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart @@ -19,7 +19,9 @@ import 'auto_generated_vendor_name.dart'; class WorkOrderDetailsBottomSheet extends StatefulWidget { final SearchWorkOrder subWorkOrder; - const WorkOrderDetailsBottomSheet({this.subWorkOrder, Key key}) : super(key: key); + final num assetId; + + const WorkOrderDetailsBottomSheet({this.subWorkOrder, this.assetId, Key key}) : super(key: key); @override State createState() => _WorkOrderDetailsBottomSheetState(); @@ -91,6 +93,7 @@ class _WorkOrderDetailsBottomSheetState extends State { height: 4, ), ATextFormField( - initialValue: (model.title ?? "").toString(), + initialValue: (model.title?.trim() ?? "").toString(), textAlign: TextAlign.center, style: Theme.of(context).textTheme.subtitle1, textInputType: TextInputType.text, diff --git a/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart b/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart index 1bf2c491..7e178c6f 100644 --- a/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart +++ b/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart @@ -9,7 +9,10 @@ import '../../../../controllers/providers/api/status_drop_down/report/service_re class ServiceReportAssistantEmployeeMenu extends StatelessWidget { final Function(AssistantEmployees) onSelect; final AssistantEmployees initialValue; - const ServiceReportAssistantEmployeeMenu({Key key, @required this.onSelect, this.initialValue}) : super(key: key); + final num assetId; + + const ServiceReportAssistantEmployeeMenu({Key key, @required this.onSelect, this.initialValue, this.assetId}) : super(key: key); + @override Widget build(BuildContext context) { ServiceReportAssistantsEmployeeProvider menuProvider = Provider.of(context); @@ -18,7 +21,8 @@ class ServiceReportAssistantEmployeeMenu extends StatelessWidget { isFailedLoading: menuProvider.assistantEmployees == null, stateCode: menuProvider.stateCode, onRefresh: () async { - await menuProvider.getAssistantEmployees(); + await menuProvider.getAssistantEmployees(assetId); + // menuProvider.setStateCode = null; }, child: AssistantEmployeeMenu( initialStatus: initialValue, diff --git a/pubspec.yaml b/pubspec.yaml index fbc5da65..e47dba3f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.5+4 +version: 1.0.6+5 environment: sdk: ">=2.7.0 <3.0.0"