Hamza/musadaq-saas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 2026-05-07 23:24:12

Browse Source
This commit is contained in:
Hamza-Ayed
2026-05-07 23:24:12 +03:00
parent 80f3d257b0
commit 51d1d42f75
6 changed files with 173 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
musadaq-app/lib/features/users/controllers/add_user_controller.dart
View File

@@ -5,6 +5,7 @@ import '../../../core/network/dio_client.dart';
import '../../../core/utils/app_snackbar.dart';
import '../../../core/utils/logger.dart';
import '../../../core/storage/secure_storage.dart';
import '../../dashboard/controllers/dashboard_controller.dart';
import 'users_management_controller.dart';
class AddUserController extends GetxController {
@@ -30,7 +31,18 @@ class AddUserController extends GetxController {
}
Future<void> _checkRoleAndFetchTenants() async {
final role = await _storage.read('user_role');
String role = '';
// 1. Try to get from DashboardController first (fastest)
if (Get.isRegistered<DashboardController>()) {
role = Get.find<DashboardController>().userRole.value;
}
// 2. Fallback to SecureStorage
if (role.isEmpty) {
role = await _storage.read('user_role') ?? '';
}
if (role == 'super_admin') {
isSuperAdmin.value = true;
_fetchTenants();

44
musadaq-app/lib/features/users/views/users_management_view.dart
View File

@@ -13,7 +13,8 @@ class UsersManagementView extends StatelessWidget {
return Scaffold(
appBar: AppBar(
title: const Text('إدارة مستخدمي النظام', style: TextStyle(fontFamily: 'El Messiri')),
title: const Text('إدارة مستخدمي النظام',
style: TextStyle(fontFamily: 'El Messiri')),
centerTitle: true,
backgroundColor: const Color(0xFF0F4C81),
foregroundColor: Colors.white,
@@ -37,9 +38,11 @@ class UsersManagementView extends StatelessWidget {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.people_outline, size: 80, color: Colors.grey.shade400),
Icon(Icons.people_outline,
size: 80, color: Colors.grey.shade400),
const SizedBox(height: 16),
const Text('لا يوجد موظفين مسجلين', style: TextStyle(fontSize: 18, color: Colors.grey)),
const Text('لا يوجد موظفين مسجلين',
style: TextStyle(fontSize: 18, color: Colors.grey)),
],
),
);
@@ -55,28 +58,53 @@ class UsersManagementView extends StatelessWidget {
return Card(
elevation: 2,
margin: const EdgeInsets.only(bottom: 12),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12)),
child: ListTile(
leading: CircleAvatar(
backgroundColor: const Color(0xFF0F4C81).withValues(alpha: 0.1),
backgroundColor:
const Color(0xFF0F4C81).withValues(alpha: 0.1),
child: const Icon(Icons.person, color: Color(0xFF0F4C81)),
),
title: Text(
user['name'] ?? 'مستخدم',
style: const TextStyle(fontWeight: FontWeight.bold),
),
subtitle: Text(user['email'] ?? ''),
trailing: Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
padding:
const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: const Color(0xFF10B981).withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(6),
),
child: Text(
user['role'] ?? '',
style: const TextStyle(color: Color(0xFF10B981), fontSize: 12),
style: const TextStyle(
color: Color(0xFF10B981), fontSize: 12),
),
),
isThreeLine: user['tenant_name'] != null,
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(user['email'] ?? ''),
if (user['tenant_name'] != null) ...[
const SizedBox(height: 4),
Row(
children: [
const Icon(Icons.account_balance,
size: 12, color: Colors.grey),
const SizedBox(width: 4),
Text(
user['tenant_name'],
style: const TextStyle(
fontSize: 12, color: Colors.grey),
),
],
),
],
],
),
),
);
},