From 2a6e10ee9d7d00b523843b07c842d3cba77875a2 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Thu, 21 Nov 2013 20:35:23 -0500 Subject: [PATCH 01/81] Disabling by default was just annoying --- app/components/tasks.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/components/tasks.rb b/app/components/tasks.rb index 3956250..6ce8a8f 100644 --- a/app/components/tasks.rb +++ b/app/components/tasks.rb @@ -2,8 +2,6 @@ class Tasks < Netzke::Basepack::Grid def configure(c) super - #disable by default, will be enabled once bike is clicked - c.disabled = true task_list_id = nil if session[:selected_bike_id] task_list_id = Bike.find_by_id(session[:selected_bike_id]).task_list.id From a11f5a1b91b34d9f0c96fe59dc64bf31fb1029ab Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Thu, 21 Nov 2013 20:36:35 -0500 Subject: [PATCH 02/81] Needed to add task_list_id as attr_accessible Also improved labels for adding task --- app/components/tasks.rb | 11 ++++++----- app/models/task.rb | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/components/tasks.rb b/app/components/tasks.rb index 6ce8a8f..c153ded 100644 --- a/app/components/tasks.rb +++ b/app/components/tasks.rb @@ -29,13 +29,14 @@ class Tasks < Netzke::Basepack::Grid end def default_fields_for_forms - fields = [] - fields << { :no_binding => true, :xtype => 'displayfield', :fieldLabel => "No Bike Selected", :value => "Select a Bike First!"} - fields.concat( [ + bike = Bike.find_by_id(session[:selected_bike_id]) + bike = "Select a Bike First!" if bike.nil? + [ + { :no_binding => true, :xtype => 'displayfield', :fieldLabel => "Bike Selected", :value => "#{bike.to_s}"}, :done, :task, - :notes - ]) + :notes, + ] end #override with nil to remove actions diff --git a/app/models/task.rb b/app/models/task.rb index 4a1a5a0..85bfa5b 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,5 +1,5 @@ class Task < ActiveRecord::Base - attr_accessible :task, :notes, :done + attr_accessible :task, :notes, :done, :task_list_id belongs_to :task_list From df3c29a89964bb246710624faec9e55ad4152a53 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 12 Jan 2014 14:24:57 -0500 Subject: [PATCH 03/81] Use twitter bootstrap classes on login --- app/views/devise/sessions/new.html.erb | 40 ++++++++++++++++---------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index f38b9b1..141a25c 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -5,34 +5,44 @@

<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> -
<%= f.label :username%>
- <%= f.text_field :username%>
+
+ <%= f.text_field :username, placeholder: "Username", class: "form-control input-lg"%> +
-
<%= f.label :password %>
- <%= f.password_field :password %>
+
+ <%= f.password_field :password, placeholder: "Password", class: "form-control input-lg" %> +
+
<% if devise_mapping.rememberable? -%> -
<%= f.check_box :remember_me %> <%= f.label :remember_me %>
+ <% end -%> +
-
<%= f.submit "Sign in" %>
- - - <%= f.hidden_field :password, :value => 'password' %> -
<%= f.submit "Sign in as #{user.username}" %>
+ <%= f.hidden_field :username, :value => user.username%> + <%= f.hidden_field :password, :value => 'password' %> + <%= f.submit "Sign in as #{user.username}", class:"btn btn-info" %> <% end %> <% end %> +

<% end %> From c9d2da3e50b9449ea341633283be98916d4860a1 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Wed, 15 Jan 2014 00:00:18 -0500 Subject: [PATCH 04/81] Make sign up links like buttons --- app/views/devise/_links.erb | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/views/devise/_links.erb b/app/views/devise/_links.erb index 33b1120..136f3f0 100644 --- a/app/views/devise/_links.erb +++ b/app/views/devise/_links.erb @@ -1,21 +1,31 @@ <%- if controller_name != 'sessions' %> - <%= link_to "Sign in", new_session_path(resource_name) %>
+

+ <%= link_to "Sign in", new_session_path(resource_name), class: "btn btn-block" %>
+

<% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
+

+ <%= link_to "Sign up", new_registration_path(resource_name), class: "btn btn-block" %>
+

<% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+

+ <%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn btn-block" %>
+

<% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+

+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "btn btn-block" %>
+

<% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+

+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: "btn btn-block" %>
+

<% end -%> <%- if devise_mapping.omniauthable? %> From a35bd2f22bf9fa3789f3e7f4515565f24422cdc5 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Wed, 15 Jan 2014 00:33:32 -0500 Subject: [PATCH 05/81] make sign up mobile friendly --- .../_user_profile_fields.html.haml | 39 ++++++----------- app/views/devise/registrations/new.html.haml | 43 +++++++------------ 2 files changed, 29 insertions(+), 53 deletions(-) diff --git a/app/views/devise/registrations/_user_profile_fields.html.haml b/app/views/devise/registrations/_user_profile_fields.html.haml index 1a3ec42..471e288 100644 --- a/app/views/devise/registrations/_user_profile_fields.html.haml +++ b/app/views/devise/registrations/_user_profile_fields.html.haml @@ -1,25 +1,14 @@ -%fieldset - .control-group - = f.label :addrStreet1, :class => "control-label" - .controls - = f.text_field :addrStreet1, :class => "control-label" - .control-group - = f.label :addrStreet2, :class => "control-label" - .controls - = f.text_field :addrStreet2, :class => "control-label" - .control-group - = f.label :addrCity, :class => "control-label" - .controls - = f.text_field :addrCity, :class => "control-label" - .control-group - = f.label :addrState, :class => "control-label" - .controls - = f.text_field :addrState, :class => "control-label" - .control-group - = f.label :addrZip, :class => "control-label" - .controls - = f.text_field :addrZip, :class => "control-label" - .control-group - = f.label :phone, :class => "control-label" - .controls - = f.text_field :phone, :class => "control-label" +%p + %fieldset + .form-group + = f.text_field :addrStreet1, placeholder: "Street Address Line 1", :class => "form-control input-lg" + .form-group + = f.text_field :addrStreet2, placeholder: "Street Address Line 2",:class => "form-control input-lg" + .form-group + = f.text_field :addrCity, placeholder: "City", :class => "form-control input-lg" + .form-group + = f.text_field :addrState, placeholder: "State Abbreviation", :class => "form-control input-lg" + .form-group + = f.text_field :addrZip, placeholder: "Zip Code", :class => "form-control input-lg" + .form-group + = f.text_field :phone, placeholder: "Phone", :class => "form-control input-lg" diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index efece1c..1b7d6b5 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -1,36 +1,23 @@ = stylesheet_link_tag "bootstrap_and_overrides", :media => "all" -= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :class => "form-horizontal"}) do |f| += form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| = devise_error_messages! .controls %h2 Sign up - .control-group - = f.label :username, :class => "control-label" - .controls - = f.text_field :username - .control-group - = f.label :first_name, :class => "control-label" - .controls - = f.text_field :first_name - .control-group - = f.label :last_name, :class => "control-label" - .controls - = f.text_field :last_name - .control-group - = f.label :email, :class => "control-label" - .controls - = f.email_field :email + .form-group + = f.text_field :username, placeholder: "Username", :class => "form-control input-lg" + .form-group + = f.text_field :first_name, placeholder: "First Name", :class => "form-control input-lg" + .form-group + = f.text_field :last_name, placeholder: "Last Name", :class => "form-control input-lg" + .form-group + = f.email_field :email, placeholder: "E-mail", :class => "form-control input-lg" - profile_builder = resource.user_profiles.empty? ? resource.user_profiles.build : resource.user_profiles = f.fields_for :user_profiles, profile_builder do |builder| = render 'user_profile_fields', f: builder - .control-group - = f.label :password, :class => "control-label" - .controls - = f.password_field :password - .control-group - = f.label :password_confirmation, :class => "control-label" - .controls - = f.password_field :password_confirmation - .control-group - .controls - = f.submit "Sign up" + .form-group + = f.password_field :password, placeholder: "Password", :class => "form-control input-lg" + .form-group + = f.password_field :password_confirmation, placeholder: "Password Confirmation", :class => "form-control input-lg" + .form-group + = f.submit "Sign up", class:"btn btn-lg btn-primary" = render "links" From 2b863b8d8a196f57e46e42fad2ffab9e6105d208 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 18 Jan 2014 12:11:43 -0500 Subject: [PATCH 06/81] Updated Forget Password, other minor changes --- app/views/devise/_links.erb | 11 ++++------- app/views/devise/passwords/new.html.erb | 12 ++++++++---- app/views/layouts/application.html.haml | 5 ++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/views/devise/_links.erb b/app/views/devise/_links.erb index 136f3f0..fc68770 100644 --- a/app/views/devise/_links.erb +++ b/app/views/devise/_links.erb @@ -1,31 +1,28 @@ <%- if controller_name != 'sessions' %>

- <%= link_to "Sign in", new_session_path(resource_name), class: "btn btn-block" %>
+ <%= link_to "Sign in", new_session_path(resource_name), class: "btn btn-block btn-default" %>

<% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %>

- <%= link_to "Sign up", new_registration_path(resource_name), class: "btn btn-block" %>
+ <%= link_to "Sign up", new_registration_path(resource_name), class: "btn btn-block btn-default" %>

<% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>

- <%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn btn-block" %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn btn-block btn-default" %>

<% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>

- <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "btn btn-block" %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "btn btn-block btn-default" %>

<% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> -

- <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: "btn btn-block" %>
-

<% end -%> <%- if devise_mapping.omniauthable? %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index b9b59d4..ee989dd 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,12 +1,16 @@ -

Forgot your password?

+<%= stylesheet_link_tag "bootstrap_and_overrides", :media => "all" %> +

Forgot your password?

+
+
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> <%= devise_error_messages! %> -
<%= f.label :email %>
- <%= f.email_field :email %>
+
+ <%= f.email_field :email, placeholder: "Email", class: "form-control input-lg" %> +
-
<%= f.submit "Send me reset password instructions" %>
+
<%= f.submit "Reset Password", class:"btn btn-lg btn-primary"%>
<% end %> <%= render "links" %> diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 1754796..fc64970 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -3,7 +3,6 @@ %head %meta{:charset => "utf-8"}/ %title= content_for?(:title) ? yield(:title) : "Velocipede" - = load_netzke = csrf_meta_tags /[if lt IE 9] = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" @@ -24,11 +23,11 @@ - if flash[:alert] %p{:class => 'alert'}= flash[:alert] .row - .span13 + .span12 = yield %footer - %p © Velocipede 2013 + %p © BikeShed 2014 = javascript_include_tag "application" = javascript_include_tag params[:controller] From a84b0e0fe721a38e5048ea0642ab4e3ce8dbdd2b Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 18 Jan 2014 15:14:19 -0500 Subject: [PATCH 07/81] Moving Netzke Admin view to Panel controller *Moved custom_netzke_helpers code to panel.js *Added panel controller and index and netzke layout --- app/assets/javascripts/application.js | 1 - .../{custom_netzke_helpers.js => panel.js} | 0 app/controllers/panel_controller.rb | 7 +++++++ app/controllers/site_controller.rb | 2 -- app/views/layouts/netzke.html.haml | 11 +++++++++++ config/routes.rb | 2 ++ 6 files changed, 20 insertions(+), 3 deletions(-) rename app/assets/javascripts/{custom_netzke_helpers.js => panel.js} (100%) create mode 100644 app/controllers/panel_controller.rb create mode 100644 app/views/layouts/netzke.html.haml diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 7cec09e..fb7cad7 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,4 +12,3 @@ // //= require jquery //= require jquery_ujs -//= require custom_netzke_helpers diff --git a/app/assets/javascripts/custom_netzke_helpers.js b/app/assets/javascripts/panel.js similarity index 100% rename from app/assets/javascripts/custom_netzke_helpers.js rename to app/assets/javascripts/panel.js diff --git a/app/controllers/panel_controller.rb b/app/controllers/panel_controller.rb new file mode 100644 index 0000000..097d1de --- /dev/null +++ b/app/controllers/panel_controller.rb @@ -0,0 +1,7 @@ +class PanelController < ApplicationController + + def index + render :inline => "<%=netzke :app_view, :layout => true %>", :layout => "netzke" + end + +end diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 0263ee0..9004665 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -1,7 +1,5 @@ class SiteController < ApplicationController def index - render :inline => "<%= netzke :app_view, :layout => true %>", :layout => "application" end - end diff --git a/app/views/layouts/netzke.html.haml b/app/views/layouts/netzke.html.haml new file mode 100644 index 0000000..e7db693 --- /dev/null +++ b/app/views/layouts/netzke.html.haml @@ -0,0 +1,11 @@ +!!! 5 +%html{:lang => "en"} + %head + %meta{:charset => "utf-8"}/ + %title= content_for?(:title) ? yield(:title) : "Velocipede" + = load_netzke + = csrf_meta_tags + %body + = yield + = javascript_include_tag "application" + = javascript_include_tag params[:controller] diff --git a/config/routes.rb b/config/routes.rb index 1e005fb..ecc2dec 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,8 @@ Velocipede::Application.routes.draw do netzke root :to => 'site#index' + get 'admin/index' => 'panel#index', :as => "admin_index" + ########################### # API Routes scope 'api', :module => :api do From ecb5083f1c97bc4520139c59814bbeb5fee76bcb Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 18 Jan 2014 15:16:23 -0500 Subject: [PATCH 08/81] Created new dashboard index *Added js for logging out button *WIP --- app/assets/javascripts/site.js | 9 +++++++++ app/views/site/index.html.haml | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 app/views/site/index.html.haml diff --git a/app/assets/javascripts/site.js b/app/assets/javascripts/site.js index e69de29..bebec98 100644 --- a/app/assets/javascripts/site.js +++ b/app/assets/javascripts/site.js @@ -0,0 +1,9 @@ +$("#index_logout").click(function(){ + $.ajax({ + type: "DELETE", + url: $("#index_logout").data("url"), + complete: function(){ + window.location.href="/"; + } + }); +}); diff --git a/app/views/site/index.html.haml b/app/views/site/index.html.haml new file mode 100644 index 0000000..f9a9b63 --- /dev/null +++ b/app/views/site/index.html.haml @@ -0,0 +1,21 @@ += stylesheet_link_tag "bootstrap_and_overrides", :media => "all" +%h2 Dashboard + +%p + %p + %a{class: "btn btn-lg btn-block btn-primary"} Add Time Entry + %p + %a{class: "btn btn-lg btn-block btn-primary"} View Timesheet + %p + %a{class: "btn btn-lg btn-block btn-primary"} Add Bike + +%p Your Bikes: +%ol + %li Bike 1 + %li Bike 2 + +%p + %p + %a{class: "btn btn-lg btn-block btn-primary", href: admin_index_path} Admin View + %p + %input{id: "index_logout", value: "Logout", type: "button", class: "btn btn-lg btn-block btn-danger", "data-url" => destroy_user_session_path } From 61472e0fb63f2d5bdd5844f8ee032f4ef9a88ae1 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 18 Jan 2014 15:20:34 -0500 Subject: [PATCH 09/81] Hide admin view button on small devices --- app/views/site/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/site/index.html.haml b/app/views/site/index.html.haml index f9a9b63..010db52 100644 --- a/app/views/site/index.html.haml +++ b/app/views/site/index.html.haml @@ -16,6 +16,6 @@ %p %p - %a{class: "btn btn-lg btn-block btn-primary", href: admin_index_path} Admin View + %a{class: "btn btn-lg btn-block btn-primary hidden-xs", href: admin_index_path} Admin View %p %input{id: "index_logout", value: "Logout", type: "button", class: "btn btn-lg btn-block btn-danger", "data-url" => destroy_user_session_path } From 0f890e12e9447ba83131b0cf3e5d0d2bc470a422 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 18 Jan 2014 18:25:21 -0500 Subject: [PATCH 10/81] Added bikes views *Added new bike template --- app/assets/javascripts/bikes.js | 1 + app/controllers/bikes_controller.rb | 6 ++++ app/views/bikes/new.html.haml | 45 +++++++++++++++++++++++++++++ app/views/bikes/show.html.haml | 1 + app/views/site/index.html.haml | 2 +- config/routes.rb | 5 +++- 6 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/bikes.js create mode 100644 app/controllers/bikes_controller.rb create mode 100644 app/views/bikes/new.html.haml create mode 100644 app/views/bikes/show.html.haml diff --git a/app/assets/javascripts/bikes.js b/app/assets/javascripts/bikes.js new file mode 100644 index 0000000..f7d2a50 --- /dev/null +++ b/app/assets/javascripts/bikes.js @@ -0,0 +1 @@ +$('.btn').button(); diff --git a/app/controllers/bikes_controller.rb b/app/controllers/bikes_controller.rb new file mode 100644 index 0000000..41ff3a8 --- /dev/null +++ b/app/controllers/bikes_controller.rb @@ -0,0 +1,6 @@ +class BikesController < AuthenticatedController + + def new + end + +end diff --git a/app/views/bikes/new.html.haml b/app/views/bikes/new.html.haml new file mode 100644 index 0000000..27b775a --- /dev/null +++ b/app/views/bikes/new.html.haml @@ -0,0 +1,45 @@ += stylesheet_link_tag "bootstrap_and_overrides", :media => "all" +%h2 Add Bike + +%p + %p + %input{id: "bike_shop_id", placeholder: "Shop ID", type: "number", min:0, class: "input-lg" } + %p + %select{id: "bike_brand_id"} + %option Select a brand + %option Huffy + %option Raleigh + %p + %input{id: "bike_model", placeholder: "Model", type: "text", class: "input-lg" } + %p + .btn-group{ "data-toggle" => "buttons"} + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "options"} RD + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "options"} MTN + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "options"} HYB + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "options"} OTHER + %p + %select{id: "bike_wheel_size"} + %option Selet a wheel size + %option 27 x 1,75 + %option 26 x 1,75 + %p + .btn-group{ "data-toggle" => "buttons"} + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "options"} Poor + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "options"} Fair + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "options"} Good + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "options"} Excellent + %p + %input{id: "bike_seat_tube", placeholder: "Seat Tube", type: "number", min: 0, max: 100, class: "input-lg" } + %p + %input{id: "bike_description", placeholder: "Short description", type: "text", class: "input-lg" } + %p + %input{id: "index_logout", value: "Add Bike", type: "button", class: "btn btn-lg btn-block btn-primary", "data-url" => "api_add_bike_path"} + diff --git a/app/views/bikes/show.html.haml b/app/views/bikes/show.html.haml new file mode 100644 index 0000000..3f950e2 --- /dev/null +++ b/app/views/bikes/show.html.haml @@ -0,0 +1 @@ +Bike Show diff --git a/app/views/site/index.html.haml b/app/views/site/index.html.haml index 010db52..6f93462 100644 --- a/app/views/site/index.html.haml +++ b/app/views/site/index.html.haml @@ -7,7 +7,7 @@ %p %a{class: "btn btn-lg btn-block btn-primary"} View Timesheet %p - %a{class: "btn btn-lg btn-block btn-primary"} Add Bike + %a{class: "btn btn-lg btn-block btn-primary", href: new_bike_path} Add Bike %p Your Bikes: %ol diff --git a/config/routes.rb b/config/routes.rb index ecc2dec..ece020b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,10 @@ Velocipede::Application.routes.draw do netzke root :to => 'site#index' - get 'admin/index' => 'panel#index', :as => "admin_index" + get 'admin/index', to: 'panel#index', as: "admin_index" + + get 'bikes/new', to: 'bikes#new', as: "new_bike" + get 'bikes/:id', to: 'bikes#show', as: "bike" ########################### # API Routes From a8bdb52536ffa640a0396500e8d6d62fb36e625d Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 19 Jan 2014 19:32:18 -0500 Subject: [PATCH 11/81] Improved Add Bike view Worked out some bootstrap overrides issues --- app/assets/javascripts/application.js | 1 + app/assets/stylesheets/application.css | 2 +- .../bootstrap_and_overrides.css.less | 21 +++++++++++++++++++ app/controllers/bikes_controller.rb | 4 ++++ app/views/bikes/new.html.haml | 17 +++++---------- app/views/layouts/application.html.haml | 1 + 6 files changed, 33 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index fb7cad7..e354875 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,3 +12,4 @@ // //= require jquery //= require jquery_ujs +//= require twitter/bootstrap/bootstrap-button diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 3b5cc66..73a3169 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -9,5 +9,5 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self - *= require_tree . + *= require bootstrap_and_overrides */ diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 4210c11..5f8534e 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -1,10 +1,26 @@ @import "twitter/bootstrap/bootstrap"; +body { + padding-top: 60px; + padding-left: 20px; +} + @import "twitter/bootstrap/responsive"; // Set the correct sprite paths @iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png'); @iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png'); +// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines) +// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not +// have the proper paths. So for now we use the absolute path. +@fontAwesomeEotPath: '/assets/fontawesome-webfont.eot'; +@fontAwesomeWoffPath: '/assets/fontawesome-webfont.woff'; +@fontAwesomeTtfPath: '/assets/fontawesome-webfont.ttf'; +@fontAwesomeSvgPath: '/assets/fontawesome-webfont.svg'; + +// Font Awesome +@import "fontawesome"; + // Your custom LESS stylesheets goes here // // Since bootstrap was imported above you have access to its mixins which @@ -15,3 +31,8 @@ // // Example: // @linkColor: #ff0000; + +[data-toggle="buttons-radio"] > .btn > input[type="radio"], +[data-toggle="buttons"] > .btn > input[type="checkbox"] { + display: none; +} diff --git a/app/controllers/bikes_controller.rb b/app/controllers/bikes_controller.rb index 41ff3a8..90d389b 100644 --- a/app/controllers/bikes_controller.rb +++ b/app/controllers/bikes_controller.rb @@ -1,6 +1,10 @@ class BikesController < AuthenticatedController def new + @brands = BikeBrand.all.map{ |b| [b.brand, b.id] } + @brands.unshift( ["Select a brand", -1] ) + @wheel_sizes = BikeWheelSize.all.map{ |w| [w.display_string, w.id] } + @wheel_sizes.unshift( ["Select a wheel size", -1] ) end end diff --git a/app/views/bikes/new.html.haml b/app/views/bikes/new.html.haml index 27b775a..90e9d1a 100644 --- a/app/views/bikes/new.html.haml +++ b/app/views/bikes/new.html.haml @@ -1,18 +1,14 @@ -= stylesheet_link_tag "bootstrap_and_overrides", :media => "all" %h2 Add Bike %p %p %input{id: "bike_shop_id", placeholder: "Shop ID", type: "number", min:0, class: "input-lg" } %p - %select{id: "bike_brand_id"} - %option Select a brand - %option Huffy - %option Raleigh + = select_tag(:bike_brand_id, options_for_select(@brands)) %p %input{id: "bike_model", placeholder: "Model", type: "text", class: "input-lg" } %p - .btn-group{ "data-toggle" => "buttons"} + .btn-group{ "data-toggle" => "buttons-radio"} %label{ class: "btn btn-default"} %input{ type: "radio", name: "options"} RD %label{ class: "btn btn-default"} @@ -22,12 +18,9 @@ %label{ class: "btn btn-default"} %input{ type: "radio", name: "options"} OTHER %p - %select{id: "bike_wheel_size"} - %option Selet a wheel size - %option 27 x 1,75 - %option 26 x 1,75 + = select_tag(:bike_wheel_size, options_for_select(@wheel_sizes)) %p - .btn-group{ "data-toggle" => "buttons"} + .btn-group{ "data-toggle" => "buttons-radio"} %label{ class: "btn btn-default"} %input{ type: "radio", name: "options"} Poor %label{ class: "btn btn-default"} @@ -37,7 +30,7 @@ %label{ class: "btn btn-default"} %input{ type: "radio", name: "options"} Excellent %p - %input{id: "bike_seat_tube", placeholder: "Seat Tube", type: "number", min: 0, max: 100, class: "input-lg" } + %input{id: "bike_seat_tube", placeholder: "Seat Tube (cm)", type: "number", min: 0, max: 100, class: "input-lg" } %p %input{id: "bike_description", placeholder: "Short description", type: "text", class: "input-lg" } %p diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index fc64970..a32b8a6 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -4,6 +4,7 @@ %meta{:charset => "utf-8"}/ %title= content_for?(:title) ? yield(:title) : "Velocipede" = csrf_meta_tags + = stylesheet_link_tag "bootstrap_and_overrides", :media => "all" /[if lt IE 9] = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" :css From bd6872413e011a46dccca2fa954a388d7f004a89 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Tue, 21 Jan 2014 23:35:11 -0500 Subject: [PATCH 12/81] Make year dynamically updated --- app/views/layouts/application.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index a32b8a6..656bd77 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -28,7 +28,7 @@ = yield %footer - %p © BikeShed 2014 + %p © BikeShed #{Time.now.year} = javascript_include_tag "application" = javascript_include_tag params[:controller] From f10b2adad6baeb8fd145dcca20a38d82ba60deb9 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 2 Feb 2014 09:43:22 -0500 Subject: [PATCH 13/81] Convert .rvmrc to ruby version and gemset --- .ruby-gemset | 1 + .ruby-version | 1 + .rvmrc | 55 --------------------------------------------------- 3 files changed, 2 insertions(+), 55 deletions(-) create mode 100644 .ruby-gemset create mode 100644 .ruby-version delete mode 100644 .rvmrc diff --git a/.ruby-gemset b/.ruby-gemset new file mode 100644 index 0000000..96e09d1 --- /dev/null +++ b/.ruby-gemset @@ -0,0 +1 @@ +velocipede diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..e5fea6c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-1.9.3-p374 diff --git a/.rvmrc b/.rvmrc deleted file mode 100644 index 2424f67..0000000 --- a/.rvmrc +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bash - -# This is an RVM Project .rvmrc file, used to automatically load the ruby -# development environment upon cd'ing into the directory - -# First we specify our desired [@], the @gemset name is optional. -environment_id="ruby-1.9.3-p374@velocipede" - -# -# Uncomment following line if you want options to be set only for given project. -# -# PROJECT_JRUBY_OPTS=( --1.9 ) - -# -# First we attempt to load the desired environment directly from the environment -# file. This is very fast and efficient compared to running through the entire -# CLI and selector. If you want feedback on which environment was used then -# insert the word 'use' after --create as this triggers verbose mode. -# -if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \ - && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] -then - \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id" - - if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] - then - . "${rvm_path:-$HOME/.rvm}/hooks/after_use" - fi -else - # If the environment file has not yet been created, use the RVM CLI to select. - if ! rvm --create use "$environment_id" - then - echo "Failed to create RVM environment '${environment_id}'." - return 1 - fi -fi - -# -# If you use an RVM gemset file to install a list of gems (*.gems), you can have -# it be automatically loaded. Uncomment the following and adjust the filename if -# necessary. -# -# filename=".gems" -# if [[ -s "$filename" ]] -# then -# rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d' -# fi - -# If you use bundler, this might be useful to you: -# if command -v bundle && [[ -s Gemfile ]] -# then -# bundle install -# fi - - From 8c5ff986a29a4aa8b30ffea5f526c5a8c3febdfd Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 2 Feb 2014 09:44:18 -0500 Subject: [PATCH 14/81] Update spec, remove turnip, to get tests working --- .rspec | 1 - Gemfile | 3 +- Gemfile.lock | 125 +++++++++++++++++----------------- config/initializers/devise.rb | 15 ++-- spec/spec_helper.rb | 3 +- 5 files changed, 73 insertions(+), 74 deletions(-) diff --git a/.rspec b/.rspec index fe31725..53607ea 100644 --- a/.rspec +++ b/.rspec @@ -1,2 +1 @@ --colour --rturnip diff --git a/Gemfile b/Gemfile index d09b8da..79e61f5 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ group :assets do end group :development, :test do - gem 'rspec-rails', '~> 2.8.1' + gem 'rspec-rails', '~> 2.14.0' gem 'factory_girl_rails', '~> 1.2' gem 'pry', '~> 0.9.8' gem 'faker' @@ -39,7 +39,6 @@ end group :test do gem 'shoulda-matchers', '~> 1.0.0' gem 'capybara', '~> 1.1.2' - gem 'turnip', '~> 0.3.0' gem 'database_cleaner' gem 'launchy' gem 'spork' diff --git a/Gemfile.lock b/Gemfile.lock index 997ddc6..de17de5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,13 +36,13 @@ GEM activesupport (3.2.13) i18n (= 0.6.1) multi_json (~> 1.0) - addressable (2.3.3) - arel (3.0.2) - bcrypt-ruby (3.0.1) - bootstrap-will_paginate (0.0.9) + addressable (2.3.5) + arel (3.0.3) + bcrypt-ruby (3.1.2) + bootstrap-will_paginate (0.0.10) will_paginate builder (3.0.4) - cancan (1.6.9) + cancan (1.6.10) capybara (1.1.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -50,28 +50,29 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) + celluloid (0.15.2) + timers (~> 1.1.0) childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) - coderay (1.0.9) + coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.2) - commonjs (0.2.6) - database_cleaner (0.9.1) + coffee-script-source (1.6.3) + commonjs (0.2.7) + database_cleaner (1.2.0) decent_exposure (1.0.2) - devise (2.0.5) + devise (2.0.6) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) railties (~> 3.1) warden (~> 1.1.1) diff-lcs (1.1.3) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) + execjs (2.0.2) factory_girl (2.6.4) activesupport (>= 2.3.9) factory_girl_rails (1.7.0) @@ -79,19 +80,17 @@ GEM railties (>= 3.0.0) faker (1.2.0) i18n (~> 0.5) - ffi (1.6.0) + ffi (1.9.3) formatador (0.2.4) - gherkin (2.11.6) - json (>= 1.7.6) - guard (1.7.0) + guard (2.2.5) formatador (>= 0.2.4) - listen (>= 0.6.0) - lumberjack (>= 1.0.2) - pry (>= 0.9.10) - thor (>= 0.14.6) + listen (~> 2.1) + lumberjack (~> 1.0) + pry (>= 0.9.12) + thor (>= 0.18.1) guard-rspec (1.2.1) guard (>= 1.1) - guard-spork (1.5.0) + guard-spork (1.5.1) childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) @@ -101,14 +100,14 @@ GEM activesupport (>= 3.1, < 4.1) haml (~> 3.1) railties (>= 3.1, < 4.1) - hike (1.2.1) + hike (1.2.3) i18n (0.6.1) journey (1.0.4) - jquery-rails (2.2.1) + jquery-rails (2.3.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.7) - launchy (2.2.0) + json (1.8.1) + launchy (2.4.2) addressable (~> 2.3) less (2.2.2) commonjs (~> 0.2.6) @@ -116,15 +115,18 @@ GEM actionpack (>= 3.1) less (~> 2.2.0) libv8 (3.3.10.4) - listen (0.7.3) - lumberjack (1.0.3) - mail (2.5.3) - i18n (>= 0.4.0) + listen (2.4.0) + celluloid (>= 0.15.2) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + lumberjack (1.0.4) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - method_source (0.8.1) - mime-types (1.22) - multi_json (1.8.2) + method_source (0.8.2) + mime-types (1.25.1) + mini_portile (0.5.2) + multi_json (1.8.4) netzke-basepack (0.8.4) netzke-core (~> 0.8.2) netzke-cancan (0.8.2) @@ -133,12 +135,13 @@ GEM netzke-core (0.8.4) execjs uglifier - nokogiri (1.5.9) + nokogiri (1.6.1) + mini_portile (~> 0.5.0) orm_adapter (0.0.7) - pg (0.15.1) + pg (0.17.1) polyglot (0.3.3) - pry (0.9.12) - coderay (~> 1.0.5) + pry (0.9.12.4) + coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) rack (1.4.5) @@ -163,31 +166,32 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.4) - rb-fsevent (0.9.3) + rake (10.1.1) + rb-fsevent (0.9.4) + rb-inotify (0.9.3) + ffi (>= 0.5.0) rdoc (3.12.2) json (~> 1.4) - rspec (2.8.0) - rspec-core (~> 2.8.0) - rspec-expectations (~> 2.8.0) - rspec-mocks (~> 2.8.0) - rspec-core (2.8.0) - rspec-expectations (2.8.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.8.0) - rspec-rails (2.8.1) + rspec-core (2.14.7) + rspec-expectations (2.14.4) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.14.4) + rspec-rails (2.14.1) actionpack (>= 3.0) + activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.8.0) - rubyzip (0.9.9) - selenium-webdriver (2.31.0) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + rubyzip (1.1.0) + selenium-webdriver (2.39.0) childprocess (>= 0.2.5) multi_json (~> 1.0) - rubyzip + rubyzip (~> 1.0) websocket (~> 1.0.4) shoulda-matchers (1.0.0) - slop (3.4.4) + slop (3.4.7) spork (0.9.2) sprockets (2.2.2) hike (~> 1.2) @@ -197,26 +201,24 @@ GEM therubyracer (0.10.2) libv8 (~> 3.3.10) thor (0.18.1) - tilt (1.3.6) - treetop (1.4.12) + tilt (1.4.1) + timers (1.1.0) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - turnip (0.3.1) - gherkin (>= 2.5) - rspec (~> 2.0) twitter-bootstrap-rails (2.0.9) actionpack (>= 3.1) less-rails (~> 2.2.2) railties (>= 3.1) therubyracer (~> 0.10.1) tzinfo (0.3.38) - uglifier (2.1.2) + uglifier (2.4.0) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) warden (1.1.1) rack (>= 1.0) websocket (1.0.7) - will_paginate (3.0.4) + will_paginate (3.0.5) xpath (0.1.4) nokogiri (~> 1.3) @@ -246,10 +248,9 @@ DEPENDENCIES pry (~> 0.9.8) rails (= 3.2.13) rb-fsevent - rspec-rails (~> 2.8.1) + rspec-rails (~> 2.14.0) shoulda-matchers (~> 1.0.0) spork - turnip (~> 0.3.0) twitter-bootstrap-rails (~> 2.0.3) uglifier (>= 1.0.3) will_paginate (~> 3.0.3) diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 9ad09e1..814c010 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -222,11 +222,12 @@ Devise.setup do |config| # end end -#Check in the user if they sign in. (Devise uses Warden) -Warden::Manager.after_set_user do |user,auth,opts| - # this essentially gets called after every netzke request, but alas, - # only using the after_authenticaion callback doesn't get fired after - # user creation. - user.checkin unless user.checked_in? +unless Rails.env.test? + #Check in the user if they sign in. (Devise uses Warden) + Warden::Manager.after_set_user do |user,auth,opts| + # this essentially gets called after every netzke request, but alas, + # only using the after_authenticaion callback doesn't get fired after + # user creation. + user.checkin unless user.checked_in? + end end - diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b434b1b..cb37a6d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -19,7 +19,6 @@ Spork.prefork do require 'rspec/rails' require 'rspec/autorun' require 'capybara/rspec' - require 'turnip/capybara' # Requires supporting ruby files with custom matchers and macros, etc, # in spec/support/ and its subdirectories. @@ -66,12 +65,12 @@ Spork.prefork do config.infer_base_class_for_anonymous_controllers = false config.include FactoryGirlStepHelpers config.include FactoryGirl::Syntax::Methods + config.include Devise::TestHelpers, type: :controller #allows :focus tag to only run specific tests config.treat_symbols_as_metadata_keys_with_true_values = true config.filter_run :focus => true config.run_all_when_everything_filtered = true - end end From 8e112ca936ed90aa3628963e43024c8967fd2d68 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 2 Feb 2014 09:45:01 -0500 Subject: [PATCH 15/81] Adding logs_controller_spec, finally test coverage!!!!! --- spec/controllers/api/logs_controller_spec.rb | 79 ++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 spec/controllers/api/logs_controller_spec.rb diff --git a/spec/controllers/api/logs_controller_spec.rb b/spec/controllers/api/logs_controller_spec.rb new file mode 100644 index 0000000..595cdb1 --- /dev/null +++ b/spec/controllers/api/logs_controller_spec.rb @@ -0,0 +1,79 @@ +require 'spec_helper' + +describe Api::V1::LogsController do + + describe "#checkin" do + + before(:each) do + @user = FactoryGirl.create(:user) + sign_in @user + controller.stub(:current_user).and_return(@user) + end + + context "user is not checked in" do + before(:each) do + @user.stub(:checked_in?).and_return(false) + end + + it "returns 204" do + @user.stub(:checkin) + post :checkin + expect(@response.code.to_i).to eql 204 + end + + it "checks in a user" do + expect(@user).to receive(:checkin) + post :checkin + end + end + + context "user is already checked in" do + before(:each) do + @user.stub(:checked_in?).and_return(true) + end + + it "returns 404 if the user is already checked in" do + post :checkin + expect(@response.code.to_i).to eql 404 + end + end + end + + describe "#checkout" do + + before(:each) do + @user = FactoryGirl.create(:user) + sign_in @user + controller.stub(:current_user).and_return(@user) + end + + context "user is not checked in" do + before(:each) do + @user.stub(:checked_in?).and_return(false) + end + + it "returns 404" do + @user.stub(:checkin) + post :checkout + expect(@response.code.to_i).to eql 404 + end + end + + context "user is already checked in" do + before(:each) do + @user.stub(:checked_in?).and_return(true) + end + + it "returns 204" do + @user.stub(:checkout) + post :checkout + expect(@response.code.to_i).to eql 204 + end + + it "checks out a user" do + expect(@user).to receive(:checkout) + post :checkout + end + end + end +end From 9edb90203c0aec1338ac3c512c92955a108e40b3 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 2 Feb 2014 09:45:18 -0500 Subject: [PATCH 16/81] Remove whitespace --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index cd657a1..3cc2c4b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -50,9 +50,9 @@ class User < ActiveRecord::Base #default BUILDBIKE/CLASS ID is 5 purpose_id = 5 Bike.find_by_sql(" - SELECT * + SELECT * FROM bikes - INNER JOIN( + INNER JOIN( SELECT * FROM transactions WHERE customer_id = #{self.id} From 4b5133fd0264c85d02d525cf3816f818b19ef280 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 2 Feb 2014 17:09:13 -0500 Subject: [PATCH 17/81] Fix unauthorized return code --- app/controllers/api/v1/base_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb index a3ed9c1..e2e90ee 100644 --- a/app/controllers/api/v1/base_controller.rb +++ b/app/controllers/api/v1/base_controller.rb @@ -11,7 +11,7 @@ class Api::V1::BaseController < ActionController::Base if @current_user.nil? msg = "Username/Password/Token invalid" - render :json => {:error => msg }, :status => 403 and return + render :json => {:error => msg }, :status => 401 and return end else authenticate_user! From f17eba810e25edbbe740a2f1e56560af90cc2008 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 2 Feb 2014 17:09:49 -0500 Subject: [PATCH 18/81] WTF? Is this needed? Commenting this out for now users#checkout copy pasta perhaps? --- app/controllers/api/v1/users_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index 35176bd..3dc34c0 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -16,6 +16,8 @@ class Api::V1::UsersController < Api::V1::BaseController end end + +=begin Is this here by accident? Commenting out for now (1/30/14) def checkout #must use @current_user since user may not have signed in if !@current_user.checked_in? @@ -25,4 +27,5 @@ class Api::V1::UsersController < Api::V1::BaseController render :nothing => true, :status => 204 and return end end +=end end From 83a4e4e9c1635da9d2437fb0e940d8a9abaa766c Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 2 Feb 2014 17:10:17 -0500 Subject: [PATCH 19/81] Make bike color not required --- app/models/bike.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/bike.rb b/app/models/bike.rb index 7403c33..ec676e0 100644 --- a/app/models/bike.rb +++ b/app/models/bike.rb @@ -17,7 +17,7 @@ class Bike < ActiveRecord::Base validates :serial_number, :length => { :minimum => 3 } validates :model, :length => { :maximum => 50 } validates :bike_brand_id, :presence => true - validates :color, :presence => true + #validates :color, :presence => true validates :bike_style_id, :presence => true validates :seat_tube_height, :presence => true validates :bike_wheel_size_id, :presence => true From c575fface96fa53ea6c2ce8c57025521645f7feb Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 2 Feb 2014 17:10:32 -0500 Subject: [PATCH 20/81] Commenting out description on bike form for now --- app/views/bikes/new.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/bikes/new.html.haml b/app/views/bikes/new.html.haml index 90e9d1a..ae98e23 100644 --- a/app/views/bikes/new.html.haml +++ b/app/views/bikes/new.html.haml @@ -31,8 +31,9 @@ %input{ type: "radio", name: "options"} Excellent %p %input{id: "bike_seat_tube", placeholder: "Seat Tube (cm)", type: "number", min: 0, max: 100, class: "input-lg" } - %p - %input{id: "bike_description", placeholder: "Short description", type: "text", class: "input-lg" } + -# Commenting this out until description is added to Bike + %p + %input{id: "bike_description", placeholder: "Short description", type: "text", class: "input-lg" } %p %input{id: "index_logout", value: "Add Bike", type: "button", class: "btn btn-lg btn-block btn-primary", "data-url" => "api_add_bike_path"} From e0041662d38a7fb9578217915be81c075a709005 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 2 Feb 2014 17:11:13 -0500 Subject: [PATCH 21/81] WIP, adding api/bikes_controller#create --- app/controllers/api/v1/bikes_controller.rb | 31 ++++++++ config/routes.rb | 2 + spec/controllers/api/bikes_controller_spec.rb | 71 +++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 app/controllers/api/v1/bikes_controller.rb create mode 100644 spec/controllers/api/bikes_controller_spec.rb diff --git a/app/controllers/api/v1/bikes_controller.rb b/app/controllers/api/v1/bikes_controller.rb new file mode 100644 index 0000000..54e7f12 --- /dev/null +++ b/app/controllers/api/v1/bikes_controller.rb @@ -0,0 +1,31 @@ +class Api::V1::BikesController < Api::V1::BaseController + CANNOT_MANAGE = "You do not have permission to manage bikes." + EXPECTED_BIKE = "Expected bike in submitted data" + + before_filter :check_bike_permission + + def create + puts params.inspect + + if bike = params[:bike] + + b = Bike.new(bike) + if !b.save + render json: { errors: b.errors }, status: 409 and return + else + render json: { bike: b.as_json }, status: 200 and return + end + + else + render json: { errors: ["Expected bike in submitted data" ]}, status: 400 and return + end + render json: {}, status: 200 and return + end + + private + def check_bike_permission + if cannot? :manage, Bike + render json: { errors: [CANNOT_MANAGE]}, status: 403 and return + end + end +end diff --git a/config/routes.rb b/config/routes.rb index ece020b..4922638 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,6 +16,8 @@ Velocipede::Application.routes.draw do post 'checkin' => "logs#checkin", :as => "api_checkin" post 'checkout' => "logs#checkout", :as => "api_checkout" post 'reset' => "users#password_reset", :as => "api_password_reset" + + post 'bikes/create' => "bikes#create", as: "api_create_bike" end end diff --git a/spec/controllers/api/bikes_controller_spec.rb b/spec/controllers/api/bikes_controller_spec.rb new file mode 100644 index 0000000..30592e9 --- /dev/null +++ b/spec/controllers/api/bikes_controller_spec.rb @@ -0,0 +1,71 @@ +require 'spec_helper' + +describe Api::V1::BikesController do + + describe "#create" do + context "as a user" do + before(:each) do + @user = FactoryGirl.create(:user) + sign_in @user + end + it "returns 403" do + post :create + expect(@response.code.to_i).to eql 403 + end + + it "returns an error message" do + post :create + json = JSON.parse(@response.body) + expect(json["errors"].first).to eql Api::V1::BikesController::CANNOT_MANAGE + end + end + + context "as a bike admin" do + before(:each) do + @user = FactoryGirl.create(:bike_admin) + sign_in @user + end + + context "with no bike in json data" do + it "returns 400" do + post :create + expect(@response.code.to_i).to eql 400 + end + + it "returns an error message" do + post :create + json = JSON.parse(@response.body) + expect(json["errors"].first).to eql Api::V1::BikesController::EXPECTED_BIKE + end + end + + context "with valid bike in json data" do + before(:each) do + @submit_json = { bike: { + serial_number: "XKCD", + bike_brand_id: 1, + shop_id: 1, + model: "Bike Model", + bike_style_id: 1, + seat_tube_height: 52, + bike_condition_id: 1, + bike_purpose_id: 1, + bike_wheel_size_id: 1, + }} + end + + it "returns 200" do + post :create, @submit_json + expect(@response.code.to_i).to eql 200 + end + + it "returns the created bike json" do + post :create, @submit_json + json = JSON.parse(@response.body) + expect(json).to have_key("bike") + expect(json.to_s).to include(@submit_json[:bike][:serial_number]) + end + end + end + end +end From 9fa0017d367d106c69fa75de486ecc76acbe2f9a Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Mon, 3 Feb 2014 00:14:37 -0500 Subject: [PATCH 22/81] Fixed error response codes, finished bikes#create spec --- app/controllers/api/v1/bikes_controller.rb | 6 ++--- spec/controllers/api/bikes_controller_spec.rb | 22 ++++++++++++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/controllers/api/v1/bikes_controller.rb b/app/controllers/api/v1/bikes_controller.rb index 54e7f12..b2ada0f 100644 --- a/app/controllers/api/v1/bikes_controller.rb +++ b/app/controllers/api/v1/bikes_controller.rb @@ -5,19 +5,17 @@ class Api::V1::BikesController < Api::V1::BaseController before_filter :check_bike_permission def create - puts params.inspect - if bike = params[:bike] b = Bike.new(bike) if !b.save - render json: { errors: b.errors }, status: 409 and return + render json: { errors: b.errors }, status: 422 and return else render json: { bike: b.as_json }, status: 200 and return end else - render json: { errors: ["Expected bike in submitted data" ]}, status: 400 and return + render json: { errors: ["Expected bike in submitted data" ]}, status: 422 and return end render json: {}, status: 200 and return end diff --git a/spec/controllers/api/bikes_controller_spec.rb b/spec/controllers/api/bikes_controller_spec.rb index 30592e9..3f99c86 100644 --- a/spec/controllers/api/bikes_controller_spec.rb +++ b/spec/controllers/api/bikes_controller_spec.rb @@ -29,7 +29,7 @@ describe Api::V1::BikesController do context "with no bike in json data" do it "returns 400" do post :create - expect(@response.code.to_i).to eql 400 + expect(@response.code.to_i).to eql 422 end it "returns an error message" do @@ -66,6 +66,26 @@ describe Api::V1::BikesController do expect(json.to_s).to include(@submit_json[:bike][:serial_number]) end end + + context "with invalid bike in json data" do + before(:each) do + @submit_json = { bike: { + serial_number: "XKCD", + }} + end + + it "returns 422" do + post :create, @submit_json + expect(@response.code.to_i).to eql 422 + end + + it "returns the fields with errors" do + post :create, @submit_json + json = JSON.parse(@response.body) + expect(json).to have_key("errors") + expect(json.to_s).to include("can't be blank") + end + end end end end From 8110baf2552f492f5082369cd30998f70ab5cdfa Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Mon, 3 Feb 2014 00:16:13 -0500 Subject: [PATCH 23/81] Removing unnecessary render --- app/controllers/api/v1/bikes_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/api/v1/bikes_controller.rb b/app/controllers/api/v1/bikes_controller.rb index b2ada0f..116714b 100644 --- a/app/controllers/api/v1/bikes_controller.rb +++ b/app/controllers/api/v1/bikes_controller.rb @@ -17,7 +17,6 @@ class Api::V1::BikesController < Api::V1::BaseController else render json: { errors: ["Expected bike in submitted data" ]}, status: 422 and return end - render json: {}, status: 200 and return end private From 38a716b1321d6348dc96fb66b9da9df99f22786d Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Tue, 4 Feb 2014 23:47:30 -0500 Subject: [PATCH 24/81] Added User password_reset spec and some refactor *Make returned error in errors array *Use constants --- .../users/javascripts/init_component.js | 2 +- app/controllers/api/v1/users_controller.rb | 12 ++-- spec/controllers/api/users_controller_spec.rb | 72 +++++++++++++++++++ 3 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 spec/controllers/api/users_controller_spec.rb diff --git a/app/components/users/javascripts/init_component.js b/app/components/users/javascripts/init_component.js index f2c7e47..edb5592 100644 --- a/app/components/users/javascripts/init_component.js +++ b/app/components/users/javascripts/init_component.js @@ -33,7 +33,7 @@ Ext.Msg.alert("Success", "New Password: "+data.password); }, error: function(data,textStatus) { - Ext.Msg.alert( "Error", JSON.parse(data.responseText)["error"]); + Ext.Msg.alert( "Error", JSON.parse(data.responseText)["errors"][0]); } }); } diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index 3dc34c0..a9eacd7 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -1,18 +1,22 @@ require 'securerandom' class Api::V1::UsersController < Api::V1::BaseController + CANNOT_MANAGE = "You do not have the permission to manager users" + NOT_FOUND = "User not found" + NOT_ALLOWED = "Not allowed to reset your own password in this fashion" + PASS_LENGTH = 8 def password_reset if can? :manage, User user = User.find_by_id(params[:user_id]) - render :json => { "error" => "User not found"}, :status => 404 and return if user.nil? - render :json => { "error" => "Not allowed to reset your own password in this fashion."}, :status => 403 and return if user.id == current_user.id + render :json => { "errors" => [NOT_FOUND]}, :status => 404 and return if user.nil? + render :json => { "errors" => [NOT_ALLOWED]}, :status => 403 and return if user.id == current_user.id - new_pass = SecureRandom.hex[0,8] + new_pass = SecureRandom.hex[0,PASS_LENGTH] user.password = new_pass user.save render :json => { "password" => new_pass}, :status => 200 and return else - render :json => { "error" => "You do not have the permission"}, :status => 403 and return + render :json => { "errors" => [CANNOT_MANAGE]}, :status => 403 and return end end diff --git a/spec/controllers/api/users_controller_spec.rb b/spec/controllers/api/users_controller_spec.rb new file mode 100644 index 0000000..5748990 --- /dev/null +++ b/spec/controllers/api/users_controller_spec.rb @@ -0,0 +1,72 @@ +require 'spec_helper' + +describe Api::V1::UsersController do + + describe "#password_reset" do + + context "as a user" do + before(:each) do + @user = FactoryGirl.create(:user) + sign_in @user + end + + it "returns 403" do + post :password_reset + expect(@response.code.to_i).to eql 403 + end + + it "returns an error message" do + post :password_reset + json = JSON.parse(@response.body) + expect(json["errors"].first).to eql Api::V1::UsersController::CANNOT_MANAGE + end + + end + + context "as an admin" do + before(:each) do + @user = FactoryGirl.create(:admin) + sign_in @user + end + + it "forbids a user to reset their own password" do + post :password_reset, user_id: @user.id + expect(@response.code.to_i).to eql 403 + json = JSON.parse(@response.body) + expect(json["errors"].first).to eql Api::V1::UsersController::NOT_ALLOWED + end + + context "with no user in json data" do + it "returns 404" do + post :password_reset + expect(@response.code.to_i).to eql 404 + end + + it "returns an error message" do + post :password_reset + json = JSON.parse(@response.body) + expect(json["errors"].first).to eql Api::V1::UsersController::NOT_FOUND + end + end + + context "another user exists" do + before(:each) do + @user2 = FactoryGirl.create(:user) + end + + it "returns 200" do + post :password_reset, user_id: @user2.id + expect(@response.code.to_i).to eql 200 + end + + it "returns that users new password" do + post :password_reset, user_id: @user2.id + json = JSON.parse(@response.body) + expect(json["password"].length).to eql Api::V1::UsersController::PASS_LENGTH + end + + end + + end + end +end From e694dfbddda6997761c562ea89494b05c98b018f Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 8 Feb 2014 14:17:09 -0500 Subject: [PATCH 25/81] Don't clobber development database, durrrr --- config/database.yml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.yml.example b/config/database.yml.example index ab246bd..de29ed3 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -10,7 +10,7 @@ development: # Do not set this db to the same as development or production. test: adapter: postgresql - database: velocipede + database: velocipede_test username: velocipede password: host: 127.0.0.1 From 2d09aba26af38a0b3fd6baa9962ddeff5e1f636d Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 8 Feb 2014 14:21:20 -0500 Subject: [PATCH 26/81] Added submit js to bikes/new view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added displayFormErrors utility * Added 4th option to bike styles “OTHER” --- app/assets/javascripts/application.js | 1 + app/assets/javascripts/bikes.js | 29 ++++++++++++++ app/assets/javascripts/utils.js | 8 ++++ app/views/bikes/new.html.haml | 57 +++++++++++++++++---------- db/seed/fixtures/bike_styles.yml | 3 ++ 5 files changed, 78 insertions(+), 20 deletions(-) create mode 100644 app/assets/javascripts/utils.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e354875..276aff6 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,3 +13,4 @@ //= require jquery //= require jquery_ujs //= require twitter/bootstrap/bootstrap-button +//= require utils diff --git a/app/assets/javascripts/bikes.js b/app/assets/javascripts/bikes.js index f7d2a50..c281230 100644 --- a/app/assets/javascripts/bikes.js +++ b/app/assets/javascripts/bikes.js @@ -1 +1,30 @@ $('.btn').button(); + +$("#add_bike_submit").click(function(){ + + json_data = { bike: { + serial_number: $("#serial_number").val(), + bike_brand_id: parseInt($("#bike_brand_id").val()), + shop_id: parseInt($("#shop_id").val()), + model: $("#model").val(), + bike_style_id: parseInt($('input[name=bike_style]:checked').val()), + seat_tube_height: parseInt($("#seat_tube_height").val()), + bike_condition_id: parseInt($('input[name=bike_condition]:checked').val()), + bike_purpose_id: 1, + bike_wheel_size_id: parseInt($("#bike_wheel_size_id").val()), + }}; + + $.ajax({ + url: $("#add_bike_submit").data("url"), + type: "POST", + data: json_data, + dataType: "json", + success: function(data, status, xhr){ + //window.location = ""; + }, + error: function(data, status ){ + displayFormErrors(data.responseJSON); + } + }); + +}); diff --git a/app/assets/javascripts/utils.js b/app/assets/javascripts/utils.js new file mode 100644 index 0000000..0b99956 --- /dev/null +++ b/app/assets/javascripts/utils.js @@ -0,0 +1,8 @@ +function displayFormErrors(data){ + if( data.errors != undefined ){ + $.each( data.errors, function( field, errorMsg) { + $("#"+field).parents(".control-group").addClass("error"); + $("#"+field).siblings(".help-block").html(errorMsg); + }); + } +} diff --git a/app/views/bikes/new.html.haml b/app/views/bikes/new.html.haml index ae98e23..972ad6a 100644 --- a/app/views/bikes/new.html.haml +++ b/app/views/bikes/new.html.haml @@ -1,39 +1,56 @@ %h2 Add Bike %p - %p - %input{id: "bike_shop_id", placeholder: "Shop ID", type: "number", min:0, class: "input-lg" } - %p - = select_tag(:bike_brand_id, options_for_select(@brands)) - %p - %input{id: "bike_model", placeholder: "Model", type: "text", class: "input-lg" } + .control-group + .controls + %input{id: "shop_id", placeholder: "Shop ID", type: "number", min:0, class: "input-lg" } + .help-block + .control-group + .controls + = select_tag(:bike_brand_id, options_for_select(@brands)) + .help-block + .control-group + .controls + %input{id: "model", placeholder: "Model", type: "text", class: "input-lg" } + .help-block + .control-group + .controls + %input{id: "serial_number", placeholder: "Serial Number", type: "text", class: "input-lg" } + .help-block %p .btn-group{ "data-toggle" => "buttons-radio"} %label{ class: "btn btn-default"} - %input{ type: "radio", name: "options"} RD + %input{ type: "radio", name: "bike_style", value: 3} RD %label{ class: "btn btn-default"} - %input{ type: "radio", name: "options"} MTN + %input{ type: "radio", name: "bike_style", value: 1} MTN %label{ class: "btn btn-default"} - %input{ type: "radio", name: "options"} HYB + %input{ type: "radio", name: "bike_style", value: 2} HYB %label{ class: "btn btn-default"} - %input{ type: "radio", name: "options"} OTHER - %p - = select_tag(:bike_wheel_size, options_for_select(@wheel_sizes)) + %input{ type: "radio", name: "bike_style", value: 4} OTHER + .help-block + .control-group + .controls + = select_tag(:bike_wheel_size, options_for_select(@wheel_sizes), id: :bike_wheel_size_id) + .help-block %p .btn-group{ "data-toggle" => "buttons-radio"} %label{ class: "btn btn-default"} - %input{ type: "radio", name: "options"} Poor + %input{ type: "radio", name: "bike_condition", value: 2} Poor %label{ class: "btn btn-default"} - %input{ type: "radio", name: "options"} Fair + %input{ type: "radio", name: "bike_condition", value: 3} Fair %label{ class: "btn btn-default"} - %input{ type: "radio", name: "options"} Good + %input{ type: "radio", name: "bike_condition", value: 4} Good %label{ class: "btn btn-default"} - %input{ type: "radio", name: "options"} Excellent - %p - %input{id: "bike_seat_tube", placeholder: "Seat Tube (cm)", type: "number", min: 0, max: 100, class: "input-lg" } + %input{ type: "radio", name: "bike_condition", value: 5} Excellent + .help-block + .control-group + .controls + %input{id: "seat_tube_height", placeholder: "Seat Tube (cm)", type: "number", min: 0, max: 100, class: "input-lg" } + .help-block -# Commenting this out until description is added to Bike %p %input{id: "bike_description", placeholder: "Short description", type: "text", class: "input-lg" } - %p - %input{id: "index_logout", value: "Add Bike", type: "button", class: "btn btn-lg btn-block btn-primary", "data-url" => "api_add_bike_path"} + .control-group + .controls + %input{id: "add_bike_submit", value: "Add Bike", type: "button", class: "btn btn-lg btn-block btn-primary", "data-url" => "#{api_create_bike_path}"} diff --git a/db/seed/fixtures/bike_styles.yml b/db/seed/fixtures/bike_styles.yml index 5673983..0de3aab 100644 --- a/db/seed/fixtures/bike_styles.yml +++ b/db/seed/fixtures/bike_styles.yml @@ -7,3 +7,6 @@ hybrid: road: id: 3 style: ROAD +road: + id: 4 + style: OTHER From 75832a3910e38050e3fb5cbf804491033ea7a9fb Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 8 Feb 2014 16:54:50 -0500 Subject: [PATCH 27/81] Add poltergeist to gem file, and limited version dependecies --- Gemfile | 17 ++++++------ Gemfile.lock | 63 ++++++++++++++++++++++++--------------------- README.md | 5 ++++ spec/spec_helper.rb | 3 +++ 4 files changed, 51 insertions(+), 37 deletions(-) diff --git a/Gemfile b/Gemfile index 79e61f5..da9454d 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem 'decent_exposure', '~> 1.0.1' gem 'devise', '~> 2.0.4' gem 'haml-rails', '~> 0.3.4' gem 'jquery-rails', '~> 2.0' -gem 'pg' +gem 'pg', '~> 0.17.1' gem 'will_paginate', '~> 3.0.3' # Gems used only for assets and not required @@ -33,17 +33,18 @@ group :development, :test do gem 'rspec-rails', '~> 2.14.0' gem 'factory_girl_rails', '~> 1.2' gem 'pry', '~> 0.9.8' - gem 'faker' + gem 'faker', '~> 1.2.0' end group :test do gem 'shoulda-matchers', '~> 1.0.0' - gem 'capybara', '~> 1.1.2' - gem 'database_cleaner' - gem 'launchy' - gem 'spork' + gem 'capybara', '~> 2.2.1' + gem 'poltergeist', '~> 1.5.0' + gem 'database_cleaner', '~> 1.2.0' + gem 'launchy', '~> 2.4.2' + gem 'spork', '~> 0.9.2' #guard dependency for Mac OS 10 gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i - gem 'guard-spork' - gem 'guard-rspec' + gem 'guard-spork', '~> 1.5.1' + gem 'guard-rspec', '~> 4.2.6' end diff --git a/Gemfile.lock b/Gemfile.lock index de17de5..2d2cc25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,17 +43,17 @@ GEM will_paginate builder (3.0.4) cancan (1.6.10) - capybara (1.1.4) + capybara (2.2.1) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - selenium-webdriver (~> 2.0) - xpath (~> 0.1.4) + xpath (~> 2.0) celluloid (0.15.2) timers (~> 1.1.0) - childprocess (0.3.9) + childprocess (0.4.0) ffi (~> 1.0, >= 1.0.11) + cliver (0.3.2) coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -61,7 +61,7 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.7.0) commonjs (0.2.7) database_cleaner (1.2.0) decent_exposure (1.0.2) @@ -70,7 +70,7 @@ GEM orm_adapter (~> 0.0.3) railties (~> 3.1) warden (~> 1.1.1) - diff-lcs (1.1.3) + diff-lcs (1.2.5) erubis (2.7.0) execjs (2.0.2) factory_girl (2.6.4) @@ -82,14 +82,15 @@ GEM i18n (~> 0.5) ffi (1.9.3) formatador (0.2.4) - guard (2.2.5) + guard (2.4.0) formatador (>= 0.2.4) listen (~> 2.1) lumberjack (~> 1.0) pry (>= 0.9.12) thor (>= 0.18.1) - guard-rspec (1.2.1) - guard (>= 1.1) + guard-rspec (4.2.6) + guard (~> 2.1) + rspec (>= 2.14, < 4.0) guard-spork (1.5.1) childprocess (>= 0.2.3) guard (>= 1.1) @@ -115,7 +116,7 @@ GEM actionpack (>= 3.1) less (~> 2.2.0) libv8 (3.3.10.4) - listen (2.4.0) + listen (2.4.1) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -139,8 +140,13 @@ GEM mini_portile (~> 0.5.0) orm_adapter (0.0.7) pg (0.17.1) + poltergeist (1.5.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) polyglot (0.3.3) - pry (0.9.12.4) + pry (0.9.12.6) coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) @@ -172,10 +178,14 @@ GEM ffi (>= 0.5.0) rdoc (3.12.2) json (~> 1.4) + rspec (2.14.1) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) rspec-core (2.14.7) - rspec-expectations (2.14.4) + rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.4) + rspec-mocks (2.14.5) rspec-rails (2.14.1) actionpack (>= 3.0) activemodel (>= 3.0) @@ -184,12 +194,6 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rubyzip (1.1.0) - selenium-webdriver (2.39.0) - childprocess (>= 0.2.5) - multi_json (~> 1.0) - rubyzip (~> 1.0) - websocket (~> 1.0.4) shoulda-matchers (1.0.0) slop (3.4.7) spork (0.9.2) @@ -217,9 +221,9 @@ GEM json (>= 1.8.0) warden (1.1.1) rack (>= 1.0) - websocket (1.0.7) + websocket-driver (0.3.2) will_paginate (3.0.5) - xpath (0.1.4) + xpath (2.0.0) nokogiri (~> 1.3) PLATFORMS @@ -229,28 +233,29 @@ DEPENDENCIES acts_as_loggable! bootstrap-will_paginate (~> 0.0.6) cancan - capybara (~> 1.1.2) + capybara (~> 2.2.1) coffee-rails (~> 3.2.1) - database_cleaner + database_cleaner (~> 1.2.0) decent_exposure (~> 1.0.1) devise (~> 2.0.4) factory_girl_rails (~> 1.2) - faker - guard-rspec - guard-spork + faker (~> 1.2.0) + guard-rspec (~> 4.2.6) + guard-spork (~> 1.5.1) haml-rails (~> 0.3.4) jquery-rails (~> 2.0) - launchy + launchy (~> 2.4.2) netzke-basepack (~> 0.8.0) netzke-cancan netzke-core (~> 0.8.0) - pg + pg (~> 0.17.1) + poltergeist (~> 1.5.0) pry (~> 0.9.8) rails (= 3.2.13) rb-fsevent rspec-rails (~> 2.14.0) shoulda-matchers (~> 1.0.0) - spork + spork (~> 0.9.2) twitter-bootstrap-rails (~> 2.0.3) uglifier (>= 1.0.3) will_paginate (~> 3.0.3) diff --git a/README.md b/README.md index c7a7193..aa4e2f0 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,11 @@ At Velocipede, with a mobile friendly UI for users, I'm hoping we can get donati 1. Create your PG user `createuser -d -P velocipede` 1. Create your database `createdb -U velocipede --owner=velocipede velocipede` +# Testing + +1. Install phantomjs `brew install phantomjs` +1. Run tests with `rspec` + # Optional Add icons diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cb37a6d..797cabf 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,7 @@ require 'rubygems' require 'spork' require 'rails' +require 'capybara/poltergeist' #uncomment the following line to use spork with the debugger #require 'spork/ext/ruby-debug' @@ -24,6 +25,8 @@ Spork.prefork do # in spec/support/ and its subdirectories. Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f} + Capybara.javascript_driver = :poltergeist + RSpec.configure do |config| # ## Mock Framework # From fb02646092cec598587766641ee20e634bebd00a Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 8 Feb 2014 16:56:21 -0500 Subject: [PATCH 28/81] Moved registrations specs to features --- spec/{requests => features}/devise/registrations_spec.rb | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spec/{requests => features}/devise/registrations_spec.rb (100%) diff --git a/spec/requests/devise/registrations_spec.rb b/spec/features/devise/registrations_spec.rb similarity index 100% rename from spec/requests/devise/registrations_spec.rb rename to spec/features/devise/registrations_spec.rb From e867366525251604fa894221b6a2917e2ea64116 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 8 Feb 2014 16:56:34 -0500 Subject: [PATCH 29/81] Made feature specs for creating a bike --- spec/features/bikes/new_spec.rb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 spec/features/bikes/new_spec.rb diff --git a/spec/features/bikes/new_spec.rb b/spec/features/bikes/new_spec.rb new file mode 100644 index 0000000..87f6a09 --- /dev/null +++ b/spec/features/bikes/new_spec.rb @@ -0,0 +1,28 @@ +require "spec_helper" + +feature "Bikes" do + before(:each) do + @user = FactoryGirl.create(:bike_admin) + visit new_user_session_path + fill_in "user_username", with: @user.username + fill_in "user_password", with: @user.password + click_button "Sign in" + end + + scenario "User creates a new bike" do + visit new_bike_path + fill_in "shop_id", with: 1 + fill_in "model", with: "Huffy" + fill_in "serial_number", with: "XKCD" + fill_in "seat_tube_height", with: 52 + click_button "Add Bike" + expect(page).to have_text("Huffy") + end + + scenario "User submits a bike with errors", js: true do + visit new_bike_path + click_button "Add Bike" + expect(page).to have_text(:all, "is not a number") + expect(page).to have_text(:all, "is too short") + end +end From 55974feb4ca9870fe1886547f8dddce57e6bf86e Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 9 Feb 2014 18:22:33 -0500 Subject: [PATCH 30/81] Parse float for seat tube height --- app/assets/javascripts/bikes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/bikes.js b/app/assets/javascripts/bikes.js index c281230..58eb18a 100644 --- a/app/assets/javascripts/bikes.js +++ b/app/assets/javascripts/bikes.js @@ -8,7 +8,7 @@ $("#add_bike_submit").click(function(){ shop_id: parseInt($("#shop_id").val()), model: $("#model").val(), bike_style_id: parseInt($('input[name=bike_style]:checked').val()), - seat_tube_height: parseInt($("#seat_tube_height").val()), + seat_tube_height: parseFloat($("#seat_tube_height").val()), bike_condition_id: parseInt($('input[name=bike_condition]:checked').val()), bike_purpose_id: 1, bike_wheel_size_id: parseInt($("#bike_wheel_size_id").val()), From d0c05a0244ac7769e4a8129ac615d945dab4e338 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 9 Feb 2014 18:23:35 -0500 Subject: [PATCH 31/81] Fix validations for creating a bike, view respond to errors --- app/models/bike.rb | 12 ++++---- app/views/bikes/new.html.haml | 50 ++++++++++++++++++--------------- spec/features/bikes/new_spec.rb | 4 +++ 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/app/models/bike.rb b/app/models/bike.rb index ec676e0..70f2277 100644 --- a/app/models/bike.rb +++ b/app/models/bike.rb @@ -16,13 +16,13 @@ class Bike < ActiveRecord::Base validates :shop_id, :presence => true, :uniqueness => true, :numericality => { :only_integer => true } validates :serial_number, :length => { :minimum => 3 } validates :model, :length => { :maximum => 50 } - validates :bike_brand_id, :presence => true + validates :bike_brand_id, :presence => true, :numericality => { greater_than: 0, message: "is not a valid brand" } #validates :color, :presence => true - validates :bike_style_id, :presence => true - validates :seat_tube_height, :presence => true - validates :bike_wheel_size_id, :presence => true - validates :bike_condition_id, :presence => true - validates :bike_purpose_id, :presence => true + validates :bike_style_id, :presence => true, :numericality => { greater_than: 0, message: "is not a valid style" } + validates :seat_tube_height, :presence => true, :numericality => true + validates :bike_wheel_size_id, :presence => true, :numericality => { greater_than: 0, message: "is not a valid wheel size" } + validates :bike_condition_id, :presence => true, :numericality => { greater_than: 0, message: "is not a valid condition" } + validates :bike_purpose_id, :presence => true, :numericality => { greater_than: 0, message: "is not a valid purpose" } self.per_page = 15 diff --git a/app/views/bikes/new.html.haml b/app/views/bikes/new.html.haml index 972ad6a..76d7e65 100644 --- a/app/views/bikes/new.html.haml +++ b/app/views/bikes/new.html.haml @@ -17,32 +17,36 @@ .controls %input{id: "serial_number", placeholder: "Serial Number", type: "text", class: "input-lg" } .help-block - %p - .btn-group{ "data-toggle" => "buttons-radio"} - %label{ class: "btn btn-default"} - %input{ type: "radio", name: "bike_style", value: 3} RD - %label{ class: "btn btn-default"} - %input{ type: "radio", name: "bike_style", value: 1} MTN - %label{ class: "btn btn-default"} - %input{ type: "radio", name: "bike_style", value: 2} HYB - %label{ class: "btn btn-default"} - %input{ type: "radio", name: "bike_style", value: 4} OTHER + .control-group + .controls + .btn-group{ "data-toggle" => "buttons-radio"} + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "bike_style", value: 3} RD + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "bike_style", value: 1} MTN + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "bike_style", value: 2} HYB + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "bike_style", value: 4} OTHER + %input{ id: "bike_style_id", type: "hidden"} + .help-block + .control-group + .controls + = select_tag(:bike_wheel_size_id, options_for_select(@wheel_sizes), id: :bike_wheel_size_id) .help-block .control-group .controls - = select_tag(:bike_wheel_size, options_for_select(@wheel_sizes), id: :bike_wheel_size_id) - .help-block - %p - .btn-group{ "data-toggle" => "buttons-radio"} - %label{ class: "btn btn-default"} - %input{ type: "radio", name: "bike_condition", value: 2} Poor - %label{ class: "btn btn-default"} - %input{ type: "radio", name: "bike_condition", value: 3} Fair - %label{ class: "btn btn-default"} - %input{ type: "radio", name: "bike_condition", value: 4} Good - %label{ class: "btn btn-default"} - %input{ type: "radio", name: "bike_condition", value: 5} Excellent - .help-block + .btn-group{ "data-toggle" => "buttons-radio"} + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "bike_condition", value: 2} Poor + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "bike_condition", value: 3} Fair + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "bike_condition", value: 4} Good + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "bike_condition", value: 5} Excellent + %input{ id: "bike_condition_id", type: "hidden"} + .help-block .control-group .controls %input{id: "seat_tube_height", placeholder: "Seat Tube (cm)", type: "number", min: 0, max: 100, class: "input-lg" } diff --git a/spec/features/bikes/new_spec.rb b/spec/features/bikes/new_spec.rb index 87f6a09..555ca8b 100644 --- a/spec/features/bikes/new_spec.rb +++ b/spec/features/bikes/new_spec.rb @@ -23,6 +23,10 @@ feature "Bikes" do visit new_bike_path click_button "Add Bike" expect(page).to have_text(:all, "is not a number") + expect(page).to have_text(:all, "is not a valid brand") expect(page).to have_text(:all, "is too short") + expect(page).to have_text(:all, "is not a valid style") + expect(page).to have_text(:all, "is not a valid wheel size") + expect(page).to have_text(:all, "is not a valid condition") end end From c6a3ed9991f29dcd8ea920233364353e2acffbfa Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 9 Feb 2014 19:11:08 -0500 Subject: [PATCH 32/81] Added bike show and show view --- app/controllers/bikes_controller.rb | 4 ++++ app/views/bikes/show.html.haml | 25 ++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/app/controllers/bikes_controller.rb b/app/controllers/bikes_controller.rb index 90d389b..792ccfe 100644 --- a/app/controllers/bikes_controller.rb +++ b/app/controllers/bikes_controller.rb @@ -7,4 +7,8 @@ class BikesController < AuthenticatedController @wheel_sizes.unshift( ["Select a wheel size", -1] ) end + def show + @bike = Bike.find_by_id(params[:id]) + end + end diff --git a/app/views/bikes/show.html.haml b/app/views/bikes/show.html.haml index 3f950e2..9282501 100644 --- a/app/views/bikes/show.html.haml +++ b/app/views/bikes/show.html.haml @@ -1 +1,24 @@ -Bike Show +%h2 #{@bike.shop_id}: #{@bike.bike_brand} - #{@bike.model} + +%dl.dl-horizontal + %dt Shop ID + %dd #{@bike.shop_id} + %dt Brand + %dd #{@bike.bike_brand} + %dt Model + %dd #{@bike.model} + %dt Type + %dd #{@bike.bike_style} + %dt Wheel Size + %dd #{@bike.bike_wheel_size.display_string} + %dt Condition + %dd #{@bike.bike_condition} + %dt Seat Tube (cm) + %dd #{@bike.seat_tube_height} + %dt Purpose + %dd #{@bike.bike_purpose} + %dt Value + %dd #{@bike.value} + - if !@bike.color.nil? + %dt Color + %dd{ style: "background-color: ##{@bike.color}; border: black; border-width: 1px; border-style: solid;"} #{@bike.color} From 64d4186b579be940282454316494bbc7d5e79c4b Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 9 Feb 2014 19:18:16 -0500 Subject: [PATCH 33/81] Bike show view styling TBD add class for color block --- app/views/bikes/show.html.haml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/views/bikes/show.html.haml b/app/views/bikes/show.html.haml index 9282501..02dd2b5 100644 --- a/app/views/bikes/show.html.haml +++ b/app/views/bikes/show.html.haml @@ -1,12 +1,7 @@ -%h2 #{@bike.shop_id}: #{@bike.bike_brand} - #{@bike.model} +%h2 #{@bike.shop_id}: #{@bike.bike_brand} +%h2 #{@bike.model} %dl.dl-horizontal - %dt Shop ID - %dd #{@bike.shop_id} - %dt Brand - %dd #{@bike.bike_brand} - %dt Model - %dd #{@bike.model} %dt Type %dd #{@bike.bike_style} %dt Wheel Size @@ -21,4 +16,4 @@ %dd #{@bike.value} - if !@bike.color.nil? %dt Color - %dd{ style: "background-color: ##{@bike.color}; border: black; border-width: 1px; border-style: solid;"} #{@bike.color} + %dd{ style: "width: 50px; background-color: ##{@bike.color}; border: black; border-width: 1px; border-style: solid;"} #{@bike.color} From 7b11da9583d5f8f1d36f42d231d3df9dfeee9eb9 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 9 Feb 2014 22:01:42 -0500 Subject: [PATCH 34/81] Forward url on add bike/ don't display value if nil --- app/assets/javascripts/bikes.js | 2 +- app/views/bikes/show.html.haml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/bikes.js b/app/assets/javascripts/bikes.js index 58eb18a..29997d8 100644 --- a/app/assets/javascripts/bikes.js +++ b/app/assets/javascripts/bikes.js @@ -20,7 +20,7 @@ $("#add_bike_submit").click(function(){ data: json_data, dataType: "json", success: function(data, status, xhr){ - //window.location = ""; + window.location = "/bikes/"+ data.bike.id; }, error: function(data, status ){ displayFormErrors(data.responseJSON); diff --git a/app/views/bikes/show.html.haml b/app/views/bikes/show.html.haml index 02dd2b5..f165e35 100644 --- a/app/views/bikes/show.html.haml +++ b/app/views/bikes/show.html.haml @@ -12,8 +12,9 @@ %dd #{@bike.seat_tube_height} %dt Purpose %dd #{@bike.bike_purpose} - %dt Value - %dd #{@bike.value} + - if !@bike.value.nil? + %dt Value + %dd #{@bike.value} - if !@bike.color.nil? %dt Color %dd{ style: "width: 50px; background-color: ##{@bike.color}; border: black; border-width: 1px; border-style: solid;"} #{@bike.color} From b90e101d69e6530584ea0ea9a984b0d4c271e9b8 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 9 Feb 2014 22:01:57 -0500 Subject: [PATCH 35/81] Whoops! copypasta in seed yml --- db/seed/fixtures/bike_styles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seed/fixtures/bike_styles.yml b/db/seed/fixtures/bike_styles.yml index 0de3aab..38d42a7 100644 --- a/db/seed/fixtures/bike_styles.yml +++ b/db/seed/fixtures/bike_styles.yml @@ -7,6 +7,6 @@ hybrid: road: id: 3 style: ROAD -road: +other: id: 4 style: OTHER From 20964eb2680e4327409fd5e35dabc8a733716640 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Mon, 10 Feb 2014 00:09:11 -0500 Subject: [PATCH 36/81] Update feature for new bike view to pass --- spec/features/bikes/new_spec.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/spec/features/bikes/new_spec.rb b/spec/features/bikes/new_spec.rb index 555ca8b..639b0e4 100644 --- a/spec/features/bikes/new_spec.rb +++ b/spec/features/bikes/new_spec.rb @@ -2,6 +2,10 @@ require "spec_helper" feature "Bikes" do before(:each) do + # create brand and wheel size + @bike_brand = BikeBrand.create( brand: "Huffy") + @bike_wheel_size = BikeWheelSize.create( description: "MyWheelSize") + @user = FactoryGirl.create(:bike_admin) visit new_user_session_path fill_in "user_username", with: @user.username @@ -9,14 +13,18 @@ feature "Bikes" do click_button "Sign in" end - scenario "User creates a new bike" do + scenario "User creates a new bike", js: true do visit new_bike_path fill_in "shop_id", with: 1 - fill_in "model", with: "Huffy" + fill_in "model", with: "Huffle Puffle" fill_in "serial_number", with: "XKCD" + find('label.btn.btn-default', text: 'RD').click + find('label.btn.btn-default', text: 'Poor').click fill_in "seat_tube_height", with: 52 + select @bike_brand.brand, from: "bike_brand_id" + select @bike_wheel_size.description, from: "bike_wheel_size_id" click_button "Add Bike" - expect(page).to have_text("Huffy") + expect(page).to have_text(@bike_brand.brand) end scenario "User submits a bike with errors", js: true do From b88bf545d20c2f8436583c1a63bb5e5cb2bea192 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Wed, 26 Feb 2014 00:05:02 -0500 Subject: [PATCH 37/81] Added jbuilder to gemfile --- Gemfile | 1 + Gemfile.lock | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Gemfile b/Gemfile index da9454d..9bb8108 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ gem 'haml-rails', '~> 0.3.4' gem 'jquery-rails', '~> 2.0' gem 'pg', '~> 0.17.1' gem 'will_paginate', '~> 3.0.3' +gem 'jbuilder', '~> 2.0.3' # Gems used only for assets and not required # in production environments by default. diff --git a/Gemfile.lock b/Gemfile.lock index 2d2cc25..e9971ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,6 +103,9 @@ GEM railties (>= 3.1, < 4.1) hike (1.2.3) i18n (0.6.1) + jbuilder (2.0.3) + activesupport (>= 3.0.0) + multi_json (>= 1.2.0) journey (1.0.4) jquery-rails (2.3.0) railties (>= 3.0, < 5.0) @@ -243,6 +246,7 @@ DEPENDENCIES guard-rspec (~> 4.2.6) guard-spork (~> 1.5.1) haml-rails (~> 0.3.4) + jbuilder (~> 2.0.3) jquery-rails (~> 2.0) launchy (~> 2.4.2) netzke-basepack (~> 0.8.0) From 14869cf8b6a2b685d4b50a92cc39069619c51151 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Wed, 26 Feb 2014 00:06:25 -0500 Subject: [PATCH 38/81] Modifed bikes create to use jbuilder & follow jsonapi.org --- app/assets/javascripts/bikes.js | 9 +++++---- app/controllers/api/v1/bikes_controller.rb | 14 +++++--------- config/routes.rb | 1 + 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/bikes.js b/app/assets/javascripts/bikes.js index 29997d8..6d42c4f 100644 --- a/app/assets/javascripts/bikes.js +++ b/app/assets/javascripts/bikes.js @@ -2,7 +2,7 @@ $('.btn').button(); $("#add_bike_submit").click(function(){ - json_data = { bike: { + json_data = { bikes: [{ serial_number: $("#serial_number").val(), bike_brand_id: parseInt($("#bike_brand_id").val()), shop_id: parseInt($("#shop_id").val()), @@ -12,15 +12,16 @@ $("#add_bike_submit").click(function(){ bike_condition_id: parseInt($('input[name=bike_condition]:checked').val()), bike_purpose_id: 1, bike_wheel_size_id: parseInt($("#bike_wheel_size_id").val()), - }}; + }]}; $.ajax({ url: $("#add_bike_submit").data("url"), type: "POST", - data: json_data, + data: JSON.stringify(json_data), + contentType: 'application/json', dataType: "json", success: function(data, status, xhr){ - window.location = "/bikes/"+ data.bike.id; + window.location = data.bikes[0].href; }, error: function(data, status ){ displayFormErrors(data.responseJSON); diff --git a/app/controllers/api/v1/bikes_controller.rb b/app/controllers/api/v1/bikes_controller.rb index 116714b..6064bfd 100644 --- a/app/controllers/api/v1/bikes_controller.rb +++ b/app/controllers/api/v1/bikes_controller.rb @@ -5,17 +5,13 @@ class Api::V1::BikesController < Api::V1::BaseController before_filter :check_bike_permission def create - if bike = params[:bike] - - b = Bike.new(bike) - if !b.save - render json: { errors: b.errors }, status: 422 and return - else - render json: { bike: b.as_json }, status: 200 and return + if params[:bikes] && bike = params[:bikes].first + @bike = Bike.new(bike) + if !@bike.save + render json: { errors: @bike.errors }, status: 422 and return end - else - render json: { errors: ["Expected bike in submitted data" ]}, status: 422 and return + render json: { errors: [EXPECTED_BIKE]}, status: 422 and return end end diff --git a/config/routes.rb b/config/routes.rb index 4922638..b6485d4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,6 +18,7 @@ Velocipede::Application.routes.draw do post 'reset' => "users#password_reset", :as => "api_password_reset" post 'bikes/create' => "bikes#create", as: "api_create_bike" + post 'bikes/:id' => "bikes#show", as: "api_bike" end end From 523046b0421bf9fd8ce78e44eff1d4a0e9735494 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 1 Mar 2014 14:15:49 -0500 Subject: [PATCH 39/81] Add create jbuilder template --- app/views/api/v1/bikes/create.json.jbuilder | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 app/views/api/v1/bikes/create.json.jbuilder diff --git a/app/views/api/v1/bikes/create.json.jbuilder b/app/views/api/v1/bikes/create.json.jbuilder new file mode 100644 index 0000000..0b73e71 --- /dev/null +++ b/app/views/api/v1/bikes/create.json.jbuilder @@ -0,0 +1,4 @@ +json.bikes [@bike] do |bike| + json.array! bike + json.set! :href, api_bike_path(bike) +end From dc0a567a2726af101bcbcf7c18a7453bacddbeb0 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 8 Mar 2014 15:03:52 -0500 Subject: [PATCH 40/81] Added bike show api method --- app/controllers/api/v1/bikes_controller.rb | 10 +++- app/views/api/v1/bikes/show.json.jbuilder | 3 ++ config/routes.rb | 9 ++-- db/seeds.rb | 2 +- spec/controllers/api/bikes_controller_spec.rb | 48 +++++++++++++++++-- spec/factories/bike_brands.rb | 5 ++ spec/factories/bike_conditions.rb | 5 ++ spec/factories/bike_purposes.rb | 5 ++ spec/factories/bike_styles.rb | 5 ++ spec/factories/bike_wheel_sizes.rb | 12 +++++ spec/factories/bikes.rb | 17 +++++++ 11 files changed, 111 insertions(+), 10 deletions(-) create mode 100644 app/views/api/v1/bikes/show.json.jbuilder create mode 100644 spec/factories/bike_brands.rb create mode 100644 spec/factories/bike_conditions.rb create mode 100644 spec/factories/bike_purposes.rb create mode 100644 spec/factories/bike_styles.rb create mode 100644 spec/factories/bike_wheel_sizes.rb diff --git a/app/controllers/api/v1/bikes_controller.rb b/app/controllers/api/v1/bikes_controller.rb index 6064bfd..976a04f 100644 --- a/app/controllers/api/v1/bikes_controller.rb +++ b/app/controllers/api/v1/bikes_controller.rb @@ -1,8 +1,9 @@ class Api::V1::BikesController < Api::V1::BaseController CANNOT_MANAGE = "You do not have permission to manage bikes." EXPECTED_BIKE = "Expected bike in submitted data" + NOT_FOUND = "The bike could not be found." - before_filter :check_bike_permission + before_filter :check_bike_permission, except: :show def create if params[:bikes] && bike = params[:bikes].first @@ -15,6 +16,13 @@ class Api::V1::BikesController < Api::V1::BaseController end end + def show + @bike = Bike.find_by_id(params[:id]) + if @bike.nil? + render json: { errors: [NOT_FOUND] }, status: 404 and return + end + end + private def check_bike_permission if cannot? :manage, Bike diff --git a/app/views/api/v1/bikes/show.json.jbuilder b/app/views/api/v1/bikes/show.json.jbuilder new file mode 100644 index 0000000..cdaee86 --- /dev/null +++ b/app/views/api/v1/bikes/show.json.jbuilder @@ -0,0 +1,3 @@ +json.bikes [@bike] do |bike| + json.array! bike +end diff --git a/config/routes.rb b/config/routes.rb index b6485d4..918d81c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,14 +11,15 @@ Velocipede::Application.routes.draw do ########################### # API Routes - scope 'api', :module => :api do + scope 'api', :module => :api, defaults: {format: :json} do scope 'v1', :module => :v1 do - post 'checkin' => "logs#checkin", :as => "api_checkin" + post 'checkin' => "logs#checkin", :as => "api_checkin" post 'checkout' => "logs#checkout", :as => "api_checkout" - post 'reset' => "users#password_reset", :as => "api_password_reset" + post 'reset' => "users#password_reset", :as => "api_password_reset" + + get 'bikes/:id' => "bikes#show", as: "api_bike" post 'bikes/create' => "bikes#create", as: "api_create_bike" - post 'bikes/:id' => "bikes#show", as: "api_bike" end end diff --git a/db/seeds.rb b/db/seeds.rb index e06aaf5..60e7917 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -41,7 +41,7 @@ if Rails.env.development? #create fake bikes if Bike.all.empty? 42.times do |n| - FactoryGirl.create(:bike) + FactoryGirl.create(:seed_bike) end end elsif Rails.env.production? diff --git a/spec/controllers/api/bikes_controller_spec.rb b/spec/controllers/api/bikes_controller_spec.rb index 3f99c86..e9e2338 100644 --- a/spec/controllers/api/bikes_controller_spec.rb +++ b/spec/controllers/api/bikes_controller_spec.rb @@ -1,6 +1,7 @@ require 'spec_helper' describe Api::V1::BikesController do + render_views describe "#create" do context "as a user" do @@ -41,7 +42,7 @@ describe Api::V1::BikesController do context "with valid bike in json data" do before(:each) do - @submit_json = { bike: { + @submit_json = { bikes: [{ serial_number: "XKCD", bike_brand_id: 1, shop_id: 1, @@ -51,11 +52,12 @@ describe Api::V1::BikesController do bike_condition_id: 1, bike_purpose_id: 1, bike_wheel_size_id: 1, - }} + }]} end it "returns 200" do post :create, @submit_json + puts @response.inspect expect(@response.code.to_i).to eql 200 end @@ -69,9 +71,9 @@ describe Api::V1::BikesController do context "with invalid bike in json data" do before(:each) do - @submit_json = { bike: { + @submit_json = { bikes: [{ serial_number: "XKCD", - }} + }]} end it "returns 422" do @@ -88,4 +90,42 @@ describe Api::V1::BikesController do end end end + + describe "#show" do + context "as a user" do + before(:each) do + @user = FactoryGirl.create(:user) + sign_in @user + end + + context "no bike exists" do + it "returns 404" do + get :show, id: 999 + expect(@response.code.to_i).to eql 404 + end + + it "returns an error message" do + get :show, id: 999 + json = JSON.parse(@response.body) + expect(json["errors"].first).to eql Api::V1::BikesController::NOT_FOUND + end + end + + context "a bike exists" do + let!(:bike){ FactoryGirl.create(:bike) } + + it "returns 200" do + get :show, id: bike.id, format: :json + expect(@response.code.to_i).to eql 200 + end + + it "returns the bike json" do + get :show, id: bike.id, format: :json + json = JSON.parse(@response.body) + expect(json).to have_key("bikes") + expect(json.to_s).to include(bike.serial_number) + end + end + end + end end diff --git a/spec/factories/bike_brands.rb b/spec/factories/bike_brands.rb new file mode 100644 index 0000000..9b2f2df --- /dev/null +++ b/spec/factories/bike_brands.rb @@ -0,0 +1,5 @@ +FactoryGirl.define do + factory :bike_brand do + brand {Faker::Commerce.product_name} + end +end diff --git a/spec/factories/bike_conditions.rb b/spec/factories/bike_conditions.rb new file mode 100644 index 0000000..fcb8b5e --- /dev/null +++ b/spec/factories/bike_conditions.rb @@ -0,0 +1,5 @@ +FactoryGirl.define do + factory :bike_condition do + condition "POOR" + end +end diff --git a/spec/factories/bike_purposes.rb b/spec/factories/bike_purposes.rb new file mode 100644 index 0000000..a854e0b --- /dev/null +++ b/spec/factories/bike_purposes.rb @@ -0,0 +1,5 @@ +FactoryGirl.define do + factory :bike_purpose do + purpose "SHOP" + end +end diff --git a/spec/factories/bike_styles.rb b/spec/factories/bike_styles.rb new file mode 100644 index 0000000..b1653e8 --- /dev/null +++ b/spec/factories/bike_styles.rb @@ -0,0 +1,5 @@ +FactoryGirl.define do + factory :bike_style do + style {Faker::Commerce.product_name} + end +end diff --git a/spec/factories/bike_wheel_sizes.rb b/spec/factories/bike_wheel_sizes.rb new file mode 100644 index 0000000..08bf418 --- /dev/null +++ b/spec/factories/bike_wheel_sizes.rb @@ -0,0 +1,12 @@ +FactoryGirl.define do + factory :bike_wheel_size do + twmm 40 + rdmm 635 + twin "1 1/2 [1 3/8]" + rdin 28 + twfr "38B [35B]" + rdfr 700 + description "a big wheel" + tire_common_score 1 + end +end diff --git a/spec/factories/bikes.rb b/spec/factories/bikes.rb index e2f04ea..18ea59f 100644 --- a/spec/factories/bikes.rb +++ b/spec/factories/bikes.rb @@ -2,6 +2,23 @@ FactoryGirl.define do factory :bike do + sequence(:shop_id) {|n| n} + sequence :serial_number do |n| + "#{Faker::Code.isbn}-#{n}" + end + bike_brand { FactoryGirl.create(:bike_brand) } + model { Faker::Commerce.product_name } + color "FFFFFF" + bike_style { FactoryGirl.create(:bike_style) } + seat_tube_height 42 + top_tube_length 42 + bike_wheel_size { FactoryGirl.create(:bike_wheel_size) } + value 200 + bike_condition { FactoryGirl.create(:bike_condition) } + bike_purpose { FactoryGirl.create(:bike_purpose) } + end + + factory :seed_bike do sequence(:shop_id) {|n| n} sequence :serial_number do |n| "#{Faker::Code.isbn}-#{n}" From 30d818ac875bc377ae79369ece0e31726cb9da4a Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 8 Mar 2014 15:04:27 -0500 Subject: [PATCH 41/81] Draft of the task list api controller --- .../api/v1/task_lists_controller.rb | 28 +++++++++++++++++++ .../api/v1/task_lists/show.json.jbuilder | 15 ++++++++++ config/routes.rb | 2 ++ 3 files changed, 45 insertions(+) create mode 100644 app/controllers/api/v1/task_lists_controller.rb create mode 100644 app/views/api/v1/task_lists/show.json.jbuilder diff --git a/app/controllers/api/v1/task_lists_controller.rb b/app/controllers/api/v1/task_lists_controller.rb new file mode 100644 index 0000000..9d4ff43 --- /dev/null +++ b/app/controllers/api/v1/task_lists_controller.rb @@ -0,0 +1,28 @@ +class Api::V1::TaskListsController < Api::V1::BaseController + CANNOT_MANAGE = "You do not have permission to manage this task list." + NOT_FOUND = "The task list could not be found." + + before_filter :get_task_list + before_filter :check_task_list_permission, except: :show + + def show + end + + def edit + #@task_list.update_attributes(params) + end + + private + def get_task_list + @task_list = TaskList.find(params[:id]) + if @task_list.nil? + render json: { errors: [NOT_FOUND] }, status: 404 and return + end + end + + def check_task_list_permission + if cannot? :manage, Bike and @task_list.item != current_user.bike + render json: { errors: [CANNOT_MANAGE]}, status: 403 and return + end + end +end diff --git a/app/views/api/v1/task_lists/show.json.jbuilder b/app/views/api/v1/task_lists/show.json.jbuilder new file mode 100644 index 0000000..f11a6da --- /dev/null +++ b/app/views/api/v1/task_lists/show.json.jbuilder @@ -0,0 +1,15 @@ +json.task_lists [@task_list] do |tl| + json.array! tl + json.links do + json.bike do + json.href api_bike_path(tl.item) + json.id tl.item_id + end + json.tasks tl.tasks do |task| + json.id task.id + json.done task.done + json.notes task.notes + json.task task.task + end + end +end diff --git a/config/routes.rb b/config/routes.rb index 918d81c..c798541 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -20,6 +20,8 @@ Velocipede::Application.routes.draw do get 'bikes/:id' => "bikes#show", as: "api_bike" post 'bikes/create' => "bikes#create", as: "api_create_bike" + + get 'task_lists/:id' => "task_lists#show", as: "api_task_list" end end From 656f0f12e4cca14fef59ac5f81bccc39ba72d8c4 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 8 Mar 2014 15:34:58 -0500 Subject: [PATCH 42/81] WIP, creating TaskList Controller and edit action & view --- app/controllers/task_lists_controller.rb | 5 +++++ app/views/task_lists/edit.haml | 10 ++++++++++ config/routes.rb | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 app/controllers/task_lists_controller.rb create mode 100644 app/views/task_lists/edit.haml diff --git a/app/controllers/task_lists_controller.rb b/app/controllers/task_lists_controller.rb new file mode 100644 index 0000000..8c1d97f --- /dev/null +++ b/app/controllers/task_lists_controller.rb @@ -0,0 +1,5 @@ +class TaskListsController < AuthenticatedController + def edit + @task_list = TaskList.find_by_id(params[:id]) + end +end diff --git a/app/views/task_lists/edit.haml b/app/views/task_lists/edit.haml new file mode 100644 index 0000000..fc7beed --- /dev/null +++ b/app/views/task_lists/edit.haml @@ -0,0 +1,10 @@ +%h2 Task List +%h3 #{@task_list.item.shop_id} #{@task_list.item.bike_brand} +%h4 #{@task_list.item.model} + +%p + .control-group + - @task_list.tasks.each do |task| + .controls + %input{class: "task_list_task", type: "checkbox", "data-id" => task.id} + #{task.task} diff --git a/config/routes.rb b/config/routes.rb index c798541..e62f66e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,6 +9,8 @@ Velocipede::Application.routes.draw do get 'bikes/new', to: 'bikes#new', as: "new_bike" get 'bikes/:id', to: 'bikes#show', as: "bike" + get 'task_lists/:id/edit' => "task_lists#edit", as: "edit_task_list" + ########################### # API Routes scope 'api', :module => :api, defaults: {format: :json} do From 3b904f95f2c4d18f3f351439e8c68a2b22e7f855 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 9 Mar 2014 19:20:00 -0400 Subject: [PATCH 43/81] Adding api task_lists#show and spec, edit.haml updates --- .../api/v1/task_lists_controller.rb | 6 +-- app/models/task_list.rb | 2 +- app/views/task_lists/edit.haml | 5 +- config/routes.rb | 2 +- .../api/task_lists_controller_spec.rb | 52 +++++++++++++++++++ spec/factories/task_lists.rb | 7 +++ 6 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 spec/controllers/api/task_lists_controller_spec.rb create mode 100644 spec/factories/task_lists.rb diff --git a/app/controllers/api/v1/task_lists_controller.rb b/app/controllers/api/v1/task_lists_controller.rb index 9d4ff43..6c89a5e 100644 --- a/app/controllers/api/v1/task_lists_controller.rb +++ b/app/controllers/api/v1/task_lists_controller.rb @@ -8,13 +8,9 @@ class Api::V1::TaskListsController < Api::V1::BaseController def show end - def edit - #@task_list.update_attributes(params) - end - private def get_task_list - @task_list = TaskList.find(params[:id]) + @task_list = TaskList.find_by_id(params[:id]) if @task_list.nil? render json: { errors: [NOT_FOUND] }, status: 404 and return end diff --git a/app/models/task_list.rb b/app/models/task_list.rb index 49ace63..85ab5ed 100644 --- a/app/models/task_list.rb +++ b/app/models/task_list.rb @@ -4,7 +4,7 @@ class TaskList < ActiveRecord::Base attr_accessible :item_id, :item_type, :name belongs_to :item, :polymorphic => true - has_many :tasks + has_many :tasks, order: "id ASC" after_save :create_default_bike_tasks diff --git a/app/views/task_lists/edit.haml b/app/views/task_lists/edit.haml index fc7beed..76599af 100644 --- a/app/views/task_lists/edit.haml +++ b/app/views/task_lists/edit.haml @@ -6,5 +6,8 @@ .control-group - @task_list.tasks.each do |task| .controls - %input{class: "task_list_task", type: "checkbox", "data-id" => task.id} + %input{class: "task_list_task", type: "checkbox", "data-id" => task.id, checked: task.done} #{task.task} + .control-group + .controls + %input{id: "update_tasks_submit", value: "Save Changes", type: "button", class: "btn btn-lg btn-block btn-primary disabled", "data-url" => "#{api_update_task_path}"} diff --git a/config/routes.rb b/config/routes.rb index e62f66e..48f8990 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -23,7 +23,7 @@ Velocipede::Application.routes.draw do get 'bikes/:id' => "bikes#show", as: "api_bike" post 'bikes/create' => "bikes#create", as: "api_create_bike" - get 'task_lists/:id' => "task_lists#show", as: "api_task_list" + get 'task_lists/:id' => "task_lists#show", as: "api_task_list" end end diff --git a/spec/controllers/api/task_lists_controller_spec.rb b/spec/controllers/api/task_lists_controller_spec.rb new file mode 100644 index 0000000..60dfd33 --- /dev/null +++ b/spec/controllers/api/task_lists_controller_spec.rb @@ -0,0 +1,52 @@ +require 'spec_helper' + +describe Api::V1::TaskListsController do + render_views + + describe "#show" do + context "as a user" do + before(:each) do + @user = FactoryGirl.create(:user) + sign_in @user + end + + context "task list exists" do + let!(:task_list){ FactoryGirl.create(:task_list) } + + it "returns 200" do + get :show, id: task_list.id, format: :json + expect(@response.code.to_i).to eql 200 + end + + it "returns valid task list json" do + get :show, id: task_list.id, format: :json + json = JSON.parse(@response.body) + expect(json.to_s).to include(task_list.name) + end + + it "returns task list with tasks json" do + get :show, id: task_list.id, format: :json + json = JSON.parse(@response.body) + expect(task_list.tasks.count).to be > 0 + task_list.tasks.each do |task| + expect(json.to_s).to include(task.task) + end + end + end + + context "task list does not exist" do + it "returns 404" do + get :show, id: 999, format: :json + expect(@response.code.to_i).to eql 404 + end + + it "returns an error message" do + get :show, id: 999, format: :json + json = JSON.parse(@response.body) + expect(json["errors"].first). + to eql Api::V1::TaskListsController::NOT_FOUND + end + end + end + end +end diff --git a/spec/factories/task_lists.rb b/spec/factories/task_lists.rb new file mode 100644 index 0000000..5b70366 --- /dev/null +++ b/spec/factories/task_lists.rb @@ -0,0 +1,7 @@ +FactoryGirl.define do + factory :task_list do + item_id { FactoryGirl.create(:bike).id } + item_type "Bike" + name { Faker::Lorem.words.join(" ")} + end +end From e2f442889eceb0c78d8b40622f7b00b792d2b36f Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 9 Mar 2014 22:30:41 -0400 Subject: [PATCH 44/81] Added tasks controller, spec, JS, apitesthelper Had an issue with calling render_views in the specs to render the jbuilder json templates and also getting the devise sign_in method to work, ended up adding a helper to add the username/password for a user --- app/assets/javascripts/task_lists.js | 32 ++++++ app/controllers/api/v1/tasks_controller.rb | 64 +++++++++++ app/views/api/v1/tasks/update.json.jbuilder | 3 + config/routes.rb | 2 + spec/controllers/api/bikes_controller_spec.rb | 1 - spec/controllers/api/tasks_controller.rb | 100 ++++++++++++++++++ spec/factories/tasks.rb | 7 ++ spec/factories/users.rb | 4 + spec/spec_helper.rb | 2 +- spec/support/api_test_helpers.rb | 5 + 10 files changed, 218 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/task_lists.js create mode 100644 app/controllers/api/v1/tasks_controller.rb create mode 100644 app/views/api/v1/tasks/update.json.jbuilder create mode 100644 spec/controllers/api/tasks_controller.rb create mode 100644 spec/factories/tasks.rb create mode 100644 spec/support/api_test_helpers.rb diff --git a/app/assets/javascripts/task_lists.js b/app/assets/javascripts/task_lists.js new file mode 100644 index 0000000..b17d8d4 --- /dev/null +++ b/app/assets/javascripts/task_lists.js @@ -0,0 +1,32 @@ +$(".task_list_task").click(function(){ + $("#update_tasks_submit").removeClass("disabled"); +}); + +$("#update_tasks_submit").click(function(){ + + tasks = []; + $(".task_list_task").each(function(){ + tasks.push({ + id: parseInt($(this).data("id")), + done: $(this).is(":checked") + }); + }); + + json_data = { tasks: tasks }; + + $.ajax({ + url: $("#update_tasks_submit").data("url"), + type: "PUT", + data: JSON.stringify(json_data), + contentType: 'application/json', + dataType: "json", + success: function(data, status, xhr){ + //should re-render via JS, but for now reload + location.reload(); + }, + error: function(data, status ){ + alert("An error occured updating tasks"); + //displayFormErrors(data.responseJSON); + } + }); +}); diff --git a/app/controllers/api/v1/tasks_controller.rb b/app/controllers/api/v1/tasks_controller.rb new file mode 100644 index 0000000..9bb8562 --- /dev/null +++ b/app/controllers/api/v1/tasks_controller.rb @@ -0,0 +1,64 @@ +class Api::V1::TasksController < Api::V1::BaseController + EXPECTED_TASKS = "Expected a list of tasks in submitted data." + CANNOT_MANAGE = "You do not have permission to manage this task." + NOT_FOUND = "The task could not be found." + + before_filter :validate_params + before_filter :get_tasks + before_filter :check_task_permission, except: :show + + def update + errors = [] + @tasks.each do |task_hash| + task = task_hash[:record] + attrs = task_hash[:new_attributes] + task.update_attributes(attrs) + if !task.errors.empty? + errors << { id: task.id, errors: task.errors } + end + end + + if !errors.empty? + render json: { errors: errors }, status: 422 and return + end + end + + private + def validate_params + if params[:tasks].nil? and not params[:tasks].kind_of?(Array) + render json: { errors: [EXPECTED_TASKS]}, status: 422 and return + end + end + + def get_tasks + @tasks = [] + errors = [] + + params[:tasks].each do |task| + t = Task.find_by_id(task[:id]) + if t.nil? + errors << { id: task[:id], error: NOT_FOUND } + else + @tasks << { record: t, new_attributes: task } + end + end + + if !errors.empty? + render json: { errors: errors }, status: 404 and return + end + end + + def check_task_permission + errors = [] + @tasks.each do |task_hash| + task = task_hash[:record] + if task.task_list.item != current_user.bike + errors << { id: task[:id], error: CANNOT_MANAGE } + end + end + + if cannot? :manage, Bike and !errors.empty? + render json: { errors: errors}, status: 403 and return + end + end +end diff --git a/app/views/api/v1/tasks/update.json.jbuilder b/app/views/api/v1/tasks/update.json.jbuilder new file mode 100644 index 0000000..0dffca7 --- /dev/null +++ b/app/views/api/v1/tasks/update.json.jbuilder @@ -0,0 +1,3 @@ +json.tasks [@tasks.map{|x| x[:record]}] do |task| + json.array! task +end diff --git a/config/routes.rb b/config/routes.rb index 48f8990..a9d9627 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,6 +24,8 @@ Velocipede::Application.routes.draw do post 'bikes/create' => "bikes#create", as: "api_create_bike" get 'task_lists/:id' => "task_lists#show", as: "api_task_list" + + put 'tasks/update' => "tasks#update", as: "api_update_task" end end diff --git a/spec/controllers/api/bikes_controller_spec.rb b/spec/controllers/api/bikes_controller_spec.rb index e9e2338..3706aa7 100644 --- a/spec/controllers/api/bikes_controller_spec.rb +++ b/spec/controllers/api/bikes_controller_spec.rb @@ -57,7 +57,6 @@ describe Api::V1::BikesController do it "returns 200" do post :create, @submit_json - puts @response.inspect expect(@response.code.to_i).to eql 200 end diff --git a/spec/controllers/api/tasks_controller.rb b/spec/controllers/api/tasks_controller.rb new file mode 100644 index 0000000..cc0e219 --- /dev/null +++ b/spec/controllers/api/tasks_controller.rb @@ -0,0 +1,100 @@ +require 'spec_helper' + +describe Api::V1::TasksController do + render_views + + describe "#update" do + context "as a user with a bike" do + before(:each) do + @user = FactoryGirl.create(:user_with_bike) + sign_in @user + end + + context "with no tasks in json data" do + it "returns 400" do + put :update + expect(@response.code.to_i).to eql 422 + end + + it "returns an error message" do + put :update + json = JSON.parse(@response.body) + expect(json["errors"].first).to eql Api::V1::TasksController::EXPECTED_TASKS + end + end + + context "with non existing task in data" do + before(:each) do + @submit_json = { tasks: [ + { id: 9999, done: false }, + ]} + end + + it "returns 404" do + put :update, @submit_json + expect(@response.code.to_i).to eql 404 + end + + it "returns an error message" do + put :update, @submit_json + json = JSON.parse(@response.body) + expect(json["errors"].to_s).to include(Api::V1::TasksController::NOT_FOUND) + end + end + + context "with valid tasks json data" do + before(:each) do + @task = FactoryGirl.create(:task, done: false, task_list_id: @user.bike.task_list.id) + task_data = { tasks: [ + { id: @task.id, done: true}, + ]} + #this is necessary because render_views does not work with sign_in devise helper + @submit_json = api_submit_json(@user, task_data) + #not sure why format: :json not working + request.accept = 'application/json' + end + + it "returns 200" do + put :update, @submit_json + expect(@response.code.to_i).to eql 200 + end + + it "returns the updated task json" do + put :update, @submit_json + json = JSON.parse(@response.body) + expect(json).to have_key("tasks") + expect(json.to_s).to include(Task.find_by_id(@task.id).done.to_s) + end + + it "updates the task" do + expect{put :update, @submit_json}. + to change{ Task.find_by_id(@task.id).done }. + from(false).to(true) + end + end + end + + context "as a user without a bike" do + before(:each) do + @user = FactoryGirl.create(:user, bike_id: nil) + sign_in @user + + task = FactoryGirl.create(:task) + @submit_json = { tasks: [ + { id: task.id, done: false }, + ]} + end + + it "should return 403" do + put :update, @submit_json + expect(@response.code.to_i).to eql 403 + end + + it "returns an error message" do + put :update, @submit_json + json = JSON.parse(@response.body) + expect(json["errors"].to_s).to include(Api::V1::TasksController::CANNOT_MANAGE) + end + end + end +end diff --git a/spec/factories/tasks.rb b/spec/factories/tasks.rb new file mode 100644 index 0000000..1b83704 --- /dev/null +++ b/spec/factories/tasks.rb @@ -0,0 +1,7 @@ +FactoryGirl.define do + factory :task do + task_list { FactoryGirl.create(:task_list) } + done false + task { Faker::Lorem.words(7).join(" ")} + end +end diff --git a/spec/factories/users.rb b/spec/factories/users.rb index e29025d..b75147c 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -36,5 +36,9 @@ FactoryGirl.define do end end + factory :user_with_bike do + bike { FactoryGirl.create(:bike) } + end + end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 797cabf..669eb41 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -68,6 +68,7 @@ Spork.prefork do config.infer_base_class_for_anonymous_controllers = false config.include FactoryGirlStepHelpers config.include FactoryGirl::Syntax::Methods + config.include ApiTestHelpers config.include Devise::TestHelpers, type: :controller #allows :focus tag to only run specific tests @@ -80,7 +81,6 @@ end Spork.each_run do # This code will be run each time you run your specs. - #Reload Factories #FYI make sure that Factories use strings instead of class constants FactoryGirl.reload diff --git a/spec/support/api_test_helpers.rb b/spec/support/api_test_helpers.rb new file mode 100644 index 0000000..c164fb1 --- /dev/null +++ b/spec/support/api_test_helpers.rb @@ -0,0 +1,5 @@ +module ApiTestHelpers + def api_submit_json(user, json_hash) + json_hash.merge({username: user.email, password: user.password}) + end +end From 64e907b6f79f8d1e1d18bd05da2051a8d1269173 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 9 Mar 2014 22:48:35 -0400 Subject: [PATCH 45/81] Should authenticate by user username, not email --- app/controllers/api/v1/base_controller.rb | 2 +- spec/support/api_test_helpers.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb index e2e90ee..e2dec11 100644 --- a/app/controllers/api/v1/base_controller.rb +++ b/app/controllers/api/v1/base_controller.rb @@ -6,7 +6,7 @@ class Api::V1::BaseController < ActionController::Base private def authenticate_user if params[:username] - user = User.find_for_database_authentication( :email => params[:username] ) + user = User.find_for_database_authentication( :username => params[:username] ) @current_user = user if user && user.valid_password?( params[:password] ) if @current_user.nil? diff --git a/spec/support/api_test_helpers.rb b/spec/support/api_test_helpers.rb index c164fb1..4300a9c 100644 --- a/spec/support/api_test_helpers.rb +++ b/spec/support/api_test_helpers.rb @@ -1,5 +1,5 @@ module ApiTestHelpers def api_submit_json(user, json_hash) - json_hash.merge({username: user.email, password: user.password}) + json_hash.merge({username: user.username, password: user.password}) end end From b1ddcfb8672448492cba0cf889e6c878c095300a Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 9 Mar 2014 22:48:59 -0400 Subject: [PATCH 46/81] Redirect correctly after creating a bike --- app/assets/javascripts/bikes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/bikes.js b/app/assets/javascripts/bikes.js index 6d42c4f..f2398ea 100644 --- a/app/assets/javascripts/bikes.js +++ b/app/assets/javascripts/bikes.js @@ -21,7 +21,7 @@ $("#add_bike_submit").click(function(){ contentType: 'application/json', dataType: "json", success: function(data, status, xhr){ - window.location = data.bikes[0].href; + window.location = data.bikes[0].id; }, error: function(data, status ){ displayFormErrors(data.responseJSON); From 1f9322ff3d67d88c543543513b76718518c5830f Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 9 Mar 2014 22:49:30 -0400 Subject: [PATCH 47/81] Fixed weird spec sign_in issues, and render json --- spec/controllers/api/bikes_controller_spec.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spec/controllers/api/bikes_controller_spec.rb b/spec/controllers/api/bikes_controller_spec.rb index 3706aa7..5d69bb1 100644 --- a/spec/controllers/api/bikes_controller_spec.rb +++ b/spec/controllers/api/bikes_controller_spec.rb @@ -42,7 +42,7 @@ describe Api::V1::BikesController do context "with valid bike in json data" do before(:each) do - @submit_json = { bikes: [{ + bike_data = { bikes: [{ serial_number: "XKCD", bike_brand_id: 1, shop_id: 1, @@ -53,6 +53,10 @@ describe Api::V1::BikesController do bike_purpose_id: 1, bike_wheel_size_id: 1, }]} + #this is necessary because render_views does not work with sign_in devise helper + @submit_json = api_submit_json(@user, bike_data) + #not sure why format: :json not working + request.accept = 'application/json' end it "returns 200" do @@ -63,8 +67,8 @@ describe Api::V1::BikesController do it "returns the created bike json" do post :create, @submit_json json = JSON.parse(@response.body) - expect(json).to have_key("bike") - expect(json.to_s).to include(@submit_json[:bike][:serial_number]) + expect(json).to have_key("bikes") + expect(json.to_s).to include(@submit_json[:bikes].first[:serial_number]) end end From 124ce5901d486b07cbd17a58dfc8bf3641488084 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Wed, 12 Mar 2014 21:29:01 -0400 Subject: [PATCH 48/81] Update spec tests for registration page --- spec/features/devise/registrations_spec.rb | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/spec/features/devise/registrations_spec.rb b/spec/features/devise/registrations_spec.rb index 7ed6a7c..45bde07 100644 --- a/spec/features/devise/registrations_spec.rb +++ b/spec/features/devise/registrations_spec.rb @@ -1,10 +1,11 @@ require 'spec_helper' describe "New User Registrations" do + it 'should have a link to sign up on the homepage' do visit root_path - page.should have_link 'Register' - click_link 'Register' + page.should have_link 'Sign up' + click_link 'Sign up' current_path.should == new_user_registration_path end @@ -13,30 +14,29 @@ describe "New User Registrations" do visit new_user_registration_path end it 'should have the additional user fields on the registration page' do - page.should have_field 'First name' - page.should have_field 'Last name' - page.should have_field 'Nickname' - page.should have_field 'Email' - page.should have_field 'Password' - page.should have_field 'Password confirmation' + page.should have_field 'user_first_name' + page.should have_field 'user_last_name' + page.should have_field 'user_email' + page.should have_field 'user_password' + page.should have_field 'user_password_confirmation' page.should have_button 'Sign up' end context 'required non-devise fields' do before do - fill_in 'Email', :with => 'FF@example.com' - fill_in 'Password', :with => 'password' - fill_in 'Password confirmation', :with => 'password' + fill_in 'user_email', :with => 'FF@example.com' + fill_in 'user_password', :with => 'password' + fill_in 'user_password_confirmation', :with => 'password' end it 'should require first name' do - fill_in 'Last name', :with => 'Footer' + fill_in 'user_last_name', :with => 'Footer' click_button 'Sign up' page.should have_content "First name can't be blank" end it 'should require last name' do - fill_in 'First name', :with => 'Frank' + fill_in 'user_first_name', :with => 'Frank' click_button 'Sign up' page.should have_content "Last name can't be blank" end From 062ed9c2d17f5e2d36f8469fb593470de9ac5493 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Wed, 12 Mar 2014 21:52:37 -0400 Subject: [PATCH 49/81] Added tests for user checkin/checkout on index --- app/models/user.rb | 17 ++++++++++------- spec/features/site/index_spec.rb | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 spec/features/site/index_spec.rb diff --git a/app/models/user.rb b/app/models/user.rb index 3cc2c4b..59a468f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -114,28 +114,31 @@ class User < ActiveRecord::Base end def checked_in? - log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN") - checked = logs.where( log_action_id: log_action.id). + #default CHECKIN log action is id, yea yea should be a constant + log_action_id = 4 + checked = logs.where( log_action_id: log_action_id). where("start_date >= ?", Time.zone.now.beginning_of_day). where("start_date = end_date") !checked.empty? end def checkin - log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN") + #default CHECKIN log action is id, yea yea should be a constant + log_action_id = 4 time = Time.now logs.create( logger_id: self.id, logger_type: self.class.to_s, start_date: time, end_date: time, - log_action_id: log_action.id, - log_action_type: log_action.class.to_s) + log_action_id: log_action_id, + log_action_type: ::ActsAsLoggable::UserAction.to_s) save end def checkout - log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN") - checked = logs.where( log_action_id: log_action.id). + #default CHECKIN log action is id, yea yea should be a constant + log_action_id = 4 + checked = logs.where( log_action_id: log_action_id). where("start_date >= ?", Time.zone.now.beginning_of_day). where("start_date = end_date").first checked.end_date = Time.now diff --git a/spec/features/site/index_spec.rb b/spec/features/site/index_spec.rb new file mode 100644 index 0000000..85cec75 --- /dev/null +++ b/spec/features/site/index_spec.rb @@ -0,0 +1,32 @@ +require 'spec_helper' + +describe "Index Page" do + + before(:each) do + @user = FactoryGirl.create(:bike_admin) + visit root_path + fill_in "user_username", with: @user.username + fill_in "user_password", with: @user.password + end + + it 'should have a link to check in' do + page.should have_button 'CHECK IN' + end + + it 'should have a link to check out' do + page.should have_button 'CHECK OUT' + end + + it 'clicking check in should check in a user' do + expect{click_button 'CHECK IN'}. + to change{@user.checked_in?}. + from(false).to(true) + end + + it 'clicking check out should check out a user' do + @user.checkin + expect{click_button 'CHECK OUT'}. + to change{@user.checked_in?}. + from(true).to(false) + end +end From 8f637348cf8896396c09f29b40392737cd017cf7 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Wed, 12 Mar 2014 23:35:09 -0400 Subject: [PATCH 50/81] Fix check in/ check out --- app/assets/javascripts/devise/sessions.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/devise/sessions.js b/app/assets/javascripts/devise/sessions.js index e58270c..054b4ce 100644 --- a/app/assets/javascripts/devise/sessions.js +++ b/app/assets/javascripts/devise/sessions.js @@ -1,7 +1,7 @@ $(document).ready(function(){ $("#checkin_menu").show(); $("#checkin").click( function(e){ - var username = $("#user_email").val(); + var username = $("#user_username").val(); var password = $("#user_password").val(); $.ajax({ type: 'POST', @@ -13,7 +13,7 @@ $(document).ready(function(){ complete: function() { }, success: function(data) { alert("Checked IN!"); - $("#user_email").val(''); + $("#user_username").val(''); $("#user_password").val(''); }, error: function(data,textStatus) { @@ -22,7 +22,7 @@ $(document).ready(function(){ }) }); $("#checkout").click( function(e){ - var username = $("#user_email").val(); + var username = $("#user_username").val(); var password = $("#user_password").val(); $.ajax({ type: 'POST', @@ -34,7 +34,8 @@ $(document).ready(function(){ complete: function() { }, success: function(data) { alert("Checked OUT!"); - $("#user_email").val(''); + + $("#user_username").val(''); $("#user_password").val(''); }, error: function(data,textStatus) { From 9527725e07f7d20f057eb4612837531ddaa87158 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 16 Mar 2014 13:34:56 -0400 Subject: [PATCH 51/81] Adding makeshift home button, Added view your bike link --- app/controllers/site_controller.rb | 1 + app/views/bikes/new.html.haml | 2 ++ app/views/bikes/show.html.haml | 2 ++ app/views/site/index.html.haml | 8 ++++---- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 9004665..4290aa9 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -1,5 +1,6 @@ class SiteController < ApplicationController def index + @bike = current_user.bike end end diff --git a/app/views/bikes/new.html.haml b/app/views/bikes/new.html.haml index 76d7e65..eb652a9 100644 --- a/app/views/bikes/new.html.haml +++ b/app/views/bikes/new.html.haml @@ -1,3 +1,5 @@ +%a{ class: "btn btn-default btn-lg", href: root_path} + %span{ class:"icon-home"} %h2 Add Bike %p diff --git a/app/views/bikes/show.html.haml b/app/views/bikes/show.html.haml index f165e35..7f82cca 100644 --- a/app/views/bikes/show.html.haml +++ b/app/views/bikes/show.html.haml @@ -1,3 +1,5 @@ +%a{ class: "btn btn-default btn-lg", href: root_path} + %span{ class:"icon-home"} %h2 #{@bike.shop_id}: #{@bike.bike_brand} %h2 #{@bike.model} diff --git a/app/views/site/index.html.haml b/app/views/site/index.html.haml index 6f93462..1877017 100644 --- a/app/views/site/index.html.haml +++ b/app/views/site/index.html.haml @@ -9,10 +9,10 @@ %p %a{class: "btn btn-lg btn-block btn-primary", href: new_bike_path} Add Bike -%p Your Bikes: -%ol - %li Bike 1 - %li Bike 2 +- if !@bike.nil? + %p + %a{class: "btn btn-lg btn-block btn-primary", href: bike_path(@bike)} View Your Bike + %p %p From 98b136e4f4351a12fe9795a660d942f501302e84 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 16 Mar 2014 13:50:13 -0400 Subject: [PATCH 52/81] Add link to view bike check list when showing bike --- app/controllers/bikes_controller.rb | 1 + app/views/bikes/show.html.haml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/bikes_controller.rb b/app/controllers/bikes_controller.rb index 792ccfe..e2985d5 100644 --- a/app/controllers/bikes_controller.rb +++ b/app/controllers/bikes_controller.rb @@ -9,6 +9,7 @@ class BikesController < AuthenticatedController def show @bike = Bike.find_by_id(params[:id]) + @task_list_id = @bike.task_list.id end end diff --git a/app/views/bikes/show.html.haml b/app/views/bikes/show.html.haml index 7f82cca..e836177 100644 --- a/app/views/bikes/show.html.haml +++ b/app/views/bikes/show.html.haml @@ -20,3 +20,4 @@ - if !@bike.color.nil? %dt Color %dd{ style: "width: 50px; background-color: ##{@bike.color}; border: black; border-width: 1px; border-style: solid;"} #{@bike.color} +%a{class: "btn btn-lg btn-block btn-primary", href: edit_task_list_path(@task_list_id) } View Checklist From 80b2b7ff60707dbae918bb13c730bda12de327dd Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 19 Apr 2014 16:20:14 -0400 Subject: [PATCH 53/81] Added New Time Entry Front End --- app/assets/javascripts/application.js | 2 + .../javascripts/bootstrap-datepicker.js | 474 +++++++ .../javascripts/bootstrap-timepicker.js | 1097 +++++++++++++++++ app/assets/javascripts/time_entries.js | 11 + app/assets/stylesheets/application.css | 2 + .../stylesheets/bootstrap-timepicker.css | 146 +++ .../bootstrap_and_overrides.css.less | 4 + app/assets/stylesheets/datepicker.css | 182 +++ app/controllers/time_entries_controller.rb | 10 + app/views/layouts/application.html.haml | 2 +- app/views/site/index.html.haml | 2 +- app/views/time_entries/new.haml | 41 + config/routes.rb | 2 + 13 files changed, 1973 insertions(+), 2 deletions(-) create mode 100755 app/assets/javascripts/bootstrap-datepicker.js create mode 100644 app/assets/javascripts/bootstrap-timepicker.js create mode 100644 app/assets/javascripts/time_entries.js create mode 100644 app/assets/stylesheets/bootstrap-timepicker.css create mode 100755 app/assets/stylesheets/datepicker.css create mode 100644 app/controllers/time_entries_controller.rb create mode 100644 app/views/time_entries/new.haml diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 276aff6..624d531 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,5 @@ //= require jquery_ujs //= require twitter/bootstrap/bootstrap-button //= require utils +//= require bootstrap-datepicker +//= require bootstrap-timepicker diff --git a/app/assets/javascripts/bootstrap-datepicker.js b/app/assets/javascripts/bootstrap-datepicker.js new file mode 100755 index 0000000..bf3a56d --- /dev/null +++ b/app/assets/javascripts/bootstrap-datepicker.js @@ -0,0 +1,474 @@ +/* ========================================================= + * bootstrap-datepicker.js + * http://www.eyecon.ro/bootstrap-datepicker + * ========================================================= + * Copyright 2012 Stefan Petre + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================= */ + +!function( $ ) { + + // Picker object + + var Datepicker = function(element, options){ + this.element = $(element); + this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'mm/dd/yyyy'); + this.picker = $(DPGlobal.template) + .appendTo('body') + .on({ + click: $.proxy(this.click, this)//, + //mousedown: $.proxy(this.mousedown, this) + }); + this.isInput = this.element.is('input'); + this.component = this.element.is('.date') ? this.element.find('.add-on') : false; + + if (this.isInput) { + this.element.on({ + focus: $.proxy(this.show, this), + //blur: $.proxy(this.hide, this), + keyup: $.proxy(this.update, this) + }); + } else { + if (this.component){ + this.component.on('click', $.proxy(this.show, this)); + } else { + this.element.on('click', $.proxy(this.show, this)); + } + } + + this.minViewMode = options.minViewMode||this.element.data('date-minviewmode')||0; + if (typeof this.minViewMode === 'string') { + switch (this.minViewMode) { + case 'months': + this.minViewMode = 1; + break; + case 'years': + this.minViewMode = 2; + break; + default: + this.minViewMode = 0; + break; + } + } + this.viewMode = options.viewMode||this.element.data('date-viewmode')||0; + if (typeof this.viewMode === 'string') { + switch (this.viewMode) { + case 'months': + this.viewMode = 1; + break; + case 'years': + this.viewMode = 2; + break; + default: + this.viewMode = 0; + break; + } + } + this.startViewMode = this.viewMode; + this.weekStart = options.weekStart||this.element.data('date-weekstart')||0; + this.weekEnd = this.weekStart === 0 ? 6 : this.weekStart - 1; + this.onRender = options.onRender; + this.fillDow(); + this.fillMonths(); + this.update(); + this.showMode(); + }; + + Datepicker.prototype = { + constructor: Datepicker, + + show: function(e) { + this.picker.show(); + this.height = this.component ? this.component.outerHeight() : this.element.outerHeight(); + this.place(); + $(window).on('resize', $.proxy(this.place, this)); + if (e ) { + e.stopPropagation(); + e.preventDefault(); + } + if (!this.isInput) { + } + var that = this; + $(document).on('mousedown', function(ev){ + if ($(ev.target).closest('.datepicker').length == 0) { + that.hide(); + } + }); + this.element.trigger({ + type: 'show', + date: this.date + }); + }, + + hide: function(){ + this.picker.hide(); + $(window).off('resize', this.place); + this.viewMode = this.startViewMode; + this.showMode(); + if (!this.isInput) { + $(document).off('mousedown', this.hide); + } + //this.set(); + this.element.trigger({ + type: 'hide', + date: this.date + }); + }, + + set: function() { + var formated = DPGlobal.formatDate(this.date, this.format); + if (!this.isInput) { + if (this.component){ + this.element.find('input').prop('value', formated); + } + this.element.data('date', formated); + } else { + this.element.prop('value', formated); + } + }, + + setValue: function(newDate) { + if (typeof newDate === 'string') { + this.date = DPGlobal.parseDate(newDate, this.format); + } else { + this.date = new Date(newDate); + } + this.set(); + this.viewDate = new Date(this.date.getFullYear(), this.date.getMonth(), 1, 0, 0, 0, 0); + this.fill(); + }, + + place: function(){ + var offset = this.component ? this.component.offset() : this.element.offset(); + this.picker.css({ + top: offset.top + this.height, + left: offset.left + }); + }, + + update: function(newDate){ + this.date = DPGlobal.parseDate( + typeof newDate === 'string' ? newDate : (this.isInput ? this.element.prop('value') : this.element.data('date')), + this.format + ); + this.viewDate = new Date(this.date.getFullYear(), this.date.getMonth(), 1, 0, 0, 0, 0); + this.fill(); + }, + + fillDow: function(){ + var dowCnt = this.weekStart; + var html = ''; + while (dowCnt < this.weekStart + 7) { + html += ''+DPGlobal.dates.daysMin[(dowCnt++)%7]+''; + } + html += ''; + this.picker.find('.datepicker-days thead').append(html); + }, + + fillMonths: function(){ + var html = ''; + var i = 0 + while (i < 12) { + html += ''+DPGlobal.dates.monthsShort[i++]+''; + } + this.picker.find('.datepicker-months td').append(html); + }, + + fill: function() { + var d = new Date(this.viewDate), + year = d.getFullYear(), + month = d.getMonth(), + currentDate = this.date.valueOf(); + this.picker.find('.datepicker-days th:eq(1)') + .text(DPGlobal.dates.months[month]+' '+year); + var prevMonth = new Date(year, month-1, 28,0,0,0,0), + day = DPGlobal.getDaysInMonth(prevMonth.getFullYear(), prevMonth.getMonth()); + prevMonth.setDate(day); + prevMonth.setDate(day - (prevMonth.getDay() - this.weekStart + 7)%7); + var nextMonth = new Date(prevMonth); + nextMonth.setDate(nextMonth.getDate() + 42); + nextMonth = nextMonth.valueOf(); + var html = []; + var clsName, + prevY, + prevM; + while(prevMonth.valueOf() < nextMonth) { + if (prevMonth.getDay() === this.weekStart) { + html.push(''); + } + clsName = this.onRender(prevMonth); + prevY = prevMonth.getFullYear(); + prevM = prevMonth.getMonth(); + if ((prevM < month && prevY === year) || prevY < year) { + clsName += ' old'; + } else if ((prevM > month && prevY === year) || prevY > year) { + clsName += ' new'; + } + if (prevMonth.valueOf() === currentDate) { + clsName += ' active'; + } + html.push(''+prevMonth.getDate() + ''); + if (prevMonth.getDay() === this.weekEnd) { + html.push(''); + } + prevMonth.setDate(prevMonth.getDate()+1); + } + this.picker.find('.datepicker-days tbody').empty().append(html.join('')); + var currentYear = this.date.getFullYear(); + + var months = this.picker.find('.datepicker-months') + .find('th:eq(1)') + .text(year) + .end() + .find('span').removeClass('active'); + if (currentYear === year) { + months.eq(this.date.getMonth()).addClass('active'); + } + + html = ''; + year = parseInt(year/10, 10) * 10; + var yearCont = this.picker.find('.datepicker-years') + .find('th:eq(1)') + .text(year + '-' + (year + 9)) + .end() + .find('td'); + year -= 1; + for (var i = -1; i < 11; i++) { + html += ''+year+''; + year += 1; + } + yearCont.html(html); + }, + + click: function(e) { + e.stopPropagation(); + e.preventDefault(); + var target = $(e.target).closest('span, td, th'); + if (target.length === 1) { + switch(target[0].nodeName.toLowerCase()) { + case 'th': + switch(target[0].className) { + case 'switch': + this.showMode(1); + break; + case 'prev': + case 'next': + this.viewDate['set'+DPGlobal.modes[this.viewMode].navFnc].call( + this.viewDate, + this.viewDate['get'+DPGlobal.modes[this.viewMode].navFnc].call(this.viewDate) + + DPGlobal.modes[this.viewMode].navStep * (target[0].className === 'prev' ? -1 : 1) + ); + this.fill(); + this.set(); + break; + } + break; + case 'span': + if (target.is('.month')) { + var month = target.parent().find('span').index(target); + this.viewDate.setMonth(month); + } else { + var year = parseInt(target.text(), 10)||0; + this.viewDate.setFullYear(year); + } + if (this.viewMode !== 0) { + this.date = new Date(this.viewDate); + this.element.trigger({ + type: 'changeDate', + date: this.date, + viewMode: DPGlobal.modes[this.viewMode].clsName + }); + } + this.showMode(-1); + this.fill(); + this.set(); + break; + case 'td': + if (target.is('.day') && !target.is('.disabled')){ + var day = parseInt(target.text(), 10)||1; + var month = this.viewDate.getMonth(); + if (target.is('.old')) { + month -= 1; + } else if (target.is('.new')) { + month += 1; + } + var year = this.viewDate.getFullYear(); + this.date = new Date(year, month, day,0,0,0,0); + this.viewDate = new Date(year, month, Math.min(28, day),0,0,0,0); + this.fill(); + this.set(); + this.element.trigger({ + type: 'changeDate', + date: this.date, + viewMode: DPGlobal.modes[this.viewMode].clsName + }); + } + break; + } + } + }, + + mousedown: function(e){ + e.stopPropagation(); + e.preventDefault(); + }, + + showMode: function(dir) { + if (dir) { + this.viewMode = Math.max(this.minViewMode, Math.min(2, this.viewMode + dir)); + } + this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).show(); + } + }; + + $.fn.datepicker = function ( option, val ) { + return this.each(function () { + var $this = $(this), + data = $this.data('datepicker'), + options = typeof option === 'object' && option; + if (!data) { + $this.data('datepicker', (data = new Datepicker(this, $.extend({}, $.fn.datepicker.defaults,options)))); + } + if (typeof option === 'string') data[option](val); + }); + }; + + $.fn.datepicker.defaults = { + onRender: function(date) { + return ''; + } + }; + $.fn.datepicker.Constructor = Datepicker; + + var DPGlobal = { + modes: [ + { + clsName: 'days', + navFnc: 'Month', + navStep: 1 + }, + { + clsName: 'months', + navFnc: 'FullYear', + navStep: 1 + }, + { + clsName: 'years', + navFnc: 'FullYear', + navStep: 10 + }], + dates:{ + days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"], + daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], + daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"], + months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] + }, + isLeapYear: function (year) { + return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0)) + }, + getDaysInMonth: function (year, month) { + return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month] + }, + parseFormat: function(format){ + var separator = format.match(/[.\/\-\s].*?/), + parts = format.split(/\W+/); + if (!separator || !parts || parts.length === 0){ + throw new Error("Invalid date format."); + } + return {separator: separator, parts: parts}; + }, + parseDate: function(date, format) { + var parts = date.split(format.separator), + date = new Date(), + val; + date.setHours(0); + date.setMinutes(0); + date.setSeconds(0); + date.setMilliseconds(0); + if (parts.length === format.parts.length) { + var year = date.getFullYear(), day = date.getDate(), month = date.getMonth(); + for (var i=0, cnt = format.parts.length; i < cnt; i++) { + val = parseInt(parts[i], 10)||1; + switch(format.parts[i]) { + case 'dd': + case 'd': + day = val; + date.setDate(val); + break; + case 'mm': + case 'm': + month = val - 1; + date.setMonth(val - 1); + break; + case 'yy': + year = 2000 + val; + date.setFullYear(2000 + val); + break; + case 'yyyy': + year = val; + date.setFullYear(val); + break; + } + } + date = new Date(year, month, day, 0 ,0 ,0); + } + return date; + }, + formatDate: function(date, format){ + var val = { + d: date.getDate(), + m: date.getMonth() + 1, + yy: date.getFullYear().toString().substring(2), + yyyy: date.getFullYear() + }; + val.dd = (val.d < 10 ? '0' : '') + val.d; + val.mm = (val.m < 10 ? '0' : '') + val.m; + var date = []; + for (var i=0, cnt = format.parts.length; i < cnt; i++) { + date.push(val[format.parts[i]]); + } + return date.join(format.separator); + }, + headTemplate: ''+ + ''+ + '‹'+ + ''+ + '›'+ + ''+ + '', + contTemplate: '' + }; + DPGlobal.template = '
'+ + '
'+ + ''+ + DPGlobal.headTemplate+ + ''+ + '
'+ + '
'+ + '
'+ + ''+ + DPGlobal.headTemplate+ + DPGlobal.contTemplate+ + '
'+ + '
'+ + '
'+ + ''+ + DPGlobal.headTemplate+ + DPGlobal.contTemplate+ + '
'+ + '
'+ + '
'; + +}( window.jQuery ); \ No newline at end of file diff --git a/app/assets/javascripts/bootstrap-timepicker.js b/app/assets/javascripts/bootstrap-timepicker.js new file mode 100644 index 0000000..5972e3c --- /dev/null +++ b/app/assets/javascripts/bootstrap-timepicker.js @@ -0,0 +1,1097 @@ +/*! + * Timepicker Component for Twitter Bootstrap + * + * Copyright 2013 Joris de Wit + * + * Contributors https://github.com/jdewit/bootstrap-timepicker/graphs/contributors + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +(function($, window, document, undefined) { + 'use strict'; + + // TIMEPICKER PUBLIC CLASS DEFINITION + var Timepicker = function(element, options) { + this.widget = ''; + this.$element = $(element); + this.defaultTime = options.defaultTime; + this.disableFocus = options.disableFocus; + this.disableMousewheel = options.disableMousewheel; + this.isOpen = options.isOpen; + this.minuteStep = options.minuteStep; + this.modalBackdrop = options.modalBackdrop; + this.orientation = options.orientation; + this.secondStep = options.secondStep; + this.showInputs = options.showInputs; + this.showMeridian = options.showMeridian; + this.showSeconds = options.showSeconds; + this.template = options.template; + this.appendWidgetTo = options.appendWidgetTo; + this.showWidgetOnAddonClick = options.showWidgetOnAddonClick; + + this._init(); + }; + + Timepicker.prototype = { + + constructor: Timepicker, + _init: function() { + var self = this; + + if (this.showWidgetOnAddonClick && (this.$element.parent().hasClass('input-append') || this.$element.parent().hasClass('input-prepend'))) { + this.$element.parent('.input-append, .input-prepend').find('.add-on').on({ + 'click.timepicker': $.proxy(this.showWidget, this) + }); + this.$element.on({ + 'focus.timepicker': $.proxy(this.highlightUnit, this), + 'click.timepicker': $.proxy(this.highlightUnit, this), + 'keydown.timepicker': $.proxy(this.elementKeydown, this), + 'blur.timepicker': $.proxy(this.blurElement, this), + 'mousewheel.timepicker DOMMouseScroll.timepicker': $.proxy(this.mousewheel, this) + }); + } else { + if (this.template) { + this.$element.on({ + 'focus.timepicker': $.proxy(this.showWidget, this), + 'click.timepicker': $.proxy(this.showWidget, this), + 'blur.timepicker': $.proxy(this.blurElement, this), + 'mousewheel.timepicker DOMMouseScroll.timepicker': $.proxy(this.mousewheel, this) + }); + } else { + this.$element.on({ + 'focus.timepicker': $.proxy(this.highlightUnit, this), + 'click.timepicker': $.proxy(this.highlightUnit, this), + 'keydown.timepicker': $.proxy(this.elementKeydown, this), + 'blur.timepicker': $.proxy(this.blurElement, this), + 'mousewheel.timepicker DOMMouseScroll.timepicker': $.proxy(this.mousewheel, this) + }); + } + } + + if (this.template !== false) { + this.$widget = $(this.getTemplate()).on('click', $.proxy(this.widgetClick, this)); + } else { + this.$widget = false; + } + + if (this.showInputs && this.$widget !== false) { + this.$widget.find('input').each(function() { + $(this).on({ + 'click.timepicker': function() { $(this).select(); }, + 'keydown.timepicker': $.proxy(self.widgetKeydown, self), + 'keyup.timepicker': $.proxy(self.widgetKeyup, self) + }); + }); + } + + this.setDefaultTime(this.defaultTime); + }, + + blurElement: function() { + this.highlightedUnit = null; + this.updateFromElementVal(); + }, + + clear: function() { + this.hour = ''; + this.minute = ''; + this.second = ''; + this.meridian = ''; + + this.$element.val(''); + }, + + decrementHour: function() { + if (this.showMeridian) { + if (this.hour === 1) { + this.hour = 12; + } else if (this.hour === 12) { + this.hour--; + + return this.toggleMeridian(); + } else if (this.hour === 0) { + this.hour = 11; + + return this.toggleMeridian(); + } else { + this.hour--; + } + } else { + if (this.hour <= 0) { + this.hour = 23; + } else { + this.hour--; + } + } + }, + + decrementMinute: function(step) { + var newVal; + + if (step) { + newVal = this.minute - step; + } else { + newVal = this.minute - this.minuteStep; + } + + if (newVal < 0) { + this.decrementHour(); + this.minute = newVal + 60; + } else { + this.minute = newVal; + } + }, + + decrementSecond: function() { + var newVal = this.second - this.secondStep; + + if (newVal < 0) { + this.decrementMinute(true); + this.second = newVal + 60; + } else { + this.second = newVal; + } + }, + + elementKeydown: function(e) { + switch (e.keyCode) { + case 9: //tab + case 27: // escape + this.updateFromElementVal(); + break; + case 37: // left arrow + e.preventDefault(); + this.highlightPrevUnit(); + break; + case 38: // up arrow + e.preventDefault(); + switch (this.highlightedUnit) { + case 'hour': + this.incrementHour(); + this.highlightHour(); + break; + case 'minute': + this.incrementMinute(); + this.highlightMinute(); + break; + case 'second': + this.incrementSecond(); + this.highlightSecond(); + break; + case 'meridian': + this.toggleMeridian(); + this.highlightMeridian(); + break; + } + this.update(); + break; + case 39: // right arrow + e.preventDefault(); + this.highlightNextUnit(); + break; + case 40: // down arrow + e.preventDefault(); + switch (this.highlightedUnit) { + case 'hour': + this.decrementHour(); + this.highlightHour(); + break; + case 'minute': + this.decrementMinute(); + this.highlightMinute(); + break; + case 'second': + this.decrementSecond(); + this.highlightSecond(); + break; + case 'meridian': + this.toggleMeridian(); + this.highlightMeridian(); + break; + } + + this.update(); + break; + } + }, + + getCursorPosition: function() { + var input = this.$element.get(0); + + if ('selectionStart' in input) {// Standard-compliant browsers + + return input.selectionStart; + } else if (document.selection) {// IE fix + input.focus(); + var sel = document.selection.createRange(), + selLen = document.selection.createRange().text.length; + + sel.moveStart('character', - input.value.length); + + return sel.text.length - selLen; + } + }, + + getTemplate: function() { + var template, + hourTemplate, + minuteTemplate, + secondTemplate, + meridianTemplate, + templateContent; + + if (this.showInputs) { + hourTemplate = ''; + minuteTemplate = ''; + secondTemplate = ''; + meridianTemplate = ''; + } else { + hourTemplate = ''; + minuteTemplate = ''; + secondTemplate = ''; + meridianTemplate = ''; + } + + templateContent = ''+ + ''+ + ''+ + ''+ + ''+ + (this.showSeconds ? + ''+ + '' + : '') + + (this.showMeridian ? + ''+ + '' + : '') + + ''+ + ''+ + ' '+ + ''+ + ' '+ + (this.showSeconds ? + ''+ + '' + : '') + + (this.showMeridian ? + ''+ + '' + : '') + + ''+ + ''+ + ''+ + ''+ + ''+ + (this.showSeconds ? + ''+ + '' + : '') + + (this.showMeridian ? + ''+ + '' + : '') + + ''+ + '
   
'+ hourTemplate +':'+ minuteTemplate +':'+ secondTemplate +' '+ meridianTemplate +'
  
'; + + switch(this.template) { + case 'modal': + template = '
'+ + '
'+ + '×'+ + '

Pick a Time

'+ + '
'+ + '
'+ + templateContent + + '
'+ + '
'+ + 'OK'+ + '
'+ + '
'; + break; + case 'dropdown': + template = '
'+ templateContent +'
'; + break; + } + + return template; + }, + + getTime: function() { + if (this.hour === '') { + return ''; + } + + return this.hour + ':' + (this.minute.toString().length === 1 ? '0' + this.minute : this.minute) + (this.showSeconds ? ':' + (this.second.toString().length === 1 ? '0' + this.second : this.second) : '') + (this.showMeridian ? ' ' + this.meridian : ''); + }, + + hideWidget: function() { + if (this.isOpen === false) { + return; + } + + this.$element.trigger({ + 'type': 'hide.timepicker', + 'time': { + 'value': this.getTime(), + 'hours': this.hour, + 'minutes': this.minute, + 'seconds': this.second, + 'meridian': this.meridian + } + }); + + if (this.template === 'modal' && this.$widget.modal) { + this.$widget.modal('hide'); + } else { + this.$widget.removeClass('open'); + } + + $(document).off('mousedown.timepicker, touchend.timepicker'); + + this.isOpen = false; + // show/hide approach taken by datepicker + this.$widget.detach(); + }, + + highlightUnit: function() { + this.position = this.getCursorPosition(); + if (this.position >= 0 && this.position <= 2) { + this.highlightHour(); + } else if (this.position >= 3 && this.position <= 5) { + this.highlightMinute(); + } else if (this.position >= 6 && this.position <= 8) { + if (this.showSeconds) { + this.highlightSecond(); + } else { + this.highlightMeridian(); + } + } else if (this.position >= 9 && this.position <= 11) { + this.highlightMeridian(); + } + }, + + highlightNextUnit: function() { + switch (this.highlightedUnit) { + case 'hour': + this.highlightMinute(); + break; + case 'minute': + if (this.showSeconds) { + this.highlightSecond(); + } else if (this.showMeridian){ + this.highlightMeridian(); + } else { + this.highlightHour(); + } + break; + case 'second': + if (this.showMeridian) { + this.highlightMeridian(); + } else { + this.highlightHour(); + } + break; + case 'meridian': + this.highlightHour(); + break; + } + }, + + highlightPrevUnit: function() { + switch (this.highlightedUnit) { + case 'hour': + if(this.showMeridian){ + this.highlightMeridian(); + } else if (this.showSeconds) { + this.highlightSecond(); + } else { + this.highlightMinute(); + } + break; + case 'minute': + this.highlightHour(); + break; + case 'second': + this.highlightMinute(); + break; + case 'meridian': + if (this.showSeconds) { + this.highlightSecond(); + } else { + this.highlightMinute(); + } + break; + } + }, + + highlightHour: function() { + var $element = this.$element.get(0), + self = this; + + this.highlightedUnit = 'hour'; + + if ($element.setSelectionRange) { + setTimeout(function() { + if (self.hour < 10) { + $element.setSelectionRange(0,1); + } else { + $element.setSelectionRange(0,2); + } + }, 0); + } + }, + + highlightMinute: function() { + var $element = this.$element.get(0), + self = this; + + this.highlightedUnit = 'minute'; + + if ($element.setSelectionRange) { + setTimeout(function() { + if (self.hour < 10) { + $element.setSelectionRange(2,4); + } else { + $element.setSelectionRange(3,5); + } + }, 0); + } + }, + + highlightSecond: function() { + var $element = this.$element.get(0), + self = this; + + this.highlightedUnit = 'second'; + + if ($element.setSelectionRange) { + setTimeout(function() { + if (self.hour < 10) { + $element.setSelectionRange(5,7); + } else { + $element.setSelectionRange(6,8); + } + }, 0); + } + }, + + highlightMeridian: function() { + var $element = this.$element.get(0), + self = this; + + this.highlightedUnit = 'meridian'; + + if ($element.setSelectionRange) { + if (this.showSeconds) { + setTimeout(function() { + if (self.hour < 10) { + $element.setSelectionRange(8,10); + } else { + $element.setSelectionRange(9,11); + } + }, 0); + } else { + setTimeout(function() { + if (self.hour < 10) { + $element.setSelectionRange(5,7); + } else { + $element.setSelectionRange(6,8); + } + }, 0); + } + } + }, + + incrementHour: function() { + if (this.showMeridian) { + if (this.hour === 11) { + this.hour++; + return this.toggleMeridian(); + } else if (this.hour === 12) { + this.hour = 0; + } + } + if (this.hour === 23) { + this.hour = 0; + + return; + } + this.hour++; + }, + + incrementMinute: function(step) { + var newVal; + + if (step) { + newVal = this.minute + step; + } else { + newVal = this.minute + this.minuteStep - (this.minute % this.minuteStep); + } + + if (newVal > 59) { + this.incrementHour(); + this.minute = newVal - 60; + } else { + this.minute = newVal; + } + }, + + incrementSecond: function() { + var newVal = this.second + this.secondStep - (this.second % this.secondStep); + + if (newVal > 59) { + this.incrementMinute(true); + this.second = newVal - 60; + } else { + this.second = newVal; + } + }, + + mousewheel: function(e) { + if (this.disableMousewheel) { + return; + } + + e.preventDefault(); + e.stopPropagation(); + + var delta = e.originalEvent.wheelDelta || -e.originalEvent.detail, + scrollTo = null; + + if (e.type === 'mousewheel') { + scrollTo = (e.originalEvent.wheelDelta * -1); + } + else if (e.type === 'DOMMouseScroll') { + scrollTo = 40 * e.originalEvent.detail; + } + + if (scrollTo) { + e.preventDefault(); + $(this).scrollTop(scrollTo + $(this).scrollTop()); + } + + switch (this.highlightedUnit) { + case 'minute': + if (delta > 0) { + this.incrementMinute(); + } else { + this.decrementMinute(); + } + this.highlightMinute(); + break; + case 'second': + if (delta > 0) { + this.incrementSecond(); + } else { + this.decrementSecond(); + } + this.highlightSecond(); + break; + case 'meridian': + this.toggleMeridian(); + this.highlightMeridian(); + break; + default: + if (delta > 0) { + this.incrementHour(); + } else { + this.decrementHour(); + } + this.highlightHour(); + break; + } + + return false; + }, + + // This method was adapted from bootstrap-datepicker. + place : function() { + if (this.isInline) { + return; + } + var widgetWidth = this.$widget.outerWidth(), widgetHeight = this.$widget.outerHeight(), visualPadding = 10, windowWidth = + $(window).width(), windowHeight = $(window).height(), scrollTop = $(window).scrollTop(); + + var zIndex = parseInt(this.$element.parents().filter(function() {}).first().css('z-index'), 10) + 10; + var offset = this.component ? this.component.parent().offset() : this.$element.offset(); + var height = this.component ? this.component.outerHeight(true) : this.$element.outerHeight(false); + var width = this.component ? this.component.outerWidth(true) : this.$element.outerWidth(false); + var left = offset.left, top = offset.top; + + this.$widget.removeClass('timepicker-orient-top timepicker-orient-bottom timepicker-orient-right timepicker-orient-left'); + + if (this.orientation.x !== 'auto') { + this.picker.addClass('datepicker-orient-' + this.orientation.x); + if (this.orientation.x === 'right') { + left -= widgetWidth - width; + } + } else{ + // auto x orientation is best-placement: if it crosses a window edge, fudge it sideways + // Default to left + this.$widget.addClass('timepicker-orient-left'); + if (offset.left < 0) { + left -= offset.left - visualPadding; + } else if (offset.left + widgetWidth > windowWidth) { + left = windowWidth - widgetWidth - visualPadding; + } + } + // auto y orientation is best-situation: top or bottom, no fudging, decision based on which shows more of the widget + var yorient = this.orientation.y, topOverflow, bottomOverflow; + if (yorient === 'auto') { + topOverflow = -scrollTop + offset.top - widgetHeight; + bottomOverflow = scrollTop + windowHeight - (offset.top + height + widgetHeight); + if (Math.max(topOverflow, bottomOverflow) === bottomOverflow) { + yorient = 'top'; + } else { + yorient = 'bottom'; + } + } + this.$widget.addClass('timepicker-orient-' + yorient); + if (yorient === 'top'){ + top += height; + } else{ + top -= widgetHeight + parseInt(this.$widget.css('padding-top'), 10); + } + + this.$widget.css({ + top : top, + left : left, + zIndex : zIndex + }); + }, + + remove: function() { + $('document').off('.timepicker'); + if (this.$widget) { + this.$widget.remove(); + } + delete this.$element.data().timepicker; + }, + + setDefaultTime: function(defaultTime) { + if (!this.$element.val()) { + if (defaultTime === 'current') { + var dTime = new Date(), + hours = dTime.getHours(), + minutes = dTime.getMinutes(), + seconds = dTime.getSeconds(), + meridian = 'AM'; + + if (seconds !== 0) { + seconds = Math.ceil(dTime.getSeconds() / this.secondStep) * this.secondStep; + if (seconds === 60) { + minutes += 1; + seconds = 0; + } + } + + if (minutes !== 0) { + minutes = Math.ceil(dTime.getMinutes() / this.minuteStep) * this.minuteStep; + if (minutes === 60) { + hours += 1; + minutes = 0; + } + } + + if (this.showMeridian) { + if (hours === 0) { + hours = 12; + } else if (hours >= 12) { + if (hours > 12) { + hours = hours - 12; + } + meridian = 'PM'; + } else { + meridian = 'AM'; + } + } + + this.hour = hours; + this.minute = minutes; + this.second = seconds; + this.meridian = meridian; + + this.update(); + + } else if (defaultTime === false) { + this.hour = 0; + this.minute = 0; + this.second = 0; + this.meridian = 'AM'; + } else { + this.setTime(defaultTime); + } + } else { + this.updateFromElementVal(); + } + }, + + setTime: function(time, ignoreWidget) { + if (!time) { + this.clear(); + return; + } + + var timeArray, + hour, + minute, + second, + meridian; + + if (typeof time === 'object' && time.getMonth){ + // this is a date object + hour = time.getHours(); + minute = time.getMinutes(); + second = time.getSeconds(); + + if (this.showMeridian){ + meridian = 'AM'; + if (hour > 12){ + meridian = 'PM'; + hour = hour % 12; + } + + if (hour === 12){ + meridian = 'PM'; + } + } + } else { + if (time.match(/p/i) !== null) { + meridian = 'PM'; + } else { + meridian = 'AM'; + } + + time = time.replace(/[^0-9\:]/g, ''); + + timeArray = time.split(':'); + + hour = timeArray[0] ? timeArray[0].toString() : timeArray.toString(); + minute = timeArray[1] ? timeArray[1].toString() : ''; + second = timeArray[2] ? timeArray[2].toString() : ''; + + // idiot proofing + if (hour.length > 4) { + second = hour.substr(4, 2); + } + if (hour.length > 2) { + minute = hour.substr(2, 2); + hour = hour.substr(0, 2); + } + if (minute.length > 2) { + second = minute.substr(2, 2); + minute = minute.substr(0, 2); + } + if (second.length > 2) { + second = second.substr(2, 2); + } + + hour = parseInt(hour, 10); + minute = parseInt(minute, 10); + second = parseInt(second, 10); + + if (isNaN(hour)) { + hour = 0; + } + if (isNaN(minute)) { + minute = 0; + } + if (isNaN(second)) { + second = 0; + } + + if (this.showMeridian) { + if (hour < 1) { + hour = 1; + } else if (hour > 12) { + hour = 12; + } + } else { + if (hour >= 24) { + hour = 23; + } else if (hour < 0) { + hour = 0; + } + if (hour < 13 && meridian === 'PM') { + hour = hour + 12; + } + } + + if (minute < 0) { + minute = 0; + } else if (minute >= 60) { + minute = 59; + } + + if (this.showSeconds) { + if (isNaN(second)) { + second = 0; + } else if (second < 0) { + second = 0; + } else if (second >= 60) { + second = 59; + } + } + } + + this.hour = hour; + this.minute = minute; + this.second = second; + this.meridian = meridian; + + this.update(ignoreWidget); + }, + + showWidget: function() { + if (this.isOpen) { + return; + } + + if (this.$element.is(':disabled')) { + return; + } + + // show/hide approach taken by datepicker + this.$widget.appendTo(this.appendWidgetTo); + var self = this; + $(document).on('mousedown.timepicker, touchend.timepicker', function (e) { + // This condition was inspired by bootstrap-datepicker. + // The element the timepicker is invoked on is the input but it has a sibling for addon/button. + if (!(self.$element.parent().find(e.target).length || + self.$widget.is(e.target) || + self.$widget.find(e.target).length)) { + self.hideWidget(); + } + }); + + this.$element.trigger({ + 'type': 'show.timepicker', + 'time': { + 'value': this.getTime(), + 'hours': this.hour, + 'minutes': this.minute, + 'seconds': this.second, + 'meridian': this.meridian + } + }); + + this.place(); + if (this.disableFocus) { + this.$element.blur(); + } + + // widget shouldn't be empty on open + if (this.hour === '') { + if (this.defaultTime) { + this.setDefaultTime(this.defaultTime); + } else { + this.setTime('0:0:0'); + } + } + + if (this.template === 'modal' && this.$widget.modal) { + this.$widget.modal('show').on('hidden', $.proxy(this.hideWidget, this)); + } else { + if (this.isOpen === false) { + this.$widget.addClass('open'); + } + } + + this.isOpen = true; + }, + + toggleMeridian: function() { + this.meridian = this.meridian === 'AM' ? 'PM' : 'AM'; + }, + + update: function(ignoreWidget) { + this.updateElement(); + if (!ignoreWidget) { + this.updateWidget(); + } + + this.$element.trigger({ + 'type': 'changeTime.timepicker', + 'time': { + 'value': this.getTime(), + 'hours': this.hour, + 'minutes': this.minute, + 'seconds': this.second, + 'meridian': this.meridian + } + }); + }, + + updateElement: function() { + this.$element.val(this.getTime()).change(); + }, + + updateFromElementVal: function() { + this.setTime(this.$element.val()); + }, + + updateWidget: function() { + if (this.$widget === false) { + return; + } + + var hour = this.hour, + minute = this.minute.toString().length === 1 ? '0' + this.minute : this.minute, + second = this.second.toString().length === 1 ? '0' + this.second : this.second; + + if (this.showInputs) { + this.$widget.find('input.bootstrap-timepicker-hour').val(hour); + this.$widget.find('input.bootstrap-timepicker-minute').val(minute); + + if (this.showSeconds) { + this.$widget.find('input.bootstrap-timepicker-second').val(second); + } + if (this.showMeridian) { + this.$widget.find('input.bootstrap-timepicker-meridian').val(this.meridian); + } + } else { + this.$widget.find('span.bootstrap-timepicker-hour').text(hour); + this.$widget.find('span.bootstrap-timepicker-minute').text(minute); + + if (this.showSeconds) { + this.$widget.find('span.bootstrap-timepicker-second').text(second); + } + if (this.showMeridian) { + this.$widget.find('span.bootstrap-timepicker-meridian').text(this.meridian); + } + } + }, + + updateFromWidgetInputs: function() { + if (this.$widget === false) { + return; + } + + var t = this.$widget.find('input.bootstrap-timepicker-hour').val() + ':' + + this.$widget.find('input.bootstrap-timepicker-minute').val() + + (this.showSeconds ? ':' + this.$widget.find('input.bootstrap-timepicker-second').val() : '') + + (this.showMeridian ? this.$widget.find('input.bootstrap-timepicker-meridian').val() : '') + ; + + this.setTime(t, true); + }, + + widgetClick: function(e) { + e.stopPropagation(); + e.preventDefault(); + + var $input = $(e.target), + action = $input.closest('a').data('action'); + + if (action) { + this[action](); + } + this.update(); + + if ($input.is('input')) { + $input.get(0).setSelectionRange(0,2); + } + }, + + widgetKeydown: function(e) { + var $input = $(e.target), + name = $input.attr('class').replace('bootstrap-timepicker-', ''); + + switch (e.keyCode) { + case 9: //tab + if ((this.showMeridian && name === 'meridian') || (this.showSeconds && name === 'second') || (!this.showMeridian && !this.showSeconds && name === 'minute')) { + return this.hideWidget(); + } + break; + case 27: // escape + this.hideWidget(); + break; + case 38: // up arrow + e.preventDefault(); + switch (name) { + case 'hour': + this.incrementHour(); + break; + case 'minute': + this.incrementMinute(); + break; + case 'second': + this.incrementSecond(); + break; + case 'meridian': + this.toggleMeridian(); + break; + } + this.setTime(this.getTime()); + $input.get(0).setSelectionRange(0,2); + break; + case 40: // down arrow + e.preventDefault(); + switch (name) { + case 'hour': + this.decrementHour(); + break; + case 'minute': + this.decrementMinute(); + break; + case 'second': + this.decrementSecond(); + break; + case 'meridian': + this.toggleMeridian(); + break; + } + this.setTime(this.getTime()); + $input.get(0).setSelectionRange(0,2); + break; + } + }, + + widgetKeyup: function(e) { + if ((e.keyCode === 65) || (e.keyCode === 77) || (e.keyCode === 80) || (e.keyCode === 46) || (e.keyCode === 8) || (e.keyCode >= 46 && e.keyCode <= 57)) { + this.updateFromWidgetInputs(); + } + } + }; + + //TIMEPICKER PLUGIN DEFINITION + $.fn.timepicker = function(option) { + var args = Array.apply(null, arguments); + args.shift(); + return this.each(function() { + var $this = $(this), + data = $this.data('timepicker'), + options = typeof option === 'object' && option; + + if (!data) { + $this.data('timepicker', (data = new Timepicker(this, $.extend({}, $.fn.timepicker.defaults, options, $(this).data())))); + } + + if (typeof option === 'string') { + data[option].apply(data, args); + } + }); + }; + + $.fn.timepicker.defaults = { + defaultTime: 'current', + disableFocus: false, + disableMousewheel: false, + isOpen: false, + minuteStep: 15, + modalBackdrop: false, + orientation: { x: 'auto', y: 'auto'}, + secondStep: 15, + showSeconds: false, + showInputs: true, + showMeridian: true, + template: 'dropdown', + appendWidgetTo: 'body', + showWidgetOnAddonClick: true + }; + + $.fn.timepicker.Constructor = Timepicker; + +})(jQuery, window, document); diff --git a/app/assets/javascripts/time_entries.js b/app/assets/javascripts/time_entries.js new file mode 100644 index 0000000..9f3e5ef --- /dev/null +++ b/app/assets/javascripts/time_entries.js @@ -0,0 +1,11 @@ +$(document).ready(function(){ + +var currentdate = new Date(); +$("#date_id").datepicker().on('changeDate', function(ev){ + $("#date_id").datepicker('hide'); +}); +$("#date_id").datepicker('setValue', currentdate); + +$("#start_time_id").timepicker(); +$("#end_time_id").timepicker(); +}); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 73a3169..6b66844 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -9,5 +9,7 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self + *= require datepicker + *= require bootstrap-timepicker *= require bootstrap_and_overrides */ diff --git a/app/assets/stylesheets/bootstrap-timepicker.css b/app/assets/stylesheets/bootstrap-timepicker.css new file mode 100644 index 0000000..fa34752 --- /dev/null +++ b/app/assets/stylesheets/bootstrap-timepicker.css @@ -0,0 +1,146 @@ +/*! + * Timepicker Component for Twitter Bootstrap + * + * Copyright 2013 Joris de Wit + * + * Contributors https://github.com/jdewit/bootstrap-timepicker/graphs/contributors + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +.bootstrap-timepicker { + position: relative; +} +.bootstrap-timepicker.pull-right .bootstrap-timepicker-widget.dropdown-menu { + left: auto; + right: 0; +} +.bootstrap-timepicker.pull-right .bootstrap-timepicker-widget.dropdown-menu:before { + left: auto; + right: 12px; +} +.bootstrap-timepicker.pull-right .bootstrap-timepicker-widget.dropdown-menu:after { + left: auto; + right: 13px; +} +.bootstrap-timepicker .add-on { + cursor: pointer; +} +.bootstrap-timepicker .add-on i { + display: inline-block; + width: 16px; + height: 16px; +} +.bootstrap-timepicker-widget.dropdown-menu { + padding: 4px; +} +.bootstrap-timepicker-widget.dropdown-menu.open { + display: inline-block; +} +.bootstrap-timepicker-widget.dropdown-menu:before { + border-bottom: 7px solid rgba(0, 0, 0, 0.2); + border-left: 7px solid transparent; + border-right: 7px solid transparent; + content: ""; + display: inline-block; + position: absolute; +} +.bootstrap-timepicker-widget.dropdown-menu:after { + border-bottom: 6px solid #FFFFFF; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + content: ""; + display: inline-block; + position: absolute; +} +.bootstrap-timepicker-widget.timepicker-orient-left:before { + left: 6px; +} +.bootstrap-timepicker-widget.timepicker-orient-left:after { + left: 7px; +} +.bootstrap-timepicker-widget.timepicker-orient-right:before { + right: 6px; +} +.bootstrap-timepicker-widget.timepicker-orient-right:after { + right: 7px; +} +.bootstrap-timepicker-widget.timepicker-orient-top:before { + top: -7px; +} +.bootstrap-timepicker-widget.timepicker-orient-top:after { + top: -6px; +} +.bootstrap-timepicker-widget.timepicker-orient-bottom:before { + bottom: -7px; + border-bottom: 0; + border-top: 7px solid #999; +} +.bootstrap-timepicker-widget.timepicker-orient-bottom:after { + bottom: -6px; + border-bottom: 0; + border-top: 6px solid #ffffff; +} +.bootstrap-timepicker-widget a.btn, +.bootstrap-timepicker-widget input { + border-radius: 4px; +} +.bootstrap-timepicker-widget table { + width: 100%; + margin: 0; +} +.bootstrap-timepicker-widget table td { + text-align: center; + height: 30px; + margin: 0; + padding: 2px; +} +.bootstrap-timepicker-widget table td:not(.separator) { + min-width: 30px; +} +.bootstrap-timepicker-widget table td span { + width: 100%; +} +.bootstrap-timepicker-widget table td a { + border: 1px transparent solid; + width: 100%; + display: inline-block; + margin: 0; + padding: 8px 0; + outline: 0; + color: #333; +} +.bootstrap-timepicker-widget table td a:hover { + text-decoration: none; + background-color: #eee; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + border-color: #ddd; +} +.bootstrap-timepicker-widget table td a i { + margin-top: 2px; + font-size: 18px; +} +.bootstrap-timepicker-widget table td input { + width: 25px; + margin: 0; + text-align: center; +} +.bootstrap-timepicker-widget .modal-content { + padding: 4px; +} +@media (min-width: 767px) { + .bootstrap-timepicker-widget.modal { + width: 200px; + margin-left: -100px; + } +} +@media (max-width: 767px) { + .bootstrap-timepicker { + width: 100%; + } + .bootstrap-timepicker .dropdown-menu { + width: 100%; + } +} diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 5f8534e..d838852 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -36,3 +36,7 @@ body { [data-toggle="buttons"] > .btn > input[type="checkbox"] { display: none; } + +.inline-block { + display: inline-block; +} diff --git a/app/assets/stylesheets/datepicker.css b/app/assets/stylesheets/datepicker.css new file mode 100755 index 0000000..b7065b7 --- /dev/null +++ b/app/assets/stylesheets/datepicker.css @@ -0,0 +1,182 @@ +/*! + * Datepicker for Bootstrap + * + * Copyright 2012 Stefan Petre + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + */ +.datepicker { + top: 0; + left: 0; + padding: 4px; + margin-top: 1px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + /*.dow { + border-top: 1px solid #ddd !important; + }*/ + +} +.datepicker:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0, 0, 0, 0.2); + position: absolute; + top: -7px; + left: 6px; +} +.datepicker:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #ffffff; + position: absolute; + top: -6px; + left: 7px; +} +.datepicker > div { + display: none; +} +.datepicker table { + width: 100%; + margin: 0; +} +.datepicker td, +.datepicker th { + text-align: center; + width: 20px; + height: 20px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.datepicker td.day:hover { + background: #eeeeee; + cursor: pointer; +} +.datepicker td.day.disabled { + color: #eeeeee; +} +.datepicker td.old, +.datepicker td.new { + color: #999999; +} +.datepicker td.active, +.datepicker td.active:hover { + color: #ffffff; + background-color: #006dcc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(to bottom, #0088cc, #0044cc); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); + border-color: #0044cc #0044cc #002a80; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #0044cc; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.datepicker td.active:hover, +.datepicker td.active:hover:hover, +.datepicker td.active:focus, +.datepicker td.active:hover:focus, +.datepicker td.active:active, +.datepicker td.active:hover:active, +.datepicker td.active.active, +.datepicker td.active:hover.active, +.datepicker td.active.disabled, +.datepicker td.active:hover.disabled, +.datepicker td.active[disabled], +.datepicker td.active:hover[disabled] { + color: #ffffff; + background-color: #0044cc; + *background-color: #003bb3; +} +.datepicker td.active:active, +.datepicker td.active:hover:active, +.datepicker td.active.active, +.datepicker td.active:hover.active { + background-color: #003399 \9; +} +.datepicker td span { + display: block; + width: 47px; + height: 54px; + line-height: 54px; + float: left; + margin: 2px; + cursor: pointer; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.datepicker td span:hover { + background: #eeeeee; +} +.datepicker td span.active { + color: #ffffff; + background-color: #006dcc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(to bottom, #0088cc, #0044cc); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); + border-color: #0044cc #0044cc #002a80; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #0044cc; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.datepicker td span.active:hover, +.datepicker td span.active:focus, +.datepicker td span.active:active, +.datepicker td span.active.active, +.datepicker td span.active.disabled, +.datepicker td span.active[disabled] { + color: #ffffff; + background-color: #0044cc; + *background-color: #003bb3; +} +.datepicker td span.active:active, +.datepicker td span.active.active { + background-color: #003399 \9; +} +.datepicker td span.old { + color: #999999; +} +.datepicker th.switch { + width: 145px; +} +.datepicker th.next, +.datepicker th.prev { + font-size: 21px; +} +.datepicker thead tr:first-child th { + cursor: pointer; +} +.datepicker thead tr:first-child th:hover { + background: #eeeeee; +} +.input-append.date .add-on i, +.input-prepend.date .add-on i { + display: block; + cursor: pointer; + width: 16px; + height: 16px; +} \ No newline at end of file diff --git a/app/controllers/time_entries_controller.rb b/app/controllers/time_entries_controller.rb new file mode 100644 index 0000000..0b73db1 --- /dev/null +++ b/app/controllers/time_entries_controller.rb @@ -0,0 +1,10 @@ +class TimeEntriesController < AuthenticatedController + + def new + + end + + def index + + end +end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 656bd77..9cad67e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -4,7 +4,7 @@ %meta{:charset => "utf-8"}/ %title= content_for?(:title) ? yield(:title) : "Velocipede" = csrf_meta_tags - = stylesheet_link_tag "bootstrap_and_overrides", :media => "all" + = stylesheet_link_tag "bootstrap_and_overrides", "datepicker", "bootstrap-timepicker", :media => "all" /[if lt IE 9] = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" :css diff --git a/app/views/site/index.html.haml b/app/views/site/index.html.haml index 1877017..0a23f4a 100644 --- a/app/views/site/index.html.haml +++ b/app/views/site/index.html.haml @@ -3,7 +3,7 @@ %p %p - %a{class: "btn btn-lg btn-block btn-primary"} Add Time Entry + %a{class: "btn btn-lg btn-block btn-primary", href: new_time_entry_path} Add Time Entry %p %a{class: "btn btn-lg btn-block btn-primary"} View Timesheet %p diff --git a/app/views/time_entries/new.haml b/app/views/time_entries/new.haml new file mode 100644 index 0000000..1774b27 --- /dev/null +++ b/app/views/time_entries/new.haml @@ -0,0 +1,41 @@ +%a{ class: "btn btn-default btn-lg", href: root_path} + %span{ class:"icon-home"} +%h2 Add Time Entry + +%p + .control-group + .controls + %input{id: "date_id", placeholder: "Date", type: "text", class: "datepicker input-small" } + .help-block + .control-group + .controls{ class: "bootstrap-timepicker"} + %label Start + %input{id: "start_time_id", placeholder: "Time ID", type: "text", class: "input-small" } + .help-block + .control-group + .controls + %label End + %input{id: "end_time_id", placeholder: "Time ID", type: "text", class: "input-small" } + .help-block + .control-group + .controls + .btn-group{ "data-toggle" => "buttons-radio"} + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "action_id", value: 3} Volunteer + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "action_id", value: 1} Personal + %label{ class: "btn btn-default"} + %input{ type: "radio", name: "action_id", value: 2} Staff + %input{ id: "bike_style_id", type: "hidden"} + .help-block + .control-group + .controls + %label + Worked on a bike? + %input{ type: "checkbox"} + .control-group + .controls + %textarea{id: "work_description", placeholder: "Work description", class: "input-lg" } + .control-group + .controls + %input{id: "add_bike_submit", value: "Add Time Entry", type: "button", class: "btn btn-lg btn-block btn-primary", "data-url" => "#{api_create_bike_path}"} diff --git a/config/routes.rb b/config/routes.rb index a9d9627..568210b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,6 +11,8 @@ Velocipede::Application.routes.draw do get 'task_lists/:id/edit' => "task_lists#edit", as: "edit_task_list" + get 'time_entries/new' => "time_entries#new", as: "new_time_entry" + ########################### # API Routes scope 'api', :module => :api, defaults: {format: :json} do From 2d65ebb45faefb49d7c8347811a31a3d525014c4 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 19 Apr 2014 16:22:54 -0400 Subject: [PATCH 54/81] JS Formatting --- app/assets/javascripts/time_entries.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/time_entries.js b/app/assets/javascripts/time_entries.js index 9f3e5ef..25743e4 100644 --- a/app/assets/javascripts/time_entries.js +++ b/app/assets/javascripts/time_entries.js @@ -1,11 +1,10 @@ $(document).ready(function(){ + var currentdate = new Date(); + $("#date_id").datepicker().on('changeDate', function(ev){ + $("#date_id").datepicker('hide'); + }); + $("#date_id").datepicker('setValue', currentdate); -var currentdate = new Date(); -$("#date_id").datepicker().on('changeDate', function(ev){ - $("#date_id").datepicker('hide'); -}); -$("#date_id").datepicker('setValue', currentdate); - -$("#start_time_id").timepicker(); -$("#end_time_id").timepicker(); + $("#start_time_id").timepicker(); + $("#end_time_id").timepicker(); }); From 3e56f2eb192b49449a7c70b5751c58f527f9ee9b Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 19 Apr 2014 16:25:15 -0400 Subject: [PATCH 55/81] Updating edit task list page w/ home & bike link --- app/views/task_lists/edit.haml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/task_lists/edit.haml b/app/views/task_lists/edit.haml index 76599af..bc5a409 100644 --- a/app/views/task_lists/edit.haml +++ b/app/views/task_lists/edit.haml @@ -1,5 +1,8 @@ +%a{ class: "btn btn-default btn-lg", href: root_path} + %span{ class:"icon-home"} %h2 Task List -%h3 #{@task_list.item.shop_id} #{@task_list.item.bike_brand} +%h3 + %a{ href: bike_path(@task_list.item)}#{@task_list.item.shop_id} #{@task_list.item.bike_brand} %h4 #{@task_list.item.model} %p From b30203b7507fefd18c0c30b953f46a6288f2d82a Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 19 Apr 2014 16:48:10 -0400 Subject: [PATCH 56/81] Allow user select bike worked when adding time --- app/controllers/time_entries_controller.rb | 6 +++++- app/views/time_entries/new.haml | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/time_entries_controller.rb b/app/controllers/time_entries_controller.rb index 0b73db1..ce9913d 100644 --- a/app/controllers/time_entries_controller.rb +++ b/app/controllers/time_entries_controller.rb @@ -1,7 +1,11 @@ class TimeEntriesController < AuthenticatedController def new - + @bikes = Bike.all.map{ |b| [b.to_s , b.id] } + if bike = current_user.bike + @bikes.unshift( [bike.to_s, bike.id] ) + end + @bikes.unshift( ["Non-bike work", -1] ) end def index diff --git a/app/views/time_entries/new.haml b/app/views/time_entries/new.haml index 1774b27..8a4f12e 100644 --- a/app/views/time_entries/new.haml +++ b/app/views/time_entries/new.haml @@ -31,8 +31,7 @@ .control-group .controls %label - Worked on a bike? - %input{ type: "checkbox"} + = select_tag(:bike_brand_id, options_for_select(@bikes)) .control-group .controls %textarea{id: "work_description", placeholder: "Work description", class: "input-lg" } From 069a11f480a8fff7ecaf3810f0ad74a0e906463d Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 19 Apr 2014 21:06:29 -0400 Subject: [PATCH 57/81] WIP, adding JS and api time entry create --- app/assets/javascripts/time_entries.js | 32 +++++++++++++++++++ .../bootstrap_and_overrides.css.less | 5 +++ .../api/v1/time_entries_controller.rb | 30 +++++++++++++++++ app/views/time_entries/new.haml | 10 +++--- config/routes.rb | 2 ++ 5 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 app/controllers/api/v1/time_entries_controller.rb diff --git a/app/assets/javascripts/time_entries.js b/app/assets/javascripts/time_entries.js index 25743e4..2f1acb7 100644 --- a/app/assets/javascripts/time_entries.js +++ b/app/assets/javascripts/time_entries.js @@ -1,4 +1,5 @@ $(document).ready(function(){ + var currentdate = new Date(); $("#date_id").datepicker().on('changeDate', function(ev){ $("#date_id").datepicker('hide'); @@ -7,4 +8,35 @@ $(document).ready(function(){ $("#start_time_id").timepicker(); $("#end_time_id").timepicker(); + + $("#add_time_entry_submit").click(function(){ + date = $("#date_id").val(); + start_date = new Date(date + " " + $("#start_time_id").val()); + end_date = new Date(date + " " + $("#end_time_id").val()); + + json_data = { time_entries: [{ + start_date: start_date.toISOString(), + end_date: end_date.toISOString(), + log_action_id: parseInt($('input[name=action_id]:checked').val()), + bike_id: parseInt($("#bike_id").val()), + description: $("#description_id").val(), + }]}; + console.log(json_data); + + $.ajax({ + url: $("#add_time_entry_submit").data("url"), + type: "POST", + data: JSON.stringify(json_data), + contentType: 'application/json', + dataType: "json", + success: function(data, status, xhr){ + console.log(data); + //window.location = data.bikes[0].id; + }, + error: function(data, status ){ + console.log(data); + displayFormErrors(data.responseJSON); + } + }); + }); }); diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index d838852..1d0efba 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -40,3 +40,8 @@ body { .inline-block { display: inline-block; } + +.control-group.error .btn-group > .btn { + color: #b94a48; + border-color: #b94a48; +} diff --git a/app/controllers/api/v1/time_entries_controller.rb b/app/controllers/api/v1/time_entries_controller.rb new file mode 100644 index 0000000..dc5447e --- /dev/null +++ b/app/controllers/api/v1/time_entries_controller.rb @@ -0,0 +1,30 @@ +class Api::V1::TimeEntriesController < Api::V1::BaseController + def create + if params[:time_entries] && time_entry = params[:time_entries].first + puts time_entry.inspect + time_entry_defaults = { + loggable_type: "User", + loggable_id: current_user.id, + log_action_type: "ActsAsLoggable::UserAction"} + time_entry.merge(time_entry_defaults) + + if time_entry[:bike_id] >= 0 + copy_defaults = { + copy_log: true, + copy_type: 'Bike', + copy_id: time_entry[:bike_id], + copy_action_type: 'ActsAsLoggable::BikeAction', + copy_action_id: 4 + } + time_entry.merge( copy_defaults ) + end + + @time_entry = ::ActsAsLoggable::Log.new(time_entry.except(:bike_id)) + if !@time_entry.save + render json: { errors: @time_entry.errors }, status: 422 and return + end + else + render json: { errors: [EXPECTED_TIME_ENTRY]}, status: 422 and return + end + end +end diff --git a/app/views/time_entries/new.haml b/app/views/time_entries/new.haml index 8a4f12e..de4b173 100644 --- a/app/views/time_entries/new.haml +++ b/app/views/time_entries/new.haml @@ -11,11 +11,13 @@ .controls{ class: "bootstrap-timepicker"} %label Start %input{id: "start_time_id", placeholder: "Time ID", type: "text", class: "input-small" } + .hidden{ id: "start_date" } .help-block .control-group .controls %label End %input{id: "end_time_id", placeholder: "Time ID", type: "text", class: "input-small" } + .hidden{ id: "end_date" } .help-block .control-group .controls @@ -26,15 +28,15 @@ %input{ type: "radio", name: "action_id", value: 1} Personal %label{ class: "btn btn-default"} %input{ type: "radio", name: "action_id", value: 2} Staff - %input{ id: "bike_style_id", type: "hidden"} + .hidden{ id: "log_action_id" } .help-block .control-group .controls %label - = select_tag(:bike_brand_id, options_for_select(@bikes)) + = select_tag(:bike_id, options_for_select(@bikes)) .control-group .controls - %textarea{id: "work_description", placeholder: "Work description", class: "input-lg" } + %textarea{id: "description_id", placeholder: "Work description", class: "input-lg" } .control-group .controls - %input{id: "add_bike_submit", value: "Add Time Entry", type: "button", class: "btn btn-lg btn-block btn-primary", "data-url" => "#{api_create_bike_path}"} + %input{id: "add_time_entry_submit", value: "Add Time Entry", type: "button", class: "btn btn-lg btn-block btn-primary", "data-url" => "#{api_create_time_entry_path}"} diff --git a/config/routes.rb b/config/routes.rb index 568210b..8e666b0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -28,6 +28,8 @@ Velocipede::Application.routes.draw do get 'task_lists/:id' => "task_lists#show", as: "api_task_list" put 'tasks/update' => "tasks#update", as: "api_update_task" + + post 'time_entries/create' => "time_entries#create", as: "api_create_time_entry" end end From 23211979737224775ff863fb18043cb1016d69c5 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 20 Apr 2014 22:56:04 -0400 Subject: [PATCH 58/81] If bike selected, forward to bike checklist --- app/assets/javascripts/time_entries.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/time_entries.js b/app/assets/javascripts/time_entries.js index 2f1acb7..3e2b0dc 100644 --- a/app/assets/javascripts/time_entries.js +++ b/app/assets/javascripts/time_entries.js @@ -14,11 +14,20 @@ $(document).ready(function(){ start_date = new Date(date + " " + $("#start_time_id").val()); end_date = new Date(date + " " + $("#end_time_id").val()); + forward = $("#add_time_entry_submit").data("forward"); + + // If a bike is selected, forward to the bike + // checklist. + bike_id = parseInt($("#bike_id").val()); + if( bike_id >= 0 ){ + forward = "/task_lists/" + bike_id + "/edit"; + } + json_data = { time_entries: [{ start_date: start_date.toISOString(), end_date: end_date.toISOString(), log_action_id: parseInt($('input[name=action_id]:checked').val()), - bike_id: parseInt($("#bike_id").val()), + bike_id: bike_id, description: $("#description_id").val(), }]}; console.log(json_data); @@ -31,7 +40,7 @@ $(document).ready(function(){ dataType: "json", success: function(data, status, xhr){ console.log(data); - //window.location = data.bikes[0].id; + window.location = forward; }, error: function(data, status ){ console.log(data); From 82f38fe35c732af551e4b22cc1218505c113131e Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 20 Apr 2014 22:56:26 -0400 Subject: [PATCH 59/81] Actually merge time_entry defaults --- app/controllers/api/v1/time_entries_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/time_entries_controller.rb b/app/controllers/api/v1/time_entries_controller.rb index dc5447e..1b4853d 100644 --- a/app/controllers/api/v1/time_entries_controller.rb +++ b/app/controllers/api/v1/time_entries_controller.rb @@ -6,7 +6,7 @@ class Api::V1::TimeEntriesController < Api::V1::BaseController loggable_type: "User", loggable_id: current_user.id, log_action_type: "ActsAsLoggable::UserAction"} - time_entry.merge(time_entry_defaults) + time_entry.merge!(time_entry_defaults) if time_entry[:bike_id] >= 0 copy_defaults = { @@ -16,7 +16,7 @@ class Api::V1::TimeEntriesController < Api::V1::BaseController copy_action_type: 'ActsAsLoggable::BikeAction', copy_action_id: 4 } - time_entry.merge( copy_defaults ) + time_entry.merge!( copy_defaults ) end @time_entry = ::ActsAsLoggable::Log.new(time_entry.except(:bike_id)) From c0a9d8c1e5aaf9b0797a11433283e594865dd581 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 20 Apr 2014 22:56:48 -0400 Subject: [PATCH 60/81] Return time entry on successful create --- app/views/api/v1/time_entries/create.json.jbuilder | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 app/views/api/v1/time_entries/create.json.jbuilder diff --git a/app/views/api/v1/time_entries/create.json.jbuilder b/app/views/api/v1/time_entries/create.json.jbuilder new file mode 100644 index 0000000..5bc0f01 --- /dev/null +++ b/app/views/api/v1/time_entries/create.json.jbuilder @@ -0,0 +1,4 @@ +json.time_entries [@time_entry] do |time_entry| + json.array! time_entry + #json.set! :href, api_time_entry_path(time_entry) +end From 11910144712b115e89d96e082c3c86d1908a394c Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 26 Apr 2014 20:06:47 -0400 Subject: [PATCH 61/81] WIP, cleaned up api/time_entries, added TimeEntry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added scoped TimeEntry model * Removed setting defaults in TimeEntry controller * Still working on tests… --- .../api/v1/time_entries_controller.rb | 21 ++++---------- app/models/time_entry.rb | 15 ++++++++++ .../api/time_entries_controller_spec.rb | 29 +++++++++++++++++++ 3 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 app/models/time_entry.rb create mode 100644 spec/controllers/api/time_entries_controller_spec.rb diff --git a/app/controllers/api/v1/time_entries_controller.rb b/app/controllers/api/v1/time_entries_controller.rb index 1b4853d..dc07b03 100644 --- a/app/controllers/api/v1/time_entries_controller.rb +++ b/app/controllers/api/v1/time_entries_controller.rb @@ -1,25 +1,16 @@ class Api::V1::TimeEntriesController < Api::V1::BaseController + EXPECTED_TIME_ENTRY = "Expected time entry in submitted data" + def create if params[:time_entries] && time_entry = params[:time_entries].first - puts time_entry.inspect - time_entry_defaults = { - loggable_type: "User", - loggable_id: current_user.id, - log_action_type: "ActsAsLoggable::UserAction"} - time_entry.merge!(time_entry_defaults) + time_entry.merge!({ loggable_id: current_user.id, + logger_id: current_user.id }) if time_entry[:bike_id] >= 0 - copy_defaults = { - copy_log: true, - copy_type: 'Bike', - copy_id: time_entry[:bike_id], - copy_action_type: 'ActsAsLoggable::BikeAction', - copy_action_id: 4 - } - time_entry.merge!( copy_defaults ) + time_entry.copy_to_bike_history(time_entry[:bike_id]) end - @time_entry = ::ActsAsLoggable::Log.new(time_entry.except(:bike_id)) + @time_entry = TimeEntry.new(time_entry.except(:bike_id)) if !@time_entry.save render json: { errors: @time_entry.errors }, status: 422 and return end diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb new file mode 100644 index 0000000..1fbbc7a --- /dev/null +++ b/app/models/time_entry.rb @@ -0,0 +1,15 @@ +class TimeEntry < ActsAsLoggable::Log + default_scope where( loggable_type: "User", + logger_type: "User", + log_action_type: "ActsAsLoggable::UserAction") + + def copy_to_bike_history(bike_id) + self.assign_attributes({ + copy_log: true, + copy_type: 'Bike', + copy_id: bike_id, + copy_action_type: 'ActsAsLoggable::BikeAction', + copy_action_id: 4 + }) + end +end diff --git a/spec/controllers/api/time_entries_controller_spec.rb b/spec/controllers/api/time_entries_controller_spec.rb new file mode 100644 index 0000000..47fa8c0 --- /dev/null +++ b/spec/controllers/api/time_entries_controller_spec.rb @@ -0,0 +1,29 @@ +require 'spec_helper' + +describe Api::V1::TimeEntriesController do + + describe "#create" do + + context "as a user" do + let!(:user){ FactoryGirl.create(:user) } + + before(:each) do + sign_in user + end + + context "with no time entry in json data" do + it "returns error status" do + post :create + json = JSON.parse(@response.body) + expect(@response.code.to_i).to eql 422 + end + + it "returns an error message" do + post :create + json = JSON.parse(@response.body) + expect(json["errors"].first).to eql Api::V1::TimeEntriesController::EXPECTED_TIME_ENTRY + end + end + end + end +end From 00511c5b64dd4cb14c191101e6d9036a2f159240 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 27 Apr 2014 14:39:11 -0400 Subject: [PATCH 62/81] Finish Api/TimeEntries spec, fix bike_id handling --- .../api/v1/time_entries_controller.rb | 5 +- .../api/time_entries_controller_spec.rb | 51 +++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/time_entries_controller.rb b/app/controllers/api/v1/time_entries_controller.rb index dc07b03..2120c9d 100644 --- a/app/controllers/api/v1/time_entries_controller.rb +++ b/app/controllers/api/v1/time_entries_controller.rb @@ -5,9 +5,10 @@ class Api::V1::TimeEntriesController < Api::V1::BaseController if params[:time_entries] && time_entry = params[:time_entries].first time_entry.merge!({ loggable_id: current_user.id, logger_id: current_user.id }) + bike_id = time_entry[:bike_id].to_i - if time_entry[:bike_id] >= 0 - time_entry.copy_to_bike_history(time_entry[:bike_id]) + if bike_id > 0 + time_entry.copy_to_bike_history(bike_id) end @time_entry = TimeEntry.new(time_entry.except(:bike_id)) diff --git a/spec/controllers/api/time_entries_controller_spec.rb b/spec/controllers/api/time_entries_controller_spec.rb index 47fa8c0..7afddd0 100644 --- a/spec/controllers/api/time_entries_controller_spec.rb +++ b/spec/controllers/api/time_entries_controller_spec.rb @@ -1,6 +1,7 @@ require 'spec_helper' describe Api::V1::TimeEntriesController do + render_views describe "#create" do @@ -24,6 +25,56 @@ describe Api::V1::TimeEntriesController do expect(json["errors"].first).to eql Api::V1::TimeEntriesController::EXPECTED_TIME_ENTRY end end + + context "with valid time entry in json data" do + + before(:each) do + time_data = { time_entries: [{ + start_date: Time.zone.now, + end_date: Time.zone.now + 60, + log_action_id: 1, + bike_id: -1, + description: "My description"}] + } + + #this is necessary because render_views does not work with sign_in devise helper + @submit_json = api_submit_json(user, time_data) + #not sure why format: :json not working + request.accept = 'application/json' + end + + it "returns 200" do + post :create, @submit_json + expect(@response.code.to_i).to eql 200 + end + + it "returns the created time entry json" do + post :create, @submit_json + json = JSON.parse(@response.body) + expect(json).to have_key("time_entries") + expect(json.to_s).to include(@submit_json[:time_entries].first[:description]) + end + end + + context "with invalid time entry in json data" do + before(:each) do + @submit_json = { time_entries: [{ + description: "My description", + }]} + end + + it "returns 422" do + post :create, @submit_json + expect(@response.code.to_i).to eql 422 + end + + it "returns the fields with errors" do + post :create, @submit_json + json = JSON.parse(@response.body) + expect(json).to have_key("errors") + expect(json.to_s).to include("can't be blank") + end + end end end end From 7897795e8bb8793436e69a80d7af4a3b65d7c1fe Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 27 Apr 2014 14:39:32 -0400 Subject: [PATCH 63/81] Correct spec description --- spec/controllers/api/bikes_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/api/bikes_controller_spec.rb b/spec/controllers/api/bikes_controller_spec.rb index 5d69bb1..f52dff0 100644 --- a/spec/controllers/api/bikes_controller_spec.rb +++ b/spec/controllers/api/bikes_controller_spec.rb @@ -28,7 +28,7 @@ describe Api::V1::BikesController do end context "with no bike in json data" do - it "returns 400" do + it "returns error status" do post :create expect(@response.code.to_i).to eql 422 end From 338905878e656f78760672cf071f0912bbe5a965 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 27 Apr 2014 15:07:21 -0400 Subject: [PATCH 64/81] feature spec for adding new time entry --- spec/features/time_entries/new_spec.rb | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 spec/features/time_entries/new_spec.rb diff --git a/spec/features/time_entries/new_spec.rb b/spec/features/time_entries/new_spec.rb new file mode 100644 index 0000000..3138998 --- /dev/null +++ b/spec/features/time_entries/new_spec.rb @@ -0,0 +1,31 @@ +require "spec_helper" + +feature "TimeEntries" do + let!(:user){ FactoryGirl.create(:user) } + + before(:each) do + visit new_user_session_path + fill_in "user_username", with: user.username + fill_in "user_password", with: user.password + click_button "Sign in" + end + + scenario "User creates a new time entry", js: true do + visit new_time_entry_path + fill_in "date_id", with: "04/27/2014" + fill_in "start_time_id", with: "3:00 PM" + fill_in "end_time_id", with: "3:15 PM" + find('label.btn.btn-default', text: 'Personal').trigger('click') + fill_in "description_id", with: "My Description" + click_button "Add Time Entry" + expect(page).to have_text("My Description") + expect(TimeEntry.count).to be > 0 + end + + scenario "User submits a time entry with errors", js: true do + visit new_time_entry_path + click_button "Add Time Entry" + expect(page).to have_text(:all, "can't be blank") + end + +end From 7dd556d71878485d7f9e9b604bc3f5804ddac0c7 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 27 Apr 2014 15:46:13 -0400 Subject: [PATCH 65/81] Fixed forwarding on time entry creation --- app/assets/javascripts/time_entries.js | 5 +---- app/views/time_entries/new.haml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/time_entries.js b/app/assets/javascripts/time_entries.js index 3e2b0dc..a504ded 100644 --- a/app/assets/javascripts/time_entries.js +++ b/app/assets/javascripts/time_entries.js @@ -19,7 +19,7 @@ $(document).ready(function(){ // If a bike is selected, forward to the bike // checklist. bike_id = parseInt($("#bike_id").val()); - if( bike_id >= 0 ){ + if( bike_id > 0 ){ forward = "/task_lists/" + bike_id + "/edit"; } @@ -30,7 +30,6 @@ $(document).ready(function(){ bike_id: bike_id, description: $("#description_id").val(), }]}; - console.log(json_data); $.ajax({ url: $("#add_time_entry_submit").data("url"), @@ -39,11 +38,9 @@ $(document).ready(function(){ contentType: 'application/json', dataType: "json", success: function(data, status, xhr){ - console.log(data); window.location = forward; }, error: function(data, status ){ - console.log(data); displayFormErrors(data.responseJSON); } }); diff --git a/app/views/time_entries/new.haml b/app/views/time_entries/new.haml index de4b173..4f10444 100644 --- a/app/views/time_entries/new.haml +++ b/app/views/time_entries/new.haml @@ -39,4 +39,4 @@ %textarea{id: "description_id", placeholder: "Work description", class: "input-lg" } .control-group .controls - %input{id: "add_time_entry_submit", value: "Add Time Entry", type: "button", class: "btn btn-lg btn-block btn-primary", "data-url" => "#{api_create_time_entry_path}"} + %input{id: "add_time_entry_submit", value: "Add Time Entry", type: "button", class: "btn btn-lg btn-block btn-primary", "data-url" => "#{api_create_time_entry_path}", "data-forward" => "#{"."}"} From 3d71add63796c156e0c5f569a3c25add1216a38c Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 27 Apr 2014 15:46:42 -0400 Subject: [PATCH 66/81] WIP, adding time entry index page --- app/views/time_entries/index.haml | 9 +++++++++ config/routes.rb | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 app/views/time_entries/index.haml diff --git a/app/views/time_entries/index.haml b/app/views/time_entries/index.haml new file mode 100644 index 0000000..e40505f --- /dev/null +++ b/app/views/time_entries/index.haml @@ -0,0 +1,9 @@ +%a{ class: "btn btn-default btn-lg", href: root_path} + %span{ class:"icon-home"} +%h2 Your Timesheet + +%p Total Hours Worked: #{@hours_worked} +%p Total Credits Available: #{@credits_available} + +%a{class: "btn btn-lg btn-block btn-primary", href: new_time_entry_path } Add Time Entry + diff --git a/config/routes.rb b/config/routes.rb index 8e666b0..2cdad74 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,7 +11,8 @@ Velocipede::Application.routes.draw do get 'task_lists/:id/edit' => "task_lists#edit", as: "edit_task_list" - get 'time_entries/new' => "time_entries#new", as: "new_time_entry" + get 'time_entries' => "time_entries#index", as: "time_entries" + get 'time_entries/new' => "time_entries#new", as: "new_time_entry" ########################### # API Routes From 4224f0de409a446fdbf4bdc7d27caaf3714d3752 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 27 Apr 2014 18:59:50 -0400 Subject: [PATCH 67/81] Added Time entries index page --- app/assets/javascripts/application.js | 1 + app/controllers/time_entries_controller.rb | 4 +++- app/models/time_entry.rb | 8 ++++++++ app/views/time_entries/index.haml | 22 ++++++++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 624d531..019f687 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,6 +13,7 @@ //= require jquery //= require jquery_ujs //= require twitter/bootstrap/bootstrap-button +//= require twitter/bootstrap/bootstrap-modal //= require utils //= require bootstrap-datepicker //= require bootstrap-timepicker diff --git a/app/controllers/time_entries_controller.rb b/app/controllers/time_entries_controller.rb index ce9913d..e019dc9 100644 --- a/app/controllers/time_entries_controller.rb +++ b/app/controllers/time_entries_controller.rb @@ -9,6 +9,8 @@ class TimeEntriesController < AuthenticatedController end def index - + @user_time_entries = TimeEntry.where(loggable_id: current_user.id) + @credits_available = current_user.total_credits + @hours_worked = current_user.total_hours end end diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index 1fbbc7a..af86b09 100644 --- a/app/models/time_entry.rb +++ b/app/models/time_entry.rb @@ -12,4 +12,12 @@ class TimeEntry < ActsAsLoggable::Log copy_action_id: 4 }) end + + def duration + end_date - start_date + end + + def duration_in_hours + (duration / 1.hour).round(2) + end end diff --git a/app/views/time_entries/index.haml b/app/views/time_entries/index.haml index e40505f..ca3c142 100644 --- a/app/views/time_entries/index.haml +++ b/app/views/time_entries/index.haml @@ -5,5 +5,27 @@ %p Total Hours Worked: #{@hours_worked} %p Total Credits Available: #{@credits_available} +%table.table + %tbody + - @user_time_entries.each do |entry| + %tr + %td #{entry.start_date.to_date.to_formatted_s(:rfc822)} + %td #{entry.duration_in_hours} + %td #{truncate(entry.description)} + %td + %button{ class: "btn icon-remove btn-danger", role: "button", "data-toggle" => "modal", "data-target" => "#confirmation" } + %a{class: "btn btn-lg btn-block btn-primary", href: new_time_entry_path } Add Time Entry +.modal{ id: "confirmation", class: "hide", role: "dialog", "aria-labelledby" => "confirmation_title", "aria-hidden" => "true", tabindex: -1 } + .modal-header + %button{ class: "close", "data-dismiss" => "modal", "aria-hidden" => "true"}x + %h4{ id: "confirmation_title" } header + .modal-body + Are you sure? + .modal-footer + %button{ class: "btn", "data-dismiss" => "modal", "aria-hidden" => "true"} Close + %button{ class: "btn btn-primary" } Delete + + + From 57d72c04a7eb35e064f80f295357c08f6cecb7df Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 3 May 2014 19:28:56 -0400 Subject: [PATCH 68/81] Fix TimeEntry scope --- app/models/time_entry.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index af86b09..aafea6a 100644 --- a/app/models/time_entry.rb +++ b/app/models/time_entry.rb @@ -1,7 +1,7 @@ class TimeEntry < ActsAsLoggable::Log default_scope where( loggable_type: "User", logger_type: "User", - log_action_type: "ActsAsLoggable::UserAction") + log_action_type: "ActsAsLoggable::UserAction").where("log_action_id != 4").order("start_date DESC") def copy_to_bike_history(bike_id) self.assign_attributes({ From 2e21e327ca4798bcadc9a9740e2bd3c38372be14 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 3 May 2014 19:29:22 -0400 Subject: [PATCH 69/81] Home page link to time entries --- app/views/site/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/site/index.html.haml b/app/views/site/index.html.haml index 0a23f4a..239bcc8 100644 --- a/app/views/site/index.html.haml +++ b/app/views/site/index.html.haml @@ -5,7 +5,7 @@ %p %a{class: "btn btn-lg btn-block btn-primary", href: new_time_entry_path} Add Time Entry %p - %a{class: "btn btn-lg btn-block btn-primary"} View Timesheet + %a{class: "btn btn-lg btn-block btn-primary", href: time_entries_path} View Timesheet %p %a{class: "btn btn-lg btn-block btn-primary", href: new_bike_path} Add Bike From 4ce4bd6597e626faf271f52778d44cecc034ceec Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 3 May 2014 19:29:57 -0400 Subject: [PATCH 70/81] WIP, rigged up JS/html to delete work entries --- app/assets/javascripts/time_entries.js | 31 ++++++++++++++++++++++++++ app/views/time_entries/index.haml | 26 +++++++++++++++------ 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/time_entries.js b/app/assets/javascripts/time_entries.js index a504ded..6fc3766 100644 --- a/app/assets/javascripts/time_entries.js +++ b/app/assets/javascripts/time_entries.js @@ -45,4 +45,35 @@ $(document).ready(function(){ } }); }); + + $(".work_entry-delete-btn").click(function(){ + row = $(this).closest("tr"); + entry_id = row.data("id"); + start_date = row.data("start_date"); + duration = row.data("duration"); + description = row.data("description"); + $("#work_entry_start_date").html(start_date); + $("#work_entry_duration").html(duration); + $("#work_entry_description").html(description); + $("#confirmation_delete").data("entry_id", entry_id); + }); + + $("#confirmation_delete").click(function(){ + console.log($(this).data("entry_id")); + /** + $.ajax({ + url: $("#confirmation_delete").data("url"), + type: "delete", + data: JSON.stringify(json_data), + contentType: 'application/json', + dataType: "json", + success: function(data, status, xhr){ + window.location = forward; + }, + error: function(data, status ){ + displayFormErrors(data.responseJSON); + } + }); + */ + }); }); diff --git a/app/views/time_entries/index.haml b/app/views/time_entries/index.haml index ca3c142..608dc83 100644 --- a/app/views/time_entries/index.haml +++ b/app/views/time_entries/index.haml @@ -2,30 +2,42 @@ %span{ class:"icon-home"} %h2 Your Timesheet -%p Total Hours Worked: #{@hours_worked} -%p Total Credits Available: #{@credits_available} +%dl.dl-horizontal + %dd + %span.badge #{@hours_worked} + Total Hours Worked + %dd + %span.badge #{@credits_available} + Total Credits Available %table.table %tbody - @user_time_entries.each do |entry| - %tr + %tr{ "data-id" => entry.id, "data-description" => entry.description, + "data-duration" => entry.duration_in_hours, + "data-start_date" => entry.start_date.to_date.to_formatted_s(:rfc822)} %td #{entry.start_date.to_date.to_formatted_s(:rfc822)} %td #{entry.duration_in_hours} %td #{truncate(entry.description)} %td - %button{ class: "btn icon-remove btn-danger", role: "button", "data-toggle" => "modal", "data-target" => "#confirmation" } + %button{ class: "btn icon-remove btn-danger work_entry-delete-btn", role: "button", "data-toggle" => "modal", "data-target" => "#confirmation" } %a{class: "btn btn-lg btn-block btn-primary", href: new_time_entry_path } Add Time Entry .modal{ id: "confirmation", class: "hide", role: "dialog", "aria-labelledby" => "confirmation_title", "aria-hidden" => "true", tabindex: -1 } .modal-header %button{ class: "close", "data-dismiss" => "modal", "aria-hidden" => "true"}x - %h4{ id: "confirmation_title" } header + %h4{ id: "confirmation_title" } Are you sure you want to delete? .modal-body - Are you sure? + %div{ id: "work_entry_start_date" } + Start Date + %div{ id: "work_entry_duration" } + Duration + %div{ id: "work_entry_description" } + Description .modal-footer %button{ class: "btn", "data-dismiss" => "modal", "aria-hidden" => "true"} Close - %button{ class: "btn btn-primary" } Delete + %button{ id: "confirmation_delete", class: "btn btn-primary" } Delete From 894423e66fd55ed33dd23b78e5af4db5b4d86a01 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 3 May 2014 21:41:33 -0400 Subject: [PATCH 71/81] Fixed bug in user credits available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Personal work was counting toward credits, now it’s possible to add a column to user actions to denote if a user action can count to credits. --- app/models/user.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 59a468f..d51757b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -74,6 +74,8 @@ class User < ActiveRecord::Base def total_earned_credits log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN") + volunteer_id = 1 + staff_id = 3 # Find the first credit conversion which has a created_at date before the # log's created_at date and join it to the log's row so we can calculate @@ -82,7 +84,7 @@ class User < ActiveRecord::Base # # The DISTINCT ON, and ORDER BY are important to getting the # single conversion rate that applies to the respective log. - ::ActsAsLoggable::Log.find_by_sql(" + ::ActsAsLoggable::Log.find_by_sql([" SELECT DISTINCT ON (logs.created_at) start_date, end_date, conversion.conversion, conversion.created_at FROM logs @@ -90,10 +92,13 @@ class User < ActiveRecord::Base SELECT conversion, created_at FROM credit_conversions ) AS conversion ON logs.created_at > conversion.created_at - WHERE logs.loggable_id = #{self.id} + WHERE logs.loggable_id = :id AND logs.loggable_type = 'User' - AND (log_action_id != #{log_action.id} AND log_action_type = '#{log_action.class.to_s}') - ORDER BY logs.created_at, conversion.created_at DESC"). + AND (log_action_id IN (:credit_actions) AND log_action_type = :log_action_type) + ORDER BY logs.created_at, conversion.created_at DESC", + {id: self.id, + credit_actions: [volunteer_id, staff_id], + log_action_type: log_action.class.to_s}]). sum{ |l| ((l.end_date - l.start_date)/3600) * l.conversion.to_i}.round(2) end From 24facd4dee96910c7a9d3c43efe5cc99ab900370 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 3 May 2014 21:48:35 -0400 Subject: [PATCH 72/81] Time entry actions had the wrong IDs... --- app/views/time_entries/new.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/time_entries/new.haml b/app/views/time_entries/new.haml index 4f10444..49a4eeb 100644 --- a/app/views/time_entries/new.haml +++ b/app/views/time_entries/new.haml @@ -23,11 +23,11 @@ .controls .btn-group{ "data-toggle" => "buttons-radio"} %label{ class: "btn btn-default"} - %input{ type: "radio", name: "action_id", value: 3} Volunteer + %input{ type: "radio", name: "action_id", value: 1} Volunteer %label{ class: "btn btn-default"} - %input{ type: "radio", name: "action_id", value: 1} Personal + %input{ type: "radio", name: "action_id", value: 2} Personal %label{ class: "btn btn-default"} - %input{ type: "radio", name: "action_id", value: 2} Staff + %input{ type: "radio", name: "action_id", value: 3} Staff .hidden{ id: "log_action_id" } .help-block .control-group From d94c436ba5e9dff9946a45906e2b6266a34aa480 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 3 May 2014 22:06:56 -0400 Subject: [PATCH 73/81] Added api/time_entry/delete method --- .../api/v1/time_entries_controller.rb | 10 +++++ config/routes.rb | 1 + .../api/time_entries_controller_spec.rb | 37 +++++++++++++++++++ spec/factories/time_entries.rb | 10 +++++ 4 files changed, 58 insertions(+) create mode 100644 spec/factories/time_entries.rb diff --git a/app/controllers/api/v1/time_entries_controller.rb b/app/controllers/api/v1/time_entries_controller.rb index 2120c9d..eac33cd 100644 --- a/app/controllers/api/v1/time_entries_controller.rb +++ b/app/controllers/api/v1/time_entries_controller.rb @@ -1,5 +1,6 @@ class Api::V1::TimeEntriesController < Api::V1::BaseController EXPECTED_TIME_ENTRY = "Expected time entry in submitted data" + NOT_FOUND = "Time entry not found" def create if params[:time_entries] && time_entry = params[:time_entries].first @@ -19,4 +20,13 @@ class Api::V1::TimeEntriesController < Api::V1::BaseController render json: { errors: [EXPECTED_TIME_ENTRY]}, status: 422 and return end end + + def delete + if time_entry = TimeEntry.find_by_id(params[:id]) + time_entry.delete + render nothing: true, status: 204 and return + else + render json: { errors: [NOT_FOUND]}, status: 404 and return + end + end end diff --git a/config/routes.rb b/config/routes.rb index 2cdad74..8ef1a8d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,6 +31,7 @@ Velocipede::Application.routes.draw do put 'tasks/update' => "tasks#update", as: "api_update_task" post 'time_entries/create' => "time_entries#create", as: "api_create_time_entry" + delete 'time_entries/:id' => "time_entries#delete", as: "api_delete_time_entry" end end diff --git a/spec/controllers/api/time_entries_controller_spec.rb b/spec/controllers/api/time_entries_controller_spec.rb index 7afddd0..bd18b63 100644 --- a/spec/controllers/api/time_entries_controller_spec.rb +++ b/spec/controllers/api/time_entries_controller_spec.rb @@ -77,4 +77,41 @@ describe Api::V1::TimeEntriesController do end end end + + describe "#delete" do + context "as a user" do + let!(:user){ FactoryGirl.create(:user) } + + before(:each) do + sign_in user + end + + context "entry does not exist" do + it "returns 404" do + delete :delete, id: 9000 + expect(@response.code.to_i).to eql 404 + end + + it "returns not found" do + delete :delete, id: 9000 + json = JSON.parse(@response.body) + expect(json).to have_key("errors") + expect(json.to_s).to include("not found") + end + end + + context "entry exists" do + let!(:entry){ FactoryGirl.create(:time_entry) } + + it "deletes the time entry" do + expect{delete :delete, id: entry.id}.to change{TimeEntry.count} + end + + it "returns 204" do + delete :delete, id: entry.id + expect(@response.code.to_i).to eql 204 + end + end + end + end end diff --git a/spec/factories/time_entries.rb b/spec/factories/time_entries.rb new file mode 100644 index 0000000..64ff916 --- /dev/null +++ b/spec/factories/time_entries.rb @@ -0,0 +1,10 @@ +FactoryGirl.define do + factory :time_entry do + loggable_type User.to_s + logger_type User.to_s + start_date Time.now + end_date Time.now + log_action_id 1 + log_action_type ActsAsLoggable::UserAction.to_s + end +end From 5e0d678ea1f4f036ef421f73ef2a8af30b596a0e Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 3 May 2014 22:08:23 -0400 Subject: [PATCH 74/81] Finish time entry delete JS/html --- app/assets/javascripts/time_entries.js | 11 ++++------- app/models/time_entry.rb | 4 ++++ app/views/time_entries/index.haml | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/time_entries.js b/app/assets/javascripts/time_entries.js index 6fc3766..8fab897 100644 --- a/app/assets/javascripts/time_entries.js +++ b/app/assets/javascripts/time_entries.js @@ -59,21 +59,18 @@ $(document).ready(function(){ }); $("#confirmation_delete").click(function(){ - console.log($(this).data("entry_id")); - /** + entry_id = $(this).data("entry_id"); + url = $("#confirmation_delete").data("url") + entry_id; $.ajax({ - url: $("#confirmation_delete").data("url"), + url: url, type: "delete", - data: JSON.stringify(json_data), contentType: 'application/json', - dataType: "json", success: function(data, status, xhr){ - window.location = forward; + location.reload(); }, error: function(data, status ){ displayFormErrors(data.responseJSON); } }); - */ }); }); diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index aafea6a..f782c4e 100644 --- a/app/models/time_entry.rb +++ b/app/models/time_entry.rb @@ -20,4 +20,8 @@ class TimeEntry < ActsAsLoggable::Log def duration_in_hours (duration / 1.hour).round(2) end + + def type + log_action.action + end end diff --git a/app/views/time_entries/index.haml b/app/views/time_entries/index.haml index 608dc83..1875d17 100644 --- a/app/views/time_entries/index.haml +++ b/app/views/time_entries/index.haml @@ -18,6 +18,7 @@ "data-start_date" => entry.start_date.to_date.to_formatted_s(:rfc822)} %td #{entry.start_date.to_date.to_formatted_s(:rfc822)} %td #{entry.duration_in_hours} + %td #{entry.type} %td #{truncate(entry.description)} %td %button{ class: "btn icon-remove btn-danger work_entry-delete-btn", role: "button", "data-toggle" => "modal", "data-target" => "#confirmation" } @@ -37,7 +38,7 @@ Description .modal-footer %button{ class: "btn", "data-dismiss" => "modal", "aria-hidden" => "true"} Close - %button{ id: "confirmation_delete", class: "btn btn-primary" } Delete + %button{ id: "confirmation_delete", class: "btn btn-primary", "data-url" => "api/v1/time_entries/" } Delete From ca3026e7c5a40afd3589336b3bc57123cc6fc376 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sat, 3 May 2014 22:53:27 -0400 Subject: [PATCH 75/81] Added delete time entry feature spec --- app/models/time_entry.rb | 2 +- app/models/user.rb | 15 +++++++-------- spec/features/time_entries/index_spec.rb | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 spec/features/time_entries/index_spec.rb diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index f782c4e..745e5b4 100644 --- a/app/models/time_entry.rb +++ b/app/models/time_entry.rb @@ -22,6 +22,6 @@ class TimeEntry < ActsAsLoggable::Log end def type - log_action.action + log_action.try(:action) end end diff --git a/app/models/user.rb b/app/models/user.rb index d51757b..a455258 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -65,15 +65,14 @@ class User < ActiveRecord::Base end def total_credits_spent - log_action = ::ActsAsLoggable::TransactionAction.find_by_action("TIME") + log_action_id = 1 #TIME transaction_logs. where( "log_action_id = ? AND log_action_type = ?", - log_action.id, log_action.class.to_s). + log_action_id, ::ActsAsLoggable::TransactionAction.to_s). sum{ |r| r.description.to_i }.round(2) end def total_earned_credits - log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN") volunteer_id = 1 staff_id = 3 @@ -98,20 +97,20 @@ class User < ActiveRecord::Base ORDER BY logs.created_at, conversion.created_at DESC", {id: self.id, credit_actions: [volunteer_id, staff_id], - log_action_type: log_action.class.to_s}]). + log_action_type: ::ActsAsLoggable::UserAction.to_s}]). sum{ |l| ((l.end_date - l.start_date)/3600) * l.conversion.to_i}.round(2) end def total_hours - log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN") - logs.where("log_action_id != ? AND log_action_type = ?", log_action.id, log_action.class.to_s).sum { |l| (l.end_date - l.start_date)/3600 }.round(2) + log_action_id = 4 #CHECKIN + logs.where("log_action_id != ? AND log_action_type = ?", log_action_id, ::ActsAsLoggable::UserAction.to_s).sum { |l| (l.end_date - l.start_date)/3600 }.round(2) end def current_month_hours - log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN") + log_action_id = 4 #CHECKIN #TODO need to prevent users from saving logs across months, force to create a new log if crossing month current_month_range = (Time.now.beginning_of_month..Time.now.end_of_month) - logs.where("log_action_id != ? AND log_action_type = ?", log_action.id, log_action.class.to_s) + logs.where("log_action_id != ? AND log_action_type = ?", log_action_id, ::ActsAsLoggable::UserAction.to_s) .where( :start_date => current_month_range) .where( :end_date => current_month_range) .sum { |l| (l.end_date - l.start_date)/3600 } diff --git a/spec/features/time_entries/index_spec.rb b/spec/features/time_entries/index_spec.rb new file mode 100644 index 0000000..6ce04d8 --- /dev/null +++ b/spec/features/time_entries/index_spec.rb @@ -0,0 +1,23 @@ +require "spec_helper" + +feature "TimeEntries" do + let!(:user){ FactoryGirl.create(:user) } + let!(:entry){ FactoryGirl.create(:time_entry, loggable_id: user.id) } + + before(:each) do + visit new_user_session_path + fill_in "user_username", with: user.username + fill_in "user_password", with: user.password + click_button "Sign in" + end + + scenario "User deletes a time entry", js: true do + visit time_entries_path + puts TimeEntry.where(loggable_id: user.id).inspect + save_screenshot("/tmp/testingpoop.png") + find('button.work_entry-delete-btn').trigger('click') + click_button "Delete" + expect(page).to have_text("Your Timesheet") + expect(TimeEntry.count).to eql 0 + end +end From 071815b9fdfe879d62a7474e618f61815b8caeef Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 4 May 2014 10:34:55 -0400 Subject: [PATCH 76/81] Fix app layout for mobile devices --- app/views/layouts/application.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9cad67e..0666f2e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -2,6 +2,7 @@ %html{:lang => "en"} %head %meta{:charset => "utf-8"}/ + %meta{ name: "viewport", content: "width=device-width", "initial-scale" => "1.0"} %title= content_for?(:title) ? yield(:title) : "Velocipede" = csrf_meta_tags = stylesheet_link_tag "bootstrap_and_overrides", "datepicker", "bootstrap-timepicker", :media => "all" @@ -9,7 +10,7 @@ = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" :css body { - padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */ + padding-top: 5px; } .x-boundlist-item { white-space: nowrap; From 0605d0f0d94bf17dec71e313921572728bde537d Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 4 May 2014 10:56:14 -0400 Subject: [PATCH 77/81] Fixed creating bike work time entry & added spec --- .../api/v1/time_entries_controller.rb | 5 +++-- spec/features/time_entries/new_spec.rb | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/time_entries_controller.rb b/app/controllers/api/v1/time_entries_controller.rb index eac33cd..e1b8768 100644 --- a/app/controllers/api/v1/time_entries_controller.rb +++ b/app/controllers/api/v1/time_entries_controller.rb @@ -8,11 +8,12 @@ class Api::V1::TimeEntriesController < Api::V1::BaseController logger_id: current_user.id }) bike_id = time_entry[:bike_id].to_i + @time_entry = TimeEntry.new(time_entry.except(:bike_id)) + if bike_id > 0 - time_entry.copy_to_bike_history(bike_id) + @time_entry.copy_to_bike_history(bike_id) end - @time_entry = TimeEntry.new(time_entry.except(:bike_id)) if !@time_entry.save render json: { errors: @time_entry.errors }, status: 422 and return end diff --git a/spec/features/time_entries/new_spec.rb b/spec/features/time_entries/new_spec.rb index 3138998..eac3280 100644 --- a/spec/features/time_entries/new_spec.rb +++ b/spec/features/time_entries/new_spec.rb @@ -22,6 +22,23 @@ feature "TimeEntries" do expect(TimeEntry.count).to be > 0 end + context "A bike exists" do + let!(:bike){ FactoryGirl.create(:bike) } + + scenario "User creates a new bike work time entry", js: true do + visit new_time_entry_path + fill_in "date_id", with: "04/27/2014" + fill_in "start_time_id", with: "3:00 PM" + fill_in "end_time_id", with: "3:15 PM" + find('label.btn.btn-default', text: 'Personal').trigger('click') + select bike.to_s, from: "bike_id" + fill_in "description_id", with: "My Description" + click_button "Add Time Entry" + expect(page).to have_text("Task List") + expect(TimeEntry.count).to be > 0 + end + end + scenario "User submits a time entry with errors", js: true do visit new_time_entry_path click_button "Add Time Entry" From b9b6ed5ca0cf600fa48355e0a5577e38aa1813e1 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 4 May 2014 10:56:29 -0400 Subject: [PATCH 78/81] Remove stray puts in spec --- spec/features/time_entries/index_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/features/time_entries/index_spec.rb b/spec/features/time_entries/index_spec.rb index 6ce04d8..82d89ef 100644 --- a/spec/features/time_entries/index_spec.rb +++ b/spec/features/time_entries/index_spec.rb @@ -13,7 +13,6 @@ feature "TimeEntries" do scenario "User deletes a time entry", js: true do visit time_entries_path - puts TimeEntry.where(loggable_id: user.id).inspect save_screenshot("/tmp/testingpoop.png") find('button.work_entry-delete-btn').trigger('click') click_button "Delete" From 5c4007a1be43251e547663d7ec2f283855e053cf Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 4 May 2014 11:14:50 -0400 Subject: [PATCH 79/81] Show add another bike link after creating bike --- app/assets/javascripts/bikes.js | 2 +- app/controllers/bikes_controller.rb | 1 + app/views/bikes/show.html.haml | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/bikes.js b/app/assets/javascripts/bikes.js index f2398ea..ba530d6 100644 --- a/app/assets/javascripts/bikes.js +++ b/app/assets/javascripts/bikes.js @@ -21,7 +21,7 @@ $("#add_bike_submit").click(function(){ contentType: 'application/json', dataType: "json", success: function(data, status, xhr){ - window.location = data.bikes[0].id; + window.location = data.bikes[0].id + "?add_bike=1"; }, error: function(data, status ){ displayFormErrors(data.responseJSON); diff --git a/app/controllers/bikes_controller.rb b/app/controllers/bikes_controller.rb index e2985d5..981ccd3 100644 --- a/app/controllers/bikes_controller.rb +++ b/app/controllers/bikes_controller.rb @@ -10,6 +10,7 @@ class BikesController < AuthenticatedController def show @bike = Bike.find_by_id(params[:id]) @task_list_id = @bike.task_list.id + @show_add_bike = true if params[:add_bike] end end diff --git a/app/views/bikes/show.html.haml b/app/views/bikes/show.html.haml index e836177..ca71f7d 100644 --- a/app/views/bikes/show.html.haml +++ b/app/views/bikes/show.html.haml @@ -1,3 +1,7 @@ +- if @show_add_bike + %p + %a{class: "btn btn-lg btn-block btn-info", href: new_bike_path} Add Another Bike? + %a{ class: "btn btn-default btn-lg", href: root_path} %span{ class:"icon-home"} %h2 #{@bike.shop_id}: #{@bike.bike_brand} From 785e096aea5a375592f6dc7b2530c57d267f7217 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 4 May 2014 11:26:37 -0400 Subject: [PATCH 80/81] Giving up on checkin tests for now --- spec/features/site/index_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/features/site/index_spec.rb b/spec/features/site/index_spec.rb index 85cec75..e341a43 100644 --- a/spec/features/site/index_spec.rb +++ b/spec/features/site/index_spec.rb @@ -17,13 +17,15 @@ describe "Index Page" do page.should have_button 'CHECK OUT' end - it 'clicking check in should check in a user' do + it 'clicking check in should check in a user', js: true do + pending expect{click_button 'CHECK IN'}. to change{@user.checked_in?}. from(false).to(true) end - it 'clicking check out should check out a user' do + it 'clicking check out should check out a user', js: true do + pending @user.checkin expect{click_button 'CHECK OUT'}. to change{@user.checked_in?}. From 1b2c0fa378d50046350e76df1f5b07bbbfeaf703 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Sun, 4 May 2014 20:43:46 -0400 Subject: [PATCH 81/81] Submit dates in locale format for time being Added jquery date format plugin --- app/assets/javascripts/application.js | 1 + app/assets/javascripts/jquery-date-format.js | 445 +++++++++++++++++++ app/assets/javascripts/time_entries.js | 9 +- 3 files changed, 453 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/jquery-date-format.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 019f687..46f1298 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,3 +17,4 @@ //= require utils //= require bootstrap-datepicker //= require bootstrap-timepicker +//= require jquery-date-format diff --git a/app/assets/javascripts/jquery-date-format.js b/app/assets/javascripts/jquery-date-format.js new file mode 100644 index 0000000..fa5175e --- /dev/null +++ b/app/assets/javascripts/jquery-date-format.js @@ -0,0 +1,445 @@ +var DateFormat = {}; + +(function($) { + var daysInWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + var shortMonthsInYear = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', + 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; + var longMonthsInYear = ['January', 'February', 'March', 'April', 'May', 'June', + 'July', 'August', 'September', 'October', 'November', 'December']; + var shortMonthsToNumber = { 'Jan': '01', 'Feb': '02', 'Mar': '03', 'Apr': '04', 'May': '05', 'Jun': '06', + 'Jul': '07', 'Aug': '08', 'Sep': '09', 'Oct': '10', 'Nov': '11', 'Dec': '12' }; + + var YYYYMMDD_MATCHER = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.?\d{0,3}[Z\-+]?(\d{2}:?\d{2})?/; + + $.format = (function() { + function numberToLongDay(value) { + // 0 to Sunday + // 1 to Monday + return daysInWeek[parseInt(value, 10)] || value; + } + + function numberToShortMonth(value) { + // 1 to Jan + // 2 to Feb + var monthArrayIndex = parseInt(value, 10) - 1; + return shortMonthsInYear[monthArrayIndex] || value; + } + + function numberToLongMonth(value) { + // 1 to January + // 2 to February + var monthArrayIndex = parseInt(value, 10) - 1; + return longMonthsInYear[monthArrayIndex] || value; + } + + function shortMonthToNumber(value) { + // Jan to 01 + // Feb to 02 + return shortMonthsToNumber[value] || value; + } + + function parseTime(value) { + // 10:54:50.546 + // => hour: 10, minute: 54, second: 50, millis: 546 + // 10:54:50 + // => hour: 10, minute: 54, second: 50, millis: '' + var time = value, + values, + subValues, + hour, + minute, + second, + millis = '', + delimited, + timeArray; + + if(time.indexOf('.') !== -1) { + delimited = time.split('.'); + // split time and milliseconds + time = delimited[0]; + millis = delimited[1]; + } + + timeArray = time.split(':'); + + if(timeArray.length === 3) { + hour = timeArray[0]; + minute = timeArray[1]; + // '20 GMT-0200 (BRST)'.replace(/\s.+/, '').replace(/[a-z]/gi, ''); + // => 20 + // '20Z'.replace(/\s.+/, '').replace(/[a-z]/gi, ''); + // => 20 + second = timeArray[2].replace(/\s.+/, '').replace(/[a-z]/gi, ''); + // '01:10:20 GMT-0200 (BRST)'.replace(/\s.+/, '').replace(/[a-z]/gi, ''); + // => 01:10:20 + // '01:10:20Z'.replace(/\s.+/, '').replace(/[a-z]/gi, ''); + // => 01:10:20 + time = time.replace(/\s.+/, '').replace(/[a-z]/gi, ''); + return { + time: time, + hour: hour, + minute: minute, + second: second, + millis: millis + }; + } + + return { time : '', hour : '', minute : '', second : '', millis : '' }; + } + + + function padding(value, length) { + var paddingCount = length - String(value).length; + for(var i = 0; i < paddingCount; i++) { + value = '0' + value; + } + return value; + } + + return { + + parseDate: function(value) { + var parsedDate = { + date: null, + year: null, + month: null, + dayOfMonth: null, + dayOfWeek: null, + time: null + }; + + if(typeof value == 'number') { + return this.parseDate(new Date(value)); + } else if(typeof value.getFullYear == 'function') { + parsedDate.year = String(value.getFullYear()); + // d = new Date(1900, 1, 1) // 1 for Feb instead of Jan. + // => Thu Feb 01 1900 00:00:00 + parsedDate.month = String(value.getMonth() + 1); + parsedDate.dayOfMonth = String(value.getDate()); + parsedDate.time = parseTime(value.toTimeString()); + } else if(value.search(YYYYMMDD_MATCHER) != -1) { + /* 2009-04-19T16:11:05+02:00 || 2009-04-19T16:11:05Z */ + values = value.split(/[T\+-]/); + parsedDate.year = values[0]; + parsedDate.month = values[1]; + parsedDate.dayOfMonth = values[2]; + parsedDate.time = parseTime(values[3].split('.')[0]); + } else { + values = value.split(' '); + switch (values.length) { + case 6: + /* Wed Jan 13 10:43:41 CET 2010 */ + parsedDate.year = values[5]; + parsedDate.month = shortMonthToNumber(values[1]); + parsedDate.dayOfMonth = values[2]; + parsedDate.time = parseTime(values[3]); + break; + case 2: + /* 2009-12-18 10:54:50.546 */ + subValues = values[0].split('-'); + parsedDate.year = subValues[0]; + parsedDate.month = subValues[1]; + parsedDate.dayOfMonth = subValues[2]; + parsedDate.time = parseTime(values[1]); + break; + case 7: + /* Tue Mar 01 2011 12:01:42 GMT-0800 (PST) */ + case 9: + /* added by Larry, for Fri Apr 08 2011 00:00:00 GMT+0800 (China Standard Time) */ + case 10: + /* added by Larry, for Fri Apr 08 2011 00:00:00 GMT+0200 (W. Europe Daylight Time) */ + parsedDate.year = values[3]; + parsedDate.month = shortMonthToNumber(values[1]); + parsedDate.dayOfMonth = values[2]; + parsedDate.time = parseTime(values[4]); + break; + case 1: + /* added by Jonny, for 2012-02-07CET00:00:00 (Doctrine Entity -> Json Serializer) */ + subValues = values[0].split(''); + parsedDate.year = subValues[0] + subValues[1] + subValues[2] + subValues[3]; + parsedDate.month = subValues[5] + subValues[6]; + parsedDate.dayOfMonth = subValues[8] + subValues[9]; + parsedDate.time = parseTime(subValues[13] + subValues[14] + subValues[15] + subValues[16] + subValues[17] + subValues[18] + subValues[19] + subValues[20]); + break; + default: + return null; + } + } + parsedDate.date = new Date(parsedDate.year, parsedDate.month - 1, parsedDate.dayOfMonth); + parsedDate.dayOfWeek = String(parsedDate.date.getDay()); + + return parsedDate; + }, + + date : function(value, format) { + try { + var parsedDate = this.parseDate(value); + + if(parsedDate === null) { + return value; + } + + var date = parsedDate.date, + year = parsedDate.year, + month = parsedDate.month, + dayOfMonth = parsedDate.dayOfMonth, + dayOfWeek = parsedDate.dayOfWeek, + time = parsedDate.time; + + var pattern = '', + retValue = '', + unparsedRest = '', + inQuote = false; + + /* Issue 1 - variable scope issue in format.date (Thanks jakemonO) */ + for(var i = 0; i < format.length; i++) { + var currentPattern = format.charAt(i); + // Look-Ahead Right (LALR) + var nextRight = format.charAt(i + 1); + + if (inQuote) { + if (currentPattern == "'") { + retValue += (pattern === '') ? "'" : pattern; + pattern = ''; + inQuote = false; + } else { + pattern += currentPattern; + } + continue; + } + pattern += currentPattern; + unparsedRest = ''; + switch (pattern) { + case 'ddd': + retValue += numberToLongDay(dayOfWeek); + pattern = ''; + break; + case 'dd': + if(nextRight === 'd') { + break; + } + retValue += padding(dayOfMonth, 2); + pattern = ''; + break; + case 'd': + if(nextRight === 'd') { + break; + } + retValue += parseInt(dayOfMonth, 10); + pattern = ''; + break; + case 'D': + if(dayOfMonth == 1 || dayOfMonth == 21 || dayOfMonth == 31) { + dayOfMonth = parseInt(dayOfMonth, 10) + 'st'; + } else if(dayOfMonth == 2 || dayOfMonth == 22) { + dayOfMonth = parseInt(dayOfMonth, 10) + 'nd'; + } else if(dayOfMonth == 3 || dayOfMonth == 23) { + dayOfMonth = parseInt(dayOfMonth, 10) + 'rd'; + } else { + dayOfMonth = parseInt(dayOfMonth, 10) + 'th'; + } + retValue += dayOfMonth; + pattern = ''; + break; + case 'MMMM': + retValue += numberToLongMonth(month); + pattern = ''; + break; + case 'MMM': + if(nextRight === 'M') { + break; + } + retValue += numberToShortMonth(month); + pattern = ''; + break; + case 'MM': + if(nextRight === 'M') { + break; + } + retValue += padding(month, 2); + pattern = ''; + break; + case 'M': + if(nextRight === 'M') { + break; + } + retValue += parseInt(month, 10); + pattern = ''; + break; + case 'y': + case 'yyy': + if(nextRight === 'y') { + break; + } + retValue += pattern; + pattern = ''; + break; + case 'yy': + if(nextRight === 'y') { + break; + } + retValue += String(year).slice(-2); + pattern = ''; + break; + case 'yyyy': + retValue += year; + pattern = ''; + break; + case 'HH': + retValue += padding(time.hour, 2); + pattern = ''; + break; + case 'H': + if(nextRight === 'H') { + break; + } + retValue += parseInt(time.hour, 10); + pattern = ''; + break; + case 'hh': + /* time.hour is '00' as string == is used instead of === */ + hour = (parseInt(time.hour, 10) === 0 ? 12 : time.hour < 13 ? time.hour + : time.hour - 12); + retValue += padding(hour, 2); + pattern = ''; + break; + case 'h': + if(nextRight === 'h') { + break; + } + hour = (parseInt(time.hour, 10) === 0 ? 12 : time.hour < 13 ? time.hour + : time.hour - 12); + retValue += parseInt(hour, 10); + // Fixing issue https://github.com/phstc/jquery-dateFormat/issues/21 + // retValue = parseInt(retValue, 10); + pattern = ''; + break; + case 'mm': + retValue += padding(time.minute, 2); + pattern = ''; + break; + case 'm': + if(nextRight === 'm') { + break; + } + retValue += time.minute; + pattern = ''; + break; + case 'ss': + /* ensure only seconds are added to the return string */ + retValue += padding(time.second.substring(0, 2), 2); + pattern = ''; + break; + case 's': + if(nextRight === 's') { + break; + } + retValue += time.second; + pattern = ''; + break; + case 'S': + case 'SS': + if(nextRight === 'S') { + break; + } + retValue += pattern; + pattern = ''; + break; + case 'SSS': + retValue += time.millis.substring(0, 3); + pattern = ''; + break; + case 'a': + retValue += time.hour >= 12 ? 'PM' : 'AM'; + pattern = ''; + break; + case 'p': + retValue += time.hour >= 12 ? 'p.m.' : 'a.m.'; + pattern = ''; + break; + case "'": + pattern = ''; + inQuote = true; + break; + default: + retValue += currentPattern; + pattern = ''; + break; + } + } + retValue += unparsedRest; + return retValue; + } catch (e) { + if(console && console.log) { + console.log(e); + } + return value; + } + }, + /* + * JavaScript Pretty Date + * Copyright (c) 2011 John Resig (ejohn.org) + * Licensed under the MIT and GPL licenses. + * + * Takes an ISO time and returns a string representing how long ago the date + * represents + * + * ('2008-01-28T20:24:17Z') // => '2 hours ago' + * ('2008-01-27T22:24:17Z') // => 'Yesterday' + * ('2008-01-26T22:24:17Z') // => '2 days ago' + * ('2008-01-14T22:24:17Z') // => '2 weeks ago' + * ('2007-12-15T22:24:17Z') // => 'more than 5 weeks ago' + * + */ + prettyDate : function(time) { + var date; + var diff; + var day_diff; + + if(typeof time === 'string' || typeof time === 'number') { + date = new Date(time); + } + + if(typeof time === 'object') { + date = new Date(time.toString()); + } + + diff = (((new Date()).getTime() - date.getTime()) / 1000); + + day_diff = Math.floor(diff / 86400); + + if(isNaN(day_diff) || day_diff < 0) { + return; + } + + if(diff < 60) { + return 'just now'; + } else if(diff < 120) { + return '1 minute ago'; + } else if(diff < 3600) { + return Math.floor(diff / 60) + ' minutes ago'; + } else if(diff < 7200) { + return '1 hour ago'; + } else if(diff < 86400) { + return Math.floor(diff / 3600) + ' hours ago'; + } else if(day_diff === 1) { + return 'Yesterday'; + } else if(day_diff < 7) { + return day_diff + ' days ago'; + } else if(day_diff < 31) { + return Math.ceil(day_diff / 7) + ' weeks ago'; + } else if(day_diff >= 31) { + return 'more than 5 weeks ago'; + } + }, + toBrowserTimeZone : function(value, format) { + return this.date(new Date(value), format || 'MM/dd/yyyy HH:mm:ss'); + } + }; + }()); +}(DateFormat)); +;// require dateFormat.js +// please check `dist/jquery.dateFormat.js` for a complete version +(function($) { + $.format = DateFormat.format; +}(jQuery)); diff --git a/app/assets/javascripts/time_entries.js b/app/assets/javascripts/time_entries.js index 8fab897..d6d51b6 100644 --- a/app/assets/javascripts/time_entries.js +++ b/app/assets/javascripts/time_entries.js @@ -23,9 +23,13 @@ $(document).ready(function(){ forward = "/task_lists/" + bike_id + "/edit"; } + //FIXME: Ideally, we'd submit the dates as ISO, but I can't figure out + // how to get Netzke to render UTC dates correctly (it calls to_json + // somewhere and drops off the timezone). For the time being, save dates + // in locale like Netzke. json_data = { time_entries: [{ - start_date: start_date.toISOString(), - end_date: end_date.toISOString(), + start_date: $.format.date(start_date, "dd-MM-yyyy hh:mm a"), + end_date: $.format.date(end_date, "dd-MM-yyyy hh:mm a"), log_action_id: parseInt($('input[name=action_id]:checked').val()), bike_id: bike_id, description: $("#description_id").val(), @@ -44,6 +48,7 @@ $(document).ready(function(){ displayFormErrors(data.responseJSON); } }); + }); $(".work_entry-delete-btn").click(function(){