Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

dark / ligth dark

Browse Source
main_design2.0
nextwo 2 years ago
parent 6f3978c439
commit 4757c73737
13 changed files with 197 additions and 222 deletions
Show Stats Download Patch File Download Diff File

2
lib/extensions/widget_extensions.dart
Unescape Escape View File

@ -68,5 +68,5 @@ extension WidgetExtensions on Widget {
} }
extension DividerExtension on Divider { extension DividerExtension on Divider {
Divider defaultStyle(BuildContext context) => Divider(thickness: 1, color: context.isDark ? AppColor.neutral50 : AppColor.neutral30); Divider defaultStyle(BuildContext context) => Divider(thickness: 1, color: context.isDark ? AppColor.neutral20 : AppColor.neutral30);
} }

15
lib/l10n/app_ar.arb
Unescape Escape View File

@ -307,7 +307,7 @@
"updateWorkOrder" : "تعديل طلب العمل", "updateWorkOrder" : "تعديل طلب العمل",
"createPreventiveMaintenanceRequest" : "إنشاء طلب صيانة وقائية", "createPreventiveMaintenanceRequest" : "إنشاء طلب صيانة وقائية",
"createNewRequest" : "إنشاء طلب جديد", "createNewRequest" : "إنشاء طلب جديد",
"calendar" : "التقويم", "calender" : "التقويم",
"helpCenter" : "مركز المساعدة", "helpCenter" : "مركز المساعدة",
"rateUs": "قيمنا", "rateUs": "قيمنا",
"settings" : " الاعدادات", "settings" : " الاعدادات",
@ -350,7 +350,16 @@
"item" : "عنصر", "item" : "عنصر",
"serialNo" : "رقم التسلسلي", "serialNo" : "رقم التسلسلي",
"measuredValue": "القيمة المقاسه", "measuredValue": "القيمة المقاسه",
"sureExit" : " هل انت متاكد من الخروج؟" "sureExit" : " هل انت متاكد من الخروج؟",
"daily" : "يومي",
"weekly" : "اسبوعي",
"monthly" : "شهري",
"myShift" : "ورديتي",
"myTeamRequest" : "طلب فريقي",
"sunToThurs": "الاحد الى الخميس",
"requestGasRefill" : "طلب اعادة تعبئة غاز",
"trackGasRefill" : "تتبع طلبات اعادة تعبئة غاز",
"trackAssetTransfer" : "تتبع نقل اجهزة",
"total" : "مجموع"
} }

13
lib/l10n/app_en.arb
Unescape Escape View File

@ -349,7 +349,18 @@
"addItem" : "Add Item", "addItem" : "Add Item",
"item" : "Item", "item" : "Item",
"measuredValue": "Measured Value", "measuredValue": "Measured Value",
"sureExit" : "Are you sure ypu want to Exit? " "sureExit" : "Are you sure ypu want to Exit? ",
"daily" : "Daily",
"weekly" : "Weekly",
"monthly" : "Monthly",
"myShift" : "My Shift",
"myTeamRequest" : "My Team Request",
"sunToThurs": "Sunday to Thursday",
"requestGasRefill" : "Request Gas Refill",
"trackGasRefill" : "Track Gas Refill",
"trackAssetTransfer" : "Track Asset Transfer",
"total" : "Total"
} }

10
lib/new_views/pages/land_page/calendar_page.dart
Unescape Escape View File

@ -39,9 +39,9 @@ class _CalendarPageState extends State<CalendarPage> with SingleTickerProviderSt
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
"My Shift".heading5(context), context.translation.myShift.heading5(context),
8.height, 8.height,
"Sunday to Thursday".bodyText(context), context.translation.sunToThurs.bodyText(context),
"09:00 to 18:00".bodyText(context).custom(color: context.isDark? AppColor.neutral10: AppColor.neutral50), "09:00 to 18:00".bodyText(context).custom(color: context.isDark? AppColor.neutral10: AppColor.neutral50),
], ],
).toShadowContainer(context), ).toShadowContainer(context),
@ -61,9 +61,9 @@ class _CalendarPageState extends State<CalendarPage> with SingleTickerProviderSt
setState(() {}); setState(() {});
}, },
tabs: [ tabs: [
Tab(text: "Monthly", height: 57.toScreenHeight), Tab(text: context.translation.monthly, height: 57.toScreenHeight),
Tab(text: "Weekly", height: 57.toScreenHeight), Tab(text: context.translation.weekly, height: 57.toScreenHeight),
Tab(text: "Daily", height: 57.toScreenHeight), Tab(text: context.translation.daily, height: 57.toScreenHeight),
], ],
), ),
), ),

3
lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart
Unescape Escape View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
class DailyFragment extends StatefulWidget { class DailyFragment extends StatefulWidget {
@ -27,7 +28,7 @@ class _DailyFragmentState extends State<DailyFragment> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SingleChildScrollView( return SingleChildScrollView(
child: Column( child: Column(
children: ["Daily".heading5(context)], children: [context.translation.daily.heading5(context)],
), ),
); );
} }

6
lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart
Unescape Escape View File

@ -39,9 +39,9 @@ class _MonthlyFragmentState extends State<MonthlyFragment> {
_controller = controller; _controller = controller;
}, },
calendarBuilders: CalendarBuilders( calendarBuilders: CalendarBuilders(
headerTitleBuilder: (context, dateTime) => CalendarHeader(dateFormat: DateFormat("MMMM, yyyy"), dateTime: dateTime), headerTitleBuilder: (context, dateTime) => CalendarHeader(dateFormat: DateFormat("MMMM, yyyy", context.isAr?"ar":"en"), dateTime: dateTime),
dowBuilder: (context, dateTime) { dowBuilder: (context, dateTime) {
final day = DateFormat("EE").format(dateTime).toUpperCase(); final day = DateFormat("EE",context.isAr?"ar":"en").format(dateTime).toUpperCase();
return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: context.isDark? AppColor.neutral10:AppColor.neutral50)); return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: context.isDark? AppColor.neutral10:AppColor.neutral50));
}, },
defaultBuilder: (context, dateTime, _) { defaultBuilder: (context, dateTime, _) {
@ -78,7 +78,7 @@ class _MonthlyFragmentState extends State<MonthlyFragment> {
children: [ children: [
const CircleAvatar(backgroundColor: AppColor.green50, radius: 8), const CircleAvatar(backgroundColor: AppColor.green50, radius: 8),
8.width, 8.width,
"My Team Requests".heading6(context), context.translation.myTeamRequest.heading6(context),
], ],
), ),
], ],

4
lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart
Unescape Escape View File

@ -51,13 +51,13 @@ class _WeeklyFragmentState extends State<WeeklyFragment> {
headerTitleBuilder: (context, dateTime) => Column( headerTitleBuilder: (context, dateTime) => Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
DateFormat("EEEE, d MMMM, yyyy").format(dateTime).heading5(context), DateFormat("EEEE, d MMMM, yyyy", context.isAr?"ar":"en").format(dateTime).heading5(context),
8.height, 8.height,
const Divider().defaultStyle(context), const Divider().defaultStyle(context),
], ],
), ),
dowBuilder: (context, dateTime) { dowBuilder: (context, dateTime) {
final day = DateFormat("EE").format(dateTime).toUpperCase(); final day = DateFormat("EE", context.isAr?"ar":"en").format(dateTime).toUpperCase();
return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: context.isDark? AppColor.neutral10:AppColor.neutral50)); return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: context.isDark? AppColor.neutral10:AppColor.neutral50));
}, },
defaultBuilder: (context, dateTime, _) { defaultBuilder: (context, dateTime, _) {

8
lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart
Unescape Escape View File

@ -38,7 +38,7 @@ class ProgressFragment extends StatelessWidget {
initialAngleInDegree: 270, initialAngleInDegree: 270,
chartType: ChartType.ring, chartType: ChartType.ring,
ringStrokeWidth: 40.toScreenWidth, ringStrokeWidth: 40.toScreenWidth,
centerText: "Total\n20", centerText: "${context.translation.total}\n20",
centerTextStyle: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), centerTextStyle: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
legendOptions: const LegendOptions(showLegends: false), legendOptions: const LegendOptions(showLegends: false),
chartValuesOptions: ChartValuesOptions( chartValuesOptions: ChartValuesOptions(
@ -68,9 +68,9 @@ class ProgressFragment extends StatelessWidget {
// setState(() {}); // setState(() {});
}, },
tabs: [ tabs: [
Tab(text: "Open", height: 57.toScreenHeight), Tab(text: context.translation.open, height: 57.toScreenHeight),
Tab(text: "In Progress", height: 57.toScreenHeight), Tab(text: context.translation.inProgress, height: 57.toScreenHeight),
Tab(text: "Completed", height: 57.toScreenHeight), Tab(text: context.translation.completed, height: 57.toScreenHeight),
], ],
), ),
), ),

113
lib/views/pages/device_transfer/device_transfer_details.dart
Unescape Escape View File

@ -75,7 +75,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Text(context.translation.transferDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), context.translation.transferDetails.heading5(context),
8.height, 8.height,
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -109,7 +109,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
// ), // ),
1.width, 1.width,
Text(widget.model.createdOn != null ? widget.model.createdOn.toServiceRequestCardFormat : "", Text(widget.model.createdOn != null ? widget.model.createdOn.toServiceRequestCardFormat : "",
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color:context.isDark? AppColor.neutral10: Color(0xFF3B3D4A))),
], ],
), ),
], ],
@ -163,72 +163,63 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
} }
_buildDetailsCard(Widget widget) { _buildDetailsCard(Widget widget) {
return widget.paddingOnly(top: 14, start: 14, end: 14); return widget.toShadowContainer(context).paddingOnly(top: 14, start: 14, end: 14);
} }
_buildTextWidget(String text) { _buildTextWidget(String text) {
return Text( return text.bodyText(context);
text,
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
);
} }
_buildCard({@required String site, @required String unit, @required String comment, @required bool isSender, StatusLabel statusLabel}) { _buildCard({@required String site, @required String unit, @required String comment, @required bool isSender, StatusLabel statusLabel}) {
return Container( return Column(
decoration: BoxDecoration( crossAxisAlignment: CrossAxisAlignment.start,
color: Colors.white, children: [
borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)), Row(
), mainAxisAlignment: MainAxisAlignment.spaceBetween,
child: Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Row( children: [
mainAxisAlignment: MainAxisAlignment.spaceBetween, statusLabel ?? Container(),
children: [ 8.height,
Column( isSender ? context.translation.senderDetails.heading5(context) : context.translation.receiverDetails.heading5(context),
crossAxisAlignment: CrossAxisAlignment.start, ],
children: [ ),
statusLabel ?? Container(), if ((_userProvider.user?.type == UsersTypes.engineer) && (isSender ? _model.senderMachineStatusName != "Closed" : _model.receiverMachineStatusName != "Closed"))
8.height, CircleAvatar(
Text(isSender ? context.translation.senderDetails : context.translation.receiverDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), radius: 25,
], backgroundColor: AppColor.neutral30,
), child: CircleAvatar(
if ((_userProvider.user?.type == UsersTypes.engineer) && (isSender ? _model.senderMachineStatusName != "Closed" : _model.receiverMachineStatusName != "Closed")) radius: 24,
CircleAvatar( backgroundColor: Colors.white,
radius: 25, child: Padding(
backgroundColor: AppColor.neutral30, padding: const EdgeInsets.only(left: 3.0),
child: CircleAvatar( child: SvgPicture.asset('assets/images/update.svg'),
radius: 24,
backgroundColor: Colors.white,
child: Padding(
padding: const EdgeInsets.only(left: 3.0),
child: SvgPicture.asset('assets/images/update.svg'),
),
), ),
).onPress(isSender ),
? () { ).onPress(isSender
Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender))); ? () {
} Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender)));
: () { }
Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender))); : () {
}), Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender)));
], }),
), ],
Column( ),
crossAxisAlignment: CrossAxisAlignment.start, Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
_buildTextWidget('${context.translation.site} : $site'), children: [
_buildTextWidget('${context.translation.unite} : $unit'), _buildTextWidget('${context.translation.site} : $site'),
8.height, _buildTextWidget('${context.translation.unite} : $unit'),
const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1), 8.height,
8.height, const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1),
_buildTextWidget(comment), 8.height,
], _buildTextWidget(comment),
), ],
8.height, ),
], 8.height,
).paddingAll(14), ],
).paddingOnly(top: 14, start: 14, end: 14); ).toShadowContainer(context).paddingOnly(top: 14, start: 14, end: 14);
} }
int getIdstatus(String status) { int getIdstatus(String status) {

37
lib/views/pages/device_transfer/update_device_transfer.dart
Unescape Escape View File

@ -206,32 +206,15 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
} }
_buildCard() { _buildCard() {
return Container( return Column(
width: MediaQuery.of(context).size.width, crossAxisAlignment: CrossAxisAlignment.start,
decoration: ShapeDecoration( children: [
color: Colors.white, context.translation.transferDetails.heading5(context),
shape: RoundedRectangleBorder( 8.height,
borderRadius: BorderRadius.circular(15), '${context.translation.assetName}: ${_formModel.assetName}'.bodyText(context),
), ///TBDZ
shadows: const [BoxShadow(color: Color(0x07000000), blurRadius: 14, offset: Offset(0, 0), spreadRadius: 0)], '${context.translation.requesterName}: '.bodyText(context),
), ],
child: Column( ).toShadowContainer(context);
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(context.translation.transferDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
8.height,
Text(
'${context.translation.assetName}: ${_formModel.assetName}',
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
),
///TBD
Text(
'${context.translation.requesterName}: ',
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
),
],
).paddingAll(16),
);
} }
} }

14
lib/views/pages/user/land_page.dart
Unescape Escape View File

@ -151,7 +151,7 @@ class _LandPageState extends State<LandPage> {
if (_userProvider.user != null && _userProvider.user.type == UsersTypes.normal_user) if (_userProvider.user != null && _userProvider.user.type == UsersTypes.normal_user)
LandPageItem( LandPageItem(
// text: _subtitle.newServiceRequest, // text: _subtitle.newServiceRequest,
text: "New Service Request", text: context.translation.newServiceRequest,
icon: FontAwesomeIcons.screwdriverWrench, icon: FontAwesomeIcons.screwdriverWrench,
onPressed: () { onPressed: () {
Navigator.of(context).pushNamed(CreateServiceRequestPage.id); Navigator.of(context).pushNamed(CreateServiceRequestPage.id);
@ -159,7 +159,7 @@ class _LandPageState extends State<LandPage> {
), ),
LandPageItem( LandPageItem(
// text: _subtitle.trackServiceRequest, // text: _subtitle.trackServiceRequest,
text: "Track Service Request", text: context.translation.trackServiceRequest,
icon: FontAwesomeIcons.listCheck, icon: FontAwesomeIcons.listCheck,
onPressed: () { onPressed: () {
Navigator.of(context).pushNamed(ServiceRequestsPage.id); Navigator.of(context).pushNamed(ServiceRequestsPage.id);
@ -168,7 +168,7 @@ class _LandPageState extends State<LandPage> {
//if (_userProvider.user.type == UsersTypes.engineer) //if (_userProvider.user.type == UsersTypes.engineer)
LandPageItem( LandPageItem(
// text: _subtitle.preventiveMaintenance, // text: _subtitle.preventiveMaintenance,
text: "Preventive Maintenance", text: context.translation.preventiveMaintenance,
icon: FontAwesomeIcons.personWalking, icon: FontAwesomeIcons.personWalking,
onPressed: () { onPressed: () {
Navigator.of(context).pushNamed(RegularVisitsPage.id); Navigator.of(context).pushNamed(RegularVisitsPage.id);
@ -184,7 +184,7 @@ class _LandPageState extends State<LandPage> {
// ), // ),
if (_userProvider?.user != null && _userProvider?.user?.type != UsersTypes.engineer) if (_userProvider?.user != null && _userProvider?.user?.type != UsersTypes.engineer)
LandPageItem( LandPageItem(
text: "Request Gas Refill", text: context.translation.requestGasRefill,
icon: FontAwesomeIcons.truckFast, icon: FontAwesomeIcons.truckFast,
onPressed: () { onPressed: () {
// Navigator.of(context).pushNamed(RequestGasRefill.id); // Navigator.of(context).pushNamed(RequestGasRefill.id);
@ -192,21 +192,21 @@ class _LandPageState extends State<LandPage> {
}, },
), ),
LandPageItem( LandPageItem(
text: "Track Gas Refill", text: context.translation.trackGasRefill,
icon: Icons.content_paste_search, icon: Icons.content_paste_search,
onPressed: () { onPressed: () {
Navigator.of(context).pushNamed(TrackGasRefillPage.id); Navigator.of(context).pushNamed(TrackGasRefillPage.id);
}, },
), ),
LandPageItem( LandPageItem(
text: "Transfer Asset", text: context.translation.deviceTransfer,
icon: FontAwesomeIcons.rightLeft, icon: FontAwesomeIcons.rightLeft,
onPressed: () { onPressed: () {
Navigator.of(context).pushNamed(RequestDeviceTransfer.id); Navigator.of(context).pushNamed(RequestDeviceTransfer.id);
}, },
), ),
LandPageItem( LandPageItem(
text: "Track Asset Transfer", text: context.translation.trackAssetTransfer,
icon: FontAwesomeIcons.peopleCarryBox, icon: FontAwesomeIcons.peopleCarryBox,
onPressed: () { onPressed: () {
Navigator.of(context).pushNamed(TrackDeviceTransferPage.id); Navigator.of(context).pushNamed(TrackDeviceTransferPage.id);

179
lib/views/widgets/equipment/asset_detail_page.dart
Unescape Escape View File

@ -13,6 +13,8 @@ import 'package:test_sa/views/widgets/loaders/failed_loading.dart';
import 'package:test_sa/views/widgets/loaders/lazy_loading.dart'; import 'package:test_sa/views/widgets/loaders/lazy_loading.dart';
import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
import '../../../new_views/app_style/app_color.dart';
class AssetDetailPage extends StatefulWidget { class AssetDetailPage extends StatefulWidget {
static const String id = "/asset-details"; static const String id = "/asset-details";
@ -62,111 +64,94 @@ class _AssetDetailPageState extends State<AssetDetailPage> {
if (snapshot.hasData) { if (snapshot.hasData) {
return SingleChildScrollView( return SingleChildScrollView(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Container( child: Column(
padding: const EdgeInsets.all(16), crossAxisAlignment: CrossAxisAlignment.start,
decoration: ShapeDecoration( children: [
color: Colors.white, AspectRatio(
shape: RoundedRectangleBorder( aspectRatio: 159 / 94,
borderRadius: BorderRadius.circular(20), child: Container(
width: 95,
height: 95,
decoration: ShapeDecoration(
color: const Color(0xFFEAF1F4),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
image: DecorationImage(
fit: BoxFit.cover,
image: NetworkImage(
_assetProvider.assetById?.assetPhoto != null ? URLs.getFileUrl(_assetProvider.assetById.assetPhoto) : "https://www.lasteelcraft.com/images/no-image-available.png"),
)),
),
), ),
shadows: const [BoxShadow(color: Color(0x07000000), blurRadius: 14, offset: Offset(0, 0), spreadRadius: 0)], 6.height,
), Column(
child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AspectRatio( Text(
aspectRatio: 159 / 94, _assetProvider.assetById?.modelDefinition?.assetName ?? "-".heading5(context),
child: Container(
width: 95,
height: 95,
decoration: ShapeDecoration(
color: const Color(0xFFEAF1F4),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
image: DecorationImage(
fit: BoxFit.cover,
image: NetworkImage(
_assetProvider.assetById?.assetPhoto != null ? URLs.getFileUrl(_assetProvider.assetById.assetPhoto) : "https://www.lasteelcraft.com/images/no-image-available.png"),
)),
), ),
), 8.height,
6.height, "${context.translation.assetNumber}: ${_assetProvider.assetById.multiAssets.first.assetNumber}".bodyText(context),
Column( "${context.translation.model}: ${_assetProvider.assetById.modelDefinition.modelDefCode}".bodyText(context),
mainAxisAlignment: MainAxisAlignment.spaceBetween, Text(
crossAxisAlignment: CrossAxisAlignment.start, "${context.translation.serialNo}: ${_assetProvider.assetById.multiAssets.first.assetSerialNo}",
children: [ maxLines: 2,
Text( style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10:Color(0xFF757575)),
_assetProvider.assetById?.modelDefinition?.assetName ?? "-", ),
style: AppTextStyles.heading5.copyWith(color: Color(0xFF3B3D4A)), Text(
), "MD: ${_assetProvider.assetById.department.departmentName ?? "-"}",
8.height, maxLines: 2,
Text( style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)),
"${context.translation.assetNumber}: ${_assetProvider.assetById.multiAssets.first.assetNumber}", ),
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), Text(
), "Supplier: ${_assetProvider.assetById.supplier?.suppliername ?? "-"}",
Text( maxLines: 2,
"${context.translation.model}: ${_assetProvider.assetById.modelDefinition.modelDefCode}", style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)),
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), ),
), Text(
Text( "Manufacturer: ${_assetProvider.assetById.modelDefinition.manufacturerName}",
"${context.translation.serialNo}: ${_assetProvider.assetById.multiAssets.first.assetSerialNo}", maxLines: 2,
maxLines: 2, style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)),
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), ),
), Text(
Text( "Location: ${_assetProvider.assetById.site.custName}",
"MD: ${_assetProvider.assetById.department.departmentName ?? "-"}", maxLines: 2,
maxLines: 2, style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)),
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), ),
), 8.height,
Text( const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1),
"Supplier: ${_assetProvider.assetById.supplier?.suppliername ?? "-"}", 8.height,
maxLines: 2, Text(
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), "Installation Date: ${_assetProvider.assetById.installationDate ?? "-"}",
), maxLines: 2,
Text( style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)),
"Manufacturer: ${_assetProvider.assetById.modelDefinition.manufacturerName}", ),
maxLines: 2, Text(
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), "Next PM Date: ${_assetProvider.assetById.installationDate ?? "-"}",
), maxLines: 2,
Text( style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)),
"Location: ${_assetProvider.assetById.site.custName}", ),
maxLines: 2, Text(
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), "Last PM Date: ${_assetProvider.assetById.installationDate ?? "-"}",
), maxLines: 2,
style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)),
),
if ((_assetProvider.assetById.modelDefinition.assetDescription ?? "").isNotEmpty) ...[
8.height, 8.height,
const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1), const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1),
8.height, 8.height,
Text( Text(
"Installation Date: ${_assetProvider.assetById.installationDate ?? "-"}", _assetProvider.assetById.modelDefinition.assetDescription ?? "-",
maxLines: 2,
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
),
Text(
"Next PM Date: ${_assetProvider.assetById.installationDate ?? "-"}",
maxLines: 2, maxLines: 2,
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)),
), ),
Text( ]
"Last PM Date: ${_assetProvider.assetById.installationDate ?? "-"}", ],
maxLines: 2, )
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), ],
), ).toShadowContainer(context),
if ((_assetProvider.assetById.modelDefinition.assetDescription ?? "").isNotEmpty) ...[
8.height,
const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1),
8.height,
Text(
_assetProvider.assetById.modelDefinition.assetDescription ?? "-",
maxLines: 2,
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
),
]
],
)
],
),
),
); );
} }
return Center(child: ALoading()); return Center(child: ALoading());

15
lib/views/widgets/equipment/asset_item_gridview.dart
Unescape Escape View File

@ -5,6 +5,7 @@ import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; 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';
class AssetItemGridView extends StatelessWidget { class AssetItemGridView extends StatelessWidget {
final Asset device; final Asset device;
@ -40,26 +41,20 @@ class AssetItemGridView extends StatelessWidget {
Text( Text(
device.modelDefinition.assetName, device.modelDefinition.assetName,
maxLines: 2, maxLines: 2,
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF3B3D4A)), style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral30: Color(0xFF3B3D4A)),
), ),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Text( "${context.translation.assetNumber} : ${device.assetNumber}".bodyText2(context),
"${context.translation.assetNumber} : ${device.assetNumber}", "${context.translation.model} : ${device.modelDefinition.modelDefCode}".bodyText2(context),
style: AppTextStyles.bodyText2.copyWith(color: Color(0xFF757575)),
),
Text(
"${context.translation.model} : ${device.modelDefinition.modelDefCode}",
style: AppTextStyles.bodyText2.copyWith(color: Color(0xFF757575)),
),
Text( Text(
"${context.translation.serialNo} : ${device.assetSerialNo}", "${context.translation.serialNo} : ${device.assetSerialNo}",
maxLines: 2, maxLines: 2,
overflow: TextOverflow.fade, overflow: TextOverflow.fade,
style: AppTextStyles.bodyText2.copyWith( style: AppTextStyles.bodyText2.copyWith(
color: Color(0xFF757575), color: context.isDark? AppColor.neutral10: Color(0xFF757575),
), ),
), ),
], ],

Write Preview
Loading…
Cancel
Save