viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit c8fc8e42e916000a9966539a8e5732346554c976

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

solved issues

Showing 5 changed files with 20 additions and 12 deletions   Show diff stats
... ... @@ -89,7 +89,7 @@ const adminMenu = [
89 89 items: [
90 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: 'Reset Password', action: '', },
  92 + { name: 'resetPassword', title: 'Change Password', component: 'Change Password', action: '', },
93 93 { name: 'Role', title: 'Role', component: 'Role', action: '', },
94 94 { name: 'BulkImport', title: 'Bulk Import', component: 'Bulk Import', action: '', },
95 95  
... ...
src/pages/Exam/exam.vue
Diff comments   View file @c8fc8e4
... ... @@ -294,7 +294,6 @@
294 294 <v-flex xs8 sm7 class="ml-3">
295 295 <v-text-field
296 296 placeholder="fill your Note"
297   - :rules="noteRules"
298 297 v-model="addExam.note"
299 298 ></v-text-field>
300 299 </v-flex>
... ... @@ -363,7 +362,6 @@ export default {
363 362 authorRules: [v => !!v || "Author Name is required"],
364 363 subjectCodeRules: [v => !!v || "Subject Code is required"],
365 364 authorRules: [v => !!v || "Author is required"],
366   - noteRules: [v => !!v || "Note is required"],
367 365 examDateRules: [v => !!v || "Date is required"],
368 366 headers: [
369 367 {
... ... @@ -438,7 +436,7 @@ export default {
438 436 this.editedItem = Object.assign({}, item);
439 437 this.profileExamDialog = true;
440 438 },
441   - deleteExam(item) {
  439 + deleteItem(item) {
442 440 let Exam = {
443 441 examId: item._id
444 442 };
... ... @@ -455,7 +453,9 @@ export default {
455 453 this.getExamList();
456 454 })
457 455 .catch(error => {
458   - // console.log(error);
  456 + this.snackbar = true;
  457 + this.text = error.response.data.message;
  458 + this.color = "error";
459 459 });
460 460 },
461 461 close() {
... ...
src/pages/Students/students.vue
Diff comments   View file @c8fc8e4
... ... @@ -517,7 +517,7 @@
517 517 </b>
518 518 </v-flex>
519 519 <v-flex sm8 xs6>
520   - <h5 class="my-1">{{ dates(editedItem.dob) }}</h5>
  520 + <h5 class="my-1">{{ editedItem.dob }}</h5>
521 521 </v-flex>
522 522 </v-layout>
523 523 </v-flex>
... ... @@ -945,7 +945,7 @@
945 945 <td class="text-xs-center td td-row">{{ props.item.parentId.fatherName }}</td>
946 946 <td class="text-xs-center td td-row">{{ props.item.parentId.motherName }}</td>
947 947 <td class="text-xs-center td td-row">{{ props.item.establishmentYear }}</td>
948   - <td class="text-xs-center td td-row">{{ props.item.mobile}}</td>
  948 + <!-- <td class="text-xs-center td td-row">{{ props.item.mobile}}</td> -->
949 949 <td class="text-xs-center td td-row">
950 950 <v-switch
951 951 class="pl-3"
... ... @@ -1650,6 +1650,7 @@
1650 1650 <v-text-field
1651 1651 v-model="addStudents.rollNo"
1652 1652 placeholder="Fill your Roll Number"
  1653 + :rules="rollNo"
1653 1654 required
1654 1655 ></v-text-field>
1655 1656 </v-flex>
... ... @@ -1976,7 +1977,7 @@ export default {
1976 1977 sortable: false,
1977 1978 align: "center"
1978 1979 },
1979   - { text: "Mobile No", value: "mobile", sortable: false, align: "center" },
  1980 + // { text: "Mobile No", value: "mobile", sortable: false, align: "center" },
1980 1981 {
1981 1982 text: "Status",
1982 1983 value: "status",
... ... @@ -2112,7 +2113,7 @@ export default {
2112 2113 this.$refs.editDataImage.click();
2113 2114 },
2114 2115 dates: function(date) {
2115   - return moment(date).format("MMMM DD, YYYY");
  2116 + return moment(date).format("MMM DD, YYYY");
2116 2117 },
2117 2118 onFilePicked(e) {
2118 2119 // console.log(e)
... ...
src/pages/Subjects/subjects.vue
Diff comments   View file @c8fc8e4
... ... @@ -58,7 +58,7 @@
58 58 <!-- ****** VIEW PROFIL NOTICE BOARD ****** -->
59 59  
60 60 <v-dialog v-model="viewSubjectDialog" max-width="600px">
61   - <v-toolbar color="v-toolbar">
  61 + <v-toolbar flat class="card-style pa-3" dark>
62 62 <v-spacer></v-spacer>
63 63 <v-toolbar-title>
64 64 <h3>Subject</h3>
... ... @@ -332,12 +332,17 @@ export default {
332 332 this.$refs.image.click();
333 333 },
334 334 editItem(item) {
  335 + this.editedIndex = this.subjectList.subjects;
335 336 this.editedItem = Object.assign({}, item);
336 337 this.dialog = true;
  338 + this.editSubjectDialog = true;
337 339 },
338 340 profile(item) {
  341 + this.editedIndex = this.subjectList.subjects;
339 342 this.editedItem = Object.assign({}, item);
340 343 this.dialog1 = true;
  344 + this.viewSubjectDialog = true;
  345 +
341 346 },
342 347 deleteItem(item) {
343 348 let deleteSubject = {
... ... @@ -357,7 +362,9 @@ export default {
357 362 this.text = "Successfully delete Existing Subject";
358 363 })
359 364 .catch(error => {
360   - // console.log(error);
  365 + this.snackbar = true;
  366 + this.text = error.response.data.message;
  367 + this.color = "error";
361 368 });
362 369 },
363 370 close() {
... ...
src/pages/Teachers/teachers.vue
Diff comments   View file @c8fc8e4
... ... @@ -6,7 +6,7 @@
6 6 <v-card-text>
7 7 <v-layout>
8 8 <v-flex xs12>
9   - <label class="title text-xs-center">Edit Teacher</label>
  9 + <label class="title text-xs-center">Edit Teacher Details</label>
10 10 <v-icon size="24" class="right" @click="editTeacherDialog = false">cancel</v-icon>
11 11 </v-flex>
12 12 </v-layout>
... ...