Merge pull request #14 in ~VLE2FE/definma-ui from development to master

* commit 'c072df74e5f23fafb383b45388e1deaf5572c277':
  csv fix
This commit is contained in:
Veit Lukas (PEA4-Fe) 2020-08-10 13:04:36 +02:00
commit 2518c130f2

View File

@ -198,9 +198,6 @@ export class SamplesComponent implements OnInit {
query.push('page-size=' + this.filters.pageSize); query.push('page-size=' + this.filters.pageSize);
} }
query.push('sort=' + this.filters.sort); query.push('sort=' + this.filters.sort);
if (options.csv) {
query.push('output=csv');
}
if (options.export) { if (options.export) {
query.push('key=' + this.d.d.userKey.key); query.push('key=' + this.d.d.userKey.key);
} }
@ -230,7 +227,10 @@ export class SamplesComponent implements OnInit {
}); });
} }
else { else {
if (this.downloadFlatten) { if (options.csv) {
query.push('output=csv');
}
else if (this.downloadFlatten) {
query.push('output=flatten'); query.push('output=flatten');
} }
if (this.downloadSpectra) { if (this.downloadSpectra) {