item groups now have order - start page is now item group 1 (configurable in globals)

back-office/app/controllers/item_in_groups_controller.rb

@@ -0,0 +1,4 @@
+class ItemInGroupsController < ApplicationController
+  active_scaffold :"item_in_group" do |conf|
+  end
+end

back-office/app/helpers/item_in_groups_helper.rb

@@ -0,0 +1,2 @@
+module ItemInGroupsHelper
+end

back-office/app/models/item.rb

@@ -5,7 +5,7 @@ class Item < ActiveRecord::Base
   belongs_to :supplier
   belongs_to :brand
   belongs_to :delivery_time_estimation
-  has_and_belongs_to_many :item_groups,                                                       :join_table => 'item_item_groups'
+  
 
   validates_presence_of :name, :description, :list_price, :current_input_price, :tags, :unit_id, :code, :sub_category_id, :weight, :supplier_id
 

back-office/app/models/item_group.rb

@@ -1,5 +1,5 @@
 class ItemGroup < ActiveRecord::Base
-	has_and_belongs_to_many :items, :join_table => 'item_item_groups'
+
 
 
 end

back-office/app/models/item_in_group.rb

@@ -0,0 +1,8 @@
+class ItemInGroup < ActiveRecord::Base
+	belongs_to :item_group
+	belongs_to :item
+
+	validates_presence_of :item_group_id
+	validates_presence_of :item_id
+	validates_presence_of :position
+end

back-office/config/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
 
+  resources :item_in_groups do as_routes end
   resources :item_groups do as_routes end
   resources :link_banners do as_routes end
   resources :delivery_time_estimations do as_routes end

back-office/test/controllers/item_in_groups_controller_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class ItemInGroupsControllerTest < ActionController::TestCase
+  setup do
+    @item_in_group = item_in_groups(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:item_in_groups)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create item_in_group" do
+    assert_difference('ItemInGroup.count') do
+      post :create, item_in_group: { item_group_id: @item_in_group.item_group_id, item_id: @item_in_group.item_id, position: @item_in_group.position }
+    end
+
+    assert_redirected_to item_in_group_path(assigns(:item_in_group))
+  end
+
+  test "should show item_in_group" do
+    get :show, id: @item_in_group
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @item_in_group
+    assert_response :success
+  end
+
+  test "should update item_in_group" do
+    patch :update, id: @item_in_group, item_in_group: { item_group_id: @item_in_group.item_group_id, item_id: @item_in_group.item_id, position: @item_in_group.position }
+    assert_redirected_to item_in_group_path(assigns(:item_in_group))
+  end
+
+  test "should destroy item_in_group" do
+    assert_difference('ItemInGroup.count', -1) do
+      delete :destroy, id: @item_in_group
+    end
+
+    assert_redirected_to item_in_groups_path
+  end
+end

back-office/test/fixtures/item_in_groups.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  item_id: 1
+  item_group_id: 1
+  position: 1
+
+two:
+  item_id: 1
+  item_group_id: 1
+  position: 1

back-office/test/models/item_in_group_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ItemInGroupTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

front-api/db/migrate/20150420044444_create_item_in_groups.rb

@@ -0,0 +1,13 @@
+class CreateItemInGroups < ActiveRecord::Migration
+  def change
+    create_table :item_in_groups do |t|
+      t.integer :item_id
+      t.integer :item_group_id
+      t.integer :position
+
+      t.timestamps null: false
+    end
+
+    drop_table "item_item_groups"
+  end
+end

front-api/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: 20150414214540) do
+ActiveRecord::Schema.define(version: 20150420044444) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -106,9 +106,12 @@ ActiveRecord::Schema.define(version: 20150414214540) do
     t.decimal  "price"
   end
 
-  create_table "item_item_groups", id: false, force: :cascade do |t|
-    t.integer "item_id",       null: false
-    t.integer "item_group_id", null: false
+  create_table "item_in_groups", force: :cascade do |t|
+    t.integer  "item_id"
+    t.integer  "item_group_id"
+    t.integer  "position"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
   end
 
   create_table "items", force: :cascade do |t|

front-api/models/item.rb

@@ -4,6 +4,9 @@ class Item < ActiveRecord::Base
   has_many :multi_media_descriptions
   belongs_to :sub_category
 
+  has_many :item_groups, through: :item_in_groups 
+
+
   attr_accessor :count # used for cart
   def attributes
     super.merge('count' => self.count)

front-api/models/item_group.rb

@@ -1,8 +1,10 @@
 class ItemGroup < ActiveRecord::Base
-	has_and_belongs_to_many :items, :join_table => 'item_item_groups'
+
+	has_many :item_in_groups
+	has_many :items, through: :item_in_groups
 
 	def all_items(offset, limit)
-		self.items.where(on_display: true).order(:created_at).limit(limit).offset(offset).all
+		self.items.where(on_display: true).order("item_in_groups.position").limit(limit).offset(offset).all
 	end
 
 end

front-api/models/item_in_group.rb

@@ -0,0 +1,4 @@
+class ItemInGroup < ActiveRecord::Base
+	belongs_to :item_group
+	belongs_to :item
+end

front-ui/app/components/startPage/startPage.js

@@ -2,7 +2,8 @@ var React = require('react'),
     Router = require('react-router'),
     RouteHandler = Router.RouteHandler,
     AllItems = require('../items/allItems'),
-    LinkBanner = require('../linkBanner/linkBanner');
+    LinkBanner = require('../linkBanner/linkBanner'),
+    AllItemsInGroup = require('../items/allItemsInGroup');
 
 var StartPage = React.createClass({
     render : function() {
@@ -11,7 +12,7 @@ var StartPage = React.createClass({
 
             <div className='col-md-12'>
                 <LinkBanner locationName="startPage" />
-                <AllItems />
+                <AllItemsInGroup />
                 <RouteHandler />
             </div>
             </div>

front-ui/app/globals.js

@@ -1,6 +1,7 @@
 module.exports = {
     ApiUrl: '@@apiEndpoint',
     DefaultPageSize: 18,
+    ItemGroupIdOfStartPage: "1",
     FormatCurrency: function(amount_s) {
     	var amount = parseFloat(amount_s);
     	return ( amount.toFixed(2) + " KM" )

front-ui/app/stores/navigationStore.js

@@ -1,5 +1,6 @@
 var AppDispatcher = require('../dispatcher/appDispatcher');
 var EventEmitter = require('events').EventEmitter;
+var Globals = require('../globals');
 
 var NavigationConstants = require('../constants/navigationConstants')
 var _ = require('underscore');
@@ -15,8 +16,12 @@ var getGroupIdFromUrl = function() {
     var url = document.URL;
     var itemIdRegex = /grupa\/(\d+)\//g;
     var match = itemIdRegex.exec(url);
-    console.log(match);
-    return match[1];
+    
+    var result = Globals.ItemGroupIdOfStartPage;
+    if(match) {
+      result = match[1]
+    }
+    return  result;
 };
 
 // Extend ItemStore with EventEmitter to add eventing capabilities