Merge pull request #17 from dragonfi/hide-reset-button

Fix some issues

drag_and_drop_v2/drag_and_drop_v2.py

@@ -179,9 +179,10 @@ class DragAndDropBlock(XBlock):
             if self._is_finished():
                 final_feedback = self.data['feedback']['finish']
 
-            # only publish the grade once
+            # don't publish the grade if the student has already completed the exercise
             if not self.completed:
-                self.completed = True
+                if self._is_finished():
+                    self.completed = True
                 try:
                     self.runtime.publish(self, 'grade', {
                         'value': len(self.item_state) / float(tot_items) * self.weight,

drag_and_drop_v2/public/css/drag_and_drop.css

@@ -185,4 +185,5 @@
     float: right;
     color: #3384CA;
     margin-top: 3px;
+    display: none;
 }

drag_and_drop_v2/public/js/drag_and_drop.js

@@ -78,6 +78,7 @@ function DragAndDropBlock(runtime, element) {
             finish: function(final_feedback) {
                 // Disable any decoy items
                 _fn.$items.draggable('disable');
+                _fn.$reset_button.show();
 
                 // Show final feedback
                 if (final_feedback) _fn.feedback.set(final_feedback);
@@ -89,6 +90,7 @@ function DragAndDropBlock(runtime, element) {
                     _fn.clickHandlers.drag.reset($(element));
                 });
                 _fn.$popup.hide();
+                _fn.$reset_button.hide();
                 _fn.feedback.set(_fn.data.feedback.start);
             },