solved bug regarding getting courses and latest events

Amber Dev
1 parent 8b184d484a
Showing 3 changed files with 41 additions and 34 deletions Show diff stats
src/pages/Authentication/Login.vue
src/pages/Dashboard/dashboard.vue
src/pages/changeStudents/changeStudents.vue
@@ -106,7 +106,7 @@ export default {
     };
   },
   methods: {
-    login() {
+    async login() {
       if (this.$refs.form.validate()) {
         this.loading = true;
         var userdata = {
@@ -147,6 +147,7 @@ export default {
               this.$store.dispatch("setToken", response.data.data.token);
               this.$store.dispatch("Id", response.data.data.id);
               this.$store.dispatch("Role", response.data.data.role);
+              localStorage.setItem("parentStudentId", response.data.data.id);
               this.$router.push("/dashboard");
             }
           })
@@ -102,7 +102,7 @@
       <v-flex xs12 sm12 md9>
         <v-container fluid grid-list-xl>
           <!-- ***** Total Students ***** -->
-          <v-flex xs12 sm12 md12 v-if="$store.state.role == 'TEACHER' ">
+          <v-flex xs12 sm12 md12 v-if="$store.state.role != 'PARENT' ">
             <v-layout wrap class>
               <v-flex xs12 sm12 md3>
                 <router-link :to="{ name:'Students' }">
@@ -897,38 +897,41 @@ export default {
           this.showLoader = false;
         });
     },
-    getparentStudents() {
+    async getparentStudents() {
       this.showLoader = true;
-      http()
+      var parentStudentsId;
+      var classId;
+      await http()
         .get("/parentStudentsList")
         .then(response => {
           // console.log("resssssss", response.data.data.students[0].classId);
           this.studentsData = response.data.data;
-          // localStorage.setItem(
-          //   "parentStudentId",
-          //   this.studentsData.students[0]._id
-          // );
-          // localStorage.setItem(
-          //   "parentClassId",
-          //   this.studentsData.students[0].classId
-          // );
+          localStorage.setItem(
+            "parentStudentId",
+            this.studentsData.students[0]._id
+          );
+          localStorage.setItem(
+            "parentClassId",
+            this.studentsData.students[0].classId
+          );
  
           if (localStorage.getItem("parentStudentId") == null) {
-            var parentStudentsId = response.data.data.students[0].classId;
-            var classId = response.data.data.students[0]._id;
+            parentStudentsId = response.data.data.students[0].classId;
+            classId = response.data.data.students[0]._id;
           }
           if (localStorage.getItem("parentStudentId")) {
-            var parentStudentsId = localStorage.getItem("parentStudentId");
-            var classId = localStorage.getItem("parentClassId");
+            parentStudentsId = localStorage.getItem("parentStudentId");
+            classId = localStorage.getItem("parentClassId");
           }
-          this.getCourses(parentStudentsId, classId);
-          this.getAnnoucementes(classId);
+
           this.showLoader = false;
         })
         .catch(err => {
           console.log("err====>", err);
           this.showLoader = false;
         });
+      await this.getCourses(parentStudentsId, classId);
+      await this.getAnnoucementes(classId);
     },
     async getCourses(parentStudentsId, classId) {
       /* getStudentCourses - to get courseData - defined in GetApis.js*/
@@ -954,10 +957,10 @@ export default {
           this.showLoader = false;
         });
     },
-    getMeetingEventes() {
+    async getMeetingEventes() {
       if (this.role == "TEACHER") {
         this.showLoader = true;
-        http()
+        await http()
           .get("/getMeetingEventesList", {
             headers: {
               Authorization: "Bearer " + this.token
@@ -989,6 +992,10 @@ export default {
   mounted() {
     //  = this.$store.state.schoolToken;
     // console.log("this.$store.state.role", this.token);
+    // this.getUsersList();
+  },
+
+  async created() {
     if (this.$store.state.role === "ADMIN") {
       this.token = this.$store.state.token;
     } else if (this.$store.state.schoolRole === "SUPERADMIN") {
@@ -1005,20 +1012,17 @@ export default {
     this.role = this.$store.state.role;
     // console.log("role", this.$store.state.schoolRole,"tt",this.$store.state.schoolToken);
     // this.getData();
-    this.getStudents();
-    this.getTeachers();
-    this.getParents();
-    this.getClasses();
-    this.getNoticeData();
-    this.getUserData();
-    this.getFeesAndCollectionsData();
-    this.getExpensesData();
-    this.getparentStudents();
-    this.getMeetingEventes();
-    // this.getUsersList();
-  },
+    await this.getStudents();
+    await this.getTeachers();
+    await this.getParents();
+    await this.getClasses();
+    await this.getNoticeData();
+    await this.getUserData();
+    await this.getFeesAndCollectionsData();
+    await this.getExpensesData();
+    await this.getparentStudents();
+    await this.getMeetingEventes();
  
-  async created() {
     /* get Latest events list for student login*/
     if (this.$store.state.role != "TEACHER") {
       let response = await this.studentMeetingEvents({
@@ -55,7 +55,7 @@ export default {
       text: "",
       loading: false,
       valid: false,
-      changeStudent: {},
+      changeStudent: "",
       studentsData: []
     };
   },
@@ -75,6 +75,8 @@ export default {
         .then(response => {
           // console.log("resssssss", response.data.data.students[0].classId);
           this.studentsData = response.data.data.students;
+          this.changeStudent = response.data.data.students[0]._id;
+          localStorage.setItem("parentStudentId", this.changeStudent);
           localStorage.setItem(
             "parentClassId",
             response.data.data.students[0].classId
...	...	@@ -106,7 +106,7 @@ export default {
106	106	};
107	107	},
108	108	methods: {
109		- login() {
	109	+ async login() {
110	110	if (this.$refs.form.validate()) {
111	111	this.loading = true;
112	112	var userdata = {
...	...	@@ -147,6 +147,7 @@ export default {
147	147	this.$store.dispatch("setToken", response.data.data.token);
148	148	this.$store.dispatch("Id", response.data.data.id);
149	149	this.$store.dispatch("Role", response.data.data.role);
	150	+ localStorage.setItem("parentStudentId", response.data.data.id);
150	151	this.$router.push("/dashboard");
151	152	}
152	153	})
...	...
...	...	@@ -102,7 +102,7 @@
102	102	<v-flex xs12 sm12 md9>
103	103	<v-container fluid grid-list-xl>
104	104	<!-- *** Total Students *** -->
105		- <v-flex xs12 sm12 md12 v-if="$store.state.role == 'TEACHER' ">
	105	+ <v-flex xs12 sm12 md12 v-if="$store.state.role != 'PARENT' ">
106	106	<v-layout wrap class>
107	107	<v-flex xs12 sm12 md3>
108	108	<router-link :to="{ name:'Students' }">
...	...	@@ -897,38 +897,41 @@ export default {
897	897	this.showLoader = false;
898	898	});
899	899	},
900		- getparentStudents() {
	900	+ async getparentStudents() {
901	901	this.showLoader = true;
902		- http()
	902	+ var parentStudentsId;
	903	+ var classId;
	904	+ await http()
903	905	.get("/parentStudentsList")
904	906	.then(response => {
905	907	// console.log("resssssss", response.data.data.students[0].classId);
906	908	this.studentsData = response.data.data;
907		- // localStorage.setItem(
908		- // "parentStudentId",
909		- // this.studentsData.students[0]._id
910		- // );
911		- // localStorage.setItem(
912		- // "parentClassId",
913		- // this.studentsData.students[0].classId
914		- // );
	909	+ localStorage.setItem(
	910	+ "parentStudentId",
	911	+ this.studentsData.students[0]._id
	912	+ );
	913	+ localStorage.setItem(
	914	+ "parentClassId",
	915	+ this.studentsData.students[0].classId
	916	+ );
915	917
916	918	if (localStorage.getItem("parentStudentId") == null) {
917		- var parentStudentsId = response.data.data.students[0].classId;
918		- var classId = response.data.data.students[0]._id;
	919	+ parentStudentsId = response.data.data.students[0].classId;
	920	+ classId = response.data.data.students[0]._id;
919	921	}
920	922	if (localStorage.getItem("parentStudentId")) {
921		- var parentStudentsId = localStorage.getItem("parentStudentId");
922		- var classId = localStorage.getItem("parentClassId");
	923	+ parentStudentsId = localStorage.getItem("parentStudentId");
	924	+ classId = localStorage.getItem("parentClassId");
923	925	}
924		- this.getCourses(parentStudentsId, classId);
925		- this.getAnnoucementes(classId);
	926	+
926	927	this.showLoader = false;
927	928	})
928	929	.catch(err => {
929	930	console.log("err====>", err);
930	931	this.showLoader = false;
931	932	});
	933	+ await this.getCourses(parentStudentsId, classId);
	934	+ await this.getAnnoucementes(classId);
932	935	},
933	936	async getCourses(parentStudentsId, classId) {
934	937	/* getStudentCourses - to get courseData - defined in GetApis.js*/
...	...	@@ -954,10 +957,10 @@ export default {
954	957	this.showLoader = false;
955	958	});
956	959	},
957		- getMeetingEventes() {
	960	+ async getMeetingEventes() {
958	961	if (this.role == "TEACHER") {
959	962	this.showLoader = true;
960		- http()
	963	+ await http()
961	964	.get("/getMeetingEventesList", {
962	965	headers: {
963	966	Authorization: "Bearer " + this.token
...	...	@@ -989,6 +992,10 @@ export default {
989	992	mounted() {
990	993	// = this.$store.state.schoolToken;
991	994	// console.log("this.$store.state.role", this.token);
	995	+ // this.getUsersList();
	996	+ },
	997	+
	998	+ async created() {
992	999	if (this.$store.state.role === "ADMIN") {
993	1000	this.token = this.$store.state.token;
994	1001	} else if (this.$store.state.schoolRole === "SUPERADMIN") {
...	...	@@ -1005,20 +1012,17 @@ export default {
1005	1012	this.role = this.$store.state.role;
1006	1013	// console.log("role", this.$store.state.schoolRole,"tt",this.$store.state.schoolToken);
1007	1014	// this.getData();
1008		- this.getStudents();
1009		- this.getTeachers();
1010		- this.getParents();
1011		- this.getClasses();
1012		- this.getNoticeData();
1013		- this.getUserData();
1014		- this.getFeesAndCollectionsData();
1015		- this.getExpensesData();
1016		- this.getparentStudents();
1017		- this.getMeetingEventes();
1018		- // this.getUsersList();
1019		- },
	1015	+ await this.getStudents();
	1016	+ await this.getTeachers();
	1017	+ await this.getParents();
	1018	+ await this.getClasses();
	1019	+ await this.getNoticeData();
	1020	+ await this.getUserData();
	1021	+ await this.getFeesAndCollectionsData();
	1022	+ await this.getExpensesData();
	1023	+ await this.getparentStudents();
	1024	+ await this.getMeetingEventes();
1020	1025
1021		- async created() {
1022	1026	/* get Latest events list for student login*/
1023	1027	if (this.$store.state.role != "TEACHER") {
1024	1028	let response = await this.studentMeetingEvents({
...	...
...	...	@@ -55,7 +55,7 @@ export default {
55	55	text: "",
56	56	loading: false,
57	57	valid: false,
58		- changeStudent: {},
	58	+ changeStudent: "",
59	59	studentsData: []
60	60	};
61	61	},
...	...	@@ -75,6 +75,8 @@ export default {
75	75	.then(response => {
76	76	// console.log("resssssss", response.data.data.students[0].classId);
77	77	this.studentsData = response.data.data.students;
	78	+ this.changeStudent = response.data.data.students[0]._id;
	79	+ localStorage.setItem("parentStudentId", this.changeStudent);
78	80	localStorage.setItem(
79	81	"parentClassId",
80	82	response.data.data.students[0].classId
...	...