diff --git a/lib/providers/patients_provider.dart b/lib/providers/patients_provider.dart index 806d0b8e..56ea4cd0 100644 --- a/lib/providers/patients_provider.dart +++ b/lib/providers/patients_provider.dart @@ -17,7 +17,7 @@ class PatientsProvider with ChangeNotifier { bool isLoading = true; bool isError = false; String error = ''; - List patientVitalSignList = []; + List patientVitalSignList = []; Client client = HttpClientWithInterceptor.build(interceptors: [HttpInterceptor()]); diff --git a/lib/screens/patients/patient_profile_screen.dart b/lib/screens/patients/profile/patient_profile_screen.dart similarity index 72% rename from lib/screens/patients/patient_profile_screen.dart rename to lib/screens/patients/profile/patient_profile_screen.dart index fba86c13..5241f18c 100644 --- a/lib/screens/patients/patient_profile_screen.dart +++ b/lib/screens/patients/profile/patient_profile_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import '../../widgets/patients/profile/patient_profile_widget.dart'; -import '../../widgets/shared/app_scaffold_widget.dart'; +import '../../../widgets/patients/profile/patient_profile_widget.dart'; +import '../../../widgets/shared/app_scaffold_widget.dart'; class PatientProfileScreen extends StatelessWidget { const PatientProfileScreen({Key key}) : super(key: key); 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 a61582a1..e3664355 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart @@ -1,15 +1,15 @@ -import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'package:doctor_app_flutter/models/patient/vital_sign_req_model.dart'; -import 'package:doctor_app_flutter/providers/patients_provider.dart'; -import 'package:doctor_app_flutter/routes.dart'; -import 'package:doctor_app_flutter/screens/patients/patiant_info_model.dart'; -import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; -import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../../../config/shared_pref_kay.dart'; +import '../../../../models/patient/vital_sign_req_model.dart'; +import '../../../../providers/patients_provider.dart'; +import '../../../../routes.dart'; +import '../../../../screens/patients/patiant_info_model.dart'; +import '../../../../util/dr_app_shared_pref.dart'; import '../../../../widgets/shared/app_scaffold_widget.dart'; import '../../../../widgets/shared/card_with_bg_widget.dart'; +import '../../../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); @@ -42,14 +42,15 @@ class _VitalSignScreenState extends State { PatiantInformtion patient = routeArgs['patient']; sharedPref.getString(TOKEN).then((token) { VitalSignReqModel vitalSignReqModel = VitalSignReqModel( - patientID: patient.patientId, - projectID: patient.projectId, - tokenID: '@dm!n', - patientTypeID: patient.patientType, - inOutpatientType: 1, - languageID: 2, - transNo: - patient.admissionNo != null ? int.parse(patient.admissionNo) : 0); + patientID: 1237159, //patient.patientId, + projectID: 12, //patient.projectId, + tokenID: '@dm!n', + patientTypeID: patient.patientType, + inOutpatientType: 2, + languageID: 2, + transNo: 0, + ); + //patient.admissionNo != null ? int.parse(patient.admissionNo) : 0); patientsProv.getPatientVitalSign(vitalSignReqModel.toJson()); }); } @@ -89,8 +90,9 @@ class _VitalSignScreenState extends State { children: patientsProv.patientVitalSignList.map((item) { return InkWell( child: CardWithBgWidget( - line1Text: 'Fahad AlSlehm - 324599', - line2Text: '12/04/2020 - 02:00 PM', + line1Text: 'DoctorName - ${item["DoctorName"]}', + line2Text: + 'PainScoreDesc - ${item["PainScoreDesc"]}', heightPercentage: 0.15, widthPercentage: 0.80), onTap: () {