viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 4ecd35af274c10198dfc04f4bda26da741435245

Authored by Shikha Mishra
1 parent 4dfee99647
Exists in master and in 2 other branches amber-development, ui-design

Resolve console error in manage salary screen

Showing 2 changed files with 101 additions and 106 deletions   Show diff stats
src/Services/http.js
Diff comments   View file @4ecd35a
... ... @@ -17,71 +17,69 @@ const baseURL = `${baseDomain}`;
17 17 // console.log("token",`${store.state.schoolToken}`);
18 18  
19 19 export default () => {
20   - // return axios.create({
21   - // // baseURL: 'http://192.168.2.221:3002/v1',
22   - // baseURL,
23   - // headers: {
24   - // Authorization: `Bearer ${store.state.token}`
25   - // }
26   - // })
27   - let instance = axios.create({
28   - // LIVE
29   - //baseURL: 'https://annadata.patanjaliayurved.org/api',
30   - // DEVELOPMENT
31   - baseURL: baseURL,
  20 + // return axios.create({
  21 + // // baseURL: 'http://192.168.2.221:3002/v1',
  22 + // baseURL,
  23 + // headers: {
  24 + // Authorization: `Bearer ${store.state.token}`
  25 + // }
  26 + // })
  27 + let instance = axios.create({
  28 + // LIVE
  29 + //baseURL: 'https://annadata.patanjaliayurved.org/api',
  30 + // DEVELOPMENT
  31 + baseURL: baseURL,
32 32  
33   - headers: {
34   - Authorization: `Bearer ${store.state.token}`,
35   - // Authorization: `Bearer sdfsdfsfsdf`,
36   - // 'Access-Control-Allow-Origin': '*'
  33 + headers: {
  34 + Authorization: `Bearer ${store.state.token}`,
  35 + // Authorization: `Bearer sdfsdfsfsdf`,
  36 + // 'Access-Control-Allow-Origin': '*'
37 37  
38   - }
39   - })
  38 + }
  39 + })
40 40  
41   - instance.interceptors.request.use((config) => {
42   - // Do something before request is sent
  41 + instance.interceptors.request.use((config) => {
  42 + // Do something before request is sent
43 43  
44   - return config
45   - }, error => {
46   - return Promise.reject(error)
47   - })
48   - instance.interceptors.response.use((response) => {
49   - // do something with the response data
  44 + return config
  45 + }, error => {
  46 + return Promise.reject(error)
  47 + })
  48 + instance.interceptors.response.use((response) => {
  49 + // do something with the response data
  50 + return response;
  51 + }, error => {
  52 + // handle the response error
  53 + console.log("error in interceptor - ", error.response.status)
  54 + var customError
  55 + const errorNo = error.response.status
50 56  
  57 + switch (errorNo) {
  58 + case 401:
  59 + customError = "Session expired"
  60 + vm1.$store.dispatch("RESET_STORE", {
  61 + token: null,
  62 + data: null,
  63 + isUserLoggedIn: false,
  64 + isSchoolLoggedIn: false,
  65 + id: null,
  66 + role: null,
  67 + // schoolId: null,
  68 + schoolToken: null,
  69 + schoolRole: null,
  70 + studentsData: [],
  71 + });
  72 + window.getApp.$emit("APP_LOGOUT");
  73 + console.log("store is - ", vm1.$store.state)
  74 + vm1.$router.push({ name: "Login" });
  75 + // vm1.$store.dispatch("Id", null);
51 76  
52   - return response;
53   - }, error => {
54   - // handle the response error
55   - console.log("error in interceptor - ", error.response.status)
56   - var customError
57   - const errorNo = error.response.status
  77 + break;
  78 + }
58 79  
59   - switch (errorNo) {
60   - case 401:
61   - customError = "Session expired"
62   - vm1.$store.dispatch("RESET_STORE", {
63   - token: null,
64   - data: null,
65   - isUserLoggedIn: false,
66   - isSchoolLoggedIn: false,
67   - id: null,
68   - role: null,
69   - // schoolId: null,
70   - schoolToken: null,
71   - schoolRole: null,
72   - studentsData: [],
73   - });
74   - window.getApp.$emit("APP_LOGOUT");
75   - console.log("store is - ",vm1.$store.state)
76   - vm1.$router.push({ name: "Login" });
77   - // vm1.$store.dispatch("Id", null);
  80 + return Promise.reject(error);
  81 + })
  82 + // response parse
78 83  
79   - break;
80   - }
81   -
82   - return Promise.reject(error);
83   - })
84   - // response parse
85   -
86   - return instance;
  84 + return instance;
87 85 }
88 86 \ No newline at end of file
... ...
src/pages/Payroll/manageSalary.vue
Diff comments   View file @4ecd35a
... ... @@ -508,10 +508,10 @@ export default {
508 508 data: () => ({
509 509 search: "",
510 510 pagination: {
511   - rowsPerPage: 10
  511 + rowsPerPage: 10,
512 512 },
513 513  
514   - role: [v => !!v || "Role Name is required"],
  514 + role: [(v) => !!v || "Role Name is required"],
515 515 getRoles: [],
516 516 teacherList: [],
517 517 roleList: [],
... ... @@ -522,7 +522,7 @@ export default {
522 522 salaryItem: "",
523 523  
524 524 getReport: {
525   - role: ""
  525 + role: "",
526 526 },
527 527  
528 528 showTeacher: false,
... ... @@ -536,9 +536,9 @@ export default {
536 536 editedItem: {
537 537 salaryTemplate: {
538 538 allowances: {},
539   - deduction: {}
  539 + deduction: {},
540 540 },
541   - hourlyTemplate: {}
  541 + hourlyTemplate: {},
542 542 },
543 543  
544 544 // salaryGrades: {},
... ... @@ -561,31 +561,31 @@ export default {
561 561 text: "No",
562 562 align: "",
563 563 sortable: false,
564   - value: "No"
  564 + value: "No",
565 565 },
566 566 {
567 567 text: "Profile Pic",
568 568 value: "profilePicUrl",
569 569 sortable: false,
570   - align: "center"
  570 + align: "center",
571 571 },
572 572 { text: "Name", value: "name", sortable: false, align: "center" },
573 573 {
574 574 text: "Join Date",
575 575 value: "joinDate",
576 576 sortable: false,
577   - align: "center"
  577 + align: "center",
578 578 },
579   - { text: "Action", value: "", sortable: false, align: "center" }
  579 + { text: "Action", value: "", sortable: false, align: "center" },
580 580 ],
581   - desserts: []
  581 + desserts: [],
582 582 }),
583 583  
584 584 methods: {
585 585 close() {
586 586 this.editHourDialog = false;
587 587 },
588   - dates: function(date) {
  588 + dates: function (date) {
589 589 return moment(date).format("MMMM DD, YYYY");
590 590 },
591 591 editItem(item) {
... ... @@ -611,29 +611,24 @@ export default {
611 611 var token = this.$store.state.token;
612 612 http()
613 613 .get("/getRolesList", {
614   - headers: { Authorization: "Bearer " + token }
  614 + headers: { Authorization: "Bearer " + token },
615 615 })
616   - .then(response => {
  616 + .then((response) => {
617 617 this.getRoles = response.data.data;
618 618 // if (this.getRoles[2].role !== 3) {
619 619 // this.getRoles = response.data.data;
620 620 // console.log("roles", this.getRoles[2].role);
621 621 // }
622   - this.getRoles = response.data.data;
623   - var removedRoles = _.remove(this.getRoles, function(c) {
624   - //remove if color is green or yellow
625   - return c.role === 1 || c.role === 4 || c.role === 5;
626   - // console.log(c);
627   - });
  622 +
  623 + // var removedRoles = _.remove(this.getRoles, function (c) {
  624 + // //remove if color is green or yellow
  625 + // return c.role === 1 || c.role === 4 || c.role === 5;
  626 + // // console.log(c);
  627 + // });
628 628 this.showLoader = false;
629 629 })
630   - .catch(error => {
  630 + .catch((error) => {
631 631 this.showLoader = false;
632   - if (error.response.status === 401) {
633   - this.$router.replace({ path: "/" });
634   - this.$store.dispatch("setToken", null);
635   - this.$store.dispatch("Id", null);
636   - }
637 632 });
638 633 },
639 634  
... ... @@ -650,14 +645,14 @@ export default {
650 645 var token = this.$store.state.token;
651 646 http()
652 647 .get("/getTeachersList", {
653   - headers: { Authorization: "Bearer " + token }
  648 + headers: { Authorization: "Bearer " + token },
654 649 })
655   - .then(response => {
  650 + .then((response) => {
656 651 this.teacherList = response.data.data;
657 652 this.showTeacher = true;
658 653 this.showLoader = false;
659 654 })
660   - .catch(error => {
  655 + .catch((error) => {
661 656 this.showLoader = false;
662 657 if (error.response.status === 401) {
663 658 this.$router.replace({ path: "/" });
... ... @@ -674,14 +669,14 @@ export default {
674 669 "/getUserDetailWithRoles",
675 670 { params: { role: this.getReport.role } },
676 671 {
677   - headers: { Authorization: "Bearer " + this.token }
  672 + headers: { Authorization: "Bearer " + this.token },
678 673 }
679 674 )
680   - .then(response => {
  675 + .then((response) => {
681 676 this.roleList = response.data.data;
682 677 this.showLoader = false;
683 678 })
684   - .catch(err => {
  679 + .catch((err) => {
685 680 this.showLoader = false;
686 681 });
687 682 },
... ... @@ -690,14 +685,14 @@ export default {
690 685 this.loadingSearch = true;
691 686 http()
692 687 .get("/getSalaryList", {
693   - headers: { Authorization: "Bearer " + this.token }
  688 + headers: { Authorization: "Bearer " + this.token },
694 689 })
695   - .then(response => {
  690 + .then((response) => {
696 691 this.salaryData = response.data.data;
697 692 this.showLoader = false;
698 693 this.loadingSearch = false;
699 694 })
700   - .catch(error => {
  695 + .catch((error) => {
701 696 // console.log("err====>", err);
702 697 this.showLoader = false;
703 698 this.loadingSearch = false;
... ... @@ -715,14 +710,14 @@ export default {
715 710 this.loadingSearch = true;
716 711 http()
717 712 .get("/getHourlyList", {
718   - headers: { Authorization: "Bearer " + this.token }
  713 + headers: { Authorization: "Bearer " + this.token },
719 714 })
720   - .then(response => {
  715 + .then((response) => {
721 716 this.hourlyData = response.data.data;
722 717 this.showLoader = false;
723 718 this.loadingSearch = false;
724 719 })
725   - .catch(error => {
  720 + .catch((error) => {
726 721 // console.log("err====>", err);
727 722 this.showLoader = false;
728 723 this.loadingSearch = false;
... ... @@ -755,7 +750,7 @@ export default {
755 750 }
756 751 },
757 752 selectGrade() {
758   - console.log("this.editedItem", this.editedItem);
  753 + // console.log("this.editedItem", this.editedItem);
759 754 },
760 755 selectView() {
761 756 if (this.editedItem.view.png === "Monthly") {
... ... @@ -772,15 +767,15 @@ export default {
772 767 role: this.editedItem.role,
773 768 userId: this.editedItem._id,
774 769 templateName: this.editedItem.salary,
775   - templateId: this.editedItem.salaryId
  770 + templateId: this.editedItem.salaryId,
776 771 };
777 772 http()
778 773 .put("/updateUserSalary", updateSalary, {
779 774 headers: {
780   - Authorization: "Bearer " + this.token
781   - }
  775 + Authorization: "Bearer " + this.token,
  776 + },
782 777 })
783   - .then(response => {
  778 + .then((response) => {
784 779 this.getUserDetailWithRoles();
785 780 this.close();
786 781 this.snackbar = true;
... ... @@ -788,10 +783,12 @@ export default {
788 783 this.color = "green";
789 784 this.editSalaryDialog = false;
790 785 })
791   - .catch(error => {
792   - console.log("error", error);
  786 + .catch((error) => {
  787 + // console.log("error", error);
  788 + this.snackbar = true;
793 789 this.snackbar = true;
794   - this.color = "red";
  790 + this.color = "error";
  791 + this.text = error.response.data.message;
795 792 });
796 793 },
797 794  
... ... @@ -824,7 +821,7 @@ export default {
824 821 // this.text = error.response.data.message;
825 822 // this.color = "red";
826 823 // });
827   - }
  824 + },
828 825  
829 826 // selectAllowances() {
830 827 // this.salaryTypeData.push({
... ... @@ -911,6 +908,6 @@ export default {
911 908 this.getRole();
912 909 this.getSalaryList();
913 910 this.getHourlyList();
914   - }
  911 + },
915 912 };
916 913 </script>
917 914 \ No newline at end of file
... ...