Revive diversity survey for 2018

[tanyaparker]

Reverts #14543

With both terms + NPS reminders (NPS is currently deactivated so we can restyle when we reactivate)

With both terms + diversity reminders

Diversity survey alone part 1/2

Diversity survey alone part 2/2

[tanyaparker]

The follow up google survey currently links to this, which is closed. I'm following up to re-open and modify as needed before I merge this in. We may remove the button and follow up survey altogether.

[tanyaparker]

I tried renaming the ref to more accurately describe the things it shows, but I couldn't rename #terms_reminder to #teacher_reminders. When I renamed it (on both this .jsx page and in the _homepage.html.haml page), the layout would go wonky and the reminders would be placed on top of the banner. I couldn't find any css styles attached to this ID so I'm not sure why only #terms_reminder works to show the views below the banner.

[breville]

I'm seeing the wonkiness on this PR as well:

The trick is that we don't want the version in the HAML to be visible; it should be wrapped in something marked display: none. Then, the HTML is copied from there and appended to the React DOM, in this appendTo line. Once we're showing it in the React DOM, then it should appear below the React that contains the "My Dashboard" heading and provides the appropriate spacing.

Note that #terms_reminder was the parent div for a variety of components, not just this one, so it was responsible for making several things available in React. It's likely that this could get the display: none treatment so that none of the components under it, if they were being rendered, would be shown, assuming that all should now be in the React DOM.

[tanyaparker]

@Erin007 since you added in the terms reminder here, can you comment on what I'm missing here to fix my PR? :) I also don't understand why I would see my layout just fine but Brendan would see it wonky for the same PR...

[Erin007]

looking...

[breville]

So I pulled the latest changes and it looks okay now. The survey being shown is part of the React DOM which is how it should work.

[breville]

I was also able to do the rename just fine. You have to make sure apps rebuilds successfully for that rename to work on the React side.

[tanyaparker]

I decided to move it here because the index.html.haml page contained the modal pop-ups like asking for school and accepting the terms of service. I thought this would be clearer that here are all the in-page reminders that show above the classroom sections.

[tanyaparker]

Tested that the results are saved as Diversity2018

1. Confirmed that I had no survey results.

mysql> select count(*) from survey_results;
+----------+
| count(*) |
+----------+
|        0 |
+----------+
1 row in set (0.00 sec)

2. Submitted the survey and it was Diversity2017.

mysql> select count(*) from survey_results;
+----------+
| count(*) |
+----------+
|        1 |
+----------+
1 row in set (0.00 sec)

mysql> select * from survey_results \G
*************************** 1. row ***************************
        id: 1
   user_id: 1
      kind: Diversity2017
properties: {"diversity_white":"60","diversity_black":"20","diversity_hispanic":"5","diversity_asian":"5","diversity_native":"1","diversity_other":"9","diversity_farm":"3"}
created_at: 2018-05-12 03:10:35
updated_at: 2018-05-12 03:10:35
1 row in set (0.00 sec)
mysql> select * from survey_results \G

3. Made the fixes and confirmed it saves as Diversity2018.

*************************** 1. row ***************************
        id: 2
   user_id: 1
      kind: Diversity2018
properties: {"diversity_white":"60","diversity_black":"10","diversity_hispanic":"10","diversity_asian":"10","diversity_native":"1","diversity_other":"9","diversity_farm":"2"}
created_at: 2018-05-12 03:20:58
updated_at: 2018-05-12 03:20:58
1 row in set (0.00 sec)

[tanyaparker]

Confirmed that doing an apps build after renaming #terms_reminder to #teacher_reminders fixes it. Also I found and re-opened the follow up Google form, making necessary changes.

Now checking Circle tests...

[tanyaparker]

Bumped counts in tests so waiting for Circle CI to re-run. Ready for review!

[tanyaparker]

Remaining circle failure is not related to my changes.

@breville @Erin007 can someone accept my PR if it looks ready to go?

[Erin007]

I restarted your Circle build, which should resolve the issue; but feel free to merge whenever you're ready.

[tanyaparker]

Muchas gracias!