Use integer data forms on All the Exercises!

Summary: Okay, not all of them. But a lot of them. Use number field on Changing Decimals to Percents. Use integer data form for Converting Between Point Slope and Slope Intercept. Use type=number fields on Converting Between Point Slope and Standard Form. Use integer data form in Domain and Range of a Function 0.5. Use integer data form in EQuation of a Circle 1, 2 Use integer data form on Equation of an Ellipse. Use integer, decimal data forms for Inscribed Angles 1, 2, 3 Use integer data form on Matrix Addition and Subtraction. Use integer data forms for Matrix Dimensions. Use integer data forms on Matrix Transpose. Use integer data forms for Measuring Angles. Use integer data form on Multiplying a Matrix by a Matrix. Use integer data form on Multiplying a Matrix by a Vector. Use integer, decimal data forms on Multiplying and Dividing Scientific Notation. Use integer, decimal data forms on Multiplying Complex Numbers. Use integer data form in One Step Equations. Use integer data form in Perimeter 1. Use integer data form in Perimeter of Squares and Rectangles. Use integer data form in Pile Patterns. Use integer, decimal data forms in Plugging in Values. Use integer data form for Quadrilateral Angles. Use integer and decimal data forms for Range of a Function. Use integer data form for Reading Bar Charts 1. Use integer, decimal data forms for Reading Line Charts 1. Allow decimal data form for Reading Pictograms 2. Use integer data form for Reading Tables 1,2. Use integer, decimal data forms on Scientific Notation. Use integer data form in Simplifying Expressions with Exponents. Use integer data form in Solid Geometry. Use integer, decimal data forms with Square Roots. Use integer data form with Square Roots 2. Use integer data forms with Scalar Matrix Multiplication. Use integer data form on Telling Time 0.5 Test Plan: locally Reviewers: tom, eater, stephanie Reviewed By: eater Differential Revision: http://phabricator.khanacademy.org/D1048
fleomikn · Jan 21, 2013 · eaa5f38 · eaa5f38
1 parent 83ab06d
commit eaa5f38
Show file tree

Hide file tree

Showing 45 changed files with 101 additions and 85 deletions.
diff --git a/exercises/changing_decimals_to_percents.html b/exercises/changing_decimals_to_percents.html
@@ -15,7 +15,7 @@
                 <div id="original" data-weight="1">
                     <p class="question">Express <code><var>DECIMAL</var></code> as a percent.</p>
                     <div class="solution" data-type="multiple">
-                        <p><span class="sol"><var>SOLN</var></span> %</p>
+                        <p><span class="sol" data-forms="decimal"><var>SOLN</var></span> %</p>
                     </div>
 
                     <div class="hints">

diff --git a/exercises/converting_between_point_slope_and_slope_intercept.html b/exercises/converting_between_point_slope_and_slope_intercept.html
@@ -25,7 +25,7 @@
             <p>In other words, if the equation is rewritten to look like <code>y = mx + b</code>, what are the values of <code>m</code> and <code>b</code>?</p>
             <p><code>y - <var>y1</var> = <var>m</var>(x - <var>x1</var>)</code></p>
             <div class="solution" data-type="multiple">
-                <p><code>y = \space</code><span class="sol"><var>m</var></span><code>\space \cdot x + \space</code><span class="sol"><var>b</var></span></p>
+                <p><code>y = \space</code><span class="sol" data-forms="integer"><var>m</var></span><code>\space \cdot x + \space</code><span class="sol" data-forms="integer"><var>b</var></span></p>
             </div>
             <div class="hints">
                 <div>

diff --git a/exercises/converting_between_point_slope_and_standard_form.html b/exercises/converting_between_point_slope_and_standard_form.html
@@ -32,7 +32,7 @@
             <!-- Custom validation is used to allow for x to be any value. If we allowed a finite range for x, then we could have a set of solutions.-->
             <div class="solution" data-type="custom">
                 <div class="instruction">
-                    <p><code>y - {}</code><input id="solution_y" type="text"></input><code>{} = {}</code><input id="solution_m" type="text"></input><code>(x - {}</code><input id="solution_x" type="text"></input><code>)</code></p>
+                    <p><code>y - {}</code><input id="solution_y" type="number"></input><code>{} = {}</code><input id="solution_m" type="number"></input><code>(x - {}</code><input id="solution_x" type="number"></input><code>)</code></p>
                 </div>
                 <div class="guess">
                     [ $( '#solution_x' ).val(), $( '#solution_y' ).val(), $( '#solution_m' ).val() ]

diff --git a/exercises/domain_and_range_0.5.html b/exercises/domain_and_range_0.5.html
@@ -5,7 +5,8 @@
     <title>Domain and range of a function 0.5</title>
     <script src="../khan-exercise.js"></script>
     <style type="text/css">
-        #answer_area input[type=text] {
+        #answer_area input[type=text],
+        #answer_area input[type=number] {
             width: 40px;
         }
     </style>
@@ -75,7 +76,7 @@
                     circle( FUNCTION_PATH[ FUNCTION_PATH.length - 1], 0.15, { stroke: "none", fill: BLUE } );
                 </div>
 
-                <p class="solution" data-type="multiple"><span class="sol"><var>DOMAIN[0]</var></span><code>\;\le x\le\;</code><span class="sol"><var>DOMAIN[1]</var></span></p>
+                <p class="solution" data-type="multiple"><span class="sol" data-forms="integer"><var>DOMAIN[0]</var></span><code>\;\le x\le\;</code><span class="sol" data-forms="integer"><var>DOMAIN[1]</var></span></p>
 
                 <div class="hints">
                     <p>For what values of <code>x</code> does <code>f(x)</code> have a value?</p>

diff --git a/exercises/equation_of_a_circle_1.html b/exercises/equation_of_a_circle_1.html
@@ -5,7 +5,8 @@
     <title>Equation of a circle 1</title>
     <script src="../khan-exercise.js"></script>
     <style type="text/css">
-        #answer_area .short input[type=text] {
+        #answer_area .short input[type=text],
+        #answer_area .short input[type=number] {
             width: 40px;
         }
     </style>
@@ -31,8 +32,8 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <p class="short"><code>(h, k) = (</code><span class="sol"><var>H</var></span><code>,</code> <span class="sol"><var>K</var></span><code>)</code></p>
-                <p><code>r</code> = <span class="sol"><var>R</var></span></p>
+                <p class="short"><code>(h, k) = (</code><span class="sol" data-forms="integer"><var>H</var></span><code>,</code> <span class="sol" data-forms="integer"><var>K</var></span><code>)</code></p>
+                <p><code>r</code> = <span class="sol" data-forms="integer"><var>R</var></span></p>
             </div>
         </div>
     </div>

diff --git a/exercises/equation_of_a_circle_2.html b/exercises/equation_of_a_circle_2.html
@@ -5,7 +5,8 @@
     <title>Equation of a circle 2</title>
     <script src="../khan-exercise.js"></script>
     <style type="text/css">
-        #answer_area .short input[type=text] {
+        #answer_area .short input[type=text],
+        #answer_area .short input[type=number] {
             width: 40px;
         }
     </style>
@@ -42,8 +43,8 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <p class="short"><code>(h, k) = (</code><span class="sol"><var>H</var></span><code>,</code> <span class="sol"><var>K</var></span><code>)</code></p>
-                <p><code>r</code> = <span class="sol"><var>R</var></span></p>
+                <p class="short"><code>(h, k) = (</code><span class="sol" data-forms="integer"><var>H</var></span><code>,</code> <span class="sol" data-forms="integer"><var>K</var></span><code>)</code></p>
+                <p><code>r</code> = <span class="sol" data-forms="integer"><var>R</var></span></p>
             </div>
         </div>
     </div>

diff --git a/exercises/equation_of_an_ellipse.html b/exercises/equation_of_an_ellipse.html
@@ -5,7 +5,8 @@
     <title>Equation of an ellipse</title>
     <script src="../khan-exercise.js"></script>
     <style type="text/css">
-        #answer_area .short input[type=text] {
+        #answer_area .short input[type=text],
+        #answer_area .short input[type=number] {
             width: 40px;
         }
     </style>
@@ -36,9 +37,9 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <p class="short"><code>(h, k) = (</code><span class="sol"><var>H</var></span><code>,</code> <span class="sol"><var>K</var></span><code>)</code></p>
-                <p>Major radius = <span class="sol short"><var>MAJ</var></span></p>
-                <p>Minor radius = <span class="sol short"><var>MIN</var></span></p>
+                <p class="short"><code>(h, k) = (</code><span class="sol" data-forms="integer"><var>H</var></span><code>,</code> <span class="sol" data-forms="integer"><var>K</var></span><code>)</code></p>
+                <p>Major radius = <span class="sol short" data-forms="integer"><var>MAJ</var></span></p>
+                <p>Minor radius = <span class="sol short" data-forms="integer"><var>MIN</var></span></p>
             </div>
         </div>
     </div>

diff --git a/exercises/inscribed_angles_1.html b/exercises/inscribed_angles_1.html
@@ -41,7 +41,7 @@
                 graph.circle.drawMovablePoint( SUBTENDED_POINT, START + CENTRAL, START );
             </div>
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>CENTRAL / 2</var></span> degrees
+                <span class="sol" data-forms="integer, decimal"><var>CENTRAL / 2</var></span> degrees
             </div>
             <div class="hints">
                 <div>
@@ -85,7 +85,7 @@
                 <var id="ASKED_LABEL">"blue"</var>
             </div>
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>CENTRAL</var></span> degrees
+                <span class="sol" data-forms="integer, decimal"><var>CENTRAL</var></span> degrees
             </div>
 
             <div class="hints">

diff --git a/exercises/inscribed_angles_2.html b/exercises/inscribed_angles_2.html
@@ -41,7 +41,7 @@
                 graph.circle.drawMovablePoint( SUBTENDED_POINT, START + CENTRAL, START );
             </div>
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>CENTRAL / 2</var></span> degrees
+                <span class="sol" data-forms="integer, decimal"><var>CENTRAL / 2</var></span> degrees
             </div>
             <div class="hints">
                 <div>
@@ -96,7 +96,7 @@
                 <var id="ASKED_LABEL">"blue"</var>
             </div>
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>CENTRAL</var></span> degrees
+                <span class="sol" data-forms="integer, decimal"><var>CENTRAL</var></span> degrees
             </div>
 
             <div class="hints">

diff --git a/exercises/inscribed_angles_3.html b/exercises/inscribed_angles_3.html
@@ -63,7 +63,7 @@
                 graph.circle.drawMovablePoint( SUBTENDED_POINT, START + CENTRAL, START );
             </div>
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>CENTRAL / 2</var></span> degrees
+                <span class="sol" data-forms="integer, decimal"><var>CENTRAL / 2</var></span> degrees
             </div>
             <div class="hints">
                 <div>
@@ -144,7 +144,7 @@
                 <var id="ASKED_LABEL">"blue"</var>
             </div>
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>CENTRAL</var></span> degrees
+                <span class="sol" data-forms="integer, decimal"><var>CENTRAL</var></span> degrees
             </div>
             <div class="hints">
                 <div>

diff --git a/exercises/matrix_addition_and_subtraction.html b/exercises/matrix_addition_and_subtraction.html
@@ -79,7 +79,7 @@
     <div class="solution" data-type="multiple">
         <div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
             <span data-each="row as elem">
-                <span data-if="elem !== ''" class="sol">
+                <span data-if="elem !== ''" class="sol" data-forms="integer">
                     <var>elem</var>
                 </span>
                 <span data-else data-type="text" class="sol">

diff --git a/exercises/matrix_dimensions.html b/exercises/matrix_dimensions.html
@@ -5,7 +5,8 @@
     <title>Matrix dimensions</title>
     <script src="../khan-exercise.js"></script>
     <style>
-        #answer_area .sol input[type=text] {
+        #answer_area .sol input[type=text],
+        #answer_area .sol input[type=number] {
             width: 20px;
         }
     </style>
@@ -35,9 +36,9 @@
             </p>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>DIM_1</var></span>
+                <span class="sol" data-forms="integer"><var>DIM_1</var></span>
                 <code>\times</code>
-                <span class="sol"><var>DIM_2</var></span>
+                <span class="sol" data-forms="integer"><var>DIM_2</var></span>
             </div>
         </div>
     </div>

diff --git a/exercises/matrix_dimensions_alternative.html b/exercises/matrix_dimensions_alternative.html
@@ -5,7 +5,8 @@
     <title>Matrix dimensions</title>
     <script src="../khan-exercise.js"></script>
     <style>
-        #answer_area .sol input[type=text] {
+        #answer_area .sol input[type=text],
+        #answer_area .sol input[type=number] {
             width: 20px;
         }
     </style>
@@ -35,9 +36,9 @@
             </p>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>DIM_1</var></span>
+                <span class="sol" data-forms="integer"><var>DIM_1</var></span>
                 <code>\times</code>
-                <span class="sol"><var>DIM_2</var></span>
+                <span class="sol" data-forms="integer"><var>DIM_2</var></span>
             </div>
         </div>
     </div>

diff --git a/exercises/matrix_transpose.html b/exercises/matrix_transpose.html
@@ -35,7 +35,7 @@
     <div class="solution" data-type="multiple">
         <div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
             <span data-each="row as elem">
-                <span data-if="elem !== ''" class="sol">
+                <span data-if="elem !== ''" class="sol" data-forms="integer">
                     <var>elem</var>
                 </span>
                 <span data-else data-type="text" class="sol">

diff --git a/exercises/measuring_angles.html b/exercises/measuring_angles.html
@@ -34,7 +34,7 @@
                         </div>
                     </div>
                     <div class="solution" data-type="multiple">
-                        <span class="sol" data-type="rational" data-inexact data-max-error="5"><var>DIFF</var></span><code>{}^{\circ}</code>
+                        <span class="sol" data-forms="integer" data-inexact data-max-error="5"><var>DIFF</var></span><code>{}^{\circ}</code>
                     </div>
                 </div>
             </div>

diff --git a/exercises/multiplying_a_matrix_by_a_matrix.html b/exercises/multiplying_a_matrix_by_a_matrix.html
@@ -134,7 +134,7 @@
     <div class="solution" data-type="multiple">
         <div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
             <span data-each="row as elem">
-                <span data-if="elem !== ''" class="sol">
+                <span data-if="elem !== ''" class="sol" data-forms="integer">
                     <var>elem</var>
                 </span>
                 <span data-else data-type="text" class="sol">

diff --git a/exercises/multiplying_a_matrix_by_a_matrix_solution_only.html b/exercises/multiplying_a_matrix_by_a_matrix_solution_only.html
@@ -58,7 +58,7 @@
     <div class="solution" data-type="multiple">
         <div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
             <span data-each="row as elem">
-                <span data-if="elem !== ''" class="sol">
+                <span data-if="elem !== ''" class="sol" data-forms="integer">
                     <var>elem</var>
                 </span>
                 <span data-else data-type="text" class="sol">

diff --git a/exercises/multiplying_a_matrix_by_a_matrix_steps_only.html b/exercises/multiplying_a_matrix_by_a_matrix_steps_only.html
@@ -118,7 +118,7 @@
     <div class="solution" data-type="multiple">
         <div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
             <span data-each="row as elem">
-                <span data-if="elem !== ''" class="sol">
+                <span data-if="elem !== ''" class="sol" data-forms="integer">
                     <var>elem</var>
                 </span>
                 <span data-else data-type="text" class="sol">

diff --git a/exercises/multiplying_a_matrix_by_a_matrix_video_hint.html b/exercises/multiplying_a_matrix_by_a_matrix_video_hint.html
@@ -61,7 +61,7 @@
     <div class="solution" data-type="multiple">
         <div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
             <span data-each="row as elem">
-                <span data-if="elem !== ''" class="sol">
+                <span data-if="elem !== ''" class="sol" data-forms="integer">
                     <var>elem</var>
                 </span>
                 <span data-else data-type="text" class="sol">

diff --git a/exercises/multiplying_a_matrix_by_a_vector.html b/exercises/multiplying_a_matrix_by_a_vector.html
@@ -121,7 +121,7 @@
     <div class="solution" data-type="multiple">
         <div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
             <span data-each="row as elem">
-                <span data-if="elem !== ''" class="sol">
+                <span data-if="elem !== ''" class="sol" data-forms="integer">
                     <var>elem</var>
                 </span>
                 <span data-else data-type="text" class="sol">

diff --git a/exercises/multiplying_and_dividing_scientific_notation.html b/exercises/multiplying_and_dividing_scientific_notation.html
@@ -5,7 +5,8 @@
     <title>Multiplying and dividing scientific notation</title>
     <script src="../khan-exercise.js"></script>
     <style type="text/css">
-        #answer_area input[type=text] {
+        #answer_area input[type=text],
+        #answer_area input[type=number] {
             width: 30px;
         }
     </style>
@@ -27,9 +28,9 @@
                 </p>
 
                 <div class="solution" data-type="multiple">
-                    <span class="sol base"><var>scientificMantissa( 2, QUOTIENT )</var></span>
+                    <span class="sol base" data-forms="integer, decimal"><var>scientificMantissa( 2, QUOTIENT )</var></span>
                     <code> \times 10 </code>
-                    <sup class="sol exp" style="width: 20px;"><var>scientificExponent( QUOTIENT )</var></sup>
+                    <sup class="sol exp" data-forms="integer, decimal" style="width: 20px;"><var>scientificExponent( QUOTIENT )</var></sup>
                 </div>
 
                 <div class="hints">
@@ -74,9 +75,9 @@
                     <code>(<var>scientific( 2, QUOTIENT )</var>)\times (<var>scientific( 2, DENOMINATOR )</var>)</code></p>
 
                 <div class="solution" data-type="multiple">
-                    <span class="sol base"><var>scientificMantissa( 3, NUMERATOR )</var></span>
+                    <span class="sol base" data-forms="integer, decimal"><var>scientificMantissa( 3, NUMERATOR )</var></span>
                     <code> \times 10 </code>
-                    <sup class="sol exp" style="width: 20px;"><var>scientificExponent( NUMERATOR )</var></sup>
+                    <sup class="sol exp" data-forms="integer, decimal" style="width: 20px;"><var>scientificExponent( NUMERATOR )</var></sup>
                 </div>
 
                 <div class="hints">

diff --git a/exercises/multiplying_complex_numbers.html b/exercises/multiplying_complex_numbers.html
@@ -5,7 +5,8 @@
     <title>Multiplying complex numbers</title>
     <script src="../khan-exercise.js"></script>
     <style type="text/css">
-        #solutionarea input[type="text"] {
+        #solutionarea input[type="text"],
+        #solutionarea input[type="number"] {
             width: 50px
         }
     </style>
@@ -40,11 +41,11 @@
             <p class="question">Multiply the following complex numbers:</p>
             <p><code>(<var>A_REP</var>) \cdot (<var>B_REP</var>)</code></p>
             <div class="solution" data-type="multiple">
-                <span class="sol" data-fallback="0" data-inexact data-max-error="0.01">
+                <span class="sol" data-forms="integer,decimal" data-fallback="0" data-inexact data-max-error="0.01">
                     <var>ANSWER_REAL</var>
                 </span>
                 <code>+</code>
-                <span class="sol" data-fallback="0" data-inexact data-max-error="0.01">
+                <span class="sol" data-forms="integer,decimal" data-fallback="0" data-inexact data-max-error="0.01">
                     <var>ANSWER_IMAG</var>
                 </span>
                 <code>i</code>

diff --git a/exercises/one_step_equations.html b/exercises/one_step_equations.html
@@ -21,7 +21,7 @@
     </div>
     <p class="question">Solve for <code><var>X</var></code>:</p>
     <div class="solution" data-type="multiple">
-        <p><code><var>X</var>=</code> <span class="sol"><var>B - A</var></code></p>
+        <p><code><var>X</var>=</code> <span class="sol" data-forms="integer"><var>B - A</var></code></p>
     </div>
 
     <div class="problems">

diff --git a/exercises/perimeter_1.html b/exercises/perimeter_1.html
@@ -35,7 +35,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>4 * S</var></span> <var>plural(UNIT_TEXT)</var>
+                <span class="sol" data-forms="integer"><var>4 * S</var></span> <var>plural(UNIT_TEXT)</var>
             </div>
 
             <div class="hints">
@@ -80,7 +80,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>L * 2 + W * 2</var></span> <var>plural(UNIT_TEXT)</var>
+                <span class="sol" data-forms="integer"><var>L * 2 + W * 2</var></span> <var>plural(UNIT_TEXT)</var>
             </div>
 
             <div class="hints">
@@ -127,7 +127,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>A + B + C</var></span> <var>plural(UNIT_TEXT)</var>
+                <span class="sol" data-forms="integer"><var>A + B + C</var></span> <var>plural(UNIT_TEXT)</var>
             </div>
 
             <div class="hints">
@@ -183,7 +183,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>S * SIDES</var></span> <var>plural(UNIT_TEXT)</var>
+                <span class="sol" data-forms="integer"><var>S * SIDES</var></span> <var>plural(UNIT_TEXT)</var>
             </div>
 
             <div class="hints">
@@ -262,7 +262,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>SHAPE.perimeter</var></span>
+                <span class="sol" data-forms="integer"><var>SHAPE.perimeter</var></span>
                 <var>plural(UNIT_TEXT)</var>
             </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ @@
                             </div>
                         </div>
                         <div class="solution" data-type="multiple">
-                            <span class="sol" data-type="rational" data-inexact data-max-error="5"><var>DIFF</var></span><code>{}^{\circ}</code>
+                            <span class="sol" data-forms="integer" data-inexact data-max-error="5"><var>DIFF</var></span><code>{}^{\circ}</code>
                         </div>
                     </div>
                 </div>
@@ Expand Down @@