Skip to content

Commit

Permalink
Fixes demo
Browse files Browse the repository at this point in the history
  • Loading branch information
@burisu
burisu committed Apr 1, 2014
1 parent 0423c35 commit a291559
Show file tree
Hide file tree
Showing 10 changed files with 291 additions and 265 deletions.
4 changes: 2 additions & 2 deletions app/models/intervention.rb
View file
Expand Up @@ -49,7 +49,7 @@ class MissingVariable < StandardError

class Intervention < Ekylibre::Record::Base
attr_readonly :reference_name, :production_id
belongs_to :ressource , :polymorphic => true
belongs_to :ressource , polymorphic: true
belongs_to :production, inverse_of: :interventions
belongs_to :production_support
belongs_to :issue
Expand Down Expand Up @@ -228,7 +228,7 @@ def run!(period = {})
if variable.parted?
# Parted from
variant = producer.variant
produced.actor = variant.matching_model.new(variant: variant, initial_born_at: stopped_at, initial_owner: producer.actor.owner, initial_container: producer.actor.container, initial_population: produced.population, initial_shape: produced.shape, name: producer.name, extjuncted: true, tracking: producer.tracking)
produced.actor = variant.matching_model.new(variant: variant, initial_born_at: stopped_at, initial_owner: producer.actor.owner, initial_container: producer.actor.container, initial_population: produced.population, initial_shape: produced.shape, name: producer.name, extjuncted: true, tracking: producer.actor.tracking)
unless produced.actor.save
puts "*" * 80 + variant.matching_model.name
puts produced.actor.inspect
Expand Down
80 changes: 43 additions & 37 deletions config/locales/arb/nomenclatures.yml
View file
Expand Up @@ -318,12 +318,12 @@ arb:
# name: "Méthodes d’analyse de la capacité d’échange cationique"
certification_labels:
items:
# aoc: "Aoc"
# aop: "Aop"
# aor: "Aor"
# aoc: "AOC"
# aop: "AOP"
# aor: "AOR"
# bio: "Agriculture Biologique"
# ig: "Ig"
# igp: "Igp"
# ig: "IG"
# igp: "IGP"
# label_rouge: "Label Rouge"
# name: "Labels"
certifications:
Expand All @@ -333,9 +333,9 @@ arb:
# bordeaux_blanc_avec_sucres: "Bordeaux blanc avec sucres"
# bordeaux_clairet: "Bordeaux clairet"
# bordeaux_claret: "Bordeaux claret"
# bordeaux_haut_benauge: "Bordeaux haut benauge"
# bordeaux_haut_benauge_avec_sucres: "Bordeaux haut benauge avec sucres"
# bordeaux_rose: "Bordeaux rose"
# bordeaux_haut_benauge: "Bordeaux Haut-Benauge"
# bordeaux_haut_benauge_avec_sucres: "Bordeaux Haut-Benauge avec sucres"
# bordeaux_rose: "Bordeaux rosé"
# bordeaux_rouge: "Bordeaux rouge"
# bordeaux_superieur_blanc: "Bordeaux supérieur blanc"
# bordeaux_superieur_rouge: "Bordeaux supérieur rouge"
Expand Down Expand Up @@ -483,7 +483,9 @@ arb:
# symbol: "Symbole"
controlled_resources:
items: #?
property_natures: #?
# name: "Ressources métiers contrôlées"
property_natures:
# accesses: "Accès"
countries:
items:
ad: "علم أندورا أندورا"
Expand Down Expand Up @@ -1444,17 +1446,16 @@ arb:
items:
# accident: "Accident"
# animal_pathology: "Pathologie animale"
# bacteria_disease: "Maladies bactériennes"
# bacteria_disease: "Maladie bactérienne"
# climate_issue: "Incident climatique"
# diarrhea: "Diarrhée"
# fecondity_problem: "Problème de fécondité"
# fungus_disease: "Maladies cryptogamiques"
# fungus_disease: "Maladie cryptogamique"
# issue: "Incident"
# mammite: "Mammite"
# nematoda_disease: "Maladies à nématodes"
# other: "Autre"
# protozoa_disease: "Maladies virales"
# respiratory_problem: "Problèmes respiratoires"
# nematoda_disease: "Maladie à nématodes"
# protozoa_disease: "Maladie virale"
# respiratory_problem: "Problème respiratoire"
# vegetal_pathology: "Pathologie végétale"
# name: "Types d’incidents"
property_natures:
Expand All @@ -1464,7 +1465,7 @@ arb:
items:
# blaye: "Blaye"
# bordeaux: "Bordeaux"
# bordeaux_haut_benauge: "Bordeaux haut benauge"
# bordeaux_haut_benauge: "Bordeaux Haut-Benauge"
# bordeaux_superieur: "Bordeaux supérieur"
# name: "Terroir"
languages:
Expand Down Expand Up @@ -1590,21 +1591,22 @@ arb:
# name: "États de la reproduction mammifère"
molecules:
items:
# calcium_carbonate: "Carbonate de calcium "
# calcium_carbonate: "Carbonate de calcium"
# copper_sulfate: "Sulfate de cuivre (Ⅰ)"
# dicopper_sulfate: "Sulfate de cuivre (Ⅱ)"
# dinitrogen: "Diazote"
# diphosphorus_pentoxide: "Diphosphorus pentoxide"
# diphosphorus_pentoxide: "Pentoxyde de phosphore"
# glucose: "Glucose"
# lactic_acid: "Acide lactique "
# lactic_acid: "Acide lactique"
# malic_acid: "Acide malique"
# phosphate: "Phosphate"
# potash: "Potasse"
# potassium_bicarbonate: "Bicarbonate de potassium"
# potassium_ferrocyanide: "Ferrocyanide de potassium"
# potassium_oxide: "Oxyde de potassium"
# sodium_chloride: "Chlorure de sodium"
# sucrose: "Sucrose"
# tetraphosphorus_decoxide: "Tetraphosphorus decoxide"
# sucrose: "Saccharose"
# tetraphosphorus_decoxide: "Décaoxyde de phosphore"
# name: "Molécules"
property_natures:
# formula: "Formule"
Expand All @@ -1618,7 +1620,7 @@ arb:
data_acces_method: #?
items:
# cartodb: "CartoDB"
# charentes_alliance_extranet: "Charentes Alliance extranet"
# charentes_alliance_extranet: "Extranet Charentes Alliance"
# est_elevage: "Est Élevage"
# lilco: "Lilco"
# msa: "MSA"
Expand Down Expand Up @@ -1811,7 +1813,7 @@ arb:
# male_young_cow: "Taurillon"
# milk: "Lait"
# natural_water: "Eau de pluie / puit"
# oenological_product: "Produit oenologique"
# oenological_product: "Produit œnologique"
# other_consumable: "Autres consommables"
# oyster_band: "Huître"
# plant: "Plant"
Expand Down Expand Up @@ -1933,8 +1935,8 @@ arb:
# concrete_tank: "Cuve béton"
# coop:ammonitre_33,5%_vr: "ammonitre COOP 33,5% vrac"
# coop:aviator_xpro_5l: "Aviator xpro 5l"
# coop:avoine_d'hiver_une_de_mai_red_25kg: "Semence d'avoine d'hiver une de mai - sac de 25kg"
# coop:bd_s_miradoux_r1_cel_gold_net_25kg: "Semence de Blé tendre Miradoux ( r1 cel gold) - sac de 25kg"
# coop:avoine_d'hiver_une_de_mai_red_25kg: "Semence d’avoine d’hiver une de mai - sac de 25kg"
# coop:bd_s_miradoux_r1_cel_gold_net_25kg: "Semence de Blé tendre Miradoux (r1 cel gold) - sac de 25kg"
# coop:bd_s_tablur_r1_cel_gold_net_25kg: "Semence de Blé dur tablur r1 cel gold net - sac de 25kg"
# coop:bd_s_tablur_r1_gau+red_25kg: "Semence de Blé dur tablur r1 gau+red - sac de 25kg"
# coop:bth_s_ascott_r1_gau+_red_25kg: "Semence de Blé tendre Ascott (r1 gau+ red) sac de 25kg"
Expand Down Expand Up @@ -2068,7 +2070,7 @@ arb:
# mower: "Faucheuse"
# mud: "Boue"
# natural_water: "Eau de pluie / du puit"
# oenological_yeast_sc_500g: "Levure oenologique - sachet de 500g"
# oenological_yeast_sc_500g: "Levure œnologique - sachet de 500g"
# office_building: "Bureau"
# office_building_division: "Pièce de bureau"
# other_herbicide: "Herbicide autre"
Expand Down Expand Up @@ -2261,7 +2263,7 @@ arb:
# motor_oil: "Huile moteur"
# mower: "Faucheuse"
# natural_water: "Eau de pluie ou de puit"
# oenological_yeast: "Levure oenologique"
# oenological_yeast: "Levure œnologique"
# organic_fertilizer: "Engrais organique"
# oyster_band: "Bande d’huître"
# packaged_process_food: "Aliments transformés et conditionnés"
Expand Down Expand Up @@ -2398,8 +2400,12 @@ arb:
accesses: #?
farm_worker:
accesses: #?
items: #?
property_natures: #?
items:
# accountant: "Comptable"
# farm_worker: "Ouvrier agricole"
# name: "Rôles"
property_natures:
# accesses: "Accès"
sexes:
items:
# female: "Femelle"
Expand Down Expand Up @@ -2542,7 +2548,7 @@ arb:
# radian: "Radian"
# second: "Seconde"
# square_meter: "Mètre carré"
# ten: "Dix"
# ten: "Dizaine"
# thousand: "Millier"
# thousand_per_hectare: "Millier par hectare"
# thousand_per_hectogram: "Millier par hectogramme"
Expand Down Expand Up @@ -2615,11 +2621,11 @@ arb:
# daucus: "Carotte"
# disinfectant: "Désinfectant"
# easement: "Aménagement foncier"
# egg: "Oeuf"
# electricity: "Electricité"
# egg: "Œuf"
# electricity: "Électricité"
# ennis: "Ennis"
# equipment: "Équipement"
# equus: "Equin"
# equus: "Équin"
# etincel: "Etincel"
# excrement: "Engrais organiques"
# fabaceae: "Fabaceae"
Expand Down Expand Up @@ -2874,8 +2880,8 @@ arb:
# name: "Variétés"
property_natures:
# derivative_of: "Dérivé"
# europa_tsn: "Europa ID"
# itis_tsn: "Itis ID"
# europa_tsn: "ID Europa"
# itis_tsn: "ID ITIS"
varieties-animal: #?
varieties-asteraceae: #?
varieties-equipment: #?
Expand All @@ -2884,8 +2890,8 @@ arb:
varieties-triticum_aestivum: #?
working_sets:
items:
# oenological_regulateds: "Produits oenologiques détenus"
# name: "Ensemble de produits"
# oenological_regulateds: "Produits œnologiques détenus"
# name: "Ensembles de produits"
property_natures:
# expression: "Expression"
procedures: #?
Expand Down

0 comments on commit a291559

Please sign in to comment.