Skip to content

Commit

Permalink
Modifs retours de Fuzzy
Browse files Browse the repository at this point in the history
  • Loading branch information
Avzgui committed Jun 2, 2015
1 parent 00c0f78 commit f5da442
Show file tree
Hide file tree
Showing 168 changed files with 18 additions and 8 deletions.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified LICENSE
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
Empty file modified app/Console/Commands/.gitkeep
100644 → 100755
Empty file.
Empty file modified app/Console/Kernel.php
100644 → 100755
Empty file.
Empty file modified app/Exceptions/Handler.php
100644 → 100755
Empty file.
Empty file modified app/Http/Controllers/ChapitreController.php
100644 → 100755
Empty file.
Empty file modified app/Http/Controllers/Controller.php
100644 → 100755
Empty file.
Empty file modified app/Http/Controllers/CoursController.php
100644 → 100755
Empty file.
Empty file modified app/Http/Controllers/ExerciceController.php
100644 → 100755
Empty file.
Empty file modified app/Http/Controllers/Exercices/TextATrouController.php
100644 → 100755
Empty file.
Empty file modified app/Http/Controllers/ExoTest2Controller.php
100644 → 100755
Empty file.
Empty file modified app/Http/Controllers/ExoTestController.php
100644 → 100755
Empty file.
24 changes: 17 additions & 7 deletions app/Http/Controllers/FuzzyController.php
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -115,29 +115,39 @@ public function evaluate(Request $request)
/* ------ on clarifie le retour du conseil ------ */
/* --- si le résultat est "très mauvais" --- */
if ($res['note'] < 12.5) {
$res['conseil'] = 'REVIEW_BASICS';
$res['conseil'] = "Oups, tu as fait beaucoup d'erreurs.
Veux tu revoir le cours ?";
$res['smiley'] = '/images/very_bad.png';
$res['choix'] = ['Revoir le cours', 'Plus Facile', 'Recommencer'];
} /* --- si le résultat est "mauvais" --- */
elseif ($res['note'] < 27.5) {
$res['conseil'] = 'REDO_SIMPLE';
$res['conseil'] = "Hmm, ce n'est pas encore ça.
Veux essayer le même exercice en plus facile ?";
$res['smiley'] = '/images/bad.png';
$res['choix'] = ['PlusFacile', 'Recommencer'];
} /* --- si le résultat est "moyen" --- */
elseif ($res['note'] < 62.5) {
$res['smiley'] = '/images/medium.png';
$res['choix'] = ['Recommencer'];
$res['conseil'] = "Tu fais encore quelques erreurs.";
/* ---- On regarde le conseil défini dans fuzzy ---- */
if ($res['conseil'] < 0.25) {
$res['conseil'] = 'REDO_SLOWLY';
$res['conseil'] .= " Essai d'aller un peu moins vite.";
} elseif ($res['conseil'] < 0.75) {
$res['conseil'] = 'REDO';
$res['conseil'] .= " Recommence tu va y arriver.";
} else {
$res['conseil'] = 'REDO_FASTER';
$res['conseil'] = "C'est bien tu fais peu d'erreurs,
mais tu prends encore un peu trop ton temps.
M0aintenant essai d'aller un peu plus vite.";
}
} elseif ($res['note'] < 77.5) {
$res['smiley'] = '/images/good.png';
$res['conseil'] = 'CONTINUE';
$res['conseil'] = "C'est bien. Prêt pour la suite ?";
$res['choix'] = ['Recommencer', 'Continuer'];
} else {
$res['smiley'] = '/images/very_good.png';
$res['conseil'] = 'CONTINUE_DIFFICULT';
$res['conseil'] = "C'est très bien ! Prêt pour la suite ?";
$res['choix'] = ['Recommencer', 'ContinuerHard'];
}


Expand Down
Empty file modified app/Http/Controllers/UserController.php
100644 → 100755
Empty file.
Empty file modified app/Http/Controllers/WelcomeController.php
100644 → 100755
Empty file.
Empty file modified app/Http/Controllers/sonController.php
100644 → 100755
Empty file.
Empty file modified app/Http/Middleware/ExampleMiddleware.php
100644 → 100755
Empty file.
Empty file modified app/Http/routes.php
100644 → 100755
Empty file.
Empty file modified app/Jobs/Job.php
100644 → 100755
Empty file.
Empty file modified app/Models/Chapitre.php
100644 → 100755
Empty file.
Empty file modified app/Models/Cours.php
100644 → 100755
Empty file.
Empty file modified app/Models/Enseigne.php
100644 → 100755
Empty file.
Empty file modified app/Models/Exercice.php
100644 → 100755
Empty file.
Empty file modified app/Models/ExerciceImageExo.php
100644 → 100755
Empty file.
Empty file modified app/Models/Forum.php
100644 → 100755
Empty file.
Empty file modified app/Models/ImageExo.php
100644 → 100755
Empty file.
Empty file modified app/Models/NextExercice.php
100644 → 100755
Empty file.
Empty file modified app/Models/Questionnaire.php
100644 → 100755
Empty file.
Empty file modified app/Models/QuestionnaireExo.php
100644 → 100755
Empty file.
Empty file modified app/Models/Stats.php
100644 → 100755
Empty file.
Empty file modified app/Models/Teacher.php
100644 → 100755
Empty file.
Empty file modified app/Models/User.php
100644 → 100755
Empty file.
Empty file modified app/Models/Wiki.php
100644 → 100755
Empty file.
Empty file modified app/Providers/AppServiceProvider.php
100644 → 100755
Empty file.
Empty file modified app/Providers/FuzzyLogicProvider.php
100644 → 100755
Empty file.
Empty file modified artisan
100644 → 100755
Empty file.
Empty file modified bootstrap/app.php
100644 → 100755
Empty file.
Empty file modified composer.json
100644 → 100755
Empty file.
Empty file modified composer.lock
100644 → 100755
Empty file.
Empty file modified config
100644 → 100755
Empty file.
Empty file modified database/migrations/.gitkeep
100644 → 100755
Empty file.
Empty file modified database/migrations/2015_05_05_081351_create_users_table.php
100644 → 100755
Empty file.
Empty file.
Empty file modified database/migrations/2015_05_05_084148_create_exercice_table.php
100644 → 100755
Empty file.
Empty file modified database/migrations/2015_05_05_084625_create_chapitre_table.php
100644 → 100755
Empty file.
Empty file modified database/migrations/2015_05_05_084907_create_cours_table.php
100644 → 100755
Empty file.
Empty file modified database/migrations/2015_05_05_085021_create_stats_table.php
100644 → 100755
Empty file.
Empty file modified database/migrations/2015_05_05_085255_create_forum_table.php
100644 → 100755
Empty file.
Empty file modified database/migrations/2015_05_05_085304_create_wiki_table.php
100644 → 100755
Empty file.
Empty file modified database/migrations/2015_05_05_085328_create_imageExo_table.php
100644 → 100755
Empty file.
Empty file modified database/migrations/2015_05_11_074807_create_enseigne_table.php
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified database/seeds/ChapitreTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/CoursTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/DatabaseSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/EnseigneTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/ExerciceImageExoTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/ExerciceTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/ForumTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/ImageExoTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/NextExerciceTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/QuestionnaireExoTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/QuestionnaireTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/StatsTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/UserTableSeeder.php
100644 → 100755
Empty file.
Empty file modified database/seeds/WikiTableSeeder.php
100644 → 100755
Empty file.
Empty file modified phpunit.xml
100644 → 100755
Empty file.
Empty file modified public/.htaccess
100644 → 100755
Empty file.
Empty file modified public/css/common.css
100644 → 100755
Empty file.
Empty file modified public/css/demo.css
100644 → 100755
Empty file.
Empty file modified public/css/signup.css
100644 → 100755
Empty file.
Empty file modified public/css/style6.css
100644 → 100755
Empty file.
Empty file modified public/images/16.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/17.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/18.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/bad.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/cleDeSol.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/cleDeSol.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/do.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/fa.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/good.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/la.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/medium.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/mi.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/partitionVide.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/re.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/si.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/sol.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/teteNote.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/very_bad.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/very_good.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/index.php
100644 → 100755
Empty file.
Empty file modified public/js/d3pie.min.js
100644 → 100755
Empty file.
Empty file modified public/js/interact.min.js
100644 → 100755
Empty file.
Empty file modified public/js/jquery-ui-1.11.4.custom/external/jquery/jquery.js
100644 → 100755
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/js/jquery-ui-1.11.4.custom/index.html
100644 → 100755
Empty file.
Empty file modified public/js/jquery-ui-1.11.4.custom/jquery-ui.css
100644 → 100755
Empty file.
Empty file modified public/js/jquery-ui-1.11.4.custom/jquery-ui.js
100644 → 100755
Empty file.
Empty file modified public/js/jquery-ui-1.11.4.custom/jquery-ui.min.css
100644 → 100755
Empty file.
Empty file modified public/js/jquery-ui-1.11.4.custom/jquery-ui.min.js
100644 → 100755
Empty file.
Empty file modified public/js/jquery-ui-1.11.4.custom/jquery-ui.structure.css
100644 → 100755
Empty file.
Empty file modified public/js/jquery-ui-1.11.4.custom/jquery-ui.structure.min.css
100644 → 100755
Empty file.
Empty file modified public/js/jquery-ui-1.11.4.custom/jquery-ui.theme.css
100644 → 100755
Empty file.
Empty file modified public/js/jquery-ui-1.11.4.custom/jquery-ui.theme.min.css
100644 → 100755
Empty file.
Empty file modified public/js/jquery.js
100644 → 100755
Empty file.
Empty file modified public/js/modernizr.custom.79639.js
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion public/js/pie.js
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function getIndexForShuffled(tab, note){

function success(mess){
console.log(mess.smiley);
$('#message').addClass('alert-warning').fadeIn(1000).html('<p>'+mess.conseil+'<img src='+mess.smiley+'>'+'</p>');
$('#message').addClass('alert-warning').fadeIn(1000).html('<p>'+mess.conseil+'</p><br/><p>'+mess.choix+'</p><img src='+mess.smiley+'>');
}

function numberOfErrors(tab_reponse, tab_solution){
Expand Down
Empty file modified public/js/utility.js
100644 → 100755
Empty file.
Empty file modified public/son/djembe.mp3
100644 → 100755
Empty file.
Empty file modified public/son/do.mp3
100644 → 100755
Empty file.
Empty file modified public/son/fa.mp3
100644 → 100755
Empty file.
Empty file modified public/son/la.mp3
100644 → 100755
Empty file.
Empty file modified public/son/mi.mp3
100644 → 100755
Empty file.
Empty file modified public/son/piano_do.mp3
100644 → 100755
Empty file.
Empty file modified public/son/piano_fa.mp3
100644 → 100755
Empty file.
Empty file modified public/son/piano_la.mp3
100644 → 100755
Empty file.
Empty file modified public/son/piano_mi.mp3
100644 → 100755
Empty file.
Empty file modified public/son/piano_re.mp3
100644 → 100755
Empty file.
Empty file modified public/son/piano_si.mp3
100644 → 100755
Empty file.
Empty file modified public/son/piano_sol.mp3
100644 → 100755
Empty file.
Empty file modified public/son/re.mp3
100644 → 100755
Empty file.
Empty file modified public/son/si.mp3
100644 → 100755
Empty file.
Empty file modified public/son/sol.mp3
100644 → 100755
Empty file.
Empty file modified resources/lang/en/validation.php
100644 → 100755
Empty file.
Empty file modified resources/views/.gitkeep
100644 → 100755
Empty file.
Empty file modified resources/views/Exercices/TextATrou.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/dashboard.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/exoPieGame.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/exoTest.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/exoTest2.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/getChapitre.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/getCours.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/getExercice.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/header.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/layouts/json.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/layouts/master.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/login.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/signup.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/teacherAll.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/testson.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/user.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/userAll.blade.php
100644 → 100755
Empty file.
Empty file modified resources/views/welcome.blade.php
100644 → 100755
Empty file.
Empty file modified server.php
100644 → 100755
Empty file.
Empty file modified storage/app/.gitignore
100644 → 100755
Empty file.
Empty file modified storage/framework/cache/.gitignore
100644 → 100755
Empty file.
Empty file modified storage/framework/sessions/.gitignore
100644 → 100755
Empty file.
Empty file modified storage/framework/views/.gitignore
100644 → 100755
Empty file.
Empty file modified storage/logs/.gitignore
100644 → 100755
Empty file.
Empty file modified tests/ExampleTest.php
100644 → 100755
Empty file.
Empty file modified tests/TestCase.php
100644 → 100755
Empty file.

0 comments on commit f5da442

Please sign in to comment.