viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 0721aca93505fe4576a52ff0b3cb6084b21726a8

Authored by Neeraj Sharma
1 parent 9c887fee01
Exists in master and in 3 other branches amber-development, development, ui-design

solve bugs in subject and create student

Showing 4 changed files with 57 additions and 74 deletions   Show diff stats
src/pages/Account/globalPayment.vue
Diff comments   View file @0721aca
... ... @@ -142,8 +142,8 @@
142 142 hide-actions
143 143 >
144 144 <template slot="items" slot-scope="props">
145   - <td id="td" class="text-xs-center">{{ props.item.invoiceNumber}}</td>
146   - <td id="td" class="text-xs-center">{{ props.item.totalAmount}}</td>
  145 + <td id="td" class="text-xs-center">{{ props.item.invoiceNumber }}</td>
  146 + <td id="td" class="text-xs-center">{{ props.item.totalAmount }}</td>
147 147 <td id="td" class="text-xs-center">{{ props.item.totalDiscount }}</td>
148 148 <td id="td" class="text-xs-center">{{ props.item.totalSubTotal }}</td>
149 149 <td id="td" class="text-xs-center">{{ props.item.paymentStatus}}</td>
... ...
src/pages/NoticeBoard/noticeBoard.vue
Diff comments   View file @0721aca
... ... @@ -129,7 +129,7 @@
129 129  
130 130 <!-- ****** VIEW PROFIL NOTICE BOARD ****** -->
131 131  
132   - <v-dialog v-model="dialog1" max-width="640px" scrollable>
  132 + <v-dialog v-model="dialog1" max-width="940px" scrollable>
133 133 <v-card>
134 134 <v-toolbar color="grey lighten-2" flat>
135 135 <v-spacer></v-spacer>
... ...
src/pages/Students/students.vue
Diff comments   View file @0721aca
... ... @@ -132,7 +132,8 @@
132 132 <v-flex xs12 sm4>
133 133 <v-layout>
134 134 <v-flex xs4 class="pt-4 subheading">
135   - <label class="right">Email ID:</label>
  135 + <label class="right hidden-xs-only hidden-sm-only">Email Id:</label>
  136 + <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Email:</label>
136 137 </v-flex>
137 138 <v-flex xs8 class="ml-3">
138 139 <v-text-field
... ... @@ -217,15 +218,15 @@
217 218 <v-flex xs12 sm4>
218 219 <v-layout>
219 220 <v-flex xs4 class="pt-4 subheading">
220   - <label class="right">Allergies:</label>
  221 + <label class="right">Gender:</label>
221 222 </v-flex>
222 223 <v-flex xs8 class="ml-3">
223   - <v-text-field
224   - v-model="editedItem.allergies"
225   - placeholder="fill your Allergies"
226   - name="pincode"
  224 + <v-select
  225 + :items="gender"
  226 + v-model="editedItem.gender"
  227 + placeholder="Select Gender"
227 228 required
228   - ></v-text-field>
  229 + ></v-select>
229 230 </v-flex>
230 231 </v-layout>
231 232 </v-flex>
... ... @@ -365,21 +366,6 @@
365 366 <v-flex xs12 sm4>
366 367 <v-layout>
367 368 <v-flex xs4 class="pt-4 subheading">
368   - <label class="right">Gender:</label>
369   - </v-flex>
370   - <v-flex xs8 class="ml-3">
371   - <v-select
372   - :items="gender"
373   - v-model="editedItem.gender"
374   - placeholder="Select Gender"
375   - required
376   - ></v-select>
377   - </v-flex>
378   - </v-layout>
379   - </v-flex>
380   - <v-flex xs12 sm4>
381   - <v-layout>
382   - <v-flex xs4 class="pt-4 subheading">
383 369 <label class="right hidden-xs-only hidden-sm-only">Roll Number:</label>
384 370 <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Roll No:</label>
385 371 </v-flex>
... ... @@ -393,9 +379,7 @@
393 379 </v-flex>
394 380 </v-layout>
395 381 </v-flex>
396   - </v-layout>
397   - <v-layout class="hidden-xs-only hidden-sm-only">
398   - <v-flex xs12 sm4>
  382 + <v-flex xs12 sm4 class="hidden-xs-only hidden-sm-only">
399 383 <v-layout>
400 384 <v-flex xs4 sm4 class="pt-4 subheading">
401 385 <label class="right hidden-xs-only hidden-sm-only">Permanent Address:</label>
... ... @@ -412,6 +396,8 @@
412 396 </v-flex>
413 397 </v-layout>
414 398 </v-flex>
  399 + </v-layout>
  400 + <v-layout class="hidden-xs-only hidden-sm-only">
415 401 <v-flex xs12 sm4>
416 402 <v-layout>
417 403 <v-flex xs4 class="pt-4 subheading">
... ... @@ -572,7 +558,7 @@
572 558 </v-flex>
573 559 </v-layout>
574 560 </v-flex>
575   - <v-flex xs12 sm6>
  561 + <!-- <v-flex xs12 sm6>
576 562 <v-layout>
577 563 <v-flex xs6 sm4>
578 564 <b>
... ... @@ -585,6 +571,20 @@
585 571 <h5 class="my-1">{{ editedItem.allergies }}</h5>
586 572 </v-flex>
587 573 </v-layout>
  574 + </v-flex>-->
  575 + <v-flex xs12 sm6>
  576 + <v-layout>
  577 + <v-flex xs6 sm4>
  578 + <b>
  579 + <h5 class="right my-1">
  580 + <b>Roll No. :</b>
  581 + </h5>
  582 + </b>
  583 + </v-flex>
  584 + <v-flex sm6 xs6>
  585 + <h5 class="my-1">{{ editedItem.rollNo }}</h5>
  586 + </v-flex>
  587 + </v-layout>
588 588 </v-flex>
589 589 </v-layout>
590 590 <v-layout wrap>
... ... @@ -697,7 +697,7 @@
697 697 <v-flex xs6 sm4>
698 698 <b>
699 699 <h5 class="right my-1">
700   - <b>Fahter Name:</b>
  700 + <b>FahterName:</b>
701 701 </h5>
702 702 </b>
703 703 </v-flex>
... ... @@ -713,7 +713,7 @@
713 713 <v-flex xs6 sm6>
714 714 <b>
715 715 <h5 class="right my-1">
716   - <b>Mother Name:</b>
  716 + <b>MotherName:</b>
717 717 </h5>
718 718 </b>
719 719 </v-flex>
... ... @@ -727,7 +727,7 @@
727 727 <v-flex xs6 sm6>
728 728 <b>
729 729 <h5 class="right my-1">
730   - <b>Father Cell No:</b>
  730 + <b>FatherCellNo:</b>
731 731 </h5>
732 732 </b>
733 733 </v-flex>
... ... @@ -743,7 +743,7 @@
743 743 <v-flex xs6 sm6>
744 744 <b>
745 745 <h5 class="right my-1">
746   - <b>Mother Cell No:</b>
  746 + <b>MotherCellNo:</b>
747 747 </h5>
748 748 </b>
749 749 </v-flex>
... ... @@ -757,7 +757,7 @@
757 757 <v-flex xs6 sm6>
758 758 <b>
759 759 <h5 class="my-1 right">
760   - <b>Academic Year:</b>
  760 + <b>AcademicYear:</b>
761 761 </h5>
762 762 </b>
763 763 </v-flex>
... ... @@ -773,7 +773,7 @@
773 773 <v-flex xs6 sm6>
774 774 <b>
775 775 <h5 class="my-1 right">
776   - <b>Medical Notes:</b>
  776 + <b>MedicalNotes:</b>
777 777 </h5>
778 778 </b>
779 779 </v-flex>
... ... @@ -782,23 +782,7 @@
782 782 </v-flex>
783 783 </v-layout>
784 784 </v-flex>
785   - <v-flex xs12 sm6>
786   - <v-layout>
787   - <v-flex xs6 sm6>
788   - <b>
789   - <h5 class="right my-1">
790   - <b>Roll No. :</b>
791   - </h5>
792   - </b>
793   - </v-flex>
794   - <v-flex sm6 xs6>
795   - <h5 class="my-1">{{ editedItem.rollNo }}</h5>
796   - </v-flex>
797   - </v-layout>
798   - </v-flex>
799   - </v-layout>
800   - <v-layout wrap class="hidden-xs-only">
801   - <v-flex xs12 sm5>
  785 + <v-flex xs12 sm5 class="hidden-xs-only">
802 786 <v-layout wrap>
803 787 <v-flex sm6>
804 788 <b>
... ... @@ -812,7 +796,7 @@
812 796 </v-flex>
813 797 </v-layout>
814 798 </v-flex>
815   - <v-flex sm6>
  799 + <v-flex sm6 class="hidden-xs-only">
816 800 <v-layout wrap>
817 801 <v-flex sm6>
818 802 <b>
... ... @@ -830,7 +814,7 @@
830 814 <v-layout wrap class="hidden-sm-only hidden-md-only hidden-lg-only hidden-xl-only">
831 815 <v-flex xs12 sm5>
832 816 <v-layout wrap>
833   - <v-flex xs8 sm6>
  817 + <v-flex xs12 sm6>
834 818 <b>
835 819 <h5 class="my-1">
836 820 <b>present Address:-</b>
... ... @@ -844,7 +828,7 @@
844 828 </v-flex>
845 829 <v-flex xs12 sm6>
846 830 <v-layout wrap>
847   - <v-flex xs9 sm6>
  831 + <v-flex xs12 sm6>
848 832 <b>
849 833 <h5 class="my-1">
850 834 <b>Permanent Address:-</b>
... ... @@ -2204,7 +2188,6 @@ export default {
2204 2188 classId: this.addStudents.select,
2205 2189 sectionId: this.addStudents.selectSection,
2206 2190 bloodGroup: this.addStudents.bloodGroup,
2207   - allergies: this.addStudents.allergies,
2208 2191 medicalNotes: this.addStudents.medicalNotes,
2209 2192 height: this.addStudents.height,
2210 2193 weight: this.addStudents.weight,
... ... @@ -2257,7 +2240,6 @@ export default {
2257 2240 classId: this.editedItem.select,
2258 2241 sectionId: this.editedItem.selectSection,
2259 2242 bloodGroup: this.editedItem.bloodGroup,
2260   - allergies: this.editedItem.allergies,
2261 2243 medicalNotes: this.editedItem.medicalNotes,
2262 2244 height: this.editedItem.height,
2263 2245 weight: this.editedItem.weight,
... ...
src/pages/Subjects/subjects.vue
Diff comments   View file @0721aca
... ... @@ -135,12 +135,12 @@
135 135 <v-select
136 136 :items="classList"
137 137 label="Select Class"
138   - v-model="addSubject.selectName"
  138 + v-model="selectClassId"
139 139 item-text="classNum"
140 140 item-value="_id"
141 141 name="Select Class"
142 142 :rules="nameRules"
143   - @change="getClassSubject(addSubject.selectName)"
  143 + @change="getClassSubject"
144 144 class="px-4"
145 145 required
146 146 ></v-select>
... ... @@ -212,7 +212,7 @@
212 212 :right="x === 'right'"
213 213 :vertical="mode === 'vertical'"
214 214 v-model="snackbar"
215   - color="success"
  215 + :color="color"
216 216 >{{ text }}</v-snackbar>
217 217 <v-flex xs12 sm8 offset-sm2 class="top">
218 218 <v-card flat>
... ... @@ -288,6 +288,7 @@ export default {
288 288 mode: "",
289 289 timeout: 3000,
290 290 text: "",
  291 + color: "",
291 292 showLoader: false,
292 293 loading: false,
293 294 date: null,
... ... @@ -324,6 +325,7 @@ export default {
324 325 editedIndex: -1,
325 326 addSubject: {},
326 327 selectClassId: "",
  328 + selectClassId: "",
327 329 editedItem: {
328 330 subjectName: ""
329 331 }
... ... @@ -335,7 +337,6 @@ export default {
335 337  
336 338 editItem(item) {
337 339 this.editedItem = Object.assign({}, item);
338   - console.log("this.editedItem._id", this.editedItem._id);
339 340 this.dialog = true;
340 341 },
341 342 profile(item) {
... ... @@ -344,7 +345,7 @@ export default {
344 345 },
345 346 deleteItem(item) {
346 347 let deleteSubject = {
347   - classId: this.addSubject.selectName,
  348 + classId: this.selectClassId,
348 349 subjectId: item._id
349 350 };
350 351 http()
... ... @@ -355,10 +356,9 @@ export default {
355 356 }
356 357 )
357 358 .then(response => {
358   - if ((this.snackbar = true)) {
359   - this.text = "Successfully delete Existing Subject";
360   - }
361   - this.getEventList();
  359 + this.getClassSubject();
  360 + this.snackbar = true;
  361 + this.text = "Successfully delete Existing Subject";
362 362 })
363 363 .catch(error => {
364 364 // console.log(error);
... ... @@ -392,16 +392,17 @@ export default {
392 392 http()
393 393 .post("/addSubject", this.addSubject)
394 394 .then(response => {
395   - if ((this.snackbar = true)) {
396   - this.text = "New Subject added successfully";
397   - }
  395 + this.getClassSubject();
  396 + this.snackbar = true;
  397 + this.text = "New Subject added successfully";
398 398 this.clear();
  399 + this.color = "green";
399 400 })
400 401 .catch(error => {
401 402 // console.log(error);
402   - if ((this.snackbar = true)) {
403   - this.text = error.response.data.message;
404   - }
  403 + this.snackbar = true;
  404 + this.text = error.response.data.message;
  405 + this.color = "error";
405 406 });
406 407 }
407 408 },
... ... @@ -442,8 +443,8 @@ export default {
442 443 });
443 444 this.close();
444 445 },
445   - getClassSubject(id) {
446   - this.selectClassId = id;
  446 + getClassSubject() {
  447 + this.selectClassId = this.selectClassId;
447 448 http()
448 449 .get(
449 450 "/getParticularClass",
... ...