mirror of
https://github.com/SyncrowIOT/web.git
synced 2026-10-26 23:37:57 +00:00
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 mohammad
|
0ac3e79c30 | ||
|
mohammad
|
dbb3450c32 | ||
|
mohammad
|
8c3df39cf4 | ||
|
mohammad
|
7f862fac2a | ||
|
mohammad
|
770db5383b | ||
|
Abdullah
|
eddd4828bb |
@@ -139,9 +139,11 @@ class ForgetPasswordWebPage extends StatelessWidget {
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
const SizedBox(height: 10),
|
||||
SizedBox(
|
||||
child: _buildDropdownField(
|
||||
context, forgetBloc, size))
|
||||
Form(
|
||||
key: forgetBloc.forgetRegionKey,
|
||||
child: SizedBox(
|
||||
child: _buildDropdownField(
|
||||
context, forgetBloc, size)))
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
@@ -226,12 +228,10 @@ class ForgetPasswordWebPage extends StatelessWidget {
|
||||
1
|
||||
? null
|
||||
: () {
|
||||
if (forgetBloc
|
||||
.forgetEmailKey
|
||||
.currentState!
|
||||
.validate()) {
|
||||
forgetBloc.add(
|
||||
StartTimerEvent());
|
||||
if (forgetBloc.forgetEmailKey.currentState!.validate()||forgetBloc.forgetRegionKey.currentState!.validate()) {
|
||||
if(forgetBloc.forgetRegionKey.currentState!.validate()){
|
||||
forgetBloc.add(StartTimerEvent());
|
||||
}
|
||||
}
|
||||
},
|
||||
child: Text(
|
||||
@@ -428,7 +428,7 @@ class ForgetPasswordWebPage extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
Container(
|
||||
SizedBox(
|
||||
width: size.width * 0.9,
|
||||
child: FormField<String>(
|
||||
validator: (value) {
|
||||
@@ -441,7 +441,7 @@ class ForgetPasswordWebPage extends StatelessWidget {
|
||||
return InputDecorator(
|
||||
decoration: InputDecoration(
|
||||
contentPadding:
|
||||
const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
|
||||
const EdgeInsets.symmetric(horizontal: 2, vertical: 10),
|
||||
errorText: field.errorText,
|
||||
filled:
|
||||
true, // Ensure the dropdown is filled with the background color
|
||||
@@ -493,6 +493,10 @@ class ForgetPasswordWebPage extends StatelessWidget {
|
||||
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,
|
||||
@@ -567,252 +571,5 @@ class ForgetPasswordWebPage extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
|
||||
// Widget _buildDropdownField(BuildContext context, AuthBloc loginBloc, Size size) {
|
||||
// final TextEditingController textEditingController = TextEditingController();
|
||||
//
|
||||
// return Column(
|
||||
// crossAxisAlignment: CrossAxisAlignment.start,
|
||||
// mainAxisAlignment: MainAxisAlignment.start,
|
||||
// children: [
|
||||
// Text(
|
||||
// "Country/Region",
|
||||
// style: Theme.of(context).textTheme.bodySmall!.copyWith(
|
||||
// fontSize: 14,
|
||||
// fontWeight: FontWeight.w400,
|
||||
// ),
|
||||
// ),
|
||||
// const SizedBox(height: 10),
|
||||
// Container(
|
||||
// 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: 16, vertical: 10),
|
||||
// errorText: field.errorText,
|
||||
// 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>(
|
||||
// isExpanded: true,
|
||||
// hint: Text(
|
||||
// 'Select your region/country',
|
||||
// style: Theme.of(context).textTheme.bodySmall!.copyWith(
|
||||
// color: ColorsManager.grayColor,
|
||||
// fontWeight: FontWeight.w400,
|
||||
// ),
|
||||
// overflow: TextOverflow.ellipsis,
|
||||
// ),
|
||||
// items: loginBloc.regionList!.map((RegionModel region) {
|
||||
// return DropdownMenuItem<String>(
|
||||
// value: region.id,
|
||||
// child: Text(
|
||||
// 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,
|
||||
// ),
|
||||
// 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();
|
||||
// }
|
||||
// },
|
||||
// ),
|
||||
// ),
|
||||
// );
|
||||
// },
|
||||
// ),
|
||||
// ),
|
||||
// ],
|
||||
// );
|
||||
// }
|
||||
|
||||
// Widget _buildDropdownField(
|
||||
// BuildContext context, AuthBloc loginBloc, Size size) {
|
||||
// final TextEditingController textEditingController = TextEditingController();
|
||||
// return Column(
|
||||
// crossAxisAlignment: CrossAxisAlignment.start,
|
||||
// mainAxisAlignment: MainAxisAlignment.start,
|
||||
// children: [
|
||||
// Text(
|
||||
// "Country/Region",
|
||||
// style: Theme.of(context).textTheme.bodySmall!.copyWith(
|
||||
// fontSize: 14,
|
||||
// fontWeight: FontWeight.w400,
|
||||
// ),
|
||||
// ),
|
||||
// const SizedBox(height: 10),
|
||||
// Container(
|
||||
// height: 50,
|
||||
// decoration: const BoxDecoration(
|
||||
// color: ColorsManager.boxColor,
|
||||
// borderRadius: BorderRadius.all(Radius.circular(8)),
|
||||
// ),
|
||||
// width: size.width * 0.9,
|
||||
// child: DropdownButtonHideUnderline(
|
||||
// child: DropdownButton2<String>(
|
||||
// style: TextStyle(color: Colors.black),
|
||||
// isExpanded: true,
|
||||
// hint: Text(
|
||||
// 'Select your region/country',
|
||||
// style: Theme.of(context).textTheme.bodySmall!.copyWith(
|
||||
// color: ColorsManager.grayColor,
|
||||
// fontWeight: FontWeight.w400,
|
||||
// ),
|
||||
// overflow: TextOverflow.ellipsis,
|
||||
// ),
|
||||
// items: loginBloc.regionList!.map((RegionModel region) {
|
||||
// return DropdownMenuItem<String>(
|
||||
// value: region.id, // Use region.id as the value
|
||||
// child: Text(
|
||||
// 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,
|
||||
// ));
|
||||
// }
|
||||
// },
|
||||
// buttonStyleData: const ButtonStyleData(
|
||||
// padding: EdgeInsets.symmetric(horizontal: 16),
|
||||
// height: 40,
|
||||
// width: double.infinity,
|
||||
// ),
|
||||
// dropdownStyleData: DropdownStyleData(
|
||||
// maxHeight: size.height * 0.70,
|
||||
// ),
|
||||
// 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) {
|
||||
// // Use the item's child text (region name) for searching.
|
||||
// final regionName = (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);
|
||||
// },
|
||||
// ),
|
||||
// onMenuStateChange: (isOpen) {
|
||||
// if (!isOpen) {
|
||||
// textEditingController.clear();
|
||||
// }
|
||||
// },
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
//
|
||||
// ],
|
||||
// );
|
||||
// }
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
bool _isPm = true;
|
||||
late String selectedHour;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_selectedHour = widget.initialTime.hour > 12
|
||||
? widget.initialTime.hour - 12
|
||||
: widget.initialTime.hour;
|
||||
_isPm = widget.initialTime.period == DayPeriod.am;
|
||||
// Initialize the selectedHour with the initial time passed to the dialog
|
||||
selectedHour = widget.initialTime.hour.toString().padLeft(2, '0') + ':00';
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AlertDialog(
|
||||
title: const Text('Select Hour'),
|
||||
content: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
DropdownButton<int>(
|
||||
value: _selectedHour,
|
||||
items: List.generate(12, (index) {
|
||||
int displayHour = index + 1;
|
||||
return DropdownMenuItem(
|
||||
value: displayHour,
|
||||
child: Text(displayHour.toString()),
|
||||
);
|
||||
}),
|
||||
onChanged: (value) {
|
||||
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!;
|
||||
});
|
||||
},
|
||||
),
|
||||
],
|
||||
content: DropdownButton<String>(
|
||||
value: selectedHour, // Show the currently selected hour
|
||||
items: List.generate(24, (index) {
|
||||
String hour = index.toString().padLeft(2, '0');
|
||||
return DropdownMenuItem<String>(
|
||||
value: '$hour:00',
|
||||
child: Text('$hour:00'),
|
||||
);
|
||||
}),
|
||||
onChanged: (String? newValue) {
|
||||
if (newValue != null) {
|
||||
setState(() {
|
||||
selectedHour = newValue; // Update the selected hour without closing the dialog
|
||||
});
|
||||
}
|
||||
},
|
||||
),
|
||||
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;
|
||||
Navigator.of(context).pop(TimeOfDay(hour: hour, minute: 0));
|
||||
// Close the dialog and return the selected time
|
||||
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),
|
||||
);
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -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 =
|
||||
selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
|
||||
accessPeriodValidate='';
|
||||
effectiveTime = selectedDateTime.toString().split('.').first;
|
||||
effectiveTimeTimeStamp = selectedTimestamp;
|
||||
}
|
||||
} else {
|
||||
if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) {
|
||||
CustomSnackBar.displaySnackBar(
|
||||
'Expiration Time cannot be earlier than Effective Time.');
|
||||
accessPeriodValidate= 'Expiration Time cannot be earlier than Effective Time.';
|
||||
} else {
|
||||
expirationTime =
|
||||
selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
|
||||
accessPeriodValidate='';
|
||||
expirationTime = selectedDateTime.toString().split('.').first;
|
||||
expirationTimeTimeStamp = selectedTimestamp;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
),
|
||||
|
||||
@@ -41,3 +41,4 @@ BoxDecoration containerDecoration = BoxDecoration(
|
||||
],
|
||||
color: ColorsManager.boxColor,
|
||||
borderRadius: const BorderRadius.all(Radius.circular(10)));
|
||||
|
||||
|
||||
@@ -50,7 +50,6 @@ dependencies:
|
||||
dropdown_search: ^5.0.6
|
||||
flutter_dotenv: ^5.1.0
|
||||
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
|
||||
Reference in New Issue
Block a user