Skip to content

Commit d9eeb94

Browse files
DivyanshuSaxenaDivyanshuSaxena
committed
Multiple bug fixes
1. Aadhaar spelling corrections 2. TODOs and unused imports removed 3. Strip form inputs, fixes #36
1 parent 0c4990a commit d9eeb94

File tree

10 files changed

+88
-118
lines changed

10 files changed

+88
-118
lines changed

‎token_system/lib/Entities/authority.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Authority extends Entity {
3030
"email": this.email,
3131
"password": password,
3232
"mobileNumber": this.mobileNumber,
33-
"aadharNumber": this.aadhaarNumber,
33+
"aadhaarNumber": this.aadhaarNumber,
3434
"pincode": this.pincode,
3535
};
3636

@@ -40,7 +40,7 @@ class Authority extends Entity {
4040
"id": this.id.toString(),
4141
"name": name ?? this.name,
4242
"mobileNumber": mobileNumber ?? this.mobileNumber,
43-
"aadharNumber": aadhaarNumber ?? this.aadhaarNumber,
43+
"aadhaarNumber": aadhaarNumber ?? this.aadhaarNumber,
4444
"pincode": pincode ?? this.pincode,
4545
};
4646

‎token_system/lib/components/pull_refresh.dart

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class _RefreshState extends State<PullRefresh> with AutomaticKeepAliveClientMixi
5353

5454
@override
5555
Widget build(BuildContext context) {
56+
super.build(context);
5657
return RefreshIndicator(
5758
child: AsyncBuilder(
5859
future: _future, builder: widget.builder, onReceiveJson: widget.onReceiveJson),

‎token_system/lib/components/request_card.dart

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class RequestCard extends StatelessWidget {
2121

2222
@override
2323
Widget build(BuildContext context) {
24-
// TODO: Make a call to get Shop Name and pincode from the shopId
2524
var borderColor;
2625
var statusText;
2726
var icon;

‎token_system/lib/screens/booking/book_token.dart

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'package:token_system/Entities/user.dart';
88
import 'package:token_system/Entities/token.dart';
99
import 'package:token_system/components/section_title.dart';
1010
import 'package:token_system/components/tab_navigator.dart';
11-
import 'package:token_system/components/async_builder.dart';
1211
import 'package:token_system/Services/miscServices.dart';
1312
import 'package:token_system/Services/tokenService.dart';
1413

‎token_system/lib/screens/booking/choose_category.dart

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'package:flutter/rendering.dart';
33
import 'package:tuple/tuple.dart';
44
import 'package:token_system/Entities/user.dart';
55
import 'package:token_system/Services/miscServices.dart';
6-
import 'package:token_system/components/async_builder.dart';
76
import 'package:token_system/components/pull_refresh.dart';
87
import 'package:token_system/components/section_title.dart';
98
import 'package:token_system/components/tab_navigator.dart';

‎token_system/lib/screens/components/edit_password.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class _EditScreenState extends State<EditPasswordScreen> {
127127
),
128128
floatingActionButton: FloatingActionButton.extended(
129129
onPressed: () {
130-
// TODO: Call update user API and relevant status codes
130+
// FIXED: Call update user API and relevant status codes
131131
if (_formKey.currentState.validate()) {
132132
_formKey.currentState.save();
133133
String _password = _passKey.currentState.value;

‎token_system/lib/screens/components/edit_profile.dart

+21-45
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'package:token_system/Entities/abstract.dart';
33
import 'package:token_system/Services/authorityService.dart';
44
import 'package:token_system/Services/shopService.dart';
55
import 'package:token_system/Services/userService.dart';
6+
import 'package:token_system/utils.dart';
67

78
class EditProfileScreen extends StatefulWidget {
89
final Entity user;
@@ -27,7 +28,7 @@ class _EditScreenState extends State<EditProfileScreen> {
2728
String _landmark = 'XXX';
2829

2930
String successMessage(int statusCode) {
30-
//TODO: UI popup to show this message
31+
// FIXED: UI popup to show this message
3132
if (statusCode == 200)
3233
return 'Profile updated.';
3334
else if (statusCode == 412)
@@ -36,31 +37,6 @@ class _EditScreenState extends State<EditProfileScreen> {
3637
return 'Update failed!';
3738
}
3839

39-
String validateMobile(String value) {
40-
// Indian Mobile number are of 10 digit only
41-
if (value.length != 10)
42-
return 'Mobile Number must be of 10 digits';
43-
else
44-
return null;
45-
}
46-
47-
String validateAadhaar(String value) {
48-
// Indian Mobile number are of 10 digit only
49-
if (value == null) return null;
50-
if (value.length != 12)
51-
return 'Aadhar must be of 12 digits only';
52-
else
53-
return null;
54-
}
55-
56-
String validatePincode(String value) {
57-
// Indian Mobile number are of 10 digit only
58-
if (value.length != 6)
59-
return 'Pincode must be of 6 digits';
60-
else
61-
return null;
62-
}
63-
6440
@override
6541
Widget build(BuildContext context) {
6642
return Scaffold(
@@ -111,7 +87,7 @@ class _EditScreenState extends State<EditProfileScreen> {
11187
),
11288
initialValue: widget.user.name ?? widget.user.shopName,
11389
validator: (value) {
114-
if (value.isEmpty)
90+
if (value.isEmpty || value.trim() == '')
11591
return widget.userType == 1
11692
? 'Please enter your Shop name'
11793
: 'Please enter your name';
@@ -135,7 +111,7 @@ class _EditScreenState extends State<EditProfileScreen> {
135111
),
136112
initialValue: widget.user.ownerName,
137113
validator: (value) {
138-
if (value.isEmpty)
114+
if (value.isEmpty || value.trim() == '')
139115
return 'Please enter your name';
140116
else
141117
return null;
@@ -171,7 +147,7 @@ class _EditScreenState extends State<EditProfileScreen> {
171147
child: TextFormField(
172148
decoration: InputDecoration(
173149
border: OutlineInputBorder(),
174-
labelText: 'Aadhar number',
150+
labelText: 'aadhaar number',
175151
),
176152
initialValue: widget.user.aadhaarNumber,
177153
keyboardType: TextInputType.phone,
@@ -246,15 +222,15 @@ class _EditScreenState extends State<EditProfileScreen> {
246222
),
247223
floatingActionButton: FloatingActionButton.extended(
248224
onPressed: () {
249-
// TODO: Call update user API and relevant status codes
225+
// FIXED: Call update user API and relevant status codes
250226
if (_formKey.currentState.validate()) {
251227
_formKey.currentState.save();
252228
if (widget.userType == 0) {
253229
UserService.updateProfileApi(widget.user,
254-
name: _name,
255-
mobileNumber: _mobile,
256-
aadhaarNumber: _aadhaar,
257-
pincode: _pincode)
230+
name: _name.trim(),
231+
mobileNumber: _mobile.trim(),
232+
aadhaarNumber: _aadhaar.trim(),
233+
pincode: _pincode.trim())
258234
.then((code) {
259235
final snackbar = SnackBar(
260236
content: Text(successMessage(code)),
@@ -267,13 +243,13 @@ class _EditScreenState extends State<EditProfileScreen> {
267243
});
268244
} else if (widget.userType == 1) {
269245
ShopService.updateProfileApi(widget.user,
270-
shopName: _name,
271-
ownerName: _ownerName,
272-
mobileNumber: _mobile,
273-
aadhaarNumber: _aadhaar,
274-
address: _address,
275-
landmark: _landmark,
276-
pincode: _pincode)
246+
shopName: _name.trim(),
247+
ownerName: _ownerName.trim(),
248+
mobileNumber: _mobile.trim(),
249+
aadhaarNumber: _aadhaar.trim(),
250+
address: _address.trim(),
251+
landmark: _landmark.trim(),
252+
pincode: _pincode.trim())
277253
.then((code) {
278254
print('Inside Api call');
279255
final snackbar = SnackBar(
@@ -287,10 +263,10 @@ class _EditScreenState extends State<EditProfileScreen> {
287263
});
288264
} else {
289265
AuthorityService.updateProfileApi(widget.user,
290-
name: _name,
291-
mobileNumber: _mobile,
292-
aadhaarNumber: _aadhaar,
293-
pincode: _pincode)
266+
name: _name.trim(),
267+
mobileNumber: _mobile.trim(),
268+
aadhaarNumber: _aadhaar.trim(),
269+
pincode: _pincode.trim())
294270
.then((code) {
295271
final snackbar = SnackBar(
296272
content: Text(successMessage(code)),

‎token_system/lib/screens/register.dart

+22-59
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:tuple/tuple.dart';
3-
import 'package:email_validator/email_validator.dart';
43
import 'package:token_system/Entities/user.dart';
54
import 'package:token_system/Entities/shop.dart';
65
import 'package:token_system/Entities/authority.dart';
@@ -11,6 +10,7 @@ import 'package:token_system/Services/authorityService.dart';
1110
import 'package:token_system/components/async_builder.dart';
1211
import 'package:token_system/components/title.dart';
1312
import 'package:token_system/screens/login.dart';
13+
import 'package:token_system/utils.dart';
1414

1515
class Register extends StatefulWidget {
1616
@override
@@ -46,38 +46,6 @@ class _RegisterState extends State<Register> {
4646
return 'Registration failed!';
4747
}
4848

49-
String validateMobile(String value) {
50-
// Indian Mobile number are of 10 digit only
51-
if (value.length != 10)
52-
return 'Mobile Number must be of 10 digits';
53-
else
54-
return null;
55-
}
56-
57-
String validateAadhaar(String value) {
58-
// Indian Aadhar number, if present, must be of 12 digit only
59-
if (value == '') return null;
60-
if (value.length != 12)
61-
return 'Aadhaar must be of 12 digits only';
62-
else
63-
return null;
64-
}
65-
66-
String validatePincode(String value) {
67-
// Indian Mobile number are of 10 digit only
68-
if (value.length != 6)
69-
return 'Pincode must be of 6 digits';
70-
else
71-
return null;
72-
}
73-
74-
String validateEmail(String value) {
75-
if (!EmailValidator.validate(value))
76-
return 'Please enter a valid email address';
77-
else
78-
return null;
79-
}
80-
8149
String validateConfirmPassword(String value) {
8250
if (value.isEmpty) return 'Enter confirm password';
8351
var password = _passKey.currentState.value;
@@ -166,7 +134,7 @@ class _RegisterState extends State<Register> {
166134
labelText: isShop() ? 'Shop Name' : 'Name',
167135
),
168136
validator: (value) {
169-
if (value.isEmpty)
137+
if (value.isEmpty || value.trim() == '')
170138
return isShop()
171139
? 'Please enter your Shop name'
172140
: 'Please enter your name';
@@ -189,7 +157,7 @@ class _RegisterState extends State<Register> {
189157
labelText: 'Shop Owner Name',
190158
),
191159
validator: (value) {
192-
if (value.isEmpty)
160+
if (value.isEmpty || value.trim() == '')
193161
return 'Please enter your name';
194162
else
195163
return null;
@@ -224,10 +192,6 @@ class _RegisterState extends State<Register> {
224192
child: Text(shopTypes[index].item2),
225193
value: shopTypes[index],
226194
));
227-
// items.add(DropdownMenuItem(
228-
// child: Text(shopTypes[index]),
229-
// value: 2*index + 1,
230-
// ));
231195
}
232196
return DropdownButton(
233197
iconDisabledColor: Colors.blueGrey,
@@ -241,7 +205,6 @@ class _RegisterState extends State<Register> {
241205
onChanged: (value) {
242206
setState(() {
243207
_shopType = value;
244-
// print(_shopType);
245208
});
246209
},
247210
);
@@ -325,7 +288,7 @@ class _RegisterState extends State<Register> {
325288
labelText: 'Address',
326289
),
327290
validator: (value) {
328-
if (value.isEmpty)
291+
if (value.isEmpty || value.trim() == '')
329292
return 'Please enter your address';
330293
else
331294
return null;
@@ -400,11 +363,11 @@ class _RegisterState extends State<Register> {
400363

401364
if (_selected == SignAs.user) {
402365
User newUser = new User(
403-
name: _name,
404-
email: _email,
405-
mobileNumber: _mobile,
406-
aadhaarNumber: _aadhaar,
407-
pincode: _pincode,
366+
name: _name.trim(),
367+
email: _email.trim(),
368+
mobileNumber: _mobile.trim(),
369+
aadhaarNumber: _aadhaar.trim(),
370+
pincode: _pincode.trim(),
408371
);
409372
UserService.registerApi(newUser, _password).then((code) {
410373
final snackbar = SnackBar(
@@ -420,15 +383,15 @@ class _RegisterState extends State<Register> {
420383
});
421384
} else if (_selected == SignAs.shop) {
422385
Shop newShop = new Shop(
423-
shopName: _name,
424-
ownerName: _ownerName,
425-
email: _email,
426-
mobileNumber: _mobile,
427-
aadhaarNumber: _aadhaar,
428-
address: _address,
429-
landmark: _landmark,
386+
shopName: _name.trim(),
387+
ownerName: _ownerName.trim(),
388+
email: _email.trim(),
389+
mobileNumber: _mobile.trim(),
390+
aadhaarNumber: _aadhaar.trim(),
391+
address: _address.trim(),
392+
landmark: _landmark.trim(),
430393
shopType: _shopType.item2,
431-
pincode: _pincode);
394+
pincode: _pincode.trim());
432395
ShopService.registerApi(newShop, _password, _shopType.item1)
433396
.then((code) {
434397
print('Inside Api call');
@@ -445,11 +408,11 @@ class _RegisterState extends State<Register> {
445408
});
446409
} else {
447410
Authority newAuth = new Authority(
448-
name: _name,
449-
email: _email,
450-
mobileNumber: _mobile,
451-
aadhaarNumber: _aadhaar,
452-
pincode: _pincode,
411+
name: _name.trim(),
412+
email: _email.trim(),
413+
mobileNumber: _mobile.trim(),
414+
aadhaarNumber: _aadhaar.trim(),
415+
pincode: _pincode.trim(),
453416
);
454417
AuthorityService.registerApi(newAuth, _password).then((code) {
455418
final snackbar = SnackBar(

‎token_system/lib/screens/shop_profile/request_verification.dart

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'package:token_system/Entities/request.dart';
66
import 'package:token_system/Services/requestService.dart';
77
import 'package:token_system/components/section_title.dart';
88
import 'package:token_system/components/tab_navigator.dart';
9-
import 'package:token_system/components/async_builder.dart';
109
import 'package:token_system/components/request_card.dart';
1110

1211
enum RequestOptions { small, medium, large }

0 commit comments

Comments
 (0)