From 69c98ca7c8ff4dc44e20aa79eb6a12dc1533191c Mon Sep 17 00:00:00 2001 From: suvaysov Date: Tue, 15 Nov 2022 19:22:49 +0600 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BA=D1=83=D0=BF=D0=BA=D0=B0=20+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/core/redux/actions/sell_actions.dart | 1 - .../view/inventarization_view.dart | 23 ++++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/core/redux/actions/sell_actions.dart b/lib/core/redux/actions/sell_actions.dart index edeb378..e3e317e 100644 --- a/lib/core/redux/actions/sell_actions.dart +++ b/lib/core/redux/actions/sell_actions.dart @@ -185,7 +185,6 @@ Future removeAllSellData(Store store) async { Future loadSellData(Store store) async { try { - log.i('loadSellData'); final int? appCompanyId = store.state.userState!.auth!.companyId; final List> set = await _dbService.queryRowsWithWhere( transactionTableName, diff --git a/lib/views/inventarization/view/inventarization_view.dart b/lib/views/inventarization/view/inventarization_view.dart index 1667333..c825389 100644 --- a/lib/views/inventarization/view/inventarization_view.dart +++ b/lib/views/inventarization/view/inventarization_view.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart'; import 'package:intl/intl.dart'; import 'package:satu/core/models/inventarization/response/inventarization_response.dart'; +import 'package:satu/core/services/dialog_service.dart'; import 'package:satu/core/services/inventarization_service.dart'; import 'package:satu/core/services/navigator_service.dart'; import 'package:satu/core/utils/locator.dart'; @@ -22,14 +23,14 @@ class InventarizationView extends StatefulWidget { } class _InventarizationViewState extends State { - final InventarizationService _service = locator(); final NavigatorService _navigatorService = locator(); + final DialogService _dialogService = locator(); static const _pageSize = 20; final PagingController _pagingController = - PagingController(firstPageKey: 1); + PagingController(firstPageKey: 1); final DateFormat formatterDay = DateFormat('dd.MM.yyyy'); @@ -58,7 +59,7 @@ class _InventarizationViewState extends State { children: [ verticalSpaceSmall, Padding( - padding: const EdgeInsets.only( left: 15.0), + padding: const EdgeInsets.only(left: 15.0), child: SizedBox( width: double.infinity, child: Row( @@ -99,12 +100,18 @@ class _InventarizationViewState extends State { ); }, pagingController: _pagingController, - builderDelegate: PagedChildBuilderDelegate( - itemBuilder: (BuildContext context, InventarizationResponse item, - int index) { + builderDelegate: + PagedChildBuilderDelegate( + itemBuilder: (BuildContext context, + InventarizationResponse item, int index) { return DictionaryTile( key: Key('category_${item.id}'), onPress: () async { + if (item.act != null) { + return _dialogService.showDialog( + description: + 'В обработанный акт нельзя добавить товары'); + } final dynamic result = await _navigatorService .push(inventarizationEditRoute, arguments: item); if (result != null && true == (result as bool)) { @@ -144,8 +151,8 @@ class _InventarizationViewState extends State { } Future _fetchData(int pageKey, int perPage) async { - final List newItems = await _service - .getList(page: pageKey, perpage: perPage); + final List newItems = + await _service.getList(page: pageKey, perpage: perPage); final isLastPage = newItems.length < _pageSize; if (isLastPage) { _pagingController.appendLastPage(newItems);