fix: resolve import path issues and clean up unused imports across multiple files

packages/chicken/lib/features/poultry_science/presentation/pages/active_hatching/logic.dart

@@ -1,12 +1,7 @@
-<<<<<<<< HEAD:packages/chicken/lib/features/poultry_science/active_hatching/logic.dart
-import 'package:rasadyar_chicken/data/models/response/hatching/hatching_models.dart';
-import 'package:rasadyar_chicken/features/poultry_science/root/logic.dart';
-========
 import 'package:rasadyar_chicken/data/di/chicken_di.dart';
 import 'package:rasadyar_chicken/features/poultry_science/data/model/response/hatching/hatching_models.dart';
 import 'package:rasadyar_chicken/features/poultry_science/data/repositories/poultry_science_repository.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/root/logic.dart';
->>>>>>>> develop:packages/chicken/lib/features/poultry_science/presentation/pages/active_hatching/logic.dart
 import 'package:rasadyar_core/core.dart';
 
 class ActiveHatchingLogic extends GetxController {
@@ -47,8 +42,7 @@ class ActiveHatchingLogic extends GetxController {
     if (isLoadingMore) {
       isLoadingMoreList.value = true;
     } else {
-      activeHatchingList.value =
-          Resource<PaginationModel<HatchingModel>>.loading();
+      activeHatchingList.value = Resource<PaginationModel<HatchingModel>>.loading();
     }
 
     if (searchedValue.value != null &&
@@ -69,21 +63,16 @@ class ActiveHatchingLogic extends GetxController {
       ),
       onSuccess: (res) {
         if ((res?.count ?? 0) == 0) {
-          activeHatchingList.value =
-              Resource<PaginationModel<HatchingModel>>.empty();
+          activeHatchingList.value = Resource<PaginationModel<HatchingModel>>.empty();
         } else {
-          activeHatchingList.value =
-              Resource<PaginationModel<HatchingModel>>.success(
-                PaginationModel<HatchingModel>(
-                  count: res?.count ?? 0,
-                  next: res?.next,
-                  previous: res?.previous,
-                  results: [
-                    ...(activeHatchingList.value.data?.results ?? []),
-                    ...(res?.results ?? []),
-                  ],
-                ),
-              );
+          activeHatchingList.value = Resource<PaginationModel<HatchingModel>>.success(
+            PaginationModel<HatchingModel>(
+              count: res?.count ?? 0,
+              next: res?.next,
+              previous: res?.previous,
+              results: [...(activeHatchingList.value.data?.results ?? []), ...(res?.results ?? [])],
+            ),
+          );
         }
       },
     );

packages/chicken/lib/features/poultry_science/presentation/pages/farm/logic.dart

@@ -1,21 +1,15 @@
 import 'package:flutter/material.dart';
-<<<<<<<< HEAD:packages/chicken/lib/features/poultry_science/farm/logic.dart
-import 'package:rasadyar_chicken/data/models/response/poultry_farm/poultry_farm.dart';
-import 'package:rasadyar_chicken/features/poultry_science/home/logic.dart';
-import 'package:rasadyar_chicken/features/poultry_science/root/logic.dart';
-========
+
 import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_farm/poultry_farm.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/home/logic.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/root/logic.dart';
->>>>>>>> develop:packages/chicken/lib/features/poultry_science/presentation/pages/farm/logic.dart
 import 'package:rasadyar_core/core.dart';
 
 class FarmLogic extends GetxController {
   List<String> routes = ['اقدام', 'فارم ها'];
   PoultryScienceRootLogic rootLogic = Get.find<PoultryScienceRootLogic>();
   BasePageLogic baseLogic = Get.find<BasePageLogic>();
-  final PoultryScienceHomeLogic _homeLogic =
-      Get.find<PoultryScienceHomeLogic>();
+  final PoultryScienceHomeLogic _homeLogic = Get.find<PoultryScienceHomeLogic>();
   RxList<InformationTagData> tagInfo = <InformationTagData>[
     InformationTagData(
       labelTitle: 'کل فارم ها',
@@ -82,18 +76,17 @@ class FarmLogic extends GetxController {
       farmList.value = Resource<PaginationModel<PoultryFarm>>.loading();
     }
     await safeCall(
-      call: () async =>
-          await rootLogic.poultryRepository.getPoultryScienceFarmList(
-            token: rootLogic.tokenService.accessToken.value!,
-            queryParameters: buildQueryParams(
-              queryParams: {'type': 'farm'},
-              role: 'PoultryScience',
-              pageSize: 50,
-              search: 'filter',
-              value: '',
-              page: currentPage.value,
-            ),
-          ),
+      call: () async => await rootLogic.poultryRepository.getPoultryScienceFarmList(
+        token: rootLogic.tokenService.accessToken.value!,
+        queryParameters: buildQueryParams(
+          queryParams: {'type': 'farm'},
+          role: 'PoultryScience',
+          pageSize: 50,
+          search: 'filter',
+          value: '',
+          page: currentPage.value,
+        ),
+      ),
       onSuccess: (res) {
         if ((res?.count ?? 0) == 0) {
           farmList.value = Resource<PaginationModel<PoultryFarm>>.empty();
@@ -103,10 +96,7 @@ class FarmLogic extends GetxController {
               count: res?.count ?? 0,
               next: res?.next,
               previous: res?.previous,
-              results: [
-                ...(farmList.value.data?.results ?? []),
-                ...?res?.results,
-              ],
+              results: [...(farmList.value.data?.results ?? []), ...?res?.results],
             ),
           );
         }

packages/chicken/lib/features/poultry_science/presentation/pages/genocide/logic.dart

@@ -1,12 +1,6 @@
-<<<<<<<< HEAD:packages/chicken/lib/features/poultry_science/genocide/logic.dart
-import 'package:rasadyar_chicken/data/models/response/poultry_order/poultry_order.dart';
-import 'package:rasadyar_chicken/features/poultry_science/killing_registration/logic.dart';
-import 'package:rasadyar_chicken/features/poultry_science/root/logic.dart';
-========
 import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_order/poultry_order.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/killing_registration/logic.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/root/logic.dart';
->>>>>>>> develop:packages/chicken/lib/features/poultry_science/presentation/pages/genocide/logic.dart
 import 'package:rasadyar_core/core.dart';
 
 class GenocideLogic extends GetxController {
@@ -50,8 +44,7 @@ class GenocideLogic extends GetxController {
     if (loadingMore) {
       isLoadingMore.value = true;
     } else {
-      poultryOrderList.value =
-          Resource<PaginationModel<PoultryOrder>>.loading();
+      poultryOrderList.value = Resource<PaginationModel<PoultryOrder>>.loading();
     }
 
     if (searchedValue.value != null &&
@@ -76,25 +69,19 @@ class GenocideLogic extends GetxController {
       onSuccess: (res) async {
         await Future.delayed(Duration(milliseconds: 500));
         if ((res?.count ?? 0) == 0) {
-          poultryOrderList.value =
-              Resource<PaginationModel<PoultryOrder>>.empty();
+          poultryOrderList.value = Resource<PaginationModel<PoultryOrder>>.empty();
         } else {
           if (loadingMore) {
-            poultryOrderList.value =
-                Resource<PaginationModel<PoultryOrder>>.success(
-                  PaginationModel<PoultryOrder>(
-                    count: res?.count ?? 0,
-                    next: res?.next,
-                    previous: res?.previous,
-                    results: [
-                      ...(poultryOrderList.value.data?.results ?? []),
-                      ...(res?.results ?? []),
-                    ],
-                  ),
-                );
+            poultryOrderList.value = Resource<PaginationModel<PoultryOrder>>.success(
+              PaginationModel<PoultryOrder>(
+                count: res?.count ?? 0,
+                next: res?.next,
+                previous: res?.previous,
+                results: [...(poultryOrderList.value.data?.results ?? []), ...(res?.results ?? [])],
+              ),
+            );
           } else {
-            poultryOrderList.value =
-                Resource<PaginationModel<PoultryOrder>>.success(res!);
+            poultryOrderList.value = Resource<PaginationModel<PoultryOrder>>.success(res!);
           }
         }
       },

packages/chicken/lib/features/poultry_science/presentation/pages/genocide/view.dart

@@ -1,12 +1,7 @@
 import 'package:flutter/material.dart';
-<<<<<<<< HEAD:packages/chicken/lib/features/poultry_science/genocide/view.dart
-import 'package:rasadyar_chicken/data/models/response/poultry_order/poultry_order.dart';
-import 'package:rasadyar_chicken/features/poultry_science/killing_registration/view.dart';
-========
+
 import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_order/poultry_order.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/killing_registration/view.dart';
-
->>>>>>>> develop:packages/chicken/lib/features/poultry_science/presentation/pages/genocide/view.dart
 import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
 import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
 import 'package:rasadyar_chicken/presentation/widget/filter_bottom_sheet.dart';
@@ -94,10 +89,7 @@ class GenocidePage extends GetView<GenocideLogic> {
   Container itemListExpandedWidget(PoultryOrder item) {
     return Container(
       padding: EdgeInsets.symmetric(horizontal: 8),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.circular(8),
-      ),
+      decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(8)),
       child: Column(
         spacing: 8,
         children: [
@@ -159,14 +151,8 @@ class GenocidePage extends GetView<GenocideLogic> {
           buildRow(title: 'نوع کشتار ', value: controller.getKillType(item)),
           buildRow(title: 'درخواست', value: controller.getRequestType(item)),
 
-          buildRow(
-            title: 'میانگین وزنی',
-            value: '${(item.indexWeight)} (کیلوگرم)',
-          ),
-          buildRow(
-            title: 'قیمت مرغدار',
-            value: '${item.amount.separatedByComma} (ریال)',
-          ),
+          buildRow(title: 'میانگین وزنی', value: '${(item.indexWeight)} (کیلوگرم)'),
+          buildRow(title: 'قیمت مرغدار', value: '${item.amount.separatedByComma} (ریال)'),
           buildRow(
             title: 'مانده در سالن ',
             value: '${item.hatching?.leftOver.separatedByComma ?? 0} (قطعه)',
@@ -183,10 +169,7 @@ class GenocidePage extends GetView<GenocideLogic> {
                 icon: Assets.vec.trashSvg.svg(
                   width: 16.w,
                   height: 16.h,
-                  colorFilter: ColorFilter.mode(
-                    AppColor.error,
-                    BlendMode.srcIn,
-                  ),
+                  colorFilter: ColorFilter.mode(AppColor.error, BlendMode.srcIn),
                 ),
                 textStyle: AppFonts.yekan16Bold.copyWith(color: AppColor.error),
                 borderColor: AppColor.error,

packages/chicken/lib/features/poultry_science/presentation/pages/home/logic.dart

@@ -1,11 +1,7 @@
 import 'package:flutter/material.dart';
-<<<<<<<< HEAD:packages/chicken/lib/features/poultry_science/home/logic.dart
-import 'package:rasadyar_chicken/data/models/response/poultry_science/home_poultry_science/home_poultry_science_model.dart';
-import 'package:rasadyar_chicken/features/poultry_science/root/logic.dart';
-========
+
 import 'package:rasadyar_chicken/features/poultry_science/data/model/response/home_poultry_science/home_poultry_science_model.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/root/logic.dart';
->>>>>>>> develop:packages/chicken/lib/features/poultry_science/presentation/pages/home/logic.dart
 import 'package:rasadyar_core/core.dart';
 import 'package:rasadyar_core/presentation/widget/custom/information_card_widget.dart';
 
@@ -163,8 +159,7 @@ class PoultryScienceHomeLogic extends GetxController {
                 );
               case 'حجم کشتار شده':
                 return tag.copyWith(
-                  value:
-                      result.hatchingKilledQuantity?.separatedByCommaFa ?? '0',
+                  value: result.hatchingKilledQuantity?.separatedByCommaFa ?? '0',
                   isLoading: false,
                 );
               default:

packages/chicken/lib/features/poultry_science/presentation/pages/inspection/logic.dart

@@ -1,13 +1,8 @@
 import 'package:flutter/material.dart';
-<<<<<<<< HEAD:packages/chicken/lib/features/poultry_science/inspection/logic.dart
-import 'package:rasadyar_chicken/data/models/response/hatching/hatching_models.dart';
-import 'package:rasadyar_chicken/data/models/response/hatching_report/hatching_report.dart';
-import 'package:rasadyar_chicken/features/poultry_science/root/logic.dart';
-========
+
 import 'package:rasadyar_chicken/features/poultry_science/data/model/response/hatching/hatching_models.dart';
 import 'package:rasadyar_chicken/features/poultry_science/data/model/response/hatching_report/hatching_report.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/root/logic.dart';
->>>>>>>> develop:packages/chicken/lib/features/poultry_science/presentation/pages/inspection/logic.dart
 import 'package:rasadyar_core/core.dart';
 
 class InspectionPoultryScienceLogic extends GetxController {
@@ -20,10 +15,7 @@ class InspectionPoultryScienceLogic extends GetxController {
 
   PoultryScienceRootLogic rootLogic = Get.find<PoultryScienceRootLogic>();
 
-  Rx<LatLng> currentLocation = LatLng(
-    34.798315281272544,
-    48.51479142983491,
-  ).obs;
+  Rx<LatLng> currentLocation = LatLng(34.798315281272544, 48.51479142983491).obs;
 
   final RxBool isLoadingMoreAllocationsMade = false.obs;
   RxInt currentPage = 1.obs;
@@ -113,10 +105,7 @@ class InspectionPoultryScienceLogic extends GetxController {
               count: res?.count ?? 0,
               next: res?.next,
               previous: res?.previous,
-              results: [
-                ...(hatchingList.value.data?.results ?? []),
-                ...(res?.results ?? []),
-              ],
+              results: [...(hatchingList.value.data?.results ?? []), ...(res?.results ?? [])],
             ),
           );
         }
@@ -128,8 +117,7 @@ class InspectionPoultryScienceLogic extends GetxController {
     if (isLoadingMore) {
       isLoadingMoreAllocationsMade.value = true;
     } else {
-      hatchingReportList.value =
-          Resource<PaginationModel<HatchingReport>>.loading();
+      hatchingReportList.value = Resource<PaginationModel<HatchingReport>>.loading();
     }
 
     if (searchedValue.value != null &&
@@ -139,36 +127,30 @@ class InspectionPoultryScienceLogic extends GetxController {
     }
 
     safeCall(
-      call: () async =>
-          await rootLogic.poultryRepository.getHatchingPoultryReport(
-            token: rootLogic.tokenService.accessToken.value!,
-            queryParameters: buildQueryParams(
-              role: 'PoultryScience',
-              pageSize: 50,
-              search: 'filter',
-              value: searchedValue.value,
-              fromDate: fromDateFilter.value.toDateTime(),
-              toDate: toDateFilter.value.toDateTime(),
-              page: currentPage.value,
-            ),
-          ),
+      call: () async => await rootLogic.poultryRepository.getHatchingPoultryReport(
+        token: rootLogic.tokenService.accessToken.value!,
+        queryParameters: buildQueryParams(
+          role: 'PoultryScience',
+          pageSize: 50,
+          search: 'filter',
+          value: searchedValue.value,
+          fromDate: fromDateFilter.value.toDateTime(),
+          toDate: toDateFilter.value.toDateTime(),
+          page: currentPage.value,
+        ),
+      ),
       onSuccess: (res) {
         if ((res?.count ?? 0) == 0) {
-          hatchingReportList.value =
-              Resource<PaginationModel<HatchingReport>>.empty();
+          hatchingReportList.value = Resource<PaginationModel<HatchingReport>>.empty();
         } else {
-          hatchingReportList.value =
-              Resource<PaginationModel<HatchingReport>>.success(
-                PaginationModel<HatchingReport>(
-                  count: res?.count ?? 0,
-                  next: res?.next,
-                  previous: res?.previous,
-                  results: [
-                    ...(hatchingReportList.value.data?.results ?? []),
-                    ...(res?.results ?? []),
-                  ],
-                ),
-              );
+          hatchingReportList.value = Resource<PaginationModel<HatchingReport>>.success(
+            PaginationModel<HatchingReport>(
+              count: res?.count ?? 0,
+              next: res?.next,
+              previous: res?.previous,
+              results: [...(hatchingReportList.value.data?.results ?? []), ...(res?.results ?? [])],
+            ),
+          );
         }
       },
     );
@@ -194,10 +176,7 @@ class InspectionPoultryScienceLogic extends GetxController {
     isOnUpload.value = true;
 
     final tmpFiles = await Future.wait(
-      pickedImages.map(
-        (element) =>
-            MultipartFile.fromFile(element.path, filename: element.name),
-      ),
+      pickedImages.map((element) => MultipartFile.fromFile(element.path, filename: element.name)),
     );
 
     var data = FormData.fromMap({
@@ -208,17 +187,13 @@ class InspectionPoultryScienceLogic extends GetxController {
     });
 
     safeCall(
-      call: () async =>
-          await rootLogic.poultryRepository.submitPoultryScienceReport(
-            token: rootLogic.tokenService.accessToken.value!,
-            data: data,
-            onSendProgress: (sent, total) {
-              presentUpload.value = calculateUploadProgress(
-                sent: sent,
-                total: total,
-              );
-            },
-          ),
+      call: () async => await rootLogic.poultryRepository.submitPoultryScienceReport(
+        token: rootLogic.tokenService.accessToken.value!,
+        data: data,
+        onSendProgress: (sent, total) {
+          presentUpload.value = calculateUploadProgress(sent: sent, total: total);
+        },
+      ),
       onSuccess: (res) {
         closeBottomSheet();
         clearImages();
@@ -230,9 +205,7 @@ class InspectionPoultryScienceLogic extends GetxController {
         clearImages();
         isOnUpload.value = false;
 
-        await Future.delayed(
-          const Duration(seconds: 4),
-        ).then((value) => closeBottomSheet());
+        await Future.delayed(const Duration(seconds: 4)).then((value) => closeBottomSheet());
       },
       showError: true,
     );

packages/chicken/lib/features/poultry_science/presentation/pages/killing_registration/logic.dart

@@ -1,16 +1,4 @@
 import 'package:flutter/material.dart';
-<<<<<<<< HEAD:packages/chicken/lib/features/poultry_science/killing_registration/logic.dart
-import 'package:rasadyar_chicken/data/models/poultry_export/poultry_export.dart';
-import 'package:rasadyar_chicken/data/models/request/kill_registration/kill_registration.dart';
-import 'package:rasadyar_chicken/data/models/response/all_poultry/all_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/approved_price/approved_price.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_house_poultry/kill_house_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_request_poultry/kill_request_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_hatching/poultry_hatching.dart';
-import 'package:rasadyar_chicken/data/models/response/sell_for_freezing/sell_for_freezing.dart';
-import 'package:rasadyar_chicken/features/poultry_science/genocide/logic.dart';
-import 'package:rasadyar_chicken/features/poultry_science/root/logic.dart';
-========
 import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_export/poultry_export.dart';
 import 'package:rasadyar_chicken/features/poultry_science/data/model/request/kill_registration/kill_registration.dart';
 import 'package:rasadyar_chicken/features/poultry_science/data/model/response/all_poultry/all_poultry.dart';
@@ -21,7 +9,6 @@ import 'package:rasadyar_chicken/features/poultry_science/data/model/response/po
 import 'package:rasadyar_chicken/features/poultry_science/data/model/response/sell_for_freezing/sell_for_freezing.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/genocide/logic.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/root/logic.dart';
->>>>>>>> develop:packages/chicken/lib/features/poultry_science/presentation/pages/killing_registration/logic.dart
 import 'package:rasadyar_core/core.dart';
 
 class KillingRegistrationLogic extends GetxController {
@@ -39,9 +26,7 @@ class KillingRegistrationLogic extends GetxController {
 
   TextEditingController quantityKillsController = TextEditingController();
   RxBool quantityKillsIsCompleted = false.obs;
-  TextEditingController quantityLoseController = TextEditingController(
-    text: 0.toString(),
-  );
+  TextEditingController quantityLoseController = TextEditingController(text: 0.toString());
   TextEditingController averageWeightKillsController = TextEditingController();
   RxBool averageWeightKillsIsCompleted = false.obs;
   TextEditingController priceFreeSaleController = TextEditingController();
@@ -55,23 +40,25 @@ class KillingRegistrationLogic extends GetxController {
   RxBool isFreeSale = false.obs;
 
   //step 1
-  Rx<Resource<List<AllPoultry>>> allPoultryList =
-      Resource<List<AllPoultry>>.loading().obs;
+  Rx<Resource<List<AllPoultry>>> allPoultryList = Resource<List<AllPoultry>>.loading().obs;
   Rxn<AllPoultry> selectedPoultry = Rxn();
 
   //step 2
-  Rx<Resource<List<KillRequestPoultry>>> poultryList =
-      Resource<List<KillRequestPoultry>>.success([]).obs;
+  Rx<Resource<List<KillRequestPoultry>>> poultryList = Resource<List<KillRequestPoultry>>.success(
+    [],
+  ).obs;
   Rxn<KillRequestPoultry> selectedKillRequestPoultry = Rxn();
 
   //step 3
-  Rx<Resource<List<PoultryHatching>>> poultryHatchingList =
-      Resource<List<PoultryHatching>>.success([]).obs;
+  Rx<Resource<List<PoultryHatching>>> poultryHatchingList = Resource<List<PoultryHatching>>.success(
+    [],
+  ).obs;
   Rxn<PoultryHatching> selectedPoultryHatching = Rxn();
 
   //step 5
-  Rx<Resource<List<KillHousePoultry>>> killHouseList =
-      Resource<List<KillHousePoultry>>.success([]).obs;
+  Rx<Resource<List<KillHousePoultry>>> killHouseList = Resource<List<KillHousePoultry>>.success(
+    [],
+  ).obs;
   Rxn<KillHousePoultry> selectedKillHouse = Rxn();
 
   @override
@@ -95,12 +82,7 @@ class KillingRegistrationLogic extends GetxController {
     });
 
     everAll(
-      [
-        selectedPoultry,
-        selectedKillRequestPoultry,
-        selectedPoultryHatching,
-        selectedKillHouse,
-      ],
+      [selectedPoultry, selectedKillRequestPoultry, selectedPoultryHatching, selectedKillHouse],
       (callback) {
         checkSubmitButton();
       },
@@ -122,15 +104,12 @@ class KillingRegistrationLogic extends GetxController {
 
   void priceListener() {
     quantityKillsController.addListener(() {
-      quantityKillsIsCompleted.value = quantityKillsController.text
-          .trim()
-          .isNotEmpty;
+      quantityKillsIsCompleted.value = quantityKillsController.text.trim().isNotEmpty;
 
       if (averageWeightKillsController.text.isNotEmpty &&
           quantityKillsController.text.trim().isNotEmpty) {
         generatedApprovedPrice.value = calculateApprovedPrice().toInt();
-        priceFreeSaleController.text =
-            generatedApprovedPrice.value.separatedByComma;
+        priceFreeSaleController.text = generatedApprovedPrice.value.separatedByComma;
 
         checkSubmitButton();
       } else {
@@ -141,15 +120,12 @@ class KillingRegistrationLogic extends GetxController {
     });
 
     averageWeightKillsController.addListener(() {
-      averageWeightKillsIsCompleted.value = averageWeightKillsController.text
-          .trim()
-          .isNotEmpty;
+      averageWeightKillsIsCompleted.value = averageWeightKillsController.text.trim().isNotEmpty;
 
       if (averageWeightKillsController.text.trim().isNotEmpty &&
           quantityKillsController.text.trim().isNotEmpty) {
         generatedApprovedPrice.value = calculateApprovedPrice().toInt();
-        priceFreeSaleController.text =
-            generatedApprovedPrice.value.separatedByComma;
+        priceFreeSaleController.text = generatedApprovedPrice.value.separatedByComma;
         checkSubmitButton();
       } else {
         generatedApprovedPrice.value = 0;
@@ -201,9 +177,7 @@ class KillingRegistrationLogic extends GetxController {
     await safeCall(
       call: () async => await rootLogic.poultryRepository.getAllPoultry(
         token: tokenService.accessToken.value ?? '',
-        queryParameters: buildRawQueryParams(
-          role: gService.getRole(Module.chicken),
-        ),
+        queryParameters: buildRawQueryParams(role: gService.getRole(Module.chicken)),
       ),
       onSuccess: (result) {
         if (result != null) {
@@ -211,9 +185,7 @@ class KillingRegistrationLogic extends GetxController {
         }
       },
       onError: (error, stackTrace) {
-        allPoultryList.value = Resource<List<AllPoultry>>.error(
-          '$error -- $stackTrace',
-        );
+        allPoultryList.value = Resource<List<AllPoultry>>.error('$error -- $stackTrace');
       },
     );
   }
@@ -258,15 +230,11 @@ class KillingRegistrationLogic extends GetxController {
       ),
       onSuccess: (result) {
         if (result != null) {
-          poultryList.value = Resource<List<KillRequestPoultry>>.success(
-            result,
-          );
+          poultryList.value = Resource<List<KillRequestPoultry>>.success(result);
         }
       },
       onError: (error, stackTrace) {
-        poultryList.value = Resource<List<KillRequestPoultry>>.error(
-          '$error -- $stackTrace',
-        );
+        poultryList.value = Resource<List<KillRequestPoultry>>.error('$error -- $stackTrace');
       },
     );
   }
@@ -282,15 +250,11 @@ class KillingRegistrationLogic extends GetxController {
       ),
       onSuccess: (result) {
         if (result != null) {
-          poultryHatchingList.value = Resource<List<PoultryHatching>>.success(
-            result,
-          );
+          poultryHatchingList.value = Resource<List<PoultryHatching>>.success(result);
         }
       },
       onError: (error, stackTrace) {
-        poultryHatchingList.value = Resource<List<PoultryHatching>>.error(
-          '$error -- $stackTrace',
-        );
+        poultryHatchingList.value = Resource<List<PoultryHatching>>.error('$error -- $stackTrace');
       },
     );
   }
@@ -301,23 +265,16 @@ class KillingRegistrationLogic extends GetxController {
       call: () async => await rootLogic.poultryRepository.getKillHouseList(
         token: tokenService.accessToken.value ?? '',
         queryParameters: buildRawQueryParams(
-          queryParams: {
-            'show_poultry': '',
-            'date': DateTime.now().formattedDashedGregorian,
-          },
+          queryParams: {'show_poultry': '', 'date': DateTime.now().formattedDashedGregorian},
         ),
       ),
       onSuccess: (result) {
         if (result != null) {
-          killHouseList.value = Resource<List<KillHousePoultry>>.success(
-            result,
-          );
+          killHouseList.value = Resource<List<KillHousePoultry>>.success(result);
         }
       },
       onError: (error, stackTrace) {
-        killHouseList.value = Resource<List<KillHousePoultry>>.error(
-          '$error -- $stackTrace',
-        );
+        killHouseList.value = Resource<List<KillHousePoultry>>.error('$error -- $stackTrace');
       },
     );
   }
@@ -354,11 +311,7 @@ class KillingRegistrationLogic extends GetxController {
         selectedPoultryHatching.value != null &&
         quantityKillsController.text.isNotEmpty &&
         averageWeightKillsController.text.isNotEmpty &&
-        ((selectedKillRequestPoultry
-                    .value
-                    ?.provinceAllowChooseKillHouse
-                    ?.mandatory ??
-                false)
+        ((selectedKillRequestPoultry.value?.provinceAllowChooseKillHouse?.mandatory ?? false)
             ? selectedKillHouse.value != null
             : true);
   }
@@ -399,11 +352,10 @@ class KillingRegistrationLogic extends GetxController {
     );
 
     await safeCall(
-      call: () async =>
-          await rootLogic.poultryRepository.submitKillRegistration(
-            token: tokenService.accessToken.value ?? '',
-            request: registrationRequest,
-          ),
+      call: () async => await rootLogic.poultryRepository.submitKillRegistration(
+        token: tokenService.accessToken.value ?? '',
+        request: registrationRequest,
+      ),
       onSuccess: (result) async {
         defaultShowSuccessMessage(
           'ثبت با موفقیت انجام شد',

packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart

@@ -1,15 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:rasadyar_chicken/data/di/chicken_di.dart';
-<<<<<<<< HEAD:packages/chicken/lib/features/poultry_science/root/logic.dart
-import 'package:rasadyar_chicken/data/repositories/poultry_science/poultry_science_repository.dart';
-import 'package:rasadyar_chicken/features/common/profile/view.dart';
-import 'package:rasadyar_chicken/features/poultry_science/home/view.dart';
-========
+
 import 'package:rasadyar_chicken/features/poultry_science/data/repositories/poultry_science_repository.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/home/view.dart';
 import 'package:rasadyar_chicken/features/common/presentation/page/profile/view.dart';
->>>>>>>> develop:packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart
 import 'package:rasadyar_chicken/presentation/routes/pages.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/routes/routes.dart';
 import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
@@ -92,8 +87,7 @@ class PoultryScienceRootLogic extends GetxController {
       Get.back(id: nestedKeyId);
     } else {
       final now = DateTime.now();
-      if (_lastBackPressed == null ||
-          now.difference(_lastBackPressed!) > Duration(seconds: 2)) {
+      if (_lastBackPressed == null || now.difference(_lastBackPressed!) > Duration(seconds: 2)) {
         _lastBackPressed = now;
         Get.snackbar(
           'خروج از برنامه',