diff --git a/App/lib/UI/qr_code_screen.dart b/App/lib/UI/qr_code_screen.dart index 031bdfa..8ea2645 100644 --- a/App/lib/UI/qr_code_screen.dart +++ b/App/lib/UI/qr_code_screen.dart @@ -43,10 +43,9 @@ class _QrCodeScreenState extends State { doctorid = result.code; resultInitialized = true; }); - readQR(); - Navigator.pushNamed(context, RouteNames.ladning); + readQR(); + Navigator.pushNamed(context, RouteNames.ladning); }); - } @override @@ -58,7 +57,8 @@ class _QrCodeScreenState extends State { //for opening the qr code link in the browser void readQR() { print(doctorid); - Doctors().addDoctor(Provider.of(context,listen: false).token, doctorid); + Doctors() + .addDoctor(Provider.of(context, listen: false).token, doctorid); } @override @@ -88,13 +88,13 @@ class _QrCodeScreenState extends State { child: Column( children: [ Text('Doctor ID: ${result.code}'), - SizedBox( - height: 20, - ), - CustomButton( - text: 'Add doc id', - onTap: readQR, - ) + SizedBox( + height: 20, + ), + CustomButton( + text: 'Add doc id', + onTap: readQR, + ) ], ), onTap: () => {readQR()}, diff --git a/App/lib/UI/registerDoctor.dart b/App/lib/UI/registerDoctor.dart index 2168be1..c69ee58 100644 --- a/App/lib/UI/registerDoctor.dart +++ b/App/lib/UI/registerDoctor.dart @@ -3,7 +3,6 @@ import 'package:shealth/UI/custombutton.dart'; import 'package:shealth/UI/sizeconfig.dart'; import 'package:provider/provider.dart'; import 'package:shealth/providers/auth.dart'; -import 'package:shealth/routers/RouteNames.dart'; import 'customdialog.dart'; @@ -219,14 +218,33 @@ class RegisterDoctor extends StatelessWidget { child: CustomButton( text: 'Register', onTap: () async { - await Provider.of(context, listen: false) - .registerDoctor( - name, email, phNo, speciality, password); - showDialog( - context: context, - builder: (_) { - return CustomDialog(); - }); + try { + await Provider.of(context, listen: false) + .registerDoctor( + name, email, phNo, speciality, password); + showDialog( + context: context, + builder: (_) { + return CustomDialog(); + }); + } catch (e) { + print('hello errors'); + showDialog( + context: context, + builder: (_) { + return AlertDialog( + title: Text('Error Occured'), + content: Text('$e'), + actions: [ + TextButton( + onPressed: () { + Navigator.pop(context); + }, + child: Text('Ok')) + ], + ); + }); + } }), ), ) diff --git a/App/lib/UI/registerPatient.dart b/App/lib/UI/registerPatient.dart index 4b00ba4..2a46f0f 100644 --- a/App/lib/UI/registerPatient.dart +++ b/App/lib/UI/registerPatient.dart @@ -3,7 +3,6 @@ import 'package:shealth/UI/custombutton.dart'; import 'package:shealth/UI/sizeconfig.dart'; import 'package:provider/provider.dart'; import 'package:shealth/providers/auth.dart'; -import 'package:shealth/routers/RouteNames.dart'; import 'customdialog.dart'; @@ -253,15 +252,33 @@ class RegisterPatient extends StatelessWidget { child: CustomButton( text: 'Register', onTap: () async { - await Provider.of(context, listen: false) - .registerPatient( - name, email, phNo, gender, age, password); + try { + await Provider.of(context, listen: false) + .registerPatient(name, email, phNo, gender, + age, password); - showDialog( - context: context, - builder: (_) { - return CustomDialog(); - }); + showDialog( + context: context, + builder: (_) { + return CustomDialog(); + }); + } catch (e) { + showDialog( + context: context, + builder: (_) { + return AlertDialog( + title: Text('Error Occured'), + content: Text('$e'), + actions: [ + TextButton( + onPressed: () { + Navigator.pop(context); + }, + child: Text('Ok')) + ], + ); + }); + } }), ), ) diff --git a/App/lib/providers/auth.dart b/App/lib/providers/auth.dart index 43e3f44..943254e 100644 --- a/App/lib/providers/auth.dart +++ b/App/lib/providers/auth.dart @@ -36,9 +36,13 @@ class Auth extends ChangeNotifier { if (response.statusCode != 200) { var responseData = jsonDecode(response.body) as Map; var error = responseData["errors"] as Map; + } else { + var responseData = jsonDecode(response.body) as Map; + var error = responseData["errors"] as Map; + throw error; } } catch (e) { - print(e); + throw e; } } @@ -58,10 +62,12 @@ class Auth extends ChangeNotifier { var responseData = jsonDecode(response.body) as Map; var error = responseData["errors"] as Map; } else { - print('nahi hua'); + var responseData = jsonDecode(response.body) as Map; + var error = responseData["errors"] as Map; + throw error; } } catch (e) { - print(e); + throw e; } }