Improvements

design_3.0_demo_module
zaid_daoud 2 years ago
parent 2c8af84814
commit 753d9577d5

@ -7,6 +7,7 @@ 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/visits/visit.dart'; import 'package:test_sa/models/visits/visit.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
import 'package:test_sa/views/pages/user/visits/pantry/edit_pentry.dart';
import '../../../../controllers/providers/api/user_provider.dart'; import '../../../../controllers/providers/api/user_provider.dart';
import '../../../../models/enums/user_types.dart'; import '../../../../models/enums/user_types.dart';
@ -79,8 +80,7 @@ class VisitDetailsPage extends StatelessWidget {
if (userProvider.user.type == UsersTypes.engineer && visit.status.id != 270) if (userProvider.user.type == UsersTypes.engineer && visit.status.id != 270)
AppFilledButton( AppFilledButton(
onPressed: () { onPressed: () {
print(visit.status.id); Navigator.of(context).push(MaterialPageRoute(builder: (_) => EditPentry(visit: visit, pentry: visit.pentry)));
// Navigator.of(context).push(MaterialPageRoute(builder: (_) => EditPentry(visit: visit, pentry: visit.pentry)));
}, },
label: context.translation.updateRequest, label: context.translation.updateRequest,
).paddingAll(16), ).paddingAll(16),

@ -22,80 +22,73 @@ class VisitItem extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
UserProvider userProvider = Provider.of<UserProvider>(context); UserProvider userProvider = Provider.of<UserProvider>(context);
return Container( return Row(
decoration: ShapeDecoration( crossAxisAlignment: CrossAxisAlignment.start,
color: Colors.white, children: [
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)), Column(
shadows: const [BoxShadow(color: Color(0x07000000), blurRadius: 14, offset: Offset(0, 0), spreadRadius: 0)], crossAxisAlignment: CrossAxisAlignment.start,
), children: [
padding: const EdgeInsets.all(16), Row(
margin: EdgeInsets.only(bottom: 8.toScreenHeight), children: [
child: Row( // StatusLabel(
crossAxisAlignment: CrossAxisAlignment.start, // label: visit.priority.name,
children: [ // id: visit.priority.id,
Column( // textColor: AColors.getPriorityStatusTextColor(visit.priority.id),
crossAxisAlignment: CrossAxisAlignment.start, // backgroundColor: AColors.getPriorityStatusColor(visit.priority.id)),
children: [ // 8.width,
Row( StatusLabel(
children: [ label: visit.status.name,
// StatusLabel( id: visit.status.id,
// label: visit.priority.name, textColor: AColors.getRequestStatusTextColorByName(visit.status.name),
// id: visit.priority.id, backgroundColor: AColors.getRequestStatusColorByName(visit.status.name),
// textColor: AColors.getPriorityStatusTextColor(visit.priority.id), ),
// backgroundColor: AColors.getPriorityStatusColor(visit.priority.id)), 1.width.expanded,
// 8.width, ],
StatusLabel( ),
label: visit.status.name, 8.height,
id: visit.status.id, Text(visit.deviceEnglishName, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
textColor: AColors.getRequestStatusTextColorByName(visit.status.name), 8.height,
backgroundColor: AColors.getRequestStatusColorByName(visit.status.name), Text(
), '${context.translation.assetNumber}: ${visit.deviceNumber}',
1.width.expanded, style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)),
], ),
), Text(
8.height, '${context.translation.assetSN}: ${visit.deviceSerialNumber}',
Text(visit.deviceEnglishName, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)),
8.height, ),
Text( Text(
'${context.translation.assetNumber}: ${visit.deviceNumber}', '${context.translation.code}: ${visit.serialNumber}',
style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)), style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)),
), ),
Text( 16.height,
'${context.translation.assetSN}: ${visit.deviceSerialNumber}', Row(
style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)), mainAxisSize: MainAxisSize.min,
), children: [
Text( Text(
'${context.translation.code}: ${visit.serialNumber}', context.translation.viewDetails,
style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)), style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF4A8DB7)),
), ),
16.height, 4.width,
Row( const Icon(Icons.arrow_forward, color: Color(0xFF4A8DB7), size: 14)
mainAxisSize: MainAxisSize.min, ],
children: [ ).onPress(() {
Text( Navigator.of(context).push(MaterialPageRoute(builder: (_) => VisitDetailsPage(visit: visit)));
context.translation.viewDetails, }),
style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF4A8DB7)), ],
), ).expanded,
4.width, 8.width,
const Icon(Icons.arrow_forward, color: Color(0xFF4A8DB7), size: 14) Column(
], crossAxisAlignment: CrossAxisAlignment.end,
).onPress(() { children: [
Navigator.of(context).push(MaterialPageRoute(builder: (_) => VisitDetailsPage(visit: visit))); if (userProvider.user.type == UsersTypes.engineer && visit.status.id != 270)
"edit".toSvgAsset(height: 48, width: 48).onPress(() {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => EditPentry(visit: visit, pentry: visit.pentry)));
}), }),
], if (userProvider.user.type == UsersTypes.engineer && visit.status.id != 270) 8.height,
).expanded, Text(visit.createdOn != null ? visit.createdOn.toServiceRequestCardFormat : "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
8.width, ],
Column( )
children: [ ],
if (userProvider.user.type == UsersTypes.engineer && visit.status.value != 5 && visit.status.value != 3) ).toShadowContainer(context).paddingOnly(bottom: 8);
context.translation.edit.toSvgAsset(height: 48, width: 48).onPress(() {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => EditPentry(visit: visit, pentry: visit.pentry)));
}),
Text(visit.createdOn != null ? visit.createdOn.toServiceRequestCardFormat : "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
],
)
],
),
);
} }
} }

Loading…
Cancel
Save