From 00bce3403e912eadca237f43057d789ba7dcae04 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Wed, 6 May 2020 22:01:34 +0300 Subject: [PATCH] first step from the vital details --- lib/routes.dart | 7 +- .../vital_sign/vital_sign_details_screen.dart | 70 +++++++++++++++++++ .../profile/vital_sign/vital_sign_screen.dart | 5 +- .../profile/patient_profile_widget.dart | 33 +-------- .../profile/profile_medical_info_widget.dart | 44 ++++++------ 5 files changed, 105 insertions(+), 54 deletions(-) create mode 100644 lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart diff --git a/lib/routes.dart b/lib/routes.dart index 1cf0901a..dcef9fbe 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -16,6 +16,7 @@ import './screens/patients/profile/lab_result/lab_orders_screen.dart'; import './screens/patients/profile/patient_profile_screen.dart'; import './screens/patients/profile/prescriptions/prescriptions_screen.dart'; import './screens/patients/profile/radiology/radiology_screen.dart'; +import './screens/patients/profile/vital_sign/vital_sign_details_screen.dart'; import './screens/patients/profile/vital_sign/vital_sign_screen.dart'; import './screens/profile_screen.dart'; import './screens/settings/settings_screen.dart'; @@ -44,6 +45,8 @@ const String VITAL_SIGN = 'patients/vital-sign'; const String LAB_ORDERS = 'patients/lab_orders'; const String PRESCRIPTIONS = 'patients/prescription'; const String RADIOLOGY = 'patients/radiology'; +const String VITAL_SIGN_DETAILS = 'patients/vital-sign-details'; + var routes = { @@ -68,5 +71,7 @@ var routes = { SERVICES: (_) => ServicesScreen(), LAB_ORDERS:(_)=>LabOrdersScreen(), PRESCRIPTIONS:(_)=>PrescriptionScreen(), - RADIOLOGY:(_)=>RadiologyScreen() + RADIOLOGY:(_)=>RadiologyScreen(), + VITAL_SIGN_DETAILS:(_)=>VitalSignDetailsScreen(), + }; diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart new file mode 100644 index 00000000..223658b2 --- /dev/null +++ b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart @@ -0,0 +1,70 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/models/patient/vital_sign_res_model.dart'; +import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_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/rounded_container_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; + +class VitalSignDetailsScreen extends StatelessWidget { + // VitalSignDetailsScreen({Key key, this.vitalSing}) : super(key: key); + VitalSignResModel vitalSing; + String url = "assets/images/"; + final double contWidth = SizeConfig.realScreenWidth * 0.70; + + @override + Widget build(BuildContext context) { + final routeArgs = ModalRoute.of(context).settings.arguments as Map; + vitalSing = routeArgs['vitalSing']; + return AppScaffold( + appBarTitle: "vital Sing ", + body: RoundedContainer( + child: CustomScrollView( + primary: false, + slivers: [ + SliverPadding( + padding: const EdgeInsets.all(10), + sliver: SliverGrid.count( + // childAspectRatio: 200, + crossAxisSpacing: 0, + mainAxisSpacing: 50, + crossAxisCount: 4, + children: [ + CircleAvatarWidget( + des: 'Vital Sign', + url: url + 'heartbeat.png', + + ), + CircleAvatarWidget( + des: 'Vital Sign', + url: url + 'heartbeat.png', + + ), + CircleAvatarWidget( + des: 'Vital Sign', + url: url + 'heartbeat.png', + ), + CircleAvatarWidget( + des: 'Vital Sign', + url: url + 'heartbeat.png', + ), + CircleAvatarWidget( + des: 'Vital Sign', + url: url + 'heartbeat.png', + ), CircleAvatarWidget( + des: 'Vital Sign', + url: url + 'heartbeat.png', + ), CircleAvatarWidget( + des: 'Vital Sign', + url: url + 'heartbeat.png', + ), + ], + ), + ), + ], + ), + // height: 500, + )); + } +} diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart index c5acfeb6..570a5aa1 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/routes.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -149,7 +150,9 @@ class _VitalSignScreenState extends State { ], ), ), - onTap: () {}, + onTap: () { + Navigator.of(context).pushNamed(VITAL_SIGN_DETAILS,arguments: {'vitalSing':patientsProv.patientVitalSignList[index]}); + }, ); }), ), diff --git a/lib/widgets/patients/profile/patient_profile_widget.dart b/lib/widgets/patients/profile/patient_profile_widget.dart index 72d287b0..4dbcf39b 100644 --- a/lib/widgets/patients/profile/patient_profile_widget.dart +++ b/lib/widgets/patients/profile/patient_profile_widget.dart @@ -15,38 +15,7 @@ import './profile_status_info_widget.dart'; *@desc: Patient Profile Widget */ class PatientProfileWidget extends StatelessWidget { - // Map patient = { - // "ProjectID": 15, - // "ClinicID": null, - // "DoctorID": 70907, - // "PatientID": 3315674, - // "DoctorName": "MOQBIL ABDULLAH AL HODAITHY", - // "DoctorNameN": null, - // "FirstName": "WALEED", - // "MiddleName": "ALI", - // "LastName": "AL-YAZIDI", - // "FirstNameN": null, - // "MiddleNameN": null, - // "LastNameN": null, - // "Gender": 1, - // "DateofBirth": "/Date(534286800000+0300)/", - // "NationalityID": null, - // "MobileNumber": "0500014559", - // "EmailAddress": "unknown@unknown.com", - // "PatientIdentificationNo": "1063236754", - // "NationalityName": "Saudi", - // "NationalityNameN": null, - // "PatientStatusType": null, - // "PatientType": 1, - // "AppointmentDate": "/Date(1587848400000+0300)/", - // "StartTime": "13:00:00", - // "Age": "34 Yr", - // "ClinicDescription": "INTERNAL MEDICINE CLINIC", - // "GenderDescription": "Male", - // "AdmissionDate": "/Date(1587848400000+0300)/", - // "AdmissionNo": "2020008652" - // }; - + PatiantInformtion patient; diff --git a/lib/widgets/patients/profile/profile_medical_info_widget.dart b/lib/widgets/patients/profile/profile_medical_info_widget.dart index 7817e9b0..2a4e001b 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget.dart @@ -79,7 +79,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { ), InkWell( //RADIOLOGY - onTap: () { + onTap: () { navigator(context, RADIOLOGY); }, child: CircleAvatarWidget( @@ -123,26 +123,30 @@ class CircleAvatarWidget extends StatelessWidget { @override Widget build(BuildContext context) { - return Column( - children: [ - Container( - height: height, - width: width, - decoration: new BoxDecoration( - // color: Colors.green, // border color - shape: BoxShape.circle, - border: Border.all(color: Hexcolor('#B7831A'), width: 1.5)), - child: CircleAvatar( - radius: SizeConfig.imageSizeMultiplier * 12, - child: Image.asset(url), - backgroundColor: Colors.transparent, + return Container( + child: Column( + children: [ + Container( + height: height, + width: width, + // width: 50, + // height: 50, + decoration: new BoxDecoration( + // color: Colors.green, // border color + shape: BoxShape.circle, + border: Border.all(color: Hexcolor('#B7831A'), width: 1.5)), + child: CircleAvatar( + radius: SizeConfig.imageSizeMultiplier * 12, + child: Image.asset(url), + backgroundColor: Colors.transparent, + ), ), - ), - SizedBox( - height: 10, - ), - AppText(des) - ], + SizedBox( + height: 10, + ), + AppText(des) + ], + ), ); } }