Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Differentiate Deep Dive workshops on map #30549

Merged
merged 5 commits into from Aug 31, 2019
Merged

Differentiate Deep Dive workshops on map #30549

merged 5 commits into from Aug 31, 2019

Conversation

islemaster
Copy link
Contributor

PLC-417 Displays different map info and pin colors depending on whether a CSF workshop is Intro or Deep Dive on code.org/professional-development-workshops/update.

Adds Deep Dive workshops to the map on this page.

Deep Dive workshops get a star on their pin. We collapse workshops at the same location into one pin - in these cases if any of the workshops is deep dive, the pin gets the star. Also adds the workshop subject to the tooltip.

Before:
image
image

After:
image
image

@@ -85,6 +91,13 @@ function createNewMarker(latLng, title, infoWindowContent) {
return marker;
}

function iconForSubject(subject) {
if (subject === 'Deep Dive') {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we hoist 'Deep dive' into a common string?

@@ -118,7 +118,9 @@ def k5_public_map_index
# will be to show workshops from all subjects when deep-dive isn't specified.
# But until then, when deep-dive isn't specified, we only show 'Intro'
# workshops.
conditions[:subject] = params['deep_dive_only'] ? 'Deep Dive' : 'Intro'
if params['deep_dive_only']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this change the comment above it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, yes - it makes it irrelevant. Removing!

@codecov-io
Copy link

Codecov Report

Merging #30549 into staging will increase coverage by <.01%.
The diff coverage is 66.66%.

Impacted file tree graph

@@             Coverage Diff             @@
##           staging   #30549      +/-   ##
===========================================
+ Coverage    73.21%   73.21%   +<.01%     
===========================================
  Files         2058     2057       -1     
  Lines       112978   112945      -33     
  Branches      3495     3493       -2     
===========================================
- Hits         82721    82698      -23     
+ Misses       26995    26986       -9     
+ Partials      3262     3261       -1
Flag Coverage Δ
#integration 55.73% <ø> (-0.01%) ⬇️
#storybook 56.5% <ø> (ø) ⬆️
#unit 58.08% <ø> (-0.01%) ⬇️
Impacted Files Coverage Δ
...erializers/api/v1/pd/workshop_k5_map_serializer.rb 57.14% <100%> (ø) ⬆️
.../app/controllers/api/v1/pd/workshops_controller.rb 88.23% <50%> (-0.75%) ⬇️
apps/src/storage/dataBrowser/DataLibraryPane.jsx 69.56% <0%> (-1.27%) ⬇️
apps/src/p5lab/P5GroupWrapper.js
apps/src/p5lab/P5SpriteWrapper.js
apps/src/p5lab/P5Wrapper.js
apps/src/storage/dataBrowser/LibraryTable.jsx
apps/src/storage/dataBrowser/LibraryCategory.jsx
apps/src/p5lab/P5LabVisualizationHeader.jsx
apps/src/p5lab/P5LabVisualizationColumn.jsx
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e653436...957bed5. Read the comment docs.

1 similar comment
@codecov-io
Copy link

Codecov Report

Merging #30549 into staging will increase coverage by <.01%.
The diff coverage is 66.66%.

Impacted file tree graph

@@             Coverage Diff             @@
##           staging   #30549      +/-   ##
===========================================
+ Coverage    73.21%   73.21%   +<.01%     
===========================================
  Files         2058     2057       -1     
  Lines       112978   112945      -33     
  Branches      3495     3493       -2     
===========================================
- Hits         82721    82698      -23     
+ Misses       26995    26986       -9     
+ Partials      3262     3261       -1
Flag Coverage Δ
#integration 55.73% <ø> (-0.01%) ⬇️
#storybook 56.5% <ø> (ø) ⬆️
#unit 58.08% <ø> (-0.01%) ⬇️
Impacted Files Coverage Δ
...erializers/api/v1/pd/workshop_k5_map_serializer.rb 57.14% <100%> (ø) ⬆️
.../app/controllers/api/v1/pd/workshops_controller.rb 88.23% <50%> (-0.75%) ⬇️
apps/src/storage/dataBrowser/DataLibraryPane.jsx 69.56% <0%> (-1.27%) ⬇️
apps/src/p5lab/P5GroupWrapper.js
apps/src/p5lab/P5SpriteWrapper.js
apps/src/p5lab/P5Wrapper.js
apps/src/storage/dataBrowser/LibraryTable.jsx
apps/src/storage/dataBrowser/LibraryCategory.jsx
apps/src/p5lab/P5LabVisualizationHeader.jsx
apps/src/p5lab/P5LabVisualizationColumn.jsx
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e653436...957bed5. Read the comment docs.

@codecov-io
Copy link

codecov-io commented Aug 30, 2019

Codecov Report

Merging #30549 into staging will increase coverage by <.01%.
The diff coverage is 66.66%.

Impacted file tree graph

@@             Coverage Diff             @@
##           staging   #30549      +/-   ##
===========================================
+ Coverage    73.21%   73.21%   +<.01%     
===========================================
  Files         2058     2057       -1     
  Lines       112978   112945      -33     
  Branches      3495     3493       -2     
===========================================
- Hits         82721    82698      -23     
+ Misses       26995    26986       -9     
+ Partials      3262     3261       -1
Flag Coverage Δ
#integration 55.73% <ø> (-0.01%) ⬇️
#storybook 56.5% <ø> (ø) ⬆️
#unit 58.08% <ø> (-0.01%) ⬇️
Impacted Files Coverage Δ
...erializers/api/v1/pd/workshop_k5_map_serializer.rb 57.14% <100%> (ø) ⬆️
.../app/controllers/api/v1/pd/workshops_controller.rb 88.23% <50%> (-0.75%) ⬇️
apps/src/storage/dataBrowser/DataLibraryPane.jsx 69.56% <0%> (-1.27%) ⬇️
apps/src/p5lab/P5GroupWrapper.js
apps/src/p5lab/P5SpriteWrapper.js
apps/src/p5lab/P5Wrapper.js
apps/src/storage/dataBrowser/LibraryTable.jsx
apps/src/storage/dataBrowser/LibraryCategory.jsx
apps/src/p5lab/P5LabVisualizationHeader.jsx
apps/src/p5lab/P5LabVisualizationColumn.jsx
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e653436...0eba12e. Read the comment docs.

Copy link

@clareconstantine clareconstantine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with brendan's comments, but otherwise this looks great!

@islemaster islemaster merged commit 12847c2 into staging Aug 31, 2019
@islemaster islemaster deleted the deep-dive-on-map branch August 31, 2019 00:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants