From f3102ef99f18f5af8c7d52323c495f0d0285538e Mon Sep 17 00:00:00 2001 From: her_username Date: Mon, 18 May 2020 18:30:58 +0300 Subject: [PATCH] edit doctor reply provider and schedule provider --- lib/providers/doctor_reply_provider.dart | 10 +++++++++- lib/providers/schedule_provider.dart | 11 ++++++++++- lib/screens/QR_reader_screen.dart | 9 +++++++-- lib/screens/patients/patient_search_screen.dart | 2 +- lib/screens/patients/patients_screen.dart | 2 +- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/lib/providers/doctor_reply_provider.dart b/lib/providers/doctor_reply_provider.dart index b187639e..9572312f 100644 --- a/lib/providers/doctor_reply_provider.dart +++ b/lib/providers/doctor_reply_provider.dart @@ -1,6 +1,8 @@ import 'dart:convert'; import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; +import 'package:doctor_app_flutter/models/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/request_doctor_reply.dart'; import 'package:doctor_app_flutter/models/list_gt_my_pationents_question_model.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; @@ -26,6 +28,12 @@ class DoctorReplyProvider with ChangeNotifier { getDoctorSchedule() async { const url = BASE_URL + 'DoctorApplication.svc/REST/GtMyPatientsQuestions'; + Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + String token = await sharedPref.getString(TOKEN); + DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); + _requestSchedule.doctorID = doctorProfile.doctorID; + _requestSchedule.projectID = doctorProfile.projectID; + _requestSchedule.tokenID = token; try { if (await Helpers.checkConnection()) { final response = await client.post(url, @@ -46,7 +54,7 @@ class DoctorReplyProvider with ChangeNotifier { } else { isError = true; isLoading = false; - error = parsed['ErrorMessage'] ?? parsed['ErrorEndUserMessage']; + error = parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'] ; } } } else { diff --git a/lib/providers/schedule_provider.dart b/lib/providers/schedule_provider.dart index d2a86c1b..44ed24de 100644 --- a/lib/providers/schedule_provider.dart +++ b/lib/providers/schedule_provider.dart @@ -1,6 +1,8 @@ import 'dart:convert'; import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; +import 'package:doctor_app_flutter/models/doctor_profile_model.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/cupertino.dart'; import 'package:http/http.dart'; @@ -18,7 +20,7 @@ class ScheduleProvider with ChangeNotifier { bool isLoading = true; bool isError = false; String error = ''; - RequestSchedule requestSchedule = RequestSchedule(15, 1, 70907, 7, 2, '2020-04-22T11:25:57.640Z', '11.11.11.11', 1.2, 9, '2lMDFT8U+Uy5jxRzCO8n2w==', 'vV6tg9yyVJ222', true, false, 1); + RequestSchedule requestSchedule = RequestSchedule(15, 1, 1485, 7, 2, '2020-04-22T11:25:57.640Z', '11.11.11.11', 1.2, 9, '2lMDFT8U+Uy5jxRzCO8n2w==', 'vV6tg9yyVJ222', true, false, 1); ScheduleProvider() { getDoctorSchedule(); @@ -26,6 +28,13 @@ class ScheduleProvider with ChangeNotifier { getDoctorSchedule() async { const url = BASE_URL + 'Doctors.svc/REST/GetDoctorWorkingHoursTable'; + Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + String token = await sharedPref.getString(TOKEN); + DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); + requestSchedule.doctorID = doctorProfile.doctorID; + requestSchedule.projectID = doctorProfile.projectID; + requestSchedule.clinicID = doctorProfile.clinicID; + requestSchedule.tokenID = token; try { if (await Helpers.checkConnection()) { diff --git a/lib/screens/QR_reader_screen.dart b/lib/screens/QR_reader_screen.dart index bde277ee..71be8b75 100644 --- a/lib/screens/QR_reader_screen.dart +++ b/lib/screens/QR_reader_screen.dart @@ -25,6 +25,7 @@ class _QrReaderScreenState extends State { DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); bool isLoading = false; + bool isError = false; PatientModel patient = PatientModel( ProjectID: 15, ClinicID: 0, @@ -93,7 +94,7 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); loading: isLoading, icon: Image.asset('assets/images/qr_code_white.png'), ), - error!=''?Container( + isError ? Container( margin: EdgeInsets.only(top: 8), decoration: BoxDecoration( borderRadius: BorderRadius.circular(6.0), @@ -148,6 +149,7 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); String patientType = "1"; setState(() { isLoading = true; + isError = false; patientList = []; }); String token = await sharedPref.getString(TOKEN); @@ -168,6 +170,7 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); }); } else { setState(() { + isError = true; error = 'No patient'; isLoading = false; }); @@ -183,6 +186,7 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); } else { setState(() { error = 'No patient'; + isError = true; isLoading = false; }); break; @@ -190,8 +194,9 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); } } else { setState(() { - error = response['ErrorMessage'] ?? response['ErrorEndUserMessage']; + error = response['ErrorEndUserMessage'] ?? response['ErrorMessage'] ; isLoading = false; + isError = true; }); } }); diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index a03b1b8b..914faf06 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -265,7 +265,7 @@ class _PatientSearchScreenState extends State { ), AppTextFormField( textInputType: TextInputType.number, - hintText: 'Patiant ID', + hintText: 'Patient ID', // inputFormatter: ONLY_NUMBERS, onSaved: (value) { diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index d10512a2..ebf33169 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -91,7 +91,7 @@ class _PatientsScreenState extends State { _isError = false; } else { _isError = true; - error = res['ErrorMessage'] ?? res['ErrorEndUserMessage']; + error = res['ErrorEndUserMessage'] ?? res['ErrorMessage'] ; } }); }).catchError((error) {