Merge branch 'smallfixes' into 'development'

small fixes in patient profile

See merge request Cloud_Solution/doctor_app_flutter!184
pull/186/head
Elham 5 years ago
commit 06935c8fe4

@ -4,9 +4,8 @@ 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/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:doctor_app_flutter/widgets/shared/profile_image_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import './profile_medical_info_widget.dart'; import './profile_medical_info_widget.dart';
/* /*
@ -188,6 +187,7 @@ class PatientProfileWidget extends StatelessWidget {
), ),
]), ]),
), ),
if (patient.admissionNo != null)
Container( Container(
margin: EdgeInsets.all(16), margin: EdgeInsets.all(16),
child: Column( child: Column(
@ -230,10 +230,16 @@ class PatientProfileWidget extends StatelessWidget {
), ),
), ),
AppText( AppText(
"${DateUtils.convertDateFromServerFormat(patient.admissionDate, 'EEEE dd, MMMM yyyy hh:mm a')}", patient.admissionDate != null
? "${DateUtils
.convertDateFromServerFormat(
patient.admissionDate,
'EEEE dd, MMMM yyyy hh:mm a')}"
: "",
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: 1.6 * SizeConfig.textMultiplier, fontSize:
1.6 * SizeConfig.textMultiplier,
), ),
], ],
), ),
@ -252,10 +258,13 @@ class PatientProfileWidget extends StatelessWidget {
), ),
), ),
AppText( AppText(
patient.admissionNo, patient.admissionNo != null
? patient.admissionNo
: '',
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: 1.6 * SizeConfig.textMultiplier, fontSize: 1.6 *
SizeConfig.textMultiplier,
), ),
], ],
), ),
@ -274,10 +283,15 @@ class PatientProfileWidget extends StatelessWidget {
), ),
), ),
AppText( AppText(
DateUtils.differenceBetweenServerDateAndCurrent(patient.admissionDate), patient.admissionDate != null
? DateUtils
.differenceBetweenServerDateAndCurrent(
patient.admissionDate)
: "",
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: 1.6 * SizeConfig.textMultiplier, fontSize: 1.6 *
SizeConfig.textMultiplier,
), ),
], ],
), ),

Loading…
Cancel
Save