Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

DAPP-66: fix date with design improvement

Browse Source
merge-requests/951/head
Elham Rababh 4 years ago
parent fec10319bf
commit 26fa1aec62
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File

26
lib/screens/procedures/ProcedureCard.dart
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save