Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Implemented stats for ordergroups on startpage. Annotated models.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-08-01 13:41:22 +02:00
parent 709425855e
commit d848831fea
65 changed files with 407 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/models/article.rb
View file

@ -1,28 +1,27 @@
# == Schema Information
# Schema version: 20090120184410
#
# Table name: articles
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# name :string(255) default(""), not null
# supplier_id :integer default(0), not null
# article_category_id :integer default(0), not null
# supplier_id :integer(4) default(0), not null
# article_category_id :integer(4) default(0), not null
# unit :string(255) default(""), not null
# note :string(255)
# availability :boolean default(TRUE), not null
# availability :boolean(1) default(TRUE), not null
# manufacturer :string(255)
# origin :string(255)
# shared_updated_on :datetime
# price :decimal(, )
# price :decimal(8, 2)
# tax :float
# deposit :decimal(, ) default(0.0)
# unit_quantity :integer default(1), not null
# deposit :decimal(8, 2) default(0.0)
# unit_quantity :integer(4) default(1), not null
# order_number :string(255)
# created_at :datetime
# updated_at :datetime
# quantity :integer default(0)
# deleted_at :datetime
# type :string(255)
# quantity :integer(4) default(0)
#
class Article < ActiveRecord::Base

3
app/models/article_category.rb
View file

@ -1,9 +1,8 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: article_categories
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# name :string(255) default(""), not null
# description :string(255)
#

7
app/models/article_price.rb
View file

@ -1,14 +1,13 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: article_prices
#
# id :integer not null, primary key
# article_id :integer
# id :integer(4) not null, primary key
# article_id :integer(4)
# price :decimal(8, 2) default(0.0), not null
# tax :decimal(8, 2) default(0.0), not null
# deposit :decimal(8, 2) default(0.0), not null
# unit_quantity :integer
# unit_quantity :integer(4)
# created_at :datetime
#

9
app/models/assignment.rb
View file

@ -1,12 +1,11 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: assignments
#
# id :integer not null, primary key
# user_id :integer default(0), not null
# task_id :integer default(0), not null
# accepted :boolean
# id :integer(4) not null, primary key
# user_id :integer(4) default(0), not null
# task_id :integer(4) default(0), not null
# accepted :boolean(1)
#
class Assignment < ActiveRecord::Base

5
app/models/delivery.rb
View file

@ -1,10 +1,9 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: deliveries
#
# id :integer not null, primary key
# supplier_id :integer
# id :integer(4) not null, primary key
# supplier_id :integer(4)
# delivered_on :date
# created_at :datetime
#

9
app/models/financial_transaction.rb
View file

@ -1,13 +1,12 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: financial_transactions
#
# id :integer not null, primary key
# ordergroup_id :integer default(0), not null
# id :integer(4) not null, primary key
# ordergroup_id :integer(4) default(0), not null
# amount :decimal(8, 2) default(0.0), not null
# note :text not null
# user_id :integer default(0), not null
# note :text default(""), not null
# user_id :integer(4) default(0), not null
# created_on :datetime not null
#

22
app/models/group.rb
View file

@ -1,29 +1,29 @@
# == Schema Information
# Schema version: 20090120184410
#
# Table name: groups
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# type :string(255) default(""), not null
# name :string(255) default(""), not null
# description :string(255)
# account_balance :decimal(, ) default(0.0), not null
# account_balance :decimal(8, 2) default(0.0), not null
# account_updated :datetime
# created_on :datetime not null
# role_admin :boolean not null
# role_suppliers :boolean not null
# role_article_meta :boolean not null
# role_finance :boolean not null
# role_orders :boolean not null
# weekly_task :boolean
# weekday :integer
# role_admin :boolean(1) not null
# role_suppliers :boolean(1) not null
# role_article_meta :boolean(1) not null
# role_finance :boolean(1) not null
# role_orders :boolean(1) not null
# weekly_task :boolean(1)
# weekday :integer(4)
# task_name :string(255)
# task_description :string(255)
# task_required_users :integer default(1)
# task_required_users :integer(4) default(1)
# deleted_at :datetime
# contact_person :string(255)
# contact_phone :string(255)
# contact_address :string(255)
# stats :text
#
# Groups organize the User.

11
app/models/group_order.rb
View file

@ -1,15 +1,14 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: group_orders
#
# id :integer not null, primary key
# ordergroup_id :integer default(0), not null
# order_id :integer default(0), not null
# id :integer(4) not null, primary key
# ordergroup_id :integer(4) default(0), not null
# order_id :integer(4) default(0), not null
# price :decimal(8, 2) default(0.0), not null
# lock_version :integer default(0), not null
# lock_version :integer(4) default(0), not null
# updated_on :datetime not null
# updated_by_user_id :integer
# updated_by_user_id :integer(4)
#
# A GroupOrder represents an Order placed by an Ordergroup.

13
app/models/group_order_article.rb
View file

@ -1,15 +1,14 @@
# == Schema Information
# Schema version: 20090120184410
#
# Table name: group_order_articles
#
# id :integer not null, primary key
# group_order_id :integer default(0), not null
# order_article_id :integer default(0), not null
# quantity :integer default(0), not null
# tolerance :integer default(0), not null
# id :integer(4) not null, primary key
# group_order_id :integer(4) default(0), not null
# order_article_id :integer(4) default(0), not null
# quantity :integer(4) default(0), not null
# tolerance :integer(4) default(0), not null
# updated_on :datetime not null
# result :integer
# result :decimal(8, 3)
#
# A GroupOrderArticle stores the sum of how many items of an OrderArticle are ordered as part of a GroupOrder.

9
app/models/group_order_article_quantity.rb
View file

@ -1,12 +1,11 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: group_order_article_quantities
#
# id :integer not null, primary key
# group_order_article_id :integer default(0), not null
# quantity :integer default(0)
# tolerance :integer default(0)
# id :integer(4) not null, primary key
# group_order_article_id :integer(4) default(0), not null
# quantity :integer(4) default(0)
# tolerance :integer(4) default(0)
# created_on :datetime not null
#

7
app/models/invite.rb
View file

@ -1,13 +1,12 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: invites
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# token :string(255) default(""), not null
# expires_at :datetime not null
# group_id :integer default(0), not null
# user_id :integer default(0), not null
# group_id :integer(4) default(0), not null
# user_id :integer(4) default(0), not null
# email :string(255) default(""), not null
#

13
app/models/invoice.rb
View file

@ -1,21 +1,20 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: invoices
#
# id :integer not null, primary key
# supplier_id :integer
# delivery_id :integer
# id :integer(4) not null, primary key
# supplier_id :integer(4)
# delivery_id :integer(4)
# order_id :integer(4)
# number :string(255)
# date :date
# paid_on :date
# note :text
# amount :decimal(8, 2) default(0.0), not null
# created_at :datetime
# updated_at :datetime
# order_id :integer
# deposit :decimal(8, 2) default(0.0), not null
# deposit_credit :decimal(8, 2) default(0.0), not null
# created_at :datetime
# updated_at :datetime
#
class Invoice < ActiveRecord::Base

7
app/models/membership.rb
View file

@ -1,11 +1,10 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: memberships
#
# id :integer not null, primary key
# group_id :integer default(0), not null
# user_id :integer default(0), not null
# id :integer(4) not null, primary key
# group_id :integer(4) default(0), not null
# user_id :integer(4) default(0), not null
#
class Membership < ActiveRecord::Base

9
app/models/message.rb
View file

@ -1,15 +1,14 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: messages
#
# id :integer not null, primary key
# sender_id :integer
# id :integer(4) not null, primary key
# sender_id :integer(4)
# recipients_ids :text
# subject :string(255) not null
# body :text
# email_state :integer default(0), not null
# private :boolean
# email_state :integer(4) default(0), not null
# private :boolean(1)
# created_at :datetime
#

13
app/models/order.rb
View file

@ -1,16 +1,15 @@
# == Schema Information
# Schema version: 20090317175355
#
# Table name: orders
#
# id :integer not null, primary key
# supplier_id :integer
# id :integer(4) not null, primary key
# supplier_id :integer(4)
# note :text
# starts :datetime
# ends :datetime
# state :string(255) default("open")
# lock_version :integer default(0), not null
# updated_by_user_id :integer
# lock_version :integer(4) default(0), not null
# updated_by_user_id :integer(4)
# foodcoop_result :decimal(8, 2)
#
@ -185,6 +184,10 @@ class Order < ActiveRecord::Base
order_articles.each do |oa|
oa.group_order_articles.each { |goa| goa.group_order_article_quantities.clear }
end
# Stats
# TODO: Move into background, if possible
ordergroups.each { |o| o.update_stats! }
end
end
end

17
app/models/order_article.rb
View file

@ -1,16 +1,15 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: order_articles
#
# id :integer not null, primary key
# order_id :integer default(0), not null
# article_id :integer default(0), not null
# quantity :integer default(0), not null
# tolerance :integer default(0), not null
# units_to_order :integer default(0), not null
# lock_version :integer default(0), not null
# article_price_id :integer
# id :integer(4) not null, primary key
# order_id :integer(4) default(0), not null
# article_id :integer(4) default(0), not null
# quantity :integer(4) default(0), not null
# tolerance :integer(4) default(0), not null
# units_to_order :integer(4) default(0), not null
# lock_version :integer(4) default(0), not null
# article_price_id :integer(4)
#
# An OrderArticle represents a single Article that is part of an Order.

7
app/models/order_comment.rb
View file

@ -1,11 +1,10 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: order_comments
#
# id :integer not null, primary key
# order_id :integer
# user_id :integer
# id :integer(4) not null, primary key
# order_id :integer(4)
# user_id :integer(4)
# text :text
# created_at :datetime
#

42
app/models/ordergroup.rb
View file

@ -1,29 +1,29 @@
# == Schema Information
# Schema version: 20090120184410
#
# Table name: groups
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# type :string(255) default(""), not null
# name :string(255) default(""), not null
# description :string(255)
# account_balance :decimal(, ) default(0.0), not null
# account_balance :decimal(8, 2) default(0.0), not null
# account_updated :datetime
# created_on :datetime not null
# role_admin :boolean not null
# role_suppliers :boolean not null
# role_article_meta :boolean not null
# role_finance :boolean not null
# role_orders :boolean not null
# weekly_task :boolean
# weekday :integer
# role_admin :boolean(1) not null
# role_suppliers :boolean(1) not null
# role_article_meta :boolean(1) not null
# role_finance :boolean(1) not null
# role_orders :boolean(1) not null
# weekly_task :boolean(1)
# weekday :integer(4)
# task_name :string(255)
# task_description :string(255)
# task_required_users :integer default(1)
# task_required_users :integer(4) default(1)
# deleted_at :datetime
# contact_person :string(255)
# contact_phone :string(255)
# contact_address :string(255)
# stats :text
#
# Ordergroups can order, they are "children" of the class Group
@ -34,6 +34,7 @@
class Ordergroup < Group
acts_as_paranoid # Avoid deleting the ordergroup for consistency of order-results
extend ActiveSupport::Memoizable # Ability to cache method results. Use memoize :expensive_method
serialize :stats
has_many :financial_transactions, :order => "created_on DESC"
has_many :group_orders
@ -41,6 +42,8 @@ class Ordergroup < Group
validates_numericality_of :account_balance, :message => 'ist keine gültige Zahl'
after_create :update_stats!
def contact
"#{contact_phone} (#{contact_person})"
end
@ -76,6 +79,23 @@ class Ordergroup < Group
end
end
def update_stats!
time = 6.month.ago
jobs = users.collect { |u| u.tasks.done.all(:conditions => ["updated_on > ?", time]).size }.sum
orders_sum = group_orders.collect { |go| go.price if go.order.ends > time }.sum
update_attribute(:stats, {:jobs_size => jobs, :orders_sum => orders_sum})
end
def avg_jobs_per_euro
stats[:orders_sum] != 0 ? stats[:jobs_size].to_f / stats[:orders_sum].to_f : 0
end
# Global average
def self.avg_jobs_per_euro
stats = Ordergroup.all.collect(&:stats)
stats.collect {|s| s[:jobs_size].to_f }.sum / stats.collect {|s| s[:orders_sum].to_f }.sum
end
private
# If this order group's account balance is made negative by the given/last transaction,

17
app/models/stock_article.rb
View file

@ -1,28 +1,27 @@
# == Schema Information
# Schema version: 20090120184410
#
# Table name: articles
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# name :string(255) default(""), not null
# supplier_id :integer default(0), not null
# article_category_id :integer default(0), not null
# supplier_id :integer(4) default(0), not null
# article_category_id :integer(4) default(0), not null
# unit :string(255) default(""), not null
# note :string(255)
# availability :boolean default(TRUE), not null
# availability :boolean(1) default(TRUE), not null
# manufacturer :string(255)
# origin :string(255)
# shared_updated_on :datetime
# price :decimal(, )
# price :decimal(8, 2)
# tax :float
# deposit :decimal(, ) default(0.0)
# unit_quantity :integer default(1), not null
# deposit :decimal(8, 2) default(0.0)
# unit_quantity :integer(4) default(1), not null
# order_number :string(255)
# created_at :datetime
# updated_at :datetime
# quantity :integer default(0)
# deleted_at :datetime
# type :string(255)
# quantity :integer(4) default(0)
#
class StockArticle < Article

13
app/models/stock_change.rb
View file

@ -1,15 +1,14 @@
# == Schema Information
# Schema version: 20090317175355
#
# Table name: stock_changes
#
# id :integer not null, primary key
# delivery_id :integer
# order_id :integer
# stock_article_id :integer
# quantity :integer default(0)
# id :integer(4) not null, primary key
# delivery_id :integer(4)
# order_id :integer(4)
# stock_article_id :integer(4)
# quantity :integer(4) default(0)
# created_at :datetime
# stock_taking_id :integer
# stock_taking_id :integer(4)
#
class StockChange < ActiveRecord::Base

3
app/models/stock_taking.rb
View file

@ -1,9 +1,8 @@
# == Schema Information
# Schema version: 20090317175355
#
# Table name: stock_takings
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# date :date
# note :text
# created_at :datetime

5
app/models/supplier.rb
View file

@ -1,9 +1,8 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: suppliers
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# name :string(255) default(""), not null
# address :string(255) default(""), not null
# phone :string(255) default(""), not null
@ -16,7 +15,7 @@
# delivery_days :string(255)
# order_howto :string(255)
# note :string(255)
# shared_supplier_id :integer
# shared_supplier_id :integer(4)
# min_order_quantity :string(255)
# deleted_at :datetime
#

22
app/models/task.rb
View file

@ -1,18 +1,17 @@
# == Schema Information
# Schema version: 20090119155930
#
# Table name: tasks
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# name :string(255) default(""), not null
# description :string(255)
# due_date :date
# done :boolean
# workgroup_id :integer
# assigned :boolean
# done :boolean(1)
# workgroup_id :integer(4)
# assigned :boolean(1)
# created_on :datetime not null
# updated_on :datetime not null
# required_users :integer default(1)
# required_users :integer(4) default(1)
#
class Task < ActiveRecord::Base
@ -28,7 +27,8 @@ class Task < ActiveRecord::Base
attr_protected :users
validates_length_of :name, :minimum => 3
after_save :update_ordergroup_stats
def is_assigned?(user)
self.assignments.detect {|ass| ass.user_id == user.id }
@ -78,4 +78,12 @@ class Task < ActiveRecord::Base
def user_list
@user_list ||= users.collect(&:nick).join(", ")
end
private
def update_ordergroup_stats
if done
users.each { |u| u.ordergroup.update_stats! }
end
end
end

3
app/models/user.rb
View file

@ -1,9 +1,8 @@
# == Schema Information
# Schema version: 20090120184410
#
# Table name: users
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# nick :string(255) default(""), not null
# password_hash :string(255) default(""), not null
# password_salt :string(255) default(""), not null

22
app/models/workgroup.rb
View file

@ -1,29 +1,29 @@
# == Schema Information
# Schema version: 20090120184410
#
# Table name: groups
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# type :string(255) default(""), not null
# name :string(255) default(""), not null
# description :string(255)
# account_balance :decimal(, ) default(0.0), not null
# account_balance :decimal(8, 2) default(0.0), not null
# account_updated :datetime
# created_on :datetime not null
# role_admin :boolean not null
# role_suppliers :boolean not null
# role_article_meta :boolean not null
# role_finance :boolean not null
# role_orders :boolean not null
# weekly_task :boolean
# weekday :integer
# role_admin :boolean(1) not null
# role_suppliers :boolean(1) not null
# role_article_meta :boolean(1) not null
# role_finance :boolean(1) not null
# role_orders :boolean(1) not null
# weekly_task :boolean(1)
# weekday :integer(4)
# task_name :string(255)
# task_description :string(255)
# task_required_users :integer default(1)
# task_required_users :integer(4) default(1)
# deleted_at :datetime
# contact_person :string(255)
# contact_phone :string(255)
# contact_address :string(255)
# stats :text
#
class Workgroup < Group

24
app/views/home/_stats.erb Normal file
View file

@ -0,0 +1,24 @@
<%
max_width = 600
global_avg = Ordergroup.avg_jobs_per_euro
group_avg = @ordergroup.avg_jobs_per_euro.to_f
length_of_global_bar = max_width / 2.0
length_of_group_bar = (group_avg / global_avg) * length_of_global_bar
length_of_group_bar = max_width if length_of_group_bar > max_width
color = group_avg >= global_avg ? "#78b74e" : "red"
%>
Engagement Deiner Bestellgruppe
<div class="stats-bar" style="width:<%= length_of_group_bar -%>px; background-color:<%= color -%>">
<%= ((group_avg / global_avg) * 100).to_i -%><%= " Äpfel" if length_of_group_bar > 50 -%>
</div>
Durchschnittsengagement
<div class="stats-bar" style="width:<%= length_of_global_bar -%>px">
100 Birnen
</div>
<span class="description">
Abgebildet ist das Verhältnis von erledigten Aufgaben zu dem Bestellvolumen Deiner Bestellgruppe im Vergleich zum Durchschnitt in der Foodcoop.
</span>

12
app/views/home/index.html.haml
View file

@ -31,6 +31,12 @@
// Current orders
= render :partial => 'shared/open_orders'
// Stats
.box_title
%h2 Engagement Deiner Bestellgruppe
.column_content
= render "stats"
- unless @messages.empty?
.box_title
%h2 Neuste Nachrichten
@ -49,9 +55,9 @@
|
Verfügbares Guthaben:
= number_to_currency(@ordergroup.get_available_funds())
%span{:style => "color:grey"}
(zuletzt aktualisiert vor
= distance_of_time_in_words(Time.now, @ordergroup.account_updated) + "(n))"
%span.description
(Letzte Aktualisierung ist
= distance_of_time_in_words(Time.now, @ordergroup.account_updated) + " her)"
%h3 Letzte Transaktionen
%table
%tr