diff --git a/lib/interceptor/http_interceptor.dart b/lib/interceptor/http_interceptor.dart index d0ad35f6..41f7c016 100644 --- a/lib/interceptor/http_interceptor.dart +++ b/lib/interceptor/http_interceptor.dart @@ -13,7 +13,7 @@ List publicUrls = [ class HttpInterceptor extends InterceptorContract { Future interceptRequest({RequestData data}) async { - // print('RequestData ${data.body}'); + print('RequestData ${data.body}'); try { data.headers["Content-Type"] = "application/json"; data.headers["Accept"] = "application/json"; diff --git a/lib/providers/patients_provider.dart b/lib/providers/patients_provider.dart index 4c20758e..7ab8abf7 100644 --- a/lib/providers/patients_provider.dart +++ b/lib/providers/patients_provider.dart @@ -18,7 +18,7 @@ class PatientsProvider with ChangeNotifier { try { final response = await client.post(url, body: json.encode({ - "ProjectID": patient.PatientID, + "ProjectID": patient.ProjectID, "ClinicID": patient.ClinicID, "DoctorID": patient.DoctorID, "FirstName": patient.FirstName, diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index d5a8cb33..6051c85e 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -1,3 +1,7 @@ +import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; +import 'package:doctor_app_flutter/routes.dart'; +import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; + import '../../config/size_config.dart'; import '../../util/text_validator.dart'; import '../../widgets/shared/app_buttons_widget.dart'; @@ -12,6 +16,8 @@ import '../../lookups/patient_lookup.dart'; import '../../models/patient_model.dart'; import '../../widgets/patients/dynamic_elements.dart'; +DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); + // OWNER : Ibrahim albitar // DATE : 19-04-2020 // DESCRIPTION : Patient Search Screen. @@ -29,9 +35,9 @@ class _PatientSearchScreenState extends State { bool _autoValidate = false; var _patientSearchFormValues = PatientModel( - ProjectID: 12, - ClinicID: 17, - DoctorID: 98129, + ProjectID: 15, + ClinicID: 0, + DoctorID: 4709, FirstName: "0", MiddleName: "0", LastName: "0", @@ -50,18 +56,31 @@ class _PatientSearchScreenState extends State { IsLoginForDoctorApp: true, PatientOutSA: false); - void _validateInputs() { - if (_formKey.currentState.validate()) { + print({_patientSearchFormValues.ProjectID}); + // _patientSearchFormValues.TokenID = + + if (_formKey.currentState.validate()) { // If all data are correct then save data to out variables - _formKey.currentState.save(); - } else { + // _formKey.currentState.save(); + + sharedPref.getString(TOKEN).then((token) { + print(token+"EEEEEE"); + _patientSearchFormValues.TokenID = token; + _patientSearchFormValues.ProjectID= 15; + print(_patientSearchFormValues.PatientMobileNumber+"dfdfdfddf"); + Navigator.of(context).pushNamed(PATIENTS, arguments: { + "patientSearchForm": _patientSearchFormValues, + "selectedType": _selectedType + }); + }); + } else { // If all data are not valid then start auto validation. - setState(() { - _autoValidate = true; - }); + setState(() { + _autoValidate = true; + }); + } } -} @override Widget build(BuildContext context) { @@ -206,8 +225,7 @@ class _PatientSearchScreenState extends State { return TextValidator().validateIdNumber(value); }, onSaved: (value) { - _patientSearchFormValues.PatientID = - 89000; + _patientSearchFormValues.PatientID = 89000; }), SizedBox( height: 10, diff --git a/lib/screens/patients/patients_list_screen.dart b/lib/screens/patients/patients_list_screen.dart index fb7e2a78..0b7380b2 100644 --- a/lib/screens/patients/patients_list_screen.dart +++ b/lib/screens/patients/patients_list_screen.dart @@ -16,6 +16,7 @@ class _PatientsListScreenState extends State { void didChangeDependencies() { final routeArgs = ModalRoute.of(context).settings.arguments as Map; PatientModel patient = routeArgs['patientSearchForm']; + print(patient.TokenID+"EEEEEE"); String patientType = routeArgs['selectedType']; print(patientType); if (_isInit) { @@ -27,6 +28,7 @@ class _PatientsListScreenState extends State { _hasError = res['ErrorEndUserMessage']; }); + print(res); }).catchError((error) { print(error); });