aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume2017-10-03 11:40:25 +0200
committerGuillaume2017-10-03 12:09:47 +0200
commitcdabb8ff3661e8b2fae462ed9e10b4447e746a06 (patch)
tree3d58a59c2cd16d0b8ec22aecd741452f20c40a44
parent92b1bd636928888477213321c7a7fecf8e873e46 (diff)
downloadchouette-core-cdabb8ff3661e8b2fae462ed9e10b4447e746a06.tar.bz2
create helper for transport_modes title Refs #4660
-rw-r--r--app/helpers/compliance_control_blocks_helper.rb10
-rw-r--r--app/views/compliance_control_sets/show.html.slim6
2 files changed, 14 insertions, 2 deletions
diff --git a/app/helpers/compliance_control_blocks_helper.rb b/app/helpers/compliance_control_blocks_helper.rb
new file mode 100644
index 000000000..ccfbf4e25
--- /dev/null
+++ b/app/helpers/compliance_control_blocks_helper.rb
@@ -0,0 +1,10 @@
+module ComplianceControlBlocksHelper
+ def transport_mode(transport_mode, transport_submode)
+ if (transport_mode) && (transport_submode) != ""
+ transportMode = "[" + transport_mode + "]" + "[" + transport_submode + "]"
+ else
+ transportMode = "[Tous les modes de transport]"
+ end
+ transportMode
+ end
+end \ No newline at end of file
diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index 4443e8005..e66291150 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -30,7 +30,8 @@
/= render 'filters'
.row
.col-lg-12
- = "Tous mode de transport"
+ h2
+ = transport_mode("", "")
.col-lg-12
.select_table
= table_builder_2 @compliance_controls_without_block,
@@ -61,7 +62,8 @@
- @compliance_control_set.compliance_control_blocks.each do |block|
.row
.col-lg-12
- = "#{block.transport_mode} / #{block.transport_mode}"
+ h2
+ = transport_mode(block.transport_mode, block.transport_submode)
.row
.col-lg-12
.select_table