viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 1dea1c0efedcfce20186397ee651834c78440ab4

Authored by Amber Dev
1 parent 06d0b65337
Exists in master and in 2 other branches amber-development, ui-design

solved bugs

Showing 3 changed files with 13 additions and 18 deletions   Show diff stats
src/Services/GetApis.js
Diff comments   View file @1dea1c0
... ... @@ -53,6 +53,12 @@ export default {
53 53 }
54 54 },
55 55  
  56 +
  57 +
  58 +
  59 +
  60 +
  61 +
56 62 /***************************************************************************************************************************** */
57 63  
58 64 // APIS USED IN dashboard.vue
... ...
src/pages/Course/courseDetail.vue
Diff comments   View file @1dea1c0
... ... @@ -73,11 +73,7 @@
73 73 <v-layout>
74 74 <v-flex xs12>
75 75 <label class="title text-xs-center">Edit Chapter</label>
76   - <v-icon
77   - size="24"
78   - class="right"
79   - @click="editChapterDetailDialog = false;"
80   - >cancel</v-icon>
  76 + <v-icon size="24" class="right" @click="editChapterDetailDialog = false;">cancel</v-icon>
81 77 </v-flex>
82 78 </v-layout>
83 79 <v-card-text>
... ... @@ -126,7 +122,6 @@
126 122 label="Add PPT"
127 123 reference="ppt"
128 124 id="pptInput"
129   -
130 125 ></UploadFiles>
131 126 </v-flex>
132 127 </v-layout>
... ... @@ -143,7 +138,6 @@
143 138 label="Add PDF"
144 139 reference="pdf"
145 140 id="pdfInput"
146   -
147 141 ></UploadFiles>
148 142 </v-flex>
149 143 </v-layout>
... ... @@ -273,7 +267,6 @@
273 267 label="Add PPT"
274 268 reference="ppt"
275 269 id="pptInput"
276   -
277 270 ></UploadFiles>
278 271 </v-flex>
279 272 </v-layout>
... ... @@ -290,7 +283,6 @@
290 283 label="Add PDF"
291 284 reference="pdf"
292 285 id="pdfInput"
293   -
294 286 ></UploadFiles>
295 287 </v-flex>
296 288 </v-layout>
... ... @@ -580,11 +572,7 @@
580 572 <v-layout>
581 573 <v-flex xs12>
582 574 <label class="title text-xs-center">Add Course Details</label>
583   - <v-icon
584   - size="24"
585   - class="right"
586   - @click="addCourseDetailDialog = false; clear();"
587   - >cancel</v-icon>
  575 + <v-icon size="24" class="right" @click="addCourseDetailDialog = false; clear();">cancel</v-icon>
588 576 </v-flex>
589 577 </v-layout>
590 578 <v-form ref="form" v-model="valid" lazy-validation>
... ...
src/pages/Dashboard/dashboard.vue
Diff comments   View file @1dea1c0
... ... @@ -213,7 +213,7 @@
213 213 </v-layout>
214 214 </v-card>
215 215 </v-flex>
216   - </v-layout> -->
  216 + </v-layout>-->
217 217  
218 218 <v-card class="mt-2 card" v-if="role != 'PARENT'">
219 219 <!-- <full-calendar
... ... @@ -416,7 +416,8 @@
416 416 <hr />
417 417 <div class="text-xs-center py-3 subheading font-weight-bold">Calender</div>
418 418 <vue-event-calendar :events="activityEvents" @day-changed="handleDayChanged($event)"></vue-event-calendar>
419   - <!-- LATEST ACTIVITY -->
  419 +
  420 + <!-- LATEST EVENTS -->
420 421 <v-card class="my-3 elevation-0">
421 422 <v-card-text>
422 423 <v-card-title class="justify-center subheading font-weight-bold">Latest Events</v-card-title>
... ... @@ -432,6 +433,7 @@
432 433 style="height: 12px;width: 12px;border-radius: 50%;display: inline-block;vertical-align: top;"
433 434 ></span>
434 435 <div style="display: inline-block;" class="ml-2">
  436 + <!-- LATEST EVENTS FOR PARENT -->
435 437 <div v-if="$store.state.role === 'PARENT' ">
436 438 <div
437 439 class="grey--text lighten-1 caption"
... ... @@ -668,7 +670,6 @@ export default {
668 670 },
669 671 methods: {
670 672 async handleDayChanged(e) {
671   - console.log("date-changed - ", e);
672 673 await this.getParticularMeetingEvent({
673 674 meetingEventId: e.events[0]._id
674 675 });
... ... @@ -1009,6 +1010,7 @@ export default {
1009 1010 this.token = this.$store.state.token;
1010 1011 } else if (this.$store.state.role === "PARENT") {
1011 1012 this.token = this.$store.state.token;
  1013 + await this.getparentStudents();
1012 1014 }
1013 1015 this.role = this.$store.state.role;
1014 1016 // console.log("role", this.$store.state.schoolRole,"tt",this.$store.state.schoolToken);
... ... @@ -1021,7 +1023,6 @@ export default {
1021 1023 await this.getUserData();
1022 1024 await this.getFeesAndCollectionsData();
1023 1025 await this.getExpensesData();
1024   - await this.getparentStudents();
1025 1026  
1026 1027 /* get Latest events list for student login*/
1027 1028 if (this.$store.state.role == "PARENT") {
... ...