Add model TypeDeChampPrivate

This commit is contained in:
Xavier J 2016-08-02 16:13:15 +02:00
parent bce1b96fee
commit 26b5e4cb24
7 changed files with 24 additions and 4 deletions

View file

@ -1,6 +1,7 @@
class Procedure < ActiveRecord::Base
has_many :types_de_piece_justificative, dependent: :destroy
has_many :types_de_champ, dependent: :destroy
has_many :types_de_champ_private, class_name: 'TypeDeChampPrivate', dependent: :destroy
has_many :dossiers
has_one :procedure_path, dependent: :destroy

View file

@ -18,6 +18,8 @@ class TypeDeChamp < ActiveRecord::Base
has_many :champ, dependent: :destroy
default_scope { where(private: false) }
validates :libelle, presence: true, allow_blank: false, allow_nil: false
validates :type_champ, presence: true, allow_blank: false, allow_nil: false
# validates :order_place, presence: true, allow_blank: false, allow_nil: false

View file

@ -0,0 +1,9 @@
class TypeDeChampPrivate < TypeDeChamp
after_initialize :force_private_value
default_scope { where(private: true) }
def force_private_value
self.private = true
end
end

View file

@ -12,6 +12,7 @@ class ProcedureSerializer < ActiveModel::Serializer
has_one :geographic_information, serializer: ModuleApiCartoSerializer
has_many :types_de_champ, serializer: TypeDeChampSerializer
has_many :types_de_piece_justificative, serializer: TypeDePieceJustificativeSerializer
has_many :types_de_champ, serializer: TypeDeChampSerializer
has_many :types_de_champ_private, serializer: TypeDeChampSerializer
has_many :types_de_piece_justificative, serializer: TypeDePieceJustificativeSerializer
end

View file

@ -3,5 +3,6 @@ class TypeDeChampSerializer < ActiveModel::Serializer
:libelle,
{:type_champ => :type},
:order_place,
:description
:description,
:private
end

View file

@ -0,0 +1,5 @@
class AddPublicAttrOnTypeDeChamp < ActiveRecord::Migration
def change
add_column :types_de_champ, :private, :boolean, default: false
end
end

View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160802113112) do
ActiveRecord::Schema.define(version: 20160802131031) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -296,6 +296,7 @@ ActiveRecord::Schema.define(version: 20160802113112) do
t.integer "procedure_id"
t.text "description"
t.boolean "mandatory", default: false
t.boolean "private", default: false
end
create_table "types_de_piece_justificative", force: :cascade do |t|