opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +23 -34
2 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6821a02956 - Show all commits

4
app/pe/pe_jury.py
View File

@ -587,13 +587,15 @@ class JuryPE(object):
tags = self._do_tags_list(self.interclasstags) tags = self._do_tags_list(self.interclasstags)
# Descripti
# Les données par UE # Les données par UE
moyennes = {} moyennes = {}
for tag in tags: for tag in tags:
moyennes[tag] = {} moyennes[tag] = {}
# Les données de synthèse # Les données de synthèse
df = self.synthese[(tag, pe_moytag.CODE_MOY_COMPETENCES)] df = self.synthese[(tag, pe_moytag.CODE_MOY_COMPETENCES)]
for aggregat in pe_rcs.TOUS_LES_RCS_AVEC_PLUSIEURS_SEM: for aggregat in pe_rcs.TOUS_LES_RCS:
moyennes[tag][aggregat] = {} moyennes[tag][aggregat] = {}
for comp in competences + ["Général"]: for comp in competences + ["Général"]:
moyennes[tag][aggregat][comp] = { moyennes[tag][aggregat][comp] = {

43
app/templates/pe/pe_view_resultats_etudiant.j2
View File

@ -3,9 +3,10 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>PE de {{ nom }} }}</title> <title>PE de {{ nom }}</title>
<!--link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css"> <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.css"-->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.min.css"/>
<style> <style>
.flash { padding: 8px; color: white; border-radius: 15px; font-weight: bold; } .flash { padding: 8px; color: white; border-radius: 15px; font-weight: bold; }
.success { background-color: limegreen; } .success { background-color: limegreen; }
@ -14,37 +15,28 @@
</head> </head>
<body> <body>
<main class="container">
<h1>Résultats PE de {{prenom}} {{nom}}</h1> <h1>Résultats PE de {{prenom}} {{nom}}</h1>
<h2>Résultats calculés par UEs</h2>
{% for tag in tags %} {% for tag in tags %}
<h3>Tag {{ tag }}</h3> <h2>Tag <code>👜 {{ tag }}</code></h2>
{% endfor %} <table class="striped">
<h2>Résultats calculés par Compétences</h2>
{% for tag in tags %}
<h3>{{ tag }}</h3>
<table>
<!-- Entêtes/Colonnes --> <!-- Entêtes/Colonnes -->
<thead> <thead>
<tr> <tr>
<th rowspan="2"></th> <th rowspan="2"></th>
{% for col in colonnes_html %} {% for col in colonnes_html %}
<th colspan="3">{{ col }}</th> <th colspan="2" data-theme="dark">{{ col }}</th>
{% endfor %} {% endfor %}
<th colspan="3">Général</th> <th colspan="2" data-theme="dark">Général</th>
</tr> </tr>
<tr> <tr>
{% for col in colonnes_html %} {% for col in colonnes_html %}
<td></td><td>Groupe</td><td>Promo</td> <th>Note</th><th>Class.</th>
{% endfor %} {% endfor %}
<th>Note</th><th>Class.</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -52,21 +44,16 @@
<tr> <tr>
<td>{{ aggregat }}</td> <td>{{ aggregat }}</td>
{% for comp in moyennes[tag][aggregat] %} {% for comp in moyennes[tag][aggregat] %}
<td>{{ moyennes[tag][aggregat][comp]["note"] }}</td> <td>{{ moyennes[tag][aggregat][comp]["note"] }}</td>
<td>{{ moyennes[tag][aggregat][comp]["rang_groupe"] }}</td> <td><span class="w3-badge w3-red">{{ moyennes[tag][aggregat][comp]["rang_groupe"] }}</span>
<td>{{ moyennes[tag][aggregat][comp]["rang_promo"] }}</td> <span class="w3-badge w3-blue">{{ moyennes[tag][aggregat][comp]["rang_promo"] }}</span></td>
{% endfor %} {% endfor %}
<td>{{ moyennes[tag][aggregat]["Général"]["note"] }}</td>
<td>{{ moyennes[tag][aggregat]["Général"]["rang_groupe"] }}</td>
<td>{{ moyennes[tag][aggregat]["Général"]["rang_promo"] }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
{% endfor %} {% endfor %}
</main>main>
</body> </body>
</html> </html>