viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 2fe1115d8acbc633d6271510df37dea1e0ba3d1a

Authored by Shikha Mishra
1 parent 67a276510b
Exists in master and in 3 other branches amber-development, development, ui-design

added csv button and fixed bugs

Showing 7 changed files with 71 additions and 70 deletions   Show diff stats
... ... @@ -52,8 +52,8 @@ const adminMenu = [
52 52 component: 'Attendance',
53 53 icon: '/static/icon/attendence.png',
54 54 items: [
55   - { name: 'StudentAttendence', title: 'Student Attendance', component: 'StudentAttendence', action: '', },
56   - { name: 'TeacherAttendence', title: 'Teacher Attendance', component: 'TeacherAttendence', action: '', }
  55 + { name: 'StudentAttendence', title: 'Student Attendance', component: 'Student Attendence', action: '', },
  56 + { name: 'TeacherAttendence', title: 'Teacher Attendance', component: 'Teacher Attendence', action: '', }
57 57 // { name: 'userAttendence', title: 'User Attendance', component: 'userAttendence', action: '', },
58 58 ]
59 59 },
... ... @@ -64,7 +64,7 @@ const adminMenu = [
64 64 icon: '/static/icon/exam.png',
65 65 items: [
66 66 { name: 'Exam', title: 'Exam', component: 'Exam', action: '', },
67   - { name: 'ExamSchedule', title: 'Exam Schedule', component: 'ExamSchedule', action: '', },
  67 + { name: 'ExamSchedule', title: 'Exam Schedule', component: 'Exam Schedule', action: '', },
68 68 { name: 'Grade', title: 'Grade', component: 'Grade', action: '', },
69 69 // { name: 'userAttendence', title: 'User Attendance', component: 'userAttendence', action: '', },
70 70 ]
... ... @@ -76,7 +76,7 @@ const adminMenu = [
76 76 icon: '/static/icon/marks.png',
77 77 items: [
78 78 { name: 'Mark', title: 'Mark', component: 'Mark', action: '', },
79   - { name: 'MarkDistribution', title: 'Mark Distribution', component: 'MarkDistribution', action: '', },
  79 + { name: 'MarkDistribution', title: 'Mark Distribution', component: 'Mark Distribution', action: '', },
80 80 { name: 'Promotion', title: 'promotion', component: 'Promotion', action: '', },
81 81 // { name: 'userAttendence', title: 'User Attendance', component: 'userAttendence', action: '', },
82 82 ]
... ... @@ -87,17 +87,17 @@ const adminMenu = [
87 87 component: 'Administrator',
88 88 icon: '/static/icon/adminstrator.png',
89 89 items: [
90   - { name: 'AcademicYear', title: 'Academic Year', component: 'AcademicYear', action: '', },
  90 + { name: 'AcademicYear', title: 'Academic Year', component: 'Academic Year', action: '', },
91 91 // { name: 'systemAdmin', title: 'System Admin', component: 'systemAdmin', action: '', },
92   - { name: 'resetPassword', title: 'Reset Password', component: 'resetPassword', action: '', },
  92 + { name: 'resetPassword', title: 'Reset Password', component: 'Reset Password', action: '', },
93 93 { name: 'Role', title: 'Role', component: 'Role', action: '', },
94   - { name: 'BulkImport', title: 'Bulk Import', component: 'BulkImport', action: '', },
  94 + { name: 'BulkImport', title: 'Bulk Import', component: 'Bulk Import', action: '', },
95 95  
96 96 ]
97 97 },
98 98 {
99 99 title: 'Notice Board',
100   - name: 'NoticeBoard',
  100 + name: 'Notice Board',
101 101 icon: '/static/icon/notice board.png',
102 102 },
103 103 {
... ... @@ -112,7 +112,7 @@ const adminMenu = [
112 112 // },
113 113 {
114 114 title: 'Time Table',
115   - name: 'TimeTable',
  115 + name: 'Time Table',
116 116 icon: '/static/icon/time table.png',
117 117 },
118 118 {
... ... @@ -121,7 +121,7 @@ const adminMenu = [
121 121 component: 'Library',
122 122 icon: '/static/icon/library.png',
123 123 items: [
124   - { name: 'LibraryMember', title: ' Library Member', component: 'LibraryMember', action: '', },
  124 + { name: 'LibraryMember', title: ' Library Member', component: 'Library Member', action: '', },
125 125 { name: 'Books', title: 'Books', component: 'Books', action: '', },
126 126 { name: 'Issue', title: ' Issue', component: 'Issue', action: '', },
127 127 { name: 'E-Books', title: 'E-Books', component: 'E-Books', action: '', }
... ... @@ -134,8 +134,8 @@ const adminMenu = [
134 134 component: 'Report',
135 135 icon: '/static/icon/reports.png',
136 136 items: [
137   - { name: 'studentReport', title: 'Student Report', component: 'studentReport', action: '', },
138   - { name: 'ProgressCardReport', title: 'Progress Card Report', component: 'ProgressCardReport', action: '', }
  137 + { name: 'studentReport', title: 'Student Report', component: 'Student Report', action: '', },
  138 + { name: 'ProgressCardReport', title: 'Progress Card Report', component: 'Progress Card Report', action: '', }
139 139 ]
140 140 },
141 141 {
... ... @@ -145,7 +145,7 @@ const adminMenu = [
145 145 },
146 146 {
147 147 title: 'Social Media',
148   - name: 'SocialMedia',
  148 + name: 'Social Media',
149 149 icon: '/static/icon/dashboard icons-35.png',
150 150 },
151 151 {
... ... @@ -164,12 +164,12 @@ const adminMenu = [
164 164 component: 'Account',
165 165 icon: '/static/icon/accounts.png',
166 166 items: [
167   - { name: 'feeTypes', title: 'Fee Types', component: 'feeTypes', action: '', },
  167 + { name: 'feeTypes', title: 'Fee Types', component: 'Fee Types', action: '', },
168 168 { name: 'Invoice', title: 'Invoice', component: 'Invoice', action: '', },
169   - { name: 'PaymentHistory', title: 'Payment History', component: 'PaymentHistory', action: '', },
  169 + { name: 'PaymentHistory', title: 'Payment History', component: 'Payment History', action: '', },
170 170 { name: 'Expense', title: 'Expense', component: 'Expense', action: '', },
171 171 { name: 'Income', title: 'Income', component: 'Income', action: '', },
172   - { name: 'GlobalPayment', title: 'Global Payment', component: 'GlobalPayment', action: '', }
  172 + { name: 'GlobalPayment', title: 'Global Payment', component: 'Global Payment', action: '', }
173 173 ]
174 174 },
175 175 {
... ... @@ -179,7 +179,7 @@ const adminMenu = [
179 179 },
180 180 {
181 181 title: 'General Setting',
182   - name: 'GeneralSetting',
  182 + name: 'General Setting',
183 183 icon: '/static/icon/settings.png',
184 184 }
185 185 ];
... ...
src/pages/Attendence/studentAttendence.vue
Diff comments   View file @2fe1115
... ... @@ -61,7 +61,7 @@
61 61 <td class="text-xs-center td td-row">{{ props.item.rollNo}}</td>
62 62 <td class="text-xs-center td td-row">{{ props.item.email }}</td>
63 63 <td class="text-xs-center td td-row">
64   - <router-link :to="{ name:'ViewStudentsAttendence',params: { id:props.item._id } }">
  64 + <router-link :to="{ name:'View Students Attendence',params: { id:props.item._id } }">
65 65 <v-tooltip top>
66 66 <img
67 67 slot="activator"
... ...
src/pages/Attendence/teacherAttendence.vue
Diff comments   View file @2fe1115
... ... @@ -54,7 +54,7 @@
54 54 <td class="td td-row text-xs-center">{{ props.item.mobileNo }}</td>
55 55 <td class="text-xs-center td td-row">
56 56 <router-link
57   - :to="{ name:'ViewTeacherAttendence',params: { teacherId:props.item._id } }"
  57 + :to="{ name:'View Teacher Attendence',params: { teacherId:props.item._id } }"
58 58 >
59 59 <span>
60 60 <v-tooltip top>
... ...
src/pages/Attendence/viewStudentsAttendence.vue
Diff comments   View file @2fe1115
... ... @@ -388,7 +388,7 @@ export default {
388 388 )
389 389 .then(response => {
390 390 this.json_data = response.data.data;
391   - this.dialogExport = true;
  391 + this.dialogExport = false;
392 392 })
393 393 .catch(err => {
394 394 console.log("err====>", err);
... ...
src/pages/Attendence/viewTeacherAttendence.vue
Diff comments   View file @2fe1115
... ... @@ -7,10 +7,10 @@
7 7 <v-icon dark right size="20">save_alt</v-icon>
8 8 </v-btn>
9 9 <v-dialog v-model="dialogExport" max-width="500px">
10   - <!-- <v-btn round slot="activator" class="right open-dialog-button" dark>
  10 + <v-btn round slot="activator" class="right open-dialog-button" dark>
11 11 Export csv
12 12 <v-icon dark right size="20">save_alt</v-icon>
13   - </v-btn> -->
  13 + </v-btn>
14 14 <v-card flat class="card-style pa-2" dark>
15 15 <h3 class=" title text-xs-center">Export</h3>
16 16 <v-card-text>
... ... @@ -365,30 +365,31 @@ export default {
365 365 // // this.$router.replace({ path: '/' });
366 366 // });
367 367 // },
368   -// exportData() {
369   -// http()
370   -// .get(
371   -// "/studentAttendanceByMonth",
372   -// {
373   -// params: {
374   -// studentId: this.$route.params.id,
375   -// startDate: this.startDate,
376   -// endDate: this.endDate
377   -// }
378   -// },
379   -// {
380   -// headers: { Authorization: "Bearer " + this.token }
381   -// }
382   -// )
383   -// .then(response => {
384   -// this.json_data = response.data.data;
385   -// this.dialogExport = true;
386   -// })
387   -// .catch(err => {
388   -// console.log("err====>", err);
389   -// // this.$router.replace({ path: '/' });
390   -// });
391   -// },
  368 + exportData() {
  369 + // console.log("id",this.$route.params.teacherId);
  370 + http()
  371 + .get(
  372 + "/teacherAttendanceByMonth",
  373 + {
  374 + params: {
  375 + teacherId: this.$route.params.teacherId,
  376 + startDate: this.startDate,
  377 + endDate: this.endDate
  378 + }
  379 + },
  380 + {
  381 + headers: { Authorization: "Bearer " + this.token }
  382 + }
  383 + )
  384 + .then(response => {
  385 + this.json_data = response.data.data;
  386 + this.dialogExport = false;
  387 + })
  388 + .catch(err => {
  389 + console.log("err====>", err);
  390 + // this.$router.replace({ path: '/' });
  391 + });
  392 + },
392 393 exportPdf(){
393 394 this.hideData = false;
394 395 this.showPdfData = true
... ...
src/pages/Mark/mark.vue
Diff comments   View file @2fe1115
... ... @@ -139,7 +139,7 @@
139 139 <td class="td td-row text-xs-center">{{ props.item.email }}</td>
140 140 <td class="td td-row text-xs-center">
141 141 <span>
142   - <router-link :to="{ name:'viewMark',params: { markId:props.item._id } }">
  142 + <router-link :to="{ name:'view Mark',params: { markId:props.item._id } }">
143 143 <v-tooltip top>
144 144 <img
145 145 slot="activator"
... ...
src/router/paths.js
Diff comments   View file @2fe1115
... ... @@ -168,7 +168,7 @@ export default [{
168 168 {
169 169 path: '/timeTable',
170 170 meta: {},
171   - name: 'TimeTable',
  171 + name: 'Time Table',
172 172 props: (route) => ({ type: route.query.type }),
173 173 component: () =>
174 174 import (
... ... @@ -228,7 +228,7 @@ export default [{
228 228 {
229 229 path: '/socialMedia',
230 230 meta: {},
231   - name: 'SocialMedia',
  231 + name: 'Social Media',
232 232 props: (route) => ({ type: route.query.type }),
233 233 component: () =>
234 234 import (
... ... @@ -288,7 +288,7 @@ export default [{
288 288 {
289 289 path: '/AttendenceStudent',
290 290 meta: {},
291   - name: 'StudentAttendence',
  291 + name: 'Student Attendence',
292 292 props: (route) => ({ type: route.query.type }),
293 293 component: () =>
294 294 import (
... ... @@ -300,7 +300,7 @@ export default [{
300 300 {
301 301 path: '/AttendenceTeacher',
302 302 meta: {},
303   - name: 'TeacherAttendence',
  303 + name: 'Teacher Attendence',
304 304 props: (route) => ({ type: route.query.type }),
305 305 component: () =>
306 306 import (
... ... @@ -324,7 +324,7 @@ export default [{
324 324 {
325 325 path: '/feeTypes',
326 326 meta: {},
327   - name: 'feeTypes',
  327 + name: 'Fee Types',
328 328 props: (route) => ({ type: route.query.type }),
329 329 component: () =>
330 330 import (
... ... @@ -348,7 +348,7 @@ export default [{
348 348 {
349 349 path: '/paymentHistory',
350 350 meta: {},
351   - name: 'PaymentHistory',
  351 + name: 'Payment History',
352 352 props: (route) => ({ type: route.query.type }),
353 353 component: () =>
354 354 import (
... ... @@ -384,7 +384,7 @@ export default [{
384 384 {
385 385 path: '/libraryMember',
386 386 meta: {},
387   - name: 'LibraryMember',
  387 + name: 'Library Member',
388 388 props: (route) => ({ type: route.query.type }),
389 389 component: () =>
390 390 import (
... ... @@ -432,7 +432,7 @@ export default [{
432 432 {
433 433 path: '/invoiceId/:invoiceid',
434 434 meta: {},
435   - name: 'EditInvoice',
  435 + name: 'Edit Invoice',
436 436 // props: (route) => ({ type: route.query.type }),
437 437 component: () =>
438 438 import (
... ... @@ -444,7 +444,7 @@ export default [{
444 444 {
445 445 path: '/StudentsAttendence/:id',
446 446 meta: {},
447   - name: 'ViewStudentsAttendence',
  447 + name: 'View Students Attendence',
448 448 props: (route) => ({ type: route.query.type }),
449 449 component: () =>
450 450 import (
... ... @@ -456,7 +456,7 @@ export default [{
456 456 {
457 457 path: '/TeacherAttendence/:teacherId',
458 458 meta: {},
459   - name: 'ViewTeacherAttendence',
  459 + name: 'View Teacher Attendence',
460 460 props: (route) => ({ type: route.query.type }),
461 461 component: () =>
462 462 import (
... ... @@ -468,7 +468,7 @@ export default [{
468 468 {
469 469 path: '/viewInvoice/:viewInvoiceId',
470 470 meta: {},
471   - name: 'ViewInvoice',
  471 + name: 'View Invoice',
472 472 props: (route) => ({ type: route.query.type }),
473 473 component: () =>
474 474 import (
... ... @@ -480,7 +480,7 @@ export default [{
480 480 {
481 481 path: '/globalPayment',
482 482 meta: {},
483   - name: 'GlobalPayment',
  483 + name: 'Global Payment',
484 484 props: (route) => ({ type: route.query.type }),
485 485 component: () =>
486 486 import (
... ... @@ -516,7 +516,7 @@ export default [{
516 516 {
517 517 path: '/examSchedule',
518 518 meta: {},
519   - name: 'ExamSchedule',
  519 + name: 'Exam Schedule',
520 520 props: (route) => ({ type: route.query.type }),
521 521 component: () =>
522 522 import (
... ... @@ -540,7 +540,7 @@ export default [{
540 540 {
541 541 path: '/viewMark/:markId',
542 542 meta: {},
543   - name: 'viewMark',
  543 + name: 'view Mark',
544 544 props: (route) => ({ type: route.query.type }),
545 545 component: () =>
546 546 import (
... ... @@ -552,7 +552,7 @@ export default [{
552 552 {
553 553 path: '/markDistribution',
554 554 meta: {},
555   - name: 'MarkDistribution',
  555 + name: 'Mark Distribution',
556 556 props: (route) => ({ type: route.query.type }),
557 557 component: () =>
558 558 import (
... ... @@ -576,7 +576,7 @@ export default [{
576 576 {
577 577 path: '/academicYear',
578 578 meta: {},
579   - name: 'AcademicYear',
  579 + name: 'Academic Year',
580 580 props: (route) => ({ type: route.query.type }),
581 581 component: () =>
582 582 import (
... ... @@ -588,7 +588,7 @@ export default [{
588 588 {
589 589 path: '/systemAdmin',
590 590 meta: {},
591   - name: 'systemAdmin',
  591 + name: 'System Admin',
592 592 props: (route) => ({ type: route.query.type }),
593 593 component: () =>
594 594 import (
... ... @@ -600,7 +600,7 @@ export default [{
600 600 {
601 601 path: '/resetPassword',
602 602 meta: {},
603   - name: 'resetPassword',
  603 + name: 'Reset Password',
604 604 props: (route) => ({ type: route.query.type }),
605 605 component: () =>
606 606 import (
... ... @@ -624,7 +624,7 @@ export default [{
624 624 {
625 625 path: '/bulkImport',
626 626 meta: {},
627   - name: 'BulkImport',
  627 + name: 'Bulk Import',
628 628 props: (route) => ({ type: route.query.type }),
629 629 component: () =>
630 630 import (
... ... @@ -636,7 +636,7 @@ export default [{
636 636 {
637 637 path: '/studentReport',
638 638 meta: {},
639   - name: 'studentReport',
  639 + name: 'Student Report',
640 640 props: (route) => ({ type: route.query.type }),
641 641 component: () =>
642 642 import (
... ... @@ -648,7 +648,7 @@ export default [{
648 648 {
649 649 path: '/progressCardReport',
650 650 meta: {},
651   - name: 'ProgressCardReport',
  651 + name: 'Progress Card Report',
652 652 props: (route) => ({ type: route.query.type }),
653 653 component: () =>
654 654 import (
... ... @@ -660,7 +660,7 @@ export default [{
660 660 {
661 661 path: '/generalSetting',
662 662 meta: {},
663   - name: 'GeneralSetting',
  663 + name: 'General Setting',
664 664 props: (route) => ({ type: route.query.type }),
665 665 component: () =>
666 666 import (
... ... @@ -687,7 +687,7 @@ export default [{
687 687 {
688 688 path: '/schooldashboard/:schoolId',
689 689 meta: {},
690   - name: 'viewSchoolDashboard',
  690 + name: 'View School Dashboard',
691 691 props: (route) => ({ type: route.query.type }),
692 692 component: () =>
693 693 import (
... ...