diff --git a/src/api/menu.js b/src/api/menu.js index b6b640c..9d2eb82 100644 --- a/src/api/menu.js +++ b/src/api/menu.js @@ -91,6 +91,8 @@ const adminMenu = [ { name: 'systemAdmin', title: 'System Admin', component: 'systemAdmin', action: '', }, { name: 'resetPassword', title: 'Reset Password', component: 'resetPassword', action: '', }, { name: 'Role', title: 'Role', component: 'Role', action: '', }, + { name: 'bulkImportole', title: 'Bulk Import', component: 'bulkImport', action: '', }, + ] }, { @@ -188,7 +190,7 @@ const schoolMenu = [ // group: 'apps', path: '/school', icon: '/static/schoolIcons/Dashboard.png', - }, + } ]; // reorder menu diff --git a/src/components/pageHeader/AppToolbar.vue b/src/components/pageHeader/AppToolbar.vue index 9fbb956..2c413df 100644 --- a/src/components/pageHeader/AppToolbar.vue +++ b/src/components/pageHeader/AppToolbar.vue @@ -9,7 +9,7 @@ xs7 sm3 class="userSearch" - v-if="$route.name != 'Dashboard' && $route.name != 'changepassword' && $route.name != 'generalSetting' && $route.name != 'resetPassword'" + v-if="$route.name != 'Dashboard' && $route.name != 'changepassword' && $route.name != 'generalSetting' && $route.name != 'resetPassword' && $route.name != 'bulkImport'" > + + + + + Import + + + + + + + + + + + + + + + + refreshUpload + + + + import + + + + + archivesample download + + + + + + + + + + + + + + + + + + refreshUpload + + + + import + + + + + archivesample download + + + + + + + + + + + + + + + + + + refreshUpload + + + + import + + + + + archivesample download + + + + + + + + + + + + + + + + + + refreshUpload + + + + import + + + + + archivesample download + + + + + + + + + + + + + + + + + + refreshUpload + + + + import + + + + + archivesample download + + + + + + + + + + + + + + + + + + refreshUpload + + + + import + + + + archivesample download + + + + + + + + + + + + \ No newline at end of file diff --git a/src/pages/Attendence/viewStudentsAttendence.vue b/src/pages/Attendence/viewStudentsAttendence.vue index 3a1a182..c687b5a 100644 --- a/src/pages/Attendence/viewStudentsAttendence.vue +++ b/src/pages/Attendence/viewStudentsAttendence.vue @@ -404,7 +404,6 @@ export default { type: 'dataURL' } this.output = await this.$html2canvas(el, options); - console.log(this.output); if(this.output) { this.loadingPdf = false } diff --git a/src/router/paths.js b/src/router/paths.js index 09cd152..95c9350 100644 --- a/src/router/paths.js +++ b/src/router/paths.js @@ -586,6 +586,18 @@ export default [{ ) }, { + path: '/bulkImport', + meta: {}, + name: 'bulkImport', + props: (route) => ({ type: route.query.type }), + component: () => + import ( + /* webpackChunkName: "routes" */ + /* webpackMode: "lazy-once" */ + `@/pages/Administrator/bulkImport.vue` + ) + }, + { path: '/studentReport', meta: {}, name: 'studentReport', @@ -622,6 +634,8 @@ export default [{ ) }, + //////SCHOOL + { path: '/school', meta: {}, diff --git a/src/script/books.js b/src/script/books.js new file mode 100644 index 0000000..03d23ec --- /dev/null +++ b/src/script/books.js @@ -0,0 +1,22 @@ +export default () => { + + const books = [{ + "Book": "Math", + "Subject": "002015", + "Author": "R D Sharma", + "Price": "600", + "Quantity": "15", + "Rack": "110", + }, + { + "Book": "Hindi", + "Subject": "059090", + "Author": "V Kumar", + "Price": "400", + "Quantity": "5", + "Rack": "10", + }, + ] + return books; + +} \ No newline at end of file diff --git a/src/script/parents.js b/src/script/parents.js new file mode 100644 index 0000000..eb3fca2 --- /dev/null +++ b/src/script/parents.js @@ -0,0 +1,20 @@ +export default () => { + + const parents = [{ + "email": "digital@theideazfactory.com", + "fatherName": "Abhishek", + "fatherCellNo": "9898981234", + "motherName": "Rita", + "motherCellNo": "8989786789", + }, + { + "email": "Rampal@viithiisys.com", + "fatherName": "suresh", + "fatherCellNo": "9898987867", + "motherName": "rita kumari", + "motherCellNo": "9768576536", + } + ] + return parents; + +} \ No newline at end of file diff --git a/src/script/students.js b/src/script/students.js new file mode 100644 index 0000000..936330b --- /dev/null +++ b/src/script/students.js @@ -0,0 +1,31 @@ +export default () => { + + const students = [{ + "name": "Rishav Singla", + "email": "rsingla.rishu@gmail.com", + "rollNo": "1", + "dob": "1993-10-08", + "gender": "Male", + "bloodGroup": "A+", + "mobile": "9914092452", + "city": "Chandigarh", + "country": "India", + "presentAddress": "Mohali Sector ", + "state": "Punjab", + }, + { + "name": "Shubham Chugh", + "email": "shubham@theideazfactory.com", + "rollNo": "2", + "dob": "1994-05-29", + "gender": "Male", + "bloodGroup": "A+", + "mobile": "8077362128", + "city": "Chandigarh", + "country": "India", + "presentAddress": "#1571, ground floor, sector 7C", + "state": "Chandigarh", + }, + ] + return students; +} \ No newline at end of file diff --git a/src/script/teachers.js b/src/script/teachers.js new file mode 100644 index 0000000..2b802b4 --- /dev/null +++ b/src/script/teachers.js @@ -0,0 +1,27 @@ +export default () => { + + const teachers = [{ + "name": "Test Teacher", + "email": "shubhamchugh1992@gmail.com", + "dob": "1994-05-01", + "city": "Chandigarh", + "country": "India", + "presentAddress": "SCO 34, second floor", + "mobileNo": "08558875847", + "state": "Chandigarh", + "joinDate": "2019-11-18", + }, + { + "name": "Neeraj Sharma", + "email": "neeraj.sharma@viithiisys.com", + "dob": "1995-01-14", + "city": "Mohali", + "country": "India", + "presentAddress": "sector 71 ,Mohali", + "mobileNo": "7009191451", + "state": "Punjab", + "joinDate": "2018-04-23", + } + ] + return teachers; +} \ No newline at end of file diff --git a/src/script/users.js b/src/script/users.js new file mode 100644 index 0000000..2557d05 --- /dev/null +++ b/src/script/users.js @@ -0,0 +1,26 @@ +export default () => { + + const users = [{ + "name": "Neeraj", + "email": "neeraj.sharma@viithiisys.com", + "dob": "1995-01-14", + "gender": "Male", + "religion": "Hindu", + "address": "Mohali", + "phone": "1234567890", + "joiningDate": "2016-08-17", + }, + { + "name": "Rishav", + "email": "rishav.singla@viithiisys.com", + "dob": "1995-01-14", + "gender": "Male", + "religion": "Hindu", + "address": "Punjab", + "phone": "9878768790", + "joiningDate": "2016-08-17", + } + ] + return users; + +} \ No newline at end of file