fix merge issues

merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
parent 68466c8d03
commit b0f0b87345

@ -43,7 +43,8 @@ const SEND_RAD_REPORT_EMAIL =
const SEND_FEEDBACK = 'Services/COCWS.svc/REST/InsertCOCItemInSPList'; const SEND_FEEDBACK = 'Services/COCWS.svc/REST/InsertCOCItemInSPList';
const GET_STATUS_FOR_COCO = 'Services/COCWS.svc/REST/GetStatusforCOC'; const GET_STATUS_FOR_COCO = 'Services/COCWS.svc/REST/GetStatusforCOC';
const GET_PATIENT_AppointmentHistory = const GET_PATIENT_AppointmentHistory =
'Services/Doctors.svc/REST/PateintHasAppoimentHistory'; 'Services'
'/Doctors.svc/REST/PateintHasAppoimentHistory';
///VITAL SIGN ///VITAL SIGN
const GET_PATIENT_VITAL_SIGN = const GET_PATIENT_VITAL_SIGN =

@ -449,18 +449,6 @@ const Map<String, Map<String, String>> localizedValues = {
"OrderDetails": {"en": "Order Details", "ar": "تفاصيل الطلب"}, "OrderDetails": {"en": "Order Details", "ar": "تفاصيل الطلب"},
"VitalSign": {"en": "Vital Sign", "ar": "العلامة حيوية"}, "VitalSign": {"en": "Vital Sign", "ar": "العلامة حيوية"},
"MonthlyReports": {"en": "Monthly Reports", "ar": "تقارير شهرية"}, "MonthlyReports": {"en": "Monthly Reports", "ar": "تقارير شهرية"},
"textToSpeech": {"en": "How May I Help You?", "ar": "كيف يمكنني مساعدتك؟"},
"locationDialogMessage": {"en": "Allow the HMG app to access your location will assist you in showing the hospitals according to the nearest to you.", "ar": "السماح لتطبيق مجموعة الحبيب الطبية بالوصول إلى موقعك سيساعدك في إظهار المستشفيات وفقًا للأقرب إليك."}, "locationDialogMessage": {"en": "Allow the HMG app to access your location will assist you in showing the hospitals according to the nearest to you.", "ar": "السماح لتطبيق مجموعة الحبيب الطبية بالوصول إلى موقعك سيساعدك في إظهار المستشفيات وفقًا للأقرب إليك."},
"parking":{"en":"Parking","ar":"مواقف"},
"alhabiServices":{"en":"HMG Service","ar":"خدمات الحبيب"},
"parkingTitle":{"en":"Car service, car service, service to save parking information, return to it later, 1- By clicking on (Read the code), save the parking data. 2- By clicking on the button (view my car park), it shows you the cars location in Google Maps. 3- Read another position by pressing the Clear Position Data button.","ar":" خدمة المواقف، تتيح هذه الخدمة للمستخدم معلومات عن موقف السيارة ليسهل عليه العودة لها لاحقاً ، 1- بالضغط على زر(قراءة الكود) تستطيع حفظ البيانات الخاصة بالموقف. 2-بالضغط على زر(عرض موقف سيارتي) يعرض لك موقع السيارة في خرائط قوقل. 3- لإعادة قراءة موقف آخرعن طريق الضغط على زر(مسح بيانات الموقف). "},
"readBarcode":{"en":"Read Barcode","ar":"قراءة الكود"},
"showMyPark":{"en":"Show My Park","ar":"عرض بارك"},
"clearMyData":{"en":"clear My Data","ar":"امسح البيانات"},
"floor":{"en":"Floor:","ar":"الطابق"},
"gate":{"en":"Gate:","ar":"بوابة"},
"building":{"en":"Building:","ar":"المبنى"},
"branch":{"en":"Branch:","ar":"الفرع"},
"emergencyServices":{"en":"Emergency Services:","ar":"خدمات الطوارئ"},
"km":{"en":"KMs:","ar":"كم"}, "km":{"en":"KMs:","ar":"كم"},
}; };

@ -44,27 +44,27 @@ class BaseAppClient {
? body['PatientOutSA'] != null ? body['PatientOutSA'] : PATIENT_OUT_SA ? body['PatientOutSA'] != null ? body['PatientOutSA'] : PATIENT_OUT_SA
: PATIENT_OUT_SA; : PATIENT_OUT_SA;
if (body.containsKey('isDentalAllowedBackend')) { // if (body.containsKey('isDentalAllowedBackend')) {
body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend') body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend')
? body['isDentalAllowedBackend'] != null ? body['isDentalAllowedBackend'] : IS_DENTAL_ALLOWED_BACKEND ? body['isDentalAllowedBackend'] != null ? body['isDentalAllowedBackend'] : IS_DENTAL_ALLOWED_BACKEND
: IS_DENTAL_ALLOWED_BACKEND; : IS_DENTAL_ALLOWED_BACKEND;
} // }
body['DeviceTypeID'] = DeviceTypeID; body['DeviceTypeID'] = DeviceTypeID;
if (body.containsKey('PatientType')) { // if (body.containsKey('PatientType')) {
body['PatientType'] = body.containsKey('PatientType') body['PatientType'] = body.containsKey('PatientType')
? body['PatientType'] != null ? body['PatientType'] : PATIENT_TYPE ? body['PatientType'] != null ? body['PatientType'] : PATIENT_TYPE
: PATIENT_TYPE; : PATIENT_TYPE;
} // }
if (body.containsKey('PatientTypeID')) { // if (body.containsKey('PatientTypeID')) {
body['PatientTypeID'] = body.containsKey('PatientTypeID') body['PatientTypeID'] = body.containsKey('PatientTypeID')
? body['PatientTypeID'] != null ? body['PatientTypeID'] != null
? body['PatientTypeID'] ? body['PatientTypeID']
: PATIENT_TYPE_ID : PATIENT_TYPE_ID
: PATIENT_TYPE_ID; : PATIENT_TYPE_ID;
} // }
if (user != null) { if (user != null) {
body['TokenID'] = token; body['TokenID'] = token;

@ -1,7 +1,6 @@
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/model/doctor/doctor_profile.dart'; import 'package:diplomaticquarterapp/core/model/doctor/doctor_profile.dart';
import 'package:diplomaticquarterapp/core/model/doctor/doctor_rating.dart'; import 'package:diplomaticquarterapp/core/model/doctor/doctor_rating.dart';
import 'package:diplomaticquarterapp/core/model/doctor/patient_doctor_appointment.dart';
import 'package:diplomaticquarterapp/core/model/doctor/reques_patient_doctor_appointmentt.dart'; import 'package:diplomaticquarterapp/core/model/doctor/reques_patient_doctor_appointmentt.dart';
import 'package:diplomaticquarterapp/core/model/doctor/request_doctor_profile.dart'; import 'package:diplomaticquarterapp/core/model/doctor/request_doctor_profile.dart';
import 'package:diplomaticquarterapp/core/model/doctor/request_doctor_rating.dart'; import 'package:diplomaticquarterapp/core/model/doctor/request_doctor_rating.dart';
@ -9,7 +8,7 @@ import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
class MyDoctorService extends BaseService { class MyDoctorService extends BaseService {
List<PatientDoctorAppointment> patientDoctorAppointmentList = List(); List<DoctorList> patientDoctorAppointmentList = List();
DoctorProfile doctorProfile; DoctorProfile doctorProfile;
DoctorList doctorList; DoctorList doctorList;
DoctorRating doctorRating = DoctorRating(); DoctorRating doctorRating = DoctorRating();
@ -51,7 +50,7 @@ class MyDoctorService extends BaseService {
patientDoctorAppointmentList.clear(); patientDoctorAppointmentList.clear();
response['PatientDoctorAppointmentResultList'].forEach((hospital) { response['PatientDoctorAppointmentResultList'].forEach((hospital) {
patientDoctorAppointmentList patientDoctorAppointmentList
.add(PatientDoctorAppointment.fromJson(hospital)); .add(DoctorList.fromJson(hospital));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;

@ -2,7 +2,6 @@ import 'package:diplomaticquarterapp/core/enum/filter_type.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/doctor/doctor_profile.dart'; import 'package:diplomaticquarterapp/core/model/doctor/doctor_profile.dart';
import 'package:diplomaticquarterapp/core/model/doctor/doctor_rating.dart'; import 'package:diplomaticquarterapp/core/model/doctor/doctor_rating.dart';
import 'package:diplomaticquarterapp/core/model/doctor/patient_doctor_appointment.dart';
import 'package:diplomaticquarterapp/core/service/medical/my_doctor_service.dart'; import 'package:diplomaticquarterapp/core/service/medical/my_doctor_service.dart';
import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
@ -65,9 +64,7 @@ class MyDoctorViewModel extends BaseViewModel {
.toList(); .toList();
if (doctorByHospital.length != 0) { if (doctorByHospital.length != 0) {
_patientDoctorAppointmentListHospital[ _patientDoctorAppointmentListHospital[_patientDoctorAppointmentListHospital.indexOf(doctorByHospital[0])]
_patientDoctorAppointmentListHospital
.indexOf(doctorByHospital[0])]
.patientDoctorAppointmentList .patientDoctorAppointmentList
.add(element); .add(element);
} else { } else {

@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart';
class ProjectViewModel extends BaseViewModel { class ProjectViewModel extends BaseViewModel {
AppSharedPreferences sharedPref = AppSharedPreferences(); AppSharedPreferences sharedPref = AppSharedPreferences();
Locale _appLocale; Locale _appLocale;
String currentLanguage = 'ar'; String currentLanguage = 'en';
bool _isArabic = false; bool _isArabic = false;
bool isInternetConnection = true; bool isInternetConnection = true;
bool isLoading = false; bool isLoading = false;
@ -45,7 +45,7 @@ class ProjectViewModel extends BaseViewModel {
void loadSharedPrefLanguage() async { void loadSharedPrefLanguage() async {
currentLanguage = await sharedPref.getString(APP_LANGUAGE); currentLanguage = await sharedPref.getString(APP_LANGUAGE);
_appLocale = Locale(currentLanguage ?? 'ar'); _appLocale = Locale(currentLanguage ?? 'en');
_isArabic = currentLanguage != null _isArabic = currentLanguage != null
? currentLanguage == 'ar' ? true : false ? currentLanguage == 'ar' ? true : false
: true; : true;

@ -85,7 +85,7 @@ class DoctorList {
clinicName = json['ClinicName']; clinicName = json['ClinicName'];
doctorTitle = json['DoctorTitle']; doctorTitle = json['DoctorTitle'];
iD = json['ID']; iD = json['ID'];
name = json['Name']; name = json['DoctorName']??json['Name'];
projectID = json['ProjectID']; projectID = json['ProjectID'];
projectName = json['ProjectName']; projectName = json['ProjectName'];
actualDoctorRate = json['ActualDoctorRate']; actualDoctorRate = json['ActualDoctorRate'];
@ -118,7 +118,7 @@ class DoctorList {
rateNumber = json['RateNumber']; rateNumber = json['RateNumber'];
serviceID = json['ServiceID']; serviceID = json['ServiceID'];
setupID = json['SetupID']; setupID = json['SetupID'];
if (json.containsKey('Speciality')) if (json.containsKey('Speciality') && json['Speciality']!=null)
speciality = json['Speciality'].cast<String>(); speciality = json['Speciality'].cast<String>();
workingHours = json['WorkingHours']; workingHours = json['WorkingHours'];
} }

@ -241,59 +241,62 @@ class _MyAppointmentsState extends State<MyAppointments>
fontSize: 16.0, fontSize: 16.0,
)), )),
), ),
], Container(
margin: EdgeInsets.only(top: 10.0), margin: EdgeInsets.only(top: 10.0),
child: Container( child: Container(
child: widget.bookedAppoList.length != 0 child: widget.bookedAppoList.length != 0
? SingleChildScrollView( ? SingleChildScrollView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
...List.generate( ...List.generate(
widget._patientBookedAppointmentListHospital.length, widget._patientBookedAppointmentListHospital.length,
(index) => AppExpandableNotifier( (index) => AppExpandableNotifier(
title: widget title: widget
._patientBookedAppointmentListHospital[index] ._patientBookedAppointmentListHospital[index]
.filterName, .filterName,
bodyWidget: Column( bodyWidget: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: widget children: widget
._patientBookedAppointmentListHospital[index] ._patientBookedAppointmentListHospital[index]
.patientDoctorAppointmentList .patientDoctorAppointmentList
.map((doctor) { .map((doctor) {
return AppointmentCard( return AppointmentCard(
appo: doctor, appo: doctor,
onReloadAppointmentHistory: onReloadAppointmentHistory:
getPatientAppointmentHistory, getPatientAppointmentHistory,
); );
}).toList(), }).toList(),
)), )),
)
],
),
)
: Container(
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Image.asset(
"assets/images/new-design/noAppointmentIcon.png"),
Container(
margin: EdgeInsets.only(top: 10.0),
child: Text("No Booked Appointments",
style: TextStyle(
fontSize: 16.0,
)),
),
],
),
),
),
),
) )
], ],
),
) ))));
: Container(
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Image.asset(
"assets/images/new-design/noAppointmentIcon.png"),
Container(
margin: EdgeInsets.only(top: 10.0),
child: Text("No Booked Appointments",
style: TextStyle(
fontSize: 16.0,
)),
),
],
),
),
),
),
);
} }
Widget getConfirmedAppointments() { Widget getConfirmedAppointments() {

@ -130,119 +130,119 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
//_firebase Background message handler //_firebase Background message handler
_firebaseMessaging.configure( _firebaseMessaging.configure(
onMessage: (Map<String, dynamic> message) async { // onMessage: (Map<String, dynamic> message) async {
showDialog("onMessage: $message"); // showDialog("onMessage: $message");
print("onMessage: $message"); // print("onMessage: $message");
print(message); // print(message);
print(message['name']); // print(message['name']);
print(message['appointmentdate']); // print(message['appointmentdate']);
//
if (Platform.isIOS) { // if (Platform.isIOS) {
if (message['is_call'] == "true") { // if (message['is_call'] == "true") {
var route = ModalRoute.of(context); // var route = ModalRoute.of(context);
//
if (route != null) { // if (route != null) {
print(route.settings.name); // print(route.settings.name);
} // }
//
Map<String, dynamic> myMap = new Map<String, dynamic>.from(message); // Map<String, dynamic> myMap = new Map<String, dynamic>.from(message);
print(myMap); // print(myMap);
LandingPage.isOpenCallPage = true; // LandingPage.isOpenCallPage = true;
LandingPage.incomingCallData = IncomingCallData.fromJson(myMap); // LandingPage.incomingCallData = IncomingCallData.fromJson(myMap);
if (!isPageNavigated) { // if (!isPageNavigated) {
isPageNavigated = true; // isPageNavigated = true;
Navigator.push( // Navigator.push(
context, // context,
MaterialPageRoute( // MaterialPageRoute(
builder: (context) => IncomingCall( // builder: (context) => IncomingCall(
incomingCallData: LandingPage.incomingCallData))) // incomingCallData: LandingPage.incomingCallData)))
.then((value) { // .then((value) {
isPageNavigated = false; // isPageNavigated = false;
}); // });
} // }
} else { // } else {
print("Is Call Not Found iOS"); // print("Is Call Not Found iOS");
} // }
} else { // } else {
print("Is Call Not Found iOS"); // print("Is Call Not Found iOS");
} // }
//
if (Platform.isAndroid) { // if (Platform.isAndroid) {
if (message['data'].containsKey("is_call")) { // if (message['data'].containsKey("is_call")) {
var route = ModalRoute.of(context); // var route = ModalRoute.of(context);
//
if (route != null) { // if (route != null) {
print(route.settings.name); // print(route.settings.name);
} // }
//
Map<String, dynamic> myMap = // Map<String, dynamic> myMap =
new Map<String, dynamic>.from(message['data']); // new Map<String, dynamic>.from(message['data']);
print(myMap); // print(myMap);
LandingPage.isOpenCallPage = true; // LandingPage.isOpenCallPage = true;
LandingPage.incomingCallData = IncomingCallData.fromJson(myMap); // LandingPage.incomingCallData = IncomingCallData.fromJson(myMap);
if (!isPageNavigated) { // if (!isPageNavigated) {
isPageNavigated = true; // isPageNavigated = true;
Navigator.push( // Navigator.push(
context, // context,
MaterialPageRoute( // MaterialPageRoute(
builder: (context) => IncomingCall( // builder: (context) => IncomingCall(
incomingCallData: LandingPage.incomingCallData))) // incomingCallData: LandingPage.incomingCallData)))
.then((value) { // .then((value) {
isPageNavigated = false; // isPageNavigated = false;
}); // });
} // }
} else { // } else {
print("Is Call Not Found Android"); // print("Is Call Not Found Android");
} // }
} else { // } else {
print("Is Call Not Found Android"); // print("Is Call Not Found Android");
} // }
}, // },
onBackgroundMessage: Platform.isIOS ? null : myBackgroundMessageHandler, // onBackgroundMessage: Platform.isIOS ? null : myBackgroundMessageHandler,
onLaunch: (Map<String, dynamic> message) async { // onLaunch: (Map<String, dynamic> message) async {
print("onLaunch: $message"); // print("onLaunch: $message");
showDialog("onLaunch: $message"); // showDialog("onLaunch: $message");
}, // },
onResume: (Map<String, dynamic> message) async { // onResume: (Map<String, dynamic> message) async {
print("onResume: $message"); // print("onResume: $message");
print(message); // print(message);
print(message['name']); // print(message['name']);
print(message['appointmentdate']); // print(message['appointmentdate']);
//
showDialog("onResume: $message"); // showDialog("onResume: $message");
//
if (Platform.isIOS) { // if (Platform.isIOS) {
if (message['is_call'] == "true") { // if (message['is_call'] == "true") {
var route = ModalRoute.of(context); // var route = ModalRoute.of(context);
//
if (route != null) { // if (route != null) {
print(route.settings.name); // print(route.settings.name);
} // }
//
Map<String, dynamic> myMap = // Map<String, dynamic> myMap =
new Map<String, dynamic>.from(message); // new Map<String, dynamic>.from(message);
print(myMap); // print(myMap);
LandingPage.isOpenCallPage = true; // LandingPage.isOpenCallPage = true;
LandingPage.incomingCallData = IncomingCallData.fromJson(myMap); // LandingPage.incomingCallData = IncomingCallData.fromJson(myMap);
if (!isPageNavigated) { // if (!isPageNavigated) {
isPageNavigated = true; // isPageNavigated = true;
Navigator.push( // Navigator.push(
context, // context,
MaterialPageRoute( // MaterialPageRoute(
builder: (context) => IncomingCall( // builder: (context) => IncomingCall(
incomingCallData: LandingPage.incomingCallData))) // incomingCallData: LandingPage.incomingCallData)))
.then((value) { // .then((value) {
isPageNavigated = false; // isPageNavigated = false;
}); // });
} // }
} else { // } else {
print("Is Call Not Found iOS"); // print("Is Call Not Found iOS");
} // }
} else { // } else {
print("Is Call Not Found iOS"); // print("Is Call Not Found iOS");
} // }
}, // },
); );
} }
showDialog(String message) { showDialog(String message) {

@ -89,7 +89,7 @@ class DoctorHomePage extends StatelessWidget {
doctorRate: doctor.doctorRate, doctorRate: doctor.doctorRate,
gender: doctor.gender, gender: doctor.gender,
doctorTitle: doctor.doctorTitle, doctorTitle: doctor.doctorTitle,
name: doctor.doctorName, name: doctor.name,
doctorImageURL: doctor.doctorImageURL, doctorImageURL: doctor.doctorImageURL,
nationalityFlagURL: doctor.nationalityFlagURL); nationalityFlagURL: doctor.nationalityFlagURL);
return DoctorView( return DoctorView(

Loading…
Cancel
Save