improve E-referral

merge-update-with-lab-changes
Elham Rababah 5 years ago
parent c994c39c6b
commit 37d9eae9ea

@ -81,7 +81,7 @@ const IS_LAST_APPOITMENT_RATED =
const GET_APPOINTMENT_DETAILS_BY_NO = const GET_APPOINTMENT_DETAILS_BY_NO =
'Services/MobileNotifications.svc/REST/GetAppointmentDetailsByApptNo'; '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/'; // Production Environment
//const BASE_URL = 'https://hmgwebservices.com/Services'; // 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 SEND_ACTIVATION_CODE_FOR_E_REFERRAL = 'Services/Authentication.svc/REST/SendActivationCodeForEReferral';
const CHECK_ACTIVATION_CODE_FOR_E_REFERRAL = 'Services/Authentication.svc/REST/CheckActivationCodeForEReferral'; const CHECK_ACTIVATION_CODE_FOR_E_REFERRAL = 'Services/Authentication.svc/REST/CheckActivationCodeForEReferral';
const GET_ALL_CITIES = 'services/Lists.svc/rest/GetAllCities'; 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 GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals";
const TIMER_MIN = 10; const TIMER_MIN = 10;

@ -90,10 +90,10 @@ class EReferralService extends BaseService {
CreateEReferralRequestModel createEReferralRequestModel CreateEReferralRequestModel createEReferralRequestModel
) async { ) async {
hasError = false; hasError = false;
await baseAppClient.post(CREATE_E_REFERRAL, await baseAppClient.post(CREATE_E_REFERRAL/*'Services/Patients.svc/REST/CreateEReferral'*/,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
// TODO Waiting for fix service // TODO Waiting for fix service
("EEEEEE"); var asd= ("EEEEEE");
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;

@ -78,8 +78,9 @@ class BaseAppClient {
print("URL : $url"); print("URL : $url");
print("Body : ${json.encode(body)}"); print("Body : ${json.encode(body)}");
var asd="";
if (await Utils.checkConnection()) { if (await Utils.checkConnection()) {
final response = await http.post(url, final response = await http.post(url.trim(),
body: json.encode(body), body: json.encode(body),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',

@ -12,7 +12,7 @@ class CreateEReferralRequestModel {
int preferredBranchCode; int preferredBranchCode;
String preferredBranchName; String preferredBranchName;
List<EReferralAttachment> medicalReportAttachment; List<EReferralAttachment> medicalReportAttachment;
EReferralAttachment insuranceCardAttachment; dynamic insuranceCardAttachment;
double versionID; double versionID;
int channel; int channel;
int languageID; int languageID;
@ -111,9 +111,11 @@ class CreateEReferralRequestModel {
data['MedicalReportAttachment'] = data['MedicalReportAttachment'] =
this.medicalReportAttachment.map((v) => v.toJson()).toList(); this.medicalReportAttachment.map((v) => v.toJson()).toList();
} }
if (this.insuranceCardAttachment != null) { if (this.insuranceCardAttachment == null) {
data['InsuranceCardAttachment'] = {};
} else
data['InsuranceCardAttachment'] = this.insuranceCardAttachment.toJson(); data['InsuranceCardAttachment'] = this.insuranceCardAttachment.toJson();
}
data['VersionID'] = this.versionID; data['VersionID'] = this.versionID;
data['Channel'] = this.channel; data['Channel'] = this.channel;
data['LanguageID'] = this.languageID; data['LanguageID'] = this.languageID;

@ -69,7 +69,7 @@ class _NewEReferralStepOnePageState extends State<NewEReferralStepOnePage> {
Navigator.of(context).pop(); Navigator.of(context).pop();
widget.changePageViewIndex(1); widget.changePageViewIndex(1);
widget.createEReferralRequestModel.requesterName=_nameTextController.text; 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; widget.createEReferralRequestModel.requesterRelationship=_selectedRelation.iD;

@ -387,7 +387,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
this.widget.createEReferralRequestModel.fullName= ""; // this.widget.createEReferralRequestModel.fullName= "";
this.widget.createEReferralRequestModel.otherRelationship= ""; this.widget.createEReferralRequestModel.otherRelationship= "";
// this.widget.createEReferralRequestModel.; // this.widget.createEReferralRequestModel.;
// this.widget.createEReferralRequestModel. preferredBranchName= "Arryan Hospital"; // this.widget.createEReferralRequestModel. preferredBranchName= "Arryan Hospital";

@ -183,7 +183,8 @@ class _NewEReferralStepTowPageState extends State<NewEReferralStepTowPage> {
onTap: () async { onTap: () async {
this.widget.changePageViewIndex(2); this.widget.changePageViewIndex(2);
this.widget.createEReferralRequestModel.identificationNo = int.parse( _patientIdentificationTextController.text); 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.cityCode = _selectedCity.iD.toString();
this.widget.createEReferralRequestModel.cityName = _selectedCity.description; this.widget.createEReferralRequestModel.cityName = _selectedCity.description;

@ -3,7 +3,6 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter/webview_flutter.dart';
import 'package:tweet_webview/tweet_webview.dart';
class MyWebView extends StatelessWidget { class MyWebView extends StatelessWidget {
final String title; final String title;

Loading…
Cancel
Save