rename shipment

This commit is contained in:
Sai Naw Wun
2020-10-07 14:42:07 +06:30
parent 65dda16fe6
commit 897e5c9b93
15 changed files with 117 additions and 172 deletions

View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/entities/shipment.dart';
import 'package:fcs/domain/entities/fcs_shipment.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/localization/app_translations.dart';
import 'package:fcs/pages/fcs_shipment/model/fcs_shipment_model.dart';
@@ -15,7 +15,7 @@ import 'package:flutter/material.dart';
import '../main/util.dart';
class FcsShipmentEditor extends StatefulWidget {
final Shipment shipment;
final FcsShipment shipment;
FcsShipmentEditor({this.shipment});
@override
@@ -34,7 +34,7 @@ class _FcsShipmentEditorState extends State<FcsShipmentEditor> {
TextEditingController _statusController = new TextEditingController();
TextEditingController _remarkController = new TextEditingController();
Shipment _shipment = new Shipment();
FcsShipment _shipment = new FcsShipment();
bool _isLoading = false;
String _currentShipment;

View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/entities/shipment.dart';
import 'package:fcs/domain/entities/fcs_shipment.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
@@ -9,7 +9,7 @@ import 'package:intl/intl.dart';
import 'fcs_shipment_editor.dart';
class FcsShipmentListRow extends StatefulWidget {
final Shipment shipment;
final FcsShipment shipment;
const FcsShipmentListRow({this.shipment});
@override
@@ -19,7 +19,7 @@ class FcsShipmentListRow extends StatefulWidget {
class _FcsShipmentListRowState extends State<FcsShipmentListRow> {
var dateFormatter = new DateFormat('dd MMM yyyy');
final double dotSize = 15.0;
Shipment _shipment = new Shipment();
FcsShipment _shipment = new FcsShipment();
@override
void initState() {

View File

@@ -1,40 +1,41 @@
import 'package:fcs/domain/entities/shipment.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/entities/fcs_shipment.dart';
import 'package:fcs/pages/main/model/base_model.dart';
class FcsShipmentModel extends BaseModel {
List<String> shipmentType = ['Air', 'Ship', 'Cargo Truck'];
List<Shipment> shipments = [
Shipment(
List<FcsShipment> shipments = [
FcsShipment(
shipDate: DateTime(2020, 4, 23),
shipmentNumber: 'A103B',
status: 'In Progress',
arrivalDate: DateTime(2020, 4, 30),
departureDate: DateTime(2020, 4, 23)),
Shipment(
FcsShipment(
shipDate: DateTime(2020, 4, 2),
shipmentNumber: 'A100A',
status: 'Ready to ship',
arrivalDate: DateTime(2020, 4, 28),
departureDate: DateTime(2020, 4, 15)),
Shipment(
FcsShipment(
shipDate: DateTime(2020, 4, 2),
shipmentNumber: 'A100B',
status: 'Arrived',
arrivalDate: DateTime(2020, 4, 28),
departureDate: DateTime(2020, 4, 15)),
Shipment(
FcsShipment(
shipDate: DateTime(2020, 4, 10),
shipmentNumber: 'A102B',
status: 'Canceled',
arrivalDate: DateTime(2020, 4, 20),
departureDate: DateTime(2020, 4, 10)),
Shipment(
FcsShipment(
shipDate: DateTime(2020, 4, 2),
shipmentNumber: 'A100B',
status: 'Canceled',
arrivalDate: DateTime(2020, 4, 20),
departureDate: DateTime(2020, 4, 23)),
Shipment(
FcsShipment(
shipDate: DateTime(2020, 4, 10),
shipmentNumber: 'A102B',
status: 'Arrived',
@@ -43,23 +44,24 @@ class FcsShipmentModel extends BaseModel {
)
];
List<Shipment> get canceled {
List<Shipment> _p = shipments.where((e) => e.status == "Canceled").toList()
..sort((e1, e2) {
return e1.shipDate.compareTo(e2.shipDate);
});
List<FcsShipment> get canceled {
List<FcsShipment> _p =
shipments.where((e) => e.status == "Canceled").toList()
..sort((e1, e2) {
return e1.shipDate.compareTo(e2.shipDate);
});
return _p;
}
List<Shipment> get completed {
List<FcsShipment> get completed {
return shipments.where((e) => e.status == "Arrived").toList()
..sort((e1, e2) {
return e1.shipDate.compareTo(e2.shipDate);
});
}
List<Shipment> get upcoming {
List<Shipment> _shipments = shipments
List<FcsShipment> get upcoming {
List<FcsShipment> _shipments = shipments
.where((e) =>
e.status == "In Progress" ||
e.status == "Ready to ship" ||