Compare commits

..
Author SHA1 Message Date
mohammad 6b2e0b1ce5 fix changes 2024-09-09 13:15:35 +03:00
7 changed files with 68 additions and 60 deletions
@@ -139,11 +139,9 @@ class ForgetPasswordWebPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
const SizedBox(height: 10), const SizedBox(height: 10),
Form( SizedBox(
key: forgetBloc.forgetRegionKey,
child: SizedBox(
child: _buildDropdownField( child: _buildDropdownField(
context, forgetBloc, size))) context, forgetBloc, size))
], ],
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
@@ -228,10 +226,12 @@ class ForgetPasswordWebPage extends StatelessWidget {
1 1
? null ? null
: () { : () {
if (forgetBloc.forgetEmailKey.currentState!.validate()||forgetBloc.forgetRegionKey.currentState!.validate()) { if (forgetBloc
if(forgetBloc.forgetRegionKey.currentState!.validate()){ .forgetEmailKey
forgetBloc.add(StartTimerEvent()); .currentState!
} .validate()) {
forgetBloc.add(
StartTimerEvent());
} }
}, },
child: Text( child: Text(
@@ -428,7 +428,7 @@ class ForgetPasswordWebPage extends StatelessWidget {
), ),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
SizedBox( Container(
width: size.width * 0.9, width: size.width * 0.9,
child: FormField<String>( child: FormField<String>(
validator: (value) { validator: (value) {
@@ -493,10 +493,7 @@ class ForgetPasswordWebPage extends StatelessWidget {
return DropdownMenuItem<String>( return DropdownMenuItem<String>(
value: region.id, value: region.id,
child: Text( child: Text(
style: Theme.of(context).textTheme.bodyMedium!.copyWith( style: Theme.of(context).textTheme.bodyMedium,
fontSize: 14,
fontWeight: FontWeight.w400,
),
region.name, region.name,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 1, maxLines: 1,
@@ -571,5 +568,4 @@ class ForgetPasswordWebPage extends StatelessWidget {
); );
} }
} }
+42 -26
View File
@@ -1,10 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class HourPickerDialog extends StatefulWidget { class HourPickerDialog extends StatefulWidget {
final TimeOfDay initialTime; final TimeOfDay initialTime;
const HourPickerDialog({super.key, required this.initialTime}); const HourPickerDialog({super.key, required this.initialTime});
@override @override
@@ -12,50 +9,70 @@ class HourPickerDialog extends StatefulWidget {
} }
class _HourPickerDialogState extends State<HourPickerDialog> { class _HourPickerDialogState extends State<HourPickerDialog> {
late String selectedHour; late int _selectedHour;
bool _isPm = true;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
// Initialize the selectedHour with the initial time passed to the dialog _selectedHour = widget.initialTime.hour > 12
selectedHour = widget.initialTime.hour.toString().padLeft(2, '0') + ':00'; ? widget.initialTime.hour - 12
: widget.initialTime.hour;
_isPm = widget.initialTime.period == DayPeriod.am;
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AlertDialog( return AlertDialog(
title: const Text('Select Hour'), title: const Text('Select Hour'),
content: DropdownButton<String>( content: Row(
value: selectedHour, // Show the currently selected hour mainAxisAlignment: MainAxisAlignment.center,
items: List.generate(24, (index) { children: [
String hour = index.toString().padLeft(2, '0'); DropdownButton<int>(
return DropdownMenuItem<String>( value: _selectedHour,
value: '$hour:00', items: List.generate(12, (index) {
child: Text('$hour:00'), int displayHour = index + 1;
return DropdownMenuItem(
value: displayHour,
child: Text(displayHour.toString()),
); );
}), }),
onChanged: (String? newValue) { onChanged: (value) {
if (newValue != null) {
setState(() { setState(() {
selectedHour = newValue; // Update the selected hour without closing the dialog _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!;
});
},
),
],
),
actions: [ actions: [
TextButton( TextButton(
onPressed: () => Navigator.of(context).pop(null), // Close the dialog without selection onPressed: () => Navigator.of(context).pop(null),
child: const Text('Cancel'), child: const Text('Cancel'),
), ),
TextButton( TextButton(
onPressed: () { onPressed: () {
// Close the dialog and return the selected time int hour = _isPm ? _selectedHour + 12 : _selectedHour;
Navigator.of(context).pop( Navigator.of(context).pop(TimeOfDay(hour: hour, minute: 0));
TimeOfDay(
hour: int.parse(selectedHour.split(':')[0]),
minute: 0,
),
);
}, },
child: const Text('OK'), child: const Text('OK'),
), ),
@@ -69,7 +86,6 @@ Future<TimeOfDay?> showHourPicker({
required TimeOfDay initialTime, required TimeOfDay initialTime,
}) { }) {
return showDialog<TimeOfDay>( return showDialog<TimeOfDay>(
barrierDismissible: false,
context: context, context: context,
builder: (context) => HourPickerDialog(initialTime: initialTime), builder: (context) => HourPickerDialog(initialTime: initialTime),
); );
@@ -116,7 +116,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
? const EdgeInsets.all(30) ? const EdgeInsets.all(30)
: const EdgeInsets.all(15), : const EdgeInsets.all(15),
child: DynamicTable( child: DynamicTable(
withSelectAll: false, withSelectAll: true,
cellDecoration: containerDecoration, cellDecoration: containerDecoration,
onRowSelected: (index, isSelected, row) { onRowSelected: (index, isSelected, row) {
final selectedDevice = devicesToShow[index]; final selectedDevice = devicesToShow[index];
@@ -14,7 +14,6 @@ import 'package:syncrow_web/services/access_mang_api.dart';
import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/color_manager.dart';
import 'package:syncrow_web/utils/constants/assets.dart'; import 'package:syncrow_web/utils/constants/assets.dart';
import 'package:syncrow_web/utils/snack_bar.dart'; import 'package:syncrow_web/utils/snack_bar.dart';
import 'package:syncrow_web/utils/style.dart';
class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordState> { class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordState> {
VisitorPasswordBloc() : super(VisitorPasswordInitial()) { VisitorPasswordBloc() : super(VisitorPasswordInitial()) {
@@ -33,9 +32,9 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
on<SelectTimeEvent>(selectTimeOfLinePassword); on<SelectTimeEvent>(selectTimeOfLinePassword);
on<ChangeTimeEvent>(changeTime); on<ChangeTimeEvent>(changeTime);
} }
final TextEditingController userNameController = TextEditingController(); final TextEditingController userNameController = TextEditingController();
final TextEditingController emailController = TextEditingController(); final TextEditingController emailController = TextEditingController();
final TextEditingController deviceNameController = TextEditingController(); final TextEditingController deviceNameController = TextEditingController();
final TextEditingController deviceIdController = TextEditingController(); final TextEditingController deviceIdController = TextEditingController();
final TextEditingController unitNameController = TextEditingController(); final TextEditingController unitNameController = TextEditingController();
@@ -52,7 +51,6 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
String accessTypeSelected = 'Online Password'; String accessTypeSelected = 'Online Password';
String usageFrequencySelected = 'One-Time'; String usageFrequencySelected = 'One-Time';
String passwordController = ''; String passwordController = '';
String accessPeriodValidate = '';
bool repeat = false; bool repeat = false;
@@ -379,18 +377,19 @@ class VisitorPasswordBloc extends Bloc<VisitorPasswordEvent, VisitorPasswordStat
1000; // Divide by 1000 to remove milliseconds 1000; // Divide by 1000 to remove milliseconds
if (event.isEffective) { if (event.isEffective) {
if (expirationTimeTimeStamp != null && selectedTimestamp > expirationTimeTimeStamp!) { if (expirationTimeTimeStamp != null && selectedTimestamp > expirationTimeTimeStamp!) {
accessPeriodValidate="Effective Time cannot be later than Expiration Time."; CustomSnackBar.displaySnackBar('Effective Time cannot be later than Expiration Time.');
} else { } else {
accessPeriodValidate=''; effectiveTime =
effectiveTime = selectedDateTime.toString().split('.').first; selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
effectiveTimeTimeStamp = selectedTimestamp; effectiveTimeTimeStamp = selectedTimestamp;
} }
} else { } else {
if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) { if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) {
accessPeriodValidate= 'Expiration Time cannot be earlier than Effective Time.'; CustomSnackBar.displaySnackBar(
'Expiration Time cannot be earlier than Effective Time.');
} else { } else {
accessPeriodValidate=''; expirationTime =
expirationTime = selectedDateTime.toString().split('.').first; selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
expirationTimeTimeStamp = selectedTimestamp; expirationTimeTimeStamp = selectedTimestamp;
} }
} }
@@ -404,9 +404,6 @@ class VisitorPasswordDialog extends StatelessWidget {
? visitorBloc.expirationTime ? visitorBloc.expirationTime
: visitorBloc.endTimeAccess.toString(), : visitorBloc.endTimeAccess.toString(),
icon: Assets.calendarIcon), icon: Assets.calendarIcon),
const SizedBox(height: 10,),
Text(visitorBloc.accessPeriodValidate,
style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: ColorsManager.red),),
const SizedBox( const SizedBox(
height: 20, height: 20,
), ),
-1
View File
@@ -41,4 +41,3 @@ BoxDecoration containerDecoration = BoxDecoration(
], ],
color: ColorsManager.boxColor, color: ColorsManager.boxColor,
borderRadius: const BorderRadius.all(Radius.circular(10))); borderRadius: const BorderRadius.all(Radius.circular(10)));
+1
View File
@@ -50,6 +50,7 @@ dependencies:
dropdown_search: ^5.0.6 dropdown_search: ^5.0.6
flutter_dotenv: ^5.1.0 flutter_dotenv: ^5.1.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter