chore: prep v1.10.4

- upd CHANGELOG
- upd model annotation
- upd db/schema

CHANGELOG.md

@@ -1,6 +1,30 @@
 # Chemotion_ELN Changelog
 ## Latest
 
+## [v1.10.4]
+> (2024-12-09)
+
+* Bug fixes
+
+  * skip uploading new but discarded attachments  ([#2251](https://github.com/ComPlat/chemotion_ELN/pull/2251))
+  * reaction report generation for gas products when the vessel size is not given  ([#2254](https://github.com/ComPlat/chemotion_ELN/pull/2254))
+  * selecting all pages with advanced/detail search corrected  ([#2215](#2215))
+  * allow multiple delayed_job named-queue pools in the worker container  ([#2258](https://github.com/ComPlat/chemotion_ELN/pull/2258))
+  * ELN upgrade: correct matrice sequence  ([#2257](https://github.com/ComPlat/chemotion_ELN/pull/2257))
+
+  ChemSpectra and NMRIUM
+  * bump service chem-spectra-app to v.1.2.4  ([#2253](https://github.com/ComPlat/chemotion_ELN/pull/2253))
+
+* Code refactoring
+  * datacollector  ([#2240](https://github.com/ComPlat/chemotion_ELN/pull/2240))
+
+* Chores
+  * Bump actionmailer from 6.1.7.8 to 6.1.7.9  ([#2221](https://github.com/ComPlat/chemotion_ELN/pull/2221))
+  * Bump actionpack from 6.1.7.8 to 6.1.7.9  ([#2220](https://github.com/ComPlat/chemotion_ELN/pull/2220))
+  * Bump actiontext from 6.1.7.8 to 6.1.7.9  ([#2219](https://github.com/ComPlat/chemotion_ELN/pull/2219))
+  * Bump rexml from 3.3.6 to 3.3.9  ([#2231](https://github.com/ComPlat/chemotion_ELN/pull/2231))
+  * Bump labimotion from 1.4.0.2 to 1.4.1  ([#2228](https://github.com/ComPlat/chemotion_ELN/pull/2228))
+
 ## [v1.10.3]
 > (2024-10-02)
 
@@ -1194,3 +1218,4 @@ ton to element view
 
 * Features
   * ELN for (organic) chemistry
+

Gemfile.lock

@@ -841,7 +841,7 @@ GEM
       rails (>= 3.0)
       rake (>= 0.8.7)
     yard (0.9.36)
-    zeitwerk (2.7.0)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   x86_64-linux

VERSION

@@ -1,3 +1,3 @@
-version: v1.10.3
-base_revision: dfb34c7ce47fa1c0e62a7bc5772752705b8c6816
-current_revision: dfb34c7ce47fa1c0e62a7bc5772752705b8c6816
+version: v1.10.4
+base_revision: 37ff39cd0063cf81cdc0d707083ac9ff47d8ff9d
+current_revision: 37ff39cd0063cf81cdc0d707083ac9ff47d8ff9d

app/models/admin.rb

@@ -37,6 +37,7 @@
 #  account_active         :boolean
 #  matrix                 :integer          default(0)
 #  providers              :jsonb
+#  inventory_labels       :jsonb
 #
 # Indexes
 #

app/models/attachment.rb

@@ -24,6 +24,7 @@
 #  aasm_state      :string
 #  filesize        :bigint
 #  attachment_data :jsonb
+#  edit_state      :integer          default(0)
 #  con_state       :integer
 #
 # Indexes

app/models/collections_sample.rb

@@ -13,6 +13,11 @@
 #  index_collections_samples_on_deleted_at                   (deleted_at)
 #  index_collections_samples_on_sample_id_and_collection_id  (sample_id,collection_id) UNIQUE
 #
+# Foreign Keys
+#
+#  fk_rails_...  (collection_id => collections.id)
+#  fk_rails_...  (sample_id => samples.id)
+#
 
 class CollectionsSample < ApplicationRecord
   acts_as_paranoid

app/models/group.rb

@@ -35,6 +35,7 @@
 #  account_active         :boolean
 #  matrix                 :integer          default(0)
 #  providers              :jsonb
+#  inventory_labels       :jsonb
 #
 # Indexes
 #

app/models/matrice.rb

@@ -17,6 +17,7 @@
 #
 #  index_matrices_on_name  (name) UNIQUE
 #
+
 # Configuration settings for some features
 # - set visibility/activation of features globaly or for users and group
 #

app/models/person.rb

@@ -35,6 +35,7 @@
 #  account_active         :boolean
 #  matrix                 :integer          default(0)
 #  providers              :jsonb
+#  inventory_labels       :jsonb
 #
 # Indexes
 #

app/models/reaction.rb

@@ -36,6 +36,8 @@
 #  variations             :jsonb
 #  plain_text_description :text
 #  plain_text_observation :text
+#  vessel_size            :jsonb
+#  gaseous                :boolean          default(FALSE)
 #
 # Indexes
 #

app/models/reactions_product_sample.rb

@@ -2,17 +2,19 @@
 #
 # Table name: reactions_samples
 #
-#  id          :integer          not null, primary key
-#  reaction_id :integer
-#  sample_id   :integer
-#  reference   :boolean
-#  equivalent  :float
-#  position    :integer
-#  type        :string
-#  deleted_at  :datetime
-#  waste       :boolean          default(FALSE)
-#  coefficient :float            default(1.0)
-#  show_label  :boolean          default(FALSE), not null
+#  id             :integer          not null, primary key
+#  reaction_id    :integer
+#  sample_id      :integer
+#  reference      :boolean
+#  equivalent     :float
+#  position       :integer
+#  type           :string
+#  deleted_at     :datetime
+#  waste          :boolean          default(FALSE)
+#  coefficient    :float            default(1.0)
+#  show_label     :boolean          default(FALSE), not null
+#  gas_type       :integer          default("off")
+#  gas_phase_data :jsonb
 #
 # Indexes
 #

app/models/reactions_purification_solvent_sample.rb

@@ -2,17 +2,19 @@
 #
 # Table name: reactions_samples
 #
-#  id          :integer          not null, primary key
-#  reaction_id :integer
-#  sample_id   :integer
-#  reference   :boolean
-#  equivalent  :float
-#  position    :integer
-#  type        :string
-#  deleted_at  :datetime
-#  waste       :boolean          default(FALSE)
-#  coefficient :float            default(1.0)
-#  show_label  :boolean          default(FALSE), not null
+#  id             :integer          not null, primary key
+#  reaction_id    :integer
+#  sample_id      :integer
+#  reference      :boolean
+#  equivalent     :float
+#  position       :integer
+#  type           :string
+#  deleted_at     :datetime
+#  waste          :boolean          default(FALSE)
+#  coefficient    :float            default(1.0)
+#  show_label     :boolean          default(FALSE), not null
+#  gas_type       :integer          default("off")
+#  gas_phase_data :jsonb
 #
 # Indexes
 #

app/models/reactions_reactant_sample.rb

@@ -2,17 +2,19 @@
 #
 # Table name: reactions_samples
 #
-#  id          :integer          not null, primary key
-#  reaction_id :integer
-#  sample_id   :integer
-#  reference   :boolean
-#  equivalent  :float
-#  position    :integer
-#  type        :string
-#  deleted_at  :datetime
-#  waste       :boolean          default(FALSE)
-#  coefficient :float            default(1.0)
-#  show_label  :boolean          default(FALSE), not null
+#  id             :integer          not null, primary key
+#  reaction_id    :integer
+#  sample_id      :integer
+#  reference      :boolean
+#  equivalent     :float
+#  position       :integer
+#  type           :string
+#  deleted_at     :datetime
+#  waste          :boolean          default(FALSE)
+#  coefficient    :float            default(1.0)
+#  show_label     :boolean          default(FALSE), not null
+#  gas_type       :integer          default("off")
+#  gas_phase_data :jsonb
 #
 # Indexes
 #

app/models/reactions_sample.rb

@@ -2,17 +2,19 @@
 #
 # Table name: reactions_samples
 #
-#  id          :integer          not null, primary key
-#  reaction_id :integer
-#  sample_id   :integer
-#  reference   :boolean
-#  equivalent  :float
-#  position    :integer
-#  type        :string
-#  deleted_at  :datetime
-#  waste       :boolean          default(FALSE)
-#  coefficient :float            default(1.0)
-#  show_label  :boolean          default(FALSE), not null
+#  id             :integer          not null, primary key
+#  reaction_id    :integer
+#  sample_id      :integer
+#  reference      :boolean
+#  equivalent     :float
+#  position       :integer
+#  type           :string
+#  deleted_at     :datetime
+#  waste          :boolean          default(FALSE)
+#  coefficient    :float            default(1.0)
+#  show_label     :boolean          default(FALSE), not null
+#  gas_type       :integer          default("off")
+#  gas_phase_data :jsonb
 #
 # Indexes
 #

app/models/reactions_solvent_sample.rb

@@ -2,17 +2,19 @@
 #
 # Table name: reactions_samples
 #
-#  id          :integer          not null, primary key
-#  reaction_id :integer
-#  sample_id   :integer
-#  reference   :boolean
-#  equivalent  :float
-#  position    :integer
-#  type        :string
-#  deleted_at  :datetime
-#  waste       :boolean          default(FALSE)
-#  coefficient :float            default(1.0)
-#  show_label  :boolean          default(FALSE), not null
+#  id             :integer          not null, primary key
+#  reaction_id    :integer
+#  sample_id      :integer
+#  reference      :boolean
+#  equivalent     :float
+#  position       :integer
+#  type           :string
+#  deleted_at     :datetime
+#  waste          :boolean          default(FALSE)
+#  coefficient    :float            default(1.0)
+#  show_label     :boolean          default(FALSE), not null
+#  gas_type       :integer          default("off")
+#  gas_phase_data :jsonb
 #
 # Indexes
 #

app/models/reactions_starting_material_sample.rb

@@ -2,17 +2,19 @@
 #
 # Table name: reactions_samples
 #
-#  id          :integer          not null, primary key
-#  reaction_id :integer
-#  sample_id   :integer
-#  reference   :boolean
-#  equivalent  :float
-#  position    :integer
-#  type        :string
-#  deleted_at  :datetime
-#  waste       :boolean          default(FALSE)
-#  coefficient :float            default(1.0)
-#  show_label  :boolean          default(FALSE), not null
+#  id             :integer          not null, primary key
+#  reaction_id    :integer
+#  sample_id      :integer
+#  reference      :boolean
+#  equivalent     :float
+#  position       :integer
+#  type           :string
+#  deleted_at     :datetime
+#  waste          :boolean          default(FALSE)
+#  coefficient    :float            default(1.0)
+#  show_label     :boolean          default(FALSE), not null
+#  gas_type       :integer          default("off")
+#  gas_phase_data :jsonb
 #
 # Indexes
 #

app/models/user.rb

@@ -25,18 +25,19 @@
 #  name_abbreviation      :string(12)
 #  type                   :string           default("Person")
 #  reaction_name_prefix   :string(3)        default("R")
-#  layout                 :hstore           not null
 #  confirmation_token     :string
 #  confirmed_at           :datetime
 #  confirmation_sent_at   :datetime
 #  unconfirmed_email      :string
+#  layout                 :hstore           not null
 #  selected_device_id     :integer
 #  failed_attempts        :integer          default(0), not null
 #  unlock_token           :string
 #  locked_at              :datetime
 #  account_active         :boolean
 #  matrix                 :integer          default(0)
 #  providers              :jsonb
+#  inventory_labels       :jsonb
 #
 # Indexes
 #