Compare commits

..

3 Commits

Author SHA1 Message Date
388391eec4 stop stacking snackbars 2025-06-29 11:29:43 +03:00
ad00cf35ba added the PR notes 2025-06-23 16:05:16 +03:00
1200a809c2 now cant use offline device to controll 2025-06-23 14:33:56 +03:00
3 changed files with 71 additions and 71 deletions

View File

@ -62,7 +62,8 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
final buttonLabel = final buttonLabel =
(selectedDevices.length > 1) ? 'Batch Control' : 'Control'; (selectedDevices.length > 1) ? 'Batch Control' : 'Control';
final isAnyDeviceOffline =
selectedDevices.any((element) => !(element.online ?? false));
return Row( return Row(
children: [ children: [
Expanded(child: SpaceTreeView( Expanded(child: SpaceTreeView(
@ -103,8 +104,28 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
decoration: containerDecoration, decoration: containerDecoration,
child: Center( child: Center(
child: DefaultButton( child: DefaultButton(
backgroundColor: isAnyDeviceOffline
? ColorsManager.primaryColor
.withValues(alpha: 0.1)
: null,
onPressed: isControlButtonEnabled onPressed: isControlButtonEnabled
? () { ? () {
if (isAnyDeviceOffline) {
ScaffoldMessenger.of(context)
.clearSnackBars();
ScaffoldMessenger.of(context)
.showSnackBar(
const SnackBar(
content: Text(
'This Device is Offline',
),
duration:
Duration(seconds: 2),
),
);
return;
}
if (selectedDevices.length == 1) { if (selectedDevices.length == 1) {
showDialog( showDialog(
context: context, context: context,

View File

@ -1,9 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:syncrow_web/pages/auth/model/user_model.dart';
import 'package:syncrow_web/pages/common/bloc/project_manager.dart'; import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
import 'package:syncrow_web/pages/roles_and_permission/model/roles_user_model.dart';
import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart'; import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart'; import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart'; import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
@ -14,11 +12,8 @@ import 'package:syncrow_web/utils/color_manager.dart';
import 'package:syncrow_web/utils/constants/assets.dart'; import 'package:syncrow_web/utils/constants/assets.dart';
class EditUserDialog extends StatefulWidget { class EditUserDialog extends StatefulWidget {
final RolesUserModel? user; final String? userId;
const EditUserDialog({ const EditUserDialog({super.key, this.userId});
super.key,
this.user,
});
@override @override
_EditUserDialogState createState() => _EditUserDialogState(); _EditUserDialogState createState() => _EditUserDialogState();
@ -33,11 +28,10 @@ class _EditUserDialogState extends State<EditUserDialog> {
create: (BuildContext context) => UsersBloc() create: (BuildContext context) => UsersBloc()
// ..add(const LoadCommunityAndSpacesEvent()) // ..add(const LoadCommunityAndSpacesEvent())
..add(const RoleEvent()) ..add(const RoleEvent())
..add(GetUserByIdEvent(uuid: widget.user!.uuid)), ..add(GetUserByIdEvent(uuid: widget.userId)),
child: BlocConsumer<UsersBloc, UsersState>(listener: (context, state) { child: BlocConsumer<UsersBloc, UsersState>(listener: (context, state) {
if (state is SpacesLoadedState) { if (state is SpacesLoadedState) {
BlocProvider.of<UsersBloc>(context) BlocProvider.of<UsersBloc>(context).add(GetUserByIdEvent(uuid: widget.userId));
.add(GetUserByIdEvent(uuid: widget.user!.uuid));
} }
}, builder: (context, state) { }, builder: (context, state) {
final _blocRole = BlocProvider.of<UsersBloc>(context); final _blocRole = BlocProvider.of<UsersBloc>(context);
@ -45,8 +39,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
return Dialog( return Dialog(
child: Container( child: Container(
decoration: const BoxDecoration( decoration: const BoxDecoration(
color: Colors.white, color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))),
borderRadius: BorderRadius.all(Radius.circular(20))),
width: 900, width: 900,
child: Column( child: Column(
children: [ children: [
@ -75,8 +68,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
children: [ children: [
_buildStep1Indicator(1, "Basics", _blocRole), _buildStep1Indicator(1, "Basics", _blocRole),
_buildStep2Indicator(2, "Spaces", _blocRole), _buildStep2Indicator(2, "Spaces", _blocRole),
_buildStep3Indicator( _buildStep3Indicator(3, "Role & Permissions", _blocRole),
3, "Role & Permissions", _blocRole),
], ],
), ),
), ),
@ -94,7 +86,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
children: [ children: [
const SizedBox(height: 10), const SizedBox(height: 10),
Expanded( Expanded(
child: _getFormContent(widget.user!), child: _getFormContent(widget.userId),
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
], ],
@ -124,14 +116,13 @@ class _EditUserDialogState extends State<EditUserDialog> {
if (currentStep < 3) { if (currentStep < 3) {
currentStep++; currentStep++;
if (currentStep == 2) { if (currentStep == 2) {
_blocRole _blocRole.add(CheckStepStatus(isEditUser: true));
.add(CheckStepStatus(isEditUser: true));
} else if (currentStep == 3) { } else if (currentStep == 3) {
_blocRole.add(const CheckSpacesStepStatus()); _blocRole.add(const CheckSpacesStepStatus());
} }
} else { } else {
_blocRole.add(EditInviteUsers( _blocRole
context: context, userId: widget.user!.uuid)); .add(EditInviteUsers(context: context, userId: widget.userId!));
} }
}); });
}, },
@ -140,8 +131,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
style: TextStyle( style: TextStyle(
color: (_blocRole.isCompleteSpaces == false || color: (_blocRole.isCompleteSpaces == false ||
_blocRole.isCompleteBasics == false || _blocRole.isCompleteBasics == false ||
_blocRole.isCompleteRolePermissions == _blocRole.isCompleteRolePermissions == false) &&
false) &&
currentStep == 3 currentStep == 3
? ColorsManager.grayColor ? ColorsManager.grayColor
: ColorsManager.secondaryColor), : ColorsManager.secondaryColor),
@ -156,15 +146,15 @@ class _EditUserDialogState extends State<EditUserDialog> {
})); }));
} }
Widget _getFormContent(RolesUserModel user) { Widget _getFormContent(userid) {
switch (currentStep) { switch (currentStep) {
case 1: case 1:
return BasicsView( return BasicsView(
userId: user.uuid, userId: userid,
); );
case 2: case 2:
return SpacesAccessView( return SpacesAccessView(
userId: user.uuid, userId: userid,
); );
case 3: case 3:
return const RolesAndPermission(); return const RolesAndPermission();
@ -176,7 +166,6 @@ class _EditUserDialogState extends State<EditUserDialog> {
int step3 = 0; int step3 = 0;
Widget _buildStep1Indicator(int step, String label, UsersBloc bloc) { Widget _buildStep1Indicator(int step, String label, UsersBloc bloc) {
final isCurrentStep = currentStep == step;
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
setState(() { setState(() {
@ -200,7 +189,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
child: Row( child: Row(
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
isCurrentStep currentStep == step
? Assets.currentProcessIcon ? Assets.currentProcessIcon
: bloc.isCompleteBasics == false : bloc.isCompleteBasics == false
? Assets.wrongProcessIcon ? Assets.wrongProcessIcon
@ -215,11 +204,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
label, label,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
color: isCurrentStep color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
? ColorsManager.blackColor fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
: ColorsManager.greyColor,
fontWeight:
isCurrentStep ? FontWeight.bold : FontWeight.normal,
), ),
), ),
], ],
@ -243,7 +229,6 @@ class _EditUserDialogState extends State<EditUserDialog> {
} }
Widget _buildStep2Indicator(int step, String label, UsersBloc bloc) { Widget _buildStep2Indicator(int step, String label, UsersBloc bloc) {
final isCurrentStep = currentStep == step;
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
setState(() { setState(() {
@ -263,7 +248,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
child: Row( child: Row(
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
isCurrentStep currentStep == step
? Assets.currentProcessIcon ? Assets.currentProcessIcon
: bloc.isCompleteSpaces == false : bloc.isCompleteSpaces == false
? Assets.wrongProcessIcon ? Assets.wrongProcessIcon
@ -278,11 +263,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
label, label,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
color: isCurrentStep color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
? ColorsManager.blackColor fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
: ColorsManager.greyColor,
fontWeight:
isCurrentStep ? FontWeight.bold : FontWeight.normal,
), ),
), ),
], ],
@ -306,7 +288,6 @@ class _EditUserDialogState extends State<EditUserDialog> {
} }
Widget _buildStep3Indicator(int step, String label, UsersBloc bloc) { Widget _buildStep3Indicator(int step, String label, UsersBloc bloc) {
final isCurrentStep = currentStep == step;
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
setState(() { setState(() {
@ -325,7 +306,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
child: Row( child: Row(
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
isCurrentStep currentStep == step
? Assets.currentProcessIcon ? Assets.currentProcessIcon
: bloc.isCompleteRolePermissions == false : bloc.isCompleteRolePermissions == false
? Assets.wrongProcessIcon ? Assets.wrongProcessIcon
@ -340,11 +321,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
label, label,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
color: isCurrentStep color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
? ColorsManager.blackColor fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
: ColorsManager.greyColor,
fontWeight:
isCurrentStep ? FontWeight.bold : FontWeight.normal,
), ),
), ),
], ],

View File

@ -19,7 +19,6 @@ 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/extension/build_context_x.dart'; import 'package:syncrow_web/utils/extension/build_context_x.dart';
import 'package:syncrow_web/utils/style.dart'; import 'package:syncrow_web/utils/style.dart';
class UsersPage extends StatelessWidget { class UsersPage extends StatelessWidget {
UsersPage({super.key}); UsersPage({super.key});
@ -452,31 +451,33 @@ class UsersPage extends StatelessWidget {
), ),
Row( Row(
children: [ children: [
if (user.isEnabled != false) user.isEnabled != false
actionButton( ? actionButton(
isActive: true, isActive: true,
title: "Edit", title: "Edit",
onTap: () { onTap: () {
context context
.read<SpaceTreeBloc>() .read<SpaceTreeBloc>()
.add(ClearCachedData()); .add(ClearCachedData());
showDialog( showDialog(
context: context, context: context,
barrierDismissible: false, barrierDismissible: false,
builder: (BuildContext context) { builder: (BuildContext context) {
return EditUserDialog(user: user); return EditUserDialog(
userId: user.uuid);
},
).then((v) {
if (v != null) {
if (v != null) {
_blocRole.add(const GetUsers());
}
}
});
}, },
).then((v) { )
if (v != null) { : actionButton(
_blocRole.add(const GetUsers()); title: "Edit",
} ),
});
},
)
else
actionButton(
title: "Edit",
),
actionButton( actionButton(
title: "Delete", title: "Delete",
onTap: () { onTap: () {