labimotion 1.0.12 → 1.0.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/labimotion/libs/export_dataset.rb +8 -3
- data/lib/labimotion/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6fee76937fb58a56cbe5ccbfa23deaf60ec7270ce18962697232baba381864bc
|
4
|
+
data.tar.gz: 4f9c52e1d367b7e267ffd2e1933e1a0986e714baf53095f06d4c3a740e4d5dff
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: '0578eec6bf64edda52b79d66dd635ced6b99c6d73e28cec5f4cd3e14bd8c669c5ef1b75a7464564f73f38492d6565cafa77ee3f0a6aa2e4ee1cd9af7d04dbc85'
|
7
|
+
data.tar.gz: f16f35d5efe1f6b06271c8675903137021d541acdd5e3dca9a58ee7a9cca08c69a73a508a2e972d206bf54e9ccb8b26dedd19032bd8ab35cc3709d4d8d2fe5a0
|
@@ -27,7 +27,7 @@ module Labimotion
|
|
27
27
|
name = ds.dataset_klass.label
|
28
28
|
|
29
29
|
match = name.match(/\((.*?)\)/)
|
30
|
-
name = match && match.length >
|
30
|
+
name = match && match.length > 1 ? match[1] : name
|
31
31
|
|
32
32
|
name = '1H NMR' if ds.dataset_klass.ols_term_id == 'CHMO:0000593'
|
33
33
|
name = '13C NMR' if ds.dataset_klass.ols_term_id == 'CHMO:0000595'
|
@@ -99,9 +99,14 @@ module Labimotion
|
|
99
99
|
wb = @xfile.workbook
|
100
100
|
gds = Labimotion::Dataset.find_by(element_id: id, element_type: 'Container')
|
101
101
|
cds = Container.find(id)
|
102
|
-
cds.attachments.where(aasm_state: 'csv')
|
102
|
+
cds_csv = cds.attachments.where(aasm_state: 'csv')
|
103
|
+
csv_length = cds_csv.length
|
104
|
+
return if csv_length.zero?
|
105
|
+
cds_csv.each_with_index do |att, idx|
|
103
106
|
name = File.basename(att.filename, '.csv')
|
104
|
-
|
107
|
+
name = name.slice(0, (25 - csv_length.to_s.length - 1))
|
108
|
+
sheet_name = "#{name}_#{idx}"
|
109
|
+
sheet = @xfile.workbook.add_worksheet(name: sheet_name)
|
105
110
|
|
106
111
|
if Labimotion::IS_RAILS5 == true
|
107
112
|
File.open(att.store.path) do |fi|
|
data/lib/labimotion/version.rb
CHANGED