From 210ac207185ee2f8e5c20ce60b327906e7cf2742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A9?= Date: Fri, 17 Sep 2021 14:12:23 +0200 Subject: [PATCH] add DEE to p_product_ref --- app/models/p_product_ref.rb | 10 +++++++++- db/migrate/20210917121011_add_dee_to_p_product_refs.rb | 7 +++++++ db/schema.rb | 5 ++++- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20210917121011_add_dee_to_p_product_refs.rb diff --git a/app/models/p_product_ref.rb b/app/models/p_product_ref.rb index 106fce6..d689bac 100644 --- a/app/models/p_product_ref.rb +++ b/app/models/p_product_ref.rb @@ -48,7 +48,7 @@ class PProductRef < ApplicationRecord :actions => {:name => "Actions", :reorder => false} } - acts_as_caching :fields => [:sorecop] + acts_as_caching :fields => [:sorecop, :dee] def not_imported? if !self.p_product or !self.p_product.imported @@ -159,4 +159,12 @@ class PProductRef < ApplicationRecord end end + def ca_dee + if self.cc_dee + return self.cc_dee + else + "TODO Calcul DEE" + end + end + end diff --git a/db/migrate/20210917121011_add_dee_to_p_product_refs.rb b/db/migrate/20210917121011_add_dee_to_p_product_refs.rb new file mode 100644 index 0000000..0984648 --- /dev/null +++ b/db/migrate/20210917121011_add_dee_to_p_product_refs.rb @@ -0,0 +1,7 @@ +class AddDeeToPProductRefs < ActiveRecord::Migration[6.0] + def change + add_column :p_product_refs, :ca_dee, :decimal + add_column :p_product_refs, :cc_dee, :decimal + add_column :p_product_refs, :ct_dee, :decimal + end +end diff --git a/db/schema.rb b/db/schema.rb index b4d95e9..c81bb6b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2021_09_17_115613) do +ActiveRecord::Schema.define(version: 2021_09_17_121011) do create_table "accounting_zones", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t| t.string "name" @@ -1796,6 +1796,9 @@ ActiveRecord::Schema.define(version: 2021_09_17_115613) do t.decimal "ca_sorecop", precision: 10 t.decimal "cc_sorecop", precision: 10 t.decimal "ct_sorecop", precision: 10 + t.decimal "ca_dee", precision: 10 + t.decimal "cc_dee", precision: 10 + t.decimal "ct_dee", precision: 10 end create_table "p_product_specs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|