labimotion 1.2.0.0 → 1.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7724683d3271fa68ecdf774518cc4d10a4d51ee1431c957e0538c5a00e4f689d
-  data.tar.gz: b9cc8b469761e732707c0b272c2e814a8215c3c22a7d7ca077d7f5ddca9ed877
+  metadata.gz: 85459b416735dd8702c2764bd1ff996855ddfaf37c8b037737c7cf5dbb9403a4
+  data.tar.gz: 8e659ab1b570a0d91dfd0e047720ddde4872eb8a3320c65500bd6b00e8be6e9f
 SHA512:
-  metadata.gz: dd7aaa2347333c05e09eb5e9d0628a8079e2fd4819e46b37e7a45fc40577fae12d2f731a5f1eddd601065c35aa333f312f724bd46b59d93f35f3639f8e34d53b
-  data.tar.gz: f222c51a55a96c1d87c1d79a1fb965b8fb6315a2b182a6767b01222eeae665de248f7bdfdc6ca3789e1f2623faf7a1b69b03bcbc1527f51f6b9c03ba99183d56
+  metadata.gz: de6f3f92718a41d4d2a7bb4b7b3547c5a4996ea2e008beb3936e36d5606cabc5d1f6e73bf8525c9f0d306ff9af92d59eb08fce8d9e1fd6f0efcdd233f2bced33
+  data.tar.gz: bad917552004d85e0ad14091f32f599b7edda626561b099917a65c5bf2b2e6a7b2611e37782127a1b5a81bf1ed463435d3d4f1d4782d694dc4b19f2ee5e2ba0a

data/lib/labimotion/utils/import_utils.rb

@@ -36,7 +36,7 @@ module Labimotion
         value
       end
 
-      def proc_assign_sample(value, sample)
+      def proc_assign_sample(value, sample, element)
         return {} if sample.nil?
 
         value = {} if value.nil? || value.is_a?(String)
@@ -45,13 +45,16 @@ module Labimotion
         value['el_tip'] = sample.short_label
         value['el_label'] = sample.short_label
         value['el_svg'] = sample.get_svg_path
+        if element&.class&.name == Labimotion::Prop::L_ELEMENT && sample&.class&.name == Labimotion::Prop::SAMPLE
+          Labimotion::ElementsSample.find_or_create_by(element_id: element.id, sample_id: sample.id)
+        end
         value
       rescue StandardError => e
         Labimotion.log_exception(e)
         value
       end
 
-      def proc_assign_element(value, element)
+      def proc_assign_element(value, element, _parent = nil)
         return {} if element.nil?
 
         value = {} if value.nil? || value.is_a?(String)
@@ -59,6 +62,9 @@ module Labimotion
         value['el_type'] = 'element' if value['el_type'].nil?
         value['el_tip'] = element.short_label
         value['el_label'] = element.short_label
+        if _parent&.class&.name == Labimotion::Prop::L_ELEMENT && element&.class&.name == Labimotion::Prop::L_ELEMENT
+          Labimotion::ElementsElement.find_or_create_by(parent_id: _parent.id, element_id: element.id)
+        end
         value
       rescue StandardError => e
         Labimotion.log_exception(e)
@@ -92,20 +98,20 @@ module Labimotion
         properties
       end
 
-      def proc_table_sample(properties, data, instances, svalue, key, tidx, vdx, col_id)
+      def proc_table_sample(properties, data, instances, svalue, key, tidx, vdx, col_id, element)
         return properties unless id = svalue.fetch('el_id', nil)
 
         # orig_s = data.fetch(Labimotion::Prop::SAMPLE, nil)&.fetch(svalue['el_id'], nil)
         sample = instances.fetch(Labimotion::Prop::SAMPLE, nil)&.fetch(id, nil)
         val = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][tidx]['sub_values'][vdx][col_id]['value']
-        properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][tidx]['sub_values'][vdx][col_id]['value'] = proc_assign_sample(val, sample)
+        properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][tidx]['sub_values'][vdx][col_id]['value'] = proc_assign_sample(val, sample, element)
         properties
       rescue StandardError => e
         Labimotion.log_exception(e)
         properties
       end
 
-      def proc_table_prop(layer, key, data, instance, properties, field, tidx, type)
+      def proc_table_prop(layer, key, data, instance, properties, field, tidx, type, element)
         fields = field[Labimotion::Prop::SUBFIELDS].select { |ss| ss['type'] == type }
         return properties if fields.nil?
 
@@ -125,7 +131,7 @@ module Labimotion
             when Labimotion::FieldType::DRAG_MOLECULE
               properties = proc_table_molecule(properties, data, svalue, key, tidx, vdx, col_id)
             when Labimotion::FieldType::DRAG_SAMPLE
-              properties = proc_table_sample(properties, data, instance, svalue, key, tidx, vdx, col_id)
+              properties = proc_table_sample(properties, data, instance, svalue, key, tidx, vdx, col_id, element)
             end
           end
         end
@@ -136,14 +142,14 @@ module Labimotion
       end
     end
 
-    def self.proc_sample(layer, key, data, instances, properties)
+    def self.proc_sample(layer, key, data, instances, properties, element)
       fields = layer[Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_SAMPLE }
       fields.each do |field|
         idx = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
         id = field["value"] && field["value"]["el_id"] unless idx.nil?
         sample = instances.fetch(Labimotion::Prop::SAMPLE, nil)&.fetch(id, nil)
         val = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']
-        val = proc_assign_sample(val, sample)
+        val = proc_assign_sample(val, sample, element)
         properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value'] = val
       end
       properties
@@ -152,7 +158,7 @@ module Labimotion
       raise
     end
 
-    def self.proc_element(layer, key, data, instances, properties, elements)
+    def self.proc_element(layer, key, data, instances, properties, elements, element)
       fields = layer[Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_ELEMENT }
       fields.each do |field|
         idx = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
@@ -162,7 +168,7 @@ module Labimotion
           properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value'] = {}
         else
           val = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']
-          val = proc_assign_element(val, att_el)
+          val = proc_assign_element(val, att_el, element)
           properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value'] = val
         end
       end
@@ -225,14 +231,14 @@ module Labimotion
     end
 
 
-    def self.proc_table(layer, key, data, instance, properties)
+    def self.proc_table(layer, key, data, instance, properties, element)
       fields = layer[Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::TABLE }
       fields&.each do |field|
         tidx = layer[Labimotion::Prop::FIELDS].index(field)
         next unless field['sub_values'].present? && field[Labimotion::Prop::SUBFIELDS].present?
 
-        proc_table_prop(layer, key, data, instance, properties, field, tidx, Labimotion::FieldType::DRAG_MOLECULE)
-        proc_table_prop(layer, key, data, instance, properties, field, tidx, Labimotion::FieldType::DRAG_SAMPLE)
+        proc_table_prop(layer, key, data, instance, properties, field, tidx, Labimotion::FieldType::DRAG_MOLECULE, element)
+        proc_table_prop(layer, key, data, instance, properties, field, tidx, Labimotion::FieldType::DRAG_SAMPLE, element)
       end
       properties
     rescue StandardError => e
@@ -246,9 +252,9 @@ module Labimotion
         layer = properties[Labimotion::Prop::LAYERS][key]
         properties = proc_molecule(layer, key, data, properties)
         properties = proc_upload(layer, key, data, instances, attachments, elmenet)
-        properties = proc_sample(layer, key, data, instances, properties)
-        properties = proc_element(layer, key, data, instances, properties, elements) # unless elements.nil?
-        properties = proc_table(layer, key, data, instances, properties)
+        properties = proc_sample(layer, key, data, instances, properties, elmenet)
+        properties = proc_element(layer, key, data, instances, properties, elements, elmenet) # unless elements.nil?
+        properties = proc_table(layer, key, data, instances, properties, elmenet)
       end
       properties
     rescue StandardError => e

data/lib/labimotion/version.rb

@@ -3,5 +3,5 @@
 ## Labimotion Version
 module Labimotion
   IS_RAILS5 = false
-  VERSION = '1.2.0.0'
+  VERSION = '1.2.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.2.0.0
+  version: 1.2.0.1
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-15 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails