mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix home and tenders scrolling and no data problem in tenders

Browse Source
This commit is contained in:
amirrezaghabeli
2025-09-11 12:11:40 +03:30
parent 05eb2ac77c
commit 2e0ff88b75
5 changed files with 105 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/home/pages/d_home_page.dart
+56 -48
View File
@@ -16,56 +16,62 @@ class DesktopHomePage extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
body: Consumer<HomeViewModel>(
builder: (context, homeViewModel, child) {
if (homeViewModel.isLoading) {
return const Center(
child: CircularProgressIndicator(color: AppColors.secondary50),
);
}
if (homeViewModel.errorMessage != null) {
return Center(child: Text(homeViewModel.errorMessage!));
}
if (homeViewModel.tenderApprovalsStateResponse != null &&
homeViewModel.data != null &&
homeViewModel.feedbackStats != null) {
return SingleChildScrollView(
child: Column(
children: [
DesktopNavigationWidget(
currentIndex: 0, // Home index
),
SizedBox(
width: 780,
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(height: 55),
// SizedBox(width: 780, child: NotificationCard()),
SizedBox(height: 40.0),
_progressBarsRow(homeViewModel),
SizedBox(height: 32.0.h()),
Padding(
padding: EdgeInsets.symmetric(horizontal: 15.0.w()),
child: _firstTenderCardsRow(context, homeViewModel),
),
SizedBox(height: 32.0.h()),
_yourTenderText(homeViewModel),
SizedBox(height: 8.0.h()),
_bottomListView(homeViewModel),
],
body: Column(
children: [
DesktopNavigationWidget(
currentIndex: 0, // Home index
),
Expanded(
child: Consumer<HomeViewModel>(
builder: (context, homeViewModel, child) {
if (homeViewModel.isLoading) {
return const Center(
child: CircularProgressIndicator(
color: AppColors.secondary50,
),
);
}
if (homeViewModel.errorMessage != null) {
return Center(child: Text(homeViewModel.errorMessage!));
}
if (homeViewModel.tenderApprovalsStateResponse != null &&
homeViewModel.data != null &&
homeViewModel.feedbackStats != null) {
return SingleChildScrollView(
child: SizedBox(
width: 780,
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(height: 55),
// SizedBox(width: 780, child: NotificationCard()),
SizedBox(height: 40.0),
_progressBarsRow(homeViewModel),
SizedBox(height: 32.0.h()),
Padding(
padding: EdgeInsets.symmetric(horizontal: 15.0.w()),
child: _firstTenderCardsRow(context, homeViewModel),
),
SizedBox(height: 32.0.h()),
_yourTenderText(homeViewModel),
SizedBox(height: 8.0.h()),
_bottomListView(homeViewModel),
],
),
),
);
}
return const Center(
child: CircularProgressIndicator(
color: AppColors.secondary50,
),
],
),
);
}
return const Center(
child: CircularProgressIndicator(color: AppColors.secondary50),
);
},
);
},
),
),
],
),
);
}
@@ -81,6 +87,7 @@ class DesktopHomePage extends StatelessWidget {
amount: homeViewModel.partnershipPercent.toString(),
circularProgressIndicatorWidth: 176,
circularProgressIndicatorHeight: 176,
strokeWidth: 9,
),
SizedBox(width: 106),
ProgressBarColumn(
@@ -89,6 +96,7 @@ class DesktopHomePage extends StatelessWidget {
amount: homeViewModel.selfApplyPercent.toString(),
circularProgressIndicatorWidth: 176,
circularProgressIndicatorHeight: 176,
strokeWidth: 9,
),
],
);
lib/views/tenders/pages/d_tenders_page.dart
+40 -33
View File
@@ -44,41 +44,48 @@ class _DesktopTendersPageState extends State<DesktopTendersPage> {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.backgroundColor,
body: SingleChildScrollView(
child: Consumer<TendersViewModel>(
builder: (context, viewModel, child) {
if (viewModel.isLoading) {
return Center(
child: CircularProgressIndicator(color: AppColors.jellyBean),
);
}
if (viewModel.errorMessage != null) {
return Center(child: Text(viewModel.errorMessage!));
}
if (viewModel.tendersResponse?.data?.tenders == null ||
viewModel.tendersResponse!.data!.tenders!.isEmpty) {
return Center(child: Text(CommonStrings.noData));
}
return Column(
children: [
DesktopNavigationWidget(
currentIndex: 1, // Tenders index
),
SizedBox(
width: 740,
height: 800,
child: Padding(
padding: EdgeInsets.symmetric(vertical: 24.0.h()),
child: MainTendersSlider(
tenders: viewModel.tendersResponse?.data?.tenders ?? [],
isDesktop: true,
body: Column(
children: [
DesktopNavigationWidget(
currentIndex: 1, // Tenders index
),
Expanded(
child: Consumer<TendersViewModel>(
builder: (context, viewModel, child) {
if (viewModel.isLoading) {
return Expanded(
child: Center(
child: CircularProgressIndicator(
color: AppColors.jellyBean,
),
),
);
}
if (viewModel.errorMessage != null) {
return Center(child: Text(viewModel.errorMessage!));
}
if ((viewModel.tendersResponse?.data?.tenders == null ||
viewModel.tendersResponse!.data!.tenders!.isEmpty) &&
viewModel.isLoading == false) {
return Center(child: Text(CommonStrings.noData));
}
return SingleChildScrollView(
child: SizedBox(
width: 740,
height: 800,
child: Padding(
padding: EdgeInsets.symmetric(vertical: 24.0.h()),
child: MainTendersSlider(
tenders: viewModel.tendersResponse?.data?.tenders ?? [],
isDesktop: true,
),
),
),
),
],
);
},
),
);
},
),
),
],
),
);
}
lib/views/tenders/pages/m_tenders_page.dart
+3 -2
View File
@@ -57,8 +57,9 @@ class _MobileTendersPageState extends State<MobileTendersPage> {
return Center(child: Text(viewModel.errorMessage!));
}
if (viewModel.tendersResponse?.data?.tenders == null ||
viewModel.tendersResponse!.data!.tenders!.isEmpty) {
if ((viewModel.tendersResponse?.data?.tenders == null ||
viewModel.tendersResponse!.data!.tenders!.isEmpty) &&
viewModel.isLoading == false) {
return Center(child: Text(CommonStrings.noData));
}
lib/views/tenders/pages/t_tenders_page.dart
+3 -2
View File
@@ -45,8 +45,9 @@ class _TabletTendersPageState extends State<TabletTendersPage> {
if (viewModel.errorMessage != null) {
return Center(child: Text(viewModel.errorMessage!));
}
if (viewModel.tendersResponse?.data?.tenders == null ||
viewModel.tendersResponse!.data!.tenders!.isEmpty) {
if ((viewModel.tendersResponse?.data?.tenders == null ||
viewModel.tendersResponse!.data!.tenders!.isEmpty) &&
viewModel.isLoading == false) {
return Center(child: Text(CommonStrings.noData));
}
return Padding(