working on UCAF get data

lib/client/base_app_client.dart

@@ -42,6 +42,8 @@ class BaseAppClient {
         DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
          if (body['DoctorID'] == null)
           body['DoctorID'] = doctorProfile?.doctorID;
+        if (body['DoctorID'] == "")
+          body['DoctorID'] = null;
           body['EditedBy'] = doctorProfile?.doctorID;
         if (body['ProjectID'] == null) {
           body['ProjectID'] = doctorProfile?.projectID;

lib/config/localized_values.dart

@@ -527,4 +527,5 @@ const Map<String, Map<String, String>> localizedValues = {
   'covered': {'en': "Covered", 'ar':"مغطى" },
   'approvalRequired': {'en': "Approval Required", 'ar':"الموافقة مطلوبة" },
   'uncoveredByDoctor': {'en': "Uncovered By Doctor", 'ar':"غير مغطى من قبل الدكتور" },
+  'chiefComplaintEmptyMsg': {'en': "There is no Chief Complaint", 'ar':"ليس هناك شكوى رئيس" },
 };

lib/core/service/patient-ucaf-service.dart

@@ -1,5 +1,58 @@
+import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/core/service/base/base_service.dart';
+import 'package:doctor_app_flutter/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart';
+import 'package:doctor_app_flutter/models/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart';
+import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
+import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-data.dart';
 
 class UcafService extends BaseService {
 
+  List<GetChiefComplaintResModel> patientChiefComplaintList  = [];
+  VitalSignData patientVitalSigns;
+
+  Future getPatientChiefComplaint(PatiantInformtion patient) async {
+    hasError = false;
+    Map<String, dynamic> body = Map();
+    body['PatientMRN'] = patient.patientMRN;
+    body['AppointmentNo'] = patient.appointmentNo;
+    body['EpisodeID'] = patient.episodeNo;
+    body['DoctorID'] = "";
+
+    await baseAppClient.post (GET_CHIEF_COMPLAINT,
+        onSuccess: (dynamic response, int statusCode) {
+          print("Success");
+          patientChiefComplaintList.clear();
+          response['List_ChiefComplaint']['entityList'].forEach((v) {
+            patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v));
+          });
+        }, onFailure: (String error, int statusCode) {
+          hasError = true;
+          super.error = error;
+        }, body: body);
+  }
+
+  Future getPatientVitalSign(PatiantInformtion patient) async {
+    patientVitalSigns = null;
+    hasError = false;
+    Map<String, dynamic> body = Map();
+    body['PatientMRN'] = patient.patientMRN;
+    body['AppointmentNo'] = patient.appointmentNo;
+    body['EpisodeID'] = patient.episodeNo;
+
+    await baseAppClient.post(
+      GET_PATIENT_VITAL_SIGN_DATA,
+      onSuccess: (dynamic response, int statusCode) {
+        if(response['VitalSignsList'] != null){
+          if(response['VitalSignsList']['entityList'] != null && (response['VitalSignsList']['entityList'] as List).length > 0){
+            patientVitalSigns = VitalSignData.fromJson(response['VitalSignsList']['entityList'][0]);
+          }
+        }
+      },
+      onFailure: (String error, int statusCode) {
+        hasError = true;
+        super.error = error.toString();
+      },
+      body: body,
+    );
+  }
 }

lib/core/service/patient-vital-signs-service.dart

@@ -11,43 +11,8 @@ class VitalSignsService extends BaseService{
   List<VitalSignResModel> patientVitalSignOrderdSubList = [];
   VitalSignData patientVitalSigns;
 
-  /*Future getPatientVitalSign(patient) async {
-    hasError = false;
-    await baseAppClient.post(
-      GET_PATIENT_VITAL_SIGN,
-      onSuccess: (dynamic response, int statusCode) {
-        patientVitalSignList = [];
-        response['List_DoctorPatientVitalSign'].forEach((v) {
-          patientVitalSignList.add(new VitalSignResModel.fromJson(v));
-        });
-
-        if (patientVitalSignList.length > 0) {
-          List<VitalSignResModel> patientVitalSignOrderdSubListTemp = [];
-          patientVitalSignOrderdSubListTemp = patientVitalSignList;
-          patientVitalSignOrderdSubListTemp
-              .sort((VitalSignResModel a, VitalSignResModel b) {
-            return b.vitalSignDate.microsecondsSinceEpoch -
-                a.vitalSignDate.microsecondsSinceEpoch;
-          });
-          patientVitalSignOrderdSubList.clear();
-          int length = patientVitalSignOrderdSubListTemp.length >= 20
-              ? 20
-              : patientVitalSignOrderdSubListTemp.length;
-          for (int x = 0; x < length; x++) {
-            patientVitalSignOrderdSubList
-                .add(patientVitalSignOrderdSubListTemp[x]);
-          }
-        }
-      },
-      onFailure: (String error, int statusCode) {
-        hasError = true;
-        super.error = error;
-      },
-      body: patient,
-    );
-  } // Vit*/
-
   Future getPatientVitalSign(PatiantInformtion patient) async {
+    patientVitalSigns = null;
     hasError = false;
     Map<String, dynamic> body = Map();
     body['PatientMRN'] = patient.patientMRN;

lib/core/viewModel/patient-ucaf-viewmodel.dart

@@ -1,9 +1,30 @@
+import 'package:doctor_app_flutter/core/enum/viewstate.dart';
 import 'package:doctor_app_flutter/core/service/patient-ucaf-service.dart';
 import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
+import 'package:doctor_app_flutter/models/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart';
+import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
+import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-data.dart';
 
 import '../../locator.dart';
 
 class UcafViewModel extends BaseViewModel {
 
   UcafService _ucafService = locator<UcafService>();
+
+  List<GetChiefComplaintResModel> get patientChiefComplaintList => _ucafService.patientChiefComplaintList;
+  VitalSignData get patientVitalSigns => _ucafService.patientVitalSigns;
+
+  Future getUCAFData(PatiantInformtion patient) async {
+    setState(ViewState.Busy);
+    await _ucafService.getPatientVitalSign(patient);
+    await _ucafService.getPatientChiefComplaint(patient);
+
+    if (_ucafService.hasError) {
+      error = _ucafService.error;
+      setState(ViewState.Error);
+    } else {
+      setState(ViewState.Idle);
+    }
+  }
+
 }

lib/screens/patients/profile/UCAF/UCAF-input-screen.dart

@@ -14,6 +14,7 @@ import 'package:flutter/services.dart';
 import 'package:hexcolor/hexcolor.dart';
 
 import '../../../../routes.dart';
+import '../../../QR_reader_screen.dart';
 
 class UCAFInputScreen extends StatefulWidget {
   @override
@@ -55,15 +56,20 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
     final screenSize = MediaQuery.of(context).size;
 
     return BaseView<UcafViewModel>(
+      onModelReady: (model) => model.getUCAFData(patient),
       builder: (_, model, w) => AppScaffold(
         baseViewModel: model,
         appBarTitle: TranslationBase.of(context).ucaf,
-        body: SingleChildScrollView(
+        body: model.patientVitalSigns != null &&
+                model.patientChiefComplaintList != null &&
+                model.patientChiefComplaintList.length > 0
+            ? SingleChildScrollView(
                 child: Column(
                   children: [
                     PatientHeaderWidgetNoAvatar(patient),
                     Container(
-                margin: EdgeInsets.symmetric(vertical: 16, horizontal: 16),
+                      margin:
+                          EdgeInsets.symmetric(vertical: 16, horizontal: 16),
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
@@ -101,7 +107,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                               height: screenSize.height * 0.070,
                               child: TextField(
                                 decoration: Helpers.textFieldSelectorDecoration(
-                              TranslationBase.of(context).durationOfIllness,
+                                    TranslationBase.of(context)
+                                        .durationOfIllness,
                                     null,
                                     false),
                                 enabled: true,
@@ -130,7 +137,7 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                                     width: 8,
                                   ),
                                   AppText(
-                              "120/80",
+                                    "${model.patientVitalSigns.bloodPressureHigher}/${model.patientVitalSigns.bloodPressureLower}",
                                     fontSize: SizeConfig.textMultiplier * 2,
                                     color: Colors.grey.shade800,
                                     fontWeight: FontWeight.normal,
@@ -149,7 +156,7 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                                     width: 8,
                                   ),
                                   AppText(
-                              "37.5(C), 98.6(F)",
+                                    "${model.patientVitalSigns.temperatureCelcius}(C), ${model.patientVitalSigns.temperatureCelcius * (9 / 5) + 32}(F)",
                                     fontSize: SizeConfig.textMultiplier * 2,
                                     color: Colors.grey.shade800,
                                     fontWeight: FontWeight.normal,
@@ -176,7 +183,7 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                                     width: 8,
                                   ),
                                   AppText(
-                              "80",
+                                    "${model.patientVitalSigns.pulseBeatPerMinute}",
                                     fontSize: SizeConfig.textMultiplier * 2,
                                     color: Colors.grey.shade800,
                                     fontWeight: FontWeight.normal,
@@ -189,7 +196,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                             height: 16,
                           ),
                           AppText(
-                      TranslationBase.of(context).chiefComplaintsAndSymptoms,
+                            TranslationBase.of(context)
+                                .chiefComplaintsAndSymptoms,
                             fontWeight: FontWeight.bold,
                             fontSize: SizeConfig.textMultiplier * 2.5,
                           ),
@@ -208,14 +216,17 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                           Container(
                               child: TextField(
                             decoration: Helpers.textFieldSelectorDecoration(
-                          TranslationBase.of(context).additionalTextComplaints,
-                          null,
+                                TranslationBase.of(context)
+                                    .additionalTextComplaints,
+                                helpers.parseHtmlString(model
+                                    .patientChiefComplaintList[0]
+                                    .chiefComplaint),
                                 false),
-                      enabled: true,
+                            enabled: false,
                             controller: _additionalComplaintsController,
                             keyboardType: TextInputType.text,
-                      minLines: 4,
-                      maxLines: 6,
+                            /*minLines: 4,
+                            maxLines: 6,*/
                           )),
                           SizedBox(
                             height: 16,
@@ -236,10 +247,12 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                                     value: conditionsData[index]['isChecked'],
                                     onChanged: (newValue) {
                                       setState(() {
-                                  conditionsData[index]['isChecked'] = newValue;
+                                        conditionsData[index]['isChecked'] =
+                                            newValue;
                                       });
                                     },
-                              controlAffinity: ListTileControlAffinity.leading,
+                                    controlAffinity:
+                                        ListTileControlAffinity.leading,
                                     contentPadding: EdgeInsets.all(0),
                                   )),
                           SizedBox(
@@ -279,7 +292,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                                 child: Container(
                                     height: screenSize.height * 0.070,
                                     child: TextField(
-                                decoration: Helpers.textFieldSelectorDecoration(
+                                      decoration:
+                                          Helpers.textFieldSelectorDecoration(
                                               TranslationBase.of(context).when,
                                               null,
                                               false),
@@ -295,7 +309,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                                 child: Container(
                                     height: screenSize.height * 0.070,
                                     child: TextField(
-                                decoration: Helpers.textFieldSelectorDecoration(
+                                      decoration:
+                                          Helpers.textFieldSelectorDecoration(
                                               TranslationBase.of(context).where,
                                               null,
                                               false),
@@ -312,7 +327,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                           Container(
                               child: TextField(
                             decoration: Helpers.textFieldSelectorDecoration(
-                              TranslationBase.of(context).specifyPossibleLineManagement,
+                                TranslationBase.of(context)
+                                    .specifyPossibleLineManagement,
                                 null,
                                 false),
                             enabled: true,
@@ -325,8 +341,7 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                             height: 16,
                           ),
                           AppText(
-                      TranslationBase.of(context)
-                          .significantSigns,
+                            TranslationBase.of(context).significantSigns,
                             fontWeight: FontWeight.bold,
                             fontSize: SizeConfig.textMultiplier * 2.0,
                           ),
@@ -342,8 +357,6 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                             enabled: true,
                             controller: _signsController,
                             keyboardType: TextInputType.text,
-                          minLines: 4,
-                          maxLines: 6,
                           )),
                           SizedBox(
                             height: 16,
@@ -351,8 +364,10 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                           AppButton(
                             title: TranslationBase.of(context).next,
                             color: HexColor("#B8382B"),
-                      onPressed: (){
-                        Navigator.of(context).pushNamed(PATIENT_UCAF_DETAIL, arguments: {'patient': patient});
+                            onPressed: () {
+                              Navigator.of(context).pushNamed(
+                                  PATIENT_UCAF_DETAIL,
+                                  arguments: {'patient': patient});
                             },
                           ),
                         ],
@@ -360,6 +375,18 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                     ),
                   ],
                 ),
+              )
+            : Container(
+                child: Center(
+                  child: AppText(
+                    model.patientVitalSigns == null
+                        ? TranslationBase.of(context).vitalSignEmptyMsg
+                        : TranslationBase.of(context).chiefComplaintEmptyMsg,
+                    fontWeight: FontWeight.normal,
+                    color: HexColor("#B8382B"),
+                    fontSize: SizeConfig.textMultiplier * 2.5,
+                  ),
+                ),
               ),
       ),
     );

lib/util/translations_delegate_base.dart

@@ -548,6 +548,7 @@ class TranslationBase {
   String get covered => localizedValues['covered'][locale.languageCode];
   String get approvalRequired => localizedValues['approvalRequired'][locale.languageCode];
   String get uncoveredByDoctor => localizedValues['uncoveredByDoctor'][locale.languageCode];
+  String get chiefComplaintEmptyMsg => localizedValues['chiefComplaintEmptyMsg'][locale.languageCode];
 }
 
 class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

pubspec.lock

@@ -503,7 +503,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.4"
+    version: "1.3.0-nullsafety.3"
   mime:
     dependency: transitive
     description:
@@ -760,7 +760,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.2"
+    version: "1.10.0-nullsafety.1"
   stream_channel:
     dependency: transitive
     description:
@@ -895,5 +895,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.10.0 <=2.11.0-213.1.beta"
+  dart: ">=2.10.0 <2.11.0"
   flutter: ">=1.22.0 <2.0.0"