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: Nommage des templates / Intégration dans formulaire d'inscription

Browse Source 
parent [#22]
This commit is contained in:
N3WT DE COMPET
2025-03-01 22:08:00 +01:00
parent b52b265835
commit eb81bbba92
12 changed files with 142 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Front-End/src/app/[locale]/admin/subscriptions/page.js
View File

@ -391,6 +391,7 @@ useEffect(()=>{
// Sauvegarde des templates clonés dans la base de données
const cloneData = {
name: `clone_${clonedDocument.id}`,
slug: clonedDocument.slug,
template_id: clonedDocument.id,
master: templateMaster.template_id,
registration_form: data.student.id
@ -468,7 +469,8 @@ useEffect(()=>{
// Sauvegarde des templates clonés dans la base de données
const cloneData = {
name: `clone_${clonedDocument.id}`,
template_id: clonedDocument.id,
slug: clonedDocument.slug,
template_id: clonedDocument.template_id,
master: templateMaster.template_id,
registration_form: data.student.id
};

13
Front-End/src/app/actions/subscriptionAction.js
View File

@ -138,4 +138,17 @@ export async function getRegisterFormFileTemplate(fileId) {
throw new Error('Failed to fetch file template');
}
return response.json();
}
export const fetchTemplatesFromRegistrationFiles = async (id) => {
const response = await fetch(`${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}/templates`, {
credentials: 'include',
headers: {
'Accept': 'application/json',
}
});
if (!response.ok) {
throw new Error('Erreur lors de la récupération des fichiers associés au groupe');
}
return response.json();
}

40
Front-End/src/components/Inscription/InscriptionFormShared.js
View File

@ -7,7 +7,7 @@ import Loader from '@/components/Loader';
import Button from '@/components/Button';
import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import Table from '@/components/Table';
import { fetchRegistrationTemplateMaster, createRegistrationTemplates, fetchRegisterForm, deleteRegistrationTemplates } from '@/app/actions/subscriptionAction';
import { fetchRegistrationTemplateMaster, createRegistrationTemplates, fetchRegisterForm, deleteRegistrationTemplates, fetchTemplatesFromRegistrationFiles } from '@/app/actions/subscriptionAction';
import { fetchRegistrationFileFromGroup } from '@/app/actions/registerFileGroupAction';
import { Download, Upload, Trash2, Eye } from 'lucide-react';
import { BASE_URL } from '@/utils/Url';
@ -18,6 +18,7 @@ import logger from '@/utils/logger';
import StudentInfoForm from '@/components/Inscription/StudentInfoForm';
import FilesToSign from '@/components/Inscription/FilesToSign';
import FilesToUpload from '@/components/Inscription/FilesToUpload';
import { DocusealForm } from '@docuseal/react';
/**
* Composant de formulaire d'inscription partagé
@ -83,7 +84,6 @@ export default function InscriptionFormShared({
});
setGuardians(data?.student?.guardians || []);
setUploadedFiles(data.registration_files || []);
setFileGroup(data.fileGroup || null);
});
setIsLoading(false);
@ -91,12 +91,10 @@ export default function InscriptionFormShared({
}, [studentId]);
useEffect(() => {
if(fileGroup){
fetchRegistrationFileFromGroup(fileGroup).then((data) => {
setFileTemplates(data);
});
}
}, [fileGroup]);
fetchTemplatesFromRegistrationFiles(studentId).then((data) => {
setFileTemplates(data);
})
}, []);
// Fonctions de gestion du formulaire et des fichiers
const updateFormField = (field, value) => {
@ -190,12 +188,7 @@ export default function InscriptionFormShared({
setCurrentPage(currentPage - 1);
};
const requiredFileTemplates = fileTemplates.filter(template => template.is_required);
// Ajout des logs pour débogage
console.log('BASE_URL:', BASE_URL);
console.log('requiredFileTemplates:', requiredFileTemplates);
console.log('currentPage:', currentPage);
const requiredFileTemplates = fileTemplates;
// Configuration des colonnes pour le tableau des fichiers
const columns = [
@ -275,15 +268,18 @@ export default function InscriptionFormShared({
{currentPage > 1 && currentPage <= requiredFileTemplates.length + 1 && (
<div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
<h2 className="text-xl font-bold mb-4 text-gray-800">{requiredFileTemplates[currentPage - 2].name}</h2>
<iframe
src={`${BASE_URL}/data/${requiredFileTemplates[currentPage - 2].file}`}
width="100%"
height="800px"
className="w-full" // Utiliser la classe CSS pour la largeur
title={requiredFileTemplates[currentPage - 2].name}
<DocusealForm
id="docusealForm"
src={"https://docuseal.com/s/"+requiredFileTemplates[currentPage - 2].slug}
withDownloadButton={false}
onComplete={() => {
const formContainer = document.getElementById('form_container');
if (formContainer) {
formContainer.style.display = 'none';
}
}}
>
<p>Votre navigateur ne prend pas en charge les fichiers PDF. Vous pouvez télécharger le fichier en cliquant <a href={`${BASE_URL}/data/${requiredFileTemplates[currentPage - 2].file}`}>ici</a>.</p>
</iframe>
</DocusealForm>
</div>
)}

54
Front-End/src/components/Structure/Files/FileUpload.js
View File

@ -16,8 +16,7 @@ export default function FileUpload({ handleCreateTemplateMaster, handleEditTempl
const [templateMaster, setTemplateMaster] = useState(null);
const [uploadedFileName, setUploadedFileName] = useState('');
const [selectedGroups, setSelectedGroups] = useState([]);
const [guardianEmails, setGuardianEmails] = useState([]);
const [registrationFormIds, setRegistrationFormIds] = useState([]);
const [guardianDetails, setGuardianDetails] = useState([]);
const csrfToken = useCsrfToken();
@ -61,25 +60,22 @@ export default function FileUpload({ handleCreateTemplateMaster, handleEditTempl
const handleGroupChange = (selectedGroups) => {
setSelectedGroups(selectedGroups);
const emails = selectedGroups.flatMap(group => group.registration_forms.flatMap(form => form.guardians.map(guardian => guardian.email)));
setGuardianEmails(emails); // Mettre à jour la variable d'état avec les emails des guardians
const registrationFormIds = selectedGroups.flatMap(group => group.registration_forms.map(form => form.student_id));
setRegistrationFormIds(registrationFormIds); // Mettre à jour la variable d'état avec les IDs des dossiers d'inscription
logger.debug('Emails des Guardians associés aux groupes sélectionnés:', emails);
logger.debug('IDs des dossiers d\'inscription associés aux groupes sélectionnés:', registrationFormIds);
const details = selectedGroups.flatMap(group =>
group.registration_forms.flatMap(form =>
form.guardians.map(guardian => ({
email: guardian.email,
last_name: form.last_name,
first_name: form.first_name,
registration_form: form.student_id
}))
)
);
setGuardianDetails(details); // Mettre à jour la variable d'état avec les détails des guardians
};
const handleLoad = (detail) => {
const templateId = detail?.id;
setTemplateMaster(detail);
if (fileToEdit) {
logger.debug('Editing master ID :', templateId);
}
else {
logger.debug('Opening master ID :', templateId);
}
}
const handleUpload = (detail) => {
@ -87,6 +83,11 @@ export default function FileUpload({ handleCreateTemplateMaster, handleEditTempl
setUploadedFileName(detail.name);
};
const handleChange = (detail) => {
logger.debug(detail)
setUploadedFileName(detail.name);
}
const handleSubmit = () => {
if (fileToEdit) {
logger.debug('Modification du template master:', templateMaster?.id);
@ -95,8 +96,7 @@ export default function FileUpload({ handleCreateTemplateMaster, handleEditTempl
group_ids: selectedGroups.map(group => group.id),
template_id: templateMaster?.id
});
}
else {
} else {
logger.debug('Création du template master:', templateMaster?.id);
handleCreateTemplateMaster({
name: uploadedFileName,
@ -104,18 +104,17 @@ export default function FileUpload({ handleCreateTemplateMaster, handleEditTempl
template_id: templateMaster?.id
});
guardianEmails.forEach((email, index) => {
cloneTemplate(templateMaster?.id, email)
guardianDetails.forEach((guardian, index) => {
cloneTemplate(templateMaster?.id, guardian.email)
.then(clonedDocument => {
// Sauvegarde des templates clonés dans la base de données
const data = {
name: `clone_${clonedDocument.id}`,
template_id: clonedDocument.id,
name: `${uploadedFileName}_${guardian.first_name}_${guardian.last_name}`,
slug: clonedDocument.slug,
template_id: clonedDocument.template_id,
master: templateMaster?.id,
registration_form: registrationFormIds[index]
registration_form: guardian.registration_form
};
createRegistrationTemplates(data, csrfToken)
.then(response => {
logger.debug('Template enregistré avec succès:', response);
@ -125,16 +124,14 @@ export default function FileUpload({ handleCreateTemplateMaster, handleEditTempl
logger.error('Erreur lors de l\'enregistrement du template:', error);
});
// Logique pour envoyer chaque template au submitter
logger.debug('Sending template to:', email);
logger.debug('Sending template to:', guardian.email);
})
.catch(error => {
logger.error('Error during cloning or sending:', error);
});
});
}
};
return (
@ -164,6 +161,7 @@ export default function FileUpload({ handleCreateTemplateMaster, handleEditTempl
language={'fr'}
onLoad={handleLoad}
onUpload={handleUpload}
onChange={handleChange}
onSave={handleSubmit}
className="h-full overflow-auto" // Ajouter overflow-auto pour permettre le défilement
style={{ maxHeight: '70vh' }} // Limiter la hauteur maximale du composant

3
Front-End/src/components/Structure/Files/FilesGroupsManagement.js
View File

@ -166,8 +166,9 @@ export default function FilesGroupsManagement({ csrfToken }) {
// Transformer le fichier mis à jour avec les informations du groupe
const transformedFile = transformFileData(data, groups);
setTemplateMasters(prevFichiers =>
prevFichiers.map(f => f.id === template_id ? transformedFile : f)
prevFichiers.map(f => f.template_id === template_id ? transformedFile : f)
);
setIsModalOpen(false);
})
.catch(error => {
console.error('Error editing file:', error);