Enhancements

main_design2.0
zaid_daoud 2 years ago
parent c281fba1ac
commit 19845bd9d8

@ -5,4 +5,9 @@ extension StringExtensions on String {
DateTime dateTime = DateTime.tryParse(this); DateTime dateTime = DateTime.tryParse(this);
return "${DateFormat('dd MMM, yyyy').format(dateTime)}\n${DateFormat('hh:mm a').format(dateTime)}"; return "${DateFormat('dd MMM, yyyy').format(dateTime)}\n${DateFormat('hh:mm a').format(dateTime)}";
} }
String get toServiceRequestDetailsFormat {
DateTime dateTime = DateTime.tryParse(this);
return "${DateFormat('dd MMM, yyyy').format(dateTime)} ${DateFormat('hh:mm a').format(dateTime)}";
}
} }

@ -31,6 +31,7 @@ class WorkOrderDetailsPage extends StatelessWidget {
SingleChildScrollView( SingleChildScrollView(
child: Container( child: Container(
margin: const EdgeInsets.all(16), margin: const EdgeInsets.all(16),
width: double.infinity,
decoration: ShapeDecoration( decoration: ShapeDecoration(
color: Colors.white, color: Colors.white,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
@ -44,25 +45,13 @@ class WorkOrderDetailsPage extends StatelessWidget {
8.height, 8.height,
Text(serviceRequest.requestCode, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), Text(serviceRequest.requestCode, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
8.height, 8.height,
Row( Text(
crossAxisAlignment: CrossAxisAlignment.start, '${context.translation.assetName}: ${workOrder.callRequest.asset.modelDefinition.assetName}',
mainAxisSize: MainAxisSize.min, style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)),
children: [ ),
Column( Text(
crossAxisAlignment: CrossAxisAlignment.start, '${context.translation.status}: ${workOrder.currentSituation.name}',
children: [ style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)),
Text(
'${context.translation.assetName}: ${workOrder.callRequest.asset.modelDefinition.assetName}',
style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)),
),
Text(
'${context.translation.status}: ${workOrder.currentSituation.name}',
style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)),
),
],
).expanded,
Text(workOrder.visitDate?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
],
), ),
Text( Text(
'${context.translation.orderWorkNumber}: ${workOrder.workOrderNo}', '${context.translation.orderWorkNumber}: ${workOrder.workOrderNo}',
@ -72,6 +61,7 @@ class WorkOrderDetailsPage extends StatelessWidget {
'${context.translation.assignedEmployee}: ${workOrder.assignedEmployee?.name ?? ""}', '${context.translation.assignedEmployee}: ${workOrder.assignedEmployee?.name ?? ""}',
style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)), style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)),
), ),
Text('${context.translation.visitDate}: ${workOrder.visitDate?.toServiceRequestDetailsFormat ?? ""}', style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575))),
Text('${context.translation.assetSN}: ${workOrder.callRequest.asset.assetSerialNo ?? ""}', style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575))), Text('${context.translation.assetSN}: ${workOrder.callRequest.asset.assetSerialNo ?? ""}', style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575))),
Text('${context.translation.assetName}: ${workOrder.callRequest.asset.modelDefinition.assetName ?? ""}', style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575))), Text('${context.translation.assetName}: ${workOrder.callRequest.asset.modelDefinition.assetName ?? ""}', style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575))),
Text('${context.translation.assetNumber}: ${workOrder.callRequest.asset.assetNumber ?? ""}', style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575))), Text('${context.translation.assetNumber}: ${workOrder.callRequest.asset.assetNumber ?? ""}', style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575))),

Loading…
Cancel
Save