bug fixes galore

rchappuis · Apr 5, 2015 · 7a73033 · 7a73033
1 parent 103930c
commit 7a73033
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 17 deletions.
diff --git a/app.js b/app.js
@@ -8,7 +8,6 @@ var cookieParser = require('cookie-parser');
 var bodyParser = require('body-parser');
 
 var routes = require('./routes/index');
-var users = require('./routes/users');
 
 var app = express();
 
@@ -25,7 +24,6 @@ app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/', routes);
-app.use('/users', users);
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {

diff --git a/public/javascripts/loan_calculator/graph_controller.js b/public/javascripts/loan_calculator/graph_controller.js
@@ -39,6 +39,8 @@ GraphController.get_step_width = function (results, steps) {
 GraphController.get_data = function (results) {
     var max_row_length = 0;
     var max_row_index = 0;
+    var num_labels = 20;
+    var step_size;
     var datasets = [];
     var keys = Object.keys(results.loans);
     keys.sort(function (a, b) {
@@ -49,26 +51,31 @@ GraphController.get_data = function (results) {
     console.log(keys);
     for (var i = 0; i < keys.length; i++) {
         var loan_key = keys[i];
-        console.log("loan key")
+        console.log("loan key");
         console.log(loan_key);
         if (results.loans[loan_key].rows.length > max_row_length) {
             max_row_length = results.loans[loan_key].rows.length;
             max_row_index = loan_key;
         }
+        if (results.loans[max_row_index].rows.length > num_labels){
+            step_size = Math.floor(results.loans[max_row_index].rows.length/num_labels);
+        }
+        else {
+            step_size = 1;
+        }
+
+        console.log(step_size);
         datasets[i] = GraphController.get_color_hash(loan_key);
         datasets[i].data = [];
-        for (var j = 0; j < results.loans[loan_key].rows.length; j++) {
+        for (var j = 0; j < results.loans[loan_key].rows.length; j += step_size) {
             datasets[i].data.push(results.loans[loan_key].rows[j].balance_remaining);
         }
     }
     var labels = [];
-
-
-    for (var i = 0; i < results.loans[max_row_index].rows.length; i++) {
+    for (var i = 0; i < results.loans[max_row_index].rows.length; i += step_size) {
         labels.push(results.loans[max_row_index].rows[i].date);
     }
 
-
     return {
         labels: labels,
         datasets: datasets

diff --git a/public/javascripts/loan_calculator/init.js b/public/javascripts/loan_calculator/init.js
@@ -19,6 +19,10 @@ Math.sign = Math.sign || function sign(x) {
     return x > 0 ? 1 : -1;
 };
 
+var deep_copy = function(string) {
+    return JSON.parse(JSON.stringify(string))
+};
+
 
 // http://localhost:63342/unbury.us/public_html/index.html#name_0=1&balance_0=2&payment_0=4&rate_0=2
 var url_loans_valid = function (params) {

diff --git a/public/javascripts/loan_calculator/results_controller.js b/public/javascripts/loan_calculator/results_controller.js
@@ -98,7 +98,12 @@ ResultsController.calculate = function (loans, payment_type, monthly_payment) {
 
 
     //loop
+    var counter = 0;
     while (Object.keys(remaining_loans).length > 0) {
+        counter++;
+        if (counter > 12*50){
+            return null;
+        }
         month.add(1, 'months');
         var extra_payment = monthly_payment;
         for (var loan_key in remaining_loans) {

diff --git a/routes/index.js b/routes/index.js
@@ -6,4 +6,8 @@ router.get('/', function(req, res, next) {
   res.render("index");
 });
 
+router.get('/opportunity_cost', function(req, res, next) {
+    res.render("opportunity_cost");
+});
+
 module.exports = router;
diff --git a/routes/users.js b/routes/users.js
diff --git a/views/opportunity_cost.jade b/views/opportunity_cost.jade
@@ -0,0 +1 @@
+include opportunity_cost/index.html
diff --git a/views/opportunity_cost/index.html b/views/opportunity_cost/index.html
@@ -0,0 +1 @@
+<p>hey</p>