Просмотр исходного кода

Add the code to display modal for the uploading of orders through a spreadsheet.

Lee Morgan 5 лет назад
Родитель
Сommit
7aa660b3ae

+ 12 - 3
views/dashboardPage/bundle.js

@@ -1493,12 +1493,20 @@ controller = {
         let modal = document.getElementById("modal");
         modal.style.display = "flex";
         document.getElementById("modalClose").addEventListener("click", this.closeModal);
+        let content = {};
 
         switch(str){
             case "recipeSpreadsheet":
-                let form = document.getElementById("modalSpreadsheetUpload");
-                form.style.display = "flex";
-                form.onsubmit = newRecipe.submitSpreadsheet;
+                content = document.getElementById("modalSpreadsheetUpload");
+                content.style.display = "flex";
+                document.getElementById("modalSpreadsheetTitle").innerText = "recipes";
+                content.onsubmit = newRecipe.submitSpreadsheet;
+                break;
+            case "orderSpreadsheet":
+                content = document.getElementById("modalSpreadsheetUpload");
+                content.style.display = "flex";
+                document.getElementById("modalSpreadsheetTitle").innerText = "orders";
+                form.submit = newOrder.submitSpreadsheet;
                 break;
         }
     },
@@ -2079,6 +2087,7 @@ let newOrder = {
     display: function(Order){
         document.getElementById("sidebarDiv").classList.add("sidebarWide");
         document.getElementById("newOrderIngredientList").style.display = "flex";
+        document.getElementById("orderFileUpload").addEventListener("click", ()=>{controller.openModal("orderSpreadsheet")});
 
         let selectedList = document.getElementById("selectedIngredientList");
         while(selectedList.children.length > 0){

+ 11 - 3
views/dashboardPage/js/dashboard.js

@@ -194,12 +194,20 @@ controller = {
         let modal = document.getElementById("modal");
         modal.style.display = "flex";
         document.getElementById("modalClose").addEventListener("click", this.closeModal);
+        let content = {};
 
         switch(str){
             case "recipeSpreadsheet":
-                let form = document.getElementById("modalSpreadsheetUpload");
-                form.style.display = "flex";
-                form.onsubmit = newRecipe.submitSpreadsheet;
+                content = document.getElementById("modalSpreadsheetUpload");
+                content.style.display = "flex";
+                document.getElementById("modalSpreadsheetTitle").innerText = "recipes";
+                content.onsubmit = newRecipe.submitSpreadsheet;
+                break;
+            case "orderSpreadsheet":
+                content = document.getElementById("modalSpreadsheetUpload");
+                content.style.display = "flex";
+                document.getElementById("modalSpreadsheetTitle").innerText = "orders";
+                form.submit = newOrder.submitSpreadsheet;
                 break;
         }
     },

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

@@ -2,6 +2,7 @@ let newOrder = {
     display: function(Order){
         document.getElementById("sidebarDiv").classList.add("sidebarWide");
         document.getElementById("newOrderIngredientList").style.display = "flex";
+        document.getElementById("orderFileUpload").addEventListener("click", ()=>{controller.openModal("orderSpreadsheet")});
 
         let selectedList = document.getElementById("selectedIngredientList");
         while(selectedList.children.length > 0){

+ 1 - 1
views/dashboardPage/modal.ejs

@@ -7,7 +7,7 @@
 
         <div id="modalContent">
             <form id="modalSpreadsheetUpload" class="modalSpreadsheetUpload" method="post">
-                <h3>Choose a file to upload your <span id="modalSpreadsheetTitle">ingredients</span></h3>
+                <h3>Choose a file to upload your <span id="modalSpreadsheetTitle"></span></h3>
                 <input id="spreadsheetInput" class="fileUpload" name="file" type="file">
                 <input type="hidden" name="type">
                 <input class="button" type="submit" value="SUBMIT">

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

@@ -38,6 +38,8 @@
 
     <button id="submitNewOrder" class="button">CREATE</button>
 
+    <button id="orderFileUpload" class="linkButton">Or, upload a spreadsheet</button>
+
     <template id="selectedIngredient">
         <div class="selectedIngredient">
             <div>