From 5bd50caa228e6937cae61d535e458f8219b4234e Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 21 Apr 2021 15:47:40 +0300 Subject: [PATCH] hot fixes --- lib/screens/procedures/ProcedureCard.dart | 40 ++++++++++---------- lib/screens/procedures/procedure_screen.dart | 17 +++++---- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/lib/screens/procedures/ProcedureCard.dart b/lib/screens/procedures/ProcedureCard.dart index 865c6f48..f165291f 100644 --- a/lib/screens/procedures/ProcedureCard.dart +++ b/lib/screens/procedures/ProcedureCard.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/client/base_app_client.dart'; +//import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/model/procedure/get_ordered_procedure_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; @@ -20,6 +20,7 @@ class ProcedureCard extends StatelessWidget { final String categoryName; final int categoryID; final PatiantInformtion patient; + final String doctorName; const ProcedureCard({ Key key, @@ -28,13 +29,12 @@ class ProcedureCard extends StatelessWidget { this.categoryID, this.categoryName, this.patient, + this.doctorName, }) : super(key: key); - @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - Map profile = sharedPref.getObj(DOCTOR_PROFILE); - DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); + return Container( width: double.maxFinite, height: MediaQuery.of(context).size.height * .22, @@ -185,22 +185,22 @@ class ProcedureCard extends StatelessWidget { ), ), ), - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // AppText( - // entityList.remarks.toString() ?? '', - // fontSize: 12, - // ), - if (entityList.categoryID == 2 || - entityList.categoryID == 4 && - entityList.doctorName == doctorProfile.doctorName) - InkWell( - child: Icon(DoctorApp.edit), - onTap: onTap, - ) - // ], - // ) + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + AppText( + entityList.remarks.toString() ?? '', + fontSize: 12, + ), + if (entityList.categoryID == 2 || + entityList.categoryID == 4 && + doctorName == entityList.doctorName) + InkWell( + child: Icon(DoctorApp.edit), + onTap: onTap, + ) + ], + ) ], ), //onTap: onTap, diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart index d81f95c0..1371df83 100644 --- a/lib/screens/procedures/procedure_screen.dart +++ b/lib/screens/procedures/procedure_screen.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/client/base_app_client.dart'; +//import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; @@ -8,19 +8,21 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/procedures/add-procedure-form.dart'; import 'package:doctor_app_flutter/screens/procedures/update-procedure.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; -import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:flutter/material.dart'; -import 'package:doctor_app_flutter/util/helpers.dart'; import 'ProcedureCard.dart'; class ProcedureScreen extends StatelessWidget { + String doctorNameP; + + void initState() async { + Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); + doctorNameP = doctorProfile.doctorName; + } + @override Widget build(BuildContext context) { final routeArgs = ModalRoute.of(context).settings.arguments as Map; @@ -177,6 +179,7 @@ class ProcedureScreen extends StatelessWidget { // 'You Cant Update This Procedure'); }, patient: patient, + doctorName: doctorNameP, ), ), if (model.procedureList.length != 0 &&