sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add length picker

Browse Source
This commit is contained in:
Sai Naw Wun
2020-10-14 01:51:53 +06:30
parent 6ab65065ec
commit 8f5542c4fb
15 changed files with 481 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

193
lib/pages/shipment/shipment_box_editor.dart
View File

@@ -1,23 +1,20 @@
import 'package:fcs/domain/entities/box.dart';
import 'package:fcs/domain/entities/cargo.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/vo/delivery_address.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/box/cargo_type_editor.dart';
import 'package:fcs/pages/delivery_address/delivery_address_list.dart';
import 'package:fcs/pages/delivery_address/delivery_address_row.dart';
import 'package:fcs/pages/delivery_address/model/delivery_address_model.dart';
import 'package:fcs/pages/main/model/main_model.dart';
import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
import 'package:fcs/pages/widgets/defalut_delivery_address.dart';
import 'package:fcs/pages/widgets/delivery_address_selection.dart';
import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/input_text.dart';
import 'package:fcs/pages/widgets/length_picker.dart';
import 'package:fcs/pages/widgets/local_button.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/local_title.dart';
import 'package:fcs/pages/widgets/my_data_table.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:fcs/pages/widgets/title_with_add_button.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:provider/provider.dart';
@@ -38,11 +35,10 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
Box _box;
bool _isLoading = false;
bool _isNew;
bool isMixBox = false;
DeliveryAddress _deliveryAddress = new DeliveryAddress();
double volumetricRatio;
double shipmentWeight;
List<Cargo> cargos;
DeliveryAddress _deliveryAddress;
double volumetricRatio = 0;
double shipmentWeight = 0;
List<Cargo> cargos = [];
@override
void initState() {
@@ -50,13 +46,10 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
volumetricRatio =
Provider.of<MainModel>(context, listen: false).setting.volumetricRatio;
shipmentWeight = 0;
cargos = [];
if (widget.box != null) {
_box = widget.box;
_deliveryAddress = _box.shippingAddress;
_isNew = false;
} else {
var shipmentModel =
@@ -65,6 +58,9 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
_isNew = true;
_box = Box();
_lengthCtl.text = "0";
_widthCtl.text = "0";
_heightCtl.text = "0";
}
_lengthCtl.addListener(_calShipmentWeight);
_widthCtl.addListener(_calShipmentWeight);
@@ -75,6 +71,7 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
double l = double.parse(_lengthCtl.text, (s) => 0);
double w = double.parse(_widthCtl.text, (s) => 0);
double h = double.parse(_heightCtl.text, (s) => 0);
print("$l $w $h");
setState(() {
shipmentWeight = l * w * h / volumetricRatio;
});
@@ -82,30 +79,35 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
@override
Widget build(BuildContext context) {
double iconSize = 32;
final shipmentWeightBox = DisplayText(
labelTextKey: "shipment.box.shipment.weight",
text: shipmentWeight == null ? "" : shipmentWeight.toStringAsFixed(0),
iconData: MaterialCommunityIcons.weight,
);
final lengthBox = InputText(
labelTextKey: "shipment.box.length",
final lengthBox = LengthPicker(
controller: _lengthCtl,
textInputType: TextInputType.number,
iconData: FontAwesome.arrow_circle_right,
lableKey: "shipment.box.length",
);
final widthBox = InputText(
labelTextKey: "shipment.box.width",
final widthBox = LengthPicker(
controller: _widthCtl,
textInputType: TextInputType.number,
iconData: FontAwesome.arrow_circle_left,
lableKey: "shipment.box.width",
);
final heightBox = InputText(
labelTextKey: "shipment.box.height",
final heightBox = LengthPicker(
controller: _heightCtl,
textInputType: TextInputType.number,
iconData: FontAwesome.arrow_circle_up,
lableKey: "shipment.box.height",
);
final dimBox = Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(right: 8.0),
child: Icon(FontAwesome.arrow_circle_right, color: primaryColor),
),
SizedBox(child: lengthBox, width: 80),
SizedBox(child: widthBox, width: 80),
SizedBox(child: heightBox, width: 80),
],
);
final createBtn = LocalButton(
textKey: "shipment.box.add",
@@ -135,18 +137,19 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
padding: const EdgeInsets.all(8.0),
child: ListView(
children: [
TitleWithAddButton(
iconData: MaterialCommunityIcons.briefcase_check,
titleKey: "shipment.box.cargo.type",
onTap: () async {
Cargo cargo = await Navigator.push<Cargo>(
context, BottomUpPageRoute(CargoTypeEditor()));
if (cargo != null) {
setState(() {
cargos.add(cargo);
});
}
}),
LocalTitle(
textKey: "shipment.box.cargo.type",
trailing: IconButton(
icon: Icon(
Icons.add_circle,
color: primaryColor,
),
onPressed: () async {
Cargo cargo = await Navigator.push<Cargo>(
context, BottomUpPageRoute(CargoTypeEditor()));
_addCargo(cargo);
}),
),
MyDataTable(
headingRowHeight: 40,
columns: [
@@ -170,13 +173,10 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
SizedBox(
height: 30,
),
TitleWithAddButton(
titleKey: "shipment.box.dimemsion",
),
LocalTitle(textKey: "shipment.box.dimemsion"),
dimBox,
shipmentWeightBox,
lengthBox,
widthBox,
heightBox,
LocalTitle(textKey: "shipment.box.delivery"),
DefaultDeliveryAddress(
deliveryAddress: _deliveryAddress,
onTap: () async {
@@ -199,82 +199,6 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
);
}
List<TableRow> getRows(BuildContext context) {
if (cargos == null || cargos == null) {
return [];
}
int total = 0;
var rows = cargos.map((c) {
total += c.weight;
return TableRow(
children: [
Text(
c.type == null ? "" : c.type,
style: textStyle,
),
Align(
alignment: Alignment.centerRight,
child: Text(c.weight == null ? "0" : c.weight.toString(),
style: textStyle)),
IconButton(icon: Icon(Icons.remove), onPressed: () => {})
],
);
}).toList();
var totalRow = TableRow(
children: [
Align(
alignment: Alignment.centerRight,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text("Total Weight",
style: TextStyle(
fontWeight: FontWeight.bold,
)),
),
),
Align(
alignment: Alignment.centerRight,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(total.toString(),
style: TextStyle(fontWeight: FontWeight.bold)),
)),
Container(
width: 50,
child:
new Text(" ", style: TextStyle(fontWeight: FontWeight.bold))),
],
);
rows.add(totalRow);
rows.insert(
0,
TableRow(children: [
Center(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: LocalText(
context,
"cargo.type",
color: Colors.grey,
),
),
),
Center(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: LocalText(
context,
"cargo.weight",
color: Colors.grey,
),
),
),
Text("")
]));
return rows;
}
List<MyDataRow> getCargoRows(BuildContext context) {
if (cargos == null || cargos == null) {
return [];
@@ -283,7 +207,14 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
var rows = cargos.map((c) {
total += c.weight;
return MyDataRow(
onSelectChanged: (bool selected) {},
onSelectChanged: (bool selected) async {
Cargo cargo = await Navigator.push<Cargo>(
context,
BottomUpPageRoute(CargoTypeEditor(
cargo: c,
)));
_addCargo(cargo);
},
cells: [
MyDataCell(new Text(
c.type == null ? "" : c.type,
@@ -300,7 +231,7 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
Icons.remove_circle,
color: primaryColor,
),
onPressed: () => {},
onPressed: () => {_removeCargo(c)},
)
],
),
@@ -314,7 +245,7 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
cells: [
MyDataCell(Align(
alignment: Alignment.centerRight,
child: Text("Total Weight",
child: Text("Total",
style: TextStyle(
fontWeight: FontWeight.bold,
)),
@@ -333,4 +264,18 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
rows.add(totalRow);
return rows;
}
_addCargo(Cargo cargo) {
if (cargo == null) return;
setState(() {
cargos.remove(cargo);
cargos.add(cargo);
});
}
_removeCargo(Cargo cargo) {
setState(() {
cargos.remove(cargo);
});
}
}

116
lib/pages/shipment/shipment_editor.dart
View File

@@ -14,8 +14,11 @@ import 'package:fcs/pages/widgets/delivery_address_selection.dart';
import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/input_date.dart';
import 'package:fcs/pages/widgets/input_time.dart';
import 'package:fcs/pages/widgets/local_button.dart';
import 'package:fcs/pages/widgets/local_dropdown.dart';
import 'package:fcs/pages/widgets/local_radio_buttons.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/local_title.dart';
import 'package:fcs/pages/widgets/multi_img_controller.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:fcs/pages/widgets/title_with_add_button.dart';
@@ -28,6 +31,8 @@ import 'package:provider/provider.dart';
import 'box_row.dart';
import 'shipment_box_editor.dart';
enum SingingCharacter { lafayette, jefferson }
class ShipmentEditor extends StatefulWidget {
final Shipment shipment;
ShipmentEditor({this.shipment});
@@ -64,12 +69,12 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
DeliveryAddress _pickupAddress = new DeliveryAddress();
int _currVal = 1;
String selectedPickupType;
String _selectedPickupType;
@override
void initState() {
super.initState();
selectedPickupType = shipment_local_pickup;
_selectedPickupType = shipment_local_pickup;
if (widget.shipment != null) {
_isNew = false;
@@ -84,6 +89,9 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
_currVal = _pickUp.radioIndex;
} else {
_isNew = true;
_pickupDate.text = dateFormatter.format(now);
_fromTimeEditingController.text = "${(now.hour)}:${(now.minute)}";
_toTimeEditingController.text = "${(now.hour)}:${(now.minute)}";
List<Cargo> _cargoTypes = [
Cargo(type: 'General Cargo', weight: 25),
Cargo(type: 'Medicine', weight: 20),
@@ -101,6 +109,8 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
super.dispose();
}
SingingCharacter _character = SingingCharacter.lafayette;
@override
Widget build(BuildContext context) {
MainModel mainModel = Provider.of<MainModel>(context);
@@ -111,29 +121,14 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
iconData: Icons.timer,
controller: _fromTimeEditingController);
final toTimeBox = InputTime(
labelTextKey: 'shipment.to', controller: _toTimeEditingController);
final toTimeBox = Container(
width: 150,
child: InputTime(
iconData: Icons.timer_off,
labelTextKey: 'shipment.to',
controller: _toTimeEditingController));
final pickupTimeBox = Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
child: fromTimeBox,
width: 120,
),
Padding(
padding: const EdgeInsets.only(left: 8.0),
child: Text('-'),
),
Container(
padding: EdgeInsets.only(left: 20),
child: toTimeBox,
width: 120,
),
],
);
final shipmentDateBox = InputDate(
final pickupDateBox = InputDate(
labelTextKey: "shipment.date",
iconData: Icons.date_range,
controller: _pickupDate,
@@ -152,8 +147,9 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
),
backgroundColor: primaryColor,
);
var deliveryAddressBox = DefaultDeliveryAddress(
final pickupAddressBox = DefaultDeliveryAddress(
deliveryAddress: _pickupAddress,
iconData: Icons.location_on,
labelKey: "shipment.location",
onTap: () async {
DeliveryAddress d = await Navigator.push<DeliveryAddress>(
@@ -176,13 +172,14 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
var shipmentTypeBox = LocalDropdown<String>(
callback: (v) {
setState(() {
selectedPickupType = v;
_selectedPickupType = v;
});
},
iconData: SimpleLineIcons.direction,
selectedValue: selectedPickupType,
selectedValue: _selectedPickupType,
values: pickupModel.pickupTypes,
);
return LocalProgress(
inAsyncCall: _isLoading,
child: Scaffold(
@@ -208,38 +205,47 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
padding: const EdgeInsets.all(10.0),
child: ListView(
children: <Widget>[
handlingFeeBox,
shipmentTypeBox,
deliveryAddressBox,
shipmentDateBox,
pickupTimeBox,
localDropoffAddress,
curierDropoffAddress,
TitleWithAddButton(
titleKey: "boxes.name",
iconData: MaterialCommunityIcons.package,
onTap: () => Navigator.push(
context,
BottomUpPageRoute(ShipmentBoxEditor()),
LocalTitle(textKey: "shipment.type"),
LocalRadioButtons(
values: pickupModel.pickupTypes,
selectedValue: _selectedPickupType,
callback: (v) {
setState(() {
_selectedPickupType = v;
});
}),
// handlingFeeBox,
// shipmentTypeBox,
LocalTitle(textKey: "shipment.location"),
pickupAddressBox,
LocalTitle(textKey: "shipment.date.time"),
pickupDateBox,
fromTimeBox,
toTimeBox,
// localDropoffAddress,
// curierDropoffAddress,
LocalTitle(
textKey: "boxes.name",
trailing: IconButton(
icon: Icon(
Icons.add_circle,
color: primaryColor,
),
onPressed: () {
Navigator.push(
context,
BottomUpPageRoute(ShipmentBoxEditor()),
);
},
),
),
Column(
children: getBoxList(context, boxModel.boxes),
),
Align(
alignment: Alignment.bottomCenter,
child: Center(
child: Container(
width: 250,
child: FlatButton(
child: Text('Create shipment'),
color: primaryColor,
textColor: Colors.white,
onPressed: () {
Navigator.pop(context);
},
),
)))
LocalButton(
textKey: "shipment.new",
),
],
),
),
@@ -258,4 +264,6 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
);
}).toList();
}
_addBox() {}
}