Authorizer search field & Date-Time Filters & Update Table View Columns

2025-07-09 22:57:21 +00:00 · 2024-09-12 14:54:04 +03:00
parent 8c3df39cf4
commit 7c97d01ddb
7 changed files with 136 additions and 80 deletions
--- a/lib/pages/access_management/bloc/access_bloc.dart
+++ b/lib/pages/access_management/bloc/access_bloc.dart
@ -3,25 +3,27 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
 import 'package:syncrow_web/pages/access_management/model/password_model.dart';
+import 'package:syncrow_web/pages/common/hour_picker_dialog.dart';
 import 'package:syncrow_web/services/access_mang_api.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/app_enum.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';

 class AccessBloc extends Bloc<AccessEvent, AccessState> {
  AccessBloc() : super((AccessInitial())) {
    on<FetchTableData>(_onFetchTableData);
-    // on<TabChangedEvent>(selectFilterTap);
    on<SelectTime>(selectTime);
    on<FilterDataEvent>(_filterData);
    on<ResetSearch>(resetSearch);
    on<TabChangedEvent>(onTabChanged);
  }
+
  String startTime = 'Start Date';
  String endTime = 'End Date';
-
  int? effectiveTimeTimeStamp;
  int? expirationTimeTimeStamp;
  TextEditingController passwordName = TextEditingController();
+  TextEditingController emailAuthorizer = TextEditingController();
  List<PasswordModel> filteredData = [];
  List<PasswordModel> data = [];

@ -62,57 +64,61 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
    }
  }

-  Future<void> selectTime(SelectTime event, Emitter<AccessState> emit) async {
+
+  Future<void> selectTime(SelectTime event, Emitter<AccessState> emit,) async {
    emit(AccessLoaded());
    final DateTime? picked = await showDatePicker(
      context: event.context,
      initialDate: DateTime.now(),
-      firstDate: DateTime(2015, 8),
-      lastDate: DateTime(2101),
+      firstDate:  DateTime.now().add(const Duration(days: -5095)),
+      lastDate: DateTime.now().add(const Duration(days: 2095)),
    );
    if (picked != null) {
-      final selectedDateTime = DateTime(
-        picked.year,
-        picked.month,
-        picked.day,
+      final TimeOfDay? timePicked = await showHourPicker(
+        context: event.context,
+        initialTime: TimeOfDay.now(),
      );
-      final selectedTimestamp = DateTime(
-            selectedDateTime.year,
-            selectedDateTime.month,
-            selectedDateTime.day,
-            selectedDateTime.hour,
-            selectedDateTime.minute,
-          ).millisecondsSinceEpoch ~/
-          1000; // Divide by 1000 to remove milliseconds
-      if (event.isStart) {
-        if (expirationTimeTimeStamp != null && selectedTimestamp > expirationTimeTimeStamp!) {
-          CustomSnackBar.displaySnackBar('Effective Time cannot be later than Expiration Time.');
+
+      if (timePicked != null) {
+        final DateTime selectedDateTime = DateTime(
+          picked.year,
+          picked.month,
+          picked.day,
+          timePicked.hour,
+          timePicked.minute,
+        );
+        final int selectedTimestamp = selectedDateTime.millisecondsSinceEpoch ~/ 1000;
+        if (event.isStart) {
+          if (expirationTimeTimeStamp != null && selectedTimestamp > expirationTimeTimeStamp!) {
+            CustomSnackBar.displaySnackBar('Effective Time cannot be later than Expiration Time.');
+          } else {
+            startTime = selectedDateTime.toString().split('.').first;
+            effectiveTimeTimeStamp = selectedTimestamp;
+          }
        } else {
-          startTime =
-              selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
-          effectiveTimeTimeStamp = selectedTimestamp;
-        }
-      } else {
-        if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) {
-          CustomSnackBar.displaySnackBar('Expiration Time cannot be earlier than Effective Time.');
-        } else {
-          endTime = selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
-          expirationTimeTimeStamp = selectedTimestamp;
+          if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) {
+            CustomSnackBar.displaySnackBar('Expiration Time cannot be earlier than Effective Time.');
+          } else {
+            endTime = selectedDateTime.toString().split('.').first;
+            expirationTimeTimeStamp = selectedTimestamp;
+          }
        }
      }
    }
    emit(ChangeTimeState());
+
  }

+
  Future<void> _filterData(FilterDataEvent event, Emitter<AccessState> emit) async {
    emit(AccessLoaded());
    try {
+      print(event.emailAuthorizer?.toLowerCase());
      // Convert search text to lower case for case-insensitive search
      final searchText = event.passwordName?.toLowerCase() ?? '';
-
+      final searchEmailText = event.emailAuthorizer?.toLowerCase() ?? '';
      filteredData = data.where((item) {
        bool matchesCriteria = true;
-
        // Convert timestamp to DateTime and extract date component
        DateTime effectiveDate =
        DateTime.fromMillisecondsSinceEpoch(int.parse(item.effectiveTime.toString()) * 1000)
@ -122,9 +128,8 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
        DateTime.fromMillisecondsSinceEpoch(int.parse(item.invalidTime.toString()) * 1000)
            .toUtc()
            .toLocal();
-        DateTime effectiveDateOnly =
-        DateTime(effectiveDate.year, effectiveDate.month, effectiveDate.day);
-        DateTime invalidDateOnly = DateTime(invalidDate.year, invalidDate.month, invalidDate.day);
+        DateTime effectiveDateAndTime = DateTime(effectiveDate.year, effectiveDate.month, effectiveDate.day,effectiveDate.hour,effectiveDate.minute);
+        DateTime invalidDateAndTime = DateTime(invalidDate.year, invalidDate.month, invalidDate.day,invalidDate.hour,invalidDate.minute);

        // Filter by password name, making the search case-insensitive
        if (searchText.isNotEmpty) {
@ -133,36 +138,51 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
            matchesCriteria = false;
          }
        }
-
-        // Filter by start date only
-        if (event.startTime != null && event.endTime == null) {
-          DateTime startDateOnly =
-          DateTime.fromMillisecondsSinceEpoch(event.startTime! * 1000).toUtc().toLocal();
-          startDateOnly = DateTime(startDateOnly.year, startDateOnly.month, startDateOnly.day);
-          if (effectiveDateOnly.isBefore(startDateOnly)) {
+        if (searchEmailText.isNotEmpty) {
+          final bool matchesName = item.authorizerEmail.toString().toLowerCase().contains(searchEmailText);
+          if (!matchesName) {
+            matchesCriteria = false;
+          }
+        }
+        // Filter by start date only
+        if (event.startTime != null && event.endTime == null) {
+          DateTime startDateTime =
+          DateTime.fromMillisecondsSinceEpoch(event.startTime! * 1000).toUtc().toLocal();
+          startDateTime = DateTime(
+              startDateTime.year,
+              startDateTime.month,
+              startDateTime.day,
+              startDateTime.hour,
+              startDateTime.minute);
+          if (effectiveDateAndTime.isBefore(startDateTime)) {
            matchesCriteria = false;
          }
        }
-
        // Filter by end date only
        if (event.endTime != null && event.startTime == null) {
-          DateTime endDateOnly =
+          DateTime startDateTime =
          DateTime.fromMillisecondsSinceEpoch(event.endTime! * 1000).toUtc().toLocal();
-          endDateOnly = DateTime(endDateOnly.year, endDateOnly.month, endDateOnly.day);
-          if (invalidDateOnly.isAfter(endDateOnly)) {
+          startDateTime = DateTime(
+              startDateTime.year,
+              startDateTime.month,
+              startDateTime.day,
+              startDateTime.hour,
+              startDateTime.minute
+          );
+          if (invalidDateAndTime.isAfter(startDateTime)) {
            matchesCriteria = false;
          }
        }

        // Filter by both start date and end date
        if (event.startTime != null && event.endTime != null) {
-          DateTime startDateOnly =
+          DateTime startDateTime =
          DateTime.fromMillisecondsSinceEpoch(event.startTime! * 1000).toUtc().toLocal();
-          DateTime endDateOnly =
+          DateTime endDateTime =
          DateTime.fromMillisecondsSinceEpoch(event.endTime! * 1000).toUtc().toLocal();
-          startDateOnly = DateTime(startDateOnly.year, startDateOnly.month, startDateOnly.day);
-          endDateOnly = DateTime(endDateOnly.year, endDateOnly.month, endDateOnly.day);
-          if (effectiveDateOnly.isBefore(startDateOnly) || invalidDateOnly.isAfter(endDateOnly)) {
+          startDateTime = DateTime(startDateTime.year, startDateTime.month, startDateTime.day,startDateTime.hour,startDateTime.minute);
+          endDateTime = DateTime(endDateTime.year, endDateTime.month, endDateTime.day,endDateTime.hour,endDateTime.minute);
+          if (effectiveDateAndTime.isBefore(startDateTime) || invalidDateAndTime.isAfter(endDateTime)) {
            matchesCriteria = false;
          }
        }
@ -186,12 +206,12 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
  }


-
  resetSearch(ResetSearch event, Emitter<AccessState> emit) async {
    emit(AccessLoaded());
    startTime = 'Start Time';
    endTime = 'End Time';
    passwordName.clear();
+    emailAuthorizer.clear();
    selectedIndex = 0;
    effectiveTimeTimeStamp = null;
    expirationTimeTimeStamp = null;
@ -200,9 +220,11 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {

  String timestampToDate(dynamic timestamp) {
    DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(int.parse(timestamp) * 1000);
-    return "${dateTime.year}/${dateTime.month.toString().padLeft(2, '0')}/${dateTime.day.toString().padLeft(2, '0')}";
+    return "${dateTime.year}/${dateTime.month.toString().padLeft(2, '0')}/${dateTime.day.toString().padLeft(2, '0')} "
+        " ${dateTime.hour.toString().padLeft(2, '0')}:${dateTime.minute.toString().padLeft(2, '0')}";
  }

+
  Future<void> onTabChanged(TabChangedEvent event, Emitter<AccessState> emit) async {
    try {
      emit(AccessLoaded());
@ -227,6 +249,7 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
      add(FilterDataEvent(
          selectedTabIndex: selectedIndex,
          passwordName: passwordName.text.toLowerCase(),
+          emailAuthorizer: emailAuthorizer.text.toLowerCase(),
          startTime: effectiveTimeTimeStamp,
          endTime: expirationTimeTimeStamp));
      emit(TableLoaded(filteredData));
@ -234,4 +257,6 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
      emit(FailedState(e.toString()));
    }
  }
+
 }
+
--- a/lib/pages/access_management/bloc/access_event.dart
+++ b/lib/pages/access_management/bloc/access_event.dart
@ -28,12 +28,14 @@ class SelectTime extends AccessEvent {

 class FilterDataEvent extends AccessEvent {
  final String? passwordName;
+  final String? emailAuthorizer;
  final int? startTime;
  final int? endTime;
  final int selectedTabIndex; // Add this field

  const FilterDataEvent({
    this.passwordName,
+    this.emailAuthorizer,
    this.startTime,
    this.endTime,
    required this.selectedTabIndex, // Initialize this field
--- a/lib/pages/access_management/model/password_model.dart
+++ b/lib/pages/access_management/model/password_model.dart
@ -6,10 +6,13 @@ class PasswordModel {
  final dynamic effectiveTime;
  final dynamic passwordCreated;
  final dynamic createdTime;
-  final dynamic passwordName; // New field
+  final dynamic passwordName;
  final AccessStatus passwordStatus;
  final AccessType passwordType;
  final dynamic deviceUuid;
+  final dynamic authorizerEmail;
+  final dynamic authorizerDate;
+  final dynamic deviceName;

  PasswordModel({
    this.passwordId,
@ -17,10 +20,13 @@ class PasswordModel {
    this.effectiveTime,
    this.passwordCreated,
    this.createdTime,
-    this.passwordName, // New field
+    this.passwordName,
    required this.passwordStatus,
    required this.passwordType,
    this.deviceUuid,
+    this.authorizerEmail,
+    this.authorizerDate,
+    this.deviceName,
  });

  factory PasswordModel.fromJson(Map<String, dynamic> json) {
@ -34,6 +40,9 @@ class PasswordModel {
      passwordStatus: AccessStatusExtension.fromString(json['passwordStatus']),
      passwordType: AccessTypeExtension.fromString(json['passwordType']),
      deviceUuid: json['deviceUuid'],
+      authorizerEmail: json['authorizerEmail'],
+      authorizerDate: json['authorizerDate'],
+      deviceName: json['deviceName'],
    );
  }

@ -44,10 +53,13 @@ class PasswordModel {
      'effectiveTime': effectiveTime,
      'passwordCreated': passwordCreated,
      'createdTime': createdTime,
-      'passwodName': passwordName, // New field
+      'passwordName': passwordName, // New field
      'passwordStatus': passwordStatus,
      'passwordType': passwordType,
      'deviceUuid': deviceUuid,
+      'authorizerEmail': authorizerEmail,
+      'authorizerDate': authorizerDate,
+      'deviceName': deviceName,
    };
  }
 }
--- a/lib/pages/access_management/view/access_management.dart
+++ b/lib/pages/access_management/view/access_management.dart
@ -24,6 +24,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {

  @override
  Widget build(BuildContext context) {
+
    final isLargeScreen = isLargeScreenSize(context);
    final isSmallScreen = isSmallScreenSize(context);
    final isHalfMediumScreen = isHafMediumScreenSize(context);
@ -85,7 +86,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                              _buildVisitorAdminPasswords(context, accessBloc),
                              const SizedBox(height: 20),
                              Expanded(
-                                  child: DynamicTable(
+                              child: DynamicTable(
                                tableName: 'AccessManagement',
                                uuidIndex: 1,
                                withSelectAll: true,
@ -96,7 +97,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                                headers: const [
                                  'Name',
                                  'Access Type',
-                                  'Access Period',
+                                  'Access Start',
+                                  'Access End',
                                  'Accessible Device',
                                  'Authorizer',
                                  'Authorization Date & Time',
@ -106,10 +108,11 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                                  return [
                                    item.passwordName,
                                    item.passwordType.value,
-                                    ('${accessBloc.timestampToDate(item.effectiveTime)} - ${accessBloc.timestampToDate(item.invalidTime)}'),
-                                    item.deviceUuid.toString(),
-                                    '',
-                                    '',
+                                    accessBloc.timestampToDate(item.effectiveTime),
+                                    accessBloc.timestampToDate(item.invalidTime),
+                                    item.deviceName.toString(),
+                                    item.authorizerEmail.toString(),
+                                    accessBloc.timestampToDate(item.invalidTime),
                                    item.passwordStatus.value,
                                  ];
                                }).toList(),
@ -166,6 +169,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
  }

  Row _buildNormalSearchWidgets(BuildContext context, AccessBloc accessBloc) {
+    TimeOfDay _selectedTime = TimeOfDay.now();
+
    return Row(
      mainAxisSize: MainAxisSize.min,
      crossAxisAlignment: CrossAxisAlignment.end,
@ -182,6 +187,17 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
          ),
        ),
        const SizedBox(width: 15),
+        SizedBox(
+          width: 250,
+          child: CustomWebTextField(
+            controller: accessBloc.emailAuthorizer,
+            height: 43,
+            isRequired: false,
+            textFieldName: 'Authorizer',
+            description: '',
+          ),
+        ),
+        const SizedBox(width: 15),
        SizedBox(
          child: DateTimeWebWidget(
            icon: Assets.calendarIcon,
@ -189,7 +205,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
            title: 'Access Time',
            size: MediaQuery.of(context).size,
            endTime: () {
-              accessBloc.add(SelectTime(context: context, isStart: false));
+               accessBloc.add(SelectTime(context: context, isStart: false));
            },
            startTime: () {
              accessBloc.add(SelectTime(context: context, isStart: true));
@ -202,6 +218,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
        SearchResetButtons(
          onSearch: () {
            accessBloc.add(FilterDataEvent(
+              emailAuthorizer:accessBloc.emailAuthorizer.text.toLowerCase() ,
                selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
                passwordName: accessBloc.passwordName.text.toLowerCase(),
                startTime: accessBloc.effectiveTimeTimeStamp,
@ -247,10 +264,12 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
        SearchResetButtons(
          onSearch: () {
            accessBloc.add(FilterDataEvent(
+              emailAuthorizer:accessBloc.emailAuthorizer.text.toLowerCase() ,
                selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
                passwordName: accessBloc.passwordName.text.toLowerCase(),
                startTime: accessBloc.effectiveTimeTimeStamp,
-                endTime: accessBloc.expirationTimeTimeStamp));
+                endTime: accessBloc.expirationTimeTimeStamp
+            ));
          },
          onReset: () {
            accessBloc.add(ResetSearch());
@ -259,4 +278,6 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
      ],
    );
  }
+
+
 }
--- a/lib/pages/auth/view/forget_password_web_page.dart
+++ b/lib/pages/auth/view/forget_password_web_page.dart
@ -209,23 +209,17 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                          decoration:
                                              textBoxDecoration()!.copyWith(
                                            hintText: 'Enter Code',
-                                            hintStyle: Theme.of(context)
-                                                .textTheme
-                                                .bodySmall!
-                                                .copyWith(
-                                                    color:
-                                                        ColorsManager.grayColor,
-                                                    fontWeight:
-                                                        FontWeight.w400),
+                                            hintStyle: Theme.of(context).textTheme
+                                             .bodySmall!.copyWith(
+                                               color: ColorsManager.grayColor,
+                                               fontWeight: FontWeight.w400),
                                            suffixIcon: SizedBox(
                                              width: 100,
                                              child: Center(
                                                child: InkWell(
                                                  onTap: state is TimerState &&
-                                                          !state
-                                                              .isButtonEnabled &&
-                                                          state.remainingTime !=
-                                                              1
+                                                     !state.isButtonEnabled &&
+                                                      state.remainingTime != 1
                                                      ? null
                                                      : () {
                                                          if (forgetBloc.forgetEmailKey.currentState!.validate()||forgetBloc.forgetRegionKey.currentState!.validate()) {
--- a/lib/pages/visitor_password/bloc/visitor_password_bloc.dart
+++ b/lib/pages/visitor_password/bloc/visitor_password_bloc.dart
@ -75,13 +75,12 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat

  Future<void> selectTimeVisitorPassword(
    SelectTimeVisitorPassword event,
-    Emitter<VisitorPasswordState> emit,
-  ) async {
+    Emitter<VisitorPasswordState> emit,) async {
    final DateTime? picked = await showDatePicker(
      context: event.context,
      initialDate: DateTime.now(),
      firstDate: DateTime(2015, 8),
-      lastDate: DateTime(3101),
+      lastDate: DateTime.now().add(const Duration(days: 5095)),
    );

    if (picked != null) {
@ -352,13 +351,15 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
      context: event.context,
      initialDate: DateTime.now(),
      firstDate: DateTime.now(),
-      lastDate: DateTime(3101),
+      lastDate: DateTime.now().add(const Duration(days: 2095)),
    );
    if (picked != null) {
      final TimeOfDay? timePicked = await showHourPicker(
        context: event.context,
        initialTime: TimeOfDay.now(),
      );
+      print('timePicked=$timePicked');
+
      if (timePicked != null) {
        final selectedDateTime = DateTime(
          picked.year,
--- a/lib/services/access_mang_api.dart
+++ b/lib/services/access_mang_api.dart
@ -12,6 +12,7 @@ class AccessMangApi {
        path: ApiEndpoints.visitorPassword,
        showServerMessage: true,
        expectedResponseModel: (json) {
+          print(json);
          List<dynamic> jsonData = json;
          List<PasswordModel> passwordList = jsonData.map((jsonItem) {
            return PasswordModel.fromJson(jsonItem);