Merge branch 'master' of github.com:AF83/stif-boiv

20 files changed, 185 insertions, 25 deletions

diff --git a/app/controllers/compliance_check_sets_controller.rb b/app/controllers/compliance_check_sets_controller.rb
new file mode 100644
index 000000000..d61fbafdb
--- /dev/null
+++ b/app/controllers/compliance_check_sets_controller.rb
@@ -0,0 +1,51 @@
+class ComplianceCheckSetsController < BreadcrumbController
+  defaults resource_class: ComplianceCheckSet
+  before_action :ransack_created_at_params, only: [:index]
+  respond_to :html
+
+  belongs_to :workbench
+
+  def index
+    index! do |format|
+      scope = ransack_period @compliance_check_sets
+      @q_for_form = scope.ransack(params[:q])
+      format.html {
+        @compliance_check_sets = ModelDecorator.decorate(
+          @q_for_form.result,
+          with: ComplianceCheckSetDecorator
+        )
+      }
+    end
+  end
+
+
+  private
+
+  def ransack_created_at_params
+    start_date = []
+    end_date = []
+
+    if params[:q] && params[:q][:created_at] && !params[:q][:created_at].has_value?(nil) && !params[:q][:created_at].has_value?("")
+      [1, 2, 3].each do |key|
+        start_date << params[:q][:created_at]["begin(#{key}i)"].to_i
+        end_date << params[:q][:created_at]["end(#{key}i)"].to_i
+      end
+      params[:q].delete(:created_at)
+      @begin_range = DateTime.new(*start_date, 0, 0, 0) rescue nil
+      @end_range = DateTime.new(*end_date, 23, 59, 59) rescue nil
+    end
+  end
+
+  # Fake ransack filter
+  def ransack_period scope
+    return scope unless !!@begin_range && !!@end_range
+
+    if @begin_range > @end_range
+      flash.now[:error] = t('compliance_check_sets.filters.error_period_filter')
+    else
+      scope = scope.where_created_at_between(@begin_range, @end_range)
+    end
+    scope
+  end
+
+end
\ No newline at end of file
diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb
index eb1ba68ea..846dbb253 100644
--- a/app/controllers/compliance_controls_controller.rb
+++ b/app/controllers/compliance_controls_controller.rb
@@ -19,7 +19,7 @@ class ComplianceControlsController < BreadcrumbController
   end
 
   def compliance_control_params
-    base = [:name, :code, :origin_code, :criticity, :comment, :control_attributes, :type, compliance_control_block_attributes: [:name, :transport_mode]]
+    base = [:name, :code, :origin_code, :criticity, :comment, :control_attributes, :type]
     permited = base + dynamic_attributes_params
     params.require(:compliance_control).permit(permited)
   end
diff --git a/app/decorators/compliance_check_set_decorator.rb b/app/decorators/compliance_check_set_decorator.rb
new file mode 100644
index 000000000..5f3821cbe
--- /dev/null
+++ b/app/decorators/compliance_check_set_decorator.rb
@@ -0,0 +1,8 @@
+class ComplianceCheckSetDecorator < Draper::Decorator
+  delegate_all
+
+  def action_links
+    links = []
+  end
+
+end
diff --git a/app/helpers/referentials_helper.rb b/app/helpers/referentials_helper.rb
index 73384bef6..f3c18d9f8 100644
--- a/app/helpers/referentials_helper.rb
+++ b/app/helpers/referentials_helper.rb
@@ -1,2 +1,12 @@
 module ReferentialsHelper
+  # Line statuses helper
+  def line_status(status)
+    if status
+    cls = 'danger'
+      content_tag :span, status ? " #{t('false')} " : " #{t('true')}", class: "fa fa-exclamation-circle fa-lg text-#{cls}"
+    else
+    cls = 'success'
+      content_tag :span, status ? " #{t('false')} " : " #{t('true')}", class: "fa fa-check-circle fa-lg text-#{cls}"
+    end
+  end
 end
diff --git a/app/models/compliance_check.rb b/app/models/compliance_check.rb
index 85cf5e37e..4c29129b9 100644
--- a/app/models/compliance_check.rb
+++ b/app/models/compliance_check.rb
@@ -6,4 +6,5 @@ class ComplianceCheck < ActiveRecord::Base
   validates :criticity, presence: true
   validates :name, presence: true
   validates :code, presence: true
+  validates :origin_code, presence: true
 end
diff --git a/app/models/compliance_check_set.rb b/app/models/compliance_check_set.rb
index 7b6400a21..3c62221f0 100644
--- a/app/models/compliance_check_set.rb
+++ b/app/models/compliance_check_set.rb
@@ -7,4 +7,9 @@ class ComplianceCheckSet < ActiveRecord::Base
   belongs_to :parent, polymorphic: true
 
   enumerize :status, in: %w[new pending successful warning failed running aborted canceled]
+
+  scope :where_created_at_between, ->(start_date, end_date) do
+    where('created_at BETWEEN ? AND ?', start_date, end_date)
+  end
+
 end
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index c5389e832..42f45b6ca 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -1,8 +1,7 @@
 class ComplianceControl < ActiveRecord::Base
   extend Enumerize
   belongs_to :compliance_control_set
-  has_one :compliance_control_block, dependent: :destroy
-  accepts_nested_attributes_for :compliance_control_block
+  belongs_to :compliance_control_block
 
   @@default_criticity = :warning
   @@default_code = ""
diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb
index a08e271f6..e03c4ce85 100644
--- a/app/models/compliance_control_block.rb
+++ b/app/models/compliance_control_block.rb
@@ -1,15 +1,9 @@
 class ComplianceControlBlock < ActiveRecord::Base
   belongs_to :compliance_control_set
-  belongs_to :compliance_control
-
-  before_save :set_compliance_control_set
+  has_many :compliance_controls, dependent: :destroy
 
   hstore_accessor :condition_attributes, transport_mode: :string
 
-  def set_compliance_control_set
-    self.compliance_control_set = self.compliance_control.compliance_control_set
-  end
-
   def self.transport_modes
     ["all"] + StifTransportModeEnumerations.transport_mode.values
   end
diff --git a/app/models/workbench.rb b/app/models/workbench.rb
index fe4e6cce1..ae111a9c5 100644
--- a/app/models/workbench.rb
+++ b/app/models/workbench.rb
@@ -11,6 +11,7 @@ class Workbench < ActiveRecord::Base
   has_many :stop_areas, through: :stop_area_referential
   has_many :imports
   has_many :workbench_imports
+  has_many :compliance_check_sets
 
   validates :name, presence: true
   validates :organisation, presence: true
diff --git a/app/policies/compliance_check_set_policy.rb b/app/policies/compliance_check_set_policy.rb
new file mode 100644
index 000000000..3f715649e
--- /dev/null
+++ b/app/policies/compliance_check_set_policy.rb
@@ -0,0 +1,7 @@
+class ComplianceCheckSetPolicy < ApplicationPolicy
+  class Scope < Scope
+    def resolve
+      scope
+    end
+  end
+end
diff --git a/app/views/compliance_check_sets/_filters.html.slim b/app/views/compliance_check_sets/_filters.html.slim
new file mode 100644
index 000000000..609754eec
--- /dev/null
+++ b/app/views/compliance_check_sets/_filters.html.slim
@@ -0,0 +1,24 @@
+= search_form_for @q_for_form, url: workbench_compliance_check_sets_path(current_offer_workbench), builder: SimpleForm::FormBuilder, class: 'form form-filter' do |f|
+  .ffg-row
+    .input-group.search_bar
+      = f.search_field :referential_name_cont, class: 'form-control', placeholder: t('compliance_check_sets.filters.name')
+      span.input-group-btn
+        button.btn.btn-default type='submit'
+          span.fa.fa-search
+
+  .ffg-row
+    .form-group.togglable
+      = f.label t('activerecord.attributes.compliance_check_set.assigned_to'), required: false, class: 'control-label'
+      = f.input :parent_type_eq_any, collection: ComplianceCheckSet.order('parent_type'), as: :check_boxes, label: false, label_method: lambda {|w| ("<span>#{w}</span>").html_safe}, required: false, wrapper_html: {class: 'checkbox_list'}
+
+    .form-group.togglable
+      = f.label Import.human_attribute_name(:created_at), required: false, class: 'control-label'
+      .filter_menu
+        = f.simple_fields_for :created_at do |p|
+          = p.input :begin, as: :date, label: false, wrapper_html: {class: 'date smart_date filter_menu-item'}, default: @begin_range, include_blank: @begin_range ? false : true
+          = p.input :end, as: :date, label: false, wrapper_html: {class: 'date smart_date filter_menu-item'}, default: @end_range, include_blank: @end_range ? false : true
+
+  .actions
+    = link_to t('actions.erase'), @compliance_checks_sets, class: 'btn btn-link'
+    = f.submit t('actions.filter'), class: 'btn btn-default', id: 'referential_filter_btn'
+
diff --git a/app/views/compliance_check_sets/index.html.slim b/app/views/compliance_check_sets/index.html.slim
new file mode 100644
index 000000000..38c4babcf
--- /dev/null
+++ b/app/views/compliance_check_sets/index.html.slim
@@ -0,0 +1,54 @@
+/ PageHeader
+- header_params = ['jeux-de-donnees',
+        t('compliance_check_sets.index.title'),
+        '']
+= pageheader(*header_params) do
+
+  / Below is secundary actions & optional contents (filters, ...)
+  .row.mb-sm
+    .col-lg-12.text-right
+
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-12
+        = render 'filters'
+      .row
+        .col-lg-12
+          .select_table
+            = table_builder_2 @compliance_check_sets,
+              [ \
+                TableBuilderHelper::Column.new( \
+                  key: :ref, \
+                  attribute: 'referential_id' \
+                ), \
+                TableBuilderHelper::Column.new( \
+                  key: :creation_date, \
+                  attribute: Proc.new { |n| l(n.created_at, format: :long) if n.created_at } \
+                ), \
+                TableBuilderHelper::Column.new( \
+                  key: :associated_object, \
+                  attribute: Proc.new{|n| n.referential.name}, \
+                  link_to: lambda do |referential| \
+                    referential_path(referential, current_workbench_id: params[:id]) \
+                  end \
+                ), \
+                TableBuilderHelper::Column.new( \
+                  key: :assigned_to, \
+                  attribute: 'parent_type' \
+                ), \
+                TableBuilderHelper::Column.new(\
+                  key: :compliance_control_set, \
+                  attribute: Proc.new{ |n| (n.compliance_control_set.name) if n.compliance_control_set} \
+                ), \
+              ],
+              sortable: true,
+              links: [:show],
+              cls: 'table has-filter has-search'
+    - unless @compliance_check_sets.any?
+      .row.mt-xs
+        .col-lg-12
+          = replacement_msg t('compliance_check_sets.search_no_results')
+
+
diff --git a/app/views/compliance_check_sets/show.html.slim b/app/views/compliance_check_sets/show.html.slim
new file mode 100644
index 000000000..4e965947d
--- /dev/null
+++ b/app/views/compliance_check_sets/show.html.slim
@@ -0,0 +1,11 @@
+/ PageHeader
+= pageheader 'jeux-de-donnees',
+              @compliance_check_set.referential.name
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-6.col-md-6.col-sm-12.col-xs-12
+        = definition_list t('metadatas'),
+            ComplianceCheckSet.human_attribute_name(:id) => @compliance_check_set.referential.id,
+            ComplianceCheckSet.human_attribute_name(:name) => @compliance_check_set.referential.name
\ No newline at end of file
diff --git a/app/views/compliance_control_sets/index.html.slim b/app/views/compliance_control_sets/index.html.slim
index aee1595ef..ecb4eb75b 100644
--- a/app/views/compliance_control_sets/index.html.slim
+++ b/app/views/compliance_control_sets/index.html.slim
@@ -19,7 +19,7 @@
         .col-lg-12
           .select_table
             = table_builder_2 @compliance_control_sets,
-                    [ \
+              [ \
                 TableBuilderHelper::Column.new( \
                   key: :name, \
                   attribute: 'name', \
@@ -28,7 +28,7 @@
                     end \
                 ), \
                 TableBuilderHelper::Column.new( \
-                  key: :assignment, \
+                  key: :assigned_to, \
                   attribute: 'assignment' \
                 ), \
                 TableBuilderHelper::Column.new( \
@@ -44,9 +44,9 @@
                   attribute: Proc.new { |n| l(n.updated_at, format: :long) if n.updated_at }, \
                 ) \
               ],
-                    sortable: true,
-                    links: [:show],
-                    cls: 'table has-filter has-search'
+              sortable: true,
+              links: [:show],
+              cls: 'table has-filter has-search'
     - unless @compliance_control_sets.any?
       .row.mt-xs
         .col-lg-12
diff --git a/app/views/compliance_controls/_form.html.slim b/app/views/compliance_controls/_form.html.slim
index bb8f68464..3928f3550 100644
--- a/app/views/compliance_controls/_form.html.slim
+++ b/app/views/compliance_controls/_form.html.slim
@@ -10,11 +10,6 @@
       - f.object.class.dynamic_attributes.each do |attribute|
         = f.input attribute.to_sym
       end
-
-      = f.simple_fields_for :compliance_control_block do |c|
-        = c.input :name
-        = c.input :transport_mode, as: :select, collection:ComplianceControlBlock.transport_modes
-      end
   .separator
 
   = f.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'compliance_control_form'
diff --git a/app/views/layouts/navigation/_main_nav_left.html.slim b/app/views/layouts/navigation/_main_nav_left.html.slim
index 12139c93b..062c9383c 100644
--- a/app/views/layouts/navigation/_main_nav_left.html.slim
+++ b/app/views/layouts/navigation/_main_nav_left.html.slim
@@ -37,7 +37,7 @@
               span Import
             = link_to calendars_path, class: 'list-group-item' do
               span Modèles de calendrier
-            = link_to '#', class: 'list-group-item' do
+            = link_to workbench_compliance_check_sets_path(current_offer_workbench), class: 'list-group-item' do
               span Rapport de contrôle
             = link_to compliance_control_sets_path, class: 'list-group-item' do
               span Jeux de contrôle
diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim
index dda5afd44..fb07c45a2 100644
--- a/app/views/lines/index.html.slim
+++ b/app/views/lines/index.html.slim
@@ -36,7 +36,7 @@
               ), \
               TableBuilderHelper::Column.new( \
                 key: :deactivated, \
-                attribute: Proc.new{|n| n.deactivated? ? t('false') : t('true')} \
+                attribute: Proc.new { |n| line_status(n.deactivated?) } \
               ), \
               TableBuilderHelper::Column.new( \
                 key: 'networks.name', \
diff --git a/app/views/referentials/show.html.slim b/app/views/referentials/show.html.slim
index e1d89cba4..0fdd79e14 100644
--- a/app/views/referentials/show.html.slim
+++ b/app/views/referentials/show.html.slim
@@ -58,7 +58,7 @@
               ), \
               TableBuilderHelper::Column.new( \
                 key: :deactivated, \
-                attribute: Proc.new { |n| n.deactivated? ? t('false') : t('true') } \
+                attribute: Proc.new { |n| line_status(n.deactivated?) } \
               ), \
               TableBuilderHelper::Column.new( \
                 key: :transport_mode, \
diff --git a/app/views/routes/show.html.slim b/app/views/routes/show.html.slim
index e2681d215..edc2d254b 100644
--- a/app/views/routes/show.html.slim
+++ b/app/views/routes/show.html.slim
@@ -48,7 +48,7 @@
               ), \
               TableBuilderHelper::Column.new( \
                 key: :deleted_at, \
-                attribute: Proc.new { |s| s.try(:stop_area).deleted_at ? t('false') : t('true') }, \
+                attribute: Proc.new { |s| line_status(s.try(:stop_area).deleted_at) } \
               ), \
               TableBuilderHelper::Column.new( \
                 key: :zip_code, \
diff --git a/app/views/stop_areas/index.html.slim b/app/views/stop_areas/index.html.slim
index 4c95761d2..95b9b1b0e 100644
--- a/app/views/stop_areas/index.html.slim
+++ b/app/views/stop_areas/index.html.slim
@@ -39,7 +39,7 @@
               ), \
               TableBuilderHelper::Column.new( \
                 key: :deleted_at, \
-                attribute: Proc.new { |s| s.deleted_at ? t('false') : t('true') } \
+                attribute: Proc.new { |s| line_status(s.deleted_at) } \
               ), \
               TableBuilderHelper::Column.new( \
                 key: :zip_code, \