Commit 1b9dd5859eb67c337266545fc2cde2b7cba3d335
1 parent
019880b6fb
Exists in
master
and in
1 other branch
added my kids to parents section
Showing
1 changed file
with
122 additions
and
83 deletions
Show diff stats
src/pages/Dashboard/dashboard.vue
... | ... | @@ -426,85 +426,131 @@ |
426 | 426 | </v-layout> |
427 | 427 | |
428 | 428 | <v-layout row wrap v-if="role == 'PARENT'"> |
429 | - <!-- ROLE - PARENT , ACTIVE STUDENTS --> | |
429 | + <!-- ROLE - PARENT , MY KIDS --> | |
430 | 430 | <v-flex xs12> |
431 | - <v-card class="elevation-0 account-Card"> | |
431 | + <v-card class="elevation-3 card"> | |
432 | 432 | <v-container> |
433 | - <v-card-title class="title font-weight-bold">Students</v-card-title> | |
434 | - <v-data-iterator | |
435 | - :items="activeStudentsList" | |
436 | - :rows-per-page-items="rowsPerPageItems" | |
437 | - :pagination.sync="pagination" | |
438 | - content-tag="v-layout" | |
439 | - row | |
440 | - wrap | |
441 | - > | |
442 | - <template v-slot:item="props"> | |
443 | - <v-flex xs12 sm6> | |
444 | - <v-card style="border: 2px solid black" class="elevation-0" height="300"> | |
445 | - <v-container> | |
446 | - <v-card-text> | |
447 | - <v-layout row wrap> | |
448 | - <!-- IMAGE OF ACTIVE STUDENT --> | |
449 | - <v-flex xs12 class="text-xs-center"> | |
433 | + <v-card-title class="title font-weight-bold justify-center">My Kids</v-card-title> | |
434 | + <v-data-iterator | |
435 | + :items="activeStudentsList" | |
436 | + :rows-per-page-items="rowsPerPageItems" | |
437 | + :pagination.sync="pagination" | |
438 | + content-tag="v-layout" | |
439 | + row | |
440 | + wrap | |
441 | + > | |
442 | + <template v-slot:item="props"> | |
443 | + <v-flex xs12 sm6> | |
444 | + <div style="height: 150px; width: 100% display: inline-block;"> | |
445 | + <v-layout row wrap> | |
446 | + <!-- IMAGE OF ACTIVE STUDENT --> | |
447 | + <v-flex xs3 class="text-xs-center"> | |
448 | + <v-avatar size="50px"> | |
450 | 449 | <img |
451 | 450 | :src="props.item.profilePicUrl" |
452 | - alt="profileImage" | |
453 | - width="80" | |
451 | + v-if="props.item.profilePicUrl" | |
454 | 452 | /> |
455 | - </v-flex> | |
456 | - <v-flex xs12 class="text-xs-center"> | |
457 | - <!--NAME --> | |
458 | - <v-layout class="pa-0 ma-0"> | |
459 | - <v-flex xs4 class="body-1 font-weight-bold pa-0 ma-0"> | |
460 | - <span class="left">Name:</span> | |
461 | - </v-flex> | |
462 | - <v-flex xs8 class="body-1 font-weight-bold pa-0 ml-2"> | |
463 | - <span class="left">{{props.item.name}}</span> | |
464 | - </v-flex> | |
465 | - </v-layout> | |
466 | - <!--ROLLNO --> | |
467 | - <v-layout class="pa-0 ma-0"> | |
468 | - <v-flex xs4 class="body-1 font-weight-bold pa-0 ma-0"> | |
469 | - <span class="left">Roll No:</span> | |
470 | - </v-flex> | |
471 | - <v-flex xs8 class="body-1 font-weight-bold pa-0 ml-2"> | |
472 | - <span class="left">{{props.item.rollNo}}</span> | |
473 | - </v-flex> | |
474 | - </v-layout> | |
475 | - <!--GENDER --> | |
476 | - <v-layout class="pa-0 ma-0"> | |
477 | - <v-flex xs4 class="body-1 font-weight-bold pa-0 ma-0"> | |
478 | - <span class="left">Gender:</span> | |
479 | - </v-flex> | |
480 | - <v-flex xs8 class="body-1 font-weight-bold pa-0 ml-2"> | |
481 | - <span class="left">{{props.item.gender}}</span> | |
482 | - </v-flex> | |
483 | - </v-layout> | |
484 | - <!--EMAIL --> | |
485 | - <v-layout class="pa-0 ma-0"> | |
486 | - <v-flex xs4 class="body-1 font-weight-bold pa-0 ma-0"> | |
487 | - <span class="left">Email:</span> | |
488 | - </v-flex> | |
489 | - <v-flex xs8 class="body-1 font-weight-bold pa-0 ml-2"> | |
490 | - <span class="left">{{props.item.email}}</span> | |
491 | - </v-flex> | |
492 | - </v-layout> | |
493 | - </v-flex> | |
494 | - </v-layout> | |
495 | - </v-card-text> | |
496 | - </v-container> | |
497 | - </v-card> | |
498 | - </v-flex> | |
499 | - </template> | |
500 | - </v-data-iterator> | |
453 | + <img src="/static/icon/user.png" v-else /> | |
454 | + </v-avatar> | |
455 | + <!-- <div style="height: 90px;"> | |
456 | + <img | |
457 | + :src="props.item.profilePicUrl" | |
458 | + alt="profileImage" | |
459 | + width="80" | |
460 | + v-if="props.item.profilePicUrl" | |
461 | + /> | |
462 | + <img width="80" src="/static/icon/user.png" v-else /> | |
463 | + </div>--> | |
464 | + </v-flex> | |
465 | + <v-flex xs9 class="text-xs-center"> | |
466 | + <!--NAME --> | |
467 | + <v-layout class="pa-0 ma-0"> | |
468 | + <v-flex xs3 class="body-1 pa-0 ma-0"> | |
469 | + <span class="left">Name:</span> | |
470 | + </v-flex> | |
471 | + <v-flex xs9 class="body-1 pa-0 ml-2"> | |
472 | + <span class="left">{{props.item.name}}</span> | |
473 | + </v-flex> | |
474 | + </v-layout> | |
475 | + <!--ROLLNO --> | |
476 | + <v-layout class="pa-0 ma-0"> | |
477 | + <v-flex xs3 class="body-1 pa-0 ma-0"> | |
478 | + <span class="left">Roll No:</span> | |
479 | + </v-flex> | |
480 | + <v-flex xs9 class="body-1 pa-0 ml-2"> | |
481 | + <span class="left">{{props.item.rollNo}}</span> | |
482 | + </v-flex> | |
483 | + </v-layout> | |
484 | + <!--GENDER --> | |
485 | + <v-layout class="pa-0 ma-0"> | |
486 | + <v-flex xs3 class="body-1 pa-0 ma-0"> | |
487 | + <span class="left">Gender:</span> | |
488 | + </v-flex> | |
489 | + <v-flex xs9 class="body-1 pa-0 ml-2"> | |
490 | + <span class="left">{{props.item.gender}}</span> | |
491 | + </v-flex> | |
492 | + </v-layout> | |
493 | + <!--EMAIL --> | |
494 | + <v-layout class="pa-0 ma-0"> | |
495 | + <v-flex xs3 class="body-1 pa-0 ma-0"> | |
496 | + <span class="left">Email:</span> | |
497 | + </v-flex> | |
498 | + <v-flex xs9 class="body-1 pa-0 ml-2"> | |
499 | + <span class="left">{{props.item.email}}</span> | |
500 | + </v-flex> | |
501 | + </v-layout> | |
502 | + </v-flex> | |
503 | + </v-layout> | |
504 | + </div> | |
505 | + </v-flex> | |
506 | + </template> | |
507 | + </v-data-iterator> | |
501 | 508 | </v-container> |
502 | 509 | </v-card> |
503 | 510 | </v-flex> |
504 | 511 | |
505 | 512 | <!-- ROLE - PARENT, MY COURSES --> |
506 | 513 | <v-flex xs12> |
507 | - <v-card class="elevation-0 account-Card"> | |
514 | + <v-card class="elevation-3 card"> | |
515 | + <v-container> | |
516 | + <v-card-title class="justify-center title font-weight-bold">My Courses</v-card-title> | |
517 | + <v-layout wrap> | |
518 | + <v-flex xs12 sm12> | |
519 | + <v-list two-line> | |
520 | + <template> | |
521 | + <v-list-tile v-for="(course,i) in courseData" :key="i"> | |
522 | + <v-list-tile-avatar> | |
523 | + <!-- <v-icon | |
524 | + class="account-circle darkBlue-color" | |
525 | + style="cursor: pointer;" | |
526 | + @click="routeToCourseDetails(course._id)" | |
527 | + >panorama_fish_eye</v-icon>--> | |
528 | + <span> | |
529 | + <v-tooltip top> | |
530 | + <img | |
531 | + slot="activator" | |
532 | + style="cursor:pointer; width:25px; height:25px; " | |
533 | + src="/static/icon/view.png" | |
534 | + @click="routeToCourseDetails(course._id)" | |
535 | + /> | |
536 | + <span>View</span> | |
537 | + </v-tooltip> | |
538 | + </span> | |
539 | + </v-list-tile-avatar> | |
540 | + <v-list-tile-content> | |
541 | + <v-list-tile-title | |
542 | + style="cursor: pointer;" | |
543 | + @click="routeToCourseDetails(course._id)" | |
544 | + >{{ course.courseName }}</v-list-tile-title> | |
545 | + </v-list-tile-content> | |
546 | + </v-list-tile> | |
547 | + </template> | |
548 | + </v-list> | |
549 | + </v-flex> | |
550 | + </v-layout> | |
551 | + </v-container> | |
552 | + </v-card> | |
553 | + <!-- <v-card class="elevation-0 account-Card"> | |
508 | 554 | <v-container> |
509 | 555 | <v-card-title class="title font-weight-bold">My Courses</v-card-title> |
510 | 556 | <v-layout wrap> |
... | ... | @@ -515,20 +561,11 @@ |
515 | 561 | @click="routeToCourseDetails(course._id)" |
516 | 562 | >{{ course.courseName }}</span> |
517 | 563 | </v-btn> |
518 | - <!-- <v-list two-line> | |
519 | - <template> | |
520 | - <v-list-tile> | |
521 | - <v-list-tile-avatar> | |
522 | - | |
523 | - </v-list-tile-avatar> | |
524 | - <v-list-tile-content></v-list-tile-content> | |
525 | - </v-list-tile> | |
526 | - </template> | |
527 | - </v-list>--> | |
564 | + | |
528 | 565 | </v-flex> |
529 | 566 | </v-layout> |
530 | 567 | </v-container> |
531 | - </v-card> | |
568 | + </v-card>--> | |
532 | 569 | </v-flex> |
533 | 570 | </v-layout> |
534 | 571 | |
... | ... | @@ -536,9 +573,11 @@ |
536 | 573 | <!-- ROLE - PARENT , LATEST ANNOUNCEMENTS --> |
537 | 574 | <v-flex xs12 sm6 md6> |
538 | 575 | <!-- NOTICE --> |
539 | - <v-card class="account-Card"> | |
576 | + <v-card class="elevation-3 card"> | |
540 | 577 | <v-container> |
541 | - <v-card-title class="justify-center subheading font-weight-bold">Latest Announcements</v-card-title> | |
578 | + <v-card-title | |
579 | + class="justify-center subheading font-weight-bold" | |
580 | + >Latest Announcements</v-card-title> | |
542 | 581 | <v-layout column> |
543 | 582 | <v-flex |
544 | 583 | v-for="(item,index) in annoucementData" |
... | ... | @@ -577,7 +616,7 @@ |
577 | 616 | <v-layout column> |
578 | 617 | <!-- ROLE - PARENT, SCHOOL EVENTS --> |
579 | 618 | <v-flex> |
580 | - <v-card class="account-Card"> | |
619 | + <v-card class="elevation-3 card"> | |
581 | 620 | <v-container> |
582 | 621 | <v-card-title class="justify-center subheading font-weight-bold">School Events</v-card-title> |
583 | 622 | <div |
... | ... | @@ -965,7 +1004,7 @@ export default { |
965 | 1004 | }, |
966 | 1005 | }, |
967 | 1006 | |
968 | - /* ROLE PARENT - ACTIVE STUDENTS */ | |
1007 | + /* ROLE PARENT - MY KIDS */ | |
969 | 1008 | studentsData: [], |
970 | 1009 | activeStudent: {}, |
971 | 1010 | activeStudentsList: [], | ... | ... |