small fix

merge-requests/954/head
Elham Rababh 4 years ago
parent 05b656416d
commit d9b2a618f5

@ -142,318 +142,327 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
return Container( return Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 5, right: 5, top: 15, bottom: 15), left: 5, right: 5, top: 15, bottom: 15),
child: Row( child: Column(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Column( Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
RichText( RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
letterSpacing: -0.4),
children: <TextSpan>[
new TextSpan(
text: "ICD : ".toUpperCase(),
),
new TextSpan(
text: assessment
.selectedICD.code
.trim()
.toUpperCase() ??
""),
],
),
),
Container(
width: MediaQuery.of(context)
.size
.width *
0.50,
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
5,
color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
letterSpacing: -0.64,
),
children: <TextSpan>[
new TextSpan(
text: assessment
.selectedICD.description
.toString(),
),
],
),
),
),
RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() * .getTextMultiplierBasedOnWidth() *
3.5, 3.6,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
letterSpacing: -0.4),
children: <TextSpan>[
new TextSpan(
text: "ICD : ".toUpperCase(),
), ),
children: <TextSpan>[ new TextSpan(
new TextSpan( text: assessment
text: TranslationBase.of( .selectedICD.code
context) .trim()
.appointmentNo, .toUpperCase() ??
style: new TextStyle( ""),
fontSize: SizeConfig ],
.getTextMultiplierBasedOnWidth() *
3,
letterSpacing: -0.4,
color: Color(0xFF575757),
),
),
new TextSpan(
text: assessment.appointmentId
.toString() ??
"",
style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
letterSpacing: -0.48,
color: Color(0xFF2B353E),
),
),
],
),
), ),
RichText( ),
text: new TextSpan( Column(
style: new TextStyle( crossAxisAlignment:
fontSize: SizeConfig CrossAxisAlignment.end,
.getTextMultiplierBasedOnWidth() * children: [
3, AppText(
color: Color(0xFF2E303A), assessment.createdOn != null
fontFamily: 'Poppins', ? AppDateUtils
fontWeight: FontWeight.w600), .getDayMonthYearDateFormatted(
children: <TextSpan>[ DateTime.parse(
new TextSpan( assessment
text: TranslationBase.of( .createdOn), isMonthShort: true)
context) : AppDateUtils
.condition + .getDayMonthYearDateFormatted(
" : ", DateTime.now()),
style: new TextStyle( fontWeight: FontWeight.w600,
letterSpacing: -0.4, fontSize: SizeConfig
color: Color(0xFF575757), .getTextMultiplierBasedOnWidth() *
3.6,
),
AppText(
assessment.createdOn != null
? AppDateUtils.getHour(
DateTime.parse(
assessment
.createdOn))
: AppDateUtils.getHour(
DateTime.now()),
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
),
],
),
],
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Container(
width: MediaQuery.of(context)
.size
.width *
0.50,
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
4.3,
color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
letterSpacing: -0.64,
),
children: <TextSpan>[
new TextSpan(
text: assessment
.selectedICD.description
.toString(),
),
],
), ),
), ),
new TextSpan( ),
text: projectViewModel RichText(
.isArabic text: new TextSpan(
? assessment
.selectedDiagnosisCondition
.nameAr
: assessment
.selectedDiagnosisCondition
.nameEn,
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() * .getTextMultiplierBasedOnWidth() *
3.6, 3.5,
letterSpacing: -0.48, color: Color(0xFF2E303A),
color: Color(0xFF2B353E), fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
), ),
), children: <TextSpan>[
], new TextSpan(
), text: TranslationBase.of(
),
RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3,
color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(
context) context)
.dType + .appointmentNo,
' : ', style: new TextStyle(
style: new TextStyle( fontSize: SizeConfig
letterSpacing: -0.4, .getTextMultiplierBasedOnWidth() *
color: Color(0xFF575757), 3,
), letterSpacing: -0.4,
color: Color(0xFF575757),
),
),
new TextSpan(
text: assessment.appointmentId
.toString() ??
"",
style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
letterSpacing: -0.48,
color: Color(0xFF2B353E),
),
),
],
), ),
new TextSpan( ),
text: projectViewModel RichText(
.isArabic text: new TextSpan(
? assessment
.selectedDiagnosisType
.nameAr
: assessment
.selectedDiagnosisType
.nameEn,
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
letterSpacing: -0.48,
color: Color(0xFF2B353E),
),
),
],
),
),
if (assessment.doctorName != null)
RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight:
FontWeight.w600),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(
context)
.doctor +
' : ',
style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() * .getTextMultiplierBasedOnWidth() *
3, 3,
letterSpacing: -0.4, color: Color(0xFF2E303A),
color: Color(0xFF575757), fontFamily: 'Poppins',
fontWeight: FontWeight.w600),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(
context)
.condition +
" : ",
style: new TextStyle(
letterSpacing: -0.4,
color: Color(0xFF575757),
),
), ),
), new TextSpan(
new TextSpan( text: projectViewModel
text: .isArabic
assessment.doctorName ?? ? assessment
'', .selectedDiagnosisCondition
style: new TextStyle( .nameAr
: assessment
.selectedDiagnosisCondition
.nameEn,
style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
letterSpacing: -0.48,
color: Color(0xFF2B353E),
),
),
],
),
),
RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() * .getTextMultiplierBasedOnWidth() *
3.6, 3,
letterSpacing: -0.48, color: Color(0xFF2E303A),
color: Color(0xFF2B353E), fontFamily: 'Poppins',
fontWeight: FontWeight.w600),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(
context)
.dType +
' : ',
style: new TextStyle(
letterSpacing: -0.4,
color: Color(0xFF575757),
),
), ),
), new TextSpan(
], text: projectViewModel
.isArabic
? assessment
.selectedDiagnosisType
.nameAr
: assessment
.selectedDiagnosisType
.nameEn,
style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
letterSpacing: -0.48,
color: Color(0xFF2B353E),
),
),
],
),
), ),
), if (assessment.doctorName != null)
SizedBox( RichText(
height: 6, text: new TextSpan(
), style: new TextStyle(
Row( fontSize: SizeConfig
mainAxisAlignment: .getTextMultiplierBasedOnWidth() *
MainAxisAlignment.start, 3.6,
crossAxisAlignment: color: Color(0xFF2E303A),
CrossAxisAlignment.start, fontFamily: 'Poppins',
children: [ fontWeight:
FontWeight.w600),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(
context)
.doctor +
' : ',
style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3,
letterSpacing: -0.4,
color: Color(0xFF575757),
),
),
new TextSpan(
text:
assessment.doctorName ??
'',
style: new TextStyle(
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
letterSpacing: -0.48,
color: Color(0xFF2B353E),
),
),
],
),
),
SizedBox( SizedBox(
height: 6, height: 6,
), ),
AppText( Row(
(assessment.remark != null && mainAxisAlignment:
assessment.remark != MainAxisAlignment.start,
'')
? TranslationBase.of(
context)
.remarks +
" : "
: '',
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3,
color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600),
RemarkText(
remark: assessment.remark ?? "",
),
],
),
],
),
Column(
crossAxisAlignment:
CrossAxisAlignment.end,
children: [
Row(
children: [
Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.end, CrossAxisAlignment.start,
children: [ children: [
AppText( SizedBox(
assessment.createdOn != null height: 6,
? AppDateUtils
.getDayMonthYearDateFormatted(
DateTime.parse(
assessment
.createdOn))
: AppDateUtils
.getDayMonthYearDateFormatted(
DateTime.now()),
fontWeight: FontWeight.w600,
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
3.6,
), ),
AppText( AppText(
assessment.createdOn != null (assessment.remark != null &&
? AppDateUtils.getHour( assessment.remark !=
DateTime.parse( '')
assessment ? TranslationBase.of(
.createdOn)) context)
: AppDateUtils.getHour( .remarks +
DateTime.now()), " : "
fontWeight: FontWeight.w600, : '',
color: Color(0xFF575757), fontSize: SizeConfig
fontSize: SizeConfig .getTextMultiplierBasedOnWidth() *
.getTextMultiplierBasedOnWidth() * 3,
3.6, color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600),
RemarkText(
remark: assessment.remark ?? "",
), ),
], ],
), ),
], ],
), ),
SizedBox( Column(
height: MediaQuery.of(context) crossAxisAlignment:
.size CrossAxisAlignment.end,
.height * children: [
0.05,
SizedBox(
height: MediaQuery.of(context)
.size
.height *
0.05,
),
InkWell(
onTap: () {
openAssessmentDialog(context,
isUpdate: true,
assessment: assessment,
model: model);
},
child: Icon(
DoctorApp.edit,
size: 18,
),
)
],
), ),
InkWell(
onTap: () {
openAssessmentDialog(context,
isUpdate: true,
assessment: assessment,
model: model);
},
child: Icon(
DoctorApp.edit,
size: 18,
),
)
], ],
), ),
], ],

@ -5,13 +5,14 @@ import 'package:flutter/material.dart';
class HeaderRow extends StatelessWidget { class HeaderRow extends StatelessWidget {
final String label; final String label;
final String value; final String value;
final bool isExpanded;
const HeaderRow({Key key, this.label, this.value}) : super(key: key); const HeaderRow({Key key, this.label, this.value, this.isExpanded = false}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Row( return Row(
// crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
label, label,
@ -23,6 +24,13 @@ class HeaderRow extends StatelessWidget {
SizedBox( SizedBox(
width: 1, width: 1,
), ),
isExpanded?Expanded(child: AppText(
value,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5,
color: Color(0xFF2E303A),
fontWeight: FontWeight.w700,
isCopyable: true,
), ):
AppText( AppText(
value, value,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5,

@ -343,7 +343,8 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
Helpers.convertToTitleCase('${TranslationBase.of(context).dr}$doctorName'), Helpers.convertToTitleCase(
'${TranslationBase.of(context).dr}$doctorName'),
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: SizeConfig fontSize: SizeConfig
@ -368,11 +369,15 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget {
), ),
if (clinic != null) if (clinic != null)
Container( Container(
width: MediaQuery.of(context).size.width * 0.51, width:
MediaQuery.of(context).size.width *
0.51,
child: HeaderRow( child: HeaderRow(
label: 'Clinic: ', label: 'Clinic: ',
value: Helpers.convertToTitleCase(clinic) ?? '', value: Helpers.convertToTitleCase(
), clinic) ??
'',
isExpanded: true),
), ),
if (isMedicalFile && episode != null) if (isMedicalFile && episode != null)
HeaderRow( HeaderRow(
@ -423,4 +428,3 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget {
(SizeConfig.isWidthLarge ? 25 : 20) (SizeConfig.isWidthLarge ? 25 : 20)
: height); : height);
} }

Loading…
Cancel
Save