5 files changed, 68 insertions, 0 deletions
diff --git a/app/controllers/compliance_control_blocks_controller.rb b/app/controllers/compliance_control_blocks_controller.rb
new file mode 100644
index 000000000..cce074e46
--- /dev/null
+++ b/app/controllers/compliance_control_blocks_controller.rb
@@ -0,0 +1,36 @@
+class ComplianceControlBlocksController < BreadcrumbController
+  defaults resource_class: ComplianceControlBlock
+  belongs_to :compliance_control_set
+
+  def new
+    @compliance_control_set = parent
+    @compliance_control_block = ComplianceControlBlock.new(compliance_control_set: @compliance_control_set)
+  end
+
+  def create
+    create! do |success, failure|
+      success.html { redirect_to compliance_control_set_path(@compliance_control_set) }  
+      failure.html { render :action => :new }
+    end
+  end
+
+  def update
+    update! do |success, failure|
+      success.html { redirect_to compliance_control_set_path(@compliance_control_set) }  
+      failure.html { render :action => :edit }
+    end 
+  end
+
+  private
+
+  def create_resource compliance_control_block
+    binding.pry
+    compliance_control_block.transport_mode = params[:compliance_control_block][:transport_mode]
+    super
+  end
+
+  def compliance_control_block_params
+    params.require(:compliance_control_block).permit(:transport_mode)
+  end
+
+end
+\ No newline at end of file
diff --git a/app/models/compliance_control_set.rb b/app/models/compliance_control_set.rb
index f8f491cba..40e269146 100644
--- a/app/models/compliance_control_set.rb
+++ b/app/models/compliance_control_set.rb
@@ -1,5 +1,6 @@
 class ComplianceControlSet < ActiveRecord::Base
   belongs_to :organisation
+  has_many :compliance_control_blocks, dependent: :destroy
   has_many :compliance_controls, dependent: :destroy
 
   validates :name, presence: true
diff --git a/app/views/compliance_control_blocks/_form.html.slim b/app/views/compliance_control_blocks/_form.html.slim
new file mode 100644
index 000000000..b20b5d0cc
--- /dev/null
+++ b/app/views/compliance_control_blocks/_form.html.slim
@@ -0,0 +1,9 @@
+= simple_form_for [@compliance_control_set, @compliance_control_block], html: { class: 'form-horizontal', id: 'compliance_control_block_form' }, wrapper: :horizontal_form do |f|
+  .row
+    .col-lg-12
+      = f.input :transport_mode, as: :select, collection: ComplianceControlBlock.transport_modes
+      / = f.input :sub_transport_mode
+
+  .separator
+
+  = f.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'compliance_control_block_form'
diff --git a/app/views/compliance_control_blocks/edit.html.slim b/app/views/compliance_control_blocks/edit.html.slim
new file mode 100644
index 000000000..fbd42e7f3
--- /dev/null
+++ b/app/views/compliance_control_blocks/edit.html.slim
@@ -0,0 +1,11 @@
+/ PageHeader
+= pageheader 'modele-calendrier',
+        t('compliance_control_blocks.edit.title')
+
+
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+        = render 'form'
+\ No newline at end of file
diff --git a/app/views/compliance_control_blocks/new.html.slim b/app/views/compliance_control_blocks/new.html.slim
new file mode 100644
index 000000000..654a0dc7f
--- /dev/null
+++ b/app/views/compliance_control_blocks/new.html.slim
@@ -0,0 +1,11 @@
+/ PageHeader
+= pageheader 'modele-calendrier',
+        t('compliance_control_blocks.new.title')
+
+
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+        = render 'form'
+\ No newline at end of file