diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html
index 06c5b2f..e10c5ec 100644
--- a/android/build/reports/problems/problems-report.html
+++ b/android/build/reports/problems/problems-report.html
@@ -650,7 +650,7 @@ code + .copy-button {
diff --git a/packages/chicken/lib/features/city_jahad/presentation/pages/new_inspection/logic.dart b/packages/chicken/lib/features/city_jahad/presentation/pages/new_inspection/logic.dart
index ceb6f4f..73ae25e 100644
--- a/packages/chicken/lib/features/city_jahad/presentation/pages/new_inspection/logic.dart
+++ b/packages/chicken/lib/features/city_jahad/presentation/pages/new_inspection/logic.dart
@@ -27,7 +27,7 @@ class NewInspectionLogic extends GetxController {
RxnString searchedValue = RxnString();
Rx fromDateFilter = Jalali.now().obs;
Rx toDateFilter = Jalali.now().obs;
-
+
@override
void onInit() {
super.onInit();
diff --git a/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source.dart b/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source.dart
index 059c884..7620d5f 100644
--- a/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source.dart
+++ b/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source.dart
@@ -13,5 +13,7 @@ abstract class VetFarmRemoteDataSource {
required SubmitInspectionResponse request,
});
- Future>> getSDUIForm({String? token});
+ Future>> getSDUIForm({
+ required String token,
+ });
}
diff --git a/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source_impl.dart b/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source_impl.dart
index 36596af..6de2fa3 100644
--- a/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source_impl.dart
+++ b/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source_impl.dart
@@ -38,18 +38,16 @@ class VetFarmRemoteDataSourceImpl implements VetFarmRemoteDataSource {
}
@override
- Future>> getSDUIForm({String? token}) async {
- DioRemote dio = DioRemote(baseUrl: "http://testbackend.rasadyaar.ir/");
- await dio.init();
-
-
- var res = await dio.get(
- 'inspection_form_sd_ui/',
-
+ Future>> getSDUIForm({
+ required String token,
+ }) async {
+ var res = await _httpClient.get(
+ '/inspection_form_sd_ui/?name=b1',
+ headers: {'Authorization': 'Bearer $token'},
fromJson: (json) {
return json;
- },
- );
- return res;
+ },
+ );
+ return res;
}
}
diff --git a/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository.dart b/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository.dart
index 4048948..009fc7b 100644
--- a/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository.dart
+++ b/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository.dart
@@ -14,5 +14,7 @@ abstract class VetFarmRepository {
});
- Future>> getSDUIForm({String? token});
+ Future>> getSDUIForm({
+ required String token,
+ });
}
diff --git a/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository_impl.dart b/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository_impl.dart
index 8fcb38e..89637b2 100644
--- a/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository_impl.dart
+++ b/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository_impl.dart
@@ -28,7 +28,7 @@ class VetFarmRepositoryImpl implements VetFarmRepository {
return await _remote.submitInspection(token: token, request: request);
}
@override
- Future>> getSDUIForm({String? token}) async {
+ Future>> getSDUIForm({required String token,}) async {
return await _remote.getSDUIForm(token: token);
}
}
diff --git a/packages/chicken/lib/features/vet_farm/presentation/pages/new_page/logic.dart b/packages/chicken/lib/features/vet_farm/presentation/pages/new_page/logic.dart
index e085028..078a732 100644
--- a/packages/chicken/lib/features/vet_farm/presentation/pages/new_page/logic.dart
+++ b/packages/chicken/lib/features/vet_farm/presentation/pages/new_page/logic.dart
@@ -29,7 +29,9 @@ class NewPageLogic extends GetxController {
Future getSDUIForm() async {
await safeCall(
- call: () async => await rootLogic.vetFarmRepository.getSDUIForm(),
+ call: () async => await rootLogic.vetFarmRepository.getSDUIForm(
+ token: rootLogic.tokenService.accessToken.value ?? '',
+ ),
onSuccess: (result) {
if (result.data != null) {
try {
diff --git a/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget.dart b/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget.dart
index 1e125e9..79efba1 100644
--- a/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget.dart
+++ b/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget.dart
@@ -636,7 +636,7 @@ class SDUIFormWidget extends StatelessWidget {
iLog('Stack trace: $stackTrace');
return Container(
padding: EdgeInsets.all(16),
- color: Colors.green.withOpacity(0.1),
+ color: Colors.green.withAlpha(10),
child: Text('Image Picker Error: $e'),
);
}
@@ -712,7 +712,7 @@ class SDUIFormWidget extends StatelessWidget {
iLog('Error building page_view child: $e');
return Container(
padding: EdgeInsets.all(8),
- color: Colors.yellow.withOpacity(0.1),
+ color: Colors.yellow.withAlpha(10),
child: Text('Child Error'),
);
}
@@ -733,7 +733,7 @@ class SDUIFormWidget extends StatelessWidget {
iLog('Stack trace: $stackTrace');
return Container(
padding: EdgeInsets.all(16),
- color: Colors.blue.withOpacity(0.1),
+ color: Colors.blue.withAlpha(10),
child: Text('PageView Error: $e'),
);
}
@@ -1006,8 +1006,6 @@ class SDUIFormWidget extends StatelessWidget {
'sdui_form_stepper_${stepperInfo.stepperData.key ?? 'default'}';
SDUIFormWidgetController formController;
- fLog('mj ==>build With Stepper Layout');
-
try {
formController = Get.find(tag: controllerTag);
} catch (_) {
@@ -1548,7 +1546,6 @@ class SDUIFormWidget extends StatelessWidget {
child: Row(
spacing: 10.w,
children: [
-
Expanded(
child: ROutlinedElevated(
height: 40.h,
@@ -1568,7 +1565,7 @@ class SDUIFormWidget extends StatelessWidget {
borderColor: AppColor.blueNormal,
),
),
- Expanded(
+ Expanded(
flex: 2,
child: RElevated(
height: 40.h,
@@ -1590,7 +1587,6 @@ class SDUIFormWidget extends StatelessWidget {
backgroundColor: AppColor.blueNormal,
),
),
-
],
),
);
diff --git a/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget_controller.dart b/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget_controller.dart
index d9998ba..3ccb91b 100644
--- a/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget_controller.dart
+++ b/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget_controller.dart
@@ -6,7 +6,7 @@ class SDUIFormWidgetController extends GetxController {
String? stepperKey;
void initializeStepper(int totalSteps, String? key) {
- this.totalSteps = totalSteps;
+ this.totalSteps = totalSteps;
this.stepperKey = key;
currentStep.value = 0;
}