From 8a9eabac2fccc2ce04481928d8f7c54f80ec4b2b Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 Date: Sun, 3 Nov 2024 16:04:01 +0300 Subject: [PATCH] improvements --- .../land_page/requests/gas_refill_item_view.dart | 2 +- .../pages/land_page/requests/ppm_item_view.dart | 3 ++- .../widgets/pentry/pentry_ppm_check_list_form.dart | 12 +++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) 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 79eb45ec..a817e22f 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 @@ -141,6 +141,6 @@ class GasRefillItemView extends StatelessWidget { }); } - return SizedBox(); + return const SizedBox(); } } 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 9875c564..61321283 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 @@ -20,6 +20,7 @@ class PpmItemView extends StatelessWidget { @override Widget build(BuildContext context) { +print(' type is ${requestData?.nameOfType}'); if (requestData != null) { return Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -47,7 +48,7 @@ class PpmItemView extends StatelessWidget { ], ), 8.height, - (requestData?.typeTransaction ?? context.translation.ppmRequest).heading5(context), + (requestData?.nameOfType ?? context.translation.ppmRequest).heading5(context), 8.height, '${context.translation.assetNumber}: ${requestData!.assetNumber}'.bodyText(context), // '${context.translation.assetSN}: ${request.assetSN}'.bodyText(context),//todo ask ahmed diff --git a/lib/views/widgets/pentry/pentry_ppm_check_list_form.dart b/lib/views/widgets/pentry/pentry_ppm_check_list_form.dart index 98790111..000b74a6 100644 --- a/lib/views/widgets/pentry/pentry_ppm_check_list_form.dart +++ b/lib/views/widgets/pentry/pentry_ppm_check_list_form.dart @@ -11,6 +11,7 @@ import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart'; import 'package:test_sa/new_views/common_widgets/single_item_drop_down_menu.dart'; import 'package:test_sa/providers/ppm_checklist_status_provider.dart'; +import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; class PentryPMChecklistForm extends StatefulWidget { final List? models; @@ -29,18 +30,19 @@ class _PentryPMChecklistFormState extends State { Widget build(BuildContext context) { SettingProvider settingProvider = Provider.of(context,listen:false); print('value of asset group is ${settingProvider.assetGroup?.toJson()}'); - List? list = widget.models?.where((element) => element.task != null).toList(); - return (list?.isEmpty ?? true) - ? context.translation.noDataFound.heading5(context).center + // List? list = widget.models?.where((element) => element.task != null).toList(); + List? list = widget.models??[]; + return (list.isEmpty) + ? const NoDataFound().center : ListView.builder( padding: EdgeInsets.only(top: 16.toScreenHeight), - itemCount: list?.length ?? 0, + itemCount: list.length , shrinkWrap: true, itemBuilder: (context, index) { return Card( child: ExpansionTile( shape: const Border(), - title: (list![index].instructionTextId == null ? (list[index].task ?? "") : (list[index].text ?? "")).heading5(context), + title: (list[index].instructionTextId == null ? (list[index].task ?? "") : (list[index].text ?? "")).heading5(context), onExpansionChanged: (value) { if (!value) { showLabel.remove(index);