diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index c9f5d910..04591962 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -65,7 +65,7 @@ class _DashboardScreenState extends State { flex: 2, child: RoundedContainer( child: CircularPercentIndicator( - radius: 100.0, + radius: 100, animation: true, animationDuration: 1200, lineWidth: 7.0, @@ -78,7 +78,7 @@ class _DashboardScreenState extends State { fontSize: SizeConfig.textMultiplier * 4), AppText("Out-Patients", fontWeight: FontWeight.normal, - fontSize: SizeConfig.textMultiplier * 1.2, + fontSize: SizeConfig.textMultiplier * 1.1, color: Colors.grey[800]), ], ), diff --git a/lib/widgets/patients/profile/patient_profile_widget.dart b/lib/widgets/patients/profile/patient_profile_widget.dart index 171d1256..0ef50d81 100644 --- a/lib/widgets/patients/profile/patient_profile_widget.dart +++ b/lib/widgets/patients/profile/patient_profile_widget.dart @@ -32,46 +32,61 @@ class PatientProfileWidget extends StatelessWidget { // ProfileStatusInfoWidget() // ]); - return Container( - child: Column(children: [ - Expanded( - flex: 1, - child: - Row(mainAxisAlignment: MainAxisAlignment.center, children: [ - Column(children: [ - Container( - padding: EdgeInsets.only(top: 20), - child: ProfileImageWidget( - url: - "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png", - name: patient.firstName + ' ' + patient.lastName, - fontsize: 24.0, - color: Colors.black, - ), + return CustomScrollView(primary: false, slivers: [ + SliverList( + delegate: SliverChildListDelegate( + [ + Expanded( + flex: 1, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Column(children: [ + Container( + padding: EdgeInsets.only(top: 20), + child: ProfileImageWidget( + url: + "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png", + name: patient.firstName + ' ' + patient.lastName, + fontsize: 24.0, + color: Colors.black, + ), + ), + Container( + child: Column( + children: [ + AppText( + 'File No: ' + patient.patientId.toString(), + fontWeight: FontWeight.normal, + fontSize: 16, + ), + AppText( + patient.genderDescription.toString() + + ', ' + + patient.age, + fontWeight: FontWeight.normal, + fontSize: 16, + ) + ], + ), + ) + ]), + ]), ), - Container( - child: Column( - children: [ - AppText( - 'File No: ' + patient.patientId.toString(), - fontWeight: FontWeight.normal, - fontSize: 16, - ), - AppText( - patient.genderDescription.toString() + ', ' + patient.age, - fontWeight: FontWeight.normal, - fontSize: 16, - ) - ], - ), - ) - ]), - ]), + ], + ), ), - Expanded( - flex: 2, - child: ProfileMedicalInfoWidget(patient: patient), - ) - ])); + SliverPadding( + padding: const EdgeInsets.fromLTRB(20, 30, 15, 10), + sliver: ProfileMedicalInfoWidget()) + ]); + + // Container( + // child: Column(children: [ + // Expanded( + // flex: 2, + // child: , + // ) + // ])); } } diff --git a/lib/widgets/patients/profile/profile_medical_info_widget.dart b/lib/widgets/patients/profile/profile_medical_info_widget.dart index 85a8e140..3ac66f2e 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget.dart @@ -23,65 +23,61 @@ class ProfileMedicalInfoWidget extends StatelessWidget { Widget build(BuildContext context) { // final double contWidth = SizeConfig.realScreenWidth * 0.70; // final double contHeight = SizeConfig.screenHeight * 0.30; - return CustomScrollView(primary: false, slivers: [ - SliverPadding( - padding: const EdgeInsets.fromLTRB(20, 30, 15, 10), - sliver: SliverGrid.count( - crossAxisSpacing: 10, - mainAxisSpacing: 20, - crossAxisCount: 2, - childAspectRatio: 1.5, - children: [ - PatientProfileButton( - key: key, - patient: patient, - name: 'Vital Sign', - route: VITAL_SIGN_DETAILS, - icon: 'heartbeat.png'), - PatientProfileButton( - key: key, - patient: patient, - route: LAB_ORDERS, - name: 'Lab Order', - icon: 'lab.png'), - PatientProfileButton( - key: key, - patient: patient, - route: PRESCRIPTIONS, - name: 'Prescription', - icon: 'note.png'), - PatientProfileButton( - key: key, - patient: patient, - route: RADIOLOGY, - name: 'Radiology', - icon: 'radiology-1.png'), - PatientProfileButton( - key: key, - patient: patient, - route: PROGRESS_NOTE, - name: 'Progress Notes', - icon: 'heartbeat.png'), - PatientProfileButton( - key: key, - patient: patient, - route: PATIENT_INSURANCE_APPROVALS, - name: 'Insurance Aprovals', - icon: 'lab.png'), - PatientProfileButton( - key: key, - patient: patient, - route: PRESCRIPTIONS, - name: 'Refer Patient', - icon: 'note.png'), - PatientProfileButton( - key: key, - patient: patient, - route: PATIENT_ORDERS, - name: 'Orders', - icon: 'radiology-1.png'), - ])) - ]); + return SliverGrid.count( + crossAxisSpacing: 10, + mainAxisSpacing: 20, + crossAxisCount: 2, + childAspectRatio: 1.5, + children: [ + PatientProfileButton( + key: key, + patient: patient, + name: 'Vital Sign', + route: VITAL_SIGN_DETAILS, + icon: 'heartbeat.png'), + PatientProfileButton( + key: key, + patient: patient, + route: LAB_ORDERS, + name: 'Lab Order', + icon: 'lab.png'), + PatientProfileButton( + key: key, + patient: patient, + route: PRESCRIPTIONS, + name: 'Prescription', + icon: 'note.png'), + PatientProfileButton( + key: key, + patient: patient, + route: RADIOLOGY, + name: 'Radiology', + icon: 'radiology-1.png'), + PatientProfileButton( + key: key, + patient: patient, + route: PROGRESS_NOTE, + name: 'Progress Notes', + icon: 'heartbeat.png'), + PatientProfileButton( + key: key, + patient: patient, + route: PATIENT_INSURANCE_APPROVALS, + name: 'Insurance Aprovals', + icon: 'lab.png'), + PatientProfileButton( + key: key, + patient: patient, + route: PRESCRIPTIONS, + name: 'Refer Patient', + icon: 'note.png'), + PatientProfileButton( + key: key, + patient: patient, + route: PATIENT_ORDERS, + name: 'Orders', + icon: 'radiology-1.png'), + ]); // child: ListView( // children: [ // Padding(