improvements

main_production_RSG
Sikander Saleem 2 months ago
parent 1699acc27c
commit a974c020f2

@ -0,0 +1,6 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M22.75 8C22.75 4.27208 19.7279 1.25 16 1.25C12.5025 1.25 9.62621 3.91012 9.28409 7.31753C9.26044 7.55298 9.24862 7.6707 9.31573 7.76318C9.38283 7.85565 9.5121 7.88392 9.77063 7.94046C12.9057 8.62605 15.374 11.0943 16.0596 14.2294C16.1161 14.4879 16.1444 14.6172 16.2368 14.6843C16.3293 14.7514 16.447 14.7396 16.6825 14.7159C20.0899 14.3738 22.75 11.4976 22.75 8Z" fill="#EAF1F4"/>
<path d="M8 9.25C4.27208 9.25 1.25 12.2721 1.25 16C1.25 19.7279 4.27208 22.75 8 22.75C11.7279 22.75 14.75 19.7279 14.75 16C14.75 12.2721 11.7279 9.25 8 9.25Z" fill="#EAF1F4"/>
<path d="M5.77448 4.24219L6.5663 5.19395C6.72824 5.38861 6.97748 5.48841 7.22902 5.45932C7.48056 5.43023 7.70044 5.27618 7.81368 5.0497L8.67082 3.33541C8.78707 3.10292 8.77464 2.82681 8.63799 2.6057C8.50133 2.38459 8.25993 2.25 8 2.25C7.21245 2.25 6.45502 2.38478 5.75052 2.63328C3.12763 3.55843 1.25 6.05696 1.25 9C1.25 9.41421 1.58579 9.75 2 9.75C2.41421 9.75 2.75 9.41421 2.75 9C2.75 6.89355 3.98604 5.07881 5.77448 4.24219Z" fill="#EAF1F4"/>
<path d="M17.4337 18.806L18.2255 19.7578C20.014 18.9212 21.25 17.1064 21.25 15C21.25 14.5858 21.5858 14.25 22 14.25C22.4142 14.25 22.75 14.5858 22.75 15C22.75 17.943 20.8724 20.4416 18.2495 21.3667C17.545 21.6152 16.7875 21.75 16 21.75C15.7401 21.75 15.4987 21.6154 15.362 21.3943C15.2254 21.1732 15.2129 20.8971 15.3292 20.6646L16.1863 18.9503C16.2996 18.7238 16.5194 18.5698 16.771 18.5407C17.0225 18.5116 17.2718 18.6114 17.4337 18.806Z" fill="#EAF1F4"/>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -142,7 +142,7 @@ class CreateRequestModel {
// }); // });
if (context.settingProvider.isUserFlowMedical) { if (context.settingProvider.isUserFlowMedical) {
list.add(CreateRequestModel('Loan Equipment Request'.addTranslation, "add_icon", CreateLoanRequestPage.id)); list.add(CreateRequestModel('Loan Equipment Request'.addTranslation, "wo/loan_wo", CreateLoanRequestPage.id));
// list.add(CreateRequestModel('Demo Request'.addTranslation, "add_icon", CreateDemoRequestPage.id)); // list.add(CreateRequestModel('Demo Request'.addTranslation, "add_icon", CreateDemoRequestPage.id));
} }
} }

@ -6,6 +6,8 @@ import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/device/asset.dart'; import 'package:test_sa/models/device/asset.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/views/widgets/item_views/info_header_widget.dart';
import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
class AssetDetailBottomSheet extends StatelessWidget { class AssetDetailBottomSheet extends StatelessWidget {
Asset? asset; Asset? asset;
@ -16,14 +18,14 @@ class AssetDetailBottomSheet extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Padding( return Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom + bottom: MediaQuery.of(context).viewInsets.bottom + MediaQuery.of(context).padding.bottom,
MediaQuery.of(context).padding.bottom,
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
(asset?.modelDefinition?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-").heading5(context).custom(color: AppColor.textStyleColor(context)), // (asset?.modelDefinition?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-").heading5(context).custom(color: AppColor.textStyleColor(context)),
InfoHeader16Widget(asset?.modelDefinition?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-"),
16.height, 16.height,
AspectRatio( AspectRatio(
aspectRatio: 358 / 136, aspectRatio: 358 / 136,
@ -52,33 +54,70 @@ class AssetDetailBottomSheet extends StatelessWidget {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
"${context.translation.assetNo}: ${asset!.assetNumber}".bodyText(context), InfoTextWidget(
"${context.translation.modelName}: ${asset!.modelDefinition?.modelName}".bodyText(context), label: context.translation.assetNo,
"${context.translation.supplier}: ${asset!.supplier?.suppliername?.cleanupWhitespace.capitalizeFirstOfEach ?? "-"}".bodyText(context), value: asset!.assetNumber,
"${context.translation.manufacture}: ${asset!.modelDefinition?.manufacturerName?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context), showEmptyValue: true,
//"${context.translation.location}: ${assetModel.site.custName?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context), ),
InfoTextWidget(
label: context.translation.modelName,
value: asset!.modelDefinition?.modelName,
showEmptyValue: true,
),
InfoTextWidget(
label: context.translation.supplier,
value: asset!.supplier?.suppliername?.cleanupWhitespace.capitalizeFirstOfEach,
showEmptyValue: true,
),
InfoTextWidget(
label: context.translation.manufacture,
value: asset!.modelDefinition?.manufacturerName?.cleanupWhitespace.capitalizeFirstOfEach,
showEmptyValue: true,
),
], ],
).expanded, ).expanded,
8.width, 8.width,
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
"${context.translation.snNo}: ${asset!.assetSerialNo}".bodyText(context), InfoTextWidget(
"${context.translation.site}: ${asset?.site?.custName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-"}".bodyText(context), label: context.translation.snNo,
"${context.translation.building}: ${asset?.building?.name?.cleanupWhitespace.capitalizeFirstOfEach ?? "-"}".bodyText(context), value: asset!.assetSerialNo,
"${context.translation.floor}: ${asset?.floor?.name?.cleanupWhitespace.capitalizeFirstOfEach ?? "-"}".bodyText(context), showEmptyValue: true,
"${context.translation.md}: ${asset?.department?.departmentName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-"}".bodyText(context), ),
"${context.translation.room}: ${asset?.room?.name ?? "-"}".bodyText(context), InfoTextWidget(
label: context.translation.site,
value: asset?.site?.custName?.cleanupWhitespace.capitalizeFirstOfEach,
showEmptyValue: true,
),
InfoTextWidget(
label: context.translation.building,
value: asset?.building?.name?.cleanupWhitespace.capitalizeFirstOfEach,
showEmptyValue: true,
),
InfoTextWidget(
label: context.translation.floor,
value: asset?.floor?.name?.cleanupWhitespace.capitalizeFirstOfEach,
showEmptyValue: true,
),
InfoTextWidget(
label: context.translation.md,
value: asset?.department?.departmentName?.cleanupWhitespace.capitalizeFirstOfEach,
showEmptyValue: true,
),
InfoTextWidget(
label: context.translation.room,
value: asset?.room?.name,
showEmptyValue: true,
),
], ],
).expanded, ).expanded,
], ],
), ),
8.height, 8.height,
if ((asset?.modelDefinition?.assetDescription ?? "").isNotEmpty) ...[ if ((asset?.modelDefinition?.assetDescription ?? "").isNotEmpty) ...[
8.height, const Divider().defaultStyle(context),
const Divider(color: AppColor.neutral30, height: 1, thickness: 1), InfoTextWidget(label: asset!.modelDefinition!.assetDescription!, isMsg: true, showEmptyValue: true),
8.height,
asset!.modelDefinition!.assetDescription!.bodyText(context),
] ]
], ],
) )

@ -69,16 +69,16 @@ class AssetPicker extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
color: buttonColor ?? backgroundColor ?? AppColor.primary10, color: buttonColor ?? backgroundColor ?? AppColor.primary10,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
border: showBorder ? Border.all(color: borderColor ?? AppColor.blueStatus(context), width: 2) : null, border: showBorder ? Border.all(color: borderColor ?? AppColor.border2Color(context), width: 1) : null,
// boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.03), blurRadius: 14)], // boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.03), blurRadius: 14)],
), ),
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight), padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
"scan_asset".toSvgAsset(height: 22, fit: BoxFit.fitHeight, color: AppColor.icon2Color(context)), "scan_asset".toSvgAsset(height: 22, fit: BoxFit.fitHeight, color: AppColor.white10),
8.width, 8.width,
' ${label ?? "Scan or Pick Asset"}'.bodyText(context).custom(color: AppColor.icon2Color(context)), ' ${label ?? "Scan or Pick Asset"}'.bodyText(context).custom(color: AppColor.white10),
], ],
), ),
).onPress(() async { ).onPress(() async {
@ -120,7 +120,7 @@ class AssetPicker extends StatelessWidget {
children: [ children: [
"scan_asset".toSvgAsset(height: 22, fit: BoxFit.fitHeight, color: AppColor.icon2Color(context)), "scan_asset".toSvgAsset(height: 22, fit: BoxFit.fitHeight, color: AppColor.icon2Color(context)),
8.width, 8.width,
"Re-Scan or Pick Asset".bodyText(context).custom(color: AppColor.textStyleColor(context)), "Re-Scan or Pick Asset".bodyText(context).custom(color: AppColor.icon2Color(context)),
], ],
), ),
).onPress(() async { ).onPress(() async {

@ -10,3 +10,11 @@ class InfoHeaderWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) => Text(label, style: AppTextStyles.bodyText.copyWith(color: AppColor.textStyleColor(context))); Widget build(BuildContext context) => Text(label, style: AppTextStyles.bodyText.copyWith(color: AppColor.textStyleColor(context)));
} }
class InfoHeader16Widget extends StatelessWidget {
final String label;
InfoHeader16Widget(this.label, {Key? key}) : super(key: key);
@override
Widget build(BuildContext context) => Text(label, style: AppTextStyles.heading6.copyWith(color: AppColor.textStyleColor(context)));
}
Loading…
Cancel
Save