labimotion 1.4.0.rc3 → 1.4.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0e43bc1bdccd36b76e3c357c88b148f6af58a422ac15967b51018ad68cc570c
-  data.tar.gz: bf7e9b0ea4e21736bd9a71cca94b32f02c3d2eed96a1188c07a97be3e11a25f4
+  metadata.gz: 587b32cc2f374e118a3570bbe34a69a497ec9e6d2134757d9241ad6c90b416ec
+  data.tar.gz: 4a778699fb7c40c7aa3383cc2cabfb910218a616f122d0b748d092262d2ee370
 SHA512:
-  metadata.gz: b64d866c7f796c327b3a3f37b7ac5883a1e4ce8e604b0280dc3f47ea300ebbfb82251ea2e42ac2315377d24453f4323de13d10a6a6a85bd6fdf1f57671431d24
-  data.tar.gz: 90d185c4806b9e9f10ace66612bad2eb1e31d268a517890c01dd1304fcb53c1b42ef2433a2960d0da53e5c910c7fd8b526c6d4057845f394f663fd148d9e0e2b
+  metadata.gz: 1c20c57d746b3c6d0f771781fb3bf44eda10062f0ca577cb06e6c4aed1bcceb8f8f0be7556d2cb3e310010aa38c9de14ef791309fe829ef1d591b8782ac5c29a
+  data.tar.gz: 760ae347f5842287bdf7d04074d55d38cdac15cf61fa540c87295f049c1547fea20fba669997172db08fcbb2f570abd3bf1b4fdbb5774e41d163645e41512e15

data/lib/labimotion/collection/import.rb

@@ -47,8 +47,12 @@ module Labimotion
       begin
         data.fetch('Labimotion::Dataset', {}).each do |uuid, fields|
           klass_id = fields['dataset_klass_id']
-          dk_obj = data.fetch('Labimotion::DatasetKlass', {})[klass_id]
-          dk_id = dk_obj['identifier']
+          next if data.fetch('Labimotion::DatasetKlass', {}).empty?
+
+          dk_obj = data.fetch('Labimotion::DatasetKlass', {}) && data.fetch('Labimotion::DatasetKlass', {})[klass_id]
+          next if dk_obj.nil?
+
+          dk_id = dk_obj && dk_obj['identifier']
           element_uuid = fields.fetch('element_id')
           element_type = fields.fetch('element_type')
           element = instances.fetch(element_type).fetch(element_uuid)
@@ -78,7 +82,7 @@ module Labimotion
         end
       rescue StandardError => e
         Labimotion.log_exception(e)
-        raise
+        # raise
       end
     end
 

data/lib/labimotion/helpers/generic_helpers.rb

@@ -23,7 +23,7 @@ module Labimotion
     def deactivate_klass(params)
       klz = fetch_klass(params[:klass], params[:id])
       klz&.update!(is_active: params[:is_active])
-      generate_klass_file unless klz.class.name != 'ElementKlass'
+      generate_klass_file unless klz.class.name != 'Labimotion::ElementKlass'
       klz
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
@@ -34,7 +34,7 @@ module Labimotion
       authenticate_admin!(params[:klass].gsub(/(Klass)/, 's').downcase)
       klz = fetch_klass(params[:klass], params[:id])
       klz&.destroy!
-      generate_klass_file unless klz.class.name != 'ElementKlass'
+      generate_klass_file unless klz.class.name != 'Labimotion::ElementKlass'
       status 201
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)

data/lib/labimotion/helpers/segment_helpers.rb

@@ -107,9 +107,9 @@ module Labimotion
       attributes['updated_by'] = current_user.id
       attributes['sync_by'] = current_user.id
       attributes['sync_time'] = DateTime.now
-      attr_klass = response.dig('element_klass', {})        # response['element_klass']
+      attr_klass = response['element_klass']    ## response.dig('element_klass', {})        # response['element_klass']
       validate_klass(attributes, attr_klass)
-      
+
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e

data/lib/labimotion/libs/export_dataset.rb

@@ -97,7 +97,10 @@ module Labimotion
           type = "#{field['type']}-#{field['option_layers']}" if field['type'] == Labimotion::FieldType::SELECT || field['type'] == Labimotion::FieldType::SYSTEM_DEFINED
 
           show_value = field['value'] =~ /\A\d+,\d+\z/ ? field['value']&.gsub(',', '.') : field['value']
-          sheet.add_row([' ', field['label'], nil, field['value_system'], field['field'], type, from_device, field['dkey'], nil].freeze)
+          ols_short_form = (field['ontology'] && field['ontology']['short_form']) || ''
+          ols_label = (field['ontology'] && field['ontology']['label']) || ''
+          ols_iri = (field['ontology'] && field['ontology']['iri']) || ''
+          sheet.add_row([' ', field['label'], nil, field['value_system'], field['field'], type, from_device, field['dkey'], nil, ols_short_form, ols_label, ols_iri].freeze)
 
           case field['type']
           when Labimotion::FieldType::SELECT
@@ -166,7 +169,7 @@ module Labimotion
     end
 
     def header
-      ['Layer Label', 'Field Label', 'Value', 'Unit', 'Name', 'Type', 'Source?', 'Source identifier', 'Source data'].freeze
+      ['Layer Label', 'Field Label', 'Value', 'Unit', 'Name', 'Type', 'Source?', 'Source identifier', 'Source data', 'Ontology', 'Ontology Label', 'iri'].freeze
     end
 
     def read

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '1.4.0.rc3'
+  VERSION = '1.4.0.rc5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc3
+  version: 1.4.0.rc5
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails