From 5c14375d6f021c1ea5fe503e917aa712f0067d2e Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Wed, 6 Sep 2023 14:52:58 +0300 Subject: [PATCH] Fixing PPM issues --- lib/models/pantry/calibration_tools.dart | 2 +- lib/models/pantry/pentry.dart | 6 ++++++ lib/views/pages/user/visits/pantry/edit_pentry.dart | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/models/pantry/calibration_tools.dart b/lib/models/pantry/calibration_tools.dart index 324be41a..29c90e27 100644 --- a/lib/models/pantry/calibration_tools.dart +++ b/lib/models/pantry/calibration_tools.dart @@ -22,7 +22,7 @@ class CalibrationTool { factory CalibrationTool.fromMap(Map map) { return CalibrationTool( - assetsNumber: Lookup(id: map["assetId"], name: map['assetSerialNo']), + assetsNumber: Lookup(id: map["assetId"], name: map['assetNumber']), dataOfTesting: DateTime.tryParse(map['calibrationDateOfTesters'] ?? ""), ); } diff --git a/lib/models/pantry/pentry.dart b/lib/models/pantry/pentry.dart index 0b742040..486a4e71 100644 --- a/lib/models/pantry/pentry.dart +++ b/lib/models/pantry/pentry.dart @@ -192,4 +192,10 @@ class Pentry { signatureNurse: signatureNurse ?? this.signatureNurse, signatureEngineer: signatureEngineer ?? this.signatureEngineer); } + + void clearEmptyObjects() { + ppmCheckLists.removeWhere((element) => (element?.title?.isEmpty ?? true) && (element?.comment?.isEmpty ?? true) && (element?.measuredValue?.isEmpty ?? true) && element.status == null); + calibrationTools.removeWhere((element) => (element?.assetsNumber == null) && (element?.dataOfTesting == null)); + pmKits.removeWhere((element) => (element?.itemCode == null)); + } } diff --git a/lib/views/pages/user/visits/pantry/edit_pentry.dart b/lib/views/pages/user/visits/pantry/edit_pentry.dart index c576702a..1873e8a0 100644 --- a/lib/views/pages/user/visits/pantry/edit_pentry.dart +++ b/lib/views/pages/user/visits/pantry/edit_pentry.dart @@ -48,10 +48,9 @@ class _EditPentryState extends State with SingleTickerProviderStateM setState(() {}); return; } - _isLoading = true; setState(() {}); - + _pentry.clearEmptyObjects(); int status = await _regularVisitsProvider.updatePentry(user: _userProvider.user, host: _settingProvider.host, pentry: _pentry, visit: widget.visit); _isLoading = false; setState(() {});