Merge pull request 'release/v1/beta/v1.0.3-beta' (#58) from release/v1/beta/v1.0.3-beta into master

Reviewed-on: http://git.agusandelnorte.gov.ph:3000/SoftwareDevelopmentSection/unit2-null-safety-repository/pulls/58

android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

lib/bloc/passo/bulding/additional_item/additional_item_bloc.dart

@@ -41,6 +41,8 @@ class AdditionalItemBloc
           globalAdditionalItems.add(newAdditional);
 
           emit(AdditionalItemsLoaded(globalAdditionalItems));
+        } else {
+          emit(AdditionalItemsErrorState('error'));
         }
       } catch (e) {
         emit(AdditionalItemsErrorState(e.toString()));

lib/bloc/passo/bulding/property_appraisal/property_appraisal_bloc.dart

@@ -18,7 +18,7 @@ class PropertyAppraisalBloc
       emit(PropertyAppraisalLoading());
       try {
         final appraisal = await PropertyAppraisalServices.instance.fetch();
-
+        print(appraisal);
         emit(PropertyAppraisalLoaded(appraisal));
       } catch (e) {
         emit(PropertyAppraisalErrorState(e.toString()));
@@ -30,11 +30,16 @@ class PropertyAppraisalBloc
       try {
         http.Response response = (await PropertyAppraisalServices.instance
             .update(event.appraisal, tempID.getInt('tempid')! - 1))!;
-
+        print('Appraisal');
+        print(tempID.getInt('tempid')! - 1);
+        print(event.appraisal.toJson());
+        print(response.body);
         if (response.statusCode == 200) {
           emit(ShowPropertyAppraisalSuccessAlertState());
         }
       } catch (e) {
+        print('app error');
+        print(e.toString());
         emit(ShowPropertyAppraisalErrorAlertState());
       }
     });

lib/bloc/passo/bulding/property_assessment/property_assessment_bloc.dart

@@ -18,10 +18,11 @@ class PropertyAssessmentBloc
       emit(PropertyAssessmentLoading());
       try {
         final tempID = await SharedPreferences.getInstance();
-
+        print(tempID.getInt('tempid')! - 1);
         final assessments = await PropertyAssessmentServices.instance
-            .fetch(tempID.getInt('tempid')! + 1);
+            .fetch(tempID.getInt('tempid')! - 1);
 
+        print(assessments);
         emit(PropertyAssessmentLoaded(assessments));
       } catch (e) {
         emit(PropertyAssessmentErrorState(e.toString()));

lib/bloc/passo/bulding/property_assessment_edit/property_assessment_edit_bloc.dart

@@ -18,8 +18,6 @@ class PropertyAssessmentEditBloc
     on<LoadPropertyAssessmentEdit>((event, emit) async {
       emit(PropertyAssessmentEditLoading());
       try {
-        final tempID = await SharedPreferences.getInstance();
-
         final assessments =
             await PropertyAssessmentServices.instance.fetchEdit(event.id);
 

lib/bloc/passo/land/land_appraisal/land_appraisal_bloc.dart

@@ -27,6 +27,19 @@ class LandAppraisalBloc extends Bloc<LandAppraisalEvent, LandAppraisalState> {
         emit(LandAppraisalErrorState(e.toString()));
       }
     });
+    on<LoadLandAppraisalEdit>((event, emit) async {
+      emit(LandAppraisalLoading());
+      try {
+        final additionalItems =
+            await LandAppraisalServices.instance.fetch(event.id);
+        globalLandAppraisal.clear();
+        globalLandAppraisal
+            .addAll(additionalItems); // Append all items to the list
+        emit(LandAppraisalLoaded(globalLandAppraisal));
+      } catch (e) {
+        emit(LandAppraisalErrorState(e.toString()));
+      }
+    });
     on<AddLandAppraisal>((event, emit) async {
       http.Response response =
           (await LandAppraisalServices.instance.add(event.land_appr))!;

lib/bloc/passo/land/land_appraisal/land_appraisal_event.dart

@@ -16,6 +16,16 @@ class LoadLandAppraisal extends LandAppraisalEvent {
   List<Object> get props => [land_appr];
 }
 
+class LoadLandAppraisalEdit extends LandAppraisalEvent {
+  final List<LandAppr> land_appr;
+  final int id;
+
+  const LoadLandAppraisalEdit({required this.land_appr, required this.id});
+
+  @override
+  List<Object> get props => [land_appr];
+}
+
 class AddLandAppraisal extends LandAppraisalEvent {
   final LandAppr land_appr;
 

lib/bloc/passo/land/land_ext_bloc/land_ext_edit_bloc.dart

@@ -0,0 +1,53 @@
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:unit2/model/passo/land_ext.dart';
+import 'package:unit2/sevices/passo/land/land_ext.dart';
+import 'package:http/http.dart' as http;
+part 'land_ext_edit_event.dart';
+part 'land_ext_edit_state.dart';
+
+class LandExtEditBloc extends Bloc<LandExtEditEvent, LandExtEditState> {
+  LandExtEditBloc() : super(LandExtEditInitial()) {
+    on<LoadLandExtEdit>((event, emit) async {
+      emit(LandExtEditLoading());
+      try {
+        final tempID = await SharedPreferences.getInstance();
+
+        final assessments = await LandExtServices.instance.fetchEdit(event.id);
+
+        emit(LandExtEditLoaded(assessments));
+      } catch (e) {
+        print(e.toString());
+        emit(LandExtEditErrorState(e.toString()));
+      }
+    });
+    // on<AddLandLocationEdit>((event, emit) async {
+    //   http.Response response = (await LandLocationService.instance
+    //       .addEdit(event.land_loc_edit))!;
+    //   print('Assessment');
+    //   print(response.statusCode);
+    //   print(response.body);
+    //   if (response.statusCode == 201) {
+    //     var jsonResponse = jsonDecode(response.body);
+    //     LandPropertyLoc newAssessment =
+    //         LandPropertyLoc.fromJson(jsonResponse['data']);
+
+    //     globalLandLocationEdit = newAssessment;
+
+    //     emit(LandLocationEditLoaded(globalLandLocationEdit));
+    //   }
+    // });
+    on<UpdateLandExtEdit>((event, emit) async {
+      http.Response response = (await LandExtServices.instance
+          .updateEdit(event.land_ext_edit, event.id))!;
+      print('landloc edit');
+      print(response.statusCode);
+      print(response.body);
+      // if (response.statusCode == 201) {
+      //   final faas = await PropertyInfoRepository.getUsers();
+      //   emit(FaasLoaded(faas));
+      // }
+    });
+  }
+}

lib/bloc/passo/land/land_ext_bloc/land_ext_edit_event.dart

@@ -0,0 +1,39 @@
+part of 'land_ext_edit_bloc.dart';
+
+class LandExtEditEvent extends Equatable {
+  const LandExtEditEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class LoadLandExtEdit extends LandExtEditEvent {
+  final LandExt land_ext_edit;
+  final int? id;
+
+  const LoadLandExtEdit({required this.land_ext_edit, required this.id});
+
+  @override
+  List<Object> get props => [land_ext_edit];
+}
+
+class AddLandExtEdit extends LandExtEditEvent {
+  final LandExt land_ext_edit;
+
+  const AddLandExtEdit({required this.land_ext_edit});
+
+  @override
+  List<Object> get props => [land_ext_edit];
+}
+
+class UpdateLandExtEdit extends LandExtEditEvent {
+  // ignore: non_constant_identifier_names
+  final LandExt land_ext_edit;
+  final int id;
+
+  // ignore: non_constant_identifier_names
+  const UpdateLandExtEdit({required this.land_ext_edit, required this.id});
+
+  @override
+  List<Object> get props => [land_ext_edit];
+}

lib/bloc/passo/land/land_ext_bloc/land_ext_edit_state.dart

@@ -0,0 +1,28 @@
+part of 'land_ext_edit_bloc.dart';
+
+class LandExtEditState extends Equatable {
+  const LandExtEditState();
+
+  @override
+  List<Object> get props => [];
+}
+
+class LandExtEditInitial extends LandExtEditState {}
+
+class LandExtEditLoading extends LandExtEditState {}
+
+class LandExtEditLoaded extends LandExtEditState {
+  LandExtEditLoaded(this.land_ext_edit);
+  final LandExt land_ext_edit;
+
+  @override
+  List<Object> get props => [land_ext_edit];
+}
+
+class LandExtEditErrorState extends LandExtEditState {
+  LandExtEditErrorState(this.error);
+  final String error;
+
+  @override
+  List<Object> get props => [error];
+}

lib/bloc/passo/land/land_property_assessment/land_property_assessment_bloc.dart

@@ -29,6 +29,19 @@ class LandPropertyAssessmentBloc
         emit(LandPropertyAssessmentErrorState(e.toString()));
       }
     });
+    on<LoadLandPropertyAssessmentEdit>((event, emit) async {
+      emit(LandPropertyAssessmentLoading());
+      try {
+        final additionalItems =
+            await LandPropertyAssessmentServices.instance.fetch(event.id);
+        globalLandPropertyAssessment.clear();
+        globalLandPropertyAssessment
+            .addAll(additionalItems); // Append all items to the list
+        emit(LandPropertyAssessmentLoaded(globalLandPropertyAssessment));
+      } catch (e) {
+        emit(LandPropertyAssessmentErrorState(e.toString()));
+      }
+    });
     on<AddLandPropertyAssessment>((event, emit) async {
       http.Response response = (await LandPropertyAssessmentServices.instance
           .add(event.assessment))!;

lib/bloc/passo/land/land_property_assessment/land_property_assessment_event.dart

@@ -17,6 +17,17 @@ class LoadLandPropertyAssessment extends LandPropertyAssessmentEvent {
   List<Object> get props => [assessment];
 }
 
+class LoadLandPropertyAssessmentEdit extends LandPropertyAssessmentEvent {
+  final List<LandPropertyAssessment> assessment;
+  final int id;
+
+  const LoadLandPropertyAssessmentEdit(
+      {required this.assessment, required this.id});
+
+  @override
+  List<Object> get props => [assessment];
+}
+
 class AddLandPropertyAssessment extends LandPropertyAssessmentEvent {
   final LandPropertyAssessment assessment;
 

lib/bloc/passo/land/land_value_adjustments/land_value_adjustments_bloc.dart

@@ -25,6 +25,19 @@ class LandValueAdjustmentsBloc
         emit(LandValueAdjustmentsErrorState(e.toString()));
       }
     });
+    on<LoadLandValueAdjustmentsEdit>((event, emit) async {
+      emit(LandValueAdjustmentsLoading());
+      try {
+        final additionalItems =
+            await ValueAdjustmentsServices.instance.fetch(event.id);
+        globalLandValueAdjustments.clear();
+        globalLandValueAdjustments
+            .addAll(additionalItems); // Append all items to the list
+        emit(LandValueAdjustmentsLoaded(globalLandValueAdjustments));
+      } catch (e) {
+        emit(LandValueAdjustmentsErrorState(e.toString()));
+      }
+    });
     on<AddLandValueAdjustments>((event, emit) async {
       http.Response response =
           (await ValueAdjustmentsServices.instance.add(event.val_adj))!;

lib/bloc/passo/land/land_value_adjustments/land_value_adjustments_event.dart

@@ -16,6 +16,16 @@ class LoadLandValueAdjustments extends LandValueAdjustmentsEvent {
   List<Object> get props => [val_adj];
 }
 
+class LoadLandValueAdjustmentsEdit extends LandValueAdjustmentsEvent {
+  final List<ValueAdjustments> val_adj;
+  final int id;
+
+  const LoadLandValueAdjustmentsEdit({required this.val_adj, required this.id});
+
+  @override
+  List<Object> get props => [val_adj];
+}
+
 class AddLandValueAdjustments extends LandValueAdjustmentsEvent {
   final ValueAdjustments val_adj;
 

lib/bloc/passo/land/other_improvements/other_improvements_bloc.dart

@@ -25,6 +25,21 @@ class OtherImprovementsBloc
         emit(OtherImprovementErrorState(e.toString()));
       }
     });
+    on<LoadOtherImprovementEdit>((event, emit) async {
+      emit(OtherImprovementLoading());
+      try {
+        final additionalItems =
+            await OtherImprovementServices.instance.fetch(event.ids);
+        print(additionalItems);
+        globalOtherImprovement.clear();
+        globalOtherImprovement
+            .addAll(additionalItems); // Append all items to the list
+        emit(OtherImprovementLoaded(globalOtherImprovement));
+      } catch (e) {
+        print(e.toString());
+        emit(OtherImprovementErrorState(e.toString()));
+      }
+    });
     on<AddOtherImprovement>((event, emit) async {
       http.Response response =
           (await OtherImprovementServices.instance.add(event.other_imp))!;

lib/bloc/passo/land/other_improvements/other_improvements_event.dart

@@ -16,6 +16,16 @@ class LoadOtherImprovement extends OtherImprovementsEvent {
   List<Object> get props => [other_imp];
 }
 
+class LoadOtherImprovementEdit extends OtherImprovementsEvent {
+  final List<OtherImprovements> other_imps;
+  final int ids;
+
+  const LoadOtherImprovementEdit({required this.other_imps, required this.ids});
+
+  @override
+  List<Object> get props => [other_imps];
+}
+
 class AddOtherImprovement extends OtherImprovementsEvent {
   final OtherImprovements other_imp;
 

lib/bloc/passo/memoranda/memoranda_bloc.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:unit2/model/passo/memoranda.dart';
@@ -7,12 +9,22 @@ part 'memoranda_event.dart';
 part 'memoranda_state.dart';
 
 class MemorandaBloc extends Bloc<MemorandaEvent, MemorandaState> {
-  MemorandaBloc() : super(MemorandaInitial()) {
+  MemorandaBloc() : super(MemorandaLoading()) {
     on<LoadMemoranda>((event, emit) async {
       emit(MemorandaLoading());
       try {
-        final municipality = await MemorandaServices.instance.fetch();
-        emit(MemorandaLoaded(municipality));
+        final response = await MemorandaServices.instance.fetch();
+        print('Memoranda bloc');
+        print(response.statusCode);
+        print(response.body);
+        if (response.statusCode == 200) {
+          final List result = jsonDecode(response.body)['data'];
+
+          emit(MemorandaLoaded(
+              result.map(((e) => Memoranda.fromJson(e))).toList()));
+        } else {
+          emit(MemorandaErrorState(response.reasonPhrase!));
+        }
       } catch (e) {
         emit(MemorandaErrorState(e.toString()));
       }

lib/bloc/passo/memoranda/memoranda_state.dart

@@ -12,15 +12,14 @@ class MemorandaInitial extends MemorandaState {}
 class MemorandaLoading extends MemorandaState {}
 
 class MemorandaLoaded extends MemorandaState {
-  MemorandaLoaded(this.memorada);
   final List<Memoranda> memorada;
-
+  const MemorandaLoaded(this.memorada);
   @override
   List<Object> get props => [memorada];
 }
 
 class MemorandaErrorState extends MemorandaState {
-  MemorandaErrorState(this.error);
+  const MemorandaErrorState(this.error);
   final String error;
 
   @override

lib/bloc/profile/profile_bloc.dart

@@ -6,6 +6,7 @@ import 'package:unit2/sevices/profile/profile_service.dart';
 
 import '../../model/profile/basic_information/primary-information.dart';
 import '../../screens/profile/components/basic_information/profile_other_info.dart';
+import '../../utils/global.dart';
 part 'profile_event.dart';
 part 'profile_state.dart';
 
@@ -52,20 +53,24 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
               .getProfile(event.token, event.userID);
           globalProfileInformation = profileInformation;
         }
-
         emit(ProfileLoaded(profileInformation: globalProfileInformation!));
       } catch (e) {
         emit(ProfileErrorState(mesage: e.toString()));
       }
     });
     on<GetPrimaryBasicInfo>((event, emit) {
-      currentProfileInformation = event.primaryBasicInformation;
-      emit(BasicInformationProfileLoaded(
-          primaryBasicInformation: event.primaryBasicInformation));
+      if (globalCurrentProfile != null) {
+        emit(BasicInformationProfileLoaded(
+            primaryBasicInformation: globalCurrentProfile!));
+      } else {
+        currentProfileInformation = event.primaryBasicInformation;
+        emit(BasicInformationProfileLoaded(
+            primaryBasicInformation: currentProfileInformation!));
+      }
     });
     on<LoadBasicPrimaryInfo>((event, emit) {
       emit(BasicInformationProfileLoaded(
-          primaryBasicInformation: currentProfileInformation!));
+          primaryBasicInformation: globalCurrentProfile!));
     });
     on<ShowPrimaryInfoEditForm>((event, emit) async {
       try {
@@ -132,6 +137,12 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
         if (status['success']) {
           Profile profile = Profile.fromJson(status['data']);
           currentProfileInformation = profile;
+          globalCurrentProfile = profile;
+          globalFistname = profile.firstName;
+          globalLastname = profile.lastName;
+          globalBday = profile.birthdate;
+          globalSex = profile.sex;
+
           emit(BasicProfileInfoEditedState(response: status));
         }
         emit(BasicProfileInfoEditedState(response: status));

lib/bloc/rbac/rbac_operations/assign_area/assign_area_bloc.dart

@@ -0,0 +1,275 @@
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:unit2/bloc/role_assignment/role_assignment_bloc.dart';
+import 'package:unit2/model/location/purok2.dart';
+import 'package:unit2/model/rbac/assigned_role.dart';
+import 'package:unit2/model/rbac/rbac.dart';
+import 'package:unit2/model/rbac/rbac_station.dart';
+import 'package:unit2/model/roles/pass_check/assign_role_area_type.dart';
+import 'package:unit2/model/utils/agency.dart';
+import 'package:unit2/sevices/roles/rbac_operations/assigned_area_services.dart';
+import '../../../../model/location/barangay2.dart';
+import '../../../../model/profile/assigned_area.dart';
+import '../../../../model/profile/basic_information/primary-information.dart';
+import '../../../../sevices/roles/rbac_operations/role_assignment_services.dart';
+part 'assign_area_event.dart';
+part 'assign_area_state.dart';
+
+class AssignAreaBloc extends Bloc<AssignAreaEvent, AssignAreaState> {
+  AssignAreaBloc() : super(AssignAreaInitial()) {
+    String? fname;
+    String? lname;
+    String? fullname;
+    Profile? profile;
+    int id;
+    List<UserAssignedArea> userAssignedAreas = [];
+    List<AssignedRole> assignedRoles = [];
+    List<RBAC> roles = [];
+    on<GetAssignArea>((event, emit) async {
+      emit(AssignAreaLoadingState());
+      try {
+        profile = await RbacRoleAssignmentServices.instance.searchUser(
+            page: 1, name: event.firstname, lastname: event.lastname);
+        if (profile != null && profile!.id != null) {
+          fname = profile!.firstName;
+          lname = profile!.lastName;
+          fullname = profile!.lastName;
+          fullname = "${fname!} ${lname!}";
+          id = profile!.webuserId!;
+          userAssignedAreas = await RbacAssignedAreaServices.instance
+              .getAssignedArea(id: profile!.webuserId!);
+
+          assignedRoles = await RbacRoleAssignmentServices.instance
+              .getAssignedRoles(
+                  firstname: event.firstname, lastname: event.lastname);
+
+          for (var role in assignedRoles) {
+            roles.add(role.role!);
+          }
+          emit(AssignedAreaLoadedState(
+              userAssignedAreas: userAssignedAreas,
+              fullname: fullname!,
+              roles: roles,
+              userId: id));
+        } else {
+          id = 0;
+          emit(UserNotExistError());
+        }
+      } catch (e) {
+        emit(AssignAreaErorState(message: e.toString()));
+      }
+    });
+    on<AddAssignArea>((event, emit) async {
+      // try {
+      emit(AssignAreaLoadingState());
+      Map<dynamic, dynamic> response = await RbacAssignedAreaServices.instance
+          .add(
+              userId: event.userId,
+              roleId: event.roleId,
+              areaTypeId: event.areaTypeId,
+              areaId: event.areaId);
+      if (response["success"]) {
+        UserAssignedArea? newAssignArea;
+        for (var userArea in userAssignedAreas) {
+          if (userArea.assignedRole?.role?.id == event.roleId &&
+              userArea.assignedRole?.user?.id == event.userId) {
+            newAssignArea = userArea;
+            break;
+          }
+        }
+        // newAssignArea = userAssignedAreas.firstWhere((var element) {
+        //   return element.assignedRole?.role?.id == event.roleId &&
+        //       element.assignedRole?.user?.id == event.userId;
+        // });
+
+        if (newAssignArea?.assignedArea != null) {
+          userAssignedAreas.removeWhere((element) =>
+              element.assignedRole!.role!.id == event.roleId &&
+              element.assignedRole!.user!.id == event.userId);
+        }
+
+        AssignedRole newAssignedRole =
+            AssignedRole.fromJson(response['data'][0]['assigned_role']);
+        AssignRoleAreaType newAssignRoleType = AssignRoleAreaType.fromJson(
+            response['data'][0]['assigned_role_area_type']);
+        UserAssignedArea temp = UserAssignedArea(
+            assignedRole: newAssignedRole,
+            assignedRoleAreaType: newAssignRoleType,
+            assignedArea: []);
+        newAssignArea = temp;
+
+        ////barangay
+        if (event.areaTypeId == 1) {
+          List<dynamic> newAreas = [];
+          for (var area in response['data']) {
+            for (var assignedArea in area['assigned_area']) {
+              var newArea = {};
+              newArea.addAll({"id": assignedArea['id']});
+              newArea.addAll({'isactive': assignedArea['isactive']});
+
+              Barangay2 newBarangay = Barangay2.fromJson(assignedArea['area']);
+
+              newArea.addAll({
+                'area': {
+                  "brgycode": newBarangay.brgycode,
+                  "brgydesc": newBarangay.brgydesc,
+                  "citymuncode": newBarangay.citymuncode
+                }
+              });
+
+              newAreas.add(newArea);
+            }
+          }
+          newAssignArea?.assignedArea = newAreas;
+          userAssignedAreas.add(newAssignArea!);
+          //// purok
+        }
+        if (event.areaTypeId == 2) {
+          List<dynamic> newAreas = [];
+          for (var area in response['data']) {
+            for (var assignedArea in area['assigned_area']) {
+              var newArea = {};
+              newArea.addAll({"id": assignedArea['id']});
+              newArea.addAll({'isactive': assignedArea['isactive']});
+              Purok2 newPurok = Purok2.fromJson(assignedArea['area']);
+              newArea.addAll({
+                'area': {
+                  "purokid": newPurok.purokid,
+                  "purokdesc": newPurok.purokdesc,
+                  "brgy": {
+                    "brgycode": newPurok.brgy?.brgycode,
+                    "brgydesc": newPurok.brgy?.brgydesc,
+                    "citymuncode": newPurok.brgy?.citymuncode,
+                  },
+                  "purok_leader": newPurok.purokLeader,
+                  "writelock": newPurok.writelock,
+                  "recordsignature": newPurok.recordsignature
+                }
+              });
+              newAreas.add(newArea);
+            }
+          }
+          newAssignArea?.assignedArea = newAreas;
+          userAssignedAreas.add(newAssignArea!);
+        }
+        ////statiom
+        if (event.areaTypeId == 4) {
+          List<dynamic> newAreas = [];
+          for (var area in response['data']) {
+            for (var assignedArea in area['assigned_area']) {
+              var newArea = {};
+              newArea.addAll({"id": assignedArea['id']});
+              newArea.addAll({'isactive': assignedArea['isactive']});
+              RbacStation newStation =
+                  RbacStation.fromJson(assignedArea['area']);
+              newArea.addAll({
+                "area": {
+                  "id": newStation.id,
+                  "station_name": newStation.stationName,
+                  "station_type": {
+                    "id": newStation.stationType?.id,
+                    "type_name": newStation.stationType?.typeName,
+                    "color": newStation.stationType?.color,
+                    "order": newStation.stationType?.order,
+                    "is_active": newStation.stationType?.isActive,
+                    "group": null
+                  },
+                  "hierarchy_order_no": newStation.hierarchyOrderNo,
+                  "head_position": newStation.headPosition,
+                  "government_agency": {
+                    "agencyid": newStation.governmentAgency?.agencycatid,
+                    "agencyname": newStation.governmentAgency?.agencyname,
+                    "agencycatid": newStation.governmentAgency?.agencycatid,
+                    "private_entity":
+                        newStation.governmentAgency?.privateEntity,
+                    "contactinfoid": newStation.governmentAgency?.contactinfoid
+                  },
+                  "acronym": newStation.acronym,
+                  "parent_station": newStation.parentStation,
+                  "code": newStation.code,
+                  "fullcode": newStation.fullcode,
+                  "child_station_info": newStation.childStationInfo,
+                  "islocation_under_parent": newStation.islocationUnderParent,
+                  "main_parent_station": newStation.mainParentStation,
+                  "description": newStation.description,
+                  "ishospital": newStation.ishospital,
+                  "isactive": newStation.isactive,
+                  "selling_station": newStation.sellingStation
+                }
+              });
+              newAreas.add(newArea);
+            }
+          }
+          newAssignArea?.assignedArea = newAreas;
+          userAssignedAreas.add(newAssignArea!);
+        }
+        ////agency
+        if (event.areaTypeId == 3) {
+          List<dynamic> newAreas = [];
+          for (var area in response['data']) {
+            for (var assignedArea in area['assigned_area']) {
+              var newArea = {};
+              newArea.addAll({"id": assignedArea['id']});
+              newArea.addAll({'isactive': assignedArea['isactive']});
+              Agency newAgency = Agency.fromJson(assignedArea['area']);
+              newArea.addAll({
+                "area": {
+                  "id": newAgency.id,
+                  "name": newAgency.name,
+                  "category": {
+                    "id": newAgency.category?.id,
+                    "industry_class": {
+                      "id": newAgency.category?.industryClass?.id,
+                      "name": newAgency.category?.industryClass?.name,
+                      "description":
+                          newAgency.category?.industryClass?.description
+                    }
+                  },
+                  "private_entity": newAgency.privateEntity,
+                }
+              });
+              newAreas.add(newArea);
+            }
+          }
+          newAssignArea?.assignedArea = newAreas;
+          userAssignedAreas.add(newAssignArea!);
+        }
+        emit(AssignAreaAddedState(response: response));
+      } else {
+        emit(AssignAreaAddedState(response: response));
+      }
+      // } catch (e) {
+      //   emit(AssignAreaErorState(message: e.toString()));
+      // }
+    });
+    on<LoadAssignedAreas>((event, emit) async {
+      emit(AssignedAreaLoadedState(
+          userAssignedAreas: userAssignedAreas,
+          fullname: fullname!,
+          roles: roles,
+          userId: event.userId));
+    });
+    on<DeleteAssignedArea>((event, emit) async {
+      emit(AssignAreaLoadingState());
+      try {
+        bool success = await RbacAssignedAreaServices.instance
+            .deleteAssignedArea(areaId: event.areaId);
+        if (success) {
+          for (var area in userAssignedAreas) {
+            area.assignedArea.removeWhere((var a) {
+              return a['id'] == event.areaId;
+            });
+          }
+          emit(AssignedAreaDeletedState(success: success));
+        } else {
+          emit(AssignedAreaDeletedState(success: success));
+        }
+      } catch (e) {
+        emit(AssignAreaErorState(message: e.toString()));
+      }
+    });
+    on<CallErrorState>((event, emit) {
+      emit(AssignAreaErorState(message: event.message));
+    });
+  }
+}

lib/bloc/rbac/rbac_operations/assign_area/assign_area_event.dart

@@ -0,0 +1,52 @@
+part of 'assign_area_bloc.dart';
+
+class AssignAreaEvent extends Equatable {
+  const AssignAreaEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class GetAssignArea extends AssignAreaEvent {
+  final String firstname;
+  final String lastname;
+  const GetAssignArea({required this.firstname, required this.lastname});
+  @override
+  List<Object> get props => [firstname, lastname];
+}
+
+class DeleteAssignedArea extends AssignAreaEvent {
+  final int areaId;
+  const DeleteAssignedArea({required this.areaId});
+  @override
+  List<Object> get props => [areaId];
+}
+
+class LoadAssignedAreas extends AssignAreaEvent {
+  final int userId;
+  const LoadAssignedAreas({required this.userId});
+  @override
+  List<Object> get props => [userId];
+}
+
+class CallErrorState extends AssignAreaEvent {
+  final String message;
+  const CallErrorState({required this.message});
+  @override
+  List<Object> get props => [message];
+}
+
+class AddAssignArea extends AssignAreaEvent {
+  final int userId;
+  final int roleId;
+  final int areaTypeId;
+  final String areaId;
+
+  const AddAssignArea(
+      {required this.areaId,
+      required this.areaTypeId,
+      required this.roleId,
+      required this.userId});
+  @override
+  List<Object> get props => [userId, roleId, areaTypeId, areaId];
+}

lib/bloc/rbac/rbac_operations/assign_area/assign_area_state.dart

@@ -0,0 +1,44 @@
+part of 'assign_area_bloc.dart';
+
+class AssignAreaState extends Equatable {
+  const AssignAreaState();
+
+  @override
+  List<Object> get props => [];
+}
+
+class AssignedAreaLoadedState extends AssignAreaState{
+  final List<UserAssignedArea> userAssignedAreas;
+  final List<RBAC> roles;
+  final String fullname;
+  final int userId;
+  const AssignedAreaLoadedState({required this.userAssignedAreas, required this.fullname, required this.roles, required this.userId});
+    @override
+  List<Object> get props => [userAssignedAreas,fullname,roles];
+}
+class AssignAreaErorState extends AssignAreaState {
+  final String message;
+  const AssignAreaErorState({required this.message});
+  @override
+  List<Object> get props => [message];
+}
+class AssignAreaLoadingState extends AssignAreaState{
+
+}
+
+class UserNotExistError extends AssignAreaState{
+  
+}
+class AssignAreaInitial extends AssignAreaState {}
+class AssignedAreaDeletedState extends AssignAreaState{
+  final bool success;
+  const AssignedAreaDeletedState({required this.success});
+  @override
+  List<Object> get props => [success];
+}
+class AssignAreaAddedState extends AssignAreaState {
+  final Map<dynamic,dynamic> response;
+  const AssignAreaAddedState({required this.response});
+    @override
+  List<Object> get props => [response];
+}

lib/bloc/role/pass_check/pass_check_bloc.dart

@@ -65,6 +65,7 @@ class PassCheckBloc extends Bloc<PassCheckEvent, PassCheckState> {
           otherInputs: otherInputs!,
           passerId: uuid!,
           roleId: roleIdRoleName!.roleId,
+          roleName: roleIdRoleName!.roleName,
           stationId: stationId,
           temp: event.temp));
     });
@@ -78,6 +79,7 @@ class PassCheckBloc extends Bloc<PassCheckEvent, PassCheckState> {
           otherInputs: otherInputs!,
           passerId: uuid!,
           roleId: roleIdRoleName!.roleId,
+          roleName:  roleIdRoleName!.roleName,
           stationId: stationId,
           temp: null));
     });
@@ -123,6 +125,7 @@ class PassCheckBloc extends Bloc<PassCheckEvent, PassCheckState> {
                   otherInputs: otherInputs!,
                   passerId: uuid!,
                   roleId: roleIdRoleName!.roleId,
+                  roleName: roleIdRoleName!.roleName,
                   stationId: stationId,
                   temp: null));
             }
@@ -152,7 +155,7 @@ class PassCheckBloc extends Bloc<PassCheckEvent, PassCheckState> {
             stationId: event.stationId,
             cpId: event.cpId,
             otherInputs: event.otherInputs,
-            roleid: event.roleId);
+            roleIdRoleName: roleIdRoleName!);
         if (success) {
             Fluttertoast.showToast(
               msg: "SUCCESSFULLY SAVED",

lib/bloc/role/pass_check/pass_check_event.dart

@@ -44,6 +44,7 @@ class PerformPostLogs extends PassCheckEvent {
   final int? stationId;
   final String? destination;
   final double? temp;
+  final String roleName;
   final int roleId;
   const PerformPostLogs(
       {required this.checkerId,
@@ -52,6 +53,7 @@ class PerformPostLogs extends PassCheckEvent {
       required this.io,
       required this.otherInputs,
       required this.passerId,
+      required this.roleName,
       required this.roleId,
       required this.stationId,
       required this.temp});

lib/bloc/role_assignment/role_assignment_bloc.dart

@@ -1,5 +1,6 @@
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
+import 'package:unit2/utils/text_container.dart';
 import '../../model/profile/basic_information/primary-information.dart';
 import '../../model/rbac/assigned_role.dart';
 import '../../model/rbac/rbac.dart';
@@ -21,27 +22,24 @@ class RoleAssignmentBloc
     List<RBAC> roles = [];
     on<GetAssignedRoles>((event, emit) async {
       emit(RoleAssignmentLoadingState());
-      fname = event.firstname;
-      lname = event.lastname;
-      fullname = "${event.firstname} ${event.lastname}";
       try {
         profile = await RbacRoleAssignmentServices.instance.searchUser(
             page: 1, name: event.firstname, lastname: event.lastname);
-        if (profile != null && profile?.id != null)  {
+        if (profile != null && profile?.id != null) {
+          fname = profile!.firstName;
+          lname = profile!.lastName;
+          fullname = "${fname!} ${lname!}";
           assignedRoles = await RbacRoleAssignmentServices.instance
-              .getAssignedRoles(
-                  firstname: event.firstname, lastname: event.lastname);
+              .getAssignedRoles(firstname: event.firstname, lastname: event.lastname);
 
-                    if (roles.isEmpty) {
-          roles = await RbacRoleServices.instance.getRbacRoles();
-        }
+          if (roles.isEmpty) {
+            roles = await RbacRoleServices.instance.getRbacRoles();
+          }
           emit(AssignedRoleLoaded(
               assignedRoles: assignedRoles, fullname: fullname!, roles: roles));
         } else {
           emit(UserNotExistError());
         }
-
-      
       } catch (e) {
         emit(RoleAssignmentErrorState(message: e.toString()));
       }

lib/bloc/user/user_bloc.dart

@@ -15,13 +15,14 @@ import '../../utils/scanner.dart';
 import '../../utils/text_container.dart';
 part 'user_event.dart';
 part 'user_state.dart';
-
 class UserBloc extends Bloc<UserEvent, UserState> {
   UserData? _userData;
   VersionInfo? _versionInfo;
   String? _apkVersion;
   bool save = false;
   String? uuid;
+  String? username;
+  String? password;
   List<AssignedArea> establishmentPointPersonAssignedAreas = [];
   UserBloc() : super(UserInitial()) {
     //// this event is called when opening the app to check if
@@ -37,17 +38,23 @@ class UserBloc extends Bloc<UserEvent, UserState> {
         String apkVersion = await getAppVersion();
         _apkVersion = apkVersion;
         final String? saved = CREDENTIALS?.get('saved');
-        final String? username = CREDENTIALS?.get('username');
-        final String? password = CREDENTIALS?.get('password');
-        if (saved != null) {
+       username = CREDENTIALS?.get('username');
+     password = CREDENTIALS?.get('password');
+     if(apkVersion != _versionInfo!.id ){
+              emit(VersionLoaded(
+              versionInfo: _versionInfo,
+              apkVersion: _apkVersion,
+              username: event.username,
+              password: event.password));
+     }else if (saved != null) {
           save = true;
           add(UserLogin(username: username, password: password));
         } else {
           emit(VersionLoaded(
               versionInfo: _versionInfo,
               apkVersion: _apkVersion,
-              username: null,
-              password: null));
+              username: event.username,
+              password: event.password));
         }
       } catch (e) {
         emit(UserError(
@@ -57,14 +64,18 @@ class UserBloc extends Bloc<UserEvent, UserState> {
     });
 ////Loading the current version of the app
     on<LoadVersion>((event, emit) {
+      username = event.username;
+      password = event.password;
       emit(VersionLoaded(
           versionInfo: _versionInfo,
           apkVersion: _apkVersion,
-          username: event.username,
-          password: event.password));
+          username: username,
+          password: password));
     });
 ////userlogin
     on<UserLogin>((event, emit) async {
+      username = event.username;
+      password = event.password;
       try {
       Map<dynamic, dynamic> response = await AuthService.instance
           .webLogin(username: event.username, password: event.password);

lib/bloc/user/user_event.dart

@@ -6,9 +6,11 @@ abstract class UserEvent extends Equatable {
 }
 
 class GetApkVersion extends UserEvent {
-  GetApkVersion();
+  final String username;
+  final String password;
+  GetApkVersion({required this.password, required this.username});
   @override
-  List<Object> get props => [];
+  List<Object> get props => [username,password];
 }
 
 class UserLogin extends UserEvent {

lib/model/location/barangay2.dart

@@ -0,0 +1,41 @@
+// To parse this JSON data, do
+//
+//     final barangay = barangayFromJson(jsonString);
+
+import 'package:meta/meta.dart';
+import 'dart:convert';
+
+import 'city.dart';
+import 'provinces.dart';
+
+Barangay2 barangayFromJson(String str) => Barangay2.fromJson(json.decode(str));
+
+String barangayToJson(Barangay2 data) => json.encode(data.toJson());
+
+class Barangay2 {
+    Barangay2({
+        required this.brgycode,
+        required this.brgydesc,
+        required this.citymuncode,
+    });
+
+    final String? brgycode;
+    final String? brgydesc;
+    final String? citymuncode;
+
+    factory Barangay2.fromJson(Map<String, dynamic> json) => Barangay2(
+        brgycode: json["brgycode"],
+        brgydesc: json["brgydesc"],
+        citymuncode: json['citymuncode']
+    );
+
+    Map<String, dynamic> toJson() => {
+        "brgycode": brgycode,
+        "brgydesc": brgydesc,
+        "citymuncode": citymuncode
+    };
+}
+
+
+
+

lib/model/location/purok.dart

@@ -0,0 +1,36 @@
+// To parse this JSON data, do
+//
+//     final purok = purokFromJson(jsonString);
+
+import 'package:meta/meta.dart';
+import 'dart:convert';
+
+import 'package:unit2/model/location/barangay.dart';
+
+Purok purokFromJson(String str) => Purok.fromJson(json.decode(str));
+
+String purokToJson(Purok data) => json.encode(data.toJson());
+
+class Purok {
+    final String code;
+    final String description;
+    final Barangay barangay;
+
+    Purok({
+        required this.code,
+        required this.description,
+        required this.barangay,
+    });
+
+    factory Purok.fromJson(Map<String, dynamic> json) => Purok(
+        code: json["code"],
+        description: json["description"],
+        barangay: Barangay.fromJson(json["barangay"]),
+    );
+
+    Map<String, dynamic> toJson() => {
+        "code": code,
+        "description": description,
+        "barangay": barangay.toJson(),
+    };
+}

lib/model/location/purok2.dart

@@ -0,0 +1,39 @@
+
+
+import 'package:unit2/model/location/barangay2.dart';
+
+class Purok2 {
+    final String purokid;
+    final String purokdesc;
+    final Barangay2? brgy;
+    final dynamic purokLeader;
+    final bool writelock;
+    final dynamic recordsignature;
+
+    Purok2({
+        required this.purokid,
+        required this.purokdesc,
+        required this.brgy,
+        required this.purokLeader,
+        required this.writelock,
+        required this.recordsignature,
+    });
+
+    factory Purok2.fromJson(Map<String, dynamic> json) => Purok2(
+        purokid: json["purokid"],
+        purokdesc: json["purokdesc"],
+        brgy: json['brgy'] == null?null: Barangay2.fromJson(json["brgy"]),
+        purokLeader: json["purok_leader"],
+        writelock: json["writelock"],
+        recordsignature: json["recordsignature"],
+    );
+
+    Map<String, dynamic> toJson() => {
+        "purokid": purokid,
+        "purokdesc": purokdesc,
+        "brgy": brgy?.toJson(),
+        "purok_leader": purokLeader,
+        "writelock": writelock,
+        "recordsignature": recordsignature,
+    };
+}

lib/model/login_data/version_info.dart

@@ -1,6 +1,6 @@
 class VersionInfo {
   VersionInfo({
-    this.version,
+    this.id,
     this.versionInfo,
     this.dateReleased,
     this.development,
@@ -11,7 +11,7 @@ class VersionInfo {
     this.x8664DownloadUrl,
   });
 
-  String? version;
+  String? id;
   String? versionInfo;
   DateTime? dateReleased;
   bool? development;
@@ -22,7 +22,7 @@ class VersionInfo {
   String? x8664DownloadUrl;
 
   factory VersionInfo.fromJson(Map<String, dynamic> json) => VersionInfo(
-        version: json["version"],
+        id: json["id"],
         versionInfo: json["version_info"],
         dateReleased: DateTime.parse(json["date_released"]),
         development: json["development"],
@@ -34,7 +34,7 @@ class VersionInfo {
       );
 
   Map<String, dynamic> toJson() => {
-        "version": version,
+        "version": id,
         "version_info": versionInfo,
         "date_released":
             "${dateReleased!.year.toString().padLeft(4, '0')}-${dateReleased!.month.toString().padLeft(2, '0')}-${dateReleased!.day.toString().padLeft(2, '0')}",

lib/model/passo/property_appraisal.dart

@@ -27,6 +27,7 @@ class PropertyAppraisal {
   final String? totalpercentDepreciation;
   final String? marketValue;
   final String? totalArea;
+  final String? actualUse;
 
   PropertyAppraisal(
       {this.id,
@@ -44,31 +45,32 @@ class PropertyAppraisal {
       this.addItemsSubtotal,
       this.totalpercentDepreciation,
       this.marketValue,
-      this.totalArea});
+      this.totalArea,
+      this.actualUse});
 
   factory PropertyAppraisal.fromJson(Map<String, dynamic> json) =>
       PropertyAppraisal(
-        id: json["id"],
-        bldgapprDetailsId: json["bldgappr_details_id"],
-        assessedById: json["assessed_by_id"],
-        assessedByName: json["assessed_by_name"],
-        dateCreated: json["date_created"] == null
-            ? null
-            : DateTime.parse(json["date_created"]),
-        dateModified: json["date_modified"] == null
-            ? null
-            : DateTime.parse(json["date_modified"]),
-        unitconstructCost: json["unitconstruct_cost"],
-        buildingCore: json["building_core"],
-        unitconstructSubtotal: json["unitconstruct_subtotal"],
-        depreciationRate: json["depreciation_rate"],
-        depreciationCost: json["depreciation_cost"],
-        costAddItems: json["cost_add_items"],
-        addItemsSubtotal: json["add_items_subtotal"],
-        totalpercentDepreciation: json["totalpercent_depreciation"],
-        marketValue: json["market_value"],
-        totalArea: json["total_area"],
-      );
+          id: json["id"],
+          bldgapprDetailsId: json["bldgappr_details_id"],
+          assessedById: json["assessed_by_id"],
+          assessedByName: json["assessed_by_name"],
+          dateCreated: json["date_created"] == null
+              ? null
+              : DateTime.parse(json["date_created"]),
+          dateModified: json["date_modified"] == null
+              ? null
+              : DateTime.parse(json["date_modified"]),
+          unitconstructCost: json["unitconstruct_cost"],
+          buildingCore: json["building_core"],
+          unitconstructSubtotal: json["unitconstruct_subtotal"],
+          depreciationRate: json["depreciation_rate"],
+          depreciationCost: json["depreciation_cost"],
+          costAddItems: json["cost_add_items"],
+          addItemsSubtotal: json["add_items_subtotal"],
+          totalpercentDepreciation: json["totalpercent_depreciation"],
+          marketValue: json["market_value"],
+          totalArea: json["total_area"],
+          actualUse: json["actual_use"]);
 
   Map<String, dynamic> toJson() => {
         "id": id,
@@ -86,6 +88,7 @@ class PropertyAppraisal {
         "add_items_subtotal": addItemsSubtotal,
         "totalpercent_depreciation": totalpercentDepreciation,
         "market_value": marketValue,
-        "total_area": totalArea
+        "total_area": totalArea,
+        "actual_use": actualUse
       };
 }

lib/model/profile/assigned_area.dart

@@ -0,0 +1,32 @@
+import 'package:unit2/model/rbac/assigned_role.dart';
+import 'package:unit2/model/rbac/rbac.dart';
+
+import '../roles/pass_check/assign_role_area_type.dart';
+
+class UserAssignedArea {
+     AssignedRole? assignedRole;
+     AssignRoleAreaType? assignedRoleAreaType;
+     dynamic assignedArea;
+
+    UserAssignedArea({
+        required this.assignedRole,
+        required this.assignedRoleAreaType,
+        required this.assignedArea,
+    });
+
+    factory UserAssignedArea.fromJson(Map<String, dynamic> json) => UserAssignedArea(
+        assignedRole: json['assigned_role'] == null? null: AssignedRole.fromJson(json["assigned_role"]),
+        assignedRoleAreaType: json['assigned_role_area_type'] == null? null : AssignRoleAreaType.fromJson(json["assigned_role_area_type"]),
+        assignedArea: json["assigned_area"],
+    );
+
+    Map<String, dynamic> toJson() => {
+        "assigned_role": assignedRole?.toJson(),
+        "assigned_role_area_type": assignedRoleAreaType?.toJson(),
+        "assigned_area": assignedArea,
+    };
+}
+
+
+
+

lib/model/rbac/assigned_role.dart

@@ -5,13 +5,15 @@
 import 'package:meta/meta.dart';
 import 'dart:convert';
 
+import 'package:unit2/model/rbac/rbac.dart';
+
 AssignedRole assignedRoleFromJson(String str) => AssignedRole.fromJson(json.decode(str));
 
 String assignedRoleToJson(AssignedRole data) => json.encode(data.toJson());
 
 class AssignedRole {
     final int? id;
-    final Role? role;
+    final RBAC? role;
     final CreatedBy? user;
     final DateTime? createdAt;
     final DateTime? updatedAt;
@@ -30,7 +32,7 @@ class AssignedRole {
 
     factory AssignedRole.fromJson(Map<String, dynamic> json) => AssignedRole(
         id: json["id"],
-        role: json['role'] == null?null: Role.fromJson(json["role"]),
+        role: json['role'] == null?null: RBAC.fromJson(json["role"]),
         user: json['role'] == null?null: CreatedBy.fromJson(json["user"]),
         createdAt:json["created_at"] == null?null: DateTime.parse(json["created_at"]),
         updatedAt: json["updated_at"] == null?null: DateTime.parse(json["updated_at"]),
@@ -84,47 +86,3 @@ class CreatedBy {
         "is_active": isActive,
     };
 }
-
-class Role {
-    final int id;
-    final String name;
-    final String slug;
-    final String shorthand;
-    final DateTime createdAt;
-    final DateTime updatedAt;
-    final CreatedBy createdBy;
-    final CreatedBy updatedBy;
-
-    Role({
-        required this.id,
-        required this.name,
-        required this.slug,
-        required this.shorthand,
-        required this.createdAt,
-        required this.updatedAt,
-        required this.createdBy,
-        required this.updatedBy,
-    });
-
-    factory Role.fromJson(Map<String, dynamic> json) => Role(
-        id: json["id"],
-        name: json["name"],
-        slug: json["slug"],
-        shorthand: json["shorthand"],
-        createdAt: DateTime.parse(json["created_at"]),
-        updatedAt: DateTime.parse(json["updated_at"]),
-        createdBy: CreatedBy.fromJson(json["created_by"]),
-        updatedBy: CreatedBy.fromJson(json["updated_by"]),
-    );
-
-    Map<String, dynamic> toJson() => {
-        "id": id,
-        "name": name,
-        "slug": slug,
-        "shorthand": shorthand,
-        "created_at": createdAt.toIso8601String(),
-        "updated_at": updatedAt.toIso8601String(),
-        "created_by": createdBy.toJson(),
-        "updated_by": updatedBy.toJson(),
-    };
-}

lib/model/roles/pass_check/purok_assign_area.dart

@@ -2,7 +2,7 @@
 
 import 'barangay_assign_area.dart';
 
-class Purok {
+class PassCheckPurok {
     final String? purokid;
     final String? purokdesc;
     final BaragayAssignArea? brgy;
@@ -10,7 +10,7 @@ class Purok {
     final bool? writelock;
     final dynamic recordsignature;
 
-    Purok({
+    PassCheckPurok({
         required this.purokid,
         required this.purokdesc,
         required this.brgy,
@@ -19,7 +19,7 @@ class Purok {
         required this.recordsignature,
     });
 
-    factory Purok.fromJson(Map<String, dynamic> json) => Purok(
+    factory PassCheckPurok.fromJson(Map<String, dynamic> json) => PassCheckPurok(
         purokid: json["purokid"],
         purokdesc: json["purokdesc"],
         brgy: json["brgy"]==null?null:BaragayAssignArea.fromJson(json["brgy"]),

lib/screens/passo/Building/add_building_components/bldg_location_landref.dart

@@ -49,20 +49,10 @@ class _BldgLocationLandrefPage extends State<BldgLocationLandrefPage> {
               final progress = ProgressHUD.of(context);
               progress!.showWithText("Please wait...");
             }
-            if (state is MunicipalityLoaded) {
-              final progress = ProgressHUD.of(context);
-              progress?.dismiss();
-            }
+
             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) {
@@ -75,6 +65,7 @@ class _BldgLocationLandrefPage extends State<BldgLocationLandrefPage> {
                     final progress = ProgressHUD.of(context);
                     progress!.showWithText("Please wait...");
                   }
+
                   if (state is BarangayLoaded) {
                     final progress = ProgressHUD.of(context);
                     progress?.dismiss();
@@ -82,13 +73,6 @@ class _BldgLocationLandrefPage extends State<BldgLocationLandrefPage> {
                   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) {
@@ -130,7 +114,7 @@ class _BldgLocationLandrefPage extends State<BldgLocationLandrefPage> {
                                           borderRadius:
                                               BorderRadius.circular(5.0),
                                         ),
-                                        child: Align(
+                                        child: const Align(
                                           alignment: Alignment.center,
                                           child: Text(
                                             "AGUSAN DEL NORTE",
@@ -244,7 +228,7 @@ class _BldgLocationLandrefPage extends State<BldgLocationLandrefPage> {
                                         child:
                                             customTextField("Area", "", 'area'))
                                   ]),
-                              SizedBox(
+                              const SizedBox(
                                 height: 50,
                               ),
                               Row(

lib/screens/passo/Building/add_building_components/general_description.dart

@@ -231,17 +231,4 @@ class _GeneralDescriptionPage extends State<GeneralDescriptionPage> {
       ),
     );
   }
-
-  Future<bool> _waitForAddPropertyInfoToComplete() async {
-    // Wait for the state change indicating completion
-    final propertyInfoState = context.read<PropertyInfoBloc>().state;
-
-    if (propertyInfoState is ShowGenDescErrorAlertState) {
-      // Check if the add operation was unsuccessful
-      return true; // You'll need to define this in your state class
-    }
-
-    // Return false if the state didn't change as expected
-    return false;
-  }
 }

lib/screens/passo/Building/edit_building/bldgloc_landref.dart

@@ -46,10 +46,7 @@ class _BldgLocLandRefEdit extends State<BldgLocLandRefEdit> {
               final progress = ProgressHUD.of(context);
               progress!.showWithText("Please wait...");
             }
-            if (state is LocationLoaded) {
-              final progress = ProgressHUD.of(context);
-              progress?.dismiss();
-            }
+
             if (state is LocationErrorState) {
               final progress = ProgressHUD.of(context);
               progress?.dismiss();
@@ -64,10 +61,6 @@ class _BldgLocLandRefEdit extends State<BldgLocLandRefEdit> {
                     final progress = ProgressHUD.of(context);
                     progress!.showWithText("Please wait...");
                   }
-                  if (state is LandrefLoaded) {
-                    final progress = ProgressHUD.of(context);
-                    progress?.dismiss();
-                  }
                   if (state is LandrefErrorState) {
                     final progress = ProgressHUD.of(context);
                     progress?.dismiss();
@@ -82,10 +75,6 @@ class _BldgLocLandRefEdit extends State<BldgLocLandRefEdit> {
                         final progress = ProgressHUD.of(context);
                         progress!.showWithText("Please wait...");
                       }
-                      if (state is MunicipalityLoaded) {
-                        final progress = ProgressHUD.of(context);
-                        progress?.dismiss();
-                      }
                       if (state is MunicipalityErrorState) {
                         final progress = ProgressHUD.of(context);
                         progress?.dismiss();

lib/screens/passo/Building/edit_building/property_assessement_edit.dart

@@ -484,7 +484,15 @@ class _PropertyAssessmentEditPage extends State<PropertyAssessmentEditPage> {
             final assessment = state.assessmentsEdit;
             return BlocConsumer<SignatoriesBloc, SignatoriesState>(
               listener: (context, state) {
-                // TODO: implement listener
+                if (state is SignatoriesLoading) {
+                  final progress = ProgressHUD.of(context);
+                  progress!.showWithText("Please wait...");
+                }
+
+                if (state is SignatoriesErrorState) {
+                  final progress = ProgressHUD.of(context);
+                  progress?.dismiss();
+                }
               },
               builder: (context, state) {
                 if (state is SignatoriesLoaded) {
@@ -492,26 +500,39 @@ class _PropertyAssessmentEditPage extends State<PropertyAssessmentEditPage> {
 
                   return BlocConsumer<MemorandaBloc, MemorandaState>(
                     listener: (context, state) {
-                      // TODO: implement listener
+                      if (state is MemorandaLoading) {
+                        final progress = ProgressHUD.of(context);
+                        progress!.showWithText("Please wait...");
+                      }
+                      if (state is MemorandaLoaded) {
+                        final progress = ProgressHUD.of(context);
+                        progress?.dismiss();
+                      }
+                      if (state is MemorandaErrorState) {
+                        final progress = ProgressHUD.of(context);
+                        progress?.dismiss();
+                      }
                     },
                     builder: (context, state) {
                       if (state is MemorandaLoaded) {
                         return FormBuilder(
                           key: keys,
                           initialValue: {
-                            'qtr': assessment.qtr.toString(),
-                            'yr': assessment.qtr.toString(),
-                            // 'appraised_by': assessment.appraisedbyName,
-                            'app_date': assessment.appraisedbyDate.toString(),
-                            // 'rec_approval': assessment.recommendapprName,
-                            'rec_date': assessment.recommendapprDate.toString(),
-                            // 'apprvd_by': assessment.approvedbyName,
-                            'memoranda': assessment.memoranda,
-                            'sworn_statement': assessment.swornstatementNo,
-                            'date_received': assessment.dateReceived.toString(),
+                            'qtr': assessment.qtr?.toString() ?? '',
+                            'yr': assessment.qtr?.toString() ?? '',
+                            'app_date':
+                                assessment.appraisedbyDate?.toString() ?? '',
+                            'rec_date':
+                                assessment.recommendapprDate?.toString() ?? '',
+                            'memoranda': assessment.memoranda ?? '',
+                            'sworn_statement':
+                                assessment.swornstatementNo ?? '',
+                            'date_received':
+                                assessment.dateReceived?.toString() ?? '',
                             'date_of_entry':
-                                assessment.entryDateAssessment.toString(),
-                            'by': assessment.entryDateBy
+                                assessment.entryDateAssessment?.toString() ??
+                                    '',
+                            'by': assessment.entryDateBy ?? '',
                           },
                           enabled: true,
                           onChanged: () {
@@ -649,7 +670,8 @@ class _PropertyAssessmentEditPage extends State<PropertyAssessmentEditPage> {
                                                         decoration:
                                                             InputDecoration(
                                                           labelText: assessment
-                                                              .appraisedbyName!,
+                                                                  .appraisedbyName ??
+                                                              "",
                                                           labelStyle:
                                                               const TextStyle(
                                                                   color: Colors
@@ -723,7 +745,8 @@ class _PropertyAssessmentEditPage extends State<PropertyAssessmentEditPage> {
                                                         decoration:
                                                             InputDecoration(
                                                           labelText: assessment
-                                                              .recommendapprName!,
+                                                                  .recommendapprName ??
+                                                              "",
                                                           labelStyle:
                                                               const TextStyle(
                                                                   color: Colors
@@ -798,7 +821,8 @@ class _PropertyAssessmentEditPage extends State<PropertyAssessmentEditPage> {
                                                         decoration:
                                                             InputDecoration(
                                                           labelText: assessment
-                                                              .approvedbyName!,
+                                                                  .approvedbyName ??
+                                                              "",
                                                           labelStyle:
                                                               const TextStyle(
                                                                   color: Colors
@@ -1087,12 +1111,13 @@ class _PropertyAssessmentEditPage extends State<PropertyAssessmentEditPage> {
 
                                                 propertyAssessments.add(ass);
 
-                                                context.read<
-                                                    PropertyAssessmentEditBloc>()
-                                                  ..add(UpdatePropertyAssessmentEdit(
-                                                      assessmentsEdit:
-                                                          propertyAssessments[
-                                                              0]));
+                                                context
+                                                    .read<
+                                                        PropertyAssessmentEditBloc>()
+                                                    .add(UpdatePropertyAssessmentEdit(
+                                                        assessmentsEdit:
+                                                            propertyAssessments[
+                                                                0]));
                                               },
                                             ),
                                           ),
@@ -1114,7 +1139,7 @@ class _PropertyAssessmentEditPage extends State<PropertyAssessmentEditPage> {
           }
           if (state is PropertyAssessmentEditErrorState) {
             return SomethingWentWrong(
-              message: onError,
+              message: state.error,
               onpressed: () {
                 context.read<PropertyAssessmentEditBloc>().add(
                     LoadPropertyAssessmentEdit(

lib/screens/passo/Building/edit_building/property_owner_info.dart

@@ -62,7 +62,19 @@ class _PropertyOwnerInfoEdit extends State<PropertyOwnerInfoEdit> {
   Widget build(BuildContext context) {
     return BlocConsumer<PropertyInfoBloc, PropertyInfoState>(
         listener: (context, state) {
-      // TODO: implement listener
+      if (state is PropertyInfoLoaded) {
+        final progress = ProgressHUD.of(context);
+        progress?.dismiss();
+      }
+      if (state is PropertyInfoLoading) {
+        final progress = ProgressHUD.of(context);
+        progress!.showWithText("Please wait...");
+      }
+
+      if (state is PropertyInfoErrorState) {
+        final progress = ProgressHUD.of(context);
+        progress?.dismiss();
+      }
     }, builder: (context, state) {
       if (state is PropertyInfoLoaded) {
         return SingleChildScrollView(

lib/screens/passo/Land/edit_land.dart

@@ -79,20 +79,8 @@ class _EditLand extends State<EditLand> {
               },
             ),
             Expanded(
-              child: FormBuilder(
-                key: landKey,
-
-                // enabled: false,
-                onChanged: () {
-                  landKey.currentState?.save();
-
-                  print(landKey.currentState?.value.toString());
-                },
-                autovalidateMode: AutovalidateMode.disabled,
-                skipDisabled: true,
-                child: Container(
-                  child: content(PrevBtn, NextBtn, onSAveAll),
-                ),
+              child: Container(
+                child: content(PrevBtn, NextBtn, onSAveAll),
               ),
             ),
           ],
@@ -111,15 +99,16 @@ class _EditLand extends State<EditLand> {
       case 1:
         return LandLocationAndBoundariesEdit(PrevBtn, NextBtn, widget.faas!);
       case 2:
-        return LandAppraisalEdit(PrevBtn, NextBtn);
+        return LandAppraisalEdit(PrevBtn, NextBtn, widget.faas.id!);
       case 3:
-        return OtherImprovementEditPage(PrevBtn, NextBtn);
+        return OtherImprovementEditPage(PrevBtn, NextBtn, widget.faas.id!);
       case 4:
-        return ValueAdjustmentEditPage(PrevBtn, NextBtn);
+        return ValueAdjustmentEditPage(PrevBtn, NextBtn, widget.faas.id!);
       case 5:
-        return LandPropertyAssessmentEditPage(PrevBtn, NextBtn);
+        return LandPropertyAssessmentEditPage(
+            PrevBtn, NextBtn, widget.faas.id!);
       case 6:
-        return LandSignatoriesEdit(onSAveAll);
+        return LandSignatoriesEdit(onSAveAll, widget.faas.id!);
 
       default:
         return LandPropertyOwnerInfoEdit(NextBtn, widget.faas!);

lib/screens/passo/Land/edit_land/AddLandAppraisalEdit.dart

@@ -0,0 +1,464 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_form_builder/flutter_form_builder.dart';
+import 'package:flutter_progress_hud/flutter_progress_hud.dart';
+import 'package:form_builder_validators/form_builder_validators.dart';
+import 'package:intl/intl.dart';
+import 'package:searchfield/searchfield.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:unit2/bloc/passo/bulding/additional_item/additional_item_bloc.dart';
+import 'package:unit2/bloc/passo/land/land_appraisal/land_appraisal_bloc.dart';
+import 'package:unit2/bloc/passo/land/land_classification/land_classification_bloc.dart';
+import 'package:unit2/bloc/passo/land/land_subclassification/land_subclassification_bloc.dart';
+import 'package:unit2/bloc/passo/municipality/municipality_bloc.dart';
+import 'package:unit2/model/passo/additional_items.dart';
+import 'package:unit2/model/passo/city.dart';
+import 'package:unit2/model/passo/class_components.dart';
+import 'package:unit2/model/passo/land_appr.dart';
+import 'package:unit2/model/passo/land_classification.dart';
+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 AddLandAppraisalEditModal extends StatefulWidget {
+  // final List<UnitConstruct> unit;
+  // final List<ClassComponents> options;
+  final int tempId;
+
+  AddLandAppraisalEditModal(this.tempId);
+
+  @override
+  _AddLandAppraisalEditModal createState() => _AddLandAppraisalEditModal();
+}
+
+class _AddLandAppraisalEditModal extends State<AddLandAppraisalEditModal> {
+  final focus = FocusNode();
+  bool isPainted = false;
+  bool isSecondHand = false;
+  TextEditingController textEditingController = TextEditingController();
+  double _unitBase = 0;
+  int _areaValue = 0;
+  final double _depValue = 0;
+  double _unitValue = 0;
+  String _subClassDesc = "";
+  int _classId = 0;
+  String _structureType = "";
+  bool _withoutBUCC = false;
+  int _notPaintedUnitVal = 0;
+  int _secondHandUnitVal = 0;
+  String cityCode = '';
+  String cityDesc = '';
+  int classCode = 1;
+  String _classDesc = '';
+
+  GlobalKey<FormBuilderState> appraisalLandKey = GlobalKey<FormBuilderState>();
+
+  BoxDecoration box1() {
+    return const BoxDecoration(boxShadow: [
+      BoxShadow(color: Colors.black12, spreadRadius: 5, blurRadius: 5)
+    ], color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(3)));
+  }
+
+  double _amountofDepreciation(unitVal, unitBase, area, depreciation) {
+    return ((unitVal * unitBase) * area) * depreciation;
+  }
+
+  double _totalMarketValue(unitBase, area) {
+    return unitBase * area;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocConsumer<LandAppraisalBloc, LandAppraisalState>(
+        listener: (context, state) {
+      if (state is LandAppraisalLoading) {
+        final progress = ProgressHUD.of(context);
+        progress!.showWithText("Please wait...");
+      }
+      if (state is LandAppraisalLoaded) {
+        final progress = ProgressHUD.of(context);
+        progress?.dismiss();
+      }
+      if (state is LandAppraisalErrorState) {
+        final progress = ProgressHUD.of(context);
+        progress?.dismiss();
+      }
+    }, buildWhen: (previous, current) {
+      return false;
+    }, builder: (context, state) {
+      if (state is ShowAddLandAppraisalScreen) {
+        return BlocConsumer<LandClassificationBloc, LandClassificationState>(
+          listener: (context, state) {
+            // TODO: implement listener
+          },
+          builder: (context, state) {
+            if (state is LandClassificationLoaded) {
+              final classification = state.land_classification;
+              return BlocConsumer<LandSubClassificationBloc,
+                  LandSubClassificationState>(
+                listener: (context, state) {
+                  // TODO: implement listener
+                },
+                builder: (context, state) {
+                  if (state is LandSubClassificationLoaded) {
+                    final subclassification = state.land_subclassification;
+                    return BlocConsumer<MunicipalityBloc, MunicipalityState>(
+                      listener: (context, state) {
+                        // TODO: implement listener
+                      },
+                      builder: (context, state) {
+                        if (state is MunicipalityLoaded) {
+                          return FormBuilder(
+                              key: appraisalLandKey,
+                              onChanged: () {
+                                appraisalLandKey.currentState?.save();
+                              },
+                              autovalidateMode: AutovalidateMode.disabled,
+                              child: Padding(
+                                  padding: const EdgeInsets.all(8.0),
+                                  child: Container(
+                                    child: SingleChildScrollView(
+                                      padding: const EdgeInsets.all(8.0),
+                                      child: Column(
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.start,
+                                        crossAxisAlignment:
+                                            CrossAxisAlignment.start,
+                                        mainAxisSize: MainAxisSize.min,
+                                        children: <Widget>[
+                                          Container(
+                                            margin: const EdgeInsets.only(
+                                                left: 0,
+                                                top: 10,
+                                                right: 0,
+                                                bottom: 0),
+                                            child: Expanded(
+                                                flex: 1,
+                                                child:
+                                                    FormBuilderDropdown<City>(
+                                                  name:
+                                                      'appraisal_municipality',
+                                                  autofocus: false,
+                                                  decoration:
+                                                      normalTextFieldStyle(
+                                                          cityDesc ??
+                                                              "Municipality",
+                                                          ""),
+                                                  items: state.municipality
+                                                      .map((municipality) =>
+                                                          DropdownMenuItem<
+                                                              City>(
+                                                            value: municipality,
+                                                            child: Text(municipality
+                                                                .cityDescription!), // Use cityDescription instead of cityName
+                                                          ))
+                                                      .toList(),
+                                                  onChanged: (selectedCity) {
+                                                    if (selectedCity != null) {
+                                                      final selectedCityCode =
+                                                          selectedCity.cityCode;
+                                                      setState(() {
+                                                        cityCode =
+                                                            selectedCityCode!;
+                                                        cityDesc = selectedCity
+                                                            .cityDescription!;
+                                                      });
+                                                      final barangayBloc =
+                                                          context.read<
+                                                              LandSubClassificationBloc>();
+                                                      barangayBloc.add(
+                                                          LoadLandSubClassification(
+                                                              classCode:
+                                                                  classCode!,
+                                                              cityCode:
+                                                                  selectedCityCode!)); // Use selectedCityCode directly
+                                                    }
+                                                  },
+                                                )),
+                                          ),
+                                          Container(
+                                            margin: const EdgeInsets.only(
+                                                left: 0,
+                                                top: 10,
+                                                right: 0,
+                                                bottom: 0),
+                                            child: Expanded(
+                                                flex: 1,
+                                                child: FormBuilderDropdown<
+                                                    LandClassification>(
+                                                  name: 'classification',
+                                                  autofocus: false,
+                                                  decoration:
+                                                      normalTextFieldStyle(
+                                                          _classDesc
+                                                                  .toString() ??
+                                                              "Classification",
+                                                          ""),
+                                                  items: classification
+                                                      .map((classification) =>
+                                                          DropdownMenuItem<
+                                                              LandClassification>(
+                                                            value:
+                                                                classification,
+                                                            child: Text(
+                                                                classification
+                                                                    .description!), // Use cityDescription instead of cityName
+                                                          ))
+                                                      .toList(),
+                                                  onChanged: (selectedClass) {
+                                                    if (selectedClass != null) {
+                                                      final selectedClassCode =
+                                                          selectedClass.id;
+                                                      setState(() {
+                                                        classCode =
+                                                            selectedClassCode!;
+                                                        _classDesc =
+                                                            selectedClass
+                                                                .description!;
+                                                      });
+                                                      final barangayBloc =
+                                                          context.read<
+                                                              LandSubClassificationBloc>();
+                                                      barangayBloc.add(
+                                                          LoadLandSubClassification(
+                                                              classCode:
+                                                                  selectedClassCode!,
+                                                              cityCode:
+                                                                  cityCode)); // Use selectedCityCode directly
+                                                    }
+                                                  },
+                                                )),
+                                          ),
+                                          Container(
+                                            margin: const EdgeInsets.only(
+                                                left: 0,
+                                                top: 10,
+                                                right: 0,
+                                                bottom: 0),
+                                            child: SizedBox(
+                                              height: 45,
+                                              child: SearchField(
+                                                itemHeight: 70,
+                                                suggestions: subclassification
+                                                    .map((LandSubClassification
+                                                            subclass) =>
+                                                        SearchFieldListItem(
+                                                            '${subclass.subclassCode} - ${subclass.subclassDescription}',
+                                                            item: subclass,
+                                                            child: ListTile(
+                                                              title: Text(
+                                                                '${subclass.subclassCode} - ${subclass.subclassDescription!.toUpperCase()}',
+                                                                overflow:
+                                                                    TextOverflow
+                                                                        .ellipsis,
+                                                              ),
+                                                            )))
+                                                    .toList(),
+
+                                                validator: FormBuilderValidators
+                                                    .required(
+                                                        errorText:
+                                                            "This field is required"),
+
+                                                searchInputDecoration:
+                                                    normalTextFieldStyle(
+                                                            "Structure Type",
+                                                            "")
+                                                        .copyWith(
+                                                            suffixIcon:
+                                                                const Icon(Icons
+                                                                    .arrow_drop_down)),
+                                                ////agency suggestion tap
+                                                focusNode: focus,
+                                                suggestionState:
+                                                    Suggestion.expand,
+                                                onSuggestionTap: (subclass) {
+                                                  setState(() {
+                                                    _unitBase = double.parse(
+                                                        subclass.item!
+                                                            .baseUnitMarketval!);
+                                                    _subClassDesc =
+                                                        '${subclass.item!.subclassCode} - ${subclass.item!.subclassDescription}';
+                                                  });
+                                                  focus.unfocus();
+                                                },
+                                              ),
+                                            ),
+                                          ),
+                                          const SizedBox(height: 10),
+                                          FormBuilderTextField(
+                                            name: 'land_appraisal_area',
+                                            decoration: normalTextFieldStyle(
+                                                "Area", ""),
+                                            validator:
+                                                FormBuilderValidators.compose(
+                                                    []),
+                                            onChanged: (value) {
+                                              setState(() {
+                                                _areaValue = int.parse(value!);
+                                              });
+                                            },
+                                          ),
+                                          const SizedBox(height: 10),
+                                          const Text('Market Value'),
+                                          const SizedBox(height: 5),
+                                          Container(
+                                            height: 45.0,
+                                            width: double.infinity,
+                                            decoration: BoxDecoration(
+                                              color: Colors.white,
+                                              border: Border.all(
+                                                color: Colors.grey,
+                                                width: 1.0,
+                                              ),
+                                              borderRadius:
+                                                  BorderRadius.circular(5.0),
+                                            ),
+                                            child: Align(
+                                                alignment: Alignment.center,
+                                                child: Text(
+                                                    NumberFormat.currency(
+                                                            locale: 'en-PH',
+                                                            symbol: "₱")
+                                                        .format(
+                                                            _totalMarketValue(
+                                                                _unitBase,
+                                                                _areaValue)))),
+                                          ),
+                                          const SizedBox(height: 10),
+                                          Row(
+                                            children: [
+                                              Container(
+                                                width: 120,
+                                                height: 60,
+                                                padding:
+                                                    const EdgeInsets.all(8.0),
+                                                child: ElevatedButton(
+                                                  onPressed: () async {
+                                                    final tempID =
+                                                        await SharedPreferences
+                                                            .getInstance();
+                                                    print(tempID
+                                                        .getInt('landid'));
+                                                    var land_appraisal = LandAppr(
+                                                        landapprDetailsId:
+                                                            widget.tempId,
+                                                        classification:
+                                                            _classDesc,
+                                                        subClass: _subClassDesc,
+                                                        area: _areaValue
+                                                            .toString(),
+                                                        unitValue: _unitBase
+                                                            .toString(),
+                                                        baseMarketval:
+                                                            _totalMarketValue(
+                                                                    _unitBase,
+                                                                    _areaValue)
+                                                                .toString());
+
+                                                    context
+                                                        .read<
+                                                            LandAppraisalBloc>()
+                                                        .add(AddLandAppraisal(
+                                                            land_appr:
+                                                                land_appraisal));
+                                                  },
+                                                  style:
+                                                      ElevatedButton.styleFrom(
+                                                    primary: Colors.black,
+                                                  ),
+                                                  child: const Text("Submit"),
+                                                ),
+                                              ),
+                                              const SizedBox(
+                                                  width:
+                                                      5), // Use SizedBox for horizontal spacing in a Row
+                                              Container(
+                                                width: 120,
+                                                height: 60,
+                                                padding:
+                                                    const EdgeInsets.all(8.0),
+                                                child: ElevatedButton(
+                                                  onPressed: () {
+                                                    context
+                                                        .read<
+                                                            LandAppraisalBloc>()
+                                                        .add(
+                                                            LoadLandAppraisalEdit(
+                                                          land_appr: <
+                                                              LandAppr>[],
+                                                          id: widget.tempId,
+                                                        ));
+                                                  },
+                                                  style:
+                                                      ElevatedButton.styleFrom(
+                                                    primary: Colors.black,
+                                                  ),
+                                                  child: const Text("Cancel"),
+                                                ),
+                                              ),
+                                            ],
+                                          ),
+                                        ],
+                                      ),
+                                    ),
+                                  )));
+                        }
+                        if (state is MunicipalityErrorState) {
+                          return SomethingWentWrong(
+                            message: onError,
+                            onpressed: () {
+                              context
+                                  .read<MunicipalityBloc>()
+                                  .add(LoadMunicipality());
+                            },
+                          );
+                        }
+                        return Container();
+                      },
+                    );
+                  }
+                  if (state is LandSubClassificationErrorState) {
+                    return SomethingWentWrong(
+                      message: onError,
+                      onpressed: () {
+                        context.read<LandSubClassificationBloc>().add(
+                            const LoadLandSubClassification(
+                                cityCode: '1', classCode: 1));
+                      },
+                    );
+                  }
+                  return Container();
+                },
+              );
+            }
+            if (state is LandClassificationErrorState) {
+              return SomethingWentWrong(
+                message: onError,
+                onpressed: () {
+                  context
+                      .read<LandClassificationBloc>()
+                      .add(LoadLandClassification());
+                },
+              );
+            }
+            return Container();
+          },
+        );
+      }
+      if (state is LandAppraisalErrorState) {
+        return SomethingWentWrong(
+          message: onError,
+          onpressed: () {
+            context.read<LandAppraisalBloc>().add(LoadLandAppraisal());
+          },
+        );
+      }
+      return Container();
+    });
+  }
+}

lib/screens/passo/Land/edit_land/AddOtherImprovementEditModal.dart

@@ -0,0 +1,357 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_form_builder/flutter_form_builder.dart';
+import 'package:form_builder_validators/form_builder_validators.dart';
+import 'package:intl/intl.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:unit2/bloc/passo/land/land_trees_improvements/land_trees_improvements_bloc.dart';
+import 'package:unit2/bloc/passo/land/other_improvements/other_improvements_bloc.dart';
+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 AddOtherImprovementEditModal extends StatefulWidget {
+  // final List<UnitConstruct> unit;
+  // final List<ClassComponents> options;
+  final int tempId;
+
+  AddOtherImprovementEditModal(this.tempId);
+
+  @override
+  _AddOtherImprovementEditModal createState() =>
+      _AddOtherImprovementEditModal();
+}
+
+class _AddOtherImprovementEditModal
+    extends State<AddOtherImprovementEditModal> {
+  final focus = FocusNode();
+  bool isPainted = false;
+  bool isSecondHand = false;
+  TextEditingController textEditingController = TextEditingController();
+  double _unitBase = 0;
+  int _areaValue = 0;
+  final double _depValue = 0;
+  double _unitValue = 0;
+  String _subClassDesc = "";
+  int _classId = 0;
+  String _structureType = "";
+  int _notPaintedUnitVal = 0;
+  int _secondHandUnitVal = 0;
+  String cityCode = '';
+  String cityDesc = '';
+  int classCode = 1;
+  String _classDesc = '';
+  String _treeType = "";
+  bool _nonfruitBearing = false;
+  bool _fruitBearing = false;
+  int qty = 0;
+  int pr_qty = 0;
+  int nonpr_qty = 0;
+
+  GlobalKey<FormBuilderState> otherImpKey = GlobalKey<FormBuilderState>();
+
+  final typeOfTree = [
+    "Non-Fruit Bearing",
+    "Fruit Bearing",
+  ];
+
+  _calculateBaseMarketValue() {
+    double base = 0.00;
+    if (_fruitBearing) {
+      base = (pr_qty + nonpr_qty) * _unitValue;
+    } else {
+      base = qty * _unitValue;
+    }
+    return base;
+  }
+
+  BoxDecoration box1() {
+    return const BoxDecoration(boxShadow: [
+      BoxShadow(color: Colors.black12, spreadRadius: 5, blurRadius: 5)
+    ], color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(3)));
+  }
+
+  double _amountofDepreciation(unitVal, unitBase, area, depreciation) {
+    return ((unitVal * unitBase) * area) * depreciation;
+  }
+
+  double _totalMarketValue(unitBase, area) {
+    return unitBase * area;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<OtherImprovementsBloc, OtherImprovementsState>(
+        buildWhen: (previous, current) {
+      return false;
+    }, builder: (context, state) {
+      if (state is ShowAddOtherImprovementScreen) {
+        return BlocConsumer<LandTreesImprovementsBloc,
+            LandTreesImprovementsState>(listener: (context, state) {
+          // TODO: implement listener
+        }, builder: (context, state) {
+          if (state is LandTreesImprovementsLoaded) {
+            final trees = state.trees_imp;
+            return FormBuilder(
+                key: otherImpKey,
+                onChanged: () {
+                  otherImpKey.currentState?.save();
+                },
+                autovalidateMode: AutovalidateMode.disabled,
+                child: Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Container(
+                    child: SingleChildScrollView(
+                      padding: const EdgeInsets.all(8.0),
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.start,
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        mainAxisSize: MainAxisSize.min,
+                        children: <Widget>[
+                          Container(
+                            margin: const EdgeInsets.only(
+                                left: 0, top: 10, right: 0, bottom: 0),
+                            child: Expanded(
+                                flex: 1,
+                                child: FormBuilderDropdown<TreesImprovements>(
+                                  name: 'kinds_of_trees',
+                                  autofocus: false,
+                                  decoration: normalTextFieldStyle(
+                                      "Kinds of Trees", ""),
+                                  items: state.trees_imp
+                                      .map((trees) =>
+                                          DropdownMenuItem<TreesImprovements>(
+                                            value: trees,
+                                            child: Text(
+                                              (trees.improvement ?? "") +
+                                                  "   " +
+                                                  (trees.subclassCode ?? ""),
+                                            ),
+                                          ))
+                                      .toList(),
+                                  onChanged: (selectedTree) {
+                                    if (selectedTree != null) {
+                                      setState(() {
+                                        _unitValue = double.parse(
+                                            selectedTree.pricePerTree!);
+                                        _treeType = selectedTree.improvement!;
+                                      });
+                                    }
+                                  },
+                                )),
+                          ),
+                          Container(
+                            child: Row(
+                              children: [
+                                Row(
+                                  children: [
+                                    Checkbox(
+                                      value: _fruitBearing,
+                                      onChanged: (bool? value) {
+                                        setState(() {
+                                          _fruitBearing = value!;
+                                        });
+                                      },
+                                    ),
+                                    Text('Fruit Bearing ?'),
+                                  ],
+                                ),
+                              ],
+                            ),
+                          ),
+                          Visibility(
+                            visible: !_fruitBearing,
+                            child: Row(
+                              children: [
+                                Expanded(
+                                  child: FormBuilderTextField(
+                                    name: 'subClass',
+                                    decoration: normalTextFieldStyle(
+                                        "SubClass/Age", ""),
+                                    validator:
+                                        FormBuilderValidators.compose([]),
+                                    onChanged: (value) {
+                                      setState(() {
+                                        _subClassDesc = value!;
+                                      });
+                                    },
+                                  ),
+                                ),
+                                SizedBox(
+                                  width: 10,
+                                ),
+                                Expanded(
+                                  child: FormBuilderTextField(
+                                    name: 'qty',
+                                    decoration: normalTextFieldStyle("No.", ""),
+                                    validator:
+                                        FormBuilderValidators.compose([]),
+                                    onChanged: (value) {
+                                      setState(() {
+                                        qty = int.parse(value!);
+                                      });
+                                    },
+                                  ),
+                                ),
+                              ],
+                            ),
+                            replacement: Column(
+                              children: [
+                                FormBuilderTextField(
+                                  name: 'no_of_productive',
+                                  decoration: normalTextFieldStyle(
+                                      "No. of Productive", ""),
+                                  validator: FormBuilderValidators.compose([]),
+                                  onChanged: (value) {
+                                    setState(() {
+                                      pr_qty = int.parse(value!);
+                                    });
+                                  },
+                                ),
+                                const SizedBox(height: 10),
+                                FormBuilderTextField(
+                                  name: 'no_of_nonproductive',
+                                  decoration: normalTextFieldStyle(
+                                      "No. of Non-Productive", ""),
+                                  validator: FormBuilderValidators.compose([]),
+                                  onChanged: (value) {
+                                    setState(() {
+                                      nonpr_qty = int.parse(value!);
+                                    });
+                                  },
+                                ),
+                              ],
+                            ),
+                          ),
+                          const SizedBox(height: 10),
+                          const Text('Market Value'),
+                          const SizedBox(height: 5),
+                          Container(
+                            height: 45.0,
+                            width: double.infinity,
+                            decoration: BoxDecoration(
+                              color: Colors.white,
+                              border: Border.all(
+                                color: Colors.grey,
+                                width: 1.0,
+                              ),
+                              borderRadius: BorderRadius.circular(5.0),
+                            ),
+                            child: Align(
+                                alignment: Alignment.center,
+                                child: Text(NumberFormat.currency(
+                                        locale: 'en-PH', symbol: "₱")
+                                    .format(_unitValue))),
+                          ),
+                          const SizedBox(height: 10),
+                          const Text('Base Market Value'),
+                          const SizedBox(height: 5),
+                          Container(
+                            height: 45.0,
+                            width: double.infinity,
+                            decoration: BoxDecoration(
+                              color: Colors.white,
+                              border: Border.all(
+                                color: Colors.grey,
+                                width: 1.0,
+                              ),
+                              borderRadius: BorderRadius.circular(5.0),
+                            ),
+                            child: Align(
+                              alignment: Alignment.center,
+                              child: Text(NumberFormat.currency(
+                                locale: 'en-PH',
+                                symbol: "₱",
+                              ).format(_calculateBaseMarketValue().toString() ==
+                                      "0.00"
+                                  ? "00.0"
+                                  : _calculateBaseMarketValue())),
+                            ),
+                          ),
+                          const SizedBox(height: 10),
+                          Row(
+                            children: [
+                              Container(
+                                width: 120,
+                                height: 60,
+                                padding: const EdgeInsets.all(8.0),
+                                child: ElevatedButton(
+                                  onPressed: () async {
+                                    var improvement = OtherImprovements(
+                                        landapprDetailsId: widget.tempId,
+                                        kindsOfTrees: _treeType,
+                                        subclassAge: _subClassDesc,
+                                        quantity: qty,
+                                        unitValue: _unitValue.toString(),
+                                        baseMarketval:
+                                            _calculateBaseMarketValue()
+                                                .toString(),
+                                        noOfProductive: pr_qty,
+                                        noOfNonproductive: nonpr_qty,
+                                        fruitBearing: _fruitBearing);
+
+                                    context.read<OtherImprovementsBloc>().add(
+                                        AddOtherImprovement(
+                                            other_imp: improvement));
+                                  },
+                                  style: ElevatedButton.styleFrom(
+                                    primary: Colors.black,
+                                  ),
+                                  child: const Text("Submit"),
+                                ),
+                              ),
+                              const SizedBox(
+                                  width:
+                                      5), // Use SizedBox for horizontal spacing in a Row
+                              Container(
+                                width: 120,
+                                height: 60,
+                                padding: const EdgeInsets.all(8.0),
+                                child: ElevatedButton(
+                                  onPressed: () {
+                                    context.read<OtherImprovementsBloc>().add(
+                                        LoadOtherImprovementEdit(
+                                            other_imps: <OtherImprovements>[],
+                                            ids: widget.tempId));
+                                  },
+                                  style: ElevatedButton.styleFrom(
+                                    primary: Colors.black,
+                                  ),
+                                  child: const Text("Cancel"),
+                                ),
+                              ),
+                            ],
+                          )
+                        ],
+                      ),
+                    ),
+                  ),
+                ));
+          }
+          if (state is LandTreesImprovementsErrorState) {
+            return SomethingWentWrong(
+              message: onError,
+              onpressed: () {
+                context
+                    .read<LandTreesImprovementsBloc>()
+                    .add(LoadLandTreesImprovements());
+              },
+            );
+          }
+          return Container();
+        });
+      }
+      if (state is OtherImprovementErrorState) {
+        return SomethingWentWrong(
+          message: onError,
+          onpressed: () {
+            context.read<OtherImprovementsBloc>().add(LoadOtherImprovement());
+          },
+        );
+      }
+      return Container();
+    });
+  }
+}

lib/screens/passo/Land/edit_land/AddPropertyAssessmentEditModal.dart

@@ -0,0 +1,356 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_form_builder/flutter_form_builder.dart';
+import 'package:intl/intl.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:unit2/bloc/passo/land/land_property_assessment/land_property_assessment_bloc.dart';
+import 'package:unit2/bloc/passo/land/land_value_adjustments/land_value_adjustments_bloc.dart';
+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 AddPropertyAssessmentEditModal extends StatefulWidget {
+  // final List<UnitConstruct> unit;
+  // final List<ClassComponents> options;
+  final int tempId;
+
+  AddPropertyAssessmentEditModal(this.tempId);
+
+  @override
+  _AddPropertyAssessmentEditModal createState() =>
+      _AddPropertyAssessmentEditModal();
+}
+
+class _AddPropertyAssessmentEditModal
+    extends State<AddPropertyAssessmentEditModal> {
+  final focus = FocusNode();
+  bool isPainted = false;
+  bool isSecondHand = false;
+  TextEditingController textEditingController = TextEditingController();
+  double _unitBase = 0;
+  int _areaValue = 0;
+  final double _depValue = 0;
+  double _unitValue = 0;
+  String _subClassDesc = "";
+  int _classId = 0;
+  String _structureType = "";
+  int _notPaintedUnitVal = 0;
+  int _secondHandUnitVal = 0;
+  String cityCode = '';
+  String cityDesc = '';
+  int classCode = 1;
+  String _classDesc = '';
+  String _treeType = "";
+  bool _nonfruitBearing = false;
+  bool _fruitBearing = false;
+  int qty = 0;
+  int pr_qty = 0;
+  int nonpr_qty = 0;
+  String _actualUse = "Residential";
+  String _assessmentLevel = "";
+
+  GlobalKey<FormBuilderState> assessmentKey = GlobalKey<FormBuilderState>();
+
+  final typeOfTree = [
+    "Non-Fruit Bearing",
+    "Fruit Bearing",
+  ];
+
+  final actual_use = [
+    "Residential",
+    "Agricultural",
+    "Commercial",
+    "Industrial",
+    "Mineral",
+    "Timberland",
+  ];
+
+  calculateAssessmentValue() {
+    switch (_actualUse) {
+      case "Residential":
+        return _unitValue * 0.20;
+        break;
+      case "Agricultural":
+        return _unitValue * 0.40;
+        break;
+      case "Commercial":
+        return _unitValue * 0.50;
+        break;
+      case "Industrial":
+        return _unitValue * 0.50;
+        break;
+      case "Mineral":
+        return _unitValue * 0.50;
+        break;
+      case "Timberland":
+        return _unitValue * 0.20;
+        break;
+      default:
+    }
+  }
+
+  BoxDecoration box1() {
+    return const BoxDecoration(boxShadow: [
+      BoxShadow(color: Colors.black12, spreadRadius: 5, blurRadius: 5)
+    ], color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(3)));
+  }
+
+  double _amountofDepreciation(unitVal, unitBase, area, depreciation) {
+    return ((unitVal * unitBase) * area) * depreciation;
+  }
+
+  double _totalMarketValue(unitBase, area) {
+    return unitBase * area;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<LandPropertyAssessmentBloc, LandPropertyAssessmentState>(
+        buildWhen: (previous, current) {
+      return false;
+    }, builder: (context, state) {
+      if (state is ShowAddLandPropertyAssessmentScreen) {
+        return BlocConsumer<LandValueAdjustmentsBloc,
+            LandValueAdjustmentsState>(listener: (context, state) {
+          // TODO: implement listener
+        }, builder: (context, state) {
+          if (state is LandValueAdjustmentsLoaded) {
+            final assessment = state.val_adj;
+            return FormBuilder(
+                key: assessmentKey,
+                onChanged: () {
+                  assessmentKey.currentState?.save();
+                },
+                autovalidateMode: AutovalidateMode.disabled,
+                child: Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Container(
+                    child: SingleChildScrollView(
+                      padding: const EdgeInsets.all(8.0),
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.start,
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        mainAxisSize: MainAxisSize.min,
+                        children: <Widget>[
+                          Container(
+                            margin: const EdgeInsets.only(
+                                left: 0, top: 10, right: 0, bottom: 0),
+                            child: Expanded(
+                                flex: 1,
+                                child: FormBuilderDropdown<ValueAdjustments>(
+                                  name: 'value_adjustments',
+                                  autofocus: false,
+                                  decoration: normalTextFieldStyle(
+                                      "Value Adjustments", ""),
+                                  items: state.val_adj
+                                      .map((adj) =>
+                                          DropdownMenuItem<ValueAdjustments>(
+                                            value: adj,
+                                            child: Text(
+                                              (adj.adjustmentFactors ?? ""),
+                                            ),
+                                          ))
+                                      .toList(),
+                                  onChanged: (selectedAdj) {
+                                    if (selectedAdj != null) {
+                                      setState(() {
+                                        _unitValue = double.parse(
+                                            selectedAdj.marketValue!);
+                                      });
+                                    }
+                                  },
+                                )),
+                          ),
+                          SizedBox(
+                            height: 10,
+                          ),
+                          FormBuilderDropdown<String?>(
+                            name: "land_actual_use",
+                            autofocus: false,
+                            decoration: normalTextFieldStyle("Actual Use", ""),
+                            items: actual_use
+                                .map((item) => DropdownMenuItem(
+                                      value: item,
+                                      child: Text(item),
+                                    ))
+                                .toList(),
+                            onChanged: (value) {
+                              setState(() {
+                                _actualUse = value!;
+
+                                switch (value) {
+                                  case "Residential":
+                                    setState(() {
+                                      _assessmentLevel = '20';
+                                    });
+
+                                    break;
+                                  case "Agricultural":
+                                    setState(() {
+                                      _assessmentLevel = '40';
+                                    });
+
+                                    break;
+                                  case "Commercial":
+                                    setState(() {
+                                      _assessmentLevel = '50';
+                                    });
+
+                                    break;
+                                  case "Industrial":
+                                    setState(() {
+                                      _assessmentLevel = '50';
+                                    });
+
+                                    break;
+                                  case "Mineral":
+                                    setState(() {
+                                      _assessmentLevel = '50';
+                                    });
+
+                                    break;
+                                  case "Timberland":
+                                    setState(() {
+                                      _assessmentLevel = '20';
+                                    });
+
+                                    break;
+                                  default:
+                                }
+                              });
+                            },
+                          ),
+                          SizedBox(
+                            height: 10,
+                          ),
+                          Text('Assessment Level'),
+                          Container(
+                            height: 45.0,
+                            width: double.infinity,
+                            decoration: BoxDecoration(
+                              color: Colors.white,
+                              border: Border.all(
+                                color: Colors.grey,
+                                width: 1.0,
+                              ),
+                              borderRadius: BorderRadius.circular(5.0),
+                            ),
+                            child: Align(
+                              alignment: Alignment.center,
+                              child: Text(_assessmentLevel + '%'),
+                            ),
+                          ),
+                          SizedBox(
+                            height: 10,
+                          ),
+                          Text('Assessment Value'),
+                          Container(
+                            height: 45.0,
+                            width: double.infinity,
+                            decoration: BoxDecoration(
+                              color: Colors.white,
+                              border: Border.all(
+                                color: Colors.grey,
+                                width: 1.0,
+                              ),
+                              borderRadius: BorderRadius.circular(5.0),
+                            ),
+                            child: Align(
+                              alignment: Alignment.center,
+                              child: Text(NumberFormat.currency(
+                                locale: 'en-PH',
+                                symbol: "₱",
+                              ).format(calculateAssessmentValue().toString() ==
+                                      "0.00"
+                                  ? "00.0"
+                                  : calculateAssessmentValue())),
+                            ),
+                          ),
+                          const SizedBox(height: 10),
+                          Row(
+                            children: [
+                              Container(
+                                width: 120,
+                                height: 60,
+                                padding: const EdgeInsets.all(8.0),
+                                child: ElevatedButton(
+                                  onPressed: () async {
+                                    var assessment = LandPropertyAssessment(
+                                        landapprDetailsId: widget.tempId,
+                                        actualUse: _actualUse,
+                                        marketval: _unitValue.toString(),
+                                        assessmentLevel: _assessmentLevel,
+                                        assessedValue:
+                                            calculateAssessmentValue()
+                                                .toString(),
+                                        totalMarketval: '0',
+                                        totalAssessedval: '0');
+
+                                    context
+                                        .read<LandPropertyAssessmentBloc>()
+                                        .add(AddLandPropertyAssessment(
+                                            assessment: assessment));
+                                  },
+                                  style: ElevatedButton.styleFrom(
+                                    primary: Colors.black,
+                                  ),
+                                  child: const Text("Submit"),
+                                ),
+                              ),
+                              const SizedBox(
+                                  width:
+                                      5), // Use SizedBox for horizontal spacing in a Row
+                              Container(
+                                width: 120,
+                                height: 60,
+                                padding: const EdgeInsets.all(8.0),
+                                child: ElevatedButton(
+                                  onPressed: () {
+                                    context
+                                        .read<LandPropertyAssessmentBloc>()
+                                        .add(
+                                            const LoadLandPropertyAssessment());
+                                  },
+                                  style: ElevatedButton.styleFrom(
+                                    primary: Colors.black,
+                                  ),
+                                  child: const Text("Cancel"),
+                                ),
+                              ),
+                            ],
+                          )
+                        ],
+                      ),
+                    ),
+                  ),
+                ));
+          }
+          if (state is LandValueAdjustmentsErrorState) {
+            return SomethingWentWrong(
+              message: onError,
+              onpressed: () {
+                context
+                    .read<LandValueAdjustmentsBloc>()
+                    .add(LoadLandValueAdjustments());
+              },
+            );
+          }
+          return Container();
+        });
+      }
+      if (state is LandPropertyAssessmentErrorState) {
+        return SomethingWentWrong(
+          message: onError,
+          onpressed: () {
+            context
+                .read<LandPropertyAssessmentBloc>()
+                .add(LoadLandPropertyAssessment());
+          },
+        );
+      }
+      return Container();
+    });
+  }
+}

lib/screens/passo/Land/edit_land/land_appraisal.dart

@@ -1,9 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_progress_hud/flutter_progress_hud.dart';
+import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:intl/intl.dart';
 import 'package:unit2/bloc/passo/land/land_appraisal/land_appraisal_bloc.dart';
 import 'package:unit2/model/passo/land_appr.dart';
-import 'package:unit2/screens/passo/Land/add_land/AddLandAppraisal.dart';
+import 'package:unit2/screens/passo/Land/edit_land/AddLandAppraisalEdit.dart';
+
 import 'package:unit2/utils/alerts.dart';
 import 'package:unit2/utils/text_container.dart';
 import 'package:unit2/widgets/error_state.dart';
@@ -12,7 +15,8 @@ import 'package:unit2/widgets/passo/custom_button.dart';
 class LandAppraisalEdit extends StatefulWidget {
   Function PrevBtn;
   Function NextBtn;
-  LandAppraisalEdit(this.PrevBtn, this.NextBtn);
+  final int faasId;
+  LandAppraisalEdit(this.PrevBtn, this.NextBtn, this.faasId);
   @override
   _LandAppraisalEdit createState() => _LandAppraisalEdit();
 }
@@ -32,231 +36,259 @@ class _LandAppraisalEdit extends State<LandAppraisalEdit> {
 
   @override
   Widget build(BuildContext context) {
-    return BlocConsumer<LandAppraisalBloc, LandAppraisalState>(
-        listener: (context, state) {
-      // TODO: implement listener
-    }, builder: (context, state) {
-      final state = context.watch<LandAppraisalBloc>().state;
-      if (state is LandAppraisalLoaded) {
-        return Column(
-          children: [
-            Expanded(
-                child: SingleChildScrollView(
-              child: Padding(
-                padding: const EdgeInsets.all(15.0),
-                child: Column(
-                  children: [
-                    Container(
-                      margin: const EdgeInsets.only(
-                          left: 0, top: 20, right: 0, bottom: 10),
-                      child: const Text('LAND APPRAISAL',
-                          style: TextStyle(
-                              fontWeight: FontWeight.bold, fontSize: 18),
-                          textAlign: TextAlign.left),
-                    ),
-                    Align(
-                      alignment: Alignment.topRight,
-                      child: ElevatedButton(
-                        style: ElevatedButton.styleFrom(
-                          backgroundColor: Colors.red,
-                        ),
-                        onPressed: () {
-                          context
-                              .read<LandAppraisalBloc>()
-                              .add(ShowLandAppraisal());
-                        },
-                        child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            const Text('ADD ITEM'), // <-- Text
-                            const SizedBox(
-                              width: 5,
-                            ),
-                            const Icon(
-                              // <-- Icon
-                              Icons.add,
-                              size: 24.0,
-                            ),
-                          ],
+    return ProgressHUD(
+      padding: const EdgeInsets.all(24),
+      backgroundColor: Colors.black87,
+      indicatorWidget: const SpinKitFadingCircle(color: Colors.white),
+      child: BlocConsumer<LandAppraisalBloc, LandAppraisalState>(
+          listener: (context, state) {
+        if (state is LandAppraisalLoading) {
+          final progress = ProgressHUD.of(context);
+          progress!.showWithText("Please wait...");
+        }
+        if (state is LandAppraisalLoaded) {
+          final progress = ProgressHUD.of(context);
+          progress?.dismiss();
+        }
+        if (state is LandAppraisalErrorState) {
+          final progress = ProgressHUD.of(context);
+          progress?.dismiss();
+        }
+      }, builder: (context, state) {
+        final state = context.watch<LandAppraisalBloc>().state;
+        if (state is LandAppraisalLoaded) {
+          return Column(
+            children: [
+              Expanded(
+                  child: SingleChildScrollView(
+                child: Padding(
+                  padding: const EdgeInsets.all(15.0),
+                  child: Column(
+                    children: [
+                      Container(
+                        margin: const EdgeInsets.only(
+                            left: 0, top: 20, right: 0, bottom: 10),
+                        child: const Text('LAND APPRAISAL',
+                            style: TextStyle(
+                                fontWeight: FontWeight.bold, fontSize: 18),
+                            textAlign: TextAlign.left),
+                      ),
+                      Align(
+                        alignment: Alignment.topRight,
+                        child: ElevatedButton(
+                          style: ElevatedButton.styleFrom(
+                            backgroundColor: Colors.red,
+                          ),
+                          onPressed: () {
+                            context
+                                .read<LandAppraisalBloc>()
+                                .add(ShowLandAppraisal());
+                          },
+                          child: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              const Text('ADD ITEM'), // <-- Text
+                              const SizedBox(
+                                width: 5,
+                              ),
+                              const Icon(
+                                // <-- Icon
+                                Icons.add,
+                                size: 24.0,
+                              ),
+                            ],
+                          ),
                         ),
                       ),
+                      SingleChildScrollView(
+                          scrollDirection: Axis.horizontal,
+                          child: DataTable(
+                              // ignore: prefer_const_literals_to_create_immutables
+                              columns: [
+                                const DataColumn(
+                                  label: Text('Classification'),
+                                ),
+                                const DataColumn(
+                                  label: Text('Sub-Classification'),
+                                ),
+                                const DataColumn(
+                                  label: Text('Area'),
+                                ),
+                                const DataColumn(
+                                  label: Text('Unit Value'),
+                                ),
+                                const DataColumn(
+                                  label: Text('Base MArket Value'),
+                                ),
+                                const DataColumn(
+                                  label: Text('Action'),
+                                )
+                              ],
+                              rows: state.land_appr.map((dataRow) {
+                                return DataRow(
+                                  cells: [
+                                    DataCell(Text(dataRow.classification!)),
+                                    DataCell(Text(dataRow.subClass!)),
+                                    DataCell(Text(dataRow.area!)),
+                                    DataCell(Text(
+                                        ((double.parse(dataRow.unitValue!)))
+                                            .toString())),
+                                    DataCell(Text(
+                                        ((double.parse(dataRow.baseMarketval!)))
+                                            .toString())),
+                                    DataCell(Row(
+                                      children: [
+                                        InkWell(
+                                          child: Container(
+                                            height: 30,
+                                            width: 30,
+                                            decoration: BoxDecoration(
+                                              shape: BoxShape.circle,
+                                              color: Colors.red,
+                                            ),
+                                            child: Icon(
+                                              Icons.delete,
+                                              color: Colors.white,
+                                              size: 20.0,
+                                            ),
+                                          ),
+                                          onTap: () {
+                                            deleteItem(dataRow.id!);
+                                          },
+                                        ),
+                                        SizedBox(
+                                          width: 10,
+                                        ),
+                                        InkWell(
+                                          child: Container(
+                                            height: 30,
+                                            width: 30,
+                                            decoration: BoxDecoration(
+                                              shape: BoxShape.circle,
+                                              color: Colors.red,
+                                            ),
+                                            child: Icon(
+                                              Icons.edit,
+                                              color: Colors.white,
+                                              size: 20.0,
+                                            ),
+                                          ),
+                                          onTap: () {},
+                                        ),
+                                      ],
+                                    ))
+                                  ],
+                                );
+                              }).toList()))
+                    ],
+                  ),
+                ),
+              )),
+              // Padding(
+              //   padding: const EdgeInsets.only(left: 20.0, right: 20.0),
+              //   child: Row(
+              //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              //     children: [
+              //       Text(
+              //         'Total',
+              //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
+              //       ),
+              //       Text(
+              //         NumberFormat.currency(locale: 'en-PH', symbol: "₱")
+              //             .format('1.0'),
+              //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
+              //       )
+              //     ],
+              //   ),
+              // ),
+              Padding(
+                padding: const EdgeInsets.all(15.0),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    CustomButton(
+                      icon: const Icon(Icons.chevron_left_rounded,
+                          color: Colors.white),
+                      onPressed: () {
+                        {
+                          widget.PrevBtn();
+                        }
+                        ;
+                      },
                     ),
-                    SingleChildScrollView(
-                        scrollDirection: Axis.horizontal,
-                        child: DataTable(
-                            // ignore: prefer_const_literals_to_create_immutables
-                            columns: [
-                              const DataColumn(
-                                label: Text('Classification'),
-                              ),
-                              const DataColumn(
-                                label: Text('Sub-Classification'),
-                              ),
-                              const DataColumn(
-                                label: Text('Area'),
-                              ),
-                              const DataColumn(
-                                label: Text('Unit Value'),
-                              ),
-                              const DataColumn(
-                                label: Text('Base MArket Value'),
-                              ),
-                              const DataColumn(
-                                label: Text('Action'),
-                              )
-                            ],
-                            rows: state.land_appr.map((dataRow) {
-                              return DataRow(
-                                cells: [
-                                  DataCell(Text(dataRow.classification!)),
-                                  DataCell(Text(dataRow.subClass!)),
-                                  DataCell(Text(dataRow.area!)),
-                                  DataCell(Text(
-                                      ((double.parse(dataRow.unitValue!)))
-                                          .toString())),
-                                  DataCell(Text(
-                                      ((double.parse(dataRow.baseMarketval!)))
-                                          .toString())),
-                                  DataCell(Row(
-                                    children: [
-                                      InkWell(
-                                        child: Container(
-                                          height: 30,
-                                          width: 30,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            color: Colors.red,
-                                          ),
-                                          child: Icon(
-                                            Icons.delete,
-                                            color: Colors.white,
-                                            size: 20.0,
-                                          ),
-                                        ),
-                                        onTap: () {
-                                          deleteItem(dataRow.id!);
-                                        },
-                                      ),
-                                      SizedBox(
-                                        width: 10,
-                                      ),
-                                      InkWell(
-                                        child: Container(
-                                          height: 30,
-                                          width: 30,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            color: Colors.red,
-                                          ),
-                                          child: Icon(
-                                            Icons.edit,
-                                            color: Colors.white,
-                                            size: 20.0,
-                                          ),
-                                        ),
-                                        onTap: () {},
-                                      ),
-                                    ],
-                                  ))
-                                ],
-                              );
-                            }).toList()))
+                    CustomButton(
+                      icon: const Icon(Icons.chevron_right_rounded,
+                          color: Colors.white),
+                      onPressed: () {
+                        {
+                          widget.NextBtn();
+                        }
+                        ;
+                      },
+                    )
                   ],
                 ),
               ),
-            )),
-            // Padding(
-            //   padding: const EdgeInsets.only(left: 20.0, right: 20.0),
-            //   child: Row(
-            //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            //     children: [
-            //       Text(
-            //         'Total',
-            //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-            //       ),
-            //       Text(
-            //         NumberFormat.currency(locale: 'en-PH', symbol: "₱")
-            //             .format('1.0'),
-            //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-            //       )
-            //     ],
-            //   ),
-            // ),
-            Padding(
-              padding: const EdgeInsets.all(15.0),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            ],
+          );
+        }
+        if (state is LandAppraisalDeletedState) {
+          if (state.success) {
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              successAlert(context, "Deletion Successful",
+                  "Extra item has been deleted successfully", () {
+                Navigator.of(context).pop();
+                context.read<LandAppraisalBloc>().add(LoadLandAppraisalEdit(
+                    land_appr: const <LandAppr>[], id: widget.faasId!));
+              });
+            });
+          }
+        }
+        if (state is ShowAddLandAppraisalScreen) {
+          return ConstrainedBox(
+            constraints: const BoxConstraints(
+              maxHeight: 700.0,
+            ),
+            child: AlertDialog(
+              insetPadding: const EdgeInsets.symmetric(
+                horizontal: 20.0,
+                vertical: 10.0,
+              ),
+              title: const Text(
+                'ADD LAND APPRAISAL',
+                textAlign: TextAlign.center,
+              ),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  CustomButton(
-                    icon: const Icon(Icons.chevron_left_rounded,
-                        color: Colors.white),
-                    onPressed: () {
-                      {
-                        widget.PrevBtn();
-                      }
-                      ;
-                    },
+                  Align(
+                    alignment: Alignment.topCenter,
+                    child: Container(
+                      child: ConstrainedBox(
+                        constraints: BoxConstraints(maxHeight: 500),
+                        child: Container(
+                          child: AddLandAppraisalEditModal(widget.faasId),
+                        ),
+                      ),
+                    ),
                   ),
-                  CustomButton(
-                    icon: const Icon(Icons.chevron_right_rounded,
-                        color: Colors.white),
-                    onPressed: () {
-                      {
-                        widget.NextBtn();
-                      }
-                      ;
-                    },
-                  )
                 ],
               ),
             ),
-          ],
-        );
-      }
-      if (state is LandAppraisalDeletedState) {
-        if (state.success) {
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            successAlert(context, "Deletion Successful",
-                "Extra item has been deleted successfully", () {
-              Navigator.of(context).pop();
-              context.read<LandAppraisalBloc>().add(const LoadLandAppraisal());
-            });
-          });
+          );
         }
-      }
-      if (state is ShowAddLandAppraisalScreen) {
-        return ConstrainedBox(
-          constraints: BoxConstraints(
-            maxHeight: 700.0,
-          ),
-          child: AlertDialog(
-            insetPadding: EdgeInsets.symmetric(
-              horizontal: 20.0,
-              vertical: 10.0,
-            ),
-            title: Text(
-              'ADD LAND APPRAISAL',
-              textAlign: TextAlign.center,
-            ),
-            content: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Container(child: AddLandAppraisalModal()),
-              ],
-            ),
-          ),
-        );
-      }
-      if (state is LandAppraisalErrorState) {
-        return SomethingWentWrong(
-          message: onError,
-          onpressed: () {
-            context.read<LandAppraisalBloc>().add(LoadLandAppraisal());
-          },
-        );
-      }
-      return Container();
-    });
+        if (state is LandAppraisalErrorState) {
+          return SomethingWentWrong(
+            message: onError,
+            onpressed: () {
+              context.read<LandAppraisalBloc>().add(LoadLandAppraisalEdit(
+                  land_appr: <LandAppr>[], id: widget.faasId!));
+            },
+          );
+        }
+        return Container();
+      }),
+    );
   }
 }

lib/screens/passo/Land/edit_land/location_and_boundaries_edit.dart

@@ -5,11 +5,9 @@ import 'package:flutter_progress_hud/flutter_progress_hud.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:unit2/bloc/passo/land/land_boundaries_edit/land_boundaries_edit_bloc.dart';
 import 'package:unit2/bloc/passo/land/land_location_edit/land_location_edit_bloc.dart';
-import 'package:unit2/bloc/passo/land/land_property_owner_info/land_property_owner_info_bloc.dart';
 import 'package:unit2/model/passo/land_property_boundaries.dart';
 import 'package:unit2/model/passo/land_property_loc.dart';
 import 'package:unit2/model/passo/land_property_owner.dart';
-import 'package:unit2/screens/passo/Land/add_land.dart';
 import 'package:unit2/screens/passo/Land/edit_land/property_owner_info_edit.dart';
 import 'package:unit2/utils/text_container.dart';
 import 'package:unit2/widgets/error_state.dart';
@@ -53,7 +51,7 @@ class _LandLocationAndBoundariesEdit
               return BlocConsumer<LandBoundariesEditBloc,
                   LandBoundariesEditState>(
                 listener: (context, state) {
-                  if (state is LandLocationEditLoaded) {
+                  if (state is LandBoundariesEditLoaded) {
                     final progress = ProgressHUD.of(context);
                     progress?.dismiss();
                   }
@@ -70,7 +68,11 @@ class _LandLocationAndBoundariesEdit
                         'street': landLoc.street,
                         'brgy': landLoc.barangay,
                         'municipality': landLoc.municipality,
-                        'province': landLoc.province
+                        'province': landLoc.province,
+                        'north': state.land_boundaries_edit.north,
+                        'south': state.land_boundaries_edit.south,
+                        'east': state.land_boundaries_edit.east,
+                        'west': state.land_boundaries_edit.west
                       },
                       enabled: true,
                       onChanged: () {
@@ -169,7 +171,7 @@ class _LandLocationAndBoundariesEdit
                                           child: customTextField(
                                               "West", "", "west"))
                                     ]),
-                                SizedBox(
+                                const SizedBox(
                                   height: 50,
                                 ),
                                 Row(
@@ -212,16 +214,18 @@ class _LandLocationAndBoundariesEdit
                                                 ?.value['province'],
                                           );
 
-                                          context.read<LandLocationEditBloc>()
-                                            ..add(UpdateLandLocationEdit(
-                                                land_loc_edit: location,
-                                                id: widget.land.id!));
+                                          context
+                                              .read<LandLocationEditBloc>()
+                                              .add(UpdateLandLocationEdit(
+                                                  land_loc_edit: location,
+                                                  id: widget.land.id!));
 
-                                          context.read<LandBoundariesEditBloc>()
-                                            ..add(UpdateLandBoundariesEdit(
-                                                land_boundaries_edit:
-                                                    boundaries,
-                                                id: widget.land.id!));
+                                          context
+                                              .read<LandBoundariesEditBloc>()
+                                              .add(UpdateLandBoundariesEdit(
+                                                  land_boundaries_edit:
+                                                      boundaries,
+                                                  id: widget.land.id!));
 
                                           widget.NextBtn();
                                         })

lib/screens/passo/Land/edit_land/other_improvements_edit.dart

@@ -1,14 +1,21 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_progress_hud/flutter_progress_hud.dart';
+import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:unit2/bloc/passo/land/other_improvements/other_improvements_bloc.dart';
+import 'package:unit2/model/passo/other_improvements.dart';
 import 'package:unit2/screens/passo/Land/add_land/AddOtherImprovementModal.dart';
+import 'package:unit2/screens/passo/Land/edit_land/AddOtherImprovementEditModal.dart';
 import 'package:unit2/utils/alerts.dart';
+import 'package:unit2/utils/text_container.dart';
+import 'package:unit2/widgets/error_state.dart';
 import 'package:unit2/widgets/passo/custom_button.dart';
 
 class OtherImprovementEditPage extends StatefulWidget {
   Function PrevBtn;
   Function NextBtn;
-  OtherImprovementEditPage(this.PrevBtn, this.NextBtn);
+  final int faasId;
+  OtherImprovementEditPage(this.PrevBtn, this.NextBtn, this.faasId);
   @override
   _OtherImprovementEditPage createState() => _OtherImprovementEditPage();
 }
@@ -30,234 +37,277 @@ class _OtherImprovementEditPage extends State<OtherImprovementEditPage> {
 
   @override
   Widget build(BuildContext context) {
-    return BlocConsumer<OtherImprovementsBloc, OtherImprovementsState>(
-        listener: (context, state) {
-      // TODO: implement listener
-    }, builder: (context, state) {
-      final state = context.watch<OtherImprovementsBloc>().state;
-      if (state is OtherImprovementLoaded) {
-        return Column(
-          children: [
-            Expanded(
-                child: SingleChildScrollView(
-              child: Padding(
-                padding: const EdgeInsets.all(15.0),
-                child: Column(
-                  children: [
-                    Container(
-                      margin: const EdgeInsets.only(
-                          left: 0, top: 20, right: 0, bottom: 10),
-                      child: const Text('OTHER IMPROVEMENTS',
-                          style: TextStyle(
-                              fontWeight: FontWeight.bold, fontSize: 18),
-                          textAlign: TextAlign.left),
-                    ),
-                    Align(
-                      alignment: Alignment.topRight,
-                      child: ElevatedButton(
-                        style: ElevatedButton.styleFrom(
-                          backgroundColor: Colors.red,
+    return Scaffold(
+      body: ProgressHUD(
+        padding: const EdgeInsets.all(24),
+        backgroundColor: Colors.black87,
+        indicatorWidget: const SpinKitFadingCircle(color: Colors.white),
+        child: BlocConsumer<OtherImprovementsBloc, OtherImprovementsState>(
+            listener: (context, state) {
+          if (state is OtherImprovementLoading) {
+            final progress = ProgressHUD.of(context);
+            progress!.showWithText("Please wait...");
+          }
+          if (state is OtherImprovementLoaded) {
+            final progress = ProgressHUD.of(context);
+            progress?.dismiss();
+          }
+          if (state is OtherImprovementErrorState) {
+            final progress = ProgressHUD.of(context);
+            progress?.dismiss();
+          }
+        }, builder: (context, state) {
+          final state = context.watch<OtherImprovementsBloc>().state;
+          if (state is OtherImprovementLoaded) {
+            return Column(
+              children: [
+                Expanded(
+                    child: SingleChildScrollView(
+                  child: Padding(
+                    padding: const EdgeInsets.all(15.0),
+                    child: Column(
+                      children: [
+                        Container(
+                          margin: const EdgeInsets.only(
+                              left: 0, top: 20, right: 0, bottom: 10),
+                          child: const Text('OTHER IMPROVEMENTS',
+                              style: TextStyle(
+                                  fontWeight: FontWeight.bold, fontSize: 18),
+                              textAlign: TextAlign.left),
                         ),
+                        Align(
+                          alignment: Alignment.topRight,
+                          child: ElevatedButton(
+                            style: ElevatedButton.styleFrom(
+                              backgroundColor: Colors.red,
+                            ),
+                            onPressed: () {
+                              context
+                                  .read<OtherImprovementsBloc>()
+                                  .add(ShowOtherImprovement());
+                            },
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                const Text('ADD ITEM'), // <-- Text
+                                const SizedBox(
+                                  width: 5,
+                                ),
+                                const Icon(
+                                  // <-- Icon
+                                  Icons.add,
+                                  size: 24.0,
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                        SingleChildScrollView(
+                            scrollDirection: Axis.horizontal,
+                            child: DataTable(
+                                // ignore: prefer_const_literals_to_create_immutables
+                                columns: [
+                                  const DataColumn(
+                                    label: Text('Kinds of Tress'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Sub-Class / Age'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Type of Tree'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('No.'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('No. of Productive'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('No. of Non-Productive'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Unit Value'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Base Market Value'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Action'),
+                                  )
+                                ],
+                                rows: state.other_imp.map((dataRow) {
+                                  return DataRow(
+                                    cells: [
+                                      DataCell(Text(dataRow.kindsOfTrees!)),
+                                      DataCell(Text(dataRow.subclassAge!)),
+                                      DataCell(Text(dataRow.fruitBearing!
+                                          ? "Fruit Bearing"
+                                          : "Non-Fruit Bearing")),
+                                      DataCell(
+                                          Text(dataRow.quantity.toString()!)),
+                                      DataCell(Text(
+                                          dataRow.noOfProductive.toString()!)),
+                                      DataCell(Text(dataRow.noOfNonproductive
+                                          .toString()!)),
+                                      DataCell(
+                                          Text(dataRow.unitValue.toString()!)),
+                                      DataCell(Text(
+                                          dataRow.baseMarketval.toString()!)),
+                                      DataCell(Row(
+                                        children: [
+                                          InkWell(
+                                            child: Container(
+                                              height: 30,
+                                              width: 30,
+                                              decoration: BoxDecoration(
+                                                shape: BoxShape.circle,
+                                                color: Colors.red,
+                                              ),
+                                              child: Icon(
+                                                Icons.delete,
+                                                color: Colors.white,
+                                                size: 20.0,
+                                              ),
+                                            ),
+                                            onTap: () {
+                                              deleteItem(dataRow.id!);
+                                            },
+                                          ),
+                                          SizedBox(
+                                            width: 10,
+                                          ),
+                                          InkWell(
+                                            child: Container(
+                                              height: 30,
+                                              width: 30,
+                                              decoration: BoxDecoration(
+                                                shape: BoxShape.circle,
+                                                color: Colors.red,
+                                              ),
+                                              child: Icon(
+                                                Icons.edit,
+                                                color: Colors.white,
+                                                size: 20.0,
+                                              ),
+                                            ),
+                                            onTap: () {},
+                                          ),
+                                        ],
+                                      ))
+                                    ],
+                                  );
+                                }).toList()))
+                      ],
+                    ),
+                  ),
+                )),
+                // Padding(
+                //   padding: const EdgeInsets.only(left: 20.0, right: 20.0),
+                //   child: Row(
+                //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                //     children: [
+                //       Text(
+                //         'Total',
+                //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
+                //       ),
+                //       Text(
+                //         NumberFormat.currency(locale: 'en-PH', symbol: "₱")
+                //             .format('1.0'),
+                //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
+                //       )
+                //     ],
+                //   ),
+                // ),
+                Padding(
+                  padding: const EdgeInsets.all(15.0),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                    children: [
+                      CustomButton(
+                        icon: const Icon(Icons.chevron_left_rounded,
+                            color: Colors.white),
                         onPressed: () {
-                          context
-                              .read<OtherImprovementsBloc>()
-                              .add(ShowOtherImprovement());
+                          {
+                            widget.PrevBtn();
+                          }
+                          ;
                         },
-                        child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            const Text('ADD ITEM'), // <-- Text
-                            const SizedBox(
-                              width: 5,
-                            ),
-                            const Icon(
-                              // <-- Icon
-                              Icons.add,
-                              size: 24.0,
-                            ),
-                          ],
+                      ),
+                      CustomButton(
+                        icon: const Icon(Icons.chevron_right_rounded,
+                            color: Colors.white),
+                        onPressed: () {
+                          {
+                            widget.NextBtn();
+                          }
+                          ;
+                        },
+                      )
+                    ],
+                  ),
+                ),
+              ],
+            );
+          }
+          if (state is OtherImprovementDeletedState) {
+            if (state.success) {
+              WidgetsBinding.instance.addPostFrameCallback((_) {
+                successAlert(context, "Deletion Successful",
+                    "Extra item has been deleted successfully", () {
+                  Navigator.of(context).pop();
+                  context
+                      .read<OtherImprovementsBloc>()
+                      .add(const LoadOtherImprovement());
+                });
+              });
+            }
+          }
+          if (state is ShowAddOtherImprovementScreen) {
+            return ConstrainedBox(
+              constraints: BoxConstraints(maxHeight: 1000.0),
+              child: AlertDialog(
+                insetPadding: EdgeInsets.symmetric(
+                  horizontal: 20.0,
+                  vertical: 10.0,
+                ),
+                title: Text(
+                  'ADD OTHER IMPROVEMENTS',
+                  textAlign: TextAlign.center,
+                ),
+                content: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Align(
+                      alignment: Alignment.topCenter,
+                      child: Container(
+                        child: ConstrainedBox(
+                          constraints: BoxConstraints(maxHeight: 500),
+                          child: Container(
+                            child: AddOtherImprovementEditModal(widget.faasId),
+                          ),
                         ),
                       ),
                     ),
-                    SingleChildScrollView(
-                        scrollDirection: Axis.horizontal,
-                        child: DataTable(
-                            // ignore: prefer_const_literals_to_create_immutables
-                            columns: [
-                              const DataColumn(
-                                label: Text('Kinds of Tress'),
-                              ),
-                              const DataColumn(
-                                label: Text('Sub-Class / Age'),
-                              ),
-                              const DataColumn(
-                                label: Text('Type of Tree'),
-                              ),
-                              const DataColumn(
-                                label: Text('No.'),
-                              ),
-                              const DataColumn(
-                                label: Text('No. of Productive'),
-                              ),
-                              const DataColumn(
-                                label: Text('No. of Non-Productive'),
-                              ),
-                              const DataColumn(
-                                label: Text('Unit Value'),
-                              ),
-                              const DataColumn(
-                                label: Text('Base Market Value'),
-                              ),
-                              const DataColumn(
-                                label: Text('Action'),
-                              )
-                            ],
-                            rows: state.other_imp.map((dataRow) {
-                              return DataRow(
-                                cells: [
-                                  DataCell(Text(dataRow.kindsOfTrees!)),
-                                  DataCell(Text(dataRow.subclassAge!)),
-                                  DataCell(Text(dataRow.fruitBearing!
-                                      ? "Fruit Bearing"
-                                      : "Non-Fruit Bearing")),
-                                  DataCell(Text(dataRow.quantity.toString()!)),
-                                  DataCell(
-                                      Text(dataRow.noOfProductive.toString()!)),
-                                  DataCell(Text(
-                                      dataRow.noOfNonproductive.toString()!)),
-                                  DataCell(Text(dataRow.unitValue.toString()!)),
-                                  DataCell(
-                                      Text(dataRow.baseMarketval.toString()!)),
-                                  DataCell(Row(
-                                    children: [
-                                      InkWell(
-                                        child: Container(
-                                          height: 30,
-                                          width: 30,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            color: Colors.red,
-                                          ),
-                                          child: Icon(
-                                            Icons.delete,
-                                            color: Colors.white,
-                                            size: 20.0,
-                                          ),
-                                        ),
-                                        onTap: () {
-                                          deleteItem(dataRow.id!);
-                                        },
-                                      ),
-                                      SizedBox(
-                                        width: 10,
-                                      ),
-                                      InkWell(
-                                        child: Container(
-                                          height: 30,
-                                          width: 30,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            color: Colors.red,
-                                          ),
-                                          child: Icon(
-                                            Icons.edit,
-                                            color: Colors.white,
-                                            size: 20.0,
-                                          ),
-                                        ),
-                                        onTap: () {},
-                                      ),
-                                    ],
-                                  ))
-                                ],
-                              );
-                            }).toList()))
                   ],
                 ),
               ),
-            )),
-            // Padding(
-            //   padding: const EdgeInsets.only(left: 20.0, right: 20.0),
-            //   child: Row(
-            //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            //     children: [
-            //       Text(
-            //         'Total',
-            //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-            //       ),
-            //       Text(
-            //         NumberFormat.currency(locale: 'en-PH', symbol: "₱")
-            //             .format('1.0'),
-            //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-            //       )
-            //     ],
-            //   ),
-            // ),
-            Padding(
-              padding: const EdgeInsets.all(15.0),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                children: [
-                  CustomButton(
-                    icon: const Icon(Icons.chevron_left_rounded,
-                        color: Colors.white),
-                    onPressed: () {
-                      {
-                        widget.PrevBtn();
-                      }
-                      ;
-                    },
-                  ),
-                  CustomButton(
-                    icon: const Icon(Icons.chevron_right_rounded,
-                        color: Colors.white),
-                    onPressed: () {
-                      {
-                        widget.NextBtn();
-                      }
-                      ;
-                    },
-                  )
-                ],
-              ),
-            ),
-          ],
-        );
-      }
-      if (state is OtherImprovementDeletedState) {
-        if (state.success) {
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            successAlert(context, "Deletion Successful",
-                "Extra item has been deleted successfully", () {
-              Navigator.of(context).pop();
-              context
-                  .read<OtherImprovementsBloc>()
-                  .add(const LoadOtherImprovement());
-            });
-          });
-        }
-      }
-      if (state is ShowAddOtherImprovementScreen) {
-        return ConstrainedBox(
-          constraints: BoxConstraints(maxHeight: 1000.0),
-          child: AlertDialog(
-            insetPadding: EdgeInsets.symmetric(
-              horizontal: 20.0,
-              vertical: 10.0,
-            ),
-            title: Text(
-              'ADD OTHER IMPROVEMENTS',
-              textAlign: TextAlign.center,
-            ),
-            content: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [Container(child: AddOtherImprovementModal())],
-            ),
-          ),
-        );
-      }
-      return Container();
-    });
+            );
+          }
+          if (state is OtherImprovementErrorState) {
+            return SomethingWentWrong(
+              message: onError,
+              onpressed: () {
+                context.read<OtherImprovementsBloc>().add(
+                    LoadOtherImprovementEdit(
+                        other_imps: const <OtherImprovements>[],
+                        ids: widget.faasId));
+              },
+            );
+          }
+          return Container();
+        }),
+      ),
+    );
   }
 }

lib/screens/passo/Land/edit_land/property_assessment_edit.dart

@@ -1,14 +1,22 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_progress_hud/flutter_progress_hud.dart';
+import 'package:flutter_spinkit/flutter_spinkit.dart';
+import 'package:unit2/bloc/passo/bulding/property_assessment_edit/property_assessment_edit_bloc.dart';
 import 'package:unit2/bloc/passo/land/land_property_assessment/land_property_assessment_bloc.dart';
+import 'package:unit2/model/passo/land_property_assessment.dart';
 import 'package:unit2/screens/passo/Land/add_land/AddPropertyAssessmentModal.dart';
+import 'package:unit2/screens/passo/Land/edit_land/AddPropertyAssessmentEditModal.dart';
 import 'package:unit2/utils/alerts.dart';
+import 'package:unit2/utils/text_container.dart';
+import 'package:unit2/widgets/error_state.dart';
 import 'package:unit2/widgets/passo/custom_button.dart';
 
 class LandPropertyAssessmentEditPage extends StatefulWidget {
   Function PrevBtn;
   Function NextBtn;
-  LandPropertyAssessmentEditPage(this.PrevBtn, this.NextBtn);
+  final int faasId;
+  LandPropertyAssessmentEditPage(this.PrevBtn, this.NextBtn, this.faasId);
   @override
   _LandPropertyAssessmentEditPage createState() =>
       _LandPropertyAssessmentEditPage();
@@ -32,214 +40,248 @@ class _LandPropertyAssessmentEditPage
 
   @override
   Widget build(BuildContext context) {
-    return BlocConsumer<LandPropertyAssessmentBloc,
-        LandPropertyAssessmentState>(listener: (context, state) {
-      // TODO: implement listener
-    }, builder: (context, state) {
-      final state = context.watch<LandPropertyAssessmentBloc>().state;
-      if (state is LandPropertyAssessmentLoaded) {
-        return Column(
-          children: [
-            Expanded(
-                child: SingleChildScrollView(
-              child: Padding(
-                padding: const EdgeInsets.all(15.0),
-                child: Column(
+    return Scaffold(
+      body: ProgressHUD(
+        padding: const EdgeInsets.all(24),
+        backgroundColor: Colors.black87,
+        indicatorWidget: const SpinKitFadingCircle(color: Colors.white),
+        child: BlocConsumer<LandPropertyAssessmentBloc,
+            LandPropertyAssessmentState>(listener: (context, state) {
+          if (state is LandPropertyAssessmentLoading) {
+            final progress = ProgressHUD.of(context);
+            progress!.showWithText("Please wait...");
+          }
+          if (state is LandPropertyAssessmentLoaded) {
+            final progress = ProgressHUD.of(context);
+            progress?.dismiss();
+          }
+          if (state is LandPropertyAssessmentErrorState) {
+            final progress = ProgressHUD.of(context);
+            progress?.dismiss();
+          }
+        }, builder: (context, state) {
+          final state = context.watch<LandPropertyAssessmentBloc>().state;
+          if (state is LandPropertyAssessmentLoaded) {
+            return Column(
+              children: [
+                Expanded(
+                    child: SingleChildScrollView(
+                  child: Padding(
+                    padding: const EdgeInsets.all(15.0),
+                    child: Column(
+                      children: [
+                        Container(
+                          margin: const EdgeInsets.only(
+                              left: 0, top: 20, right: 0, bottom: 10),
+                          child: const Text('PROPERTY ASSESSMENT',
+                              style: TextStyle(
+                                  fontWeight: FontWeight.bold, fontSize: 18),
+                              textAlign: TextAlign.left),
+                        ),
+                        Align(
+                          alignment: Alignment.topRight,
+                          child: ElevatedButton(
+                            style: ElevatedButton.styleFrom(
+                              backgroundColor: Colors.red,
+                            ),
+                            onPressed: () {
+                              context
+                                  .read<LandPropertyAssessmentBloc>()
+                                  .add(ShowLandPropertyAssessment());
+                            },
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                const Text('ADD ITEM'), // <-- Text
+                                const SizedBox(
+                                  width: 5,
+                                ),
+                                const Icon(
+                                  // <-- Icon
+                                  Icons.add,
+                                  size: 24.0,
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                        SingleChildScrollView(
+                            scrollDirection: Axis.horizontal,
+                            child: DataTable(
+                                // ignore: prefer_const_literals_to_create_immutables
+                                columns: [
+                                  const DataColumn(
+                                    label: Text('Actual Use'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Market Value'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Assessment Level'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Assessed Value'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Action'),
+                                  )
+                                ],
+                                rows: state.assessment.map((dataRow) {
+                                  return DataRow(
+                                    cells: [
+                                      DataCell(Text(dataRow.actualUse!)),
+                                      DataCell(Text(dataRow.marketval!)),
+                                      DataCell(
+                                          Text(dataRow.assessmentLevel! + '%')),
+                                      DataCell(Text(dataRow.assessedValue!)),
+                                      DataCell(Row(
+                                        children: [
+                                          InkWell(
+                                            child: Container(
+                                              height: 30,
+                                              width: 30,
+                                              decoration: BoxDecoration(
+                                                shape: BoxShape.circle,
+                                                color: Colors.red,
+                                              ),
+                                              child: Icon(
+                                                Icons.delete,
+                                                color: Colors.white,
+                                                size: 20.0,
+                                              ),
+                                            ),
+                                            onTap: () {
+                                              deleteItem(dataRow.id!);
+                                            },
+                                          ),
+                                          SizedBox(
+                                            width: 10,
+                                          ),
+                                          InkWell(
+                                            child: Container(
+                                              height: 30,
+                                              width: 30,
+                                              decoration: BoxDecoration(
+                                                shape: BoxShape.circle,
+                                                color: Colors.red,
+                                              ),
+                                              child: Icon(
+                                                Icons.edit,
+                                                color: Colors.white,
+                                                size: 20.0,
+                                              ),
+                                            ),
+                                            onTap: () {},
+                                          ),
+                                        ],
+                                      ))
+                                    ],
+                                  );
+                                }).toList()))
+                      ],
+                    ),
+                  ),
+                )),
+                // Padding(
+                //   padding: const EdgeInsets.only(left: 20.0, right: 20.0),
+                //   child: Row(
+                //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                //     children: [
+                //       Text(
+                //         'Total',
+                //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
+                //       ),
+                //       Text(
+                //         NumberFormat.currency(locale: 'en-PH', symbol: "₱")
+                //             .format('1.0'),
+                //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
+                //       )
+                //     ],
+                //   ),
+                // ),
+                Padding(
+                  padding: const EdgeInsets.all(15.0),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                    children: [
+                      CustomButton(
+                        icon: const Icon(Icons.chevron_left_rounded,
+                            color: Colors.white),
+                        onPressed: () {
+                          {
+                            widget.PrevBtn();
+                          }
+                          ;
+                        },
+                      ),
+                      CustomButton(
+                        icon: const Icon(Icons.chevron_right_rounded,
+                            color: Colors.white),
+                        onPressed: () {
+                          {
+                            widget.NextBtn();
+                          }
+                          ;
+                        },
+                      )
+                    ],
+                  ),
+                ),
+              ],
+            );
+          }
+          if (state is LandPropertyAssessmentDeletedState) {
+            if (state.success) {
+              WidgetsBinding.instance.addPostFrameCallback((_) {
+                successAlert(context, "Deletion Successful",
+                    "Extra item has been deleted successfully", () {
+                  Navigator.of(context).pop();
+                  context.read<LandPropertyAssessmentBloc>().add(
+                      LoadLandPropertyAssessmentEdit(
+                          assessment: <LandPropertyAssessment>[],
+                          id: widget.faasId));
+                });
+              });
+            }
+          }
+          if (state is ShowAddLandPropertyAssessmentScreen) {
+            return ConstrainedBox(
+              constraints: BoxConstraints(maxHeight: 1000.0),
+              child: AlertDialog(
+                insetPadding: EdgeInsets.symmetric(
+                  horizontal: 20.0,
+                  vertical: 10.0,
+                ),
+                title: Text(
+                  'ADD PROPERTY ASSESSMENT',
+                  textAlign: TextAlign.center,
+                ),
+                content: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Container(
-                      margin: const EdgeInsets.only(
-                          left: 0, top: 20, right: 0, bottom: 10),
-                      child: const Text('PROPERTY ASSESSMENT',
-                          style: TextStyle(
-                              fontWeight: FontWeight.bold, fontSize: 18),
-                          textAlign: TextAlign.left),
-                    ),
-                    Align(
-                      alignment: Alignment.topRight,
-                      child: ElevatedButton(
-                        style: ElevatedButton.styleFrom(
-                          backgroundColor: Colors.red,
-                        ),
-                        onPressed: () {
-                          context
-                              .read<LandPropertyAssessmentBloc>()
-                              .add(ShowLandPropertyAssessment());
-                        },
-                        child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            const Text('ADD ITEM'), // <-- Text
-                            const SizedBox(
-                              width: 5,
-                            ),
-                            const Icon(
-                              // <-- Icon
-                              Icons.add,
-                              size: 24.0,
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-                    SingleChildScrollView(
-                        scrollDirection: Axis.horizontal,
-                        child: DataTable(
-                            // ignore: prefer_const_literals_to_create_immutables
-                            columns: [
-                              const DataColumn(
-                                label: Text('Actual Use'),
-                              ),
-                              const DataColumn(
-                                label: Text('Market Value'),
-                              ),
-                              const DataColumn(
-                                label: Text('Assessment Level'),
-                              ),
-                              const DataColumn(
-                                label: Text('Assessed Value'),
-                              ),
-                              const DataColumn(
-                                label: Text('Action'),
-                              )
-                            ],
-                            rows: state.assessment.map((dataRow) {
-                              return DataRow(
-                                cells: [
-                                  DataCell(Text(dataRow.actualUse!)),
-                                  DataCell(Text(dataRow.marketval!)),
-                                  DataCell(
-                                      Text(dataRow.assessmentLevel! + '%')),
-                                  DataCell(Text(dataRow.assessedValue!)),
-                                  DataCell(Row(
-                                    children: [
-                                      InkWell(
-                                        child: Container(
-                                          height: 30,
-                                          width: 30,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            color: Colors.red,
-                                          ),
-                                          child: Icon(
-                                            Icons.delete,
-                                            color: Colors.white,
-                                            size: 20.0,
-                                          ),
-                                        ),
-                                        onTap: () {
-                                          deleteItem(dataRow.id!);
-                                        },
-                                      ),
-                                      SizedBox(
-                                        width: 10,
-                                      ),
-                                      InkWell(
-                                        child: Container(
-                                          height: 30,
-                                          width: 30,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            color: Colors.red,
-                                          ),
-                                          child: Icon(
-                                            Icons.edit,
-                                            color: Colors.white,
-                                            size: 20.0,
-                                          ),
-                                        ),
-                                        onTap: () {},
-                                      ),
-                                    ],
-                                  ))
-                                ],
-                              );
-                            }).toList()))
+                        child: AddPropertyAssessmentEditModal(widget.faasId))
                   ],
                 ),
               ),
-            )),
-            // Padding(
-            //   padding: const EdgeInsets.only(left: 20.0, right: 20.0),
-            //   child: Row(
-            //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            //     children: [
-            //       Text(
-            //         'Total',
-            //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-            //       ),
-            //       Text(
-            //         NumberFormat.currency(locale: 'en-PH', symbol: "₱")
-            //             .format('1.0'),
-            //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-            //       )
-            //     ],
-            //   ),
-            // ),
-            Padding(
-              padding: const EdgeInsets.all(15.0),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                children: [
-                  CustomButton(
-                    icon: const Icon(Icons.chevron_left_rounded,
-                        color: Colors.white),
-                    onPressed: () {
-                      {
-                        widget.PrevBtn();
-                      }
-                      ;
-                    },
-                  ),
-                  CustomButton(
-                    icon: const Icon(Icons.chevron_right_rounded,
-                        color: Colors.white),
-                    onPressed: () {
-                      {
-                        widget.NextBtn();
-                      }
-                      ;
-                    },
-                  )
-                ],
-              ),
-            ),
-          ],
-        );
-      }
-      if (state is LandPropertyAssessmentDeletedState) {
-        if (state.success) {
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            successAlert(context, "Deletion Successful",
-                "Extra item has been deleted successfully", () {
-              Navigator.of(context).pop();
-              context
-                  .read<LandPropertyAssessmentBloc>()
-                  .add(const LoadLandPropertyAssessment());
-            });
-          });
-        }
-      }
-      if (state is ShowAddLandPropertyAssessmentScreen) {
-        return ConstrainedBox(
-          constraints: BoxConstraints(maxHeight: 1000.0),
-          child: AlertDialog(
-            insetPadding: EdgeInsets.symmetric(
-              horizontal: 20.0,
-              vertical: 10.0,
-            ),
-            title: Text(
-              'ADD PROPERTY ASSESSMENT',
-              textAlign: TextAlign.center,
-            ),
-            content: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [Container(child: AddPropertyAssessmentModal())],
-            ),
-          ),
-        );
-      }
-      return Container();
-    });
+            );
+          }
+          if (state is LandPropertyAssessmentErrorState) {
+            return SomethingWentWrong(
+              message: onError,
+              onpressed: () {
+                context.read<LandPropertyAssessmentBloc>().add(
+                    LoadLandPropertyAssessmentEdit(
+                        assessment: const <LandPropertyAssessment>[],
+                        id: widget.faasId));
+              },
+            );
+          }
+
+          return Container();
+        }),
+      ),
+    );
   }
 }

lib/screens/passo/Land/edit_land/value_adjustments_edit.dart

@@ -1,14 +1,20 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_progress_hud/flutter_progress_hud.dart';
+import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:unit2/bloc/passo/land/land_value_adjustments/land_value_adjustments_bloc.dart';
+import 'package:unit2/model/passo/land_value_adjustment.dart';
 import 'package:unit2/screens/passo/Land/add_land/AddLandValueAdjustmentModal.dart';
 import 'package:unit2/utils/alerts.dart';
+import 'package:unit2/utils/text_container.dart';
+import 'package:unit2/widgets/error_state.dart';
 import 'package:unit2/widgets/passo/custom_button.dart';
 
 class ValueAdjustmentEditPage extends StatefulWidget {
   Function PrevBtn;
   Function NextBtn;
-  ValueAdjustmentEditPage(this.PrevBtn, this.NextBtn);
+  final int faasId;
+  ValueAdjustmentEditPage(this.PrevBtn, this.NextBtn, this.faasId);
   @override
   _ValueAdjustmentEditPage createState() => _ValueAdjustmentEditPage();
 }
@@ -30,217 +36,248 @@ class _ValueAdjustmentEditPage extends State<ValueAdjustmentEditPage> {
 
   @override
   Widget build(BuildContext context) {
-    return BlocConsumer<LandValueAdjustmentsBloc, LandValueAdjustmentsState>(
-        listener: (context, state) {
-      // TODO: implement listener
-    }, builder: (context, state) {
-      final state = context.watch<LandValueAdjustmentsBloc>().state;
-      if (state is LandValueAdjustmentsLoaded) {
-        return Column(
-          children: [
-            Expanded(
-                child: SingleChildScrollView(
-              child: Padding(
-                padding: const EdgeInsets.all(15.0),
-                child: Column(
-                  children: [
-                    Container(
-                      margin: const EdgeInsets.only(
-                          left: 0, top: 20, right: 0, bottom: 10),
-                      child: const Text('VALUE ADJUSTMENTS',
-                          style: TextStyle(
-                              fontWeight: FontWeight.bold, fontSize: 18),
-                          textAlign: TextAlign.left),
-                    ),
-                    Align(
-                      alignment: Alignment.topRight,
-                      child: ElevatedButton(
-                        style: ElevatedButton.styleFrom(
-                          backgroundColor: Colors.red,
+    return Scaffold(
+      body: ProgressHUD(
+        padding: const EdgeInsets.all(24),
+        backgroundColor: Colors.black87,
+        indicatorWidget: const SpinKitFadingCircle(color: Colors.white),
+        child:
+            BlocConsumer<LandValueAdjustmentsBloc, LandValueAdjustmentsState>(
+                listener: (context, state) {
+          if (state is LandValueAdjustmentsLoading) {
+            final progress = ProgressHUD.of(context);
+            progress!.showWithText("Please wait...");
+          }
+          if (state is LandValueAdjustmentsLoaded) {
+            final progress = ProgressHUD.of(context);
+            progress?.dismiss();
+          }
+          if (state is LandValueAdjustmentsErrorState) {
+            final progress = ProgressHUD.of(context);
+            progress?.dismiss();
+          }
+        }, builder: (context, state) {
+          final state = context.watch<LandValueAdjustmentsBloc>().state;
+          if (state is LandValueAdjustmentsLoaded) {
+            return Column(
+              children: [
+                Expanded(
+                    child: SingleChildScrollView(
+                  child: Padding(
+                    padding: const EdgeInsets.all(15.0),
+                    child: Column(
+                      children: [
+                        Container(
+                          margin: const EdgeInsets.only(
+                              left: 0, top: 20, right: 0, bottom: 10),
+                          child: const Text('VALUE ADJUSTMENTS',
+                              style: TextStyle(
+                                  fontWeight: FontWeight.bold, fontSize: 18),
+                              textAlign: TextAlign.left),
                         ),
-                        onPressed: () {
-                          context
-                              .read<LandValueAdjustmentsBloc>()
-                              .add(ShowLandValueAdjustments());
-                        },
-                        child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            const Text('ADD ITEM'), // <-- Text
-                            const SizedBox(
-                              width: 5,
+                        Align(
+                          alignment: Alignment.topRight,
+                          child: ElevatedButton(
+                            style: ElevatedButton.styleFrom(
+                              backgroundColor: Colors.red,
                             ),
-                            const Icon(
-                              // <-- Icon
-                              Icons.add,
-                              size: 24.0,
+                            onPressed: () {
+                              context
+                                  .read<LandValueAdjustmentsBloc>()
+                                  .add(ShowLandValueAdjustments());
+                            },
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                const Text('ADD ITEM'), // <-- Text
+                                const SizedBox(
+                                  width: 5,
+                                ),
+                                const Icon(
+                                  // <-- Icon
+                                  Icons.add,
+                                  size: 24.0,
+                                ),
+                              ],
                             ),
-                          ],
+                          ),
                         ),
-                      ),
-                    ),
-                    SingleChildScrollView(
-                        scrollDirection: Axis.horizontal,
-                        child: DataTable(
-                            // ignore: prefer_const_literals_to_create_immutables
-                            columns: [
-                              const DataColumn(
-                                label: Text('Base Market Value'),
-                              ),
-                              const DataColumn(
-                                label: Text('Adjustment Factors'),
-                              ),
-                              const DataColumn(
-                                label: Text('% Adjustment'),
-                              ),
-                              const DataColumn(
-                                label: Text('Value Adjustment'),
-                              ),
-                              const DataColumn(
-                                label: Text('Market Value'),
-                              ),
-                              const DataColumn(
-                                label: Text('Action'),
-                              )
-                            ],
-                            rows: state.val_adj.map((dataRow) {
-                              return DataRow(
-                                cells: [
-                                  DataCell(Text(dataRow.baseMarketval!)),
-                                  DataCell(Text(dataRow.adjustmentFactors!)),
-                                  DataCell(Text(dataRow.adjustment!)),
-                                  DataCell(Text(dataRow.valueAdjustment!)),
-                                  DataCell(Text(dataRow.marketValue!)),
-                                  DataCell(Row(
-                                    children: [
-                                      InkWell(
-                                        child: Container(
-                                          height: 30,
-                                          width: 30,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            color: Colors.red,
-                                          ),
-                                          child: Icon(
-                                            Icons.delete,
-                                            color: Colors.white,
-                                            size: 20.0,
-                                          ),
-                                        ),
-                                        onTap: () {
-                                          deleteItem(dataRow.id!);
-                                        },
-                                      ),
-                                      SizedBox(
-                                        width: 10,
-                                      ),
-                                      InkWell(
-                                        child: Container(
-                                          height: 30,
-                                          width: 30,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            color: Colors.red,
-                                          ),
-                                          child: Icon(
-                                            Icons.edit,
-                                            color: Colors.white,
-                                            size: 20.0,
-                                          ),
-                                        ),
-                                        onTap: () {},
-                                      ),
-                                    ],
-                                  ))
+                        SingleChildScrollView(
+                            scrollDirection: Axis.horizontal,
+                            child: DataTable(
+                                // ignore: prefer_const_literals_to_create_immutables
+                                columns: [
+                                  const DataColumn(
+                                    label: Text('Base Market Value'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Adjustment Factors'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('% Adjustment'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Value Adjustment'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Market Value'),
+                                  ),
+                                  const DataColumn(
+                                    label: Text('Action'),
+                                  )
                                 ],
-                              );
-                            }).toList()))
-                  ],
+                                rows: state.val_adj.map((dataRow) {
+                                  return DataRow(
+                                    cells: [
+                                      DataCell(Text(dataRow.baseMarketval!)),
+                                      DataCell(
+                                          Text(dataRow.adjustmentFactors!)),
+                                      DataCell(Text(dataRow.adjustment!)),
+                                      DataCell(Text(dataRow.valueAdjustment!)),
+                                      DataCell(Text(dataRow.marketValue!)),
+                                      DataCell(Row(
+                                        children: [
+                                          InkWell(
+                                            child: Container(
+                                              height: 30,
+                                              width: 30,
+                                              decoration: BoxDecoration(
+                                                shape: BoxShape.circle,
+                                                color: Colors.red,
+                                              ),
+                                              child: Icon(
+                                                Icons.delete,
+                                                color: Colors.white,
+                                                size: 20.0,
+                                              ),
+                                            ),
+                                            onTap: () {
+                                              deleteItem(dataRow.id!);
+                                            },
+                                          ),
+                                          SizedBox(
+                                            width: 10,
+                                          ),
+                                          InkWell(
+                                            child: Container(
+                                              height: 30,
+                                              width: 30,
+                                              decoration: BoxDecoration(
+                                                shape: BoxShape.circle,
+                                                color: Colors.red,
+                                              ),
+                                              child: Icon(
+                                                Icons.edit,
+                                                color: Colors.white,
+                                                size: 20.0,
+                                              ),
+                                            ),
+                                            onTap: () {},
+                                          ),
+                                        ],
+                                      ))
+                                    ],
+                                  );
+                                }).toList()))
+                      ],
+                    ),
+                  ),
+                )),
+                // Padding(
+                //   padding: const EdgeInsets.only(left: 20.0, right: 20.0),
+                //   child: Row(
+                //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                //     children: [
+                //       Text(
+                //         'Total',
+                //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
+                //       ),
+                //       Text(
+                //         NumberFormat.currency(locale: 'en-PH', symbol: "₱")
+                //             .format('1.0'),
+                //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
+                //       )
+                //     ],
+                //   ),
+                // ),
+                Padding(
+                  padding: const EdgeInsets.all(15.0),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                    children: [
+                      CustomButton(
+                        icon: const Icon(Icons.chevron_left_rounded,
+                            color: Colors.white),
+                        onPressed: () {
+                          {
+                            widget.PrevBtn();
+                          }
+                          ;
+                        },
+                      ),
+                      CustomButton(
+                        icon: const Icon(Icons.chevron_right_rounded,
+                            color: Colors.white),
+                        onPressed: () {
+                          {
+                            widget.NextBtn();
+                          }
+                          ;
+                        },
+                      )
+                    ],
+                  ),
+                ),
+              ],
+            );
+          }
+          if (state is LandValueAdjustmentsDeletedState) {
+            if (state.success) {
+              WidgetsBinding.instance.addPostFrameCallback((_) {
+                successAlert(context, "Deletion Successful",
+                    "Extra item has been deleted successfully", () {
+                  Navigator.of(context).pop();
+                  context.read<LandValueAdjustmentsBloc>().add(
+                      LoadLandValueAdjustmentsEdit(
+                          val_adj: <ValueAdjustments>[], id: widget.faasId));
+                });
+              });
+            }
+          }
+          if (state is ShowAddLandValueAdjustmentsScreen) {
+            return ConstrainedBox(
+              constraints: BoxConstraints(maxHeight: 1000.0),
+              child: AlertDialog(
+                insetPadding: EdgeInsets.symmetric(
+                  horizontal: 20.0,
+                  vertical: 10.0,
+                ),
+                title: Text(
+                  'ADD VALUE ADJUSTMENTS',
+                  textAlign: TextAlign.center,
+                ),
+                content: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [Expanded(child: AddLandValueAdjustmentModal())],
                 ),
               ),
-            )),
-            // Padding(
-            //   padding: const EdgeInsets.only(left: 20.0, right: 20.0),
-            //   child: Row(
-            //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            //     children: [
-            //       Text(
-            //         'Total',
-            //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-            //       ),
-            //       Text(
-            //         NumberFormat.currency(locale: 'en-PH', symbol: "₱")
-            //             .format('1.0'),
-            //         style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-            //       )
-            //     ],
-            //   ),
-            // ),
-            Padding(
-              padding: const EdgeInsets.all(15.0),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                children: [
-                  CustomButton(
-                    icon: const Icon(Icons.chevron_left_rounded,
-                        color: Colors.white),
-                    onPressed: () {
-                      {
-                        widget.PrevBtn();
-                      }
-                      ;
-                    },
-                  ),
-                  CustomButton(
-                    icon: const Icon(Icons.chevron_right_rounded,
-                        color: Colors.white),
-                    onPressed: () {
-                      {
-                        widget.NextBtn();
-                      }
-                      ;
-                    },
-                  )
-                ],
-              ),
-            ),
-          ],
-        );
-      }
-      if (state is LandValueAdjustmentsDeletedState) {
-        if (state.success) {
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            successAlert(context, "Deletion Successful",
-                "Extra item has been deleted successfully", () {
-              Navigator.of(context).pop();
-              context
-                  .read<LandValueAdjustmentsBloc>()
-                  .add(const LoadLandValueAdjustments());
-            });
-          });
-        }
-      }
-      if (state is ShowAddLandValueAdjustmentsScreen) {
-        return ConstrainedBox(
-          constraints: BoxConstraints(maxHeight: 1000.0),
-          child: AlertDialog(
-            insetPadding: EdgeInsets.symmetric(
-              horizontal: 20.0,
-              vertical: 10.0,
-            ),
-            title: Text(
-              'ADD VALUE ADJUSTMENTS',
-              textAlign: TextAlign.center,
-            ),
-            content: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [Expanded(child: AddLandValueAdjustmentModal())],
-            ),
-          ),
-        );
-      }
-      return Container();
-    });
+            );
+          }
+          if (state is LandValueAdjustmentsErrorState) {
+            return SomethingWentWrong(
+              message: onError,
+              onpressed: () {
+                context.read<LandValueAdjustmentsBloc>().add(
+                    LoadLandValueAdjustmentsEdit(
+                        val_adj: const <ValueAdjustments>[],
+                        id: widget.faasId));
+              },
+            );
+          }
+          return Container();
+        }),
+      ),
+    );
   }
 }

lib/screens/passo/building_home.dart

@@ -90,8 +90,11 @@ class BuildingHome extends StatelessWidget {
                     final progress = ProgressHUD.of(context);
                     progress!.showWithText("Please wait...");
                   }
-                  if (state is PropertyInfoLoaded ||
-                      state is PropertyInfoErrorState) {
+                  if (state is PropertyInfoLoaded) {
+                    final progress = ProgressHUD.of(context);
+                    progress?.dismiss();
+                  }
+                  if (state is PropertyInfoErrorState) {
                     final progress = ProgressHUD.of(context);
                     progress?.dismiss();
                   }

lib/screens/passo/land_home .dart

@@ -21,6 +21,7 @@ import 'package:unit2/bloc/passo/land/land_appraisal/land_appraisal_bloc.dart';
 import 'package:unit2/bloc/passo/land/land_boundaries_edit/land_boundaries_edit_bloc.dart';
 import 'package:unit2/bloc/passo/land/land_classification/land_classification_bloc.dart';
 import 'package:unit2/bloc/passo/land/land_ext/land_ext_bloc.dart';
+import 'package:unit2/bloc/passo/land/land_ext_bloc/land_ext_edit_bloc.dart';
 import 'package:unit2/bloc/passo/land/land_location_edit/land_location_edit_bloc.dart';
 import 'package:unit2/bloc/passo/land/land_property_assessment/land_property_assessment_bloc.dart';
 import 'package:unit2/bloc/passo/land/land_property_owner_info/land_property_owner_info_bloc.dart';
@@ -39,10 +40,15 @@ import 'package:unit2/bloc/passo/signatories/signatories_bloc.dart';
 import 'package:unit2/bloc/user/user_bloc.dart';
 import 'package:unit2/model/passo/additional_items.dart';
 import 'package:unit2/model/passo/general_description.dart';
+import 'package:unit2/model/passo/land_appr.dart';
+import 'package:unit2/model/passo/land_ext.dart';
+import 'package:unit2/model/passo/land_property_assessment.dart';
 import 'package:unit2/model/passo/land_property_boundaries.dart';
 import 'package:unit2/model/passo/land_property_loc.dart';
 import 'package:unit2/model/passo/land_property_owner.dart';
 import 'package:unit2/model/passo/land_ref.dart';
+import 'package:unit2/model/passo/land_value_adjustment.dart';
+import 'package:unit2/model/passo/other_improvements.dart';
 import 'package:unit2/model/passo/property_appraisal.dart';
 import 'package:unit2/model/passo/property_appraisal_edit.dart';
 import 'package:unit2/model/passo/property_assessment_edit.dart';
@@ -300,14 +306,20 @@ Card _listCard(LandPropertyOwner property_info, context, index) {
                       ..add(LoadLandLocationEdit(
                           land_loc_edit: LandPropertyLoc(),
                           id: property_info.id))),
+                BlocProvider(
+                    create: (context) => LandExtEditBloc()
+                      ..add(LoadLandExtEdit(
+                          land_ext_edit: LandExt(), id: property_info.id))),
                 BlocProvider(
                     create: (context) => LandBoundariesEditBloc()
                       ..add(LoadLandBoundariesEdit(
                           land_boundaries_edit: LandPropertyBoundaries(),
                           id: property_info.id))),
                 BlocProvider(
-                    create: (context) =>
-                        LandAppraisalBloc()..add(LoadLandAppraisal())),
+                    create: (context) => LandAppraisalBloc()
+                      ..add(LoadLandAppraisalEdit(
+                          land_appr: const <LandAppr>[],
+                          id: property_info.id!))),
                 BlocProvider(
                     create: (context) => LandClassificationBloc()
                       ..add(LoadLandClassification())),
@@ -316,8 +328,10 @@ Card _listCard(LandPropertyOwner property_info, context, index) {
                       ..add(LoadLandSubClassification(
                           cityCode: "1", classCode: 1))),
                 BlocProvider(
-                    create: (context) =>
-                        OtherImprovementsBloc()..add(LoadOtherImprovement())),
+                    create: (context) => OtherImprovementsBloc()
+                      ..add(LoadOtherImprovementEdit(
+                          other_imps: const <OtherImprovements>[],
+                          ids: property_info.id!))),
                 BlocProvider(
                     create: (context) =>
                         TypeOfLocationBloc()..add(LoadTypeOfLocation())),
@@ -326,7 +340,9 @@ Card _listCard(LandPropertyOwner property_info, context, index) {
                         TypeOfRoadBloc()..add(LoadTypeOfRoad())),
                 BlocProvider(
                     create: (context) => LandPropertyAssessmentBloc()
-                      ..add(LoadLandPropertyAssessment())),
+                      ..add(LoadLandPropertyAssessmentEdit(
+                          assessment: <LandPropertyAssessment>[],
+                          id: property_info.id!))),
                 BlocProvider(
                     create: (context) => LandTreesImprovementsBloc()
                       ..add(LoadLandTreesImprovements())),
@@ -334,7 +350,9 @@ Card _listCard(LandPropertyOwner property_info, context, index) {
                     create: (context) => LandExtBloc()..add(LoadLandExt())),
                 BlocProvider(
                     create: (context) => LandValueAdjustmentsBloc()
-                      ..add(LoadLandValueAdjustments())),
+                      ..add(LoadLandValueAdjustmentsEdit(
+                          val_adj: <ValueAdjustments>[],
+                          id: property_info.id!))),
                 BlocProvider(
                     create: (context) =>
                         SignatoriesBloc()..add(LoadSignatories())),

lib/screens/passo/passo_dashboard.dart

@@ -51,7 +51,7 @@ class _PassoDashBoard extends State<PassoDashBoard> {
               child: const LandHome(),
             ),
             EmptyData(
-              message: "Development ongoing ...",
+              message: "Sorry, this page is under construction.",
             )
           ],
         ),

lib/screens/profile/components/basic_information/edit_basic_info_modal.dart

@@ -24,6 +24,7 @@ class EditBasicProfileInfoScreen extends StatefulWidget {
   State<EditBasicProfileInfoScreen> createState() =>
       _EditBasicProfileInfoScreenState();
 }
+
 final bdayController = TextEditingController();
 ProfileOtherInfo? selectedIndigency;
 ProfileOtherInfo? selectedEthnicity;
@@ -36,13 +37,13 @@ String? selectedStatus;
 String? selectedExtension;
 final _formKey = GlobalKey<FormBuilderState>();
 
-
 class _EditBasicProfileInfoScreenState
     extends State<EditBasicProfileInfoScreen> {
-      @override
+  @override
   void dispose() {
     super.dispose();
   }
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<ProfileBloc, ProfileState>(
@@ -52,7 +53,8 @@ class _EditBasicProfileInfoScreenState
           selectedSex = state.sexes.firstWhere((element) =>
               element.toLowerCase() ==
               state.primaryInformation.sex!.toLowerCase());
-          if (state.primaryInformation.bloodType != null && state.primaryInformation.bloodType != "N/A") {
+          if (state.primaryInformation.bloodType != null &&
+              state.primaryInformation.bloodType != "N/A") {
             selectedBloodType = state.bloodTypes.firstWhere((element) =>
                 element.toLowerCase() ==
                 state.primaryInformation.bloodType?.toLowerCase());
@@ -99,9 +101,6 @@ class _EditBasicProfileInfoScreenState
                 state.primaryInformation.disability!.toLowerCase());
           }
 
-
-
-
           return Container(
             padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 32),
             child: FormBuilder(
@@ -116,9 +115,7 @@ class _EditBasicProfileInfoScreenState
                         ),
                         FormBuilderTextField(
                           name: "lastname",
-                          inputFormatters: [
-                            UpperCaseTextFormatter()
-                          ],
+                          inputFormatters: [UpperCaseTextFormatter()],
                           initialValue: state.primaryInformation.lastName,
                           decoration: normalTextFieldStyle("Last name *", ""),
                           validator: FormBuilderValidators.required(
@@ -129,9 +126,7 @@ class _EditBasicProfileInfoScreenState
                         ),
                         FormBuilderTextField(
                           name: "firstname",
-                            inputFormatters: [
-                            UpperCaseTextFormatter()
-                          ],
+                          inputFormatters: [UpperCaseTextFormatter()],
                           initialValue: state.primaryInformation.firstName,
                           decoration: normalTextFieldStyle("First name *", ""),
                           validator: FormBuilderValidators.required(
@@ -146,12 +141,12 @@ class _EditBasicProfileInfoScreenState
                             Flexible(
                               flex: 2,
                               child: FormBuilderTextField(
-                                  inputFormatters: [
-                            UpperCaseTextFormatter()
-                          ],
+                                inputFormatters: [UpperCaseTextFormatter()],
                                 name: "middlename",
-                                initialValue: state.primaryInformation.middleName??'',
-                                decoration: normalTextFieldStyle("Middle name", ""),
+                                initialValue:
+                                    state.primaryInformation.middleName ?? '',
+                                decoration:
+                                    normalTextFieldStyle("Middle name", ""),
                               ),
                             ),
                             const SizedBox(
@@ -164,13 +159,11 @@ class _EditBasicProfileInfoScreenState
                                 value: selectedExtension,
                                 decoration:
                                     normalTextFieldStyle("Name Extension", ""),
-                             
                                 items: state.extensions
                                     .map((element) => DropdownMenuItem<String>(
                                         value: element, child: Text(element)))
                                     .toList(),
                                 onChanged: (e) {
-                         
                                   selectedExtension = e;
                                 },
                               ),
@@ -193,8 +186,9 @@ class _EditBasicProfileInfoScreenState
                                     errorText: "This field is required"),
                                 timeHintText: "Birthdate",
                                 decoration:
-                                    normalTextFieldStyle("Birthdate *", "*").copyWith(
-                                        prefixIcon: const Icon(
+                                    normalTextFieldStyle("Birthdate *", "*")
+                                        .copyWith(
+                                            prefixIcon: const Icon(
                                   Icons.date_range,
                                   color: Colors.black87,
                                 )),
@@ -206,7 +200,7 @@ class _EditBasicProfileInfoScreenState
                             const SizedBox(
                               width: 10,
                             ),
-                  
+
                             ////sex
                             Flexible(
                               flex: 1,
@@ -221,7 +215,7 @@ class _EditBasicProfileInfoScreenState
                                         value: element, child: Text(element)))
                                     .toList(),
                                 onChanged: (e) {
-                                  selectedSex= e;
+                                  selectedSex = e;
                                 },
                               ),
                             )
@@ -238,9 +232,10 @@ class _EditBasicProfileInfoScreenState
                               flex: 1,
                               child: FormBuilderDropdown<String>(
                                 initialValue: selectedBloodType,
-                                       validator: FormBuilderValidators.required(
+                                validator: FormBuilderValidators.required(
                                     errorText: "This field is required"),
-                                decoration: normalTextFieldStyle("Blood type *", ""),
+                                decoration:
+                                    normalTextFieldStyle("Blood type *", ""),
                                 name: "bloodtype",
                                 items: state.bloodTypes
                                     .map((element) => DropdownMenuItem<String>(
@@ -259,8 +254,9 @@ class _EditBasicProfileInfoScreenState
                               flex: 1,
                               child: FormBuilderDropdown<String>(
                                 initialValue: selectedStatus,
-                                decoration: normalTextFieldStyle("Civil status *", ""),
-                                       validator: FormBuilderValidators.required(
+                                decoration:
+                                    normalTextFieldStyle("Civil status *", ""),
+                                validator: FormBuilderValidators.required(
                                     errorText: "This field is required"),
                                 name: "extension",
                                 items: state.civilStatus
@@ -305,11 +301,12 @@ class _EditBasicProfileInfoScreenState
                               flex: 1,
                               child: FormBuilderTextField(
                                 name: "height",
-                                       validator: numericRequired,
+                                validator: numericRequired,
                                 initialValue: state.primaryInformation.heightM
                                     .toString()
                                     .toString(),
-                                decoration: normalTextFieldStyle("Height (Meter) *", ""),
+                                decoration: normalTextFieldStyle(
+                                    "Height (Meter) *", ""),
                               ),
                             ),
                             const SizedBox(
@@ -317,13 +314,13 @@ class _EditBasicProfileInfoScreenState
                             ),
                             Flexible(
                               flex: 1,
-                              
                               child: FormBuilderTextField(
-                                       validator: numericRequired,
+                                validator: numericRequired,
                                 name: "weigth",
-                                initialValue:
-                                    state.primaryInformation.weightKg!.toString(),
-                                decoration: normalTextFieldStyle("Weight (Kg) *", ""),
+                                initialValue: state.primaryInformation.weightKg!
+                                    .toString(),
+                                decoration:
+                                    normalTextFieldStyle("Weight (Kg) *", ""),
                               ),
                             ),
                           ]),
@@ -338,7 +335,8 @@ class _EditBasicProfileInfoScreenState
                               flex: 1,
                               child: FormBuilderTextField(
                                 name: "prefix",
-                                initialValue: state.primaryInformation.titlePrefix
+                                initialValue: state
+                                    .primaryInformation.titlePrefix
                                     .toString()
                                     .toString(),
                                 decoration: normalTextFieldStyle(
@@ -352,7 +350,8 @@ class _EditBasicProfileInfoScreenState
                               flex: 1,
                               child: FormBuilderTextField(
                                 name: "suffix",
-                                initialValue: state.primaryInformation.titleSuffix,
+                                initialValue:
+                                    state.primaryInformation.titleSuffix,
                                 decoration: normalTextFieldStyle(
                                     "Title Suffix", "PhD.,MD.,MS.,CE"),
                               ),
@@ -368,10 +367,11 @@ class _EditBasicProfileInfoScreenState
                             ////Indigency
                             Flexible(
                               flex: 1,
-                              child: DropdownButtonFormField<ProfileOtherInfo>(                        
+                              child: DropdownButtonFormField<ProfileOtherInfo>(
                                 isExpanded: true,
                                 value: selectedIndigency,
-                                decoration: normalTextFieldStyle("Indigency", ""),
+                                decoration:
+                                    normalTextFieldStyle("Indigency", ""),
                                 items: state.indigenous
                                     .map((element) =>
                                         DropdownMenuItem<ProfileOtherInfo>(
@@ -392,7 +392,8 @@ class _EditBasicProfileInfoScreenState
                               child: DropdownButtonFormField<ProfileOtherInfo>(
                                 isExpanded: true,
                                 value: selectedEthnicity,
-                                decoration: normalTextFieldStyle("Ethnicity", ""),
+                                decoration:
+                                    normalTextFieldStyle("Ethnicity", ""),
                                 items: state.ethnicity
                                     .map((element) =>
                                         DropdownMenuItem<ProfileOtherInfo>(
@@ -402,8 +403,7 @@ class _EditBasicProfileInfoScreenState
                                 onChanged: (e) {
                                   selectedEthnicity = e;
                                   print(selectedEthnicity!.name);
-                                               print(selectedEthnicity!
-                                               .id);
+                                  print(selectedEthnicity!.id);
                                 },
                               ),
                             ),
@@ -421,7 +421,8 @@ class _EditBasicProfileInfoScreenState
                               child: DropdownButtonFormField<ProfileOtherInfo>(
                                 isExpanded: true,
                                 value: selectedReligion,
-                                decoration: normalTextFieldStyle("Religion", ""),
+                                decoration:
+                                    normalTextFieldStyle("Religion", ""),
                                 items: state.religion
                                     .map((element) =>
                                         DropdownMenuItem<ProfileOtherInfo>(
@@ -440,10 +441,10 @@ class _EditBasicProfileInfoScreenState
                             Flexible(
                               flex: 1,
                               child: DropdownButtonFormField<ProfileOtherInfo>(
-                             
                                 isExpanded: true,
                                 value: selectedDisability,
-                                decoration: normalTextFieldStyle("Disability", ""),
+                                decoration:
+                                    normalTextFieldStyle("Disability", ""),
                                 items: state.disability
                                     .map((element) =>
                                         DropdownMenuItem<ProfileOtherInfo>(
@@ -464,33 +465,36 @@ class _EditBasicProfileInfoScreenState
                           width: double.infinity,
                           height: 60,
                           child: ElevatedButton(
-                              style:
-                                  mainBtnStyle(primary, Colors.transparent, second),
+                              style: mainBtnStyle(
+                                  primary, Colors.transparent, second),
                               onPressed: () {
                                 if (_formKey.currentState!.saveAndValidate()) {
                                   String lastName =
                                       _formKey.currentState!.value['lastname'];
                                   String firstName =
                                       _formKey.currentState!.value['firstname'];
-                                  String? middleName =
-                                      _formKey.currentState?.value['middlename'];
+                                  String? middleName = _formKey
+                                      .currentState?.value['middlename'];
                                   String? pref =
                                       _formKey.currentState?.value['prefix'];
-                                  String suf = _formKey.currentState?.value['suffix'];
+                                  String suf =
+                                      _formKey.currentState?.value['suffix'];
                                   DateTime birthdate =
                                       DateTime.parse(bdayController.text);
                                   double? hM =
-                                      _formKey.currentState!.value['height'] == null
+                                      _formKey.currentState!.value['height'] ==
+                                              null
                                           ? null
-                                          : double.tryParse(
-                                              _formKey.currentState?.value['height']);
+                                          : double.tryParse(_formKey
+                                              .currentState?.value['height']);
                                   double? wKg =
-                                      _formKey.currentState!.value['weigth'] == null
+                                      _formKey.currentState!.value['weigth'] ==
+                                              null
                                           ? null
-                                          : double.tryParse(
-                                              _formKey.currentState?.value['weigth']);
+                                          : double.tryParse(_formKey
+                                              .currentState?.value['weigth']);
                                   Profile primaryInformation = Profile(
-                                    webuserId: null,
+                                      webuserId: null,
                                       id: state.primaryInformation.id,
                                       lastName: lastName,
                                       firstName: firstName,
@@ -499,14 +503,21 @@ class _EditBasicProfileInfoScreenState
                                       sex: selectedSex,
                                       birthdate: birthdate,
                                       civilStatus: selectedStatus,
-                                      bloodType: selectedBloodType =="NONE"?null:selectedBloodType,
+                                      bloodType: selectedBloodType == "NONE"
+                                          ? null
+                                          : selectedBloodType,
                                       heightM: hM,
                                       weightKg: wKg,
-                                      photoPath: state.primaryInformation.photoPath,
-                                      esigPath: state.primaryInformation.esigPath,
-                                      maidenName: state.primaryInformation.maidenName,
-                                      deceased: state.primaryInformation.deceased,
-                                      uuidQrcode: state.primaryInformation.uuidQrcode,
+                                      photoPath:
+                                          state.primaryInformation.photoPath,
+                                      esigPath:
+                                          state.primaryInformation.esigPath,
+                                      maidenName:
+                                          state.primaryInformation.maidenName,
+                                      deceased:
+                                          state.primaryInformation.deceased,
+                                      uuidQrcode:
+                                          state.primaryInformation.uuidQrcode,
                                       titlePrefix: pref,
                                       titleSuffix: suf,
                                       showTitleId:
@@ -525,7 +536,8 @@ class _EditBasicProfileInfoScreenState
                                           genderId: selectedGender?.id,
                                           indigencyId: selectedIndigency?.id,
                                           profileId: widget.profileId,
-                                          profileInformation: primaryInformation,
+                                          profileInformation:
+                                              primaryInformation,
                                           religionId: selectedReligion?.id,
                                           token: widget.token));
                                 }
@@ -540,7 +552,7 @@ class _EditBasicProfileInfoScreenState
             ),
           );
         }
-        return  Container();
+        return Container();
       },
     );
   }

lib/screens/profile/components/basic_information/family/spouse_add_modal.dart

@@ -349,7 +349,8 @@ class _SpouseAlertState extends State<SpouseAlert> {
                                           ],
 
                                           itemHeight: 100,
-                                          suggestionsDecoration: box1(),
+                                                                               suggestionsDecoration:  searchFieldDecoration(),
+
                                           suggestions: widget.positions
                                               .map((PositionTitle position) =>
                                                   SearchFieldListItem(

lib/screens/profile/components/basic_information/family/spouse_edit_modal.dart

@@ -383,7 +383,8 @@ class _SpouseEditAlertState extends State<SpouseEditAlert> {
                                           suggestionDirection:
                                               SuggestionDirection.down,
                                           itemHeight: 100,
-                                          suggestionsDecoration: box1(),
+                                                                             suggestionsDecoration:  searchFieldDecoration(),
+
                                           suggestions: widget.positions
                                               .map((PositionTitle position) =>
                                                   SearchFieldListItem(

lib/screens/profile/components/basic_information/primary_information_screen.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
@@ -6,6 +5,8 @@ import 'package:flutter_progress_hud/flutter_progress_hud.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:intl/intl.dart';
 import 'package:unit2/bloc/profile/profile_bloc.dart';
+import 'package:unit2/bloc/user/user_bloc.dart';
+import 'package:unit2/model/profile/basic_information/primary-information.dart';
 import 'package:unit2/screens/profile/components/basic_information/edit_basic_info_modal.dart';
 import 'package:unit2/theme-data.dart/colors.dart';
 import 'package:unit2/theme-data.dart/form-style.dart';
@@ -30,6 +31,7 @@ class _PrimaryInfoState extends State<PrimaryInfo> {
   Widget build(BuildContext context) {
     bool enabled = false;
     DateFormat dteFormat2 = DateFormat.yMMMMd('en_US');
+    Profile? profile;
     return Scaffold(
         appBar: AppBar(
             title: context.watch<ProfileBloc>().state
@@ -62,300 +64,420 @@ class _PrimaryInfoState extends State<PrimaryInfo> {
           padding: const EdgeInsets.all(24),
           backgroundColor: Colors.black87,
           indicatorWidget: const SpinKitFadingCircle(color: Colors.white),
-          child: BlocConsumer<ProfileBloc, ProfileState>(
-            listener: (context, state) {
-              if (state is BasicPrimaryInformationLoadingState) {
-                final progress = ProgressHUD.of(context);
-                progress!.showWithText("Please wait...");
-              }
-              if (state is BasicInformationProfileLoaded ||
-                  state is BasicInformationEditingState ||
-                  state is BasicPrimaryInformationErrorState ||
-                  state is BasicProfileInfoEditedState) {
-                final progress = ProgressHUD.of(context);
-                progress!.dismiss();
-              }
-              if (state is BasicProfileInfoEditedState) {
-                if (state.response['success']) {
-                  successAlert(context, "Updated Successfull!",
-                      state.response['message'], () {
-                    Navigator.of(context).pop();
-                    context.read<ProfileBloc>().add(LoadBasicPrimaryInfo());
-                  });
-                } else {
-                  errorAlert(context, "Update Failed",
-                      "Something went wrong. Please try again.", () {
-                    Navigator.of(context).pop();
-                    context.read<ProfileBloc>().add(LoadBasicPrimaryInfo());
-                  });
-                }
-              }
-            },
+          child: BlocBuilder<UserBloc, UserState>(
             builder: (context, state) {
-              if (state is BasicInformationProfileLoaded) {
-                return Container(
-                  padding:
-                      const EdgeInsets.symmetric(vertical: 24, horizontal: 24),
-                  child: Column(
-                    children: [
-                      const SizedBox(
-                        height: 28,
-                      ),
-                      FormBuilderTextField(
-                        enabled: enabled,
-                        name: lastname,
-                        initialValue: state.primaryBasicInformation.lastName!,
-                        decoration: normalTextFieldStyle("Last name", ""),
-                      ),
-                      const SizedBox(
-                        height: 15,
-                      ),
-                      FormBuilderTextField(
-                        enabled: enabled,
-                        name: firstname,
-                        initialValue: state.primaryBasicInformation.firstName!,
-                        decoration: normalTextFieldStyle("First name", ""),
-                      ),
-                      const SizedBox(
-                        height: 15,
-                      ),
-                      SizedBox(
-                        width: screenWidth,
-                        child: Row(children: [
-                          Flexible(
-                            flex: 2,
-                            child: FormBuilderTextField(
-                              enabled: enabled,
-                              name: middlename,
-                              initialValue: state.primaryBasicInformation.middleName??''
-                                 ,
-                              decoration:
-                                  normalTextFieldStyle("Middle name", ""),
+              if (state is UserLoggedIn) {
+                return BlocConsumer<ProfileBloc, ProfileState>(
+                  listener: (context, state) {
+                    if (state is BasicPrimaryInformationLoadingState) {
+                      final progress = ProgressHUD.of(context);
+                      progress!.showWithText("Please wait...");
+                    }
+                    if (state is BasicInformationProfileLoaded ||
+                        state is BasicInformationEditingState ||
+                        state is BasicPrimaryInformationErrorState ||
+                        state is BasicProfileInfoEditedState) {
+                      final progress = ProgressHUD.of(context);
+                      progress!.dismiss();
+                    }
+                    if (state is BasicProfileInfoEditedState) {
+                      profile = Profile.fromJson(state.response['data']);
+                      if (state.response['success']) {
+                        successAlert(context, "Updated Successfull!",
+                            state.response['message'], () {
+                          Navigator.of(context).pop();
+                          context
+                              .read<ProfileBloc>()
+                              .add(LoadBasicPrimaryInfo());
+                        });
+                      } else {
+                        errorAlert(context, "Update Failed",
+                            "Something went wrong. Please try again.", () {
+                          Navigator.of(context).pop();
+                          context
+                              .read<ProfileBloc>()
+                              .add(LoadBasicPrimaryInfo());
+                        });
+                      }
+                    }
+                  },
+                  builder: (context, state) {
+                    if (state is BasicInformationProfileLoaded) {
+                      profile = state.primaryBasicInformation;
+                      return Container(
+                        padding: const EdgeInsets.symmetric(
+                            vertical: 24, horizontal: 24),
+                        child: Column(
+                          children: [
+                            const SizedBox(
+                              height: 28,
                             ),
-                          ),
-                          const SizedBox(
-                            width: 10,
-                          ),
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                              enabled: enabled,
-                              name: extensionName,
-                              initialValue: state.primaryBasicInformation
-                                  .nameExtension ??= 'N/A',
-                              decoration:
-                                  normalTextFieldStyle("Name extension", ""),
-                            ),
-                          )
-                        ]),
-                      ),
-                      const SizedBox(
-                        height: 15,
-                      ),
-                      SizedBox(
-                        width: screenWidth,
-                        child: Row(children: [
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                              enabled: enabled,
-                              name: extensionName,
-                              initialValue: dteFormat2.format(
-                                  state.primaryBasicInformation.birthdate!),
-                              decoration:
-                                  normalTextFieldStyle("Birth date", ""),
-                            ),
-                          ),
-                          const SizedBox(
-                            width: 10,
-                          ),
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                              enabled: enabled,
-                              name: sex,
-                              initialValue: state.primaryBasicInformation.sex!,
-                              decoration: normalTextFieldStyle("Sex", ""),
-                            ),
-                          )
-                        ]),
-                      ),
-                      const SizedBox(
-                        height: 15,
-                      ),
-                      SizedBox(
-                        width: screenWidth,
-                        child: Row(children: [
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                              enabled: enabled,
-                              name: "bloodType",
+                            FormBuilderTextField(
+                              enabled: false,
+                              name: lastname,
                               initialValue:
-                                  state.primaryBasicInformation.bloodType!,
-                              decoration:
-                                  normalTextFieldStyle("Blood type", ""),
+                                  state.primaryBasicInformation.lastName!,
+                              style: const TextStyle(color: Colors.black),
+                              decoration: normalTextFieldStyle("Last name", "")
+                                  .copyWith(
+                                      disabledBorder:
+                                          const OutlineInputBorder(),
+                                      labelStyle:
+                                          const TextStyle(color: Colors.black)),
                             ),
-                          ),
-                          const SizedBox(
-                            width: 10,
-                          ),
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
+                            const SizedBox(
+                              height: 15,
+                            ),
+                            FormBuilderTextField(
                               enabled: enabled,
-                              name: "civilStatus",
+                              name: firstname,
                               initialValue:
-                                  state.primaryBasicInformation.civilStatus!,
-                              decoration:
-                                  normalTextFieldStyle("Civil Status", ""),
+                                  state.primaryBasicInformation.firstName!,
+                              style: const TextStyle(color: Colors.black),
+                              decoration: normalTextFieldStyle("First name", "")
+                                  .copyWith(
+                                      disabledBorder:
+                                          const OutlineInputBorder(),
+                                      labelStyle:
+                                          const TextStyle(color: Colors.black)),
                             ),
-                          ),
-                          const SizedBox(
-                            width: 10,
-                          ),
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                              enabled: enabled,
-                              name: "gender",
-                              initialValue: state
-                                  .primaryBasicInformation.gender ??= "N/A",
-                              decoration: normalTextFieldStyle("Gender", ""),
+                            const SizedBox(
+                              height: 15,
                             ),
-                          ),
-                        ]),
-                      ),
-                      const SizedBox(
-                        height: 15,
-                      ),
-                      SizedBox(
-                        width: screenWidth,
-                        child: Row(children: [
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                                             maxLines: 2,
-                              enabled: enabled,
-                              name: height,
-                              initialValue: state
-                                  .primaryBasicInformation.heightM!
-                                  .toString(),
-                              decoration: normalTextFieldStyle("Height", ""),
+                            SizedBox(
+                              width: screenWidth,
+                              child: Row(children: [
+                                Flexible(
+                                  flex: 2,
+                                  child: FormBuilderTextField(
+                                    enabled: enabled,
+                                    name: middlename,
+                                    initialValue: state.primaryBasicInformation
+                                            .middleName ??
+                                        '',
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration:
+                                        normalTextFieldStyle("Middle name", "")
+                                            .copyWith(
+                                                disabledBorder:
+                                                    const OutlineInputBorder(),
+                                                labelStyle: const TextStyle(
+                                                    color: Colors.black)),
+                                  ),
+                                ),
+                                const SizedBox(
+                                  width: 10,
+                                ),
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    enabled: enabled,
+                                    name: extensionName,
+                                    initialValue: state.primaryBasicInformation
+                                        .nameExtension ??= 'N/A',
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration: normalTextFieldStyle(
+                                            "Name extension", "")
+                                        .copyWith(
+                                            disabledBorder:
+                                                const OutlineInputBorder(),
+                                            labelStyle: const TextStyle(
+                                                color: Colors.black)),
+                                  ),
+                                )
+                              ]),
                             ),
-                          ),
-                          const SizedBox(
-                            width: 10,
-                          ),
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                              enabled: enabled,
-                              name: width,
-                              initialValue: state
-                                  .primaryBasicInformation.weightKg!
-                                  .toString(),
-                              decoration: normalTextFieldStyle("Weight", ""),
+                            const SizedBox(
+                              height: 15,
                             ),
-                          ),
-                          const SizedBox(
-                            width: 10,
-                          ),
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                              enabled: enabled,
-                              name: prefixSuffix,
-                              initialValue:
-                                  "${state.primaryBasicInformation.titlePrefix ??= "NA"} | ${state.primaryBasicInformation.titleSuffix ??= "N/A"}",
-                              decoration: normalTextFieldStyle(
-                                  "Title Prefix and Suffix", ""),
+                            SizedBox(
+                              width: screenWidth,
+                              child: Row(children: [
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    enabled: enabled,
+                                    name: extensionName,
+                                    initialValue: dteFormat2.format(state
+                                        .primaryBasicInformation.birthdate!),
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration:
+                                        normalTextFieldStyle("Birth date", "")
+                                            .copyWith(
+                                                disabledBorder:
+                                                    const OutlineInputBorder(),
+                                                labelStyle: const TextStyle(
+                                                    color: Colors.black)),
+                                  ),
+                                ),
+                                const SizedBox(
+                                  width: 10,
+                                ),
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    enabled: enabled,
+                                    name: sex,
+                                    initialValue:
+                                        state.primaryBasicInformation.sex!,
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration: normalTextFieldStyle("Sex", "")
+                                        .copyWith(
+                                            disabledBorder:
+                                                const OutlineInputBorder(),
+                                            labelStyle: const TextStyle(
+                                                color: Colors.black)),
+                                  ),
+                                )
+                              ]),
                             ),
-                          ),
-                        ]),
-                      ),
-                      const SizedBox(
-                        height: 12,
-                      ),
-                      SizedBox(
-                        width: screenWidth,
-                        child: Row(children: [
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                                             maxLines: 2,
-                              enabled: enabled,
-                              name: height,
-                              initialValue: state.primaryBasicInformation.ip ??=
-                                  "N/A",
-                              decoration:
-                                  normalTextFieldStyle("Indigenous", ""),
+                            const SizedBox(
+                              height: 15,
                             ),
-                          ),
-                          const SizedBox(
-                            width: 10,
-                          ),
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                              enabled: enabled,
-                              name: width,
-                              initialValue: state
-                                  .primaryBasicInformation.ethnicity ??= "N/A",
-                              decoration: normalTextFieldStyle("Ethnicity", ""),
+                            SizedBox(
+                              width: screenWidth,
+                              child: Row(children: [
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    enabled: enabled,
+                                    name: "bloodType",
+                                    initialValue: state
+                                        .primaryBasicInformation.bloodType!,
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration:
+                                        normalTextFieldStyle("Blood type", "")
+                                            .copyWith(
+                                                disabledBorder:
+                                                    const OutlineInputBorder(),
+                                                labelStyle: const TextStyle(
+                                                    color: Colors.black)),
+                                  ),
+                                ),
+                                const SizedBox(
+                                  width: 10,
+                                ),
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    enabled: enabled,
+                                    name: "civilStatus",
+                                    initialValue: state
+                                        .primaryBasicInformation.civilStatus!,
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration:
+                                        normalTextFieldStyle("Civil Status", "")
+                                            .copyWith(
+                                                disabledBorder:
+                                                    const OutlineInputBorder(),
+                                                labelStyle: const TextStyle(
+                                                    color: Colors.black)),
+                                  ),
+                                ),
+                                const SizedBox(
+                                  width: 10,
+                                ),
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    enabled: enabled,
+                                    name: "gender",
+                                    initialValue: state.primaryBasicInformation
+                                        .gender ??= "N/A",
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration:
+                                        normalTextFieldStyle("Gender", "")
+                                            .copyWith(
+                                                disabledBorder:
+                                                    const OutlineInputBorder(),
+                                                labelStyle: const TextStyle(
+                                                    color: Colors.black)),
+                                  ),
+                                ),
+                              ]),
                             ),
-                          ),
-                        ]),
-                      ),
-                      const SizedBox(
-                        height: 12,
-                      ),
-                      SizedBox(
-                        width: screenWidth,
-                        child: Row(children: [
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                                             maxLines: 2,
-                              enabled: enabled,
-                              name: height,
-                              initialValue: state
-                                  .primaryBasicInformation.religion ??= "N/A",
-                              decoration: normalTextFieldStyle("Religion", ""),
+                            const SizedBox(
+                              height: 15,
                             ),
-                          ),
-                          const SizedBox(
-                            width: 10,
-                          ),
-                          Flexible(
-                            flex: 1,
-                            child: FormBuilderTextField(
-                              maxLines: 2,
-                              enabled: enabled,
-                              name: width,
-                              initialValue: state
-                                  .primaryBasicInformation.disability ??= "N/A",
-                              decoration:
-                                  normalTextFieldStyle("Disability", ""),
+                            SizedBox(
+                              width: screenWidth,
+                              child: Row(children: [
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    maxLines: 2,
+                                    enabled: enabled,
+                                    name: height,
+                                    initialValue: state
+                                        .primaryBasicInformation.heightM!
+                                        .toString(),
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration:
+                                        normalTextFieldStyle("Height", "")
+                                            .copyWith(
+                                                disabledBorder:
+                                                    const OutlineInputBorder(),
+                                                labelStyle: const TextStyle(
+                                                    color: Colors.black)),
+                                  ),
+                                ),
+                                const SizedBox(
+                                  width: 10,
+                                ),
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    enabled: enabled,
+                                    name: width,
+                                    initialValue: state
+                                        .primaryBasicInformation.weightKg!
+                                        .toString(),
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration:
+                                        normalTextFieldStyle("Weight", "")
+                                            .copyWith(
+                                                disabledBorder:
+                                                    const OutlineInputBorder(),
+                                                labelStyle: const TextStyle(
+                                                    color: Colors.black)),
+                                  ),
+                                ),
+                                const SizedBox(
+                                  width: 10,
+                                ),
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    enabled: enabled,
+                                    name: prefixSuffix,
+                                    initialValue:
+                                        "${state.primaryBasicInformation.titlePrefix ??= "NA"} | ${state.primaryBasicInformation.titleSuffix ??= "N/A"}",
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration: normalTextFieldStyle(
+                                            "Title Prefix and Suffix", "")
+                                        .copyWith(
+                                            disabledBorder:
+                                                const OutlineInputBorder(),
+                                            labelStyle: const TextStyle(
+                                                color: Colors.black)),
+                                  ),
+                                ),
+                              ]),
                             ),
-                          ),
-                        ]),
-                      ),
-                    ],
-                  ),
+                            const SizedBox(
+                              height: 12,
+                            ),
+                            SizedBox(
+                              width: screenWidth,
+                              child: Row(children: [
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    maxLines: 2,
+                                    enabled: enabled,
+                                    name: height,
+                                    initialValue: state
+                                        .primaryBasicInformation.ip ??= "N/A",
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration:
+                                        normalTextFieldStyle("Indigenous", "")
+                                            .copyWith(
+                                                disabledBorder:
+                                                    const OutlineInputBorder(),
+                                                labelStyle: const TextStyle(
+                                                    color: Colors.black)),
+                                  ),
+                                ),
+                                const SizedBox(
+                                  width: 10,
+                                ),
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    enabled: enabled,
+                                    name: width,
+                                    initialValue: state.primaryBasicInformation
+                                        .ethnicity ??= "N/A",
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration:
+                                        normalTextFieldStyle("Ethnicity", "")
+                                            .copyWith(
+                                                disabledBorder:
+                                                    const OutlineInputBorder(),
+                                                labelStyle: const TextStyle(
+                                                    color: Colors.black)),
+                                  ),
+                                ),
+                              ]),
+                            ),
+                            const SizedBox(
+                              height: 12,
+                            ),
+                            SizedBox(
+                              width: screenWidth,
+                              child: Row(children: [
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    maxLines: 2,
+                                    enabled: enabled,
+                                    name: height,
+                                    initialValue: state.primaryBasicInformation
+                                        .religion ??= "N/A",
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration:
+                                        normalTextFieldStyle("Religion", "")
+                                            .copyWith(
+                                                disabledBorder:
+                                                    const OutlineInputBorder(),
+                                                labelStyle: const TextStyle(
+                                                    color: Colors.black)),
+                                  ),
+                                ),
+                                const SizedBox(
+                                  width: 10,
+                                ),
+                                Flexible(
+                                  flex: 1,
+                                  child: FormBuilderTextField(
+                                    maxLines: 2,
+                                    enabled: enabled,
+                                    name: width,
+                                    initialValue: state.primaryBasicInformation
+                                        .disability ??= "N/A",
+                                    style: const TextStyle(color: Colors.black),
+                                    decoration:
+                                        normalTextFieldStyle("Disability", "")
+                                            .copyWith(
+                                                disabledBorder:
+                                                    const OutlineInputBorder(),
+                                                labelStyle: const TextStyle(
+                                                    color: Colors.black)),
+                                  ),
+                                ),
+                              ]),
+                            ),
+                          ],
+                        ),
+                      );
+                    }
+                    if (state is BasicPrimaryInformationErrorState) {
+                      return SomethingWentWrong(
+                          message: state.message,
+                          onpressed: () {
+                            context
+                                .read<ProfileBloc>()
+                                .add(LoadBasicPrimaryInfo());
+                          });
+                    }
+                    if (state is BasicInformationEditingState) {
+                      return EditBasicProfileInfoScreen(
+                          profileId: widget.profileId, token: widget.token);
+                    }
+                    return Container();
+                  },
                 );
               }
-              if (state is BasicPrimaryInformationErrorState) {
-                return SomethingWentWrong(
-                    message: state.message,
-                    onpressed: () {
-                      context.read<ProfileBloc>().add(LoadBasicPrimaryInfo());
-                    });
-              }
-              if (state is BasicInformationEditingState) {
-                return EditBasicProfileInfoScreen(
-                    profileId: widget.profileId, token: widget.token);
-              }
               return Container();
             },
           ),

lib/screens/profile/components/education/add_modal.dart

@@ -128,7 +128,8 @@ class _AddEducationScreenState extends State<AddEducationScreen> {
                           return SearchField(
                             inputFormatters: [UpperCaseTextFormatter()],
                             itemHeight: 70,
-                            suggestionsDecoration: box1(),
+                                                            suggestionsDecoration:  searchFieldDecoration(),
+
                             suggestions: state.schools
                                 .map((School school) =>
                                     SearchFieldListItem(school.name!,
@@ -190,7 +191,8 @@ class _AddEducationScreenState extends State<AddEducationScreen> {
                     UpperCaseTextFormatter()
                   ],
                                     itemHeight: 100,
-                                    suggestionsDecoration: box1(),
+                                                                           suggestionsDecoration:  searchFieldDecoration(),
+
                                     suggestions: state.programs
                                         .map((Course program) =>
                                             SearchFieldListItem(

lib/screens/profile/components/education/edit_modal.dart

@@ -165,7 +165,8 @@ class _EditEducationScreenState extends State<EditEducationScreen> {
                             },
                             controller: currentSchoolController,
                             itemHeight: 70,
-                            suggestionsDecoration: box1(),
+                                                            suggestionsDecoration:  searchFieldDecoration(),
+
                             suggestions: state.schools
                                 .map((School school) =>
                                     SearchFieldListItem(school.name!,
@@ -230,7 +231,8 @@ class _EditEducationScreenState extends State<EditEducationScreen> {
                                         SuggestionAction.unfocus,
                                     controller: currentProgramController,
                                     itemHeight: 70,
-                                    suggestionsDecoration: box1(),
+                                                                        suggestionsDecoration:  searchFieldDecoration(),
+
                                     suggestions: state.programs
                                         .map((Course program) =>
                                             SearchFieldListItem(

lib/screens/profile/components/learning_development/add_modal.dart

@@ -371,7 +371,7 @@ class _AddLearningAndDevelopmentScreenState
                                         ],
                                         focusNode: topicFocusNode,
                                         itemHeight: 100,
-                                        suggestionsDecoration: box1(),
+                                        suggestionsDecoration:  searchFieldDecoration(),
                                         suggestions: state.topics
                                             .map((LearningDevelopmentType
                                                     topic) =>

lib/screens/profile/components/learning_development/edit_modal.dart

@@ -267,7 +267,7 @@ class _EditLearningAndDevelopmentScreenState
                                   controller: currentTopicController,
                                   focusNode: topicFocusNode,
                                   itemHeight: 100,
-                                  suggestionsDecoration: box1(),
+                                  suggestionsDecoration:  searchFieldDecoration(),
                                   suggestions: state.topics
                                       .map((LearningDevelopmentType
                                               topic) =>

lib/screens/profile/components/voluntary_works/add_modal.dart

@@ -92,7 +92,7 @@ class _AddVoluntaryWorkScreenState extends State<AddVoluntaryWorkScreen> {
                       return SearchField(
                         inputFormatters: [UpperCaseTextFormatter()],
                         itemHeight: 70,
-                        suggestionsDecoration: box1(),
+                        suggestionsDecoration:  searchFieldDecoration(),
                         suggestions: state.positions
                             .map((PositionTitle position) =>
                                 SearchFieldListItem(position.title!,

lib/screens/profile/components/voluntary_works/edit_modal.dart

@@ -128,7 +128,7 @@ class _EditVoluntaryWorkScreenState extends State<EditVoluntaryWorkScreen> {
                                 inputFormatters: [UpperCaseTextFormatter()],
                                 controller: positionController,
                                 itemHeight: 70,
-                                suggestionsDecoration: box1(),
+                                suggestionsDecoration: searchFieldDecoration(),
                                 suggestions: state.positions
                                     .map((PositionTitle position) =>
                                         SearchFieldListItem(position.title!,

lib/screens/profile/components/work_history/add_modal.dart

@@ -98,7 +98,7 @@ class _AddWorkHistoryScreenState extends State<AddWorkHistoryScreen> {
                           return SearchField(
                             inputFormatters: [UpperCaseTextFormatter()],
                             itemHeight: 70,
-                            suggestionsDecoration: box1(),
+                            suggestionsDecoration:  searchFieldDecoration(),
                             suggestions: state.agencyPositions
                                 .map((PositionTitle position) =>
                                     SearchFieldListItem(position.title!,

lib/screens/profile/components/work_history/edit_modal.dart

@@ -121,7 +121,7 @@ class _EditWorkHistoryScreenState extends State<EditWorkHistoryScreen> {
                               inputFormatters: [UpperCaseTextFormatter()],
                               controller: oldPositionController,
                               itemHeight: 100,
-                              suggestionsDecoration: box1(),
+                              suggestionsDecoration:  searchFieldDecoration(),
                               suggestions: state.agencyPositions
                                   .map((PositionTitle position) =>
                                       SearchFieldListItem(position.title!,

lib/screens/profile/profile.dart

@@ -30,6 +30,7 @@ import 'package:unit2/screens/profile/components/references_screen.dart';
 import 'package:unit2/screens/profile/components/work_history_screen.dart';
 import 'package:unit2/screens/profile/components/voluntary_works_screen.dart';
 import 'package:unit2/theme-data.dart/colors.dart';
+import 'package:unit2/utils/global.dart';
 import 'package:unit2/widgets/error_state.dart';
 import '../../bloc/profile/eligibility/eligibility_bloc.dart';
 import '../../bloc/profile/family/family_bloc.dart';
@@ -69,8 +70,12 @@ class ProfileInfo extends StatelessWidget {
             if (state is UserLoggedIn) {
               profileId = state.userData!.user!.login!.user!.profileId;
               token = state.userData!.user!.login!.token!;
-              profile = state.userData!.employeeInfo!.profile!;
-
+              if (globalCurrentProfile == null) {
+                profile = state.userData!.employeeInfo!.profile!;
+              } else {
+                profile = globalCurrentProfile!;
+              }
+              print(profile.lastName);
               return BlocConsumer<ProfileBloc, ProfileState>(
                 listener: (
                   context,

lib/screens/superadmin/agency/agency_screen.dart

@@ -172,7 +172,6 @@ class RbacAgencyScreen extends StatelessWidget {
         indicatorWidget: const SpinKitFadingCircle(color: Colors.white),
         child: BlocConsumer<AgencyBloc, AgencyState>(
           listener: (context, state) {
-            print(state);
             if (state is AgencyLoadingState) {
               final progress = ProgressHUD.of(context);
               progress!.showWithText("Please wait...");
@@ -235,26 +234,25 @@ class RbacAgencyScreen extends StatelessWidget {
                             decoration: box1(),
                             padding: const EdgeInsets.symmetric(
                                 horizontal: 12, vertical: 8),
-                            child: Expanded(
-                                child: Row(
+                            child: Row(
                               children: [
-                                CircleAvatar(
-                                  child: Text('${index + 1}'),
-                                ),
-                                const SizedBox(
-                                  width: 12,
-                                ),
-                                Flexible(
-                                  child: Text(state.agencies[index].name!,
-                                      style: Theme.of(context)
-                                          .textTheme
-                                          .titleMedium!
-                                          .copyWith(
-                                              fontWeight: FontWeight.w500,
-                                              color: primary)),
-                                ),
+                            CircleAvatar(
+                              child: Text('${index + 1}'),
+                            ),
+                            const SizedBox(
+                              width: 12,
+                            ),
+                            Flexible(
+                              child: Text(state.agencies[index].name!,
+                                  style: Theme.of(context)
+                                      .textTheme
+                                      .titleMedium!
+                                      .copyWith(
+                                          fontWeight: FontWeight.w500,
+                                          color: primary)),
+                            ),
                               ],
-                            )),
+                            ),
                           ),
                           const SizedBox(
                             height: 5,
@@ -266,8 +264,7 @@ class RbacAgencyScreen extends StatelessWidget {
                 return const EmptyData(
                     message: "No Object available. Please click + to add.");
               }
-            }
-            if (state is AgencyErrorState) {
+            }if (state is AgencyErrorState) {
               return SomethingWentWrong(
                   message: state.message,
                   onpressed: () {

lib/screens/superadmin/role_assignment.dart/role_assignment_screen.dart

@@ -213,7 +213,7 @@ class RbacRoleAssignment extends StatelessWidget {
                                           Flexible(
                                             child: Text(
                                                 state.assignedRoles[index].role!
-                                                    .name,
+                                                    .name!,
                                                 style: Theme.of(context)
                                                     .textTheme
                                                     .titleMedium!
@@ -262,8 +262,8 @@ class RbacRoleAssignment extends StatelessWidget {
                   ],
                 );
               } else {
-                return const EmptyData(
-                    message: "No Role available. Please click + to add.");
+                return  EmptyData(
+                    message: "No Role available for ${state.fullname}. Please click + to add.");
               }
             }
             if (state is RoleAssignmentErrorState) {

lib/screens/superadmin/stations/stations_screen.dart

@@ -180,7 +180,8 @@ class _RbacStationScreenState extends State<RbacStationScreen> {
                               ////Station Type
                               SearchField(
                                 itemHeight: 50,
-                                suggestionsDecoration: box1(),
+                                                                        suggestionsDecoration:  searchFieldDecoration(),
+
                                 suggestions: stationTypes
                                     .map((StationType stationType) =>
                                         SearchFieldListItem(

lib/screens/unit2/basic-info/basic-info.dart

@@ -46,46 +46,45 @@ class BasicInfo extends StatelessWidget {
                           alignment: Alignment.center,
                           children: [
                             const CoverImage(),
-                            Positioned(
-                              top: blockSizeVertical * 15.5,
-                              child: Stack(
-                                alignment: Alignment.center,
-                                children: [
-                                  CachedNetworkImage(
-                                    imageUrl: fileUrl,
-                                    imageBuilder: (context, imageProvider) =>
-                                        Container(
-                                      width: 160,
-                                      height: 160,
-                                      decoration: BoxDecoration(
-                                        border:
-                                            Border.all(color: Colors.black26, width: 3),
-                                        shape: BoxShape.circle,
-                                        image: DecorationImage(
-                                            image: imageProvider,
-                                            fit: BoxFit.cover),
-                                      ),
-                                    ),
-                                    placeholder: (context, url) =>
-                                        const CircularProgressIndicator(),
-                                    errorWidget: (context, url, error) =>
-                                        Container(
-                        width: 160,
-                                      height: 160,
-                                    decoration: BoxDecoration(
-                                        border:
-                                            Border.all(color: Colors.white, width: 3),
-                                        shape: BoxShape.circle,
-                                       
-                                      ),
-                                       child:  SvgPicture.asset(
-                                      'assets/svgs/male.svg',
-                                    ),
-                                  ),
-                                  ),
-                                ],
-                              ),
-                            ),
+                            // Positioned(
+                            //   top: blockSizeVertical * 15.5,
+                            //   child: Stack(
+                            //     alignment: Alignment.center,
+                            //     children: [
+                            //       CachedNetworkImage(
+                            //         imageUrl: fileUrl,
+                            //         imageBuilder: (context, imageProvider) =>
+                            //             Container(
+                            //           width: 160,
+                            //           height: 160,
+                            //           decoration: BoxDecoration(
+                            //             border: Border.all(
+                            //                 color: Colors.black26, width: 3),
+                            //             shape: BoxShape.circle,
+                            //             image: DecorationImage(
+                            //                 image: imageProvider,
+                            //                 fit: BoxFit.cover),
+                            //           ),
+                            //         ),
+                            //         placeholder: (context, url) =>
+                            //             const CircularProgressIndicator(),
+                            //         errorWidget: (context, url, error) =>
+                            //             Container(
+                            //           width: 160,
+                            //           height: 160,
+                            //           decoration: BoxDecoration(
+                            //             border: Border.all(
+                            //                 color: Colors.white, width: 3),
+                            //             shape: BoxShape.circle,
+                            //           ),
+                            //           child: SvgPicture.asset(
+                            //             'assets/svgs/male.svg',
+                            //           ),
+                            //         ),
+                            //       ),
+                            //     ],
+                            //   ),
+                            // ),
                             Positioned(
                                 top: 10,
                                 left: 20,
@@ -138,14 +137,15 @@ class BuildInformation extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     DateFormat dteFormat2 = DateFormat.yMMMMd('en_US');
-    final String firstName =
-        userData.user!.login!.user!.firstName!.toUpperCase();
-    final String lastname = userData.user!.login!.user!.lastName!.toUpperCase();
-    final String? middlename = userData.employeeInfo == null
-        ? ''
-        : userData.employeeInfo!.profile?.middleName?.toUpperCase();
-    final String sex = userData.employeeInfo!.profile!.sex!.toUpperCase();
-    final DateTime? bday = userData.employeeInfo!.profile!.birthdate;
+    globalFistname = globalFistname ?? userData.user!.login!.user!.firstName!.toUpperCase();
+    globalLastname =globalLastname ?? userData.user!.login!.user!.lastName!.toUpperCase();
+    globalMiddleName = globalMiddleName == null
+        ? (userData.employeeInfo == null
+            ? ''
+            : userData.employeeInfo!.profile?.middleName?.toUpperCase())
+        : '';
+    globalSex = globalSex ?? userData.employeeInfo!.profile!.sex!.toUpperCase();
+    globalBday = globalBday ?? userData.employeeInfo!.profile!.birthdate;
     final uuid = userData.employeeInfo!.uuid;
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 25),
@@ -156,7 +156,7 @@ class BuildInformation extends StatelessWidget {
             height: 25,
           ),
           Text(
-            "$firstName ${middlename ?? ''} $lastname",
+            "$globalFistname ${globalMiddleName ?? ''} $globalLastname",
             textAlign: TextAlign.center,
             style: Theme.of(context)
                 .textTheme
@@ -167,7 +167,7 @@ class BuildInformation extends StatelessWidget {
             height: 10,
           ),
           Text(
-            "${dteFormat2.format(bday!)} | $sex",
+            "${dteFormat2.format(globalBday!)} | $sex",
             style:
                 Theme.of(context).textTheme.bodySmall!.copyWith(fontSize: 18),
           ),
@@ -181,7 +181,7 @@ class BuildInformation extends StatelessWidget {
                 return QRFullScreenImage(uuid: uuid);
               }));
             },
-            child: QrImage(
+            child: QrImageView(
               data: uuid!,
               size: blockSizeVertical * 24,
             ),

lib/screens/unit2/basic-info/components/qr_image.dart

@@ -16,7 +16,7 @@ class QRFullScreenImage extends StatelessWidget {
         centerTitle: true,
         backgroundColor: primary,title: const Text("Profile QR Code"),),
       body:    Center(
-      child: QrImage(
+      child: QrImageView(
               data: uuid,
               size: blockSizeVertical * 50
             ),

lib/screens/unit2/homepage.dart/components/dashboard/dashboard.dart

@@ -76,9 +76,6 @@ class _DashBoardState extends State<DashBoard> {
       tempUnit2Cards = unit2Cards.sublist(0, 4);
     }
 
-    superadminCards.forEach((el) {
-      print(el.object.name);
-    });
 
     return Container(
       padding:

lib/screens/unit2/homepage.dart/components/dashboard/dashboard_icon_generator.dart

@@ -24,11 +24,15 @@ IconData? iconGenerator({required String name}) {
     return FontAwesome.box;
   } else if (name.toLowerCase() == 'permission') {
     return FontAwesome5.door_open;
-  } else if (name.toLowerCase() == 'station') {
+  } else if (name.toLowerCase() == 'permission assignment') {
+    return Icons.assignment_ind;
+  } 
+  
+  else if (name.toLowerCase() == 'station') {
     return ModernPictograms.home;
   } else if (name.toLowerCase() == 'purok') {
     return WebSymbols.list_numbered;
-  } else if (name.toLowerCase() == 'barangay') {
+  } else if (name.toLowerCase() == 'baranggay') {
     return Maki.industrial_building;
   } else if (name.toLowerCase() == 'role module') {
     return FontAwesome5.person_booth;

lib/screens/unit2/homepage.dart/components/dashboard/superadmin_expanded_menu.dart

@@ -4,6 +4,7 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 import 'package:unit2/bloc/rbac/rbac_operations/agency/agency_bloc.dart';
+import 'package:unit2/bloc/rbac/rbac_operations/assign_area/assign_area_bloc.dart';
 import 'package:unit2/bloc/rbac/rbac_operations/module/module_bloc.dart';
 import 'package:unit2/bloc/rbac/rbac_operations/module_objects/module_objects_bloc.dart';
 import 'package:unit2/bloc/rbac/rbac_operations/object/object_bloc.dart';
@@ -15,6 +16,7 @@ import 'package:unit2/bloc/rbac/rbac_operations/role_module/role_module_bloc.dar
 import 'package:unit2/bloc/rbac/rbac_operations/roles_under/roles_under_bloc.dart';
 import 'package:unit2/bloc/rbac/rbac_operations/station/station_bloc.dart';
 import 'package:unit2/bloc/role_assignment/role_assignment_bloc.dart';
+import 'package:unit2/screens/superadmin/assign_area/assign_area_screen.dart';
 import 'package:unit2/screens/superadmin/module/module_screen.dart';
 import 'package:unit2/screens/superadmin/object/object_screen.dart';
 import 'package:unit2/screens/superadmin/operation/operation_screen.dart';
@@ -49,6 +51,7 @@ class SuperAdminMenu extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final roleAssignmentKey = GlobalKey<FormBuilderState>();
+    final areaKey = GlobalKey<FormBuilderState>();
     return AnimationConfiguration.staggeredGrid(
       position: index,
       columnCount: columnCount,
@@ -74,12 +77,9 @@ class SuperAdminMenu extends StatelessWidget {
                       object.moduleName == 'superadmin'
                   ? CardLabel(
                       icon: iconGenerator(name: object.object.name!),
-                      title:
-                         object.object.name!,
+                      title: object.object.name!,
                       ontap: () {
-                  
                         if (object.object.name == 'Role') {
-        
                           Navigator.push(context, MaterialPageRoute(
                               builder: (BuildContext context) {
                             return BlocProvider(
@@ -156,9 +156,7 @@ class SuperAdminMenu extends StatelessWidget {
                             return BlocProvider(
                               create: (context) =>
                                   AgencyBloc()..add(GetAgencies()),
-                              child: RbacAgencyScreen(
-                           
-                              ),
+                              child: const RbacAgencyScreen(),
                             );
                           }));
                         }
@@ -198,31 +196,126 @@ class SuperAdminMenu extends StatelessWidget {
                             );
                           }));
                         }
-               
+
                         if (object.object.name == 'Station') {
                           Navigator.push(context, MaterialPageRoute(
                               builder: (BuildContext context) {
                             return BlocProvider(
                               create: (context) => StationBloc()
                                 ..add(const GetStations(agencyId: 1)),
-                              child:  const RbacStationScreen(
+                              child: const RbacStationScreen(
                                 agencyId: 1,
                               ),
                             );
                           }));
                         }
-                        if (object.object.name == 'Role Member') {
-                                  Navigator.of(context).pop();
+                        ////////////////////////////////
+                        if (object.object.name == 'Area') {
+                          Navigator.of(context).pop();
                           showDialog(
                               context: context,
                               builder: (BuildContext context) {
                                 return AlertDialog(
                                   title: Row(
                                     children: [
-                                      const Expanded(child:  Text("Search User")),
-                                      IconButton(onPressed: (){
-                                        Navigator.pop(context);
-                                      }, icon: const Icon(Icons.close))
+                                      const Expanded(
+                                          child: Text("Search User")),
+                                      IconButton(
+                                          onPressed: () {
+                                            Navigator.pop(context);
+                                          },
+                                          icon: const Icon(Icons.close))
+                                    ],
+                                  ),
+                                  content: FormBuilder(
+                                      key: areaKey,
+                                      child: Column(
+                                        mainAxisSize: MainAxisSize.min,
+                                        children: [
+                                          FormBuilderTextField(
+                                            name: "firstname",
+                                            validator:
+                                                FormBuilderValidators.required(
+                                                    errorText:
+                                                        "This field is required"),
+                                            decoration: normalTextFieldStyle(
+                                                "First name", "first name"),
+                                          ),
+                                          const SizedBox(
+                                            height: 8,
+                                          ),
+                                          FormBuilderTextField(
+                                            validator:
+                                                FormBuilderValidators.required(
+                                                    errorText:
+                                                        "This field is required"),
+                                            name: "lastname",
+                                            decoration: normalTextFieldStyle(
+                                                "Last name", "last tname"),
+                                          ),
+                                          const SizedBox(
+                                            height: 24,
+                                          ),
+                                          SizedBox(
+                                            height: 60,
+                                            width: double.maxFinite,
+                                            child: ElevatedButton(
+                                              onPressed: () {
+                                                if (areaKey.currentState!
+                                                    .saveAndValidate()) {
+                                                  String fname =
+                                                      areaKey
+                                                          .currentState!
+                                                          .value['firstname'];
+                                                  String lname = areaKey
+                                                      .currentState!
+                                                      .value['lastname'];
+                                                  Navigator.of(context).pop();
+                                                  Navigator.push(context,
+                                                      MaterialPageRoute(builder:
+                                                          (BuildContext
+                                                              context) {
+                                                    return BlocProvider(
+                                                      create: (context) =>
+                                                          AssignAreaBloc()
+                                                            ..add(
+                                                              GetAssignArea(
+                                                                  firstname:
+                                                                      fname,
+                                                                  lastname:
+                                                                      lname),
+                                                            ),
+                                                      child:
+                                                           RbacAssignedAreaScreen(lname: lname,fname: fname,id: id,),
+                                                    );
+                                                  }));
+                                                }
+                                              },
+                                              style: mainBtnStyle(primary,
+                                                  Colors.transparent, second),
+                                              child: const Text("Submit"),
+                                            ),
+                                          )
+                                        ],
+                                      )),
+                                );
+                              });
+                        }
+                        if (object.object.name == 'Role Member') {
+                          Navigator.of(context).pop();
+                          showDialog(  
+                              context: context,
+                              builder: (BuildContext context) {
+                                return AlertDialog(
+                                  title: Row(
+                                    children: [
+                                      const Expanded(
+                                          child: Text("Search User")),
+                                      IconButton(
+                                          onPressed: () {
+                                            Navigator.pop(context);
+                                          },
+                                          icon: const Icon(Icons.close))
                                     ],
                                   ),
                                   content: FormBuilder(
@@ -262,7 +355,6 @@ class SuperAdminMenu extends StatelessWidget {
                                                 if (roleAssignmentKey
                                                     .currentState!
                                                     .saveAndValidate()) {
-                                                    
                                                   String fname =
                                                       roleAssignmentKey
                                                           .currentState!
@@ -271,19 +363,27 @@ class SuperAdminMenu extends StatelessWidget {
                                                       roleAssignmentKey
                                                           .currentState!
                                                           .value['lastname'];
-                                                            Navigator.of(context).pop();
+                                                  Navigator.of(context).pop();
                                                   Navigator.push(context,
                                                       MaterialPageRoute(builder:
                                                           (BuildContext
                                                               context) {
                                                     return BlocProvider(
-                                                        create: (context) =>
-                                                            RoleAssignmentBloc()
-                                                              ..add(GetAssignedRoles(
+                                                      create: (context) =>
+                                                          RoleAssignmentBloc()
+                                                            ..add(
+                                                              GetAssignedRoles(
                                                                   firstname:
                                                                       fname,
                                                                   lastname:
-                                                                      lname),),child:RbacRoleAssignment(id:id,name: fname,lname: lname,) ,);
+                                                                      lname),
+                                                            ),
+                                                      child: RbacRoleAssignment(
+                                                        id: id,
+                                                        name: fname,
+                                                        lname: lname,
+                                                      ),
+                                                    );
                                                   }));
                                                 }
                                               },

lib/screens/unit2/homepage.dart/components/menu-screen.dart

@@ -17,9 +17,9 @@ class MenuScreen extends StatefulWidget {
 class _MenuScreenState extends State<MenuScreen> {
   @override
   Widget build(BuildContext context) {
-    final String firstName =
+    final String firstName =globalFistname??
         widget.userData!.user!.login!.user!.firstName!.toUpperCase();
-    final String lastname =
+    final String lastname = globalLastname??
         widget.userData!.user!.login!.user!.lastName!.toUpperCase();
     return Drawer(
       child: SizedBox(

lib/screens/unit2/homepage.dart/module-screen.dart

@@ -20,8 +20,10 @@ class _MainScreenState extends State<MainScreen> {
   List<Role> roles = [];
   List<DisplayCard> cards = [];
   int? userId;
+     DateTime? ctime;
   @override
   Widget build(BuildContext context) {
+    
        setState(() {
           cards.clear();
          cards=[];
@@ -52,34 +54,49 @@ class _MainScreenState extends State<MainScreen> {
             }
           }
 
-          return Scaffold(
-            appBar: AppBar(
-              backgroundColor: primary,
-              leading: IconButton(
-                onPressed: () {
-                  ZoomDrawer.of(context)!.toggle();
-                },
-                icon: const Icon(
-                  Icons.menu,
-                  color: Colors.white,
-                ),
-              ),
-              centerTitle: true,
-              title: const Text(
-                unit2ModuleScreen,
-                style: TextStyle(
-                  fontSize: 18.0,
-                  color: Colors.white,
+          return WillPopScope(
+                  onWillPop: () {
+                DateTime now = DateTime.now();
+                if (ctime == null || now.difference(ctime!) > const Duration(seconds: 2)) { 
+                     //add duration of press gap
+                    ctime = now;
+                    ScaffoldMessenger.of(context).showSnackBar(
+                       const SnackBar(content: Text('Press Again to Exit',textAlign: TextAlign.center,)) 
+                    ); 
+                    return Future.value(false);
+                }
+
+                return Future.value(true);
+             },
+            child: Scaffold(
+              appBar: AppBar(
+                backgroundColor: primary,
+                leading: IconButton(
+                  onPressed: () {
+                    ZoomDrawer.of(context)!.toggle();
+                  },
+                  icon: const Icon(
+                    Icons.menu,
+                    color: Colors.white,
+                  ),
+                ),
+                centerTitle: true,
+                title: const Text(
+                  unit2ModuleScreen,
+                  style: TextStyle(
+                    fontSize: 18.0,
+                    color: Colors.white,
+                  ),
                 ),
               ),
+              body: state.userData!.user!.login!.user!.roles!.isNotEmpty
+                  ? DashBoard(
+                    estPersonAssignedArea: state.estPersonAssignedArea,
+                      userId: userId!,
+                      cards: cards,
+                    )
+                  : const NoModule(),
             ),
-            body: state.userData!.user!.login!.user!.roles!.isNotEmpty
-                ? DashBoard(
-                  estPersonAssignedArea: state.estPersonAssignedArea,
-                    userId: userId!,
-                    cards: cards,
-                  )
-                : const NoModule(),
           );
         }
         return Container();

lib/screens/unit2/login/components/update_required.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:better_open_file/better_open_file.dart';
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_app_installer/easy_app_installer.dart';
 import 'package:flutter/material.dart';
@@ -9,6 +11,7 @@ import 'package:flutter_progress_hud/flutter_progress_hud.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:unit2/model/login_data/version_info.dart';
 import 'package:unit2/screens/unit2/login/components/showAlert.dart';
 import 'package:unit2/theme-data.dart/btn-style.dart';
 
@@ -20,9 +23,9 @@ import '../../../../widgets/wave.dart';
 
 class Update extends StatefulWidget {
   final String apkVersion;
-  final String currenVersion;
+  final VersionInfo versionInfo;
   const Update(
-      {super.key, required this.apkVersion, required this.currenVersion});
+      {super.key, required this.apkVersion, required this.versionInfo});
 
   @override
   State<Update> createState() => _UpdateState();
@@ -74,14 +77,14 @@ class _UpdateState extends State<Update> {
                           ],
                         ),
                         const SizedBox(
-                          height: 10,
+                          height: 25,
                         ),
                         RichText(
                             textAlign: TextAlign.justify,
                             text: TextSpan(
                                 text: 'Your app version ',
                                 style: const TextStyle(
-                                  fontSize: 16,
+                                  fontSize: 14,
                                   color: Colors.black,
                                 ),
                                 children: <TextSpan>[
@@ -95,7 +98,7 @@ class _UpdateState extends State<Update> {
                                           " did not match with the latest version ",
                                       style: TextStyle(color: Colors.black)),
                                   TextSpan(
-                                      text: widget.currenVersion.toString(),
+                                      text: widget.versionInfo.versionInfo,
                                       style: const TextStyle(
                                           color: primary,
                                           fontWeight: FontWeight.bold)),
@@ -105,7 +108,7 @@ class _UpdateState extends State<Update> {
                                       style: TextStyle(color: Colors.black)),
                                 ])),
                         const SizedBox(
-                          height: 12.0,
+                          height: 25,
                         ),
                         Container(
                           child: downloading
@@ -130,17 +133,22 @@ class _UpdateState extends State<Update> {
                                   icon: const Icon(Icons.download),
                                   style: mainBtnStyle(
                                       primary, Colors.transparent, second),
-                                  onPressed: () async {
-                                    final progress = ProgressHUD.of(context);
-                                    progress?.showWithText(
-                                      'Please wait...',
-                                    );
-                                    setState(() {
-                                      downloading = true;
-                                      progressRating = '0';
-                                    });
-                                    await openFile();
-                                  },
+                                   onPressed: () async {
+                                          setState(() {
+                                            downloading = true;
+                                            progressRating = '0';
+                                          });
+                                          try {
+                                            await openFile();
+                                          } catch (e) {
+                                            showAlert(context, () {
+                                              setState(() {
+                                                downloading = false;
+                                                progressRating = '0';
+                                              });
+                                            });
+                                          }
+                                        },
                                   label: const Text(
                                       "Download Latest App Version.")),
                         ),
@@ -168,9 +176,9 @@ class _UpdateState extends State<Update> {
   Future<void> openFile() async {
     try {
       final filePath = await downloadFile();
-      await openAPK(filePath);
+      await OpenFile.open(filePath);
     } catch (e) {
-      print(e.toString());
+      throw e.toString();
     }
   }
 
@@ -181,16 +189,36 @@ class _UpdateState extends State<Update> {
     }
   }
 
-  Future<String> downloadFile() async {
-    final progress = ProgressHUD.of(context);
+
+  Future<String> getCPUArchitecture() async {
+    String downloadURL = "";
+    DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
+    AndroidDeviceInfo androidDeviceInfo = await deviceInfoPlugin.androidInfo;
+    try{
+List<String> cpuArchitecture = androidDeviceInfo.supportedAbis;
+    if (cpuArchitecture.first == 'arm64-v8a') {
+      downloadURL = widget.versionInfo.arm64v8aDownloadUrl!;
+    }
+    else if (cpuArchitecture.first == 'armeabi-v7a') {
+      downloadURL = widget.versionInfo.armeabiv7aDownloadUrl!;
+    } else {
+      downloadURL = widget.versionInfo.x8664DownloadUrl!;
+    }
+    print(downloadURL);
+    }catch(e){
+      throw e.toString();
+    }
+        return downloadURL;
+  }
+
+  Future<String?> downloadFile() async {
     final appStorage = await getApplicationDocumentsDirectory();
+    String? appDir;
     try {
       String url = await getCPUArchitecture();
       final response = await dio.download(url, '${appStorage.path}/uniT.apk',
           deleteOnError: true,
           options: Options(
-              receiveTimeout: 20000,
-              sendTimeout: 20000,
               receiveDataWhenStatusError: true,
               responseType: ResponseType.bytes,
               followRedirects: false,
@@ -202,47 +230,24 @@ class _UpdateState extends State<Update> {
           downloading = true;
         });
         if (progressRating == '100') {
-          final progress = ProgressHUD.of(context);
-          progress!.dismiss();
           setState(() {
             downloading = false;
             isDownloaded = true;
           });
         }
+        appDir = '${appStorage.path}/uniT.apk';
       });
-    } on TimeoutException catch (_) {
-      progress!.dismiss();
-      showAlert(context, () {
-        setState(() {
-          downloading = false;
-        });
-      });
-      throw TimeoutException(timeoutError);
-    } on SocketException catch (_) {
-      progress!.dismiss();
-      showAlert(context, () {
-        setState(() {
-          downloading = false;
-        });
-      });
-      throw const SocketException(timeoutError);
-    } on DioError catch (_) {
-      progress!.dismiss();
-      showAlert(context, () {
-        setState(() {
-          downloading = false;
-        });
-      });
-      throw TimeoutException(timeoutError);
-    } catch (_) {
-      progress!.dismiss();
-      showAlert(context, () {
-        setState(() {
-          downloading = false;
-        });
-      });
-      throw TimeoutException(timeoutError);
+    } on TimeoutException catch (e) {
+      throw e.toString();
+    } on SocketException catch (e) {
+      throw e.toString();
+    } on Error catch (e) {
+      throw e.toString();
+    } catch (e) {
+      throw e.toString();
     }
-    return '${appStorage.path}/uniT.apk';
+
+    return appDir!;
   }
+  
 }

lib/screens/unit2/login/login.dart

@@ -22,7 +22,6 @@ import '../../../theme-data.dart/colors.dart';
 import '../../../theme-data.dart/form-style.dart';
 import '../../../theme-data.dart/btn-style.dart';
 import './components/login-via-qr-label.dart';
-import './functions/press-again-to-exit.dart';
 
 class UniT2Login extends StatefulWidget {
   const UniT2Login({super.key});
@@ -37,17 +36,30 @@ class _UniT2LoginState extends State<UniT2Login> {
   bool _showPassword = true;
   String? password;
   String? username;
+    DateTime? ctime;
   @override
   Widget build(BuildContext context) {
     return WillPopScope(
-      onWillPop: pressAgainToExit,
+          onWillPop: () {
+                DateTime now = DateTime.now();
+                if (ctime == null || now.difference(ctime!) > const Duration(seconds: 2)) { 
+                    ctime = now;
+                    ScaffoldMessenger.of(context).showSnackBar(
+                       const SnackBar(content: Text('Press Again to Exit',textAlign: TextAlign.center,)) 
+                    ); 
+                    return Future.value(false);
+                }
+
+                return Future.value(true);
+             },
       child: Scaffold(
         body: ProgressHUD(
           backgroundColor: Colors.black87,
           indicatorWidget: const SpinKitFadingCircle(color: Colors.white),
           child: BlocConsumer<UserBloc, UserState>(listener: (context, state) {
-            print(state);
-            if (state is UserLoggedIn || state is UuidLoaded || state is LoginErrorState) {
+            if (state is UserLoggedIn ||
+                state is UuidLoaded ||
+                state is LoginErrorState) {
               final progress = ProgressHUD.of(context);
               progress!.dismiss();
             }
@@ -94,10 +106,11 @@ class _UniT2LoginState extends State<UniT2Login> {
               }));
             }
           }, builder: (context, state) {
-            print(state);
             if (state is VersionLoaded) {
+              print(state.versionInfo!.id);
+              print(state.apkVersion);
               return Builder(builder: (context) {
-                if (state.versionInfo!.version != state.apkVersion) {
+                if (state.versionInfo?.id == state.apkVersion) {
                   return SizedBox(
                     child: SingleChildScrollView(
                       child: Stack(
@@ -344,7 +357,7 @@ class _UniT2LoginState extends State<UniT2Login> {
                   //New update available
                   return Update(
                     apkVersion: state.apkVersion!,
-                    currenVersion: state.versionInfo!.version!,
+               versionInfo: state.versionInfo!,
                   );
                 }
               });
@@ -355,7 +368,7 @@ class _UniT2LoginState extends State<UniT2Login> {
                 onpressed: () {
                   BlocProvider.of<UserBloc>(
                           NavigationService.navigatorKey.currentContext!)
-                      .add(GetApkVersion());
+                                      .add(LoadVersion(username: username, password: password));
                   return MaterialPageRoute(builder: (_) {
                     return const UniT2Login();
                   });
@@ -374,14 +387,14 @@ class _UniT2LoginState extends State<UniT2Login> {
                 onpressed: () {
                   BlocProvider.of<UserBloc>(
                           NavigationService.navigatorKey.currentContext!)
-                      .add(GetApkVersion());
+                              .add(LoadVersion(username: username, password: password));
                   return MaterialPageRoute(builder: (_) {
                     return const UniT2Login();
                   });
                 },
               );
             }
-            return Container();
+           return Container();
           }),
         ),
       ),

lib/screens/unit2/roles/establishment_point_person/est_point_person_role_member_screen.dart

@@ -158,11 +158,11 @@ class EstPointPersonRoleAssignmentScreen extends StatelessWidget {
                 if (!assignedRoles.keys.contains(fullName)) {
                   assignedRoles.addAll({fullName: []});
                   assignedRoles[fullName]!.add(Content(
-                      id: assignedRole.id!, name: assignedRole.role!.name));
+                      id: assignedRole.id!, name: assignedRole.role!.name!));
                 } else {
                   assignedRoles[fullName]!.add(Content(
                       id: assignedRole.id!,
-                      name: assignedRole.role!.name));
+                      name: assignedRole.role!.name!));
                 }
               }
             }

lib/screens/unit2/roles/establishment_point_person/est_point_person_station.dart

@@ -171,7 +171,7 @@ class EstPointPersonStationScreen extends StatelessWidget {
                               ////Station Type
                               SearchField(
                                 itemHeight: 50,
-                                suggestionsDecoration: box1(),
+                                suggestionsDecoration: searchFieldDecoration(),
                                 suggestions: stationTypes
                                     .map((StationType stationType) =>
                                         SearchFieldListItem(

lib/screens/unit2/roles/rbac/rbac.dart

@@ -222,7 +222,7 @@ class _RBACScreenState extends State<RBACScreen> {
                                         builder: (context, setState) {
                                       return SearchField(
                                           itemHeight: 40,
-                                          suggestionsDecoration: box1(),
+                                          suggestionsDecoration: searchFieldDecoration(),
                                           suggestions: state.role
                                               .map((RBAC role) =>
                                                   SearchFieldListItem(
@@ -305,7 +305,7 @@ class _RBACScreenState extends State<RBACScreen> {
                                         builder: (context, setState) {
                                       return SearchField(
                                           itemHeight: 40,
-                                          suggestionsDecoration: box1(),
+                                          suggestionsDecoration: searchFieldDecoration(),
                                           suggestions: state.modules
                                               .map((RBAC module) =>
                                                   SearchFieldListItem(
@@ -602,7 +602,7 @@ class _RBACScreenState extends State<RBACScreen> {
                                                                             ),
                                                                             SearchField(
                                                                                 itemHeight: 40,
-                                                                                suggestionsDecoration: box1(),
+                                                                                suggestionsDecoration: searchFieldDecoration(),
                                                                                 suggestions: state.objects
                                                                                     .map((RBAC object) => SearchFieldListItem(object.name!,
                                                                                         item: object,

lib/sevices/passo/building/property_appraisal_services.dart

@@ -90,7 +90,7 @@ class PropertyAppraisalServices {
       http.Response response = await Request.instance
           .getRequest(param: params, path: path, headers: headers);
       print('Property_Apraisaledit');
-      print(response.statusCode);
+      print(response.body);
       if (response.statusCode == 200) {
         final jsonData = jsonDecode(response.body);
         final dataList = jsonData['data'] as List<dynamic>;

lib/sevices/passo/building/property_assessment_services.dart

@@ -98,6 +98,7 @@ class PropertyAssessmentServices {
       http.Response response = await Request.instance
           .getRequest(param: params, path: path, headers: headers);
       print('Assessment');
+      print(response.statusCode);
       print(response.body);
       if (response.statusCode == 200) {
         final jsonData = jsonDecode(response.body);

lib/sevices/passo/land/land_ext.dart

@@ -84,53 +84,55 @@ class LandExtServices {
     return response;
   }
 
-  // Future<LandExtEdit> fetchEdit(tempID) async {
-  //   http.Response response = await http.get(Uri.parse(
-  //       '$baseUrl${Url.instance.getLandExt()}?bldgappr_details_id=$tempID'));
-  //   print('Assessment');
-  //   print(response.body);
-  //   if (response.statusCode == 200) {
-  //     final jsonData = jsonDecode(response.body);
-  //     final dataList = jsonData['data'] as List<dynamic>;
-  //     final result =
-  //         LandExtEdit.fromJson(dataList[0] as Map<String, dynamic>);
+  Future<http.Response?> updateEdit(LandExt data, id) async {
+    String path = Url.instance.getLandExt();
+    Map<String, String> headers = {
+      'Content-Type': 'application/json; charset=UTF-8',
+      'X-Client-Key': xClientKey,
+      'X-Client-Secret': xClientKeySecret
+    };
+    Map<String, String> params = {
+      "landappr_details_id": id.toString(),
+    };
+    http.Response? response;
+    try {
+      response = await Request.instance.putRequest(
+          path: path, body: data.toJson(), headers: headers, param: params);
+    } catch (e) {
+      log(e.toString());
+    }
+    return response;
+  }
 
-  //     return result;
-  //   } else {
-  //     throw Exception(response.reasonPhrase);
-  //   }
-  // }
+  Future<LandExt> fetchEdit(tempID) async {
+    String path = Url.instance.getLandExt();
+    Map<String, String> headers = {
+      'Content-Type': 'application/json; charset=UTF-8',
+      'X-Client-Key': xClientKey,
+      'X-Client-Secret': xClientKeySecret
+    };
+    Map<String, String> params = {
+      "landappr_details_id": tempID.toString(),
+    };
+    try {
+      http.Response response = await Request.instance
+          .getRequest(param: params, path: path, headers: headers);
 
-  // Future<http.Response?> addEdit(LandExtEdit assessment) async {
-  //   http.Response? response;
-  //   try {
-  //     response = await http.post(
-  //         Uri.parse("$baseUrl${Url.instance.getLandExt()}"),
-  //         headers: {
-  //           HttpHeaders.contentTypeHeader: "application/json",
-  //         },
-  //         body: jsonEncode(assessment.toJson()));
-  //   } catch (e) {
-  //     log(e.toString());
-  //   }
-  //   return response;
-  // }
+      print('Landextedit');
+      print(response.body);
 
-  // Future<http.Response?> updateEdit(
-  //     LandExtEdit assessment, id) async {
-  //   print(id);
-  //   http.Response? response;
-  //   try {
-  //     response = await http.put(Uri.parse(
-  //             // ignore: unnecessary_brace_in_string_interps
-  //             "$baseUrl${Url.instance.getLandExt()}?bldgappr_details_id=${id}"),
-  //         headers: {
-  //           HttpHeaders.contentTypeHeader: "application/json",
-  //         },
-  //         body: jsonEncode(assessment.toJson()));
-  //   } catch (e) {
-  //     log(e.toString());
-  //   }
-  //   return response;
-  // }
+      if (response.statusCode == 200) {
+        final jsonData = jsonDecode(response.body);
+        final dataList = jsonData['data'] as List<dynamic>;
+        final result = LandExt.fromJson(dataList[0] as Map<String, dynamic>);
+
+        return result;
+      } else {
+        print(response.reasonPhrase);
+        throw Exception(response.reasonPhrase);
+      }
+    } catch (e) {
+      throw e.toString();
+    }
+  }
 }

lib/sevices/passo/land/land_other_improvements.dart

@@ -24,11 +24,11 @@ class OtherImprovementServices {
       'X-Client-Secret': xClientKeySecret
     };
     Map<String, String> params = {
-      "landappr_details_id": tempID,
+      "landappr_details_id": tempID.toString(),
     };
     try {
       http.Response response = await Request.instance
-          .getRequest(param: {}, path: path, headers: headers);
+          .getRequest(param: params, path: path, headers: headers);
 
       if (response.statusCode == 200) {
         final List result = jsonDecode(response.body)['data'];
@@ -67,11 +67,11 @@ class OtherImprovementServices {
       'X-Client-Secret': xClientKeySecret
     };
     Map<String, String> params = {
-      "id": id,
+      "id": id.toString(),
     };
     try {
       http.Response response = await Request.instance
-          .deleteRequest(path: path, headers: headers, body: {}, param: {});
+          .deleteRequest(path: path, headers: headers, body: {}, param: params);
       print(id);
       if (response.statusCode == 200) {
         print(response.body);

lib/sevices/passo/land/land_value_adjustment.dart

@@ -25,11 +25,11 @@ class ValueAdjustmentsServices {
       'X-Client-Secret': xClientKeySecret
     };
     Map<String, String> params = {
-      "landappr_details_id": tempID,
+      "landappr_details_id": tempID.toString(),
     };
     try {
       http.Response response = await Request.instance
-          .getRequest(param: {}, path: path, headers: headers);
+          .getRequest(param: params, path: path, headers: headers);
       if (response.statusCode == 200) {
         final List result = jsonDecode(response.body)['data'];
         print(result);
@@ -67,11 +67,11 @@ class ValueAdjustmentsServices {
       'X-Client-Secret': xClientKeySecret
     };
     Map<String, String> params = {
-      "id": id,
+      "id": id.toString(),
     };
     try {
       http.Response response = await Request.instance
-          .deleteRequest(path: path, headers: headers, body: {}, param: {});
+          .deleteRequest(path: path, headers: headers, body: {}, param: params);
       print(id);
       if (response.statusCode == 200) {
         print(response.body);

lib/sevices/passo/memoranda.dart

@@ -1,9 +1,4 @@
-import 'dart:convert';
-
-import 'package:unit2/model/passo/barangay.dart';
-import 'package:unit2/model/passo/class_components.dart';
 import 'package:http/http.dart' as http;
-import 'package:unit2/model/passo/memoranda.dart';
 import 'package:unit2/utils/request.dart';
 import 'package:unit2/utils/urls.dart';
 
@@ -14,25 +9,16 @@ class MemorandaServices {
   String xClientKey = "unitK3CQaXiWlPReDsBzmmwBZPd9Re1z";
   String xClientKeySecret = "unitcYqAN7GGalyz";
 
-  Future<List<Memoranda>> fetch() async {
+  Future<http.Response> fetch() async {
     String path = Url.instance.getMemoranda();
     Map<String, String> headers = {
       'Content-Type': 'application/json; charset=UTF-8',
       'X-Client-Key': xClientKey,
       'X-Client-Secret': xClientKeySecret
     };
-    try {
-      http.Response response = await Request.instance
-          .getRequest(param: {}, path: path, headers: headers);
-      if (response.statusCode == 200) {
-        final List result = jsonDecode(response.body)['data'];
 
-        return result.map(((e) => Memoranda.fromJson(e))).toList();
-      } else {
-        throw Exception(response.reasonPhrase);
-      }
-    } catch (e) {
-      throw e.toString();
-    }
+    http.Response response = await Request.instance
+        .getRequest(param: {}, path: path, headers: headers);
+    return response;
   }
 }

lib/sevices/passo/signatories_service.dart

@@ -19,22 +19,19 @@ class SignatoriesServices {
       'X-Client-Key': xClientKey,
       'X-Client-Secret': xClientKeySecret
     };
-    try {
-      http.Response response = await Request.instance
-          .getRequest(param: {}, path: path, headers: headers);
 
-      print('Signatories');
-      print(response.statusCode);
-      if (response.statusCode == 200) {
-        final List result = jsonDecode(response.body)['data'];
+    http.Response response = await Request.instance
+        .getRequest(param: {}, path: path, headers: headers);
 
-        return result.map(((e) => Signatories.fromJson(e))).toList();
-      } else {
-        print(response.reasonPhrase);
-        throw Exception(response.reasonPhrase);
-      }
-    } catch (e) {
-      throw e.toString();
+    print('Signatories');
+    print(response.statusCode);
+    if (response.statusCode == 200) {
+      final List result = jsonDecode(response.body)['data'];
+
+      return result.map(((e) => Signatories.fromJson(e))).toList();
+    } else {
+      print(response.reasonPhrase);
+      throw Exception(response.reasonPhrase);
     }
   }
 }

lib/sevices/roles/pass_check_services.dart

@@ -116,9 +116,9 @@ class PassCheckServices {
         }
         ////PUROK
         if (assignRoleAreaType.areaTypeName.toLowerCase() == 'purok') {
-          List<Purok> assignedArea = [];
+          List<PassCheckPurok> assignedArea = [];
           data['data'][0]['assigned_area'].forEach((var element) {
-            Purok purok = Purok.fromJson(element['area']);
+            PassCheckPurok purok = PassCheckPurok.fromJson(element['area']);
             assignedArea.add(purok);
           });
           statusResponse = assignedArea;
@@ -172,7 +172,7 @@ class PassCheckServices {
       double? temp,
       int? stationId,
       String? cpId,
-      required int roleid}) async {
+      required RoleIdRoleName roleIdRoleName}) async {
     String path = Url.instance.postLogs();
     bool success;
     Map<String, String> headers = {
@@ -182,9 +182,8 @@ class PassCheckServices {
     };
     Map body;
     if (otherInputs) {
-      if (roleid == 41 || roleid == 13 || roleid == 17 || roleid == 22) {
+      if (roleIdRoleName.roleName.toLowerCase() == "security guard" || roleIdRoleName.roleName.toLowerCase() == "qr code scanner") {
         if (io == "i") {
-          print("1");
           body = {
             "station_id": stationId,
             "temperature": temp,
@@ -193,7 +192,6 @@ class PassCheckServices {
             "io": io
           };
         } else {
-          print("2");
           body = {
             "station_id": stationId,
             "destination": destination,
@@ -203,7 +201,6 @@ class PassCheckServices {
           };
         }
       } else {
-        print("3");
         if (io == "i") {
           body = {
             "cp_id": cpId,
@@ -213,7 +210,6 @@ class PassCheckServices {
             "io": io
           };
         } else {
-          print("4");
           body = {
             "cp_id": cpId,
             "destination": destination,
@@ -224,8 +220,7 @@ class PassCheckServices {
         }
       }
     } else {
-      print("5");
-      if (roleid == 41 || roleid == 13 || roleid == 17 || roleid == 22) {
+      if (roleIdRoleName.roleName.toLowerCase() == "security guard" || roleIdRoleName.roleName.toLowerCase() == "qr code scanner") {
         body = {
           "station_id": stationId,
           "passer": passerId,
@@ -233,7 +228,6 @@ class PassCheckServices {
           "io": io
         };
       } else {
-        print("6");
         body = {
           "cp_id": cpId,
           "temperature": temp,

lib/sevices/roles/rbac_operations/assigned_area_services.dart

@@ -0,0 +1,89 @@
+import 'dart:convert';
+
+import 'package:unit2/model/profile/assigned_area.dart';
+import 'package:unit2/utils/urls.dart';
+import 'package:http/http.dart' as http;
+
+import '../../../utils/request.dart';
+
+class RbacAssignedAreaServices {
+  static final RbacAssignedAreaServices _instance = RbacAssignedAreaServices();
+  static RbacAssignedAreaServices get instance => _instance;
+  String xClientKey = "unitK3CQaXiWlPReDsBzmmwBZPd9Re1z";
+  String xClientKeySecret = "unitcYqAN7GGalyz";
+  Future<List<UserAssignedArea>> getAssignedArea({required int id}) async {
+    List<UserAssignedArea> userAssignedAreas = [];
+    String path = Url.instance.getAssignAreas();
+    Map<String, String> headers = {
+      'Content-Type': 'application/json; charset=UTF-8',
+      'X-Client-Key': xClientKey,
+      'X-Client-Secret': xClientKeySecret
+    };
+    Map<String, String> param = {
+      "assigned_role__user__id": id.toString(),
+    };
+    try {
+      http.Response response = await Request.instance
+          .getRequest(param: param, path: path, headers: headers);
+      if (response.statusCode == 200) {
+        Map data = jsonDecode(response.body);
+        if (data['data'] != null) {
+          for (var assignedArea in data['data']) {
+            UserAssignedArea newArea = UserAssignedArea.fromJson(assignedArea);
+            userAssignedAreas.add(newArea);
+          }
+        }
+      }
+    } catch (e) {
+      throw e.toString();
+    }
+    return userAssignedAreas;
+  }
+   Future<bool> deleteAssignedArea({required int areaId}) async {
+    bool success = false;
+     String path = "${Url.instance.getAssignAreas()}$areaId/";
+    Map<String, String> headers = {
+      'Content-Type': 'application/json; charset=UTF-8',
+      'X-Client-Key': xClientKey,
+      'X-Client-Secret': xClientKeySecret
+    };
+    try {
+      http.Response response = await Request.instance
+          .deleteRequest(path: path, headers: headers, body: {}, param: {});
+      if (response.statusCode == 200) {
+        success = true;
+      }else{
+        success = false;
+      }
+    } catch (e) {
+      throw e.toString();
+    }
+    return success;
+  }
+  Future<Map<dynamic, dynamic>> add ({required int userId, required int roleId, required int areaTypeId, required String areaId}) async{
+        String path = Url.instance.getAssignAreas();
+          Map<String, String> headers = {
+      'Content-Type': 'application/json; charset=UTF-8',
+      'X-Client-Key': xClientKey,
+      'X-Client-Secret': xClientKeySecret
+    };
+     Map<dynamic, dynamic>? responseStatus = {};
+    Map body = {
+      "user_id":userId,
+      "role_id":roleId,
+      "assigned_areas": [{"areatypeid":areaTypeId,"areaid":areaId}]
+    };
+    try{
+      http.Response response = await Request.instance.postRequest(path: path, headers: headers, body: body, param: {});
+      if(response.statusCode == 201){
+          Map data = jsonDecode(response.body);
+        responseStatus = data;
+      } else {
+        responseStatus.addAll({'success': false});
+      }
+    }catch(e){
+      throw e.toString();
+    }
+    return responseStatus;
+  }
+}

lib/theme-data.dart/box_shadow.dart

@@ -1,8 +1,15 @@
  import 'package:flutter/material.dart';
+import 'package:searchfield/searchfield.dart';
 
 BoxDecoration box1(){
   return const BoxDecoration(
                 boxShadow: [BoxShadow(color: Colors.black12,spreadRadius: 5,blurRadius: 5)] ,
                       color: Colors.white,
                       borderRadius:  BorderRadius.all(Radius.circular(3)));
+}
+SuggestionDecoration searchFieldDecoration(){
+    return  SuggestionDecoration(
+                boxShadow:const [BoxShadow(color: Colors.black12,spreadRadius: 5,blurRadius: 5)] ,
+                      color: Colors.white,
+                      borderRadius: const BorderRadius.all(Radius.circular(3)));
 }

lib/utils/app_router.dart

@@ -27,7 +27,7 @@ class AppRouter {
       case '/':
         BlocProvider.of<UserBloc>(
                 NavigationService.navigatorKey.currentContext!)
-            .add(GetApkVersion());
+            .add(GetApkVersion(username: "", password: ""));
         return MaterialPageRoute(builder: (_) {
           return const UniT2Login();
         });

lib/utils/cpu_architecture.dart

@@ -13,7 +13,7 @@ Future<String> getCPUArchitecture() async {
     try {
       Response response = await dio.get(apkUrl,
           options: Options(
-              receiveTimeout: 20000,
+              receiveTimeout:const Duration(seconds: 25),
               receiveDataWhenStatusError: true,
               responseType: ResponseType.json,
               followRedirects: false,
@@ -37,8 +37,8 @@ Future<String> getCPUArchitecture() async {
       throw TimeoutException("Connection timeout");
     } on SocketException catch (_) {
       throw const SocketException("Connection timeout");
-    } on DioError catch (_) {
-      throw DioErrorType.connectTimeout;
+    } on DioException catch (e) {
+      throw e.toString();
     }
     return downloadURL;
   }

lib/utils/global.dart

@@ -1,5 +1,7 @@
 import 'package:hive/hive.dart';
 
+import '../model/profile/basic_information/primary-information.dart';
+
 double screenWidth = 0;
 double screenHeight = 0;
 double blockSizeHorizontal = 0;
@@ -11,6 +13,22 @@ double safeBlockVertical = 0;
 
 const xClientKey = "unitK3CQaXiWlPReDsBzmmwBZPd9Re1z";
 const xClientSecret = "unitcYqAN7GGalyz";
+ String? globalFistname;
+ String? globalLastname;
+ String? globalMiddleName;
+ DateTime? globalBday;
+ String? globalSex;
+Profile? globalCurrentProfile;
+
+
+const String urlDownloadArmeabiv7aAPK =
+  "https://agusandelnorte.gov.ph/media/public/transparency/downloadables/UniT-App/v1.0.1/beta/unit_app_v1_0_1_beta_armeabi-v7a-release.apk?download";
+
+const String urlDownloadX8664APK =
+"https://agusandelnorte.gov.ph/media/public/transparency/downloadables/UniT-App/v1.0.1/beta/unit_app_v1_0_1_beta_x86_64-release.apk?download";
+
+const String urlDownloadarm64v8aAPK =
+  "https://agusandelnorte.gov.ph/media/public/transparency/downloadables/UniT-App/v1.0.1/beta/unit_app_v1_0_1_beta_arm64-v8a-release.apk?download";
 
 
 

lib/utils/location_utilities.dart

@@ -6,6 +6,7 @@ import 'package:unit2/model/location/city.dart';
 import 'package:unit2/model/location/country.dart';
 import 'package:http/http.dart' as http;
 import 'package:unit2/model/location/provinces.dart';
+import 'package:unit2/model/location/purok.dart';
 import 'package:unit2/utils/request.dart';
 import 'package:unit2/utils/urls.dart';
 
@@ -23,20 +24,20 @@ class LocationUtils {
     List<Country> countries = [];
     String path = Url.instance.getCounties();
 
-    try{
-    http.Response response = await Request.instance
-        .getRequest(path: path, param: {}, headers: headers);
-    if (response.statusCode == 200) {
-      Map data = jsonDecode(response.body);
-      if (data['data'] != null) {
-        data['data'].forEach((var country) {
-          Country newCOuntry = Country.fromJson(country);
-          countries.add(newCOuntry);
-        });
+    try {
+      http.Response response = await Request.instance
+          .getRequest(path: path, param: {}, headers: headers);
+      if (response.statusCode == 200) {
+        Map data = jsonDecode(response.body);
+        if (data['data'] != null) {
+          data['data'].forEach((var country) {
+            Country newCOuntry = Country.fromJson(country);
+            countries.add(newCOuntry);
+          });
+        }
       }
-    }
-    }catch(e){
-      throw(e.toString());
+    } catch (e) {
+      throw (e.toString());
     }
     return countries;
   }
@@ -45,20 +46,20 @@ class LocationUtils {
     List<Region> regions = [];
     String path = Url.instance.getRegions();
 
-    try{
-    http.Response response = await Request.instance
-        .getRequest(path: path, param: {}, headers: headers);
-    if (response.statusCode == 200) {
-      Map data = jsonDecode(response.body);
-      if (data['data'] != null) {
-        data['data'].forEach((var region) {
-          Region newRegion = Region.fromJson(region);
-          regions.add(newRegion);
-        });
+    try {
+      http.Response response = await Request.instance
+          .getRequest(path: path, param: {}, headers: headers);
+      if (response.statusCode == 200) {
+        Map data = jsonDecode(response.body);
+        if (data['data'] != null) {
+          data['data'].forEach((var region) {
+            Region newRegion = Region.fromJson(region);
+            regions.add(newRegion);
+          });
+        }
       }
-    }
-    }catch(e){
-      throw(e.toString());
+    } catch (e) {
+      throw (e.toString());
     }
     return regions;
   }
@@ -70,12 +71,14 @@ class LocationUtils {
     try {
       http.Response response = await Request.instance
           .getRequest(path: path, param: {}, headers: headers);
-      Map data = jsonDecode(response.body);
-      if (data['data'] != null) {
-        data['data'].forEach((var province) {
-          Province newProvince = Province.fromJson(province);
-          provinces.add(newProvince);
-        });
+      if (response.statusCode == 200) {
+        Map data = jsonDecode(response.body);
+        if (data['data'] != null) {
+          data['data'].forEach((var province) {
+            Province newProvince = Province.fromJson(province);
+            provinces.add(newProvince);
+          });
+        }
       }
     } catch (e) {
       throw (e.toString());
@@ -89,12 +92,14 @@ class LocationUtils {
     try {
       http.Response response = await Request.instance
           .getRequest(path: path, param: {}, headers: headers);
-      Map data = jsonDecode(response.body);
-      if (data['data'] != null) {
-        data['data'].forEach((var city) {
-          CityMunicipality cityMun = CityMunicipality.fromJson(city);
-          cities.add(cityMun);
-        });
+      if (response.statusCode == 200) {
+        Map data = jsonDecode(response.body);
+        if (data['data'] != null) {
+          data['data'].forEach((var city) {
+            CityMunicipality cityMun = CityMunicipality.fromJson(city);
+            cities.add(cityMun);
+          });
+        }
       }
     } catch (e) {
       throw (e.toString());
@@ -102,41 +107,64 @@ class LocationUtils {
     return cities;
   }
 
-    Future<List<Barangay>> getBarangay({required String code}) async {
+  Future<List<Barangay>> getBarangay({required String code}) async {
     List<Barangay> barangays = [];
     String path = Url.instance.getBarangays() + code;
     try {
       http.Response response = await Request.instance
           .getRequest(path: path, param: {}, headers: headers);
-      Map data = jsonDecode(response.body);
-      if (data['data'] != null) {
-        data['data'].forEach((var city) {
-          Barangay barangay = Barangay.fromJson(city);
-          barangays.add(barangay);
-        });
+      if (response.statusCode == 200) {
+        Map data = jsonDecode(response.body);
+        if (data['data'] != null) {
+          data['data'].forEach((var city) {
+            Barangay barangay = Barangay.fromJson(city);
+            barangays.add(barangay);
+          });
+        }
       }
     } catch (e) {
       throw (e.toString());
     }
     return barangays;
   }
-  Future<List<AddressCategory>>getAddressCategory()async{
+
+  Future<List<Purok>> getPurok({required String barangay}) async {
+    List<Purok> puroks = [];
+    String path = Url.instance.getPurok() + barangay;
+    try {
+      http.Response response = await Request.instance
+          .getRequest(path: path, param: {}, headers: headers);
+      if (response.statusCode == 200) {
+        Map data = jsonDecode(response.body);
+        if (data['data'] != null) {
+          data['data'].forEach((var purok) {
+            Purok newPurok = Purok.fromJson(purok);
+            puroks.add(newPurok);
+          });
+        }
+      }
+    } catch (e) {
+      throw (e.toString());
+    }
+    return puroks;
+  }
+
+  Future<List<AddressCategory>> getAddressCategory() async {
     List<AddressCategory> categories = [];
     String path = Url.instance.getAddressCategory();
-    try{
-      http.Response response = await Request.instance.getRequest(path: path,param: {},headers:headers );
+    try {
+      http.Response response = await Request.instance
+          .getRequest(path: path, param: {}, headers: headers);
       Map data = jsonDecode(response.body);
-      if(data['data'] != null){
-        data['data'].forEach((var cat){
+      if (data['data'] != null) {
+        data['data'].forEach((var cat) {
           categories.add(AddressCategory.fromJson(cat));
         });
       }
       categories;
       return categories;
-    }catch(e){
+    } catch (e) {
       throw e.toString();
     }
   }
-
-
 }

lib/utils/request.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'package:http/http.dart';
 import 'package:unit2/utils/text_container.dart';
 import 'package:unit2/utils/urls.dart';
@@ -19,7 +18,7 @@ class Request {
       Map<String, String>? param}) async {
     Response response;
     try {
-      response = await get(Uri.http(host, path!, param), headers: headers)
+      response = await get(Uri.https(host, path!, param), headers: headers)
           .timeout(Duration(seconds: requestTimeout));
     } on TimeoutException catch (_) {
       // Fluttertoast.showToast(
@@ -61,7 +60,7 @@ class Request {
       Map<String, String>? param}) async {
     Response response;
     try {
-      response = await post(Uri.http(host, path!, param),
+      response = await post(Uri.https(host, path!, param),
               headers: headers, body: jsonEncode(body))
           .timeout(Duration(seconds: requestTimeout));
     } on TimeoutException catch (_) {
@@ -104,7 +103,7 @@ class Request {
       required Map<String, dynamic>? param}) async {
     Response response;
     try {
-      response = await put(Uri.http(host, path, param),
+      response = await put(Uri.https(host, path, param),
           headers: headers, body: jsonEncode(body));
     } on TimeoutException catch (_) {
       // Fluttertoast.showToast(
@@ -188,7 +187,7 @@ class Request {
       required Map<String, dynamic>? param}) async {
     Response response;
     try {
-      response = await delete(Uri.http(host, path, param),
+      response = await delete(Uri.https(host, path, param),
               headers: headers, body: jsonEncode(body))
           .timeout(Duration(seconds: requestTimeout));
     } on TimeoutException catch (_) {