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

update to profile

Browse Source
This commit is contained in:
Aiman Hafiz 2025-12-15 16:04:14 +08:00
parent c21384fb92
commit d93c603573
8 changed files with 145 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/main.dart
View File

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

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

@ -328,7 +328,7 @@ class _ItemScreenState extends State<ItemScreen> {
extentRatio: 0.45, extentRatio: 0.45,
children: [ 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) => 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'), 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))),
], ],
), ),
child: Container( child: Container(

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

@ -246,42 +246,47 @@ class _ManufacturerScreenState extends State<ManufacturerScreen> {
final name = manufacturer['manufacturerName'] ?? 'No Name'; final name = manufacturer['manufacturerName'] ?? 'No Name';
final id = manufacturer['manufacturerId']; final id = manufacturer['manufacturerId'];
return Slidable( return Padding(
key: Key(id.toString()), padding: const EdgeInsets.only(bottom: 12),
endActionPane: ActionPane( child: Slidable(
motion: const StretchMotion(), key: Key(id.toString()),
children: [ endActionPane: ActionPane(
SlidableAction( motion: const StretchMotion(),
onPressed: (context) => _showFormDialog(manufacturer: manufacturer), children: [
backgroundColor: Colors.blue, SlidableAction(
foregroundColor: Colors.white, onPressed: (context) => _showFormDialog(manufacturer: manufacturer),
icon: Icons.edit, backgroundColor: Colors.blue,
label: 'Edit', foregroundColor: Colors.white,
), icon: Icons.edit,
SlidableAction( label: 'Edit',
onPressed: (context) => _confirmDelete(id, name), ),
backgroundColor: Colors.red, SlidableAction(
foregroundColor: Colors.white, onPressed: (context) => _confirmDelete(id, name),
icon: Icons.delete, backgroundColor: Colors.red,
label: 'Delete', foregroundColor: Colors.white,
), icon: Icons.delete,
], label: 'Delete',
), borderRadius: const BorderRadius.horizontal(
child: Card( right: Radius.circular(16)),
margin: const EdgeInsets.only(bottom: 12), ),
color: Colors.white, ],
elevation: 1,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16),
side: BorderSide(color: Colors.grey.shade300, width: 1),
), ),
child: ListTile( child: Card(
title: Text( margin: EdgeInsets.zero,
name, color: Colors.white,
style: const TextStyle( elevation: 1,
fontSize: 16, shape: RoundedRectangleBorder(
fontWeight: FontWeight.w600, borderRadius: BorderRadius.circular(16),
color: Colors.black87, side: BorderSide(color: Colors.grey.shade300, width: 1),
),
child: ListTile(
title: Text(
name,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Colors.black87,
),
), ),
), ),
), ),

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

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

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

@ -186,59 +186,64 @@ class _StationScreenState extends State<StationScreen> {
itemCount: _filteredStations.length, itemCount: _filteredStations.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final station = _filteredStations[index]; final station = _filteredStations[index];
return Slidable( return Padding(
key: Key(station['stationId'].toString()), padding: const EdgeInsets.only(bottom: 12),
endActionPane: ActionPane( child: Slidable(
motion: const StretchMotion(), key: Key(station['stationId'].toString()),
children: [ endActionPane: ActionPane(
SlidableAction( motion: const StretchMotion(),
onPressed: (context) { children: [
Navigator.push( SlidableAction(
context, onPressed: (context) {
MaterialPageRoute( Navigator.push(
builder: (context) => context,
StationFormScreen(station: station)), MaterialPageRoute(
).then((_) => _fetchStations()); builder: (context) =>
}, StationFormScreen(station: station)),
backgroundColor: Colors.blue, ).then((_) => _fetchStations());
foregroundColor: Colors.white, },
icon: Icons.edit, backgroundColor: Colors.blue,
label: 'Edit', foregroundColor: Colors.white,
), icon: Icons.edit,
SlidableAction( label: 'Edit',
onPressed: (context) => _confirmDelete(
station['stationId'],
station['stationName'],
), ),
backgroundColor: Colors.red, SlidableAction(
foregroundColor: Colors.white, onPressed: (context) => _confirmDelete(
icon: Icons.delete, station['stationId'],
label: 'Delete', station['stationName'],
), ),
], backgroundColor: Colors.red,
), foregroundColor: Colors.white,
child: Card( icon: Icons.delete,
margin: const EdgeInsets.only(bottom: 12), label: 'Delete',
color: Colors.white, borderRadius: const BorderRadius.horizontal(
elevation: 1, right: Radius.circular(16)),
shape: RoundedRectangleBorder( ),
borderRadius: BorderRadius.circular(16), ],
side: BorderSide(color: Colors.grey.shade300),
), ),
child: ListTile( child: Card(
contentPadding: const EdgeInsets.symmetric( margin: EdgeInsets.zero,
vertical: 8, color: Colors.white,
horizontal: 16), elevation: 1,
title: Text( shape: RoundedRectangleBorder(
station['stationName'] ?? 'No Name', borderRadius: BorderRadius.circular(16),
style: const TextStyle( side: BorderSide(color: Colors.grey.shade300),
fontSize: 16, ),
fontWeight: FontWeight.w600, child: ListTile(
color: Colors.black87, contentPadding: const EdgeInsets.symmetric(
), vertical: 8,
horizontal: 16),
title: Text(
station['stationName'] ?? 'No Name',
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Colors.black87,
),
),
subtitle: Text(
station['departmentName'] ?? 'No Department'),
), ),
subtitle: Text(
station['departmentName'] ?? 'No Department'),
), ),
), ),
); );

10
lib/screens/bottom_nav_bar.dart
View File

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

1
lib/screens/nav_bar.dart
View File

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

33
lib/services/auth_service.dart
View File

@ -50,6 +50,39 @@ 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 { Future<Map<String, dynamic>> _fetchLdapUserDetails(String sessionCookie, String username) async {
final Uri userInfoUri = Uri.parse('${ApiService.baseUrl}/IdentityAPI/GetUserInformation'); final Uri userInfoUri = Uri.parse('${ApiService.baseUrl}/IdentityAPI/GetUserInformation');
final headers = {'Cookie': sessionCookie}; final headers = {'Cookie': sessionCookie};