scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-02 21:51:51 +08:00
Code Issues Projects Releases Packages Wiki Activity

Added links for creating new sample type and group when creating new sample. [fixes SCI-701]

Browse source
This commit is contained in:
Matej Zrimšek 2016-12-08 15:02:49 +01:00
parent e83bce22a3
commit aea679ec11
3 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/assets/javascripts/samples/sample_datatable.js
View file

@ -664,7 +664,7 @@ function onClickAddSample() {
else if ($(th).attr("id") == "sample-type") {
var colIndex = getColumnIndex("#sample-type")
if (colIndex) {
var selectType = createSampleTypeSelect(data["sample_types"], -1);
var selectType = createSampleTypeSelect(data["sample_types"]);
var td = createTdElement("");
td.appendChild(selectType[0]);
tr.appendChild(td);
@ -673,7 +673,7 @@ function onClickAddSample() {
else if ($(th).attr("id") == "sample-group") {
var colIndex = getColumnIndex("#sample-group")
if (colIndex) {
var selectGroup = createSampleGroupSelect(data["sample_groups"], -1);
var selectGroup = createSampleGroupSelect(data["sample_groups"]);
var td = createTdElement("");
td.appendChild(selectGroup[0]);
tr.appendChild(td);
@ -740,9 +740,15 @@ function createTdElement(content) {
* @param selected Selected sample type id
*/
function createSampleTypeSelect(data, selected) {
selected = _.isUndefined(selected) ? 1 : selected + 1;
var $selectType = $('<select></select>')
.attr('name', 'sample_type_id').addClass('show-tick');
var $option = $("<option href='/organizations/1/sample_types'></option>")
.attr('value', -2)
.text(I18n.t('samples.table.add_sample_type'));
$selectType.append($option);
var $option = $('<option></option>')
.attr('value', -1).text(I18n.t('samples.table.no_type'))
$selectType.append($option);
@ -752,7 +758,7 @@ function createSampleTypeSelect(data, selected) {
.attr('value', val.id).text(val.name);
$selectType.append($option);
});
$selectType.val(selected);
$selectType.makeDropdownOptionsLinks(selected);
return $selectType;
}
@ -762,9 +768,14 @@ function createSampleTypeSelect(data, selected) {
* @param selected Selected sample group id
*/
function createSampleGroupSelect(data, selected) {
selected = _.isUndefined(selected) ? 1 : selected + 1;
var $selectGroup = $('<select></select>')
.attr('name', 'sample_group_id').addClass('show-tick');
var $option = $("<option href='/organizations/1/sample_groups'></option>")
.text(I18n.t('samples.table.add_sample_group'));
$selectGroup.append($option);
var $span = $("<span></span>").addClass('glyphicon glyphicon-asterisk');
var $option = $('<option></option>')
.attr('value', -1).text(I18n.t('samples.table.no_group'))
@ -780,7 +791,7 @@ function createSampleGroupSelect(data, selected) {
$selectGroup.append($option);
});
$selectGroup.val(selected);
$selectGroup.makeDropdownOptionsLinks(selected);
return $selectGroup;
}

21
app/assets/javascripts/sitewide/utils.js
View file

@ -215,3 +215,24 @@ function initPageTutorialSteps(pageFirstStepN, pageLastStepN, nextPagePath,
});
}
}
/**
* Add redirection links on dropdown elements.
* @param {[type]} selectedIdx Index of element to be selected.
* @return {Object} This
*/
$.fn.makeDropdownOptionsLinks = function(selectedIdx) {
selectedIdx = _.isUndefined(selectedIdx) ? 1 : selectedIdx;
$(this).change(function() {
location = $(this).find('option:selected').attr('href');
});
$(this).find('option')
.each(function(i) {
if (!$(this).is("[href]")) {
$(this).attr('href', '#');
}
})
.eq(selectedIdx).attr('selected', true);
return this;
}

2
config/locales/en.yml
View file

@ -847,6 +847,8 @@ en:
added_by: "Added by"
no_group: "No sample group"
no_type: "No sample type"
add_sample_type: "Add new sample type"
add_sample_group: "Add new sample group"
new:
head_title: "%{organization} | Add new sample"
title: "Add new sample to team %{organization}"