Browse Source

search plot

master
daivph 5 years ago
parent
commit
a39802b42a
3 changed files with 11 additions and 6 deletions
  1. +4
    -1
      lib/data/api/rest_client.dart
  2. +1
    -1
      lib/data/api/rest_client.g.dart
  3. +6
    -4
      lib/presentation/screens/plot/bloc/plot_bloc.dart

+ 4
- 1
lib/data/api/rest_client.dart View File

@@ -50,9 +50,12 @@ abstract class RestClient {
@PUT("/api/delete-fcmToken")
Future<void> deleteFcmToken(@Body() String token);

@GET("/api/tb-crops?page={page}&size={size}&query={query}")
//Plot
@GET(
"/api/_search/tb-crops?page={page}&size={size}&sort=id,asc&query={query}")
Future<List<Crop>> getPlots(
{@Path() int page = 0, @Path() int size = 20, @Path() String query = ""});

@GET("/api/listActivityTypesOther")
Future<List<ActionType>> getActionTypes({@DioOptions() Options options});


+ 1
- 1
lib/data/api/rest_client.g.dart View File

@@ -189,7 +189,7 @@ class _RestClient implements RestClient {
queryParameters.removeWhere((k, v) => v == null);
final _data = <String, dynamic>{};
final Response<List<dynamic>> _result = await _dio.request(
'/api/tb-crops?page=$page&size=$size&query=$query',
'/api/_search/tb-crops?page=$page&size=$size&sort=id,asc&query=$query',
queryParameters: queryParameters,
options: RequestOptions(
method: 'GET',

+ 6
- 4
lib/presentation/screens/plot/bloc/plot_bloc.dart View File

@@ -23,7 +23,8 @@ class PlotBloc extends Bloc<PlotEvent, PlotState> {
try {
if (state is PlotInitial) {
yield PlotLoading();
final response = await repository.getPlots(page: 0, size: pageSize);
final response = await repository.getPlots(
page: 0, size: pageSize, searchString: "");
yield PlotSuccess(
items: response,
page: 0,
@@ -32,8 +33,8 @@ class PlotBloc extends Bloc<PlotEvent, PlotState> {
if (state is PlotSuccess) {
final currentState = state as PlotSuccess;
int page = currentState.page + 1;
final response =
await repository.getPlots(page: page, size: pageSize);
final response = await repository.getPlots(
page: page, size: pageSize, searchString: "");
yield response.isEmpty
? currentState.copyWith(hasReachedMax: true)
: PlotSuccess(
@@ -49,7 +50,8 @@ class PlotBloc extends Bloc<PlotEvent, PlotState> {
if (event is OnRefresh) {
try {
yield PlotLoading();
final response = await repository.getPlots(page: 0, size: pageSize);
final response = await repository.getPlots(
page: 0, size: pageSize, searchString: "");
yield PlotSuccess(
items: response,
page: 0,

Loading…
Cancel
Save