diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 356eb4f8..89d9eea7 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -11,6 +11,7 @@ import 'package:doctor_app_flutter/providers/patients_provider.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/screens/patients/TopTenUsersModelResponse.dart'; import 'package:doctor_app_flutter/screens/patients/patiant_info_model.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -119,12 +120,22 @@ class _PatientsScreenState extends State { Column(children: responseModelList.map((PatiantInformtion item) { return InkWell( child: CardWithBgWidget( + widget: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText(item.nationalityName, fontSize: 2.5 *SizeConfig.textMultiplier ,), + SizedBox( + height: 8, + ), + AppText(item.lastName, fontSize: 2.5 *SizeConfig.textMultiplier), + SizedBox( + height: 8, + ), + AppText(item.middleName, fontSize: 2.5 *SizeConfig.textMultiplier), - line1Text:item.nationalityName,//item['FirstName'],//patient.getFirstName(),//item['FirstName'], - line2Text:item.lastName, //responseModelList['LastName'],//item['LastName'],//'12/04/2020 - 02:00 PM', - // line3Text: item.middleName, - heightPercentage: 0.15, - widthPercentage: 0.80), + ], + ), + ), onTap: (){ Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: {"patient": responseModelList}); }, 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 bc7cf633..3d689870 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart @@ -1,8 +1,10 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/models/patient_model.dart'; import 'package:doctor_app_flutter/providers/patients_provider.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -48,7 +50,9 @@ class _VitalSignScreenState extends State { "ProjectID": patient['ProjectID'], "PatientTypeID": patient['PatientType'], "InOutPatientType": 1, - "TransNo":patient['AdmissionNo'] !=null ? int.parse(patient['AdmissionNo']) : 0, + "TransNo": patient['AdmissionNo'] != null + ? int.parse(patient['AdmissionNo']) + : 0, "LanguageID": 2, "stamp": "2020-04-26T09:32:18.317Z", "IPAdress": "11.11.11.11", @@ -88,10 +92,24 @@ class _VitalSignScreenState extends State { children: litems.map((item) { return InkWell( child: CardWithBgWidget( - line1Text: 'Fahad AlSlehm - 324599', - line2Text: '12/04/2020 - 02:00 PM', - heightPercentage: 0.15, - widthPercentage: 0.80), + widget: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + 'Fahad AlSlehm - 324599', + fontSize: 2.5 * SizeConfig.textMultiplier, + ), + SizedBox( + height: 8, + ), + AppText('12/04/2020 - 02:00 PM', + fontSize: 2.5 * SizeConfig.textMultiplier), + SizedBox( + height: 8, + ), + ], + ), + ), onTap: () { Navigator.of(context).pushNamed(VITAL_SIGN); },