Use custom choices in rating too, to allow to use labels for extra items

mentoring/quizz.py

@@ -69,7 +69,7 @@ class QuizzBlock(XBlock):
         return Fragment(u"<p>I can only appear inside mentoring blocks.</p>")
 
     def mentoring_view(self, context=None):
-        if self.type not in ('yes-maybenot-understand', 'rating-understand', 'choices'):
+        if self.type not in ('rating', 'choices'):
             raise ValueError, u'Invalid value for QuizzBlock.type: `{}`'.format(self.type)
 
         template_path = 'templates/html/quizz_{}.html'.format(self.type)
@@ -167,23 +167,6 @@ class QuizzTipBlock(XBlock):
         return not submission or submission in self.display_with_defaults
 
     @property
-    def reject_with_defaults(self):
-        reject = commas_to_list(self.reject)
-        log.debug(reject)
-        if reject is None:
-            quizz = self.runtime.get_block(self.parent)
-            if quizz.type == 'yes-maybenot-understand':
-                return ['maybenot', 'understand']
-            elif quizz.type == 'rating-understand':
-                return ['1', '2', '3', 'understand']
-            elif quizz.type == 'choice':
-                return []
-            else:
-                raise ValueError, 'Unknown quizz type, could not determine defaults'
-        else:
-            return reject
-
-    @property
     def display_with_defaults(self):
         display = commas_to_list(self.display)
         if display is None:
@@ -193,6 +176,12 @@ class QuizzTipBlock(XBlock):
                                if choice not in display]
         return display
 
+    @property
+    def reject_with_defaults(self):
+        reject = commas_to_list(self.reject)
+        log.debug(reject)
+        return reject
+
 
 class QuizzChoiceBlock(XBlock):
     """

templates/html/quizz_rating-understand.html → templates/html/quizz_rating.html

-<fieldset class="rating-understand">
+<fieldset class="rating">
   <legend>{{ self.question }}</legend>
   <div class="choices">
     <span class="low">{{ self.low }}</span>
@@ -18,8 +18,10 @@
       <label><input type="radio" name="{{ self.name }}" value="5"{% if self.student_choice == '5' %} checked{% endif %}>5</label>
     </span>
     <span class="low">{{ self.high }}</span>
+    {% for choice in custom_choices %}
     <span class="choice">
-      <label><input type="radio" name="{{ self.name }}" value="understand"{% if self.student_choice == 'understand' %} checked{% endif %}>I don't understand</label>
+      <label><input type="radio" name="{{ self.name }}" value="{{ choice.value }}"{% if self.student_choice == '{{ choice.value }}' %} checked{% endif %}> {{ choice.content }}</label>
     </span>
+    {% endfor %}
   </div>
 </fieldset>

templates/xml/005_checking_your_improvement_goal.xml

@@ -37,8 +37,10 @@
             <tip reject="understand">Room for improvement means that you have not yet come close to fully accomplishing your goal. You are not even close to having 100% success. You probably don't even have 50% success. You could not accomplish this change in a weekend. There is room for improvement if you have made a little progress but then gotten stuck in your efforts to change. Or, it maybe you reached your goal temporarily but were unable to sustain that improvement. Or, maybe you feel you have gotten stuck before you even began to make improvements.</tip>
         </quizz>
 
-        <quizz name="goal-important" type="rating-understand" low="Not at all important to me" high="Very important to me">
+        <quizz name="goal-important" type="rating" low="Not at all important to me" high="Very important to me">
             <question>How important is it to you?</question>
+            <choice value="understand">I don't understand</choice>
+
             <tip reject="1,2,3">The Immunity-to-Change process helps you uncover some of the core beliefs and assumptions you have held that are preventing you from making change. While the insights and changes that come from uncovering these beliefs and exploring them can be transformational, you will probably only be willing to undertake this work if your Improvement Goal is quite important you. If yours isn't, go back and identify one that feels very important to you. You can revise your work by TODO-LINK.</tip>
             <tip reject="understand">A goal is important if it is one that could make a big difference in helping you reach your goals in your work life or your personal life (or both). You are willing to work hard on it. You are interesting in spending some time and energy on it and doing some thinking about why you haven't been able to improve before now. For most people, an Improvement Goal does not focus only a small detail of your life (e.g., remembering to say thank you sometimes when the bus driver is nice to me) but on something that feels pretty central, something that deserves some serious attention (e.g., being more compassionate to my wife).</tip>
         </quizz>

templates/xml/013_checking_the_map.xml

@@ -17,14 +17,18 @@
             <tip reject="understand">Does your map help you understand yourself?  Does it get and keep your attention?  Can you see why and how you have been struggling to change?</tip>
         </quizz>
 
-        <quizz name="map-powerful" type="rating-understand" low="Least" high="Most">
+        <quizz name="map-powerful" type="rating" low="Least" high="Most">
             <question>Does this map, as a whole, feel powerful to you?</question>
+            <choice value="understand">I don't understand</choice>
+
             <tip reject="1,2,3">If your map doesn't yet feel powerful to you, we suggest you do some more reflection to see if you can increase its power. Our immune systems, when they are functioning, can be enormously powerful because they show us how and why we may be spending a great deal of energy keeping things exactly the way they are. We are spending a great deal of energy to change nothing. If that is the case, there is very likely a powerful dynamic in play. Seeing that dynamic clearly allows us a much better chance of altering it. If the immune system you have sketched across your first three columns does not feel powerful to you, it might be that you have misunderstood some aspects of the directions for how to make your immunity map. Or, maybe you understood but need to reflect more deeply to see if there are new insights you could come to that would be more interesting for you to consider.</tip>
             <tip reject="understand">Does seeing your map (your immunity to change) have a strong effect on you?  Does it show you how your immune system has been influencing you, controlling you?</tip>
         </quizz>
 
-        <quizz name="map-explore-more" type="rating-understand" low="Least" high="Most">
+        <quizz name="map-explore-more" type="rating" low="Least" high="Most">
             <question>Is this a map that you'd like to spend more time exploring?</question>
+            <choice value="understand">I don't understand</choice>
+
             <tip reject="1,2,3">Your Immunity-to-Change will form the basis for all the learning you will do in this online course. If you haven't diagnosed an immune system that you want to spend time exploring, you are going to have a hard time doing the work to overturn your immune system. At this point, you won't yet know how to solve your problem and overturn your immunity. That will come later. We can't get to the right solution if we don't truly understand the problem. We will come to a solution, but only after you have "gotten the problem right." If you aren't interested in the immunity you have sketched out so far, we would advise you to spend some more time with your map until you have a picture of an immune system that you would like to explore further to eventually solve. You might even consider starting over again from the beginning.</tip>
             <tip reject="understand">Would you like to learn more about your immune system?  In this course, you will learn more about why you have this immune system. You will learn more about how your immune system has been working. And you will learn more about how you can change your immune system.</tip>
         </quizz>

templates/xml/015_checking_your_big_assumptions.xml

@@ -37,8 +37,10 @@
             <tip reject="understand">Do your Big Assumptions limit what you do? Do they limit what you can choose?  Do they limit how you can think?  If I assume that a good mother must always put her children's wants and needs before her own, then I am limiting myself. I don't allow myself to wonder whether a good mother can meet both her needs and her children's needs. I don't allow myself to say no to my children if they want something that I do not want. I don't even see that I am making choices because my Big Assumptions tell me I must think and behave in these ways.</tip>
         </quizz>
 
-        <quizz name="big-assumptions-real" type="rating-understand" low="Least" high="Most">
+        <quizz name="big-assumptions-real" type="rating" low="Least" high="Most">
             <question>Do your Big Assumptions feel real to you?</question>
+            <choice value="understand">I don't understand</choice>
+
             <tip reject="1,2,3">Some of your Big Assumptions may feel undeniably true ("What do you mean, "an assumption"?  I think this is exactly the awful thing that would happen!"). Some assumptions you may know aren't really true (although you act and feel as if they were true); and some you may feel are only partially or sometimes true. Maybe there are some assumptions where you are unsure if they are true or not. All of these types of Big Assumptions should go in your 4th column, and will be valuable resources when you begin to do the work on overturning your immune system. But all of your Big Assumptions should feel like they have some degree of truth for you. Even if you can intellectually argue with yourself that your Big Assumption doesn't make sense, you should also be able to see that on some level, you are not convinced of that or you would be doing things differently than you are. If your Big Assumptions don't seem to feel real or true to you on some level, go back and revise them by TODO-LINK</tip>
             <tip reject="understand">Do some of your Big Assumptions feel like they are true?  Do they feel like they are not assumptions, but are just facts?  Is it hard to imagine that they might not be true?  That you could change your mind about any (or all) of them? Then your Big Assumptions feel real to you.</tip>
         </quizz>