Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quiz sondage #6486

Open
wants to merge 88 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 65 commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
0e4a448
quizz: Intégration IHM
artragis Sep 20, 2020
fd130d5
divers fix
artragis Sep 20, 2020
37c472f
POC
artragis Sep 20, 2020
d68cce6
Remontée des stats et blocs pour correction
artragis Sep 21, 2020
3b570b2
Permet de bien corriger les quizz où une réponse n'a pas été donnée
artragis Feb 20, 2021
9fd81bb
modèles de stats
artragis Sep 27, 2020
2064551
Utilise la fonction get_or_create de django qui est plus robuste
artragis Oct 9, 2020
cd7fc95
ne pas fusionner la correction
artragis Nov 14, 2020
2d5471b
reformat
artragis Dec 19, 2020
109edc7
merge migrations
artragis Dec 19, 2020
15772e7
Revert bad modif
artragis Dec 19, 2020
b2a0561
Update templates/tutorialv2/view/content.html
artragis Dec 19, 2020
15c9c8e
Update templates/tutorialv2/view/container.html
artragis Dec 19, 2020
db80c8d
Fix deux/trois soucis sur les quizz
artragis Oct 30, 2022
cb5eeca
doc lint
artragis Oct 30, 2022
a2588ac
doc lint
artragis Oct 30, 2022
496cc30
clean up models
artragis Oct 30, 2022
5bf27a0
Apply suggestions from code review
artragis Oct 31, 2022
458f1c5
Rend le JS plus lisible
artragis Oct 31, 2022
f76544b
Indente le span
artragis Oct 31, 2022
7961f52
linter hell
artragis Oct 31, 2022
f7306b5
Billets précédents et suivants : uniquement ceux choisis par le Staff
atman0eirb Dec 30, 2022
83a14cd
modify test to accept the Fix #5793
atman0eirb Jan 13, 2023
e721ba2
import de PickListOperation pour le test
atman0eirb Jan 13, 2023
b858112
Merge branch 'dev' into dev
philippemilink Jan 14, 2023
26d76be
add explanation, validaion of quizz if there is answer
atman0eirb Mar 18, 2023
6aa48a0
quik fix
atman0eirb Mar 19, 2023
62b07c6
conflict
atman0eirb Mar 19, 2023
0052db6
reglage de bug d'affichage apres le submit de la reponse
Mar 19, 2023
9093ffa
fixed explanation and result display
atman0eirb Mar 23, 2023
0a638da
Merge branch 'quiz_sondage' of github.com:atman0eirb/zds-site into qu…
atman0eirb Mar 23, 2023
3ce3f5d
display corrects answers with green
atman0eirb Mar 27, 2023
4d0e68d
no result display any more, result is clear by colors
atman0eirb Mar 27, 2023
0da5ae2
Merge remote branch 'origin/quiz_sondage'
atman0eirb Mar 27, 2023
fbab71a
Merge remote branch 'origin/quiz_sondage'
atman0eirb Mar 27, 2023
266f492
problem des statistiques doublées résolu
atman0eirb Apr 3, 2023
c9793a5
fix le titre des quizzs dans la section statistique
Apr 3, 2023
6816722
Merge branch 'quiz_sondage' of github.com:atman0eirb/zds-site into qu…
Apr 3, 2023
e6415af
problem des statistiques doublées résolu
atman0eirb Apr 3, 2023
f4f2353
problème des statistiques doubles résolu à l'origine
atman0eirb Apr 5, 2023
baeae57
résolve conflicts
atman0eirb Apr 5, 2023
4bc5404
disabled submit after answer&& non connected user can't answer a qui…
atman0eirb Apr 5, 2023
0cb1154
survey start Js file
atman0eirb Apr 6, 2023
bce2090
added a quizz markdown code generator
atman0eirb Apr 6, 2023
77fc952
made quizz statistics in other page than contenent statistics
atman0eirb Apr 8, 2023
a32d1f1
non connected user can responses only one time per session, addes qu…
atman0eirb Apr 12, 2023
034dc5e
deleted that quizz generator
atman0eirb Apr 12, 2023
02648d8
fixed issue of text between quizz and submit button
atman0eirb Apr 16, 2023
44f8626
added a button to create quizz squelette on editor; still have an is…
atman0eirb Apr 16, 2023
9d9c10c
fix explanation dislay
atman0eirb Apr 17, 2023
78f8174
added icons for a best result display for daltoniens
atman0eirb Apr 17, 2023
c50d72b
factorisaton of icon code
atman0eirb Apr 18, 2023
4e369a1
used mathjax for a good display of formula
atman0eirb Apr 20, 2023
50bd56c
fixed issue of bad display in quizz statistics
atman0eirb Apr 22, 2023
60edb12
rajout chemin pour titre dans statistique des quizzs
Apr 23, 2023
d265bac
changed display of explication
atman0eirb Apr 23, 2023
eee0046
fix explanation dislay
atman0eirb Apr 17, 2023
a07fb12
added icons for a best result display for daltoniens
atman0eirb Apr 17, 2023
e205615
factorisaton of icon code
atman0eirb Apr 18, 2023
32a0fef
used mathjax for a good display of formula
atman0eirb Apr 20, 2023
51d951e
fixed content of statistics sent from client
atman0eirb Apr 23, 2023
19a2875
fixed conflict
atman0eirb Apr 23, 2023
6234832
quizzs works only on turorials pages
atman0eirb Apr 25, 2023
eed909a
in one session a non connected user can answers only one time
atman0eirb Apr 27, 2023
0ac7e4d
good display of statistics, possibility to delete quizzs and questio…
atman0eirb Apr 28, 2023
3512eb3
quick fix
atman0eirb Apr 28, 2023
33243c0
correction faute de francais
Apr 29, 2023
6ed7cff
fixed issues on authors statistics page
atman0eirb Apr 30, 2023
bf95026
quick conflict
atman0eirb Apr 30, 2023
729bdb6
ajout des premiers tests
Apr 30, 2023
314caa1
fixed display of explanation in tutorial draft version
atman0eirb Apr 30, 2023
4bbec24
quick fix of last commit
atman0eirb Apr 30, 2023
91e89b6
quizz squelette on editor
atman0eirb Apr 30, 2023
e9c39bf
maked answers element as labels , still need some style :)
atman0eirb May 1, 2023
b2c6328
ajout de tests supplémentaires
May 1, 2023
76ea273
quizz squelette dans l'editeur n'est possible que dans contenus et s…
atman0eirb May 3, 2023
e1003f2
modification de style pour quizz et stat
May 3, 2023
53509b4
complément dans la documentation
May 3, 2023
e71fb82
fix -> boutton submit confondu avec la ligne de fin de section
May 3, 2023
8348e85
Merge branch 'quiz_sondage' of github.com:atman0eirb/zds-site into qu…
May 3, 2023
079d5e7
remise de la doc
May 3, 2023
59dcda2
quick fix
atman0eirb May 4, 2023
23ca81b
added Http404 for invalid date format
atman0eirb May 7, 2023
275dc4c
added tests of statistics deletting view
atman0eirb May 7, 2023
40d2967
quick fix of quizz squelette
atman0eirb May 8, 2023
317b47f
sondage in other branch Forum_sondage
atman0eirb May 8, 2023
d9d29b8
quick fix
atman0eirb May 9, 2023
3a0fe77
deletting users responses when quizz question answers were updated /…
atman0eirb May 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions assets/js/charts.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,35 @@
const t = v * (1 - s * (1 - f))

switch (i) {
case 0: r = v; g = t; b = p; break
case 1: r = q; g = v; b = p; break
case 2: r = p; g = v; b = t; break
case 3: r = p; g = q; b = v; break
case 4: r = t; g = p; b = v; break
default: r = v; g = p; b = q
case 0:
r = v
g = t
b = p
break
case 1:
r = q
g = v
b = p
break
case 2:
r = p
g = v
b = t
break
case 3:
r = p
g = q
b = v
break
case 4:
r = t
g = p
b = v
break
default:
r = v
g = p
b = q
}

return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)]
Expand Down Expand Up @@ -173,6 +196,7 @@
}
}
}

drawCharts()

// Tab management
Expand Down
Loading