Merge pull request #26425 from code-dot-org/staging

DTT (Staging > Test) [robo-dtt]
code-dot-org · Dec 19, 2018 · 244c813 · 244c813
2 parents 404d23d + 8cf1b52
commit 244c813
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 36 deletions.
diff --git a/dashboard/config/locales/scripts.en.yml b/dashboard/config/locales/scripts.en.yml
@@ -10428,6 +10428,8 @@ en:
               name: Binary Bracelets
               description_student: ''
               description_teacher: ''
+            'End of Course Project: Play Lab':
+              name: 'End of Course Project: Play Lab'
         csp-mid-survey:
           stages:
             CSP Mid-year survey:

diff --git a/dashboard/config/scripts/coursec-2019.script b/dashboard/config/scripts/coursec-2019.script
@@ -8,9 +8,15 @@ project_widget_types ["playlab", "artist"]
 script_announcements [{"notice"=>"Our 2018 CS Fundamentals Curriculum Guide is Live", "details"=>"Click \"Learn More\" to download the PDF, including unplugged lesson plans for Courses A-F.", "link"=>"https://code.org/curriculum/docs/csf/CSF_Curriculum_Guide_2018_smaller.pdf", "type"=>"bullhorn"}]
 version_year '2019'
 
+stage 'Screen Out the Mean'
+level 'courseC_Unplugged_ScreenOutTheMean_2019'
+
 stage 'Building a Foundation'
 level 'BuildingAFoundation_2019'
 
+stage 'Real-life Algorithms: Paper Planes'
+level 'PaperPlanes_2019'
+
 stage 'Programming in Maze'
 level 'courseC_video_maze_2019'
 level 'courseC_maze_programming1_2019'
@@ -40,9 +46,6 @@ level 'courseC_maze_debugging9_2019'
 bonus 'courseC_maze_debugging_challenge1_2019'
 bonus 'courseC_maze_debugging_challenge2_2019'
 
-stage 'Real-life Algorithms: Paper Planes'
-level 'PaperPlanes_2019'
-
 stage 'Programming in Collector'
 level 'courseC_video_collector_2019'
 level 'courseC_collector_prog1_2019'
@@ -74,6 +77,9 @@ assessment 'courseC_artist_prog6_predict1_2019'
 bonus 'courseC_artist_prog_challenge1_2019'
 bonus 'courseC_artist_prog_challenge2a_2019'
 
+stage 'Binary Bracelets'
+level 'BinaryBracelets_2019'
+
 stage 'Loops: Getting Loopy'
 level 'GettingLoopy_2019'
 
@@ -126,6 +132,22 @@ assessment 'courseC_harvester_loops11_predict1_2019'
 bonus 'courseC_harvester_loops_challenge1a_2019'
 bonus 'courseC_harvester_loops_challenge2_2019'
 
+stage 'Looking Ahead'
+level 'Overworld Move to Sheep_2019'
+level 'Overworld Chop Tree_2019'
+level 'Overworld Shear Sheep_2019'
+level 'Overworld Chop Trees_2019'
+level 'Overworld Place Wall_2019'
+level 'Overworld House Frame Chosen_2019'
+level 'Overworld Plant Crops_2019'
+level 'Overworld Avoid Monsters_2019'
+level 'Underground Mining Coal_2019'
+level 'Underground Iron_2019'
+level 'Underground Avoiding Lava_2019'
+level 'Underground If Statements_2019'
+level 'Overworld Powered Minecart_2019'
+level 'Overworld Free Play 20x20_2019'
+
 stage 'Events: The Big Event'
 level 'BigEvent_2019'
 
@@ -142,9 +164,6 @@ level 'courseC_flappy_events8_2019'
 level 'courseC_flappy_events9_2019'
 level 'courseC_flappy_events10_2019'
 
-stage 'Screen Out the Mean'
-level 'courseC_Unplugged_ScreenOutTheMean_2019'
-
 stage 'Events in Play Lab'
 level 'courseC_PlayLab_events1_2019'
 level 'courseC_PlayLab_events2_2019'
@@ -159,21 +178,10 @@ level 'courseC_PlayLab_eventsA_2019'
 level 'courseC_PlayLab_eventsFP_2019'
 bonus 'courseC_PlayLab_events_challenge1_2019'
 
-stage 'Looking Ahead'
-level 'Overworld Move to Sheep_2019'
-level 'Overworld Chop Tree_2019'
-level 'Overworld Shear Sheep_2019'
-level 'Overworld Chop Trees_2019'
-level 'Overworld Place Wall_2019'
-level 'Overworld House Frame Chosen_2019'
-level 'Overworld Plant Crops_2019'
-level 'Overworld Avoid Monsters_2019'
-level 'Underground Mining Coal_2019'
-level 'Underground Iron_2019'
-level 'Underground Avoiding Lava_2019'
-level 'Underground If Statements_2019'
-level 'Overworld Powered Minecart_2019'
-level 'Overworld Free Play 20x20_2019'
-
-stage 'Binary Bracelets'
-level 'BinaryBracelets_2019'
+stage 'End of Course Project: Play Lab'
+level 'courseC19_playLab_EOC1'
+level 'courseC19_playLab_EOC2'
+level 'courseC19_playLab_EOC3'
+level 'courseC19_playLab_EOC4'
+level 'courseC19_playLab_EOC5'
+level 'courseC19_playLab_EOC6'
diff --git a/dashboard/config/scripts/csd_u1_assessment_match_psp.match b/dashboard/config/scripts/csd_u1_assessment_match_psp.match
@@ -1,5 +1,6 @@
 name 'CSD U1 Assessment match PSP'
 title ''
+height '100'
 description 'Five students are painting a mural on the side of their school.  Match what they are doing with a step of the Problem Solving Process.'
 question 'Define'
 answer 'Asking the teachers what sort of mural they need to make, and how big it needs to be.'

diff --git a/dashboard/config/scripts/levels/CSD Board Buttons Map_2018.level b/dashboard/config/scripts/levels/CSD Board Buttons Map_2018.level
@@ -7,11 +7,14 @@
   "properties": {
     "instructions_important": "false",
     "display_name": "Buttons and Switch",
-    "reference": "/docs/csd/maker_buttons/index.html",
+    "reference": "/docs/concepts/maker-toolkit/physical-input/index.html",
     "parent_level_id": 8726,
     "name_suffix": "_2018"
   },
   "published": true,
-  "notes": ""
+  "notes": "",
+  "audit_log": "[{\"changed_at\":\"2018-12-19 19:57:24 +0000\",\"changed\":[\"reference\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
+  "level_concept_difficulty": {
+  }
 }]]></config>
 </Map>
diff --git a/dashboard/config/scripts/levels/CSD Buzzer Map_2018.level b/dashboard/config/scripts/levels/CSD Buzzer Map_2018.level
@@ -7,11 +7,14 @@
   "properties": {
     "instructions_important": "false",
     "display_name": "Circuit Playground: Buzzer",
-    "reference": "/docs/csd/maker_buzzer/index.html",
+    "reference": "/docs/concepts/maker-toolkit/producing-output/index.html",
     "parent_level_id": 8732,
     "name_suffix": "_2018"
   },
   "published": true,
-  "notes": ""
+  "notes": "",
+  "audit_log": "[{\"changed_at\":\"2018-12-19 19:56:24 +0000\",\"changed\":[\"reference\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
+  "level_concept_difficulty": {
+  }
 }]]></config>
 </Map>
diff --git a/dashboard/config/scripts/levels/CSD U6 Event Types_2018.level b/dashboard/config/scripts/levels/CSD U6 Event Types_2018.level
@@ -7,12 +7,14 @@
   "properties": {
     "instructions_important": "false",
     "display_name": "Event Types",
-    "reference": "/docs/csd/maker_buttons/index.html",
+    "reference": "/docs/concepts/maker-toolkit/physical-input/index.html",
     "parent_level_id": 10572,
     "name_suffix": "_2018"
   },
   "published": true,
   "notes": "",
-  "audit_log": "[{\"changed_at\":\"2017-11-28 21:43:16 +0000\",\"changed\":[],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"}]"
+  "audit_log": "[{\"changed_at\":\"2017-11-28 21:43:16 +0000\",\"changed\":[],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2018-12-19 19:55:46 +0000\",\"changed\":[\"reference\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
+  "level_concept_difficulty": {
+  }
 }]]></config>
 </Map>
diff --git a/dashboard/config/scripts/levels/CSD U6 getProperty Map_2018.level b/dashboard/config/scripts/levels/CSD U6 getProperty Map_2018.level
@@ -7,11 +7,14 @@
   "properties": {
     "instructions_important": "false",
     "display_name": "getProperty",
-    "reference": "/docs/csd/getProperty_input/index.html",
+    "reference": "/docs/concepts/app-lab/taking-input-with-getproperty/index.html",
     "parent_level_id": 10214,
     "name_suffix": "_2018"
   },
   "published": true,
-  "notes": ""
+  "notes": "",
+  "audit_log": "[{\"changed_at\":\"2018-12-19 19:54:07 +0000\",\"changed\":[\"reference\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
+  "level_concept_difficulty": {
+  }
 }]]></config>
 </Map>
diff --git a/dashboard/config/scripts/levels/CSD U6 setProperty Map_2018.level b/dashboard/config/scripts/levels/CSD U6 setProperty Map_2018.level
@@ -7,12 +7,14 @@
   "properties": {
     "instructions_important": "false",
     "display_name": "Designing Screens with Code",
-    "reference": "/docs/csd/set_property/index.html",
+    "reference": "/docs/concepts/app-lab/designing-screens-with-code/index.html",
     "parent_level_id": 10120,
     "name_suffix": "_2018"
   },
   "published": true,
   "notes": "",
-  "audit_log": "[{\"changed_at\":\"2017-10-26 16:07:32 +0000\",\"changed\":[],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-26 16:10:48 +0000\",\"changed\":[\"teacher_markdown\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]"
+  "audit_log": "[{\"changed_at\":\"2017-10-26 16:07:32 +0000\",\"changed\":[],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-26 16:10:48 +0000\",\"changed\":[\"teacher_markdown\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2018-12-19 19:52:10 +0000\",\"changed\":[\"reference\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
+  "level_concept_difficulty": {
+  }
 }]]></config>
 </Map>
diff --git a/dashboard/config/scripts/levels/CSD onBoardEvent Map_2018.level b/dashboard/config/scripts/levels/CSD onBoardEvent Map_2018.level
@@ -7,11 +7,14 @@
   "properties": {
     "instructions_important": "false",
     "display_name": "Responding to Board Events",
-    "reference": "/docs/csd/maker_event/index.html",
+    "reference": "/docs/concepts/maker-toolkit/board-events/index.html",
     "parent_level_id": 8727,
     "name_suffix": "_2018"
   },
   "published": true,
-  "notes": ""
+  "notes": "",
+  "audit_log": "[{\"changed_at\":\"2018-12-19 19:58:09 +0000\",\"changed\":[\"reference\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
+  "level_concept_difficulty": {
+  }
 }]]></config>
 </Map>