Compare commits

...
Author SHA1 Message Date
mohammad 0ac3e79c30 new HourPicker 2024-09-12 14:18:53 +03:00
mohammad dbb3450c32 new HourPicker 2024-09-11 16:04:54 +03:00
mohammad 8c3df39cf4 fix changes 2024-09-09 12:44:55 +03:00
mohammad 7f862fac2a fix changes 2024-09-09 14:51:06 +03:00
mohammad 770db5383b fix changes 2024-09-09 13:36:26 +03:00
Abdullah eddd4828bb Merge pull request #18 from SyncrowIOT/web_changes_1
fix changes
2024-09-09 13:12:22 +03:00
mohammad 2162c996ea fix changes 2024-09-09 13:03:37 +03:00
Abdullah 177baca864 Merge pull request #16 from SyncrowIOT/otp_changes
curtain and forget password and select all check box and fix bugs
2024-09-08 23:15:20 +03:00
9 changed files with 507 additions and 415 deletions
+35 -29
View File
@@ -34,6 +34,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
final TextEditingController forgetPasswordController = TextEditingController(); final TextEditingController forgetPasswordController = TextEditingController();
final TextEditingController forgetOtp = TextEditingController(); final TextEditingController forgetOtp = TextEditingController();
final forgetFormKey = GlobalKey<FormState>(); final forgetFormKey = GlobalKey<FormState>();
final forgetEmailKey = GlobalKey<FormState>();
final forgetRegionKey = GlobalKey<FormState>();
late bool checkValidate = false; late bool checkValidate = false;
Timer? _timer; Timer? _timer;
@@ -93,34 +95,36 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
} }
Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async { Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async {
try { emit(LoadingForgetState());
emit(LoadingForgetState()); try {
var response = await AuthenticationAPI.verifyOtp( var response = await AuthenticationAPI.verifyOtp(
email: forgetEmailController.text, otpCode: forgetOtp.text); email: forgetEmailController.text, otpCode: forgetOtp.text);
if (response == true) { if (response == true) {
await AuthenticationAPI.forgetPassword( await AuthenticationAPI.forgetPassword(
password: forgetPasswordController.text, email: forgetEmailController.text); password: forgetPasswordController.text,
_timer?.cancel(); email: forgetEmailController.text);
emit(const TimerState(isButtonEnabled: true, remainingTime: 0)); _timer?.cancel();
emit(SuccessForgetState()); emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
emit(SuccessForgetState());
}
} on DioException catch (e) {
final errorData = e.response!.data;
String errorMessage = errorData['message'];
if (errorMessage == 'this email is not registered') {
validate = 'Invalid Credentials!';
emit(AuthInitialState());
} else if (errorMessage == "You entered wrong otp") {
forgetValidate = 'Wrong one time password.';
emit(AuthInitialState());
} else if (errorMessage == "OTP expired") {
forgetValidate = 'One time password has been expired.';
emit(AuthInitialState());
} else {
validate = '';
emit(AuthInitialState());
}
} }
} on DioException catch (e) {
final errorData = e.response!.data;
String errorMessage = errorData['message'];
if (errorMessage == 'this email is not registered') {
validate = 'Invalid Credentials!';
emit(AuthInitialState());
} else if (errorMessage == "You entered wrong otp") {
forgetValidate = 'Wrong one time password.';
emit(AuthInitialState());
} else if (errorMessage == "OTP expired") {
forgetValidate = 'One time password has been expired.';
emit(AuthInitialState());
} else {
validate = '';
emit(AuthInitialState());
}
}
} }
String? validateCode(String? value) { String? validateCode(String? value) {
@@ -231,9 +235,10 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
return 'Email is required'; return 'Email is required';
} else if (!RegExp(r'^[^@]+@[^@]+\.[^@]+').hasMatch(value)) { } else if (!RegExp(r'^[^@]+@[^@]+\.[^@]+').hasMatch(value)) {
return 'Enter a valid email address'; return 'Enter a valid email address';
} else if (regionUuid == '') {
return 'Please select your region';
} }
// else if (regionUuid == '') {
// return 'Please select your region';
// }
validate = ''; validate = '';
return null; return null;
} }
@@ -371,6 +376,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
try { try {
emit(AuthLoading()); emit(AuthLoading());
regionUuid = event.val; regionUuid = event.val;
add(CheckEnableEvent());
emit(AuthInitialState()); emit(AuthInitialState());
} catch (e) { } catch (e) {
emit(FailureForgetState(error: e.toString())); emit(FailureForgetState(error: e.toString()));
+426 -328
View File
@@ -64,91 +64,96 @@ class ForgetPasswordWebPage extends StatelessWidget {
Size size = MediaQuery.of(context).size; Size size = MediaQuery.of(context).size;
return FirstLayer( return FirstLayer(
second: Center( second: Center(
child: Stack( child: Stack(
children: [
if (state is AuthLoading)
const Center(child: CircularProgressIndicator()),
ListView(
shrinkWrap: true,
controller: _scrollController,
children: [ children: [
if (state is AuthLoading) Container(
const Center(child: CircularProgressIndicator()), padding: EdgeInsets.all(size.width * 0.02),
ListView( margin: EdgeInsets.all(size.width * 0.09),
shrinkWrap: true, decoration: BoxDecoration(
controller: _scrollController, color: Colors.black.withOpacity(0.3),
children: [ borderRadius: const BorderRadius.all(Radius.circular(20)),
Container( ),
padding: EdgeInsets.all(size.width * 0.02), child: Center(
margin: EdgeInsets.all(size.width * 0.09), child: Row(
decoration: BoxDecoration( crossAxisAlignment: CrossAxisAlignment.center,
color: Colors.black.withOpacity(0.3), mainAxisAlignment: MainAxisAlignment.center,
borderRadius: const BorderRadius.all(Radius.circular(20)), children: [
), const Spacer(),
child: Center( Expanded(
child: Row( flex: 3,
crossAxisAlignment: CrossAxisAlignment.center, child: SvgPicture.asset(
mainAxisAlignment: MainAxisAlignment.center, Assets.loginLogo,
children: [ ),
const Spacer(), ),
Expanded( const Spacer(),
flex: 3, Expanded(
child: SvgPicture.asset( flex: 3,
Assets.loginLogo, child: Container(
), decoration: BoxDecoration(
), color: Colors.white.withOpacity(0.1),
const Spacer(), borderRadius:
Expanded(
flex: 3,
child: Container(
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.1),
borderRadius:
const BorderRadius.all(Radius.circular(30)), const BorderRadius.all(Radius.circular(30)),
border: Border.all( border: Border.all(
color: color:
ColorsManager.graysColor.withOpacity(0.2)), ColorsManager.graysColor.withOpacity(0.2)),
), ),
child: Form( child: Form(
key: forgetBloc.forgetFormKey, key: forgetBloc.forgetFormKey,
child: Padding( child: Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: size.width * 0.02, horizontal: size.width * 0.02,
vertical: size.width * 0.003), vertical: size.width * 0.003),
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceEvenly, MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
const SizedBox(height: 10), const SizedBox(height: 10),
const Text( const Text(
'Forget Password', 'Forget Password',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 24, fontSize: 24,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
Text( Text(
'Please fill in your account information to\nretrieve your password', 'Please fill in your account information to\nretrieve your password',
style: Theme.of(context) style: Theme.of(context)
.textTheme .textTheme
.bodySmall! .bodySmall!
.copyWith( .copyWith(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w400), fontWeight: FontWeight.w400),
), ),
const SizedBox(height: 10),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
const SizedBox(height: 10), const SizedBox(height: 10),
Column( Form(
key: forgetBloc.forgetRegionKey,
child: SizedBox(
child: _buildDropdownField(
context, forgetBloc, size)))
],
),
const SizedBox(height: 20),
Form(
key: forgetBloc.forgetEmailKey,
child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment:
children: [ MainAxisAlignment.start,
const SizedBox(height: 10),
SizedBox(
child: _buildDropdownField(context, forgetBloc, size)
)
],
),
const SizedBox(height: 20),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Text( Text(
"Account", "Account",
@@ -156,17 +161,20 @@ class ForgetPasswordWebPage extends StatelessWidget {
.textTheme .textTheme
.bodySmall! .bodySmall!
.copyWith( .copyWith(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w400), fontWeight:
FontWeight.w400),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
SizedBox( SizedBox(
child: TextFormField( child: TextFormField(
controller:forgetBloc.forgetEmailController , controller: forgetBloc.forgetEmailController,
validator: forgetBloc.validateEmail, validator: forgetBloc.validateEmail,
decoration: textBoxDecoration()!.copyWith( decoration:
textBoxDecoration()!.copyWith(
hintText: 'Enter your email', hintText: 'Enter your email',
hintStyle: Theme.of(context).textTheme.bodySmall!.copyWith( hintStyle: Theme.of(context)
.textTheme.bodySmall!.copyWith(
color: ColorsManager.grayColor, color: ColorsManager.grayColor,
fontWeight: FontWeight.w400), fontWeight: FontWeight.w400),
), ),
@@ -174,200 +182,237 @@ class ForgetPasswordWebPage extends StatelessWidget {
color: Colors.black), color: Colors.black),
), ),
), ),
if(forgetBloc.forgetEmailValidate!='')
SizedBox(
child: Text(
forgetBloc.forgetEmailValidate,
style: const TextStyle(
fontWeight: FontWeight.w700,
color: ColorsManager.red),
),
),
const SizedBox(height: 10.0),
], ],
), )),
const SizedBox(height: 20.0), const SizedBox(height: 20.0),
Column( Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Text( Text(
"One Time Password", "One Time Password",
style: Theme.of(context) style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(
fontSize: 14,
fontWeight: FontWeight.w400),
),
const SizedBox(height: 10),
SizedBox(
child: TextFormField(
validator: forgetBloc.validateCode,
keyboardType:
TextInputType.visiblePassword,
controller: forgetBloc.forgetOtp,
decoration:
textBoxDecoration()!.copyWith(
hintText: 'Enter Code',
hintStyle: Theme.of(context)
.textTheme .textTheme
.bodySmall! .bodySmall!
.copyWith( .copyWith(
fontSize: 14, color:
fontWeight: FontWeight.w400), ColorsManager.grayColor,
), fontWeight:
const SizedBox(height: 10), FontWeight.w400),
SizedBox( suffixIcon: SizedBox(
child: TextFormField( width: 100,
validator: forgetBloc.validateCode, child: Center(
keyboardType: child: InkWell(
TextInputType.visiblePassword, onTap: state is TimerState &&
controller: forgetBloc.forgetOtp, !state
decoration: .isButtonEnabled &&
textBoxDecoration()!.copyWith( state.remainingTime !=
hintText: 'Enter Code', 1
hintStyle: Theme.of(context).textTheme.bodySmall!.copyWith( ? null
color: ColorsManager.grayColor, : () {
fontWeight: FontWeight.w400), if (forgetBloc.forgetEmailKey.currentState!.validate()||forgetBloc.forgetRegionKey.currentState!.validate()) {
suffixIcon: SizedBox( if(forgetBloc.forgetRegionKey.currentState!.validate()){
width: 100, forgetBloc.add(StartTimerEvent());
child: Center( }
child: InkWell( }
onTap: state is TimerState && },
!state.isButtonEnabled && child: Text(
state.remainingTime != 1 'Get Code ${state is TimerState && !state.isButtonEnabled && state.remainingTime != 1 ? "(${forgetBloc.formattedTime(state.remainingTime)}) " : ""}',
? null : () { style: TextStyle(
forgetBloc.add(StartTimerEvent()); color: state
is TimerState &&
}, !state
child: Text( .isButtonEnabled
'Get Code ${state is TimerState && !state.isButtonEnabled && state.remainingTime != 1 ? "(${forgetBloc.formattedTime(state.remainingTime)}) " : ""}', ? Colors.grey
style: TextStyle( : ColorsManager
color: state is TimerState && .btnColor,
!state.isButtonEnabled
? Colors.grey
: ColorsManager.btnColor,
),
),
), ),
), ),
), ),
), ),
style: const TextStyle(
color: Colors.black),
), ),
), ),
if (forgetBloc.forgetValidate != '') // Check if there is a validation message style: const TextStyle(
Padding( color: Colors.black),
padding: ),
),
if (forgetBloc.forgetValidate !=
'') // Check if there is a validation message
Padding(
padding:
const EdgeInsets.only(top: 8.0), const EdgeInsets.only(top: 8.0),
child: Text( child: Text(
forgetBloc.forgetValidate, forgetBloc.forgetValidate,
style: const TextStyle( style: const TextStyle(
color: ColorsManager.red, color: ColorsManager.red,
fontSize: 10, fontSize: 10,
fontWeight: FontWeight.w700), fontWeight: FontWeight.w700),
),
),
],
),
const SizedBox(height: 20.0),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
"Password",
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(
fontSize: 14,
fontWeight: FontWeight.w400),
),
const SizedBox(height: 10),
SizedBox(
child: TextFormField(
obscureText: forgetBloc.obscureText,
keyboardType:
TextInputType.visiblePassword,
validator:
forgetBloc.passwordValidator,
controller: forgetBloc
.forgetPasswordController,
decoration:
textBoxDecoration()!.copyWith(
suffixIcon: IconButton(
onPressed: () {
forgetBloc.add(
PasswordVisibleEvent(
newValue: forgetBloc
.obscureText));
},
icon: SizedBox(
child: SvgPicture.asset(
forgetBloc.obscureText
? Assets.visiblePassword
: Assets
.invisiblePassword,
height: 15,
width: 15,
),
), ),
), ),
], hintText: 'At least 8 characters',
), hintStyle: Theme.of(context)
const SizedBox(height: 20.0),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
"Password",
style: Theme.of(context)
.textTheme .textTheme
.bodySmall! .bodySmall!
.copyWith( .copyWith(
fontSize: 14, color:
fontWeight: FontWeight.w400), ColorsManager.grayColor,
), fontWeight:
const SizedBox(height: 10), FontWeight.w400),
SizedBox(
child: TextFormField(
validator: forgetBloc.passwordValidator,
keyboardType: TextInputType.visiblePassword,
controller: forgetBloc.forgetPasswordController,
decoration: textBoxDecoration()!.copyWith(
hintText: 'At least 8 characters',
hintStyle: Theme.of(context).textTheme.bodySmall!.copyWith(
color: ColorsManager.grayColor,
fontWeight: FontWeight.w400),
),
style: const TextStyle(color: Colors.black),
),
),
],
),
const SizedBox(
height: 10,
),
const SizedBox(height: 20.0),
Row(
crossAxisAlignment:
CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
width: size.width * 0.2,
child: DefaultButton(
backgroundColor:
ColorsManager.btnColor,
child: const Text('Submit'),
onPressed: () {
if (forgetBloc.forgetFormKey.currentState!.validate()) {
forgetBloc.add(ChangePasswordEvent());
}
},
),
),
],
),
const SizedBox(height: 10.0),
Center(
child: SizedBox(
child: Text(
forgetBloc.validate,
style: const TextStyle(
fontWeight: FontWeight.w700,
color: ColorsManager.red),
), ),
style: const TextStyle(
color: Colors.black),
), ),
), ),
const SizedBox(
height: 10,
),
SizedBox(
child: Center(
child: Wrap(
children: [
const Text(
"Do you have an account? ",
style: TextStyle(color: Colors.white),
),
InkWell(
onTap: () {
forgetBloc.add(StopTimerEvent());
Navigator.pop(context);
},
child: const Text(
"Sign in",
),
),
],
),
),
),
const SizedBox(height: 15.0),
], ],
), ),
), const SizedBox(
height: 10,
),
const SizedBox(height: 20.0),
Row(
crossAxisAlignment:
CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
width: size.width * 0.2,
child: DefaultButton(
backgroundColor:
ColorsManager.btnColor,
child: const Text('Submit'),
onPressed: () {
if (forgetBloc.forgetFormKey.currentState!.validate() ||
forgetBloc.forgetEmailKey.currentState!.validate() ) {
if( forgetBloc.forgetEmailKey.currentState!.validate()
&&forgetBloc.forgetFormKey.currentState!.validate() ){
forgetBloc.add(ChangePasswordEvent());
}
}
},
),
),
],
),
const SizedBox(height: 10.0),
Center(
child: SizedBox(
child: Text(
forgetBloc.validate,
style: const TextStyle(
fontWeight: FontWeight.w700,
color: ColorsManager.red),
),
),
),
const SizedBox(
height: 10,
),
SizedBox(
child: Center(
child: Wrap(
children: [
const Text(
"Do you have an account? ",
style:
TextStyle(color: Colors.white),
),
InkWell(
onTap: () {
forgetBloc.add(StopTimerEvent());
Navigator.pop(context);
},
child: const Text(
"Sign in",
),
),
],
),
),
),
const SizedBox(height: 15.0),
],
), ),
), ),
), ),
const Spacer(), ),
],
), ),
), const Spacer(),
],
), ),
], ),
), ),
], ],
), ),
)); ],
),
));
} }
Widget _buildDropdownField( Widget _buildDropdownField(
BuildContext context, AuthBloc loginBloc, Size size) { BuildContext context, AuthBloc loginBloc, Size size) {
final TextEditingController textEditingController = TextEditingController(); final TextEditingController textEditingController = TextEditingController();
@@ -378,100 +423,153 @@ class ForgetPasswordWebPage extends StatelessWidget {
Text( Text(
"Country/Region", "Country/Region",
style: Theme.of(context).textTheme.bodySmall!.copyWith( style: Theme.of(context).textTheme.bodySmall!.copyWith(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
Container( SizedBox(
height: 50,
decoration: const BoxDecoration(
color: ColorsManager.boxColor,
borderRadius: BorderRadius.all(Radius.circular(8)),
),
width: size.width * 0.9, width: size.width * 0.9,
child: DropdownButtonHideUnderline( child: FormField<String>(
child: DropdownButton2<String>( validator: (value) {
style: TextStyle(color: Colors.black), if (value == null || value.isEmpty) {
isExpanded: true, return 'Please select a country/region';
hint: Text( }
'Select your region/country', return null;
style: Theme.of(context).textTheme.bodySmall!.copyWith( },
color: ColorsManager.grayColor, builder: (FormFieldState<String> field) {
fontWeight: FontWeight.w400, return InputDecorator(
), decoration: InputDecoration(
overflow: TextOverflow.ellipsis, contentPadding:
), const EdgeInsets.symmetric(horizontal: 2, vertical: 10),
items: loginBloc.regionList!.map((RegionModel region) { errorText: field.errorText,
return DropdownMenuItem<String>( filled:
value: region.id, // Use region.id as the value true, // Ensure the dropdown is filled with the background color
child: Text( fillColor: ColorsManager
region.name, .boxColor, // Match the dropdown container color
overflow: TextOverflow.ellipsis, border: OutlineInputBorder(
maxLines: 1, borderRadius: BorderRadius.circular(8.0),
borderSide: BorderSide(
color: field.hasError ? Colors.red : Colors.transparent,
width: 1.5,
),
), ),
); enabledBorder: OutlineInputBorder(
}).toList(), borderRadius: BorderRadius.circular(8.0),
value: loginBloc.regionList!.any( borderSide: BorderSide(
(region) => region.id == loginBloc.regionUuid,) color:
? loginBloc.regionUuid field.hasError ? Colors.red : ColorsManager.grayColor,
: null, width: 1.5,
onChanged: (String? value) { ),
if (value != null) { ),
focusedBorder: OutlineInputBorder(
loginBloc.add(SelectRegionEvent( borderRadius: BorderRadius.circular(8.0),
val: value, borderSide: BorderSide(
)); color:
} field.hasError ? Colors.red : ColorsManager.grayColor,
}, width: 1.5,
buttonStyleData: const ButtonStyleData( ),
padding: EdgeInsets.symmetric(horizontal: 16), ),
height: 40, errorBorder: OutlineInputBorder(
width: double.infinity, borderRadius: BorderRadius.circular(8.0),
), borderSide: BorderSide(
dropdownStyleData: DropdownStyleData( color: Colors.red,
maxHeight: size.height * 0.70, width: 1.5,
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
),
dropdownSearchData: DropdownSearchData(
searchController: textEditingController,
searchInnerWidgetHeight: 50,
searchInnerWidget: Container(
height: 50,
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
child: TextFormField(
style: const TextStyle(color: Colors.black),
controller: textEditingController,
decoration: textBoxDecoration()!.copyWith(
errorStyle: const TextStyle(height: 0),
contentPadding: const EdgeInsets.symmetric(
vertical: 12,
horizontal: 10,
),
), ),
), ),
), ),
searchMatchFn: (item, searchValue) { child: DropdownButtonHideUnderline(
// Use the item's child text (region name) for searching. child: DropdownButton2<String>(
final regionName = (item.child as Text).data?.toLowerCase() ?? ''; isExpanded: true,
final search = searchValue.toLowerCase().trim(); hint: Text(
// Debugging print statement to ensure values are captured correctly. 'Select your region/country',
// Return true if the region name contains the search term. style: Theme.of(context).textTheme.bodySmall!.copyWith(
return regionName.contains(search); color: ColorsManager.grayColor,
}, fontWeight: FontWeight.w400,
), ),
onMenuStateChange: (isOpen) { overflow: TextOverflow.ellipsis,
if (!isOpen) { ),
textEditingController.clear(); items: loginBloc.regionList!.map((RegionModel region) {
} return DropdownMenuItem<String>(
}, value: region.id,
), child: Text(
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
fontSize: 14,
fontWeight: FontWeight.w400,
),
region.name,
overflow: TextOverflow.ellipsis,
maxLines: 1,
),
);
}).toList(),
value: loginBloc.regionList!
.any((region) => region.id == loginBloc.regionUuid)
? loginBloc.regionUuid
: null,
onChanged: (String? value) {
if (value != null) {
loginBloc.add(SelectRegionEvent(val: value));
field.didChange(
value); // Notify the form field of the change
}
},
buttonStyleData: const ButtonStyleData(
padding: EdgeInsets.symmetric(horizontal: 16),
height: 40,
width: double.infinity,
),
dropdownStyleData: DropdownStyleData(
maxHeight: size.height * 0.70,
decoration: BoxDecoration(
color: ColorsManager
.boxColor, // Match dropdown background color to the container
borderRadius: BorderRadius.circular(8.0),
),
),
menuItemStyleData: const MenuItemStyleData(
height: 40,
),
dropdownSearchData: DropdownSearchData(
searchController: textEditingController,
searchInnerWidgetHeight: 50,
searchInnerWidget: Container(
height: 50,
padding: const EdgeInsets.symmetric(
horizontal: 8, vertical: 4),
child: TextFormField(
style: const TextStyle(color: Colors.black),
controller: textEditingController,
decoration: textBoxDecoration()!.copyWith(
errorStyle: const TextStyle(height: 0),
contentPadding: const EdgeInsets.symmetric(
vertical: 12,
horizontal: 10,
),
),
),
),
searchMatchFn: (item, searchValue) {
final regionName =
(item.child as Text).data?.toLowerCase() ?? '';
final search = searchValue.toLowerCase().trim();
return regionName.contains(search);
},
),
onMenuStateChange: (isOpen) {
if (!isOpen) {
textEditingController.clear();
}
},
),
),
);
},
), ),
), ),
], ],
); );
} }
} }
+31 -47
View File
@@ -1,7 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class HourPickerDialog extends StatefulWidget { class HourPickerDialog extends StatefulWidget {
final TimeOfDay initialTime; final TimeOfDay initialTime;
const HourPickerDialog({super.key, required this.initialTime}); const HourPickerDialog({super.key, required this.initialTime});
@override @override
@@ -9,70 +12,50 @@ class HourPickerDialog extends StatefulWidget {
} }
class _HourPickerDialogState extends State<HourPickerDialog> { class _HourPickerDialogState extends State<HourPickerDialog> {
late int _selectedHour; late String selectedHour;
bool _isPm = false;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_selectedHour = widget.initialTime.hour > 12 // Initialize the selectedHour with the initial time passed to the dialog
? widget.initialTime.hour - 12 selectedHour = widget.initialTime.hour.toString().padLeft(2, '0') + ':00';
: widget.initialTime.hour;
_isPm = widget.initialTime.period == DayPeriod.pm;
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AlertDialog( return AlertDialog(
title: const Text('Select Hour'), title: const Text('Select Hour'),
content: Row( content: DropdownButton<String>(
mainAxisAlignment: MainAxisAlignment.center, value: selectedHour, // Show the currently selected hour
children: [ items: List.generate(24, (index) {
DropdownButton<int>( String hour = index.toString().padLeft(2, '0');
value: _selectedHour, return DropdownMenuItem<String>(
items: List.generate(12, (index) { value: '$hour:00',
int displayHour = index + 1; child: Text('$hour:00'),
return DropdownMenuItem( );
value: displayHour, }),
child: Text(displayHour.toString()), onChanged: (String? newValue) {
); if (newValue != null) {
}), setState(() {
onChanged: (value) { selectedHour = newValue; // Update the selected hour without closing the dialog
setState(() { });
_selectedHour = value!; }
}); },
},
),
SizedBox(width: 16.0),
DropdownButton<bool>(
value: _isPm,
items: const [
DropdownMenuItem(
value: true,
child: Text('AM'),
),
DropdownMenuItem(
value:false ,
child: Text('PM'),
),
],
onChanged: (value) {
setState(() {
_isPm = value!;
});
},
),
],
), ),
actions: [ actions: [
TextButton( TextButton(
onPressed: () => Navigator.of(context).pop(null), onPressed: () => Navigator.of(context).pop(null), // Close the dialog without selection
child: const Text('Cancel'), child: const Text('Cancel'),
), ),
TextButton( TextButton(
onPressed: () { onPressed: () {
int hour = _isPm ? _selectedHour + 12 : _selectedHour; // Close the dialog and return the selected time
Navigator.of(context).pop(TimeOfDay(hour: hour, minute: 0)); Navigator.of(context).pop(
TimeOfDay(
hour: int.parse(selectedHour.split(':')[0]),
minute: 0,
),
);
}, },
child: const Text('OK'), child: const Text('OK'),
), ),
@@ -86,6 +69,7 @@ Future<TimeOfDay?> showHourPicker({
required TimeOfDay initialTime, required TimeOfDay initialTime,
}) { }) {
return showDialog<TimeOfDay>( return showDialog<TimeOfDay>(
barrierDismissible: false,
context: context, context: context,
builder: (context) => HourPickerDialog(initialTime: initialTime), builder: (context) => HourPickerDialog(initialTime: initialTime),
); );
@@ -69,7 +69,7 @@ class AcDeviceControl extends StatelessWidget with HelperResponsiveLayout {
deviceId: device.uuid!, deviceId: device.uuid!,
description: 'Child Lock', description: 'Child Lock',
icon: icon:
state.status.childLock ? Assets.unlock : Assets.childLock, state.status.childLock ? Assets.childLock:Assets.unlock ,
), ),
], ],
); );
@@ -116,7 +116,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
? const EdgeInsets.all(30) ? const EdgeInsets.all(30)
: const EdgeInsets.all(15), : const EdgeInsets.all(15),
child: DynamicTable( child: DynamicTable(
withSelectAll: true, withSelectAll: false,
cellDecoration: containerDecoration, cellDecoration: containerDecoration,
onRowSelected: (index, isSelected, row) { onRowSelected: (index, isSelected, row) {
final selectedDevice = devicesToShow[index]; final selectedDevice = devicesToShow[index];
@@ -14,6 +14,7 @@ import 'package:syncrow_web/services/access_mang_api.dart';
import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/color_manager.dart';
import 'package:syncrow_web/utils/constants/assets.dart'; import 'package:syncrow_web/utils/constants/assets.dart';
import 'package:syncrow_web/utils/snack_bar.dart'; import 'package:syncrow_web/utils/snack_bar.dart';
import 'package:syncrow_web/utils/style.dart';
class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordState> { class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordState> {
VisitorPasswordBloc() : super(VisitorPasswordInitial()) { VisitorPasswordBloc() : super(VisitorPasswordInitial()) {
@@ -32,9 +33,9 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
on<SelectTimeEvent>(selectTimeOfLinePassword); on<SelectTimeEvent>(selectTimeOfLinePassword);
on<ChangeTimeEvent>(changeTime); on<ChangeTimeEvent>(changeTime);
} }
final TextEditingController userNameController = TextEditingController(); final TextEditingController userNameController = TextEditingController();
final TextEditingController emailController = TextEditingController(); final TextEditingController emailController = TextEditingController();
final TextEditingController deviceNameController = TextEditingController(); final TextEditingController deviceNameController = TextEditingController();
final TextEditingController deviceIdController = TextEditingController(); final TextEditingController deviceIdController = TextEditingController();
final TextEditingController unitNameController = TextEditingController(); final TextEditingController unitNameController = TextEditingController();
@@ -51,6 +52,7 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
String accessTypeSelected = 'Online Password'; String accessTypeSelected = 'Online Password';
String usageFrequencySelected = 'One-Time'; String usageFrequencySelected = 'One-Time';
String passwordController = ''; String passwordController = '';
String accessPeriodValidate = '';
bool repeat = false; bool repeat = false;
@@ -377,19 +379,18 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
1000; // Divide by 1000 to remove milliseconds 1000; // Divide by 1000 to remove milliseconds
if (event.isEffective) { if (event.isEffective) {
if (expirationTimeTimeStamp != null && selectedTimestamp > expirationTimeTimeStamp!) { if (expirationTimeTimeStamp != null && selectedTimestamp > expirationTimeTimeStamp!) {
CustomSnackBar.displaySnackBar('Effective Time cannot be later than Expiration Time.'); accessPeriodValidate="Effective Time cannot be later than Expiration Time.";
} else { } else {
effectiveTime = accessPeriodValidate='';
selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds effectiveTime = selectedDateTime.toString().split('.').first;
effectiveTimeTimeStamp = selectedTimestamp; effectiveTimeTimeStamp = selectedTimestamp;
} }
} else { } else {
if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) { if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) {
CustomSnackBar.displaySnackBar( accessPeriodValidate= 'Expiration Time cannot be earlier than Effective Time.';
'Expiration Time cannot be earlier than Effective Time.');
} else { } else {
expirationTime = accessPeriodValidate='';
selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds expirationTime = selectedDateTime.toString().split('.').first;
expirationTimeTimeStamp = selectedTimestamp; expirationTimeTimeStamp = selectedTimestamp;
} }
} }
@@ -404,6 +404,9 @@ class VisitorPasswordDialog extends StatelessWidget {
? visitorBloc.expirationTime ? visitorBloc.expirationTime
: visitorBloc.endTimeAccess.toString(), : visitorBloc.endTimeAccess.toString(),
icon: Assets.calendarIcon), icon: Assets.calendarIcon),
const SizedBox(height: 10,),
Text(visitorBloc.accessPeriodValidate,
style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: ColorsManager.red),),
const SizedBox( const SizedBox(
height: 20, height: 20,
), ),
+1
View File
@@ -41,3 +41,4 @@ BoxDecoration containerDecoration = BoxDecoration(
], ],
color: ColorsManager.boxColor, color: ColorsManager.boxColor,
borderRadius: const BorderRadius.all(Radius.circular(10))); borderRadius: const BorderRadius.all(Radius.circular(10)));
-1
View File
@@ -50,7 +50,6 @@ dependencies:
dropdown_search: ^5.0.6 dropdown_search: ^5.0.6
flutter_dotenv: ^5.1.0 flutter_dotenv: ^5.1.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter