scayac
/
IAProf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: scayac:v1.0
Branches Tags
scayac:main
scayac:master
...
compare: scayac:main
Branches Tags
scayac:main
scayac:master

2 Commits
v1.0 ... main

Author SHA1 Message Date
scayac 563f466360 Gestion de l'affichage des appréciations individuelles dans le tableau de bord
6 months ago
scayac baa1709383 Ajout des boutons individuels de génération/régénration des appréciations
6 months ago
4 changed files with 391 additions and 211 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 1
      .gitignore
  2. 206
      main/templates/resultat_appreciations.html
  3. 3
      main/urls.py
  4. 20
      main/views.py

1
.gitignore vendored
Unescape View File

@ -3,3 +3,4 @@ db.sqlite3
__pycache__ __pycache__
migrations migrations
.env .env
.vscode

206
main/templates/resultat_appreciations.html
Unescape View File

@ -7,14 +7,14 @@
<link href="https://cdn.jsdelivr.net/npm/startbootstrap-sb-admin@7.0.6/dist/css/styles.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/npm/startbootstrap-sb-admin@7.0.6/dist/css/styles.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
<style> <style>
:root { :root {
color-scheme: light dark; color-scheme: light dark;
} }
body, .bg-light { body, .bg-light {
background-color: #f8f9fa; background-color: #f8f9fa;
color: #212529; color: #212529;
} }
@media (prefers-color-scheme: dark) { @media (prefers-color-scheme: dark) {
html, body, .bg-light { html, body, .bg-light {
background-color: #181a1b !important; background-color: #181a1b !important;
color: #f8f9fa !important; color: #f8f9fa !important;
@ -69,7 +69,25 @@ body, .bg-light {
color: #23272b !important; color: #23272b !important;
border: 1px solid #444c56 !important; border: 1px solid #444c56 !important;
} }
} .btn-outline-primary, .btn-outline-primary:focus, .btn-outline-primary:active, .btn-outline-primary:hover {
color: #23272b !important;
background-color: #ffe082 !important;
border-color: #ffe082 !important;
box-shadow: none !important;
}
.btn-outline-primary:disabled, .btn-outline-primary.disabled {
color: #bdbdbd !important;
background-color: #444c56 !important;
border-color: #444c56 !important;
}
}
#bulletinModal .modal-content, #bulletinModal .modal-body, #bulletinModal .modal-header {
background-color: #fff !important;
color: #23272b !important;
}
#bulletinModal .modal-title {
color: #23272b !important;
}
</style> </style>
</head> </head>
<body class="bg-light"> <body class="bg-light">
@ -94,7 +112,7 @@ body, .bg-light {
<div> <div>
<label for="modele-select" class="form-label">Choisir un modèle</label> <label for="modele-select" class="form-label">Choisir un modèle</label>
<select id="modele-select" class="form-select"> <select id="modele-select" class="form-select">
{% for modele in modeles %} {% for modele in modeles|dictsortreversed:'id' %}
<option value="{{ modele.code }}" {% if modele.code == 'gpt-4.1-mini' %}selected{% endif %}>{{ modele.nom }}</option> <option value="{{ modele.code }}" {% if modele.code == 'gpt-4.1-mini' %}selected{% endif %}>{{ modele.nom }}</option>
{% endfor %} {% endfor %}
{% if not modeles or not modeles|dictsort:'code'|length %} {% if not modeles or not modeles|dictsort:'code'|length %}
@ -108,7 +126,7 @@ body, .bg-light {
</div> </div>
<div class="mb-3 d-flex gap-2"> <div class="mb-3 d-flex gap-2">
<button id="generation-toggle" class="btn btn-primary mb-3">Lancer la génération</button> <button id="generation-toggle" class="btn btn-primary mb-3">Lancer la génération</button>
<button id="export-pdf" class="btn btn-secondary mb-3" type="button" onclick="exportTableToPDF()">Exporter en PDF</button> <button id="export-pdf" class="btn btn-primary mb-3" type="button" onclick="exportTableToPDF()">Exporter en PDF</button>
</div> </div>
<div id="credit-alert" class="alert alert-danger d-none" role="alert"> <div id="credit-alert" class="alert alert-danger d-none" role="alert">
Vous n'avez plus de crédits pour générer des appréciations. Vous n'avez plus de crédits pour générer des appréciations.
@ -116,34 +134,73 @@ body, .bg-light {
<table class="table table-bordered" id="appreciations-table"> <table class="table table-bordered" id="appreciations-table">
<thead> <thead>
<tr> <tr>
<th>Élève</th> <th style="width:1%; white-space:nowrap;">Élève</th>
<th>Appréciation</th> <th>Appréciation</th>
<th style="width:1%; white-space:nowrap; text-align:center;">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% if appreciations_json and appreciations_json|length > 0 %} {% if appreciations_json and appreciations_json|length > 0 %}
{% for appreciation in appreciations_json %} {% for appreciation in appreciations_json %}
<tr> <tr>
<td class="eleve">{{ appreciation.eleve }}</td> <td class="eleve" style="width:1%; white-space:nowrap;">{{ appreciation.eleve }}</td>
<td class="appreciation"></td> <td class="appreciation"></td>
<td style="width:1%; text-align:center; vertical-align:middle;">
<div class="d-flex justify-content-center gap-2">
<button class="btn btn-outline-primary btn-sm action-generate w-100" type="button">Générer</button>
<button class="btn btn-outline-primary btn-sm action-bulletin w-100" type="button" data-eleve="{{ appreciation.eleve }}">Bulletin</button>
</div>
</td>
</tr> </tr>
{% endfor %} {% endfor %}
{% else %} {% else %}
<tr> <tr>
<td colspan="2"><div class="alert alert-warning mb-0">Aucune appréciation générée.</div></td> <td colspan="3"><div class="alert alert-warning mb-0">Aucune appréciation générée.</div></td>
</tr> </tr>
{% endif %} {% endif %}
</tbody> </tbody>
</table> </table>
<!-- Injection des appréciations dans une variable JS globale pour accès rapide -->
<script id="appreciations-data" type="application/json">
{{ appreciations_json|safe }}
</script>
<script>
window.allAppreciations = {};
try {
const appreciationsList = JSON.parse(document.getElementById('appreciations-data').textContent);
appreciationsList.forEach(eleve => {
let appreciations = eleve.appreciations;
if (typeof appreciations === 'string') {
try { appreciations = JSON.parse(appreciations); } catch (e) { appreciations = []; }
}
window.allAppreciations[eleve.eleve] = appreciations;
});
} catch (e) { window.allAppreciations = {}; }
</script>
<script> <script>
let stopGeneration = false; let stopGeneration = false;
let enCours = false; let enCours = false;
function getRowsSansAppreciation() { function updateActionButtons() {
const rows = document.querySelectorAll('#appreciations-table tbody tr');
rows.forEach(row => {
const appreciationCell = row.querySelector('.appreciation');
const btn = row.querySelector('.action-generate');
if (!btn) return;
if (appreciationCell.textContent.trim()) {
btn.textContent = 'Régénérer';
} else {
btn.textContent = 'Générer';
}
btn.disabled = enCours;
});
}
function getRowsSansAppreciation() {
return Array.from(document.querySelectorAll('#appreciations-table tbody tr')).filter(row => !row.querySelector('.appreciation').textContent.trim()); return Array.from(document.querySelectorAll('#appreciations-table tbody tr')).filter(row => !row.querySelector('.appreciation').textContent.trim());
} }
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
const btnToggle = document.getElementById('generation-toggle'); const btnToggle = document.getElementById('generation-toggle');
const selectModele = document.getElementById('modele-select'); const selectModele = document.getElementById('modele-select');
const creditRestant = document.getElementById('credit-restant'); const creditRestant = document.getElementById('credit-restant');
@ -165,13 +222,16 @@ document.addEventListener('DOMContentLoaded', function() {
function traiterLignes() { function traiterLignes() {
rows = getRowsSansAppreciation(); rows = getRowsSansAppreciation();
updateActionButtons();
if (rows.length === 0 || stopGeneration) { if (rows.length === 0 || stopGeneration) {
enCours = false; enCours = false;
updateActionButtons();
if (stopGeneration) setButtonState('continuer'); if (stopGeneration) setButtonState('continuer');
else setButtonState('lancer'); else setButtonState('lancer');
return; return;
} }
enCours = true; enCours = true;
updateActionButtons();
setButtonState('arreter'); setButtonState('arreter');
const row = rows[0]; const row = rows[0];
const eleve = row.querySelector('.eleve').textContent; const eleve = row.querySelector('.eleve').textContent;
@ -188,6 +248,7 @@ document.addEventListener('DOMContentLoaded', function() {
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
appreciationCell.textContent = data.appreciation; appreciationCell.textContent = data.appreciation;
updateActionButtons();
if (typeof data.credit !== 'undefined') { if (typeof data.credit !== 'undefined') {
creditRestant.textContent = 'Crédits restants : ' + data.credit; creditRestant.textContent = 'Crédits restants : ' + data.credit;
} }
@ -203,6 +264,7 @@ document.addEventListener('DOMContentLoaded', function() {
}) })
.catch(() => { .catch(() => {
appreciationCell.textContent = 'Erreur lors de la génération'; appreciationCell.textContent = 'Erreur lors de la génération';
updateActionButtons();
traiterLignes(); traiterLignes();
}); });
} }
@ -225,12 +287,86 @@ document.addEventListener('DOMContentLoaded', function() {
} }
}); });
// Action individuelle sur bouton Générer/Régénérer
document.querySelectorAll('.action-generate').forEach(btn => {
btn.addEventListener('click', function() {
if (enCours) return;
const row = btn.closest('tr');
const eleve = row.querySelector('.eleve').textContent;
const appreciationCell = row.querySelector('.appreciation');
appreciationCell.innerHTML = '<span class="spinner-border spinner-border-sm"></span> Génération...';
btn.disabled = true;
fetch("{% url 'generer_appreciation_ajax' %}", {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRFToken': '{{ csrf_token }}'
},
body: JSON.stringify({eleve: eleve, modele: selectModele.value})
})
.then(response => response.json())
.then(data => {
appreciationCell.textContent = data.appreciation;
updateActionButtons();
if (typeof data.credit !== 'undefined') {
creditRestant.textContent = 'Crédits restants : ' + data.credit;
}
if (data.credit === 0) {
creditAlert.classList.remove('d-none');
}
})
.catch(() => {
appreciationCell.textContent = 'Erreur lors de la génération';
updateActionButtons();
});
});
});
// Action individuelle sur bouton Bulletin
document.querySelectorAll('.action-bulletin').forEach(btn => {
btn.addEventListener('click', function() {
const eleve = btn.getAttribute('data-eleve');
fetch("{% url 'get_bulletin_eleve' %}", {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRFToken': '{{ csrf_token }}'
},
body: JSON.stringify({eleve: eleve})
})
.then(response => response.json())
.then(data => {
// Mettre le titre dans le header du modal
const modalTitle = document.getElementById('bulletinModalLabel');
if (modalTitle) {
modalTitle.textContent = `Bulletin de l'élève ${eleve}`;
}
// Mettre uniquement les appréciations dans le body
let message = '';
if (Array.isArray(data.appreciations) && data.appreciations.length > 0) {
message += data.appreciations.map(app => `<div style='margin-bottom:8px;'><strong>${app.matiere} :</strong><br>${app.appreciation}</div>`).join('');
} else {
message += '<em>Aucune appréciation trouvée dans le bulletin.</em>';
}
showBulletinModal(message);
})
.catch(() => {
const modalTitle = document.getElementById('bulletinModalLabel');
if (modalTitle) {
modalTitle.textContent = `Bulletin`;
}
showBulletinModal('<em>Erreur lors de la récupération du bulletin.</em>');
});
});
});
setButtonState('lancer'); setButtonState('lancer');
}); updateActionButtons();
</script> });
</script>
<script> <script>
// CDN jsPDF + autoTable pour export PDF // CDN jsPDF + autoTable pour export PDF
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
if (!window.jspdfLoaded) { if (!window.jspdfLoaded) {
const script1 = document.createElement('script'); const script1 = document.createElement('script');
script1.src = 'https://cdnjs.cloudflare.com/ajax/libs/jspdf/2.5.1/jspdf.umd.min.js'; script1.src = 'https://cdnjs.cloudflare.com/ajax/libs/jspdf/2.5.1/jspdf.umd.min.js';
@ -242,9 +378,9 @@ document.addEventListener('DOMContentLoaded', function() {
}; };
document.body.appendChild(script1); document.body.appendChild(script1);
} }
}); });
function exportTableToPDF() { function exportTableToPDF() {
const doc = new window.jspdf.jsPDF({ orientation: 'portrait', unit: 'pt', format: 'a4' }); const doc = new window.jspdf.jsPDF({ orientation: 'portrait', unit: 'pt', format: 'a4' });
doc.text('Tableau des appréciations', 40, 40); doc.text('Tableau des appréciations', 40, 40);
// Couleurs fixes mode clair // Couleurs fixes mode clair
@ -275,8 +411,30 @@ function exportTableToPDF() {
pageBreak: 'auto', pageBreak: 'auto',
}); });
doc.save('appreciations.pdf'); doc.save('appreciations.pdf');
} }
</script> </script>
<script>
function showBulletinModal(html) {
const modalBody = document.getElementById('bulletinModalBody');
if (modalBody) {
modalBody.innerHTML = html;
const modal = new bootstrap.Modal(document.getElementById('bulletinModal'));
modal.show();
}
}
</script>
<!-- Modal Bulletin -->
<div class="modal fade" id="bulletinModal" tabindex="-1" aria-labelledby="bulletinModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" style="max-width:80vw; width:80vw;">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="bulletinModalLabel">Bulletin</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Fermer"></button>
</div>
<div class="modal-body" id="bulletinModalBody" style="font-size:1.1rem; line-height:1.5; word-break:break-word;"></div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

3
main/urls.py
Unescape View File

@ -1,5 +1,5 @@
from django.urls import path from django.urls import path
from .views import login_view, generation, resultat_appreciations, logout_view, generer_appreciation_ajax from .views import login_view, generation, resultat_appreciations, logout_view, generer_appreciation_ajax, get_bulletin_eleve
urlpatterns = [ urlpatterns = [
path('login/', login_view, name='login'), path('login/', login_view, name='login'),
@ -7,4 +7,5 @@ urlpatterns = [
path('resultat/', resultat_appreciations, name='resultat_appreciations'), path('resultat/', resultat_appreciations, name='resultat_appreciations'),
path('logout/', logout_view, name='logout'), path('logout/', logout_view, name='logout'),
path('generer_appreciation_ajax/', generer_appreciation_ajax, name='generer_appreciation_ajax'), path('generer_appreciation_ajax/', generer_appreciation_ajax, name='generer_appreciation_ajax'),
path('get_bulletin_eleve/', get_bulletin_eleve, name='get_bulletin_eleve'),
] ]

20
main/views.py
Unescape View File

@ -10,6 +10,7 @@ from main.models import UserCredit, Modele
import os import os
import uuid import uuid
import json import json
from django.views.decorators.csrf import csrf_exempt
def login_view(request): def login_view(request):
if request.method == 'POST': if request.method == 'POST':
@ -76,6 +77,25 @@ def generer_appreciation_ajax(request):
return JsonResponse({'appreciation': 'Crédit épuisé', 'credit': 0, 'stop': True}) return JsonResponse({'appreciation': 'Crédit épuisé', 'credit': 0, 'stop': True})
return JsonResponse({'error': 'Méthode non autorisée'}, status=405) return JsonResponse({'error': 'Méthode non autorisée'}, status=405)
@login_required(login_url='/login/')
def get_bulletin_eleve(request):
if request.method == 'POST':
data = json.loads(request.body)
eleve_nom = data.get('eleve')
appreciations_json = request.session.get('appreciations_json', [])
appreciations = []
for eleve in appreciations_json:
if eleve.get('eleve') == eleve_nom:
appreciations = eleve.get('appreciations', [])
if isinstance(appreciations, str):
try:
appreciations = json.loads(appreciations)
except Exception:
appreciations = []
break
return JsonResponse({'appreciations': appreciations})
return JsonResponse({'error': 'Méthode non autorisée'}, status=405)
def logout_view(request): def logout_view(request):
logout(request) logout(request)
return redirect('login') return redirect('login')

Write Preview
Loading…
Cancel
Save