bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-02-28 08:43:23 -05:00
Code Issues Projects Releases Wiki Activity

Bike photo upload

Browse Source
This commit is contained in:
Ilya Konanykhin 2017-01-18 18:38:29 +06:00
parent a68e7eca56
commit 5f7eb43f63
10 changed files with 1406 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/application.js
View File

@ -16,4 +16,5 @@
//= require utils //= require utils
//= require moment //= require moment
//= require bootstrap-datetimepicker //= require bootstrap-datetimepicker
//= require jquery.form

28
app/assets/javascripts/bikes.js
View File

@ -1,31 +1,11 @@
$('.btn').button(); $('.btn').button();
$("#add_bike_submit").click(function(){ $("#add_bike_form").ajaxForm({
json_data = { bikes: [{
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: 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()),
}]};
$.ajax({
url: $("#add_bike_submit").data("url"),
type: "POST",
data: JSON.stringify(json_data),
contentType: 'application/json',
dataType: "json", dataType: "json",
success: function(data, status, xhr){ success: function(data){
window.location = data.bikes[0].id + "?add_bike=1"; window.location = data.bikes[0].id + "?add_bike=1";
}, },
error: function(data, status ){ error: function(data){
displayFormErrors(data.responseJSON); displayFormErrors(data.responseJSON);
} }
}); })
});

2
app/assets/javascripts/utils.js
View File

@ -2,7 +2,7 @@ function displayFormErrors(data){
if(data.errors != undefined ){ if(data.errors != undefined ){
$.each(data.errors, function(field, errorMsg) { $.each(data.errors, function(field, errorMsg) {
$("#"+field).closest(".form-group").addClass("has-error"); $("#"+field).closest(".form-group").addClass("has-error");
$("#"+field).siblings(".help-block").html(errorMsg); $("#"+field).siblings(".help-block").html(errorMsg.join(", "));
}); });
} }
} }

1
app/controllers/bikes_controller.rb
View File

@ -1,6 +1,7 @@
class BikesController < AuthenticatedController class BikesController < AuthenticatedController
def new def new
@bike = Bike.new bike_purpose_id: 1
@brands = BikeBrand.all.map{ |b| [b.brand, b.id] } @brands = BikeBrand.all.map{ |b| [b.brand, b.id] }
@brands.unshift( ["Select a brand", -1] ) @brands.unshift( ["Select a brand", -1] )
@wheel_sizes = BikeWheelSize.all.map{ |w| [w.display_string, w.id] } @wheel_sizes = BikeWheelSize.all.map{ |w| [w.display_string, w.id] }

7
app/models/bike.rb
View File

@ -1,7 +1,7 @@
class Bike < ActiveRecord::Base class Bike < ActiveRecord::Base
acts_as_loggable acts_as_loggable
attr_accessible :shop_id, :serial_number, :bike_brand_id, :model, :color, :bike_style_id, :seat_tube_height, attr_accessible :shop_id, :serial_number, :bike_brand_id, :model, :color, :bike_style_id, :seat_tube_height,
:top_tube_length, :bike_wheel_size_id, :value, :bike_condition_id, :bike_purpose_id :top_tube_length, :bike_wheel_size_id, :value, :bike_condition_id, :bike_purpose_id, :photo
has_many :transactions has_many :transactions
@ -13,6 +13,8 @@ class Bike < ActiveRecord::Base
belongs_to :bike_purpose belongs_to :bike_purpose
belongs_to :bike_wheel_size belongs_to :bike_wheel_size
has_attached_file :photo, :styles => {:thumb => '100x100>'}
validates :shop_id, :presence => true, :uniqueness => true, :numericality => { :only_integer => true } validates :shop_id, :presence => true, :uniqueness => true, :numericality => { :only_integer => true }
validates :serial_number, :length => { :minimum => 3 } validates :serial_number, :length => { :minimum => 3 }
validates :model, :length => { :maximum => 50 } validates :model, :length => { :maximum => 50 }
@ -24,6 +26,9 @@ class Bike < ActiveRecord::Base
validates :bike_condition_id, :presence => true, :numericality => { greater_than: 0, message: "is not a valid condition" } 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" } validates :bike_purpose_id, :presence => true, :numericality => { greater_than: 0, message: "is not a valid purpose" }
validates_attachment :photo, :content_type => {:content_type => %w{ image/jpeg image/gif image/png }},
:file_name => {:matches => [/png\Z/, /jpe?g\Z/, /gif\Z/]}
self.per_page = 15 self.per_page = 15
after_create :create_task_list after_create :create_task_list

123
app/views/bikes/new.html.haml
View File

@ -4,70 +4,77 @@
.row .row
.col-xs-12.col-sm-6.col-lg-4 .col-xs-12.col-sm-6.col-lg-4
%fieldset = form_for @bike, as: 'bikes', index: '', url: api_create_bike_path, method: :post, enctype: 'multipart/form-data', html: {id: 'add_bike_form'} do |f|
.form-group = f.hidden_field 'bike_purpose_id'
= number_field_tag nil, nil, id: 'shop_id', placeholder: 'Shop ID', min: 0, class: 'form-control' %fieldset
.help-block .form-group
= f.number_field 'shop_id', placeholder: 'Shop ID', min: 0, class: 'form-control', id: 'shop_id'
.help-block
.form-group .form-group
= select_tag :bike_brand_id, options_for_select(@brands), class: 'form-control' = f.select 'bike_brand_id', options_for_select(@brands), {}, class: 'form-control', id: 'bike_brand_id'
.help-block .help-block
.form-group .form-group
= text_field_tag nil, nil, id: 'model', placeholder: 'Model', class: 'form-control' = f.text_field 'model', placeholder: 'Model', class: 'form-control', id: 'model'
.help-block .help-block
.form-group .form-group
= text_field_tag nil, nil, id: 'serial_number', placeholder: 'Serial Number', class: 'form-control' = f.text_field 'serial_number', placeholder: 'Serial Number', class: 'form-control', id: 'serial_number'
.help-block .help-block
.form-group .form-group
.btn-group(data-toggle="buttons") .btn-group(data-toggle="buttons")
%label.btn.btn-default %label.btn.btn-default
= radio_button_tag 'bike_style', 3 = f.radio_button 'bike_style_id', 3
RD RD
%label.btn.btn-default %label.btn.btn-default
= radio_button_tag 'bike_style', 1 = f.radio_button 'bike_style_id', 1
MTN MTN
%label.btn.btn-default %label.btn.btn-default
= radio_button_tag 'bike_style', 2 = f.radio_button 'bike_style_id', 2
HYB HYB
%label.btn.btn-default %label.btn.btn-default
= radio_button_tag 'bike_style', 4 = f.radio_button 'bike_style_id', 4
OTHER OTHER
= hidden_field_tag nil, nil, id: 'bike_style_id' = hidden_field_tag nil, nil, id: 'bike_style_id'
.help-block .help-block
.form-group .form-group
= select_tag :bike_wheel_size_id, options_for_select(@wheel_sizes), id: :bike_wheel_size_id, class: 'form-control' = f.select 'bike_wheel_size_id', options_for_select(@wheel_sizes), {}, class: 'form-control', id: 'bike_wheel_size_id'
.help-block .help-block
.form-group .form-group
.btn-group(data-toggle="buttons") .btn-group(data-toggle="buttons")
%label.btn.btn-default %label.btn.btn-default
= radio_button_tag 'bike_condition', 2 = f.radio_button 'bike_condition_id', 2
Poor Poor
%label.btn.btn-default %label.btn.btn-default
= radio_button_tag 'bike_condition', 3 = f.radio_button 'bike_condition_id', 3
Fair Fair
%label.btn.btn-default %label.btn.btn-default
= radio_button_tag 'bike_condition', 4 = f.radio_button 'bike_condition_id', 4
Good Good
%label.btn.btn-default %label.btn.btn-default
= radio_button_tag 'bike_condition', 5 = f.radio_button 'bike_condition_id', 5
Excellent Excellent
= hidden_field_tag nil, nil, id: 'bike_condition_id' = hidden_field_tag nil, nil, id: 'bike_condition_id'
.help-block .help-block
.form-group .form-group
.input-group .input-group
= number_field_tag nil, nil, id: 'seat_tube_height', placeholder: 'Seat Tube', min: 0, max: 100, class: 'form-control' = f.number_field 'seat_tube_height', placeholder: 'Seat Tube', min: 0, max: 100, class: 'form-control', id: 'seat_tube_height'
.input-group-addon cm .input-group-addon cm
.help-block .help-block
-# Commenting this out until description is added to Bike .form-group
/.form-group %label Bike photo (optional)
%input{id: "bike_description", placeholder: "Short description", type: "text", class: "input-lg" } = f.file_field 'photo', id: 'photo'
.help-block
.form-group -# Commenting this out until description is added to Bike
= button_tag 'Add Bike', id: 'add_bike_submit', class: 'btn btn-primary', data: {url: api_create_bike_path} /.form-group
%input{id: "bike_description", placeholder: "Short description", type: "text", class: "input-lg" }
.form-group
= button_tag 'Add Bike', class: 'btn btn-primary'

55
app/views/bikes/show.html.haml
View File

@ -7,34 +7,49 @@
%h1 #{@bike.shop_id}: #{@bike.bike_brand} %h1 #{@bike.shop_id}: #{@bike.bike_brand}
%h4= @bike.model %h4= @bike.model
%dl.dl-horizontal .form-horizontal
%dt Type - if @bike.photo?
%dd= @bike.bike_style .form-group
%label.col-sm-2.control-label Photo
.col-sm-10
= link_to @bike.photo.url, target: '_blank' do
%img{src: @bike.photo.url(:thumb), class: 'img-thumbnail'}
%dt Wheel Size .form-group
%dd= @bike.bike_wheel_size.display_string %label.col-sm-2.control-label Type
.col-sm-10.form-control-static= @bike.bike_style
%dt Condition .form-group
%dd= @bike.bike_condition %label.col-sm-2.control-label Wheel Size
.col-sm-10.form-control-static= @bike.bike_wheel_size.display_string
%dt Seat Tube (cm) .form-group
%dd= @bike.seat_tube_height %label.col-sm-2.control-label Condition
.col-sm-10.form-control-static= @bike.bike_condition
%dt Purpose .form-group
%dd= @bike.bike_purpose %label.col-sm-2.control-label Seat Tube (cm)
.col-sm-10.form-control-static= @bike.seat_tube_height
.form-group
%label.col-sm-2.control-label Purpose
.col-sm-10.form-control-static= @bike.bike_purpose
- unless @bike.value.nil? - unless @bike.value.nil?
%dt Value .form-group
%dd= @bike.value %label.col-sm-2.control-label Value
.col-sm-10.form-control-static= @bike.value
- unless @bike.color.nil? - unless @bike.color.nil?
%dt Color .form-group
%dd %label.col-sm-2.control-label Color
.bike-color(style="background-color: ##{@bike.color}")= @bike.color .col-sm-10.form-control-static
.bike-color(style="background-color: ##{@bike.color}")= @bike.color
- if @task_list - if @task_list
- tasks = @task_list.tasks.to_a - tasks = @task_list.tasks.to_a
%dt Task list .form-group
%dd %label.col-sm-2.control-label Task list
= link_to edit_task_list_path(@task_list.id) do .col-sm-10.form-control-static
#{tasks.select(&:done).count}/#{tasks.count} = link_to edit_task_list_path(@task_list.id) do
#{tasks.select(&:done).count}/#{tasks.count}

11
db/migrate/20170118112258_add_attachment_photo_to_bikes.rb Normal file
View File

@ -0,0 +1,11 @@
class AddAttachmentPhotoToBikes < ActiveRecord::Migration
def self.up
change_table :bikes do |t|
t.attachment :photo
end
end
def self.down
remove_attachment :bikes, :photo
end
end

6
db/schema.rb
View File

@ -11,7 +11,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20170118110330) do ActiveRecord::Schema.define(:version => 20170118112258) do
create_table "bike_actions", :force => true do |t| create_table "bike_actions", :force => true do |t|
t.string "action", :limit => 128, :null => false t.string "action", :limit => 128, :null => false
@ -73,6 +73,10 @@ ActiveRecord::Schema.define(:version => 20170118110330) do
t.string "model" t.string "model"
t.integer "shop_id" t.integer "shop_id"
t.integer "bike_wheel_size_id" t.integer "bike_wheel_size_id"
t.string "photo_file_name"
t.string "photo_content_type"
t.integer "photo_file_size"
t.datetime "photo_updated_at"
end end
create_table "credit_conversions", :force => true do |t| create_table "credit_conversions", :force => true do |t|

1277
vendor/assets/javascripts/jquery.form.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff