Commit c2d61982 authored by Xavier Watkins's avatar Xavier Watkins
Browse files

Merge remote-tracking branch 'origin/master' into production

parents 974e61a2 f679bc69
......@@ -22,47 +22,79 @@
</tab>
<tab heading="{{stats.geneProductId.label}}" ng-show="stats.geneProductId.annotation.length > 0">
<div class="row expanded">
<p>
Statistics for the top <strong>{{stats.geneProductId.annotation.length | number:0}}</strong> of
about <strong>{{stats.geneProductId.approximateCount | number:0}}</strong> distinct Gene Products.
</p>
<stats-table title="Annotations per Gene Product ID" items="stats.geneProductId.annotation" is-term="true" mapping="goTermMapping"></stats-table>
</div>
</tab>
<tab heading="{{stats.annotationsForGoId.label}}" ng-show="stats.annotationsForGoId.geneProduct.length > 0">
<div class="row expanded">
<p>
Statistics for the top <strong>{{stats.annotationsForGoId.geneProduct.length | number:0}}</strong> of
about <strong>{{stats.annotationsForGoId.approximateCount | number:0}}</strong> distinct Slim GO ids.
</p>
<stats-table title="Annotations per slim term" items="stats.annotationsForGoId.geneProduct" is-term="true" mapping="goTermMapping"></stats-table>
<!-- <stats-table title="Gene products per Assigned By" items="stats.assignedBy.geneProduct"></stats-table> -->
</div>
</tab>
<tab heading="{{stats.goId.label}}">
<div class="row expanded">
<p>
Statistics for the top <strong>{{stats.goId.annotation.length | number:0}}</strong> of
about <strong>{{stats.goId.approximateCount | number:0}}</strong> distinct GO ids.
</p>
<stats-table title="Annotations per GO ID" items="stats.goId.annotation" is-term="true" mapping="goTermMapping"></stats-table>
<stats-table title="Gene products per GO ID" items="stats.goId.geneProduct" is-term="true" mapping="goTermMapping"></stats-table>
</div>
</tab>
<tab heading="{{stats.aspect.label}}">
<div class="row expanded">
<p>
Statistics for the top <strong>{{stats.aspect.annotation.length | number:0}}</strong> of
about <strong>{{stats.aspect.approximateCount | number:0}}</strong> distinct Aspects.
</p>
<stats-table title="Annotations per Aspect" items="stats.aspect.annotation"></stats-table>
<stats-table title="Gene products per Aspect" items="stats.aspect.geneProduct"></stats-table>
</div>
</tab>
<tab heading="{{stats.evidenceCode.label}}">
<div class="row expanded">
<p>
Statistics for the top <strong>{{stats.evidenceCode.annotation.length | number:0}}</strong> of
about <strong>{{stats.evidenceCode.approximateCount | number:0}}</strong> distinct Evidence Codes.
</p>
<stats-table title="Annotations per Evidence" items="stats.evidenceCode.annotation" is-term="true"></stats-table>
<stats-table title="Gene products per Evidence" items="stats.evidenceCode.geneProduct" is-term="true"></stats-table>
</div>
</tab>
<tab heading="{{stats.reference.label}}">
<div class="row expanded">
<p>
Statistics for the top <strong>{{stats.reference.annotation.length | number:0}}</strong> of
about <strong>{{stats.reference.approximateCount | number:0}}</strong> distinct References.
</p>
<stats-table title="Annotations per Reference" items="stats.reference.annotation"></stats-table>
<stats-table title="Gene products per Reference" items="stats.reference.geneProduct"></stats-table>
</div>
</tab>
<tab heading="{{stats.taxonId.label}}">
<div class="row expanded">
<p>
Statistics for the top <strong>{{stats.taxonId.annotation.length | number:0}}</strong> of
about <strong>{{stats.taxonId.approximateCount | number:0}}</strong> distinct Taxon Ids.
</p>
<stats-table title="Annotations per Taxon" items="stats.taxonId.annotation"></stats-table>
<stats-table title="Gene products per Taxon" items="stats.taxonId.geneProduct"></stats-table>
</div>
</tab>
<tab heading="{{stats.assignedBy.label}}">
<div class="row expanded">
<p>
Statistics for the top <strong>{{stats.assignedBy.annotation.length | number:0}}</strong> of
about <strong>{{stats.assignedBy.approximateCount | number:0}}</strong> distinct Assigned by.
</p>
<stats-table title="Annotations per Assigned By" items="stats.assignedBy.annotation"></stats-table>
<stats-table title="Gene products per Assigned By" items="stats.assignedBy.geneProduct"></stats-table>
</div>
......
......@@ -39,6 +39,7 @@ app.controller('StatisticsCtrl', function($scope, $routeParams, searchService, t
if (item.groupName === 'annotation') {
angular.forEach(item.types, function(type) {
$scope.stats[type.type].annotation = type.values;
$scope.stats[type.type].approximateCount = type.approximateCount;
$scope.totalNumberAnnotations = item.totalHits;
});
} else if (item.groupName === 'geneProduct') {
......@@ -49,6 +50,7 @@ app.controller('StatisticsCtrl', function($scope, $routeParams, searchService, t
} else if (item.groupName === 'slimming') {
angular.forEach(item.types, function(type) {
$scope.stats[type.type].geneProduct = type.values;
$scope.stats[type.type].approximateCount = type.approximateCount;
$scope.totalNumberAnnotations = item.totalHits;
});
}
......
......@@ -14,16 +14,16 @@
// ASPECT ICONS
.aspect-biological_process:before, .aspect-Process:before {
.aspect-biological_process:before, .aspect-Process:before, .aspect-Biological:before {
@include action-icon(#FE9FA4, $white, #FE9FA4);
content:'P';
}
.aspect-cellular_component:before, .aspect-Component:before{
.aspect-cellular_component:before, .aspect-Component:before, .aspect-Cellular:before{
@include action-icon(#B2AFFF, $white, #B2AFFF);
content:'C';
}
.aspect-molecular_function:before, .aspect-Function:before{
.aspect-molecular_function:before, .aspect-Function:before, .aspect-Molecular:before{
@include action-icon(#59BB74, $white, #59BB74);
content:'F';
}
......
......@@ -4,7 +4,7 @@
<section class="panel" id="overview">
<section>
<!-- Check if it is obsolete -->
<div class="alert" ng-show="isObsolete">
<div class="callout alert" ng-show="isObsolete">
<element id="warning" class="icon icon-generic" data-icon="l" href="#"></element>
<strong>This term is obsolete.</strong><br/>
{{termModel.comment}}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment