Added delete on Land Faas;Added auto-refresh/auto-reload on adding new faas

feature/passo/PASSO-#1-Sync-data-from-device-to-postgre-and-vice-versa
cyzoox 2023-09-25 14:39:55 +08:00
parent b560340ebc
commit 75cfe68bd1
17 changed files with 1627 additions and 1330 deletions

View File

@ -42,7 +42,8 @@ class LandExtBloc extends Bloc<LandExtEvent, LandExtState> {
}); });
on<UpdateLandExt>((event, emit) async { on<UpdateLandExt>((event, emit) async {
final tempID = await SharedPreferences.getInstance(); final tempID = await SharedPreferences.getInstance();
final tempID2 = tempID.getInt('tempid')! - 1; final tempID2 = tempID.getInt('landid')! - 1;
http.Response response = http.Response response =
(await LandExtServices.instance.update(event.landext, tempID2))!; (await LandExtServices.instance.update(event.landext, tempID2))!;
print('landext'); print('landext');

View File

@ -59,6 +59,11 @@ class LandPropertyOwnerInfoBloc
print(event.land_loc.id!); print(event.land_loc.id!);
print('Land LOc'); print('Land LOc');
print(response.statusCode); print(response.statusCode);
if (response.statusCode == 200) {
emit(ShowLandLocSuccessAlertState());
} else {
emit(ShowLandLocErrorAlertState());
}
}); });
on<UpdateLandBoundaries>((event, emit) async { on<UpdateLandBoundaries>((event, emit) async {
@ -67,6 +72,21 @@ class LandPropertyOwnerInfoBloc
.update(event.land_boundaries, event.land_boundaries.id))!; .update(event.land_boundaries, event.land_boundaries.id))!;
print('Land Boundaries'); print('Land Boundaries');
print(response.body); print(response.body);
if (response.statusCode == 200) {
emit(ShowLandBoundariesSuccessState());
} else {
emit(ShowLandBoundariesErrorAlertState());
}
});
on<DeleteLandFaas>((event, emit) async {
print(event.id);
emit(LandLoading());
http.Response response = (await LandServices.instance.remove(event.id));
print(response.statusCode);
if (response.statusCode == 200) {
emit(LandFaasDeletedState(success: true));
}
}); });
} }
} }

View File

@ -58,3 +58,12 @@ class UpdateLandBoundaries extends LandPropertyOwnerInfoEvent {
@override @override
List<Object> get props => [land_boundaries]; List<Object> get props => [land_boundaries];
} }
class DeleteLandFaas extends LandPropertyOwnerInfoEvent {
final int id;
const DeleteLandFaas({required this.id});
@override
List<Object> get props => [id];
}

View File

@ -24,3 +24,18 @@ class LandErrorState extends LandPropertyOwnerInfoState {
@override @override
List<Object> get props => [error]; List<Object> get props => [error];
} }
class LandFaasDeletedState extends LandPropertyOwnerInfoState {
final bool success;
const LandFaasDeletedState({required this.success});
@override
List<Object> get props => [success];
}
class ShowLandLocErrorAlertState extends LandPropertyOwnerInfoState {}
class ShowLandBoundariesErrorAlertState extends LandPropertyOwnerInfoState {}
class ShowLandLocSuccessAlertState extends LandPropertyOwnerInfoState {}
class ShowLandBoundariesSuccessState extends LandPropertyOwnerInfoState {}

View File

@ -31,6 +31,8 @@ import 'package:unit2/widgets/error_state.dart';
GlobalKey<FormBuilderState> formKey = GlobalKey<FormBuilderState>(); GlobalKey<FormBuilderState> formKey = GlobalKey<FormBuilderState>();
class AddBuilding extends StatefulWidget { class AddBuilding extends StatefulWidget {
Function triggerBlocEvent;
AddBuilding(this.triggerBlocEvent);
@override @override
_AddBuilding createState() => _AddBuilding(); _AddBuilding createState() => _AddBuilding();
} }
@ -293,6 +295,7 @@ class _AddBuilding extends State<AddBuilding> {
} }
void onSAveAll() { void onSAveAll() {
return Navigator.of(context).pop(); Navigator.of(context).pop();
widget.triggerBlocEvent();
} }
} }

View File

@ -589,7 +589,7 @@ class _PropertyAssessmentPage extends State<PropertyAssessmentPage> {
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: primary, backgroundColor: primary,
foregroundColor: Colors.red), foregroundColor: Colors.red),
child: SizedBox( child: const SizedBox(
width: 200, width: 200,
height: 50, height: 50,
child: Align( child: Align(
@ -604,7 +604,7 @@ class _PropertyAssessmentPage extends State<PropertyAssessmentPage> {
), ),
), ),
), ),
SizedBox( const SizedBox(
height: 30, height: 30,
), ),
]), ]),
@ -613,10 +613,26 @@ class _PropertyAssessmentPage extends State<PropertyAssessmentPage> {
], ],
); );
} }
if (state is MemorandaErrorState) {
return SomethingWentWrong(
message: onError,
onpressed: () {
context.read<MemorandaBloc>().add(LoadMemoranda());
},
);
}
return Container(); return Container();
}, },
); );
} }
if (state is SignatoriesErrorState) {
return SomethingWentWrong(
message: onError,
onpressed: () {
context.read<SignatoriesBloc>().add(LoadSignatories());
},
);
}
return Container(); return Container();
}, },
))); )));

View File

@ -48,16 +48,16 @@ class _AddLand extends State<AddLand> {
appBar: AppBar( appBar: AppBar(
centerTitle: true, centerTitle: true,
backgroundColor: primary, backgroundColor: primary,
title: Text('Land FAAS'), title: const Text('Land FAAS'),
), ),
body: Padding( body: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Column( child: Column(
children: [ children: [
NumberStepper( NumberStepper(
numbers: [1, 2, 3, 4, 5, 6, 7], numbers: const [1, 2, 3, 4, 5, 6, 7],
activeStepColor: primary, activeStepColor: primary,
numberStyle: TextStyle(color: Colors.white), numberStyle: const TextStyle(color: Colors.white),
lineColor: primary, lineColor: primary,
// activeStep property set to activeStep variable defined above. // activeStep property set to activeStep variable defined above.
activeStep: activeStep, activeStep: activeStep,

View File

@ -12,6 +12,8 @@ import 'package:unit2/model/passo/land_value_adjustment.dart';
import 'package:unit2/model/passo/type_of_location.dart'; import 'package:unit2/model/passo/type_of_location.dart';
import 'package:unit2/model/passo/type_of_road.dart'; import 'package:unit2/model/passo/type_of_road.dart';
import 'package:unit2/theme-data.dart/form-style.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 AddLandValueAdjustmentModal extends StatefulWidget { class AddLandValueAdjustmentModal extends StatefulWidget {
// final List<UnitConstruct> unit; // final List<UnitConstruct> unit;
@ -444,7 +446,13 @@ class _AddLandValueAdjustmentModal extends State<AddLandValueAdjustmentModal> {
), ),
)); ));
} }
return Container(); if (state is TypeOfLocationErrorState) {
return SomethingWentWrong(
message: onError,
onpressed: () {
context
.read<TypeOfLocationBloc>()
.add(LoadTypeOfLocation());
}, },
); );
} }
@ -452,7 +460,30 @@ class _AddLandValueAdjustmentModal extends State<AddLandValueAdjustmentModal> {
}, },
); );
} }
if (state is LandAppraisalErrorState) {
return SomethingWentWrong(
message: onError,
onpressed: () {
context
.read<LandAppraisalBloc>()
.add(LoadLandAppraisal());
},
);
}
return Container();
},
);
}
if (state is LandValueAdjustmentsErrorState) {
return SomethingWentWrong(
message: onError,
onpressed: () {
context
.read<LandValueAdjustmentsBloc>()
.add(LoadLandValueAdjustments());
},
);
}
return Container(); return Container();
}); });
} }

View File

@ -1,5 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.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:intl/intl.dart';
import 'package:unit2/bloc/passo/land/land_appraisal/land_appraisal_bloc.dart'; import 'package:unit2/bloc/passo/land/land_appraisal/land_appraisal_bloc.dart';
import 'package:unit2/model/passo/land_appr.dart'; import 'package:unit2/model/passo/land_appr.dart';
@ -32,9 +34,25 @@ class _LandAppraisal extends State<LandAppraisal> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BlocConsumer<LandAppraisalBloc, LandAppraisalState>( return Scaffold(
body: ProgressHUD(
padding: const EdgeInsets.all(24),
backgroundColor: Colors.black87,
indicatorWidget: const SpinKitFadingCircle(color: Colors.white),
child: BlocConsumer<LandAppraisalBloc, LandAppraisalState>(
listener: (context, state) { listener: (context, state) {
// TODO: implement listener 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) { }, builder: (context, state) {
final state = context.watch<LandAppraisalBloc>().state; final state = context.watch<LandAppraisalBloc>().state;
if (state is LandAppraisalLoaded) { if (state is LandAppraisalLoaded) {
@ -114,8 +132,8 @@ class _LandAppraisal extends State<LandAppraisal> {
DataCell(Text( DataCell(Text(
((double.parse(dataRow.unitValue!))) ((double.parse(dataRow.unitValue!)))
.toString())), .toString())),
DataCell(Text( DataCell(Text(((double.parse(
((double.parse(dataRow.baseMarketval!))) dataRow.baseMarketval!)))
.toString())), .toString())),
DataCell(Row( DataCell(Row(
children: [ children: [
@ -219,7 +237,9 @@ class _LandAppraisal extends State<LandAppraisal> {
successAlert(context, "Deletion Successful", successAlert(context, "Deletion Successful",
"Extra item has been deleted successfully", () { "Extra item has been deleted successfully", () {
Navigator.of(context).pop(); Navigator.of(context).pop();
context.read<LandAppraisalBloc>().add(const LoadLandAppraisal()); context
.read<LandAppraisalBloc>()
.add(const LoadLandAppraisal());
}); });
}); });
} }
@ -255,6 +275,8 @@ class _LandAppraisal extends State<LandAppraisal> {
); );
} }
return Container(); return Container();
}); }),
),
);
} }
} }

View File

@ -1,5 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.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/bloc/passo/land/other_improvements/other_improvements_bloc.dart';
import 'package:unit2/screens/passo/Land/add_land/AddOtherImprovementModal.dart'; import 'package:unit2/screens/passo/Land/add_land/AddOtherImprovementModal.dart';
import 'package:unit2/utils/alerts.dart'; import 'package:unit2/utils/alerts.dart';
@ -30,9 +32,25 @@ class _OtherImprovementPage extends State<OtherImprovementPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BlocConsumer<OtherImprovementsBloc, OtherImprovementsState>( 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) { listener: (context, state) {
// TODO: implement listener 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) { }, builder: (context, state) {
final state = context.watch<OtherImprovementsBloc>().state; final state = context.watch<OtherImprovementsBloc>().state;
if (state is OtherImprovementLoaded) { if (state is OtherImprovementLoaded) {
@ -120,14 +138,16 @@ class _OtherImprovementPage extends State<OtherImprovementPage> {
DataCell(Text(dataRow.fruitBearing! DataCell(Text(dataRow.fruitBearing!
? "Fruit Bearing" ? "Fruit Bearing"
: "Non-Fruit Bearing")), : "Non-Fruit Bearing")),
DataCell(Text(dataRow.quantity.toString()!)),
DataCell( DataCell(
Text(dataRow.noOfProductive.toString()!)), Text(dataRow.quantity.toString()!)),
DataCell(Text( DataCell(Text(
dataRow.noOfNonproductive.toString()!)), dataRow.noOfProductive.toString()!)),
DataCell(Text(dataRow.unitValue.toString()!)), DataCell(Text(dataRow.noOfNonproductive
.toString()!)),
DataCell( DataCell(
Text(dataRow.baseMarketval.toString()!)), Text(dataRow.unitValue.toString()!)),
DataCell(Text(
dataRow.baseMarketval.toString()!)),
DataCell(Row( DataCell(Row(
children: [ children: [
InkWell( InkWell(
@ -258,6 +278,8 @@ class _OtherImprovementPage extends State<OtherImprovementPage> {
); );
} }
return Container(); return Container();
}); }),
),
);
} }
} }

View File

@ -1,5 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.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_property_assessment/land_property_assessment_bloc.dart'; import 'package:unit2/bloc/passo/land/land_property_assessment/land_property_assessment_bloc.dart';
import 'package:unit2/screens/passo/Land/add_land/AddPropertyAssessmentModal.dart'; import 'package:unit2/screens/passo/Land/add_land/AddPropertyAssessmentModal.dart';
import 'package:unit2/utils/alerts.dart'; import 'package:unit2/utils/alerts.dart';
@ -30,9 +32,25 @@ class _LandPropertyAssessmentPage extends State<LandPropertyAssessmentPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BlocConsumer<LandPropertyAssessmentBloc, 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) { LandPropertyAssessmentState>(listener: (context, state) {
// TODO: implement listener 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) { }, builder: (context, state) {
final state = context.watch<LandPropertyAssessmentBloc>().state; final state = context.watch<LandPropertyAssessmentBloc>().state;
if (state is LandPropertyAssessmentLoaded) { if (state is LandPropertyAssessmentLoaded) {
@ -238,6 +256,8 @@ class _LandPropertyAssessmentPage extends State<LandPropertyAssessmentPage> {
); );
} }
return Container(); return Container();
}); }),
),
);
} }
} }

View File

@ -1,6 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_form_builder/flutter_form_builder.dart'; import 'package:flutter_form_builder/flutter_form_builder.dart';
import 'package:flutter_progress_hud/flutter_progress_hud.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart';
import 'package:form_builder_validators/form_builder_validators.dart'; import 'package:form_builder_validators/form_builder_validators.dart';
import 'package:searchfield/searchfield.dart'; import 'package:searchfield/searchfield.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
@ -12,6 +14,8 @@ import 'package:unit2/model/passo/memoranda.dart';
import 'package:unit2/model/passo/signatories.dart'; import 'package:unit2/model/passo/signatories.dart';
import 'package:unit2/screens/passo/Land/add_land.dart'; import 'package:unit2/screens/passo/Land/add_land.dart';
import 'package:unit2/theme-data.dart/colors.dart'; import 'package:unit2/theme-data.dart/colors.dart';
import 'package:unit2/utils/text_container.dart';
import 'package:unit2/widgets/error_state.dart';
class LandSignatories extends StatefulWidget { class LandSignatories extends StatefulWidget {
Function onSAve; Function onSAve;
@ -28,22 +32,54 @@ class _LandSignatories extends State<LandSignatories> {
String _memoranda = ""; String _memoranda = "";
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BlocConsumer<LandExtBloc, LandExtState>( return Scaffold(
body: ProgressHUD(
padding: const EdgeInsets.all(24),
backgroundColor: Colors.black87,
indicatorWidget: const SpinKitFadingCircle(color: Colors.white),
child: BlocConsumer<LandExtBloc, LandExtState>(
listener: (context, state) { listener: (context, state) {
// TODO: implement listener if (state is LandExtLoading) {
final progress = ProgressHUD.of(context);
progress!.showWithText("Please wait...");
}
if (state is LandExtErrorState) {
final progress = ProgressHUD.of(context);
progress?.dismiss();
}
}, },
builder: (context, state) { builder: (context, state) {
if (state is LandExtLoaded) { if (state is LandExtLoaded) {
return BlocConsumer<SignatoriesBloc, SignatoriesState>( return BlocConsumer<SignatoriesBloc, SignatoriesState>(
listener: (context, state) { 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) { builder: (context, state) {
if (state is SignatoriesLoaded) { if (state is SignatoriesLoaded) {
final signatories = state.signatories; final signatories = state.signatories;
return BlocConsumer<MemorandaBloc, MemorandaState>( return BlocConsumer<MemorandaBloc, MemorandaState>(
listener: (context, state) { 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) { builder: (context, state) {
if (state is MemorandaLoaded) { if (state is MemorandaLoaded) {
@ -55,11 +91,13 @@ class _LandSignatories extends State<LandSignatories> {
left: 0, top: 20, right: 0, bottom: 10), left: 0, top: 20, right: 0, bottom: 10),
child: const Text('PROPERTY ASSESSMENT cont..', child: const Text('PROPERTY ASSESSMENT cont..',
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontSize: 18), fontWeight: FontWeight.bold,
fontSize: 18),
textAlign: TextAlign.left), textAlign: TextAlign.left),
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment:
MainAxisAlignment.spaceAround,
children: [ children: [
Row( Row(
children: [ children: [
@ -98,7 +136,8 @@ class _LandSignatories extends State<LandSignatories> {
), ),
const Text( const Text(
'EFFECTIVITY OF ASSESSMENT / REASSESSMENT :', 'EFFECTIVITY OF ASSESSMENT / REASSESSMENT :',
style: TextStyle(fontWeight: FontWeight.bold), style:
TextStyle(fontWeight: FontWeight.bold),
), ),
const SizedBox( const SizedBox(
height: 20, height: 20,
@ -139,7 +178,8 @@ class _LandSignatories extends State<LandSignatories> {
left: 0, top: 40, right: 0, bottom: 10), left: 0, top: 40, right: 0, bottom: 10),
child: const Text('SIGNATORIES', child: const Text('SIGNATORIES',
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontSize: 18), fontWeight: FontWeight.bold,
fontSize: 18),
textAlign: TextAlign.left), textAlign: TextAlign.left),
), ),
const SizedBox( const SizedBox(
@ -154,7 +194,8 @@ class _LandSignatories extends State<LandSignatories> {
), ),
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment:
MainAxisAlignment.spaceAround,
children: [ children: [
Column( Column(
children: [ children: [
@ -189,8 +230,8 @@ class _LandSignatories extends State<LandSignatories> {
initialValue: DateTime.now(), initialValue: DateTime.now(),
inputType: InputType.date, inputType: InputType.date,
initialTime: initialTime: const TimeOfDay(
const TimeOfDay(hour: 8, minute: 0), hour: 8, minute: 0),
// locale: const Locale.fromSubtags(languageCode: 'fr'), // locale: const Locale.fromSubtags(languageCode: 'fr'),
), ),
), ),
@ -206,10 +247,12 @@ class _LandSignatories extends State<LandSignatories> {
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Text( child: Text(
'RECOMMENDING APPROVAL:', 'RECOMMENDING APPROVAL:',
style: TextStyle(fontWeight: FontWeight.bold), style:
TextStyle(fontWeight: FontWeight.bold),
)), )),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment:
MainAxisAlignment.spaceAround,
children: [ children: [
Column( Column(
children: [ children: [
@ -244,8 +287,8 @@ class _LandSignatories extends State<LandSignatories> {
initialValue: DateTime.now(), initialValue: DateTime.now(),
inputType: InputType.date, inputType: InputType.date,
initialTime: initialTime: const TimeOfDay(
const TimeOfDay(hour: 8, minute: 0), hour: 8, minute: 0),
// locale: const Locale.fromSubtags(languageCode: 'fr'), // locale: const Locale.fromSubtags(languageCode: 'fr'),
), ),
), ),
@ -301,8 +344,8 @@ class _LandSignatories extends State<LandSignatories> {
initialValue: DateTime.now(), initialValue: DateTime.now(),
inputType: InputType.date, inputType: InputType.date,
initialTime: initialTime: const TimeOfDay(
const TimeOfDay(hour: 8, minute: 0), hour: 8, minute: 0),
// locale: const Locale.fromSubtags(languageCode: 'fr'), // locale: const Locale.fromSubtags(languageCode: 'fr'),
), ),
), ),
@ -338,7 +381,8 @@ class _LandSignatories extends State<LandSignatories> {
child: ListTile( child: ListTile(
title: Text( title: Text(
'${memoranda.memoranda}', '${memoranda.memoranda}',
overflow: TextOverflow.ellipsis, overflow:
TextOverflow.ellipsis,
), ),
), ),
)) ))
@ -365,7 +409,8 @@ class _LandSignatories extends State<LandSignatories> {
height: 30, height: 30,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [ children: [
Text('Sworn Statement No. :'), Text('Sworn Statement No. :'),
SizedBox( SizedBox(
@ -374,7 +419,8 @@ class _LandSignatories extends State<LandSignatories> {
child: FormBuilderTextField( child: FormBuilderTextField(
name: 'sworn_statement_land', name: 'sworn_statement_land',
decoration: InputDecoration(), decoration: InputDecoration(),
validator: FormBuilderValidators.compose([]), validator:
FormBuilderValidators.compose([]),
), ),
), ),
], ],
@ -383,7 +429,8 @@ class _LandSignatories extends State<LandSignatories> {
height: 30, height: 30,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [ children: [
Text('Date Received:'), Text('Date Received:'),
SizedBox( SizedBox(
@ -407,7 +454,8 @@ class _LandSignatories extends State<LandSignatories> {
height: 30, height: 30,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [ children: [
Text('Date of Entry in the Rec. of Ass. :'), Text('Date of Entry in the Rec. of Ass. :'),
SizedBox( SizedBox(
@ -431,7 +479,8 @@ class _LandSignatories extends State<LandSignatories> {
height: 30, height: 30,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [ children: [
Text('By:'), Text('By:'),
SizedBox( SizedBox(
@ -440,7 +489,8 @@ class _LandSignatories extends State<LandSignatories> {
child: FormBuilderTextField( child: FormBuilderTextField(
name: 'by_land', name: 'by_land',
decoration: InputDecoration(), decoration: InputDecoration(),
validator: FormBuilderValidators.compose([]), validator:
FormBuilderValidators.compose([]),
), ),
), ),
], ],
@ -457,19 +507,24 @@ class _LandSignatories extends State<LandSignatories> {
tempID.getInt('landid')! - 1, tempID.getInt('landid')! - 1,
taxable: isTaxable, taxable: isTaxable,
exempt: isExempt, exempt: isExempt,
qtr: int.parse( qtr: int.parse(landKey
landKey.currentState!.value['land_qtr']), .currentState!.value['land_qtr']),
yr: int.parse( yr: int.parse(landKey
landKey.currentState!.value['land_yr']), .currentState!.value['land_yr']),
appraisedbyName: landKey.currentState!.value['appraised_by_land'].firstname + appraisedbyName: landKey
.currentState!
.value['appraised_by_land']
.firstname +
' ' + ' ' +
landKey landKey
.currentState! .currentState!
.value['appraised_by_land'] .value['appraised_by_land']
.middlename + .middlename +
' ' + ' ' +
landKey.currentState! landKey
.value['appraised_by_land'].lastname, .currentState!
.value['appraised_by_land']
.lastname,
appraisedbyDate: landKey appraisedbyDate: landKey
.currentState!.value['app_date_land'], .currentState!.value['app_date_land'],
recommendapprName: landKey recommendapprName: landKey
@ -477,20 +532,11 @@ class _LandSignatories extends State<LandSignatories> {
.value['rec_approval_land'] .value['rec_approval_land']
.firstname + .firstname +
' ' + ' ' +
landKey landKey.currentState!.value['rec_approval_land'].middlename +
.currentState!
.value['rec_approval_land']
.middlename +
' ' + ' ' +
landKey.currentState! landKey.currentState!.value['rec_approval_land'].lastname,
.value['rec_approval_land'].lastname, recommendapprDate: landKey.currentState!.value['rec_date_land'],
recommendapprDate: landKey approvedbyName: landKey.currentState!.value['apprvd_by_land'].firstname + ' ' + landKey.currentState!.value['apprvd_by_land'].middlename + ' ' + landKey.currentState!.value['apprvd_by_land'].lastname,
.currentState!.value['rec_date_land'],
approvedbyName: landKey.currentState!.value['apprvd_by_land'].firstname +
' ' +
landKey.currentState!.value['apprvd_by_land'].middlename +
' ' +
landKey.currentState!.value['apprvd_by_land'].lastname,
approvedbyDate: landKey.currentState!.value['apprvd_by_date_land'], approvedbyDate: landKey.currentState!.value['apprvd_by_date_land'],
memoranda: _memoranda, memoranda: _memoranda,
swornstatementNo: landKey.currentState!.value['sworn_statement_land'], swornstatementNo: landKey.currentState!.value['sworn_statement_land'],
@ -498,9 +544,10 @@ class _LandSignatories extends State<LandSignatories> {
entryDateAssessment: landKey.currentState!.value['date_of_entry_land'], entryDateAssessment: landKey.currentState!.value['date_of_entry_land'],
entryDateBy: landKey.currentState!.value['by_land']); entryDateBy: landKey.currentState!.value['by_land']);
print(ext.toJson());
context.read<LandExtBloc>() context.read<LandExtBloc>()
..add(UpdateLandExt(landext: ext)); ..add(UpdateLandExt(landext: ext));
widget.onSAve(); // widget.onSAve();
}, },
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: primary, backgroundColor: primary,
@ -526,7 +573,13 @@ class _LandSignatories extends State<LandSignatories> {
], ],
)); ));
} }
return Container(); if (state is MemorandaErrorState) {
return SomethingWentWrong(
message: onError,
onpressed: () {
context
.read<MemorandaBloc>()
.add(LoadMemoranda());
}, },
); );
} }
@ -534,8 +587,30 @@ class _LandSignatories extends State<LandSignatories> {
}, },
); );
} }
if (state is SignatoriesErrorState) {
return SomethingWentWrong(
message: onError,
onpressed: () {
context.read<SignatoriesBloc>().add(LoadSignatories());
},
);
}
return Container(); return Container();
}, },
); );
} }
if (state is LandExtErrorState) {
return SomethingWentWrong(
message: onError,
onpressed: () {
context.read<LandExtBloc>().add(LoadLandExt());
},
);
}
return Container();
},
),
),
);
}
} }

View File

@ -1,5 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.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/bloc/passo/land/land_value_adjustments/land_value_adjustments_bloc.dart';
import 'package:unit2/screens/passo/Land/add_land/AddLandValueAdjustmentModal.dart'; import 'package:unit2/screens/passo/Land/add_land/AddLandValueAdjustmentModal.dart';
import 'package:unit2/utils/alerts.dart'; import 'package:unit2/utils/alerts.dart';
@ -30,9 +32,26 @@ class _ValueAdjustmentPage extends State<ValueAdjustmentPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BlocConsumer<LandValueAdjustmentsBloc, LandValueAdjustmentsState>( 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) { listener: (context, state) {
// TODO: implement listener 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) { }, builder: (context, state) {
final state = context.watch<LandValueAdjustmentsBloc>().state; final state = context.watch<LandValueAdjustmentsBloc>().state;
if (state is LandValueAdjustmentsLoaded) { if (state is LandValueAdjustmentsLoaded) {
@ -107,7 +126,8 @@ class _ValueAdjustmentPage extends State<ValueAdjustmentPage> {
return DataRow( return DataRow(
cells: [ cells: [
DataCell(Text(dataRow.baseMarketval!)), DataCell(Text(dataRow.baseMarketval!)),
DataCell(Text(dataRow.adjustmentFactors!)), DataCell(
Text(dataRow.adjustmentFactors!)),
DataCell(Text(dataRow.adjustment!)), DataCell(Text(dataRow.adjustment!)),
DataCell(Text(dataRow.valueAdjustment!)), DataCell(Text(dataRow.valueAdjustment!)),
DataCell(Text(dataRow.marketValue!)), DataCell(Text(dataRow.marketValue!)),
@ -241,6 +261,8 @@ class _ValueAdjustmentPage extends State<ValueAdjustmentPage> {
); );
} }
return Container(); return Container();
}); }),
),
);
} }
} }

View File

@ -72,6 +72,11 @@ class BuildingHome extends StatelessWidget {
context.read<PropertyInfoBloc>().add(DeleteBuildingFaas(id: itemId)); context.read<PropertyInfoBloc>().add(DeleteBuildingFaas(id: itemId));
} }
void triggerBlocEvent() {
final myBloc = BlocProvider.of<PropertyInfoBloc>(context);
myBloc.add(LoadPropertyInfo());
}
return Scaffold( return Scaffold(
body: ProgressHUD( body: ProgressHUD(
backgroundColor: Colors.black87, backgroundColor: Colors.black87,
@ -206,7 +211,7 @@ class BuildingHome extends StatelessWidget {
BlocProvider( BlocProvider(
create: (context) => create: (context) =>
MemorandaBloc()..add(LoadMemoranda())), MemorandaBloc()..add(LoadMemoranda())),
], child: AddBuilding()); ], child: AddBuilding(triggerBlocEvent));
})); }));
}), }),
SpeedDialChild( SpeedDialChild(

View File

@ -5,17 +5,10 @@ import 'package:flutter_spinkit/flutter_spinkit.dart';
import 'package:unit2/bloc/passo/barangay/barangay_bloc.dart'; import 'package:unit2/bloc/passo/barangay/barangay_bloc.dart';
import 'package:unit2/bloc/passo/bulding/additional_item/additional_item_bloc.dart'; import 'package:unit2/bloc/passo/bulding/additional_item/additional_item_bloc.dart';
import 'package:unit2/bloc/passo/bulding/additional_items_edit/additional_items_edit_bloc.dart';
import 'package:unit2/bloc/passo/bulding/class_components/class_components_bloc.dart'; import 'package:unit2/bloc/passo/bulding/class_components/class_components_bloc.dart';
import 'package:unit2/bloc/passo/bulding/general_description/general_description_bloc.dart';
import 'package:unit2/bloc/passo/bulding/landref/landref_bloc.dart';
import 'package:unit2/bloc/passo/bulding/location/location_bloc.dart';
import 'package:unit2/bloc/passo/bulding/property_appraisal/property_appraisal_bloc.dart'; import 'package:unit2/bloc/passo/bulding/property_appraisal/property_appraisal_bloc.dart';
import 'package:unit2/bloc/passo/bulding/property_appraisal_edit/property_appraisal_edit_bloc.dart';
import 'package:unit2/bloc/passo/bulding/property_assessment/property_assessment_bloc.dart'; import 'package:unit2/bloc/passo/bulding/property_assessment/property_assessment_bloc.dart';
import 'package:unit2/bloc/passo/bulding/property_assessment_edit/property_assessment_edit_bloc.dart';
import 'package:unit2/bloc/passo/bulding/property_info/property_info_bloc.dart'; import 'package:unit2/bloc/passo/bulding/property_info/property_info_bloc.dart';
import 'package:unit2/bloc/passo/bulding/structural_material/structural_material_bloc.dart';
import 'package:unit2/bloc/passo/bulding/unit_construct/unit_construct_bloc.dart'; import 'package:unit2/bloc/passo/bulding/unit_construct/unit_construct_bloc.dart';
import 'package:unit2/bloc/passo/land/land_appraisal/land_appraisal_bloc.dart'; 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_boundaries_edit/land_boundaries_edit_bloc.dart';
@ -38,42 +31,39 @@ import 'package:unit2/bloc/passo/municipality/municipality_bloc.dart';
import 'package:unit2/bloc/passo/signatories/signatories_bloc.dart'; import 'package:unit2/bloc/passo/signatories/signatories_bloc.dart';
import 'package:unit2/bloc/user/user_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_appr.dart';
import 'package:unit2/model/passo/land_ext.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_assessment.dart';
import 'package:unit2/model/passo/land_property_boundaries.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_loc.dart';
import 'package:unit2/model/passo/land_property_owner.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/land_value_adjustment.dart';
import 'package:unit2/model/passo/other_improvements.dart'; import 'package:unit2/model/passo/other_improvements.dart';
import 'package:unit2/model/passo/property_appraisal.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';
import 'package:unit2/model/passo/property_info.dart';
import 'package:unit2/model/passo/structural_materials_ii.dart';
import 'package:unit2/model/passo/structureMaterial.dart';
import 'package:unit2/model/profile/basic_information/primary-information.dart'; import 'package:unit2/model/profile/basic_information/primary-information.dart';
import 'package:unit2/screens/passo/Building/add_building.dart'; import 'package:unit2/screens/passo/Building/add_building.dart';
import 'package:unit2/screens/passo/Building/edit_building.dart';
import 'package:unit2/screens/passo/Land/add_land.dart'; import 'package:unit2/screens/passo/Land/add_land.dart';
import 'package:unit2/screens/passo/Land/edit_land.dart'; import 'package:unit2/screens/passo/Land/edit_land.dart';
import 'package:unit2/screens/passo/Test%20Envi/multi_dropdown.dart';
import 'package:unit2/screens/passo/Test%20Envi/speed_dial.dart';
import 'package:unit2/theme-data.dart/colors.dart'; import 'package:unit2/theme-data.dart/colors.dart';
import 'package:unit2/utils/alerts.dart';
import 'package:unit2/utils/text_container.dart'; import 'package:unit2/utils/text_container.dart';
import 'package:unit2/widgets/error_state.dart'; import 'package:unit2/widgets/error_state.dart';
import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart';
import '../../model/passo/bldg_loc.dart';
class LandHome extends StatelessWidget { class LandHome extends StatelessWidget {
const LandHome({super.key}); const LandHome({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
void deleteItem(int itemId) {
context.read<LandPropertyOwnerInfoBloc>().add(DeleteLandFaas(id: itemId));
}
void triggerBlocEvent() {
final myBloc = BlocProvider.of<PropertyInfoBloc>(context);
myBloc.add(LoadPropertyInfo());
}
int? profileId; int? profileId;
String? token; String? token;
Profile profile; Profile profile;
@ -114,8 +104,8 @@ class LandHome extends StatelessWidget {
shrinkWrap: true, shrinkWrap: true,
itemCount: propertyList.length, itemCount: propertyList.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return _listCard( return _listCard(propertyList[index], context,
propertyList[index], context, index); index, deleteItem);
}, },
), ),
), ),
@ -133,6 +123,20 @@ class LandHome extends StatelessWidget {
}, },
); );
} }
if (state is LandFaasDeletedState) {
if (state.success) {
WidgetsBinding.instance.addPostFrameCallback((_) {
successAlert(context, "Deletion Successful",
"Land FAAS Data has been deleted successfully", () {
Navigator.of(context).pop();
context
.read<LandPropertyOwnerInfoBloc>()
.add(const LoadLand());
});
});
}
}
return Container(); return Container();
}, },
); );
@ -195,7 +199,7 @@ class LandHome extends StatelessWidget {
BlocProvider( BlocProvider(
create: (context) => create: (context) =>
MemorandaBloc()..add(LoadMemoranda())), MemorandaBloc()..add(LoadMemoranda())),
], child: AddBuilding()); ], child: AddBuilding(triggerBlocEvent));
})); }));
}), }),
SpeedDialChild( SpeedDialChild(
@ -281,7 +285,7 @@ class LandHome extends StatelessWidget {
} }
} }
Card _listCard(LandPropertyOwner property_info, context, index) { Card _listCard(LandPropertyOwner property_info, context, index, deleteItem) {
return Card( return Card(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
@ -417,7 +421,13 @@ Card _listCard(LandPropertyOwner property_info, context, index) {
], ],
), ),
), ),
IconButton(onPressed: () {}, icon: const Icon(Icons.chevron_right)), IconButton(
onPressed: () {
deleteItem(property_info.id);
},
icon: const Icon(Icons.delete_rounded),
color: primary,
),
], ],
), ),
), ),

View File

@ -72,4 +72,29 @@ class LandServices {
} }
return response; return response;
} }
Future<http.Response> remove(id) async {
String path = Url.instance.getLandOwnerInfo();
Map<String, String> headers = {
'Content-Type': 'application/json; charset=UTF-8',
'X-Client-Key': xClientKey,
'X-Client-Secret': xClientKeySecret
};
Map<String, String> params = {
"id": id.toString(),
};
try {
http.Response response = await Request.instance
.deleteRequest(path: path, headers: headers, body: {}, param: params);
print(id);
if (response.statusCode == 200) {
print(response.body);
return response;
} else {
throw Exception(response.reasonPhrase);
}
} catch (e) {
throw e.toString();
}
}
} }

View File

@ -5,11 +5,11 @@ class Url {
String host() { String host() {
// return '192.168.10.183:3000'; // return '192.168.10.183:3000';
return 'agusandelnorte.gov.ph'; // return 'agusandelnorte.gov.ph';
// return "192.168.10.219:3000"; // return "192.168.10.219:3000";
// return "192.168.10.241"; // return "192.168.10.241";
// return "192.168.10.221:3004"; // return "192.168.10.221:3004";
// return "playweb.agusandelnorte.gov.ph"; return "playweb.agusandelnorte.gov.ph";
// return 'devapi.agusandelnorte.gov.ph:3004'; // return 'devapi.agusandelnorte.gov.ph:3004';
// return "192.168.10.218:8000"; // return "192.168.10.218:8000";
} }
@ -344,7 +344,8 @@ class Url {
String getBarangays() { String getBarangays() {
return "/api/web_app/location/barangay/"; return "/api/web_app/location/barangay/";
} }
String getPurok(){
String getPurok() {
return "/api/web_app/location/purok/"; return "/api/web_app/location/purok/";
} }