fix the design issues after merge

merge-requests/32/head
her_username 5 years ago
parent 84ebdb98ea
commit 35f8c14b9a

@ -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/routes.dart';
import 'package:doctor_app_flutter/screens/patients/TopTenUsersModelResponse.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/screens/patients/patiant_info_model.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -119,12 +120,22 @@ class _PatientsScreenState extends State<PatientsScreen> {
Column(children: responseModelList.map((PatiantInformtion item) { Column(children: responseModelList.map((PatiantInformtion item) {
return InkWell( return InkWell(
child: CardWithBgWidget( child: CardWithBgWidget(
widget: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
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: (){ onTap: (){
Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: {"patient": responseModelList}); Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: {"patient": responseModelList});
}, },

@ -1,8 +1,10 @@
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/config/size_config.dart';
import 'package:doctor_app_flutter/models/patient_model.dart'; import 'package:doctor_app_flutter/models/patient_model.dart';
import 'package:doctor_app_flutter/providers/patients_provider.dart'; import 'package:doctor_app_flutter/providers/patients_provider.dart';
import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.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:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -48,7 +50,9 @@ class _VitalSignScreenState extends State<VitalSignScreen> {
"ProjectID": patient['ProjectID'], "ProjectID": patient['ProjectID'],
"PatientTypeID": patient['PatientType'], "PatientTypeID": patient['PatientType'],
"InOutPatientType": 1, "InOutPatientType": 1,
"TransNo":patient['AdmissionNo'] !=null ? int.parse(patient['AdmissionNo']) : 0, "TransNo": patient['AdmissionNo'] != null
? int.parse(patient['AdmissionNo'])
: 0,
"LanguageID": 2, "LanguageID": 2,
"stamp": "2020-04-26T09:32:18.317Z", "stamp": "2020-04-26T09:32:18.317Z",
"IPAdress": "11.11.11.11", "IPAdress": "11.11.11.11",
@ -88,10 +92,24 @@ class _VitalSignScreenState extends State<VitalSignScreen> {
children: litems.map((item) { children: litems.map((item) {
return InkWell( return InkWell(
child: CardWithBgWidget( child: CardWithBgWidget(
line1Text: 'Fahad AlSlehm - 324599', widget: Column(
line2Text: '12/04/2020 - 02:00 PM', crossAxisAlignment: CrossAxisAlignment.start,
heightPercentage: 0.15, children: <Widget>[
widthPercentage: 0.80), 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: () { onTap: () {
Navigator.of(context).pushNamed(VITAL_SIGN); Navigator.of(context).pushNamed(VITAL_SIGN);
}, },

Loading…
Cancel
Save