labimotion 1.4.0.rc3 → 1.4.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0e43bc1bdccd36b76e3c357c88b148f6af58a422ac15967b51018ad68cc570c
-  data.tar.gz: bf7e9b0ea4e21736bd9a71cca94b32f02c3d2eed96a1188c07a97be3e11a25f4
+  metadata.gz: f38f255a309e305ddfe715e5382c0087acde8a05c42434a8c87c03640ad38772
+  data.tar.gz: a3ed70fa27d008b51f416fbd4ac9a2ce70e1d3cc117bdfa37e31010a62301b98
 SHA512:
-  metadata.gz: b64d866c7f796c327b3a3f37b7ac5883a1e4ce8e604b0280dc3f47ea300ebbfb82251ea2e42ac2315377d24453f4323de13d10a6a6a85bd6fdf1f57671431d24
-  data.tar.gz: 90d185c4806b9e9f10ace66612bad2eb1e31d268a517890c01dd1304fcb53c1b42ef2433a2960d0da53e5c910c7fd8b526c6d4057845f394f663fd148d9e0e2b
+  metadata.gz: e80ca22f7120c4d3f34b9eecc37baa2b40a83b7d34409b4598129bb939e1c473ed6fa7fe06c7c2396210dc25571238b1bc51733fafb373e8928c076aa8761fe2
+  data.tar.gz: 70ddf10ed69d7eea7ac3769e3a32dd59b38b3eed052ba232e9cdbadacaa2ef6bab9ea204537390c2abe71f06246ac9eeb650b2731b28d92ad8d1bc0d534d4b38

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.rc4'
 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.rc4
 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-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails