From 09f2ae32ebd65dba7ca77e213150f7d40ab63543 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 7 Sep 2023 16:29:37 +0300 Subject: [PATCH] improvements --- .../pages/sub_workorder/workorder_item.dart | 28 ++-- .../pages/sub_workorder/workorder_list.dart | 1 - .../user/gas_refill/request_gas_refill.dart | 5 +- .../pages/user/requests/request_details.dart | 126 +++++++++--------- 4 files changed, 83 insertions(+), 77 deletions(-) diff --git a/lib/views/pages/sub_workorder/workorder_item.dart b/lib/views/pages/sub_workorder/workorder_item.dart index e2c561d..574fa0f 100644 --- a/lib/views/pages/sub_workorder/workorder_item.dart +++ b/lib/views/pages/sub_workorder/workorder_item.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:fluttertoast/fluttertoast.dart'; import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/models/subtitle.dart'; @@ -32,7 +33,13 @@ class WorkOrderItem extends StatelessWidget { ), ), onPressed: () { - onPressed(item); + item.callRequest.status.value == 5 || item.callRequest.status.value == 3 + ? Fluttertoast.showToast( + msg: "Request is ${item.callRequest.status.name}. No more sub work orders will be create.", + toastLength: Toast.LENGTH_LONG, + gravity: ToastGravity.BOTTOM, + ) + : onPressed(item); }, child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -53,13 +60,14 @@ class WorkOrderItem extends StatelessWidget { // color: onItemColor, // ), // ), - Row(crossAxisAlignment: CrossAxisAlignment.start, + Row( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( "Asset Name:", style: Theme.of(context).textTheme.subtitle2.copyWith( - color: onItemColor, - ), + color: onItemColor, + ), ), 8.width, Expanded( @@ -68,8 +76,8 @@ class WorkOrderItem extends StatelessWidget { // .AssetName item.callRequest.asset.modelDefinition.assetName, style: Theme.of(context).textTheme.subtitle2.copyWith( - color: onItemColor, - ), + color: onItemColor, + ), ), ), ], @@ -99,16 +107,16 @@ class WorkOrderItem extends StatelessWidget { child: Text( "Asset SN:", style: Theme.of(context).textTheme.subtitle2.copyWith( - color: onItemColor, - ), + color: onItemColor, + ), ), ), //if (item.clientName != null) Text( item.callRequest.asset.assetSerialNo, style: Theme.of(context).textTheme.subtitle2.copyWith( - color: onItemColor, - ), + color: onItemColor, + ), ), ], ), diff --git a/lib/views/pages/sub_workorder/workorder_list.dart b/lib/views/pages/sub_workorder/workorder_list.dart index 65a1f4e..e39be6a 100644 --- a/lib/views/pages/sub_workorder/workorder_list.dart +++ b/lib/views/pages/sub_workorder/workorder_list.dart @@ -83,7 +83,6 @@ class _WorkOrderListState extends State { onPressed: (model) { // Navigator.of(context).push(MaterialPageRoute( // builder: (_) => WorkOrderUpdate(item: model,))); - log(model?.toJson()?.toString()); Navigator.push( context, MaterialPageRoute(builder: (context) => CreateSubWorkOrderPage(workOrder: model)), diff --git a/lib/views/pages/user/gas_refill/request_gas_refill.dart b/lib/views/pages/user/gas_refill/request_gas_refill.dart index e524258..d1e6e95 100644 --- a/lib/views/pages/user/gas_refill/request_gas_refill.dart +++ b/lib/views/pages/user/gas_refill/request_gas_refill.dart @@ -36,6 +36,7 @@ import '../../../widgets/timer/app_timer.dart'; class RequestGasRefill extends StatefulWidget { static const String id = "/request-gas-refill"; final GasRefillModel gasRefillModel; + const RequestGasRefill({this.gasRefillModel, Key key}) : super(key: key); @override @@ -160,8 +161,8 @@ class _RequestGasRefillState extends State { } else { _gasRefillProvider.timer = null; } - HospitalsProvider().getHospitalsListByVal(searchVal: _userProvider.user?.clientName).then((value) { - _gasRefillProvider.hospital = value?.firstWhere((element) => element.name == _userProvider.user?.clientName, orElse: () => null); + HospitalsProvider().getHospitalsListByVal(searchVal: _formModel.clientName).then((value) { + _gasRefillProvider.hospital = value?.firstWhere((element) => element.name == _formModel.clientName, orElse: () => null); _gasRefillProvider.building = _gasRefillProvider.hospital?.buildings?.firstWhere((element) => element.name == widget.gasRefillModel?.building?.name, orElse: () => null); _gasRefillProvider.floor = _gasRefillProvider.building?.floors?.firstWhere((element) => element.name == widget.gasRefillModel?.floor?.name, orElse: () => null); _gasRefillProvider.department = _gasRefillProvider.floor?.departments?.firstWhere((element) => element.name == widget.gasRefillModel?.department?.departmentName, orElse: () => null); diff --git a/lib/views/pages/user/requests/request_details.dart b/lib/views/pages/user/requests/request_details.dart index 426a41e..35b7809 100644 --- a/lib/views/pages/user/requests/request_details.dart +++ b/lib/views/pages/user/requests/request_details.dart @@ -94,48 +94,47 @@ class RequestDetailsPage extends StatelessWidget { color: AColors.white, buttonSize: 42, backgroundColor: AColors.green, - onPressed: () async { - if(serviceRequest.statusValue == 2) { - Navigator.of(context).push( - MaterialPageRoute(builder: (_) => CreateRequestPage(serviceRequest: serviceRequest)), - ); - } else - null; - // showModalBottomSheet( - // context: context, - // builder: (context) { - // return ServiceRequestsUpdateDialog( - // request: serviceRequest, - // ); - // }); - // DateTime picked = await showDatePicker( - // context: context, - // initialDate: DateTime.now(), - // firstDate: DateTime.now(), - // lastDate: DateTime.now().add(Duration(days: 182)) - // ); - // if(picked == null){return;} - // showDialog( - // context: context, - // barrierDismissible: false, - // builder: (BuildContext context) { - // return CupertinoAlertDialog( - // title: Text(_subtitle.updatingDots), - // content: Center(child: CircularProgressIndicator()), - // ); - // }, - // ); - // int status = await _serviceRequestsProvider.updateDate( - // user: _userProvider.user, - // host: _settingProvider.host, - // request: serviceRequest, - // newDate: picked.toString().split(" ").first - // ); - // Navigator.of(context).pop(); - // Fluttertoast.showToast( - // msg: HttpStatusManger.getStatusMessage(status: status, subtitle: _subtitle), - // ); - }, + onPressed: (serviceRequest.statusValue == 5 || serviceRequest.statusValue == 3) + ? null + : () async { + Navigator.of(context).push( + MaterialPageRoute(builder: (_) => CreateRequestPage(serviceRequest: serviceRequest)), + ); + // showModalBottomSheet( + // context: context, + // builder: (context) { + // return ServiceRequestsUpdateDialog( + // request: serviceRequest, + // ); + // }); + // DateTime picked = await showDatePicker( + // context: context, + // initialDate: DateTime.now(), + // firstDate: DateTime.now(), + // lastDate: DateTime.now().add(Duration(days: 182)) + // ); + // if(picked == null){return;} + // showDialog( + // context: context, + // barrierDismissible: false, + // builder: (BuildContext context) { + // return CupertinoAlertDialog( + // title: Text(_subtitle.updatingDots), + // content: Center(child: CircularProgressIndicator()), + // ); + // }, + // ); + // int status = await _serviceRequestsProvider.updateDate( + // user: _userProvider.user, + // host: _settingProvider.host, + // request: serviceRequest, + // newDate: picked.toString().split(" ").first + // ); + // Navigator.of(context).pop(); + // Fluttertoast.showToast( + // msg: HttpStatusManger.getStatusMessage(status: status, subtitle: _subtitle), + // ); + }, ), SizedBox( width: 16, @@ -397,17 +396,17 @@ class RequestDetailsPage extends StatelessWidget { padding: EdgeInsets.all(32), child: AButton( text: _subtitle.editServiceReport, - onPressed: () { - if(serviceRequest.statusValue == 2) { - Navigator.of(context).push( - MaterialPageRoute( - builder: (_) => FutureServiceReport( - request: serviceRequest, - workOrder: workOrders[index], - )), - ); - }else {null;} - }, + onPressed: serviceRequest.statusValue == 5 || serviceRequest.statusValue == 3 + ? null + : () { + Navigator.of(context).push( + MaterialPageRoute( + builder: (_) => FutureServiceReport( + request: serviceRequest, + workOrder: workOrders[index], + )), + ); + }, ), ) : SizedBox.shrink(), @@ -422,9 +421,11 @@ class RequestDetailsPage extends StatelessWidget { padding: const EdgeInsets.all(32), child: AButton( text: "Create Work Order", - onPressed: () { - Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest))); - }, + onPressed: serviceRequest.statusValue == 5 || serviceRequest.statusValue == 3 + ? null + : () { + Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest))); + }, ), ), ), @@ -445,14 +446,11 @@ class RequestDetailsPage extends StatelessWidget { padding: const EdgeInsets.all(32), child: AButton( text: "Create Work Order", - onPressed: () { - if(serviceRequest.statusValue == 2) { - Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest))); - } - else { - null; - } - }, + onPressed: serviceRequest.statusValue == 5 || serviceRequest.statusValue == 3 + ? null + : () { + Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest))); + }, ), ), ),