Merge branch 'fix-issues' into 'development'

Hot Fixes

See merge request Cloud_Solution/doctor_app_flutter!500
merge-requests/501/merge
Mohammad Aljammal 5 years ago
commit 94b7744dd0

@ -29,7 +29,9 @@ class DoctorCard extends StatelessWidget {
this.invoiceNO, this.invoiceNO,
this.onTap, this.onTap,
this.appointmentDate, this.appointmentDate,
this.orderNo, this.isPrescriptions=false, this.clinic}); this.orderNo,
this.isPrescriptions = false,
this.clinic});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -69,13 +71,13 @@ class DoctorCard extends StatelessWidget {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, fontSize: 14,
), ),
if(!isPrescriptions) if (!isPrescriptions)
Texts( Texts(
'${DateUtils.getHour(appointmentDate)}', '${DateUtils.getHour(appointmentDate)}',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.grey[700], color: Colors.grey[700],
fontSize: 14, fontSize: 14,
), ),
], ],
), ),
), ),
@ -106,7 +108,8 @@ class DoctorCard extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'order No:', TranslationBase.of(context).orderNo +
": ",
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
@ -120,7 +123,9 @@ class DoctorCard extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Invoice:', TranslationBase.of(context)
.invoiceNo +
": ",
fontSize: 14, fontSize: 14,
color: Colors.grey[500], color: Colors.grey[500],
), ),
@ -130,34 +135,36 @@ class DoctorCard extends StatelessWidget {
) )
], ],
), ),
if(clinic!=null) if (clinic != null)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Clinic: ', TranslationBase.of(context).clinic +
color: Colors.grey[500], ": ",
fontSize: 14, color: Colors.grey[500],
), fontSize: 14,
Texts( ),
clinic, Texts(
fontSize: 14, clinic,
) fontSize: 14,
], )
), ],
if(branch!=null) ),
Row( if (branch != null)
children: <Widget>[ Row(
Texts( children: <Widget>[
'Branch: ', Texts(
fontSize: 14, TranslationBase.of(context).branch +
color: Colors.grey[500], ": ",
), fontSize: 14,
Texts( color: Colors.grey[500],
branch, ),
fontSize: 14, Texts(
) branch,
], fontSize: 14,
) )
],
)
]), ]),
), ),
), ),
@ -167,7 +174,6 @@ class DoctorCard extends StatelessWidget {
], ],
), ),
), ),
], ],
), ),
], ],

@ -1,5 +1,6 @@
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/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -105,7 +106,7 @@ class DoctorCardInsurance extends StatelessWidget {
Expanded( Expanded(
child: Texts( child: Texts(
doctorName, doctorName,
fontWeight: FontWeight.w700, bold: true,
)), )),
], ],
), ),
@ -155,15 +156,18 @@ class DoctorCardInsurance extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Clinic: ', TranslationBase.of(context).clinic +
": ",
color: Colors.grey[500],
fontSize: 14,
//fontWeight: FontWeight.w600, //fontWeight: FontWeight.w600,
//color: Colors.grey[500], //color: Colors.grey[500],
), ),
Expanded( Expanded(
child: Texts( child: Texts(
clinic, clinic,
fontWeight: FontWeight.w700, //fontWeight: FontWeight.w700,
fontSize: 15.0, fontSize: 14.0,
), ),
) )
], ],
@ -172,26 +176,30 @@ class DoctorCardInsurance extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Branch:', TranslationBase.of(context).branch +
//color: Colors.grey[500], ": ",
fontSize: 14,
color: Colors.grey[500],
), ),
Texts( Texts(
branch2, branch2,
fontWeight: FontWeight.w700, fontSize: 14.0,
fontSize: 15.0,
) )
], ],
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Approval No: ', TranslationBase.of(context)
.approvalNo +
": ",
fontSize: 14,
color: Colors.grey[500],
//color: Colors.grey[500], //color: Colors.grey[500],
), ),
Texts( Texts(
branch, branch,
fontWeight: FontWeight.w700, fontSize: 14.0,
fontSize: 15.0,
) )
], ],
), ),
@ -202,8 +210,7 @@ class DoctorCardInsurance extends StatelessWidget {
padding: padding:
const EdgeInsets.symmetric(horizontal: 15.0), const EdgeInsets.symmetric(horizontal: 15.0),
child: Icon( child: Icon(
DoctorApp.view, EvaIcons.eye,
size: 22.0,
), ),
) )
], ],

Loading…
Cancel
Save