From 6c3d681387d58248d24b46aa5779d2bd09b56e8a Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 21 Apr 2021 13:03:52 +0300 Subject: [PATCH 1/3] hot fixes --- lib/screens/procedures/ProcedureCard.dart | 35 +++++++++++-------- .../entity_list_procedure_widget.dart | 2 +- lib/screens/procedures/procedure_screen.dart | 5 ++- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/lib/screens/procedures/ProcedureCard.dart b/lib/screens/procedures/ProcedureCard.dart index ed450df0..865c6f48 100644 --- a/lib/screens/procedures/ProcedureCard.dart +++ b/lib/screens/procedures/ProcedureCard.dart @@ -1,6 +1,9 @@ +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'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; +import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/FlowChartPage.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; @@ -18,19 +21,20 @@ class ProcedureCard extends StatelessWidget { final int categoryID; final PatiantInformtion patient; - const ProcedureCard( - {Key key, - this.onTap, - this.entityList, - this.categoryID, - this.categoryName, - this.patient, - }) - : super(key: key); + const ProcedureCard({ + Key key, + this.onTap, + this.entityList, + this.categoryID, + this.categoryName, + this.patient, + }) : 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, @@ -188,12 +192,13 @@ class ProcedureCard extends StatelessWidget { // entityList.remarks.toString() ?? '', // fontSize: 12, // ), - // if (entityList.categoryID == 2 || - // entityList.categoryID == 4) - // InkWell( - // child: Icon(DoctorApp.edit), - // onTap: onTap, - // ) + if (entityList.categoryID == 2 || + entityList.categoryID == 4 && + entityList.doctorName == doctorProfile.doctorName) + InkWell( + child: Icon(DoctorApp.edit), + onTap: onTap, + ) // ], // ) ], diff --git a/lib/screens/procedures/entity_list_procedure_widget.dart b/lib/screens/procedures/entity_list_procedure_widget.dart index 15fc27b6..b74ffa0d 100644 --- a/lib/screens/procedures/entity_list_procedure_widget.dart +++ b/lib/screens/procedures/entity_list_procedure_widget.dart @@ -67,7 +67,7 @@ class _ProcedureListWidgetState extends State { NetworkBaseView( baseViewModel: widget.model, child: Container( - height: MediaQuery.of(context).size.height * 0.55, + height: MediaQuery.of(context).size.height * 0.75, child: Center( child: Container( margin: EdgeInsets.only(top: 15), diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart index ebeb1d4f..d81f95c0 100644 --- a/lib/screens/procedures/procedure_screen.dart +++ b/lib/screens/procedures/procedure_screen.dart @@ -1,6 +1,8 @@ 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'; +import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/procedures/add-procedure-form.dart'; @@ -15,7 +17,7 @@ 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 { @@ -25,6 +27,7 @@ class ProcedureScreen extends StatelessWidget { PatiantInformtion patient = routeArgs['patient']; String patientType = routeArgs['patientType']; String arrivalType = routeArgs['arrivalType']; + return BaseView( onModelReady: (model) => model.getProcedure(mrn: patient.patientId, patientType: patientType), From 5bd50caa228e6937cae61d535e458f8219b4234e Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 21 Apr 2021 15:47:40 +0300 Subject: [PATCH 2/3] 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 && From 6a33f60bad5e59a6e6f6dc4bb0fa49c74943b745 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 21 Apr 2021 15:49:58 +0300 Subject: [PATCH 3/3] hot fixes --- pubspec.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index d338a618..e9386145 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -608,7 +608,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0-nullsafety.4" mime: dependency: transitive description: @@ -900,7 +900,7 @@ packages: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.1" + version: "1.10.0-nullsafety.2" sticky_headers: dependency: "direct main" description: @@ -1091,5 +1091,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=2.10.0 <2.11.0" + dart: ">=2.10.0 <=2.11.0-213.1.beta" flutter: ">=1.22.0 <2.0.0"