Merge branch '6-0-ui' into 6-0-stable

CHANGELOG.md

@@ -2,24 +2,44 @@
 
 ### New Features
 - Survey reports restyled to be more easily digested, and appear as infographics
-  - About Me
-  - My Sleep Pattern
+  - All surveys except for 'My Interest in Research'
+  - Users are able to toggle and view the original detailed reports
+  - Researchers and providers are immediately shown the original reports, with option to see new reports
+  - Formatting and content based on feedback sourced from members via the forums
 - **Administrative Changes**
   - Cross-Tabs admin panel added
     - Lists information about demographics of enrollment per type of referral source
+  - Location breakdown admin panel added
+    - Shows breakdown of member location by state and country
 - **Survey Exports**
   - Common Data Model Version 2.0 exports implemented
   - ESS export task added for reporting purposes
   - PROMIS export task added for reporting purposes
   - Location Report added that shows membership by country and state
 - System for adding custom validations for specific Survey questions
   - Date of birth validation
+- **Public facing tools**
+  - Sleep apnea risk assessment tool added
+    - Based on the STOPBang survey
+    - Social sharing of results added for social media
+  - Sleep apnea and BMI assessment tool added
+    - Transformed from BMI/AHI calculator
+    - Relates sleep apnea severity to BMI category
 
 ### Enhancements
 - **Gem Changes**
   - Updated to rails 4.2.1
+- **Documentation Changes**
+  - Consent and Privacy Policy updated based on need in order to do coenrollment
+  - Method for users to accept this update added
+    - This acceptance is required to for users to complete new surveys
+    - New users will automatically accept the update when they accept the consent
+  - Governance policies added to footer
+- Added American Sleep Association as a partner
 
 ### Bug Fixes
+- Date of birth bug fix addressed now from the backend for better handling
+- Partner ISSS link updated
 
 ## 5.2.0 (March 25, 2015)
 

app/views/static/partners.html.haml

@@ -4,6 +4,14 @@
 
 .panel.panel-partners
   .panel-body
+    .row
+      .col-md-8
+        %h4.darker-blue American Sleep Association
+        %h5.f300
+          The American Sleep Association (ASA) is an organization dedicated to improving public awareness about sleep disorders and sleep health, promoting sleep medicine research, and providing a portal for communication between patients, physicians, healthcare professionals, corporations, and scientists. The ASA is a member-driven public service organization.
+      .col-md-4.right.hidden-sm.hidden-xs
+        .img-centerer
+        = image_tag 'myapnea/partners/asa_logo.png', class: 'partners-logo-square'
     .row
       .col-md-4.left.hidden-sm.hidden-xs
         .img-centerer

app/views/tools/risk_assessment.html.haml

@@ -117,10 +117,6 @@
                 Collar size of 17" or more for men
                 %br
                 Collar size of 16" or more for women
-            %p.f300.text-muted
-              If you don't know your collar size, you can approximate using your hands. If you can wrap your hands around your neck and your fingers
-              %span.f500 do not touch
-              on both sides, you likely have a large neck.
           .col-xs-6
             .radio-container
               = radio_button_tag 'neck', 'yes'