improvements

main_design2.0
Sikander Saleem 2 years ago
parent 253ce67deb
commit 09f2ae32eb

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/localization/localization.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/subtitle.dart';
@ -32,7 +33,13 @@ class WorkOrderItem extends StatelessWidget {
), ),
), ),
onPressed: () { 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( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -53,13 +60,14 @@ class WorkOrderItem extends StatelessWidget {
// color: onItemColor, // color: onItemColor,
// ), // ),
// ), // ),
Row(crossAxisAlignment: CrossAxisAlignment.start, Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"Asset Name:", "Asset Name:",
style: Theme.of(context).textTheme.subtitle2.copyWith( style: Theme.of(context).textTheme.subtitle2.copyWith(
color: onItemColor, color: onItemColor,
), ),
), ),
8.width, 8.width,
Expanded( Expanded(
@ -68,8 +76,8 @@ class WorkOrderItem extends StatelessWidget {
// .AssetName // .AssetName
item.callRequest.asset.modelDefinition.assetName, item.callRequest.asset.modelDefinition.assetName,
style: Theme.of(context).textTheme.subtitle2.copyWith( style: Theme.of(context).textTheme.subtitle2.copyWith(
color: onItemColor, color: onItemColor,
), ),
), ),
), ),
], ],
@ -99,16 +107,16 @@ class WorkOrderItem extends StatelessWidget {
child: Text( child: Text(
"Asset SN:", "Asset SN:",
style: Theme.of(context).textTheme.subtitle2.copyWith( style: Theme.of(context).textTheme.subtitle2.copyWith(
color: onItemColor, color: onItemColor,
), ),
), ),
), ),
//if (item.clientName != null) //if (item.clientName != null)
Text( Text(
item.callRequest.asset.assetSerialNo, item.callRequest.asset.assetSerialNo,
style: Theme.of(context).textTheme.subtitle2.copyWith( style: Theme.of(context).textTheme.subtitle2.copyWith(
color: onItemColor, color: onItemColor,
), ),
), ),
], ],
), ),

@ -83,7 +83,6 @@ class _WorkOrderListState extends State<WorkOrderList> {
onPressed: (model) { onPressed: (model) {
// Navigator.of(context).push(MaterialPageRoute( // Navigator.of(context).push(MaterialPageRoute(
// builder: (_) => WorkOrderUpdate(item: model,))); // builder: (_) => WorkOrderUpdate(item: model,)));
log(model?.toJson()?.toString());
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => CreateSubWorkOrderPage(workOrder: model)), MaterialPageRoute(builder: (context) => CreateSubWorkOrderPage(workOrder: model)),

@ -36,6 +36,7 @@ import '../../../widgets/timer/app_timer.dart';
class RequestGasRefill extends StatefulWidget { class RequestGasRefill extends StatefulWidget {
static const String id = "/request-gas-refill"; static const String id = "/request-gas-refill";
final GasRefillModel gasRefillModel; final GasRefillModel gasRefillModel;
const RequestGasRefill({this.gasRefillModel, Key key}) : super(key: key); const RequestGasRefill({this.gasRefillModel, Key key}) : super(key: key);
@override @override
@ -160,8 +161,8 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
} else { } else {
_gasRefillProvider.timer = null; _gasRefillProvider.timer = null;
} }
HospitalsProvider().getHospitalsListByVal(searchVal: _userProvider.user?.clientName).then((value) { HospitalsProvider().getHospitalsListByVal(searchVal: _formModel.clientName).then((value) {
_gasRefillProvider.hospital = value?.firstWhere((element) => element.name == _userProvider.user?.clientName, orElse: () => null); _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.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.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); _gasRefillProvider.department = _gasRefillProvider.floor?.departments?.firstWhere((element) => element.name == widget.gasRefillModel?.department?.departmentName, orElse: () => null);

@ -94,48 +94,47 @@ class RequestDetailsPage extends StatelessWidget {
color: AColors.white, color: AColors.white,
buttonSize: 42, buttonSize: 42,
backgroundColor: AColors.green, backgroundColor: AColors.green,
onPressed: () async { onPressed: (serviceRequest.statusValue == 5 || serviceRequest.statusValue == 3)
if(serviceRequest.statusValue == 2) { ? null
Navigator.of(context).push( : () async {
MaterialPageRoute(builder: (_) => CreateRequestPage(serviceRequest: serviceRequest)), Navigator.of(context).push(
); MaterialPageRoute(builder: (_) => CreateRequestPage(serviceRequest: serviceRequest)),
} else );
null; // showModalBottomSheet(
// showModalBottomSheet( // context: context,
// context: context, // builder: (context) {
// builder: (context) { // return ServiceRequestsUpdateDialog(
// return ServiceRequestsUpdateDialog( // request: serviceRequest,
// request: serviceRequest, // );
// ); // });
// }); // DateTime picked = await showDatePicker(
// DateTime picked = await showDatePicker( // context: context,
// context: context, // initialDate: DateTime.now(),
// initialDate: DateTime.now(), // firstDate: DateTime.now(),
// firstDate: DateTime.now(), // lastDate: DateTime.now().add(Duration(days: 182))
// lastDate: DateTime.now().add(Duration(days: 182)) // );
// ); // if(picked == null){return;}
// if(picked == null){return;} // showDialog<void>(
// showDialog<void>( // context: context,
// context: context, // barrierDismissible: false,
// barrierDismissible: false, // builder: (BuildContext context) {
// builder: (BuildContext context) { // return CupertinoAlertDialog(
// return CupertinoAlertDialog( // title: Text(_subtitle.updatingDots),
// title: Text(_subtitle.updatingDots), // content: Center(child: CircularProgressIndicator()),
// content: Center(child: CircularProgressIndicator()), // );
// ); // },
// }, // );
// ); // int status = await _serviceRequestsProvider.updateDate(
// int status = await _serviceRequestsProvider.updateDate( // user: _userProvider.user,
// user: _userProvider.user, // host: _settingProvider.host,
// host: _settingProvider.host, // request: serviceRequest,
// request: serviceRequest, // newDate: picked.toString().split(" ").first
// newDate: picked.toString().split(" ").first // );
// ); // Navigator.of(context).pop();
// Navigator.of(context).pop(); // Fluttertoast.showToast(
// Fluttertoast.showToast( // msg: HttpStatusManger.getStatusMessage(status: status, subtitle: _subtitle),
// msg: HttpStatusManger.getStatusMessage(status: status, subtitle: _subtitle), // );
// ); },
},
), ),
SizedBox( SizedBox(
width: 16, width: 16,
@ -397,17 +396,17 @@ class RequestDetailsPage extends StatelessWidget {
padding: EdgeInsets.all(32), padding: EdgeInsets.all(32),
child: AButton( child: AButton(
text: _subtitle.editServiceReport, text: _subtitle.editServiceReport,
onPressed: () { onPressed: serviceRequest.statusValue == 5 || serviceRequest.statusValue == 3
if(serviceRequest.statusValue == 2) { ? null
Navigator.of(context).push( : () {
MaterialPageRoute( Navigator.of(context).push(
builder: (_) => FutureServiceReport( MaterialPageRoute(
request: serviceRequest, builder: (_) => FutureServiceReport(
workOrder: workOrders[index], request: serviceRequest,
)), workOrder: workOrders[index],
); )),
}else {null;} );
}, },
), ),
) )
: SizedBox.shrink(), : SizedBox.shrink(),
@ -422,9 +421,11 @@ class RequestDetailsPage extends StatelessWidget {
padding: const EdgeInsets.all(32), padding: const EdgeInsets.all(32),
child: AButton( child: AButton(
text: "Create Work Order", text: "Create Work Order",
onPressed: () { onPressed: serviceRequest.statusValue == 5 || serviceRequest.statusValue == 3
Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest))); ? null
}, : () {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest)));
},
), ),
), ),
), ),
@ -445,14 +446,11 @@ class RequestDetailsPage extends StatelessWidget {
padding: const EdgeInsets.all(32), padding: const EdgeInsets.all(32),
child: AButton( child: AButton(
text: "Create Work Order", text: "Create Work Order",
onPressed: () { onPressed: serviceRequest.statusValue == 5 || serviceRequest.statusValue == 3
if(serviceRequest.statusValue == 2) { ? null
Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest))); : () {
} Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest)));
else { },
null;
}
},
), ),
), ),
), ),

Loading…
Cancel
Save