midgard/tap
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add more users on overview screen

Browse source
This commit is contained in:
benji 2015-02-20 09:21:18 +01:00
parent d8cf9e443e
commit 82be0ceca4
6 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/application.css.scss
View file

@ -70,10 +70,6 @@ footer ul li {
}
.overview{
//margin-left: 2px;
width: 50%;
float: left;
border-radius: 0px;
margin-bottom: 0px;
border: 0px;

5
app/controllers/orders_controller.rb
View file

@ -8,6 +8,8 @@ class OrdersController < ApplicationController
redirect_to root_path, flash: { error: "Koelkast can't order things." } if @user.koelkast?
@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)
end
@ -39,8 +41,7 @@ class OrdersController < ApplicationController
end
def overview
@users_by_name = User.members.order(:name)
@users_by_order = User.members.order(:orders_count).reverse_order
@users = User.members.order(:name)
end
def quickpay

2
app/models/product.rb
View file

@ -17,7 +17,7 @@
class Product < ActiveRecord::Base
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)

6
app/views/orders/_overview.html.erb
View file

@ -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>

7
app/views/orders/overview.html.erb
View file

@ -1,4 +1,7 @@
<%= render partial: 'flash' %>
<%= render 'overview', users: @users_by_name %>
<%= render 'overview', users: @users_by_order %>
<div class="row">
<% @users.each do |user| %>
<%= render 'users/new_order', user: user %>
<% end %>
</div>

6
app/views/users/_new_order.html.erb
View file

@ -1,10 +1,10 @@
<div class="thumbnail overview">
<div class="col-md-2 thumbnail overview">
<% unless user.dagschotel.nil? %>
<%= 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 %>
<%= 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>