viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 109a6218c0518dd2c227c8a1d70574128150f4c4

Authored by Neeraj Sharma
1 parent a76a6f1351
Exists in master and in 3 other branches amber-development, development, ui-design

solve issue/bugs in payment,eBook,issue,timetable and generalSetting

Showing 8 changed files with 256 additions and 125 deletions   Show diff stats
... ... @@ -77,7 +77,7 @@ const adminMenu = [
77 77 items: [
78 78 { name: 'Mark', title: 'Mark', component: 'Mark', action: '', },
79 79 { name: 'MarkDistribution', title: 'Mark Distribution', component: 'Mark Distribution', action: '', },
80   - { name: 'Promotion', title: 'promotion', component: 'Promotion', action: '', },
  80 + // { name: 'Promotion', title: 'promotion', component: 'Promotion', action: '', },
81 81 // { name: 'userAttendence', title: 'User Attendance', component: 'userAttendence', action: '', },
82 82 ]
83 83 },
... ...
src/pages/Account/paymentHistory.vue
Diff comments   View file @109a621
... ... @@ -18,7 +18,7 @@
18 18 </v-flex>
19 19 <v-flex xs8 sm7 class="ml-3">
20 20 <v-text-field
21   - v-model="editedItem.totalPaidAmount"
  21 + v-model="editedItem.paidAmount"
22 22 placeholder="please fill this field"
23 23 ></v-text-field>
24 24 </v-flex>
... ... @@ -90,20 +90,20 @@
90 90 <v-tooltip top>
91 91 <img
92 92 slot="activator"
93   - style="cursor:pointer; width:20px; height:18px; "
94   - class="mr-5"
  93 + style="cursor:pointer; width:20px; height:18px;"
  94 + class="mr-3"
95 95 @click="editItem(props.item)"
96   - src="/static/icon/edit1.png"
  96 + src="/static/icon/edit.png"
97 97 />
98 98 <span>Edit</span>
99 99 </v-tooltip>
100 100 <v-tooltip top>
101 101 <img
102 102 slot="activator"
103   - style="cursor:pointer;width:20px; height:20px; "
104   - class="mr-5"
  103 + style="cursor:pointer;width:20px; height:20px;"
  104 + class="mr-3"
105 105 @click="deleteItem(props.item)"
106   - src="/static/icon/delete1.png"
  106 + src="/static/icon/delete.png"
107 107 />
108 108 <span>Delete</span>
109 109 </v-tooltip>
... ... @@ -188,18 +188,18 @@ export default {
188 188 editItem(item) {
189 189 this.editedIndex = this.paymentHistory.indexOf(item);
190 190 this.editedItem = Object.assign({}, item);
  191 + this.editedItem.paidAmount = this.editedItem.feeType.paidAmount;
191 192 this.editPaymentDialog = true;
192 193 },
193 194 deleteItem(item) {
194 195 let deleteGrade = {
195 196 invoiceId: item._id,
196   - feeTypeId: item.feeType._id,
  197 + feeTypeId: item.feeType._id
197 198 };
198 199 http()
199 200 .put(
200   - "/deleteFeeType",
201   - confirm("Are you sure you want to delete this?") &&
202   - deleteGrade,
  201 + "/deleteFeeType",
  202 + confirm("Are you sure you want to delete this?") && deleteGrade,
203 203 {
204 204 headers: {
205 205 Authorization: "Bearer " + this.token
... ... @@ -253,7 +253,7 @@ export default {
253 253 var updatePayment = {
254 254 invoiceId: this.editedItem._id,
255 255 feeTypeId: this.editedItem.feeType._id,
256   - paidAmount: this.editedItem.totalPaidAmount,
  256 + paidAmount: this.editedItem.paidAmount,
257 257 paymentMethod: this.editedItem.paymentMethod
258 258 };
259 259 http()
... ... @@ -276,13 +276,29 @@ export default {
276 276 });
277 277 },
278 278 displaySearch() {
279   - (this.show = false), (this.showSearch = true);
  279 + this.show = false;
  280 + this.showSearch = true;
280 281 },
281 282 closeSearch() {
282 283 this.showSearch = false;
283 284 this.show = true;
284 285 this.search = "";
285   - }
  286 + },
  287 + // fixedPaidAmount(paidAmount) {
  288 + // console.log("paidAmount", paidAmount);
  289 + // console.log(
  290 + // "this.editedItem.feeType.subTotal",
  291 + // this.editedItem.feeType.subTotal
  292 + // );
  293 + // if (paidAmount > this.editedItem.feeType.subTotal) {
  294 + // console.log(
  295 + // "------------finaly------------",
  296 + // this.editedItem.feeType.subTotal
  297 + // );
  298 + // this.editedItem.paidAmount = this.editedItem.feeType.subTotal;
  299 + // console.log("finally----paidamount", this.editedItem.paidAmount);
  300 + // }
  301 + // }
286 302 },
287 303 mounted() {
288 304 this.token = this.$store.state.token;
... ...
src/pages/Library/eBook.vue
Diff comments   View file @109a621
... ... @@ -10,45 +10,22 @@
10 10 </v-flex>
11 11 </v-layout>
12 12 <v-card-text>
13   - <v-flex xs12 class="text-xs-center text-sm-center text-md-center text-lg-center mr-4">
  13 + <v-flex xs12 class="text-xs-center text-sm-center text-md-center text-lg-center">
14 14 <input
15 15 type="file"
16 16 style="display: none"
17   - ref="image"
  17 + ref="editImage"
18 18 accept="image/*"
19   - multiple
20   - @change="onImagePicked"
  19 + @change="onEditImagePicked"
21 20 />
22   - <v-layout justify-center>
23   - <v-flex v-if="files != ''">
24   - <img :src="files" height="200" width="160;" />
25   - </v-flex>
26   - </v-layout>
27 21 <img
28   - v-if="editedItem.coverPhotoUrl && files == '' "
  22 + v-if="editedItem.coverPhotoUrl"
29 23 :src="editedItem.coverPhotoUrl"
30   - height="200"
  24 + height="160"
31 25 width="160"
32 26 alt="eBooks"
33 27 class="pa-2"
34 28 />
35   - <v-layout justify-center>
36   - <v-flex
37   - xs3
38   - v-for="Image in editedItem.newsImageUrl"
39   - :key="Image._id"
40   - class="profile-image-wrapper"
41   - >
42   - <v-icon
43   - class="red edit-profile-icon"
44   - dark
45   - @click="deleteImage(Image._id,editedItem._id)"
46   - >close</v-icon>
47   - </v-flex>
48   - <v-flex v-for="(file, index) in files" :key="index">
49   - <img :src="file" height="160" width="160" class="pa-2" />
50   - </v-flex>
51   - </v-layout>
52 29 <img
53 30 src="/static/icon/user.png"
54 31 v-if="editedItem.coverPhotoUrl == ''"
... ... @@ -58,7 +35,7 @@
58 35 />
59 36 </v-flex>
60 37 <v-container grid-list-md>
61   - <v-flex xs12 sm6>
  38 + <v-flex xs12 sm12>
62 39 <v-layout>
63 40 <v-flex xs4 class="pt-4 subheading">
64 41 <label class="right hidden-xs-only hidden-sm-only">Name :</label>
... ... @@ -75,7 +52,7 @@
75 52 </v-flex>
76 53 </v-layout>
77 54 </v-flex>
78   - <v-flex xs12 sm6>
  55 + <v-flex xs12 sm12>
79 56 <v-layout>
80 57 <v-flex xs4 class="pt-4 subheading">
81 58 <label class="right hidden-xs-only hidden-sm-only">Author :</label>
... ... @@ -92,23 +69,67 @@
92 69 </v-flex>
93 70 </v-layout>
94 71 </v-flex>
95   - <v-flex xs12 sm6>
  72 + <v-flex xs12 sm12>
96 73 <v-layout>
97 74 <v-flex xs4 class="pt-4 subheading">
98 75 <label class="right hidden-xs-only hidden-sm-only">Class :</label>
99 76 <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Class :</label>
100 77 </v-flex>
101 78 <v-flex xs8 class="ml-3">
102   - <v-text-field
103   - v-model="editedItem.classId.classNum"
104   - placeholder="fill your full class"
105   - name="classNum"
  79 + <v-select
  80 + v-model="editedItem.classId"
  81 + :items="addClass"
  82 + label="Select Class"
  83 + item-text="classNum"
  84 + item-value="_id"
106 85 type="_id"
107 86 required
  87 + ></v-select>
  88 + </v-flex>
  89 + </v-layout>
  90 + </v-flex>
  91 + <v-flex xs12 sm12>
  92 + <v-layout>
  93 + <v-flex xs4 class="pt-4 subheading">
  94 + <label class="right hidden-xs-only hidden-sm-only">Upload Image :</label>
  95 + <label class="right hidden-lg-only hidden-md-only hidden-xl-only">UploadImage :</label>
  96 + </v-flex>
  97 + <v-flex xs8 class="ml-3">
  98 + <v-text-field
  99 + label="Select Image"
  100 + @click="editPickImage"
  101 + v-model="editImageName"
  102 + append-icon="attach_file"
  103 + ></v-text-field>
  104 + </v-flex>
  105 + </v-layout>
  106 + </v-flex>
  107 + <v-flex xs12>
  108 + <v-layout>
  109 + <v-flex xs4 class="pt-4 subheading">
  110 + <label class="right">Upload File:</label>
  111 + </v-flex>
  112 + <v-flex xs8 class="ml-3">
  113 + <input
  114 + type="file"
  115 + style="display: none"
  116 + ref="editFile"
  117 + @change="onEditFilePicked"
  118 + />
  119 + <v-text-field
  120 + label="Select File"
  121 + @click="editPickFile"
  122 + v-model="editFileName"
  123 + append-icon="attach_file"
108 124 ></v-text-field>
109 125 </v-flex>
110 126 </v-layout>
111 127 </v-flex>
  128 + <v-card-actions>
  129 + <v-spacer></v-spacer>
  130 + <v-btn round dark @click="save" :loading="editLoading" class="add-button">Save</v-btn>
  131 + <v-spacer></v-spacer>
  132 + </v-card-actions>
112 133 </v-container>
113 134 </v-card-text>
114 135 </v-card>
... ... @@ -221,7 +242,10 @@
221 242 <tr class="tr">
222 243 <td class="td td-row">{{ props.index + 1}}</td>
223 244 <td class="td td-row text-xs-center">
224   - <img :src="props.item.coverPhotoUrl" alt="newsImage" width="100" height="70" />
  245 + <v-avatar size="40">
  246 + <img :src="props.item.coverPhotoUrl" v-if="props.item.coverPhotoUrl" alt="ebooks" />
  247 + <img src="/static/icon/user.png" v-if="!props.item.coverPhotoUrl" />
  248 + </v-avatar>
225 249 </td>
226 250 <td class="td td-row text-xs-center">{{ props.item.name}}</td>
227 251 <td class="td td-row text-xs-center">{{ props.item.author}}</td>
... ... @@ -357,10 +381,9 @@
357 381 <v-text-field
358 382 label="Select Image"
359 383 @click="pickImage"
360   - v-model="addEBooks.uploadCover"
  384 + v-model="imageName"
361 385 :rules="uploadImageRule"
362 386 append-icon="attach_file"
363   - multiple
364 387 ></v-text-field>
365 388 </v-flex>
366 389 </v-layout>
... ... @@ -370,15 +393,14 @@
370 393 <v-flex xs4 class="pt-4 subheading">
371 394 <label class="right">Upload File:</label>
372 395 </v-flex>
373   - <v-flex xs7 class="ml-3">
  396 + <v-flex xs8 class="ml-3">
374 397 <input type="file" style="display: none" ref="file" @change="onFilePicked" />
375 398 <v-text-field
376 399 label="Select File"
377 400 @click="pickFile"
378   - v-model="addEBooks.uploadFile"
  401 + v-model="fileName"
379 402 :rules="uploadFileRule"
380 403 append-icon="attach_file"
381   - multiple
382 404 ></v-text-field>
383 405 </v-flex>
384 406 </v-layout>
... ... @@ -435,6 +457,7 @@ export default {
435 457 viewEbookDialog: false,
436 458 valid: true,
437 459 addEBookDialog: false,
  460 + editLoading: false,
438 461 addClass: [],
439 462 addSection: [],
440 463 pagination: {
... ... @@ -456,7 +479,7 @@ export default {
456 479  
457 480 headers: [
458 481 {
459   - align: "justify-center",
  482 + align: "left",
460 483 text: "No",
461 484 sortable: false,
462 485 value: "No"
... ... @@ -484,22 +507,31 @@ export default {
484 507 }
485 508 },
486 509 token: "",
487   - uploadCover: {}
  510 + uploadCover: {},
  511 + editImageName: "",
  512 + editFiles: "",
  513 + editAnyFile: "",
  514 + editFileName: ""
488 515 }),
489 516 methods: {
  517 + editPickImage() {
  518 + this.$refs.editImage.click();
  519 + },
490 520 pickImage() {
491 521 this.$refs.image.click();
492 522 },
493 523 pickFile() {
494 524 this.$refs.file.click();
495 525 },
  526 + editPickFile() {
  527 + this.$refs.editFile.click();
  528 + },
496 529 onImagePicked(e) {
497 530 // console.log(e)
498 531 const files = e.target.files;
499 532 /** fetch Image Name **/
500 533 if (files[0] !== undefined) {
501 534 this.imageName = files[0].name;
502   - this.addEBooks.uploadCover = this.imageName;
503 535 if (this.imageName.lastIndexOf(".") <= 0) {
504 536 return;
505 537 }
... ... @@ -516,6 +548,26 @@ export default {
516 548 this.imageUrl = "";
517 549 }
518 550 },
  551 + onEditImagePicked(e) {
  552 + // console.log(e)
  553 + const files = e.target.files;
  554 + /** fetch Image Name **/
  555 + if (files[0] !== undefined) {
  556 + this.editImageName = files[0].name;
  557 + if (this.editImageName.lastIndexOf(".") <= 0) {
  558 + return;
  559 + }
  560 + /** Select many image and showing many image add to news card **/
  561 + const fr = new FileReader();
  562 + fr.readAsDataURL(files[0]);
  563 + fr.addEventListener("load", () => {
  564 + this.editFiles = fr.result;
  565 + });
  566 + } else {
  567 + this.editImageName = "";
  568 + this.editFiles = "";
  569 + }
  570 + },
519 571 getEBooksList() {
520 572 this.showLoader = true;
521 573 http()
... ... @@ -543,7 +595,6 @@ export default {
543 595 /** fetch Image Name **/
544 596 if (files[0] !== undefined) {
545 597 this.fileName = files[0].name;
546   - this.addEBooks.uploadFile = this.fileName;
547 598 if (this.fileName.lastIndexOf(".") <= 0) {
548 599 return;
549 600 }
... ... @@ -558,6 +609,26 @@ export default {
558 609 this.fileName = "";
559 610 }
560 611 },
  612 + onEditFilePicked(e) {
  613 + // console.log(e)
  614 + const files = e.target.files;
  615 + /** fetch Image Name **/
  616 + if (files[0] !== undefined) {
  617 + this.editFileName = files[0].name;
  618 + if (this.editFileName.lastIndexOf(".") <= 0) {
  619 + return;
  620 + }
  621 + const fr = new FileReader();
  622 + fr.readAsDataURL(files[0]);
  623 + fr.addEventListener("load", () => {
  624 + this.editAnyFile = fr.result;
  625 + // console.log(" this.anyFile Url", this.anyFile )
  626 + });
  627 + } else {
  628 + this.editAnyFile = "";
  629 + this.editFileName = "";
  630 + }
  631 + },
561 632 editItem(item) {
562 633 this.files = [];
563 634 this.editedIndex = this.eBookData.indexOf(item);
... ... @@ -599,6 +670,7 @@ export default {
599 670 },
600 671 submit() {
601 672 if (this.$refs.form.validate()) {
  673 + this.loading = true;
602 674 var uploadCover = "";
603 675 var uploadFile = "";
604 676 if (this.files) {
... ... @@ -624,13 +696,12 @@ export default {
624 696 .then(response => {
625 697 this.getEBooksList();
626 698 // this.getEBooksList = [];
627   - this.snackbar = true;
628 699 this.addEBookDialog = false;
  700 + this.snackbar = true;
629 701 this.text = response.data.message;
630 702 this.color = "green";
631 703 this.loading = false;
632   - this.addEBooks.uploadCover = "";
633   - this.addEBooks.uploadFile = "";
  704 + (this.imageName = ""), (this.fileName = "");
634 705 })
635 706 .catch(error => {
636 707 this.snackbar = true;
... ... @@ -645,18 +716,23 @@ export default {
645 716 this.files = "";
646 717 },
647 718 save() {
  719 + this.editLoading = true;
648 720 this.loadingUpadte = true;
649   - if (this.files.length > 0) {
650   - const [baseUrl, imageUrl] = this.files.split(/,/);
  721 + if (this.editFiles) {
  722 + const [baseUrl, imageUrl] = this.editFiles.split(/,/);
651 723 this.editedItem.uploadCover = imageUrl;
652 724 // console.log("anyFile.split(/,/)", this.addEBooks.uploadCover);
653 725 }
654   - if (this.anyFile) {
655   - const [baseUrl, fileUrl] = this.anyFile.split(/,/);
  726 + if (this.editAnyFile) {
  727 + const [baseUrl, fileUrl] = this.editAnyFile.split(/,/);
656 728 this.editedItem.uploadFile = fileUrl;
657 729 // console.log("anyFile.split(/,/)", this.addEBooks.uploadFile);
658 730 }
  731 + if (this.editedItem.classId._id) {
  732 + this.editedItem.classId = this.editedItem.classId._id;
  733 + }
659 734 this.editedItem.ebookId = this.editedItem._id;
  735 + console.log("this.editedItem", this.editedItem);
660 736 http()
661 737 .put("/updateEBook", this.editedItem)
662 738 .then(response => {
... ... @@ -664,6 +740,7 @@ export default {
664 740 this.snackbar = true;
665 741 this.text = "Successfully Edit Existing E-Book";
666 742 this.getEBooksList();
  743 + this.editLoading = false;
667 744 this.editedItem.uploadFile = "";
668 745 this.editedItem.uploadCover = "";
669 746 this.anyFile = "";
... ... @@ -671,6 +748,7 @@ export default {
671 748 this.close();
672 749 })
673 750 .catch(error => {
  751 + this.editLoading = false;
674 752 this.loadingUpadte = false;
675 753 this.snackbar = true;
676 754 this.text = error.response.data.message;
... ...
src/pages/Library/issue.vue
Diff comments   View file @109a621
... ... @@ -35,12 +35,14 @@
35 35 <label class="right">Book:</label>
36 36 </v-flex>
37 37 <v-flex xs7 class="ml-3">
38   - <v-text-field
39   - v-model="editedItem.name"
40   - placeholder="fill your Book name"
41   - name="name"
42   - type="text"
43   - ></v-text-field>
  38 + <v-select
  39 + v-model="editedItem.bookId"
  40 + label="Select Book Name"
  41 + :rules="bookRules"
  42 + :items="books"
  43 + item-text="name"
  44 + item-value="_id"
  45 + ></v-select>
44 46 </v-flex>
45 47 </v-layout>
46 48 </v-flex>
... ... @@ -685,6 +687,39 @@ export default {
685 687  
686 688 this.viewIssueDialog = true;
687 689 },
  690 + deleteItem(item) {
  691 + let deleteParticularIssue = {
  692 + bookIssueId: item._id
  693 + };
  694 + http()
  695 + .delete(
  696 + "/deleteBookIssue",
  697 + confirm("Are you sure you want to delete this?") && {
  698 + params: deleteParticularIssue
  699 + }
  700 + )
  701 + .then(response => {
  702 + this.snackbar = true;
  703 + this.text = "Delete Successfully";
  704 + this.getIssueList();
  705 + if (this.libraryID) {
  706 + this.libraryId = this.libraryID;
  707 + }
  708 + if (this.libraryId) {
  709 + this.libraryId = this.libraryId;
  710 + }
  711 + this.snackbar = true;
  712 + this.text = response.data.message;
  713 + this.color = "green";
  714 + this.loading = false;
  715 + })
  716 + .catch(error => {
  717 + // console.log(error);
  718 + this.snackbar = true;
  719 + this.text = error.response.data.message;
  720 + this.color = "red";
  721 + });
  722 + },
688 723 returnBook(item) {
689 724 let returnBook = {
690 725 bookIssueId: item._id
... ... @@ -745,7 +780,7 @@ export default {
745 780 },
746 781 save() {
747 782 this.editedItem.bookIssueId = this.editedItem._id;
748   - this.editedItem.bookId = this.editedItem.bookId._id;
  783 + this.editedItem.bookId = this.editedItem.bookId;
749 784 http()
750 785 .put("/updateBookIssue", this.editedItem)
751 786 .then(response => {
... ...
src/pages/TimeTable/timeTable.vue
Diff comments   View file @109a621
... ... @@ -640,7 +640,7 @@
640 640 style="cursor:pointer; width:20px; height:18px; "
641 641 class="mr-2 ml-2"
642 642 src="/static/icon/edit1.png"
643   - @click="updateTimeTable(list, timeTableList)"
  643 + @click="updateTimeTable(list, timeTableList,props.item._id)"
644 644 />
645 645 <img
646 646 style="cursor:pointer; width:20px; height:20px; "
... ... @@ -1166,17 +1166,10 @@ export default {
1166 1166 this.editedItem = Object.assign({}, item);
1167 1167 this.dialog = true;
1168 1168 },
1169   - updateTimeTable(timeToUpdate, classToUpdate) {
1170   - // console.log(
1171   - // "timeToUpdate, classToUpdate",
1172   - // timeToUpdate._id,
1173   - // classToUpdate.schedule
1174   - // );
1175   - for (let i = 0; i < classToUpdate.schedule.length; i++) {
1176   - this.updateLecturesId.scheduleId = classToUpdate.schedule[i]._id;
1177   - }
1178   - (this.updateLecturesId.lectureId = timeToUpdate._id),
1179   - (this.updateLectures = timeToUpdate);
  1169 + updateTimeTable(timeToUpdate, classToUpdate, scheduleId) {
  1170 + this.updateLecturesId.scheduleId = scheduleId;
  1171 + this.updateLecturesId.lectureId = timeToUpdate._id;
  1172 + this.updateLectures = timeToUpdate;
1180 1173 this.dialogUpdateLectures = true;
1181 1174 },
1182 1175 addLecture(scheduleId, timeTableId) {
... ...
src/pages/generalSetting/generalSetting.vue
Diff comments   View file @109a621
... ... @@ -2,7 +2,7 @@
2 2 <v-app id="login">
3 3 <v-container>
4 4 <v-layout>
5   - <v-flex xs12 sm12 md12 lg12 class="mt-5">
  5 + <v-flex xs12 sm12 md12 lg10 class="mt-5 mx-auto">
6 6 <v-card flat class="card-style pa-2" dark>
7 7 <v-layout>
8 8 <v-flex xs12>
... ... @@ -17,9 +17,12 @@
17 17 xs12
18 18 class="text-xs-center text-sm-center text-md-center text-lg-center mb-4"
19 19 >
20   - <v-avatar size="80px">
21   - <img src="/static/icon/user.png" v-if="!imageUrl" />
22   - </v-avatar>
  20 + <img
  21 + src="/static/default_thumb.png"
  22 + height="140"
  23 + width="140"
  24 + v-if="!imageData.imageUrl"
  25 + />
23 26 <input
24 27 type="file"
25 28 style="display: none"
... ... @@ -27,7 +30,12 @@
27 30 accept="image/*"
28 31 @change="onFilePicked"
29 32 />
30   - <img :src="imageData.imageUrl" height="150" width="150" v-if="imageUrl" />
  33 + <img
  34 + :src="imageData.imageUrl"
  35 + height="150"
  36 + width="150"
  37 + v-if="imageData.imageUrl"
  38 + />
31 39 </v-flex>
32 40 </v-layout>
33 41 <v-flex xs12>
... ... @@ -162,7 +170,7 @@ export default {
162 170 },
163 171 mounted() {
164 172 this.token = this.$store.state.token;
165   - // this.getRole();
  173 + this.getParticularSchool();
166 174 },
167 175 methods: {
168 176 pickFile() {
... ... @@ -248,28 +256,29 @@ export default {
248 256 // },
249 257 clear() {
250 258 this.$refs.form.reset();
  259 + },
  260 + getParticularSchool() {
  261 + this.showLoader = true;
  262 + http()
  263 + .get("/getParticularSchool", {
  264 + params: {
  265 + schoolId: this.$store.state.id
  266 + },
  267 + headers: { Authorization: "Bearer " + this.token }
  268 + })
  269 + .then(response => {
  270 + this.setting = response.data.data;
  271 + this.imageData.imageUrl = response.data.data.schoolLogoUrl;
  272 + })
  273 + .catch(error => {
  274 + this.showLoader = false;
  275 + if (error.response.status === 401) {
  276 + this.$router.replace({ path: "/" });
  277 + this.$store.dispatch("setToken", null);
  278 + this.$store.dispatch("Id", null);
  279 + }
  280 + });
251 281 }
252   - // getUsers(roles) {
253   - // this.showLoader = true;
254   - // http()
255   - // .get("/getUserWithRole", {
256   - // params: {
257   - // name: roles
258   - // },
259   - // headers: { Authorization: "Bearer " + this.token }
260   - // })
261   - // .then(response => {
262   - // this.getUsersName = response.data.data;
263   - // })
264   - // .catch(error => {
265   - // this.showLoader = false;
266   - // if (error.response.status === 401) {
267   - // this.$router.replace({ path: "/" });
268   - // this.$store.dispatch("setToken", null);
269   - // this.$store.dispatch("Id", null);
270   - // }
271   - // });
272   - // }
273 282 }
274 283 };
275 284 </script>
... ...
src/router/paths.js
Diff comments   View file @109a621
... ... @@ -625,18 +625,18 @@ export default [{
625 625 `@/pages/Mark/markDistribution.vue`
626 626 )
627 627 },
628   - {
629   - path: '/promotion',
630   - meta: {},
631   - name: 'Promotion',
632   - props: (route) => ({ type: route.query.type }),
633   - component: () =>
634   - import (
635   - /* webpackChunkName: "routes" */
636   - /* webpackMode: "lazy-once" */
637   - `@/pages/Mark/promotion.vue`
638   - )
639   - },
  628 + // {
  629 + // path: '/promotion',
  630 + // meta: {},
  631 + // name: 'Promotion',
  632 + // props: (route) => ({ type: route.query.type }),
  633 + // component: () =>
  634 + // import (
  635 + // /* webpackChunkName: "routes" */
  636 + // /* webpackMode: "lazy-once" */
  637 + // `@/pages/Mark/promotion.vue`
  638 + // )
  639 + // },
640 640 {
641 641 path: '/academicYear',
642 642 meta: {},
... ...
static/defaultSchoolLogo.jpg
View file @a76a6f1

21.1 KB