labimotion 1.0.11 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7059d7bb80a3d629ddacc3ef633f4c2b039120b6a6a6754761a84de37a5aa6a0
-  data.tar.gz: 842ad058f7563befe7d7bf34a909aab07c97d8c406cd0f5b7f601d79f3af0ea2
+  metadata.gz: 6fee76937fb58a56cbe5ccbfa23deaf60ec7270ce18962697232baba381864bc
+  data.tar.gz: 4f9c52e1d367b7e267ffd2e1933e1a0986e714baf53095f06d4c3a740e4d5dff
 SHA512:
-  metadata.gz: 8b03a6c2bc5592268ab5aef1e68a146c23c17e15d0d134a7f965d864dd38538b81051853c6b1d914df84d0f2697e0a8c7623bdbe5d9a548c0ee3a298994a7fba
-  data.tar.gz: f314a546d4b70cc3dc042b9e0977b918f984f2b573e512bc6385fe2611001c2e061b15226e2f7e99153db0bdaf0420b36c8b579246d3c5c7bea4cc9f2c60c59a
+  metadata.gz: '0578eec6bf64edda52b79d66dd635ced6b99c6d73e28cec5f4cd3e14bd8c669c5ef1b75a7464564f73f38492d6565cafa77ee3f0a6aa2e4ee1cd9af7d04dbc85'
+  data.tar.gz: f16f35d5efe1f6b06271c8675903137021d541acdd5e3dca9a58ee7a9cca08c69a73a508a2e972d206bf54e9ccb8b26dedd19032bd8ab35cc3709d4d8d2fe5a0

data/lib/labimotion/libs/export_dataset.rb

@@ -27,7 +27,7 @@ module Labimotion
       name = ds.dataset_klass.label
 
       match = name.match(/\((.*?)\)/)
-      name = match && match.length > 2 ? match[1] : name
+      name = match && match.length > 1 ? match[1] : name
 
       name = '1H NMR' if ds.dataset_klass.ols_term_id == 'CHMO:0000593'
       name = '13C NMR' if ds.dataset_klass.ols_term_id == 'CHMO:0000595'
@@ -99,9 +99,14 @@ module Labimotion
       wb = @xfile.workbook
       gds = Labimotion::Dataset.find_by(element_id: id, element_type: 'Container')
       cds = Container.find(id)
-      cds.attachments.where(aasm_state: 'csv').each do |att|
+      cds_csv = cds.attachments.where(aasm_state: 'csv')
+      csv_length = cds_csv.length
+      return if csv_length.zero?
+      cds_csv.each_with_index do |att, idx|
         name = File.basename(att.filename, '.csv')
-        sheet = @xfile.workbook.add_worksheet(name: name.slice(0, 25))
+        name = name.slice(0, (25 - csv_length.to_s.length - 1))
+        sheet_name = "#{name}_#{idx}"
+        sheet = @xfile.workbook.add_worksheet(name: sheet_name)
 
         if Labimotion::IS_RAILS5 == true
           File.open(att.store.path) do |fi|

data/lib/labimotion/models/concerns/attachment_converter.rb

@@ -22,7 +22,7 @@ module Labimotion
       end
 
       def exec_converter
-        return if self.has_attribute?(:con_state) == false || con_state.present?
+        return if self.has_attribute?(:con_state) == false || !con_state.present?
 
         #return if attachable_id.nil?
         return if Labimotion::IS_RAILS5 == false && self.con_state != Labimotion::ConState::WAIT

data/lib/labimotion/version.rb

@@ -3,7 +3,7 @@
 ## Labimotion Version
 module Labimotion
   IS_RAILS5 = false
-  VERSION_ELN = '1.0.11'
+  VERSION_ELN = '1.0.13'
   VERSION_REPO = '0.3.1'
 
   VERSION = Labimotion::VERSION_REPO if Labimotion::IS_RAILS5 == true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.13
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails