merge branches

This commit is contained in:
amirrezaghabeli
2025-08-20 13:11:22 +03:30
parent 1af9c0a76b
commit 4b51071aad
36 changed files with 1894 additions and 167 deletions
@@ -40,12 +40,15 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
currentPage = currentPage - 1;
});
// Fetch feedback for the previous tender if not already loaded
// Fetch feedback and approvals for the previous tender if not already loaded
final viewModel = context.read<TendersViewModel>();
final previousTenderId = widget.tenders[currentPage - 2].id!;
if (!viewModel.hasFeedbackForTender(previousTenderId)) {
viewModel.getTenderFeedback(previousTenderId);
}
if (!viewModel.hasTenderApprovalForTender(previousTenderId)) {
viewModel.getTenderApprovals(previousTenderId);
}
}
void _goToNextPage() {
@@ -61,12 +64,15 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
currentPage = currentPage + 1;
});
// Fetch feedback for the next tender if not already loaded
// Fetch feedback and approvals for the next tender if not already loaded
final viewModel = context.read<TendersViewModel>();
final nextTenderId = widget.tenders[currentPage].id!;
if (!viewModel.hasFeedbackForTender(nextTenderId)) {
viewModel.getTenderFeedback(nextTenderId);
}
if (!viewModel.hasTenderApprovalForTender(nextTenderId)) {
viewModel.getTenderApprovals(nextTenderId);
}
}
@override
@@ -95,11 +101,16 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
currentPage = index + 1;
});
// Fetch feedback for the new tender if not already loaded
// Fetch feedback and approvals for the new tender if not already loaded
final viewModel = context.read<TendersViewModel>();
if (!viewModel.hasFeedbackForTender(widget.tenders[index].id!)) {
viewModel.getTenderFeedback(widget.tenders[index].id!);
}
if (!viewModel.hasTenderApprovalForTender(
widget.tenders[index].id!,
)) {
viewModel.getTenderApprovals(widget.tenders[index].id!);
}
// Check if we need to load more tenders (when user reaches near the end)
if (index >= widget.tenders.length - 1 &&
@@ -154,28 +165,26 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
viewModel.isLoadingMore ?
Padding(
padding: EdgeInsets.only(top: 4.0.h()),
child: SizedBox(
width: 16.0.w(),
height: 16.0.w(),
child: CircularProgressIndicator(
strokeWidth: 2.0,
color: AppColors.jellyBean,
viewModel.isLoadingMore
? Padding(
padding: EdgeInsets.only(top: 4.0.h()),
child: SizedBox(
width: 16.0.w(),
height: 16.0.w(),
child: CircularProgressIndicator(
strokeWidth: 2.0,
color: AppColors.jellyBean,
),
),
)
: Text(
'$currentPage/${widget.tenders.length}',
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.grey,
),
),
):
Text(
'$currentPage/${widget.tenders.length}',
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.grey,
),
),
],
);
}