diff options
| -rw-r--r-- | app/assets/javascripts/vehicle_journeys_frequencies.js.coffee | 3 | ||||
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/vehicle_journeys_frequencies/_frequency.html.erb | 8 | ||||
| -rw-r--r-- | config/locales/frequencies.en.yml | 4 | ||||
| -rw-r--r-- | config/locales/frequencies.fr.yml | 4 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
6 files changed, 21 insertions, 3 deletions
diff --git a/app/assets/javascripts/vehicle_journeys_frequencies.js.coffee b/app/assets/javascripts/vehicle_journeys_frequencies.js.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/vehicle_journeys_frequencies.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index 32bc68a5e..a94fe8ed6 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -99,8 +99,7 @@ class VehicleJourneysController < ChouetteController :is_frequency] }, { frequencies_attributes: [ :scheduled_headway_interval, :first_departure_time, :last_departure_time, - :exact_time ] }, - :is_frequency ) + :exact_time ] } ) end end diff --git a/app/views/vehicle_journeys_frequencies/_frequency.html.erb b/app/views/vehicle_journeys_frequencies/_frequency.html.erb new file mode 100644 index 000000000..a0d4d3ca5 --- /dev/null +++ b/app/views/vehicle_journeys_frequencies/_frequency.html.erb @@ -0,0 +1,8 @@ +<tr> + <td></td> + <td><%= frequency.first_departure_time %></td> + <td><%= frequency.last_departure_time %></td> + <td><%= frequency.scheduled_headway_interval %></td> + <td><%= frequency.exact_time %></td> + <td><i class="fa fa-trash"></i></td> +</tr> diff --git a/config/locales/frequencies.en.yml b/config/locales/frequencies.en.yml index b32da80c9..9bd4250bd 100644 --- a/config/locales/frequencies.en.yml +++ b/config/locales/frequencies.en.yml @@ -3,3 +3,7 @@ en: time_band: Time band form: add_frequency_line: Add a line + first_departure: First departure + last_departure: Last departure + scheduled_headway_interval: Interval + exact_time: Exact? diff --git a/config/locales/frequencies.fr.yml b/config/locales/frequencies.fr.yml index 337a00ae9..2bce7ae09 100644 --- a/config/locales/frequencies.fr.yml +++ b/config/locales/frequencies.fr.yml @@ -3,3 +3,7 @@ fr: time_band: Plages horaires form: add_frequency_line: Ajouter une ligne + first_departure: Premier départ + last_departure: Dernier départ + scheduled_headway_interval: Intervalle + exact_time: Exact ? diff --git a/db/schema.rb b/db/schema.rb index 8a2cdef07..ee77ef01d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20151022150419) do +ActiveRecord::Schema.define(version: 20151015150300) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |