Commit 99cd791848d643102e6b1412e7fc0f8425875761
1 parent
0721aca935
Exists in
master
and in
3 other branches
implement all task to trello
Showing
18 changed files
with
173 additions
and
107 deletions
Show diff stats
src/api/menu.js
... | ... | @@ -184,6 +184,35 @@ const adminMenu = [ |
184 | 184 | } |
185 | 185 | ]; |
186 | 186 | |
187 | +const libraryMenu = [{ | |
188 | + title: 'Library', | |
189 | + group: 'Library', | |
190 | + component: 'Library', | |
191 | + icon: '/static/schoolIcons/Library.png', | |
192 | + items: [ | |
193 | + { name: 'libraryMember', title: ' Library Member', component: 'libraryMember', action: '', }, | |
194 | + { name: 'Books', title: 'Books', component: 'Books', action: '', }, | |
195 | + { name: 'Issue', title: ' Issue', component: 'Issue', action: '', }, | |
196 | + { name: 'eBooks', title: 'E-Books', component: 'eBooks', action: '', } | |
197 | + | |
198 | + ] | |
199 | +}]; | |
200 | + | |
201 | +const accountMenu = [{ | |
202 | + title: 'Account', | |
203 | + group: 'Account', | |
204 | + component: 'Account', | |
205 | + icon: '/static/schoolIcons/Account.png', | |
206 | + items: [ | |
207 | + { name: 'feeTypes', title: 'Fee Types', component: 'feeTypes', action: '', }, | |
208 | + { name: 'Invoice', title: 'Invoice', component: 'Invoice', action: '', }, | |
209 | + { name: 'paymentHistory', title: 'Payment History', component: 'paymentHistory', action: '', }, | |
210 | + { name: 'Expense', title: 'Expense', component: 'Expense', action: '', }, | |
211 | + { name: 'Income', title: 'Income', component: 'Income', action: '', }, | |
212 | + { name: 'GlobalPayment', title: 'Global Payment', component: 'GlobalPayment', action: '', } | |
213 | + ] | |
214 | +}]; | |
215 | + | |
187 | 216 | const schoolMenu = [ |
188 | 217 | // { header: 'Apps' }, |
189 | 218 | { |
... | ... | @@ -205,4 +234,4 @@ const schoolMenu = [ |
205 | 234 | // } |
206 | 235 | // }); |
207 | 236 | |
208 | -export default { adminMenu, schoolMenu }; | |
209 | 237 | \ No newline at end of file |
238 | +export default { adminMenu, schoolMenu, libraryMenu, accountMenu }; | |
210 | 239 | \ No newline at end of file | ... | ... |
src/components/pageHeader/AppDrawer.vue
... | ... | @@ -151,6 +151,10 @@ export default { |
151 | 151 | this.menus = menu.adminMenu; |
152 | 152 | } else if (this.$store.state.role === "SUPERADMIN") { |
153 | 153 | this.menus = menu.schoolMenu; |
154 | + } else if (this.$store.state.role === "LIBRARIAN") { | |
155 | + this.menus = menu.libraryMenu; | |
156 | + } else if (this.$store.state.role === "ACCOUNTANT") { | |
157 | + this.menus = menu.accountMenu; | |
154 | 158 | } |
155 | 159 | window.getApp.$on("APP_DRAWER_TOGGLED", () => { |
156 | 160 | this.drawer = !this.drawer; | ... | ... |
src/components/pageHeader/AppToolbar.vue
... | ... | @@ -27,8 +27,9 @@ |
27 | 27 | <v-btn icon large flat slot="activator"> |
28 | 28 | <v-avatar> |
29 | 29 | <!-- <img src="/static/icon/user.png" /> --> |
30 | - <v-icon dark size="40px" v-if="!userData.schoolLogoUrl">account_circle</v-icon> | |
30 | + <v-icon dark size="40px" v-if="!userData.schoolLogoUrl && !userData.profilePicUrl">account_circle</v-icon> | |
31 | 31 | <img :src="userData.schoolLogoUrl" v-else-if="userData.schoolLogoUrl" /> |
32 | + <img :src="userData.profilePicUrl" v-else-if="userData.profilePicUrl" /> | |
32 | 33 | </v-avatar> |
33 | 34 | </v-btn> |
34 | 35 | <v-list class="pa-0"> | ... | ... |
src/pages/Account/expense.vue
... | ... | @@ -614,6 +614,7 @@ export default { |
614 | 614 | var token = this.$store.state.token; |
615 | 615 | http() |
616 | 616 | .get("/getExpensesList", { |
617 | + params: { schoolId: this.$store.state.schoolId }, | |
617 | 618 | headers: { Authorization: "Bearer " + token } |
618 | 619 | }) |
619 | 620 | .then(response => { |
... | ... | @@ -633,10 +634,6 @@ export default { |
633 | 634 | editItem(item) { |
634 | 635 | this.editedIndex = this.expenseList.indexOf(item); |
635 | 636 | this.editedItem = Object.assign({}, item); |
636 | - // this.editedItem.dob = | |
637 | - // this.editedItem.dob != undefined | |
638 | - // ? (this.editedItem.dob = this.editedItem.dob.substring(0, 10)) | |
639 | - // : (this.editedItem.dob = ""); | |
640 | 637 | this.editedItem.date = |
641 | 638 | this.editedItem.date != undefined |
642 | 639 | ? (this.editedItem.date = this.editedItem.date.substring(0, 10)) |
... | ... | @@ -663,9 +660,8 @@ export default { |
663 | 660 | ) |
664 | 661 | .then(response => { |
665 | 662 | // console.log("deleteUers",deleteTeachers) |
666 | - if ((this.snackbar = true)) { | |
667 | - this.text = "Successfully delete Existing Expense"; | |
668 | - } | |
663 | + this.snackbar = true; | |
664 | + this.text = "Successfully delete Existing Expense"; | |
669 | 665 | this.getExpenseList(); |
670 | 666 | }) |
671 | 667 | .catch(error => { |
... | ... | @@ -703,6 +699,7 @@ export default { |
703 | 699 | this.addExpense.upload = imageUrl; |
704 | 700 | } |
705 | 701 | this.loading = true; |
702 | + this.addExpense = this.$store.state.schoolId; | |
706 | 703 | http() |
707 | 704 | .post("/createExpense", this.addExpense) |
708 | 705 | .then(response => { | ... | ... |
src/pages/Account/feeTypes.vue
... | ... | @@ -36,45 +36,45 @@ |
36 | 36 | <v-spacer></v-spacer> |
37 | 37 | </v-toolbar> |
38 | 38 | <v-card> |
39 | - <v-container fluid> | |
40 | - <v-layout wrap justify-center> | |
41 | - <v-flex xs12 sm9> | |
42 | - <v-layout> | |
43 | - <v-flex xs4 class="pt-4 subheading"> | |
44 | - <label class="right pr-3">Fee Type:</label> | |
45 | - </v-flex> | |
46 | - <v-flex xs8> | |
47 | - <v-text-field | |
48 | - v-model="editedItem.feeType" | |
49 | - placeholder="fill your Fee Type" | |
50 | - :rules="feetTypeRules" | |
51 | - required | |
52 | - ></v-text-field> | |
53 | - </v-flex> | |
54 | - </v-layout> | |
55 | - <v-layout> | |
56 | - <v-flex xs4 class="pt-4 subheading"> | |
57 | - <label class="right pr-3">Note:</label> | |
58 | - </v-flex> | |
59 | - <v-flex xs8> | |
60 | - <v-textarea | |
61 | - name="input-7-1" | |
62 | - v-model="editedItem.note" | |
63 | - placeholder="fill your Note" | |
64 | - :rules="noteRules" | |
65 | - multi-line | |
66 | - required | |
67 | - ></v-textarea> | |
68 | - </v-flex> | |
69 | - </v-layout> | |
70 | - <v-card-actions> | |
71 | - <v-btn round dark @click.native="close">Cancel</v-btn> | |
72 | - <v-spacer></v-spacer> | |
73 | - <v-btn round dark @click="save">Save</v-btn> | |
74 | - </v-card-actions> | |
75 | - </v-flex> | |
76 | - </v-layout> | |
77 | - </v-container> | |
39 | + <v-container fluid> | |
40 | + <v-layout wrap justify-center> | |
41 | + <v-flex xs12 sm9> | |
42 | + <v-layout> | |
43 | + <v-flex xs4 class="pt-4 subheading"> | |
44 | + <label class="right pr-3">Fee Type:</label> | |
45 | + </v-flex> | |
46 | + <v-flex xs8> | |
47 | + <v-text-field | |
48 | + v-model="editedItem.feeType" | |
49 | + placeholder="fill your Fee Type" | |
50 | + :rules="feetTypeRules" | |
51 | + required | |
52 | + ></v-text-field> | |
53 | + </v-flex> | |
54 | + </v-layout> | |
55 | + <v-layout> | |
56 | + <v-flex xs4 class="pt-4 subheading"> | |
57 | + <label class="right pr-3">Note:</label> | |
58 | + </v-flex> | |
59 | + <v-flex xs8> | |
60 | + <v-textarea | |
61 | + name="input-7-1" | |
62 | + v-model="editedItem.note" | |
63 | + placeholder="fill your Note" | |
64 | + :rules="noteRules" | |
65 | + multi-line | |
66 | + required | |
67 | + ></v-textarea> | |
68 | + </v-flex> | |
69 | + </v-layout> | |
70 | + <v-card-actions> | |
71 | + <v-btn round dark @click.native="close">Cancel</v-btn> | |
72 | + <v-spacer></v-spacer> | |
73 | + <v-btn round dark @click="save">Save</v-btn> | |
74 | + </v-card-actions> | |
75 | + </v-flex> | |
76 | + </v-layout> | |
77 | + </v-container> | |
78 | 78 | </v-card> |
79 | 79 | </v-dialog> |
80 | 80 | |
... | ... | @@ -330,6 +330,7 @@ export default { |
330 | 330 | this.showLoader = true; |
331 | 331 | http() |
332 | 332 | .get("/getFeesList", { |
333 | + params: { schoolId: this.$store.state.schoolId }, | |
333 | 334 | headers: { Authorization: "Bearer " + this.token } |
334 | 335 | }) |
335 | 336 | .then(response => { |
... | ... | @@ -408,23 +409,20 @@ export default { |
408 | 409 | submit() { |
409 | 410 | if (this.$refs.form.validate()) { |
410 | 411 | this.loading = true; |
412 | + this.schoolId = this.$store.state.schoolId; | |
411 | 413 | http() |
412 | 414 | .post("/createFee", this.feeTypeData) |
413 | 415 | .then(response => { |
414 | - console.log(response); | |
415 | 416 | this.getFeeTypeList(); |
416 | - if ((this.snackbar = true)) { | |
417 | - this.text = "New feetype added successfully"; | |
418 | - } | |
419 | - | |
417 | + this.snackbar = true; | |
418 | + this.text = "New feetype added successfully"; | |
420 | 419 | this.clear(); |
421 | 420 | this.loading = false; |
422 | 421 | }) |
423 | 422 | .catch(error => { |
424 | 423 | // console.log(error); |
425 | - if ((this.snackbar = true)) { | |
426 | - this.text = error.response.data.message; | |
427 | - } | |
424 | + this.snackbar = true; | |
425 | + this.text = error.response.data.message; | |
428 | 426 | this.loading = false; |
429 | 427 | }); |
430 | 428 | } | ... | ... |
src/pages/Account/globalPayment.vue
... | ... | @@ -252,7 +252,12 @@ export default { |
252 | 252 | http() |
253 | 253 | .get( |
254 | 254 | "/getSectionsList", |
255 | - { params: { classId: this.selectStudents.selectClassId } }, | |
255 | + { | |
256 | + params: { | |
257 | + classId: this.selectStudents.selectClassId, | |
258 | + schoolId: this.$store.state.schoolId | |
259 | + } | |
260 | + }, | |
256 | 261 | { |
257 | 262 | headers: { Authorization: "Bearer " + token } |
258 | 263 | } |
... | ... | @@ -274,7 +279,8 @@ export default { |
274 | 279 | .get("/getStudentWithClass", { |
275 | 280 | params: { |
276 | 281 | classId: this.selectStudents.selectClassId, |
277 | - sectionId: this.selectStudents.selectSection | |
282 | + sectionId: this.selectStudents.selectSection, | |
283 | + schoolId: this.$store.state.schoolId | |
278 | 284 | } |
279 | 285 | }) |
280 | 286 | .then(response => { |
... | ... | @@ -293,7 +299,8 @@ export default { |
293 | 299 | .get("/getInvoicesList", { |
294 | 300 | params: { |
295 | 301 | classId: this.selectStudents.selectClassId, |
296 | - studentId: this.selectStudents.selectId | |
302 | + studentId: this.selectStudents.selectId, | |
303 | + schoolId: this.$store.state.schoolId | |
297 | 304 | } |
298 | 305 | }) |
299 | 306 | .then(response => { |
... | ... | @@ -311,6 +318,9 @@ export default { |
311 | 318 | var token = this.$store.state.token; |
312 | 319 | http() |
313 | 320 | .get("/getClassesList", { |
321 | + params: { | |
322 | + schoolId: this.$store.state.schoolId | |
323 | + }, | |
314 | 324 | headers: { Authorization: "Bearer " + token } |
315 | 325 | }) |
316 | 326 | .then(response => { | ... | ... |
src/pages/Account/income.vue
... | ... | @@ -596,6 +596,7 @@ export default { |
596 | 596 | var token = this.$store.state.token; |
597 | 597 | http() |
598 | 598 | .get("/getIncomesList", { |
599 | + params: { schoolId: this.$store.state.schoolId }, | |
599 | 600 | headers: { Authorization: "Bearer " + token } |
600 | 601 | }) |
601 | 602 | .then(response => { |
... | ... | @@ -680,6 +681,7 @@ export default { |
680 | 681 | this.addIncome.upload = imageUrl; |
681 | 682 | } |
682 | 683 | this.loading = true; |
684 | + this.addIncome = this.$store.state.schoolId; | |
683 | 685 | http() |
684 | 686 | .post("/createIncome", this.addIncome) |
685 | 687 | .then(response => { | ... | ... |
src/pages/Account/invoice.vue
... | ... | @@ -622,9 +622,8 @@ export default { |
622 | 622 | }) |
623 | 623 | .catch(error => { |
624 | 624 | // console.log(error); |
625 | - if ((this.snackbar = true)) { | |
626 | - this.text = error.response.data.message; | |
627 | - } | |
625 | + this.snackbar = true; | |
626 | + this.text = error.response.data.message; | |
628 | 627 | this.loading = false; |
629 | 628 | }); |
630 | 629 | } |
... | ... | @@ -636,6 +635,7 @@ export default { |
636 | 635 | this.showLoader = true; |
637 | 636 | http() |
638 | 637 | .get("/getInvoicesList", { |
638 | + params: { schoolId: this.$store.state.schoolId }, | |
639 | 639 | headers: { Authorization: "Bearer " + this.token } |
640 | 640 | }) |
641 | 641 | .then(response => { |
... | ... | @@ -655,12 +655,9 @@ export default { |
655 | 655 | selectFeeType() { |
656 | 656 | this.showFeeType = true; |
657 | 657 | this.feeTypeData.push({ feeTypeName: this.feeType.feeTypeName }); |
658 | - // console.log("this.feeType.feeTypeListC", this.feeTypeData.feeTypeName); | |
659 | 658 | }, |
660 | 659 | deleteSelectFee: function(index) { |
661 | 660 | this.feeTypeData.splice(index, 1); |
662 | - // console.log("this.feeTypeData", this.feeTypeData); | |
663 | - // if (index === 1) | |
664 | 661 | for (let i = 0; i < this.feeTypeData.length; i++) { |
665 | 662 | this.feeType = this.feeTypeData[i]; |
666 | 663 | } |
... | ... | @@ -677,6 +674,7 @@ export default { |
677 | 674 | getAllClasses() { |
678 | 675 | http() |
679 | 676 | .get("/getClassesList", { |
677 | + params: { schoolId: this.$store.state.schoolId }, | |
680 | 678 | headers: { Authorization: "Bearer " + this.token } |
681 | 679 | }) |
682 | 680 | .then(response => { |
... | ... | @@ -690,7 +688,10 @@ export default { |
690 | 688 | getAllStudents() { |
691 | 689 | http() |
692 | 690 | .get("/getStudentsList", { |
693 | - params: { classId: this.invoiceData.classNum }, | |
691 | + params: { | |
692 | + classId: this.invoiceData.classNum, | |
693 | + schoolId: this.$store.state.schoolId | |
694 | + }, | |
694 | 695 | headers: { Authorization: "Bearer " + this.token } |
695 | 696 | }) |
696 | 697 | .then(response => { |
... | ... | @@ -704,6 +705,9 @@ export default { |
704 | 705 | getfeeType() { |
705 | 706 | http() |
706 | 707 | .get("/getFeesList", { |
708 | + params: { | |
709 | + schoolId: this.$store.state.schoolId | |
710 | + }, | |
707 | 711 | headers: { Authorization: "Bearer " + this.token } |
708 | 712 | }) |
709 | 713 | .then(response => { | ... | ... |
src/pages/Account/paymentHistory.vue
... | ... | @@ -47,7 +47,7 @@ |
47 | 47 | <span>Delete</span> |
48 | 48 | </v-tooltip> |
49 | 49 | </span> |
50 | - </td> --> | |
50 | + </td>--> | |
51 | 51 | </template> |
52 | 52 | <v-alert |
53 | 53 | slot="no-results" |
... | ... | @@ -110,7 +110,7 @@ export default { |
110 | 110 | value: "date", |
111 | 111 | sortable: false, |
112 | 112 | align: "center" |
113 | - }, | |
113 | + } | |
114 | 114 | // { text: "Action", value: "", sortable: false, align: "center" } |
115 | 115 | ], |
116 | 116 | paymentHistory: [] |
... | ... | @@ -124,7 +124,10 @@ export default { |
124 | 124 | var token = this.$store.state.token; |
125 | 125 | http() |
126 | 126 | .get("/getInvoicesList", { |
127 | - params: { paymentStatus: "FULLY_PAID" }, | |
127 | + params: { | |
128 | + paymentStatus: "FULLY_PAID", | |
129 | + schoolId: this.$store.state.schoolId | |
130 | + }, | |
128 | 131 | headers: { Authorization: "Bearer " + token } |
129 | 132 | }) |
130 | 133 | .then(response => { | ... | ... |
src/pages/Account/viewInvoice.vue
1 | 1 | <template> |
2 | 2 | <v-app id="pages-dasboard"> |
3 | - <!-- ****** Edit multiple INVOICE ****** --> | |
3 | + <!-- ****** Edit INVOICE ****** --> | |
4 | 4 | <v-container fluid grid-list-md> |
5 | 5 | <v-card> |
6 | 6 | <v-layout wrap> |
... | ... | @@ -152,7 +152,10 @@ export default { |
152 | 152 | getInvoiceList() { |
153 | 153 | http() |
154 | 154 | .get("/getParticularInvoice", { |
155 | - params: { invoiceId: this.$route.params.viewInvoiceId }, | |
155 | + params: { | |
156 | + invoiceId: this.$route.params.viewInvoiceId, | |
157 | + schoolId: this.$store.state.schoolId | |
158 | + }, | |
156 | 159 | headers: { Authorization: "Bearer " + this.token } |
157 | 160 | }) |
158 | 161 | .then(response => { |
... | ... | @@ -181,6 +184,7 @@ export default { |
181 | 184 | getfeeType() { |
182 | 185 | http() |
183 | 186 | .get("/getFeesList", { |
187 | + params: { schoolId: this.$store.state.schoolId }, | |
184 | 188 | headers: { Authorization: "Bearer " + this.token } |
185 | 189 | }) |
186 | 190 | .then(response => { | ... | ... |
src/pages/Authentication/Login.vue
... | ... | @@ -114,8 +114,7 @@ export default { |
114 | 114 | this.loading = true; |
115 | 115 | var userdata = { |
116 | 116 | email: this.userLogincredentials.email, |
117 | - password: this.userLogincredentials.password, | |
118 | - role: "ADMIN" | |
117 | + password: this.userLogincredentials.password | |
119 | 118 | }; |
120 | 119 | http() |
121 | 120 | .post("/schoolLogin", userdata) |
... | ... | @@ -123,12 +122,17 @@ export default { |
123 | 122 | this.$store.dispatch("setToken", response.data.data.token); |
124 | 123 | this.$store.dispatch("Id", response.data.data.id); |
125 | 124 | this.$store.dispatch("Role", response.data.data.role); |
125 | + this.$store.dispatch("SchoolId", response.data.data.schoolId); | |
126 | 126 | this.loading = false; |
127 | 127 | // console.log("{this.$store.state.state.role}",this.$store.state.role) |
128 | 128 | if (this.$store.state.role === "ADMIN") { |
129 | 129 | this.$router.push("/dashboard"); |
130 | 130 | } else if (this.$store.state.role === "SUPERADMIN") { |
131 | 131 | this.$router.push("/school"); |
132 | + } else if (this.$store.state.role === "LIBRARIAN") { | |
133 | + this.$router.push("/libraryMember"); | |
134 | + } else if (this.$store.state.role === "ACCOUNTANT") { | |
135 | + this.$router.push("/feeTypes"); | |
132 | 136 | } |
133 | 137 | }) |
134 | 138 | .catch(error => { | ... | ... |
src/pages/Library/books.vue
... | ... | @@ -260,7 +260,7 @@ |
260 | 260 | /> |
261 | 261 | <span>Delete</span> |
262 | 262 | </v-tooltip> |
263 | - </span> | |
263 | + </span> | |
264 | 264 | </td> |
265 | 265 | </template> |
266 | 266 | <v-alert |
... | ... | @@ -466,6 +466,9 @@ export default { |
466 | 466 | this.showLoader = true; |
467 | 467 | http() |
468 | 468 | .get("/getBooksList", { |
469 | + params: { | |
470 | + schoolId: this.$store.state.schoolId | |
471 | + }, | |
469 | 472 | headers: { Authorization: "Bearer " + this.token } |
470 | 473 | }) |
471 | 474 | .then(response => { |
... | ... | @@ -543,6 +546,7 @@ export default { |
543 | 546 | }, |
544 | 547 | submit() { |
545 | 548 | this.BooksData.quantity = Number(this.BooksData.quantity); |
549 | + this.BooksData.schoolId = this.$store.state.schoolId; | |
546 | 550 | if (this.$refs.form.validate()) { |
547 | 551 | this.loading = true; |
548 | 552 | http() | ... | ... |
src/pages/Library/eBook.vue
... | ... | @@ -55,14 +55,14 @@ |
55 | 55 | /> |
56 | 56 | <v-layout justify-center> |
57 | 57 | <v-flex v-if="files != ''"> |
58 | - <img :src="files" height="450" width="500;" /> | |
58 | + <img :src="files" height="200" width="160;" /> | |
59 | 59 | </v-flex> |
60 | 60 | </v-layout> |
61 | 61 | <img |
62 | 62 | v-if="editedItem.coverPhotoUrl && files == '' " |
63 | 63 | :src="editedItem.coverPhotoUrl" |
64 | - height="450" | |
65 | - width="500" | |
64 | + height="200" | |
65 | + width="160" | |
66 | 66 | alt="eBooks" |
67 | 67 | class="pa-2" |
68 | 68 | /> |
... | ... | @@ -537,6 +537,7 @@ export default { |
537 | 537 | this.showLoader = true; |
538 | 538 | http() |
539 | 539 | .get("/getEBooksList", { |
540 | + params: { schoolId: this.$store.state.schoolId }, | |
540 | 541 | headers: { Authorization: "Bearer " + this.token } |
541 | 542 | }) |
542 | 543 | .then(response => { |
... | ... | @@ -642,6 +643,7 @@ export default { |
642 | 643 | this.addEBooks.uploadFile = fileUrl; |
643 | 644 | // console.log("anyFile.split(/,/)", this.addEBooks.uploadFile); |
644 | 645 | } |
646 | + this.addEBooks = this.$store.state.schoolId; | |
645 | 647 | http() |
646 | 648 | .post("/createEBook", this.addEBooks) |
647 | 649 | .then(response => { | ... | ... |
src/pages/Library/issue.vue
... | ... | @@ -306,7 +306,7 @@ |
306 | 306 | >{{ props.item.bookId.status}}</span> |
307 | 307 | </td> |
308 | 308 | <td class="text-xs-center"> |
309 | - <span> | |
309 | + <span> | |
310 | 310 | <v-tooltip top> |
311 | 311 | <img |
312 | 312 | slot="activator" |
... | ... | @@ -605,7 +605,10 @@ export default { |
605 | 605 | .get( |
606 | 606 | "/getBooksIssueList", |
607 | 607 | { |
608 | - params: { libraryId: this.libraryId } | |
608 | + params: { | |
609 | + libraryId: this.libraryId, | |
610 | + schoolId: this.$store.state.schoolId | |
611 | + } | |
609 | 612 | }, |
610 | 613 | { |
611 | 614 | headers: { Authorization: "Bearer " + this.token } |
... | ... | @@ -697,7 +700,8 @@ export default { |
697 | 700 | libraryId: this.libraryID, |
698 | 701 | serialNumber: this.serialNo, |
699 | 702 | note: this.note, |
700 | - dueDate: this.date | |
703 | + dueDate: this.date, | |
704 | + schoolId: this.$store.state.schoolId | |
701 | 705 | }; |
702 | 706 | console.log("====================", createBook); |
703 | 707 | http() |
... | ... | @@ -724,7 +728,7 @@ export default { |
724 | 728 | }, |
725 | 729 | save() { |
726 | 730 | this.editedItem.bookIssueId = this.editedItem._id; |
727 | - this.editedItem.bookId = this.editedItem.bookId._id | |
731 | + this.editedItem.bookId = this.editedItem.bookId._id; | |
728 | 732 | http() |
729 | 733 | .put("/updateBookIssue", this.editedItem) |
730 | 734 | .then(response => { |
... | ... | @@ -747,6 +751,9 @@ export default { |
747 | 751 | this.showLoader = true; |
748 | 752 | http() |
749 | 753 | .get("/getBooksList", { |
754 | + params: { | |
755 | + schoolId: this.$store.state.schoolId | |
756 | + }, | |
750 | 757 | headers: { Authorization: "Bearer " + this.token } |
751 | 758 | }) |
752 | 759 | .then(response => { |
... | ... | @@ -765,10 +772,8 @@ export default { |
765 | 772 | }); |
766 | 773 | }, |
767 | 774 | getParticularBookData(books) { |
768 | - console.log("books", books); | |
769 | 775 | for (let i = 0; i < this.books.length; i++) { |
770 | 776 | if (books == this.books[i]._id) { |
771 | - console.log("books", this.books[i].remaining); | |
772 | 777 | if (this.books[i].remaining <= 0) { |
773 | 778 | this.snackbar = true; |
774 | 779 | this.text = "Book is unavailable"; | ... | ... |
src/pages/Library/member.vue
... | ... | @@ -626,7 +626,10 @@ export default { |
626 | 626 | this.showLoader = true; |
627 | 627 | http() |
628 | 628 | .get("/getStudentsList", { |
629 | - params: { classId: this.selectStudents }, | |
629 | + params: { | |
630 | + classId: this.selectStudents, | |
631 | + schoolId: this.$store.state.schoolId | |
632 | + }, | |
630 | 633 | headers: { Authorization: "Bearer " + this.token } |
631 | 634 | }) |
632 | 635 | .then(response => { |
... | ... | @@ -693,6 +696,7 @@ export default { |
693 | 696 | submit() { |
694 | 697 | if (this.$refs.form.validate()) { |
695 | 698 | this.loading = true; |
699 | + this.addBook.schoolId = this.$store.state.schoolId; | |
696 | 700 | http() |
697 | 701 | .put("/addLibrary", this.addBook) |
698 | 702 | .then(response => { |
... | ... | @@ -732,6 +736,9 @@ export default { |
732 | 736 | getAllClass() { |
733 | 737 | http() |
734 | 738 | .get("/getClassesList", { |
739 | + params: { | |
740 | + schoolId: this.$store.state.schoolId | |
741 | + }, | |
735 | 742 | headers: { Authorization: "Bearer " + this.token } |
736 | 743 | }) |
737 | 744 | .then(response => { | ... | ... |
src/pages/Subjects/subjects.vue
... | ... | @@ -433,6 +433,10 @@ export default { |
433 | 433 | ) |
434 | 434 | .then(response => { |
435 | 435 | this.subjectList = response.data.data; |
436 | + this.getClassSubject(); | |
437 | + this.snackbar = true; | |
438 | + this.color = "green"; | |
439 | + this.text = response.data.message; | |
436 | 440 | }) |
437 | 441 | .catch(err => { |
438 | 442 | console.log("err====>", err); | ... | ... |
src/pages/User/user.vue
... | ... | @@ -708,23 +708,6 @@ |
708 | 708 | <v-flex xs12 sm6> |
709 | 709 | <v-layout> |
710 | 710 | <v-flex xs4 class="pt-4 subheading"> |
711 | - <label class="right">Password:</label> | |
712 | - </v-flex> | |
713 | - <v-flex xs8 class="ml-3"> | |
714 | - <v-text-field | |
715 | - v-model="addUser.password" | |
716 | - placeholder="fill your Password" | |
717 | - :rules="passwordRules" | |
718 | - required | |
719 | - ></v-text-field> | |
720 | - </v-flex> | |
721 | - </v-layout> | |
722 | - </v-flex> | |
723 | - </v-layout> | |
724 | - <v-layout> | |
725 | - <v-flex xs12 sm6> | |
726 | - <v-layout> | |
727 | - <v-flex xs4 class="pt-4 subheading"> | |
728 | 711 | <label class="right hidden-sm-only hidden-xs-only">Uplaod Image:</label> |
729 | 712 | <label class="right hidden-lg-only hidden-xl-only hidden-md-only">Image:</label> |
730 | 713 | </v-flex> |
... | ... | @@ -995,9 +978,8 @@ export default { |
995 | 978 | }, |
996 | 979 | deleteItem(item) { |
997 | 980 | let deleteUser = { |
998 | - UserId: item._id | |
981 | + userId: item._id | |
999 | 982 | }; |
1000 | - // console.log("deleteUers",deleteUser) | |
1001 | 983 | http() |
1002 | 984 | .delete( |
1003 | 985 | "/deleteUser", |
... | ... | @@ -1007,9 +989,8 @@ export default { |
1007 | 989 | ) |
1008 | 990 | .then(response => { |
1009 | 991 | // console.log("deleteUers",deleteUser) |
1010 | - if ((this.snackbar = true)) { | |
1011 | - this.text = "Successfully delete Existing User"; | |
1012 | - } | |
992 | + this.snackbar = true; | |
993 | + this.text = "Successfully delete Existing User"; | |
1013 | 994 | this.getUsersList(); |
1014 | 995 | }) |
1015 | 996 | .catch(error => { | ... | ... |
src/store/store.js
... | ... | @@ -14,7 +14,8 @@ export default new Vuex.Store({ |
14 | 14 | data: null, |
15 | 15 | isUserLoggedIn: false, |
16 | 16 | id: null, |
17 | - role: null | |
17 | + role: null, | |
18 | + schoolId: null | |
18 | 19 | }, |
19 | 20 | // serve as the one and only way to change the state of the data in the state object |
20 | 21 | mutations: { |
... | ... | @@ -35,6 +36,9 @@ export default new Vuex.Store({ |
35 | 36 | }, |
36 | 37 | Role(state, role) { |
37 | 38 | state.role = role |
39 | + }, | |
40 | + SchoolId(state, schoolId) { | |
41 | + state.schoolId = schoolId | |
38 | 42 | } |
39 | 43 | }, |
40 | 44 | //Action methods are referred to as being "dispatched" |
... | ... | @@ -50,6 +54,9 @@ export default new Vuex.Store({ |
50 | 54 | }, |
51 | 55 | Role({ commit }, role) { |
52 | 56 | commit('Role', role) |
57 | + }, | |
58 | + SchoolId({ commit }, schoolId) { | |
59 | + commit('SchoolId', schoolId) | |
53 | 60 | } |
54 | 61 | |
55 | 62 | } | ... | ... |