fix : some ui bug

2025-10-14 16:24:46 +03:30
parent ba907e2571
commit 36ff3d5922
17 changed files with 108 additions and 44 deletions
--- a/packages/chicken/lib/presentation/pages/poultry_science/genocide/view.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/genocide/view.dart
@@ -74,6 +74,7 @@ class GenocidePage extends GetView<GenocideLogic> {
              secondChild: itemListExpandedWidget(item),
              labelColor: AppColor.blueLight,
              labelIcon: Assets.vec.timerSvg.path,
+              labelIconColor: AppColor.yellowNormal2,
            );
          }, controller.expandedIndex);
        },
--- a/packages/chicken/lib/presentation/pages/poultry_science/home/view.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/home/view.dart
@@ -21,7 +21,7 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {

      child: Column(
        children: [
-          SizedBox(height: 8.h),
+          SizedBox(height: 18.h),
          InkWell(
            onTap: () {
              controller.isExpanded.value = !controller.isExpanded.value;
--- a/packages/chicken/lib/presentation/pages/poultry_science/inspection/view.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/inspection/view.dart
@@ -57,6 +57,9 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
                labelIcon: item.reportInfo?.image == false
                    ? Assets.vec.timerSvg.path
                    : Assets.vec.checkSquareSvg.path,
+                labelIconColor: item.reportInfo?.image == false
+                    ? AppColor.yellowNormal2
+                    : AppColor.mediumGreyDarkHover,
              );
            }, controller.expandedIndex);
          },
--- a/packages/chicken/lib/presentation/pages/steward/buy_in_province_all/logic.dart
+++ b/packages/chicken/lib/presentation/pages/steward/buy_in_province_all/logic.dart
@@ -174,4 +174,11 @@ class BuyInProvinceAllLogic extends GetxController {
      isExpandedListIndex.value = index;
    }
  }
+
+  Color getLabelColor(String? receiverState) {
+    if (receiverState == 'pending') {
+      return AppColor.yellowNormal2;
+    }
+    return AppColor.mediumGreyDarkHover;
+  }
 }
--- a/packages/chicken/lib/presentation/pages/steward/buy_in_province_all/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/buy_in_province_all/view.dart
@@ -30,6 +30,7 @@ class BuyInProvinceAllPage extends GetView<BuyInProvinceAllLogic> {
                secondChild: itemListExpandedWidget(item),
                labelColor: getLabelColor(item.receiverState),
                labelIcon: controller.getVecPathItem(item.receiverState),
+                labelIconColor: controller.getLabelColor(item.receiverState),
              );
            }, controller.isExpandedListIndex);
          },
@@ -87,9 +88,10 @@ class BuyInProvinceAllPage extends GetView<BuyInProvinceAllLogic> {
                    ),
                  ),
                  Text(
-                    '${item.weightOfCarcasses?.separatedByCommaFa}kg',
+                    item.weightOfCarcasses?.separatedByCommaFa.addKg ?? 'N/A',
                    textAlign: TextAlign.left,
-                    style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
+                    textDirection: TextDirection.ltr,
+                    style: AppFonts.yekan12Bold.copyWith(color: AppColor.blueNormal),
                  ),
                ],
              ),
@@ -195,15 +197,21 @@ class BuyInProvinceAllPage extends GetView<BuyInProvinceAllLogic> {
          buildRow(title: 'محصول', value: item.product?.name ?? 'N/A'),
          buildRow(
            title: 'وزن خریداری شده',
-            value: '${item.weightOfCarcasses?.separatedByCommaFa} کیلوگرم',
+            value: item.weightOfCarcasses?.separatedByCommaFa ?? 'N/A',
+            valueLabel: 'کیلوگرم',
          ),
          buildRow(
            title: 'قیمت هر کیلوگرم',
-            titleLabel:(item.approvedPriceStatus ?? false) ? 'مصوب' : 'آزاد' ,
-            titleLabelStyle:   AppFonts.yekan14Bold.copyWith(color: AppColor.greenNormal),
-            value: '${item.amount?.separatedByCommaFa} ریال',
+            titleLabel: (item.approvedPriceStatus ?? false) ? 'مصوب' : 'آزاد',
+            titleLabelStyle: AppFonts.yekan14Bold.copyWith(color: AppColor.greenNormal),
+            value: item.amount?.separatedByCommaFa ?? 'N/A',
+            valueLabel: 'ریال',
+          ),
+          buildRow(
+            title: 'قیمت کل',
+            value: item.totalAmount?.separatedByCommaFa ?? 'N/A',
+            valueLabel: 'ریال',
          ),
-          buildRow(title: 'قیمت کل', value: '${item.totalAmount?.separatedByCommaFa} ریال'),

          Visibility(
            visible: item.receiverState == 'pending',
@@ -222,7 +230,6 @@ class BuyInProvinceAllPage extends GetView<BuyInProvinceAllLogic> {
                        conformationBottomSheet(item),
                        isScrollControlled: true,
                      ).then((value) {
-
                        Get.back();
                        controller.clearApprovedController();
                      });
--- a/packages/chicken/lib/presentation/pages/steward/buy_in_province_waiting/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/buy_in_province_waiting/view.dart
@@ -32,6 +32,7 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
                  secondChild: itemListExpandedWidget(item),
                  labelColor: AppColor.blueLight,
                  labelIcon: Assets.vec.timerSvg.path,
+                  labelIconColor: AppColor.yellowNormal2,
                );
              }, controller.isExpandedListIndex);
            },
@@ -90,9 +91,10 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
                    ),
                  ),
                  Text(
-                    '${item.weightOfCarcasses?.separatedByCommaFa}kg',
+                    item.weightOfCarcasses?.separatedByCommaFa.addKg ?? 'N/A',
                    textAlign: TextAlign.left,
-                    style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
+                    textDirection: TextDirection.ltr,
+                    style: AppFonts.yekan12Bold.copyWith(color: AppColor.blueNormal),
                  ),
                ],
              ),
--- a/packages/chicken/lib/presentation/pages/steward/home/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/home/view.dart
@@ -19,13 +19,14 @@ class HomePage extends GetView<HomeLogic> {
      isBase: true,
      onRefresh: controller.refreshData,
      child: SingleChildScrollView(
+        padding: EdgeInsets.only(bottom: 100.h),
        child: Column(
          children: [
            SizedBox(height: 18.h),
            mainInformation(),
            SizedBox(height: 8.h),
            WidelyUsedWidget(),
-            SizedBox(height: 20),
+
          ],
        ),
      ),
--- a/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart
@@ -189,9 +189,10 @@ class SalesInProvincePage extends GetView<SalesInProvinceLogic> {
                    ),
                  ),
                  Text(
-                    '${item.weightOfCarcasses?.separatedByCommaFa}kg',
+                    item.weightOfCarcasses!.separatedByCommaFa.addKg,
                    textAlign: TextAlign.left,
-                    style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
+                    textDirection: TextDirection.ltr,
+                    style: AppFonts.yekan12Bold.copyWith(color: AppColor.blueNormal),
                  ),
                ],
              ),
--- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart
@@ -6,6 +6,7 @@ import 'package:rasadyar_chicken/data/models/response/roles_products/roles_produ
 import 'package:rasadyar_chicken/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart';
 import 'package:rasadyar_chicken/presentation/routes/routes.dart';
 import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
+import 'package:rasadyar_chicken/presentation/utils/string_utils.dart';
 import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
 import 'package:rasadyar_chicken/presentation/widget/filter_bottom_sheet.dart';
 import 'package:rasadyar_chicken/presentation/widget/steward/inventory_widget.dart';
@@ -140,11 +141,11 @@ class SalesOutOfProvincePage extends GetView<SalesOutOfProvinceLogic> {
              ),

              Text(
-                '${item.weightOfCarcasses?.separatedByCommaFa ?? 0}KG',
+                item.weightOfCarcasses!.separatedByCommaFa.addKg,
                textAlign: TextAlign.center,
+                textDirection: TextDirection.ltr,
                style: AppFonts.yekan12Bold.copyWith(color: AppColor.textColor),
              ),
-
            ],
          ),
        ),
@@ -176,22 +177,19 @@ class SalesOutOfProvincePage extends GetView<SalesOutOfProvinceLogic> {
            mainAxisAlignment: MainAxisAlignment.center,
            spacing: 8,
            children: [
-
-
              Text(
-                item.buyer?.province?? 'N/A',
+                item.buyer?.province ?? 'N/A',
                textAlign: TextAlign.center,
                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
              ),
              Text(
-                item.buyer?.city?? 'N/A',
+                item.buyer?.city ?? 'N/A',
                textAlign: TextAlign.center,
                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
              ),
            ],
          ),
        ),
-
      ],
    );
  }
@@ -257,12 +255,30 @@ class SalesOutOfProvincePage extends GetView<SalesOutOfProvinceLogic> {
          buildRow(title: 'تلفن خریدار', value: item.buyer?.mobile ?? 'N/A'),
          buildRow(title: 'نام واحد', value: item.buyer?.unitName ?? 'N/A'),
          buildRow(
-            title: 'وزن لاشه (کیلوگرم)',
+            title: 'وزن لاشه ',
            value: '${item.weightOfCarcasses?.separatedByCommaFa}',
+            valueLabel: 'کیلوگرم'
          ),
          buildRow(
-            title: 'حجم تقریبی لاشه (قطعه)',
+            title: 'حجم تقریبی لاشه ',
            value: '${item.numberOfCarcasses?.separatedByCommaFa}',
+            valueLabel: 'قطعه'
+
+          ),
+          buildRow(
+              title: 'انبار فروش',
+              value: '${item.quota?.faTitle}',
+          ),
+          buildRow(
+            title: 'کد قرنطینه ',
+            value: item.clearanceCode?? 'بدون کد',
+          ),
+
+          buildRow(
+              title: 'حجم تقریبی لاشه ',
+              value: '${item.numberOfCarcasses?.separatedByCommaFa}',
+              valueLabel: 'قطعه'
+
          ),

          Row(
--- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart
@@ -53,7 +53,7 @@ class SalesOutOfProvinceBuyersPage extends GetView<SalesOutOfProvinceBuyersLogic
                        return ObxValue((val) {
                          return ExpandableListItem2(
                            selected: val.value == index,
-                            onTap: () => controller.toggleExpansion(),
+                            onTap: () => controller.toggleExpansion(index: index),
                            index: index,
                            child: itemListWidget(item),
                            secondChild: itemListExpandedWidget(item),
@@ -304,7 +304,16 @@ class SalesOutOfProvinceBuyersPage extends GetView<SalesOutOfProvinceBuyersLogic
            title: 'تعداد درخواست ها',
            value: '${item.requestsInfo?.numberOfRequests.separatedByCommaFa}',
          ),
-          buildRow(title: 'وزن', value: '${item.requestsInfo?.totalWeight.separatedByCommaFa}'),
+          buildRow(
+            title: 'حجم تقریبی',
+            value: '${item.requestsInfo?.totalQuantity.separatedByCommaFa}',
+            valueLabel: 'قطعه',
+          ),
+          buildRow(
+            title: 'وزن',
+            value: '${item.requestsInfo?.totalWeight.separatedByCommaFa}',
+            valueLabel: 'کیلوگرم',
+          ),

          Row(
            mainAxisAlignment: MainAxisAlignment.center,
--- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/view.dart
@@ -34,6 +34,7 @@ class SalesOutOfProvinceSalesListPage extends GetView<SalesOutOfProvinceSalesLis
                secondChild: itemListExpandedWidget(item, index),
                labelColor: AppColor.blueLight,
                labelIcon: Assets.vec.timerSvg.path,
+                labelIconColor: AppColor.yellowNormal2,
              );
            }, controller.expandedListIndex);
          },
--- a/packages/chicken/lib/presentation/pages/steward/segmentation/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/segmentation/view.dart
@@ -132,9 +132,10 @@ class SegmentationPage extends GetView<SegmentationLogic> {
        Expanded(
          flex: 2,
          child: Text(
-            '${item.weight.separatedByCommaFa} KG',
+            item.weight.separatedByCommaFa.addKg,
            textAlign: TextAlign.center,
-            style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
+            textDirection: TextDirection.ltr,
+            style: AppFonts.yekan14Bold.copyWith(color: AppColor.blueNormal),
          ),
        ),
      ],
@@ -207,7 +208,10 @@ class SegmentationPage extends GetView<SegmentationLogic> {
                : item.buyer?.shop ?? 'N/A',
          ),
          buildRow(title: 'ماهیت', value: item.toGuild != null ? 'مباشر' : 'قطعه‌بند'),
-          buildRow(title: 'وزن قطعه‌بندی', value: '${item.weight?.separatedByCommaFa}'),
+          buildRow(title: 'وزن قطعه‌بندی',
+              value: item.weight!.separatedByCommaFa,
+          valueLabel: 'کیلوگرم'
+          ),

          Row(
            mainAxisAlignment: MainAxisAlignment.center,