Merge pull request #24 from SyncrowIOT/dev

Dev

lib/pages/access_management/view/access_management.dart

@@ -30,7 +30,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
     final padding = isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
 
     return WebScaffold(
-        enableMenuSideba: false,
+        enableMenuSidebar: false,
         appBarTitle: FittedBox(
           child: Text(
             'Access Management',

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 = true;
 
   @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.am;
   }
 
   @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/all_devices/view/device_managment_page.dart

@@ -21,13 +21,11 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
           ),
         ),
         rightBody: const NavigateHomeGridView(),
-        enableMenuSideba: isLargeScreenSize(context),
         scaffoldBody: BlocBuilder<DeviceManagementBloc, DeviceManagementState>(
           builder: (context, state) {
             if (state is DeviceManagementLoading) {
               return const Center(child: CircularProgressIndicator());
-            } else if (state is DeviceManagementLoaded ||
+            } else if (state is DeviceManagementLoaded || state is DeviceManagementFiltered) {
-                state is DeviceManagementFiltered) {
               final devices = state is DeviceManagementLoaded
                   ? state.devices
                   : (state as DeviceManagementFiltered).filteredDevices;

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/home/view/home_page_mobile.dart

@@ -18,7 +18,7 @@ class HomeMobilePage extends StatelessWidget {
       canPop: false,
       onPopInvoked: (didPop) => false,
       child: WebScaffold(
-        enableMenuSideba: false,
+        enableMenuSidebar: false,
         appBarTitle: Row(
           children: [
             SvgPicture.asset(
@@ -41,8 +41,7 @@ class HomeMobilePage extends StatelessWidget {
                     SizedBox(height: size.height * 0.05),
                     const Text(
                       'ACCESS YOUR APPS',
-                      style:
+                      style: TextStyle(fontSize: 20, fontWeight: FontWeight.w700),
-                          TextStyle(fontSize: 20, fontWeight: FontWeight.w700),
                     ),
                     const SizedBox(height: 30),
                     Expanded(
@@ -52,8 +51,7 @@ class HomeMobilePage extends StatelessWidget {
                         width: size.width * 0.68,
                         child: GridView.builder(
                           itemCount: 8,
-                          gridDelegate:
+                          gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                              const SliverGridDelegateWithFixedCrossAxisCount(
                             crossAxisCount: 2,
                             crossAxisSpacing: 20.0,
                             mainAxisSpacing: 20.0,
@@ -65,8 +63,7 @@ class HomeMobilePage extends StatelessWidget {
                               active: homeItems[index]['active'],
                               name: homeItems[index]['title'],
                               img: homeItems[index]['icon'],
-                              onTap: () =>
+                              onTap: () => homeBloc.homeItems[index].onPress(context),
-                                  homeBloc.homeItems[index].onPress(context),
                             );
                           },
                         ),

lib/pages/home/view/home_page_web.dart

@@ -20,7 +20,7 @@ class HomeWebPage extends StatelessWidget {
           builder: (context, state) {
             final homeBloc = BlocProvider.of<HomeBloc>(context);
             return WebScaffold(
-              enableMenuSideba: false,
+              enableMenuSidebar: false,
               appBarTitle: Row(
                 children: [
                   SvgPicture.asset(

lib/pages/visitor_password/bloc/visitor_password_bloc.dart

@@ -32,9 +32,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 +51,7 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
   String accessTypeSelected = 'Online Password';
   String usageFrequencySelected = 'One-Time';
   String passwordController = '';
+  String accessPeriodValidate = '';
 
   bool repeat = false;
 
@@ -377,19 +378,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;
           }
         }
@@ -448,7 +448,6 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
           <Widget>[
             TextButton(
               onPressed: () {
-
                 Navigator.of(context).pop(true);
               },
               child: const Text('OK'),

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)));
+

lib/web_layout/web_scaffold.dart

@@ -6,7 +6,7 @@ import 'package:syncrow_web/web_layout/web_app_bar.dart';
 import 'menu_sidebar.dart';
 
 class WebScaffold extends StatelessWidget with HelperResponsiveLayout {
-  final bool enableMenuSideba;
+  final bool enableMenuSidebar;
   final Widget? appBarTitle;
   final Widget? centerBody;
   final Widget? rightBody;
@@ -17,7 +17,7 @@ class WebScaffold extends StatelessWidget with HelperResponsiveLayout {
     this.centerBody,
     this.rightBody,
     this.scaffoldBody,
-    this.enableMenuSideba = true,
+    this.enableMenuSidebar = false,
   });
   @override
   Widget build(BuildContext context) {
@@ -49,7 +49,7 @@ class WebScaffold extends StatelessWidget with HelperResponsiveLayout {
             Expanded(
               child: Row(
                 children: [
-                  if (enableMenuSideba && !isSmall) const MenuSidebar(),
+                  if (enableMenuSidebar && !isSmall) const MenuSidebar(),
                   Expanded(flex: 5, child: scaffoldBody!)
                 ],
               ),

pubspec.yaml

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