new HourPicker

fix changes

lib/pages/auth/bloc/auth_bloc.dart

@@ -34,6 +34,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   final TextEditingController forgetPasswordController = TextEditingController();
   final TextEditingController forgetOtp = TextEditingController();
   final forgetFormKey = GlobalKey<FormState>();
+  final forgetEmailKey = GlobalKey<FormState>();
+  final forgetRegionKey = GlobalKey<FormState>();
   late bool checkValidate = false;
 
   Timer? _timer;
@@ -93,13 +95,14 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async {
-    try {
     emit(LoadingForgetState());
+      try {
         var response = await AuthenticationAPI.verifyOtp(
             email: forgetEmailController.text, otpCode: forgetOtp.text);
         if (response == true) {
           await AuthenticationAPI.forgetPassword(
-            password: forgetPasswordController.text, email: forgetEmailController.text);
+              password: forgetPasswordController.text,
+              email: forgetEmailController.text);
           _timer?.cancel();
           emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
           emit(SuccessForgetState());
@@ -121,6 +124,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
           emit(AuthInitialState());
         }
       }
+
   }
 
   String? validateCode(String? value) {
@@ -231,9 +235,10 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       return 'Email is required';
     } else if (!RegExp(r'^[^@]+@[^@]+\.[^@]+').hasMatch(value)) {
       return 'Enter a valid email address';
-    } else if (regionUuid == '') {
-      return 'Please select your region';
     }
+    // else if (regionUuid == '') {
+    //   return 'Please select your region';
+    // }
     validate = '';
     return null;
   }
@@ -371,6 +376,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     try {
       emit(AuthLoading());
       regionUuid = event.val;
+      add(CheckEnableEvent());
       emit(AuthInitialState());
     } catch (e) {
       emit(FailureForgetState(error: e.toString()));

lib/pages/auth/view/forget_password_web_page.dart

@@ -139,16 +139,21 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                     mainAxisAlignment: MainAxisAlignment.start,
                                     children: [
                                       const SizedBox(height: 10),
-                                          SizedBox(
+                                 Form(
-                                              child: _buildDropdownField(context, forgetBloc, size)
+                                    key: forgetBloc.forgetRegionKey,
-                                          )
+                                     child:      SizedBox(
+                                     child: _buildDropdownField(
+                                         context, forgetBloc, size)))
                                     ],
                                   ),
                                   const SizedBox(height: 20),
-                                      Column(
+                                  Form(
+                                      key: forgetBloc.forgetEmailKey,
+                                      child: Column(
                                         crossAxisAlignment:
                                             CrossAxisAlignment.start,
-                                        mainAxisAlignment: MainAxisAlignment.start,
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.start,
                                         children: [
                                           Text(
                                             "Account",
@@ -157,16 +162,19 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                                 .bodySmall!
                                                 .copyWith(
                                                     fontSize: 14,
-                                                fontWeight: FontWeight.w400),
+                                                    fontWeight:
+                                                        FontWeight.w400),
                                           ),
                                           const SizedBox(height: 10),
                                           SizedBox(
                                             child: TextFormField(
-                                              controller:forgetBloc.forgetEmailController ,
+                                              controller: forgetBloc.forgetEmailController,
                                               validator: forgetBloc.validateEmail,
-                                              decoration: textBoxDecoration()!.copyWith(
+                                              decoration:
+                                                  textBoxDecoration()!.copyWith(
                                                 hintText: 'Enter your email',
-                                                hintStyle: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                                hintStyle: Theme.of(context)
+                                                 .textTheme.bodySmall!.copyWith(
                                                     color: ColorsManager.grayColor,
                                                     fontWeight: FontWeight.w400),
                                               ),
@@ -174,19 +182,8 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                                   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),
                                   Column(
                                     crossAxisAlignment:
@@ -212,27 +209,41 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                           decoration:
                                               textBoxDecoration()!.copyWith(
                                             hintText: 'Enter Code',
-                                                hintStyle: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                            hintStyle: Theme.of(context)
-                                                    color: ColorsManager.grayColor,
+                                                .textTheme
-                                                    fontWeight: FontWeight.w400),
+                                                .bodySmall!
+                                                .copyWith(
+                                                    color:
+                                                        ColorsManager.grayColor,
+                                                    fontWeight:
+                                                        FontWeight.w400),
                                             suffixIcon: SizedBox(
                                               width: 100,
                                               child: Center(
                                                 child: InkWell(
                                                   onTap: state is TimerState &&
-                                                          !state.isButtonEnabled &&
+                                                          !state
-                                                          state.remainingTime != 1
+                                                              .isButtonEnabled &&
-                                                          ? null : () {
+                                                          state.remainingTime !=
+                                                              1
+                                                      ? null
+                                                      : () {
+                                                          if (forgetBloc.forgetEmailKey.currentState!.validate()||forgetBloc.forgetRegionKey.currentState!.validate()) {
+                                                            if(forgetBloc.forgetRegionKey.currentState!.validate()){
                                                               forgetBloc.add(StartTimerEvent());
-
+                                                            }
+                                                          }
                                                         },
                                                   child: Text(
                                                     'Get Code ${state is TimerState && !state.isButtonEnabled && state.remainingTime != 1 ? "(${forgetBloc.formattedTime(state.remainingTime)}) " : ""}',
                                                     style: TextStyle(
-                                                          color: state is TimerState &&
+                                                      color: state
-                                                              !state.isButtonEnabled
+                                                                  is TimerState &&
+                                                              !state
+                                                                  .isButtonEnabled
                                                           ? Colors.grey
-                                                              : ColorsManager.btnColor,
+                                                          : ColorsManager
+                                                              .btnColor,
                                                     ),
                                                   ),
                                                 ),
@@ -243,7 +254,8 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                               color: Colors.black),
                                         ),
                                       ),
-                                          if (forgetBloc.forgetValidate != '') // Check if there is a validation message
+                                      if (forgetBloc.forgetValidate !=
+                                          '') // Check if there is a validation message
                                         Padding(
                                           padding:
                                               const EdgeInsets.only(top: 8.0),
@@ -275,16 +287,45 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                       const SizedBox(height: 10),
                                       SizedBox(
                                         child: TextFormField(
-                                              validator: forgetBloc.passwordValidator,
+                                          obscureText: forgetBloc.obscureText,
-                                              keyboardType: TextInputType.visiblePassword,
+                                          keyboardType:
-                                              controller: forgetBloc.forgetPasswordController,
+                                              TextInputType.visiblePassword,
-                                              decoration: textBoxDecoration()!.copyWith(
+                                          validator:
-                                                hintText: 'At least 8 characters',
+                                              forgetBloc.passwordValidator,
-                                                hintStyle: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                          controller: forgetBloc
-                                                    color: ColorsManager.grayColor,
+                                              .forgetPasswordController,
-                                                    fontWeight: FontWeight.w400),
+                                          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,
                                                 ),
-                                              style: const TextStyle(color: Colors.black),
+                                              ),
+                                            ),
+                                            hintText: 'At least 8 characters',
+                                            hintStyle: Theme.of(context)
+                                                .textTheme
+                                                .bodySmall!
+                                                .copyWith(
+                                                    color:
+                                                        ColorsManager.grayColor,
+                                                    fontWeight:
+                                                        FontWeight.w400),
+                                          ),
+                                          style: const TextStyle(
+                                              color: Colors.black),
                                         ),
                                       ),
                                     ],
@@ -305,9 +346,13 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                               ColorsManager.btnColor,
                                           child: const Text('Submit'),
                                           onPressed: () {
-                                                if (forgetBloc.forgetFormKey.currentState!.validate()) {
+                                            if (forgetBloc.forgetFormKey.currentState!.validate() ||
+                                                forgetBloc.forgetEmailKey.currentState!.validate() ) {
+                                              if(  forgetBloc.forgetEmailKey.currentState!.validate()
+                                                  &&forgetBloc.forgetFormKey.currentState!.validate()  ){
                                                 forgetBloc.add(ChangePasswordEvent());
                                               }
+                                            }
                                           },
                                         ),
                                       ),
@@ -333,7 +378,8 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                         children: [
                                           const Text(
                                             "Do you have an account? ",
-                                                style: TextStyle(color: Colors.white),
+                                            style:
+                                                TextStyle(color: Colors.white),
                                           ),
                                           InkWell(
                                             onTap: () {
@@ -367,7 +413,6 @@ class ForgetPasswordWebPage extends StatelessWidget {
     ));
   }
 
-
   Widget _buildDropdownField(
       BuildContext context, AuthBloc loginBloc, Size size) {
     final TextEditingController textEditingController = TextEditingController();
@@ -383,16 +428,58 @@ class ForgetPasswordWebPage extends StatelessWidget {
               ),
         ),
         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,
+          child: FormField<String>(
+            validator: (value) {
+              if (value == null || value.isEmpty) {
+                return 'Please select a country/region';
+              }
+              return null;
+            },
+            builder: (FormFieldState<String> field) {
+              return InputDecorator(
+                decoration: InputDecoration(
+                  contentPadding:
+                      const EdgeInsets.symmetric(horizontal: 2, vertical: 10),
+                  errorText: field.errorText,
+                  filled:
+                      true, // Ensure the dropdown is filled with the background color
+                  fillColor: ColorsManager
+                      .boxColor, // Match the dropdown container color
+                  border: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(8.0),
+                    borderSide: BorderSide(
+                      color: field.hasError ? Colors.red : Colors.transparent,
+                      width: 1.5,
+                    ),
+                  ),
+                  enabledBorder: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(8.0),
+                    borderSide: BorderSide(
+                      color:
+                          field.hasError ? Colors.red : ColorsManager.grayColor,
+                      width: 1.5,
+                    ),
+                  ),
+                  focusedBorder: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(8.0),
+                    borderSide: BorderSide(
+                      color:
+                          field.hasError ? Colors.red : ColorsManager.grayColor,
+                      width: 1.5,
+                    ),
+                  ),
+                  errorBorder: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(8.0),
+                    borderSide: BorderSide(
+                      color: Colors.red,
+                      width: 1.5,
+                    ),
+                  ),
+                ),
                 child: DropdownButtonHideUnderline(
                   child: DropdownButton2<String>(
-              style: TextStyle(color: Colors.black),
                     isExpanded: true,
                     hint: Text(
                       'Select your region/country',
@@ -404,24 +491,27 @@ class ForgetPasswordWebPage extends StatelessWidget {
                     ),
                     items: loginBloc.regionList!.map((RegionModel region) {
                       return DropdownMenuItem<String>(
-                  value: region.id, // Use region.id as the value
+                        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(
+                    value: loginBloc.regionList!
-                    (region) => region.id == loginBloc.regionUuid,)
+                            .any((region) => region.id == loginBloc.regionUuid)
                         ? loginBloc.regionUuid
                         : null,
                     onChanged: (String? value) {
                       if (value != null) {
-
+                        loginBloc.add(SelectRegionEvent(val: value));
-                  loginBloc.add(SelectRegionEvent(
+                        field.didChange(
-                    val: value,
+                            value); // Notify the form field of the change
-                  ));
                       }
                     },
                     buttonStyleData: const ButtonStyleData(
@@ -431,6 +521,11 @@ class ForgetPasswordWebPage extends StatelessWidget {
                     ),
                     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,
@@ -440,7 +535,8 @@ class ForgetPasswordWebPage extends StatelessWidget {
                       searchInnerWidgetHeight: 50,
                       searchInnerWidget: Container(
                         height: 50,
-                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                        padding: const EdgeInsets.symmetric(
+                            horizontal: 8, vertical: 4),
                         child: TextFormField(
                           style: const TextStyle(color: Colors.black),
                           controller: textEditingController,
@@ -454,11 +550,9 @@ class ForgetPasswordWebPage extends StatelessWidget {
                         ),
                       ),
                       searchMatchFn: (item, searchValue) {
-                  // Use the item's child text (region name) for searching.
+                        final regionName =
-                  final regionName = (item.child as Text).data?.toLowerCase() ?? '';
+                            (item.child as Text).data?.toLowerCase() ?? '';
                         final search = searchValue.toLowerCase().trim();
-                  // Debugging print statement to ensure values are captured correctly.
-                  // Return true if the region name contains the search term.
                         return regionName.contains(search);
                       },
                     ),
@@ -469,9 +563,13 @@ class ForgetPasswordWebPage extends StatelessWidget {
                     },
                   ),
                 ),
+              );
+            },
+          ),
         ),
-
       ],
     );
   }
+
+
 }

lib/pages/common/hour_picker_dialog.dart

@@ -1,7 +1,10 @@
+
+
 import 'package:flutter/material.dart';
 
 class HourPickerDialog extends StatefulWidget {
   final TimeOfDay initialTime;
+
   const HourPickerDialog({super.key, required this.initialTime});
 
   @override
@@ -9,70 +12,50 @@ class HourPickerDialog extends StatefulWidget {
 }
 
 class _HourPickerDialogState extends State<HourPickerDialog> {
-  late int _selectedHour;
+  late String selectedHour;
-  bool _isPm = false;
 
   @override
   void 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
   Widget build(BuildContext context) {
     return AlertDialog(
       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: (value) {
+        onChanged: (String? newValue) {
+          if (newValue != null) {
             setState(() {
-                _selectedHour = value!;
+              selectedHour = newValue; // Update the selected hour without closing the dialog
             });
+          }
         },
       ),
-          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: [
         TextButton(
-          onPressed: () => Navigator.of(context).pop(null),
+          onPressed: () => Navigator.of(context).pop(null), // Close the dialog without selection
           child: const Text('Cancel'),
         ),
         TextButton(
           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'),
         ),
@@ -86,6 +69,7 @@ Future<TimeOfDay?> showHourPicker({
   required TimeOfDay initialTime,
 }) {
   return showDialog<TimeOfDay>(
+    barrierDismissible: false,
     context: context,
     builder: (context) => HourPickerDialog(initialTime: initialTime),
   );

lib/pages/device_managment/ac/view/ac_device_control.dart

@@ -69,7 +69,7 @@ class AcDeviceControl extends StatelessWidget with HelperResponsiveLayout {
                   deviceId: device.uuid!,
                   description: 'Child Lock',
                   icon:
-                      state.status.childLock ? Assets.unlock : Assets.childLock,
+                      state.status.childLock ? Assets.childLock:Assets.unlock ,
                 ),
               ],
             );

lib/pages/device_managment/all_devices/widgets/device_managment_body.dart

@@ -116,7 +116,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                     ? const EdgeInsets.all(30)
                     : const EdgeInsets.all(15),
                 child: DynamicTable(
-                  withSelectAll: true,
+                  withSelectAll: false,
                   cellDecoration: containerDecoration,
                   onRowSelected: (index, isSelected, row) {
                     final selectedDevice = devicesToShow[index];

lib/pages/visitor_password/bloc/visitor_password_bloc.dart

@@ -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/constants/assets.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';
+import 'package:syncrow_web/utils/style.dart';
 
 class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordState> {
   VisitorPasswordBloc() : super(VisitorPasswordInitial()) {
@@ -32,9 +33,9 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
     on<SelectTimeEvent>(selectTimeOfLinePassword);
     on<ChangeTimeEvent>(changeTime);
   }
+
   final TextEditingController userNameController = TextEditingController();
   final TextEditingController emailController = TextEditingController();
-
   final TextEditingController deviceNameController = TextEditingController();
   final TextEditingController deviceIdController = TextEditingController();
   final TextEditingController unitNameController = TextEditingController();
@@ -51,6 +52,7 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
   String accessTypeSelected = 'Online Password';
   String usageFrequencySelected = 'One-Time';
   String passwordController = '';
+  String accessPeriodValidate = '';
 
   bool repeat = false;
 
@@ -377,19 +379,18 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
             1000; // Divide by 1000 to remove milliseconds
         if (event.isEffective) {
           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 {
-            effectiveTime =
+            accessPeriodValidate='';
-                selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
+            effectiveTime = selectedDateTime.toString().split('.').first;
             effectiveTimeTimeStamp = selectedTimestamp;
           }
         } else {
           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 {
-            expirationTime =
+            accessPeriodValidate='';
-                selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
+            expirationTime = selectedDateTime.toString().split('.').first;
             expirationTimeTimeStamp = selectedTimestamp;
           }
         }

lib/pages/visitor_password/view/visitor_password_dialog.dart

@@ -404,6 +404,9 @@ class VisitorPasswordDialog extends StatelessWidget {
                                         ? visitorBloc.expirationTime
                                         : visitorBloc.endTimeAccess.toString(),
                                     icon: Assets.calendarIcon),
+                              const SizedBox(height: 10,),
+                              Text(visitorBloc.accessPeriodValidate,
+                                style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: ColorsManager.red),),
                               const SizedBox(
                                 height: 20,
                               ),

lib/utils/style.dart

@@ -41,3 +41,4 @@ BoxDecoration containerDecoration = BoxDecoration(
     ],
     color: ColorsManager.boxColor,
     borderRadius: const BorderRadius.all(Radius.circular(10)));
+

pubspec.yaml

@@ -50,7 +50,6 @@ dependencies:
   dropdown_search: ^5.0.6
   flutter_dotenv: ^5.1.0
 
-
 dev_dependencies:
   flutter_test:
     sdk: flutter