Add more users on overview screen
This commit is contained in:
parent
d8cf9e443e
commit
82be0ceca4
6 changed files with 12 additions and 18 deletions
|
@ -70,10 +70,6 @@ footer ul li {
|
||||||
}
|
}
|
||||||
|
|
||||||
.overview{
|
.overview{
|
||||||
//margin-left: 2px;
|
|
||||||
width: 50%;
|
|
||||||
float: left;
|
|
||||||
border-radius: 0px;
|
|
||||||
margin-bottom: 0px;
|
margin-bottom: 0px;
|
||||||
border: 0px;
|
border: 0px;
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,8 @@ class OrdersController < ApplicationController
|
||||||
redirect_to root_path, flash: { error: "Koelkast can't order things." } if @user.koelkast?
|
redirect_to root_path, flash: { error: "Koelkast can't order things." } if @user.koelkast?
|
||||||
|
|
||||||
@order = @user.orders.build
|
@order = @user.orders.build
|
||||||
|
# products = @user.products.select("products.*", "sum(order_items.count) as count").group(:product_id).order("count desc")
|
||||||
|
# @order.g_order_items(products)
|
||||||
@order.g_order_items(Product.all)
|
@order.g_order_items(Product.all)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -39,8 +41,7 @@ class OrdersController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def overview
|
def overview
|
||||||
@users_by_name = User.members.order(:name)
|
@users = User.members.order(:name)
|
||||||
@users_by_order = User.members.order(:orders_count).reverse_order
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def quickpay
|
def quickpay
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
class Product < ActiveRecord::Base
|
class Product < ActiveRecord::Base
|
||||||
has_many :order_items
|
has_many :order_items
|
||||||
has_attached_file :avatar, styles: { medium: "100x100>" }, default_style: :medium, default_url: "http://lorempixel.com/70/70/"
|
has_attached_file :avatar, styles: { dagschotel: "80x80>", medium: "100x100>" }, default_style: :medium, default_url: "http://lorempixel.com/70/70/"
|
||||||
|
|
||||||
enum category: %w(food beverages other)
|
enum category: %w(food beverages other)
|
||||||
|
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
<div class="col-md-6">
|
|
||||||
<h3 class="center" >Sort by name</h3>
|
|
||||||
<% users.each do |user| %>
|
|
||||||
<%= render 'users/new_order', user: user %>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
|
@ -1,4 +1,7 @@
|
||||||
<%= render partial: 'flash' %>
|
<%= render partial: 'flash' %>
|
||||||
|
|
||||||
<%= render 'overview', users: @users_by_name %>
|
<div class="row">
|
||||||
<%= render 'overview', users: @users_by_order %>
|
<% @users.each do |user| %>
|
||||||
|
<%= render 'users/new_order', user: user %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
<div class="thumbnail overview">
|
<div class="col-md-2 thumbnail overview">
|
||||||
<% unless user.dagschotel.nil? %>
|
<% unless user.dagschotel.nil? %>
|
||||||
<%= link_to user_quickpay_path(user) do %>
|
<%= link_to user_quickpay_path(user) do %>
|
||||||
<%= image_tag user.dagschotel.avatar, class: "img-circle dagschotel" %>
|
<%= image_tag user.dagschotel.avatar(:dagschotel), class: "img-circle dagschotel" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= link_to image_tag(user.avatar(:large) , class: "img-circle avatar"), new_user_order_path(user) %>
|
<%= link_to image_tag(user.avatar(:large) , class: "img-circle avatar"), new_user_order_path(user) %>
|
||||||
<%= link_to user.name , new_user_order_path(user), class: "btn btn-info", style: get_color_style(user) %>
|
<%= link_to user.nickname , new_user_order_path(user), class: "btn btn-info", style: get_color_style(user) %>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue