Merge branch 'develop' into refactor_type_de_xxx

Conflicts:
	db/schema.rb

db/migrate/20151112151918_add_json_lat_lngs_to_dossier.rb

@@ -0,0 +1,5 @@
+class AddJsonLatLngsToDossier < ActiveRecord::Migration
+  def change
+    add_column :dossiers, :json_latlngs, :text
+  end
+end

db/migrate/20151113171605_create_exercice_table.rb

@@ -0,0 +1,11 @@
+class CreateExerciceTable < ActiveRecord::Migration
+  def change
+    create_table :exercices do |t|
+      t.string :ca
+      t.datetime :dateFinExercice
+      t.integer :date_fin_exercice_timestamp
+    end
+
+    add_reference :exercices, :etablissement, references: :etablissements
+  end
+end

db/schema.rb

@@ -66,6 +66,7 @@ ActiveRecord::Schema.define(version: 20151116175817) do
     t.datetime "updated_at",           default: '2015-09-22 09:25:29'
     t.string   "state"
     t.integer  "user_id"
+    t.text     "json_latlngs"
   end
 
   add_index "dossiers", ["procedure_id"], name: "index_dossiers_on_procedure_id", using: :btree
@@ -104,6 +105,13 @@ ActiveRecord::Schema.define(version: 20151116175817) do
     t.integer "entreprise_id"
   end
 
+  create_table "exercices", force: :cascade do |t|
+    t.string   "ca"
+    t.datetime "dateFinExercice"
+    t.integer  "date_fin_exercice_timestamp"
+    t.integer  "etablissement_id"
+  end
+
   create_table "gestionnaires", force: :cascade do |t|
     t.string   "email",                  default: "", null: false
     t.string   "encrypted_password",     default: "", null: false