diff --git a/lib/config/config.dart b/lib/config/config.dart index 42f69cfb..15f5974b 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -81,7 +81,7 @@ const IS_LAST_APPOITMENT_RATED = const GET_APPOINTMENT_DETAILS_BY_NO = 'Services/MobileNotifications.svc/REST/GetAppointmentDetailsByApptNo'; -const GET_QR_PARKING = '/Services/SWP.svc/REST/GetQRParkingByID'; +const GET_QR_PARKING = 'Services/SWP.svc/REST/GetQRParkingByID'; //const BASE_URL = 'https://hmgwebservices.com/'; // Production Environment //const BASE_URL = 'https://hmgwebservices.com/Services'; // Production Environment @@ -227,7 +227,7 @@ const GET_ALL_RELATIONSHIP_TYPES = "Services/Patients.svc/REST/GetAllRelationshi const SEND_ACTIVATION_CODE_FOR_E_REFERRAL = 'Services/Authentication.svc/REST/SendActivationCodeForEReferral'; const CHECK_ACTIVATION_CODE_FOR_E_REFERRAL = 'Services/Authentication.svc/REST/CheckActivationCodeForEReferral'; const GET_ALL_CITIES = 'services/Lists.svc/rest/GetAllCities'; -const CREATE_E_REFERRAL = 'Services/Patients.svc/REST/CreateEReferral​'; +const CREATE_E_REFERRAL = "Services/Patients.svc/REST/CreateEReferral"; const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals"; const TIMER_MIN = 10; diff --git a/lib/core/service/all_habib_medical_services/e_referral_service.dart b/lib/core/service/all_habib_medical_services/e_referral_service.dart index b7cfd7e6..9bf7a435 100644 --- a/lib/core/service/all_habib_medical_services/e_referral_service.dart +++ b/lib/core/service/all_habib_medical_services/e_referral_service.dart @@ -90,10 +90,10 @@ class EReferralService extends BaseService { CreateEReferralRequestModel createEReferralRequestModel ) async { hasError = false; - await baseAppClient.post(CREATE_E_REFERRAL, + await baseAppClient.post(CREATE_E_REFERRAL/*'Services/Patients.svc/REST/CreateEReferral'*/, onSuccess: (dynamic response, int statusCode) { // TODO Waiting for fix service - ("EEEEEE"); + var asd= ("EEEEEE"); }, onFailure: (String error, int statusCode) { hasError = true; diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 4d04378a..f5494049 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -78,8 +78,9 @@ class BaseAppClient { print("URL : $url"); print("Body : ${json.encode(body)}"); + var asd=""; if (await Utils.checkConnection()) { - final response = await http.post(url, + final response = await http.post(url.trim(), body: json.encode(body), headers: { 'Content-Type': 'application/json', diff --git a/lib/models/AlHabibMedicalServices/EReferral/create_e_referral_request_model.dart b/lib/models/AlHabibMedicalServices/EReferral/create_e_referral_request_model.dart index 34139ba2..e13de327 100644 --- a/lib/models/AlHabibMedicalServices/EReferral/create_e_referral_request_model.dart +++ b/lib/models/AlHabibMedicalServices/EReferral/create_e_referral_request_model.dart @@ -12,7 +12,7 @@ class CreateEReferralRequestModel { int preferredBranchCode; String preferredBranchName; List medicalReportAttachment; - EReferralAttachment insuranceCardAttachment; + dynamic insuranceCardAttachment; double versionID; int channel; int languageID; @@ -111,9 +111,11 @@ class CreateEReferralRequestModel { data['MedicalReportAttachment'] = this.medicalReportAttachment.map((v) => v.toJson()).toList(); } - if (this.insuranceCardAttachment != null) { + if (this.insuranceCardAttachment == null) { + data['InsuranceCardAttachment'] = {}; + } else data['InsuranceCardAttachment'] = this.insuranceCardAttachment.toJson(); - } + data['VersionID'] = this.versionID; data['Channel'] = this.channel; data['LanguageID'] = this.languageID; diff --git a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart index bc06dcf7..6245ee3c 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart @@ -69,7 +69,7 @@ class _NewEReferralStepOnePageState extends State { Navigator.of(context).pop(); widget.changePageViewIndex(1); widget.createEReferralRequestModel.requesterName=_nameTextController.text; - widget.createEReferralRequestModel.requesterContactNo = _selectedCountry['code']+_mobileTextController.text; + widget.createEReferralRequestModel.requesterContactNo = _selectedCountry['code'].toString().substring(1)+_mobileTextController.text; widget.createEReferralRequestModel.requesterRelationship=_selectedRelation.iD; diff --git a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart index ed46cbc1..f8b484f8 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart @@ -387,7 +387,7 @@ class _NewEReferralStepThreePageState extends State { - this.widget.createEReferralRequestModel.fullName= ""; + // this.widget.createEReferralRequestModel.fullName= ""; this.widget.createEReferralRequestModel.otherRelationship= ""; // this.widget.createEReferralRequestModel.; // this.widget.createEReferralRequestModel. preferredBranchName= "Arryan Hospital"; diff --git a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart index 407abc9b..82abdbb9 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart @@ -183,7 +183,8 @@ class _NewEReferralStepTowPageState extends State { onTap: () async { this.widget.changePageViewIndex(2); this.widget.createEReferralRequestModel.identificationNo = int.parse( _patientIdentificationTextController.text); - this.widget.createEReferralRequestModel.patientMobileNumber = _selectedCountry['code']+_mobileTextController.text; + this.widget.createEReferralRequestModel.fullName = _patientNameTextController.text; + this.widget.createEReferralRequestModel.patientMobileNumber = _selectedCountry['code'].toString().substring(1)+_mobileTextController.text; this.widget.createEReferralRequestModel.cityCode = _selectedCity.iD.toString(); this.widget.createEReferralRequestModel.cityName = _selectedCity.description; diff --git a/lib/pages/AlHabibMedicalService/my_web_view.dart b/lib/pages/AlHabibMedicalService/my_web_view.dart index e614c8d0..59163c15 100644 --- a/lib/pages/AlHabibMedicalService/my_web_view.dart +++ b/lib/pages/AlHabibMedicalService/my_web_view.dart @@ -3,7 +3,6 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'package:webview_flutter/webview_flutter.dart'; -import 'package:tweet_webview/tweet_webview.dart'; class MyWebView extends StatelessWidget { final String title;