Browse Source

action user water (doing)

master
daivph 5 years ago
parent
commit
559f7a2f42
6 changed files with 410 additions and 12 deletions
  1. +1
    -1
      ios/Flutter/.last_build_id
  2. +17
    -5
      lib/custom_model/UseWater.dart
  3. +18
    -0
      lib/custom_model/WaterType.dart
  4. +357
    -4
      lib/presentation/screens/actions/use_water/sc_edit_action_user_water.dart
  5. +12
    -2
      lib/presentation/screens/plot_detail/sc_plot_action.dart
  6. +5
    -0
      lib/utils/const_common.dart

+ 1
- 1
ios/Flutter/.last_build_id View File

0d1f90510e22958a585802bb59f9c570
eb141365fb69a4e0decadd2584d53516

+ 17
- 5
lib/custom_model/UseWater.dart View File

class UseWater { class UseWater {
int id; int id;
int activityId;
int cropId; int cropId;
String executeDate; String executeDate;
String description;
String media;
String waterType; String waterType;
num amount; num amount;
String description;
String executeBy;


UseWater( UseWater(
{this.id, {this.id,
this.activityId,
this.cropId, this.cropId,
this.executeDate, this.executeDate,
this.description,
this.media,
this.waterType, this.waterType,
this.amount});
this.amount,
this.description,
this.executeBy});


UseWater.fromJson(Map<String, dynamic> json) { UseWater.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
activityId = json['activityId'];
cropId = json['cropId']; cropId = json['cropId'];
executeDate = json['executeDate']; executeDate = json['executeDate'];
description = json['description'];
media = json['media'];
waterType = json['waterType']; waterType = json['waterType'];
amount = json['amount']; amount = json['amount'];
description = json['description'];
executeBy = json['executeBy'];
} }


Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id; data['id'] = this.id;
data['activityId'] = this.activityId;
data['cropId'] = this.cropId; data['cropId'] = this.cropId;
data['executeDate'] = this.executeDate; data['executeDate'] = this.executeDate;
data['description'] = this.description;
data['media'] = this.media;
data['waterType'] = this.waterType; data['waterType'] = this.waterType;
data['amount'] = this.amount; data['amount'] = this.amount;
data['description'] = this.description;
data['executeBy'] = this.executeBy;
return data; return data;
} }
} }

+ 18
- 0
lib/custom_model/WaterType.dart View File

class WaterType {
String waterTypeName;
String waterTypeDescription;

WaterType({this.waterTypeName, this.waterTypeDescription});

WaterType.fromJson(Map<String, dynamic> json) {
waterTypeName = json['waterTypeName'];
waterTypeDescription = json['waterTypeDescription'];
}

Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['waterTypeName'] = this.waterTypeName;
data['waterTypeDescription'] = this.waterTypeDescription;
return data;
}
}

+ 357
- 4
lib/presentation/screens/actions/use_water/sc_edit_action_user_water.dart View File

import 'dart:convert';

import 'package:farm_tpf/custom_model/UseWater.dart';
import 'package:farm_tpf/custom_model/WaterType.dart';
import 'package:farm_tpf/data/api/app_exception.dart';
import 'package:farm_tpf/data/repository/repository.dart';
import 'package:farm_tpf/presentation/custom_widgets/bloc/media_helper_bloc.dart';
import 'package:farm_tpf/presentation/custom_widgets/widget_loading.dart';
import 'package:farm_tpf/presentation/custom_widgets/widget_media_picker.dart';
import 'package:farm_tpf/presentation/screens/actions/bloc/action_detail_bloc.dart';
import 'package:farm_tpf/presentation/screens/actions/state_management_helper/change_file_controller.dart';
import 'package:farm_tpf/utils/const_common.dart';
import 'package:farm_tpf/utils/const_string.dart'; import 'package:farm_tpf/utils/const_string.dart';
import 'package:farm_tpf/utils/const_style.dart';
import 'package:farm_tpf/utils/pref.dart';
import 'package:farm_tpf/utils/validators.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
import 'package:get/get.dart';
import 'package:intl/intl.dart';
import 'package:keyboard_dismisser/keyboard_dismisser.dart';
import 'package:pattern_formatter/pattern_formatter.dart';
import 'package:farm_tpf/utils/formatter.dart';

import '../util_action.dart';


class EditActionUseWaterScreen extends StatefulWidget { class EditActionUseWaterScreen extends StatefulWidget {
final int cropId;
final bool isEdit;
final int activityId;
EditActionUseWaterScreen(
{@required this.cropId, this.isEdit = false, this.activityId});
@override @override
_EditActionUseWaterScreenState createState() => _EditActionUseWaterScreenState createState() =>
_EditActionUseWaterScreenState(); _EditActionUseWaterScreenState();
} }


class _EditActionUseWaterScreenState extends State<EditActionUseWaterScreen> { class _EditActionUseWaterScreenState extends State<EditActionUseWaterScreen> {
final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
final _repository = Repository();
GlobalKey<FormState> _formKey = GlobalKey();
bool _autoValidate = false;
UseWater _useWater = UseWater();
var pref = LocalPref();
TextEditingController _waterTypeController = TextEditingController();
TextEditingController _amountController = TextEditingController();
TextEditingController _descriptionController = TextEditingController();

String executeTimeView;
DateTime executeTime = DateTime.now();
List<String> filePaths = List<String>();
var changeFileController = Get.put(ChangeFileController());

@override @override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(plot_action_use_water),
void initState() {
super.initState();
changeFileController.initValue();
var parsedExecuteDate =
DateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(executeTime);
_useWater.executeDate = "$parsedExecuteDate";
executeTimeView = DateFormat("dd/MM/yyyy HH:mm").format(executeTime);
_useWater.cropId = widget.cropId;
}

_validateInputs() async {
if (_formKey.currentState.validate()) {
_formKey.currentState.save();
LoadingDialog.showLoadingDialog(context);
filePaths = Get.find<ChangeFileController>().files;
//Create request general model
try {
var activityUseWater = jsonEncode(_useWater.toJson()).toString();
//ADD NEW
if (_useWater.activityId == null) {
_repository.createAction((value) {
LoadingDialog.hideLoadingDialog(context);
Get.back(result: value);
Get.snackbar(label_add_success, "Hoạt động sử dụng nước",
snackPosition: SnackPosition.BOTTOM);
}, (error) {
LoadingDialog.hideLoadingDialog(context);
_scaffoldKey.currentState.showSnackBar(SnackBar(
content: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Flexible(child: Text(AppException.handleError(error))),
Icon(Icons.error),
],
),
backgroundColor: Colors.red,
duration: Duration(seconds: 3),
));
},
apiAddAction: ConstCommon.apiAddUserWater,
paramActivity: ConstCommon.paramsActionUseWater,
activityAction: activityUseWater,
filePaths: filePaths);
} else {
//UPDATE
_repository.updateAction((value) {
LoadingDialog.hideLoadingDialog(context);
Get.back(result: value);
Get.snackbar(label_update_success, "Hoạt động sử dụng nước",
snackPosition: SnackPosition.BOTTOM);
}, (error) {
LoadingDialog.hideLoadingDialog(context);
_scaffoldKey.currentState.showSnackBar(SnackBar(
content: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Flexible(child: Text(AppException.handleError(error))),
Icon(Icons.error),
],
),
backgroundColor: Colors.red,
duration: Duration(seconds: 3),
));
},
apiUpdateAction: ConstCommon.apiUpdateUseWater,
paramActivity: ConstCommon.paramsActionUseWater,
activityAction: activityUseWater,
filePaths: filePaths);
}
} catch (e) {
LoadingDialog.hideLoadingDialog(context);
print(e.toString());
}
} else {
_autoValidate = true;
}
}

Widget _btnExecuteTimePicker() {
return FlatButton(
padding: EdgeInsets.only(top: 0.0, right: 0.0, bottom: 0.0, left: 0.0),
onPressed: () {
DatePicker.showDateTimePicker(context,
showTitleActions: true, onChanged: (date) {}, onConfirm: (date) {
setState(() {
var parsedDate =
DateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(date);
_useWater.executeDate = "$parsedDate";
executeTimeView = DateFormat("dd/MM/yyyy HH:mm").format(date);
});
}, currentTime: executeTime, locale: LocaleType.vi);
},
child: Container(
padding:
EdgeInsets.only(top: 0.0, right: 0.0, bottom: 10.5, left: 0.0),
decoration: BoxDecoration(
border: kBorderTextField,
),
child: Row(
children: [
Expanded(
child: Text(
//TODO: check condition
executeTimeView == null ? "$executeTime" : executeTimeView,
style: TextStyle(fontSize: 14.0, color: Colors.black87),
)),
Icon(
Icons.date_range,
color: Colors.blue,
),
],
)));
}

Widget _amountField() {
return TextFormField(
keyboardType: TextInputType.numberWithOptions(decimal: true),
inputFormatters: [
ThousandsFormatter(
formatter: NumberFormat("#,###.##", "es"), allowFraction: true)
],
decoration: InputDecoration(labelText: "Thể tích nước sử dụng"),
controller: _amountController,
validator: (String value) {
return Validators.validNumber(value, "Thể tích nước sử dụng");
},
onSaved: (newValue) {
_useWater.amount = newValue.parseDoubleThousand();
},
);
}

Widget _descriptionField() {
return TextFormField(
keyboardType: TextInputType.text,
decoration: InputDecoration(labelText: "Ghi chú"),
controller: _descriptionController,
onSaved: (newValue) {
_useWater.description = newValue;
},
);
}

Widget _typeWater() {
var waterTypes = List<WaterType>();
waterTypes.add(WaterType()
..waterTypeName = "name"
..waterTypeDescription = "description");
waterTypes.add(WaterType()
..waterTypeName = "name1"
..waterTypeDescription = "description1");
waterTypes.add(WaterType()
..waterTypeName = "name2"
..waterTypeDescription = "description2");
return Container(
height: 150,
child: ListView.builder(
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (context, index) {
return GestureDetector(
child: RadioListTile(
title: Text(waterTypes[index].waterTypeDescription ?? ""),
value: waterTypes[index],
groupValue: 1 == 1 ? null : waterTypes[0],
onChanged: (WaterType value) {
print("selected value: ${value.waterTypeName}");
}),
onTap: () {});
},
itemCount: waterTypes.length,
), ),
); );
} }

_actionAppBar() {
IconButton iconButton;
if (1 == 1) {
iconButton = IconButton(
icon: Icon(
Icons.done,
color: Colors.black,
),
onPressed: () {
FocusScopeNode currentFocus = FocusScope.of(context);
if (!currentFocus.hasPrimaryFocus) {
currentFocus.unfocus();
}
_validateInputs();
},
);
return <Widget>[iconButton];
}
return <Widget>[Container()];
}

@override
Widget build(BuildContext context) => KeyboardDismisser(
gestures: [
GestureType.onTap,
GestureType.onPanUpdateDownDirection,
],
child: Scaffold(
key: _scaffoldKey,
appBar: AppBar(
centerTitle: true,
title: Text(plot_action_use_water),
actions: _actionAppBar()),
body: KeyboardDismisser(
child: MultiBlocProvider(
providers: [
BlocProvider<ActionDetailBloc>(
create: (context) =>
ActionDetailBloc(repository: Repository())
..add(FetchData(
isNeedFetchData: widget.isEdit,
apiActivity: ConstCommon.apiDetailUseWater,
activityId: widget.activityId))),
BlocProvider<MediaHelperBloc>(
create: (context) =>
MediaHelperBloc()..add(ChangeListMedia(items: [])),
)
],
child: Form(
key: _formKey,
autovalidate: _autoValidate,
child: SingleChildScrollView(
padding: EdgeInsets.all(8.0),
child: BlocConsumer<ActionDetailBloc, ActionDetailState>(
listener: (context, state) async {
if (state is ActionDetailFailure) {
LoadingDialog.hideLoadingDialog(context);
} else if (state is ActionDetailSuccess) {
LoadingDialog.hideLoadingDialog(context);
print(state.item);
_useWater = UseWater.fromJson(state.item);
_amountController.text =
_useWater.amount.formatNumtoStringDecimal();
_descriptionController.text =
_useWater.description ?? "";

try {
executeTime =
DateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
.parse(_useWater.executeDate);
} catch (_) {}
executeTimeView = DateFormat("dd/MM/yyyy HH:mm")
.format(executeTime);
//Show media
if (_useWater.media != null) {
await UtilAction.cacheFiles(_useWater.media)
.then((value) {
BlocProvider.of<MediaHelperBloc>(context)
.add(ChangeListMedia(items: value));
}).whenComplete(() {
print("completed");
});
}
} else if (state is ActionDetailInitial) {
} else if (state is ActionDetailLoading) {
LoadingDialog.showLoadingDialog(context);
}
},
builder: (context, state) {
return Column(
children: <Widget>[
Container(
width: double.infinity,
child: Text(
"Ngày thực hiện",
style: TextStyle(
color: Colors.black54, fontSize: 13.0),
),
),
_btnExecuteTimePicker(),
SizedBox(
height: 8.0,
),
_typeWater(),
SizedBox(
height: 8.0,
),
_amountField(),
SizedBox(
height: 8.0,
),
_descriptionField(),
SizedBox(
height: 8.0,
),
BlocBuilder<MediaHelperBloc, MediaHelperState>(
builder: (context, state) {
if (state is MediaHelperSuccess) {
return WidgetMediaPicker(
currentItems: state.items,
onChangeFiles: (filePaths) async {
Get.find<ChangeFileController>()
.addAllFile(filePaths);
});
} else {
return Center(
child: CircularProgressIndicator());
}
}),
],
);
},
),
)),
))));
@override
void dispose() {
_amountController.dispose();
_descriptionController.dispose();
super.dispose();
}
} }

+ 12
- 2
lib/presentation/screens/plot_detail/sc_plot_action.dart View File

EditActionDiseaseScreen( EditActionDiseaseScreen(
cropId: widget.cropId, cropId: widget.cropId,
))); )));
actions.add(
ActionType(plot_action_use_water, null, EditActionUseWaterScreen()));
actions.add(ActionType(
plot_action_use_water,
null,
EditActionUseWaterScreen(
cropId: widget.cropId,
)));
actions.add(ActionType(plot_action_other, null, EditActionOtherScreen())); actions.add(ActionType(plot_action_other, null, EditActionOtherScreen()));
actions actions
.add(ActionType(plot_action_harvest, null, EditActionHarvestScreen())); .add(ActionType(plot_action_harvest, null, EditActionHarvestScreen()));
activityId: item.id, activityId: item.id,
isEdit: true, isEdit: true,
)); ));
} else if (item.activityTypeName == "ACTIVE_TYPE_USE_WATER") {
Get.to(EditActionUseWaterScreen(
cropId: item.cropId,
activityId: item.id,
isEdit: true,
));
} }
}); });
} }

+ 5
- 0
lib/utils/const_common.dart View File

static const String apiDetailCropStatus = "api/activity-crop-status"; static const String apiDetailCropStatus = "api/activity-crop-status";
static const String apiDetailEnvUpdate = "api/activity-environment-update"; static const String apiDetailEnvUpdate = "api/activity-environment-update";
static const String apiDetailDisease = "api/activity-pests-investigation"; static const String apiDetailDisease = "api/activity-pests-investigation";
static const String apiDetailUseWater = "api/activity-water-usage";


//nursery //nursery
static const String paramsActionNursery = "activityNursery"; static const String paramsActionNursery = "activityNursery";
static const String paramsActionDisease = "activityPestsInvestigation"; static const String paramsActionDisease = "activityPestsInvestigation";
static const String apiUpdateDisease = "api/updatePestsInvestigation"; static const String apiUpdateDisease = "api/updatePestsInvestigation";
static const String apiAddDisease = "api/createPestsInvestigation"; static const String apiAddDisease = "api/createPestsInvestigation";
//Use water
static const String paramsActionUseWater = "activityWaters";
static const String apiUpdateUseWater = "api/updateWaters";
static const String apiAddUserWater = "api/createWaters";


static const String supplyTypeSeed = "GIONG"; static const String supplyTypeSeed = "GIONG";
static const String supplyTypeDung = "PHANBON"; static const String supplyTypeDung = "PHANBON";

Loading…
Cancel
Save