Skip to content

Error Handling Complete #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nirbhay-nrb wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Error Handling Complete #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbe6137
error handling done for registration page
Nirbhay-nrb Oct 2, 2021
5e9ae82
Merge branch 'Servatom:main' into main
Nirbhay-nrb Oct 2, 2021
48c3033
Merge branch 'Servatom:main' into main
Nirbhay-nrb Oct 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions App/lib/UI/qr_code_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@ class _QrCodeScreenState extends State<QrCodeScreen> {
doctorid = result.code;
resultInitialized = true;
});
readQR();
Navigator.pushNamed(context, RouteNames.ladning);
readQR();
Navigator.pushNamed(context, RouteNames.ladning);
});

}

@override
Expand All @@ -58,7 +57,8 @@ class _QrCodeScreenState extends State<QrCodeScreen> {
//for opening the qr code link in the browser
void readQR() {
print(doctorid);
Doctors().addDoctor(Provider.of<Auth>(context,listen: false).token, doctorid);
Doctors()
.addDoctor(Provider.of<Auth>(context, listen: false).token, doctorid);
}

@override
Expand Down Expand Up @@ -88,13 +88,13 @@ class _QrCodeScreenState extends State<QrCodeScreen> {
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()},
Expand Down
36 changes: 27 additions & 9 deletions App/lib/UI/registerDoctor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -219,14 +218,33 @@ class RegisterDoctor extends StatelessWidget {
child: CustomButton(
text: 'Register',
onTap: () async {
await Provider.of<Auth>(context, listen: false)
.registerDoctor(
name, email, phNo, speciality, password);
showDialog(
context: context,
builder: (_) {
return CustomDialog();
});
try {
await Provider.of<Auth>(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'))
],
);
});
}
}),
),
)
Expand Down
35 changes: 26 additions & 9 deletions App/lib/UI/registerPatient.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -253,15 +252,33 @@ class RegisterPatient extends StatelessWidget {
child: CustomButton(
text: 'Register',
onTap: () async {
await Provider.of<Auth>(context, listen: false)
.registerPatient(
name, email, phNo, gender, age, password);
try {
await Provider.of<Auth>(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'))
],
);
});
}
}),
),
)
Expand Down
12 changes: 9 additions & 3 deletions App/lib/providers/auth.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,13 @@ class Auth extends ChangeNotifier {
if (response.statusCode != 200) {
var responseData = jsonDecode(response.body) as Map<String, dynamic>;
var error = responseData["errors"] as Map<String, dynamic>;
} else {
var responseData = jsonDecode(response.body) as Map<String, dynamic>;
var error = responseData["errors"] as Map<String, dynamic>;
throw error;
}
} catch (e) {
print(e);
throw e;
}
}

Expand All @@ -58,10 +62,12 @@ class Auth extends ChangeNotifier {
var responseData = jsonDecode(response.body) as Map<String, dynamic>;
var error = responseData["errors"] as Map<String, dynamic>;
} else {
print('nahi hua');
var responseData = jsonDecode(response.body) as Map<String, dynamic>;
var error = responseData["errors"] as Map<String, dynamic>;
throw error;
}
} catch (e) {
print(e);
throw e;
}
}

Expand Down