Merge branch 'v2.8_elham_fixes' into 'dev_v2.8_withouth_null_ckecking'

V2.8 elham fixes

See merge request Cloud_Solution/doctor_app_flutter!936
merge-requests/937/merge
Elham Ali 4 years ago
commit bce6dc6f63

@ -123,16 +123,17 @@ class _PatientMakeReferralScreenState extends State<PatientMakeReferralScreen> {
model.patientReferral.length - 1] model.patientReferral.length - 1]
.patientDetails .patientDetails
.gender, .gender,
referredDate: model ///TODO Elham* check this
.patientReferral[ // referredDate: model
model.patientReferral.length - 1] // .patientReferral[
.referredOn // model.patientReferral.length - 1]
.split(" ")[0], // .referredOn
referredTime: model // .split(" ")[0],
.patientReferral[ // referredTime: model
model.patientReferral.length - 1] // .patientReferral[
.referredOn // model.patientReferral.length - 1]
.split(" ")[1], // .referredOn
// .split(" ")[1],
patientID: patientID:
"${model.patientReferral[model.patientReferral.length - 1].patientID}", "${model.patientReferral[model.patientReferral.length - 1].patientID}",
isSameBranch: model isSameBranch: model

@ -96,7 +96,7 @@ class PatientReferralItemWidget extends StatelessWidget {
: Colors.red[900], : Colors.red[900],
), ),
AppText( AppText(
referredDate, referredDate??"",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
letterSpacing: -0.48, letterSpacing: -0.48,
@ -109,7 +109,7 @@ class PatientReferralItemWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
patientName, patientName??"",
fontSize: 16.0, fontSize: 16.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Color(0xff2E303A), color: Color(0xff2E303A),
@ -130,7 +130,7 @@ class PatientReferralItemWidget extends StatelessWidget {
width: 4, width: 4,
), ),
AppText( AppText(
referredTime, referredTime??"",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 12.0, fontSize: 12.0,

@ -96,7 +96,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
Container( Container(
height: widget.height != 0 && widget.maxLines == 1 height: widget.height != 0 && widget.maxLines == 1
? widget.height + 8 ? widget.height + 8
: MediaQuery.of(context).size.height * 0.098, : null,//MediaQuery.of(context).size.height * 0.098,
decoration: widget.hasBorder decoration: widget.hasBorder
? TextFieldsUtils.containerBorderDecoration( ? TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0Xffffffff),
@ -117,7 +117,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
padding: widget.dropDownText == null padding: widget.dropDownText == null
? widget.isSearchTextField ? widget.isSearchTextField
? EdgeInsets.only(top: 10) ? EdgeInsets.only(top: 10)
: EdgeInsets.only(top: 7.5) : EdgeInsets.only(top: 0.5)
: EdgeInsets.only(top: 0), // 8.0 : EdgeInsets.only(top: 0), // 8.0
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -144,8 +144,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
height: height:
widget.height != 0 && widget.maxLines == 1 widget.height != 0 && widget.maxLines == 1
? widget.height - 22 ? widget.height - 22
: MediaQuery.of(context).size.height * : null,
0.045,
child: TextFormField( child: TextFormField(
textAlign: projectViewModel.isArabic textAlign: projectViewModel.isArabic
? TextAlign.right ? TextAlign.right
@ -156,8 +155,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
.textFieldSelectorDecoration( .textFieldSelectorDecoration(
widget.hintText, null, true), widget.hintText, null, true),
style: TextStyle( style: TextStyle(
fontSize: fontSize: SizeConfig.textMultiplier * 1.7,
14.0, //SizeConfig.textMultiplier * 1.7,
fontFamily: 'Poppins', fontFamily: 'Poppins',
color: Color(0xFF575757), color: Color(0xFF575757),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,

Loading…
Cancel
Save