Merge branch 'develop' of github.com:sgmap/tps into develop

Conflicts:
	db/schema.rb
This commit is contained in:
Tanguy PATTE 2016-01-20 15:50:13 +01:00
commit f75f0e26d6
80 changed files with 694 additions and 650 deletions

View file

@ -0,0 +1,18 @@
class CreateCadastreTable < ActiveRecord::Migration
def change
create_table :cadastres do |t|
t.string :surface_intersection
t.float :surface_parcelle
t.string :numero
t.integer :feuille
t.string :section
t.string :code_dep
t.string :nom_com
t.string :code_com
t.string :code_arr
t.text :geometry
end
add_reference :cadastres, :dossier, references: :dossiers
end
end

View file

@ -11,7 +11,9 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160120141602) do
ActiveRecord::Schema.define(version: 20160115135025) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -35,6 +37,20 @@ ActiveRecord::Schema.define(version: 20160120141602) do
add_index "administrateurs", ["email"], name: "index_administrateurs_on_email", unique: true, using: :btree
add_index "administrateurs", ["reset_password_token"], name: "index_administrateurs_on_reset_password_token", unique: true, using: :btree
create_table "cadastres", force: :cascade do |t|
t.string "surface_intersection"
t.float "surface_parcelle"
t.string "numero"
t.integer "feuille"
t.string "section"
t.string "code_dep"
t.string "nom_com"
t.string "code_com"
t.string "code_arr"
t.text "geometry"
t.integer "dossier_id"
end
create_table "cerfas", force: :cascade do |t|
t.string "content"
t.integer "dossier_id"