# Khan/khan-exercises

Merge branch 'time' of https://github.com/Christi/khan-exercises

```Conflicts:
exercises/telling_time_2.html```
2 parents 5a85729 + 78a56d7 commit f5655f319e1395d04698f541bae95940e9030369 beneater committed Apr 23, 2012
Showing with 15 additions and 7 deletions.
1. +15 −7 exercises/telling_time_2.html
 @@ -21,7 +21,7 @@ HOUR + ":" + NICE_MINUTE -

Set the clock to TIME. The hour hand is blue and the minute hand is orange.

+

Set the clock to TIME.

@@ -42,7 +42,7 @@ minuteSnapDegrees = 360 / minuteSnapPoints; hourSnapDegrees = 360 / hourSnapPoints; - var clock = addAnalogClock( { radius: clockRadius, minuteTicks: hourSnapPoints } ); + var clock = addAnalogClock( { radius: clockRadius, minuteTicks: 60 } ); clock.draw(); addMouseLayer(); @@ -217,7 +217,12 @@ if ( minuteAngle === minuteStartAngle && hourAngle === hourStartAngle) { return ""; } - + if ((minuteAngle === correctHourAngle) && (hourAngle === correctMinuteAngle) ){ + return "Remember the hour hand is the short hand and the minute hand is the long hand"; + } + else if ((minuteAngle === correctMinuteAngle) && (hourAngle !== correctHourAngle) &&(hourAngle === roundToNearest( hourSnapDegrees, timeToDegrees( 5 * (HOUR) )))) { + return "Remember the hour hand needs to move over the course of the hour"; + } return (minuteAngle === correctMinuteAngle) && (hourAngle === correctHourAngle);
@@ -228,6 +233,8 @@
+ +

The hour hand is the short blue bar and the minute hand is the long orange bar.

The number after the \Large{:} symbol represents the number of minutes past the hour. So TIME represents MINUTE minutes past hour HOUR.

@@ -242,16 +249,17 @@

The 12 long tick marks correspond to the hours in the day (assuming AM/PM time).

-

If it is 0 minutes, the hour hand belongs directly on the corresponding hour mark. However, for any other number of minutes, the hour hand should be proportionally past the hour mark.

+

If it is 0 minutes, the hour hand belongs directly on the corresponding hour mark. But, over the hour, the hour hand must travel so it reaches the next hour by the time the hour changes.

Since it's HOUR hourplural(HOUR) and 0 minutes, the hour hand should be right on the HOUR hour mark.

-

- Since it's HOUR hourplural(HOUR) and MINUTE minutes, the hour hand should be fraction(MINUTE, 60) = fraction(MINUTE, 60, false, true) of the way past the HOUR hour mark. -

+
+

Since it's HOUR hourplural(HOUR) and MINUTE minutes, the hour hand will have traveled fraction(MINUTE, 60) = fraction(MINUTE, 60, false, true) of the way to the 1 HOUR + 1 hour mark.

+

So the hour hand needs to be placed just before the second just past the third just past the first between the second and third just before the fourth small tick mark past the HOUR hour mark.

+