Merge branch 'pharmacy-bugs' into 'development'

Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!334
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit ed5079e3a0

@ -81,16 +81,13 @@ class _HomePageState extends State<HomePage> {
child: Row(
children: <Widget>[
Expanded(
child: Visibility(
visible: model.user.outSA == 1 ? false : true,
child: Container(
height: 125,
padding: EdgeInsets.all(5),
margin: EdgeInsets.all(5),
decoration: BoxDecoration(
image: DecorationImage(
image:
AssetImage("assets/images/new-design/covid_bg_transparent.png"),
image: AssetImage("assets/images/new-design/covid_bg_transparent.png"),
fit: BoxFit.fill,
),
color: Colors.white.withOpacity(0.3),
@ -163,7 +160,6 @@ class _HomePageState extends State<HomePage> {
),
),
),
),
Expanded(
child: InkWell(
onTap: () => Navigator.push(context, FadePage(page: LiveCareHome())),
@ -462,7 +458,6 @@ class _HomePageState extends State<HomePage> {
if (projectViewModel.havePrivilege(64) ||
projectViewModel.havePrivilege(65) ||
projectViewModel.havePrivilege(67))
if (model.user.outSA == 0)
Container(
margin: EdgeInsets.only(left: 15, right: 15),
child: Row(
@ -470,7 +465,9 @@ class _HomePageState extends State<HomePage> {
children: <Widget>[
if (projectViewModel.havePrivilege(64))
DashboardItem(
onTap: () {
onTap: (model.user != null && model.user.outSA == 1)
? () {}
: () {
Navigator.push(
context,
FadePage(
@ -481,7 +478,17 @@ class _HomePageState extends State<HomePage> {
child: Center(
child: Padding(
padding: const EdgeInsets.all(15.0),
child: Column(
child: (model.user != null && model.user.outSA == 1)
? Container(
width: double.infinity,
height: double.infinity,
color: Colors.grey.withOpacity(0.7),
child: Icon(
Icons.lock_outline,
size: 40,
),
)
: Column(
children: <Widget>[
Image.asset(
'assets/images/home_health_care_icon.png',
@ -499,8 +506,7 @@ class _HomePageState extends State<HomePage> {
fontSize: SizeConfig.textMultiplier * 1.55,
)
],
),
),
)),
),
height: MediaQuery.of(context).size.width * 0.4,
imageName: 'home_healthcare_service_bg.png',
@ -508,12 +514,29 @@ class _HomePageState extends State<HomePage> {
),
if (projectViewModel.havePrivilege(65))
DashboardItem(
onTap: () => getPharmacyToken(model),
onTap: () =>
(model.user != null && model.user.outSA == 1) ? () {} : getPharmacyToken(model),
child: Center(
child: Padding(
padding: const EdgeInsets.all(15.0),
child: Column(
child: (model.user != null && model.user.outSA == 1)
? Container(
width: double.infinity,
height: double.infinity,
color: Colors.grey.withOpacity(0.7),
child: Icon(
Icons.lock_outline,
size: 40,
),
)
: Column(
children: <Widget>[
// if (projectViewModel.user != null && model.isLogin && model.user.outSA == 1)
// Image.asset(
// 'assets/images/lock_icon.png',
// width: 50,
// height: 50,
// ),
Image.asset(
'assets/images/pharmacy_logo.png',
width: 40,
@ -538,7 +561,9 @@ class _HomePageState extends State<HomePage> {
),
if (projectViewModel.havePrivilege(67))
DashboardItem(
onTap: () {
onTap: (model.user != null && model.user.outSA == 1)
? () {}
: () {
Navigator.push(
context,
FadePage(
@ -549,7 +574,17 @@ class _HomePageState extends State<HomePage> {
child: Center(
child: Padding(
padding: const EdgeInsets.all(15.0),
child: Column(
child: (model.user != null && model.user.outSA == 1)
? Container(
width: double.infinity,
height: double.infinity,
color: Colors.grey.withOpacity(0.7),
child: Icon(
Icons.lock_outline,
size: 40,
),
)
: Column(
children: <Widget>[
Image.asset(
'assets/images/comprehensive_medical_checkup_logo.png',
@ -567,8 +602,7 @@ class _HomePageState extends State<HomePage> {
fontSize: SizeConfig.textMultiplier * 1.55,
)
],
),
),
)),
),
height: MediaQuery.of(context).size.width * 0.4,
color: HexColor("#747C80"),

Loading…
Cancel
Save