ElPoyo/EM2_ERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: ajout de champs jauge et contact mail et télphone.

Browse Source 
Changement des icons de l'app
This commit is contained in:
ElPoyo
2025-12-20 15:38:27 +01:00
parent 28d9e008af
commit df9e24d3b3
52 changed files with 353 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
em2rp/lib/config/app_version.dart
View File

@@ -1,6 +1,6 @@
/// Configuration de la version de l'application
class AppVersion {
static const String version = '0.3.4';
static const String version = '0.3.5';
/// Retourne la version complète de l'application
static String get fullVersion => 'v$version';

18
em2rp/lib/controllers/event_form_controller.dart
View File

@@ -17,6 +17,9 @@ class EventFormController extends ChangeNotifier {
final TextEditingController installationController = TextEditingController();
final TextEditingController disassemblyController = TextEditingController();
final TextEditingController addressController = TextEditingController();
final TextEditingController jaugeController = TextEditingController();
final TextEditingController contactEmailController = TextEditingController();
final TextEditingController contactPhoneController = TextEditingController();
// State variables
DateTime? _startDateTime;
@@ -67,6 +70,9 @@ class EventFormController extends ChangeNotifier {
disassemblyController.addListener(_onAnyFieldChanged);
addressController.addListener(_onAnyFieldChanged);
descriptionController.addListener(_onAnyFieldChanged);
jaugeController.addListener(_onAnyFieldChanged);
contactEmailController.addListener(_onAnyFieldChanged);
contactPhoneController.addListener(_onAnyFieldChanged);
}
void _onAnyFieldChanged() {
@@ -97,6 +103,9 @@ class EventFormController extends ChangeNotifier {
installationController.text = event.installationTime.toString();
disassemblyController.text = event.disassemblyTime.toString();
addressController.text = event.address;
jaugeController.text = event.jauge?.toString() ?? '';
contactEmailController.text = event.contactEmail ?? '';
contactPhoneController.text = event.contactPhone ?? '';
_startDateTime = event.startDateTime;
_endDateTime = event.endDateTime;
_assignedEquipment = List<EventEquipment>.from(event.assignedEquipment);
@@ -310,6 +319,9 @@ class EventFormController extends ChangeNotifier {
documents: finalDocuments,
options: _selectedOptions,
status: _selectedStatus,
jauge: jaugeController.text.isNotEmpty ? int.tryParse(jaugeController.text) : null,
contactEmail: contactEmailController.text.isNotEmpty ? contactEmailController.text.trim() : null,
contactPhone: contactPhoneController.text.isNotEmpty ? contactPhoneController.text.trim() : null,
assignedEquipment: _assignedEquipment,
assignedContainers: _assignedContainers,
preparationStatus: existingEvent.preparationStatus,
@@ -352,6 +364,9 @@ class EventFormController extends ChangeNotifier {
documents: _uploadedFiles,
options: _selectedOptions,
status: _selectedStatus,
jauge: jaugeController.text.isNotEmpty ? int.tryParse(jaugeController.text) : null,
contactEmail: contactEmailController.text.isNotEmpty ? contactEmailController.text.trim() : null,
contactPhone: contactPhoneController.text.isNotEmpty ? contactPhoneController.text.trim() : null,
assignedContainers: _assignedContainers,
assignedEquipment: _assignedEquipment,
);
@@ -437,6 +452,9 @@ class EventFormController extends ChangeNotifier {
installationController.dispose();
disassemblyController.dispose();
addressController.dispose();
jaugeController.dispose();
contactEmailController.dispose();
contactPhoneController.dispose();
super.dispose();
}
}

14
em2rp/lib/models/event_model.dart
View File

@@ -172,6 +172,11 @@ class EventModel {
final List<Map<String, dynamic>> options;
final EventStatus status;
// Champs de contact
final int? jauge;
final String? contactEmail;
final String? contactPhone;
// Nouveaux champs pour la gestion du matériel
final List<EventEquipment> assignedEquipment;
final List<String> assignedContainers; // IDs des conteneurs assignés
@@ -197,6 +202,9 @@ class EventModel {
required this.documents,
this.options = const [],
this.status = EventStatus.waitingForApproval,
this.jauge,
this.contactEmail,
this.contactPhone,
this.assignedEquipment = const [],
this.assignedContainers = const [],
this.preparationStatus,
@@ -329,6 +337,9 @@ class EventModel {
documents: docs,
options: options,
status: eventStatusFromString(map['status'] as String?),
jauge: map['jauge'] != null ? _parseInt(map['jauge']) : null,
contactEmail: map['contactEmail']?.toString(),
contactPhone: map['contactPhone']?.toString(),
assignedEquipment: assignedEquipment,
preparationStatus: preparationStatusFromString(map['preparationStatus'] as String?),
returnStatus: returnStatusFromString(map['returnStatus'] as String?),
@@ -384,6 +395,9 @@ class EventModel {
'documents': documents,
'options': options,
'status': eventStatusToString(status),
'jauge': jauge,
'contactEmail': contactEmail,
'contactPhone': contactPhone,
'assignedEquipment': assignedEquipment.map((e) => e.toMap()).toList(),
'assignedContainers': assignedContainers,
'preparationStatus': preparationStatus != null ? preparationStatusToString(preparationStatus!) : null,

3
em2rp/lib/views/event_add_page.dart
View File

@@ -238,6 +238,9 @@ class _EventAddEditPageState extends State<EventAddEditPage> {
installationController: controller.installationController,
disassemblyController: controller.disassemblyController,
addressController: controller.addressController,
jaugeController: controller.jaugeController,
contactEmailController: controller.contactEmailController,
contactPhoneController: controller.contactPhoneController,
isMobile: isMobile,
onAnyFieldChanged: () {}, // Géré automatiquement par le contrôleur
),

110
em2rp/lib/views/widgets/calendar_widgets/event_details_components/event_details_description.dart
View File

@@ -12,6 +12,8 @@ class EventDetailsDescription extends StatelessWidget {
@override
Widget build(BuildContext context) {
final bool isMobile = MediaQuery.of(context).size.width < 600;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -24,10 +26,17 @@ class EventDetailsDescription extends StatelessWidget {
),
const SizedBox(height: 8),
SelectableText(
event.description,
event.description.isEmpty ? 'Aucune description' : event.description,
style: Theme.of(context).textTheme.bodyLarge,
),
const SizedBox(height: 16),
// Informations de contact et jauge
if (event.jauge != null || event.contactEmail != null || event.contactPhone != null) ...[
isMobile ? _buildContactInfoMobile(context) : _buildContactInfoDesktop(context),
const SizedBox(height: 16),
],
Text(
'Adresse',
style: Theme.of(context).textTheme.titleLarge?.copyWith(
@@ -50,5 +59,104 @@ class EventDetailsDescription extends StatelessWidget {
],
);
}
Widget _buildContactInfoMobile(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (event.jauge != null) ...[
_buildInfoRow(context, Icons.people, 'Jauge', '${event.jauge} personnes'),
const SizedBox(height: 8),
],
if (event.contactEmail != null) ...[
_buildInfoRow(context, Icons.email, 'Email', event.contactEmail!),
const SizedBox(height: 8),
],
if (event.contactPhone != null) ...[
_buildInfoRow(context, Icons.phone, 'Téléphone', event.contactPhone!),
],
],
);
}
Widget _buildContactInfoDesktop(BuildContext context) {
return Wrap(
spacing: 24,
runSpacing: 12,
children: [
if (event.jauge != null)
_buildInfoChip(context, Icons.people, 'Jauge', '${event.jauge} personnes'),
if (event.contactEmail != null)
_buildInfoChip(context, Icons.email, 'Email', event.contactEmail!),
if (event.contactPhone != null)
_buildInfoChip(context, Icons.phone, 'Téléphone', event.contactPhone!),
],
);
}
Widget _buildInfoRow(BuildContext context, IconData icon, String label, String value) {
return Row(
children: [
Icon(icon, size: 20, color: Theme.of(context).primaryColor),
const SizedBox(width: 8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
label,
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: Colors.grey[600],
),
),
SelectableText(
value,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
fontWeight: FontWeight.w500,
),
),
],
),
),
],
);
}
Widget _buildInfoChip(BuildContext context, IconData icon, String label, String value) {
final primaryColor = Theme.of(context).primaryColor;
return Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
decoration: BoxDecoration(
color: primaryColor.withOpacity(0.1),
borderRadius: BorderRadius.circular(8),
border: Border.all(color: primaryColor.withOpacity(0.2)),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, size: 18, color: primaryColor),
const SizedBox(width: 8),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
label,
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: Colors.grey[600],
),
),
SelectableText(
value,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
fontWeight: FontWeight.w500,
),
),
],
),
],
),
);
}
}

129
em2rp/lib/views/widgets/event_form/event_details_section.dart
View File

@@ -6,6 +6,9 @@ class EventDetailsSection extends StatefulWidget {
final TextEditingController installationController;
final TextEditingController disassemblyController;
final TextEditingController addressController;
final TextEditingController jaugeController;
final TextEditingController contactEmailController;
final TextEditingController contactPhoneController;
final bool isMobile;
final VoidCallback onAnyFieldChanged;
@@ -15,6 +18,9 @@ class EventDetailsSection extends StatefulWidget {
required this.installationController,
required this.disassemblyController,
required this.addressController,
required this.jaugeController,
required this.contactEmailController,
required this.contactPhoneController,
required this.isMobile,
required this.onAnyFieldChanged,
});
@@ -51,27 +57,15 @@ class _EventDetailsSectionState extends State<EventDetailsSection> {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildSectionTitle('Détails'),
AnimatedContainer(
duration: const Duration(milliseconds: 200),
constraints: BoxConstraints(
minHeight: 48,
maxHeight: widget.isMobile ? 48.0 * 20 : 48.0 * 10,
),
child: TextFormField(
controller: widget.descriptionController,
minLines: 1,
maxLines: _descriptionMaxLines > (widget.isMobile ? 20 : 10)
? (widget.isMobile ? 20 : 10)
: _descriptionMaxLines,
decoration: const InputDecoration(
labelText: 'Description',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.description),
),
onChanged: (_) => widget.onAnyFieldChanged(),
),
),
// Description et champs de contact
widget.isMobile
? _buildMobileLayout()
: _buildDesktopLayout(),
const SizedBox(height: 20),
// Installation et démontage
Row(
children: [
Expanded(
@@ -93,6 +87,7 @@ class _EventDetailsSectionState extends State<EventDetailsSection> {
),
],
),
_buildSectionTitle('Adresse*'),
TextFormField(
controller: widget.addressController,
@@ -108,6 +103,100 @@ class _EventDetailsSectionState extends State<EventDetailsSection> {
);
}
Widget _buildMobileLayout() {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildDescriptionField(),
const SizedBox(height: 16),
_buildContactFields(),
],
);
}
Widget _buildDesktopLayout() {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
flex: 2,
child: _buildDescriptionField(),
),
const SizedBox(width: 16),
Expanded(
flex: 1,
child: _buildContactFields(),
),
],
);
}
Widget _buildDescriptionField() {
return AnimatedContainer(
duration: const Duration(milliseconds: 200),
constraints: BoxConstraints(
minHeight: 48,
maxHeight: widget.isMobile ? 48.0 * 20 : 48.0 * 10,
),
child: TextFormField(
controller: widget.descriptionController,
minLines: 1,
maxLines: _descriptionMaxLines > (widget.isMobile ? 20 : 10)
? (widget.isMobile ? 20 : 10)
: _descriptionMaxLines,
decoration: const InputDecoration(
labelText: 'Description',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.description),
),
onChanged: (_) => widget.onAnyFieldChanged(),
),
);
}
Widget _buildContactFields() {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
TextFormField(
controller: widget.jaugeController,
decoration: const InputDecoration(
labelText: 'Jauge',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.people),
hintText: 'Nombre de personnes',
),
keyboardType: TextInputType.number,
onChanged: (_) => widget.onAnyFieldChanged(),
),
const SizedBox(height: 12),
TextFormField(
controller: widget.contactEmailController,
decoration: const InputDecoration(
labelText: 'Email de contact',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.email),
hintText: 'contact@exemple.com',
),
keyboardType: TextInputType.emailAddress,
onChanged: (_) => widget.onAnyFieldChanged(),
),
const SizedBox(height: 12),
TextFormField(
controller: widget.contactPhoneController,
decoration: const InputDecoration(
labelText: 'Téléphone de contact',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.phone),
hintText: '06 12 34 56 78',
),
keyboardType: TextInputType.phone,
onChanged: (_) => widget.onAnyFieldChanged(),
),
],
);
}
Widget _buildSectionTitle(String title) {
return Padding(
padding: const EdgeInsets.only(top: 16.0, bottom: 8.0),