From 982522b5b9dfc39c10d08129b873aadf77b7293f Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 28 Feb 2016 19:40:37 +0100 Subject: Experiment: add "teacher helped" link to Prolog screen Records a {'typ': 'experiment', 'data': 'teacher help'} action when clicked. This will allow us to consider such traces specially when evaluating different hint types. This is specific to the prolog_hints experiment and should be reverted or generalized in the future. --- css/codeq.css | 5 +++++ index.html | 6 ++++++ js/codeq/prolog.js | 18 ++++++++++++++++++ res/en.json | 2 ++ res/sl.json | 2 ++ 5 files changed, 33 insertions(+) diff --git a/css/codeq.css b/css/codeq.css index bbb40c9..9b87baa 100644 --- a/css/codeq.css +++ b/css/codeq.css @@ -295,6 +295,11 @@ h2.group-title a.view-solutions { /***** responsiveness *****/ /* md & ld */ @media (min-width: 992px) { + /* experiment: Prolog hints */ + .teacher-help { + position: fixed; bottom: 0; left: 0; max-width: 30%; + } + /* end of experiment: Prolog hints */ /* BEGIN layouts */ /*~~ line-layout ~~*/ diff --git a/index.html b/index.html index 9675f40..96e7504 100644 --- a/index.html +++ b/index.html @@ -364,6 +364,12 @@
+ + +
diff --git a/js/codeq/prolog.js b/js/codeq/prolog.js index 7cf9592..6e07784 100644 --- a/js/codeq/prolog.js +++ b/js/codeq/prolog.js @@ -28,6 +28,10 @@ along with this program. If not, see . */ jqAllButtons = jqBtnPlan.add(jqBtnTest), // all the buttons prologHandler; + // experiment: Prolog hints + var jqTeacherHelp = jqScreen.find('.teacher-help'); + // end of experiment: Prolog hints + var enterFun = function(problemDef, commonDef, currentSolution) { $('#navigation-problem-list').css('display', ''); var navigationProlog = $("#navigation-prolog"); @@ -55,6 +59,11 @@ along with this program. If not, see . */ .done(); }, 'exit': function () { + // experiment: Prolog hints + jqTeacherHelp.find('a').off('click'); + jqTeacherHelp.hide(); + // end of experiment: Prolog hints + jqAllButtons.off(); // unregister all event handlers jqAllQuadrants.off(); jqScreen.css('display', 'none'); @@ -250,6 +259,15 @@ along with this program. If not, see . */ .done(); }); + // experiment: Prolog hints + jqTeacherHelp.find('a').on('click', function(e) { + e.preventDefault(); + activityHandler.queueTrace({'typ': 'experiment', 'data': 'teacher help'}); + jqTeacherHelp.hide(); + }); + jqTeacherHelp.show(); + // end of experiment: Prolog hints + codeq.comms.loadProblem(problemDef.id).done(); activityHandler.queueTrace({ 'typ': 'open', diff --git a/res/en.json b/res/en.json index 4f5e89d..5e172c9 100644 --- a/res/en.json +++ b/res/en.json @@ -1,4 +1,6 @@ { + "teacher_help": "If a teacher helped you solve this problem, please click", + "here": "here", "language": "Language", "ui_language_title": "Select the UI language.", "passwords_do_not_match": "Passwords do not match.", diff --git a/res/sl.json b/res/sl.json index f3af40c..e17684a 100644 --- a/res/sl.json +++ b/res/sl.json @@ -1,4 +1,6 @@ { + "teacher_help": "Če ti je pri reševanju pomagal učitelj, klikni", + "here": "tukaj", "language": "Jezik", "ui_language_title": "Izberi jezik uporabniškega vmesnika.", "passwords_do_not_match": "Gesli se ne ujemata.", -- cgit v1.2.1