Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with 3.3

Browse Source
dev_v3.13.6_voipcall
Sultan khan 10 months ago
parent d0c7b08eac
commit 86f5e81fea
16 changed files with 29 additions and 48 deletions
Show Stats Download Patch File Download Diff File

6
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart
Unescape Escape View File

@ -44,7 +44,7 @@ class _NewCMCStepThreePageState extends State<NewCMCStepThreePage> {
HospitalsModel? selectedHospital; HospitalsModel? selectedHospital;
final GlobalKey projectDropdownKey = GlobalKey(); final GlobalKey projectDropdownKey = GlobalKey();
bool isLocationSelected = false; bool isLocationSelected = false;
ProjectViewModel projectViewModel; ProjectViewModel? projectViewModel;
static CameraPosition _kGooglePlex = CameraPosition( static CameraPosition _kGooglePlex = CameraPosition(
target: LatLng(37.42796133580664, -122.085749655962), target: LatLng(37.42796133580664, -122.085749655962),
@ -299,7 +299,7 @@ class _NewCMCStepThreePageState extends State<NewCMCStepThreePage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
projectViewModel.isArabic projectViewModel!.isArabic
? widget ? widget
.cmcInsertPresOrderRequestModel .cmcInsertPresOrderRequestModel
.patientERCMCInsertServicesList![index] .patientERCMCInsertServicesList![index]
@ -403,7 +403,7 @@ class _NewCMCStepThreePageState extends State<NewCMCStepThreePage> {
} }
getProjectsList() { getProjectsList() {
int languageID = projectViewModel.isArabic ? 1 : 2; int languageID = projectViewModel!.isArabic ? 1 : 2;
ClinicListService service = new ClinicListService(); ClinicListService service = new ClinicListService();
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
List<HospitalsModel> projectsListLocal = []; List<HospitalsModel> projectsListLocal = [];

5
lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart
Unescape Escape View File

@ -114,7 +114,7 @@ class _BariatricsPageState extends State<BariatricsPage> {
margin: EdgeInsets.only(bottom: 16.0, left: 16, right: 16), margin: EdgeInsets.only(bottom: 16.0, left: 16, right: 16),
child: BorderedButton( child: BorderedButton(
TranslationBase.of(context).skip, TranslationBase.of(context).skip,
fontSize: SizeConfig!.textMultiplier! * 2.1, fontSize: SizeConfig.textMultiplier! * 2.1,
textColor: Colors.blue, textColor: Colors.blue,
vPadding: 8, vPadding: 8,
hPadding: 8, hPadding: 8,
@ -139,7 +139,8 @@ class _BariatricsPageState extends State<BariatricsPage> {
} }
callDoctorsSearchAPI() { callDoctorsSearchAPI() {
int languageID = projectProvider.isArabic ? 1 : 2; ProjectViewModel projectProvider = Provider.of(context);
int languageID = projectProvider.isArabic! ? 1 : 2;
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
List<DoctorList> doctorsList = []; List<DoctorList> doctorsList = [];
List<String> arr = []; List<String> arr = [];

2
lib/pages/BookAppointment/DentalComplaints.dart
Unescape Escape View File

@ -214,7 +214,7 @@ class _DentalComplaintsState extends State<DentalComplaints> {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
int appoTime = 0; int appoTime = 0;
service.getDoctorsList(int.parse("17"), widget.searchInfo!.ProjectID, false, languageID, context, isContinueDentalPlan: true).then((res) { service.getDoctorsList(int.parse("17"), widget.searchInfo!.ProjectID!, false, languageID, context, isContinueDentalPlan: true).then((res) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
dentalProceduresModel = DentalProceduresModel.fromJson(res as Map<String, dynamic>); dentalProceduresModel = DentalProceduresModel.fromJson(res as Map<String, dynamic>);

2
lib/pages/BookAppointment/components/SearchByClinic.dart
Unescape Escape View File

@ -611,7 +611,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
List<PatientDoctorAppointmentList> _patientDoctorAppointmentListHospital = []; List<PatientDoctorAppointmentList> _patientDoctorAppointmentListHospital = [];
DoctorsListService service = new DoctorsListService(); DoctorsListService service = new DoctorsListService();
service.getDoctorsList(clinicID, projectDropdownValue != "" ? int.parse(projectDropdownValue) : 0, nearestAppo, languageID, context).then((res) { service.getDoctorsList(clinicID, projectDropdownValue != "" ? int.parse(projectDropdownValue!) : 0, nearestAppo, languageID, context).then((res) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
setState(() { setState(() {

2
lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
Unescape Escape View File

@ -68,7 +68,7 @@ class _DentalComplaintCardState extends State<DentalComplaintCard> {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
ClinicListService service = new ClinicListService(); ClinicListService service = new ClinicListService();
service.getChiefComplaintDoctorList(widget.listDentalChiefComplain!.iD!, widget.listDentalChiefComplain.projectID, languageID, context).then((res) { service.getChiefComplaintDoctorList(widget.listDentalChiefComplain!.iD!, widget.listDentalChiefComplain.projectID!, languageID, context).then((res) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
print(res['List_DentalDoctorChiefComplaintMapping']); print(res['List_DentalDoctorChiefComplaintMapping']);

2
lib/pages/DrawerPages/family/my-family.dart
Unescape Escape View File

@ -564,7 +564,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
} }
familySharedRecordsList =[]; familySharedRecordsList =[];
sentRecordsList = []; sentRecordsList = [];
familySharedRecords.getAllSharedRecordsByStatusList.forEach((element) { familySharedRecords.getAllSharedRecordsByStatusList!.forEach((element) {
if (element.status == 3) { if (element.status == 3) {
familySharedRecordsList.add(element); familySharedRecordsList.add(element);
} }

4
lib/pages/MyAppointments/MyAppointments.dart
Unescape Escape View File

@ -55,7 +55,7 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
int _currentPage = 0; int _currentPage = 0;
ToDoCountProviderModel? toDoProvider; ToDoCountProviderModel? toDoProvider;
ProjectViewModel projectViewModel; ProjectViewModel? projectViewModel;
@override @override
void initState() { void initState() {
@ -137,7 +137,7 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
} }
getPatientAppointmentHistory() { getPatientAppointmentHistory() {
int languageID = projectViewModel.isArabic ? 1 : 2; int languageID = projectViewModel!.isArabic! ? 1 : 2;
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
DoctorsListService service = new DoctorsListService(); DoctorsListService service = new DoctorsListService();
widget.appoList.clear(); widget.appoList.clear();

4
lib/pages/MyAppointments/VisitTicket.dart
Unescape Escape View File

@ -19,7 +19,7 @@ class VisitTicket extends StatefulWidget {
class _VisitTicketState extends State<VisitTicket> { class _VisitTicketState extends State<VisitTicket> {
bool isLoading = false; bool isLoading = false;
ProjectViewModel projectViewModel; ProjectViewModel? projectViewModel;
@override @override
void initState() { void initState() {
@ -52,7 +52,7 @@ class _VisitTicketState extends State<VisitTicket> {
} }
getPatientAppointmentCurfewHistory(BuildContext context) { getPatientAppointmentCurfewHistory(BuildContext context) {
int languageID = projectViewModel.isArabic ? 1 : 2; int languageID = projectViewModel!.isArabic ? 1 : 2;
DoctorsListService service = new DoctorsListService(); DoctorsListService service = new DoctorsListService();
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
service.getPatientAppointmentHistory(true, languageID, context).then((res) { service.getPatientAppointmentHistory(true, languageID, context).then((res) {

4
lib/pages/MyAppointments/widgets/AppointmentActions.dart
Unescape Escape View File

@ -372,7 +372,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
// } // }
openAppointmentLabResults() { openAppointmentLabResults() {
int languageID = widget.projectViewModel.isArabic ? 1 : 2; int languageID = widget.projectViewModel!.isArabic ? 1 : 2;
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
DoctorsListService service = new DoctorsListService(); DoctorsListService service = new DoctorsListService();
PatientLabOrders patientLabOrders = new PatientLabOrders(); PatientLabOrders patientLabOrders = new PatientLabOrders();
@ -408,7 +408,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
} }
openAppointmentRadiology() { openAppointmentRadiology() {
int languageID = widget.projectViewModel.isArabic ? 1 : 2; int languageID = widget.projectViewModel!.isArabic! ? 1 : 2;
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
DoctorsListService service = new DoctorsListService(); DoctorsListService service = new DoctorsListService();
FinalRadiology finalRadiology = new FinalRadiology(); FinalRadiology finalRadiology = new FinalRadiology();

4
lib/pages/feedback/send_feedback_page.dart
Unescape Escape View File

@ -58,7 +58,7 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
List<AppoitmentAllHistoryResultList> appoList = []; List<AppoitmentAllHistoryResultList> appoList = [];
ProjectViewModel projectViewModel; ProjectViewModel? projectViewModel;
String getSelected(BuildContext context) { String getSelected(BuildContext context) {
switch (messageType) { switch (messageType) {
@ -471,7 +471,7 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
listData: list, listData: list,
selectedIndex: selectedStatusIndex, selectedIndex: selectedStatusIndex,
onValueSelected: (index) { onValueSelected: (index) {
int languageID = projectViewModel.isArabic ? 1 : 2; int languageID = projectViewModel!.isArabic ? 1 : 2;
selectedStatusIndex = index; selectedStatusIndex = index;
if (index == 1) { if (index == 1) {

2
lib/pages/landing/landing_page.dart
Unescape Escape View File

@ -636,7 +636,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
notificationCount = value['List_PatientDashboard'][0]['UnreadPatientNotificationCount'] > 99 ? '99+' : value['List_PatientDashboard'][0]['UnreadPatientNotificationCount'].toString(); notificationCount = value['List_PatientDashboard'][0]['UnreadPatientNotificationCount'] > 99 ? '99+' : value['List_PatientDashboard'][0]['UnreadPatientNotificationCount'].toString();
model.setState(model.count, true, notificationCount); model.setState(model.count, true, notificationCount);
sharedPref.setString(NOTIFICATION_COUNT, notificationCount); sharedPref.setString(NOTIFICATION_COUNT, notificationCount);
FlutterAppIconBadge.updateBadge(num.parse(notificationCount)); FlutterAppIconBadge.updateBadge(int.parse(notificationCount));
} }
}); });
// if (await AppSharedPreferences().getBool(IS_LAST_APPOINTMENT_RATE_SHOWN) == null || !await AppSharedPreferences().getBool(IS_LAST_APPOINTMENT_RATE_SHOWN)) { // if (await AppSharedPreferences().getBool(IS_LAST_APPOINTMENT_RATE_SHOWN) == null || !await AppSharedPreferences().getBool(IS_LAST_APPOINTMENT_RATE_SHOWN)) {

2
lib/pages/livecare/widgets/clinic_card.dart
Unescape Escape View File

@ -166,7 +166,7 @@ class _State extends State<ClinicCard> {
int languageID = widget.languageID == 'ar' ? 1 : 2; int languageID = widget.languageID == 'ar' ? 1 : 2;
LiveCareService service = new LiveCareService(); LiveCareService service = new LiveCareService();
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
service.getLivecareClinicTiming(patientERGetClinicsList!.serviceID, languageID, context).then((res) { service.getLivecareClinicTiming(patientERGetClinicsList!.serviceID!, languageID, context).then((res) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
setState(() { setState(() {

22
lib/services/clinic_services/get_clinic_service.dart
Unescape Escape View File

@ -153,20 +153,6 @@ class ClinicListService extends BaseService {
return Future.value(localRes); return Future.value(localRes);
} }
Future<Map> getProjectsList(context) async {
Map<String, dynamic> request = {};
request = {"LanguageID": languageID};
dynamic localRes;
await baseAppClient.post(GET_PROJECTS_LIST, onSuccess: (response, statusCode) async {
localRes = response;
}, onFailure: (String error, int statusCode) {
throw error;
}, body: request);
return Future.value(localRes);
}
Future<Map> getChiefComplaintsList(int clinicID, int projectID, int languageID, BuildContext context, {doctorId}) async { Future<Map> getChiefComplaintsList(int clinicID, int projectID, int languageID, BuildContext context, {doctorId}) async {
//Utils.showProgressDialog(context); //Utils.showProgressDialog(context);
@ -260,13 +246,7 @@ class ClinicListService extends BaseService {
}, body: request); }, body: request);
return Future.value(localRes); return Future.value(localRes);
} }
await baseAppClient.post(GET_NATIONALITY, onSuccess: (response, statusCode) async {
localRes = response;
}, onFailure: (String error, int statusCode) {
throw error;
}, body: request);
return Future.value(localRes);
}
Future<Map> insertInPatientOrder( Future<Map> insertInPatientOrder(
GetAdmissionInfoResponseModel getAdmissionInfoResponseModel, int typeID, String patientName, String patientNameAR, String patientMobileNo, String comments, context) async { GetAdmissionInfoResponseModel getAdmissionInfoResponseModel, int typeID, String patientName, String patientNameAR, String patientMobileNo, String comments, context) async {

2
lib/uitl/location_util.dart
Unescape Escape View File

@ -127,7 +127,7 @@ class LocationUtils {
accuracy: 1.0, accuracy: 1.0,
heading: 0.0, heading: 0.0,
speed: 0.0, speed: 0.0,
speedAccuracy: 1, speedAccuracy: 1, altitudeAccuracy: 0.0, headingAccuracy: 0.0,
// altitudeAccuracy: 0.0, // altitudeAccuracy: 0.0,
// headingAccuracy: 0.0, // headingAccuracy: 0.0,
// altitudeAccuracy: 0, // altitudeAccuracy: 0,

8
lib/uitl/push-notification-handler.dart
Unescape Escape View File

@ -306,15 +306,15 @@ class PushNotificationHandler {
// print("Push Notification getToken: " + token!); // print("Push Notification getToken: " + token!);
// onToken(token!); // onToken(token!);
// }); // });
FirebaseMessaging.instance.getToken(vapidKey: 'BHRJG8sIzcysWxPw3B6xQjz_85nUuCfU6EAmpH18kyUTmB2cj35IdFwCyWSab80SA1v6oBSWVh-p6PcHPw_y00Y').then((String token) { FirebaseMessaging.instance.getToken(vapidKey: 'BHRJG8sIzcysWxPw3B6xQjz_85nUuCfU6EAmpH18kyUTmB2cj35IdFwCyWSab80SA1v6oBSWVh-p6PcHPw_y00Y').then((String? token) {
print("Push Notification getToken: " + token); print("Push Notification getToken: " + token!);
onToken(token); onToken(token!);
}); });
if(Platform.isIOS) { if(Platform.isIOS) {
FirebaseMessaging.instance.getAPNSToken().then((value) { FirebaseMessaging.instance.getAPNSToken().then((value) {
print("Push APNS getToken: " + value); print("Push APNS getToken: " + value!);
}); });
} }

6
lib/widgets/others/bottom_bar.dart
Unescape Escape View File

@ -68,7 +68,7 @@ class _SearchBot extends State<BottomBarSearch> {
bool _isInit = true; bool _isInit = true;
TextEditingController searchController = TextEditingController(); TextEditingController searchController = TextEditingController();
ProjectViewModel projectProvider; ProjectViewModel? projectProvider;
@override @override
void initState() { void initState() {
@ -378,7 +378,7 @@ class _SearchBot extends State<BottomBarSearch> {
} }
getDoctorProfile(projectId, clinicId, doctorId, context, doctorData) { getDoctorProfile(projectId, clinicId, doctorId, context, doctorData) {
int languageID = projectProvider.isArabic ? 1 : 2; int languageID = projectProvider!.isArabic ? 1 : 2;
List<DoctorProfileList> docProfileList = []; List<DoctorProfileList> docProfileList = [];
DoctorsListService service = new DoctorsListService(); DoctorsListService service = new DoctorsListService();
@ -399,7 +399,7 @@ class _SearchBot extends State<BottomBarSearch> {
} }
getDoctorsList(projectId, clinicId, context, {doctorId, doctorName}) { getDoctorsList(projectId, clinicId, context, {doctorId, doctorName}) {
int languageID = projectProvider.isArabic ? 1 : 2; int languageID = projectProvider!.isArabic ? 1 : 2;
List<DoctorList> doctorsList = []; List<DoctorList> doctorsList = [];
List<String> arr = []; List<String> arr = [];
List<String> arrDistance = []; List<String> arrDistance = [];

Write Preview
Loading…
Cancel
Save