From dd7be645ba25f3a687556c71fb85eeccd0768c9c Mon Sep 17 00:00:00 2001 From: Greg Enslow Date: Wed, 9 Apr 2014 19:51:55 -0700 Subject: [PATCH 1/4] Updating involvements view to support signin/out --- app/controllers/involvements_controller.rb | 13 +++++++++++++ app/views/involvements/show.html.haml | 16 ++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/app/controllers/involvements_controller.rb b/app/controllers/involvements_controller.rb index d7f4da5..8c8bb2b 100644 --- a/app/controllers/involvements_controller.rb +++ b/app/controllers/involvements_controller.rb @@ -66,6 +66,19 @@ def show end end end + + # GET /involvements/1/hqwin + def hqwin + respond_to do |format| + format.html # hqwin.html.erb + format.json do + render json: @involvement, include: { + positions: {only: [:id, :name]}, + slots: {include: {shift: {}, position: {only: [:id, :name]}}} + } + end + end + end # GET /involvements/1/changes # GET /involvements/1/changes.json diff --git a/app/views/involvements/show.html.haml b/app/views/involvements/show.html.haml index d66f338..d655721 100644 --- a/app/views/involvements/show.html.haml +++ b/app/views/involvements/show.html.haml @@ -12,6 +12,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 @@ -39,6 +41,20 @@ %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 + = f.input :position, :as => :select, :collection => @involvement.positions + -# = 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 + = f.input :start_time + = f.actions do + -# = f.input :audit_comment, as: :audit, required: true + = 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? From 7af6b4ed0b0eaef6945e7c846485e3e1d04b17af Mon Sep 17 00:00:00 2001 From: Greg Enslow Date: Wed, 9 Apr 2014 20:44:31 -0700 Subject: [PATCH 2/4] Changing checkin to DataPicker --- app/views/involvements/show.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/involvements/show.html.haml b/app/views/involvements/show.html.haml index d655721..91be652 100644 --- a/app/views/involvements/show.html.haml +++ b/app/views/involvements/show.html.haml @@ -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 @@ -50,7 +51,7 @@ -# = 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 - = f.input :start_time + = f.input :start_time, :as => :DatePicker, :value => Time.now.to_formatted_s(:db) = f.actions do -# = f.input :audit_comment, as: :audit, required: true = f.submit 'Sign In' From 1ec74a8f3c14100a1331df1fbd4a4265f40b8589 Mon Sep 17 00:00:00 2001 From: Greg Enslow Date: Thu, 10 Apr 2014 17:39:05 -0700 Subject: [PATCH 3/4] Adding conditional display of signin/out for hqwindow --- app/views/involvements/show.html.haml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/views/involvements/show.html.haml b/app/views/involvements/show.html.haml index 91be652..5a42575 100644 --- a/app/views/involvements/show.html.haml +++ b/app/views/involvements/show.html.haml @@ -47,14 +47,24 @@ = semantic_form_for [@involvement.event, worklog] do |f| = f.inputs do = f.input :involvement_id, :as => :hidden - = f.input :position, :as => :select, :collection => @involvement.positions + - 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 - = f.input :start_time, :as => :DatePicker, :value => Time.now.to_formatted_s(:db) + / 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 - = f.submit 'Sign In' + - 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} From a7b2abd672e1bdc3d2f132a92e33bca32c2ab87d Mon Sep 17 00:00:00 2001 From: Greg Enslow Date: Thu, 10 Apr 2014 17:46:23 -0700 Subject: [PATCH 4/4] Removed hqwin controller method - not needed anymore. --- app/controllers/involvements_controller.rb | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/app/controllers/involvements_controller.rb b/app/controllers/involvements_controller.rb index 8c8bb2b..d7f4da5 100644 --- a/app/controllers/involvements_controller.rb +++ b/app/controllers/involvements_controller.rb @@ -66,19 +66,6 @@ def show end end end - - # GET /involvements/1/hqwin - def hqwin - respond_to do |format| - format.html # hqwin.html.erb - format.json do - render json: @involvement, include: { - positions: {only: [:id, :name]}, - slots: {include: {shift: {}, position: {only: [:id, :name]}}} - } - end - end - end # GET /involvements/1/changes # GET /involvements/1/changes.json