Remove console logs

views/dataPage/fetchData.js

@@ -57,7 +57,34 @@ window.fetchData = function(from, to){
                             break;
                         }
                     }
-                    //change to/from in date list
+
+                    for(let set of response.data){
+                        if(set.transactions[0] < data.transactions[0]){
+                            data.transactions = set.transactions.concat(data.transactions);
+                        }else if(set.transactions[set.transactions.length-1] > data.transactions[data.transactions.length-1]){
+                            data.transactions = data.transactions.concat(set.transactions);
+                        }else{
+                            for(let i = 0; i < data.transactions.length; i++){
+                                if(set.transactions[0] > data.transactions[i].date){
+                                    data.transactions = data.transactions.slice(0, i).concat(set.transactions).concat(data.transactions.slice(i, data.transactions.length - 1));
+                                    break;
+                                }
+                            }
+                        }
+
+                        if(set.purchases[0] < data.purchases[0]){
+                            data.purchases = set.purchases.concat(data.purchases);
+                        }else if(set.purchases[set.purchases.length-1] > data.purchases[data.purchases.length-1]){
+                            data.purchases = data.purchases.concat(set.purchases);
+                        }else{
+                            for(let i = 0; i < data.purchases.length; i++){
+                                if(set.purchases[0] > data.purchases[i].date){
+                                    data.purchases = data.purchases.slice(0, i).concat(set.purchases).concat(data.purchases.slice(i, data.purchases.length - 1));
+                                    break;
+                                }
+                            }
+                        }
+                    }
                 }
             })
             .catch((err)=>{});

views/dataPage/ingredient.js

@@ -8,8 +8,8 @@ window.ingredientObj = {
         document.querySelector("strand-selector").setAttribute("strand", "ingredient");
 
         //A grabastic bag of bullshit to get rid of
-        let date = new Date();
-        let d = new Date(date.getFullYear(), date.getMonth(), 1);
+        let now = new Date();
+        let startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
 
         if(!this.isPopulated){
             let ingredientsDiv = document.querySelector("#ingredientOptions");
@@ -24,7 +24,7 @@ window.ingredientObj = {
                 checkbox.id = `${item.ingredient.name}Checkbox`;
                 checkbox.onchange = ()=>{
                     if(checkbox.checked){
-                        this.graph.addData(this.formatData(item.ingredient._id, d, new Date()), [d, new Date()], item.ingredient._id);
+                        this.graph.addData(this.formatData(item.ingredient._id, startOfMonth, new Date()), [startOfMonth, new Date()], item.ingredient._id);
                     }else{
                         this.graph.removeData(item.ingredient._id);
                     }
@@ -52,7 +52,7 @@ window.ingredientObj = {
         if(ingredient){
             this.graph.clearData();
             
-            this.graph.addData(this.formatData(ingredient.id, d, new Date()), [d, new Date()], ingredient.id);
+            this.graph.addData(this.formatData(ingredient.id, startOfMonth, new Date()), [startOfMonth, new Date()], ingredient.id);
 
             for(let label of document.querySelector("#ingredientOptions").children){
                 if(label.innerText === ingredient.name){