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

add paginator in boxes and deliveries

Browse Source
This commit is contained in:
Thinzar Win
2020-10-16 17:57:58 +06:30
parent e4fbf8bd20
commit 8235f28aa8
14 changed files with 1227 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/pages/box/box_info.dart
View File

@@ -1,25 +1,18 @@
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/package.dart';
import 'package:fcs/domain/vo/delivery_address.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/model/main_model.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/package/model/package_model.dart';
import 'package:fcs/pages/rates/model/shipment_rate_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/display_text.dart';
import 'package:fcs/pages/widgets/fcs_id_icon.dart';
import 'package:fcs/pages/widgets/length_picker.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/multi_img_file.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:fcs/pages/widgets/status_tree.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart';
@@ -48,7 +41,7 @@ class _BoxInfoState extends State<BoxInfo> {
String _shipmentNumber;
List<Package> _packages = [];
List<Box> _mixBoxes = [];
Box _selectedShipmentBox;
Box _selectedShipmentBox = new Box();
List<CargoType> _cargoTypes = [];
DeliveryAddress _deliveryAddress = new DeliveryAddress();
TextEditingController _widthController = new TextEditingController();
@@ -66,8 +59,8 @@ class _BoxInfoState extends State<BoxInfo> {
// for packages
var packageModel = Provider.of<PackageModel>(context, listen: false);
_packages = [
packageModel.packages[0],
packageModel.packages[1],
// packageModel.packages[0],
// packageModel.packages[1],
];
_packages.forEach((p) {
p.isChecked = false;
@@ -75,10 +68,14 @@ class _BoxInfoState extends State<BoxInfo> {
//for shipment boxes
var boxModel = Provider.of<BoxModel>(context, listen: false);
_selectedShipmentBox = boxModel.boxes[0];
_selectedShipmentBox = boxModel.boxeList[0];
//for mix boxes
_mixBoxes = [boxModel.boxes[0], boxModel.boxes[1], boxModel.boxes[2]];
_mixBoxes = [
boxModel.boxeList[0],
boxModel.boxeList[1],
boxModel.boxeList[2]
];
_mixBoxes.forEach((b) {
b.isChecked = false;
});
@@ -115,6 +112,7 @@ class _BoxInfoState extends State<BoxInfo> {
final DateFormat dateFormat = DateFormat("d MMM yyyy");
List<TimelineModel> _models() {
if (_box.shipmentHistory == null) return [];
// return [];
return _box.shipmentHistory
.map((e) => TimelineModel(
@@ -155,7 +153,19 @@ class _BoxInfoState extends State<BoxInfo> {
@override
Widget build(BuildContext context) {
var boxModel = Provider.of<BoxModel>(context);
final cargoType = Container(
height: 30,
padding: EdgeInsets.only(left: 15),
child: Row(
children: [
Icon(Icons.check_circle, color: primaryColor),
SizedBox(
width: 10,
),
Text(_selectedCartonType),
],
),
);
final shipmentBox = DisplayText(
text: _shipmentNumber == null ? "" : _shipmentNumber,
@@ -464,10 +474,7 @@ class _BoxInfoState extends State<BoxInfo> {
height: 10,
),
LocalTitle(textKey: "box.type.title"),
LocalRadioButtons(
values: boxModel.cartonTypes,
selectedValue: _selectedCartonType,
callback: (v) {}),
cargoType,
LocalTitle(textKey: "box.shipment_info"),
shipmentBox,
fcsIDBox,