Merge pull request #22 from SyncrowIOT/fix_hour_picker_dialog

new HourPicker
This commit is contained in:
mohammadnemer1
2024-09-12 14:27:09 +03:00
committed by GitHub
5 changed files with 44 additions and 56 deletions

View File

@ -1,7 +1,10 @@
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
@ -9,70 +12,50 @@ class HourPickerDialog extends StatefulWidget {
} }
class _HourPickerDialogState extends State<HourPickerDialog> { class _HourPickerDialogState extends State<HourPickerDialog> {
late int _selectedHour; late String selectedHour;
bool _isPm = false;
@override @override
void initState() { void initState() {
super.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.pm;
} }
@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: 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: (String? newValue) {
); if (newValue != null) {
}), setState(() {
onChanged: (value) { selectedHour = newValue; // Update the selected hour without closing the dialog
setState(() { });
_selectedHour = value!; }
}); },
},
),
SizedBox(width: 16.0),
DropdownButton<bool>(
value: _isPm,
items: const [
DropdownMenuItem(
value: false,
child: Text('AM'),
),
DropdownMenuItem(
value: true,
child: Text('PM'),
),
],
onChanged: (value) {
setState(() {
_isPm = value!;
});
},
),
],
), ),
actions: [ actions: [
TextButton( TextButton(
onPressed: () => Navigator.of(context).pop(null), onPressed: () => Navigator.of(context).pop(null), // Close the dialog without selection
child: const Text('Cancel'), child: const Text('Cancel'),
), ),
TextButton( TextButton(
onPressed: () { 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'), child: const Text('OK'),
), ),
@ -86,6 +69,7 @@ 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),
); );

View File

@ -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/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()) {
@ -32,9 +33,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();
@ -51,6 +52,7 @@ 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;
@ -377,19 +379,18 @@ 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!) {
CustomSnackBar.displaySnackBar('Effective Time cannot be later than Expiration Time.'); accessPeriodValidate="Effective Time cannot be later than Expiration Time.";
} else { } else {
effectiveTime = accessPeriodValidate='';
selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds effectiveTime = selectedDateTime.toString().split('.').first;
effectiveTimeTimeStamp = selectedTimestamp; effectiveTimeTimeStamp = selectedTimestamp;
} }
} else { } else {
if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) { 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 { } else {
expirationTime = accessPeriodValidate='';
selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds expirationTime = selectedDateTime.toString().split('.').first;
expirationTimeTimeStamp = selectedTimestamp; expirationTimeTimeStamp = selectedTimestamp;
} }
} }

View File

@ -404,6 +404,9 @@ 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,
), ),

View File

@ -41,3 +41,4 @@ BoxDecoration containerDecoration = BoxDecoration(
], ],
color: ColorsManager.boxColor, color: ColorsManager.boxColor,
borderRadius: const BorderRadius.all(Radius.circular(10))); borderRadius: const BorderRadius.all(Radius.circular(10)));

View File

@ -50,7 +50,6 @@ 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