acasini/n3wt-school
1
0
Fork 0
mirror of https://git.v0id.ovh/n3wt-innov/n3wt-school.git synced 2026-01-28 23:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Sauvegarde des formulaires d'école dans les bons dossiers /

Browse Source 
utilisation des bons composants dans les modales [N3WTS-17]
This commit is contained in:
N3WT DE COMPET
2026-01-18 18:44:13 +01:00
parent 8549699dec
commit b4f70e6bad
7 changed files with 867 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
Back-End/Subscriptions/models.py
View File

@ -318,20 +318,27 @@ class RegistrationForm(models.Model):
####### Formulaires masters (documents école, à signer ou pas) #######
def registration_school_file_master_upload_to(instance, filename):
# Stocke les fichiers masters dans un dossier dédié
return f"registration_files/school_file_masters/{instance.pk}/{filename}"
# Utilise l'ID si le nom n'est pas encore disponible
est_name = None
if instance.establishment and instance.establishment.name:
est_name = instance.establishment.name
else:
# fallback si pas d'établissement (devrait être rare)
est_name = "unknown_establishment"
return f"{est_name}/Formulaires/{filename}"
class RegistrationSchoolFileMaster(models.Model):
groups = models.ManyToManyField(RegistrationFileGroup, related_name='school_file_masters', blank=True)
name = models.CharField(max_length=255, default="")
is_required = models.BooleanField(default=False)
formMasterData = models.JSONField(default=list, blank=True, null=True)
# Nouveau champ pour formulaire existant (PDF, DOC, etc.)
file = models.FileField(
upload_to=registration_school_file_master_upload_to,
null=True,
blank=True,
help_text="Fichier du formulaire existant (PDF, DOC, etc.)"
)
establishment = models.ForeignKey('Establishment.Establishment', on_delete=models.CASCADE, related_name='school_file_masters', null=True, blank=True)
def __str__(self):
return f'{self.name} - {self.id}'
@ -342,6 +349,131 @@ class RegistrationSchoolFileMaster(models.Model):
return self.file.url
return None
def save(self, *args, **kwargs):
import os
affected_rf_ids = set()
is_new = self.pk is None
super().save(*args, **kwargs)
# 2. Gestion des groupes pour la synchro des templates
if is_new:
from Subscriptions.models import RegistrationForm
new_groups = set(self.groups.values_list('id', flat=True))
affected_rf_ids.update(
RegistrationForm.objects.filter(fileGroup__in=list(new_groups)).values_list('pk', flat=True)
)
else:
try:
old = RegistrationSchoolFileMaster.objects.get(pk=self.pk)
old_groups = set(old.groups.values_list('id', flat=True))
new_groups = set(self.groups.values_list('id', flat=True))
from Subscriptions.models import RegistrationForm
affected_rf_ids.update(
RegistrationForm.objects.filter(fileGroup__in=list(old_groups | new_groups)).values_list('pk', flat=True)
)
form_data_changed = (
old.formMasterData != self.formMasterData
and self.formMasterData
and isinstance(self.formMasterData, dict)
and self.formMasterData.get("fields")
)
name_changed = old.name != self.name
# --- Correction spécifique pour les fichiers existants (PDF, DOC, etc.) ---
# Si le nom change et qu'on a un fichier existant, on doit renommer physiquement le fichier
if old.file and not self.file and name_changed:
old_file_path = old.file.path
ext = os.path.splitext(old_file_path)[1]
clean_name = (self.name or 'document').replace(' ', '_').replace('/', '_')
new_filename = f"{clean_name}{ext}"
new_rel_path = os.path.join(os.path.dirname(old.file.name), new_filename)
new_abs_path = os.path.join(os.path.dirname(old_file_path), new_filename)
logger.info(f"Renommage fichier: {old_file_path} -> {new_abs_path}")
try:
if not os.path.exists(new_abs_path):
os.rename(old_file_path, new_abs_path)
self.file.name = new_rel_path
logger.info(f"self.file.name après renommage: {self.file.name}")
super().save(update_fields=["file"])
else:
logger.info(f"Le fichier cible existe déjà: {new_abs_path}")
except Exception as e:
logger.error(f"Erreur lors du renommage du fichier master: {e}")
elif old.file and self.file and self.file != old.file:
old.file.delete(save=False)
elif old.file and form_data_changed:
old.file.delete(save=False)
self.file = None
except RegistrationSchoolFileMaster.DoesNotExist:
pass
# Harmonisation : gestion du fichier (dynamique ou existant) sans appeler registration_school_file_master_upload_to
# Pour les formulaires dynamiques (PDF à générer)
if not self.file and self.formMasterData and isinstance(self.formMasterData, dict) and self.formMasterData.get("fields"):
try:
from Subscriptions.util import generate_form_json_pdf
pdf_filename = f"{self.name or 'formulaire'}.pdf"
abs_path = os.path.join(settings.MEDIA_ROOT, self.file.field.upload_to(self, pdf_filename))
os.makedirs(os.path.dirname(abs_path), exist_ok=True)
if os.path.exists(abs_path):
try:
os.remove(abs_path)
logger.info(f"Suppression fichier existant: {abs_path}")
except Exception as e:
logger.error(f"Erreur suppression fichier existant avant save: {e}")
pdf_file = generate_form_json_pdf(self, self.formMasterData)
logger.info(f"Sauvegarde PDF dynamique: {pdf_filename}")
self.file.save(pdf_filename, pdf_file, save=False)
logger.info(f"self.file.name après save PDF dynamique: {self.file.name}")
super().save(update_fields=["file"])
except Exception as e:
logger.error(f"Erreur lors de la génération automatique du PDF pour le master {self.pk}: {e}")
# Pour les fichiers existants uploadés
elif self.file and hasattr(self.file, 'name') and self.name:
# On force le nom du fichier (nom du master + extension) si besoin
ext = os.path.splitext(self.file.name)[1]
clean_name = (self.name or 'document').replace(' ', '_').replace('/', '_')
final_file_name = f"{clean_name}{ext}"
# Si le nom ne correspond pas, on renomme le fichier physique et le FileField
if os.path.basename(self.file.name) != final_file_name:
current_path = self.file.path
abs_path = os.path.join(settings.MEDIA_ROOT, self.file.field.upload_to(self, final_file_name))
os.makedirs(os.path.dirname(abs_path), exist_ok=True)
if os.path.exists(abs_path):
try:
os.remove(abs_path)
logger.info(f"Suppression fichier existant: {abs_path}")
except Exception as e:
logger.error(f"Erreur suppression fichier existant avant renommage: {e}")
try:
os.rename(current_path, abs_path)
self.file.name = os.path.relpath(abs_path, settings.MEDIA_ROOT)
logger.info(f"Déplacement fichier existant: {current_path} -> {abs_path}")
super().save(update_fields=["file"])
except Exception as e:
logger.error(f"Erreur lors du déplacement du fichier existant: {e}")
# 4. Synchronisation des templates pour tous les dossiers d'inscription concernés (création ou modification)
try:
from Subscriptions.util import create_templates_for_registration_form
from Subscriptions.models import RegistrationForm
for rf_id in affected_rf_ids:
try:
rf = RegistrationForm.objects.get(pk=rf_id)
create_templates_for_registration_form(rf)
except Exception as e:
logger.error(f"Erreur lors de la synchronisation des templates pour RF {rf_id} après modification du master {self.pk}: {e}")
except Exception as e:
logger.error(f"Erreur globale lors de la synchronisation des templates après modification du master {self.pk}: {e}")
def delete(self, *args, **kwargs):
# Supprimer le fichier physique du master si présent
if self.file and hasattr(self.file, 'path') and os.path.exists(self.file.path):
try:
self.file.delete(save=False)
except Exception as e:
logger.error(f"Erreur lors de la suppression du fichier master: {e}")
super().delete(*args, **kwargs)
####### Parent files masters (documents à fournir par les parents) #######
class RegistrationParentFileMaster(models.Model):
groups = models.ManyToManyField(RegistrationFileGroup, related_name='parent_file_masters', blank=True)
@ -354,7 +486,7 @@ class RegistrationParentFileMaster(models.Model):
############################################################
def registration_school_file_upload_to(instance, filename):
return f"registration_files/{instance.registration_form.establishment.name}/dossier_rf_{instance.registration_form.pk}/school/{filename}"
return f"{instance.registration_form.establishment.name}/dossier_{instance.registration_form.student.last_name}_{instance.registration_form.student.first_name}/{filename}"
def registration_parent_file_upload_to(instance, filename):
return f"registration_files/{instance.registration_form.establishment.name}/dossier_rf_{instance.registration_form.pk}/parent/{filename}"