From 9f87e5daf2b0f6cb12bfe1fe7f96a32a56264075 Mon Sep 17 00:00:00 2001
From: Elham Rababah <Elham.a.Rababah@gmail.com>
Date: Tue, 28 Apr 2020 16:22:25 +0300
Subject: [PATCH] fix bug in vital sign model

---
 lib/models/patient/vital_sign_res_model.dart  |  4 +--
 lib/providers/patients_provider.dart          | 17 ++++++----
 .../profile/vital_sign/vital_sign_screen.dart | 32 +++++++++++++------
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/lib/models/patient/vital_sign_res_model.dart b/lib/models/patient/vital_sign_res_model.dart
index b2d6ee45..5d0eabff 100644
--- a/lib/models/patient/vital_sign_res_model.dart
+++ b/lib/models/patient/vital_sign_res_model.dart
@@ -3,7 +3,7 @@ class VitalSignResModel {
   Null projectID;
   int weightKg;
   int heightCm;
-  int temperatureCelcius;
+  var temperatureCelcius;
   int pulseBeatPerMinute;
   int respirationBeatPerMinute;
   int bloodPressureLower;
@@ -11,7 +11,7 @@ class VitalSignResModel {
   int sAO2;
   int fIO2;
   Null painScore;
-  double bodyMassIndex;
+  var bodyMassIndex;
   int headCircumCm;
   int leanBodyWeightLbs;
   int idealBodyWeightLbs;
diff --git a/lib/providers/patients_provider.dart b/lib/providers/patients_provider.dart
index 06a1a139..1baf7786 100644
--- a/lib/providers/patients_provider.dart
+++ b/lib/providers/patients_provider.dart
@@ -1,15 +1,15 @@
 import 'dart:convert';
 
-import 'package:doctor_app_flutter/config/config.dart';
-import 'package:doctor_app_flutter/models/patient/patient_model.dart';
-import 'package:doctor_app_flutter/models/patient/vital_sign_res_model.dart';
-import 'package:doctor_app_flutter/screens/patients/patiant_info_model.dart';
-import 'package:doctor_app_flutter/util/helpers.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:http/http.dart';
 import 'package:http_interceptor/http_client_with_interceptor.dart';
 
+import '../config/config.dart';
 import '../interceptor/http_interceptor.dart';
+import '../models/patient/patient_model.dart';
+import '../models/patient/vital_sign_res_model.dart';
+import '../screens/patients/patiant_info_model.dart';
+import '../util/helpers.dart';
 
 const GET_PATIENT_VITAL_SIGN =
     BASE_URL + 'Doctors.svc/REST/Doctor_GetPatientVitalSign';
@@ -89,7 +89,12 @@ class PatientsProvider with ChangeNotifier {
           var res = json.decode(response.body);
           print('$res');
           if (res['MessageStatus'] == 1) {
-            patientVitalSignList = res['List_DoctorPatientVitalSign'];
+            patientVitalSignList=[];
+            res['List_DoctorPatientVitalSign'].forEach((v) {
+            patientVitalSignList
+                .add(new VitalSignResModel.fromJson(v));
+          });
+            // patientVitalSignList = res['List_DoctorPatientVitalSign'];
           } else {
             isError = true;
             error = res['ErrorMessage'] ?? res['ErrorEndUserMessage'];
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 30683649..79a73408 100644
--- a/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart
+++ b/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart
@@ -1,11 +1,9 @@
-import 'package:doctor_app_flutter/models/patient/vital_sign_res_model.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';
@@ -87,22 +85,36 @@ class _VitalSignScreenState extends State<VitalSignScreen> {
                       ),
                     )
                   : Container(
-                      child: Column(
-                        children: patientsProv.patientVitalSignList.map((VitalSignResModel item) {
-                          return InkWell(
+                      child: ListView.builder(
+                          itemCount: patientsProv.patientVitalSignList.length,
+                          itemBuilder: (BuildContext ctxt, int index) {
+                            return  InkWell(
                             child: CardWithBgWidget(
-                                line1Text: 'DoctorName - ${item.doctorName}',
+                                line1Text: 'DoctorName - ${patientsProv.patientVitalSignList[index].doctorName}',
                                 line2Text:
-                                    'PainScoreDesc - ${item.painScoreDesc}',
+                                    'PainScoreDesc - ${patientsProv.patientVitalSignList[index].painScoreDesc}',
                                 heightPercentage: 0.15,
                                 widthPercentage: 0.80),
                             onTap: () {
-                              Navigator.of(context).pushNamed(VITAL_SIGN);
+                              // Navigator.of(context).pushNamed(VITAL_SIGN);
                             },
                           );
-                        }).toList(),
-                      ),
+                          }),
                     ),
     );
   }
 }
+
+// patientsProv.patientVitalSignList.map((VitalSignResModel item) {
+//                           return InkWell(
+//                             child: CardWithBgWidget(
+//                                 line1Text: 'DoctorName - ${item.doctorName}',
+//                                 line2Text:
+//                                     'PainScoreDesc - ${item.painScoreDesc}',
+//                                 heightPercentage: 0.15,
+//                                 widthPercentage: 0.80),
+//                             onTap: () {
+//                               Navigator.of(context).pushNamed(VITAL_SIGN);
+//                             },
+//                           );
+//                         }).toList()