From 6258035a88d0a6264c666421be44e66e13a814da Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Wed, 25 Oct 2023 12:33:09 +0300 Subject: [PATCH] add room field to asset transfer --- .../api/asset_transfer_provider.dart | 1 + .../app_floating_action_button.dart | 5 ++-- .../pages/new_service_request_page.dart | 0 .../pages/new_transfer_request_page.dart | 27 ------------------- .../request_device_transfer.dart | 7 +++++ 5 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 lib/new_views/pages/new_service_request_page.dart delete mode 100644 lib/new_views/pages/new_transfer_request_page.dart diff --git a/lib/controllers/providers/api/asset_transfer_provider.dart b/lib/controllers/providers/api/asset_transfer_provider.dart index 11a258c5..bdf388ba 100644 --- a/lib/controllers/providers/api/asset_transfer_provider.dart +++ b/lib/controllers/providers/api/asset_transfer_provider.dart @@ -138,6 +138,7 @@ class AssetTransferProvider extends ChangeNotifier { notifyListeners(); } Fluttertoast.showToast(msg: context.translation.createdSuccessfully); + Navigator.pop(context); } else { Fluttertoast.showToast(msg: "${context.translation.failedToCompleteRequest} :${json.decode(response.body)['message']}"); } diff --git a/lib/new_views/common_widgets/app_floating_action_button.dart b/lib/new_views/common_widgets/app_floating_action_button.dart index aae061fe..1d6a139c 100644 --- a/lib/new_views/common_widgets/app_floating_action_button.dart +++ b/lib/new_views/common_widgets/app_floating_action_button.dart @@ -4,10 +4,9 @@ import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/new_views/pages/new_gas_refill_request_page.dart'; -import 'package:test_sa/new_views/pages/new_transfer_request_page.dart'; +import 'package:test_sa/views/pages/device_transfer/request_device_transfer.dart'; import 'package:test_sa/views/pages/user/requests/create_service_request_page.dart'; -import '../../models/enums/translation_keys.dart'; import '../app_style/app_color.dart'; class AppFloatingActionButton extends StatefulWidget { @@ -53,7 +52,7 @@ class _AppFloatingActionButtonState extends State { children: [ _FloatingButtonListTile(iconName: "gas_refill_request", label: context.translation.gasRefillRequest, routeName: NewGasRefillRequestPage.routeName), const Divider().defaultStyle(context).paddingOnly(start: 16, end: 16), - _FloatingButtonListTile(iconName: "transfer_request", label: context.translation.transferRequest, routeName: NewTransferRequestPage.routeName), + _FloatingButtonListTile(iconName: "transfer_request", label: context.translation.transferRequest, routeName: RequestDeviceTransfer.id), const Divider().defaultStyle(context).paddingOnly(start: 16, end: 16), _FloatingButtonListTile(iconName: "service_request", label: context.translation.serviceRequest, routeName: CreateServiceRequestPage.id), ], diff --git a/lib/new_views/pages/new_service_request_page.dart b/lib/new_views/pages/new_service_request_page.dart deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/new_views/pages/new_transfer_request_page.dart b/lib/new_views/pages/new_transfer_request_page.dart deleted file mode 100644 index 48ff0d96..00000000 --- a/lib/new_views/pages/new_transfer_request_page.dart +++ /dev/null @@ -1,27 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:test_sa/extensions/context_extension.dart'; -import 'package:test_sa/extensions/widget_extensions.dart'; -import 'package:test_sa/models/enums/translation_keys.dart'; - -import '../common_widgets/app_filled_button.dart'; -import '../common_widgets/default_app_bar.dart'; - -class NewTransferRequestPage extends StatelessWidget { - static const String routeName = "/new_transfer_request_page"; - const NewTransferRequestPage({Key key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: DefaultAppBar(title: context.translation.newTransferRequest), - body: Column( - children: [ - SingleChildScrollView( - child: Column(children: []), - ).expanded, - AppFilledButton(label: context.translation.submitRequest, maxWidth: true, onPressed: () {}) - ], - ).paddingOnly(start: 16, end: 16, bottom: 24), - ); - } -} diff --git a/lib/views/pages/device_transfer/request_device_transfer.dart b/lib/views/pages/device_transfer/request_device_transfer.dart index e609381e..15e7b652 100644 --- a/lib/views/pages/device_transfer/request_device_transfer.dart +++ b/lib/views/pages/device_transfer/request_device_transfer.dart @@ -158,6 +158,13 @@ class _RequestDeviceTransferState extends State { _assetDestination?.department = value; }, ), + 8.height, + AppTextFormField( + labelText: context.translation.room, + onSaved: (text) { + _transferModel.destRoom = text; + }, + ), 16.height, context.translation.comments.heading5(context), 8.height,