From f247e6c5ff5e970a2c1bb0788ca9f914e871eb41 Mon Sep 17 00:00:00 2001 From: ohsab Date: Tue, 9 Dec 2014 20:26:18 +0100 Subject: [PATCH 1/3] dagschotel button added --- app/assets/stylesheets/application.css.scss | 29 ++++++++++----------- app/views/orders/overview.html.erb | 28 ++------------------ 2 files changed, 16 insertions(+), 41 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 2f32111..e94bbe8 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -92,21 +92,6 @@ footer ul li { margin-left: 15px; } -.usercontainer{ - position: absolute; - width: 49%; - border-radius: 0px; - margin: -2px; - padding: 18px; - border-color: #000; - border: 0px; - vertical-align: bottom; - - - font-weight: bold; - font-size: 24px; - -} .overview{ //margin-left: 2px; @@ -115,9 +100,23 @@ footer ul li { border-radius: 0px; .btn{ + margin-top: -10px; width: 100%; border-color: #444; } + + .dagschotel{ + float:left; + } + + .user_img{ + margin-left: 33%; + + } + + + + } .center{ diff --git a/app/views/orders/overview.html.erb b/app/views/orders/overview.html.erb index 7d21183..364068c 100644 --- a/app/views/orders/overview.html.erb +++ b/app/views/orders/overview.html.erb @@ -1,26 +1,2 @@ -
-

sort by name

- - <% @users_by_name.each do |user| %> -
- <%= link_to image_tag("http://placehold.it/100x100", class: "img-circle"), - new_user_order_path(user) %> - <%= link_to user.name , new_user_order_path(user), class: "btn btn-info overview", - style: get_color_style(user) %> -
- <% end %> - -
- - -
-

sort by name

- - <% @users_by_order.each do |user| %> -
- <%= link_to image_tag("http://babeholder.pixoil.com/img/100/100", class: "img-circle"), - new_user_order_path(user) %> - <%= link_to user.name , new_user_order_path(user), class: "btn btn-info overview", - style: get_color_style(user) %> -
- <% end %> +<%= render 'orders/user_list', users: @users_by_name %> +<%= render 'orders/user_list', users: @users_by_order %> From 9fe6bf75308b823dc48ba1a0e9b7c57901d98054 Mon Sep 17 00:00:00 2001 From: Benjamin Cousaert Date: Tue, 9 Dec 2014 20:28:50 +0100 Subject: [PATCH 2/3] Add dagschotel to users --- app/models/user.rb | 5 ++++- db/migrate/20141209192545_add_dagschotel_to_users.rb | 5 +++++ db/schema.rb | 3 ++- test/fixtures/users.yml | 2 ++ test/models/user_test.rb | 2 ++ 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20141209192545_add_dagschotel_to_users.rb diff --git a/app/models/user.rb b/app/models/user.rb index e7a2dad..e6311f4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -16,6 +16,8 @@ # last_sign_in_at :datetime # current_sign_in_ip :string(255) # last_sign_in_ip :string(255) +# dagschotel :reference +# dagschotel_id :integer # class User < ActiveRecord::Base @@ -23,11 +25,12 @@ class User < ActiveRecord::Base :rememberable, :trackable has_many :orders, -> { includes :products } + belongs_to :dagschotel, class_name: 'Product' validates :nickname, presence: true, uniqueness: true validates :name, presence: true validates :last_name, presence: true - validates :password, length: { in: 8..128 }, confirmation: true + validates :password, length: { in: 8..128 }, confirmation: true, on: :create def full_name "#{name} #{last_name}" diff --git a/db/migrate/20141209192545_add_dagschotel_to_users.rb b/db/migrate/20141209192545_add_dagschotel_to_users.rb new file mode 100644 index 0000000..82509a5 --- /dev/null +++ b/db/migrate/20141209192545_add_dagschotel_to_users.rb @@ -0,0 +1,5 @@ +class AddDagschotelToUsers < ActiveRecord::Migration + def change + add_reference :users, :dagschotel + end +end diff --git a/db/schema.rb b/db/schema.rb index e52179a..002ed1e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20141209172818) do +ActiveRecord::Schema.define(version: 20141209192545) do create_table "order_products", force: true do |t| t.integer "order_id" @@ -54,6 +54,7 @@ ActiveRecord::Schema.define(version: 20141209172818) do t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" + t.integer "dagschotel_id" end end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index a086a02..4d5b784 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -16,6 +16,8 @@ # last_sign_in_at :datetime # current_sign_in_ip :string(255) # last_sign_in_ip :string(255) +# dagschotel :reference +# dagschotel_id :integer # # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 4682454..1e0afd3 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -16,6 +16,8 @@ # last_sign_in_at :datetime # current_sign_in_ip :string(255) # last_sign_in_ip :string(255) +# dagschotel :reference +# dagschotel_id :integer # require 'test_helper' From c2fe9de0ff4dbb4932591af84a7a8f1ed724356e Mon Sep 17 00:00:00 2001 From: ohsab Date: Tue, 9 Dec 2014 20:33:11 +0100 Subject: [PATCH 3/3] filles added --- app/helpers/application_helper.rb | 2 +- app/views/orders/_user_list.html.erb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 app/views/orders/_user_list.html.erb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e3e4677..b80b5f2 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2,7 +2,7 @@ require 'digest/md5' module ApplicationHelper def get_color(user) - @color = Digest::MD5.hexdigest(user.name)[0..5] + @color = Digest::MD5.hexdigest(user.nickname)[0..5] end def get_color_style(user) diff --git a/app/views/orders/_user_list.html.erb b/app/views/orders/_user_list.html.erb new file mode 100644 index 0000000..e9a5394 --- /dev/null +++ b/app/views/orders/_user_list.html.erb @@ -0,0 +1,17 @@ +
+

sort by name

+ + <% users.each do |user| %> +
+ <%= link_to image_tag("http://placekitten.com/g/50/50", class: "img-circle dagschotel"), + user %> + <%= link_to image_tag("http://babeholder.pixoil.com/img/100/100", class: "img-circle user_img"), + new_user_order_path(user) %> + + + <%= link_to user.nickname , new_user_order_path(user), class: "btn btn-info", + style: get_color_style(user) %> +
+ <% end %> + +