diff --git a/src/pages/Report/idCard.vue b/src/pages/Report/idCard.vue
index 4169ebf..7bb4b1d 100644
--- a/src/pages/Report/idCard.vue
+++ b/src/pages/Report/idCard.vue
@@ -7,13 +7,13 @@
           <v-layout wrap>
             <v-flex xs12 sm6 lg4>
               <v-layout>
-                <v-flex xs3 sm6 lg4 class="subheading mt-4">
+                <!-- <v-flex xs3 sm6 lg4 class="subheading mt-4">
                   <label class="right">Id Card For:</label>
-                </v-flex>
-                <v-flex xs7 sm6 lg7 class="ml-2">
+                </v-flex>-->
+                <v-flex xs7 sm6 lg10 class="ml-2">
                   <v-autocomplete
                     v-model="getReport.role"
-                    label="Please Select"
+                    label="Select Type"
                     :items="getRoles"
                     item-text="name"
                     item-value="role"
@@ -25,10 +25,10 @@
             </v-flex>
             <v-flex xs12 sm6 lg4 v-if="showClass">
               <v-layout>
-                <v-flex xs3 sm6 lg2 class="subheading mt-4">
+                <!-- <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Class:</label>
-                </v-flex>
-                <v-flex xs9 sm6 lg8 class="ml-2">
+                </v-flex>-->
+                <v-flex xs9 sm6 lg10 class="ml-2">
                   <v-select
                     v-model="getReport.classId"
                     label="Select Class"
@@ -43,10 +43,10 @@
             </v-flex>
             <v-flex xs12 sm6 lg4 v-if="showSections">
               <v-layout>
-                <v-flex xs3 sm6 lg2 class="subheading mt-4">
+                <!-- <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Section:</label>
-                </v-flex>
-                <v-flex xs9 sm6 lg8 class="ml-2">
+                </v-flex>-->
+                <v-flex xs9 sm6 lg10 class="ml-2">
                   <v-select
                     :items="addSection"
                     label="Select Section"
@@ -62,10 +62,10 @@
             </v-flex>
             <v-flex xs12 sm6 lg4 v-if="showStudents">
               <v-layout>
-                <v-flex xs3 sm6 lg4 class="subheading mt-4">
+                <!-- <v-flex xs3 sm6 lg4 class="subheading mt-4">
                   <label class="right">Student:</label>
-                </v-flex>
-                <v-flex xs9 sm6 lg7 class="ml-2">
+                </v-flex>-->
+                <v-flex xs9 sm6 lg10 class="ml-2">
                   <v-select
                     :items="getStudentsList"
                     label="Select Student"
@@ -79,10 +79,10 @@
             </v-flex>
             <v-flex xs12 sm6 lg4 v-if="showTeacher">
               <v-layout>
-                <v-flex xs3 sm6 lg2 class="subheading mt-4">
+                <!-- <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Teacher:</label>
-                </v-flex>
-                <v-flex xs9 sm6 lg8 class="ml-2">
+                </v-flex>-->
+                <v-flex xs9 sm6 lg10 class="ml-2">
                   <v-select
                     v-model="getReport._id"
                     label="Select Teacher"
@@ -96,9 +96,9 @@
             </v-flex>
             <v-flex xs12 sm6 lg4 v-if="showAdmin">
               <v-layout>
-                <v-flex xs3 sm6 lg2 class="subheading mt-4">
+                <!-- <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Admin:</label>
-                </v-flex>
+                </v-flex>-->
                 <v-flex xs9 sm6 lg10 class="ml-2">
                   <v-select
                     v-model="getReport._id"
@@ -113,10 +113,10 @@
             </v-flex>
             <v-flex xs12 sm6 lg4 v-if="showAccountant">
               <v-layout>
-                <v-flex xs3 sm6 lg2 class="subheading mt-4">
+                <!-- <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Accountant:</label>
-                </v-flex>
-                <v-flex xs9 sm6 lg8 class="ml-2">
+                </v-flex>-->
+                <v-flex xs9 sm6 lg10 class="ml-2">
                   <v-select
                     v-model="getReport._id"
                     label="Select Accountant"
@@ -130,10 +130,10 @@
             </v-flex>
             <v-flex xs12 sm6 lg4 v-if="showLibrarian">
               <v-layout>
-                <v-flex xs3 sm6 lg2 class="subheading mt-4">
+                <!-- <v-flex xs3 sm6 lg2 class="subheading mt-4">
                   <label class="right">Librarian:</label>
-                </v-flex>
-                <v-flex xs9 sm6 lg8 class="ml-2">
+                </v-flex>-->
+                <v-flex xs9 sm6 lg10 class="ml-2">
                   <v-select
                     v-model="getReport._id"
                     label="Select Librarian"
@@ -147,17 +147,18 @@
             </v-flex>
             <v-flex xs12 sm6 lg4>
               <v-layout>
-                <v-flex xs4 sm4 lg2 class="subheading mt-4">
+                <!-- <v-flex xs4 sm4 lg2 class="subheading mt-4">
                   <label class="right">Type:</label>
-                </v-flex>
-                <v-flex xs7 sm6 lg8 class="ml-2">
+                </v-flex>-->
+                <v-flex xs7 sm6 lg10 class="ml-2">
                   <v-autocomplete
-                    label="Please Select"
+                    label="Select View Type"
                     type="text"
                     :items="typeList"
                     v-model="getReport.form"
                     item-text="name"
                     item-value="value"
+                    :rules="typeRules"
                     @change="getReportType(getReport.form)"
                     required
                   ></v-autocomplete>
@@ -371,46 +372,7 @@
                       >
                         <b>{{ getCard.name}}</b>
                       </p>
-                      <!-- <p
-                        v-if="getCard.classId"
-                        style="color: #302653;font-size:24px;
-                          letter-spacing: 4px;"
-                      >{{ getCard.classId.classNum }}</p>-->
-                      <!-- <p
-                        v-if="getCard.classId"
-                        style="color: #302653;font-size:24px;
-                          letter-spacing: 4px;"
-                      >{{ getCard.sectionId.name }}</p>-->
-                      <!-- <p
-                        v-if="getCard.rollNo"
-                        style="color: #302653;font-size:24px;
-                          letter-spacing: 2px;"
-                      >Roll: {{ getCard.rollNo }}</p>
-                      <p
-                        v-if="getCard.joinDate"
-                        style="color: #302653;font-size:16px;
-                          letter-spacing: 2px;"
-                      >{{ dates(getCard.joinDate) }}</p>
-                      <p
-                        v-if="getCard.joiningDate"
-                        style="color: #302653;font-size:16px;
-                          letter-spacing: 2px;"
-                      >{{ dates(getCard.joiningDate) }}</p>
-                      <p
-                        v-if="getCard.phone"
-                        style="color: #302653;font-size:16px;
-                          letter-spacing: 2px;"
-                      >{{ getCard.phone }}</p>-->
-                      <!-- <p
-                        style="
-                        font-size: 19px;
-                        font-weight: 100;
-                        color: rgb(48, 38, 83);
-                        letter-spacing: 5px;"
-                      >
-                        <span v-if="getCard.mobile">{{ getCard.mobile}}</span>
-                        <span v-if="getCard.mobileNo">{{ getCard.mobileNo }}</span>
-                      </p>-->
+
                       <p
                         v-if="getCard.city"
                         style="
@@ -516,7 +478,7 @@ export default {
     // accountantRules: [v => !!v || "Accountant Field is required"],
     // librarianRules: [v => !!v || "Librarian Field is required"],
 
-    // typeRules: [v => !!v || "Type is required"],
+    typeRules: [v => !!v || "Type is required"],
     // backgroundRules: [v => !!v || "Background is required"],
     typeList: [
       {
@@ -596,7 +558,7 @@ export default {
         this.showLibrarian = false;
         this.showStudents = false;
         this.showSections = false;
-        this.getUsersList();
+        this.getUsersList(role);
       }
       if (role === 7) {
         this.showLibrarian = true;
@@ -606,7 +568,7 @@ export default {
         this.showClass = false;
         this.showStudents = false;
         this.showSections = false;
-        this.getUsersList();
+        this.getUsersList(role);
       }
     },
 
@@ -714,60 +676,62 @@ export default {
         });
     },
     getCards() {
-      http()
-        .get("/getIdCardDetail", {
-          headers: {
-            Authorization: "Bearer " + this.token
-          },
-          params: {
-            profileId: this.getReport._id,
-            role: this.getReport.role
-          }
-        })
-        .then(response => {
-          this.getCard = "";
-          var data = response.data.data;
-          if (
-            Object.keys(data.adminData).length != 0 &&
-            data.adminData.constructor === Object
-          ) {
-            this.getCard = response.data.data.adminData;
-            console.log("this.getCard ", this.getCard);
-          }
-          if (
-            Object.keys(data.teachersData).length != 0 &&
-            data.teachersData.constructor === Object
-          ) {
-            this.getCard = response.data.data.teachersData;
-            console.log("this.getCard--teachersData ", this.getCard);
-          }
-          if (
-            Object.keys(data.studentData).length != 0 &&
-            data.studentData.constructor === Object
-          ) {
-            this.getCard = response.data.data.studentData;
-            console.log("this.getCard--studentData ", this.getCard);
-          }
-          if (
-            Object.keys(data.usersData).length != 0 &&
-            data.usersData.constructor === Object
-          ) {
-            this.getCard = response.data.data.usersData;
-            console.log("this.getCard--usersData   ", this.getCard);
-          }
-          // console.log("this.getCard--all ", response.data.data);
-          this.showLoader = false;
-          this.showReport = true;
-        })
-        .catch(error => {
-          this.showLoader = false;
-          console.log("error", error.response.data.errors);
-          if (error.response.data.errors) {
-            this.snackbar = true;
-            this.text = " Field is required";
-            this.color = "error";
-          }
-        });
+      if (this.$refs.form.validate()) {
+        http()
+          .get("/getIdCardDetail", {
+            headers: {
+              Authorization: "Bearer " + this.token
+            },
+            params: {
+              profileId: this.getReport._id,
+              role: this.getReport.role
+            }
+          })
+          .then(response => {
+            this.getCard = "";
+            var data = response.data.data;
+            if (
+              Object.keys(data.adminData).length != 0 &&
+              data.adminData.constructor === Object
+            ) {
+              this.getCard = response.data.data.adminData;
+              console.log("this.getCard ", this.getCard);
+            }
+            if (
+              Object.keys(data.teachersData).length != 0 &&
+              data.teachersData.constructor === Object
+            ) {
+              this.getCard = response.data.data.teachersData;
+              console.log("this.getCard--teachersData ", this.getCard);
+            }
+            if (
+              Object.keys(data.studentData).length != 0 &&
+              data.studentData.constructor === Object
+            ) {
+              this.getCard = response.data.data.studentData;
+              console.log("this.getCard--studentData ", this.getCard);
+            }
+            if (
+              Object.keys(data.usersData).length != 0 &&
+              data.usersData.constructor === Object
+            ) {
+              this.getCard = response.data.data.usersData;
+              console.log("this.getCard--usersData   ", this.getCard);
+            }
+            // console.log("this.getCard--all ", response.data.data);
+            this.showLoader = false;
+            this.showReport = true;
+          })
+          .catch(error => {
+            this.showLoader = false;
+            console.log("error", error.response.data.errors);
+            if (error.response.data.errors) {
+              this.snackbar = true;
+              this.text = " Field is required";
+              this.color = "error";
+            }
+          });
+      }
     },
     getTeacherList() {
       this.showLoader = true;
@@ -789,11 +753,11 @@ export default {
           }
         });
     },
-    getUsersList() {
+    getUsersList(role) {
       this.showLoader = true;
       var token = this.$store.state.token;
       http()
-        .get("/getUsersList", {
+        .get("/getUsersList?role=" + role, {
           headers: { Authorization: "Bearer " + token }
         })
         .then(response => {