improvements

main_design2.0
Sikander Saleem 2 years ago
parent f8ba08a44b
commit ab83963c65

@ -30,35 +30,31 @@ class DeviceTransferDetails extends StatefulWidget {
} }
class _DeviceTransferDetailsState extends State<DeviceTransferDetails> { class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
AssetTransfer _model;
UserProvider _userProvider; UserProvider _userProvider;
AssetTransfer _model;
bool _isLoading = false; bool _isLoading = false;
final GlobalKey<FormState> _formKey = GlobalKey<FormState>(); final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>(); final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
@override @override
void initState() { void initState() {
_model = widget.model;
super.initState(); super.initState();
} }
Future<void> _getDeviceTransfer() async {
_model = await Provider.of<AssetTransferProvider>(context).getRequestById(assetTransferId: widget.model.id);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_userProvider ??= Provider.of<UserProvider>(context);
return Scaffold( return Scaffold(
appBar: DefaultAppBar(title: context.translation.deviceTransferDetails), appBar: DefaultAppBar(title: context.translation.deviceTransferDetails),
key: _scaffoldKey, key: _scaffoldKey,
body: SafeArea( body: SafeArea(
child: FutureBuilder( child: FutureBuilder(
future: _getDeviceTransfer(), future: Provider.of<AssetTransferProvider>(context).getRequestById(assetTransferId: widget.model.id),
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) { if (snapshot.connectionState == ConnectionState.waiting) {
return const ALoading(); return const ALoading();
} else { } else {
_userProvider = Provider.of<UserProvider>(context); _model = snapshot.data;
return Form( return Form(
key: _formKey, key: _formKey,
child: LoadingManager( child: LoadingManager(
@ -108,8 +104,8 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
// ], // ],
// ), // ),
1.width, 1.width,
Text(widget.model.createdOn != null ? widget.model.createdOn.toServiceRequestCardFormat : "", Text(_model.createdOn != null ? _model.createdOn.toServiceRequestCardFormat : "",
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color:context.isDark? AppColor.neutral10: Color(0xFF3B3D4A))), textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF3B3D4A))),
], ],
), ),
], ],

@ -44,7 +44,6 @@ class VisitDetailsPage extends StatelessWidget {
return Column(children: [ return Column(children: [
SingleChildScrollView( SingleChildScrollView(
child: Column( child: Column(
//mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Row(

@ -15,6 +15,7 @@ class AssetItemListView extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Row( return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
width: 95, width: 95,
@ -38,15 +39,15 @@ class AssetItemListView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
device.modelDefinition.assetName.heading5(context), device.modelDefinition.assetName.heading6(context),
"${context.translation.assetNumber} : ${device.assetNumber}".bodyText(context), "${context.translation.assetNumber} : ${device.assetNumber}".bodyText(context),
"${context.translation.model} : ${device.modelDefinition.modelDefCode}".bodyText(context), "${context.translation.model} : ${device.modelDefinition.modelDefCode}".bodyText(context),
], ],
), ),
Row( Row(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
"${context.translation.serialNo} : ${device.assetSerialNo}".bodyText(context).expanded, "${context.translation.serialNo} : ${device.assetSerialNo}".bodyText(context).expanded,
Row( Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [

@ -186,8 +186,6 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
device: _searchableList[index], device: _searchableList[index],
onPressed: (device) { onPressed: (device) {
Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id); Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id);
return;
Navigator.of(context).pop(device);
}, },
); );
}, },

Loading…
Cancel
Save