Work on Monthly report page for premium user

Author: 5codeman

controllers/user_controller.js

@@ -169,6 +169,7 @@ module.exports.getLeaderboardUser = async (req, res) => {
     } catch (err) {
         console.log(err);
     }
+    //pending task - we have to send the sorted data from here backend only
 };
 
 //send sorted data from backend - pending wqtch sir video
@@ -206,7 +207,7 @@ module.exports.dailyReports = async (req, res) => {
     try {
         const date = req.body.date;
         const expenses = await Expense.findAll({
-            where: { date: date, userId: req.user.id },
+            where: { date: date, userId: req.user.id }
         });
         return res.send(expenses);
     } catch (error) {
@@ -218,15 +219,8 @@ module.exports.monthlyReports = async (req, res) => {
     try {
         const month = req.body.month;
         const expenses = await Expense.findAll({
-            where: {
-                date: {
-                    [sequelize.like]: `%-${month}-%`,
-                },
-                userId: req.user.id,
-            },
-            raw: true,
+            where: { date: { [sequelize.Op.like]: `%-${month}-%`, }, userId: req.user.id, } //, raw: true,
         });
-
         return res.send(expenses);
     } catch (error) {
         console.log(error);

public/js/reports.js

@@ -17,20 +17,13 @@ async function getDailyReport(e) {
         e.preventDefault();
         const date = new Date(dateInput.value);
         const formattedDate = `${date.getDate().toString().padStart(2, "0")}-${(
-            date.getMonth() + 1
-        )
-            .toString()
-            .padStart(2, "0")}-${date.getFullYear()}`;
+            date.getMonth() + 1).toString().padStart(2, "0")}-${date.getFullYear()}`;
 
         let totalAmount = 0;
-        const res = await axios.post(
-            "http://localhost:9000/user/dailyReports",
-            {
-                date: formattedDate,
-            }
-            // ,{ headers: { Authorization: token } }
+        const res = await axios.post("http://localhost:9000/user/dailyReports", { date: formattedDate }
         );
 
+        // for empty the previous data
         tbodyDaily.innerHTML = "";
         tfootDaily.innerHTML = "";
 
@@ -64,8 +57,8 @@ async function getDailyReport(e) {
         tr.setAttribute("class", "trStyle");
         tfootDaily.appendChild(tr);
 
-        const td1 = document.createElement("td");
-        const td2 = document.createElement("td");
+        const td1 = document.createElement("td"); // no use but make for balancing colums
+        const td2 = document.createElement("td"); // no use but make for balancing colums
         const td3 = document.createElement("td");
         const td4 = document.createElement("td");
 
@@ -88,18 +81,11 @@ monthShowBtn.addEventListener("click", getMonthlyReport);
 async function getMonthlyReport(e) {
     try {
         e.preventDefault();
-        // const token = localStorage.getItem("token");
         const month = new Date(monthInput.value);
-        const formattedMonth = `${(month.getMonth() + 1)
-            .toString()
-            .padStart(2, "0")}`;
+        const formattedMonth = `${(month.getMonth() + 1).toString().padStart(2, "0")}`;
 
         let totalAmount = 0;
-        const res = await axios.post(
-            "http://localhost:9000/user/monthlyReports",
-            {
-                month: formattedMonth,
-            }
+        const res = await axios.post("http://localhost:9000/user/monthlyReports", { month: formattedMonth }
             // ,{ headers: { Authorization: token } }
         );
 

public/views/reports.html

@@ -69,7 +69,7 @@ <h3>DAILY REPORTS</h3>
                 <form>
                     <div class="mb-3">
                         <label for="date" class="form-label"> Select Date</label>
-                        <input type="date" class="form-control" id="date" />
+                        <input type="date" class="form-control" id="date" required />
                     </div>
                     <button id="dateShowBtn" type="submit" class="btn btn-primary showBtn">Show</button>
                 </form>
@@ -117,7 +117,7 @@ <h3>MONTHLY REPORTS</h3>
                 <form>
                     <div class="mb-3">
                         <label for="month" class="form-label">Select Month</label>
-                        <input type="month" class="form-control" id="month" />
+                        <input type="month" class="form-control" id="month" required />
                     </div>
                     <button id="monthShowBtn" type="submit" class="btn btn-primary showBtn">Show</button>
                 </form>