Browse Source

Decoupled state from data.
Removed updateAnalytics function from the controller.

Lee Morgan 5 years ago
parent
commit
f82f83b965

+ 2 - 27
views/dashboardPage/js/classes/Merchant.js

@@ -212,9 +212,6 @@ class Merchant{
             const merchantIngredient = new MerchantIngredient(createdIngredient, quantity);
             this._ingredients.push(merchantIngredient);
         }
-
-        ingredientsStrand.populateByProperty();
-        analyticsStrand.populateButtons();
     }
 
     removeIngredient(ingredient){
@@ -224,10 +221,6 @@ class Merchant{
         }
 
         this._ingredients.splice(index, 1);
-
-        homeStrand.drawInventoryCheckCard();
-        ingredientsStrand.populateByProperty();
-        analyticsStrand.populateButtons();
     }
 
     getIngredient(id){
@@ -271,9 +264,6 @@ class Merchant{
                 this
             ));
         }
-
-        recipeBookStrand.populateRecipes();
-        analyticsStrand.populateButtons();
     }
 
     removeRecipe(recipe){
@@ -284,8 +274,7 @@ class Merchant{
 
         this._recipes.splice(index, 1);
 
-        recipeBookStrand.populateRecipes();
-        analyticsStrand.populateButtons();
+        state.updateRecipes();
     }
 
     get transactions(){
@@ -341,11 +330,6 @@ class Merchant{
         }
 
         this.transactions.sort((a, b) => (a.date > b.date) ? 1 : -1);
-
-        homeStrand.isPopulated = false;
-        ingredientsStrand.populateByProperty();
-        analyticsStrand.displayIngredient();
-        analyticsStrand.displayRecipe();
     }
 
     removeTransaction(transaction){
@@ -361,10 +345,7 @@ class Merchant{
 
         this._transactions.splice(this._transactions.indexOf(transaction), 1);
 
-        homeStrand.isPopulated = false;
-        ingredientsStrand.populateByProperty();
-        analyticsStrand.displayIngredient();
-        analyticsStrand.displayRecipe();
+        state.updateTransactions();
     }
 
     get orders(){
@@ -409,9 +390,6 @@ class Merchant{
                 }
             }
         }
-
-        ingredientsStrand.populateByProperty();
-        ordersStrand.displayOrders();
     }
 
     removeOrder(order){
@@ -430,9 +408,6 @@ class Merchant{
                 }
             }
         }
-
-        ingredientsStrand.isPopulated = false;
-        ordersStrand.isPopulated = false;
     }
 
     get units(){

+ 0 - 4
views/dashboardPage/js/dashboard.js

@@ -316,10 +316,6 @@ controller = {
         document.getElementById("menu").style.display = "none";
         document.querySelector(".contentBlock").style.display = "flex";
         document.getElementById("mobileMenuSelector").onclick = ()=>{this.openMenu()};
-    },
-
-    updateAnalytics: function(){
-        analytics.isPopulated = false;
     }
 }
 

+ 1 - 1
views/dashboardPage/js/sidebars/editIngredient.js

@@ -105,7 +105,7 @@ let editIngredient = {
             }else{
                 merchant.removeIngredient(merchant.getIngredient(response.ingredient._id));
                 merchant.addIngredients([response]);
-
+                state.updateIngredients();
                 controller.openStrand("ingredients");
                 controller.createBanner("INGREDIENT UPDATED", "success");
             }

+ 1 - 0
views/dashboardPage/js/sidebars/editRecipe.js

@@ -115,6 +115,7 @@ let editRecipe = {
                 }else{
                     merchant.removeRecipe(recipe)
                     merchant.addRecipes([response]);
+                    state.updateRecipes();
                     controller.openStrand("recipeBook");
                     controller.createBanner("RECIPE UPDATED", "success");
                 }

+ 1 - 0
views/dashboardPage/js/sidebars/ingredientDetails.js

@@ -71,6 +71,7 @@ let ingredientDetails = {
                     controller.createBanner(response, "error");
                 }else{
                     merchant.removeIngredient(ingredient);
+                    state.updateIngredients();
                     
                     controller.openStrand("ingredients");
                     controller.createBanner("INGREDIENT REMOVED", "success");

+ 2 - 0
views/dashboardPage/js/sidebars/newIngredient.js

@@ -62,6 +62,7 @@ let newIngredient = {
                     controller.createBanner(response, "error");
                 }else{
                     merchant.addIngredients([response]);
+                    state.updateIngredients();
                     controller.openStrand("ingredients");
 
                     controller.createBanner("INGREDIENT CREATED", "success");
@@ -96,6 +97,7 @@ let newIngredient = {
                     controller.createBanner(response, "error");
                 }else{
                     merchant.addIngredients(response);
+                    state.updateIngredients();
 
                     controller.createBanner("INGREDIENTS SUCCESSFULLY ADDED", "success");
                     controller.openStrand("ingredients");

+ 2 - 0
views/dashboardPage/js/sidebars/newOrder.js

@@ -91,6 +91,7 @@ let newOrder = {
                     controller.createBanner(response, "error");
                 }else{
                     merchant.addOrders([response], true);
+                    state.updateOrders();
                     
                     controller.openStrand("orders", merchant.orders);
                     controller.createBanner("NEW ORDER CREATED", "success");
@@ -150,6 +151,7 @@ let newOrder = {
                     controller.createBanner(response, "error");
                 }else{
                     merchant.addOrders([response], true);
+                    state.updateOrders();
 
                     controller.createBanner("ORDER CREATED AND INGREDIENTS UPDATED SUCCESSFULLY", "success");
                     controller.openStrand("orders");

+ 2 - 0
views/dashboardPage/js/sidebars/newRecipe.js

@@ -98,6 +98,7 @@ let newRecipe = {
                     controller.createBanner(response, "error");
                 }else{
                     merchant.addRecipes([response]);
+                    state.updateRecipes();
 
                     controller.createBanner("RECIPE CREATED", "success");
                     controller.openStrand("recipeBook");
@@ -135,6 +136,7 @@ let newRecipe = {
                     controller.createBanner(response, "error");
                 }else{
                     merchant.addRecipes(response);
+                    state.updateRecipes();
 
                     controller.createBanner("ALL RECIPES SUCCESSFULLY CREATED", "success");
                     controller.openStrand("recipeBook");

+ 2 - 2
views/dashboardPage/js/sidebars/newTransaction.js

@@ -76,8 +76,8 @@ let newTransaction = {
                         controller.createBanner(response, "error");
                     }else{
                         merchant.addTransactions([response], true);
+                        state.updateTransactions();
 
-                        controller.updateAnalytics();
                         controller.openStrand("transactions", merchant.getTransactions());
                         controller.createBanner("TRANSACTION CREATED", "success");
                     }
@@ -116,7 +116,7 @@ let newTransaction = {
                         response.recipes[i].recipe = response.recipes[i].recipe._id;
                     }
                     merchant.addTransactions([response], true);
-                    controller.updateAnalytics();
+                    state.updateTransactions();
 
                     controller.openStrand("transactions", merchant.transactions);
                     controller.createBanner("TRANSACTION SUCCESSFULLY CREATED.  INGREDIENTS UPDATED", "success");

+ 1 - 0
views/dashboardPage/js/sidebars/orderDetails.js

@@ -50,6 +50,7 @@ let orderDetails = {
                     controller.createBanner(response, "error");
                 }else{
                     merchant.removeOrder(order);
+                    state.updateOrders();
 
                     controller.openStrand("orders", merchant.orders);
                     controller.createBanner("ORDER REMOVED", "success");

+ 1 - 0
views/dashboardPage/js/sidebars/recipeDetails.js

@@ -41,6 +41,7 @@ let recipeDetails = {
                     controller.createBanner(response, "error");
                 }else{
                     merchant.removeRecipe(recipe);
+                    state.updateRecipes();
 
                     controller.createBanner("RECIPE REMOVED", "success");
                     controller.openStrand("recipeBook");

+ 1 - 1
views/dashboardPage/js/sidebars/transactionDetails.js

@@ -58,7 +58,7 @@ let transactionDetails = {
                     controller.createBanner(response, "error");
                 }else{
                     merchant.removeTransaction(this.transaction);
-                    controller.updateAnalytics();
+                    state.updateTransactions();
 
                     controller.openStrand("transactions", merchant.getTransactions());
                     controller.createBanner("TRANSACTION REMOVED", "success");

+ 1 - 0
views/dashboardPage/js/strands/home.js

@@ -266,6 +266,7 @@ let home = {
                             merchant.removeIngredient(merchant.getIngredient(response[i].ingredient._id));
                             merchant.addIngredients(response);
                         }
+                        state.updateIngredients();
                         controller.createBanner("INGREDIENTS UPDATED", "success");
                     }
                 })

+ 1 - 0
views/dashboardPage/js/strands/orders.js

@@ -51,6 +51,7 @@ let orders = {
                 }else{
                     merchant.clearOrders();
                     merchant.addOrders(response);
+                    state.updateOrders();
                 }
             })
             .catch((err)=>{