DAPP-66: fix date with design improvement

merge-requests/951/head
Elham Rababh 4 years ago
parent fec10319bf
commit 26fa1aec62

@ -1,10 +1,12 @@
//import 'package:doctor_app_flutter/client/base_app_client.dart';
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/model/procedure/get_ordered_procedure_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/cupertino.dart';
@ -82,14 +84,15 @@ class ProcedureCard extends StatelessWidget {
: 'Urgent',
color: entityList.orderType == 0
? Colors.black
: Colors.red[800],
: AppGlobal.appRedColor,
fontWeight: FontWeight.w600,
),
SizedBox(
height: 5,
),
AppText(
entityList.procedureName,
Helpers.convertToTitleCase(
entityList.procedureName),
bold: true,
fontSize: 14,
),
@ -104,13 +107,18 @@ class ProcedureCard extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.end,
children: [
AppText(
'${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.convertISOStringToDateTime(entityList.orderDate), isArabic: projectViewModel.isArabic)}',
'${AppDateUtils.getDayMonthYearDateFormatted(
AppDateUtils.convertISOStringToDateTime(
entityList.createdOn),
isMonthShort: true,
isArabic: projectViewModel.isArabic,
)}',
color: Colors.black,
fontWeight: FontWeight.w600,
fontSize: 14,
),
AppText(
'${AppDateUtils.getHour(AppDateUtils.convertISOStringToDateTime(entityList.orderDate))}',
'${AppDateUtils.getHour(AppDateUtils.convertISOStringToDateTime(entityList.createdOn))}',
fontWeight: FontWeight.w600,
color: Colors.grey[700],
fontSize: 14,
@ -174,7 +182,8 @@ class ProcedureCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
entityList.doctorName,
Helpers.convertToTitleCase(
entityList.doctorName),
fontFamily: 'Poppins',
fontWeight: FontWeight.w800,
fontSize: 1.7 * SizeConfig.textMultiplier,
@ -182,7 +191,8 @@ class ProcedureCard extends StatelessWidget {
),
if (entityList.clinicDescription != null)
AppText(
entityList.clinicDescription,
Helpers.convertToTitleCase(
entityList.clinicDescription),
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.4 * SizeConfig.textMultiplier,
@ -201,7 +211,9 @@ class ProcedureCard extends StatelessWidget {
children: [
Expanded(
child: AppText(
entityList.remarks.toString() ?? '',
Helpers.convertToTitleCase(
entityList.remarks.toString()) ??
'',
fontSize: 12,
),
),

Loading…
Cancel
Save