diff options
| author | Robert | 2017-10-27 12:49:47 +0200 | 
|---|---|---|
| committer | Robert | 2017-10-31 19:08:52 +0100 | 
| commit | e0d52eef6b0c48e646cfc7e03322647b1a15181f (patch) | |
| tree | 6dceb4dba9cbe89e420b7bdd4dfbfbf3db853431 /app | |
| parent | 63f3a7838140b2cac5dfca7cc80cb78f2c369c69 (diff) | |
| download | chouette-core-e0d52eef6b0c48e646cfc7e03322647b1a15181f.tar.bz2 | |
Refs: #4774;
        DB Setup for specs
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/compliance_control_sets_controller.rb | 9 | ||||
| -rw-r--r-- | app/helpers/table_builder_helper.rb | 1 | ||||
| -rw-r--r-- | app/views/compliance_control_sets/grouping.html.slim | 39 | ||||
| -rw-r--r-- | app/views/layouts/navigation/_main_nav_left.html.slim | 21 | 
4 files changed, 59 insertions, 11 deletions
| diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb index 570204065..7d695a197 100644 --- a/app/controllers/compliance_control_sets_controller.rb +++ b/app/controllers/compliance_control_sets_controller.rb @@ -29,6 +29,13 @@ class ComplianceControlSetsController < InheritedResources::Base      redirect_to(compliance_control_sets_path)    end +  def grouping +    show! do | format | +      format.html do +        @controls = @compliance_control_set.compliance_controls.to_a +      end +    end +  end    protected    def begin_of_association_chain @@ -54,4 +61,4 @@ class ComplianceControlSetsController < InheritedResources::Base    def compliance_control_set_params      params.require(:compliance_control_set).permit(:name, :id)    end -end
\ No newline at end of file +end diff --git a/app/helpers/table_builder_helper.rb b/app/helpers/table_builder_helper.rb index 95f53a90d..3eacffa9e 100644 --- a/app/helpers/table_builder_helper.rb +++ b/app/helpers/table_builder_helper.rb @@ -116,6 +116,7 @@ module TableBuilderHelper            hcont << content_tag(:th, checkbox(id_name: '0', value: 'all'))          end +  require 'pry'; binding.pry          columns.each do |column|            if overhead.empty?              hcont << content_tag(:th, build_column_header( diff --git a/app/views/compliance_control_sets/grouping.html.slim b/app/views/compliance_control_sets/grouping.html.slim new file mode 100644 index 000000000..d527601b2 --- /dev/null +++ b/app/views/compliance_control_sets/grouping.html.slim @@ -0,0 +1,39 @@ +/ PageContent +.page_content +  .container-fluid +    .row +      .col-lg-6.col-md-6.col-sm-12.col-xs-12 +        = definition_list t('metadatas'), +            ComplianceControlSet.human_attribute_name(:name) => @compliance_control_set.name +    .row +      .col-lg-12 +        h2 +          = transport_mode("", "") +      .row +        .col-lg-12 +          .select_table +            = table_builder_2 @coontrols, \ +                    [ \ +                TableBuilderHelper::Column.new( \ +                  key: :code, \ +                  attribute: 'code' \ +                ), \ +                TableBuilderHelper::Column.new( \ +                  key: :name, \ +                  attribute: 'name', \ +                  link_to: lambda do |compliance_control| \ +                      compliance_control_set_compliance_control_path(@compliance_control_set, compliance_control) \ +                    end \ +                ), \ +                TableBuilderHelper::Column.new( \ +                  key: :criticity, \ +                  attribute: 'criticity' \ +                ), \ +                TableBuilderHelper::Column.new( \ +                  key: :comment, \ +                  attribute: 'comment' \ +                ), \ +              ], +              sortable: true, +              cls: 'table has-filter has-search' + diff --git a/app/views/layouts/navigation/_main_nav_left.html.slim b/app/views/layouts/navigation/_main_nav_left.html.slim index 062c9383c..837b9cb73 100644 --- a/app/views/layouts/navigation/_main_nav_left.html.slim +++ b/app/views/layouts/navigation/_main_nav_left.html.slim @@ -31,16 +31,17 @@          #miTwo.panel-collapse.collapse            .list-group -            = link_to workbench_path(current_offer_workbench), class: "list-group-item #{params[:controller] == 'workbenches' ? 'active' : ''}" do -              span Jeux de données -            = link_to workbench_imports_path(current_offer_workbench), class: "list-group-item #{(params[:controller] == 'imports') ? 'active' : ''}" do -              span Import -            = link_to calendars_path, class: 'list-group-item' do -              span Modèles de calendrier -            = 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 +            - if current_user +              = link_to workbench_path(current_offer_workbench), class: "list-group-item #{params[:controller] == 'workbenches' ? 'active' : ''}" do +                span Jeux de données +              = link_to workbench_imports_path(current_offer_workbench), class: "list-group-item #{(params[:controller] == 'imports') ? 'active' : ''}" do +                span Import +              = link_to calendars_path, class: 'list-group-item' do +                span Modèles de calendrier +              = 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        .menu-item.panel          .panel-heading | 
