diff --git a/package-lock.json b/package-lock.json
index 2e0417a..cfeb6ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13867,9 +13867,9 @@
             "dev": true
         },
         "qs": {
-            "version": "6.5.2",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-            "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+            "version": "6.9.4",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+            "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
         },
         "query-string": {
             "version": "4.3.4",
@@ -14348,6 +14348,13 @@
                 "tough-cookie": "~2.5.0",
                 "tunnel-agent": "^0.6.0",
                 "uuid": "^3.3.2"
+            },
+            "dependencies": {
+                "qs": {
+                    "version": "6.5.2",
+                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+                    "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+                }
             }
         },
         "request-promise-core": {
diff --git a/package.json b/package.json
index fa91c4c..4faa35d 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
         "moment": "^2.24.0",
         "nprogress": "^0.2.0",
         "papaparse": "^5.1.1",
+        "qs": "^6.9.4",
         "quill": "^1.3.6",
         "save": "^2.4.0",
         "underscore": "^1.9.1",
diff --git a/src/pages/Report/idCard.vue b/src/pages/Report/idCard.vue
index d4be9ca..f548ae5 100644
--- a/src/pages/Report/idCard.vue
+++ b/src/pages/Report/idCard.vue
@@ -13,13 +13,14 @@
                     label="Select Type"
                     :items="getRoles"
                     item-text="name"
-                    item-value="role"
+                    return-object
                     @change="getRoleInputs(getReport.role)"
                     required
                   ></v-autocomplete>
                 </v-flex>
               </v-layout>
             </v-flex>
+            <!-- SELECT CLASS -->
             <v-flex xs12 sm12 lg4 v-if="showClass">
               <v-layout>
                 <v-flex xs12 sm12 lg10 class="ml-2">
@@ -35,6 +36,7 @@
                 </v-flex>
               </v-layout>
             </v-flex>
+            <!-- SELECT SECTION -->
             <v-flex xs12 sm12 lg4 v-if="showSections">
               <v-layout>
                 <v-flex xs12 sm12 lg10 class="ml-2">
@@ -51,6 +53,7 @@
                 </v-flex>
               </v-layout>
             </v-flex>
+            <!-- SELECT STUDENT -->
             <v-flex xs12 sm12 lg4 v-if="showStudents">
               <v-layout>
                 <v-flex xs12 sm12 lg10 class="ml-2">
@@ -420,6 +423,7 @@
 <script>
 import http from "@/Services/http.js";
 import moment from "moment";
+var qs = require("qs");
 
 export default {
   data: () => ({
@@ -456,18 +460,18 @@ export default {
     getSelectUserData: [],
     // Users: [],
     getReport: {},
-    typeRules: [v => !!v || "Type is required"],
+    typeRules: [(v) => !!v || "Type is required"],
     typeList: [
       {
         name: "Front Part",
-        value: "frontPart"
+        value: "frontPart",
       },
       {
         name: "Back Part",
-        value: "backPart"
-      }
+        value: "backPart",
+      },
     ],
-    backgroundList: ["Yes", "No"]
+    backgroundList: ["Yes", "No"],
   }),
 
   mounted() {
@@ -477,7 +481,7 @@ export default {
   },
 
   methods: {
-    dates: function(date) {
+    dates: function (date) {
       return moment(date).format("MMMM DD, YYYY");
       return date;
     },
@@ -496,7 +500,7 @@ export default {
       this.showReport = false;
       this.getReport._id = "";
       this.getCard = "";
-      if (role === 4) {
+      if (role.name === "STUDENT") {
         // console.log("role", role);
         this.showClass = true;
         this.showTeacher = false;
@@ -507,7 +511,7 @@ export default {
         this.showSections = false;
         this.getClass();
       }
-      if (role === 3) {
+      if (role.name === "TEACHER") {
         this.showTeacher = true;
         this.showClass = false;
         this.showAdmin = false;
@@ -517,7 +521,7 @@ export default {
         this.showSections = false;
         this.getTeacherList();
       }
-      if (role === 2) {
+      if (role.name === "ADMIN") {
         this.showAdmin = true;
         this.showTeacher = false;
         this.showClass = false;
@@ -527,7 +531,7 @@ export default {
         this.showSections = false;
         this.getUserData();
       }
-      if (role === 6) {
+      if (role.name === "ACCOUNTANT") {
         this.showAccountant = true;
         this.showAdmin = false;
         this.showTeacher = false;
@@ -535,9 +539,9 @@ export default {
         this.showLibrarian = false;
         this.showStudents = false;
         this.showSections = false;
-        this.getUsersList(role);
+        this.getUsersList(role.role);
       }
-      if (role === 7) {
+      if (role.name === "LIBRARIAN") {
         this.showLibrarian = true;
         this.showAccountant = false;
         this.showAdmin = false;
@@ -545,7 +549,7 @@ export default {
         this.showClass = false;
         this.showStudents = false;
         this.showSections = false;
-        this.getUsersList(role);
+        this.getUsersList(role.role);
       }
     },
 
@@ -558,10 +562,10 @@ export default {
       this.showLoader = true;
       http()
         .get("/getParticularUserDetail")
-        .then(response => {
+        .then((response) => {
           let mergeObj = {
             name: "Select All",
-            id: "Select All"
+            id: "Select All",
           };
           this.getSelectUserData.push(mergeObj);
           let getUserDetails = response.data.data;
@@ -569,7 +573,7 @@ export default {
           this.showLoader = false;
           // this.adminList = response.data.data;
         })
-        .catch(error => {
+        .catch((error) => {
           this.showLoader = false;
           if (error.response.status === 401) {
             this.$router.replace({ path: "/" });
@@ -582,19 +586,22 @@ export default {
       this.showLoader = true;
       http()
         .get("/getRolesList", {
-          headers: { Authorization: "Bearer " + this.token }
+          headers: { Authorization: "Bearer " + this.token },
         })
-        .then(response => {
+        .then((response) => {
           var getRoles = [];
           getRoles = response.data.data;
           for (let i = 0; i < getRoles.length; i++) {
-            if (getRoles[i].role != "1" && getRoles[i].role != "5") {
+            if (
+              getRoles[i].name != "SUPERADMIN" &&
+              getRoles[i].name != "PARENT"
+            ) {
               this.getRoles.push(getRoles[i]);
             }
           }
           this.showLoader = false;
         })
-        .catch(error => {
+        .catch((error) => {
           this.showLoader = false;
           if (error.response.status === 401) {
             this.$router.replace({ path: "/" });
@@ -609,13 +616,13 @@ export default {
       this.showLoader = true;
       http()
         .get("/getClassesList", {
-          headers: { Authorization: "Bearer " + this.token }
+          headers: { Authorization: "Bearer " + this.token },
         })
-        .then(response => {
+        .then((response) => {
           this.classList = response.data.data;
           this.showLoader = false;
         })
-        .catch(error => {
+        .catch((error) => {
           this.showLoader = false;
           // console.log("err====>", err);
         });
@@ -627,15 +634,15 @@ export default {
           "/getSectionsList",
           { params: { classId: _id } },
           {
-            headers: { Authorization: "Bearer " + this.token }
+            headers: { Authorization: "Bearer " + this.token },
           }
         )
-        .then(response => {
+        .then((response) => {
           this.addSection = response.data.data;
           this.showSections = true;
           this.showLoader = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.showLoader = false;
           // console.log("err====>", err);
         });
@@ -647,19 +654,19 @@ export default {
         .get("/getStudentWithClass", {
           params: {
             classId: this.getReport.classId,
-            sectionId: this.getReport.sectionId
-          }
+            sectionId: this.getReport.sectionId,
+          },
         })
-        .then(response => {
+        .then((response) => {
           response.data.data.unshift({
             name: "Select All",
-            _id: "Select All"
+            _id: "Select All",
           });
           this.getSelectUserData = response.data.data;
           this.showStudents = true;
           this.showLoader = false;
         })
-        .catch(error => {
+        .catch((error) => {
           console.log("err====>", error);
           this.showLoader = false;
         });
@@ -669,42 +676,43 @@ export default {
       var getSelectUserId = [];
       for (let i = 0; i < this.getSelectUserData.length; i++) {
         console.log("this.getReport._id", this.getReport._id);
+        /* if the selected user id mathches any id in the original user data then push it in 
+        array, this way only one id will be pushed */
         if (this.getReport._id === this.getSelectUserData[i]._id) {
-          console.log(
-            "this.getSelectUserData[i]._id------------",
-            this.getSelectUserData[i]._id
-          );
           getSelectUserId.push(this.getSelectUserData[i]._id);
-        } else if (this.getReport._id == "Select All") {
-          console.log(
-            "this.getSelectUserData[i]._id)",
-            this.getSelectUserData[i]._id
-          );
+        } /* else if select all option is selected then all ids will be pushed */ else if (
+          this.getReport._id == "Select All"
+        ) {
           getSelectUserId.push(this.getSelectUserData[i]._id);
-          if (getSelectUserId[0] == undefined) {
-            delete getSelectUserId[0];
+          if (
+            getSelectUserId[0] == undefined ||
+            getSelectUserId[0] == "Select All"
+          ) {
+            getSelectUserId.shift();
           }
         }
       }
-      console.log(
-        // "this.getSelectUserData[i]._id",/
-        // this.getSelectUserData[i]._id,
-        "getSelectUserId",
-        getSelectUserId
-      );
+
       if (this.$refs.form.validate()) {
         this.showLoader = true;
+        // var strigified = JSON.stringify(getSelectUserId) 
+        // var profileId = [];
+        // profileId = getSelectUserId;
         http()
           .get("/getIdCardDetail", {
             headers: {
-              Authorization: "Bearer " + this.token
+              Authorization: "Bearer " + this.token,
             },
-            params: {
-              profileId: getSelectUserId,
-              role: this.getReport.role
-            }
+            params: { profileId: getSelectUserId, role: this.getReport.role.role, },
+            paramsSerializer: (params) => {
+              return qs.stringify(params);
+            },
+            // params: {
+            //   profileId: strigified,
+            //   role: this.getReport.role.role,
+            // },
           })
-          .then(response => {
+          .then((response) => {
             this.getCard = "";
             var data = response.data.data;
             if (
@@ -739,7 +747,7 @@ export default {
             this.showLoader = false;
             this.showReport = true;
           })
-          .catch(error => {
+          .catch((error) => {
             this.showLoader = false;
             // console.log("error", error.response.data.errors);
             if (error.response.data.errors) {
@@ -756,17 +764,17 @@ export default {
       var token = this.$store.state.token;
       http()
         .get("/getTeachersList", {
-          headers: { Authorization: "Bearer " + token }
+          headers: { Authorization: "Bearer " + token },
         })
-        .then(response => {
+        .then((response) => {
           response.data.data.unshift({
             name: "Select All",
-            _id: "Select All"
+            _id: "Select All",
           });
           this.getSelectUserData = response.data.data;
           this.showLoader = false;
         })
-        .catch(error => {
+        .catch((error) => {
           this.showLoader = false;
           if (error.response.status === 401) {
             this.$router.replace({ path: "/" });
@@ -781,17 +789,17 @@ export default {
       var token = this.$store.state.token;
       http()
         .get("/getUsersList?role=" + role, {
-          headers: { Authorization: "Bearer " + token }
+          headers: { Authorization: "Bearer " + token },
         })
-        .then(response => {
+        .then((response) => {
           response.data.data.unshift({
             name: "Select All",
-            _id: "Select All"
+            _id: "Select All",
           });
           this.getSelectUserData = response.data.data;
           this.showLoader = false;
         })
-        .catch(error => {
+        .catch((error) => {
           this.showLoader = false;
           if (error.response.status === 401) {
             this.$router.replace({ path: "/" });
@@ -804,13 +812,13 @@ export default {
       http()
         .get("getParentsList", {
           headers: {
-            Authorization: "Bearer " + this.$store.state.token
-          }
+            Authorization: "Bearer " + this.$store.state.token,
+          },
         })
-        .then(response => {
+        .then((response) => {
           this.parentsList = response.data.data;
         })
-        .catch(error => {
+        .catch((error) => {
           // console.log("err====>", error.response.data.message);
           this.showLoader = false;
           if (error.response.status === 401) {
@@ -820,8 +828,8 @@ export default {
             this.$store.dispatch("Role", null);
           }
         });
-    }
-  }
+    },
+  },
 };
 </script>
 
diff --git a/src/pages/User/user.vue b/src/pages/User/user.vue
index 51cd303..a0d7fe2 100644
--- a/src/pages/User/user.vue
+++ b/src/pages/User/user.vue
@@ -768,6 +768,7 @@
 import http from "@/Services/http.js";
 import Util from "@/util";
 import moment from "moment";
+import _ from 'lodash';
 
 export default {
   data: () => ({
@@ -1093,19 +1094,17 @@ export default {
           this.userRole = response.data.data;
           this.showLoader = false;
           this.userRole = response.data.data;
+           console.log("response 1- ",response.data.data,"user role 1- ",this.userRole)
           var removedRoles = _.remove(this.userRole, function(c) {
             //remove if color is green or yellow
-            return c.role === 1 || c.role === 3 || c.role === 4 || c.role === 5;
-            // console.log(c);
+            return c.name === "SUPERADMIN" || c.name === "TEACHER" || c.name === "STUDENT" || c.name === "PARENT" ;
           });
+          console.log("response - ",response.data.data,"user role - ",this.userRole,"removed - ",removedRoles)
+         
         })
         .catch(error => {
           this.showLoader = false;
-          if (error.response.status === 401) {
-            this.$router.replace({ path: "/" });
-            this.$store.dispatch("setToken", null);
-            this.$store.dispatch("Id", null);
-          }
+          
         });
     },
     suspendStatus(suspendStatus, id) {