Merge branch 'jan_fix_bugs' into 'development'

Jan fix bugs

See merge request Cloud_Solution/doctor_app_flutter!954
merge-requests/955/merge
Elham Ali 4 years ago
commit a5974ad584

@ -126,7 +126,7 @@ class PatientSearchViewModel extends BaseViewModel {
} else if (OutPatientFilterType.NextWeek == outPatientFilterType) { } else if (OutPatientFilterType.NextWeek == outPatientFilterType) {
dateTo = AppDateUtils.convertDateToFormat( dateTo = AppDateUtils.convertDateToFormat(
DateTime(DateTime.now().year, DateTime.now().month, DateTime(DateTime.now().year, DateTime.now().month,
DateTime.now().day + 6), DateTime.now().day + 7),
'yyyy-MM-dd'); 'yyyy-MM-dd');
dateFrom = AppDateUtils.convertDateToFormat( dateFrom = AppDateUtils.convertDateToFormat(

@ -142,15 +142,10 @@ 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(
@ -175,6 +170,56 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
], ],
), ),
), ),
Column(
crossAxisAlignment:
CrossAxisAlignment.end,
children: [
AppText(
assessment.createdOn != null
? AppDateUtils
.getDayMonthYearDateFormatted(
DateTime.parse(
assessment
.createdOn), isMonthShort: true)
: AppDateUtils
.getDayMonthYearDateFormatted(
DateTime.now()),
fontWeight: FontWeight.w600,
fontSize: SizeConfig
.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( Container(
width: MediaQuery.of(context) width: MediaQuery.of(context)
.size .size
@ -185,7 +230,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
style: new TextStyle( style: new TextStyle(
fontSize: SizeConfig fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() * .getTextMultiplierBasedOnWidth() *
5, 4.3,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -397,45 +442,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.end, CrossAxisAlignment.end,
children: [ children: [
Row(
children: [
Column(
crossAxisAlignment:
CrossAxisAlignment.end,
children: [
AppText(
assessment.createdOn != null
? AppDateUtils
.getDayMonthYearDateFormatted(
DateTime.parse(
assessment
.createdOn))
: AppDateUtils
.getDayMonthYearDateFormatted(
DateTime.now()),
fontWeight: FontWeight.w600,
fontSize: SizeConfig
.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,
),
],
),
],
),
SizedBox( SizedBox(
height: MediaQuery.of(context) height: MediaQuery.of(context)
.size .size
@ -458,6 +465,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
), ),
], ],
), ),
],
),
); );
}).toList(), }).toList(),
) )

@ -39,7 +39,7 @@ class StatusLabel extends StatelessWidget {
: TranslationBase.of(context).locked, : TranslationBase.of(context).locked,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
textAlign: TextAlign.center, textAlign: TextAlign.center,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.7, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5,
color: stepId == selectedStepId color: stepId == selectedStepId
? Color(0xFFCC9B14) ? Color(0xFFCC9B14)
: stepId < selectedStepId : stepId < selectedStepId

@ -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