Skip to content
This repository has been archived by the owner on Jan 18, 2020. It is now read-only.

Commit

Permalink
Update UI to include "other" category & always require category
Browse files Browse the repository at this point in the history
  • Loading branch information
@naegelyd
naegelyd committed Feb 11, 2014
1 parent 26d8b58 commit 06f9868
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 81 deletions.
28 changes: 16 additions & 12 deletions varify/static/cilantro/js/templates/varify/modals/result.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,30 +61,34 @@ <h4>Pathogenicity</h4>
<div class="span6">
<h4>Category</h4>
<label class="radio">
<input type="radio" value="1" name="category-radio" id="category-definitive" disabled/>
<span class="assessment-category-label muted">Definitive cause of phenotype</span>
<input type="radio" value="1" name="category-radio" id="category-definitive" checked />
<span class="assessment-category-label">Definitive cause of phenotype</span>
</label>
<label class="radio">
<input type="radio" value="2" name="category-radio" id="category-possible" disabled/>
<span class="assessment-category-label muted">Possibly linked to clinical indication</span>
<input type="radio" value="2" name="category-radio" id="category-possible"/>
<span class="assessment-category-label">Possibly linked to clinical indication</span>
</label>
<div>
<div id="incidental-category-radios" class="span6">
<label class="radio">
<input type="radio" value="3" name="category-radio" id="incidental-immediate" disabled/>
<span class="assessment-category-label muted">Immediately medically actionable</span>
<input type="radio" value="3" name="category-radio" id="incidental-immediate"/>
<span class="assessment-category-label">Immediately medically actionable</span>
</label>
<label class="radio">
<input type="radio" value="4" name="category-radio" id="incidental-childhood" disabled/>
<span class="assessment-category-label muted">Childhood onset</span>
<input type="radio" value="4" name="category-radio" id="incidental-childhood"/>
<span class="assessment-category-label">Childhood onset</span>
</label>
<label class="radio">
<input type="radio" value="5" name="category-radio" id="incidental-adult" disabled/>
<span class="assessment-category-label muted">Adult onset</span>
<input type="radio" value="5" name="category-radio" id="incidental-adult"/>
<span class="assessment-category-label">Adult onset</span>
</label>
<label class="radio">
<input type="radio" value="6" name="category-radio" id="incidental-recessive" disabled/>
<span class="assessment-category-label muted">Recessive carrier</span>
<input type="radio" value="6" name="category-radio" id="incidental-recessive"/>
<span class="assessment-category-label">Recessive carrier</span>
</label>
<label class="radio">
<input type="radio" value="7" name="category-radio" id="incidental-other"/>
<span class="assessment-category-label">Other</span>
</label>
</div>
<div class="span6" id="incidental-findings-label">
Expand Down
2 changes: 1 addition & 1 deletion varify/static/scripts/coffeescript/models/assessment.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ define [
defaults:
'evidence_details': ''
'sanger_requested': 'undefined'
'assessment_category': 'undefined'
'assessment_category': 1
'father_result': 'undefined'
'mother_result': 'undefined'
'pathogenicity': 1
Expand Down
20 changes: 4 additions & 16 deletions varify/static/scripts/coffeescript/ui/modals/result.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@ define [
@errorContainer = $('#error-container')
@errorMsg = $('#error-message')

$('input[name=pathogenicity-radio]').on 'change', @pathogenicityRadioChanged
$('.alert-error > .close').on 'click', @closeFormErrorsClicked

@formContainer.hide()
Expand Down Expand Up @@ -402,17 +401,6 @@ define [
closeFormErrorsClicked: (event) ->
$(event.target).parent().hide()

# Enable/disable category radios if the pathogenicity changed
pathogenicityRadioChanged: (event) =>
if $(event.target).hasClass('requires-category')
$('input:radio[name=category-radio]').removeAttr('disabled')
$('.assessment-category-label').removeClass('muted')
this.setRadioChecked('category-radio', @model.get('assessment_category'))
else
$('input:radio[name=category-radio]:checked').attr('checked', false)
$('input:radio[name=category-radio]').attr('disabled', true)
$('.assessment-category-label').addClass('muted')

isValid: ->
# Rather than checking which field changed, just update all fields
@model.set({
Expand All @@ -429,10 +417,10 @@ define [
@errorContainer.hide()
@errorMsg.html('')

if (@model.get('pathogenicity') >= 2 && @model.get('pathogenicity') <= 4)
if !(@model.get('assessment_category')?)
valid = false
@errorMsg.append('<h5>Please select a category.</h5>')
if _.isEmpty(@model.get('pathogenicity'))
@errorMsg.append('<h5>Please select a pathogenicity.</h5>')
if _.isEmpty(@model.get('assessment_category'))
@errorMsg.append('<h5>Please select a category.</h5>')
if _.isEmpty(@model.get('mother_result'))
valid = false
@errorMsg.append('<h5>Please select a result from the &quot;Mother&quot; dropdown.</h5>')
Expand Down
12 changes: 5 additions & 7 deletions varify/static/scripts/javascript/src/models/assessment.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 28 additions & 45 deletions varify/static/scripts/javascript/src/ui/modals/result.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 06f9868

Please sign in to comment.