handle approval in better way
This commit is contained in:
@@ -353,12 +353,58 @@ class TendersViewModel with ChangeNotifier {
|
|||||||
required String status,
|
required String status,
|
||||||
}) async {
|
}) async {
|
||||||
_tenderApprovalErrorMessage = null;
|
_tenderApprovalErrorMessage = null;
|
||||||
|
|
||||||
|
// Get current approval for this tender
|
||||||
|
final existingApproval = getTenderApprovalForTender(tenderId);
|
||||||
|
final existingApprovalIndex = tenderApprovals.indexWhere(
|
||||||
|
(a) => a.tenderId == tenderId,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Create optimistic approval data
|
||||||
|
TenderApprovalsData? optimisticApproval;
|
||||||
|
|
||||||
|
if (existingApproval == null) {
|
||||||
|
// No existing approval - create new optimistic approval
|
||||||
|
optimisticApproval = TenderApprovalsData(
|
||||||
|
id: null, // Will be filled by server
|
||||||
|
status: status,
|
||||||
|
tenderId: tenderId,
|
||||||
|
companyId: null, // Will be filled by server
|
||||||
|
submissionMode: submissionMode,
|
||||||
|
createdAt: DateTime.now().millisecondsSinceEpoch,
|
||||||
|
tender: null,
|
||||||
|
);
|
||||||
|
tenderApprovals.add(optimisticApproval);
|
||||||
|
} else {
|
||||||
|
// Existing approval - update optimistically
|
||||||
|
if (existingApproval.status == status) {
|
||||||
|
// Same status - remove approval (toggle off)
|
||||||
|
if (existingApprovalIndex != -1) {
|
||||||
|
tenderApprovals.removeAt(existingApprovalIndex);
|
||||||
|
}
|
||||||
|
optimisticApproval = null;
|
||||||
|
} else {
|
||||||
|
// Different status - update to new status
|
||||||
|
optimisticApproval = existingApproval.copyWith(
|
||||||
|
status: status,
|
||||||
|
submissionMode: submissionMode,
|
||||||
|
);
|
||||||
|
if (existingApprovalIndex != -1) {
|
||||||
|
tenderApprovals[existingApprovalIndex] = optimisticApproval;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Notify listeners immediately for optimistic update
|
||||||
notifyListeners();
|
notifyListeners();
|
||||||
|
|
||||||
|
// Call API
|
||||||
final result = await _tendersRepository.toggleApprovals(
|
final result = await _tendersRepository.toggleApprovals(
|
||||||
tenderId: tenderId,
|
tenderId: tenderId,
|
||||||
submissionMode: submissionMode,
|
submissionMode: submissionMode,
|
||||||
status: status,
|
status: status,
|
||||||
);
|
);
|
||||||
|
|
||||||
switch (result) {
|
switch (result) {
|
||||||
case Ok<TenderApprovalsToggleResponse>():
|
case Ok<TenderApprovalsToggleResponse>():
|
||||||
_tenderApprovalToggleData = result.value.data;
|
_tenderApprovalToggleData = result.value.data;
|
||||||
@@ -382,12 +428,31 @@ class TendersViewModel with ChangeNotifier {
|
|||||||
} else {
|
} else {
|
||||||
tenderApprovals.add(approvalData);
|
tenderApprovals.add(approvalData);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// Server returned null data - remove approval
|
||||||
|
tenderApprovals.removeWhere((a) => a.tenderId == tenderId);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case Error<TenderApprovalsToggleResponse>():
|
case Error<TenderApprovalsToggleResponse>():
|
||||||
|
// Revert optimistic update on error
|
||||||
|
if (existingApproval == null) {
|
||||||
|
// Remove the optimistic approval we added
|
||||||
|
tenderApprovals.removeWhere((a) => a.tenderId == tenderId);
|
||||||
|
} else {
|
||||||
|
// Restore the original approval - find current index and update, or add if not found
|
||||||
|
final currentIndex = tenderApprovals.indexWhere(
|
||||||
|
(a) => a.tenderId == tenderId,
|
||||||
|
);
|
||||||
|
if (currentIndex != -1) {
|
||||||
|
tenderApprovals[currentIndex] = existingApproval;
|
||||||
|
} else {
|
||||||
|
tenderApprovals.add(existingApproval);
|
||||||
|
}
|
||||||
|
}
|
||||||
_tenderApprovalErrorMessage = result.error.toString();
|
_tenderApprovalErrorMessage = result.error.toString();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
notifyListeners();
|
notifyListeners();
|
||||||
_tenderApprovalErrorMessage = null;
|
_tenderApprovalErrorMessage = null;
|
||||||
notifyListeners();
|
notifyListeners();
|
||||||
|
|||||||
Reference in New Issue
Block a user