Aiman_Hafizuddin/inventory_mobile
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Aiman_Hafizuddin:422ec9a6e1444e95d591f88e6ad567bad5ee5e77
Branches Tags
Aiman_Hafizuddin:main
..
compare: Aiman_Hafizuddin:c21384fb92468d3bc887a0cd28efeaf46dab74b9
Branches Tags
Aiman_Hafizuddin:main

No commits in common. "422ec9a6e1444e95d591f88e6ad567bad5ee5e77" and "c21384fb92468d3bc887a0cd28efeaf46dab74b9" have entirely different histories.
422ec9a6e1 ... c21384fb92

9 changed files with 85 additions and 306 deletions
Show Stats Expand all files Collapse all files

4
lib/main.dart
View File

@ -20,7 +20,6 @@ import 'screens/admin/item_movement/item_movement_station.dart';
import 'screens/admin/product_request/technician_to_invMaster.dart';
import 'screens/admin/product_request/invMaster_to_invMaster.dart';
import 'screens/admin/product_request/product_request_form.dart';
import 'screens/profile/profile_screen.dart'; // Add this import
import 'routes/slide_route.dart';
import 'package:inventory_system/services/api_service.dart';
@ -112,9 +111,6 @@ class InventorySystemApp extends StatelessWidget {
case '/scan-user':
page = const ScanUserScreen();
break;
case '/profile':
page = const ProfileScreen();
break;
case '/item_movement_all':
page = const ItemMovementAllScreen();
break;

2
lib/screens/admin/item/item.dart
View File

@ -328,7 +328,7 @@ class _ItemScreenState extends State<ItemScreen> {
extentRatio: 0.45,
children: [
SlidableAction(onPressed: (context) => Navigator.push(context, MaterialPageRoute(builder: (context) => ItemFormScreen(item: item))).then((success) => {if(success == true) _fetchItems()}), backgroundColor: Colors.blue, foregroundColor: Colors.white, icon: Icons.edit, label: 'Edit'),
SlidableAction(onPressed: (context) => _confirmDelete(item['itemID'], item['productName']), backgroundColor: Colors.red, foregroundColor: Colors.white, icon: Icons.delete, label: 'Delete', borderRadius: const BorderRadius.horizontal(right: Radius.circular(16))),
SlidableAction(onPressed: (context) => _confirmDelete(item['itemID'], item['productName']), backgroundColor: Colors.red, foregroundColor: Colors.white, icon: Icons.delete, label: 'Delete'),
],
),
child: Container(

9
lib/screens/admin/manufacturer/manufacturer.dart
View File

@ -246,9 +246,7 @@ class _ManufacturerScreenState extends State<ManufacturerScreen> {
final name = manufacturer['manufacturerName'] ?? 'No Name';
final id = manufacturer['manufacturerId'];
return Padding(
padding: const EdgeInsets.only(bottom: 12),
child: Slidable(
return Slidable(
key: Key(id.toString()),
endActionPane: ActionPane(
motion: const StretchMotion(),
@ -266,13 +264,11 @@ class _ManufacturerScreenState extends State<ManufacturerScreen> {
foregroundColor: Colors.white,
icon: Icons.delete,
label: 'Delete',
borderRadius: const BorderRadius.horizontal(
right: Radius.circular(16)),
),
],
),
child: Card(
margin: EdgeInsets.zero,
margin: const EdgeInsets.only(bottom: 12),
color: Colors.white,
elevation: 1,
shape: RoundedRectangleBorder(
@ -290,7 +286,6 @@ class _ManufacturerScreenState extends State<ManufacturerScreen> {
),
),
),
),
);
},
);

1
lib/screens/admin/product/product.dart
View File

@ -249,7 +249,6 @@ class _ProductScreenState extends State<ProductScreen> {
foregroundColor: Colors.white,
label: 'Delete',
icon: Icons.delete,
borderRadius: const BorderRadius.horizontal(right: Radius.circular(16)),
),
],
),

9
lib/screens/admin/station/station.dart
View File

@ -186,9 +186,7 @@ class _StationScreenState extends State<StationScreen> {
itemCount: _filteredStations.length,
itemBuilder: (context, index) {
final station = _filteredStations[index];
return Padding(
padding: const EdgeInsets.only(bottom: 12),
child: Slidable(
return Slidable(
key: Key(station['stationId'].toString()),
endActionPane: ActionPane(
motion: const StretchMotion(),
@ -216,13 +214,11 @@ class _StationScreenState extends State<StationScreen> {
foregroundColor: Colors.white,
icon: Icons.delete,
label: 'Delete',
borderRadius: const BorderRadius.horizontal(
right: Radius.circular(16)),
),
],
),
child: Card(
margin: EdgeInsets.zero,
margin: const EdgeInsets.only(bottom: 12),
color: Colors.white,
elevation: 1,
shape: RoundedRectangleBorder(
@ -245,7 +241,6 @@ class _StationScreenState extends State<StationScreen> {
station['departmentName'] ?? 'No Department'),
),
),
),
);
},
);

10
lib/screens/bottom_nav_bar.dart
View File

@ -52,16 +52,6 @@ class BottomNavBar extends StatelessWidget {
return;
}
if (index == 2) {
final currentRoute = ModalRoute.of(context)?.settings.name;
const profileRoute = '/profile';
if (currentRoute != profileRoute) {
Navigator.pushNamed(context, profileRoute);
}
return;
}
onItemTapped(index);
},
backgroundColor: Colors.blue[800],

1
lib/screens/nav_bar.dart
View File

@ -14,7 +14,6 @@ enum AppScreen {
productRequestUser,
itemMovementUser,
scan,
profile,
}
class NavBar extends StatelessWidget {

162
lib/screens/profile/profile_screen.dart
View File

@ -1,162 +0,0 @@
import 'package:flutter/material.dart';
import 'package:inventory_system/screens/bottom_nav_bar.dart';
import 'package:inventory_system/screens/title_bar.dart';
import 'package:inventory_system/services/auth_service.dart';
import 'package:inventory_system/screens/nav_bar.dart';
import 'package:inventory_system/services/session_manager.dart';
class ProfileScreen extends StatefulWidget {
const ProfileScreen({super.key});
@override
State<ProfileScreen> createState() => _ProfileScreenState();
}
class _ProfileScreenState extends State<ProfileScreen> {
final AuthService _authService = AuthService();
late Future<Map<String, dynamic>> _userProfileFuture;
@override
void initState() {
super.initState();
_userProfileFuture = _authService.fetchUserProfile();
}
@override
Widget build(BuildContext context) {
final isAdmin = SessionManager.instance.currentUser?['isAdmin'] ?? false;
return Scaffold(
backgroundColor: const Color(0xFFF5F5F7),
appBar: const TitleBar(title: 'Profile'),
drawer: NavBar(isAdmin: isAdmin, selectedScreen: AppScreen.profile),
body: FutureBuilder<Map<String, dynamic>>(
future: _userProfileFuture,
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const Center(child: CircularProgressIndicator());
}
if (snapshot.hasError) {
return Center(child: Text('Error: ${snapshot.error}'));
}
final data = snapshot.data;
if (data == null || data['success'] != true) {
return Center(child: Text(data?['message'] ?? 'Failed to load profile'));
}
final userInfo = data['data'];
return SingleChildScrollView(
padding: const EdgeInsets.all(24.0),
child: Column(
children: [
const SizedBox(height: 20),
// Avatar
Container(
width: 100,
height: 100,
decoration: BoxDecoration(
color: Colors.white,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.1),
blurRadius: 10,
offset: const Offset(0, 5),
),
],
),
child: const Icon(Icons.person, size: 60, color: Colors.grey),
),
const SizedBox(height: 30),
_buildInfoCard(userInfo),
],
),
);
},
),
bottomNavigationBar: BottomNavBar(
selectedIndex: 2,
onItemTapped: (index) {
// Handled by BottomNavBar internal logic
},
),
);
}
Widget _buildInfoCard(Map<String, dynamic> user) {
final email = user['email'] ?? 'N/A';
final company = user['company'] ?? 'N/A';
final departmentObj = user['department'];
String deptName = 'N/A';
if (departmentObj != null) {
deptName = departmentObj['departmentName'] ?? 'N/A';
}
final roles = user['role'] as List<dynamic>?;
final roleStr = roles?.join(', ') ?? 'N/A';
return Container(
width: double.infinity,
padding: const EdgeInsets.all(24),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(20),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.05),
blurRadius: 15,
offset: const Offset(0, 5),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildInfoRow('Email', email, Icons.email_outlined),
const Divider(height: 32),
_buildInfoRow('Company', company, Icons.business_outlined),
const Divider(height: 32),
_buildInfoRow('Department', deptName, Icons.meeting_room_outlined),
const Divider(height: 32),
_buildInfoRow('Role', roleStr, Icons.admin_panel_settings_outlined),
],
),
);
}
Widget _buildInfoRow(String label, String value, IconData icon) {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Icon(icon, color: Colors.blue.shade700, size: 24),
const SizedBox(width: 16),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
label,
style: TextStyle(
fontSize: 14,
color: Colors.grey.shade500,
fontWeight: FontWeight.w500,
),
),
const SizedBox(height: 4),
Text(
value,
style: const TextStyle(
fontSize: 16,
color: Colors.black87,
fontWeight: FontWeight.w600,
),
),
],
),
),
],
);
}
}

33
lib/services/auth_service.dart
View File

@ -50,39 +50,6 @@ class AuthService {
}
}
Future<Map<String, dynamic>> fetchUserProfile() async {
final String? sessionCookie = SessionManager.instance.getCookie();
if (sessionCookie == null) {
return {'success': false, 'message': 'No active session found.'};
}
final Uri userInfoUri = Uri.parse('${ApiService.baseUrl}/IdentityAPI/GetUserInformation');
final headers = {'Cookie': sessionCookie};
try {
final response = await http.post(userInfoUri, headers: headers);
if (response.statusCode == 200) {
final userInfoResponse = jsonDecode(response.body);
final Map<String, dynamic>? userData = userInfoResponse['userInfo'];
if (userData == null) {
return {'success': false, 'message': 'User profile data is missing from the API response.'};
}
return {
'success': true,
'data': userData // Return raw user data as requested for display
};
} else {
return {'success': false, 'message': 'Failed to retrieve user profile. Status: ${response.statusCode}'};
}
} catch (e) {
debugPrint('Error fetching user profile: $e');
return {'success': false, 'message': 'Error fetching user details.'};
}
}
Future<Map<String, dynamic>> _fetchLdapUserDetails(String sessionCookie, String username) async {
final Uri userInfoUri = Uri.parse('${ApiService.baseUrl}/IdentityAPI/GetUserInformation');
final headers = {'Cookie': sessionCookie};