08f046c89c
This commit introduces a complete overhaul of how equipment is assigned to events, focusing on an enhanced user experience, advanced selection capabilities, and robust conflict detection.
**Key Features & Enhancements:**
- **Advanced Equipment Selection UI (`EquipmentSelectionDialog`):**
- New full-screen dialog to select equipment and containers ("boîtes") for an event.
- Hierarchical view showing containers and a flat list of all individual equipment.
- Real-time search and filtering by equipment category.
- Side panel summarizing the current selection and providing recommendations for containers based on selected equipment.
- Supports quantity selection for consumables and cables.
- **Conflict Detection & Management (`EventAvailabilityService`):**
- A new service (`EventAvailabilityService`) checks for equipment availability against other events based on the selected date range.
- The selection dialog visually highlights equipment and containers with scheduling conflicts (e.g., already used, partially unavailable).
- A dedicated conflict resolution dialog (`EquipmentConflictDialog`) appears if conflicting items are selected, allowing the user to either remove them or force the assignment.
- **Integrated Event Form (`EventAssignedEquipmentSection`):**
- The event creation/editing form now includes a new section for managing assigned equipment.
- It clearly displays assigned containers and standalone equipment, showing the composition of each container.
- Integrates the new selection dialog, ensuring all assignments are checked for conflicts before being saved.
- **Event Preparation & Return Workflow (`EventPreparationPage`):**
- New page (`EventPreparationPage`) for managing the check-out (preparation) and check-in (return) of equipment for an event.
- Provides a checklist of all assigned equipment.
- Users can validate each item, with options to "validate all" or finalize with missing items.
- Includes a dialog (`MissingEquipmentDialog`) to handle discrepancies.
- Supports tracking returned quantities for consumables.
**Data Model and Other Changes:**
- The `EventModel` now includes `assignedContainers` to explicitly link containers to an event.
- `EquipmentAssociatedEventsSection` on the equipment detail page is now functional, displaying current, upcoming, and past events for that item.
- Added deployment and versioning scripts (`scripts/deploy.js`, `scripts/increment_version.js`, `scripts/toggle_env.js`) to automate the release process.
- Introduced an application version display in the main drawer (`AppVersion`).
198 lines
7.6 KiB
Dart
198 lines
7.6 KiB
Dart
import 'package:em2rp/providers/local_user_provider.dart';
|
|
import 'package:em2rp/utils/colors.dart';
|
|
import 'package:em2rp/views/calendar_page.dart';
|
|
import 'package:em2rp/views/my_account_page.dart';
|
|
import 'package:em2rp/views/user_management_page.dart';
|
|
import 'package:em2rp/views/data_management_page.dart';
|
|
import 'package:em2rp/views/equipment_management_page.dart';
|
|
import 'package:em2rp/config/app_version.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:em2rp/views/widgets/image/profile_picture.dart';
|
|
import 'package:provider/provider.dart';
|
|
import 'package:em2rp/utils/permission_gate.dart';
|
|
|
|
class MainDrawer extends StatelessWidget {
|
|
final String currentPage;
|
|
|
|
const MainDrawer({
|
|
super.key,
|
|
required this.currentPage,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Consumer<LocalUserProvider>(
|
|
builder: (context, userProvider, child) {
|
|
final hasUser = userProvider.currentUser != null;
|
|
|
|
return Drawer(
|
|
child: ListView(
|
|
padding: EdgeInsets.zero,
|
|
children: <Widget>[
|
|
DrawerHeader(
|
|
decoration: BoxDecoration(
|
|
image: DecorationImage(
|
|
image: const AssetImage('assets/EM2_NsurB.jpg'),
|
|
fit: BoxFit.cover,
|
|
colorFilter: ColorFilter.mode(
|
|
AppColors.noir.withAlpha(102),
|
|
BlendMode.darken,
|
|
),
|
|
),
|
|
),
|
|
child: Container(
|
|
padding: const EdgeInsets.all(16.0),
|
|
alignment: Alignment.bottomLeft,
|
|
child: SingleChildScrollView(
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
mainAxisAlignment: MainAxisAlignment.end,
|
|
children: [
|
|
if (hasUser)
|
|
ProfilePictureWidget(
|
|
userId: userProvider.currentUser!.uid,
|
|
radius: 30,
|
|
)
|
|
else
|
|
const CircleAvatar(
|
|
radius: 30,
|
|
child: Icon(Icons.account_circle, size: 45),
|
|
),
|
|
const SizedBox(height: 8),
|
|
Text(
|
|
hasUser
|
|
? 'Bonjour, ${userProvider.currentUser!.firstName}'
|
|
: 'Bonjour, Utilisateur',
|
|
style: const TextStyle(
|
|
color: AppColors.blanc,
|
|
fontSize: 18,
|
|
fontWeight: FontWeight.bold,
|
|
shadows: [
|
|
Shadow(
|
|
blurRadius: 3.0,
|
|
color: AppColors.noir,
|
|
offset: Offset(1.0, 1.0),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
ListTile(
|
|
leading: const Icon(Icons.calendar_today),
|
|
title: const Text('Calendrier'),
|
|
selected: currentPage == '/calendar',
|
|
selectedColor: AppColors.rouge,
|
|
onTap: () {
|
|
Navigator.pop(context);
|
|
Navigator.pushReplacement(
|
|
context,
|
|
MaterialPageRoute(
|
|
builder: (context) => const CalendarPage()),
|
|
);
|
|
},
|
|
),
|
|
PermissionGate(
|
|
requiredPermissions: const ['view_equipment'],
|
|
child: ListTile(
|
|
leading: const Icon(Icons.inventory),
|
|
title: const Text('Gestion du Matériel'),
|
|
selected: currentPage == '/equipment_management',
|
|
selectedColor: AppColors.rouge,
|
|
onTap: () {
|
|
Navigator.pop(context);
|
|
Navigator.pushReplacement(
|
|
context,
|
|
MaterialPageRoute(
|
|
builder: (context) =>
|
|
const EquipmentManagementPage()),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
ExpansionTileTheme(
|
|
data: const ExpansionTileThemeData(
|
|
iconColor: AppColors.noir,
|
|
collapsedIconColor: AppColors.noir,
|
|
),
|
|
child: ExpansionTile(
|
|
leading: const Icon(Icons.settings),
|
|
title: const Text('Paramètres'),
|
|
children: <Widget>[
|
|
ListTile(
|
|
leading: const Icon(Icons.account_circle),
|
|
title: const Text('Mon Compte'),
|
|
selected: currentPage == '/my_account',
|
|
selectedColor: AppColors.rouge,
|
|
onTap: () {
|
|
Navigator.pop(context);
|
|
Navigator.pushReplacement(
|
|
context,
|
|
MaterialPageRoute(
|
|
builder: (context) => const MyAccountPage()),
|
|
);
|
|
},
|
|
),
|
|
PermissionGate(
|
|
requiredPermissions: const ['view_all_users'],
|
|
child: ListTile(
|
|
leading: const Icon(Icons.group),
|
|
title: const Text('Gestion des Utilisateurs'),
|
|
selected: currentPage == '/user_management',
|
|
selectedColor: AppColors.rouge,
|
|
onTap: () {
|
|
Navigator.pop(context);
|
|
Navigator.pushReplacement(
|
|
context,
|
|
MaterialPageRoute(
|
|
builder: (context) =>
|
|
const UserManagementPage()),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
PermissionGate(
|
|
requiredPermissions: const ['edit_data'],
|
|
child: ListTile(
|
|
leading: const Icon(Icons.data_usage),
|
|
title: const Text('Gestion des Données'),
|
|
selected: currentPage == '/data_management',
|
|
selectedColor: AppColors.rouge,
|
|
onTap: () {
|
|
Navigator.pop(context);
|
|
Navigator.pushReplacement(
|
|
context,
|
|
MaterialPageRoute(
|
|
builder: (context) => const DataManagementPage()),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
// Version en bas du drawer
|
|
const Divider(),
|
|
Padding(
|
|
padding: const EdgeInsets.all(16.0),
|
|
child: Center(
|
|
child: Text(
|
|
AppVersion.fullVersion,
|
|
style: TextStyle(
|
|
color: Colors.grey.shade600,
|
|
fontSize: 12,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
},
|
|
);
|
|
}
|
|
}
|