mr.mojtaba/rasadyar_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: update layout dimensions and improve text formatting in poultry farm inspection pages

Browse Source
This commit is contained in:
mr.mojtaba
2025-11-22 09:30:21 +03:30
parent 9364c0c351
commit a47263d98e
7 changed files with 188 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/local.properties
View File

@@ -1,4 +1,4 @@
sdk.dir=C:\\Users\\Housh11\\AppData\\Local\\Android\\sdk
sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk
flutter.sdk=C:\\src\\flutter
flutter.buildMode=debug
flutter.versionName=1.3.33

272
packages/chicken/lib/presentation/pages/poultry_farm_inspection/home/view.dart
View File

@@ -7,8 +7,7 @@ import 'package:rasadyar_core/core.dart';
import '../widgets/cu_bottom_sheet.dart';
import 'logic.dart';
class PoultryFarmInspectionHomePage
extends GetView<PoultryFarmInspectionHomeLogic> {
class PoultryFarmInspectionHomePage extends GetView<PoultryFarmInspectionHomeLogic> {
const PoultryFarmInspectionHomePage({super.key});
@override
@@ -38,9 +37,7 @@ class PoultryFarmInspectionHomePage
infoCards(),
segmentWidget(),
ObxValue((data) {
return data.value == 0
? activeInspectionWidget()
: inactiveInspectionWidget();
return data.value == 0 ? activeInspectionWidget() : inactiveInspectionWidget();
}, controller.selectedSegmentIndex),
],
),
@@ -55,7 +52,7 @@ class PoultryFarmInspectionHomePage
addOrEditBottomSheet(controller),
isScrollControlled: true,
ignoreSafeArea: false,
).then((value) => controller.clearForm(),);
).then((value) => controller.clearForm());
},
),
),
@@ -66,31 +63,15 @@ class PoultryFarmInspectionHomePage
Padding infoCards() {
return Padding(
padding: const EdgeInsets.fromLTRB(9, 12, 7, 8),
padding: const EdgeInsets.fromLTRB(9, 12, 9, 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
spacing: 8,
children: [
cardInfo(
value: 2225256,
description: 'بازرسی شده',
color: const Color(0xFFB6DED8),
),
cardInfo(
value: 2050,
description: 'بازرسی نشده',
color: const Color(0xFFE9CED7),
),
cardInfo(
value: 2225256,
description: 'عملکرد مناسب',
color: const Color(0xFFCFE0FF),
),
cardInfo(
value: 55225,
description: 'عملکرد ضعیف',
color: const Color(0xFFF3D6CB),
),
cardInfo(value: 2225256, description: 'بازرسی شده', color: const Color(0xFFB6DED8)),
cardInfo(value: 2050, description: 'بازرسی نشده', color: const Color(0xFFE9CED7)),
cardInfo(value: 2225256, description: 'عملکرد مناسب', color: const Color(0xFFCFE0FF)),
cardInfo(value: 55225, description: 'عملکرد ضعیف', color: const Color(0xFFF3D6CB)),
],
),
);
@@ -108,8 +89,7 @@ class PoultryFarmInspectionHomePage
borderColor: const Color(0xFFB4B4B4),
selectedBorderColor: AppColor.blueNormal,
selectedBackgroundColor: AppColor.blueLight,
onSegmentSelected: (index) =>
controller.changeSegmentIndex(index),
onSegmentSelected: (index) => controller.changeSegmentIndex(index),
backgroundColor: AppColor.whiteGreyNormal,
),
),
@@ -165,10 +145,7 @@ class PoultryFarmInspectionHomePage
final reportColor = AppColor.redDark;
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: [
@@ -204,10 +181,7 @@ class PoultryFarmInspectionHomePage
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'نژاد:$breed',
style: AppFonts.yekan14.copyWith(color: AppColor.textColor),
),
Text('نژاد:$breed', style: AppFonts.yekan14.copyWith(color: AppColor.textColor)),
Text(
' سن $ageInDays (روزه)',
style: AppFonts.yekan14.copyWith(color: AppColor.blueNormal),
@@ -220,16 +194,8 @@ class PoultryFarmInspectionHomePage
),
),
buildRow(title: 'شماره مجوز جوجه ریزی', value: licenceNumber),
buildUnitRow(
title: 'حجم جوجه ریزی',
value: chickVolume,
unit: '(قطعه)',
),
buildUnitRow(
title: 'مانده در سالن',
value: hallRemain,
unit: '(قطعه)',
),
buildUnitRow(title: 'حجم جوجه ریزی', value: chickVolume, unit: '(قطعه)'),
buildUnitRow(title: 'مانده در سالن', value: hallRemain, unit: '(قطعه)'),
buildUnitRow(title: 'تلفات', value: losses, unit: '(قطعه)'),
buildRow(title: 'دامپزشک فارم', value: vetInfo),
buildRow(
@@ -423,10 +389,7 @@ class PoultryFarmInspectionHomePage
final reportColor = AppColor.greenNormal;
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: [
@@ -462,10 +425,7 @@ class PoultryFarmInspectionHomePage
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'نژاد:$breed',
style: AppFonts.yekan14.copyWith(color: AppColor.textColor),
),
Text('نژاد:$breed', style: AppFonts.yekan14.copyWith(color: AppColor.textColor)),
Text(
' سن $ageInDays (روزه)',
style: AppFonts.yekan14.copyWith(color: AppColor.blueNormal),
@@ -478,16 +438,8 @@ class PoultryFarmInspectionHomePage
),
),
buildRow(title: 'شماره مجوز جوجه ریزی', value: licenceNumber),
buildUnitRow(
title: 'حجم جوجه ریزی',
value: chickVolume,
unit: '(قطعه)',
),
buildUnitRow(
title: 'مانده در سالن',
value: hallRemain,
unit: '(قطعه)',
),
buildUnitRow(title: 'حجم جوجه ریزی', value: chickVolume, unit: '(قطعه)'),
buildUnitRow(title: 'مانده در سالن', value: hallRemain, unit: '(قطعه)'),
buildUnitRow(title: 'تلفات', value: losses, unit: '(قطعه)'),
buildRow(title: 'دامپزشک فارم', value: vetInfo),
buildRow(
@@ -504,27 +456,18 @@ class PoultryFarmInspectionHomePage
Assets.vec.excelDownloadSvg.svg(
width: 24.w,
height: 24.h,
colorFilter: ColorFilter.mode(
AppColor.greenDark,
BlendMode.srcIn,
),
colorFilter: ColorFilter.mode(AppColor.greenDark, BlendMode.srcIn),
),
Text(
'مشاهده جزییات ',
style: AppFonts.yekan14Bold.copyWith(
color: AppColor.greenDark,
),
style: AppFonts.yekan14Bold.copyWith(color: AppColor.greenDark),
),
],
),
borderColor: AppColor.greenDark,
onPressed: () {
Get.bottomSheet(
detailsWidget(),
isScrollControlled: true,
isDismissible: true,
);
Get.bottomSheet(detailsWidget(), isScrollControlled: true, isDismissible: true);
},
),
],
@@ -544,24 +487,15 @@ class PoultryFarmInspectionHomePage
Row(
children: [
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 4,
vertical: 10,
),
padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 10),
child: Text(
'جزییات',
style: AppFonts.yekan18Bold.copyWith(
color: AppColor.iconColor,
),
style: AppFonts.yekan18Bold.copyWith(color: AppColor.iconColor),
),
),
],
),
Divider(
color: AppColor.blackLightHover,
height: 1,
thickness: 1,
),
Divider(color: AppColor.blackLightHover, height: 1, thickness: 1),
ObxValue((data) {
return tabBarWidget(
['اطلاعات', 'پاییش سلامت', 'زیرساخت', 'مستندات'],
@@ -603,56 +537,35 @@ class PoultryFarmInspectionHomePage
SizedBox(height: 10),
Row(
children: [
Text(
'مشخصات کلی',
style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor),
),
Text('مشخصات کلی', style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor)),
],
),
SizedBox(height: 10),
Container(
clipBehavior: Clip.hardEdge,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8),
),
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(8)),
child: Column(
children: [
rTableRow(title: 'نام واحد مرغداری', value: 'لذیذ'),
rTableRow(title: 'کد یکتا / شناسه واحد', value: '2541415'),
rTableRow(
title: 'نام مالک / بهره‌بردار',
value: 'مرغداری احمدی',
),
rTableRow(title: 'نام مالک / بهره‌بردار', value: 'مرغداری احمدی'),
rTableRow(title: 'موجودی سوخت اضطراری', value: '200 لیتر'),
rTableRow(
title: 'شهر/تعاونی',
value: 'خرم آباد/تعاونی خرم آباد',
),
rTableRow(title: 'شهر/تعاونی', value: 'خرم آباد/تعاونی خرم آباد'),
rTableRow(title: 'شماره تلفن واحد', value: '021-12345678'),
rTableRow(title: 'دامپزشک فارم', value: 'dd dd (05218569685)'),
rTableRow(title: 'سالن', value: '2'),
rTableRow(
title: 'تاریخ ثبت جوجه ریزی',
value: '1402/09/19 (10:12)',
),
rTableRow(
title: 'شهر/تعاونی',
value: 'خرم آباد/تعاونی خرم آباد',
),
rTableRow(title: 'تاریخ ثبت جوجه ریزی', value: '1402/09/19 (10:12)'),
rTableRow(title: 'شهر/تعاونی', value: 'خرم آباد/تعاونی خرم آباد'),
rTableRow(title: 'شماره تلفن واحد', value: '021-12345678'),
rTableRow(title: 'دامپزشک فارم', value: 'dd dd (05218569685)'),
rTableRow(title: 'سالن', value: '2'),
rTableRow(
title: 'تاریخ ثبت جوجه ریزی',
value: '1402/09/19 (10:12)',
),
rTableRow(title: 'تاریخ ثبت جوجه ریزی', value: '1402/09/19 (10:12)'),
],
),
),
@@ -671,9 +584,7 @@ class PoultryFarmInspectionHomePage
alignment: Alignment.centerRight,
decoration: BoxDecoration(
color: AppColor.bgLight2,
border: Border(
bottom: BorderSide(color: AppColor.blackLightHover, width: 1),
),
border: Border(bottom: BorderSide(color: AppColor.blackLightHover, width: 1)),
),
child: Text(
title ?? '',
@@ -687,9 +598,7 @@ class PoultryFarmInspectionHomePage
padding: EdgeInsets.symmetric(horizontal: 9, vertical: 11),
alignment: Alignment.centerRight,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(color: AppColor.blackLightHover, width: 1),
),
border: Border(bottom: BorderSide(color: AppColor.blackLightHover, width: 1)),
),
child: Text(
value ?? '',
@@ -701,11 +610,7 @@ class PoultryFarmInspectionHomePage
);
}
Widget tabBarWidget(
List<String> tabs,
int selectedIndex,
Function(int) onTabSelected,
) {
Widget tabBarWidget(List<String> tabs, int selectedIndex, Function(int) onTabSelected) {
return SizedBox(
height: 38.h,
width: Get.width,
@@ -723,18 +628,10 @@ class PoultryFarmInspectionHomePage
onTap: () => onTabSelected(tabs.indexOf(tab)),
behavior: HitTestBehavior.opaque,
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 10,
vertical: 11,
),
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 11),
decoration: BoxDecoration(
border: tab == tabs[selectedIndex]
? Border(
bottom: BorderSide(
color: AppColor.blueNormalOld,
width: 3,
),
)
? Border(bottom: BorderSide(color: AppColor.blueNormalOld, width: 3))
: null,
),
child: Text(
@@ -756,11 +653,7 @@ class PoultryFarmInspectionHomePage
bottom: 0,
left: 0,
right: 0,
child: Divider(
color: AppColor.blackLightHover,
height: 1,
thickness: 1,
),
child: Divider(color: AppColor.blackLightHover, height: 1, thickness: 1),
),
],
),
@@ -776,56 +669,35 @@ class PoultryFarmInspectionHomePage
SizedBox(height: 10),
Row(
children: [
Text(
'پاییش سلامت',
style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor),
),
Text('پاییش سلامت', style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor)),
],
),
SizedBox(height: 10),
Container(
clipBehavior: Clip.hardEdge,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8),
),
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(8)),
child: Column(
children: [
rTableRow(title: 'نام واحد مرغداری', value: 'لذیذ'),
rTableRow(title: 'کد یکتا / شناسه واحد', value: '2541415'),
rTableRow(
title: 'نام مالک / بهره‌بردار',
value: 'مرغداری احمدی',
),
rTableRow(title: 'نام مالک / بهره‌بردار', value: 'مرغداری احمدی'),
rTableRow(title: 'موجودی سوخت اضطراری', value: '200 لیتر'),
rTableRow(
title: 'شهر/تعاونی',
value: 'خرم آباد/تعاونی خرم آباد',
),
rTableRow(title: 'شهر/تعاونی', value: 'خرم آباد/تعاونی خرم آباد'),
rTableRow(title: 'شماره تلفن واحد', value: '021-12345678'),
rTableRow(title: 'دامپزشک فارم', value: 'dd dd (05218569685)'),
rTableRow(title: 'سالن', value: '2'),
rTableRow(
title: 'تاریخ ثبت جوجه ریزی',
value: '1402/09/19 (10:12)',
),
rTableRow(
title: 'شهر/تعاونی',
value: 'خرم آباد/تعاونی خرم آباد',
),
rTableRow(title: 'تاریخ ثبت جوجه ریزی', value: '1402/09/19 (10:12)'),
rTableRow(title: 'شهر/تعاونی', value: 'خرم آباد/تعاونی خرم آباد'),
rTableRow(title: 'شماره تلفن واحد', value: '021-12345678'),
rTableRow(title: 'دامپزشک فارم', value: 'dd dd (05218569685)'),
rTableRow(title: 'سالن', value: '2'),
rTableRow(
title: 'تاریخ ثبت جوجه ریزی',
value: '1402/09/19 (10:12)',
),
rTableRow(title: 'تاریخ ثبت جوجه ریزی', value: '1402/09/19 (10:12)'),
],
),
),
@@ -843,56 +715,35 @@ class PoultryFarmInspectionHomePage
SizedBox(height: 10),
Row(
children: [
Text(
'زیرساخت',
style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor),
),
Text('زیرساخت', style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor)),
],
),
SizedBox(height: 10),
Container(
clipBehavior: Clip.hardEdge,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8),
),
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(8)),
child: Column(
children: [
rTableRow(title: 'نام واحد مرغداری', value: 'لذیذ'),
rTableRow(title: 'کد یکتا / شناسه واحد', value: '2541415'),
rTableRow(
title: 'نام مالک / بهره‌بردار',
value: 'مرغداری احمدی',
),
rTableRow(title: 'نام مالک / بهره‌بردار', value: 'مرغداری احمدی'),
rTableRow(title: 'موجودی سوخت اضطراری', value: '200 لیتر'),
rTableRow(
title: 'شهر/تعاونی',
value: 'خرم آباد/تعاونی خرم آباد',
),
rTableRow(title: 'شهر/تعاونی', value: 'خرم آباد/تعاونی خرم آباد'),
rTableRow(title: 'شماره تلفن واحد', value: '021-12345678'),
rTableRow(title: 'دامپزشک فارم', value: 'dd dd (05218569685)'),
rTableRow(title: 'سالن', value: '2'),
rTableRow(
title: 'تاریخ ثبت جوجه ریزی',
value: '1402/09/19 (10:12)',
),
rTableRow(
title: 'شهر/تعاونی',
value: 'خرم آباد/تعاونی خرم آباد',
),
rTableRow(title: 'تاریخ ثبت جوجه ریزی', value: '1402/09/19 (10:12)'),
rTableRow(title: 'شهر/تعاونی', value: 'خرم آباد/تعاونی خرم آباد'),
rTableRow(title: 'شماره تلفن واحد', value: '021-12345678'),
rTableRow(title: 'دامپزشک فارم', value: 'dd dd (05218569685)'),
rTableRow(title: 'سالن', value: '2'),
rTableRow(
title: 'تاریخ ثبت جوجه ریزی',
value: '1402/09/19 (10:12)',
),
rTableRow(title: 'تاریخ ثبت جوجه ریزی', value: '1402/09/19 (10:12)'),
],
),
),
@@ -910,10 +761,7 @@ class PoultryFarmInspectionHomePage
SizedBox(height: 10),
Row(
children: [
Text(
'مستندات',
style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor),
),
Text('مستندات', style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor)),
],
),
@@ -944,9 +792,7 @@ class PoultryFarmInspectionHomePage
color: Color(0x33000000),
image: DecorationImage(
fit: BoxFit.cover,
image: NetworkImage(
"https://picsum.photos/150/150?random=$index",
),
image: NetworkImage("https://picsum.photos/150/150?random=$index"),
),
borderRadius: BorderRadius.circular(8),
@@ -963,9 +809,7 @@ class PoultryFarmInspectionHomePage
Text(
'200 فارم در این سالن تخمین زده شده است.',
textAlign: TextAlign.right,
style: AppFonts.yekan14Bold.copyWith(
color: AppColor.textColor,
),
style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor),
),
],
),
@@ -1020,9 +864,7 @@ class PoultryFarmInspectionHomePage
Text(
'انبار نهاده ها',
textAlign: TextAlign.right,
style: AppFonts.yekan14Bold.copyWith(
color: AppColor.textColor,
),
style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor),
),
],
),
@@ -1077,9 +919,7 @@ class PoultryFarmInspectionHomePage
Text(
'تلفات',
textAlign: TextAlign.right,
style: AppFonts.yekan14Bold.copyWith(
color: AppColor.textColor,
),
style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor),
),
],
),
@@ -1090,5 +930,5 @@ class PoultryFarmInspectionHomePage
],
),
);
}
}
}

9
packages/chicken/lib/presentation/pages/poultry_farm_inspection/widgets/step1_page.dart
View File

@@ -12,7 +12,7 @@ Widget step1Page(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 25.h),
Container(
height: 500.h,
height: 610.h,
clipBehavior: Clip.none,
width: Get.width,
child: farmInfoWidget(
@@ -25,7 +25,7 @@ Widget step1Page(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 30.h),
Container(
height: 340.h,
height: 400.h,
clipBehavior: Clip.none,
width: Get.width,
child: farmInfoWidget(
@@ -108,10 +108,7 @@ Column basicUnitInformation(PoultryFarmInspectionHomeLogic controller) {
spacing: 4,
children: [
Icon(Icons.my_location_rounded, color: Colors.white, size: 24),
Text(
'دریافت موقعیت جغرافیایی',
style: AppFonts.yekan14.copyWith(color: Colors.white),
),
Text('دریافت موقعیت جغرافیایی', style: AppFonts.yekan14.copyWith(color: Colors.white)),
],
),
),

71
packages/chicken/lib/presentation/pages/poultry_farm_inspection/widgets/step2_page.dart
View File

@@ -12,7 +12,7 @@ Widget step2Page(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 35.h),
Container(
height: 645.h,
height: 760.h,
clipBehavior: Clip.none,
width: Get.width,
child: farmInfoWidget(
@@ -25,7 +25,7 @@ Widget step2Page(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 30.h),
Container(
height: 410.h,
height: 430.h,
clipBehavior: Clip.none,
width: Get.width,
child: farmInfoWidget(
@@ -37,7 +37,7 @@ Widget step2Page(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 24.h),
Container(
height: 380.h,
height: 450.h,
clipBehavior: Clip.none,
width: Get.width,
child: farmInfoWidget(
@@ -55,6 +55,7 @@ Column generalConditionOfTheHall(PoultryFarmInspectionHomeLogic controller) {
return Column(
spacing: 10,
children: [
SizedBox(height: 12),
cardInfo(
padding: EdgeInsets.fromLTRB(0, 12, 12, 6),
child: Column(
@@ -72,10 +73,7 @@ Column generalConditionOfTheHall(PoultryFarmInspectionHomeLogic controller) {
padding: EdgeInsets.all(22),
decoration: BoxDecoration(
color: Color(0xFFE9E9E9),
border: Border.all(
width: 1,
color: AppColor.blackLightHover,
),
border: Border.all(width: 1, color: AppColor.blackLightHover),
borderRadius: BorderRadius.circular(8),
),
child: Assets.vec.galleryAddSvg.svg(width: 36, height: 36),
@@ -111,29 +109,25 @@ Column generalConditionOfTheHall(PoultryFarmInspectionHomeLogic controller) {
selectedIndex: data.value,
index: 0,
label: 'عالی',
onTap: (index) =>
controller.setSanitaryConditionOfTheHallIndex(index),
onTap: (index) => controller.setSanitaryConditionOfTheHallIndex(index),
),
formChips(
selectedIndex: data.value,
index: 1,
label: 'خوب',
onTap: (index) =>
controller.setSanitaryConditionOfTheHallIndex(index),
onTap: (index) => controller.setSanitaryConditionOfTheHallIndex(index),
),
formChips(
selectedIndex: data.value,
index: 2,
label: 'متوسط',
onTap: (index) =>
controller.setSanitaryConditionOfTheHallIndex(index),
onTap: (index) => controller.setSanitaryConditionOfTheHallIndex(index),
),
formChips(
selectedIndex: data.value,
index: 3,
label: 'ضعیف',
onTap: (index) =>
controller.setSanitaryConditionOfTheHallIndex(index),
onTap: (index) => controller.setSanitaryConditionOfTheHallIndex(index),
),
],
);
@@ -148,10 +142,7 @@ Column generalConditionOfTheHall(PoultryFarmInspectionHomeLogic controller) {
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 9,
children: [
Text(
'وضعیت تهویه',
style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2),
),
Text('وضعیت تهویه', style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2)),
ObxValue((data) {
return Row(
@@ -159,22 +150,19 @@ Column generalConditionOfTheHall(PoultryFarmInspectionHomeLogic controller) {
spacing: 10,
children: [
formChips(
onTap: (index) =>
controller.setVentilationStatusIndex(index),
onTap: (index) => controller.setVentilationStatusIndex(index),
selectedIndex: data.value,
index: 0,
label: 'خشک',
),
formChips(
onTap: (index) =>
controller.setVentilationStatusIndex(index),
onTap: (index) => controller.setVentilationStatusIndex(index),
selectedIndex: data.value,
index: 1,
label: 'نیمه‌مرطوب',
),
formChips(
onTap: (index) =>
controller.setVentilationStatusIndex(index),
onTap: (index) => controller.setVentilationStatusIndex(index),
selectedIndex: data.value,
index: 2,
label: 'مرطوب',
@@ -192,10 +180,7 @@ Column generalConditionOfTheHall(PoultryFarmInspectionHomeLogic controller) {
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 9,
children: [
Text(
'وضعیت بستر',
style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2),
),
Text('وضعیت بستر', style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2)),
ObxValue((data) {
return SingleChildScrollView(
@@ -390,16 +375,10 @@ Column casualtiesInformation(PoultryFarmInspectionHomeLogic controller) {
),
ResourceOverlayDropdown(
items: Resource.success([
'بیماری',
'قطعی برق',
'استرس گرمایی',
'مشکلات دانه',
]),
items: Resource.success(['بیماری', 'قطعی برق', 'استرس گرمایی', 'مشکلات دانه']),
itemBuilder: (item) => Text(item),
labelBuilder: (selected) =>
Text(selected ?? 'علت احتمالی تلفات غیرعادی'),
labelBuilder: (selected) => Text(selected ?? 'علت احتمالی تلفات غیرعادی'),
),
ResourceOverlayDropdown(
@@ -415,10 +394,7 @@ Column casualtiesInformation(PoultryFarmInspectionHomeLogic controller) {
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 9,
children: [
Text(
'نوع نمونه',
style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2),
),
Text('نوع نمونه', style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2)),
ObxValue((data) {
return Row(
@@ -460,24 +436,17 @@ Column diseasesAndHealthInformation(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 1.h),
ResourceOverlayDropdown(
items: Resource.success([
'بیماری',
'قطعی برق',
'استرس گرمایی',
'مشکلات دانه',
]),
items: Resource.success(['بیماری', 'قطعی برق', 'استرس گرمایی', 'مشکلات دانه']),
itemBuilder: (item) => Text(item),
labelBuilder: (selected) =>
Text(selected ?? 'وجود علائم بیماری در گله'),
labelBuilder: (selected) => Text(selected ?? 'وجود علائم بیماری در گله'),
),
ResourceOverlayDropdown(
items: Resource.success(['انجام نشد', 'انجام شد']),
itemBuilder: (item) => Text(item),
labelBuilder: (selected) =>
Text(selected ?? 'نوع بیماری تشخیص داده‌شده / مشکوک'),
labelBuilder: (selected) => Text(selected ?? 'نوع بیماری تشخیص داده‌شده / مشکوک'),
),
RTextField(

158
packages/chicken/lib/presentation/pages/poultry_farm_inspection/widgets/step3_page.dart
View File

@@ -12,7 +12,7 @@ Widget step3Page(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 35.h),
Container(
height: 350.h,
height: 410.h,
clipBehavior: Clip.none,
width: Get.width,
child: farmInfoWidget(
@@ -25,7 +25,7 @@ Widget step3Page(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 30.h),
Container(
height: 550.h,
height: 650.h,
clipBehavior: Clip.none,
width: Get.width,
child: farmInfoWidget(
@@ -37,7 +37,7 @@ Widget step3Page(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 24.h),
Container(
height: 380.h,
height: 405.h,
clipBehavior: Clip.none,
width: Get.width,
child: farmInfoWidget(
@@ -49,7 +49,7 @@ Widget step3Page(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 24.h),
Container(
height: 380.h,
height: 440.h,
clipBehavior: Clip.none,
width: Get.width,
child: farmInfoWidget(
@@ -84,10 +84,7 @@ Column agriculturalInput2(PoultryFarmInspectionHomeLogic controller) {
padding: EdgeInsets.all(22),
decoration: BoxDecoration(
color: Color(0xFFE9E9E9),
border: Border.all(
width: 1,
color: AppColor.blackLightHover,
),
border: Border.all(width: 1, color: AppColor.blackLightHover),
borderRadius: BorderRadius.circular(8),
),
child: Assets.vec.galleryAddSvg.svg(width: 36, height: 36),
@@ -123,29 +120,25 @@ Column agriculturalInput2(PoultryFarmInspectionHomeLogic controller) {
selectedIndex: data.value,
index: 0,
label: 'عالی',
onTap: (index) =>
controller.setSanitaryConditionOfTheHallIndex(index),
onTap: (index) => controller.setSanitaryConditionOfTheHallIndex(index),
),
formChips(
selectedIndex: data.value,
index: 1,
label: 'خوب',
onTap: (index) =>
controller.setSanitaryConditionOfTheHallIndex(index),
onTap: (index) => controller.setSanitaryConditionOfTheHallIndex(index),
),
formChips(
selectedIndex: data.value,
index: 2,
label: 'متوسط',
onTap: (index) =>
controller.setSanitaryConditionOfTheHallIndex(index),
onTap: (index) => controller.setSanitaryConditionOfTheHallIndex(index),
),
formChips(
selectedIndex: data.value,
index: 3,
label: 'ضعیف',
onTap: (index) =>
controller.setSanitaryConditionOfTheHallIndex(index),
onTap: (index) => controller.setSanitaryConditionOfTheHallIndex(index),
),
],
);
@@ -160,10 +153,7 @@ Column agriculturalInput2(PoultryFarmInspectionHomeLogic controller) {
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 9,
children: [
Text(
'وضعیت تهویه',
style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2),
),
Text('وضعیت تهویه', style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2)),
ObxValue((data) {
return Row(
@@ -171,22 +161,19 @@ Column agriculturalInput2(PoultryFarmInspectionHomeLogic controller) {
spacing: 10,
children: [
formChips(
onTap: (index) =>
controller.setVentilationStatusIndex(index),
onTap: (index) => controller.setVentilationStatusIndex(index),
selectedIndex: data.value,
index: 0,
label: 'خشک',
),
formChips(
onTap: (index) =>
controller.setVentilationStatusIndex(index),
onTap: (index) => controller.setVentilationStatusIndex(index),
selectedIndex: data.value,
index: 1,
label: 'نیمه‌مرطوب',
),
formChips(
onTap: (index) =>
controller.setVentilationStatusIndex(index),
onTap: (index) => controller.setVentilationStatusIndex(index),
selectedIndex: data.value,
index: 2,
label: 'مرطوب',
@@ -204,10 +191,7 @@ Column agriculturalInput2(PoultryFarmInspectionHomeLogic controller) {
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 9,
children: [
Text(
'وضعیت بستر',
style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2),
),
Text('وضعیت بستر', style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2)),
ObxValue((data) {
return SingleChildScrollView(
@@ -411,22 +395,19 @@ Column infrastructureAndEnergy(PoultryFarmInspectionHomeLogic controller) {
spacing: 10,
children: [
formChips(
onTap: (index) =>
controller.setGeneratorOperatingStatusIndex(index),
onTap: (index) => controller.setGeneratorOperatingStatusIndex(index),
selectedIndex: data.value,
index: 0,
label: 'سالم',
),
formChips(
onTap: (index) =>
controller.setGeneratorOperatingStatusIndex(index),
onTap: (index) => controller.setGeneratorOperatingStatusIndex(index),
selectedIndex: data.value,
index: 1,
label: 'نیمه‌سالم',
),
formChips(
onTap: (index) =>
controller.setGeneratorOperatingStatusIndex(index),
onTap: (index) => controller.setGeneratorOperatingStatusIndex(index),
selectedIndex: data.value,
index: 2,
label: 'معیوب',
@@ -446,24 +427,17 @@ Column infrastructureAndEnergy(PoultryFarmInspectionHomeLogic controller) {
),
ResourceOverlayDropdown(
items: Resource.success([
'بیماری',
'قطعی برق',
'استرس گرمایی',
'مشکلات دانه',
]),
items: Resource.success(['بیماری', 'قطعی برق', 'استرس گرمایی', 'مشکلات دانه']),
itemBuilder: (item) => Text(item),
labelBuilder: (selected) =>
Text(selected ?? 'علت احتمالی تلفات غیرعادی'),
labelBuilder: (selected) => Text(selected ?? 'علت احتمالی تلفات غیرعادی'),
),
ResourceOverlayDropdown(
items: Resource.success(['ندارد', 'دارد']),
itemBuilder: (item) => Text(item),
labelBuilder: (selected) =>
Text(selected ?? 'سابقه قطعی برق دوره جاری'),
labelBuilder: (selected) => Text(selected ?? 'سابقه قطعی برق دوره جاری'),
),
RTextField(
@@ -525,10 +499,7 @@ Column agriculturalInput(PoultryFarmInspectionHomeLogic controller) {
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 9,
children: [
Text(
'کیفیت دانه',
style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2),
),
Text('کیفیت دانه', style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2)),
ObxValue((data) {
return Row(
@@ -548,8 +519,7 @@ Column agriculturalInput(PoultryFarmInspectionHomeLogic controller) {
label: 'متوسط',
),
formChips(
onTap: (index) =>
controller.setGrainQualityInputIndex(index),
onTap: (index) => controller.setGrainQualityInputIndex(index),
selectedIndex: data.value,
index: 2,
label: 'ضعیف',
@@ -619,22 +589,19 @@ Column humanResources(PoultryFarmInspectionHomeLogic controller) {
spacing: 10,
children: [
formChips(
onTap: (index) =>
controller.setWorkerContractStatusIndex(index),
onTap: (index) => controller.setWorkerContractStatusIndex(index),
selectedIndex: data.value,
index: 0,
label: 'دائم',
),
formChips(
onTap: (index) =>
controller.setWorkerContractStatusIndex(index),
onTap: (index) => controller.setWorkerContractStatusIndex(index),
selectedIndex: data.value,
index: 1,
label: 'موقت',
),
formChips(
onTap: (index) =>
controller.setWorkerContractStatusIndex(index),
onTap: (index) => controller.setWorkerContractStatusIndex(index),
selectedIndex: data.value,
index: 2,
label: 'روزمزدی',
@@ -650,8 +617,7 @@ Column humanResources(PoultryFarmInspectionHomeLogic controller) {
items: Resource.success(['آموزش‌ ندیده است', 'آموزش‌ دیده است']),
itemBuilder: (item) => Text(item),
labelBuilder: (selected) =>
Text(selected ?? 'آموزش‌دیده در حوزه بهداشت و امنیت زیستی'),
labelBuilder: (selected) => Text(selected ?? 'آموزش‌دیده در حوزه بهداشت و امنیت زیستی'),
),
],
);
@@ -683,7 +649,8 @@ Column facilitiesAndSupport(PoultryFarmInspectionHomeLogic controller) {
filled: true,
filledColor: AppColor.bgLight,
), RTextField(
),
RTextField(
controller: controller.nameOfThePoultryFarmUnit,
label: 'سال دریافت',
filled: true,
@@ -695,11 +662,9 @@ Column facilitiesAndSupport(PoultryFarmInspectionHomeLogic controller) {
items: Resource.success(['دریافت نشده', 'دریافت شده']),
itemBuilder: (item) => Text(item),
labelBuilder: (selected) =>
Text(selected ?? 'وضعیت بازپرداخت'),
labelBuilder: (selected) => Text(selected ?? 'وضعیت بازپرداخت'),
),
cardInfo(
padding: EdgeInsets.fromLTRB(12, 12, 12, 12),
child: Column(
@@ -712,44 +677,43 @@ Column facilitiesAndSupport(PoultryFarmInspectionHomeLogic controller) {
),
ObxValue((data) {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
spacing: 10,
children: [
formChips(
onTap: (index) =>
controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 0,
label: 'نهاده',
),
formChips(
onTap: (index) =>
controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 1,
label: 'تسهیلات',
),
formChips(
onTap: (index) =>
controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 2,
label: 'واکسن',
), formChips(
onTap: (index) =>
controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 3,
label: 'تجهیزات',
),
],
return SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
spacing: 10,
children: [
formChips(
onTap: (index) => controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 0,
label: 'نهاده',
),
formChips(
onTap: (index) => controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 1,
label: 'تسهیلات',
),
formChips(
onTap: (index) => controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 2,
label: 'واکسن',
),
formChips(
onTap: (index) => controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 3,
label: 'تجهیزات',
),
],
),
);
}, controller.newBeneficiaryRequestIndex),
],
),
),
],
);
}

110
packages/chicken/lib/presentation/pages/poultry_farm_inspection/widgets/step4_page.dart
View File

@@ -12,7 +12,7 @@ Widget step4Page(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 35.h),
Container(
height: 430.h,
height: 455.h,
clipBehavior: Clip.none,
width: Get.width,
child: farmInfoWidget(
@@ -25,7 +25,7 @@ Widget step4Page(PoultryFarmInspectionHomeLogic controller) {
SizedBox(height: 30.h),
Container(
height: 200.h,
height: 220.h,
clipBehavior: Clip.none,
width: Get.width,
child: farmInfoWidget(
@@ -62,10 +62,7 @@ Column documents(PoultryFarmInspectionHomeLogic controller) {
padding: EdgeInsets.all(22),
decoration: BoxDecoration(
color: Color(0xFFE9E9E9),
border: Border.all(
width: 1,
color: AppColor.blackLightHover,
),
border: Border.all(width: 1, color: AppColor.blackLightHover),
borderRadius: BorderRadius.circular(8),
),
child: Assets.vec.galleryAddSvg.svg(width: 36, height: 36),
@@ -99,10 +96,7 @@ Column documents(PoultryFarmInspectionHomeLogic controller) {
padding: EdgeInsets.all(22),
decoration: BoxDecoration(
color: Color(0xFFE9E9E9),
border: Border.all(
width: 1,
color: AppColor.blackLightHover,
),
border: Border.all(width: 1, color: AppColor.blackLightHover),
borderRadius: BorderRadius.circular(8),
),
child: Assets.vec.galleryAddSvg.svg(width: 36, height: 36),
@@ -135,10 +129,7 @@ Column documents(PoultryFarmInspectionHomeLogic controller) {
padding: EdgeInsets.all(22),
decoration: BoxDecoration(
color: Color(0xFFE9E9E9),
border: Border.all(
width: 1,
color: AppColor.blackLightHover,
),
border: Border.all(width: 1, color: AppColor.blackLightHover),
borderRadius: BorderRadius.circular(8),
),
child: Assets.vec.galleryAddSvg.svg(width: 36, height: 36),
@@ -147,11 +138,7 @@ Column documents(PoultryFarmInspectionHomeLogic controller) {
),
),
Text(
'ثبت عکس تلفات',
style: AppFonts.yekan14.copyWith(color: AppColor.textColorLight),
),
Text('ثبت عکس تلفات', style: AppFonts.yekan14.copyWith(color: AppColor.textColorLight)),
],
),
),
@@ -205,32 +192,32 @@ Column inspectorConclusion(PoultryFarmInspectionHomeLogic controller) {
),
ObxValue((data) {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
spacing: 10,
children: [
formChips(
onTap: (index) =>
controller.setInspectorConclusionIndex(index),
selectedIndex: data.value,
index: 0,
label: 'تایید شده',
),
formChips(
onTap: (index) =>
controller.setInspectorConclusionIndex(index),
selectedIndex: data.value,
index: 1,
label: 'نیازمند اصلاح',
),
formChips(
onTap: (index) =>
controller.setInspectorConclusionIndex(index),
selectedIndex: data.value,
index: 2,
label: 'پرریسک',
),
],
return SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
spacing: 10,
children: [
formChips(
onTap: (index) => controller.setInspectorConclusionIndex(index),
selectedIndex: data.value,
index: 0,
label: 'تایید شده',
),
formChips(
onTap: (index) => controller.setInspectorConclusionIndex(index),
selectedIndex: data.value,
index: 1,
label: 'نیازمند اصلاح',
),
formChips(
onTap: (index) => controller.setInspectorConclusionIndex(index),
selectedIndex: data.value,
index: 2,
label: 'پرریسک',
),
],
),
);
}, controller.inspectorConclusionIndex),
],
@@ -240,6 +227,7 @@ Column inspectorConclusion(PoultryFarmInspectionHomeLogic controller) {
RTextField(
controller: controller.inspectorConclusionDescriptionController,
hintText: 'توصیه‌ها / اخطارها / اقدامات اصلاحی ...',
hintStyle: AppFonts.yekan14.copyWith(color: AppColor.textColorLight),
maxLines: 3,
minLines: 3,
filled: true,
@@ -282,10 +270,7 @@ Column agriculturalInput(PoultryFarmInspectionHomeLogic controller) {
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 9,
children: [
Text(
'کیفیت دانه',
style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2),
),
Text('کیفیت دانه', style: AppFonts.yekan14Bold.copyWith(color: AppColor.textColor2)),
ObxValue((data) {
return Row(
@@ -305,8 +290,7 @@ Column agriculturalInput(PoultryFarmInspectionHomeLogic controller) {
label: 'متوسط',
),
formChips(
onTap: (index) =>
controller.setGrainQualityInputIndex(index),
onTap: (index) => controller.setGrainQualityInputIndex(index),
selectedIndex: data.value,
index: 2,
label: 'ضعیف',
@@ -376,22 +360,19 @@ Column humanResources(PoultryFarmInspectionHomeLogic controller) {
spacing: 10,
children: [
formChips(
onTap: (index) =>
controller.setWorkerContractStatusIndex(index),
onTap: (index) => controller.setWorkerContractStatusIndex(index),
selectedIndex: data.value,
index: 0,
label: 'دائم',
),
formChips(
onTap: (index) =>
controller.setWorkerContractStatusIndex(index),
onTap: (index) => controller.setWorkerContractStatusIndex(index),
selectedIndex: data.value,
index: 1,
label: 'موقت',
),
formChips(
onTap: (index) =>
controller.setWorkerContractStatusIndex(index),
onTap: (index) => controller.setWorkerContractStatusIndex(index),
selectedIndex: data.value,
index: 2,
label: 'روزمزدی',
@@ -407,8 +388,7 @@ Column humanResources(PoultryFarmInspectionHomeLogic controller) {
items: Resource.success(['آموزش‌ ندیده است', 'آموزش‌ دیده است']),
itemBuilder: (item) => Text(item),
labelBuilder: (selected) =>
Text(selected ?? 'آموزش‌دیده در حوزه بهداشت و امنیت زیستی'),
labelBuilder: (selected) => Text(selected ?? 'آموزش‌دیده در حوزه بهداشت و امنیت زیستی'),
),
],
);
@@ -473,29 +453,25 @@ Column facilitiesAndSupport(PoultryFarmInspectionHomeLogic controller) {
spacing: 10,
children: [
formChips(
onTap: (index) =>
controller.setNewBeneficiaryRequestIndex(index),
onTap: (index) => controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 0,
label: 'نهاده',
),
formChips(
onTap: (index) =>
controller.setNewBeneficiaryRequestIndex(index),
onTap: (index) => controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 1,
label: 'تسهیلات',
),
formChips(
onTap: (index) =>
controller.setNewBeneficiaryRequestIndex(index),
onTap: (index) => controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 2,
label: 'واکسن',
),
formChips(
onTap: (index) =>
controller.setNewBeneficiaryRequestIndex(index),
onTap: (index) => controller.setNewBeneficiaryRequestIndex(index),
selectedIndex: data.value,
index: 3,
label: 'تجهیزات',

18
packages/chicken/lib/presentation/widget/info_card/info_card.dart
View File

@@ -1,21 +1,14 @@
import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart';
Widget cardInfo({
required int value,
required String description,
required Color color,
}) {
Widget cardInfo({required int value, required String description, required Color color}) {
return Container(
width: 93.w,
width: 90.w,
height: 53.h,
decoration: BoxDecoration(
color: color,
borderRadius: BorderRadius.circular(8),
border: Border.all(
width: 0.50,
color: const Color.fromARGB(54, 169, 169, 169),
),
border: Border.all(width: 0.50, color: const Color.fromARGB(54, 169, 169, 169)),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
@@ -26,10 +19,7 @@ Widget cardInfo({
value.separatedByCommaFa,
style: AppFonts.yekan13Bold.copyWith(color: AppColor.textColor),
),
Text(
description,
style: AppFonts.yekan10.copyWith(color: AppColor.textColor),
),
Text(description, style: AppFonts.yekan10.copyWith(color: AppColor.textColor)),
],
),
);