new service request flow & ui. & voice record timer fix.
Sikander Saleem
1 year ago
parent
ad3549b9a4
commit
3c182b856d
@ -0,0 +1,45 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:test_sa/extensions/int_extensions.dart';
|
||||
import 'package:test_sa/extensions/text_extensions.dart';
|
||||
import 'package:test_sa/extensions/widget_extensions.dart';
|
||||
import 'package:test_sa/models/service_request/pending_service_request_model.dart';
|
||||
import 'package:test_sa/models/service_request/service_request.dart';
|
||||
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
|
||||
import 'package:test_sa/views/pages/user/requests/service_request_details.dart';
|
||||
|
||||
class PendingServiceRequestScreen extends StatelessWidget {
|
||||
final PendingAssetServiceRequest pendingAssetServiceRequest;
|
||||
|
||||
PendingServiceRequestScreen(this.pendingAssetServiceRequest, {Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: DefaultAppBar(title: "Pending Requests (${pendingAssetServiceRequest.details.length})"),
|
||||
body: ListView.separated(
|
||||
itemCount: pendingAssetServiceRequest.details.length,
|
||||
padding: EdgeInsets.all(16),
|
||||
separatorBuilder: (cxt, index) => 12.height,
|
||||
itemBuilder: (cxt, index) => Container(
|
||||
padding: EdgeInsets.symmetric(vertical: 16, horizontal: 8),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.grey[200],
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
pendingAssetServiceRequest.details[index].message.cleanupWhitespace?.capitalizeFirstOfEach ?? "",
|
||||
style: Theme.of(context).textTheme.bodyLarge,
|
||||
).expanded,
|
||||
Icon(Icons.arrow_forward_ios, size: 16)
|
||||
],
|
||||
),
|
||||
).onPress(() {
|
||||
Navigator.of(context).push(MaterialPageRoute(
|
||||
builder: (_) => ServiceRequestDetailsPage(
|
||||
serviceRequest: ServiceRequest(id: pendingAssetServiceRequest.details[index].id.toString()),
|
||||
)));
|
||||
})));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,83 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:test_sa/controllers/api_routes/urls.dart';
|
||||
import 'package:test_sa/extensions/context_extension.dart';
|
||||
import 'package:test_sa/extensions/int_extensions.dart';
|
||||
import 'package:test_sa/extensions/text_extensions.dart';
|
||||
import 'package:test_sa/extensions/widget_extensions.dart';
|
||||
import 'package:test_sa/models/device/asset.dart';
|
||||
import 'package:test_sa/new_views/app_style/app_color.dart';
|
||||
|
||||
class AssetDetailBottomSheet extends StatelessWidget {
|
||||
Asset asset;
|
||||
|
||||
AssetDetailBottomSheet(this.asset, {Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
(asset?.modelDefinition?.assetName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-").heading5(context),
|
||||
16.height,
|
||||
AspectRatio(
|
||||
aspectRatio: 358 / 136,
|
||||
child: Container(
|
||||
width: 95,
|
||||
height: 95,
|
||||
decoration: ShapeDecoration(
|
||||
color: AppColor.neutral30,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
image: DecorationImage(
|
||||
fit: BoxFit.cover,
|
||||
image: NetworkImage(asset?.assetPhoto != null ? URLs.getFileUrl(asset.assetPhoto) : "https://www.lasteelcraft.com/images/no-image-available.png"),
|
||||
)),
|
||||
),
|
||||
),
|
||||
16.height,
|
||||
Column(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
"${context.translation.assetNo}: ${asset.assetNumber}".bodyText(context),
|
||||
"${context.translation.modelName}: ${asset.modelDefinition.modelName}".bodyText(context),
|
||||
"${context.translation.supplier}: ${asset.supplier?.suppliername ?? "-"}".bodyText(context),
|
||||
"${context.translation.manufacture}: ${asset.modelDefinition.manufacturerName}".bodyText(context),
|
||||
//"${context.translation.location}: ${assetModel.site.custName?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context),
|
||||
],
|
||||
).expanded,
|
||||
8.width,
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
"${context.translation.snNo}: ${asset.assetSerialNo}".bodyText(context),
|
||||
"${context.translation.site}: ${asset?.site?.custName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context),
|
||||
"${context.translation.building}: ${asset?.building?.name?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context),
|
||||
"${context.translation.floor}: ${asset?.floor?.name?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context),
|
||||
"${context.translation.md}: ${asset?.department?.departmentName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context),
|
||||
"${context.translation.room}: ${asset?.room?.value ?? "-"}".bodyText(context),
|
||||
],
|
||||
).expanded,
|
||||
],
|
||||
),
|
||||
8.height,
|
||||
if ((asset.modelDefinition.assetDescription ?? "").isNotEmpty) ...[
|
||||
8.height,
|
||||
const Divider(color: AppColor.neutral30, height: 1, thickness: 1),
|
||||
8.height,
|
||||
asset.modelDefinition.assetDescription.bodyText(context),
|
||||
]
|
||||
],
|
||||
)
|
||||
],
|
||||
).paddingAll(16);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,132 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:test_sa/extensions/context_extension.dart';
|
||||
import 'package:test_sa/extensions/int_extensions.dart';
|
||||
import 'package:test_sa/extensions/text_extensions.dart';
|
||||
import 'package:test_sa/extensions/widget_extensions.dart';
|
||||
import 'package:test_sa/views/widgets/bottom_sheets/asset_detail_bottom_sheet.dart';
|
||||
import 'package:test_sa/views/widgets/equipment/single_device_picker.dart';
|
||||
|
||||
import '../../../models/device/asset.dart';
|
||||
import '../../../new_views/app_style/app_color.dart';
|
||||
|
||||
class AssetPicker extends StatelessWidget {
|
||||
final Function(Asset) onPick;
|
||||
final Asset device;
|
||||
final bool editable;
|
||||
final bool showAssetInfo;
|
||||
final bool forPPM;
|
||||
final bool showLoading;
|
||||
|
||||
AssetPicker({Key key, this.editable = true, this.device, this.onPick, this.showAssetInfo = true, this.forPPM = false, this.showLoading = false}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
children: [
|
||||
if (device == null)
|
||||
Container(
|
||||
height: 50,
|
||||
alignment: Alignment.center,
|
||||
decoration: BoxDecoration(
|
||||
color: AppColor.blueStatus(context),
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
// boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.03), blurRadius: 14)],
|
||||
),
|
||||
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
"qr".toSvgAsset(height: 22, fit: BoxFit.fitHeight, color: context.isDark ? AppColor.neutral20 : Colors.white),
|
||||
8.width,
|
||||
"Scan or Pick Asset".bodyText(context).custom(color: context.isDark ? AppColor.neutral20 : Colors.white),
|
||||
],
|
||||
),
|
||||
).onPress(() async {
|
||||
Asset device = await Navigator.of(context).pushNamed(MyAssetsPage.id) as Asset;
|
||||
if (device != null) {
|
||||
onPick(device);
|
||||
}
|
||||
})
|
||||
else
|
||||
Container(
|
||||
height: 50,
|
||||
alignment: Alignment.center,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white, borderRadius: BorderRadius.circular(10), border: Border.all(color: AppColor.blueStatus(context), width: 2),
|
||||
// boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.03), blurRadius: 14)],
|
||||
),
|
||||
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
"qr".toSvgAsset(height: 22, fit: BoxFit.fitHeight, color: context.isDark ? AppColor.neutral20 : Colors.black87),
|
||||
8.width,
|
||||
"Re-Scan or Pick Asset".bodyText(context).custom(color: context.isDark ? AppColor.neutral20 : Colors.black87),
|
||||
],
|
||||
),
|
||||
).onPress(() async {
|
||||
Asset device = await Navigator.of(context).pushNamed(MyAssetsPage.id) as Asset;
|
||||
if (device != null) {
|
||||
onPick(device);
|
||||
}
|
||||
}),
|
||||
if (device != null && showAssetInfo)
|
||||
Container(
|
||||
padding: EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
color: showLoading ? Colors.white : Color(0xffF4F6FC),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: Color(0xff212936).withOpacity(.03),
|
||||
),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Text(
|
||||
device.modelDefinition?.assetName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "",
|
||||
style: TextStyle(
|
||||
fontSize: 14.toScreenWidth,
|
||||
fontWeight: FontWeight.w500,
|
||||
fontStyle: FontStyle.normal,
|
||||
color: Colors.black87,
|
||||
decoration: TextDecoration.none,
|
||||
),
|
||||
).toShimmer(isShow: showLoading).expanded,
|
||||
const Icon(
|
||||
Icons.info,
|
||||
color: Color(0xff7D859A),
|
||||
size: 20,
|
||||
),
|
||||
],
|
||||
),
|
||||
8.height,
|
||||
"${context.translation.assetNo}: ${device.assetNumber}".bodyText2(context).toShimmer(isShow: showLoading),
|
||||
2.height,
|
||||
// "${context.translation.manufacture}: ${device.modelDefinition?.manufacturerName}".bodyText(context),
|
||||
"${context.translation.model}: ${device.modelDefinition?.modelName}".bodyText2(context).toShimmer(isShow: showLoading),
|
||||
// "${context.translation.serialNumber}: ${device.assetNumber}".bodyText(context),
|
||||
// const Divider().defaultStyle(context),
|
||||
// "${context.translation.department}: ${device.department?.departmentName}".bodyText(context),
|
||||
// "${context.translation.site}: ${device.site?.custName}".bodyText(context),
|
||||
],
|
||||
),
|
||||
).onPress(() {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
shape: const RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.vertical(
|
||||
top: Radius.circular(20),
|
||||
),
|
||||
),
|
||||
clipBehavior: Clip.antiAliasWithSaveLayer,
|
||||
builder: (BuildContext context) => AssetDetailBottomSheet(device),
|
||||
);
|
||||
}).paddingOnly(top: 16),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue