hot fixes

merge-requests/526/head
hussam al-habibeh 5 years ago
parent 6c3d681387
commit 5bd50caa22

@ -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/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/model/procedure/get_ordered_procedure_model.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/core/viewModel/project_view_model.dart';
@ -20,6 +20,7 @@ class ProcedureCard extends StatelessWidget {
final String categoryName; final String categoryName;
final int categoryID; final int categoryID;
final PatiantInformtion patient; final PatiantInformtion patient;
final String doctorName;
const ProcedureCard({ const ProcedureCard({
Key key, Key key,
@ -28,13 +29,12 @@ class ProcedureCard extends StatelessWidget {
this.categoryID, this.categoryID,
this.categoryName, this.categoryName,
this.patient, this.patient,
this.doctorName,
}) : super(key: key); }) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
Map profile = sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
return Container( return Container(
width: double.maxFinite, width: double.maxFinite,
height: MediaQuery.of(context).size.height * .22, height: MediaQuery.of(context).size.height * .22,
@ -185,22 +185,22 @@ class ProcedureCard extends StatelessWidget {
), ),
), ),
), ),
// Row( Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [ children: [
// AppText( AppText(
// entityList.remarks.toString() ?? '', entityList.remarks.toString() ?? '',
// fontSize: 12, fontSize: 12,
// ), ),
if (entityList.categoryID == 2 || if (entityList.categoryID == 2 ||
entityList.categoryID == 4 && entityList.categoryID == 4 &&
entityList.doctorName == doctorProfile.doctorName) doctorName == entityList.doctorName)
InkWell( InkWell(
child: Icon(DoctorApp.edit), child: Icon(DoctorApp.edit),
onTap: onTap, onTap: onTap,
) )
// ], ],
// ) )
], ],
), ),
//onTap: onTap, //onTap: onTap,

@ -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/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.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/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/add-procedure-form.dart';
import 'package:doctor_app_flutter/screens/procedures/update-procedure.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/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-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_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_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:flutter/material.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'ProcedureCard.dart'; import 'ProcedureCard.dart';
class ProcedureScreen extends StatelessWidget { 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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
@ -177,6 +179,7 @@ class ProcedureScreen extends StatelessWidget {
// 'You Cant Update This Procedure'); // 'You Cant Update This Procedure');
}, },
patient: patient, patient: patient,
doctorName: doctorNameP,
), ),
), ),
if (model.procedureList.length != 0 && if (model.procedureList.length != 0 &&

Loading…
Cancel
Save