Booth inf ocan be updated.

app/controllers/market_vendors_controller.rb

@@ -0,0 +1,11 @@
+class MarketVendorsController < ApplicationController
+  def index
+   if params[:market_id]
+    @market_vendors = MarketVendor.where(market_id: params[:market_id])
+    render json: @market_vendors, each_serializer: MarketVendorOnlyVendorSerializer, root: false
+  else
+    @market_vendors = MarketVendor.where(vendor_id: params[:vendor_id]) if params[:vendor_id]
+    render json: @market_vendors, each_serializer: MarketVendorSerializer, root: false
+  end
+  end
+end

app/controllers/vendors_controller.rb

@@ -44,8 +44,8 @@ def show
   def add_market
     if has_admin_code
       @vendor = Vendor.find(params[:id])
-      @market_vendor = MarketVendor.create(vendor_id: params[:id], market_id: params[:market_id]);
-      render json: @market_vendor.market, root: false
+      @market_vendor = MarketVendor.create(vendor_id: params[:id], market_id: params[:market_id], booth_location: params[:booth_location]);
+      render json: @market_vendor, serializer: MarketVendorSerializer, root: false
     else
       send_unauthorized_response
     end

app/serializers/market_vendor_only_vendor_serializer.rb

@@ -0,0 +1,8 @@
+class MarketVendorOnlyVendorSerializer < ActiveModel::Serializer
+  attributes :id,
+             :booth_location, :vendor
+
+  def vendor
+    return VendorSerializer.new(object.vendor, root: false)
+  end
+end

app/serializers/market_vendor_serializer.rb

@@ -0,0 +1,12 @@
+class MarketVendorSerializer < ActiveModel::Serializer
+  attributes :id,
+             :booth_location, :market, :vendor
+
+  def market
+    return MarketSerializer.new(object.market, root: false)
+  end
+
+  def vendor
+    return VendorSerializer.new(object.vendor, root: false)
+  end
+end

config/routes.rb

@@ -9,6 +9,8 @@
     get 'to_coordinates', on: :collection
   end
 
+  resources :market_vendors
+
   resources :vendors do
     put 'add_market', on: :member
     put 'remove_market', on: :member

db/migrate/20160915054510_add_booth_info_to_market_vendors.rb

@@ -0,0 +1,7 @@
+class AddBoothInfoToMarketVendors < ActiveRecord::Migration
+  def change
+    add_column :market_vendors, :booth_location, :string
+    add_column :market_vendors, :at_market_longitude, :float
+    add_column :market_vendors, :at_market_latitude, :float
+  end
+end

db/schema.rb

@@ -11,16 +11,19 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160911223901) do
+ActiveRecord::Schema.define(version: 20160915054510) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
   create_table "market_vendors", force: :cascade do |t|
-    t.integer  "vendor_id",  null: false
-    t.integer  "market_id",  null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.integer  "vendor_id",           null: false
+    t.integer  "market_id",           null: false
+    t.datetime "created_at",          null: false
+    t.datetime "updated_at",          null: false
+    t.string   "booth_location"
+    t.float    "at_market_longitude"
+    t.float    "at_market_latitude"
   end
 
   create_table "markets", force: :cascade do |t|

frontend/app/modules/app.js

@@ -11,6 +11,7 @@
             'ui.router',
             'ttfm.home',
             'ttfm.markets',
+            'ttfm.market-vendors',
             'ttfm.security',
             'ttfm.vendors',
             'jgefroh.components'

frontend/app/modules/components/base-service-factory.js

@@ -45,6 +45,10 @@
         return response.data[service.resourceNameSingular] || response.data[service.resourceNamePlural] || response.data;
       };
 
+      service.getResponseData = function(response) {
+        return response.data;
+      }
+
       service.createPayload = function(resource) {
         var payload = {};
         payload[service.resourceNameSingular] = resource;

frontend/app/modules/market-vendors/market-vendors-list.html

@@ -0,0 +1,16 @@
+<div data-ng-show="vm.marketVendors.length">
+  <table>
+    <thead>
+      <th>Booth</th>
+      <th>Vendor</th>
+      <th>Products</th>
+    </thead>
+    <tbody>
+      <tr data-ng-repeat="marketVendor in vm.marketVendors | orderBy: 'vendor.name' track by marketVendor.id">
+        <td><span data-ng-bind="marketVendor.booth_location"></span></td>
+        <td><span data-ng-bind="marketVendor.vendor.name"></span></td>
+        <td><span data-ng-bind="marketVendor.vendor.description"></span></td>
+      </tr>
+    </tbody>
+  </table>
+</div>

frontend/app/modules/market-vendors/market-vendors-list.js

@@ -0,0 +1,32 @@
+(function() {
+  'use strict';
+  angular
+    .module('ttfm.market-vendors')
+    .directive('marketVendorsList', Directive);
+  function Directive() {
+    function Controller(MarketVendorsService) {
+      var vm = this;
+      function initialize() {
+        MarketVendorsService.query({market_id: vm.market.id}).then(function(marketVendors) {
+          vm.marketVendors = marketVendors;
+          console.info("WHAT");
+        });
+        console.info("WHAT");
+
+      }
+      initialize();
+    }
+
+    return {
+      restrict: 'A',
+      templateUrl: 'market-vendors-list.html',
+      replace: true,
+      controller: ['MarketVendorsService', Controller],
+      controllerAs: 'vm',
+      bindToController: true,
+      scope: {
+        market: '='
+      }
+    };
+  }
+})();

frontend/app/modules/market-vendors/market-vendors-module.js

@@ -0,0 +1,8 @@
+(function() {
+  angular
+    .module('ttfm.market-vendors', [])
+    .config(['$stateProvider', Routes]);
+
+  function Routes($stateProvider) {
+  }
+})();

frontend/app/modules/market-vendors/market-vendors-service.js

@@ -0,0 +1,10 @@
+(function() {
+  angular
+    .module('ttfm.market-vendors')
+    .service('MarketVendorsService', ['$rootScope', '$sanitize', 'BaseServiceFactory', Service]);
+
+  function Service($rootScope, $sanitize, BaseServiceFactory) {
+    var service = BaseServiceFactory('market_vendor', 'market_vendors');
+    return service;
+  }
+})();

frontend/app/modules/markets/markets-show.html

@@ -4,5 +4,5 @@ <h1>{{vm.market.name}}</h1>
   <h2>{{vm.market.address}}</h2>
   <h3 style="text-transform: capitalize;">{{vm.market.days_of_week_as_array.join(', ')}}</h3>
   <div data-static-map data-location="vm.market.latitude + ',' + vm.market.longitude" data-size="512x512"></div>
-  <div data-vendors-list data-market="vm.market"></div>
+  <div data-market-vendors-list data-market="vm.market"></div>
 </div>

frontend/app/modules/vendors/vendors-form.html

@@ -13,20 +13,28 @@ <h3>Markets the Vendor Attends</h3>
 
     <div class="input-field">
       <label>Markets</label>
-      <select data-ng-options="market as market.name for market in vm.allMarkets | filter: vm.isNotOnVendor | orderBy: 'name' track by market.id" data-ng-model="vm.selectedMarket">
+      <select data-ng-options="market as market.name for market in vm.allMarkets | filter: vm.isNotOnVendor | orderBy: 'name' track by market.id" data-ng-model="vm.selectedMarket" style="margin-bottom: 1rem;">
         <option value="">Select a Market</option>
       </select>
-      <button data-ng-click="vm.addMarket(vm.selectedMarket);">Add Market</button>
+      <div data-text-field data-label="Booth at Market" data-ng-model="vm.boothLocation"></div>
+      <button data-ng-click="vm.addMarket(vm.selectedMarket, vm.boothLocation);">Add Market</button>
 
     </div>
     <table>
-      <tr data-ng-repeat="market in vm.vendorMarkets">
+      <thead>
+        <th>Booth</th>
+        <th>Market</th>
+      </thead>
+      <tr data-ng-repeat="marketVendor in vm.marketVendors">
         <td>
-          <span data-ng-bind="market.name"></span><br/>
-          <span data-ng-bind="market.address"></span>
+          <span data-ng-bind="marketVendor.booth_location"></span>
+        </td>
+        <td>
+          <span data-ng-bind="marketVendor.market.name"></span><br/>
+          <span data-ng-bind="marketVendor.market.address"></span>
         </td>
         <td class="button-column">
-          <a data-ng-click="vm.removeMarket(market)"><span class="fa fa-fw fa-trash"></span></a>
+          <a data-ng-click="vm.removeMarket(marketVendor)"><span class="fa fa-fw fa-trash"></span></a>
         </td>
       </tr>
     </table>

frontend/app/modules/vendors/vendors-form.js

@@ -4,40 +4,40 @@
     .module('ttfm.vendors')
     .directive('vendorsForm', Directive);
   function Directive() {
-    function Controller($scope, VendorsService, MarketsService) {
+    function Controller($scope, VendorsService, MarketsService, MarketVendorsService) {
       var vm = this;
       vm.allMarkets = [];
-      vm.vendorMarkets = [];
+      vm.marketVendors = [];
       MarketsService.query().then(function(markets) {
         vm.allMarkets = markets;
       });
 
-      MarketsService.query({vendor_id: vm.vendor.id}).then(function(markets) {
-        vm.vendorMarkets = markets;
+      MarketVendorsService.query({vendor_id: vm.vendor.id}).then(function(marketVendors) {
+        vm.marketVendors = marketVendors;
       });
 
-      vm.addMarket = function(market) {
+      vm.addMarket = function(market, boothLocation) {
         $scope.$parent.vm.errors = null;
-        VendorsService.addMarket(vm.vendor, market).then(function(market) {
-          vm.vendorMarkets.push(market);
+        VendorsService.addMarket(vm.vendor, market, boothLocation).then(function(marketVendor) {
+          vm.marketVendors.push(marketVendor);
         }).catch(function(response) {
           $scope.$parent.vm.errors = response.data.error;
         });
       }
 
-      vm.removeMarket = function(market) {
+      vm.removeMarket = function(marketVendor) {
         $scope.$parent.vm.errors = null;
-        VendorsService.removeMarket(vm.vendor, market).then(function() {
-          vm.vendorMarkets.splice(vm.vendorMarkets.indexOf(market), 1);
+        VendorsService.removeMarket(vm.vendor, marketVendor.market).then(function() {
+          vm.marketVendors.splice(vm.marketVendors.indexOf(marketVendor), 1);
         }).catch(function(response) {
           $scope.$parent.vm.errors = response.data.error;
         });
       }
 
       vm.isNotOnVendor = function(market) {
         var isDuplicate = false;
-        angular.forEach(vm.vendorMarkets, function(vendorMarket) {
-          if (market.id === vendorMarket.id) {
+        angular.forEach(vm.marketVendors, function(existingMarketVendor) {
+          if (market.id === existingMarketVendor.market.id) {
             isDuplicate = true;
           }
         });
@@ -49,7 +49,7 @@
       restrict: 'A',
       templateUrl: 'vendors-form.html',
       replace: true,
-      controller: ['$scope', 'VendorsService', 'MarketsService', Controller],
+      controller: ['$scope', 'VendorsService', 'MarketsService', 'MarketVendorsService', Controller],
       controllerAs: 'vm',
       bindToController: true,
       scope: {

frontend/app/modules/vendors/vendors-service.js

@@ -6,8 +6,8 @@
   function Service($rootScope, $sanitize, BaseServiceFactory) {
     var service = BaseServiceFactory('vendor', 'vendors');
 
-    service.addMarket = function(vendor, market) {
-      return service.$http.put(service.memberUrl(vendor.id) + '/add_market', {market_id: market.id}).then(service.getResponsePayload);
+    service.addMarket = function(vendor, market, boothLocation) {
+      return service.$http.put(service.memberUrl(vendor.id) + '/add_market', {market_id: market.id, booth_location: boothLocation}).then(service.getResponseData);
     }
     service.removeMarket = function(vendor, market) {
       return service.$http.put(service.memberUrl(vendor.id) + '/remove_market', {market_id: market.id}).then(service.getResponsePayload);