Skip to content

Commit

Permalink
Merge 8c365e1 into 15300b6
Browse files Browse the repository at this point in the history
  • Loading branch information
@dhakim87
dhakim87 committed Jun 12, 2020
2 parents 15300b6 + 8c365e1 commit 3b0beb4
Show file tree
Hide file tree
Showing 10 changed files with 167 additions and 162 deletions.
219 changes: 109 additions & 110 deletions microsetta_private_api/templates/account_details.jinja2
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{% extends "sitebase.jinja2" %}
{% set page_title = "Account Details" %}
{% set show_breadcrumbs = True %}
{% set show_logout = True %}
{% block head %}
<script src="/static/vendor/js/jquery-3.4.1.min.js"></script>
<script src="/static/vendor/js/jquery.validate.min.js"></script>
Expand Down Expand Up @@ -46,117 +47,115 @@
<li class="breadcrumb-item active" aria-current="page">Account Details</li>
{% endblock %}
{% block content %}
<div class="container">
<div class="card">
<h5 class="card-header">Account Details</h5>
<div class="card-body">
<form id="acct_form" name="acct_form" method="post">
<div class="form-group">
<label for="email" name="email_label">Email/Correo electrónico</label>
<input id="email" name="email" class="form-control" type="hidden" value="{{account.email |e}}"/>
<input id="view_email" name="view_email" class="form-control" type="email" value="{{account.email |e}}" disabled="disabled" readonly/>
</div>
<div class="form-group">
<label for="first_name" name="first_name_label">First Name/Nombre</label>
<input id="first_name" name="first_name" class="form-control" value="{{account.first_name |e}}" type="text" />
</div>
<div class="form-group">
<label for="last_name" name="last_name_label">Last Name/Nombre de Familia</label>
<input id="last_name" name="last_name" class="form-control" value="{{account.last_name |e}}" type="text" />
</div>
<div class="form-group">
<label for="street" name="street_label" >Street Address/Dirección</label>
<input id="street" name="street" class="form-control" value="{{account.address.street |e}}" type="text" />
</div>
<div class="form-group">
<label for="city" name="city_label">City/Ciudad</label>
<input id="city" name="city" class="form-control" value="{{account.address.city |e}}" type="text" />
</div>
<div class="form-group">
<p>
<strong>Note to non-US users:</strong> We are working on support for additional countries and
expect to have that available soon.
</p>
<label for="state" name="state_label">State/Estado</label>
<div class="card">
<h5 class="card-header">Account Details</h5>
<div class="card-body">
<form id="acct_form" name="acct_form" method="post">
<div class="form-group">
<label for="email" name="email_label">Email/Correo electrónico</label>
<input id="email" name="email" class="form-control" type="hidden" value="{{account.email |e}}"/>
<input id="view_email" name="view_email" class="form-control" type="email" value="{{account.email |e}}" disabled="disabled" readonly/>
</div>
<div class="form-group">
<label for="first_name" name="first_name_label">First Name/Nombre</label>
<input id="first_name" name="first_name" class="form-control" value="{{account.first_name |e}}" type="text" />
</div>
<div class="form-group">
<label for="last_name" name="last_name_label">Last Name/Nombre de Familia</label>
<input id="last_name" name="last_name" class="form-control" value="{{account.last_name |e}}" type="text" />
</div>
<div class="form-group">
<label for="street" name="street_label" >Street Address/Dirección</label>
<input id="street" name="street" class="form-control" value="{{account.address.street |e}}" type="text" />
</div>
<div class="form-group">
<label for="city" name="city_label">City/Ciudad</label>
<input id="city" name="city" class="form-control" value="{{account.address.city |e}}" type="text" />
</div>
<div class="form-group">
<p>
<strong>Note to non-US users:</strong> We are working on support for additional countries and
expect to have that available soon.
</p>
<label for="state" name="state_label">State/Estado</label>

{% set US_STATES = [
("CA", "California"),
("AL", "Alabama"),
("AK", "Alaska"),
("AZ", "Arizona"),
("AR", "Arkansas"),
("CO", "Colorado"),
("CT", "Connecticut"),
("DE", "Delaware"),
("DC", "District Of Columbia"),
("FL", "Florida"),
("GA", "Georgia"),
("HI", "Hawaii"),
("ID", "Idaho"),
("IL", "Illinois"),
("IN", "Indiana"),
("IA", "Iowa"),
("KS", "Kansas"),
("KY", "Kentucky"),
("LA", "Louisiana"),
("ME", "Maine"),
("MD", "Maryland"),
("MA", "Massachusetts"),
("MI", "Michigan"),
("MN", "Minnesota"),
("MS", "Mississippi"),
("MO", "Missouri"),
("MT", "Montana"),
("NE", "Nebraska"),
("NV", "Nevada"),
("NH", "New Hampshire"),
("NJ", "New Jersey"),
("NM", "New Mexico"),
("NY", "New York"),
("NC", "North Carolina"),
("ND", "North Dakota"),
("OH", "Ohio"),
("OK", "Oklahoma"),
("OR", "Oregon"),
("PA", "Pennsylvania"),
("RI", "Rhode Island"),
("SC", "South Carolina"),
("SD", "South Dakota"),
("TN", "Tennessee"),
("TX", "Texas"),
("UT", "Utah"),
("VT", "Vermont"),
("VA", "Virginia"),
("WA", "Washington"),
("WV", "West Virginia"),
("WI", "Wisconsin"),
("WY", "Wyoming")
] %}
{% set US_STATES = [
("CA", "California"),
("AL", "Alabama"),
("AK", "Alaska"),
("AZ", "Arizona"),
("AR", "Arkansas"),
("CO", "Colorado"),
("CT", "Connecticut"),
("DE", "Delaware"),
("DC", "District Of Columbia"),
("FL", "Florida"),
("GA", "Georgia"),
("HI", "Hawaii"),
("ID", "Idaho"),
("IL", "Illinois"),
("IN", "Indiana"),
("IA", "Iowa"),
("KS", "Kansas"),
("KY", "Kentucky"),
("LA", "Louisiana"),
("ME", "Maine"),
("MD", "Maryland"),
("MA", "Massachusetts"),
("MI", "Michigan"),
("MN", "Minnesota"),
("MS", "Mississippi"),
("MO", "Missouri"),
("MT", "Montana"),
("NE", "Nebraska"),
("NV", "Nevada"),
("NH", "New Hampshire"),
("NJ", "New Jersey"),
("NM", "New Mexico"),
("NY", "New York"),
("NC", "North Carolina"),
("ND", "North Dakota"),
("OH", "Ohio"),
("OK", "Oklahoma"),
("OR", "Oregon"),
("PA", "Pennsylvania"),
("RI", "Rhode Island"),
("SC", "South Carolina"),
("SD", "South Dakota"),
("TN", "Tennessee"),
("TX", "Texas"),
("UT", "Utah"),
("VT", "Vermont"),
("VA", "Virginia"),
("WA", "Washington"),
("WV", "West Virginia"),
("WI", "Wisconsin"),
("WY", "Wyoming")
] %}

<select id="state" name="state" class="form-control">
{% for code, full_name in US_STATES %}
<option value="{{code}}" {% if account.address.state == code %}selected {% endif %}>{{full_name}}</option>
{% endfor %}
</select>
</div>
<div class="form-group">
<label for="post_code" name="post_code_label">Zip Code/Código Postal</label>
<input id="post_code" name="post_code" class="form-control" value="{{account.address.post_code |e}}" type="text" />
</div>
{% if CREATE_ACCT %}
<div class="form-group">
<label for="kit_name" name="kit_name_label">Kit ID/ID del kit</label>
<input id="kit_name" name="kit_name" class="form-control" type="text"/>
</div>
{% endif %}
<input id="country_code" name="country_code" type="hidden" value="{{account.address.country_code |e}}"/>
{% if CREATE_ACCT %}
<button type="submit" class="btn btn-primary">Create Account</button>
{% else %}
<button type="submit" class="btn btn-primary">Save</button>
{% endif %}
</form>
<select id="state" name="state" class="form-control">
{% for code, full_name in US_STATES %}
<option value="{{code}}" {% if account.address.state == code %}selected {% endif %}>{{full_name}}</option>
{% endfor %}
</select>
</div>
<div class="form-group">
<label for="post_code" name="post_code_label">Zip Code/Código Postal</label>
<input id="post_code" name="post_code" class="form-control" value="{{account.address.post_code |e}}" type="text" />
</div>
{% if CREATE_ACCT %}
<div class="form-group">
<label for="kit_name" name="kit_name_label">Kit ID/ID del kit</label>
<input id="kit_name" name="kit_name" class="form-control" type="text"/>
</div>
</div>
</div>
{% endif %}
<input id="country_code" name="country_code" type="hidden" value="{{account.address.country_code |e}}"/>
{% if CREATE_ACCT %}
<button type="submit" class="btn btn-primary">Create Account</button>
{% else %}
<button type="submit" class="btn btn-primary">Save</button>
{% endif %}
</form>
</div>
</div>
{% endblock %}
78 changes: 39 additions & 39 deletions microsetta_private_api/templates/account_overview.jinja2
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{% extends "sitebase.jinja2" %}
{% set page_title = "Account" %}
{% set show_breadcrumbs = True %}
{% set show_logout = True %}
{% block head %}
<script src="/static/vendor/js/jquery-3.4.1.min.js"></script>
<script src="/static/vendor/js/jquery.validate.min.js"></script>
Expand All @@ -26,58 +27,57 @@
<li class="breadcrumb-item active" aria-current="page">Account</li>
{% endblock %}
{% block content %}
<h4>Account Details</h4>
<div class="container">
<h4>Account Details</h4>
<div class="container">
<div class="card" style="width: 18rem;">
<div class="card-body">
<h5 class="card-title">{{account.first_name |e}} {{account.last_name |e}}</h5>
<h6 class="card-subtitle mb-2 text-muted">{{account.email |e}}</h6>
<a href="/accounts/{{account.account_id}}/details" class="card-link">View Account Details</a>
</div>
</div>
<div class="card" style="width: 18rem;">
<div class="card-body">
<h5 class="card-title">{{account.first_name |e}} {{account.last_name |e}}</h5>
<h6 class="card-subtitle mb-2 text-muted">{{account.email |e}}</h6>
<a href="/accounts/{{account.account_id}}/details" class="card-link">View Account Details</a>
</div>
</div>
<hr style="border-top: dotted 1px;" />
<h4>Sources</h4>
<div class="container">
{% if sources|length > 0 %}
Choose a source to assign samples to by clicking on a name, listed in blue below:
<div class="list-group">
<br>
<div class="row">
<div class="col-sm">
<i>Name</i>
</div>
<div class="col-sm">
<i>Source type</i>
</div>
</div>
<hr style="border-top: dotted 1px;" />
<h4>Sources</h4>
<div class="container">
{% if sources|length > 0 %}
Choose a source to assign samples to by clicking on a name, listed in blue below:
<div class="list-group">
<br>
<div class="row">
<div class="col-sm">
<i>Name</i>
</div>
{% for source in sources %}
<div class="container list-group-item {{loop.cycle('odd', 'even') }}">
<div class="row">
<div class="col-sm">
<div class="col-sm">
<i>Source type</i>
</div>
</div>
{% for source in sources %}
<div class="container list-group-item {{loop.cycle('odd', 'even') }}">
<div class="row">
<div class="col-sm">
<a class="btn btn-outline-info" href="/accounts/{{account.account_id}}/sources/{{ source.source_id|e }}">
{{ source.source_name|e}}
</a>
</div>
<div class="col-sm">
{{source.source_type|e}}
</div>
</div>
{{ source.source_name|e}}
</a>
</div>
{% endfor %}
<div class="col-sm">
{{source.source_type|e}}
</div>
</div>
</div>
{% endfor %}
</div>
{% endif %}
</div>
<br>
<i><u>How do I choose a Sample Source?</u></i>
The Microsetta Initiative is researching both host-associated and environmental microbiomes, which means looking at microbes found on and in your body as well as those found in the world around you. At the moment, we have two categories of sample sources to choose from: Human and Environmental.
<i><u>How do I choose a Sample Source?</u></i>
The Microsetta Initiative is researching both host-associated and environmental microbiomes, which means looking at microbes found on and in your body as well as those found in the world around you. At the moment, we have two categories of sample sources to choose from: Human and Environmental.
<br />
Some projects and participants that use The Microsetta Initiative are interested in environmental samples (e.g., soil, household surfaces, etc).
<br/><br/>
<div class="container">
<div class="container">
Add a new source to this account:
<br />
<br />
<a href = "/accounts/{{ account.account_id }}/create_human_source">
<button class="btn btn-primary"> New Human Source</button></a>
<a href = "/accounts/{{ account.account_id }}/create_nonhuman_source">
Expand Down
1 change: 1 addition & 0 deletions microsetta_private_api/templates/faq.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{% set page_title = "Frequently Asked Questions" %}
{% set show_breadcrumbs = False %}
{% set disable_faq = True %}
{% set show_logout = False %}
{% block head %}
<script src="/static/vendor/js/jquery-3.4.1.min.js"></script>
<script>
Expand Down
1 change: 1 addition & 0 deletions microsetta_private_api/templates/new_participant.jinja2
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{% extends "sitebase.jinja2" %}
{% set page_title = "Consent" %}
{% set show_breadcrumbs = True %}
{% set show_logout = True %}
{% block head %}
<script type="text/javascript" src="/static/vendor/js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="/static/vendor/jquery-ui-1.12.1/jquery-ui.min.js"></script>
Expand Down

0 comments on commit 3b0beb4

Please sign in to comment.