Added hackathon seeds and fixed some rounding issues

HACKATHON_TODOS.md

@@ -1,2 +1 @@
-- articles form bugfixing (too many units in dropdowns, ...)
-- investigate goa result content change after reducing received number for beer with ordered amount 59 and tolerance 1
+- bread rolls tolerance cannot be raised higher than 1

app/assets/javascripts/article-form.js

@@ -352,14 +352,14 @@ class ArticleForm {
       const currentField$ = $(`input[name="${this.ratioQuantityFieldNameByIndex(i)}"]`, this.articleForm$);
       const currentValue = currentField$.val();
       const previousValue = $(`input[name="${this.ratioQuantityFieldNameByIndex(i - 1)}"]:last`, this.articleForm$).val();
-      currentField$.val(currentValue / previousValue);
+      currentField$.val(round(currentValue / previousValue));
     }
   }
 
   convertPriceToPriceUnit() {
     const groupOrderUnitPrice = this.price$.val();
     const ratio = this.getUnitRatio(1, this.priceUnit$.val(), this.groupOrderUnit$.val());
-    const relativePrice = groupOrderUnitPrice * ratio;
+    const relativePrice = round(groupOrderUnitPrice * ratio);
     this.price$.val(relativePrice);
   }
 
@@ -452,3 +452,11 @@ function mergeJQueryObjects(array_of_jquery_objects) {
     return el.get();
   }));
 }
+
+function round(num, precision) {
+  if (precision === undefined) {
+    precision = 3;
+  }
+  const factor = precision * Math.pow(10, precision);
+  return Math.round((num + Number.EPSILON) * factor) / factor;
+}

app/assets/javascripts/group-order-form.js

@@ -222,7 +222,7 @@ class GroupOrderForm {
 
 function round(num, precision) {
   if (precision === undefined) {
-    precision = 2;
+    precision = 3;
   }
   const factor = precision * Math.pow(10, precision);
   return Math.round((num + Number.EPSILON) * factor) / factor;

app/models/article.rb

@@ -224,39 +224,39 @@ def mark_as_deleted
 
   # TODO: Maybe use the nilify blanks gem instead of the following five methods?:
   def unit=(value)
-    if value.empty?
+    if value.blank?
       self[:unit] = nil
     else
       super
     end
   end
 
   def supplier_order_unit=(value)
-    if value.empty?
+    if value.blank?
       self[:supplier_order_unit] = nil
     else
       super
     end
   end
 
   def group_order_unit=(value)
-    if value.empty?
+    if value.blank?
       self[:group_order_unit] = nil
     else
       super
     end
   end
 
   def price_unit=(value)
-    if value.empty?
+    if value.blank?
       self[:price_unit] = nil
     else
       super
     end
   end
 
   def billing_unit=(value)
-    if value.empty?
+    if value.blank?
       self[:billing_unit] = nil
     else
       super

db/seeds/hackathon.seeds.rb

@@ -0,0 +1,93 @@
+require_relative 'seed_helper'
+
+## Financial transaction classes
+
+FinancialTransactionClass.create!(:id => 1, :name => 'Standard')
+FinancialTransactionClass.create!(:id => 2, :name => 'Foodsoft')
+
+## Suppliers & articles
+
+SupplierCategory.create!(:id => 1, :name => "Other", :financial_transaction_class_id => 1)
+
+Supplier.create!([
+                   { :id => 1, :name => "Hackathon", :supplier_category_id => 1, :address => "Smallstreet 1, Cookilage", :phone => "0123456789", :email => "info@bbakery.test", :min_order_quantity => "100" }
+                 ])
+
+ArticleCategory.create!(:id => 1, :name => "Other", :description => "other, misc, unknown")
+ArticleCategory.create!(:id => 2, :name => "Fruit")
+ArticleCategory.create!(:id => 3, :name => "Vegetables")
+ArticleCategory.create!(:id => 4, :name => "Potatoes & onions")
+ArticleCategory.create!(:id => 5, :name => "Bread & Bakery")
+ArticleCategory.create!(:id => 6, :name => "Drinks", :description => "juice, fruit juice, vegetable juice, soda")
+ArticleCategory.create!(:id => 7, :name => "Herbs & Spices")
+ArticleCategory.create!(:id => 8, :name => "Milk & products", :description => "milk, butter, cream, yoghurt, cheese, eggs, milk substitutes")
+ArticleCategory.create!(:id => 9, :name => "Fish & Sea")
+ArticleCategory.create!(:id => 10, :name => "Meat")
+ArticleCategory.create!(:id => 11, :name => "Oils & Fats")
+ArticleCategory.create!(:id => 12, :name => "Grains & Legumes")
+ArticleCategory.create!(:id => 13, :name => "Nuts & Seeds")
+ArticleCategory.create!(:id => 14, :name => "Sugar & Sweets")
+
+Article.create!({ name: "Carrots", supplier_id: 1, article_category_id: 3, unit: nil, price: 3, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "KGM", price_unit: "KGM", billing_unit: "KGM", group_order_unit: "KGM", group_order_granularity: 0.001 })
+Article.create!({ name: "Pumpkin", supplier_id: 1, article_category_id: 3, unit: nil, price: 1.5, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "XPP", price_unit: "KGM", billing_unit: "KGM", group_order_unit: "XPP", :article_unit_ratios => [ArticleUnitRatio.new({ :sort => 1, :quantity => 1.3, :unit => 'KGM' })] })
+Article.create!({ name: "Bread", supplier_id: 1, article_category_id: 5, unit: nil, price: 2.1, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "XPP", price_unit: "KGM", billing_unit: "KGM", group_order_unit: "XPP", group_order_granularity: 0.5,
+                  :article_unit_ratios => [ArticleUnitRatio.new({ :sort => 1, :quantity => 700, :unit => 'GRM' })] })
+Article.create!({ name: "Bread rolls", supplier_id: 1, article_category_id: 5, unit: nil, price: 4, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "XPP", price_unit: "KGM", billing_unit: "KGM", group_order_unit: "XPP", minimum_order_quantity: 5,
+                  :article_unit_ratios => [ArticleUnitRatio.new({ :sort => 1, :quantity => 350, :unit => 'GRM' })] })
+Article.create!({ name: "Muesli", supplier_id: 1, article_category_id: 13, unit: nil, price: 2.5, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "XPP", price_unit: "XPP", billing_unit: "XPP", group_order_unit: "XPP",
+                  :article_unit_ratios => [ArticleUnitRatio.new({ :sort => 1, :quantity => 500, :unit => 'GRM' })] })
+Article.create!({ name: "Smoked tofu", supplier_id: 1, article_category_id: 8, unit: nil, price: 2.4, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "XPP", price_unit: "HGM", billing_unit: "GRM", group_order_unit: "XPP",
+                  :article_unit_ratios => [ArticleUnitRatio.new({ :sort => 1, :quantity => 160, :unit => 'GRM' })] })
+Article.create!({ name: "Beer", supplier_id: 1, article_category_id: 6, unit: nil, price: 2.6, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "XCB", price_unit: "XBO", billing_unit: "XBO", group_order_unit: "XBO",
+                  :article_unit_ratios => [ArticleUnitRatio.new({ :sort => 1, :quantity => 20, :unit => 'XBO' }), ArticleUnitRatio.new({ :sort => 2, :quantity => 10, :unit => 'LTR' })] })
+Article.create!({ name: "Detergent", supplier_id: 1, article_category_id: 1, unit: nil, price: 1, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "XPP", price_unit: "LTR", billing_unit: "LTR", group_order_unit: "LTR", group_order_granularity: 0.001,
+                  :article_unit_ratios => [ArticleUnitRatio.new({ :sort => 2, :quantity => 20, :unit => 'LTR' }), ArticleUnitRatio.new({ :sort => 2, :quantity => 25, :unit => 'KGM' })] })
+Article.create!({ name: "Rice", supplier_id: 1, article_category_id: 12, unit: nil, price: 2.25, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "XPP", price_unit: "KGM", billing_unit: "KGM", group_order_unit: "KGM", group_order_granularity: 0.05,
+                  :article_unit_ratios => [ArticleUnitRatio.new({ :sort => 1, :quantity => 25, :unit => 'KGM' })] })
+Article.create!({ name: "Potatoes", supplier_id: 1, article_category_id: 3, unit: nil, price: 2.25, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "KGM", price_unit: "KGM", billing_unit: "KGM", group_order_unit: "GRM" })
+Article.create!({ name: "Wheat", supplier_id: 1, article_category_id: 12, unit: nil, price: 2.25, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "XPP", price_unit: "KGM", billing_unit: "KGM", group_order_unit: "KGM", group_order_granularity: 0.05,
+                  :article_unit_ratios => [ArticleUnitRatio.new({ :sort => 1, :quantity => 25, :unit => 'KGM' })] })
+Article.create!({ name: "Oranges", supplier_id: 1, article_category_id: 2, unit: nil, price: 2.25, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "XPP", price_unit: "KGM", billing_unit: "KGM", group_order_unit: "KGM", group_order_granularity: 0.05,
+                  :article_unit_ratios => [ArticleUnitRatio.new({ :sort => 1, :quantity => 12, :unit => 'KGM' })] })
+Article.create!({ name: "Lentils", supplier_id: 1, article_category_id: 12, unit: nil, price: 2.25, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "XPP", price_unit: "KGM", billing_unit: "KGM", group_order_unit: "KGM", group_order_granularity: 0.05,
+                  :article_unit_ratios => [ArticleUnitRatio.new({ :sort => 1, :quantity => 500, :unit => 'GRM' })] })
+Article.create!({ name: "Oyster mushrooms", supplier_id: 1, article_category_id: 3, unit: nil, price: 3, tax: 7.0, deposit: "0.0", quantity: 0, supplier_order_unit: "KGM", price_unit: "KGM", billing_unit: "KGM", group_order_unit: "KGM", group_order_granularity: 0.001, minimum_order_quantity: 1.2 })
+
+## Members & groups
+
+User.create!(:id => 1, :nick => "admin", :password => "secret", :first_name => "Anton", :last_name => "Administrator", :email => "admin@foo.test", :created_on => 'Wed, 15 Jan 2014 16:15:33 UTC +00:00')
+User.create!(:id => 2, :nick => "john", :password => "secret", :first_name => "John", :last_name => "Doe", :email => "john@doe.test", :created_on => 'Sun, 19 Jan 2014 17:38:22 UTC +00:00')
+User.create!(:id => 3, :nick => "peter", :password => "secret", :first_name => "Peter", :last_name => "Peters", :email => "peter@peters.test", :created_on => 'Sat, 25 Jan 2014 20:20:36 UTC +00:00')
+User.create!(:id => 4, :nick => "jan", :password => "secret", :first_name => "Jan", :last_name => "Lou", :email => "jan@lou.test", :created_on => 'Mon, 27 Jan 2014 16:22:14 UTC +00:00')
+User.create!(:id => 5, :nick => "mary", :password => "secret", :first_name => "Mary", :last_name => "Lou", :email => "marie@lou.test", :created_on => 'Mon, 03 Feb 2014 11:47:17 UTC +00:00')
+
+Workgroup.create!(:id => 1, :name => "Administrators", :description => "System administrators.", :account_balance => 0.0, :created_on => 'Wed, 15 Jan 2014 16:15:33 UTC +00:00', :role_admin => true, :role_suppliers => true, :role_article_meta => true, :role_finance => true, :role_orders => true, :next_weekly_tasks_number => 8, :ignore_apple_restriction => false)
+Workgroup.create!(:id => 2, :name => "Finances", :account_balance => 0.0, :created_on => 'Sun, 19 Jan 2014 17:40:03 UTC +00:00', :role_admin => false, :role_suppliers => false, :role_article_meta => false, :role_finance => true, :role_orders => false, :next_weekly_tasks_number => 8, :ignore_apple_restriction => false)
+Workgroup.create!(:id => 3, :name => "Ordering", :account_balance => 0.0, :created_on => 'Thu, 20 Feb 2014 14:44:47 UTC +00:00', :role_admin => false, :role_suppliers => false, :role_article_meta => true, :role_finance => false, :role_orders => true, :next_weekly_tasks_number => 8, :ignore_apple_restriction => false)
+Workgroup.create!(:id => 4, :name => "Assortment", :account_balance => 0.0, :created_on => 'Wed, 09 Apr 2014 12:24:55 UTC +00:00', :role_admin => false, :role_suppliers => true, :role_article_meta => true, :role_finance => false, :role_orders => false, :next_weekly_tasks_number => 8, :ignore_apple_restriction => false)
+Ordergroup.create!(:id => 5, :name => "Admin Administrator", :account_balance => 0.0, :created_on => 'Sat, 18 Jan 2014 00:38:48 UTC +00:00', :role_admin => false, :role_suppliers => false, :role_article_meta => false, :role_finance => false, :role_orders => false, :stats => { :jobs_size => 0, :orders_sum => 1021.74 }, :next_weekly_tasks_number => 8, :ignore_apple_restriction => true)
+Ordergroup.create!(:id => 6, :name => "Pete's house", :account_balance => -0.35E2, :created_on => 'Sat, 25 Jan 2014 20:20:37 UTC +00:00', :role_admin => false, :role_suppliers => false, :role_article_meta => false, :role_finance => false, :role_orders => false, :contact_person => "Piet Pieterssen", :stats => { :jobs_size => 0, :orders_sum => 60.96 }, :next_weekly_tasks_number => 8, :ignore_apple_restriction => false)
+Ordergroup.create!(:id => 7, :name => "Jan Klaassen", :account_balance => -0.35E2, :created_on => 'Mon, 27 Jan 2014 16:22:14 UTC +00:00', :role_admin => false, :role_suppliers => false, :role_article_meta => false, :role_finance => false, :role_orders => false, :contact_person => "Jan Klaassen", :stats => { :jobs_size => 0, :orders_sum => 0 }, :next_weekly_tasks_number => 8, :ignore_apple_restriction => false)
+Ordergroup.create!(:id => 8, :name => "John Doe", :account_balance => 0.90E2, :created_on => 'Wed, 09 Apr 2014 12:23:29 UTC +00:00', :role_admin => false, :role_suppliers => false, :role_article_meta => false, :role_finance => false, :role_orders => false, :contact_person => "John Doe", :stats => { :jobs_size => 0, :orders_sum => 0 }, :next_weekly_tasks_number => 8, :ignore_apple_restriction => false)
+
+Membership.create!(:group_id => 1, :user_id => 1)
+Membership.create!(:group_id => 5, :user_id => 1)
+Membership.create!(:group_id => 2, :user_id => 2)
+Membership.create!(:group_id => 8, :user_id => 2)
+Membership.create!(:group_id => 6, :user_id => 3)
+Membership.create!(:group_id => 7, :user_id => 4)
+Membership.create!(:group_id => 8, :user_id => 4)
+Membership.create!(:group_id => 3, :user_id => 4)
+Membership.create!(:group_id => 7, :user_id => 5)
+Membership.create!(:group_id => 3, :user_id => 5)
+Membership.create!(:group_id => 4, :user_id => 5)
+
+## Finances
+
+FinancialTransactionType.create!(:id => 1, :name => "Foodcoop", :financial_transaction_class_id => 1)
+
+FinancialTransaction.create!(:id => 1, :ordergroup_id => 5, :amount => -0.35E2, :note => "Membership fee for ordergroup", :user_id => 1, :created_on => 'Sat, 18 Jan 2014 00:38:48 UTC +00:00', :financial_transaction_type_id => 1)
+FinancialTransaction.create!(:id => 3, :ordergroup_id => 6, :amount => -0.35E2, :note => "Membership fee for ordergroup", :user_id => 1, :created_on => 'Sat, 25 Jan 2014 20:20:37 UTC +00:00', :financial_transaction_type_id => 1)
+FinancialTransaction.create!(:id => 4, :ordergroup_id => 7, :amount => -0.35E2, :note => "Membership fee for ordergroup", :user_id => 1, :created_on => 'Mon, 27 Jan 2014 16:22:14 UTC +00:00', :financial_transaction_type_id => 1)
+FinancialTransaction.create!(:id => 5, :ordergroup_id => 5, :amount => 0.35E2, :note => "payment", :user_id => 2, :created_on => 'Wed, 05 Feb 2014 16:49:24 UTC +00:00', :financial_transaction_type_id => 1)
+FinancialTransaction.create!(:id => 6, :ordergroup_id => 8, :amount => 0.90E2, :note => "Bank transfer", :user_id => 2, :created_on => 'Mon, 17 Feb 2014 16:19:34 UTC +00:00', :financial_transaction_type_id => 1)