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

update shipment

Browse Source
This commit is contained in:
Thinzar Win
2020-07-01 08:12:59 +06:30
parent 45c4524a84
commit b15e685f3a
4 changed files with 149 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/model/pickup_model.dart
View File

@@ -56,6 +56,7 @@ class PickUpModel extends BaseModel {
address: '154-19 64th Ave.\nFlushing, NY 11367', address: '154-19 64th Ave.\nFlushing, NY 11367',
handlingFee: 5000, handlingFee: 5000,
isCourier: true, isCourier: true,
radioIndex: 2,
cargoTypes: [ cargoTypes: [
Cargo(type: 'General Cargo', weight: 25), Cargo(type: 'General Cargo', weight: 25),
Cargo(type: 'Medicine', weight: 20), Cargo(type: 'Medicine', weight: 20),
@@ -73,6 +74,8 @@ class PickUpModel extends BaseModel {
date: DateTime(2020, 5, 6), date: DateTime(2020, 5, 6),
address: '154-19 64th Ave.\nFlushing, NY 11367', address: '154-19 64th Ave.\nFlushing, NY 11367',
handlingFee: 5000, handlingFee: 5000,
isCourier: true,
radioIndex: 4,
cargoTypes: [ cargoTypes: [
Cargo(type: 'General Cargo', weight: 25), Cargo(type: 'General Cargo', weight: 25),
Cargo(type: 'Medicine', weight: 20), Cargo(type: 'Medicine', weight: 20),
@@ -90,6 +93,7 @@ class PickUpModel extends BaseModel {
date: DateTime(2020, 5, 9), date: DateTime(2020, 5, 9),
address: '154-19 64th Ave.\nFlushing, NY 11367', address: '154-19 64th Ave.\nFlushing, NY 11367',
handlingFee: 5000, handlingFee: 5000,
radioIndex: 3,
cargoTypes: [ cargoTypes: [
Cargo(type: 'General Cargo', weight: 25), Cargo(type: 'General Cargo', weight: 25),
Cargo(type: 'Medicine', weight: 20), Cargo(type: 'Medicine', weight: 20),

42
lib/pages/pickup_editor.dart
View File

@@ -58,8 +58,7 @@ class _PickUpEditorState extends State<PickUpEditor> {
bool isNew; bool isNew;
ShippingAddress _shippingAddress = new ShippingAddress(); ShippingAddress _shippingAddress = new ShippingAddress();
dynamic _currVal = 1; int _currVal = 1;
String _currText = '';
@override @override
void initState() { void initState() {
@@ -74,6 +73,7 @@ class _PickUpEditorState extends State<PickUpEditor> {
_weightEditingController.text = _pickUp.weight.toString(); _weightEditingController.text = _pickUp.weight.toString();
_pickupDate.text = dateFormatter.format(now); _pickupDate.text = dateFormatter.format(now);
_handlingFeeController.text = numberFormatter.format(_pickUp.handlingFee); _handlingFeeController.text = numberFormatter.format(_pickUp.handlingFee);
_currVal = _pickUp.radioIndex;
var mainModel = Provider.of<MainModel>(context, listen: false); var mainModel = Provider.of<MainModel>(context, listen: false);
_recipientNameEditingController.text = mainModel.recipient.name; _recipientNameEditingController.text = mainModel.recipient.name;
@@ -230,6 +230,7 @@ class _PickUpEditorState extends State<PickUpEditor> {
MainModel mainModel = Provider.of<MainModel>(context); MainModel mainModel = Provider.of<MainModel>(context);
var boxModel = Provider.of<BoxModel>(context); var boxModel = Provider.of<BoxModel>(context);
// var shipmentModel = Provider.of<ShipmentModel>(context);
return LocalProgress( return LocalProgress(
inAsyncCall: _isLoading, inAsyncCall: _isLoading,
@@ -308,20 +309,32 @@ class _PickUpEditorState extends State<PickUpEditor> {
), ),
], ],
), ),
_currVal == 3
ExpansionTile( ? Container(
child: ShippingAddressRow(
shippingAddress: ShippingAddress(
fullName: 'Myo Min',
addressLine1: '154-19 64th Ave.',
addressLine2: 'Flushing',
city: 'NY',
state: 'NY',
phoneNumber: '+1 (292)215-2247'),
),
)
: ExpansionTile(
title: Text( title: Text(
'Package Information', 'Package Information',
style: TextStyle( style: TextStyle(
color: primaryColor, fontWeight: FontWeight.bold), color: primaryColor,
fontWeight: FontWeight.bold),
), ),
children: <Widget>[ children: <Widget>[
Column( Column(
children: getBoxList(context, boxModel.boxes), children: getBoxList(context, boxModel.boxes),
), ),
Container( Container(
padding: padding: EdgeInsets.only(
EdgeInsets.only(top: 20, bottom: 15, right: 15), top: 20, bottom: 15, right: 15),
child: Align( child: Align(
alignment: Alignment.bottomRight, alignment: Alignment.bottomRight,
child: Container( child: Container(
@@ -349,11 +362,14 @@ class _PickUpEditorState extends State<PickUpEditor> {
SizedBox(height: 10.0), SizedBox(height: 10.0),
], ],
), ),
ExpansionTile( _currVal == 3
? Container()
: ExpansionTile(
title: Text( title: Text(
'Pickup Location / Time', 'Pickup Location / Time',
style: TextStyle( style: TextStyle(
color: primaryColor, fontWeight: FontWeight.bold), color: primaryColor,
fontWeight: FontWeight.bold),
), ),
children: <Widget>[ children: <Widget>[
Padding( Padding(
@@ -555,7 +571,7 @@ class _PickUpEditorState extends State<PickUpEditor> {
child: Container( child: Container(
width: 250, width: 250,
child: FlatButton( child: FlatButton(
child: Text('Request for pickup'), child: Text('Request for shipment'),
color: primaryColor, color: primaryColor,
textColor: Colors.white, textColor: Colors.white,
onPressed: () { onPressed: () {
@@ -573,7 +589,7 @@ class _PickUpEditorState extends State<PickUpEditor> {
child: Container( child: Container(
width: 250, width: 250,
child: FlatButton( child: FlatButton(
child: Text('Complete Pickup'), child: Text('Complete Shipment'),
color: primaryColor, color: primaryColor,
textColor: Colors.white, textColor: Colors.white,
onPressed: () { onPressed: () {
@@ -587,7 +603,7 @@ class _PickUpEditorState extends State<PickUpEditor> {
child: Container( child: Container(
width: 250, width: 250,
child: FlatButton( child: FlatButton(
child: Text('Assign Pickup'), child: Text('Assign Shipment'),
color: primaryColor, color: primaryColor,
textColor: Colors.white, textColor: Colors.white,
onPressed: () { onPressed: () {
@@ -601,7 +617,7 @@ class _PickUpEditorState extends State<PickUpEditor> {
child: Container( child: Container(
width: 250, width: 250,
child: FlatButton( child: FlatButton(
child: Text('Cancel Pickup'), child: Text('Cancel Shipment'),
color: Colors.grey[600], color: Colors.grey[600],
textColor: Colors.white, textColor: Colors.white,
onPressed: () { onPressed: () {

4
lib/vo/pickup.dart
View File

@@ -14,6 +14,7 @@ class PickUp {
DateTime date; DateTime date;
List<Cargo> cargoTypes; List<Cargo> cargoTypes;
bool isCourier; bool isCourier;
int radioIndex;
PickUp( PickUp(
{this.id, {this.id,
@@ -28,7 +29,8 @@ class PickUp {
this.status, this.status,
this.date, this.date,
this.cargoTypes, this.cargoTypes,
this.isCourier=false}); this.isCourier = false,
this.radioIndex = 1});
int get last => DateTime.now().difference(date).inDays; int get last => DateTime.now().difference(date).inDays;

2
lib/vo/radio.dart
View File

@@ -1,5 +1,5 @@
class RadioGroup { class RadioGroup {
String text; String text;
dynamic index; int index;
RadioGroup({this.text, this.index}); RadioGroup({this.text, this.index});
} }