Skip to content

Commit

Permalink
Merge pull request #23614 from code-dot-org/staging
Browse files Browse the repository at this point in the history
DTT (Staging > Test) [robo-dtt]
  • Loading branch information
deploy-code-org committed Jul 10, 2018
2 parents 560de64 + f4ff2f2 commit 7e8a18a
Show file tree
Hide file tree
Showing 71 changed files with 219 additions and 80 deletions.
13 changes: 13 additions & 0 deletions dashboard/app/models/census/state_cs_offering.rb
Expand Up @@ -32,6 +32,7 @@ class Census::StateCsOffering < ApplicationRecord
ID
IN
KY
LA
MA
MI
MS
Expand Down Expand Up @@ -85,6 +86,8 @@ def self.construct_state_school_id(state_code, row_hash)
School.find_by(id: row_hash['NCES'])&.state_school_id
when 'KY'
row_hash['State School ID']
when 'LA'
row_hash['State_School_ID']
when 'MA'
School.construct_state_school_id('MA', row_hash['District Code'][0..3], row_hash['School Code'])
when 'MS'
Expand Down Expand Up @@ -239,6 +242,14 @@ def self.construct_state_school_id(state_code, row_hash)
Other
).freeze

LA_COURSE_CODES = %w(
061102
061103
061177
061175
061176
).freeze

MA_COURSE_CODES = %w(
10011
10012
Expand Down Expand Up @@ -371,6 +382,8 @@ def self.get_courses(state_code, row_hash)
IN_COURSE_CODES.select {|course| row_hash[course] == 'Y'}
when 'KY'
KY_COURSE_CODES.select {|course| course == row_hash['Course']}
when 'LA'
LA_COURSE_CODES.select {|course| course == row_hash['Course']}
when 'MA'
# Don't consider a course as offered at a school if there is no enrollment ("*") or it is not a positive number
MA_COURSE_CODES.select do |course|
Expand Down
16 changes: 16 additions & 0 deletions dashboard/config/blocks/GamelabJr/gamelab_bounce.js
@@ -0,0 +1,16 @@
function bounce(sprite){
if(sprite.isTouching(bottomEdge)){
console.log("bottom!");
}
else if(sprite.isTouching(rightEdge)){
console.log("Right!");
}
else if(sprite.isTouching(topEdge)){
console.log("Top!");
}
else{
console.log("Left");
}
console.log(sprite.touching);
sprite.direction += sprite.direction * 1.45;
}
13 changes: 13 additions & 0 deletions dashboard/config/blocks/GamelabJr/gamelab_bounce.json
@@ -0,0 +1,13 @@
{
"category": "Sprites",
"config": {
"func": "bounce",
"blockText": "{SPRITE} bounces",
"args": [
{
"name": "SPRITE",
"type": "Sprite"
}
]
}
}
14 changes: 0 additions & 14 deletions dashboard/config/blocks/GamelabJr/gamelab_bounceOff.json

This file was deleted.

24 changes: 24 additions & 0 deletions dashboard/config/blocks/GamelabJr/gamelab_joystickDirection.js
@@ -0,0 +1,24 @@
function joystickDirection() {
var x = 0, y = 0;
if (keyDown("right")) {
x += 1;
}
if (keyDown("left")) {
x -= 1;
}
if (keyDown("up")) {
y -= 1;
}
if (keyDown("down")) {
y += 1;
}
if (x !== 0) {
x *= Infinity;
}
if (y !== 0) {
y *= Infinity;
}
if (x || y) {
return createVector(x, y);
}
}
@@ -0,0 +1,9 @@
{
"category": "",
"config": {
"func": "joystickDirection",
"name": "joystickDirection",
"blockText": "joystick direction",
"returnType": "Location"
}
}
16 changes: 16 additions & 0 deletions dashboard/config/blocks/GamelabJr/gamelab_keyDown.json
@@ -0,0 +1,16 @@
{
"category": "",
"config": {
"func": "keyDown",
"name": "keyDown",
"blockText": "key is down {KEY}",
"returnType": "Boolean",
"args": [
{
"name": "KEY",
"field": true,
"type": "String"
}
]
}
}
9 changes: 9 additions & 0 deletions dashboard/config/blocks/GamelabJr/gamelab_mouseDown.json
@@ -0,0 +1,9 @@
{
"category": "",
"config": {
"expression": "mouseDown('leftButton')",
"name": "mouseDown",
"blockText": "mouse is down",
"returnType": "Boolean"
}
}
6 changes: 6 additions & 0 deletions dashboard/config/blocks/GamelabJr/gamelab_whenJoystick.js
@@ -0,0 +1,6 @@
function whenJoystick(callback) {
whenLeftArrow(callback);
whenRightArrow(callback);
whenUpArrow(callback);
whenDownArrow(callback);
}
16 changes: 16 additions & 0 deletions dashboard/config/blocks/GamelabJr/gamelab_whenJoystick.json
@@ -0,0 +1,16 @@
{
"category": "",
"config": {
"color": [
140,
1,
0.74
],
"func": "whenJoystick",
"blockText": "when joystick",
"args": [

],
"eventBlock": true
}
}
6 changes: 6 additions & 0 deletions dashboard/config/blocks/GamelabJr/gamelab_whileJoystick.js
@@ -0,0 +1,6 @@
function whileJoystick(callback) {
whileLeftArrow(callback);
whileRightArrow(callback);
whileUpArrow(callback);
whileDownArrow(callback);
}
16 changes: 16 additions & 0 deletions dashboard/config/blocks/GamelabJr/gamelab_whileJoystick.json
@@ -0,0 +1,16 @@
{
"category": "",
"config": {
"color": [
322,
0.9,
0.95
],
"func": "whileJoystick",
"blockText": "while joystick",
"args": [

],
"eventLoopBlock": true
}
}
2 changes: 1 addition & 1 deletion dashboard/config/locales/scripts.en.yml
Expand Up @@ -8612,7 +8612,7 @@ en:
description_teacher: In this lesson students consider a number of computing devices to determine what types of inputs and outputs they use. Groups are assigned to a computing device and based on a teacher-provided definition of input and output, list the inputs and outputs of their device. Earlier in the activity students are prompted to focus on more obvious physical inputs and outputs (e.g. a keyboard as an input or a screen as an output) but later discussions lead students to consider less obvious examples (e.g. that a touch screen is both an input and output, or the fact that the Internet can serve as both input and output). Throughout the lesson the teacher records inputs and outputs that are identified on a T-Chart at the front of the room. To conclude the lesson students examine common activities they do on a computing device and select the inputs and outputs used for that activity from the chart.
Processing:
name: Processing
description_student: This lesson dives deeper into the concept of processing that was introduced as part of the definition of a computer. Pairs work together to puta deck of cards in order, a form of processing information. In the end, the class discusses what processing means within the context of solving information problems.
description_student: This lesson dives deeper into the concept of processing that was introduced as part of the definition of a computer. Pairs work together to put a deck of cards in order, a form of processing information. In the end, the class discusses what processing means within the context of solving information problems.
description_teacher: Students complete two unplugged card sorting activities to explore the meaning of processing and its relationship to problem-solving. The first activity has few constraints and is used to introduce a high-level definition of processing. The next introduces more constraints that force students to develop an algorithm that will always successfully process the cards. Students iteratively develop, test, and share their algorithms with classmates. A wrap-up discussion has students reflect on the different types of problem-solving they used in these activities and the value of producing an algorithm to solve a problem.
Storage:
name: Storage
Expand Down
Expand Up @@ -6,7 +6,7 @@ markdown <<MARKDOWN



# 1000011
![](https://images.code.org/3aa6cac930e44cdc71b8fdcb7b1babe9-image-1531247036544.23.16 AM.png)



Expand Down
7 changes: 5 additions & 2 deletions dashboard/config/scripts/levels/New Sprite Lab Project.level

Large diffs are not rendered by default.

Expand Up @@ -55,10 +55,7 @@
"instructions": "Create an **event** so that when Geraldine touches the puddle, her color changes to brown.",
"include_shared_functions": "false",
"validation_code": "var status = 3;\r\nif (World.frameCount > 200) {\r\n // Check through all sprites in case student changed the sprite name\r\n for (var i=0; i<World.allSprites.length; i++) {\r\n var sprite = World.allSprites[i];\r\n // ignore edge sprites\r\n if (!edges.contains(sprite)) {\r\n if(sprite.getAnimationLabel() == \"giraffe\"){\r\n if(sprite.isTouching(puddle) && sprite.tint != undefined){\r\n console.log(\"I'm in!\");\r\n status = 0;\r\n levelSuccess(status);\r\n }\r\n }\r\n }\r\n }\r\n }",
"contained_level_names": null,
"encrypted_examples": [

]
"contained_level_names": null
},
"published": true,
"notes": "",
Expand Down
2 changes: 1 addition & 1 deletion dashboard/db/schema.rb
Expand Up @@ -1324,7 +1324,7 @@
t.datetime "updated_at", null: false
t.datetime "deleted_at"
t.index ["student_id", "level_id", "teacher_id"], name: "index_feedback_on_student_and_level_and_teacher_id", using: :btree
t.index ["student_id", "level_id"], name: "index_feedback_on_student_and_level", using: :btree
t.index ["student_id", "level_id"], name: "index_feedback_on_student_and_level", using: :btree
end

create_table "teacher_profiles", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
Expand Down
4 changes: 2 additions & 2 deletions pegasus/data/cdo-state-promote.csv
Expand Up @@ -26,7 +26,7 @@ MN,Minnesota,13366,2.9,895,39,-12471,No,Yes,No,No,No,No,No,No,No,No,,,,,90134,12
MO,Missouri,11090,4.3,1138,47,-9952,No,No,No,No,No,No,No,No,No,No,,,,,82050,909934500,44620,0,17%,0.95%,631,20%,29,34,1,0,64,69,21%,22,466,16%,21,19,1,0,18%,165,33%,8,15,0,0,10%,71%,Other,www.code.org/promote/MO,no school districts in the state,Union Station Science City and Washington University at St. Louis Institute for School Partnership,none,4,810,0,3,0,0,1357000,3606,2269,2547,1716,1567,942,399,327398,6863,,,,,,,,,,,,
MS,Mississippi,1228,4.6,155,14,-1073,No,No,Yes,Yes,No,No,No,No,No,Yes,,,,,69507,85354596,38300,0,12%,0.11%,105,23%,11,12,0,0,23,13,7%,10,19,5%,3,3,0,0,3%,86,27%,8,9,0,0,6%,78%,No,www.code.org/promote/MS,no school districts in the state,Mississippi State University,none,1,255,2,1,0,0,150000,1076,933,493,387,813,165,16,99631,2829,,,,,,,,,,,,
MT,Montana,652,2.3,75,10,-577,No,No,Yes,Other,No,Yes,No,No,No,No,,,,,64375,41972500,41440,0,11%,0.18%,13,15%,2,0,0,0,2,2,2%,2,13,15%,2,0,0,0,2%,0,0%,0,0,0,0,0%,57%,Other,www.code.org/promote/MT,no school districts in the state,Teachers Teaching Tech,none,0,0,12,20,0,0,185000,485,374,120,341,116,4,9,44291,1290,,Montana is in the process of developing K-12 computer science standards.,,,,,,,,,,K-12 CS standards in progress
NC,North Carolina,20184,5.1,1284,71,-18900,No,Yes,Yes,No,Yes,No,No,No,No,No,,,,,88971,1795790664,45280,0,20%,0.98%,2411,24%,163,178,6,2,349,95,15%,0,1435,24%,89,106,5,1,9%,976,25%,74,72,1,1,10%,69%,Yes,www.code.org/promote/NC,"Alamance-Burlington School System, Chatham County Schools, Durham Public Schools, Franklin County School, Granville County Schools, Johnston County Schools, Orange County Schools, Rockingham County Schools, Warren County Schools, and Wilson County Schools",The Friday Institute,none,9,2299,54,28,0,38,2456000,11770,6626,4421,10183,3806,12482,1425,497021,12077,,,,,,,,,,,,
NC,North Carolina,20184,5.1,1284,71,-18900,Yes,Yes,Yes,No,Yes,No,No,No,No,No,,,,,88971,1795790664,45280,0,20%,0.98%,2411,24%,163,178,6,2,349,95,15%,0,1435,24%,89,106,5,1,9%,976,25%,74,72,1,1,10%,69%,Yes,www.code.org/promote/NC,"Alamance-Burlington School System, Chatham County Schools, Durham Public Schools, Franklin County School, Granville County Schools, Johnston County Schools, Orange County Schools, Rockingham County Schools, Warren County Schools, and Wilson County Schools",The Friday Institute,none,9,2299,54,28,0,38,2456000,11770,6626,4421,10183,3806,12482,1425,497021,12077,,,,,,,,,,,,
ND,North Dakota,673,2.5,117,5,-556,No,Yes,Yes,No,No,No,No,No,No,No,,,,,70311,47319303,47130,0,7%,1.27%,96,11%,4,1,1,0,6,10,19%,7,40,3%,1,0,0,0,13%,56,18%,3,1,1,0,6%,0,No,www.code.org/promote/ND,no school districts in the state,Teachers Teaching Tech,none,1,10,0,0,0,0,104000,354,151,170,1,95,6,35,35481,1195,,,,,,,,,,,,
NE,Nebraska,2612,3.2,438,36,-2174,No,No,No,No,No,No,No,No,No,No,,,,,76542,199927704,44170,0,15%,0.67%,157,10%,8,2,2,0,12,19,21%,4,110,9%,5,1,0,0,18%,47,11%,3,1,2,0,9%,63%,No,www.code.org/promote/NE,Lincoln Public School,University of Nebraska at Lincoln,none,1,221,2,3,0,1,686000,1203,447,713,602,394,110,88,190490,2784,,,,,,,,,,,,
NH,New Hampshire,1475,2.2,391,24,-1084,Yes,Other,Yes,Other,No,No,Yes,Other,No,No,,,,,92945,137093875,50180,2,20%,1.34%,237,18%,5,2,1,0,8,20,17%,0,199,19%,3,1,1,0,14%,38,13%,2,1,0,0,8%,66%,Yes,www.code.org/promote/NH,no school districts in the state,UNH STEM Teachers' Collaborative,none,1,135,0,0,0,0,320000,1791,740,928,852,693,267,167,57775,1351,,New Hampshire is in the process of developing K-12 computer science standards.,,,,,"New Hampshire requires that all school districts offer instruction in computer science. However, the state could consider increasing access by requiring each school to offer at least one course.","New Hampshire has passed policy that is permissive and encouraging for schools to allow computer science to count for a core graduation requirement, but it is not a requirement for schools.",,,Requires all school districts to offer CS,K-12 CS standards in progress
Expand All @@ -37,7 +37,7 @@ NY,New York,33873,4.5,3801,186,-30072,No,Other,Yes,No,Yes,No,No,No,No,No,,,,,100
OH,Ohio,15515,3.8,1137,139,-14378,No,Yes,Yes,Other,No,Yes,No,No,No,No,,,,,83959,1302623885,45930,0,18%,0.95%,2202,24%,82,85,4,0,171,131,18%,49,1287,19%,49,39,3,0,12%,915,30%,33,46,1,0,9%,65%,No,www.code.org/promote/OH,"Blanchester Local Schools, Canal Winchester Local Schools, Columbus City School District, Metro Early College High School, New Albany Plain Local Schools, Newark City Schools, Oak Hills Local School District, Reynoldsburg City School District, Strongsville School District, and Vermilion Local School District",Battelle Education,none,6,2075,40,38,16,32,1786000,13211,6122,6894,6512,4846,2546,1149,619999,10897,,Ohio is in the process of developing K-12 computer science standards.,,,,,,,,,,K-12 CS standards in progress
OK,Oklahoma,2633,3.6,446,49,-2187,No,Yes,Yes,Yes,No,No,Yes,No,No,No,,,,,72036,189670788,42760,4,15%,0.61%,363,22%,28,27,9,0,64,29,10%,6,180,26%,12,19,5,0,7%,183,18%,16,8,4,0,5%,67%,Other,www.code.org/promote/OK,no school districts in the state,Oklahoma Public School Resource Center,none,3,270,10,20,0,1,438000,2734,1636,1669,1097,1204,773,187,136107,3291,,,,,,,,,,,,
OR,Oregon,5793,2.9,537,26,-5256,No,Other,No,No,No,No,No,No,No,No,,,,,86352,500237136,49710,0,15%,0.88%,436,20%,29,2,3,0,34,25,11%,10,283,17%,21,2,1,0,7%,153,25%,8,0,2,0,6%,57%,Yes,www.code.org/promote/OR,Beaverton School District,George Fox University,none,2,656,0,1,0,0,943000,3172,1495,1372,1388,1173,1005,281,235467,5696,,,,,,,,"Oregon allows schools to count computer science for a core graduation requirement. The policy is not written down and publicly accessible, but we are working with the state to release public documentation.",,,,
PA,Pennsylvania,19752,3.7,2969,191,-16783,No,Yes,No,Yes,No,No,No,No,No,No,,,,,85654,1691837808,47540,0,20%,1.48%,3058,22%,146,84,2,0,232,206,26%,37,1952,18%,91,48,1,0,23%,1106,28%,55,36,1,0,11%,71%,Other,www.code.org/promote/PA,no school districts in the state,Delaware County Intermediate Unit and Allegheny Intermediate Unit 3,none,4,2687,14,26,0,5,2512000,14524,7550,8611,7187,6102,3048,1891,733178,13335,,,,,,,,"Pennsylvania has passed policy that is permissive and encouraging for schools to allow computer science to count for a core graduation requirement, but it is not a requirement for schools.",,,,
PA,Pennsylvania,19752,3.7,2969,191,-16783,No,Yes,No,Yes,Yes,No,No,No,No,No,,,,,85654,1691837808,47540,0,20%,1.48%,3058,22%,146,84,2,0,232,206,26%,37,1952,18%,91,48,1,0,23%,1106,28%,55,36,1,0,11%,71%,Other,www.code.org/promote/PA,no school districts in the state,Delaware County Intermediate Unit and Allegheny Intermediate Unit 3,none,4,2687,14,26,0,5,2512000,14524,7550,8611,7187,6102,3048,1891,733178,13335,,,,,,,,"Pennsylvania has passed policy that is permissive and encouraging for schools to allow computer science to count for a core graduation requirement, but it is not a requirement for schools.",,,,
RI,Rhode Island,1690,3.8,348,13,-1342,Yes,Other,No,Yes,Yes,No,No,Other,No,No,,,,,90037,152162530,51920,0,17%,0.79%,337,23%,26,5,0,1,32,29,41%,15,146,21%,14,2,0,0,17%,191,24%,12,3,0,1,29%,0,No,www.code.org/promote/RI,no school districts in the state,University of Rhode Island,the State of Rhode Island,4,1062,0,2,0,0,366000,1265,877,884,569,485,438,94,94443,2669,,,,,,,Rhode Island is working towards bringing computer science to all secondary schools.,"Rhode Island allows computer science to count for a core graduation requirement. This policy is not written down and publicly accessible, but we are working with the state to release public documentation. ",,,Working towards all high schools to offer CS,
SC,South Carolina,4342,3.9,529,51,-3813,No,No,Yes,Yes,No,No,No,No,No,No,,,,,75259,326774578,41530,0,25%,0.76%,770,28%,58,69,3,0,130,48,16%,16,437,27%,37,46,1,0,12%,333,28%,21,23,2,0,8%,73%,Yes,www.code.org/promote/SC,no school districts in the state,the STEM Center of Excellence at the Citadel,none,4,381,10,16,0,0,1690000,4311,2940,1987,2425,1435,1119,374,217918,5869,,,,,,,,,,,,
SD,South Dakota,678,2.7,145,19,-533,No,No,No,No,No,No,No,No,No,No,,,,,65516,44419848,40070,0,18%,0.62%,35,9%,0,1,0,0,1,4,5%,0,16,19%,0,1,0,0,5%,19,0%,0,0,0,0,1%,52%,Other,www.code.org/promote/SD,no school districts in the state,Teachers Teaching Tech,none,4,1090,1,3,0,2,192000,515,300,231,177,276,118,26,76799,2273,,,,,,,,,,,,
Expand Down
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/9a566dadb6bbf34b113ecc8e7f65783f-AK.pdf
https://cdo-fetch.s3.amazonaws.com/2591b0f205791bc63561d4466d16fa4c-AK.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/3f80cafd803df0c67d97c1c18e5166fc-AL.pdf
https://cdo-fetch.s3.amazonaws.com/c9b1e8e7e3eb2230a6c615c8bb6e8e93-AL.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/23c636734525fdf2f91c10a46ba241d2-AR.pdf
https://cdo-fetch.s3.amazonaws.com/1a2381fefd1033eaffac46c22039b7d1-AR.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/885973683baf8b24e85a899ec2f09e00-AZ.pdf
https://cdo-fetch.s3.amazonaws.com/57abbad8e10ecc2d6f24848aa63c9cc2-AZ.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/a45f1ac37c7598b2137d864d5271601d-CA.pdf
https://cdo-fetch.s3.amazonaws.com/f23149cd74cdee4698f527938e6d8169-CA.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/38de57e7db7c1dcf16fa7f6cf11a4677-CO.pdf
https://cdo-fetch.s3.amazonaws.com/12695637cf0f25d85f15fa55fa53a863-CO.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/08ca4236b1f76181f1c54a703a170ce5-CT.pdf
https://cdo-fetch.s3.amazonaws.com/a877867b36cc5192290a9491c2b42c62-CT.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/32b15c4df73dfad7b6fb79d878d2dd9e-DC.pdf
https://cdo-fetch.s3.amazonaws.com/369f47cb11c6d7256aa402f505c7306e-DC.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/9e7a5ea75fd3dfbbdf8d354eb6b2c1ac-DE.pdf
https://cdo-fetch.s3.amazonaws.com/ec8a0f7218166fe262a02677f6922f4a-DE.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/632802cc56bcb0fa4f9b5518af719325-FL.pdf
https://cdo-fetch.s3.amazonaws.com/73e7eed2c324ee0b61e8adedfe904444-FL.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/f98ef60a5ff22c379a4e9394434ec7ff-GA.pdf
https://cdo-fetch.s3.amazonaws.com/e48fba3ca2a8a4f88bcd1e9070d883fd-GA.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/ff6324eb8a793b9ebffff576a585a6de-HI.pdf
https://cdo-fetch.s3.amazonaws.com/58d60e9f06178df1407067cb9610ef60-HI.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/6ef5c81dca8dcad5595c0ace7ad97c01-IA.pdf
https://cdo-fetch.s3.amazonaws.com/1298305b969f2a97010aa576556a7587-IA.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/b9defdd7adde9e94b7bdb722bd38e49e-ID.pdf
https://cdo-fetch.s3.amazonaws.com/35a3a014f4403d18c0cc41be802b280f-ID.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/25831b6fadf9a8692a53389a19a0df65-IL.pdf
https://cdo-fetch.s3.amazonaws.com/247921111493c7aff36c0d34dd5141e6-IL.pdf
@@ -1 +1 @@
https://cdo-fetch.s3.amazonaws.com/cde6dceb05a4dcc65974c1f88389ee3c-IN.pdf
https://cdo-fetch.s3.amazonaws.com/4752d942066528eb940c576e38a390ca-IN.pdf

0 comments on commit 7e8a18a

Please sign in to comment.