Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb35075614 | ||
|
|
19b5b9e19c |
@@ -13,6 +13,7 @@ enum CarteStatut {
|
||||
switch (raw) {
|
||||
case 'refusee':
|
||||
return CarteStatut.refusee;
|
||||
case 'fermee':
|
||||
case 'traitee':
|
||||
return CarteStatut.traitee;
|
||||
case 'ouverte':
|
||||
@@ -109,6 +110,12 @@ class CarteBulle {
|
||||
String? get dateDebut => payload['date_debut']?.toString();
|
||||
String? get dateFin => payload['date_fin']?.toString();
|
||||
String? get motif => payload['motif']?.toString();
|
||||
|
||||
/// Helper pour extraire les informations de soin
|
||||
String? get resumerSoin {
|
||||
if (!isSoinEnfant) return null;
|
||||
return payload['motif']?.toString();
|
||||
}
|
||||
|
||||
/// Motif de refus : réponse API, sinon motif payload (co-parent / reload).
|
||||
String? get motifRefus {
|
||||
@@ -165,7 +172,12 @@ class CarteBulle {
|
||||
case 'absence_enfant':
|
||||
case 'absence_enfant_modif':
|
||||
return 'assets/images/sac_lapin.png';
|
||||
// soin_enfant : icône selon sous-type payload — à brancher plus tard
|
||||
case 'soin_enfant':
|
||||
final st = payload['sous_type']?.toString();
|
||||
if (st == 'fievre') return 'assets/images/thermo_croix.png';
|
||||
if (st == 'medicament') return 'assets/images/cuillere.png'; // Using generic fallback or specific if added later. Assuming thermo_croix or similar could work.
|
||||
if (st == 'bobo') return 'assets/images/sac_lapin.png'; // Will adjust these later if better assets exist. Let's use generic ones for now, or null if no appropriate assets.
|
||||
return null;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -49,18 +49,14 @@ class CarteTypeUi {
|
||||
label: 'Arrêt maladie',
|
||||
motifHint: 'Précisions (optionnel)',
|
||||
),
|
||||
// Point d’extension #soins — visible dès que le back l’émet.
|
||||
'soin_enfant': CarteTypeUi(
|
||||
typeCode: 'soin_enfant',
|
||||
label: 'Soin / bobo',
|
||||
motifHint: 'Décrivez le soin ou le bobo',
|
||||
motifRequired: true,
|
||||
periodeMode: CartePeriodeMode.singleDay,
|
||||
sousTypes: [
|
||||
CarteSousTypeUi(code: 'temperature', label: 'Température'),
|
||||
CarteSousTypeUi(code: 'fievre', label: 'Fièvre'),
|
||||
CarteSousTypeUi(code: 'bobo', label: 'Bobo'),
|
||||
CarteSousTypeUi(code: 'medicament', label: 'Médicament'),
|
||||
CarteSousTypeUi(code: 'autre', label: 'Autre'),
|
||||
],
|
||||
),
|
||||
};
|
||||
|
||||
@@ -91,6 +91,7 @@ class CardsService {
|
||||
required String dateDebut,
|
||||
required String dateFin,
|
||||
String? motif,
|
||||
Map<String, dynamic>? payload,
|
||||
}) async {
|
||||
final response = await http.post(
|
||||
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.cards}'),
|
||||
@@ -101,6 +102,7 @@ class CardsService {
|
||||
'date_debut': dateDebut,
|
||||
'date_fin': dateFin,
|
||||
if (motif != null && motif.trim().isNotEmpty) 'motif': motif.trim(),
|
||||
if (payload != null) 'payload': payload,
|
||||
}),
|
||||
);
|
||||
|
||||
@@ -114,6 +116,49 @@ class CardsService {
|
||||
return CarteBulle.fromJson(Map<String, dynamic>.from(decoded as Map));
|
||||
}
|
||||
|
||||
/// Modifier une carte (corriger un soin, dates en attente...).
|
||||
static Future<CarteBulle> maj({
|
||||
required String cardId,
|
||||
String? dateDebut,
|
||||
String? dateFin,
|
||||
String? motif,
|
||||
Map<String, dynamic>? payload,
|
||||
}) async {
|
||||
final response = await http.patch(
|
||||
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.cards}/$cardId'),
|
||||
headers: await _headers(),
|
||||
body: jsonEncode({
|
||||
if (dateDebut != null) 'date_debut': dateDebut,
|
||||
if (dateFin != null) 'date_fin': dateFin,
|
||||
if (motif != null && motif.trim().isNotEmpty) 'motif': motif.trim(),
|
||||
if (payload != null) 'payload': payload,
|
||||
}),
|
||||
);
|
||||
|
||||
if (response.statusCode != 200) {
|
||||
throw Exception(
|
||||
_extractError(response.body, 'Erreur lors de la mise à jour'),
|
||||
);
|
||||
}
|
||||
|
||||
final decoded = jsonDecode(response.body);
|
||||
return CarteBulle.fromJson(Map<String, dynamic>.from(decoded as Map));
|
||||
}
|
||||
|
||||
/// Supprimer une bulle (AM 24h ou avant traitement).
|
||||
static Future<void> supprimer(String cardId) async {
|
||||
final response = await http.delete(
|
||||
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.cards}/$cardId'),
|
||||
headers: await _headers(),
|
||||
);
|
||||
|
||||
if (response.statusCode != 204 && response.statusCode != 200) {
|
||||
throw Exception(
|
||||
_extractError(response.body, 'Erreur lors de la suppression'),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Répondre : accept | refuse | ack.
|
||||
static Future<CarteBulle> repondre({
|
||||
required String cardId,
|
||||
|
||||
@@ -10,19 +10,28 @@ import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||
Future<CarteBulle?> showAjouterCarteModal(
|
||||
BuildContext context, {
|
||||
required String placementId,
|
||||
CarteBulle? carteToEdit,
|
||||
}) {
|
||||
return showDialog<CarteBulle>(
|
||||
context: context,
|
||||
barrierDismissible: false,
|
||||
builder: (ctx) => AjouterCarteModal(placementId: placementId),
|
||||
builder: (ctx) => AjouterCarteModal(
|
||||
placementId: placementId,
|
||||
carteToEdit: carteToEdit,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Modale générique : types API + catalogue UI, période (pas de motif V1).
|
||||
/// Modale générique : types API + catalogue UI, période, soins
|
||||
class AjouterCarteModal extends StatefulWidget {
|
||||
final String placementId;
|
||||
final CarteBulle? carteToEdit;
|
||||
|
||||
const AjouterCarteModal({super.key, required this.placementId});
|
||||
const AjouterCarteModal({
|
||||
super.key,
|
||||
required this.placementId,
|
||||
this.carteToEdit,
|
||||
});
|
||||
|
||||
@override
|
||||
State<AjouterCarteModal> createState() => _AjouterCarteModalState();
|
||||
@@ -38,6 +47,17 @@ class _AjouterCarteModalState extends State<AjouterCarteModal> {
|
||||
bool _submitting = false;
|
||||
String? _error;
|
||||
|
||||
TimeOfDay _heureReleve = TimeOfDay.now();
|
||||
|
||||
// --- Controllers Soins ---
|
||||
final _motifController = TextEditingController();
|
||||
final _temperatureController = TextEditingController();
|
||||
final _medicamentDonneController = TextEditingController();
|
||||
String? _boboNature;
|
||||
final _boboDescriptionController = TextEditingController();
|
||||
final _medicamentNomController = TextEditingController();
|
||||
final _medicamentContexteController = TextEditingController();
|
||||
|
||||
CarteTypeUi get _ui =>
|
||||
_selected?.ui ??
|
||||
CarteTypeUi.resolve(typeCode: _selected?.code ?? 'inconnu');
|
||||
@@ -51,6 +71,67 @@ class _AjouterCarteModalState extends State<AjouterCarteModal> {
|
||||
_loadTypes();
|
||||
}
|
||||
|
||||
void _prefillIfEdit(List<CarteTypeEmissible> types) {
|
||||
if (widget.carteToEdit == null) return;
|
||||
final card = widget.carteToEdit!;
|
||||
final type = types.where((t) => t.code == card.typeCode).firstOrNull;
|
||||
if (type != null) {
|
||||
_selected = type;
|
||||
}
|
||||
|
||||
if (card.dateDebut != null) {
|
||||
_dateDebut = DateTime.tryParse(card.dateDebut!) ?? _dateDebut;
|
||||
}
|
||||
if (card.dateFin != null) {
|
||||
_dateFin = DateTime.tryParse(card.dateFin!) ?? _dateFin;
|
||||
}
|
||||
|
||||
_motifController.text = card.motif ?? '';
|
||||
|
||||
if (card.typeCode == 'soin_enfant') {
|
||||
final p = card.payload;
|
||||
_sousTypeCode = p['sous_type']?.toString();
|
||||
final h = p['heure_releve']?.toString();
|
||||
if (h != null && h.contains(':')) {
|
||||
final parts = h.split(':');
|
||||
_heureReleve = TimeOfDay(
|
||||
hour: int.tryParse(parts[0]) ?? 0,
|
||||
minute: int.tryParse(parts[1]) ?? 0,
|
||||
);
|
||||
}
|
||||
|
||||
if (_sousTypeCode == 'fievre') {
|
||||
_temperatureController.text = p['temperature_c']?.toString() ?? '';
|
||||
_medicamentDonneController.text = p['medicament_donne']?.toString() ?? '';
|
||||
} else if (_sousTypeCode == 'bobo') {
|
||||
final nature = p['bobo_nature']?.toString() ?? '';
|
||||
final naturesValides = ['Chute', 'Coup', 'Égratignure', 'Piqûre', 'Brûlure', 'Autre'];
|
||||
if (naturesValides.map((n) => n.toLowerCase().replaceAll('é', 'e').replaceAll('û', 'u')).contains(nature.toLowerCase())) {
|
||||
_boboNature = naturesValides.firstWhere(
|
||||
(n) => n.toLowerCase().replaceAll('é', 'e').replaceAll('û', 'u') == nature.toLowerCase().replaceAll('é', 'e').replaceAll('û', 'u'),
|
||||
orElse: () => 'Autre'
|
||||
);
|
||||
} else {
|
||||
_boboNature = 'Autre';
|
||||
}
|
||||
_boboDescriptionController.text = p['description']?.toString() ?? '';
|
||||
} else if (_sousTypeCode == 'medicament') {
|
||||
_medicamentNomController.text = p['medicament_nom']?.toString() ?? '';
|
||||
_medicamentContexteController.text = p['contexte']?.toString() ?? '';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_temperatureController.dispose();
|
||||
_medicamentDonneController.dispose();
|
||||
_boboDescriptionController.dispose();
|
||||
_medicamentNomController.dispose();
|
||||
_medicamentContexteController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
Future<void> _loadTypes() async {
|
||||
setState(() {
|
||||
_loadingTypes = true;
|
||||
@@ -66,6 +147,8 @@ class _AjouterCarteModalState extends State<AjouterCarteModal> {
|
||||
_loadingTypes = false;
|
||||
if (types.isEmpty) {
|
||||
_error = 'Aucun type de carte disponible pour votre rôle.';
|
||||
} else {
|
||||
_prefillIfEdit(types);
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
@@ -90,6 +173,22 @@ class _AjouterCarteModalState extends State<AjouterCarteModal> {
|
||||
return '$day/$m/${d.year}';
|
||||
}
|
||||
|
||||
Future<void> _pickTime() async {
|
||||
final picked = await showTimePicker(
|
||||
context: context,
|
||||
initialTime: _heureReleve,
|
||||
builder: (context, child) {
|
||||
return MediaQuery(
|
||||
data: MediaQuery.of(context).copyWith(alwaysUse24HourFormat: true),
|
||||
child: child ?? const SizedBox(),
|
||||
);
|
||||
},
|
||||
);
|
||||
if (picked != null && mounted) {
|
||||
setState(() => _heureReleve = picked);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _pickSingleDay() async {
|
||||
final picked = await showDatePicker(
|
||||
context: context,
|
||||
@@ -180,11 +279,63 @@ class _AjouterCarteModalState extends State<AjouterCarteModal> {
|
||||
return null;
|
||||
}
|
||||
|
||||
/// V1 : pas de texte libre ; seul un sous-type catalogue peut alimenter motif.
|
||||
String? _motifOptionnel() => _sousTypeLabel();
|
||||
/// V1 : pas de texte libre pour le motif si la logique change.
|
||||
/// (On retire `motifOptionnel` car le backend va dériver du payload).
|
||||
Map<String, dynamic>? _buildPayload() {
|
||||
if (_selected?.code != 'soin_enfant') {
|
||||
return null;
|
||||
}
|
||||
|
||||
final base = <String, dynamic>{
|
||||
'sous_type': _sousTypeCode,
|
||||
'heure_releve':
|
||||
'${_heureReleve.hour.toString().padLeft(2, '0')}:${_heureReleve.minute.toString().padLeft(2, '0')}',
|
||||
};
|
||||
|
||||
if (_sousTypeCode == 'fievre') {
|
||||
final t = _temperatureController.text.trim().replaceAll(',', '.');
|
||||
if (t.isNotEmpty) {
|
||||
base['temperature_c'] = double.tryParse(t);
|
||||
}
|
||||
base['medicament_donne'] = _medicamentDonneController.text.trim();
|
||||
} else if (_sousTypeCode == 'bobo') {
|
||||
// Normaliser l'enregistrement pour le back :
|
||||
final nature = _boboNature?.toLowerCase().replaceAll('é', 'e').replaceAll('û', 'u') ?? 'autre';
|
||||
base['bobo_nature'] = nature;
|
||||
base['description'] = _boboDescriptionController.text.trim();
|
||||
} else if (_sousTypeCode == 'medicament') {
|
||||
base['medicament_nom'] = _medicamentNomController.text.trim();
|
||||
base['contexte'] = _medicamentContexteController.text.trim();
|
||||
}
|
||||
|
||||
return base;
|
||||
}
|
||||
|
||||
Future<void> _submit() async {
|
||||
if (_selected == null) return;
|
||||
|
||||
// Validations locales spécifiques soins
|
||||
if (_selected?.code == 'soin_enfant') {
|
||||
if (_sousTypeCode == null) {
|
||||
setState(() => _error = 'Veuillez choisir un sous-type.');
|
||||
return;
|
||||
}
|
||||
if (_sousTypeCode == 'fievre') {
|
||||
final t = _temperatureController.text.trim().replaceAll(',', '.');
|
||||
if (t.isNotEmpty && double.tryParse(t) == null) {
|
||||
setState(() => _error = 'La température est invalide.');
|
||||
return;
|
||||
}
|
||||
} else if (_sousTypeCode == 'bobo' && _boboNature == null) {
|
||||
setState(() => _error = 'Veuillez indiquer la nature du bobo.');
|
||||
return;
|
||||
} else if (_sousTypeCode == 'medicament' &&
|
||||
_medicamentNomController.text.trim().isEmpty) {
|
||||
setState(() => _error = 'Le nom du médicament est obligatoire.');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (_dateFin.isBefore(_dateDebut)) {
|
||||
setState(() => _error = 'La date de fin doit être après la date de début.');
|
||||
return;
|
||||
@@ -195,17 +346,36 @@ class _AjouterCarteModalState extends State<AjouterCarteModal> {
|
||||
_error = null;
|
||||
});
|
||||
try {
|
||||
final created = await CardsService.creer(
|
||||
typeCode: _selected!.code,
|
||||
idPlacement: widget.placementId,
|
||||
dateDebut: _fmtIso(_dateDebut),
|
||||
dateFin: _fmtIso(
|
||||
_ui.periodeMode == CartePeriodeMode.singleDay
|
||||
? _dateDebut
|
||||
: _dateFin,
|
||||
),
|
||||
motif: _motifOptionnel(),
|
||||
);
|
||||
final payload = _buildPayload();
|
||||
|
||||
final dynamic created;
|
||||
if (widget.carteToEdit != null) {
|
||||
created = await CardsService.maj(
|
||||
cardId: widget.carteToEdit!.id,
|
||||
dateDebut: _fmtIso(_dateDebut),
|
||||
dateFin: _fmtIso(
|
||||
_ui.periodeMode == CartePeriodeMode.singleDay
|
||||
? _dateDebut
|
||||
: _dateFin,
|
||||
),
|
||||
motif: _selected?.code == 'soin_enfant' ? null : _motifController.text.trim(),
|
||||
payload: payload,
|
||||
);
|
||||
} else {
|
||||
created = await CardsService.creer(
|
||||
typeCode: _selected!.code,
|
||||
idPlacement: widget.placementId,
|
||||
dateDebut: _fmtIso(_dateDebut),
|
||||
dateFin: _fmtIso(
|
||||
_ui.periodeMode == CartePeriodeMode.singleDay
|
||||
? _dateDebut
|
||||
: _dateFin,
|
||||
),
|
||||
motif: _selected?.code == 'soin_enfant' ? null : _motifController.text.trim(),
|
||||
payload: payload,
|
||||
);
|
||||
}
|
||||
|
||||
if (!mounted) return;
|
||||
Navigator.of(context).pop(created);
|
||||
} catch (e) {
|
||||
@@ -255,10 +425,27 @@ class _AjouterCarteModalState extends State<AjouterCarteModal> {
|
||||
_buildTypeSelector(),
|
||||
const SizedBox(height: 16),
|
||||
if (_ui.periodeMode == CartePeriodeMode.singleDay)
|
||||
_DateField(
|
||||
label: 'Date',
|
||||
value: _fmtUi(_dateDebut),
|
||||
onTap: _submitting ? null : _pickSingleDay,
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: _DateField(
|
||||
label: 'Date',
|
||||
value: _fmtUi(_dateDebut),
|
||||
onTap: _submitting ? null : _pickSingleDay,
|
||||
),
|
||||
),
|
||||
if (_selected?.code == 'soin_enfant') ...[
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: _DateField(
|
||||
label: 'Heure',
|
||||
value: _heureReleve.format(context),
|
||||
icon: Icons.access_time,
|
||||
onTap: _submitting ? null : _pickTime,
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
)
|
||||
else
|
||||
_DateField(
|
||||
@@ -297,6 +484,26 @@ class _AjouterCarteModalState extends State<AjouterCarteModal> {
|
||||
],
|
||||
),
|
||||
],
|
||||
if (_selected?.code == 'soin_enfant') _buildSoinForm(),
|
||||
if (_selected?.code != 'soin_enfant') ...[
|
||||
const SizedBox(height: 16),
|
||||
TextFormField(
|
||||
controller: _motifController,
|
||||
enabled: !_submitting,
|
||||
maxLines: 3,
|
||||
decoration: InputDecoration(
|
||||
labelText: _ui.motifRequired ? 'Motif *' : 'Motif',
|
||||
hintText: _ui.motifHint,
|
||||
border: const OutlineInputBorder(),
|
||||
),
|
||||
validator: (v) {
|
||||
if (!_ui.motifRequired) return null;
|
||||
final text = v?.trim() ?? '';
|
||||
if (text.isEmpty) return 'Motif obligatoire';
|
||||
return null;
|
||||
},
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -374,17 +581,106 @@ class _AjouterCarteModalState extends State<AjouterCarteModal> {
|
||||
},
|
||||
);
|
||||
}
|
||||
Widget _buildSoinForm() {
|
||||
if (_sousTypeCode == null) return const SizedBox.shrink();
|
||||
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
const SizedBox(height: 16),
|
||||
if (_sousTypeCode == 'fievre') ...[
|
||||
TextFormField(
|
||||
controller: _temperatureController,
|
||||
enabled: !_submitting,
|
||||
keyboardType: const TextInputType.numberWithOptions(decimal: true),
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Température (°C) *',
|
||||
hintText: 'ex: 38.5',
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
TextFormField(
|
||||
controller: _medicamentDonneController,
|
||||
enabled: !_submitting,
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Médicament donné (optionnel)',
|
||||
hintText: 'ex: Doliprane 2.4kg',
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
] else if (_sousTypeCode == 'bobo') ...[
|
||||
DropdownButtonFormField<String>(
|
||||
value: _boboNature,
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Nature du bobo *',
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
items: const [
|
||||
DropdownMenuItem(value: 'Chute', child: Text('Chute')),
|
||||
DropdownMenuItem(value: 'Égratignure', child: Text('Égratignure')),
|
||||
DropdownMenuItem(value: 'Coup', child: Text('Coup')),
|
||||
DropdownMenuItem(value: 'Piqûre', child: Text('Piqûre')),
|
||||
DropdownMenuItem(value: 'Brûlure', child: Text('Brûlure')),
|
||||
DropdownMenuItem(value: 'Autre', child: Text('Autre')),
|
||||
],
|
||||
onChanged: _submitting
|
||||
? null
|
||||
: (val) {
|
||||
setState(() {
|
||||
_boboNature = val;
|
||||
});
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
TextFormField(
|
||||
controller: _boboDescriptionController,
|
||||
enabled: !_submitting,
|
||||
maxLines: 2,
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Description / Zone touchée *',
|
||||
hintText: 'ex: Égratignure sur le genou droit',
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
] else if (_sousTypeCode == 'medicament') ...[
|
||||
TextFormField(
|
||||
controller: _medicamentNomController,
|
||||
enabled: !_submitting,
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Nom du médicament *',
|
||||
hintText: 'ex: Ventoline',
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
TextFormField(
|
||||
controller: _medicamentContexteController,
|
||||
enabled: !_submitting,
|
||||
maxLines: 2,
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Contexte / Posologie (optionnel)',
|
||||
hintText: 'ex: 2 bouffées suite à une quinte de toux',
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _DateField extends StatelessWidget {
|
||||
final String label;
|
||||
final String value;
|
||||
final VoidCallback? onTap;
|
||||
final IconData icon;
|
||||
|
||||
const _DateField({
|
||||
required this.label,
|
||||
required this.value,
|
||||
required this.onTap,
|
||||
this.icon = Icons.calendar_today_outlined,
|
||||
});
|
||||
|
||||
@override
|
||||
@@ -396,7 +692,7 @@ class _DateField extends StatelessWidget {
|
||||
decoration: InputDecoration(
|
||||
labelText: label,
|
||||
border: const OutlineInputBorder(),
|
||||
suffixIcon: const Icon(Icons.calendar_today_outlined, size: 18),
|
||||
suffixIcon: Icon(icon, size: 18),
|
||||
),
|
||||
child: Text(
|
||||
value,
|
||||
|
||||
@@ -611,8 +611,15 @@ class _BulleTile extends StatelessWidget {
|
||||
return '$jj ${_mois[dt.month - 1]} ${dt.year}';
|
||||
}
|
||||
|
||||
/// Une ligne type maquette : « Du 04 au 06 novembre 2026 ».
|
||||
String _fmtPeriodeUneLigne() {
|
||||
// Si c'est un soin_enfant en singleDay, on affiche juste "Le ..." ou un résumé si pertinent
|
||||
if (card.isSoinEnfant) {
|
||||
final resume = card.resumerSoin;
|
||||
final jour = card.dateDebut != null ? 'Le ${_fmtLong(card.dateDebut)}' : '';
|
||||
if (resume != null) return '$jour\n$resume';
|
||||
return jour;
|
||||
}
|
||||
|
||||
final d1 = DateTime.tryParse(card.dateDebut ?? '');
|
||||
final d2 = DateTime.tryParse(card.dateFin ?? '');
|
||||
if (d1 == null && d2 == null) return '';
|
||||
@@ -850,6 +857,11 @@ class _BulleTile extends StatelessWidget {
|
||||
}
|
||||
|
||||
Widget _buildGeneric(BuildContext context) {
|
||||
final encre = _Encre.pour(card.colorFamily);
|
||||
final isEdited = card.modifieLe != null && (card.creeLe == null || card.modifieLe!.isAfter(card.creeLe!));
|
||||
final createdAt = card.creeLe ?? DateTime.now();
|
||||
final canEdit = card.isCreator && DateTime.now().difference(createdAt).inHours < 24;
|
||||
|
||||
final memeJour = card.dateDebut != null &&
|
||||
card.dateFin != null &&
|
||||
card.dateDebut == card.dateFin;
|
||||
@@ -870,23 +882,41 @@ class _BulleTile extends StatelessWidget {
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
card.titreAffiche,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: QuotidienTheme.ink,
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
card.titreAffiche,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: QuotidienTheme.ink,
|
||||
),
|
||||
),
|
||||
),
|
||||
if (isEdited)
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 8),
|
||||
child: Text(
|
||||
'(Corrigée)',
|
||||
style: GoogleFonts.merriweather(
|
||||
fontSize: 11,
|
||||
fontStyle: FontStyle.italic,
|
||||
color: QuotidienTheme.ink.withOpacity(0.6),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
if (card.dateDebut != null || card.dateFin != null) ...[
|
||||
if (card.dateDebut != null || card.dateFin != null || card.isSoinEnfant) ...[
|
||||
const SizedBox(height: 10),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 12),
|
||||
child: memeJour
|
||||
child: (memeJour || card.isSoinEnfant)
|
||||
? Text(
|
||||
'Le ${_fmtLong(card.dateDebut)}',
|
||||
_fmtPeriodeUneLigne(),
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 17,
|
||||
fontWeight: FontWeight.w600,
|
||||
@@ -960,6 +990,72 @@ class _BulleTile extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
// Edit / Delete buttons for creator if within 24h
|
||||
if (canEdit && !busy) ...[
|
||||
const SizedBox(height: 10),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
TextButton.icon(
|
||||
icon: const Icon(Icons.edit, size: 16),
|
||||
label: const Text('Corriger'),
|
||||
style: TextButton.styleFrom(
|
||||
foregroundColor: encre.link,
|
||||
textStyle: GoogleFonts.merriweather(fontSize: 12),
|
||||
),
|
||||
onPressed: () {
|
||||
showAjouterCarteModal(
|
||||
context,
|
||||
placementId: card.idPlacement,
|
||||
carteToEdit: card,
|
||||
);
|
||||
},
|
||||
),
|
||||
TextButton.icon(
|
||||
icon: const Icon(Icons.delete_outline, size: 16),
|
||||
label: const Text('Supprimer'),
|
||||
style: TextButton.styleFrom(
|
||||
foregroundColor: Colors.red[700],
|
||||
textStyle: GoogleFonts.merriweather(fontSize: 12),
|
||||
),
|
||||
onPressed: () async {
|
||||
final confirm = await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (ctx) => AlertDialog(
|
||||
title: Text('Supprimer cette carte ?', style: GoogleFonts.merienda()),
|
||||
content: const Text('Cette action est définitive.'),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(ctx, false),
|
||||
child: const Text('Annuler'),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: () => Navigator.pop(ctx, true),
|
||||
style: FilledButton.styleFrom(backgroundColor: Colors.red[700]),
|
||||
child: const Text('Supprimer'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
if (confirm == true && context.mounted) {
|
||||
try {
|
||||
await CardsService.supprimer(card.id);
|
||||
// The stream will handle the removal locally via card.deleted
|
||||
} catch (e) {
|
||||
if (context.mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Erreur: ${e.toString().replaceFirst('Exception: ', '')}')),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
|
||||
if (card.peutRepondre) ...[
|
||||
const SizedBox(height: 14),
|
||||
if (busy)
|
||||
|
||||
Reference in New Issue
Block a user