viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit fc77c38e048056465ab9e73e06a20a87f0f06614

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

fixed all task change in form

Showing 7 changed files with 507 additions and 91 deletions   Show diff stats
src/Services/http.js
Diff comments   View file @fc77c38
... ... @@ -7,7 +7,7 @@ const baseURL = `${baseDomain}`;
7 7  
8 8 export default () => {
9 9 return axios.create({
10   - // baseURL: 'http://192.168.2.221:3002/v1',
  10 + // baseURL: 'http://192.168.0.108:3002/v1',
11 11 baseURL,
12 12 headers: {
13 13 Authorization: `Bearer ${store.state.token}`
... ...
... ... @@ -169,6 +169,7 @@ const adminMenu = [
169 169 { name: 'paymentHistory', title: 'Payment History', component: 'paymentHistory', 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 173 ]
173 174 },
174 175 {
... ...
src/pages/Account/globalPayment.vue
Diff comments   View file @fc77c38
... ... @@ -0,0 +1,326 @@
  1 +<template>
  2 + <div>
  3 + <!-- ****** EXISTING GLOBAL PAYMENT TABLE ****** -->
  4 + <v-form ref="form" v-model="valid" lazy-validation>
  5 + <v-container fluid>
  6 + <v-flex xs12 sm12 lg12>
  7 + <v-layout wrap>
  8 + <v-flex xs12 sm12 lg10>
  9 + <v-layout wrap>
  10 + <v-flex xs12 sm12 lg4>
  11 + <v-flex xs12 sm4 lg4 class="subheading">
  12 + <label class="mt-4">Class:</label>
  13 + </v-flex>
  14 + <v-flex xs12 sm12 lg10>
  15 + <v-select
  16 + :items="addclass"
  17 + label="Select Class"
  18 + v-model="selectStudents.select"
  19 + item-text="classNum"
  20 + item-value="_id"
  21 + name="Select Class"
  22 + :rules="classRules"
  23 + @change="getSection(selectStudents.select)"
  24 + required
  25 + ></v-select>
  26 + </v-flex>
  27 + </v-flex>
  28 + <v-flex xs12 sm12 lg4>
  29 + <v-flex xs12 sm4 lg4 class="subheading">
  30 + <label class="mt-4">Section:</label>
  31 + </v-flex>
  32 + <v-flex xs12 sm12 lg10 class>
  33 + <v-select
  34 + :items="addSection"
  35 + label="Select Section"
  36 + v-model="selectStudents.selectSection"
  37 + item-text="name"
  38 + item-value="_id"
  39 + name="Select Section"
  40 + :rules="sectionRules"
  41 + @change="getStudents()"
  42 + required
  43 + ></v-select>
  44 + </v-flex>
  45 + </v-flex>
  46 + <v-flex xs12 sm12 lg4>
  47 + <v-flex xs12 sm4 lg4 class="subheading">
  48 + <label class="mt-4">Student:</label>
  49 + </v-flex>
  50 + <v-flex xs12 sm12 lg10 class>
  51 + <v-select
  52 + :items="studentData"
  53 + label="Select Student"
  54 + v-model="selectStudents.selectStudent"
  55 + item-text="name"
  56 + item-value="_id"
  57 + :rules="studentRules"
  58 + required
  59 + ></v-select>
  60 + </v-flex>
  61 + </v-flex>
  62 + </v-layout>
  63 + </v-flex>
  64 + <v-flex xs12 sm12 lg2>
  65 + <v-flex xs12 sm12 lg12>
  66 + <v-btn @click="findStudents()" round dark :loading="loading" class="right mt-4">Search</v-btn>
  67 + </v-flex>
  68 + </v-flex>
  69 + </v-layout>
  70 + </v-flex>
  71 + </v-container>
  72 + </v-form>
  73 + <!-- <v-data-table
  74 + :headers="headers"
  75 + :items="desserts"
  76 + :pagination.sync="pagination"
  77 + :search="search"
  78 + >
  79 + <template slot="items" slot-scope="props">
  80 + <td id="td" class="text-xs-center">{{ props.item.rollNo}}</td>
  81 + <td id="td" class="text-xs-center">
  82 + <v-avatar>
  83 + <img :src="props.item.profilePicUrl" v-if="props.item.profilePicUrl" />
  84 + <img src="/static/icon/user.png" v-else-if="!props.item.profilePicUrl" />
  85 + </v-avatar>
  86 + </td>
  87 + <td id="td" class="text-xs-center">{{ props.item.name}}</td>
  88 + <td id="td" class="text-xs-center">{{ props.item.email }}</td>
  89 + <td id="td" class="text-xs-center">{{ dates(props.item.dob) }}</td>
  90 + <td id="td" class="text-xs-center">{{ props.item.gender }}</td>
  91 + <td id="td" class="text-xs-center">{{ props.item.parentId.fatherName }}</td>
  92 + <td id="td" class="text-xs-center">{{ props.item.parentId.motherName }}</td>
  93 + <td id="td" class="text-xs-center">{{ props.item.establishmentYear }}</td>
  94 + <td id="td" class="text-xs-center">{{ props.item.mobile}}</td>
  95 +
  96 + <td class="text-xs-center">
  97 + <span>
  98 + <v-tooltip top>
  99 + <img
  100 + slot="activator"
  101 + style="cursor:pointer; width:25px; height:18px; "
  102 + class="mr5"
  103 + @click="profile(props.item)"
  104 + src="/static/icon/eye1.png"
  105 + />
  106 + <span>View</span>
  107 + </v-tooltip>
  108 + <v-tooltip top>
  109 + <img
  110 + slot="activator"
  111 + style="cursor:pointer; width:20px; height:18px; "
  112 + class="mr5"
  113 + @click="editItem(props.item)"
  114 + src="/static/icon/edit1.png"
  115 + />
  116 + <span>Edit</span>
  117 + </v-tooltip>
  118 + <v-tooltip top>
  119 + <img
  120 + slot="activator"
  121 + style="cursor:pointer; width:20px; height:20px; "
  122 + class="mr5"
  123 + @click="deleteItem(props.item)"
  124 + src="/static/icon/delete1.png"
  125 + />
  126 + <span>Delete</span>
  127 + </v-tooltip>
  128 + </span>
  129 + </td>
  130 + </template>
  131 + <v-alert
  132 + slot="no-results"
  133 + :value="true"
  134 + color="error"
  135 + icon="warning"
  136 + >Your search for "{{ search }}" found no results.</v-alert>
  137 + </v-data-table>-->
  138 + <div class="loader" v-if="showLoader">
  139 + <v-progress-circular indeterminate color="white"></v-progress-circular>
  140 + </div>
  141 + </div>
  142 +</template>
  143 +
  144 +<script>
  145 +import http from "@/Services/http.js";
  146 +import moment from "moment";
  147 +
  148 +export default {
  149 + data: () => ({
  150 + snackbar: false,
  151 + y: "top",
  152 + x: "right",
  153 + mode: "",
  154 + timeout: 3000,
  155 + text: "",
  156 + showLoader: false,
  157 + loading: false,
  158 + search: "",
  159 + valid: true,
  160 + addclass: [],
  161 + selectStudents: {},
  162 + addSection: [],
  163 + classRules: [v => !!v || " Class Name is required"],
  164 + sectionRules: [v => !!v || " Section Name is required"],
  165 + studentRules: [v => !!v || "Student Name is required"],
  166 + // pagination: {
  167 + // rowsPerPage: 15
  168 + // },
  169 + // headers: [
  170 + // {
  171 + // text: "Roll No.",
  172 + // align: "center",
  173 + // sortable: false,
  174 + // value: "rollNo"
  175 + // },
  176 + // {
  177 + // text: "Profile Pic",
  178 + // value: "profilePicUrl",
  179 + // sortable: false,
  180 + // align: "center"
  181 + // },
  182 + // { text: "Name", value: "name", sortable: false, align: "center" },
  183 + // { text: "Email", value: "email", sortable: false, align: "center" },
  184 + // { text: "Dob", value: "dob", sortable: false, align: "center" },
  185 + // { text: "Gender", value: "gender", sortable: false, align: "center" },
  186 + // {
  187 + // text: "Father Name",
  188 + // value: "fatherName",
  189 + // sortable: false,
  190 + // align: "center"
  191 + // },
  192 + // {
  193 + // text: "Mother Name",
  194 + // value: "motherName",
  195 + // sortable: false,
  196 + // align: "center"
  197 + // },
  198 + // {
  199 + // text: "Academic Year",
  200 + // value: "establishmentYear",
  201 + // sortable: false,
  202 + // align: "center"
  203 + // },
  204 + // { text: "Mobile No", value: "mobile", sortable: false, align: "center" },
  205 + // { text: "Action", value: "", sortable: false, align: "center" }
  206 + // ],
  207 + studentData: []
  208 + }),
  209 + methods: {
  210 + // getSections(_id) {
  211 + // var token = this.$store.state.token;
  212 + // this.showLoader = true;
  213 + // http()
  214 + // .get(
  215 + // "/getSectionsList",
  216 + // { params: { classId: _id } },
  217 + // {
  218 + // headers: { Authorization: "Bearer " + token }
  219 + // }
  220 + // )
  221 + // .then(response => {
  222 + // this.addSection = response.data.data;
  223 + // this.showLoader = false;
  224 + // // console.log("getSectionsList=====>", this.addSection);
  225 + // })
  226 + // .catch(err => {
  227 + // this.showLoader = false;
  228 + // // console.log("err====>", err);
  229 + // // this.$router.replace({ path: '/' });
  230 + // });
  231 + // },
  232 + getSection(_id) {
  233 + var token = this.$store.state.token;
  234 + this.showLoader = true;
  235 + http()
  236 + .get(
  237 + "/getSectionsList",
  238 + { params: { classId: _id } },
  239 + {
  240 + headers: { Authorization: "Bearer " + token }
  241 + }
  242 + )
  243 + .then(response => {
  244 + this.addSection = response.data.data;
  245 + this.showLoader = false;
  246 + // console.log("getSectionsList=====>", this.addSection);
  247 + })
  248 + .catch(err => {
  249 + this.showLoader = false;
  250 + // console.log("err====>", err);
  251 + // this.$router.replace({ path: '/' });
  252 + });
  253 + },
  254 + getStudents() {
  255 + this.showLoader = true;
  256 + http()
  257 + .get("/getStudentWithClass", {
  258 + params: {
  259 + classId: this.selectStudents.select,
  260 + sectionId: this.selectStudents.selectSection
  261 + }
  262 + })
  263 + .then(response => {
  264 + this.studentData = response.data.data;
  265 + this.showLoader = false;
  266 + console.log("getSectionsList=====>", this.addSection);
  267 + })
  268 + .catch(err => {
  269 + console.log("err====>", err);
  270 + this.showLoader = false;
  271 + });
  272 + }
  273 + // dates: function(date) {
  274 + // return moment(date).format("MMMM DD, YYYY");
  275 + // },
  276 + // getParentDetails() {
  277 + // if (this.parentData.email) {
  278 + // http()
  279 + // .get("getParticularParent", {
  280 + // params: { email: this.parentData.email },
  281 + // headers: {
  282 + // Authorization: "Bearer " + this.$store.state.token
  283 + // }
  284 + // })
  285 + // .then(response => {
  286 + // this.showNext = true;
  287 + // this.showParent = false;
  288 + // this.parentData = response.data.data;
  289 + // this.parentId = response.data.data._id;
  290 + // })
  291 + // .catch(error => {
  292 + // console.log("err====>", error.response.data.message);
  293 + // });
  294 + // }
  295 + // }
  296 + },
  297 + mounted() {
  298 + var token = this.$store.state.token;
  299 + http()
  300 + .get("/getClassesList", {
  301 + headers: { Authorization: "Bearer " + token }
  302 + })
  303 + .then(response => {
  304 + this.addclass = response.data.data;
  305 + })
  306 + .catch(error => {
  307 + this.showLoader = false;
  308 + if (error.response.status === 401) {
  309 + this.$router.replace({ path: "/" });
  310 + this.$store.dispatch("setToken", null);
  311 + this.$store.dispatch("Id", null);
  312 + this.$store.dispatch("Role", null);
  313 + }
  314 + });
  315 + },
  316 + created() {
  317 + this.$root.$on("app:search", search => {
  318 + this.search = search;
  319 + });
  320 + },
  321 + beforeDestroy() {
  322 + // dont forget to remove the listener
  323 + this.$root.$off("app:search");
  324 + }
  325 +};
  326 +</script>
... ...
src/pages/Parent/parents.vue
Diff comments   View file @fc77c38
... ... @@ -46,7 +46,7 @@
46 46 class="hidden-sm-only hidden-md-only hidden-lg-only hidden-xl-only"
47 47 >close</v-icon>
48 48 </v-toolbar>
49   - <v-card-text style="height: 410px;">
  49 + <v-card-text style="height: 600px;">
50 50 <v-flex xs12>
51 51 <v-layout>
52 52 <v-flex xs3 sm4 class="pt-4 subheading">
... ... @@ -95,6 +95,20 @@
95 95 <v-flex xs12>
96 96 <v-layout>
97 97 <v-flex xs3 sm4 class="pt-4 subheading">
  98 + <label class="right">Father Profession:</label>
  99 + </v-flex>
  100 + <v-flex xs8 sm6 class="ml-3">
  101 + <v-text-field
  102 + v-model="editedItem.fatherProfession"
  103 + placeholder="fill your father Profession"
  104 + required
  105 + ></v-text-field>
  106 + </v-flex>
  107 + </v-layout>
  108 + </v-flex>
  109 + <v-flex xs12>
  110 + <v-layout>
  111 + <v-flex xs3 sm4 class="pt-4 subheading">
98 112 <label class="right">Mother Name:</label>
99 113 </v-flex>
100 114 <v-flex xs8 sm6 class="ml-3">
... ... @@ -122,6 +136,21 @@
122 136 </v-flex>
123 137 </v-layout>
124 138 </v-flex>
  139 + <v-flex xs12>
  140 + <v-layout>
  141 + <v-flex xs3 sm4 class="pt-4 subheading">
  142 + <label class="right">Mother Profession:</label>
  143 + </v-flex>
  144 + <v-flex xs8 sm6 class="ml-3">
  145 + <v-text-field
  146 + v-model="editedItem.motherProfession"
  147 + placeholder="fill your Mother Profession"
  148 + type="text"
  149 + required
  150 + ></v-text-field>
  151 + </v-flex>
  152 + </v-layout>
  153 + </v-flex>
125 154 <v-layout>
126 155 <v-flex xs12 sm12>
127 156 <v-card-actions>
... ... @@ -228,6 +257,38 @@
228 257 </v-layout>
229 258 </v-flex>
230 259 </v-layout>
  260 + <v-layout>
  261 + <v-flex xs12>
  262 + <v-layout>
  263 + <v-flex xs6>
  264 + <b>
  265 + <h5 class="right my-1">
  266 + <b>Father Profession:</b>
  267 + </h5>
  268 + </b>
  269 + </v-flex>
  270 + <v-flex xs6>
  271 + <h5 class="my-1">{{ editedItem.fatherProfession }}</h5>
  272 + </v-flex>
  273 + </v-layout>
  274 + </v-flex>
  275 + </v-layout>
  276 + <v-layout>
  277 + <v-flex xs12>
  278 + <v-layout>
  279 + <v-flex xs6>
  280 + <b>
  281 + <h5 class="right my-1">
  282 + <b>Mother Profession:</b>
  283 + </h5>
  284 + </b>
  285 + </v-flex>
  286 + <v-flex xs6>
  287 + <h5 class="my-1">{{ editedItem.motherProfession }}</h5>
  288 + </v-flex>
  289 + </v-layout>
  290 + </v-flex>
  291 + </v-layout>
231 292 </v-flex>
232 293 </v-layout>
233 294 </v-container>
... ... @@ -316,21 +377,36 @@
316 377 <v-flex xs12 sm6>
317 378 <v-layout>
318 379 <v-flex xs4 class="pt-4 subheading">
  380 + <label class="right">Father Cell No:</label>
  381 + </v-flex>
  382 + <v-flex xs8 class="ml-3">
  383 + <v-text-field
  384 + v-model="parentData.fatherCellNo"
  385 + placeholder="fill your father Cell Number"
  386 + type="number"
  387 + :rules="fatheCellNoRules"
  388 + required
  389 + ></v-text-field>
  390 + </v-flex>
  391 + </v-layout>
  392 + </v-flex>
  393 + <v-flex xs12 sm6>
  394 + <v-layout>
  395 + <v-flex xs4 class="pt-4 subheading">
319 396 <label class="right">Parent Email Id:</label>
320 397 </v-flex>
321 398 <v-flex xs8 class="ml-3">
322 399 <v-text-field
323 400 placeholder="fill Parent email"
324   - :rules="emailRules"
325 401 v-model="parentData.email"
326 402 type="text"
327   - v-on:keyup="getParentDetails"
328   - name="email"
329 403 required
330 404 ></v-text-field>
331 405 </v-flex>
332 406 </v-layout>
333 407 </v-flex>
  408 + </v-layout>
  409 + <v-layout>
334 410 <v-flex xs12 sm6>
335 411 <v-layout>
336 412 <v-flex xs4 class="pt-4 subheading">
... ... @@ -339,32 +415,28 @@
339 415 <v-flex xs8 class="ml-3">
340 416 <v-text-field
341 417 v-model="parentData.fatherName"
342   - :rules="fatherNameRules"
343 418 placeholder="Fill your father Name"
344 419 required
345 420 ></v-text-field>
346 421 </v-flex>
347 422 </v-layout>
348 423 </v-flex>
349   - </v-layout>
350   - <v-layout>
351 424 <v-flex xs12 sm6>
352 425 <v-layout>
353 426 <v-flex xs4 class="pt-4 subheading">
354   - <label class="right">Father Cell No:</label>
  427 + <label class="right">Father Profession:</label>
355 428 </v-flex>
356 429 <v-flex xs8 class="ml-3">
357 430 <v-text-field
358   - v-model="parentData.fatherCellNo"
359   - placeholder="fill your father Cell Number"
360   - name="state"
361   - type="number"
362   - :rules="fatheCellNoRules"
  431 + v-model="parentData.fatherProfession"
  432 + placeholder="fill your father Profession"
363 433 required
364 434 ></v-text-field>
365 435 </v-flex>
366 436 </v-layout>
367 437 </v-flex>
  438 + </v-layout>
  439 + <v-layout>
368 440 <v-flex xs12 sm6>
369 441 <v-layout>
370 442 <v-flex xs4 class="pt-4 subheading">
... ... @@ -374,16 +446,12 @@
374 446 <v-text-field
375 447 v-model="parentData.motherName"
376 448 placeholder="fill your Mother Name"
377   - name="state"
378 449 type="text"
379   - :rules="motherNameRules"
380 450 required
381 451 ></v-text-field>
382 452 </v-flex>
383 453 </v-layout>
384 454 </v-flex>
385   - </v-layout>
386   - <v-layout>
387 455 <v-flex xs12 sm6>
388 456 <v-layout>
389 457 <v-flex xs4 class="pt-4 subheading">
... ... @@ -393,9 +461,24 @@
393 461 <v-text-field
394 462 v-model="parentData.motherCellNo"
395 463 placeholder="fill your Mother Cell Number"
396   - name="state"
397 464 type="number"
398   - :rules="motherCellNoRules"
  465 + required
  466 + ></v-text-field>
  467 + </v-flex>
  468 + </v-layout>
  469 + </v-flex>
  470 + </v-layout>
  471 + <v-layout>
  472 + <v-flex xs12 sm6>
  473 + <v-layout>
  474 + <v-flex xs4 class="pt-4 subheading">
  475 + <label class="right">Mother Profession:</label>
  476 + </v-flex>
  477 + <v-flex xs8 class="ml-3">
  478 + <v-text-field
  479 + v-model="parentData.motherProfession"
  480 + placeholder="fill your Mother Profession"
  481 + type="text"
399 482 required
400 483 ></v-text-field>
401 484 </v-flex>
... ... @@ -587,17 +670,10 @@ export default {
587 670 },
588 671 submitParentDetails() {
589 672 if (this.$refs.parentForm.validate()) {
590   - let addparentDetails = {
591   - email: this.parentData.email,
592   - fatherName: this.parentData.fatherName,
593   - fatherCellNo: this.parentData.fatherCellNo,
594   - motherName: this.parentData.motherName,
595   - motherCellNo: this.parentData.motherCellNo,
596   - role: "PARENT"
597   - };
  673 + this.parentData.role = "PARENT";
598 674 this.loading = true;
599 675 http()
600   - .post("/createParent", addparentDetails)
  676 + .post("/createParent", this.parentData)
601 677 .then(response => {
602 678 this.parentId = response.data.data.id;
603 679 if ((this.snackbar = true)) {
... ...
src/pages/Students/students.vue
Diff comments   View file @fc77c38
... ... @@ -403,7 +403,7 @@
403 403 class="right hidden-lg-only hidden-md-only hidden-xl-only"
404 404 >Permanent Address:</label>
405 405 </v-flex>
406   - <v-flex xs12 sm8 class="ml-3">
  406 + <v-flex xs12 sm8 class="ml-3">
407 407 <v-text-field
408 408 v-model="editedItem.permanentAddress"
409 409 placeholder="fill Your Permanent Address"
... ... @@ -1046,16 +1046,15 @@
1046 1046 <v-flex xs12 sm6>
1047 1047 <v-layout>
1048 1048 <v-flex xs4 class="pt-4 subheading">
1049   - <label class="right">Parent Email Id:</label>
  1049 + <label class="right">Father Cell No:</label>
1050 1050 </v-flex>
1051 1051 <v-flex xs8 class="ml-3">
1052 1052 <v-text-field
1053   - placeholder="fill Parent email"
1054   - :rules="emailRules"
1055   - v-model.trim="parentData.email"
1056   - type="text"
1057   - v-on:keyup="getParentDetails"
1058   - name="email"
  1053 + v-model.trim="parentData.fatherCellNo"
  1054 + placeholder="fill your father Cell Number"
  1055 + type="number"
  1056 + :rules="fatheCellNoRules"
  1057 + v-on:keyup="getParentDetails()"
1059 1058 required
1060 1059 ></v-text-field>
1061 1060 </v-flex>
... ... @@ -1064,13 +1063,13 @@
1064 1063 <v-flex xs12 sm6>
1065 1064 <v-layout>
1066 1065 <v-flex xs4 class="pt-4 subheading">
1067   - <label class="right">Father Name:</label>
  1066 + <label class="right">Parent Email Id:</label>
1068 1067 </v-flex>
1069 1068 <v-flex xs8 class="ml-3">
1070 1069 <v-text-field
1071   - v-model="parentData.fatherName"
1072   - :rules="fatherNameRules"
1073   - placeholder="Fill your father Name"
  1070 + placeholder="fill Parent email"
  1071 + v-model="parentData.email"
  1072 + type="text"
1074 1073 required
1075 1074 ></v-text-field>
1076 1075 </v-flex>
... ... @@ -1081,15 +1080,12 @@
1081 1080 <v-flex xs12 sm6>
1082 1081 <v-layout>
1083 1082 <v-flex xs4 class="pt-4 subheading">
1084   - <label class="right">Father Cell No:</label>
  1083 + <label class="right">Father Name:</label>
1085 1084 </v-flex>
1086 1085 <v-flex xs8 class="ml-3">
1087 1086 <v-text-field
1088   - v-model="parentData.fatherCellNo"
1089   - placeholder="fill your father Cell Number"
1090   - name="state"
1091   - type="number"
1092   - :rules="fatheCellNoRules"
  1087 + v-model="parentData.fatherName"
  1088 + placeholder="Fill your father Name"
1093 1089 required
1094 1090 ></v-text-field>
1095 1091 </v-flex>
... ... @@ -1106,7 +1102,6 @@
1106 1102 placeholder="fill your Mother Name"
1107 1103 name="state"
1108 1104 type="text"
1109   - :rules="motherNameRules"
1110 1105 required
1111 1106 ></v-text-field>
1112 1107 </v-flex>
... ... @@ -1125,12 +1120,39 @@
1125 1120 placeholder="fill your Mother Cell Number"
1126 1121 name="state"
1127 1122 type="number"
1128   - :rules="motherCellNoRules"
1129 1123 required
1130 1124 ></v-text-field>
1131 1125 </v-flex>
1132 1126 </v-layout>
1133 1127 </v-flex>
  1128 + <v-flex xs12 sm6>
  1129 + <v-layout>
  1130 + <v-flex xs4 class="pt-4 subheading">
  1131 + <label class="right">Father Profession:</label>
  1132 + </v-flex>
  1133 + <v-flex xs8 class="ml-3">
  1134 + <v-text-field
  1135 + v-model="parentData.fatherProfession"
  1136 + placeholder="fill your father profession"
  1137 + ></v-text-field>
  1138 + </v-flex>
  1139 + </v-layout>
  1140 + </v-flex>
  1141 + </v-layout>
  1142 + <v-layout wrap>
  1143 + <v-flex xs12 sm6>
  1144 + <v-layout>
  1145 + <v-flex xs4 class="pt-4 subheading">
  1146 + <label class="right">Mother Profession:</label>
  1147 + </v-flex>
  1148 + <v-flex xs8 class="ml-3">
  1149 + <v-text-field
  1150 + v-model="parentData.motherProfession"
  1151 + placeholder="fill your mother profession"
  1152 + ></v-text-field>
  1153 + </v-flex>
  1154 + </v-layout>
  1155 + </v-flex>
1134 1156 </v-layout>
1135 1157 <v-flex sm12 class="hidden-xs-only">
1136 1158 <v-card-actions>
... ... @@ -1276,7 +1298,6 @@
1276 1298 <v-flex xs8 sm8 class="ml-3">
1277 1299 <v-text-field
1278 1300 placeholder="fill your email"
1279   - :rules="emailRules"
1280 1301 v-model="addStudents.email"
1281 1302 type="text"
1282 1303 name="email"
... ... @@ -1395,7 +1416,6 @@
1395 1416 placeholder="fill your MobileNo"
1396 1417 name="mobileNo"
1397 1418 type="number"
1398   - :rules="mobileNoRules"
1399 1419 required
1400 1420 ></v-text-field>
1401 1421 </v-flex>
... ... @@ -1459,7 +1479,7 @@
1459 1479 </v-flex>
1460 1480 </v-layout>
1461 1481 <v-layout wrap>
1462   - <v-flex xs12 sm6>
  1482 + <!-- <v-flex xs12 sm6>
1463 1483 <v-layout>
1464 1484 <v-flex xs4 class="pt-4 subheading">
1465 1485 <label class="right">Allergies:</label>
... ... @@ -1472,6 +1492,23 @@
1472 1492 ></v-text-field>
1473 1493 </v-flex>
1474 1494 </v-layout>
  1495 + </v-flex>-->
  1496 + <v-flex xs12 sm6>
  1497 + <v-layout>
  1498 + <v-flex xs4 class="pt-4 subheading">
  1499 + <label class="right hidden-xs-only hidden-sm-only">Roll Number:</label>
  1500 + <label
  1501 + class="right hidden-lg-only hidden-md-only hidden-xl-only"
  1502 + >Roll No:</label>
  1503 + </v-flex>
  1504 + <v-flex xs8 class="ml-3">
  1505 + <v-text-field
  1506 + v-model="addStudents.rollNo"
  1507 + placeholder="Fill your Roll Number"
  1508 + required
  1509 + ></v-text-field>
  1510 + </v-flex>
  1511 + </v-layout>
1475 1512 </v-flex>
1476 1513 <v-flex xs12 sm6>
1477 1514 <v-layout>
... ... @@ -1566,23 +1603,6 @@
1566 1603 </v-flex>
1567 1604 </v-layout>
1568 1605 <v-layout wrap>
1569   - <v-flex xs12 sm6>
1570   - <v-layout>
1571   - <v-flex xs4 class="pt-4 subheading">
1572   - <label class="right hidden-xs-only hidden-sm-only">Roll Number:</label>
1573   - <label
1574   - class="right hidden-lg-only hidden-md-only hidden-xl-only"
1575   - >Roll No:</label>
1576   - </v-flex>
1577   - <v-flex xs8 class="ml-3">
1578   - <v-text-field
1579   - v-model="addStudents.rollNo"
1580   - placeholder="Fill your Roll Number"
1581   - required
1582   - ></v-text-field>
1583   - </v-flex>
1584   - </v-layout>
1585   - </v-flex>
1586 1606 <v-flex xs12 sm6 class="hidden-xs-only hidden-sm-only">
1587 1607 <v-layout>
1588 1608 <v-flex xs4 sm4 class="pt-4 subheading">
... ... @@ -1599,8 +1619,6 @@
1599 1619 </v-flex>
1600 1620 </v-layout>
1601 1621 </v-flex>
1602   - </v-layout>
1603   - <v-layout class="hidden-xs-only hidden-sm-only" wrap>
1604 1622 <v-flex xs12 sm6>
1605 1623 <v-layout>
1606 1624 <v-flex xs4 sm4 class="pt-4 subheading addressForm">
... ... @@ -1661,7 +1679,7 @@
1661 1679 </v-flex>
1662 1680 </v-layout>
1663 1681 <v-layout>
1664   - <v-flex xs12 sm12>
  1682 + <v-flex xs12 sm11 offset-sm1>
1665 1683 <v-layout>
1666 1684 <v-flex xs6>
1667 1685 <v-btn round dark @click="e2 = 1">Back</v-btn>
... ... @@ -1741,23 +1759,13 @@ export default {
1741 1759 country: [v => !!v || " Country Name is required"],
1742 1760 permanentAddress: [v => !!v || " Permanent Address is required"],
1743 1761 presentAddress: [v => !!v || " Present Address is required"],
1744   - mobileNoRules: [v => !!v || "Mobile Number is required"],
1745 1762 stateRules: [v => !!v || "State Name is required"],
1746 1763 classRules: [v => !!v || " Class Name is required"],
1747 1764 sectionRules: [v => !!v || " Section Name is required"],
1748 1765 genderRules: [v => !!v || " Select Gender is required"],
1749   - fatherNameRules: [v => !!v || " Father Name is required"],
1750 1766 fatheCellNoRules: [v => !!v || " father Cell Number is required"],
1751   - motherNameRules: [v => !!v || " Mother Name is required"],
1752   - motherCellNoRules: [v => !!v || " Mother Cell Number is required"],
1753 1767 establishmentYearRules: [v => !!v || " Academic Year is required"],
1754 1768 errorMessages: "",
1755   - emailRules: [
1756   - v => !!v || "E-mail is required",
1757   - v =>
1758   - /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) ||
1759   - "E-mail must be valid"
1760   - ],
1761 1769 countries: [],
1762 1770 headers: [
1763 1771 {
... ... @@ -2175,10 +2183,10 @@ export default {
2175 2183 }
2176 2184 },
2177 2185 getParentDetails() {
2178   - if (this.parentData.email) {
  2186 + if (this.parentData.fatherCellNo.length > 9) {
2179 2187 http()
2180 2188 .get("getParticularParent", {
2181   - params: { email: this.parentData.email },
  2189 + params: { fatherCellNo: this.parentData.fatherCellNo },
2182 2190 headers: {
2183 2191 Authorization: "Bearer " + this.$store.state.token
2184 2192 }
... ...
src/pages/Teachers/teachers.vue
Diff comments   View file @fc77c38
... ... @@ -618,7 +618,6 @@
618 618 <v-flex xs8 class="ml-3">
619 619 <v-text-field
620 620 placeholder="fill your email"
621   - :rules="emailRules"
622 621 v-model="addTeachers.email"
623 622 type="text"
624 623 name="email"
... ... @@ -956,12 +955,6 @@ export default {
956 955 stateRules: [v => !!v || "State Name is required"],
957 956 joinDateRules: [v => !!v || " Join Date is required"],
958 957 errorMessages: "",
959   - emailRules: [
960   - v => !!v || "E-mail is required",
961   - v =>
962   - /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) ||
963   - "E-mail must be valid"
964   - ],
965 958 countries: [],
966 959 headers: [
967 960 {
... ...
src/router/paths.js
Diff comments   View file @fc77c38
... ... @@ -466,6 +466,18 @@ export default [{
466 466 )
467 467 },
468 468 {
  469 + path: '/globalPayment',
  470 + meta: {},
  471 + name: 'GlobalPayment',
  472 + props: (route) => ({ type: route.query.type }),
  473 + component: () =>
  474 + import (
  475 + /* webpackChunkName: "routes" */
  476 + /* webpackMode: "lazy-once" */
  477 + `@/pages/Account/globalPayment.vue`
  478 + )
  479 + },
  480 + {
469 481 path: '/exam',
470 482 meta: {},
471 483 name: 'Exam',
... ...