From 7213975239c99002d962350dbee5ae582db7c090 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Tue, 12 Dec 2017 15:33:43 -0800
Subject: [PATCH 01/23] add quote view

---
 src/views/quote_view.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/views/quote_view.js

diff --git a/src/views/quote_view.js b/src/views/quote_view.js
new file mode 100644
index 0000000..4140b73
--- /dev/null
+++ b/src/views/quote_view.js
@@ -0,0 +1,15 @@
+import Backbone from 'backbone';
+import Quote from '../models/quote';
+
+const QuoteView = Backbone.View.extend({
+  initialize(params) {
+    this.template = params.template;
+  },
+  render() {
+    const compiledTemplate = this.template(this.model.toJSON());
+    this.$el.html(compiledTemplate);
+    return this;
+  },
+});
+
+export default QuoteView;

From f9b38866f2f0f98092b44078e561e5bb5bc125e2 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Tue, 12 Dec 2017 15:57:12 -0800
Subject: [PATCH 02/23] add li element and quote class

---
 dist/index.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index 8a046fa..1312378 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -85,16 +85,16 @@ <h3>Order Entry Form</h3>
     <script type="text/template" id="quote-template">
       <!-- The provided styles assume that you will insert this template
       within an element with the class "quote" applied -->
-      <!-- <li class="quote"> -->
-      <div class="row small-12 columns">
-        <h3 class="symbol"><%- symbol %></h3>
-        <h3 class="price">$<%- price.toFixed(2) %></h3>
-        <div class="quote-actions">
-          <button class="btn-buy alert button">Buy</button>
-          <button class="btn-sell success button">Sell</button>
+      <li class="quote">
+        <div class="row small-12 columns">
+          <h3 class="symbol"><%- symbol %></h3>
+          <h3 class="price">$<%- price.toFixed(2) %></h3>
+          <div class="quote-actions">
+            <button class="btn-buy alert button">Buy</button>
+            <button class="btn-sell success button">Sell</button>
+          </div>
         </div>
-      </div>
-      <!-- </li> -->
+      </li>
     </script>
 
     <script type="text/template" id="trade-template">

From 9ddcaa4cf770d3e2e6e86acba05949cdbcd38854 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Tue, 12 Dec 2017 17:59:12 -0800
Subject: [PATCH 03/23] one quote is displayed

---
 src/app.js                    | 34 ++++++++++++++++++++++++++++++++++
 src/collections/quote_list.js |  1 +
 src/views/quote_list_view.js  |  0
 src/views/quote_view.js       |  5 ++++-
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/views/quote_list_view.js

diff --git a/src/app.js b/src/app.js
index 03ec910..6acf24c 100644
--- a/src/app.js
+++ b/src/app.js
@@ -2,9 +2,12 @@ import 'foundation-sites/dist/foundation.css';
 import 'css/app.css';
 
 import $ from 'jquery';
+import _ from 'underscore';
 
 import Simulator from 'models/simulator';
+import Quote from 'models/quote';
 import QuoteList from 'collections/quote_list';
+import QuoteView from './views/quote_view';
 
 const quoteData = [
   {
@@ -25,6 +28,23 @@ const quoteData = [
   },
 ];
 
+const renderList = (quoteList) => {
+  const $quoteList = $();
+  $quoteList.empty();
+
+  quoteList.forEach((quote) => {
+    const quoteView = new QuoteView({
+      model: quote,
+      template: _.template($('#quote-template').html()),
+      tagName: 'li',
+      className: 'quote',
+    });
+    $quoteList.append(quoteView.render().$el);
+  });
+};
+
+let quoteTemplate;
+
 $(document).ready(function() {
   const quotes = new QuoteList(quoteData);
   const simulator = new Simulator({
@@ -32,4 +52,18 @@ $(document).ready(function() {
   });
 
   simulator.start();
+
+  quoteTemplate = _.template($('#quote-template').html());
+const $quoteList = $('#quotes');
+
+  const quoteView = new QuoteView({
+    // el: 'ul',
+    model: quotes.at(0),
+    template: quoteTemplate,
+    tagName: 'li',
+    className: 'quote'
+  });
+  quoteView.render();
+
+  $quoteList.append(quoteView.render().$el);
 });
diff --git a/src/collections/quote_list.js b/src/collections/quote_list.js
index 8da08cb..db4fc96 100644
--- a/src/collections/quote_list.js
+++ b/src/collections/quote_list.js
@@ -1,4 +1,5 @@
 import Backbone from 'backbone';
+
 import Quote from 'models/quote';
 
 const QuoteList = Backbone.Collection.extend({
diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index 4140b73..4dc259c 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -4,12 +4,15 @@ import Quote from '../models/quote';
 const QuoteView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
+    this.listenTo(this.model, 'change', this.render);
   },
+
   render() {
     const compiledTemplate = this.template(this.model.toJSON());
     this.$el.html(compiledTemplate);
+    
     return this;
-  },
+  }, //render
 });
 
 export default QuoteView;

From 73d0bb29fb31dd174db43f136947ef921132d991 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Tue, 12 Dec 2017 23:07:35 -0800
Subject: [PATCH 04/23] add collection view for quote

---
 src/views/quote_list_view.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
index e69de29..ee40071 100644
--- a/src/views/quote_list_view.js
+++ b/src/views/quote_list_view.js
@@ -0,0 +1,25 @@
+import Backbone from 'backbone';
+import _ from 'underscore';
+import QuoteView from '../views/quote_view';
+
+const QuoteListView = Backbone.View.extend ({
+  initialize(params) {
+    this.template = params.template;
+    this.listenTo(this.model, 'update', this.render);
+  },
+  render() {
+    this.$('#quotes').empty();
+    this.model.each((quote) =>{
+      const quoteView = new QuoteView ({
+        model: quote,
+        template: this.template,
+        tagName: 'li',
+        className: 'quote',
+      });
+    this.$('#quotes').append(taskView.render().$el);
+    });
+    return this;
+  }
+});
+
+export default QuoteListView;

From c52f4ff5b43b7cc5ab2af1c885a2cdb0df2edeaa Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Tue, 12 Dec 2017 23:35:58 -0800
Subject: [PATCH 05/23] add renderlist to quoteListView

---
 src/views/quote_list_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
index ee40071..9dfd6cd 100644
--- a/src/views/quote_list_view.js
+++ b/src/views/quote_list_view.js
@@ -16,7 +16,7 @@ const QuoteListView = Backbone.View.extend ({
         tagName: 'li',
         className: 'quote',
       });
-    this.$('#quotes').append(taskView.render().$el);
+    this.$('#quotes').append(quoteView.render().$el);
     });
     return this;
   }

From af3c19471e996d0c5efac3a4e276f20d4250ccfa Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Tue, 12 Dec 2017 23:36:25 -0800
Subject: [PATCH 06/23] can show all quotes

---
 src/app.js | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/app.js b/src/app.js
index 6acf24c..fd21ede 100644
--- a/src/app.js
+++ b/src/app.js
@@ -7,7 +7,9 @@ import _ from 'underscore';
 import Simulator from 'models/simulator';
 import Quote from 'models/quote';
 import QuoteList from 'collections/quote_list';
+
 import QuoteView from './views/quote_view';
+import QuoteListView from './views/quote_list_view';
 
 const quoteData = [
   {
@@ -54,16 +56,28 @@ $(document).ready(function() {
   simulator.start();
 
   quoteTemplate = _.template($('#quote-template').html());
-const $quoteList = $('#quotes');
 
-  const quoteView = new QuoteView({
-    // el: 'ul',
-    model: quotes.at(0),
+  const quoteListView = new QuoteListView ({
+    model: quotes,
     template: quoteTemplate,
-    tagName: 'li',
-    className: 'quote'
+    el: 'main',
   });
-  quoteView.render();
 
-  $quoteList.append(quoteView.render().$el);
+  quoteListView.render();
+
+
+
+// // render one quote
+// const $quoteList = $('#quotes');
+//
+//   const quoteView = new QuoteView({
+//     // el: 'ul',
+//     model: quotes.at(0),
+//     template: quoteTemplate,
+//     tagName: 'li',
+//     className: 'quote'
+//   });
+//   quoteView.render();
+//
+//   $quoteList.append(quoteView.render().$el);
 });

From 31398da2cc4bde24d065ae50e033af85a2e7c04f Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Tue, 12 Dec 2017 23:57:26 -0800
Subject: [PATCH 07/23] add logic for buy and sell functions in quote model

---
 src/models/quote.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/models/quote.js b/src/models/quote.js
index 4fbf466..583cab6 100644
--- a/src/models/quote.js
+++ b/src/models/quote.js
@@ -8,10 +8,13 @@ const Quote = Backbone.Model.extend({
 
   buy() {
     // Implement this function to increase the price by $1.00
+    this.set('price', this.get('price') + 1.00);
   },
 
   sell() {
     // Implement this function to decrease the price by $1.00
+
+    this.set('price', this.get('price') - 1.00);
   },
 });
 

From 26e4a0a7865ad1c897ace2df75ff9d009c1dd0ce Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Wed, 13 Dec 2017 00:25:29 -0800
Subject: [PATCH 08/23] cannot increase or decrease price

---
 src/app.js                   | 28 ++++++++++++++--------------
 src/views/quote_list_view.js |  5 +++--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/app.js b/src/app.js
index fd21ede..5eada12 100644
--- a/src/app.js
+++ b/src/app.js
@@ -30,20 +30,20 @@ const quoteData = [
   },
 ];
 
-const renderList = (quoteList) => {
-  const $quoteList = $();
-  $quoteList.empty();
-
-  quoteList.forEach((quote) => {
-    const quoteView = new QuoteView({
-      model: quote,
-      template: _.template($('#quote-template').html()),
-      tagName: 'li',
-      className: 'quote',
-    });
-    $quoteList.append(quoteView.render().$el);
-  });
-};
+// const renderList = (quoteList) => {
+//   const $quoteList = $();
+//   $quoteList.empty();
+//
+//   quoteList.forEach((quote) => {
+//     const quoteView = new QuoteView({
+//       model: quote,
+//       template: _.template($('#quote-template').html()),
+//       tagName: 'li',
+//       className: 'quote',
+//     });
+//     $quoteList.append(quoteView.render().$el);
+//   });
+// };
 
 let quoteTemplate;
 
diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
index 9dfd6cd..b670e1f 100644
--- a/src/views/quote_list_view.js
+++ b/src/views/quote_list_view.js
@@ -1,5 +1,6 @@
 import Backbone from 'backbone';
 import _ from 'underscore';
+import Quote from '../models/quote';
 import QuoteView from '../views/quote_view';
 
 const QuoteListView = Backbone.View.extend ({
@@ -9,14 +10,14 @@ const QuoteListView = Backbone.View.extend ({
   },
   render() {
     this.$('#quotes').empty();
-    this.model.each((quote) =>{
+    this.model.each((quote) => {
       const quoteView = new QuoteView ({
         model: quote,
         template: this.template,
         tagName: 'li',
         className: 'quote',
       });
-    this.$('#quotes').append(quoteView.render().$el);
+      this.$('#quotes').append(quoteView.render().$el);
     });
     return this;
   }

From 29f4da61b074bbfefc61c9a204b5d2ffc6a849cf Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Wed, 13 Dec 2017 00:48:14 -0800
Subject: [PATCH 09/23] add event listeners for buy and sell

---
 src/views/quote_view.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index 4dc259c..fe4f50d 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -10,9 +10,24 @@ const QuoteView = Backbone.View.extend({
   render() {
     const compiledTemplate = this.template(this.model.toJSON());
     this.$el.html(compiledTemplate);
-    
+
     return this;
   }, //render
+  events: {
+    'click button.btn-buy': 'buy',
+    'click button.btn-sell': 'sell'
+  },
+
+  buy(event) {
+    console.log('Invest');
+    this.model.buy();
+  },
+
+  sell(event) {
+    console.log('Make that money');
+    this.model.sell();
+
+  },
 });
 
 export default QuoteView;

From 2e9c59ab4512f98758f45dce8f421cccf5706c5d Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Wed, 13 Dec 2017 22:34:11 -0800
Subject: [PATCH 10/23] add logic for to show quotes sold and bought in
 tradeview

---
 src/models/quote.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/models/quote.js b/src/models/quote.js
index 583cab6..c1a1df1 100644
--- a/src/models/quote.js
+++ b/src/models/quote.js
@@ -7,11 +7,22 @@ const Quote = Backbone.Model.extend({
   },
 
   buy() {
+    this.trigger('trade', {
+      buy: true,
+      price: this.get('price'),
+      symbol: this.get('symbol')
+    });
+    // buy.trigger()
     // Implement this function to increase the price by $1.00
     this.set('price', this.get('price') + 1.00);
   },
 
   sell() {
+    this.trigger('trade', {
+      buy: false,
+      price: this.get('price'),
+      symbol: this.get('symbol')
+    });
     // Implement this function to decrease the price by $1.00
 
     this.set('price', this.get('price') - 1.00);

From 7191f543233113ad491e985cd4e2da724c1b1ee5 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Wed, 13 Dec 2017 22:54:01 -0800
Subject: [PATCH 11/23] can view history of all trades made by the user

---
 src/app.js                   | 18 ++++++++++++++++--
 src/views/quote_view.js      |  2 +-
 src/views/trade_list_view.js | 26 ++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 src/views/trade_list_view.js

diff --git a/src/app.js b/src/app.js
index 5eada12..35a581f 100644
--- a/src/app.js
+++ b/src/app.js
@@ -10,6 +10,7 @@ import QuoteList from 'collections/quote_list';
 
 import QuoteView from './views/quote_view';
 import QuoteListView from './views/quote_list_view';
+import TradeListView from './views/trade_list_view';
 
 const quoteData = [
   {
@@ -46,8 +47,10 @@ const quoteData = [
 // };
 
 let quoteTemplate;
+let tradeTemplate;
 
 $(document).ready(function() {
+  // Quotes
   const quotes = new QuoteList(quoteData);
   const simulator = new Simulator({
     quotes: quotes,
@@ -65,7 +68,17 @@ $(document).ready(function() {
 
   quoteListView.render();
 
+// Trade History
+tradeTemplate = _.template($('#trade-template').html());
 
+  const tradeListView = new TradeListView({
+    model: quotes,
+    template: tradeTemplate,
+    el: 'main',
+
+  });
+
+  tradeListView.bind();
 
 // // render one quote
 // const $quoteList = $('#quotes');
@@ -77,7 +90,8 @@ $(document).ready(function() {
 //     tagName: 'li',
 //     className: 'quote'
 //   });
-//   quoteView.render();
+//   $('#quotes-list')quoteView.render();
 //
-//   $quoteList.append(quoteView.render().$el);
+        //   $quoteList.append(quoteView.render().$el);
+
 });
diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index fe4f50d..0bde157 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -14,7 +14,7 @@ const QuoteView = Backbone.View.extend({
     return this;
   }, //render
   events: {
-    'click button.btn-buy': 'buy',
+    'click button.btn-buy': 'buy', //why lowercase?
     'click button.btn-sell': 'sell'
   },
 
diff --git a/src/views/trade_list_view.js b/src/views/trade_list_view.js
new file mode 100644
index 0000000..0ad78ed
--- /dev/null
+++ b/src/views/trade_list_view.js
@@ -0,0 +1,26 @@
+import Backbone from 'backbone';
+import _ from 'underscore';
+import Quote from '../models/quote';
+import QuoteView from '../views/quote_view';
+
+const TradeListView = Backbone.View.extend ({
+  initialize(params) {
+    this.template = params.template;
+    // this.listenTo(this.model, 'change', this.render);
+  },
+
+    bind() {
+      this.model.each((quote) => {
+        this.listenTo(quote,'trade', this.render)
+      });
+    },
+
+    render(data) {
+      let compiledTemplate = this.template(data)
+      this.$('#trades').prepend(compiledTemplate);
+
+    return this;
+  }
+});
+
+export default TradeListView;

From f3bf284a001204e6f10eedcc4682ffb5f5f1bf7c Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Thu, 14 Dec 2017 10:17:21 -0800
Subject: [PATCH 12/23] add order view

---
 src/views/order_view.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/views/order_view.js

diff --git a/src/views/order_view.js b/src/views/order_view.js
new file mode 100644
index 0000000..57bf60d
--- /dev/null
+++ b/src/views/order_view.js
@@ -0,0 +1,9 @@
+import Backbone from 'backbone';
+import Order from '../models/order';
+
+const OrderView = Backbone.View.extend({
+  initialize(params) {
+    this.template = params.template;
+    this.listenTo(this.model, 'change', this.render);
+  },
+});

From fcad05504aef47166c83a426fcbdf15c7dac8291 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Thu, 14 Dec 2017 14:06:54 -0800
Subject: [PATCH 13/23] add order list view

---
 src/views/order_list_view.js | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/views/order_list_view.js

diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
new file mode 100644
index 0000000..b5a8bd8
--- /dev/null
+++ b/src/views/order_list_view.js
@@ -0,0 +1,4 @@
+import Backbone from 'backbone';
+import _ from 'underscore';
+import Order from '../models/quote';
+import OrderView from '../views/order_view';

From e7bad872050d4708bb5363ed36f696cb69b8f11c Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Sun, 17 Dec 2017 20:53:48 -0800
Subject: [PATCH 14/23] unable to see open order, NaN returned

---
 dist/index.html                               |  4 +-
 src/app.js                                    | 38 +++++++++++--
 src/collections/order_list.js                 |  8 +++
 src/collections/quote_list.js                 |  1 -
 src/models/order.js                           | 30 +++++++++++
 src/views/order_entry_view.js                 | 53 +++++++++++++++++++
 src/views/order_list_view.js                  | 34 +++++++++++-
 src/views/order_view.js                       | 17 +++++-
 src/views/quote_list_view.js                  |  8 +++
 ...ade_list_view.js => trade_history_view.js} |  8 +--
 10 files changed, 189 insertions(+), 12 deletions(-)
 create mode 100644 src/collections/order_list.js
 create mode 100644 src/models/order.js
 create mode 100644 src/views/order_entry_view.js
 rename src/views/{trade_list_view.js => trade_history_view.js} (73%)

diff --git a/dist/index.html b/dist/index.html
index 1312378..c5a212c 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -57,9 +57,9 @@ <h2>Open Orders</h2>
        <div class="columns large-4 small-12 trade-column">
          <div class="order-entry-form columns small-10 small-offset-1">
            <h3>Order Entry Form</h3>
-           <form>
+           <form id="add-order-form">
              <label for="symbol">Symbol</label>
-             <select name="symbol">
+             <select id="symbol" name="symbol">
                <!-- Option entries should be added here using JavaScript -->
              </select>
              <label for="price-target">Price</label>
diff --git a/src/app.js b/src/app.js
index 35a581f..084bb08 100644
--- a/src/app.js
+++ b/src/app.js
@@ -7,10 +7,14 @@ import _ from 'underscore';
 import Simulator from 'models/simulator';
 import Quote from 'models/quote';
 import QuoteList from 'collections/quote_list';
+import Order from 'models/order';
+import OrderList from 'collections/order_list';
 
 import QuoteView from './views/quote_view';
 import QuoteListView from './views/quote_list_view';
-import TradeListView from './views/trade_list_view';
+import TradeHistoryView from './views/trade_history_view';
+import OrderListView from './views/order_list_view';
+import OrderEntryView from './views/order_entry_view';
 
 const quoteData = [
   {
@@ -48,6 +52,7 @@ const quoteData = [
 
 let quoteTemplate;
 let tradeTemplate;
+const bus = _.extend({}, Backbone.Events);
 
 $(document).ready(function() {
   // Quotes
@@ -71,14 +76,41 @@ $(document).ready(function() {
 // Trade History
 tradeTemplate = _.template($('#trade-template').html());
 
-  const tradeListView = new TradeListView({
+  const tradeHistoryView = new TradeHistoryView({
     model: quotes,
     template: tradeTemplate,
     el: 'main',
 
   });
 
-  tradeListView.bind();
+  tradeHistoryView.bind();
+
+// Add orders
+const orders = new OrderList();
+
+  $('#orderForm').on('submit', function(event) {
+    event.preventDefault();
+  });
+
+  quotes.each((quote) => {
+    $('#orderForm select').append($('<option>', {
+      value: quote.get('symbol'),
+      text: quote.get('symbol')
+    }));
+  });
+
+  const orderEntryView = new OrderEntryView({
+    el: '.order-entry-form',
+    bus: bus,
+  });
+
+  const orderListView = new OrderListView({
+    model: orders,
+    template: _.template($('#order-template').html()),
+    el: '.orders-list-container',
+    bus: bus,
+  });
+
 
 // // render one quote
 // const $quoteList = $('#quotes');
diff --git a/src/collections/order_list.js b/src/collections/order_list.js
new file mode 100644
index 0000000..8d7cabd
--- /dev/null
+++ b/src/collections/order_list.js
@@ -0,0 +1,8 @@
+import Backbone from 'backbone';
+import Order from 'models/order';
+
+const OrderList = Backbone.Collection.extend({
+  model: Order,
+});
+
+export default OrderList;
diff --git a/src/collections/quote_list.js b/src/collections/quote_list.js
index db4fc96..8da08cb 100644
--- a/src/collections/quote_list.js
+++ b/src/collections/quote_list.js
@@ -1,5 +1,4 @@
 import Backbone from 'backbone';
-
 import Quote from 'models/quote';
 
 const QuoteList = Backbone.Collection.extend({
diff --git a/src/models/order.js b/src/models/order.js
new file mode 100644
index 0000000..c95ca52
--- /dev/null
+++ b/src/models/order.js
@@ -0,0 +1,30 @@
+import Backbone from 'backbone';
+import Quote from '../models/quote';
+
+const Order = Backbone.Model.extend({
+  
+  buyit(){
+    const quote = this.get('quote');
+
+    if (this.get('targetPrice') >= quote.get('price') ||
+        this.get('targetPrice') === ''){
+          quote.buy();
+          return true;
+        }
+        return false;
+  },
+
+  sellIt(){
+    const quote = this.get('quote');
+
+    if (this.get('targetPrice') <= quote.get('price') ||
+        this.get('targetPrice') === '') {
+
+      quote.sell();
+      return true;
+    }
+    return false;
+  }
+});
+
+export default Order;
diff --git a/src/views/order_entry_view.js b/src/views/order_entry_view.js
new file mode 100644
index 0000000..e83081e
--- /dev/null
+++ b/src/views/order_entry_view.js
@@ -0,0 +1,53 @@
+import Backbone from 'backbone';
+import _ from 'underscore';
+import Order from '../models/order';
+import OrderView from '../views/order_view';
+import Quote from '../models/quote';
+import QuoteView from '../views/quote_view';
+
+const OrderEntryView = Backbone.View.extend({
+  initialize(params){
+    this.template = params.template;
+    this.bus = params.bus;
+  },
+
+  events: {
+    'click button.btn-buy': 'buy',
+    'click button.btn-sell': 'sell'
+  },
+  buy(event) {
+    event.preventDefault();
+    let orderData = {
+      buy: true
+    };
+
+    orderData.symbol = this.$('#orderForm select').val();
+    orderData.targetPrice = parseFloat(this.$('#target-price').val());
+
+    let order = new Order(orderData);
+      if (!order.isValid()) {
+        order.destroy();
+        this.updateStatusMessage(order.validationError);
+      return;
+      }
+
+    this.bus.trigger('newOrder', order);
+
+  },
+
+  sell(event) {
+    event.preventDefault();
+    let orderData = {
+      buy: false
+    };
+
+    orderData.symbol = this.$('#orderForm select').val();
+    orderData.targetPrice = parseFloat(this.$('#target-price').val());
+
+    let order = new Order(orderData);
+    this.bus.trigger('newOrder', order);
+    },
+
+
+});
+export default OrderEntryView;
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index b5a8bd8..210e524 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -1,4 +1,36 @@
 import Backbone from 'backbone';
 import _ from 'underscore';
-import Order from '../models/quote';
 import OrderView from '../views/order_view';
+import Order from '../models/order';
+// import OrderList from '../collections/order_list';
+
+
+const OrderListView = Backbone.View.extend({
+  initialize(params) {
+    this.template = params.template;
+    this.bus = params.bus;
+
+    this.listenTo(this.model, 'update', this.render);
+    this.listenTo(this.bus, 'newOrder', this.addOrder);
+  },
+  render() {
+    // update event happened
+    this.$('#orders').empty();
+    this.model.each((order) => {
+      const orderView = new OrderView({
+        model: order,
+        template: this.template,
+        tagName: 'li',
+        className: 'order',
+      });
+
+      this.$('#orders').append(orderView.render().$el);
+    });
+    return this;
+  },
+  addOrder(order) {
+    this.model.add(order);
+  }
+});
+
+export default OrderListView;
diff --git a/src/views/order_view.js b/src/views/order_view.js
index 57bf60d..324f825 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -4,6 +4,21 @@ import Order from '../models/order';
 const OrderView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
-    this.listenTo(this.model, 'change', this.render);
+  },
+  render() {
+    const compiledTemplate = this.template(this.model.toJSON());
+    this.$el.html(compiledTemplate);
+    return this;
+  },
+
+  events: {
+    'click .btn-cancel': 'cancel',
+  },
+
+  cancel(){
+    this.model.destroy();
+    this.remove();
   },
 });
+
+export default OrderView;
diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
index b670e1f..d366350 100644
--- a/src/views/quote_list_view.js
+++ b/src/views/quote_list_view.js
@@ -8,6 +8,7 @@ const QuoteListView = Backbone.View.extend ({
     this.template = params.template;
     this.listenTo(this.model, 'update', this.render);
   },
+
   render() {
     this.$('#quotes').empty();
     this.model.each((quote) => {
@@ -17,10 +18,17 @@ const QuoteListView = Backbone.View.extend ({
         tagName: 'li',
         className: 'quote',
       });
+
       this.$('#quotes').append(quoteView.render().$el);
+      // Add symbol dropdown list using js
+        let getSymbol = document.getElementById("symbol");
+           let option = document.createElement("option");
+           option.text = quote.get('symbol');
+           getSymbol.add(option);
     });
     return this;
   }
+
 });
 
 export default QuoteListView;
diff --git a/src/views/trade_list_view.js b/src/views/trade_history_view.js
similarity index 73%
rename from src/views/trade_list_view.js
rename to src/views/trade_history_view.js
index 0ad78ed..d20537e 100644
--- a/src/views/trade_list_view.js
+++ b/src/views/trade_history_view.js
@@ -3,7 +3,7 @@ import _ from 'underscore';
 import Quote from '../models/quote';
 import QuoteView from '../views/quote_view';
 
-const TradeListView = Backbone.View.extend ({
+const TradeHistoryView = Backbone.View.extend ({
   initialize(params) {
     this.template = params.template;
     // this.listenTo(this.model, 'change', this.render);
@@ -11,11 +11,11 @@ const TradeListView = Backbone.View.extend ({
 
     bind() {
       this.model.each((quote) => {
-        this.listenTo(quote,'trade', this.render)
+        this.listenTo(quote,'trade', this.renderHistory)
       });
     },
 
-    render(data) {
+    renderHistory(data) {
       let compiledTemplate = this.template(data)
       this.$('#trades').prepend(compiledTemplate);
 
@@ -23,4 +23,4 @@ const TradeListView = Backbone.View.extend ({
   }
 });
 
-export default TradeListView;
+export default TradeHistoryView;

From 873e8f226b8e50ac6736b8587f3706923718e79f Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Sun, 17 Dec 2017 23:37:49 -0800
Subject: [PATCH 15/23] can append price to open order but symbol is not
 visible

---
 src/views/order_entry_view.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/views/order_entry_view.js b/src/views/order_entry_view.js
index e83081e..7fc0173 100644
--- a/src/views/order_entry_view.js
+++ b/src/views/order_entry_view.js
@@ -1,8 +1,10 @@
 import Backbone from 'backbone';
 import _ from 'underscore';
+
+import Quote from '../models/quote';
 import Order from '../models/order';
+
 import OrderView from '../views/order_view';
-import Quote from '../models/quote';
 import QuoteView from '../views/quote_view';
 
 const OrderEntryView = Backbone.View.extend({
@@ -17,26 +19,29 @@ const OrderEntryView = Backbone.View.extend({
   },
   buy(event) {
     event.preventDefault();
+    console.log('test1');
     let orderData = {
       buy: true
     };
 
     orderData.symbol = this.$('#orderForm select').val();
-    orderData.targetPrice = parseFloat(this.$('#target-price').val());
+    let targetPrice = parseFloat(this.$('#target-price').val());
+    console.log('the target price is ' + targetPrice);
+    orderData.targetPrice = targetPrice;
 
     let order = new Order(orderData);
-      if (!order.isValid()) {
-        order.destroy();
-        this.updateStatusMessage(order.validationError);
+    if (!order.isValid()) {
+      order.destroy();
+      this.updateStatusMessage(order.validationError);
       return;
-      }
+    }
 
     this.bus.trigger('newOrder', order);
-
   },
 
   sell(event) {
     event.preventDefault();
+    console.log('selltest');
     let orderData = {
       buy: false
     };
@@ -44,10 +49,9 @@ const OrderEntryView = Backbone.View.extend({
     orderData.symbol = this.$('#orderForm select').val();
     orderData.targetPrice = parseFloat(this.$('#target-price').val());
 
+
     let order = new Order(orderData);
     this.bus.trigger('newOrder', order);
-    },
-
-
+  },
 });
 export default OrderEntryView;

From a978acd01a9189a7a52b2a347806e4be22820e81 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Sun, 17 Dec 2017 23:38:25 -0800
Subject: [PATCH 16/23] added target price id to input on add order form

---
 dist/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/index.html b/dist/index.html
index c5a212c..63e81da 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -63,7 +63,7 @@ <h3>Order Entry Form</h3>
                <!-- Option entries should be added here using JavaScript -->
              </select>
              <label for="price-target">Price</label>
-             <input type="number" name="price-target" step="0.10" min="0.00" placeholder="100.00" />
+             <input id="target-price" type="number" name="price-target" step="0.10" min="0.00" placeholder="100.00" />
              <label>Action</label>
              <button class="btn-buy alert button">Buy</button>
              <button class="btn-sell success button">Sell</button>

From b20e16875fbc7d9ed7b1bc2c055cea596f8a75a3 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Sun, 17 Dec 2017 23:41:43 -0800
Subject: [PATCH 17/23] fixed indentation

---
 src/app.js                      | 39 ++++++++++++++++++---------------
 src/models/order.js             |  2 +-
 src/views/order_list_view.js    |  4 ++--
 src/views/order_view.js         |  1 +
 src/views/quote_list_view.js    |  9 ++++----
 src/views/quote_view.js         |  1 -
 src/views/trade_history_view.js | 17 +++++++-------
 7 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/src/app.js b/src/app.js
index 084bb08..05abb9d 100644
--- a/src/app.js
+++ b/src/app.js
@@ -13,6 +13,7 @@ import OrderList from 'collections/order_list';
 import QuoteView from './views/quote_view';
 import QuoteListView from './views/quote_list_view';
 import TradeHistoryView from './views/trade_history_view';
+import OrderView from './views/order_view';
 import OrderListView from './views/order_list_view';
 import OrderEntryView from './views/order_entry_view';
 
@@ -52,6 +53,7 @@ const quoteData = [
 
 let quoteTemplate;
 let tradeTemplate;
+let orderTemplate;
 const bus = _.extend({}, Backbone.Events);
 
 $(document).ready(function() {
@@ -73,8 +75,8 @@ $(document).ready(function() {
 
   quoteListView.render();
 
-// Trade History
-tradeTemplate = _.template($('#trade-template').html());
+  // Trade History
+  tradeTemplate = _.template($('#trade-template').html());
 
   const tradeHistoryView = new TradeHistoryView({
     model: quotes,
@@ -85,8 +87,8 @@ tradeTemplate = _.template($('#trade-template').html());
 
   tradeHistoryView.bind();
 
-// Add orders
-const orders = new OrderList();
+  // Add orders
+  const orders = new OrderList();
 
   $('#orderForm').on('submit', function(event) {
     event.preventDefault();
@@ -104,26 +106,27 @@ const orders = new OrderList();
     bus: bus,
   });
 
+  orderTemplate = _.template($('#order-template').html());
   const orderListView = new OrderListView({
     model: orders,
-    template: _.template($('#order-template').html()),
+    template: orderTemplate,
     el: '.orders-list-container',
     bus: bus,
   });
 
 
-// // render one quote
-// const $quoteList = $('#quotes');
-//
-//   const quoteView = new QuoteView({
-//     // el: 'ul',
-//     model: quotes.at(0),
-//     template: quoteTemplate,
-//     tagName: 'li',
-//     className: 'quote'
-//   });
-//   $('#quotes-list')quoteView.render();
-//
-        //   $quoteList.append(quoteView.render().$el);
+  // // render one quote
+  // const $quoteList = $('#quotes');
+  //
+  //   const quoteView = new QuoteView({
+  //     // el: 'ul',
+  //     model: quotes.at(0),
+  //     template: quoteTemplate,
+  //     tagName: 'li',
+  //     className: 'quote'
+  //   });
+  //   $('#quotes-list')quoteView.render();
+  //
+  //   $quoteList.append(quoteView.render().$el);
 
 });
diff --git a/src/models/order.js b/src/models/order.js
index c95ca52..edde9c0 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -2,7 +2,7 @@ import Backbone from 'backbone';
 import Quote from '../models/quote';
 
 const Order = Backbone.Model.extend({
-  
+
   buyit(){
     const quote = this.get('quote');
 
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index 210e524..15dbbdb 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -1,9 +1,8 @@
 import Backbone from 'backbone';
 import _ from 'underscore';
+
 import OrderView from '../views/order_view';
 import Order from '../models/order';
-// import OrderList from '../collections/order_list';
-
 
 const OrderListView = Backbone.View.extend({
   initialize(params) {
@@ -17,6 +16,7 @@ const OrderListView = Backbone.View.extend({
     // update event happened
     this.$('#orders').empty();
     this.model.each((order) => {
+      console.log('order is ' + JSON.stringify(order));
       const orderView = new OrderView({
         model: order,
         template: this.template,
diff --git a/src/views/order_view.js b/src/views/order_view.js
index 324f825..30c5497 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -4,6 +4,7 @@ import Order from '../models/order';
 const OrderView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
+    // this.listenTo(this.model, "change", this.render);
   },
   render() {
     const compiledTemplate = this.template(this.model.toJSON());
diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
index d366350..9030577 100644
--- a/src/views/quote_list_view.js
+++ b/src/views/quote_list_view.js
@@ -1,5 +1,6 @@
 import Backbone from 'backbone';
 import _ from 'underscore';
+
 import Quote from '../models/quote';
 import QuoteView from '../views/quote_view';
 
@@ -21,10 +22,10 @@ const QuoteListView = Backbone.View.extend ({
 
       this.$('#quotes').append(quoteView.render().$el);
       // Add symbol dropdown list using js
-        let getSymbol = document.getElementById("symbol");
-           let option = document.createElement("option");
-           option.text = quote.get('symbol');
-           getSymbol.add(option);
+      let getSymbol = document.getElementById("symbol");
+      let option = document.createElement("option");
+      option.text = quote.get('symbol');
+      getSymbol.add(option);
     });
     return this;
   }
diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index 0bde157..2d4a59a 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -26,7 +26,6 @@ const QuoteView = Backbone.View.extend({
   sell(event) {
     console.log('Make that money');
     this.model.sell();
-
   },
 });
 
diff --git a/src/views/trade_history_view.js b/src/views/trade_history_view.js
index d20537e..c897404 100644
--- a/src/views/trade_history_view.js
+++ b/src/views/trade_history_view.js
@@ -1,5 +1,6 @@
 import Backbone from 'backbone';
 import _ from 'underscore';
+
 import Quote from '../models/quote';
 import QuoteView from '../views/quote_view';
 
@@ -9,15 +10,15 @@ const TradeHistoryView = Backbone.View.extend ({
     // this.listenTo(this.model, 'change', this.render);
   },
 
-    bind() {
-      this.model.each((quote) => {
-        this.listenTo(quote,'trade', this.renderHistory)
-      });
-    },
+  bind() {
+    this.model.each((quote) => {
+      this.listenTo(quote,'trade', this.renderHistory)
+    });
+  },
 
-    renderHistory(data) {
-      let compiledTemplate = this.template(data)
-      this.$('#trades').prepend(compiledTemplate);
+  renderHistory(data) {
+    let compiledTemplate = this.template(data)
+    this.$('#trades').prepend(compiledTemplate);
 
     return this;
   }

From 2b50848c57c03d7d50a1644cc571455fa9f90e75 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Mon, 18 Dec 2017 00:01:17 -0800
Subject: [PATCH 18/23] symbol and price visible on open orders

---
 src/views/order_entry_view.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/order_entry_view.js b/src/views/order_entry_view.js
index 7fc0173..0a99f44 100644
--- a/src/views/order_entry_view.js
+++ b/src/views/order_entry_view.js
@@ -24,7 +24,9 @@ const OrderEntryView = Backbone.View.extend({
       buy: true
     };
 
-    orderData.symbol = this.$('#orderForm select').val();
+    let symbol = this.$('#add-order-form select').val();
+    console.log('the symbol is ' + symbol);
+    orderData.symbol = symbol;
     let targetPrice = parseFloat(this.$('#target-price').val());
     console.log('the target price is ' + targetPrice);
     orderData.targetPrice = targetPrice;
@@ -46,7 +48,7 @@ const OrderEntryView = Backbone.View.extend({
       buy: false
     };
 
-    orderData.symbol = this.$('#orderForm select').val();
+    orderData.symbol = this.$('#add-order-form select').val();
     orderData.targetPrice = parseFloat(this.$('#target-price').val());
 
 

From a939e03bbc38d596b74964161f05350234d8200c Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Mon, 18 Dec 2017 09:38:00 -0800
Subject: [PATCH 19/23] validation not working

---
 src/app.js                    | 16 ++++++++++------
 src/models/order.js           | 27 ++++++++++++++++++++++++++-
 src/views/order_entry_view.js |  2 +-
 src/views/order_view.js       | 29 ++++++++++++++++++++++++++++-
 4 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/src/app.js b/src/app.js
index 05abb9d..2b93ab5 100644
--- a/src/app.js
+++ b/src/app.js
@@ -94,19 +94,22 @@ $(document).ready(function() {
     event.preventDefault();
   });
 
-  quotes.each((quote) => {
-    $('#orderForm select').append($('<option>', {
-      value: quote.get('symbol'),
-      text: quote.get('symbol')
-    }));
-  });
+  // quotes.each((quote) => {
+  //   $('#orderForm select').append($('<option>', {
+  //     value: quote.get('symbol'),
+  //     text: quote.get('symbol')
+  //   }));
+  // });
 
   const orderEntryView = new OrderEntryView({
     el: '.order-entry-form',
     bus: bus,
   });
 
+  orderEntryView.render();
+
   orderTemplate = _.template($('#order-template').html());
+
   const orderListView = new OrderListView({
     model: orders,
     template: orderTemplate,
@@ -115,6 +118,7 @@ $(document).ready(function() {
   });
 
 
+
   // // render one quote
   // const $quoteList = $('#quotes');
   //
diff --git a/src/models/order.js b/src/models/order.js
index edde9c0..e94be6a 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -2,6 +2,28 @@ import Backbone from 'backbone';
 import Quote from '../models/quote';
 
 const Order = Backbone.Model.extend({
+  defaults: {
+   symbol: 'UNDEF',
+   targetPrice: 0.00,
+   buy: true,
+   // quote: null
+ },
+// Validation is not working
+//  validate(attributes) {
+//     const errors = {};
+//     const targetPrice = this.get('targetPrice');
+//     const symbol = this.get('symbol');
+//
+//     if (!attributes.targetPrice) {
+//       errors['targetPrice'] = ["Target Price is required"];
+//     }
+//
+//     if (!attributes.symbol) {
+//       errors['symbol'] = ["Symbol is required"];
+//     }
+//
+// },
+//
 
   buyit(){
     const quote = this.get('quote');
@@ -24,7 +46,10 @@ const Order = Backbone.Model.extend({
       return true;
     }
     return false;
-  }
+  },
+
+
+
 });
 
 export default Order;
diff --git a/src/views/order_entry_view.js b/src/views/order_entry_view.js
index 0a99f44..60e375a 100644
--- a/src/views/order_entry_view.js
+++ b/src/views/order_entry_view.js
@@ -52,7 +52,7 @@ const OrderEntryView = Backbone.View.extend({
     orderData.targetPrice = parseFloat(this.$('#target-price').val());
 
 
-    let order = new Order(orderData);
+    let neworder = new Order(orderData);
     this.bus.trigger('newOrder', order);
   },
 });
diff --git a/src/views/order_view.js b/src/views/order_view.js
index 30c5497..1204cf7 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -1,11 +1,38 @@
 import Backbone from 'backbone';
+
 import Order from '../models/order';
+import Quote from '../models/quote';
+
+import OrderList from '../collections/order_list';
+
+import $ from 'jquery';
 
 const OrderView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
-    // this.listenTo(this.model, "change", this.render);
+    this.model = params.model;
+    this.listenTo(this.model, "change", this.render);
+    this.listenTo(this.model.get('quote'), 'change', this.closeOrder);
   },
+
+  closeOrder() {
+    let quote = this.model.get('quote');
+
+    if (this.model.get('buy')) {
+      if (this.model.get('targetPrice') >= quote.get('price')) {
+        quote.buy();
+        this.model.destroy();
+        this.remove();
+      }
+    } else {
+      if (this.model.get('targetPrice') <= quote.get('price')) {
+        quote.sell();
+        this.model.destroy();
+        this.remove();
+      }
+    }
+  },
+
   render() {
     const compiledTemplate = this.template(this.model.toJSON());
     this.$el.html(compiledTemplate);

From 9a81f0ce70acada390fd2488a10ceaf0ac6f013a Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Tue, 19 Dec 2017 07:17:02 -0800
Subject: [PATCH 20/23] moved business logic from view to model

---
 src/views/order_view.js | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/views/order_view.js b/src/views/order_view.js
index 1204cf7..6197700 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -16,22 +16,37 @@ const OrderView = Backbone.View.extend({
   },
 
   closeOrder() {
-    let quote = this.model.get('quote');
-
-    if (this.model.get('buy')) {
-      if (this.model.get('targetPrice') >= quote.get('price')) {
-        quote.buy();
+    if(this.model.get('buy')){
+      if(this.model.buyStock()){
         this.model.destroy();
         this.remove();
       }
-    } else {
-      if (this.model.get('targetPrice') <= quote.get('price')) {
-        quote.sell();
-        this.model.destroy();
-        this.remove();
+    }
+    else{
+      if(this.model.sellStock()){
+        if(this.model.sellStock()){
+          this.model.destroy();
+          this.remove();
+        }
       }
     }
   },
+    // let quote = this.model.get('quote');
+//moved logic to model
+    // if (this.model.get('buy')) {
+    //   if (this.model.get('targetPrice') >= quote.get('price')) {
+    //     quote.buy();
+    //     this.model.destroy();
+    //     this.remove();
+    //   }
+    // } else {
+    //   if (this.model.get('targetPrice') <= quote.get('price')) {
+    //     quote.sell();
+    //     this.model.destroy();
+    //     this.remove();
+    //   }
+    // }
+  // },
 
   render() {
     const compiledTemplate = this.template(this.model.toJSON());

From 7fe3e8035bfe1f995e033bf6d1684ccec9322e21 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Tue, 19 Dec 2017 07:18:31 -0800
Subject: [PATCH 21/23] call function to closeout order

---
 src/views/order_entry_view.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/order_entry_view.js b/src/views/order_entry_view.js
index 60e375a..d12e16c 100644
--- a/src/views/order_entry_view.js
+++ b/src/views/order_entry_view.js
@@ -11,6 +11,7 @@ const OrderEntryView = Backbone.View.extend({
   initialize(params){
     this.template = params.template;
     this.bus = params.bus;
+    this.quotesList = params.quotesList;
   },
 
   events: {
@@ -30,6 +31,7 @@ const OrderEntryView = Backbone.View.extend({
     let targetPrice = parseFloat(this.$('#target-price').val());
     console.log('the target price is ' + targetPrice);
     orderData.targetPrice = targetPrice;
+    orderData.quote = this.quotesList.findWhere({symbol: orderData.symbol});
 
     let order = new Order(orderData);
     if (!order.isValid()) {
@@ -50,6 +52,7 @@ const OrderEntryView = Backbone.View.extend({
 
     orderData.symbol = this.$('#add-order-form select').val();
     orderData.targetPrice = parseFloat(this.$('#target-price').val());
+    orderData.quote = this.quotesList.findWhere({symbol: orderData.symbol});
 
 
     let neworder = new Order(orderData);

From 8a77dee706f4eb91f28fbeb9b9600574818cf178 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Tue, 19 Dec 2017 07:22:58 -0800
Subject: [PATCH 22/23] fixed bug, wrong variable caused error when sell button
 is clicked

---
 src/views/order_entry_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/order_entry_view.js b/src/views/order_entry_view.js
index d12e16c..990dbd2 100644
--- a/src/views/order_entry_view.js
+++ b/src/views/order_entry_view.js
@@ -55,7 +55,7 @@ const OrderEntryView = Backbone.View.extend({
     orderData.quote = this.quotesList.findWhere({symbol: orderData.symbol});
 
 
-    let neworder = new Order(orderData);
+    let order = new Order(orderData);
     this.bus.trigger('newOrder', order);
   },
 });

From e863c388ecaa045e52a41ff0e3530c9e20f9be40 Mon Sep 17 00:00:00 2001
From: nkiru onwuneme <generalhrh@gmail.com>
Date: Tue, 19 Dec 2017 07:24:52 -0800
Subject: [PATCH 23/23] order executes if sell or buy price matches quote

---
 src/app.js          | 1 +
 src/models/order.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app.js b/src/app.js
index 2b93ab5..aac873a 100644
--- a/src/app.js
+++ b/src/app.js
@@ -104,6 +104,7 @@ $(document).ready(function() {
   const orderEntryView = new OrderEntryView({
     el: '.order-entry-form',
     bus: bus,
+    quotesList: quotes
   });
 
   orderEntryView.render();
diff --git a/src/models/order.js b/src/models/order.js
index e94be6a..bc04e91 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -25,7 +25,7 @@ const Order = Backbone.Model.extend({
 // },
 //
 
-  buyit(){
+  buyStock(){
     const quote = this.get('quote');
 
     if (this.get('targetPrice') >= quote.get('price') ||
@@ -36,7 +36,7 @@ const Order = Backbone.Model.extend({
         return false;
   },
 
-  sellIt(){
+  sellStock(){
     const quote = this.get('quote');
 
     if (this.get('targetPrice') <= quote.get('price') ||