Merge pull request #32 from mkaplan9/mk_small_fixes

Mk small fixes

Author: mkaplan9

asset_allocation.html

@@ -99,7 +99,7 @@ <h4 class="aa-input-label">Set amount to add each year ($)</h4>
             <input type="text" placeholder="100" id="addAmount"/>
             <button id="addAmountButton">Set Add Amount</button>
 
-            <h4 class="aa-input-label">Set date range (enter years from 1963 to 2018)</h4>
+            <h4 class="aa-input-label">Set date range (YYYY)</h4>
             <input type="text" placeholder="1963" id="startDate"/>
             <input type="text" placeholder="2018" id="endDate"/>
             <button id="dateButton">Set Dates</button>
@@ -110,7 +110,7 @@ <h4 class="aa-input-label">Set date range (enter years from 1963 to 2018)</h4>
       <br></br>
 
       <div class="center">
-        <h4>Add New Line (enter percent stocks)</h4>
+        <h4>Add New Line (%)</h4>
         <input type="text" placeholder="70" id="percentStocks"/>
         <button id="addLine">Add Line</button>
         <button id="clear">Clear All Data</button>

assets/assetAllocation.png

@@ -123,13 +123,27 @@ <h2 class="featurette-heading right black">Abner Schreiber's Memoirs</h2>
           <a href="./my_favorite_things.html">
             <h2 class="featurette-heading black">A Few of My Favorite Things</h2>
           </a>
-          <p class="lead"></p>
+          <p class="lead">Quotes, books, articles, etc.</p>
         </div>
         <div class="col-md-4">
           <img class="featurette-image img-responsive right index-thumbnail-container" src="./assets/myFavoriteThings.jpg" alt="">
         </div>
       </div>
 
+      <hr class="featurette-divider">
+
+      <div class="row featurette">
+        <div class="col-md-4 col-md-offset-2 index-thumbnail-container">
+          <img class="featurette-image img-responsive left" src="./assets/assetAllocation.png" alt="">
+        </div>
+        <div class="col-md-4">
+          <a href="./asset_allocation.html">
+            <h2 class="featurette-heading right black">Asset Allocation Simulation</h2>
+          </a>
+          <p class="lead right">A simulation showing how different investment asset allocations would have fared over time.</p>
+        </div>
+      </div>
+
       <!-- /END THE FEATURETTES -->
       <br></br>
 

index.html

@@ -321,12 +321,23 @@ var config = {
   options: {
     title: {
       display: true,
+      fontSize: 30,
       text: 'Asset Allocation'
     },
     scales: {
       yAxes: [{
         ticks: {
           beginAtZero: true
+        },
+        scaleLabel: {
+          labelString: "Total Investment Value ($)",
+          display: true
+        }
+      }],
+      xAxes: [{
+        scaleLabel: {
+          labelString: "Year",
+          display: true
         }
       }]
     }
@@ -443,7 +454,7 @@ function getNewLine(percentStocks, startIndex, endIndex) {
 
     total = endStock + endBond
 
-    newLine.push(total)
+    newLine.push(Math.round(total))
   }
 
   return newLine