labimotion 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6043cc7059f5394e70f75b1a06415fff819c17c210450ec0f335d896166709db
-  data.tar.gz: a20e04caa39ff947b878533a8d13f4019f5722d3a1a309d0066f776b648d3514
+  metadata.gz: 4cb214fd84c4c884358893ea3a5c7af5504bf3c9d366747d95c4c86aa6f2c42e
+  data.tar.gz: 5ec0a7b4e10b6174ba9802648c9f9f15e85c03b491035d375b06ee85e25ce15e
 SHA512:
-  metadata.gz: 28b2d0ee49532e30873049b382275384bae81c8db730397727cadbad8c663b2e03fdd7b50f6c805ca09c99a3dffe1eef1d66378ca5802645ba324046f0cf07e9
-  data.tar.gz: b2130bd66485442b4944c73f2bb61755e6511d33ab6dd27895eab14df06417b6bb1d8feaa7945b77146b3ea2bc51a15748177cf416602750940312cdb9ec5173
+  metadata.gz: 6c2c0a26c8c8ce05d44f976d1146464f72c1dd173529cff04fa9918863c8f074f69299d90d2d9fefafcd5628a5dd28d29ade1b5b9029b4aac88602f05d64db90
+  data.tar.gz: 67bfe5f4e12b5b8412a95fd4124818dfb4da775baa2558e4934c4b8b86d79c43c0c65f51070e4893ef3cf857bfae2e3efd6061bbbd1b5b5759917bfed936568d

data/lib/labimotion/apis/generic_element_api.rb

@@ -318,7 +318,7 @@ module Labimotion
           if Labimotion::IS_RAILS5 == true
             {
               element: ElementPermissionProxy.new(current_user, element, user_ids).serialized,
-              attachments: Entities::AttachmentEntity.represent(element.attachments)
+              attachments: attach_thumbnail(element&.attachments)
             }
           else
             {
@@ -326,7 +326,7 @@ module Labimotion
                 element,
                 detail_levels: ElementDetailLevelCalculator.new(user: current_user, element: element).detail_levels,
               ),
-              attachments: Entities::AttachmentEntity.represent(element.attachments),
+              attachments: attach_thumbnail(element&.attachments)
             }
           end
         rescue StandardError => e
@@ -350,7 +350,7 @@ module Labimotion
           if Labimotion::IS_RAILS5 == true
             {
               element: ElementPermissionProxy.new(current_user, element, user_ids).serialized,
-              attachments: Entities::AttachmentEntity.represent(element.attachments)
+              attachments: attach_thumbnail(element&.attachments)
             }
           else
             present(
@@ -386,7 +386,7 @@ module Labimotion
             if Labimotion::IS_RAILS5 == true
               {
                 element: ElementPermissionProxy.new(current_user, element, user_ids).serialized,
-                attachments: Entities::AttachmentEntity.represent(element.attachments)
+                attachments: attach_thumbnail(element&.attachments)
               }
             else
               {
@@ -394,7 +394,7 @@ module Labimotion
                   element,
                   detail_levels: ElementDetailLevelCalculator.new(user: current_user, element: element).detail_levels,
                 ),
-                attachments: Entities::AttachmentEntity.represent(element.attachments),
+                attachments: attach_thumbnail(element&.attachments),
               }
             end
           rescue StandardError => e

data/lib/labimotion/helpers/element_helpers.rb

@@ -159,7 +159,7 @@ module Labimotion
         att_ary = create_attachments(
           params[:attfiles],
           params[:delfiles],
-          params[:att_type],
+          "Labimotion::#{params[:att_type]}",
           params[:att_id],
           params[:attfilesIdentifier],
           current_user.id
@@ -326,5 +326,14 @@ module Labimotion
       raise e
     end
 
+    def attach_thumbnail(_attachments)
+      attachments = _attachments&.map do |attachment|
+        _att = Entities::AttachmentEntity.represent(attachment, serializable: true)
+        _att[:thumbnail] = attachment.thumb ? Base64.encode64(attachment.read_thumbnail) : nil
+        _att
+      end
+      attachments
+    end
+
   end
 end

data/lib/labimotion/libs/export_dataset.rb

@@ -101,7 +101,7 @@ module Labimotion
       cds = Container.find(id)
       cds.attachments.where(aasm_state: 'csv').each do |att|
         name = File.basename(att.filename, '.csv')
-        sheet = @xfile.workbook.add_worksheet(name: name)
+        sheet = @xfile.workbook.add_worksheet(name: name.slice(0, 25))
 
         if Labimotion::IS_RAILS5 == true
           File.open(att.store.path) do |fi|

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

@@ -23,5 +23,14 @@ module Labimotion
       end
       properties
     end
+
+    def migrate_workflow
+      return if properties_template.nil? || properties_release.nil?
+
+      return if properties_template['flow'].nil? && properties_release['flow'].nil?
+
+      update_column(:properties_template, split_workflow(properties_template)) if properties_template['flow']
+      update_column(:properties_release, split_workflow(properties_release)) if properties_release['flow']
+    end
   end
 end

data/lib/labimotion/models/element.rb

@@ -12,6 +12,7 @@ module Labimotion
     include ElementUIStateScopes
     include Collectable
     ## include AnalysisCodes
+    include ElementCodes
     include Taggable
     include Workflow
     include Segmentable
@@ -58,7 +59,7 @@ module Labimotion
 
 
     def attachments
-      Attachment.where(attachable_id: self.id, attachable_type: 'Element')
+      Attachment.where(attachable_id: self.id, attachable_type: self.class.name)
     end
 
     def self.get_associated_samples(element_ids)

data/lib/labimotion/models/element_klass.rb

@@ -23,13 +23,5 @@ module Labimotion
       )
     end
 
-    def migrate_workflow
-      return if properties_template.nil? || properties_release.nil?
-
-      return if properties_template['flow'].nil? && properties_release['flow'].nil?
-
-      update_column(:properties_template, split_workflow(properties_template)) if properties_template['flow']
-      update_column(:properties_release, split_workflow(properties_release)) if properties_release['flow']
-    end
   end
 end

data/lib/labimotion/models/segment_klass.rb

@@ -6,6 +6,7 @@ module Labimotion
     self.table_name = :segment_klasses
     acts_as_paranoid
     include GenericKlassRevisions
+    include Workflow
     belongs_to :element_klass, class_name: 'Labimotion::ElementKlass'
     has_many :segments, dependent: :destroy, class_name: 'Labimotion::Segment'
     has_many :segment_klasses_revisions, dependent: :destroy, class_name: 'Labimotion::SegmentKlassesRevision'

data/lib/labimotion/utils/export.rb

@@ -22,6 +22,26 @@ module Labimotion
       fetch_many.call(klasses, {'created_by' => 'User'})
     end
 
+    def self.fetch_elements(collection, segments, attachments, fetch_many, fetch_one, fetch_containers)
+      fetch_many.call(collection.elements, {
+        'element_klass_id' => 'Labimotion::ElementKlass',
+        'created_by' => 'User',
+      })
+      fetch_many.call(collection.collections_elements, {
+              'collection_id' => 'Collection',
+              'element_id' => 'Labimotion::Element',
+      })
+      collection.elements.each do |element|
+
+        element, attachments = Labimotion::Export.fetch_properties(element, attachments, &fetch_one)
+        fetch_containers.call(element)
+        segment, @attachments = Labimotion::Export.fetch_segments(element, attachments, &fetch_one)
+        segments += segment if segment.present?
+      end
+
+      [segments, attachments]
+
+    end
 
     def self.fetch_segments(element, attachments, &fetch_one)
       element_type = element.class.name

data/lib/labimotion/version.rb

@@ -3,5 +3,5 @@
 module Labimotion
   IS_RAILS5 = false
   VERSION = '0.1.14' if Labimotion::IS_RAILS5 == true
-  VERSION = '1.0.5' if Labimotion::IS_RAILS5 == false
+  VERSION = '1.0.6' if Labimotion::IS_RAILS5 == false
 end

metadata

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