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

Commit

Permalink
Style and consistency changes for variant set workflow
Browse files Browse the repository at this point in the history
Signed-off-by: Don Naegely <naegelyd@gmail.com>
  • Loading branch information
naegelyd committed Jun 12, 2014
1 parent 05eff92 commit f277dcf
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 37 deletions.
13 changes: 6 additions & 7 deletions varify/samples/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -625,20 +625,19 @@ def get(self, request, pk):
instance = self.get_object(request, pk)
data = serialize(instance, **self.template)

for i in range(0, len(data['results'])):
for i in range(len(data['results'])):
data['results'][i]['variant'] = VariantResource.get(
request, data['results'][i]['variant_id'])
data['results'][i].pop('variant_id')

resultId = data['results'][i]['id']
data['results'][i]['num_assessments'] = len(
Assessment.objects.filter(
sample_result__id=resultId,
sample_result__resultset__id=pk))
result_id = data['results'][i]['id']
data['results'][i]['num_assessments'] = Assessment.objects.filter(
sample_result__id=result_id,
sample_result__resultset__id=pk).count()

try:
assessment = Assessment.objects.get(
sample_result__id=resultId,
sample_result__id=result_id,
sample_result__resultset__id=pk,
user=request.user.id)
data['results'][i]['assessment'] = \
Expand Down
2 changes: 1 addition & 1 deletion varify/static/js/min/ui/workflows/variant-set.js

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

1 change: 1 addition & 0 deletions varify/static/js/src/ui/result-details.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ define([
this.ui.expandableRows
.css('height', '' + this.maxExpandableHeight + 'px')
.css('overflow', 'hidden');

this.ui.expandCollapseLinks.text(this.showMoreText);
}
});
Expand Down
Loading

0 comments on commit f277dcf

Please sign in to comment.