finish add assessment

lib/config/config.dart

@@ -125,7 +125,10 @@ const POST_CHIEF_COMPLAINT =
 const POST_PHYSICAL_EXAM =
     'Services/DoctorApplication.svc/REST/PostPhysicalExam';
 const POST_PROGRESS_NOTE =
-    '/Services/DoctorApplication.svc/REST/PostProgressNote';
+    'Services/DoctorApplication.svc/REST/PostProgressNote';
+
+const POST_ASSESSMENT =
+    'Services/DoctorApplication.svc/REST/PostAssessment';
 
 const GET_CATEGORISE_PROCEDURE =
     'Services/DoctorApplication.svc/REST/GetCategories';

lib/core/service/SOAP_service.dart

@@ -2,6 +2,7 @@ import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/models/SOAP/get_Allergies_request_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/post_allergy_request_model.dart';
+import 'package:doctor_app_flutter/models/SOAP/post_assessment_request_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/post_chief_complaint_request_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/post_histories_request_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/post_physical_exam_request_model.dart';
@@ -86,4 +87,16 @@ class SOAPService extends LookupService {
       super.error = error;
     }, body: postProgressNoteRequestModel.toJson());
   }
+
+  Future postAssessment(
+      PostAssessmentRequestModel postAssessmentRequestModel) async {
+    hasError = false;
+    await baseAppClient.post(POST_ASSESSMENT,
+        onSuccess: (dynamic response, int statusCode) {
+      print("Success");
+    }, onFailure: (String error, int statusCode) {
+      hasError = true;
+      super.error = error;
+    }, body: postAssessmentRequestModel.toJson());
+  }
 }

lib/core/viewModel/SOAP_view_model.dart

@@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/models/SOAP/Allergy_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/get_Allergies_request_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/post_allergy_request_model.dart';
+import 'package:doctor_app_flutter/models/SOAP/post_assessment_request_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/post_chief_complaint_request_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/post_histories_request_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/post_physical_exam_request_model.dart';
@@ -108,5 +109,15 @@ class SOAPViewModel extends BaseViewModel {
       setState(ViewState.Idle);
   }
 
+  Future postAssessment(PostAssessmentRequestModel postAssessmentRequestModel)  async {
+    setState(ViewState.BusyLocal);
+    await _SOAPService.postAssessment(postAssessmentRequestModel);
+    if (_SOAPService.hasError) {
+      error = _SOAPService.error;
+      setState(ViewState.ErrorLocal);
+    } else
+      setState(ViewState.Idle);
+  }
+
 
 }

lib/models/SOAP/post_assessment_request_model.dart

@@ -0,0 +1,69 @@
+class PostAssessmentRequestModel {
+  int patientMRN;
+  int appointmentNo;
+  int episodeId;
+  List<IcdCodeDetails> icdCodeDetails;
+
+  PostAssessmentRequestModel(
+      {this.patientMRN,
+        this.appointmentNo,
+        this.episodeId,
+        this.icdCodeDetails});
+
+  PostAssessmentRequestModel.fromJson(Map<String, dynamic> json) {
+    patientMRN = json['PatientMRN'];
+    appointmentNo = json['AppointmentNo'];
+    episodeId = json['EpisodeId'];
+    if (json['icdCodeDetails'] != null) {
+      icdCodeDetails = new List<IcdCodeDetails>();
+      json['icdCodeDetails'].forEach((v) {
+        icdCodeDetails.add(new IcdCodeDetails.fromJson(v));
+      });
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['PatientMRN'] = this.patientMRN;
+    data['AppointmentNo'] = this.appointmentNo;
+    data['EpisodeId'] = this.episodeId;
+    if (this.icdCodeDetails != null) {
+      data['icdCodeDetails'] =
+          this.icdCodeDetails.map((v) => v.toJson()).toList();
+    }
+    return data;
+  }
+}
+
+class IcdCodeDetails {
+  String icdcode10Id;
+  int conditionId;
+  int diagnosisTypeId;
+  bool complexDiagnosis;
+  String remarks;
+
+  IcdCodeDetails(
+      {this.icdcode10Id,
+        this.conditionId,
+        this.diagnosisTypeId,
+        this.complexDiagnosis,
+        this.remarks});
+
+  IcdCodeDetails.fromJson(Map<String, dynamic> json) {
+    icdcode10Id = json['icdcode10Id'];
+    conditionId = json['conditionId'];
+    diagnosisTypeId = json['diagnosisTypeId'];
+    complexDiagnosis = json['complexDiagnosis'];
+    remarks = json['remarks'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['icdcode10Id'] = this.icdcode10Id;
+    data['conditionId'] = this.conditionId;
+    data['diagnosisTypeId'] = this.diagnosisTypeId;
+    data['complexDiagnosis'] = this.complexDiagnosis;
+    data['remarks'] = this.remarks;
+    return data;
+  }
+}

lib/widgets/patients/profile/SOAP/assessment_page.dart

@@ -1,8 +1,11 @@
+import 'package:doctor_app_flutter/client/base_app_client.dart';
 import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart';
+import 'package:doctor_app_flutter/core/enum/viewstate.dart';
 import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/my_selected_assement.dart';
+import 'package:doctor_app_flutter/models/SOAP/post_assessment_request_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/shared/Text.dart';
@@ -288,11 +291,10 @@ class _AssessmentPageState extends State<AssessmentPage> {
                         height: 30,
                       ),
                       AppButton(
-                            title: TranslationBase
+                        title: TranslationBase.of(context).next,
-                                .of(context)
+                        loading: model.state == ViewState.BusyLocal,
-                                .next,
+                        onPressed: () async {
-                            onPressed: () {
+                          await submitAssessment(model);
-                              widget.changePageViewIndex(3);
                         },
                       ),
                       SizedBox(
@@ -305,6 +307,31 @@ class _AssessmentPageState extends State<AssessmentPage> {
             )));
   }
 
+  submitAssessment(SOAPViewModel model) async {
+    PostAssessmentRequestModel postAssessmentRequestModel =
+        new PostAssessmentRequestModel(
+      patientMRN: 3120690,
+      episodeId: 200012117,
+      appointmentNo: 2016054573,
+      icdCodeDetails:  [new IcdCodeDetails(
+        remarks: widget.mySelectedAssessment.remark,
+        complexDiagnosis: true,
+        conditionId: widget.mySelectedAssessment.selectedDiagnosisCondition.id,
+        diagnosisTypeId: widget.mySelectedAssessment.selectedDiagnosisType.id ,
+        icdcode10Id: "1"
+      )]
+    );
+
+    await model.postAssessment(postAssessmentRequestModel);
+
+    if (model.state == ViewState.ErrorLocal) {
+      helpers.showErrorToast(model.error);
+    } else {
+      widget.changePageViewIndex(3);
+    }
+
+  }
+
   openAssessmentDialog(BuildContext context) {
     showModalBottomSheet(
         backgroundColor: Colors.white,
@@ -441,13 +468,16 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                                         list: model.listOfDiagnosisType,
                                         selectedValue: widget
                                             .mySelectedAssessment
-                                            .selectedICD,
+                                            .selectedDiagnosisType,
-                                        okText: TranslationBase.of(context).ok,
+                                        okText: TranslationBase
+                                            .of(context)
+                                            .ok,
                                         okFunction:
                                             (MasterKeyModel selectedValue) {
                                           setState(() {
                                             widget.mySelectedAssessment
-                                                .selectedICD = selectedValue;
+                                                .selectedDiagnosisType =
+                                                selectedValue;
                                           });
                                         },
                                       );
@@ -463,10 +493,11 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                               child: TextField(
                                 decoration: textFieldSelectorDecoration(
                                     "Name / ICD",
-                                    widget.mySelectedAssessment.selectedICD !=
+                                    widget.mySelectedAssessment
+                                        .selectedDiagnosisType !=
                                         null
                                         ? widget.mySelectedAssessment
-                                            .selectedICD.nameEn
+                                        .selectedDiagnosisType.nameEn
                                         : null,
                                     true),
                                 enabled: false,