diff --git a/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart b/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart index de5cb11a..d7acf11c 100644 --- a/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart +++ b/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart @@ -53,10 +53,6 @@ class _AssetInventoryFormViewState extends State { ValueNotifier? registeredController; bool isRegistered = false; - // TextEditingController _assetModelController = TextEditingController(); - // TextEditingController _assetManufacturerController = TextEditingController(); - // TextEditingController _assetSupplierController = TextEditingController(); - final List attachments = []; @override @@ -179,17 +175,16 @@ class _AssetInventoryFormViewState extends State { ), 12.height, ], - if (((isRegistered && widget.sessionTypeValue != 3)))...[ + if (((isRegistered && widget.sessionTypeValue != 3))) ...[ AppTextFormField( labelText: context.translation.assetNo, backgroundColor: AppColor.fieldBgColor(context), textAlign: TextAlign.center, - // controller: _assetNoController, showShadow: false, enable: true, labelStyle: AppTextStyles.textFieldLabelStyle, style: Theme.of(context).textTheme.titleMedium, - onChange: (value){ + onChange: (value) { _scannedAssetModel?.newAssetNumber = value; }, ), @@ -282,32 +277,19 @@ class _AssetInventoryFormViewState extends State { setState(() {}); }, ), - // SingleItemDropDownMenu( - // context: context, - // title: context.translation.supplier, - // backgroundColor: AppColor.fieldBgColor(context), - // initialValue: _scannedAssetModel?.supplier, - // showAsBottomSheet: true, - // showShadow: false, - // showCancel: true, - // onSelect: (supplier) { - // _scannedAssetModel?.supplier = supplier; - // _scannedAssetModel?.newSupplierId = supplier?.id; - // _scannedAssetModel?.newSupplierName = supplier?.name; - // setState(() {}); - // }, - // ), - 12.height, - siteInfoContainer(label: context.translation.site, value: _scannedAssetModel?.siteName ?? '-'), - 12.height, - siteInfoContainer(label: context.translation.building, value: _scannedAssetModel?.buildingName ?? '-'), - 12.height, - siteInfoContainer(label: context.translation.floor, value: _scannedAssetModel?.floorName ?? '-'), - 12.height, - siteInfoContainer(label: context.translation.department, value: _scannedAssetModel?.departmentName ?? '-'), - 12.height, - siteInfoContainer(label: context.translation.room, value: _scannedAssetModel?.roomName ?? '-'), - 12.height, + if (!isRegistered) ...[ + 12.height, + siteInfoContainer(label: context.translation.site, value: _scannedAssetModel?.siteName ?? '-'), + 12.height, + siteInfoContainer(label: context.translation.building, value: _scannedAssetModel?.buildingName ?? '-'), + 12.height, + siteInfoContainer(label: context.translation.floor, value: _scannedAssetModel?.floorName ?? '-'), + 12.height, + siteInfoContainer(label: context.translation.department, value: _scannedAssetModel?.departmentName ?? '-'), + 12.height, + siteInfoContainer(label: context.translation.room, value: _scannedAssetModel?.roomName ?? '-'), + 12.height, + ], if (_scannedAssetModel?.status != null && _scannedAssetModel!.status!.isNotEmpty) classificationWidget(label: _scannedAssetModel?.status), 12.height, Text( @@ -438,24 +420,16 @@ class _AssetInventoryFormViewState extends State { _scannedAssetModel?.photo = fileName; } showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); - assetInventoryProvider.saveAssetInSession(model: _scannedAssetModel).then((success) async{ + assetInventoryProvider.saveAssetInSession(model: _scannedAssetModel).then((success) async { ///Need to use push and remove until... Navigator.pop(context); if (success) { - // Navigator.pop(context); - // Navigator.pop(context); /// need to confirm need to call this ... AllRequestsProvider allRequestsProvider = Provider.of(context, listen: false); allRequestsProvider.reset(); allRequestsProvider.getAllRequests(context, typeTransaction: 8); - getAssetFilteredList(); + getAssetFilteredList(); Navigator.pop(context); - // Navigator.pushReplacement( - // context, - // MaterialPageRoute( - // builder: (contxt) => SiteInformationPage( - // sessionModel: SessionModel(id: int.tryParse(widget.assetInventoryModel?.sessionId?.toString() ?? '') ?? 0), - // ))); } else { log('api error...'); } @@ -474,7 +448,6 @@ class _AssetInventoryFormViewState extends State { registeredController?.dispose(); } - Future getAssetFilteredList({bool loadMore = false}) async { AssetInventoryProvider provider = Provider.of(context, listen: false); Map payload = {