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,7 +60,8 @@ class WorkOrderItem extends StatelessWidget {
// color: onItemColor, // color: onItemColor,
// ), // ),
// ), // ),
Row(crossAxisAlignment: CrossAxisAlignment.start, Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"Asset Name:", "Asset Name:",

@ -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,13 +94,12 @@ 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
: () async {
Navigator.of(context).push( Navigator.of(context).push(
MaterialPageRoute(builder: (_) => CreateRequestPage(serviceRequest: serviceRequest)), MaterialPageRoute(builder: (_) => CreateRequestPage(serviceRequest: serviceRequest)),
); );
} else
null;
// showModalBottomSheet( // showModalBottomSheet(
// context: context, // context: context,
// builder: (context) { // builder: (context) {
@ -397,8 +396,9 @@ 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( Navigator.of(context).push(
MaterialPageRoute( MaterialPageRoute(
builder: (_) => FutureServiceReport( builder: (_) => FutureServiceReport(
@ -406,7 +406,6 @@ class RequestDetailsPage extends StatelessWidget {
workOrder: workOrders[index], workOrder: workOrders[index],
)), )),
); );
}else {null;}
}, },
), ),
) )
@ -422,7 +421,9 @@ 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
? null
: () {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest))); Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest)));
}, },
), ),
@ -445,13 +446,10 @@ 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