Bläddra i källkod

Fix minor things for transaction filtering. Finish transaction filtering.

Lee Morgan 6 år sedan
förälder
incheckning
1475b66b96

+ 1 - 0
controllers/transactionData.js

@@ -26,6 +26,7 @@ module.exports = {
         }
         let startDate = new Date(req.body.startDate);
         let endDate = new Date(req.body.endDate);
+        endDate = new Date(endDate.getFullYear(), endDate.getMonth(), endDate.getDate() + 1);
         Transaction.aggregate([
             {$match: {
                 merchant: new ObjectId(req.session.user),

+ 7 - 2
views/dashboardPage/dashboard.ejs

@@ -285,8 +285,13 @@
                                 </button>
                             </div>
                             <div class="dropdownContents" id="dateDropdown">
-                                <input id="transFilDate1"type="date">
-                                <input id="transFilDate2" type="date">
+                                <label>From:
+                                    <input id="transFilDate1"type="date">
+                                </label>
+                                
+                                <label>To:
+                                    <input id="transFilDate2" type="date">
+                                </label>
                             </div>
                             
                         </div>

+ 1 - 1
views/dashboardPage/transactions.js

@@ -84,7 +84,7 @@ window.transactionsStrandObj = {
             return;
         }
 
-        let recipeChoices = document.getElementById("transFilCheckboxes");
+        let recipeChoices = document.getElementById("recipeDropDown");
         for(let i = 0; i < recipeChoices.children.length; i += 3){
             if(recipeChoices.children[i].checked){
                 data.recipes.push(recipeChoices.children[i].recipe.id);