Added getStates in home

lib/views/home/pages/d_home_page.dart

@@ -4,7 +4,7 @@ import 'package:tm_app/core/constants/strings.dart';
 import 'package:tm_app/core/routes/app_routes.dart';
 import 'package:tm_app/core/theme/colors.dart';
 import 'package:tm_app/core/utils/size_config.dart';
-import 'package:tm_app/data/services/model/home/home_response/home_response_model.dart';
+import 'package:tm_app/data/services/model/tender_approvals_state_response/tender_approvals_state_response.dart';
 import 'package:tm_app/view_models/home_view_model.dart';
 import 'package:tm_app/views/home/widgets/notification_card.dart';
 
@@ -35,9 +35,12 @@ class DesktopHomePage extends StatelessWidget {
                 SizedBox(height: 55),
                 SizedBox(width: 780, child: NotificationCard()),
                 SizedBox(height: 40.0),
-                _progressBarsRow(homeViewModel.homeResponse!),
+                _progressBarsRow(homeViewModel.tenderApprovalsStateResponse!),
                 SizedBox(height: 32.0.h()),
-                _firstTenderCardsRow(context, homeViewModel.homeResponse!),
+                _firstTenderCardsRow(
+                  context,
+                  homeViewModel.tenderApprovalsStateResponse!,
+                ),
                 SizedBox(height: 32.0.h()),
                 _yourTenderText(),
                 SizedBox(height: 8.0.h()),
@@ -50,41 +53,50 @@ class DesktopHomePage extends StatelessWidget {
     );
   }
 
-  Widget _progressBarsRow(HomeResponseModel homeResponse) {
+  Widget _progressBarsRow(
+    TenderApprovalsStateResponse tenderApprovalsStateResponse,
+  ) {
+    final partnership =
+        tenderApprovalsStateResponse.data!.partnershipCount ?? 0;
+    final selfApply = tenderApprovalsStateResponse.data!.selfApplyCount ?? 0;
+    final total = (partnership + selfApply);
+
+    final partnershipPercent = total > 0 ? (partnership / total) * 100 : 0;
+    final selfApplyPercent = total > 0 ? (selfApply / total) * 100 : 0;
     return Row(
       // mainAxisAlignment: MainAxisAlignment.spaceBetween,
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
         ProgressBarColumn(
           text: AppStrings.partnership,
-          value: double.parse(homeResponse.partnership ?? '0'),
-          amount: homeResponse.partnership ?? '0',
+          value: double.parse('$partnershipPercent'),
+          amount: partnership.toString(),
           circularProgressIndicatorWidth: 176,
           circularProgressIndicatorHeight: 176,
         ),
         SizedBox(width: 106),
         ProgressBarColumn(
           text: AppStrings.selfApply,
-          value: double.parse(homeResponse.selfApply ?? '0'),
-          amount: homeResponse.selfApply ?? '0',
+          value: double.parse(selfApplyPercent.toString()),
+          amount: selfApply.toString(),
           circularProgressIndicatorWidth: 176,
           circularProgressIndicatorHeight: 176,
         ),
         SizedBox(width: 106),
-        ProgressBarColumn(
-          text: AppStrings.contracting,
-          value: double.parse(homeResponse.contracting ?? '0'),
-          amount: homeResponse.contracting ?? '0',
-          circularProgressIndicatorWidth: 176,
-          circularProgressIndicatorHeight: 176,
-        ),
+        // ProgressBarColumn(
+        //   text: AppStrings.contracting,
+        //   value: double.parse(homeResponse.contracting ?? '0'),
+        //   amount: homeResponse.contracting ?? '0',
+        //   circularProgressIndicatorWidth: 176,
+        //   circularProgressIndicatorHeight: 176,
+        // ),
       ],
     );
   }
 
   Widget _firstTenderCardsRow(
     BuildContext context,
-    HomeResponseModel homeResponse,
+    TenderApprovalsStateResponse tenderApprovalsStateResponse,
   ) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
@@ -93,7 +105,12 @@ class DesktopHomePage extends StatelessWidget {
           backgroundColor: AppColors.primary20,
           iconPath: 'assets/icons/arrows.svg',
           title: AppStrings.tenderSubmitted,
-          amount: homeResponse.tenderSubmitted ?? '0',
+          amount:
+              tenderApprovalsStateResponse
+                  .data!
+                  .approvalsBySubmission!
+                  .selfApply
+                  .toString(),
           textColor: Color(0xFF0164FF),
           enableTap: true,
           width: 178,
@@ -107,7 +124,7 @@ class DesktopHomePage extends StatelessWidget {
           backgroundColor: AppColors.primary10,
           iconPath: 'assets/icons/thumb.svg',
           title: AppStrings.approvedTenders,
-          amount: homeResponse.approvedTenders ?? '0',
+          amount: tenderApprovalsStateResponse.data!.approvedTenders.toString(),
           textColor: Color(0xFF24848E),
           enableTap: true,
           width: 178,
@@ -117,29 +134,29 @@ class DesktopHomePage extends StatelessWidget {
           },
         ),
         SizedBox(width: 10),
-        TenderCard(
-          backgroundColor: AppColors.orange10,
-          iconPath: 'assets/icons/shield.svg',
-          title: AppStrings.tenderValue,
-          amount: homeResponse.tenderValue ?? '0',
-          textColor: Color(0xFFE5821E),
-          enableTap: true,
-          width: 178,
-          height: 148,
-          onTap: () {},
-        ),
-        SizedBox(width: 10),
-        TenderCard(
-          backgroundColor: AppColors.grey10,
-          iconPath: 'assets/icons/edit.svg',
-          title: AppStrings.thunderStatus,
-          amount: homeResponse.thunderStatus ?? '0',
-          textColor: Color(0xFF9E9E9E),
-          enableTap: false,
-          width: 178,
-          height: 148,
-          onTap: () {},
-        ),
+        // TenderCard(
+        //   backgroundColor: AppColors.orange10,
+        //   iconPath: 'assets/icons/shield.svg',
+        //   title: AppStrings.tenderValue,
+        //   amount: homeResponse.tenderValue ?? '0',
+        //   textColor: Color(0xFFE5821E),
+        //   enableTap: true,
+        //   width: 178,
+        //   height: 148,
+        //   onTap: () {},
+        // ),
+        // SizedBox(width: 10),
+        // TenderCard(
+        //   backgroundColor: AppColors.grey10,
+        //   iconPath: 'assets/icons/edit.svg',
+        //   title: AppStrings.thunderStatus,
+        //   amount: homeResponse.thunderStatus ?? '0',
+        //   textColor: Color(0xFF9E9E9E),
+        //   enableTap: false,
+        //   width: 178,
+        //   height: 148,
+        //   onTap: () {},
+        // ),
       ],
     );
   }

lib/views/home/pages/m_home_page.dart

@@ -6,6 +6,7 @@ import 'package:tm_app/core/routes/app_routes.dart';
 import 'package:tm_app/core/theme/colors.dart';
 import 'package:tm_app/core/utils/size_config.dart';
 import 'package:tm_app/data/services/model/home/home_response/home_response_model.dart';
+import 'package:tm_app/data/services/model/tender_approvals_state_response/tender_approvals_state_response.dart';
 import 'package:tm_app/view_models/home_view_model.dart';
 import 'package:tm_app/views/home/widgets/notification_card.dart';
 import 'package:tm_app/views/shared/tender_app_bar.dart';
@@ -39,11 +40,14 @@ class MobileHomePage extends StatelessWidget {
                   SizedBox(height: 18.0.h()),
                   NotificationCard(),
                   SizedBox(height: 32.0.h()),
-                  _progressBarsRow(homeViewModel.homeResponse!),
+                  _progressBarsRow(homeViewModel.tenderApprovalsStateResponse!),
                   SizedBox(height: 32.0.h()),
-                  _firstTenderCardsRow(context, homeViewModel.homeResponse!),
+                  _firstTenderCardsRow(
+                    context,
+                    homeViewModel.tenderApprovalsStateResponse!,
+                  ),
                   SizedBox(height: 8.0.h()),
-                  _secondTenderCardsRow(homeViewModel.homeResponse!),
+                  //  _secondTenderCardsRow(homeViewModel.homeResponse!),
                   SizedBox(height: 40.0.h()),
                   _yourTenderText(homeViewModel),
                   _bottomListView(homeViewModel),
@@ -59,27 +63,41 @@ class MobileHomePage extends StatelessWidget {
     );
   }
 
-  Widget _progressBarsRow(HomeResponseModel homeResponse) {
+  Widget _progressBarsRow(
+    TenderApprovalsStateResponse tenderApprovalsStateResponse,
+  ) {
+    final partnership =
+        tenderApprovalsStateResponse.data!.partnershipCount ?? 0;
+    final selfApply = tenderApprovalsStateResponse.data!.selfApplyCount ?? 0;
+    final total = (partnership + selfApply);
+
+    final partnershipPercent = total > 0 ? (partnership / total) * 100 : 0;
+    final selfApplyPercent = total > 0 ? (selfApply / total) * 100 : 0;
+
     return Padding(
       padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
       child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
+          Spacer(),
+          SizedBox(width: 20.0.w()),
           ProgressBarColumn(
             text: AppStrings.partnership,
-            value: double.parse(homeResponse.partnership ?? '0'),
-            amount: '${homeResponse.partnership}%',
+            value: double.parse('$partnershipPercent'),
+            amount: partnership.toString(),
           ),
+          Spacer(),
           ProgressBarColumn(
             text: AppStrings.selfApply,
-            value: double.parse(homeResponse.selfApply ?? '0'),
-            amount: homeResponse.selfApply ?? '0',
-          ),
-          ProgressBarColumn(
-            text: AppStrings.contracting,
-            value: double.parse(homeResponse.contracting ?? '0'),
-            amount: homeResponse.contracting ?? '0',
+            value: double.parse(selfApplyPercent.toString()),
+            amount: selfApply.toString(),
           ),
+          SizedBox(width: 20.0.w()),
+          Spacer(),
+          // ProgressBarColumn(
+          //   text: AppStrings.contracting,
+          //   value: double.parse(tenderApprovalsStateResponse.data.contracting ?? '0'),
+          //   amount: tenderApprovalsStateResponse.data.contracting ?? '0',
+          // ),
         ],
       ),
     );
@@ -87,7 +105,7 @@ class MobileHomePage extends StatelessWidget {
 
   Widget _firstTenderCardsRow(
     BuildContext context,
-    HomeResponseModel homeResponse,
+    TenderApprovalsStateResponse tenderApprovalsStateResponse,
   ) {
     return Padding(
       padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
@@ -98,7 +116,12 @@ class MobileHomePage extends StatelessWidget {
             backgroundColor: AppColors.primary20,
             iconPath: AssetsManager.arrows,
             title: AppStrings.tenderSubmitted,
-            amount: homeResponse.tenderSubmitted ?? '0',
+            amount:
+                tenderApprovalsStateResponse
+                    .data!
+                    .approvalsBySubmission!
+                    .selfApply
+                    .toString(),
             textColor: Color(0xFF0164FF),
             enableTap: true,
             onTap: () {
@@ -109,7 +132,8 @@ class MobileHomePage extends StatelessWidget {
             backgroundColor: AppColors.primary10,
             iconPath: AssetsManager.thumb,
             title: AppStrings.approvedTenders,
-            amount: homeResponse.approvedTenders ?? '0',
+            amount:
+                tenderApprovalsStateResponse.data!.approvedTenders.toString(),
             textColor: Color(0xFF24848E),
             enableTap: true,
             onTap: () {
@@ -121,6 +145,7 @@ class MobileHomePage extends StatelessWidget {
     );
   }
 
+  // ignore: unused_element
   Widget _secondTenderCardsRow(HomeResponseModel homeResponse) {
     return Padding(
       padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
@@ -151,11 +176,11 @@ class MobileHomePage extends StatelessWidget {
   }
 
   Widget _yourTenderText(HomeViewModel homeViewModel) {
-  final isYourTenders = homeViewModel.data?.data?.isNotEmpty ?? false;
+    final isYourTenders = homeViewModel.data?.data?.isNotEmpty ?? false;
     return Padding(
       padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
       child: Text(
-        isYourTenders ? AppStrings.yourTenders  : AppStrings.recommendedTenders,
+        isYourTenders ? AppStrings.yourTenders : AppStrings.recommendedTenders,
         style: TextStyle(
           fontSize: 18.0.sp(),
           fontWeight: FontWeight.w700,

lib/views/home/pages/t_home_page.dart

@@ -5,6 +5,7 @@ import 'package:tm_app/core/routes/app_routes.dart';
 import 'package:tm_app/core/theme/colors.dart';
 import 'package:tm_app/core/utils/size_config.dart';
 import 'package:tm_app/data/services/model/home/home_response/home_response_model.dart';
+import 'package:tm_app/data/services/model/tender_approvals_state_response/tender_approvals_state_response.dart';
 import 'package:tm_app/view_models/home_view_model.dart';
 import 'package:tm_app/views/home/widgets/notification_card.dart';
 
@@ -41,11 +42,14 @@ class TabletHomePage extends StatelessWidget {
                 children: [
                   NotificationCard(),
                   SizedBox(height: 40.0.h()),
-                  _progressBarsRow(homeViewModel.homeResponse!),
+                  _progressBarsRow(homeViewModel.tenderApprovalsStateResponse!),
                   SizedBox(height: 32.0.h()),
-                  _firstTenderCardsRow(context, homeViewModel.homeResponse!),
+                  _firstTenderCardsRow(
+                    context,
+                    homeViewModel.tenderApprovalsStateResponse!,
+                  ),
                   SizedBox(height: 8.0.h()),
-                  _secondTenderCardsRow(homeViewModel.homeResponse!),
+                  //_secondTenderCardsRow(homeViewModel.homeResponse!),
                   SizedBox(height: 32.0.h()),
                   _yourTenderText(),
                   SizedBox(height: 8.0.h()),
@@ -59,41 +63,53 @@ class TabletHomePage extends StatelessWidget {
     );
   }
 
-  Widget _progressBarsRow(HomeResponseModel homeResponse) {
+  Widget _progressBarsRow(
+    TenderApprovalsStateResponse tenderApprovalsStateResponse,
+  ) {
+    final partnership =
+        tenderApprovalsStateResponse.data!.partnershipCount ?? 0;
+    final selfApply = tenderApprovalsStateResponse.data!.selfApplyCount ?? 0;
+    final total = (partnership + selfApply);
+
+    final partnershipPercent = total > 0 ? (partnership / total) * 100 : 0;
+    final selfApplyPercent = total > 0 ? (selfApply / total) * 100 : 0;
     return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
+        Spacer(),
+        SizedBox(width: 20.0.w()),
         ProgressBarColumn(
           text: AppStrings.partnership,
-          value: double.parse(homeResponse.partnership ?? '0'),
-          amount: homeResponse.partnership ?? '0',
+          value: double.parse('$partnershipPercent'),
+          amount: partnership.toString(),
           circularProgressIndicatorWidth: 176.0,
           circularProgressIndicatorHeight: 176.0,
           strokeWidth: 8.0,
         ),
         ProgressBarColumn(
           text: AppStrings.selfApply,
-          value: double.parse(homeResponse.selfApply ?? '0'),
-          amount: homeResponse.selfApply ?? '0',
-          circularProgressIndicatorWidth: 176.0,
-          circularProgressIndicatorHeight: 176.0,
-          strokeWidth: 8.0,
-        ),
-        ProgressBarColumn(
-          text: AppStrings.contracting,
-          value: double.parse(homeResponse.contracting ?? '0'),
-          amount: homeResponse.contracting ?? '0',
+          value: double.parse(selfApplyPercent.toString()),
+          amount: selfApply.toString(),
           circularProgressIndicatorWidth: 176.0,
           circularProgressIndicatorHeight: 176.0,
           strokeWidth: 8.0,
         ),
+        SizedBox(width: 20.0.w()),
+        Spacer(),
+        // ProgressBarColumn(
+        //   text: AppStrings.contracting,
+        //   value: double.parse(homeResponse.contracting ?? '0'),
+        //   amount: homeResponse.contracting ?? '0',
+        //   circularProgressIndicatorWidth: 176.0,
+        //   circularProgressIndicatorHeight: 176.0,
+        //   strokeWidth: 8.0,
+        // ),
       ],
     );
   }
 
   Widget _firstTenderCardsRow(
     BuildContext context,
-    HomeResponseModel homeResponse,
+    TenderApprovalsStateResponse tenderApprovalsStateResponse,
   ) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -103,7 +119,12 @@ class TabletHomePage extends StatelessWidget {
             backgroundColor: AppColors.primary20,
             iconPath: 'assets/icons/arrows.svg',
             title: AppStrings.tenderSubmitted,
-            amount: homeResponse.tenderSubmitted ?? '0',
+            amount:
+                tenderApprovalsStateResponse
+                    .data!
+                    .approvalsBySubmission!
+                    .selfApply
+                    .toString(),
             textColor: Color(0xFF0164FF),
             enableTap: true,
             width: double.infinity,
@@ -119,7 +140,9 @@ class TabletHomePage extends StatelessWidget {
             backgroundColor: AppColors.primary10,
             iconPath: 'assets/icons/thumb.svg',
             title: AppStrings.approvedTenders,
-            amount: homeResponse.approvedTenders ?? '0',
+            amount:
+                tenderApprovalsStateResponse.data!.approvedTenders.toString(),
+
             textColor: Color(0xFF24848E),
             enableTap: true,
             width: double.infinity,
@@ -133,6 +156,7 @@ class TabletHomePage extends StatelessWidget {
     );
   }
 
+  // ignore: unused_element
   Widget _secondTenderCardsRow(HomeResponseModel homeResponse) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,