Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion api/src/Page/Sample.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class Sample extends Page
'capillaryPhase' => '',
'json' => '',
'dcp' => '\d',
'pipeline' => '\w+',

'collected_during' => '\w+\d+-\d+',

Expand Down Expand Up @@ -1174,7 +1175,11 @@ function _samples()
$join WHERE $where", $args);
$tot = intval($tot[0]['TOT']);


# Get stats only for a specific processing pipeline
if ($this->has_arg('pipeline')) {
$where .= ' AND (app.processingprograms is null OR app.processingpipelineid is null OR app.processingpipelineid=:' . (sizeof($args) + 1) . ')';
array_push($args, $this->arg('pipeline'));
}

$start = 0;
$pp = $this->has_arg('per_page') ? $this->arg('per_page') : 15;
Expand Down
18 changes: 17 additions & 1 deletion client/src/js/modules/shipment/views/containerplate.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ define(['marionette',
'modules/imaging/collections/autoscoreschemas',
'modules/imaging/collections/autoscores',
'collections/users',
'collections/processingpipelines',

'utils/editable',
'views/table',
Expand Down Expand Up @@ -74,7 +75,7 @@ define(['marionette',
AutoScoreSchemas, AutoScores,

Users,

ProcessingPipelines,
Editable, TableView, table, XHRImage, utils,
template, templateimage){

Expand Down Expand Up @@ -259,6 +260,7 @@ define(['marionette',

sampleStatusCurrent: 'input[id=sample_status_current]',
param: 'select[name=param]',
pipeline: 'select[name=pipeline]',
rank: 'input[name=rank]',

sampleStatusAuto: 'input[id=sample_status_auto]',
Expand Down Expand Up @@ -291,6 +293,7 @@ define(['marionette',

'click @ui.rank': 'setRankStatus',
'change @ui.param': 'setParamValue',
'change @ui.pipeline': 'setPipeline',

'click @ui.sampleStatusAuto': 'setSampleStatusShown',
'change @ui.class': 'setAutoStatus',
Expand Down Expand Up @@ -331,6 +334,11 @@ define(['marionette',
this.setRankStatus()
},

setPipeline: function() {
this.samples.queryParams.pipeline = this.ui.pipeline.val()
this.samples.fetch({ data: {'sort_by': 'POSITION' } })
},

setRankStatus: function() {
if (this.ui.rank.is(':checked')) {
this.ui.sampleStatusData.prop('checked', true)
Expand Down Expand Up @@ -629,12 +637,20 @@ define(['marionette',
// Assumption all plates are for vmxi, so login => users only
this.users.queryParams.login = 1

this.processing_pipelines = new ProcessingPipelines()
this.processing_pipelines.queryParams.category = 'processing'
this.processing_pipelines.fetch().done(this.updatePipelines.bind(this))

this.touchstartX = 0;
this.touchstartY = 0;

Backbone.Validation.bind(this)
},

updatePipelines: function() {
this.ui.pipeline.html('<option value="">All pipelines</option>'+this.processing_pipelines.opts())
},

updateSchemas: function() {
if (this.autoscoreschemas.length === 1) {
this.ui.schemaspan.html(this.autoscoreschemas.at(0).get('SCHEMANAME'))
Expand Down
3 changes: 2 additions & 1 deletion client/src/js/templates/shipment/containerplateimage.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ <h1 class="no_mobile">Container: <span class="NAME"><%-NAME%></span></h1>
Data Status
</label>
<label>
Rank By
- Rank By
<input type="checkbox" name="rank" />
</label>:
<select name="param">
<option value="DCRESOLUTION" data-inverted="1" data-check="DC">AP Resolution</option>
<option value="DCCOMPLETENESS" data-check="DC" data-min="0.85">AP Completeness</option>
</select>
<select name="pipeline"></select>
</div>
<div>
<label>
Expand Down