labimotion 1.0.10 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95963019e270001284bfb6a75a085785c40c49e71af21d10d9565c38f439a7da
-  data.tar.gz: f51abb8bde5af0eb4908747622b6a6c8e20caf5ad603adc10e0d520fa1c1d339
+  metadata.gz: 7ddd7650762797d557ff280a60b4bb89bea1a3514941e741f4c0cb8c4b87e4ab
+  data.tar.gz: 146b83a224742e7a75f39c606b71259a0a217dbbea679dc6010be8c11cb7d26e
 SHA512:
-  metadata.gz: 87e851bf6615b5161e8193aa5ee13e65c6bcf83a6214a23f3c104aeaa865399d8480b53176f8b8c7b3f4631d254a4c0588d2d667542022db4004905b816754ec
-  data.tar.gz: e0a302cefad4050e905b01dc195f79b0c4262eb9883f0b39d12687f09e86dca957cccd708383f278756115543018f6dda86b75968769e07b8c23c0887ee70810
+  metadata.gz: 91c70dea416babdc050b80793020c614ad4d2ddb07632ffca1186919f9b4e149a98c7f0840b7c2f3c5876d0c75c465f1038fe3392a13a35092d109a92c211b89
+  data.tar.gz: 8e71a05bc1215ce367a80f6e48a2452256b0236d7392cc394229c0bfc18d739d81004e86f5e0a25a8ee3d03c35f30eb32f67715f4437e219f7780d549b79e218

data/lib/labimotion/libs/export_dataset.rb

@@ -99,9 +99,9 @@ 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.attachments.where(aasm_state: 'csv').each_with_index do |att, idx|
         name = File.basename(att.filename, '.csv')
-        sheet = @xfile.workbook.add_worksheet(name: name.slice(0, 25))
+        sheet = @xfile.workbook.add_worksheet(name: "#{name.slice(0, 25)}_#{idx + 1}")
 
         if Labimotion::IS_RAILS5 == true
           File.open(att.store.path) do |fi|

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

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

data/lib/labimotion/version.rb

@@ -3,7 +3,7 @@
 ## Labimotion Version
 module Labimotion
   IS_RAILS5 = false
-  VERSION_ELN = '1.0.10'
+  VERSION_ELN = '1.0.12'
   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.10
+  version: 1.0.12
 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