Merge pull request #13992 from code-dot-org/levelbuilder

dashboard/config/locales/dsls.en.yml

@@ -7097,7 +7097,10 @@ en:
         : Incorrect.  The `repeat` loops allow Laurel to get all 7 pieces of treasure at the top, and all 6 down the side, but not all 7 along the bottom.
         Laurel collect all of the treasure.: Laurel collect all of the treasure.
         Laurel will collect all of the treasure along the top and side, but not along the bottom.: Laurel will collect all of the treasure along the top and side, but not along the bottom.
+        Laurel will get all of the treasure along the top and side, but not along the bottom.: Laurel will get all of the treasure along the top and side, but not along the bottom.
+        Laurel will get all of the treasure.: Laurel will get all of the treasure.
         Laurel will not collect any treasure at all.: Laurel will not collect any treasure at all.
+        Laurel will not get any treasure at all.: Laurel will not get any treasure at all.
         ? The `repeat` loops allow Laurel to get all 7 pieces of treasure at the top, and all 6 down the side, but not all 7 along the bottom.
         : The `repeat` loops allow Laurel to get all 7 pieces of treasure at the top, and all 6 down the side, but not all 7 along the bottom.
         The code below uses loops.  What will happen when you click "Run"?: The code below uses loops.  What will happen when you click "Run"?
@@ -7107,6 +7110,8 @@ en:
         Incorrect. The program uses a `repeat` loop to get Laurel to move forward five times.: Incorrect. The program uses a `repeat` loop to get Laurel to move forward five times.
         Laurel will move forward and collect treasure five times in a row.: Laurel will move forward and collect treasure five times in a row.
         Laurel will move forward and collect treasure one time.: Laurel will move forward and collect treasure one time.
+        Laurel will move forward and get treasure five times in a row.: Laurel will move forward and get treasure five times in a row.
+        Laurel will move forward and get treasure one time.: Laurel will move forward and get treasure one time.
         Laurel won't move at all.: Laurel won't move at all.
         Look at the code below.  What do you think will happen when you click "Run"?: Look at the code below.  What do you think will happen when you click "Run"?
         The program uses a `repeat` loop to get Laurel to move forward five times.: The program uses a `repeat` loop to get Laurel to move forward five times.
@@ -7140,9 +7145,12 @@ en:
         Correct!: Correct!
         I don't know.: I don't know.
         Incorrect. The `repeat` loop only instructs Laurel to move forward and collect treasure three times.: Incorrect. The `repeat` loop only instructs Laurel to move forward and collect treasure three times.
+        Incorrect. The `repeat` loop only instructs Laurel to move forward and get treasure three times.: Incorrect. The `repeat` loop only instructs Laurel to move forward and get treasure three times.
         Incorrect. The program uses a `repeat` loop to get Laurel to move forward three times.: Incorrect. The program uses a `repeat` loop to get Laurel to move forward three times.
         Laurel will move forward and collect all of the treasure.: Laurel will move forward and collect all of the treasure.
         Laurel will move forward and collect treasure three times in a row.: Laurel will move forward and collect treasure three times in a row.
+        Laurel will move forward and get all of the treasure.: Laurel will move forward and get all of the treasure.
+        Laurel will move forward and get treasure three times in a row.: Laurel will move forward and get treasure three times in a row.
         Laurel won't move at all.: Laurel won't move at all.
         Look at the code below.  What do you think will happen when you click "Run"?: Look at the code below.  What do you think will happen when you click "Run"?
         The program uses a `repeat` loop to get Laurel to move forward three times.: The program uses a `repeat` loop to get Laurel to move forward three times.
@@ -7379,6 +7387,10 @@ en:
         The farmer will harvest the corn.: The farmer will harvest the corn.
         The farmer will harvest the lettuce.: The farmer will harvest the lettuce.
         The farmer will harvest two pumpkins.: The farmer will harvest two pumpkins.
+      courseE_multi_farmer_ramp12:
+        " ": " "
+        right answer: right answer
+        wrong answer: wrong answer
       courseE_prediction_artistFunction1:
         Correct! The function is called two times in the program, with a jump in between.: Correct! The function is called two times in the program, with a jump in between.
         Incorrect. The function is actually called two times in the program.: Incorrect. The function is actually called two times in the program.

dashboard/config/locales/scripts.en.yml

@@ -2698,6 +2698,7 @@ en:
             Analog Input: Analog Input
             Polling Events: Polling Events
             Sensor Applications: Sensor Applications
+            'Project: Prototype an Innovation': 'Project: Prototype an Innovation'
           title: Draft Unit 6
           description_audience: ''
           description_short: ''
@@ -2718,6 +2719,7 @@ en:
             Interpreting Data: Interpreting Data
             Data in the Real World: Data in the Real World
             Combining Representations: Combining Representations
+            Representing Images: Representing Images
           title: ''
           description_audience: ''
           description_short: ''

dashboard/config/scripts/applab-1hour.script

@@ -2,6 +2,8 @@ login_required true
 
 stage 'Room Escape'
 named_level 'Escape Room Example'
+named_level 'Overview: Design Mode'
+named_level 'Optional Video: Design Mode'
 named_level 'Overview: Images'
 level 'Room Escape Workshop - 1'
 level 'Room Escape Workshop - 3'
@@ -12,12 +14,11 @@ level 'Room Escape Workshop - 4'
 named_level 'Overview: If Statements'
 named_level 'Video: if Statement'
 level 'Room Escape Workshop - 5'
-named_level 'Overview: Design Mode'
-named_level 'Optional Video: Design Mode'
 level 'Room Escape Workshop - 7'
 level 'Room Escape Workshop - 8'
 level 'Room Escape Workshop - 9'
 level 'Room Escape Workshop - 9-2'
 level 'Room Escape Workshop - 11'
 level 'Room Escape Workshop - 10'
+level 'Room Escape Workshop - 10 - 2'
 named_level 'Final Room Escape App'

dashboard/config/scripts/coursea_multi_collector_loops11_predict2.multi

@@ -1,6 +1,6 @@
 name 'courseA_multi_collector_loops11_predict2'
 question 'The code below uses loops.  What will happen when you click "Run"?'
-right 'Laurel will collect all of the treasure along the top and side, but not along the bottom.', feedback: 'Correct.'
-wrong 'Laurel will not collect any treasure at all.', feedback: 'Incorrect.  The `repeat` loops allow Laurel to get all 7 pieces of treasure at the top, and all 6 down the side, but not all 7 along the bottom.'
-wrong 'Laurel collect all of the treasure.', feedback: 'Incorrect.  The `repeat` loops allow Laurel to get all 7 pieces of treasure at the top, and all 6 down the side, but not all 7 along the bottom.'
+right 'Laurel will get all of the treasure along the top and side, but not along the bottom.', feedback: 'Correct.'
+wrong 'Laurel will not get any treasure at all.', feedback: 'Incorrect.  The `repeat` loops allow Laurel to get all 7 pieces of treasure at the top, and all 6 down the side, but not all 7 along the bottom.'
+wrong 'Laurel will get all of the treasure.', feedback: 'Incorrect.  The `repeat` loops allow Laurel to get all 7 pieces of treasure at the top, and all 6 down the side, but not all 7 along the bottom.'
 wrong 'I don\'t know.', feedback: 'The `repeat` loops allow Laurel to get all 7 pieces of treasure at the top, and all 6 down the side, but not all 7 along the bottom.'

dashboard/config/scripts/coursea_multi_collector_loops3_predict1.multi

@@ -1,6 +1,6 @@
 name 'courseA_multi_collector_loops3_predict1'
 question 'Look at the code below.  What do you think will happen when you click "Run"?'
 wrong 'Laurel won\'t move at all.', feedback: 'Incorrect. The program uses a `repeat` loop to get Laurel to move forward five times.'
-right 'Laurel will move forward and collect treasure five times in a row.', feedback: 'Correct!'
-wrong 'Laurel will move forward and collect treasure one time.', feedback: 'Incorrect. The program uses a `repeat` loop to get Laurel to move forward five times.'
+right 'Laurel will move forward and get treasure five times in a row.', feedback: 'Correct!'
+wrong 'Laurel will move forward and get treasure one time.', feedback: 'Incorrect. The program uses a `repeat` loop to get Laurel to move forward five times.'
 wrong 'I don\'t know.', feedback: 'The program uses a `repeat` loop to get Laurel to move forward five times.'

dashboard/config/scripts/courseb_multi_collector_loops3_predict1.multi

@@ -1,6 +1,6 @@
 name 'courseB_multi_collector_loops3_predict1'
 question 'Look at the code below.  What do you think will happen when you click "Run"?'
 wrong 'Laurel won\'t move at all.', feedback: 'Incorrect. The program uses a `repeat` loop to get Laurel to move forward three times.'
-right 'Laurel will move forward and collect treasure three times in a row.', feedback: 'Correct!'
-wrong 'Laurel will move forward and collect all of the treasure.', feedback: 'Incorrect. The `repeat` loop only instructs Laurel to move forward and collect treasure three times.'
+right 'Laurel will move forward and get treasure three times in a row.', feedback: 'Correct!'
+wrong 'Laurel will move forward and get all of the treasure.', feedback: 'Incorrect. The `repeat` loop only instructs Laurel to move forward and get treasure three times.'
 wrong 'I don\'t know.', feedback: 'The program uses a `repeat` loop to get Laurel to move forward three times.'

dashboard/config/scripts/coursed-ramp.script

@@ -7,6 +7,7 @@ level 'courseD_maze_ramp2'
 level 'courseD_maze_ramp3'
 level 'courseD_maze_ramp4'
 level 'courseD_maze_ramp5'
+level 'courseA_video_Loops'
 level 'courseD_maze_ramp6'
 level 'courseD_maze_ramp7'
 level 'courseD_collector_ramp8'

dashboard/config/scripts/coursee-ramp.script

@@ -7,10 +7,7 @@ level 'courseE_maze_ramp4'
 level 'courseE_maze_ramp5'
 level 'courseE_maze_ramp6'
 level 'courseE_maze_ramp7'
-level 'courseE_collector_ramp8'
-level 'courseE_collector_ramp9'
-level 'courseE_collector_ramp10'
-level 'courseE_artist_ramp11'
-level 'courseE_artist_ramp12'
-level 'courseE_farmer_ramp13'
+level 'courseE_artist_ramp8'
+level 'courseE_artist_ramp10'
+level 'courseE_farmer_ramp11'
 assessment 'courseE_farmer_ramp14'

dashboard/config/scripts/coursee_multi_farmer_ramp12.multi

@@ -0,0 +1,12 @@
+name 'courseE_multi_farmer_ramp12'
+question ' '
+wrong 'wrong answer'
+right 'right answer'
+
+markdown <<MARKDOWN
+Oh my!  These bundles of lettuce are so close together that the farmer doesn't know how many there are! 
+
+Here, we use a new block called the `if/else` block.  Look closely at the program below. Can you figure out what will happen after you click "Run"?
+
+
+MARKDOWN

dashboard/config/scripts/csd5-draft.script

@@ -1,5 +1,11 @@
 hideable_stages true
 
+stage 'Representing Images'
+level 'CSD U5 black white images pixelation'
+level 'CSD U5 black white images pixelation 2'
+level 'CSD U5 black white images pixelation 3'
+level 'CSD U5 black white images pixelation 4'
+
 stage 'Combining Representations'
 level 'CSD U3 combining rep'
 level 'CSD U5 student record'

dashboard/config/scripts/csd6-draft.script

@@ -165,3 +165,11 @@ level 'CSDU6 - sensors love tester 1', progression: 'Love Tester Project'
 level 'CSDU6 - sensors love tester 2', progression: 'Love Tester Project'
 level 'CSDU6 - sensors love tester 3', progression: 'Love Tester Project'
 named_level 'CSDU6 - sensor projects challenge'
+
+stage 'Project: Prototype an Innovation'
+level 'CSDU6 - final project 1', progression: 'Project Work'
+level 'CSDU6 - final project 2', progression: 'Project Work'
+level 'CSDU6 - final project 3', progression: 'Project Work'
+level 'CSDU6 - final project 4', progression: 'Project Work'
+level 'CSDU6 - final project 5', progression: 'Project Work'
+level 'CSDU6 - final project 6', progression: 'Project Work'

dashboard/config/scripts/csd_u5_student_record.external

@@ -4,7 +4,8 @@ description 'description here'
 markdown <<MARKDOWN
 # Student record
 
-<div style="float: right; height:209px; width: 416px; background-color: black;">
+<div style="float: right; height:209px; width: 456px; background-color: black;">
+  <div style="float:left; height:52px; width: 40px; background-color: white; margin:0px; line-height: 50px; text-align: center;font-size: 20px;">0</div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
@@ -14,6 +15,7 @@ markdown <<MARKDOWN
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: white; margin:1px;"></div>
 
+  <div style="float:left; height:52px; width: 40px; background-color: white; margin:0px; line-height: 50px; text-align: center;font-size: 20px;">1</div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
@@ -23,6 +25,7 @@ markdown <<MARKDOWN
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: white; margin:1px;"></div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: white; margin:1px;"></div>
 
+  <div style="float:left; height:52px; width: 40px; background-color: white; margin:0px; line-height: 50px; text-align: center;font-size: 20px;">2</div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: white; margin:1px;"></div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
@@ -32,6 +35,7 @@ markdown <<MARKDOWN
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: white; margin:1px;"></div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
 
+  <div style="float:left; height:53px; width: 40px; background-color: white; margin:0px; line-height: 50px; text-align: center;font-size: 20px;">3</div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: white; margin:1px;"></div>
   <div style="float:left; height:50px; width: 50px; height: 50px; background-color: gray; margin:1px;"></div>
@@ -48,4 +52,7 @@ markdown <<MARKDOWN
 #### * The second eight store the student's age as a binary number.
 #### * The next eight store the student's first initial in ASCII.
 #### * The last eight store the student's last initial in ASCII.
+
+<br />
+<br />
 MARKDOWN

dashboard/config/scripts/levels/CSD U5 black white images pixelation 2.level

@@ -0,0 +1,22 @@
+<Pixelation>
+  <config><![CDATA[{
+  "game_id": 44,
+  "created_at": "2017-03-23T21:04:35.000Z",
+  "level_num": "custom",
+  "user_id": 106,
+  "properties": {
+    "markdown_instructions": "# Do This\r\n\r\nUse the pixelation widget to draw something a smiley face",
+    "instructions_important": "false",
+    "display_name": "Black and White Pixelation Widget",
+    "version": "1",
+    "hex": "false",
+    "skip_dialog": true,
+    "href": "pixelation/pixelation.html",
+    "data": "1100"
+  },
+  "published": true,
+  "notes": "",
+  "level_concept_difficulty": {
+  }
+}]]></config>
+</Pixelation>

dashboard/config/scripts/levels/CSD U5 black white images pixelation 3.level

@@ -0,0 +1,22 @@
+<Pixelation>
+  <config><![CDATA[{
+  "game_id": 44,
+  "created_at": "2017-03-23T21:05:05.000Z",
+  "level_num": "custom",
+  "user_id": 106,
+  "properties": {
+    "markdown_instructions": "# Do This\r\n\r\nUse the pixelation widget to draw something a smiley face",
+    "instructions_important": "false",
+    "display_name": "Black and White Pixelation Widget",
+    "version": "1",
+    "hex": "false",
+    "skip_dialog": true,
+    "href": "pixelation/pixelation.html",
+    "data": "1100"
+  },
+  "published": true,
+  "notes": "",
+  "level_concept_difficulty": {
+  }
+}]]></config>
+</Pixelation>

dashboard/config/scripts/levels/CSD U5 black white images pixelation 4.level

@@ -0,0 +1,22 @@
+<Pixelation>
+  <config><![CDATA[{
+  "game_id": 44,
+  "created_at": "2017-03-23T21:05:38.000Z",
+  "level_num": "custom",
+  "user_id": 106,
+  "properties": {
+    "markdown_instructions": "# Do This\r\n\r\nUse the pixelation widget to draw something a smiley face",
+    "instructions_important": "false",
+    "display_name": "Black and White Pixelation Widget",
+    "version": "1",
+    "hex": "false",
+    "skip_dialog": true,
+    "href": "pixelation/pixelation.html",
+    "data": "1100"
+  },
+  "published": true,
+  "notes": "",
+  "level_concept_difficulty": {
+  }
+}]]></config>
+</Pixelation>

dashboard/config/scripts/levels/CSD U5 black white images pixelation.level

@@ -5,14 +5,15 @@
   "level_num": "custom",
   "user_id": 106,
   "properties": {
-    "markdown_instructions": "# Do This\r\n\r\nUse the pixelation widget to draw something a smiley face",
+    "markdown_instructions": "# Do This\r\n\r\nComplete the \"X\" shape by typing 0s and 1s",
     "instructions_important": "false",
     "display_name": "Black and White Pixelation Widget",
     "version": "1",
     "hex": "false",
     "skip_dialog": true,
     "href": "pixelation/pixelation.html",
-    "data": "1100"
+    "data": "01110101011101110101",
+    "instructions": "Complete the X shape by typing 0s and 1s"
   },
   "published": true,
   "notes": "",