From ed41815966dc9631e07400697bf77aacbc696c44 Mon Sep 17 00:00:00 2001 From: cyzoox Date: Wed, 6 Sep 2023 08:59:07 +0800 Subject: [PATCH] Fixed building home and land home errors enclosed expanded with column, added errorstate try again button --- .../AddExtraItems.dart | 10 ++++ .../edit_building/bldgloc_landref.dart | 50 ++++--------------- .../edit_building/structural_materials.dart | 14 +++--- .../property_owner_info.dart | 13 +++++ .../passo/Land/add_land/AddLandAppraisal.dart | 38 +++++++++++++- .../add_land/AddOtherImprovementModal.dart | 24 +++++++-- .../add_land/AddPropertyAssessmentModal.dart | 26 ++++++++-- lib/screens/passo/building_home.dart | 23 +++++---- lib/screens/passo/land_home .dart | 24 +++++---- 9 files changed, 143 insertions(+), 79 deletions(-) create mode 100644 lib/screens/passo/Building/edit_building_new/property_owner_info.dart diff --git a/lib/screens/passo/Building/add_building_components/AddExtraItems.dart b/lib/screens/passo/Building/add_building_components/AddExtraItems.dart index eb3a9a7..ef4fac4 100644 --- a/lib/screens/passo/Building/add_building_components/AddExtraItems.dart +++ b/lib/screens/passo/Building/add_building_components/AddExtraItems.dart @@ -10,6 +10,8 @@ import 'package:unit2/model/passo/additional_items.dart'; import 'package:unit2/model/passo/class_components.dart'; import 'package:unit2/model/passo/unit_construct.dart'; import 'package:unit2/theme-data.dart/form-style.dart'; +import 'package:unit2/utils/text_container.dart'; +import 'package:unit2/widgets/error_state.dart'; class AddExtraItems extends StatefulWidget { final List unit; @@ -573,6 +575,14 @@ class _AddExtraItems extends State { ), ))); } + if (state is AdditionalItemsErrorState) { + return SomethingWentWrong( + message: onError, + onpressed: () { + context.read().add(LoadAdditionalItems()); + }, + ); + } return Container(); }); } diff --git a/lib/screens/passo/Building/edit_building/bldgloc_landref.dart b/lib/screens/passo/Building/edit_building/bldgloc_landref.dart index 2b6ced8..0a891fb 100644 --- a/lib/screens/passo/Building/edit_building/bldgloc_landref.dart +++ b/lib/screens/passo/Building/edit_building/bldgloc_landref.dart @@ -52,13 +52,6 @@ class _BldgLocLandRefEdit extends State { if (state is LocationErrorState) { final progress = ProgressHUD.of(context); progress?.dismiss(); - // Fluttertoast.showToast( - // msg: onError, - // fontSize: 24, - // toastLength: Toast.LENGTH_LONG, - // gravity: ToastGravity.CENTER, - // backgroundColor: Colors.black, - // textColor: Colors.white); } }, builder: (context, state) { @@ -77,13 +70,6 @@ class _BldgLocLandRefEdit extends State { if (state is LandrefErrorState) { final progress = ProgressHUD.of(context); progress?.dismiss(); - // Fluttertoast.showToast( - // msg: onError, - // fontSize: 24, - // toastLength: Toast.LENGTH_LONG, - // gravity: ToastGravity.CENTER, - // backgroundColor: Colors.black, - // textColor: Colors.white); } }, builder: (context, state) { @@ -102,13 +88,6 @@ class _BldgLocLandRefEdit extends State { if (state is MunicipalityErrorState) { final progress = ProgressHUD.of(context); progress?.dismiss(); - // Fluttertoast.showToast( - // msg: onError, - // fontSize: 24, - // toastLength: Toast.LENGTH_LONG, - // gravity: ToastGravity.CENTER, - // backgroundColor: Colors.black, - // textColor: Colors.white); } }, builder: (context, state) { if (state is MunicipalityLoaded) { @@ -132,13 +111,6 @@ class _BldgLocLandRefEdit extends State { if (state is BarangayErrorState) { final progress = ProgressHUD.of(context); progress?.dismiss(); - // Fluttertoast.showToast( - // msg: onError, - // fontSize: 24, - // toastLength: Toast.LENGTH_LONG, - // gravity: ToastGravity.CENTER, - // backgroundColor: Colors.black, - // textColor: Colors.white); } }, builder: (context, state) { if (state is BarangayLoaded) { @@ -150,17 +122,15 @@ class _BldgLocLandRefEdit extends State { return FormBuilder( key: keys, initialValue: { - 'street': bldgloc.street, - // 'brgy': bldgloc.barangay, - // 'municipality': bldgloc.municipality, - 'province': bldgloc.province, + 'street': bldgloc.street ?? "", + 'province': bldgloc.province ?? "", 'l_owner': landRef.owner, - 'oct_tct_cloa': landRef.cloaNo, - 'survey_no': landRef.surveyNo, - 'lot_no': landRef.lotNo, - 'blk_no': landRef.blkNo, - 'l_td_arp': landRef.tdn, - 'area': landRef.area + 'oct_tct_cloa': landRef.cloaNo ?? "", + 'survey_no': landRef.surveyNo ?? "", + 'lot_no': landRef.lotNo ?? "", + 'blk_no': landRef.blkNo ?? "", + 'l_td_arp': landRef.tdn ?? "", + 'area': landRef.area ?? "" }, enabled: true, onChanged: () { @@ -250,8 +220,8 @@ class _BldgLocLandRefEdit extends State { // optional flex property if flex is 1 because the default flex is 1 flex: 1, child: customDropDownField( - bldgloc.barangay, - "", + bldgloc.barangay ?? "", + "Barangay", 'brgy', brgyNAmes)) ]), diff --git a/lib/screens/passo/Building/edit_building/structural_materials.dart b/lib/screens/passo/Building/edit_building/structural_materials.dart index 5d37368..efeacf3 100644 --- a/lib/screens/passo/Building/edit_building/structural_materials.dart +++ b/lib/screens/passo/Building/edit_building/structural_materials.dart @@ -43,13 +43,13 @@ class _StructuralMaterialsPageEdit extends State { listener: (context, state) { if (state is StructuralMaterialsLoaded) { setState(() { - foundation = state.structure.foundation!.split(','); - column = state.structure.columns!.split(','); - beam = state.structure.beams!.split(','); - truss_framing = state.structure.trussFraming!.split(','); - roof = state.structure.roof!.split(','); - flooring = state.structure.flooring!.split(','); - walls = state.structure.walls!.split(','); + foundation = state.structure.foundation!.split(',') ?? []; + column = state.structure.columns!.split(',') ?? []; + beam = state.structure.beams!.split(',') ?? []; + truss_framing = state.structure.trussFraming!.split(',') ?? []; + roof = state.structure.roof!.split(',') ?? []; + flooring = state.structure.flooring!.split(',') ?? []; + walls = state.structure.walls!.split(',') ?? []; // Update other local state variables here if needed }); } diff --git a/lib/screens/passo/Building/edit_building_new/property_owner_info.dart b/lib/screens/passo/Building/edit_building_new/property_owner_info.dart new file mode 100644 index 0000000..33490b5 --- /dev/null +++ b/lib/screens/passo/Building/edit_building_new/property_owner_info.dart @@ -0,0 +1,13 @@ +import 'package:flutter/material.dart'; + +class PropertyOwnerPage extends StatefulWidget { + @override + _PropertyOwnerPage createState() => _PropertyOwnerPage(); +} + +class _PropertyOwnerPage extends State { + @override + Widget build(BuildContext context) { + return Scaffold(body: Container()); + } +} diff --git a/lib/screens/passo/Land/add_land/AddLandAppraisal.dart b/lib/screens/passo/Land/add_land/AddLandAppraisal.dart index 6e70768..02e4e74 100644 --- a/lib/screens/passo/Land/add_land/AddLandAppraisal.dart +++ b/lib/screens/passo/Land/add_land/AddLandAppraisal.dart @@ -19,6 +19,8 @@ import 'package:unit2/model/passo/land_subclassification.dart'; import 'package:unit2/model/passo/unit_construct.dart'; import 'package:unit2/screens/passo/Land/add_land.dart'; import 'package:unit2/theme-data.dart/form-style.dart'; +import 'package:unit2/utils/text_container.dart'; +import 'package:unit2/widgets/error_state.dart'; import 'package:unit2/widgets/passo/custom_formBuilder_fields.dart'; class AddLandAppraisalModal extends StatefulWidget { @@ -392,22 +394,54 @@ class _AddLandAppraisalModal extends State { ))); } if (state is MunicipalityErrorState) { - return Text(state.error); + return SomethingWentWrong( + message: onError, + onpressed: () { + context + .read() + .add(LoadMunicipality()); + }, + ); } return Container(); }, ); } + if (state is LandSubClassificationErrorState) { + return SomethingWentWrong( + message: onError, + onpressed: () { + context.read().add( + const LoadLandSubClassification( + cityCode: '1', classCode: 1)); + }, + ); + } return Container(); }, ); } + if (state is LandClassificationErrorState) { + return SomethingWentWrong( + message: onError, + onpressed: () { + context + .read() + .add(LoadLandClassification()); + }, + ); + } return Container(); }, ); } if (state is LandAppraisalErrorState) { - return Text(state.error); + return SomethingWentWrong( + message: onError, + onpressed: () { + context.read().add(LoadLandAppraisal()); + }, + ); } return Container(); }); diff --git a/lib/screens/passo/Land/add_land/AddOtherImprovementModal.dart b/lib/screens/passo/Land/add_land/AddOtherImprovementModal.dart index c89300d..3f6e6b4 100644 --- a/lib/screens/passo/Land/add_land/AddOtherImprovementModal.dart +++ b/lib/screens/passo/Land/add_land/AddOtherImprovementModal.dart @@ -9,6 +9,8 @@ import 'package:unit2/bloc/passo/land/other_improvements/other_improvements_bloc import 'package:unit2/model/passo/other_improvements.dart'; import 'package:unit2/model/passo/trees_improvements.dart'; import 'package:unit2/theme-data.dart/form-style.dart'; +import 'package:unit2/utils/text_container.dart'; +import 'package:unit2/widgets/error_state.dart'; class AddOtherImprovementModal extends StatefulWidget { // final List unit; @@ -329,16 +331,28 @@ class _AddOtherImprovementModal extends State { ), )); } - + if (state is LandTreesImprovementsErrorState) { + return SomethingWentWrong( + message: onError, + onpressed: () { + context + .read() + .add(LoadLandTreesImprovements()); + }, + ); + } return Container(); }); } if (state is OtherImprovementErrorState) { - return Text(state.error); + return SomethingWentWrong( + message: onError, + onpressed: () { + context.read().add(LoadOtherImprovement()); + }, + ); } - return Container( - child: Text("Other Improvement"), - ); + return Container(); }); } } diff --git a/lib/screens/passo/Land/add_land/AddPropertyAssessmentModal.dart b/lib/screens/passo/Land/add_land/AddPropertyAssessmentModal.dart index 35bf7f6..8752a6f 100644 --- a/lib/screens/passo/Land/add_land/AddPropertyAssessmentModal.dart +++ b/lib/screens/passo/Land/add_land/AddPropertyAssessmentModal.dart @@ -8,6 +8,8 @@ import 'package:unit2/bloc/passo/land/land_value_adjustments/land_value_adjustme import 'package:unit2/model/passo/land_property_assessment.dart'; import 'package:unit2/model/passo/land_value_adjustment.dart'; import 'package:unit2/theme-data.dart/form-style.dart'; +import 'package:unit2/utils/text_container.dart'; +import 'package:unit2/widgets/error_state.dart'; class AddPropertyAssessmentModal extends StatefulWidget { // final List unit; @@ -327,16 +329,30 @@ class _AddPropertyAssessmentModal extends State { ), )); } - + if (state is LandValueAdjustmentsErrorState) { + return SomethingWentWrong( + message: onError, + onpressed: () { + context + .read() + .add(LoadLandValueAdjustments()); + }, + ); + } return Container(); }); } if (state is LandPropertyAssessmentErrorState) { - return Text(state.error); + return SomethingWentWrong( + message: onError, + onpressed: () { + context + .read() + .add(LoadLandPropertyAssessment()); + }, + ); } - return Container( - child: Text("Property Assessment"), - ); + return Container(); }); } } diff --git a/lib/screens/passo/building_home.dart b/lib/screens/passo/building_home.dart index c2dcaeb..7c428b0 100644 --- a/lib/screens/passo/building_home.dart +++ b/lib/screens/passo/building_home.dart @@ -68,7 +68,6 @@ class BuildingHome extends StatelessWidget { Profile profile; return Scaffold( body: ProgressHUD( - padding: const EdgeInsets.only(left: 24, right: 24), backgroundColor: Colors.black87, indicatorWidget: const SpinKitFadingCircle(color: Colors.white), child: BlocBuilder(builder: (context, state) { @@ -96,15 +95,19 @@ class BuildingHome extends StatelessWidget { List propertyList = state.property_info; return Container( padding: const EdgeInsets.symmetric(horizontal: 12), - child: Expanded( - child: ListView.builder( - shrinkWrap: true, - itemCount: propertyList.length, - itemBuilder: (BuildContext context, int index) { - return _listCard( - propertyList[index], context, index); - }, - ), + child: Column( + children: [ + Expanded( + child: ListView.builder( + shrinkWrap: true, + itemCount: propertyList.length, + itemBuilder: (BuildContext context, int index) { + return _listCard( + propertyList[index], context, index); + }, + ), + ), + ], ), ); } diff --git a/lib/screens/passo/land_home .dart b/lib/screens/passo/land_home .dart index 4326133..5ee23c1 100644 --- a/lib/screens/passo/land_home .dart +++ b/lib/screens/passo/land_home .dart @@ -96,15 +96,19 @@ class LandHome extends StatelessWidget { List propertyList = state.land; return Container( padding: const EdgeInsets.symmetric(horizontal: 12), - child: Expanded( - child: ListView.builder( - shrinkWrap: true, - itemCount: propertyList.length, - itemBuilder: (BuildContext context, int index) { - return _listCard( - propertyList[index], context, index); - }, - ), + child: Column( + children: [ + Expanded( + child: ListView.builder( + shrinkWrap: true, + itemCount: propertyList.length, + itemBuilder: (BuildContext context, int index) { + return _listCard( + propertyList[index], context, index); + }, + ), + ), + ], ), ); } @@ -114,7 +118,7 @@ class LandHome extends StatelessWidget { onpressed: () { context .read() - .add(LoadLand()); + .add(const LoadLand()); }, ); }