ATOMS-1305 bug fixes

design_3.0_asset_inventory_module
WaseemAbbasi22 1 week ago
parent 866ec5754e
commit 549e5f4fd9

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

Loading…
Cancel
Save