add paginator
This commit is contained in:
@@ -1,14 +1,13 @@
|
||||
import 'package:fcs/domain/constants.dart';
|
||||
import 'package:fcs/domain/entities/box.dart';
|
||||
import 'package:fcs/domain/entities/cargo_type.dart';
|
||||
import 'package:fcs/domain/entities/shipment.dart';
|
||||
import 'package:fcs/domain/vo/delivery_address.dart';
|
||||
import 'package:fcs/helpers/theme.dart';
|
||||
import 'package:fcs/pages/box/model/box_model.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/main/util.dart';
|
||||
import 'package:fcs/pages/shipment/model/shipment_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';
|
||||
@@ -21,7 +20,6 @@ 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';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_icons/flutter_icons.dart';
|
||||
@@ -32,8 +30,6 @@ 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});
|
||||
@@ -63,46 +59,42 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
|
||||
TextEditingController _pickupDate = new TextEditingController();
|
||||
TextEditingController _handlingFeeController = new TextEditingController();
|
||||
|
||||
Shipment _pickUp;
|
||||
Shipment _shipment;
|
||||
bool _isLoading = false;
|
||||
var now = new DateTime.now();
|
||||
bool _isNew;
|
||||
DeliveryAddress _pickupAddress = new DeliveryAddress();
|
||||
|
||||
int _currVal = 1;
|
||||
String _selectedPickupType;
|
||||
String _selectedShipmentType;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_selectedPickupType = shipment_local_pickup;
|
||||
_selectedShipmentType = shipment_local_pickup;
|
||||
|
||||
if (widget.shipment != null) {
|
||||
_isNew = false;
|
||||
_pickUp = widget.shipment;
|
||||
_addressEditingController.text = _pickUp.address;
|
||||
_fromTimeEditingController.text = _pickUp.fromTime;
|
||||
_toTimeEditingController.text = _pickUp.toTime;
|
||||
_noOfPackageEditingController.text = _pickUp.numberOfPackage.toString();
|
||||
_weightEditingController.text = _pickUp.weight.toString();
|
||||
_pickupDate.text = dateFormatter.format(now);
|
||||
_handlingFeeController.text = numberFormatter.format(_pickUp.handlingFee);
|
||||
_currVal = _pickUp.radioIndex;
|
||||
_shipment = widget.shipment;
|
||||
_addressEditingController.text = _shipment.address;
|
||||
_fromTimeEditingController.text = _shipment.pickupTimeStart;
|
||||
_toTimeEditingController.text = _shipment.pickupTimeEnd;
|
||||
_noOfPackageEditingController.text = _shipment.numberOfPackage.toString();
|
||||
_weightEditingController.text = _shipment.weight.toString();
|
||||
_pickupDate.text = dateFormatter.format(_shipment.pickupDate ?? now);
|
||||
// _handlingFeeController.text =
|
||||
// numberFormatter.format(_shipment.handlingFee);
|
||||
_currVal = _shipment.radioIndex;
|
||||
} else {
|
||||
_isNew = true;
|
||||
_pickupDate.text = dateFormatter.format(now);
|
||||
_fromTimeEditingController.text = "${(now.hour)}:${(now.minute)}";
|
||||
_toTimeEditingController.text = "${(now.hour)}:${(now.minute)}";
|
||||
List<CargoType> _cargoTypes = [
|
||||
CargoType(name: 'General Cargo', weight: 25),
|
||||
CargoType(name: 'Medicine', weight: 20),
|
||||
CargoType(name: 'Dangerous Cargo', weight: 30)
|
||||
];
|
||||
_pickUp = Shipment(cargoTypes: _cargoTypes);
|
||||
_shipment = Shipment(boxes: []);
|
||||
var shipmentModel =
|
||||
Provider.of<DeliveryAddressModel>(context, listen: false);
|
||||
_shipment.pickupAddress = shipmentModel.defalutAddress;
|
||||
_pickupDate.text = dateFormatter.format(now);
|
||||
}
|
||||
var shipmentModel =
|
||||
Provider.of<DeliveryAddressModel>(context, listen: false);
|
||||
_pickupAddress = shipmentModel.defalutAddress;
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -110,8 +102,6 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
SingingCharacter _character = SingingCharacter.lafayette;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
MainModel mainModel = Provider.of<MainModel>(context);
|
||||
@@ -149,20 +139,20 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
|
||||
backgroundColor: primaryColor,
|
||||
);
|
||||
final pickupAddressBox = DefaultDeliveryAddress(
|
||||
deliveryAddress: _pickupAddress,
|
||||
deliveryAddress: _shipment.pickupAddress,
|
||||
iconData: Icons.location_on,
|
||||
labelKey: "shipment.location",
|
||||
onTap: () async {
|
||||
DeliveryAddress d = await Navigator.push<DeliveryAddress>(
|
||||
DeliveryAddress address = await Navigator.push<DeliveryAddress>(
|
||||
context,
|
||||
CupertinoPageRoute(
|
||||
builder: (context) => DeliveryAddressSelection(
|
||||
deliveryAddress: _pickupAddress,
|
||||
deliveryAddress: _shipment.pickupAddress,
|
||||
)),
|
||||
);
|
||||
if (d == null) return;
|
||||
if (address == null) return;
|
||||
setState(() {
|
||||
this._pickupAddress = d;
|
||||
_shipment.pickupAddress = address;
|
||||
});
|
||||
},
|
||||
);
|
||||
@@ -174,15 +164,16 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
|
||||
var shipmentTypeBox = LocalDropdown<String>(
|
||||
callback: (v) {
|
||||
setState(() {
|
||||
_selectedPickupType = v;
|
||||
_selectedShipmentType = v;
|
||||
});
|
||||
},
|
||||
iconData: SimpleLineIcons.direction,
|
||||
selectedValue: _selectedPickupType,
|
||||
values: pickupModel.pickupTypes,
|
||||
selectedValue: _selectedShipmentType,
|
||||
values: pickupModel.shipmentTypes,
|
||||
);
|
||||
final createBtn = LocalButton(
|
||||
textKey: "shipment.create",
|
||||
callBack: _create,
|
||||
);
|
||||
|
||||
final updateBtn = LocalButton(
|
||||
@@ -216,11 +207,11 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
|
||||
children: <Widget>[
|
||||
LocalTitle(textKey: "shipment.type"),
|
||||
LocalRadioButtons(
|
||||
values: pickupModel.pickupTypes,
|
||||
selectedValue: _selectedPickupType,
|
||||
values: pickupModel.shipmentTypes,
|
||||
selectedValue: _selectedShipmentType,
|
||||
callback: (v) {
|
||||
setState(() {
|
||||
_selectedPickupType = v;
|
||||
_selectedShipmentType = v;
|
||||
});
|
||||
}),
|
||||
// handlingFeeBox,
|
||||
@@ -240,17 +231,18 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
|
||||
Icons.add_circle,
|
||||
color: primaryColor,
|
||||
),
|
||||
onPressed: () {
|
||||
Navigator.push(
|
||||
onPressed: () async {
|
||||
Box box = await Navigator.push(
|
||||
context,
|
||||
CupertinoPageRoute(
|
||||
builder: (context) => ShipmentBoxEditor()),
|
||||
);
|
||||
_addBox(box);
|
||||
},
|
||||
),
|
||||
),
|
||||
Column(
|
||||
children: getBoxList(context, boxModel.boxes),
|
||||
children: getBoxList(context, _shipment.boxes),
|
||||
),
|
||||
_isNew ? createBtn : updateBtn,
|
||||
],
|
||||
@@ -263,14 +255,67 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
|
||||
List<Widget> getBoxList(BuildContext context, List<Box> boxes) {
|
||||
return boxes.asMap().entries.map((_box) {
|
||||
return InkWell(
|
||||
onTap: () {
|
||||
Navigator.of(context).push(CupertinoPageRoute(
|
||||
onTap: () async {
|
||||
Box box = await Navigator.of(context).push(CupertinoPageRoute(
|
||||
builder: (context) => ShipmentBoxEditor(box: _box.value)));
|
||||
_saveBox(box);
|
||||
},
|
||||
child: BoxRow(box: _box.value),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(child: BoxRow(box: _box.value)),
|
||||
InkWell(
|
||||
onTap: () => _removeBox(_box.value),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(8.0),
|
||||
child: Icon(Icons.remove, color: primaryColor),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}).toList();
|
||||
}
|
||||
|
||||
_addBox() {}
|
||||
_addBox(Box box) {
|
||||
if (box == null) return;
|
||||
_shipment.boxes.add(box);
|
||||
setState(() {});
|
||||
}
|
||||
|
||||
_saveBox(Box box) {
|
||||
if (box == null) return;
|
||||
setState(() {});
|
||||
}
|
||||
|
||||
_removeBox(Box box) {
|
||||
if (box == null) return;
|
||||
_shipment.boxes.remove(box);
|
||||
setState(() {});
|
||||
}
|
||||
|
||||
_create() async {
|
||||
_shipment.shipmentType = this._selectedShipmentType;
|
||||
_shipment.pickupDate = dateFormatter.parse(_pickupDate.text);
|
||||
_shipment.pickupTimeStart = _fromTimeEditingController.text;
|
||||
_shipment.pickupTimeEnd = _toTimeEditingController.text;
|
||||
setState(() {
|
||||
_isLoading = true;
|
||||
});
|
||||
try {
|
||||
ShipmentModel shipmentModel =
|
||||
Provider.of<ShipmentModel>(context, listen: false);
|
||||
if (_isNew) {
|
||||
await shipmentModel.createShipment(_shipment);
|
||||
} else {
|
||||
await shipmentModel.createShipment(_shipment);
|
||||
}
|
||||
Navigator.pop(context);
|
||||
} catch (e) {
|
||||
showMsgDialog(context, "Error", e.toString());
|
||||
} finally {
|
||||
setState(() {
|
||||
_isLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user