completed request improvement.

design_3.0_latest
Sikander Saleem 1 year ago
parent 898eac0ee8
commit 318ae666c1

@ -19,7 +19,7 @@ class RequestItemViewList extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return (list.isEmpty && !isLoading) return (list.isEmpty && !isLoading)
? NoDataFound(message: context.translation.noDataFound) ? NoDataFound(message: context.translation.noDataFound).center
: ListView.separated( : ListView.separated(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
shrinkWrap: true, shrinkWrap: true,

@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/app_strings/app_asset.dart'; import 'package:test_sa/app_strings/app_asset.dart';
import 'package:test_sa/dashboard_latest/widgets/request_category_list.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart';
@ -612,6 +611,7 @@ class ServiceRequestBottomSheet {
); );
})); }));
} }
static Future nurseRejectBackBottomSheet({required BuildContext context}) { static Future nurseRejectBackBottomSheet({required BuildContext context}) {
String feedback = ''; String feedback = '';
return buildBottomSheetParent( return buildBottomSheetParent(
@ -656,7 +656,7 @@ class ServiceRequestBottomSheet {
); );
requestDetailProvider.nurseReject(); requestDetailProvider.nurseReject();
Navigator.pop(context); Navigator.pop(context);
if(requestDetailProvider.currentWorkOrder!.data!.requestId!=null){ if (requestDetailProvider.currentWorkOrder!.data!.requestId != null) {
requestDetailProvider.getWorkOrderById(id: requestDetailProvider.currentWorkOrder!.data!.requestId!); requestDetailProvider.getWorkOrderById(id: requestDetailProvider.currentWorkOrder!.data!.requestId!);
} }
} }
@ -695,13 +695,13 @@ class ServiceRequestBottomSheet {
InkWell( InkWell(
child: acknowledge child: acknowledge
? const Icon( ? const Icon(
Icons.check_box, Icons.check_box,
color: AppColor.primary10, color: AppColor.primary10,
) )
: const Icon( : const Icon(
Icons.check_box_outline_blank, Icons.check_box_outline_blank,
color: AppColor.neutral120, color: AppColor.neutral120,
), ),
onTap: () { onTap: () {
setState(() { setState(() {
acknowledge = !acknowledge; acknowledge = !acknowledge;
@ -710,9 +710,7 @@ class ServiceRequestBottomSheet {
), ),
6.width, 6.width,
Flexible( Flexible(
child: context.translation.nurseAcknowledge child: context.translation.nurseAcknowledge.bodyText(context).custom(color: context.isDark ? AppColor.primary50 : AppColor.neutral120),
.bodyText(context)
.custom(color: context.isDark ? AppColor.primary50 : AppColor.neutral120),
), ),
], ],
), ),
@ -723,18 +721,17 @@ class ServiceRequestBottomSheet {
newSignature: newSignature, newSignature: newSignature,
backgroundColor: AppColor.neutral100, backgroundColor: AppColor.neutral100,
showShadow: false, showShadow: false,
onChange:(signature){ onChange: (signature) {
if (signature == null || signature.isEmpty) return;
setState(() { setState(() {
if (signature == null || signature.isEmpty) return;
newSignature = signature; newSignature = signature;
nurseSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}"; nurseSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}";
print('signature i got is ${newSignature}'); print('signature i got is ${newSignature}');
}); });
}, },
onSaved: (signature) { onSaved: (signature) {
if (signature == null || signature.isEmpty) return;
setState(() { setState(() {
if (signature == null || signature.isEmpty) return;
newSignature = signature; newSignature = signature;
nurseSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}"; nurseSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}";
print('signature i got is ${newSignature}'); print('signature i got is ${newSignature}');
@ -767,6 +764,7 @@ class ServiceRequestBottomSheet {
AppFilledButton( AppFilledButton(
label: context.translation.confirm, label: context.translation.confirm,
maxWidth: true, maxWidth: true,
loading: requestDetailProvider.isLoading,
buttonColor: AppColor.green70, buttonColor: AppColor.green70,
onPressed: () async { onPressed: () async {
if (newSignature != null) { if (newSignature != null) {
@ -774,12 +772,12 @@ class ServiceRequestBottomSheet {
workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!,
signatureNurse: nurseSignature, signatureNurse: nurseSignature,
); );
requestDetailProvider.nurseConfirm(); await requestDetailProvider.nurseConfirm();
if(requestDetailProvider.currentWorkOrder!.data!.requestId!=null){ if (requestDetailProvider.currentWorkOrder!.data!.requestId != null) {
requestDetailProvider.getWorkOrderById(id: requestDetailProvider.currentWorkOrder!.data!.requestId!); requestDetailProvider.getWorkOrderById(id: requestDetailProvider.currentWorkOrder!.data!.requestId!);
} }
Navigator.pop(context); Navigator.pop(context);
}else{ } else {
//show some toast... //show some toast...
} }
}, },

@ -58,7 +58,7 @@ class WorkOrderDetailView extends StatelessWidget {
context: context), context: context),
], ],
), ),
if (requestProvider.timer!=null&&requestProvider.timer!.isActive)...[ if (requestProvider.timer != null && requestProvider.timer!.isActive) ...[
const TimerWidget(), const TimerWidget(),
] ]
], ],
@ -67,7 +67,6 @@ class WorkOrderDetailView extends StatelessWidget {
} }
Widget workOrderDetailCard(BuildContext context, WorkOrderData workOrder, UserProvider userProvider) { Widget workOrderDetailCard(BuildContext context, WorkOrderData workOrder, UserProvider userProvider) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -102,10 +101,10 @@ class WorkOrderDetailView extends StatelessWidget {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
if (userProvider.user!.type == UsersTypes.normal_user) // if (userProvider.user!.type == UsersTypes.normal_user)
context.translation.code.toSvgAsset(width: 48).onPress(() { // context.translation.code.toSvgAsset(width: 48).onPress(() {
// Navigator.push(context, MaterialPageRoute(builder: (context) => UpdateServiceRequestPage(serviceRequest: serviceRequest))); // // Navigator.push(context, MaterialPageRoute(builder: (context) => UpdateServiceRequestPage(serviceRequest: serviceRequest)));
}), // }),
if (userProvider.user!.type == UsersTypes.engineer) 16.height, if (userProvider.user!.type == UsersTypes.engineer) 16.height,
Text( Text(
workOrder.requestedDate!.toString().toServiceRequestCardFormat, workOrder.requestedDate!.toString().toServiceRequestCardFormat,

@ -119,10 +119,10 @@ class _ServiceRequestDetailsPageState extends State<ServiceRequestDetailsPage> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
if (userProvider.user!.type == UsersTypes.normal_user) // if (userProvider.user!.type == UsersTypes.normal_user)
context.translation.code.toSvgAsset(width: 48).onPress(() { // context.translation.code.toSvgAsset(width: 48).onPress(() {
Navigator.push(context, MaterialPageRoute(builder: (context) => UpdateServiceRequestPage(serviceRequest: serviceRequest))); // Navigator.push(context, MaterialPageRoute(builder: (context) => UpdateServiceRequestPage(serviceRequest: serviceRequest)));
}), // }),
if (userProvider.user!.type == UsersTypes.engineer) 16.height, if (userProvider.user!.type == UsersTypes.engineer) 16.height,
Text( Text(
serviceRequest.date!.toServiceRequestCardFormat, serviceRequest.date!.toServiceRequestCardFormat,

Loading…
Cancel
Save