Merge branch with resolved conflicts - restructured features and added new modules

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

@@ -1,14 +1,16 @@
 import 'package:flutter/material.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';
 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: 'کل فارم ها',
@@ -75,17 +77,18 @@ 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();
@@ -95,7 +98,10 @@ 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/farm/view.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_farm/poultry_farm.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_farm/poultry_farm.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';
@@ -28,7 +28,7 @@ class FarmPage extends GetView<FarmLogic> {
         controller.getFarmList();
       },
       routes: controller.routes,
-      backId: poultryFirstKey,
+      backId: poultryScienceActionKey,
       child: Column(children: [firstTagInformation(), farmListWidget()]),
     );
   }
@@ -76,7 +76,6 @@ class FarmPage extends GetView<FarmLogic> {
           itemCount: data.value.data?.results?.length ?? 0,
           separatorBuilder: (context, index) => SizedBox(height: 8.h),
           onLoadMore: () async => controller.getFarmList(true),
-
         );
       }, controller.farmList),
     );
@@ -85,7 +84,10 @@ class FarmPage extends GetView<FarmLogic> {
   Container itemListExpandedWidget(PoultryFarm 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: [
@@ -134,10 +136,19 @@ class FarmPage extends GetView<FarmLogic> {
             ),
           ),
 
-          buildRow(title: 'مالک/ تلفن', value: '${item.user?.fullname} (${item.user?.mobile})'),
+          buildRow(
+            title: 'مالک/ تلفن',
+            value: '${item.user?.fullname} (${item.user?.mobile})',
+          ),
           buildRow(title: 'شناسه یکتا', value: item.breedingUniqueId ?? 'N/A'),
-          buildRow(title: 'کد اپیدمیولوژیک', value: item.epidemiologicalCode ?? 'N/A'),
-          buildRow(title: 'کد بهداشتی', value: item.healthCertificateNumber ?? 'N/A'),
+          buildRow(
+            title: 'کد اپیدمیولوژیک',
+            value: item.epidemiologicalCode ?? 'N/A',
+          ),
+          buildRow(
+            title: 'کد بهداشتی',
+            value: item.healthCertificateNumber ?? 'N/A',
+          ),
           buildRow(
             title: 'دامپزشک فارم',
             value: '${item.vetFarm?.fullName} (${item.vetFarm?.mobile ?? '-'})',