Skip to content

Pudding's changes to involvements view. #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
genslow wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Pudding's changes to involvements view. #17

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd7be64
Updating involvements view to support signin/out
genslow Apr 10, 2014
7af6b4e
Changing checkin to DataPicker
genslow Apr 10, 2014
ed3d9d9
Merge remote-tracking branch 'upstream/master' into pudding-hqwindow
genslow Apr 10, 2014
1ec74a8
Adding conditional display of signin/out for hqwindow
genslow Apr 11, 2014
a7b2abd
Removed hqwin controller method - not needed anymore.
genslow Apr 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions app/views/involvements/show.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
= stylesheet_link_tag "//ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/smoothness/jquery-ui.css"
%h1
= @involvement.name
- if @involvement.person.display_name != @involvement.name
Expand All @@ -12,6 +13,8 @@
%ul
%li.tab-title
%a.tab-link(href='#tab-status') Status
%li.tab-title
%a.tab-link(href='#tab-signinout') Sign In/Out
%li.tab-title
%a.tab-link(href='#tab-schedule') Schedule
%li.tab-title
Expand Down Expand Up @@ -39,6 +42,30 @@
%dt#label_positions< Positions
%dd#value_positions<= @involvement.positions.to_sentence

.tab-content#tab-signinout
- worklog = WorkLog.new( {start_time: Time.zone.now, involvement_id: @involvement.id, event_id: @event.id} )
= semantic_form_for [@involvement.event, worklog] do |f|
= f.inputs do
= f.input :involvement_id, :as => :hidden
- if !@involvement.work_logs.any? &:on_duty?
= f.input :position, :as => :select, :collection => @involvement.positions
- else
/ TODO set value to current position
= f.input :position, :as => :hidden
-# = f.input :shift, :as => :select, :collection => Hash[@shifts.map {|s| [s.to_s_with_date, s.id]}]
-# = f.input :event, :as => :select, :collection => @events
/ TODO :as => datetime_picker (read only?)
- if @involvement.work_logs.any? &:on_duty?
= f.input :end_time, :as => :DatePicker, :value => Time.now.to_formatted_s(:db)
- else
= f.input :start_time, :as => :DatePicker, :value => Time.now.to_formatted_s(:db)
= f.actions do
-# = f.input :audit_comment, as: :audit, required: true
- if @involvement.work_logs.any? &:on_duty?
= f.submit 'Sign Out'
- else
= f.submit 'Sign In'

.tab-content#tab-schedule
= render :partial => 'slots/list_for_involvement', :locals => {:involvement => @involvement}
- if policy(@involvement).schedule? and @event.signup_open?
Expand Down