From a76a6f1351492db2c1b86e9dea5f35706279a24f Mon Sep 17 00:00:00 2001
From: Neeraj Sharma <neeraj.sharma@viithiisys.com>
Date: Mon, 18 May 2020 14:18:19 +0530
Subject: [PATCH] implelement task

---
 src/App.vue                             |  1 -
 src/components/pageHeader/AppDrawer.vue | 33 +++++++++++---------
 src/pages/Authentication/Login.vue      |  1 -
 src/pages/Library/eBook.vue             | 28 +++++++++++------
 src/pages/Library/issue.vue             | 10 ++++--
 src/pages/Library/member.vue            |  2 +-
 src/pages/Report/admitCard.vue          |  2 +-
 src/pages/Report/progressCardReport.vue | 55 ++++++++++++++++-----------------
 8 files changed, 74 insertions(+), 58 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 53c734a..cbb37f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,7 +11,6 @@
             <router-view></router-view>
           </div>
           <!-- App Footer -->
-          <!-- <v-footer height="auto" class="fixcolors pa-3 app--footer"></v-footer> -->
         </v-content>
         <!-- theme setting -->
         <!-- <v-btn small fab dark falt fixed top="top" right="right" class="setting-fab" color="red" @click="openThemeSettings">
diff --git a/src/components/pageHeader/AppDrawer.vue b/src/components/pageHeader/AppDrawer.vue
index 8542c3e..4a04e4f 100644
--- a/src/components/pageHeader/AppDrawer.vue
+++ b/src/components/pageHeader/AppDrawer.vue
@@ -4,28 +4,32 @@
     :mini-variant.sync="mini"
     :dark="$vuetify.dark"
     app
+    fixed
     v-model="drawer"
     hide-overlay
     width="260"
+    class="white--text side-bar-color"
   >
-    <img
-      v-bind:src="computeLogo"
-      height="40"
-      width="130"
-      class="imgLogo mb-3 mt-3"
-      alt="logo"
-      style="margin: auto;
-      display: block;"
-    />
     <!-- <vue-perfect-scrollbar
       class="drawer-menu--scroll side-bar-color mt-3"
       :settings="scrollSettings"
     >-->
-    <v-list dense expand class="white--text side-bar-color">
+    <v-toolbar class="white" flat>
+      <img
+        v-bind:src="computeLogo"
+        height="40"
+        width="130"
+        class="imgLogo mb-3 mt-3"
+        alt="logo"
+        style="margin: auto;
+      display: block;"
+      />
+    </v-toolbar>
+    <v-list dense dark>
       <template v-for="(item, i) in menus" v-if="role === 'ADMIN'">
         <!-- {{menus}} -->
         <!--group with subitems-->
-        <v-list-group v-if="item.items" :key="item.name" :group="item.group" no-action="no-action">
+        <v-list-group v-if="item.items" :key="item.name" :group="item.group" no-action>
           <v-list-tile slot="activator" ripple="ripple">
             <v-list-tile-action v-if="item.icon">
               <img :src="item.icon" width="22" alt="icons" />
@@ -698,12 +702,13 @@ export default {
 }
 .side-bar-color {
   background: #827bfa !important;
-  border-top-right-radius: 74px !important;
+  /* border-top-right-radius: 74px !important; */
 }
 .v-navigation-drawer--fixed {
   position: absolute !important;
-  height: inherit !important;
-  max-height: inherit !important;
+
+  min-height: calc(2000px - 64px - 50px - 81px) !important;
+  /* max-height: inherit !important; */
 }
 .hover:hover {
   color: red !important;
diff --git a/src/pages/Authentication/Login.vue b/src/pages/Authentication/Login.vue
index 53d924d..cd2e81e 100644
--- a/src/pages/Authentication/Login.vue
+++ b/src/pages/Authentication/Login.vue
@@ -49,7 +49,6 @@
                       name="input-10-1"
                       placeholder="Enter Your password"
                       @keyup.enter="login"
-                      counter
                     ></v-text-field>
                   </v-form>
                   <v-layout row wrap>
diff --git a/src/pages/Library/eBook.vue b/src/pages/Library/eBook.vue
index 6d2d72a..503dab3 100644
--- a/src/pages/Library/eBook.vue
+++ b/src/pages/Library/eBook.vue
@@ -358,6 +358,7 @@
                     label="Select Image"
                     @click="pickImage"
                     v-model="addEBooks.uploadCover"
+                    :rules="uploadImageRule"
                     append-icon="attach_file"
                     multiple
                   ></v-text-field>
@@ -375,6 +376,7 @@
                     label="Select File"
                     @click="pickFile"
                     v-model="addEBooks.uploadFile"
+                    :rules="uploadFileRule"
                     append-icon="attach_file"
                     multiple
                   ></v-text-field>
@@ -387,7 +389,7 @@
                   <label class="right">Private:</label>
                 </v-flex>
                 <v-flex xs7 class="ml-3">
-                  <v-checkbox v-model="addEBooks.private"></v-checkbox>
+                  <v-checkbox v-model="addEBooks.private" :rules="uploadPrivateRule"></v-checkbox>
                 </v-flex>
               </v-layout>
             </v-flex>
@@ -448,6 +450,10 @@ export default {
     anyFile: "",
     titleRules: [v => !!v || " Tilte is required"],
     descriptionRules: [v => !!v || " Description is required"],
+    uploadImageRule: [v => !!v || " field is required"],
+    uploadFileRule: [v => !!v || " fied is required"],
+    uploadPrivateRule: [v => !!v || " fied is required"],
+
     headers: [
       {
         align: "justify-center",
@@ -493,6 +499,7 @@ export default {
       /** fetch Image Name **/
       if (files[0] !== undefined) {
         this.imageName = files[0].name;
+        this.addEBooks.uploadCover = this.imageName;
         if (this.imageName.lastIndexOf(".") <= 0) {
           return;
         }
@@ -536,6 +543,7 @@ export default {
       /** fetch Image Name **/
       if (files[0] !== undefined) {
         this.fileName = files[0].name;
+        this.addEBooks.uploadFile = this.fileName;
         if (this.fileName.lastIndexOf(".") <= 0) {
           return;
         }
@@ -591,31 +599,33 @@ export default {
     },
     submit() {
       if (this.$refs.form.validate()) {
+        var uploadCover = "";
+        var uploadFile = "";
         if (this.files) {
           const [baseUrl, imageUrl] = this.files.split(/,/);
-          this.addEBooks.uploadCover = imageUrl;
-          // console.log("anyFile.split(/,/)", this.addEBooks.uploadCover);
+          uploadCover = imageUrl;
+          console.log("anyFile.split(/,/)", uploadCover);
         }
         if (this.anyFile) {
           const [baseUrl, fileUrl] = this.anyFile.split(/,/);
-          this.addEBooks.uploadFile = fileUrl;
-          // console.log("anyFile.split(/,/)", this.addEBooks.uploadFile);
+          uploadFile = fileUrl;
+          console.log("anyFile.split(/,/)", uploadFile);
         }
         let data = {
           classId: this.addEBooks.classId,
           name: this.addEBooks.name,
           author: this.addEBooks.author,
           private: this.addEBooks.private,
-          uploadCover: this.addEBooks.uploadCover,
-          uploadFile: this.addEBooks.uploadFile
+          uploadCover: uploadCover,
+          uploadFile: uploadFile
         };
         http()
           .post("/createEBook", data)
           .then(response => {
-            this.getEBooksList = [];
+            this.getEBooksList();
+            // this.getEBooksList = [];
             this.snackbar = true;
             this.addEBookDialog = false;
-            this.getEBooksList()
             this.text = response.data.message;
             this.color = "green";
             this.loading = false;
diff --git a/src/pages/Library/issue.vue b/src/pages/Library/issue.vue
index 146f102..aa6d97b 100644
--- a/src/pages/Library/issue.vue
+++ b/src/pages/Library/issue.vue
@@ -24,6 +24,7 @@
                         placeholder="fill your Library Id"
                         name="name"
                         type="text"
+                        disabled
                       ></v-text-field>
                     </v-flex>
                   </v-layout>
@@ -631,6 +632,9 @@ export default {
     getIssueList() {
       this.showLoader = true;
       this.loadingSearch = true;
+      if (this.libraryID) {
+        this.libraryId = this.libraryID;
+      }
       http()
         .get(
           "/getBooksIssueList",
@@ -717,10 +721,12 @@ export default {
         };
         this.loading = true;
         http()
+          .post("/createBookIssue", createBook)
           .then(response => {
+            this.getIssueList();
             this.snackbar = true;
             this.text = response.data.message;
-            // this.getIssueList();
+            this.addIssueDialog = false;
             this.color = "green";
             this.loading = false;
             this.clear();
@@ -743,11 +749,11 @@ export default {
       http()
         .put("/updateBookIssue", this.editedItem)
         .then(response => {
+          this.editIssueDialog = false;
           this.snackbar = true;
           this.text = "Successfully Edit Issue a Book";
           this.color = "green";
           this.getIssueList();
-          this.addIssueDialog = false;
           this.close();
         })
         .catch(error => {
diff --git a/src/pages/Library/member.vue b/src/pages/Library/member.vue
index 3ba61f7..414f793 100644
--- a/src/pages/Library/member.vue
+++ b/src/pages/Library/member.vue
@@ -499,7 +499,7 @@
       >
         <template slot="items" slot-scope="props">
           <tr class="tr">
-            <td class="td td-row text-xs-center">{{ props.index}}</td>
+            <td class="td td-row text-xs-center">{{ props.index + 1 }}</td>
             <td class="td td-row text-xs-center">
               <v-avatar>
                 <img :src="props.item.profilePicUrl" v-if="props.item.profilePicUrl" />
diff --git a/src/pages/Report/admitCard.vue b/src/pages/Report/admitCard.vue
index cfe29e4..be5aed9 100644
--- a/src/pages/Report/admitCard.vue
+++ b/src/pages/Report/admitCard.vue
@@ -159,7 +159,7 @@
                 >{{ userData.name }}</p>
                 <p>{{ userData.address }}, {{ userData.pinCode }}</p>
                 <div>
-                  <h4>First Terminal Exam Admit Card - ( {{ userData.establishmentYear }})</h4>
+                  <h4>{{ getScheduleList.scheduleData[0].examId.examName }} Exam Admit Card</h4>
                 </div>
               </v-flex>
               <v-flex xs4 style="text-align:center;margin-bottom:0px">
diff --git a/src/pages/Report/progressCardReport.vue b/src/pages/Report/progressCardReport.vue
index d2a6f8a..541e7c8 100644
--- a/src/pages/Report/progressCardReport.vue
+++ b/src/pages/Report/progressCardReport.vue
@@ -95,17 +95,16 @@
                       </v-btn>
                     </v-flex>
                   </v-layout>
-                  <div>
+                  <div id="printMe">
                     <card class="elevation-0" v-for="(value, id, Index) in filterData" :key="Index">
                       <!-- <v-flex xs12  flat> -->
                       <!-- {{value}}---{{id}}---{{index}} -->
                       <v-card
-                        id="printMe"
                         class="ma-3"
                         style="
                         border: 1px solid lightgrey;
-                        margin-bottom:14px;
-                        padding:20px"
+                        margin-bottom:0px;
+                        padding: 0px"
                       >
                         <div style="border: 1px solid lightgray;">
                           <v-layout>
@@ -116,7 +115,7 @@
                               overflow: hidden;
                               vertical-align: middle;
                               margin: 10px;
-                              padding-bottom: 10px;"
+                              padding-bottom: 0px;"
                               >
                                 <v-flex xs12 sm12 md12>
                                   <v-layout>
@@ -139,7 +138,7 @@
                                 </v-flex>
                               </div>
                               <!-- Profile School -->
-                              <v-flex xs12 sm12 md12 lg12 style="margin:0px 10px; ">
+                              <v-flex xs12 sm12 md12 lg12 style="margin:0px 0px; ">
                                 <v-layout>
                                   <v-flex
                                     xs5
@@ -150,7 +149,7 @@
                                     padding-left: 16px !important;"
                                   >
                                     <p
-                                      style="font-size:20px;margin-bottom: 16px;"
+                                      style="font-size:20px;margin-bottom: 0px;"
                                     >{{ userData.name }}</p>
                                     <p
                                       style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;"
@@ -167,7 +166,7 @@
                                     <div v-for="(studentMark,i,index) in value" :key="index">
                                       <p
                                         v-if="index == 0"
-                                        style="font-size:20px;margin-bottom: 16px;"
+                                        style="font-size:20px;margin-bottom: 0px;"
                                       >{{ studentMark[0].studentId.name }}</p>
                                       <p
                                         v-if="index == 0"
@@ -258,17 +257,17 @@
                                 <tr style="border: 1px solid lightgrey !important;padding:4px;">
                                   <td
                                     rowspan="2"
-                                    style="border: 1px solid lightgrey !important;padding: 6px;"
+                                    style="border: 1px solid lightgrey !important;padding: 0px;"
                                   >Subject</td>
                                   <template>
                                     <td
                                       v-for="(studentMarkData,i) in studentMark.studentsMarks"
                                       :key="i"
                                       colspan="2"
-                                      style="border: 1px solid lightgrey !important;padding: 6px;"
+                                      style="border: 1px solid lightgrey !important;padding: 0px;"
                                     >{{studentMarkData.markDistributionId.distributionType}}</td>
                                     <td
-                                      style="border: 1px solid lightgrey !important;padding: 6px;"
+                                      style="border: 1px solid lightgrey !important;padding: 0px;"
                                     >Total Marks</td>
                                   </template>
                                 </tr>
@@ -276,11 +275,11 @@
                                   <template v-for="(exam, ind) in studentMark.studentsMarks">
                                     <td
                                       :key="ind"
-                                      style="border: 1px solid lightgrey !important;padding: 6px;"
+                                      style="border: 1px solid lightgrey !important;padding: 0px;"
                                     >Marks</td>
                                     <td
                                       :key="ind"
-                                      style="border: 1px solid lightgrey !important;padding: 6px;"
+                                      style="border: 1px solid lightgrey !important;padding: 0px;"
                                     >Highest Marks</td>
                                   </template>
                                 </tr>
@@ -291,20 +290,20 @@
                               >
                                 <tr v-for="studentMark in studentMarks" :key="studentMark">
                                   <td
-                                    style="border: 1px solid lightgrey !important;padding: 6px;"
+                                    style="border: 1px solid lightgrey !important;padding: 0px;"
                                   >{{studentMark.subjectName}}</td>
                                   <template v-for="(exam, index) in  studentMark.studentsMarks">
                                     <td
                                       :key="index"
-                                      style="border: 1px solid lightgrey !important;padding: 6px;"
+                                      style="border: 1px solid lightgrey !important;padding: 0px;"
                                     >{{exam.marksScored}}</td>
                                     <td
                                       :key="index"
-                                      style="border: 1px solid lightgrey !important;padding: 6px;"
+                                      style="border: 1px solid lightgrey !important;padding: 0px;"
                                     >{{exam.markDistributionId.markValue}}</td>
                                   </template>
                                   <td
-                                    style="border: 1px solid lightgrey !important;padding: 6px;"
+                                    style="border: 1px solid lightgrey !important;padding: 0px;"
                                   >{{studentMark.totalMarks}}</td>
                                 </tr>
                               </tbody>
@@ -316,11 +315,11 @@
                                     style="    
                                     border: 1px solid #e2e7eb;
                                     text-align:center
-                                    padding: 6px;"
+                                    padding: 0px;"
                                   >Total Marks</td>
                                   <td
                                     colspan="7"
-                                    style="border: 1px solid lightgrey !important;padding: 6px;"
+                                    style="border: 1px solid lightgrey !important;padding: 0px;"
                                   >{{ studentMark.allSubjectTotalMarks }}</td>
                                 </tr>
                                 <tr>
@@ -330,11 +329,11 @@
                                     style="    
                                     border: 1px solid #e2e7eb;
                                     text-align:center
-                                    padding: 6px;"
+                                    padding: 0px;"
                                   >Grade</td>
                                   <td
                                     colspan="7"
-                                    style="border: 1px solid lightgrey !important;padding: 6px;"
+                                    style="border: 1px solid lightgrey !important;padding: 0px;"
                                   >{{ studentMark.grade ? studentMark.grade : "-" }}</td>
                                 </tr>
                                 <tr>
@@ -343,12 +342,12 @@
                                     style="
                                      border: 1px solid #e2e7eb;
                                     text-align:center
-                                    padding: 6px;"
+                                    padding: 0px;"
                                     class="subheding"
                                   >Average Mark</td>
                                   <td
                                     colspan="7"
-                                    style="border: 1px solid lightgrey !important;padding: 6px;"
+                                    style="border: 1px solid lightgrey !important;padding: 0px;"
                                   >-</td>
                                 </tr>
                                 <tr>
@@ -357,25 +356,23 @@
                                     style="
                                     border: 1px solid #e2e7eb;
                                     text-align:center
-                                    padding: 6px; !important;
+                                    padding: 0px; !important;
                                     font-size: 16px !important;"
                                     class="subheding"
                                   >GPA</td>
                                   <td
                                     colspan="7"
-                                    style="border: 1px solid lightgrey !important;padding: 6px !important;font-size: 16px !important;"
+                                    style="border: 1px solid lightgrey !important;padding: 0px !important;font-size: 16px !important;"
                                   >-</td>
                                 </tr>
                               </tfoot>
                             </table>
-                            <!-- </div> -->
                           </v-card>
                         </div>
                       </v-card>
-                      <!-- </v-flex> -->
+                      <p style="page-break-after: always;">&nbsp;</p>
                     </card>
                   </div>
-                  <p style="page-break-after: always;">&nbsp;</p>
                 </v-flex>
               </v-layout>
             </v-flex>
@@ -612,7 +609,7 @@ table {
 th,
 td {
   border: 1px solid #e2e7eb;
-  padding: 6px;
+  padding: 0px;
   text-align: center;
 }
 table.feeTypeTable {
-- 
2.0.0