fixed citizens ui

2 files changed, 12 insertions, 12 deletions

diff --git a/interface/controllers/citizens.controller.js b/interface/controllers/citizens.controller.js
index ae0204e..1cb61cb 100644
--- a/interface/controllers/citizens.controller.js
+++ b/interface/controllers/citizens.controller.js
@@ -51,7 +51,7 @@ exports.getCountOfCitizens = () => {
 };
 
 exports.deleteCitizenbyId = (citizen_id) => {
-  const query = `delete from citizens where citizen_id = ${citizen_id};`;
+  const query = `delete from citizens where citizen_id = '${citizen_id}';`;
   return sequelize.query(query, { type: QueryTypes.DELETE });
 };
 
@@ -62,13 +62,13 @@ exports.editCitizen = (
   dob,
   marital_status
 ) => {
-  const query = `update citizens set address = '${address}', mobile_num = '${mobile_num}', dob = '${dob}', marital_status = '${marital_status}' where citizen_id = ${citizen_id};`;
+  const query = `update citizens set address = '${address}', mobile_num = '${mobile_num}', dob = '${dob}', marital_status = '${marital_status}' where citizen_id = '${citizen_id}';`;
   return sequelize.query(query, { type: QueryTypes.UPDATE });
 };
 
 //Check Citizen exists or not
 exports.checkCitizenId = (citizen_id) => {
-  const query = `select * from citizens where citizen_id = ${citizen_id};`;
+  const query = `select * from citizens where citizen_id = '${citizen_id}';`;
   return sequelize
     .query(query, { type: QueryTypes.SELECT })
     .then((citizen_id) => {
diff --git a/interface/public/citizens.js b/interface/public/citizens.js
index ea00aa5..b6cf74c 100644
--- a/interface/public/citizens.js
+++ b/interface/public/citizens.js
@@ -19,19 +19,19 @@ const pageLeft = $('#pageLeft');
 const pageRight = $('#pageRight');
 if (page > 1) {
   pageLeft.removeClass("disabled");
-  pageLeft.attr("href", `${window.location.pathname}?page=${parseInt(page) - 1}&limit=${limit}&query=${query}`);
+  pageLeft.attr("href", `/citizens?page=${parseInt(page) - 1}&limit=${limit}&query=${query}`);
 } else {
   pageLeft.addClass("disabled");
 }
 if (page < numberOfPages) {
   pageRight.removeClass("disabled");
-  pageRight.attr("href", `${window.location.pathname}?page=${parseInt(page) + 1}&limit=${limit}&query=${query}`);
+  pageRight.attr("href", `/citizens?page=${parseInt(page) + 1}&limit=${limit}&query=${query}`);
 } else {
   pageRight.addClass("disabled");
 }
 
 function redirectToLimit(limit) {
-  window.location.href = `${window.location.pathname}?page=1&limit=${limit}&query=${query}`;
+  window.location.href = `/citizens?page=1&limit=${limit}&query=${query}`;
 }
 
 addPageNumbers(numberOfPages);
@@ -50,7 +50,7 @@ function addPageNumbers(numberOfPages) {
     for (let i = startingPoint; i < startingPoint + 5; i++) {
       const linkElement = document.createElement("a");
       linkElement.innerHTML = i;
-      linkElement.setAttribute("href", `${window.location.pathname}?page=${i}&limit=${limit}&query=${query}`);
+      linkElement.setAttribute("href", `/citizens?page=${i}&limit=${limit}&query=${query}`);
       linkElement.setAttribute("id", `page${i}`);
       linkElement.classList.add("item");
       pageRight.before(linkElement);
@@ -65,7 +65,7 @@ function addPageNumbers(numberOfPages) {
     if (page > 3) {
       const firstPage = document.createElement("a");
       firstPage.innerHTML = 1;
-      firstPage.setAttribute("href", `${window.location.pathname}?page=1&limit=${limit}&query=${query}`);
+      firstPage.setAttribute("href", `/citizens?page=1&limit=${limit}&query=${query}`);
       firstPage.setAttribute("id", `page1`);
       firstPage.classList.add("item");
       pageLeft.after(dots);
@@ -76,7 +76,7 @@ function addPageNumbers(numberOfPages) {
     if (page != numberOfPages) {
       const lastPage = document.createElement("a");
       lastPage.innerHTML = numberOfPages;
-      lastPage.setAttribute("href", `${window.location.pathname}?page=${numberOfPages}&limit=${limit}&query=${query}`);
+      lastPage.setAttribute("href", `/citizens?page=${numberOfPages}&limit=${limit}&query=${query}`);
       lastPage.classList.add("item");
       pageRight.before(lastPage);
     }
@@ -86,7 +86,7 @@ function addPageNumbers(numberOfPages) {
       // Insert before pageRight
       const linkElement = document.createElement("a");
       linkElement.innerHTML = i;
-      linkElement.setAttribute("href", `${window.location.pathname}?page=${i}&limit=${limit}&query=${query}`);
+      linkElement.setAttribute("href", `/citizens?page=${i}&limit=${limit}&query=${query}`);
       linkElement.setAttribute("id", `page${i}`);
       linkElement.classList.add("item");
       pageRight.before(linkElement);
@@ -122,7 +122,7 @@ function editCitizen(event) {
     citizen_id: $("#citizen_id").html(),
   };
   $.ajax({
-    url: "/api${window.location.pathname}/edit",
+    url: "/api/citizens/edit",
     type: "POST",
     data: data,
     success: function (response) {
@@ -136,7 +136,7 @@ function editCitizen(event) {
 function deleteCitizenRecord(citizen) {
   citizen_id = JSON.parse(citizen).citizen_id;
   $.ajax({
-    url: "/api${window.location.pathname}/delete",
+    url: "/api/citizens/delete",
     type: "POST",
     data: { citizen_id },
     success: function (response) {