merge branches

lib/views/detail/widgets/tender_detail_card.dart

@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:tm_app/core/constants/strings.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/tender_detail_response/tender_detail_response_model.dart';
+import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
 
 class TenderDetailCard extends StatelessWidget {
-  final TenderDetailResponseModel detail;
+  final TenderData detail;
 
   const TenderDetailCard({required this.detail, super.key});
 

lib/views/detail/widgets/tender_detail_header.dart

@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:intl/intl.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/tender_detail_response/tender_detail_response_model.dart';
+import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
 import 'package:tm_app/views/detail/widgets/status_tag.dart';
 import 'package:tm_app/views/detail/widgets/tender_detail_info_section.dart';
 import 'package:tm_app/views/detail/widgets/tender_document_section.dart';
@@ -9,9 +10,13 @@ import 'package:tm_app/views/detail/widgets/tender_location_section.dart';
 
 class TenderDetailHeader extends StatelessWidget {
   final bool isScreenBig;
-  final TenderDetailResponseModel detail;
+  final TenderData detail;
 
-  const TenderDetailHeader({required this.isScreenBig, required this.detail, super.key});
+  const TenderDetailHeader({
+    required this.isScreenBig,
+    required this.detail,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -29,7 +34,7 @@ class TenderDetailHeader extends StatelessWidget {
           SizedBox(height: 12.0.h()),
           _buildTitle(),
           SizedBox(height: 10.0.h()),
-          Divider(color: AppColors.grey20,),
+          Divider(color: AppColors.grey20),
           SizedBox(height: 5.0.h()),
           TenderDetailInfoSection(isScreenBig: isScreenBig, detail: detail),
           TenderLocationSection(detail: detail),
@@ -44,7 +49,7 @@ class TenderDetailHeader extends StatelessWidget {
     mainAxisAlignment: MainAxisAlignment.spaceBetween,
     children: [
       Text(
-        detail.date ?? '',
+        unixToDate(detail.publicationDate),
         style: TextStyle(
           color: AppColors.grey60,
           fontWeight: FontWeight.w400,
@@ -68,3 +73,14 @@ class TenderDetailHeader extends StatelessWidget {
     ),
   );
 }
+
+String unixToDate(int? unixTimestamp, {String format = 'yyyy-MM-dd'}) {
+  if (unixTimestamp == null) return '';
+
+  // Convert seconds to milliseconds if needed
+  int timestampInMs =
+      unixTimestamp > 1000000000000 ? unixTimestamp : unixTimestamp * 1000;
+
+  final DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(timestampInMs);
+  return DateFormat(format).format(dateTime);
+}

lib/views/detail/widgets/tender_detail_info_section.dart

@@ -1,43 +1,44 @@
 import 'package:flutter/material.dart';
 import 'package:tm_app/core/constants/strings.dart';
-import 'package:tm_app/data/services/model/tender_detail_response/tender_detail_response_model.dart';
+import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
 import 'package:tm_app/views/detail/widgets/deadline_item.dart';
 import 'package:tm_app/views/detail/widgets/info_item.dart';
 
 class TenderDetailInfoSection extends StatelessWidget {
   final bool isScreenBig;
-  final TenderDetailResponseModel detail;
+  final TenderData detail;
 
-  const TenderDetailInfoSection({required this.isScreenBig, required this.detail, super.key});
+  const TenderDetailInfoSection({
+    required this.isScreenBig,
+    required this.detail,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        InfoItem(
-          title: AppStrings.tenderIdLabel,
-          value: detail.id ?? '',
-        ),
+        InfoItem(title: AppStrings.tenderIdLabel, value: detail.id ?? ''),
         DeadlineItem(
           title: AppStrings.tenderDeadlineLabel,
           approvalText: AppStrings.tenderApprovalText,
-          approvalDate: detail.approvalDate ?? '',
+          approvalDate: '',
           submissionText: AppStrings.tenderSubmissionText,
-          submissionDate: detail.submissionDate ?? '',
+          submissionDate: '',
           isScreenBig: isScreenBig,
         ),
         InfoItem(
           title: AppStrings.tenderClientLabel,
-          value: detail.client ?? '',
+          value: detail.buyerOrganization!.name ?? '',
         ),
         InfoItem(
           title: AppStrings.tenderDeliveryLocationsLabel,
-          value: detail.deliveryLocation ?? '',
+          value: detail.countryCode ?? '',
         ),
         InfoItem(
           title: AppStrings.tenderReferenceNumberLabel,
-          value: detail.referenceNumber ?? '',
+          value: detail.noticePublicationId ?? '',
         ),
       ],
     );

lib/views/detail/widgets/tender_document_section.dart

@@ -3,27 +3,24 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:tm_app/core/constants/assets.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/tender_detail_response/tender_detail_response_model.dart';
-class TenderDocumentSection extends StatelessWidget {
-  final TenderDetailResponseModel detail;
+import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
 
-  const TenderDocumentSection({super.key, required this.detail});
+class TenderDocumentSection extends StatelessWidget {
+  final TenderData detail;
+
+  const TenderDocumentSection({required this.detail, super.key});
 
   @override
   Widget build(BuildContext context) {
     return InkWell(
-      onTap: () {
-        if (detail.documentUrl != null) {
-          //launchUrl(Uri.parse(detail.documentUrl!));
-        }
-      },
+      onTap: () {},
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           SvgPicture.asset(AssetsManager.export),
           SizedBox(height: 6.0.h()),
           Text(
-            detail.documentName ?? '',
+            '',
             style: TextStyle(
               fontWeight: FontWeight.w400,
               fontSize: 16.0.sp(),

lib/views/detail/widgets/tender_location_section.dart

@@ -4,10 +4,11 @@ import 'package:tm_app/core/constants/assets.dart';
 import 'package:tm_app/core/constants/strings.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/tender_detail_response/tender_detail_response_model.dart';
+
+import '../../../data/services/model/tender_data/tender_data.dart';
 
 class TenderLocationSection extends StatelessWidget {
-  final TenderDetailResponseModel detail;
+  final TenderData detail;
 
   const TenderLocationSection({required this.detail, super.key});
 
@@ -21,7 +22,7 @@ class TenderLocationSection extends StatelessWidget {
           SizedBox(
             height: 45.0.h(),
             child: Text(
-              detail.locationTitle ?? '',
+              '',
               style: TextStyle(
                 color: AppColors.grey80,
                 fontWeight: FontWeight.w600,
@@ -38,7 +39,7 @@ class TenderLocationSection extends StatelessWidget {
               ),
               SizedBox(width: 4.0.w()),
               Text(
-                detail.country ?? '',
+                detail.countryCode ?? '',
                 style: TextStyle(
                   color: AppColors.grey70,
                   fontSize: 14.0.sp(),
@@ -47,7 +48,7 @@ class TenderLocationSection extends StatelessWidget {
               ),
               SizedBox(width: 4.0.w()),
               Image.asset(
-                detail.flagAsset ?? AssetsManager.seFlag,
+                AssetsManager.seFlag,
                 height: 20.0.h(),
                 width: 20.0.w(),
               ),
@@ -60,7 +61,7 @@ class TenderLocationSection extends StatelessWidget {
           ),
           SizedBox(height: 8.0.h()),
           Text(
-            detail.locationDescription ?? '',
+            detail.description ?? '',
             style: TextStyle(fontWeight: FontWeight.w400, fontSize: 14.0.sp()),
           ),
           SizedBox(height: 16.0.h()),