merged branches

lib/views/tenders/widgets/tender_card.dart

@@ -2,15 +2,15 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:tm_app/core/constants/strings.dart';
 import 'package:tm_app/core/routes/app_routes.dart';
+import 'package:tm_app/data/services/model/home/tender/tender_model.dart';
 
 import '../../../core/constants/assets.dart';
 import '../../../core/theme/colors.dart';
 import '../../../core/utils/size_config.dart';
-import '../models/tender_model.dart';
 import 'tender_action_buttons.dart';
 
 class TenderCard extends StatelessWidget {
-  final Tender tender;
+  final TenderModel tender;
   final bool isDesktop;
   const TenderCard({required this.tender, super.key, this.isDesktop = false});
 
@@ -41,7 +41,7 @@ class TenderCard extends StatelessWidget {
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
                         Text(
-                          tender.date,
+                          tender.createdTime ?? '',
                           style: TextStyle(
                             color: AppColors.grey60,
                             fontSize: 12.0.sp(),
@@ -78,7 +78,7 @@ class TenderCard extends StatelessWidget {
                             ),
                           ),
                           Text(
-                            tender.deadline,
+                            tender.deadline ?? '',
                             style: TextStyle(
                               color: AppColors.grey80,
                               fontSize: 14.0.sp(),
@@ -92,7 +92,7 @@ class TenderCard extends StatelessWidget {
 
                     // Title
                     Text(
-                      tender.title,
+                      tender.title ?? '',
                       style: TextStyle(
                         color: AppColors.grey80,
                         fontSize: 16.0.sp(),
@@ -103,7 +103,7 @@ class TenderCard extends StatelessWidget {
 
                     // Description
                     Text(
-                      tender.description,
+                      tender.description ?? '',
                       style: TextStyle(
                         color: AppColors.grey70,
                         fontSize: 16.0.sp(),
@@ -115,7 +115,7 @@ class TenderCard extends StatelessWidget {
 
                     // Tender ID
                     Text(
-                      tender.tenderId,
+                      tender.tenderId ?? '',
                       style: TextStyle(
                         color: AppColors.grey,
                         fontSize: 14.0.sp(),
@@ -144,7 +144,7 @@ class TenderCard extends StatelessWidget {
                           ),
                         ),
                         Text(
-                          '${tender.matchPercentage.toInt()}%',
+                          '${tender.profileMatch?.toInt() ?? 0}%',
                           style: TextStyle(
                             color: AppColors.secondaryTextColor,
                             fontSize: 16.0.sp(),
@@ -165,7 +165,7 @@ class TenderCard extends StatelessWidget {
                       ),
                       child: FractionallySizedBox(
                         alignment: Alignment.centerLeft,
-                        widthFactor: tender.matchPercentage / 100,
+                        widthFactor: tender.profileMatch ?? 0 / 100,
                         child: Container(
                           decoration: BoxDecoration(
                             color: AppColors.secondary50,
@@ -186,7 +186,7 @@ class TenderCard extends StatelessWidget {
                               SvgPicture.asset(AssetsManager.location),
                               SizedBox(width: 4.0.w()),
                               Text(
-                                tender.location,
+                                tender.location ?? '',
                                 style: TextStyle(
                                   color: AppColors.grey80,
                                   fontSize: 14.0.sp(),