5-minute steps in the time selection. #2669

pull/6827/head
Felix Schäfer 14 years ago
parent ed974e3d3c
commit d17143ecf0
  1. 2
      app/views/meetings/_form.html.erb
  2. 19
      features/meetings_new.feature

@ -3,7 +3,7 @@
<div class="box tabular">
<p><%= f.text_field :title, :required => true, :size => 60 %></p>
<p><%= f.text_field :location, :size => 60 %></p>
<p><%= f.text_field :start_date, :required => true, :size => 10 %><%= calendar_for('meeting_start_date') %> <%= time_select("meeting", "start_time", :ignore_date => true) %></p>
<p><%= f.text_field :start_date, :required => true, :size => 10 %><%= calendar_for('meeting_start_date') %> <%= time_select "meeting", "start_time", :ignore_date => true, :minute_step => 5 %></p>
<p><label for="meeting_duration"><%=l :field_duration %></label><%= text_field_tag "meeting[duration]", @meeting.duration, :size => 5 %> <em>(<%=l :text_in_hours %>)</em></p>
<div><label><%=l :field_participants %></label>
<table class="list">

@ -55,4 +55,21 @@ Feature: Create new meetings
And I click on "Create"
Then I should see "Successful creation."
And I should see "FSR Sitzung 123"
# TODO sollten hier noch die "Defaults" abgefragt werden? Wahrscheinlich eher eine RSpec Sache?
# TODO sollten hier noch die "Defaults" abgefragt werden? Wahrscheinlich eher eine RSpec Sache?
@javascript
Scenario: The start-time should be selectable in 5-minute increments
Given the role "user" may have the following rights:
| view_meetings |
| create_meetings |
When I login as "alice"
And I go to the Meetings page for the project called "dingens"
And I click on "New Meeting"
Then I should see "New Meeting"
And I should not see "01" within "#meeting_start_time_5i"
And I should not see "14" within "#meeting_start_time_5i"
# TODO entweder ich habe einen Knick in der Optik, oder die beiden sollten klappen, geht aber auch mit den 2 nächsten Zeilen...
#And "00" should be selectable from "meeting_start_time_5i"
#And "05" should be selectable from "meeting_start_time_5i"
And I should see "00" within "#meeting_start_time_5i"
And I should see "05" within "#meeting_start_time_5i"
Loading…
Cancel
Save