Exercises: retry implied on move; add handlers to sortable

diff --git a/catalogue/static/catalogue/css/exercise.css b/catalogue/static/catalogue/css/exercise.css
index 2be22bc..decaef5 100644 (file)
--- a/catalogue/static/catalogue/css/exercise.css
+++ b/catalogue/static/catalogue/css/exercise.css
@@ -101,7 +101,28 @@
 .uporzadkuj .lista {
   list-style: none;
   margin: 0;
 .uporzadkuj .lista {
   list-style: none;
   margin: 0;

-  padding: 0; }
+  padding: 0;
+  counter-reset: answer; }
+  .uporzadkuj .lista li {
+    counter-increment: answer;
+    padding-right: 3em;
+    background-image: url(/static/img/ornaments/draggable.png);
+    background-repeat: no-repeat;
+    background-position: 100% 50%; }
+  .uporzadkuj .lista li:before {
+    border-radius: 0.688em;
+    padding: 0.5em 0.688em;
+    background-color: #d4d6d8;
+    color: #363a3e;
+    cursor: pointer;
+    z-index: 2;
+    content: counter(answer);
+    float: left;
+    margin: -0.5em 0 0 -3em; }
+  .uporzadkuj .lista li.ui-sortable-placeholder {
+    counter-increment: answer 0; }
+  .uporzadkuj .lista li.ui-sortable-helper:before {
+    content: none; }

 
 .przyporzadkuj .question-piece {
   background-color: #d4d6d8;
 
 .przyporzadkuj .question-piece {
   background-color: #d4d6d8;

diff --git a/catalogue/static/catalogue/css/exercise.scss b/catalogue/static/catalogue/css/exercise.scss
index e16d7d7..035aa2a 100755 (executable)
--- a/catalogue/static/catalogue/css/exercise.scss
+++ b/catalogue/static/catalogue/css/exercise.scss
@@ -154,6 +154,27 @@ $px: 0.0625em;
     }
     .lista {
         @include list-plain;
     }
     .lista {
         @include list-plain;

+        counter-reset: answer;
+        li {
+            counter-increment: answer;
+            padding-right: 3em;
+            background-image: url(/static/img/ornaments/draggable.png);
+            background-repeat: no-repeat;
+            background-position: 100% 50%;
+        }
+        li:before {
+            @include bubble;
+            @include bubble-drag;
+            content: counter(answer);
+            float: left;
+            margin: -.5em 0 0 -3em;
+        }
+        li.ui-sortable-placeholder {
+            counter-increment: answer 0;
+        }
+        li.ui-sortable-helper:before {
+            content: none;
+        }

     }
 }
 
     }
 }
 

diff --git a/catalogue/static/catalogue/js/edumed.js b/catalogue/static/catalogue/js/edumed.js
index 33b7c58..817dd95 100644 (file)
--- a/catalogue/static/catalogue/js/edumed.js
+++ b/catalogue/static/catalogue/js/edumed.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.3.3

 (function() {
   var $, Binding, EduModule, Exercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, exercise,
     __hasProp = {}.hasOwnProperty,
 (function() {
   var $, Binding, EduModule, Exercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, exercise,
     __hasProp = {}.hasOwnProperty,


@@ -44,9 +44,7 @@
         return $(ev.target).hide();
       });
       $(".retry", this.element).click(function(ev) {
         return $(ev.target).hide();
       });
       $(".retry", this.element).click(function(ev) {

-        $(".correct, .incorrect", _this.element).removeClass("correct incorrect");
-        $(ev.target).prev(".check").show();
-        return $(ev.target).hide();
+        return _this.retry();

       });
       $('.solutions', this.element).click(function() {
         _this.show_solutions();
       });
       $('.solutions', this.element).click(function() {
         _this.show_solutions();


@@ -57,6 +55,12 @@
       });
     }
 
       });
     }
 

+    Exercise.prototype.retry = function() {
+      $(".correct, .incorrect", this.element).removeClass("correct incorrect");
+      $(".check", this.element).show();
+      return $(".retry", this.element).hide();
+    };
+

     Exercise.prototype.reset = function() {
       $(this.element).html($(this.element).data('exercise-html'));
       return exercise(this.element);
     Exercise.prototype.reset = function() {
       $(this.element).html($(this.element).data('exercise-html'));
       return exercise(this.element);


@@ -174,7 +178,8 @@
         var draggable_opts, self;
         draggable_opts = {
           revert: 'invalid',
         var draggable_opts, self;
         draggable_opts = {
           revert: 'invalid',

-          helper: 'clone'
+          helper: 'clone',
+          start: _this.retry

         };
         $(".draggable", question).draggable(draggable_opts);
         self = _this;
         };
         $(".draggable", question).draggable(draggable_opts);
         self = _this;


@@ -220,6 +225,7 @@
 
     function Wybor(element) {
       Wybor.__super__.constructor.call(this, element);
 
     function Wybor(element) {
       Wybor.__super__.constructor.call(this, element);

+      $(".question-piece input", element).change(this.retry);

     }
 
     Wybor.prototype.check_question = function(question) {
     }
 
     Wybor.prototype.check_question = function(question) {


@@ -284,7 +290,8 @@
     function Uporzadkuj(element) {
       Uporzadkuj.__super__.constructor.call(this, element);
       $('ol, ul', this.element).sortable({
     function Uporzadkuj(element) {
       Uporzadkuj.__super__.constructor.call(this, element);
       $('ol, ul', this.element).sortable({

-        items: "> li"
+        items: "> li",
+        start: this.retry

       });
     }
 
       });
     }
 


@@ -573,11 +580,13 @@
         qp = _ref[_i];
         $(".true", qp).click(function(ev) {
           ev.preventDefault();
         qp = _ref[_i];
         $(".true", qp).click(function(ev) {
           ev.preventDefault();

+          this.retry();

           $(this).closest(".question-piece").data("value", "true");
           return $(this).addClass('chosen').siblings('a').removeClass('chosen');
         });
         $(".false", qp).click(function(ev) {
           ev.preventDefault();
           $(this).closest(".question-piece").data("value", "true");
           return $(this).addClass('chosen').siblings('a').removeClass('chosen');
         });
         $(".false", qp).click(function(ev) {
           ev.preventDefault();

+          this.retry();

           $(this).closest(".question-piece").data("value", "false");
           return $(this).addClass('chosen').siblings('a').removeClass('chosen');
         });
           $(this).closest(".question-piece").data("value", "false");
           return $(this).addClass('chosen').siblings('a').removeClass('chosen');
         });

diff --git a/edumed/static/img/ornaments/draggable.png b/edumed/static/img/ornaments/draggable.png
new file mode 100644 (file)
index 0000000..75af63e
Binary files /dev/null and b/edumed/static/img/ornaments/draggable.png differ