diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart index d4cb25fb..2519da64 100644 --- a/lib/controllers/providers/api/all_requests_provider.dart +++ b/lib/controllers/providers/api/all_requests_provider.dart @@ -33,14 +33,14 @@ class AllRequestsProvider extends ChangeNotifier { getCloseRequests(); } - Future getAllRequests() async { + Future getAllRequests({int typeTransaction}) async { if (isAllLoading == true) return -2; isAllLoading = true; if (allRequestsAndCount == null) notifyListeners(); Response response; try { Map body = { - "typeTransaction": [1, 2, 3, 4], + "typeTransaction": typeTransaction == null ? [1, 2, 3, 4] : [typeTransaction], "statusTransaction": [1, 2, 3], "priority": [0, 1], "displayData": [] diff --git a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart index ce87feef..b1984440 100644 --- a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart @@ -44,7 +44,7 @@ class _WeeklyFragmentState extends State { @override Widget build(BuildContext context) { return SingleChildScrollView( - padding: const EdgeInsets.only(left: 16,right: 16), + padding: const EdgeInsets.only(left: 16, right: 16), child: Consumer(builder: (context, snapshot, _) { return Column( mainAxisSize: MainAxisSize.min, @@ -108,11 +108,11 @@ class _WeeklyFragmentState extends State { return isServiceRequest ? ServiceRequestItemView(list[index], showShadow: false) : isGasRefill - ? GasRefillItemView(list[index]) + ? GasRefillItemView(list[index], showShadow: false) : isPPMs - ? PpmItemView(list[index]) + ? PpmItemView(list[index], showShadow: false) : isAssetTransfer - ? AssetItemView(list[index]) + ? AssetItemView(list[index], showShadow: false) : Container( height: 100, width: double.infinity, diff --git a/lib/new_views/pages/land_page/land_page.dart b/lib/new_views/pages/land_page/land_page.dart index c61ded35..9ef56893 100644 --- a/lib/new_views/pages/land_page/land_page.dart +++ b/lib/new_views/pages/land_page/land_page.dart @@ -50,8 +50,8 @@ class _LandPageState extends State { DashboardPage(onDrawerPress: (() { _scaffoldKey.currentState.isDrawerOpen ? _scaffoldKey.currentState.closeDrawer() : _scaffoldKey.currentState.openDrawer(); })), - // old_page.LandPage(), - MyRequestsPage(), + old_page.LandPage(), + // MyRequestsPage(), SingleDevicePicker(), if (_userProvider.user.type == UsersTypes.engineer) CalendarPage(), MyRequestsPage(), diff --git a/lib/new_views/pages/land_page/requests/asset_item_view.dart b/lib/new_views/pages/land_page/requests/asset_item_view.dart index 2e44f0d6..153c7b33 100644 --- a/lib/new_views/pages/land_page/requests/asset_item_view.dart +++ b/lib/new_views/pages/land_page/requests/asset_item_view.dart @@ -14,7 +14,7 @@ class AssetItemView extends StatelessWidget { final RequestsDetails request; final bool showShadow; - const AssetItemView(this.request, {Key key, this.showShadow = false}) : super(key: key); + const AssetItemView(this.request, {Key key, this.showShadow = true}) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart b/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart index f34098db..027750dd 100644 --- a/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart +++ b/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart @@ -13,7 +13,7 @@ class GasRefillItemView extends StatelessWidget { final RequestsDetails request; final bool showShadow; - const GasRefillItemView(this.request, {Key key, this.showShadow = false}) : super(key: key); + const GasRefillItemView(this.request, {Key key, this.showShadow = true}) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/new_views/pages/land_page/requests/ppm_item_view.dart b/lib/new_views/pages/land_page/requests/ppm_item_view.dart index d5506dd5..bd069843 100644 --- a/lib/new_views/pages/land_page/requests/ppm_item_view.dart +++ b/lib/new_views/pages/land_page/requests/ppm_item_view.dart @@ -16,7 +16,7 @@ class PpmItemView extends StatelessWidget { final RequestsDetails request; final bool showShadow; - const PpmItemView(this.request, {Key key, this.showShadow = false}) : super(key: key); + const PpmItemView(this.request, {Key key, this.showShadow = true}) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/new_views/pages/land_page/requests/service_request_item_view.dart b/lib/new_views/pages/land_page/requests/service_request_item_view.dart index 7a2f0793..84444c5e 100644 --- a/lib/new_views/pages/land_page/requests/service_request_item_view.dart +++ b/lib/new_views/pages/land_page/requests/service_request_item_view.dart @@ -12,7 +12,7 @@ class ServiceRequestItemView extends StatelessWidget { final RequestsDetails request; final bool showShadow; - const ServiceRequestItemView(this.request, {Key key, this.showShadow = false}) : super(key: key); + const ServiceRequestItemView(this.request, {Key key, this.showShadow = true}) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/single_device_picker.dart index bef01473..489b12cc 100644 --- a/lib/views/widgets/equipment/single_device_picker.dart +++ b/lib/views/widgets/equipment/single_device_picker.dart @@ -161,35 +161,38 @@ class _SingleDevicePickerState extends State { await _devicesProvider.getDevicesList( user: _userProvider.user, host: _settingProvider.host, hospitalId: _userProvider.user.clientId, serialNumber: snController.text, number: numberController.text); }, - child: showListView - ? ListView.separated( - padding: const EdgeInsets.all(16), - itemCount: _searchableList.length, - separatorBuilder: (listContext, itemIndex) => 8.height, - itemBuilder: (listContext, itemIndex) { - return AssetItemListView( - device: _searchableList[itemIndex], - onPressed: (device) { - Navigator.of(context).pop(device); - }, - ); - }, - ) - : GridView.builder( - gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 191 / 261, crossAxisSpacing: 16, mainAxisSpacing: 16), - itemCount: _searchableList.length, - padding: const EdgeInsets.all(16), - itemBuilder: (context, index) { - return AssetItemGridView( - device: _searchableList[index], - onPressed: (device) { - Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id); - return; - Navigator.of(context).pop(device); - }, - ); - }, - ), + child: AnimatedSwitcher( + duration: const Duration(milliseconds: 500), + child: showListView + ? ListView.separated( + padding: const EdgeInsets.all(16), + itemCount: _searchableList.length, + separatorBuilder: (listContext, itemIndex) => 8.height, + itemBuilder: (listContext, itemIndex) { + return AssetItemListView( + device: _searchableList[itemIndex], + onPressed: (device) { + Navigator.of(context).pop(device); + }, + ); + }, + ) + : GridView.builder( + gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 191 / 261, crossAxisSpacing: 16, mainAxisSpacing: 16), + itemCount: _searchableList.length, + padding: const EdgeInsets.all(16), + itemBuilder: (context, index) { + return AssetItemGridView( + device: _searchableList[index], + onPressed: (device) { + Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id); + return; + Navigator.of(context).pop(device); + }, + ); + }, + ), + ), )), ], ), diff --git a/lib/views/widgets/requests/service_request_item.dart b/lib/views/widgets/requests/service_request_item.dart index ae4fe61e..ac1f26a2 100644 --- a/lib/views/widgets/requests/service_request_item.dart +++ b/lib/views/widgets/requests/service_request_item.dart @@ -88,7 +88,7 @@ class ServiceRequestItem extends StatelessWidget { ], ), ], - ).paddingAll(16).onPress(() { + ).onPress(() { onPressed(request); }).toShadowContainer(context), ],