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

null safety

Browse Source
This commit is contained in:
phyothandar
2021-09-10 12:00:08 +06:30
parent a144c945b6
commit 5e672937b5
67 changed files with 901 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/pages/processing/package_editor.dart
View File

@@ -18,14 +18,14 @@ import 'package:fcs/pages/widgets/multi_img_file.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';
class PackageEditor extends StatefulWidget {
final Package package;
final User consignee;
final User sender;
final Package? package;
final User? consignee;
final User? sender;
PackageEditor({this.package, this.consignee, this.sender});
@override
@@ -38,13 +38,13 @@ class _PackageEditorState extends State<PackageEditor> {
bool _isLoading = false;
MultiImgController multiImgController = MultiImgController();
Package _package;
Package? _package;
@override
void initState() {
super.initState();
_package = Package();
_loadPackageData(null);
_loadPackageData(widget.package!.id);
}
_loadPackageData(String id) async {
@@ -64,10 +64,10 @@ class _PackageEditorState extends State<PackageEditor> {
}
}
setState(() {
selectedMarket = _package.market ?? "";
_descCtl.text = _package.desc;
_remarkCtl.text = _package.remark;
multiImgController.setImageUrls = _package.photoUrls;
selectedMarket = _package!.market ?? "";
_descCtl.text = _package!.desc;
_remarkCtl.text = _package!.remark;
multiImgController.setImageUrls = _package!.photoUrls;
});
}
@@ -77,7 +77,7 @@ class _PackageEditorState extends State<PackageEditor> {
children: <Widget>[
Expanded(
child: DisplayText(
text: _package.trackingID,
text: _package!.trackingID != null ? _package!.trackingID : "",
labelTextKey: "processing.tracking.id",
iconData: MaterialCommunityIcons.barcode_scan,
)),
@@ -174,13 +174,13 @@ class _PackageEditorState extends State<PackageEditor> {
);
}
String selectedMarket;
String? selectedMarket;
Widget marketDropdown() {
List<Market> _markets = Provider.of<MarketModel>(context).markets;
List<String> markets = _markets.map((e) => e.name).toList();
markets.insert(0, MANAGE_MARKET);
if (!markets.contains(selectedMarket)) {
markets.insert(0, selectedMarket);
markets.insert(0, selectedMarket!);
}
return Row(
@@ -210,7 +210,7 @@ class _PackageEditorState extends State<PackageEditor> {
height: 1,
color: Colors.grey,
),
onChanged: (String newValue) {
onChanged: (String? newValue) {
setState(() {
if (newValue == MANAGE_MARKET) {
selectedMarket = null;
@@ -254,14 +254,15 @@ class _PackageEditorState extends State<PackageEditor> {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
try {
_package.market = selectedMarket;
_package.desc = _descCtl.text;
_package.remark = _remarkCtl.text;
_package.photoFiles = multiImgController.getUpdatedFile;
_package.fcsID = widget.consignee.fcsID;
_package.senderFCSID = widget.sender?.fcsID;
_package!.market = selectedMarket!;
_package!.desc = _descCtl.text;
_package!.remark = _remarkCtl.text;
_package!.photoFiles = multiImgController.getUpdatedFile;
_package!.fcsID = widget.consignee!.fcsID;
_package!.senderFCSID =
widget.sender!.fcsID != null ? widget.sender!.fcsID : "";
await packageModel.updateProcessing(_package,
await packageModel.updateProcessing(_package!,
multiImgController.getAddedFile, multiImgController.getDeletedUrl);
Navigator.pop<Package>(context, _package);