diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee | 12 | ||||
| -rw-r--r-- | app/inputs/check_boxes_input.rb | 17 | ||||
| -rw-r--r-- | app/inputs/extended_time_picker_input.rb | 12 | ||||
| -rw-r--r-- | app/views/access_links/_form.html.erb | 26 | ||||
| -rw-r--r-- | app/views/access_points/_form.html.erb | 4 | ||||
| -rw-r--r-- | app/views/connection_links/_form.erb | 8 |
6 files changed, 52 insertions, 27 deletions
diff --git a/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee b/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee index bfa7c5587..9945022bc 100644 --- a/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee +++ b/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee @@ -1,8 +1,16 @@ jQuery -> if(!(Modernizr.inputtypes && Modernizr.inputtypes.time)) - $('input[type="time"]').timepicker( + $('.timepicker_basic').timepicker( template: false, showInputs: false, minuteStep: 1, showMeridian: false, - )
\ No newline at end of file + ) + $('.timepicker_seconds').timepicker( + template: false, + showInputs: false, + minuteStep: 1, + secondStep: 1, + showMeridian: false, + showSeconds: true + )
\ No newline at end of file diff --git a/app/inputs/check_boxes_input.rb b/app/inputs/check_boxes_input.rb new file mode 100644 index 000000000..83137c224 --- /dev/null +++ b/app/inputs/check_boxes_input.rb @@ -0,0 +1,17 @@ +class CheckBoxesInput < Formtastic::Inputs::CheckBoxesInput + + def selected_values + if object.respond_to?(method) + selected_items = [object.send(method)].compact.flatten + + # FIX for ids only + return selected_items.map(&:to_s).compact if selected_items.all?{ |i| i.is_a? Integer} + + [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact + else + [] + end + end + +end + diff --git a/app/inputs/extended_time_picker_input.rb b/app/inputs/extended_time_picker_input.rb new file mode 100644 index 000000000..46b5bbdb4 --- /dev/null +++ b/app/inputs/extended_time_picker_input.rb @@ -0,0 +1,12 @@ +class ExtendedTimePickerInput < Formtastic::Inputs::TimePickerInput + + def value + return options[:input_html][:value] if options[:input_html] && options[:input_html].key?(:value) + val = object.send(method) + return "00:00:00" if val.is_a?(Date) + return val.strftime("%H:%M:%S") if val.is_a?(Time) + return val if val.nil? + val.to_s + end + +end diff --git a/app/views/access_links/_form.html.erb b/app/views/access_links/_form.html.erb index a5145adc7..4de6e8e85 100644 --- a/app/views/access_links/_form.html.erb +++ b/app/views/access_links/_form.html.erb @@ -6,29 +6,17 @@ <%= form.input :name %> <%= form.input :access_link_type, :as => :select, :collection => Chouette::AccessLink.access_link_types, :include_blank => false, :member_label => Proc.new { |type| t("connection_link_types.label.#{type}") } %> <%= form.input :comment %> - <%= form.input :link_distance %> - <%= form.inputs :name => t('access_links.show.durations') do %> - <%= form.input "default_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %> - <%= form.input "default_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %> - <%= form.input "default_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %> - <%= form.input :default_duration, :ignore_date=>true,:include_seconds=>true, :label => @access_link.human_attribute_name("default_duration")%> - <%= form.input "frequent_traveller_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %> - <%= form.input "frequent_traveller_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %> - <%= form.input "frequent_traveller_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %> - <%= form.input :frequent_traveller_duration, :ignore_date=>true,:include_seconds=>true, :label => @access_link.human_attribute_name("frequent_traveller_duration")%> - <%= form.input "occasional_traveller_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %> - <%= form.input "occasional_traveller_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %> - <%= form.input "occasional_traveller_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %> - <%= form.input :occasional_traveller_duration, :ignore_date=>true,:include_seconds=>true, :label => @access_link.human_attribute_name("occasional_traveller_duration")%> - <%= form.input "mobility_restricted_traveller_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %> - <%= form.input "mobility_restricted_traveller_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %> - <%= form.input "mobility_restricted_traveller_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %> - <%= form.input :mobility_restricted_traveller_duration, :ignore_date=>true,:include_seconds=>true, :label => @access_link.human_attribute_name("mobility_restricted_traveller_duration")%> - <% end %> + <%= form.input :link_distance %> <%= form.input :mobility_restricted_suitability,:as => :boolean %> <%= form.input :stairs_availability,:as => :boolean %> <%= form.input :lift_availability,:as => :boolean %> <%= form.input :objectid, :required => !@access_link.new_record? %> + <%= form.inputs :name => t('access_links.show.durations') do %> + <%= form.input :default_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :label => @access_link.human_attribute_name("default_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> + <%= form.input :frequent_traveller_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :include_seconds => true, :label => @access_link.human_attribute_name("frequent_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> + <%= form.input :occasional_traveller_duration, :as => :extended_time_picker, :size => 8, :include_seconds => true, :label => @access_link.human_attribute_name("occasional_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> + <%= form.input :mobility_restricted_traveller_duration, :as => :extended_time_picker, :include_seconds => true, :label => @access_link.human_attribute_name("mobility_restricted_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> + <% end %> <% end %> <%= form.actions do %> <%= form.action :submit, :as => :button %> diff --git a/app/views/access_points/_form.html.erb b/app/views/access_points/_form.html.erb index b124f9237..e25379d8f 100644 --- a/app/views/access_points/_form.html.erb +++ b/app/views/access_points/_form.html.erb @@ -10,8 +10,8 @@ <%= form.input :street_name %> <%= form.input :country_code %> <%= form.input :comment %> - <%= form.input :openning_time, :as => :time_picker, :input_html => { :class => "form-control input-sm dateselect-time"}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> - <%= form.input :closing_time, :as => :time_picker, :input_html => { :class => "form-control input-sm dateselect-time"}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> + <%= form.input :openning_time, :as => :time_picker, :input_html => { :class => "form-control input-sm timepicker_basic"}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> + <%= form.input :closing_time, :as => :time_picker, :input_html => { :class => "form-control input-sm timepicker_basic"}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> <%= form.input :mobility_restricted_suitability,:as => :boolean %> <%= form.input :stairs_availability,:as => :boolean %> <%= form.input :lift_availability,:as => :boolean %> diff --git a/app/views/connection_links/_form.erb b/app/views/connection_links/_form.erb index 52f49d852..41eef1480 100644 --- a/app/views/connection_links/_form.erb +++ b/app/views/connection_links/_form.erb @@ -12,10 +12,10 @@ <%= form.input :objectid, :required => !@connection_link.new_record? %> <% end %> <%= form.inputs :name => t('connection_links.show.durations') do %> - <%= form.input :default_duration, :as => :time_select, :size => 8, :include_seconds=>true, :label => @connection_link.human_attribute_name("default_duration"), :input_html => { :placeholder => "HH:MM" } %> - <%= form.input :frequent_traveller_duration, :as => :time_select, :size => 8, :include_seconds=>true, :label => @connection_link.human_attribute_name("frequent_traveller_duration"), :input_html => { :placeholder => "HH:MM:SS" } %> - <%= form.input :occasional_traveller_duration, :as => :time_select, :size => 8, :include_seconds=>true, :label => @connection_link.human_attribute_name("occasional_traveller_duration"), :input_html => { :placeholder => "HH:MM:SS" } %> - <%= form.input :mobility_restricted_traveller_duration, :as => :time_select, :include_seconds=>true, :label => @connection_link.human_attribute_name("mobility_restricted_traveller_duration"), :input_html => { :placeholder => "HH:MM:SS" } %> + <%= form.input :default_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :label => @connection_link.human_attribute_name("default_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> + <%= form.input :frequent_traveller_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :include_seconds => true, :label => @connection_link.human_attribute_name("frequent_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> + <%= form.input :occasional_traveller_duration, :as => :extended_time_picker, :size => 8, :include_seconds => true, :label => @connection_link.human_attribute_name("occasional_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> + <%= form.input :mobility_restricted_traveller_duration, :as => :extended_time_picker, :include_seconds => true, :label => @connection_link.human_attribute_name("mobility_restricted_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %> <% end %> <%= form.actions do %> |