onoma 0.6.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aa531b97279dc41483a45c1b9c49e4348ef97d0
-  data.tar.gz: ab465eed5f0e0c8ed6329965329331a1c1ce2944
+  metadata.gz: fb4d80adfacee042ec4c281d7559e02c1dbb4f9c
+  data.tar.gz: 0f4dd57daf53ec7eb7af7a6d5fd5b5a844558fa1
 SHA512:
-  metadata.gz: d584e4a31a0ca55abab1158e568f7e43f8cd979175d7a6a4198089b7abfe421cc7b6f11d371c158bc2aee8d3826aae49e043879c14959103a917882f8bda0839
-  data.tar.gz: 4fab1c416930d147217fb4f1ee095dac303091b1aefc614f273bc1e24f589a3c3d5ca3f19f97704c068fe4cec10aa0bd5722bb46648f8ddf83dee3aa26cd477b
+  metadata.gz: 5f84232fae7225678bb85671d6376fa8564c1c07ffc1ff8e462dbedada396e91f498efee4026cc577d7c9b7ca21763b597b68c0d257b46a38b33d3695a7b48a1
+  data.tar.gz: e0218b2acd21e4285d363d54d2c04f915a2e2ade7f46ba9f271c3dfc942df5dffc537bf33b00b3bec6b483a66352590c4fa829409984fc6c035affe2be266ee4

data/config/locales/eng.yml

@@ -1905,6 +1905,7 @@ eng:
         acta_category: "Acta category"
     document_natures:
       items:
+        ac_work_sheet: "AC work sheet"
         account_journal_entry_sheet: "Account journal entry sheet"
         activity_cost: "Activity cost"
         animal_husbandry_register: "Animal husbandry register"
@@ -1942,6 +1943,7 @@ eng:
         outgoing_payment_list__standard: "Outgoing payment list"
         pending_vat_register: "Pending VAT register"
         pfi_land_parcel_register: "Phytosanitary Frequency Indicators register"
+        phytosanitary_applicator_sheet: "Applicator sheet"
         phytosanitary_certification: "Phytosanitary certification"
         phytosanitary_register: "Phytosanitary register"
         prescription: "Prescription"
@@ -1953,6 +1955,7 @@ eng:
         purchases_original: "Purchases original"
         sales_estimate: "Sales estimate"
         sales_invoice: "Sales invoice"
+        sales_invoice_shipment: "Sales invoice (shipments)"
         sales_order: "Sales order"
         security_data_sheet: "Security data sheet"
         shipping_note: "Shipping note"
@@ -2162,6 +2165,7 @@ eng:
         element_count: "Element count"
         end_of_life_witness: "End of life witness"
         energy: "Energy"
+        engine_speed: "Engine speed"
         entry_date: "Entry date"
         entry_reason: "Entry reason"
         estimated_harvest_alcoholic_volumetric_concentration: "Estimated harvest alcoholic volumetric concentration"
@@ -2185,6 +2189,7 @@ eng:
         germination_rate: "Germination rate"
         grains_area_density: "Grains area density"
         grains_count: "Grains count"
+        ground_speed: "Ground_speed"
         hagberg_falling_number: "Hagberg falling number"
         healthy: "Healthiness"
         height: "Height"
@@ -2251,6 +2256,8 @@ eng:
         nominal_storable_easement_area: "Nominal storable easement area"
         nominal_storable_net_mass: "Nominal storable net mass"
         nominal_storable_net_volume: "Nominal storable net volume"
+        nozzle_count: "Nozzle count"
+        nozzle_type: "Nozzle type"
         organic_matter_concentration: "Organic matter concentration"
         origin_country_code: "Origin country code"
         origin_identification_number: "Origin identification number"
@@ -2294,6 +2301,8 @@ eng:
         spans_count: "Spans count"
         species_purity: "Species purity"
         specific_weight: "Specific weight"
+        spray_mix_volume_area_density: "Spray mix volume area density"
+        spray_pressure: "Spray pressure"
         stakes_count: "Stakes count"
         subsoil_nature: "Subsoil nature"
         sucrose_concentration: "Sucrose concentration"
@@ -4701,6 +4710,8 @@ eng:
         quintal: "Quintal"
         quintal_per_hectare: "Quintal per hectare"
         radian: "Radian"
+        radian_per_second: "Radian per second"
+        revolution_per_second: "Revolution per second"
         second: "Second"
         square_centimeter: "Square centimeter"
         square_meter: "Square meter"

data/config/locales/fra.yml

@@ -1977,6 +1977,7 @@ fra:
         acta_category: "Catégorie ACTA"
     document_natures:
       items:
+        ac_work_sheet: "Fiche de chantier ETA"
         account_journal_entry_sheet: "Extrait de compte"
         activity_cost: "Coûts de production détaillés"
         animal_husbandry_register: "Registre d’élevage"
@@ -2016,6 +2017,7 @@ fra:
         outgoing_payment_list__standard: "Lot de décaissements"
         pending_vat_register: "État de TVA préparatoire"
         pfi_land_parcel_register: "Bilan IFT"
+        phytosanitary_applicator_sheet: "Fiche applicateur"
         phytosanitary_certification: "Certi-Phyto"
         phytosanitary_register: "Registre phytosanitaire"
         prescription: "Prescription vétérinaire"
@@ -2027,6 +2029,7 @@ fra:
         purchases_original: "Pièce originale d’achat"
         sales_estimate: "Devis de vente"
         sales_invoice: "Facture de vente"
+        sales_invoice_shipment: "Facture de vente (expéditions)"
         sales_order: "Commande de vente"
         security_data_sheet: "Fiche de données de sécurité"
         shipping_note: "Bon de livraison"
@@ -2269,6 +2272,7 @@ fra:
         element_count: "Nombre d'éléments"
         end_of_life_witness: "Témoin du décès"
         energy: "Énergie"
+        engine_speed: "Régime"
         entry_date: "Date d'entrée"
         entry_reason: "Motif d'entrée"
         estimated_harvest_alcoholic_volumetric_concentration: "TAVP vendange"
@@ -2292,6 +2296,7 @@ fra:
         germination_rate: "Taux de germination"
         grains_area_density: "Grains par surface"
         grains_count: "Nombre de grains"
+        ground_speed: "Vitesse"
         hagberg_falling_number: "Temps de chute de Hagberg"
         healthy: "Bonne santé"
         height: "Hauteur"
@@ -2358,6 +2363,8 @@ fra:
         nominal_storable_easement_area: "Capacité de stockage surfacique nominale (emprise au sol)"
         nominal_storable_net_mass: "Capacité de stockage massique nominale"
         nominal_storable_net_volume: "Capacité de stockage volumique nominale"
+        nozzle_count: "Nombre de buses"
+        nozzle_type: "Couleur/type de buses"
         organic_matter_concentration: "Teneur en matière organique"
         origin_country_code: "Code pays d'origine"
         origin_identification_number: "Numéro d'identification d'origine"
@@ -2402,6 +2409,8 @@ fra:
         spans_count: "Nombre de travées"
         species_purity: "Pureté spécifique"
         specific_weight: "Poids spécifique"
+        spray_mix_volume_area_density: "Volume de bouillie surfacique"
+        spray_pressure: "Pression"
         stakes_count: "Nombre de piquets"
         subsoil_nature: "Type de sous-sol"
         sucrose_concentration: "Teneur en sucre"
@@ -4952,6 +4961,8 @@ fra:
         quintal: "Quintal"
         quintal_per_hectare: "Quintal par hectare"
         radian: "Radian"
+        radian_per_second: "Radian par seconde"
+        revolution_per_second: "Tour par minute"
         second: "Seconde"
         square_centimeter: "Centimètre carré"
         square_meter: "Mètre carré"

data/db/reference.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<nomenclatures xmlns="http://www.ekylibre.org/XML/2013/nomenclatures" version="20211203105751">
+<nomenclatures xmlns="http://www.ekylibre.org/XML/2013/nomenclatures" version="20220704161519">
   <nomenclature name="abilities" translateable="true">
     <properties>
       <property name="parameters" type="choice_list" choices="variety, issue_nature"/>
@@ -1719,7 +1719,7 @@
       <property name="countries" type="item_list" choices="countries"/>
       <property name="number" type="string" required="true" default="2"/>
       <property name="precision" type="integer" required="true" default="2"/>
-      <property name="symbol" type="string"/>
+      <property name="symbol" type="string" fallbacks="name"/>
     </properties>
     <items>
       <item name="AED" precision="2" active="true" countries="ae" number="784"/>
@@ -1821,7 +1821,7 @@
       <item name="MNT" precision="2" active="true" countries="mn" number="496"/>
       <item name="MOP" precision="2" active="true" countries="mo" number="446"/>
       <item name="MRO" precision="2" active="true" countries="mr" number="478"/>
-      <item name="MUR" precision="2" active="true" countries="mu" number="480"/>
+      <item name="MUR" precision="2" active="true" countries="mu" number="480" symbol="Rs"/>
       <item name="MVR" precision="2" active="true" countries="mv" number="462"/>
       <item name="MWK" precision="2" active="true" countries="mw" number="454"/>
       <item name="MXN" precision="2" active="true" countries="mx" number="484"/>
@@ -1913,6 +1913,7 @@
       <item name="amount_of_substance" symbol="mol"/>
       <item name="amount_of_substance_density" symbol="mol/kg"/>
       <item name="angle" symbol="rad"/>
+      <item name="angular_velocity" symbol="rad/s"/>
       <item name="concentration" symbol="./m&#xB3;"/>
       <item name="distance" symbol="m"/>
       <item name="distance_speed" symbol="m/s"/>
@@ -1964,10 +1965,12 @@
   </nomenclature>
   <nomenclature name="document_natures" translateable="true">
     <properties>
+      <property name="active" type="boolean" default="true"/>
       <property name="category" type="item_list" choices="document_categories"/>
       <property name="signed" type="boolean" default="false"/>
     </properties>
     <items>
+      <item name="ac_work_sheet" category="management" active="false"/>
       <item name="account_journal_entry_sheet" category="accountancy"/>
       <item name="activity_cost" category="management"/>
       <item name="animal_husbandry_register" category="animal_farming"/>
@@ -2009,6 +2012,7 @@
       <item name="outgoing_payment_list__standard" category="exploitation"/>
       <item name="pending_vat_register" category="accountancy"/>
       <item name="pfi_land_parcel_register" category="land_parcel_management"/>
+      <item name="phytosanitary_applicator_sheet" category="management"/>
       <item name="phytosanitary_certification" category="land_parcel_management"/>
       <item name="phytosanitary_register" category="land_parcel_management"/>
       <item name="prescription" category="health"/>
@@ -2020,6 +2024,7 @@
       <item name="purchases_original" category="exploitation"/>
       <item name="sales_estimate" category="marketing"/>
       <item name="sales_invoice" category="marketing" signed="true"/>
+      <item name="sales_invoice_shipment" category="marketing" signed="true"/>
       <item name="sales_order" category="marketing"/>
       <item name="security_data_sheet" category="land_parcel_management"/>
       <item name="shipping_note" category="exploitation"/>
@@ -2217,6 +2222,7 @@
       <item name="element_count" datatype="integer"/>
       <item name="end_of_life_witness" datatype="string"/>
       <item name="energy" datatype="measure" unit="kilowatt_hour"/>
+      <item name="engine_speed" datatype="measure" unit="revolution_per_minute"/>
       <item name="entry_date" datatype="string"/>
       <item name="entry_reason" datatype="string"/>
       <item name="estimated_harvest_alcoholic_volumetric_concentration" datatype="measure" unit="volume_percent"/>
@@ -2240,6 +2246,7 @@
       <item name="germination_rate" datatype="measure" unit="percent"/>
       <item name="grains_area_density" datatype="measure" unit="unity_per_square_meter"/>
       <item name="grains_count" datatype="measure" unit="thousand"/>
+      <item name="ground_speed" datatype="measure" unit="kilometer_per_hour"/>
       <item name="hagberg_falling_number" datatype="measure" unit="second"/>
       <item name="healthy" datatype="boolean"/>
       <item name="height" datatype="measure" unit="meter"/>
@@ -2306,6 +2313,8 @@
       <item name="nominal_storable_easement_area" datatype="measure" unit="square_meter"/>
       <item name="nominal_storable_net_mass" datatype="measure" unit="kilogram"/>
       <item name="nominal_storable_net_volume" datatype="measure" unit="liter"/>
+      <item name="nozzle_count" datatype="integer"/>
+      <item name="nozzle_type" datatype="string"/>
       <item name="organic_matter_concentration" datatype="measure" unit="mass_percent"/>
       <item name="origin_country_code" datatype="string"/>
       <item name="origin_identification_number" datatype="string"/>
@@ -2349,6 +2358,8 @@
       <item name="spans_count" datatype="integer"/>
       <item name="species_purity" datatype="measure" unit="percent"/>
       <item name="specific_weight" datatype="measure" unit="kilogram_per_hectoliter"/>
+      <item name="spray_mix_volume_area_density" datatype="measure" unit="liter_per_hectare"/>
+      <item name="spray_pressure" datatype="measure" unit="bar"/>
       <item name="stakes_count" datatype="integer" gathering="proportional_to_population"/>
       <item name="subsoil_nature" datatype="choice" choices="soil_natures"/>
       <item name="sucrose_concentration" datatype="measure" unit="mass_percent"/>
@@ -4314,7 +4325,7 @@
       <item name="sower" category="equipment" variety="trailed_equipment" population_counting="unitary" abilities="sow" variable_indicators="geolocation" frozen_indicators="nominal_storable_net_volume, application_width, rows_count, theoretical_working_speed" nature="equipment"/>
       <item name="species" category="fruit" variety="pollen" derivative_of="plant" population_counting="decimal" variable_indicators="reference_year" frozen_indicators="net_mass, net_volume" nature="article"/>
       <item name="spinach" category="vegetable" variety="vegetable" derivative_of="spinacia_oleracea" population_counting="decimal" abilities="feed(animal)" variable_indicators="" frozen_indicators="net_mass" nature="article"/>
-      <item name="sprayer" category="equipment" variety="trailed_equipment" population_counting="unitary" abilities="spray" variable_indicators="geolocation" frozen_indicators="nominal_storable_net_volume, application_width, theoretical_working_speed" nature="equipment"/>
+      <item name="sprayer" category="equipment" variety="trailed_equipment" population_counting="unitary" abilities="spray" variable_indicators="geolocation, application_width, element_count, nominal_storable_net_volume, rows_count, theoretical_working_speed" frozen_indicators="" nature="equipment"/>
       <item name="spread_renting" category="equipment_rent" variety="service" population_counting="decimal" abilities="spread(preparation)" variable_indicators="" frozen_indicators="usage_duration" nature="fee_and_service"/>
       <item name="spreader" category="equipment" variety="trailed_equipment" population_counting="unitary" abilities="spread(preparation)" variable_indicators="geolocation" frozen_indicators="nominal_storable_net_volume, application_width, theoretical_working_speed" nature="equipment"/>
       <item name="spreader_trailer" category="equipment" variety="trailed_equipment" population_counting="unitary" abilities="store(excrement), move, spread(excrement), store(raw_matter), store_fluid, spread(preparation)" variable_indicators="geolocation" frozen_indicators="nominal_storable_net_volume, nominal_storable_net_mass" nature="equipment"/>
@@ -4330,7 +4341,7 @@
       <item name="telescopic_handler" category="equipment" variety="handling_equipment" population_counting="unitary" variable_indicators="geolocation" abilities="catch(product)" nature="equipment"/>
       <item name="tool" category="equipment" variety="equipment" population_counting="unitary" nature="equipment"/>
       <item name="topper" category="equipment" variety="trailed_equipment" population_counting="unitary" abilities="cut" frozen_indicators="application_width, theoretical_working_speed" variable_indicators="geolocation" nature="equipment"/>
-      <item name="tractor" category="equipment" variety="tractor" population_counting="unitary" abilities="catch(matter), move, tow(matter), consume(oil), consume(fuel)" variable_indicators="net_surface_area, motor_power, geolocation, hour_counter" frozen_indicators="" linkage_points="rear, front" nature="equipment"/>
+      <item name="tractor" category="equipment" variety="tractor" population_counting="unitary" abilities="catch(matter), move, tow(matter), consume(oil), consume(fuel)" variable_indicators="fuel_consumption, geolocation, motor_power, hour_counter, ground_speed" frozen_indicators="" linkage_points="rear, front" nature="equipment"/>
       <item name="trade_show" category="trade_show" variety="service" population_counting="integer" variable_indicators="" nature="fee_and_service"/>
       <item name="trailer" category="equipment" variety="trailed_equipment" population_counting="unitary" abilities="store_fluid, store(grain), store(grass), store(raw_matter), store(silage), move" variable_indicators="geolocation" frozen_indicators="nominal_storable_net_volume, nominal_storable_net_mass" nature="equipment"/>
       <item name="training_course" category="service" variety="service" population_counting="decimal" variable_indicators="" frozen_indicators="usage_duration" nature="fee_and_service"/>
@@ -10258,6 +10269,8 @@
       <item name="quintal_per_square_centimeter" dimension="mass_area_density" symbol="qt/cm&#xB2;" a="1000000.0" base_unit="quintal" base_dimension="mass" repartition_unit="square_centimeter" repartition_dimension="surface_area"/>
       <item name="quintal_per_square_meter" dimension="mass_area_density" symbol="qt/m&#xB2;" a="100.0" base_unit="quintal" base_dimension="mass" repartition_unit="square_meter" repartition_dimension="surface_area"/>
       <item name="radian" dimension="angle" symbol="rad" base_unit="radian" base_dimension="angle"/>
+      <item name="radian_per_second" dimension="angular_velocity" symbol="rad/s" repartition_unit="second" repartition_dimension="time" base_unit="radian" base_dimension="angle"/>
+      <item name="revolution_per_minute" dimension="angular_velocity" symbol="tr/min" a="0.10471975511965977" d="60.0" repartition_unit="minute" repartition_dimension="time"/>
       <item name="second" dimension="time" symbol="s" base_unit="second" base_dimension="time"/>
       <item name="square_centimeter" dimension="surface_area" symbol="cm&#xB2;" a="0.0001" base_unit="square_centimeter" base_dimension="surface_area"/>
       <item name="square_meter" dimension="surface_area" symbol="m&#xB2;" base_unit="square_meter" base_dimension="surface_area"/>

data/lib/onoma/item.rb

@@ -279,11 +279,12 @@ module Onoma
       if property
         if value.nil? && property.fallbacks
           property.fallbacks.each do |fallback|
+            value ||= @name if fallback == :name
             value ||= @attributes[fallback]
             break if value
           end
         end
-        value ||= cast_property(name, property.default) if property.default
+        value = cast_property(name, property.default) if property.default && value.nil?
       end
       value
     end

data/lib/onoma/migration/actions/property_change.rb

@@ -0,0 +1,36 @@
+module Onoma
+  module Migration
+    module Actions
+      class PropertyChange < Onoma::Migration::Actions::Base
+        attr_reader :nomenclature, :name, :changes
+        def initialize(element)
+          name = element['property'].split('.')
+          @nomenclature = name.first
+          @name = name.second
+
+          @changes = {}
+          if element.has_attribute?('type')
+            changes[:type] = element.attr('type').to_sym
+          end
+          if element.has_attribute?('fallbacks')
+            @changes[:fallbacks] = element.attr('fallbacks').to_s.strip.split(/[[:space:]]*\,[[:space:]]*/).map(&:to_sym)
+          end
+          if element.has_attribute?('default')
+            @changes[:default] = element.attr('default').to_sym
+          end
+          if element.has_attribute?('required')
+            @changes[:required] = element.attr('required').to_s == 'true'
+          end
+          # @changes[:inherit]  = !!(element.attr('inherit').to_s == 'true')
+          if element.has_attribute?('choices')
+            if type == :choice || type == :choice_list
+              @changes[:choices] = element.attr('choices').to_s.strip.split(/[[:space:]]*\,[[:space:]]*/).map(&:to_sym)
+            elsif type == :item || type == :item_list
+              @changes[:choices] = element.attr('choices').to_s.strip.to_sym
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/onoma/migrator/reference.rb

@@ -48,7 +48,7 @@ module Onoma
       end
 
       def property_change(action)
-        @set.add_property(action.nomenclature, action.name, action.changes)
+        @set.change_property(action.nomenclature, action.name, action.changes)
       end
 
       def item_creation(action)

data/lib/onoma/nomenclature.rb

@@ -256,6 +256,22 @@ module Onoma
       p
     end
 
+    def change_property(name, updates = {})
+      property = property_natures[name]
+
+      unless property
+        raise "Property #{p.name} doesn't exist in nomenclature #{@name}"
+      end
+
+      updates.each do |k, v|
+        begin
+          property.send("#{k}=", v)
+        rescue NoMethodError => e
+          "#{k} attribute doesn't exist for property nature"
+        end
+      end
+    end
+
     def sibling(name)
       @set.find(name)
     end

data/lib/onoma/nomenclature_set.rb

@@ -151,8 +151,9 @@ module Onoma
       nomenclature.add_property(property_name, type, options)
     end
 
-    def change_property(_nomenclature_name, _property_name, _updates = {})
-      raise NotImplementedError
+    def change_property(nomenclature_name, property_name, updates = {})
+      nomenclature = find!(nomenclature_name)
+      nomenclature.change_property(property_name, updates)
     end
 
     def remove_property(_nomenclature_name, _property_name, _options = {})

data/lib/onoma/property_nature.rb

@@ -1,6 +1,7 @@
 module Onoma
   class PropertyNature
-    attr_reader :nomenclature, :name, :type, :fallbacks, :default, :source
+    attr_reader :nomenclature
+    attr_accessor :name, :type, :fallbacks, :default, :source
 
     # New item
     def initialize(nomenclature, name, type, options = {})

data/lib/onoma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onoma
-  VERSION = '0.6.3'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onoma
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Ekylibre developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -153,6 +153,7 @@ files:
 - lib/onoma/migration/actions/nomenclature_change.rb
 - lib/onoma/migration/actions/nomenclature_creation.rb
 - lib/onoma/migration/actions/nomenclature_removal.rb
+- lib/onoma/migration/actions/property_change.rb
 - lib/onoma/migration/actions/property_creation.rb
 - lib/onoma/migration/base.rb
 - lib/onoma/migrator.rb