forget password changes & bugs number 10 & 15-18

lib/main.dart

@@ -38,6 +38,7 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    HomeBloc.fetchUserInfo();
     return MultiBlocProvider(
         providers: [
           BlocProvider(create: (context) => HomeBloc()),
@@ -57,6 +58,7 @@ class MyApp extends StatelessWidget {
           ),
           theme: myTheme,
           routerConfig: _router,
-        ));
+        )
+    );
   }
 }

lib/pages/access_management/view/access_management.dart

@@ -38,13 +38,23 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
             style: Theme.of(context).textTheme.headlineLarge,
           ),
         ),
-        centerBody: Text(
+        centerBody: Wrap(
+          children: [
+            Padding(
+              padding:  EdgeInsets.only(left: MediaQuery.of(context).size.width*0.09),
+              child: Align(
+                alignment: Alignment.bottomLeft,
+                child: Text(
                   'Physical Access',
                   style: Theme.of(context)
                       .textTheme
                       .headlineMedium!
                       .copyWith(color: Colors.white),
                 ),
+              ),
+            ),
+          ],
+        ),
         rightBody: const NavigateHomeGridView(),
         scaffoldBody: BlocProvider(
             create: (BuildContext context) =>
@@ -82,6 +92,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                               const SizedBox(height: 20),
                               Expanded(
                                   child: DynamicTable(
+                                    withSelectAll: false,
                                 isEmpty: filteredData.isEmpty,
                                 withCheckBox: false,
                                 size: MediaQuery.of(context).size,
@@ -113,8 +124,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 })));
   }
 
-  Wrap _buildVisitorAdminPasswords(
+  Wrap _buildVisitorAdminPasswords(BuildContext context, AccessBloc accessBloc) {
-      BuildContext context, AccessBloc accessBloc) {
     return Wrap(
       spacing: 10,
       runSpacing: 10,
@@ -171,15 +181,14 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
           width: 250,
           child: CustomWebTextField(
             controller: accessBloc.passwordName,
-            height: 38,
+            height: 43,
-            isRequired: true,
+            isRequired: false,
             textFieldName: 'Name',
             description: '',
           ),
         ),
         const SizedBox(width: 15),
         SizedBox(
-          height: 70,
           child: DateTimeWebWidget(
             icon: Assets.calendarIcon,
             isRequired: false,

lib/pages/auth/bloc/auth_bloc.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
@@ -81,21 +82,25 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         _timer?.cancel();
         emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
         emit(SuccessForgetState());
-      } else if (response == "You entered wrong otp") {
+      }
+    }
+   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 (response == "OTP expired") {
+  } else if (errorMessage == "OTP expired") {
     forgetValidate = 'One time password has been expired.';
     emit(AuthInitialState());
   }
-    } catch (failure) {
+
-      // forgetValidate='Invalid Credentials!';
-      emit(AuthInitialState());
-      // emit(FailureForgetState(error: failure.toString()));
    }
   }
 
-//925207
   String? validateCode(String? value) {
     if (value == null || value.isEmpty) {
       return 'Code is required';
@@ -177,15 +182,15 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(LoginInitial());
   }
 
-  checkOtpCode(
+  // checkOtpCode(
-    ChangePasswordEvent event,
+  //   ChangePasswordEvent event,
-    Emitter<AuthState> emit,
+  //   Emitter<AuthState> emit,
-  ) async {
+  // ) async {
-    emit(LoadingForgetState());
+  //   emit(LoadingForgetState());
-    await AuthenticationAPI.verifyOtp(
+  //   await AuthenticationAPI.verifyOtp(
-        email: forgetEmailController.text, otpCode: forgetOtp.text);
+  //       email: forgetEmailController.text, otpCode: forgetOtp.text);
-    emit(SuccessForgetState());
+  //   emit(SuccessForgetState());
-  }
+  // }
 
   void _passwordVisible(PasswordVisibleEvent event, Emitter<AuthState> emit) {
     emit(AuthLoading());

lib/pages/auth/view/forget_password_web_page.dart

@@ -346,8 +346,7 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                             if (forgetBloc
                                                 .forgetFormKey.currentState!
                                                 .validate()) {
-                                              forgetBloc
+                                              forgetBloc.add(ChangePasswordEvent());
-                                                  .add(ChangePasswordEvent());
                                             }
                                           },
                                         ),
@@ -355,7 +354,8 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                     ],
                                   ),
                                   const SizedBox(height: 10.0),
-                                  SizedBox(
+                                  Center(
+                                    child: SizedBox(
                                       child: Text(
                                         forgetBloc.validate,
                                         style: const TextStyle(
@@ -363,6 +363,7 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                             color: ColorsManager.red),
                                       ),
                                     ),
+                                  ),
                                   SizedBox(
                                     height: 10,
                                   ),

lib/pages/common/custom_table.dart

@@ -10,6 +10,7 @@ class DynamicTable extends StatefulWidget {
   final BoxDecoration? cellDecoration;
   final Size size;
   final bool withCheckBox;
+  final bool withSelectAll;
   final bool isEmpty;
   final void Function(bool?)? selectAll;
   final void Function(int, bool, dynamic)? onRowSelected;
@@ -21,6 +22,7 @@ class DynamicTable extends StatefulWidget {
     required this.size,
     required this.isEmpty,
     required this.withCheckBox,
+    required this.withSelectAll,
     this.headerDecoration,
     this.cellDecoration,
     this.selectAll,
@@ -34,6 +36,7 @@ class DynamicTable extends StatefulWidget {
 
 class _DynamicTableState extends State<DynamicTable> {
   late List<bool> _selected;
+  bool _selectAll = false;
 
   @override
   void initState() {
@@ -54,6 +57,17 @@ class _DynamicTableState extends State<DynamicTable> {
     });
   }
 
+
+  void _toggleSelectAll(bool? value) {
+    setState(() {
+      _selectAll = value ?? false;
+      _selected = List<bool>.filled(widget.data.length, _selectAll);
+      if (widget.selectAll != null) {
+        widget.selectAll!(_selectAll);
+      }
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -148,7 +162,7 @@ class _DynamicTableState extends State<DynamicTable> {
       ),
       child: Checkbox(
         value: _selected.every((element) => element == true),
-        onChanged: null,
+        onChanged:widget.withSelectAll?_toggleSelectAll:null,
       ),
     );
   }

lib/pages/common/text_field/custom_web_textfield.dart

@@ -32,21 +32,19 @@ class CustomWebTextField extends StatelessWidget {
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            if (isRequired)
+
               Row(
                 children: [
-                  Text(
+                  if (isRequired)
-                    '* ',
+                  Text('* ',
                     style: Theme.of(context)
-                        .textTheme
+                        .textTheme.bodyMedium!
-                        .bodyMedium!
                         .copyWith(color: Colors.red),
                   ),
                   Text(
                     textFieldName,
                     style: Theme.of(context)
-                        .textTheme
+                        .textTheme.bodySmall!
-                        .bodySmall!
                         .copyWith(color: Colors.black, fontSize: 13),
                   ),
                 ],
@@ -70,15 +68,17 @@ class CustomWebTextField extends StatelessWidget {
         ),
         Container(
           height: height ?? 35,
-          decoration: containerDecoration
+          decoration: containerDecoration.copyWith(
-              .copyWith(color: const Color(0xFFF5F6F7), boxShadow: [
+              color: const Color(0xFFF5F6F7),
+              boxShadow: [
             BoxShadow(
               color: Colors.grey.withOpacity(0.3),
               spreadRadius: 2,
               blurRadius: 3,
               offset: const Offset(1, 1), // changes position of shadow
             ),
-          ]),
+          ]
+          ),
           child: TextFormField(
             validator: validator,
             controller: controller,

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

@@ -51,10 +51,9 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
           'Low Battery ($lowBatteryCount)',
         ];
 
-        return CustomScrollView(
+        return Column(
-          slivers: [
+           children: [
-            SliverToBoxAdapter(
+            Container(
-              child: Container(
               padding: isLargeScreenSize(context)
                   ? const EdgeInsets.all(30)
                   : const EdgeInsets.all(15),
@@ -66,8 +65,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                     tabs: tabs,
                     selectedIndex: selectedIndex,
                     onTabChanged: (index) {
-                        context
+                      context.read<DeviceManagementBloc>()
-                            .read<DeviceManagementBloc>()
                           .add(SelectedFilterChanged(index));
                     },
                   ),
@@ -84,8 +82,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                             ? () {
                                 final selectedDevice = context
                                     .read<DeviceManagementBloc>()
-                                      .selectedDevices
+                                    .selectedDevices.first;
-                                      .first;
                                 showDialog(
                                   context: context,
                                   builder: (context) => DeviceControlDialog(
@@ -109,13 +106,13 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                 ],
               ),
             ),
-            ),
+            Expanded(
-            SliverFillRemaining(
               child: Padding(
                 padding: isLargeScreenSize(context)
                     ? const EdgeInsets.all(30)
                     : const EdgeInsets.all(15),
                 child: DynamicTable(
+                  withSelectAll: false,
                   cellDecoration: containerDecoration,
                   onRowSelected: (index, isSelected, row) {
                     final selectedDevice = devicesToShow[index];

lib/pages/home/bloc/home_bloc.dart

@@ -43,6 +43,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await HomeApi().fetchUserInfo(uuid);
+
     } catch (e) {
       return;
     }

lib/pages/visitor_password/view/add_device_dialog.dart

@@ -40,7 +40,7 @@ class AddDeviceDialog extends StatelessWidget {
                   fontSize: 24,
                   color: Colors.black),
             ),
-            content: Container(
+            content: SizedBox(
               height: MediaQuery.of(context).size.height / 1.7,
               width: MediaQuery.of(context).size.width / 2,
               child: Padding(
@@ -78,7 +78,7 @@ class AddDeviceDialog extends StatelessWidget {
                             ),
                           ],
                         )),
-                    SizedBox(
+                    const SizedBox(
                       height: 20,
                     ),
                     const SizedBox(
@@ -93,7 +93,7 @@ class AddDeviceDialog extends StatelessWidget {
                           flex: 4,
                           child: CustomWebTextField(
                             controller: visitorBloc.deviceNameController,
-                            isRequired: true,
+                            isRequired: false,
                             textFieldName: 'Device Name',
                             description: '',
                           ),
@@ -103,7 +103,7 @@ class AddDeviceDialog extends StatelessWidget {
                           flex: 4,
                           child: CustomWebTextField(
                             controller: visitorBloc.deviceIdController,
-                            isRequired: true,
+                            isRequired: false,
                             textFieldName: 'Device ID',
                             description: '',
                           ),
@@ -113,7 +113,7 @@ class AddDeviceDialog extends StatelessWidget {
                           flex: 4,
                           child: CustomWebTextField(
                             controller: visitorBloc.unitNameController,
-                            isRequired: true,
+                            isRequired: false,
                             textFieldName: 'Unit Name',
                             description: '',
                           ),
@@ -168,14 +168,15 @@ class AddDeviceDialog extends StatelessWidget {
                         flex: 3,
                         child: state is TableLoaded
                             ? DynamicTable(
+                          withSelectAll: true,
+
                           initialSelectedIds: selectedDeviceIds,
                           cellDecoration: containerDecoration,
                           isEmpty: visitorBloc.data.isEmpty,
                           selectAll: (p0) {
                             visitorBloc.selectedDeviceIds.clear();
                             for (var item in state.data) {
-                                    visitorBloc
+                              visitorBloc.add(SelectDeviceEvent(item.uuid));
-                                        .add(SelectDeviceEvent(item.uuid));
                             }
                             },
                           onRowSelected: (index, isSelected, row) {
@@ -200,8 +201,7 @@ class AddDeviceDialog extends StatelessWidget {
                               item.online.value.toString(),
                             ];
                           }).toList(),
-                              )
+                        ) : const Center(child: CircularProgressIndicator()))
-                            : const Center(child: CircularProgressIndicator()))
                   ],
                 ),
               ),

lib/pages/visitor_password/view/visitor_password_dialog.dart

@@ -323,8 +323,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                                                     : visitorBloc.usageFrequencySelected,
                                                 onChanged: (String? value) {
                                                   if (value != null) {
-                                                    context
+                                                    context.read<VisitorPasswordBloc>()
-                                                        .read<VisitorPasswordBloc>()
                                                         .add(SelectUsageFrequency(value));
                                                   }
                                                 },
@@ -344,7 +343,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                                         if (visitorBloc.usageFrequencySelected == 'One-Time' &&
                                             visitorBloc.accessTypeSelected == 'Offline Password')
                                           Text(
-                                            'Within the validity period, there is no limit to the number of times each device can be unlocked.',
+                                            'Within the validity period, each device can be unlocked only once, and the maximum validity period is 6 hours',
                                             style: Theme.of(context).textTheme.bodySmall!.copyWith(
                                                 color: ColorsManager.grayColor, fontSize: 9),
                                           ),

lib/services/auth_api.dart

@@ -25,7 +25,9 @@ class AuthenticationAPI {
         path: ApiEndpoints.forgetPassword,
         body: {"email": email, "password": password},
         showServerMessage: true,
-        expectedResponseModel: (json) {});
+        expectedResponseModel: (json) {
+          print('json=$json');
+        });
     return response;
   }
 
@@ -66,7 +68,6 @@ class AuthenticationAPI {
   }
 
   static Future verifyOtp({required String email, required String otpCode}) async {
-    try {
       final response = await HTTPService().post(
           path: ApiEndpoints.verifyOtp,
           body: {"email": email, "type": "PASSWORD", "otpCode": otpCode},
@@ -79,17 +80,7 @@ class AuthenticationAPI {
             }
           });
       return response;
-    } on DioException catch (e) {
+
-      if (e.response != null) {
-        if (e.response!.statusCode == 400) {
-          final errorData = e.response!.data;
-          String errorMessage = errorData['message'];
-          return errorMessage;
-        }
-      } else {
-        debugPrint('Error: ${e.message}');
-      }
-    }
   }
 
   static Future<List<RegionModel>> fetchRegion() async {

lib/services/home_api.dart

@@ -8,6 +8,7 @@ class HomeApi {
         path: ApiEndpoints.getUser.replaceAll('{userUuid}', userId!),
         showServerMessage: true,
         expectedResponseModel: (json) {
+          print('fetchUserInfo$json');
           return UserModel.fromJson(json);
         });
     return response;