diff --git a/app/views/pages/confirm-profile.ejs b/app/views/pages/confirm-profile.ejs index 93b89204..61e80883 100644 --- a/app/views/pages/confirm-profile.ejs +++ b/app/views/pages/confirm-profile.ejs @@ -70,7 +70,7 @@ <% } %>

- +

diff --git a/app/views/pages/report.ejs b/app/views/pages/report.ejs index 2f8b8df2..9f48c34a 100644 --- a/app/views/pages/report.ejs +++ b/app/views/pages/report.ejs @@ -37,6 +37,46 @@ <%- include('partials/header', { home: true, menu: false }) -%> + +
@@ -171,13 +211,120 @@ <%- __("Join the most important crowdsource! Regardless if you're healthy or not, please submit the form below – that is also valuable information!") %>

<% } %> + +
+
+ +
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + +
+ + + +
+ +
+
+ <%= __('Demography and geography') %> +
+ +
+ <%= __('Testing & Isolation') %> +
+ +
+ <%= __('Symptoms') %> +
+ +
+ <%= __('Health') %> +
+ +
+ <%= __('Submit & Share') %> +
+ +
+ +
+ + +
+

<%= __("Geography and demography") %>

- +
- <%= __("Biological gender") %> + <%= __("Biological gender") %>

> @@ -207,16 +354,24 @@ <% if (locals.zipGuide) { %> - <%= __('What is my Zip code?') %> <% } %> + +

+
+
-

<%= __("Testing and symptoms") %>

+

<%= __("Testing and isolation") %>

- <%= __("Have you been in close contact with someone who was tested positive for COVID-19?") %> + <%= __("Have you been in close contact with someone who was tested positive for COVID-19?") %>

> @@ -229,7 +384,7 @@

- <%= __('Have you been tested for COVID-19?')%> + <%= __('Have you been tested for COVID-19?')%>

> @@ -241,7 +396,7 @@

+
+ <%= __('I am currently:')%> +

+ > + +

+

+ > + +

+

+ > + +

+

+ > + +

+

+ > + +

+
+ +
+ +
+
+ +

<%= __("Symptoms") %>

+
+ +
+ <%= __('Have you experienced any symptoms?')%> +

+ > + + + > + +

+
+ + + +
+
+
+ +

<%= __("Health") %>

+
- <%= __('Have you been diagnosed with any of the following conditions?')%> + <%= __('Have you been diagnosed with any of the following conditions?')%>

<%= __('Diabetes mellitus, Hypertension, Ischemic heart disease, Asthma, Chronic lung disease, Chronic kidney disease') %>

> @@ -361,36 +577,9 @@

-
- <%= __('I am currently:')%> -

- > - -

-

- > - -

-

- > - -

-

- > - -

-

- > - -

-

- > - -

-
- <%= __('Cigarette smoking habits:') %> + <%= __('Cigarette smoking habits:') %>

> @@ -418,8 +607,19 @@ id="body-temperature" value="<%= bodyTemperature %>" > +

+
- +
+
+ +

<%= __("Submit & Share") %>

+

<%= __("How will my data be used?") %>

<%= __('Your health information is stored anonymously, and can not be used to identify you.')%>
@@ -442,15 +642,24 @@

-
    + +
+ +

<%= __(`Contribute and share {{ hostname }} on`, { hostname: baseUrl }) %>

<%- include('partials/share', { amount: formatNumber(aggregated.numberOfReports) }) -%> @@ -515,6 +724,28 @@ altFormat: '<%= __(`F j, Y`) %>', dateFormat: 'Y-m-d' }); + //accepts a collection of html elements and returns true if any of the elements is checked + function isRadioButtonSet(collection) { + var re = false; + for (var i = 0; i < collection.length; i++) { + if (collection[i].checked) { + re = true; + break; + } + }; + return re; + } + + //returns the radio button that is set or false if none are + function radioSet(collection) { + for (var i = 0; i < collection.length; i++) { + if (collection[i].checked) { + return collection[i]; + break; + } + }; + return false; + } + + + + + + <%- include('partials/footer', { home: true }) -%>