viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit ac10393a4603e1ee2997df2a2279fe9c3b444779

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

add calender date and other somethings changes

Showing 5 changed files with 118 additions and 64 deletions   Show diff stats
package-lock.json
Diff comments   View file @ac10393
... ... @@ -5571,7 +5571,8 @@
5571 5571 "ansi-regex": {
5572 5572 "version": "2.1.1",
5573 5573 "bundled": true,
5574   - "dev": true
  5574 + "dev": true,
  5575 + "optional": true
5575 5576 },
5576 5577 "aproba": {
5577 5578 "version": "1.2.0",
... ... @@ -5592,12 +5593,14 @@
5592 5593 "balanced-match": {
5593 5594 "version": "1.0.0",
5594 5595 "bundled": true,
5595   - "dev": true
  5596 + "dev": true,
  5597 + "optional": true
5596 5598 },
5597 5599 "brace-expansion": {
5598 5600 "version": "1.1.11",
5599 5601 "bundled": true,
5600 5602 "dev": true,
  5603 + "optional": true,
5601 5604 "requires": {
5602 5605 "balanced-match": "^1.0.0",
5603 5606 "concat-map": "0.0.1"
... ... @@ -5612,17 +5615,20 @@
5612 5615 "code-point-at": {
5613 5616 "version": "1.1.0",
5614 5617 "bundled": true,
5615   - "dev": true
  5618 + "dev": true,
  5619 + "optional": true
5616 5620 },
5617 5621 "concat-map": {
5618 5622 "version": "0.0.1",
5619 5623 "bundled": true,
5620   - "dev": true
  5624 + "dev": true,
  5625 + "optional": true
5621 5626 },
5622 5627 "console-control-strings": {
5623 5628 "version": "1.1.0",
5624 5629 "bundled": true,
5625   - "dev": true
  5630 + "dev": true,
  5631 + "optional": true
5626 5632 },
5627 5633 "core-util-is": {
5628 5634 "version": "1.0.2",
... ... @@ -5739,7 +5745,8 @@
5739 5745 "inherits": {
5740 5746 "version": "2.0.3",
5741 5747 "bundled": true,
5742   - "dev": true
  5748 + "dev": true,
  5749 + "optional": true
5743 5750 },
5744 5751 "ini": {
5745 5752 "version": "1.3.5",
... ... @@ -5751,6 +5758,7 @@
5751 5758 "version": "1.0.0",
5752 5759 "bundled": true,
5753 5760 "dev": true,
  5761 + "optional": true,
5754 5762 "requires": {
5755 5763 "number-is-nan": "^1.0.0"
5756 5764 }
... ... @@ -5765,6 +5773,7 @@
5765 5773 "version": "3.0.4",
5766 5774 "bundled": true,
5767 5775 "dev": true,
  5776 + "optional": true,
5768 5777 "requires": {
5769 5778 "brace-expansion": "^1.1.7"
5770 5779 }
... ... @@ -5772,12 +5781,14 @@
5772 5781 "minimist": {
5773 5782 "version": "0.0.8",
5774 5783 "bundled": true,
5775   - "dev": true
  5784 + "dev": true,
  5785 + "optional": true
5776 5786 },
5777 5787 "minipass": {
5778 5788 "version": "2.2.4",
5779 5789 "bundled": true,
5780 5790 "dev": true,
  5791 + "optional": true,
5781 5792 "requires": {
5782 5793 "safe-buffer": "^5.1.1",
5783 5794 "yallist": "^3.0.0"
... ... @@ -5796,6 +5807,7 @@
5796 5807 "version": "0.5.1",
5797 5808 "bundled": true,
5798 5809 "dev": true,
  5810 + "optional": true,
5799 5811 "requires": {
5800 5812 "minimist": "0.0.8"
5801 5813 }
... ... @@ -5876,7 +5888,8 @@
5876 5888 "number-is-nan": {
5877 5889 "version": "1.0.1",
5878 5890 "bundled": true,
5879   - "dev": true
  5891 + "dev": true,
  5892 + "optional": true
5880 5893 },
5881 5894 "object-assign": {
5882 5895 "version": "4.1.1",
... ... @@ -5888,6 +5901,7 @@
5888 5901 "version": "1.4.0",
5889 5902 "bundled": true,
5890 5903 "dev": true,
  5904 + "optional": true,
5891 5905 "requires": {
5892 5906 "wrappy": "1"
5893 5907 }
... ... @@ -5973,7 +5987,8 @@
5973 5987 "safe-buffer": {
5974 5988 "version": "5.1.1",
5975 5989 "bundled": true,
5976   - "dev": true
  5990 + "dev": true,
  5991 + "optional": true
5977 5992 },
5978 5993 "safer-buffer": {
5979 5994 "version": "2.1.2",
... ... @@ -6009,6 +6024,7 @@
6009 6024 "version": "1.0.2",
6010 6025 "bundled": true,
6011 6026 "dev": true,
  6027 + "optional": true,
6012 6028 "requires": {
6013 6029 "code-point-at": "^1.0.0",
6014 6030 "is-fullwidth-code-point": "^1.0.0",
... ... @@ -6028,6 +6044,7 @@
6028 6044 "version": "3.0.1",
6029 6045 "bundled": true,
6030 6046 "dev": true,
  6047 + "optional": true,
6031 6048 "requires": {
6032 6049 "ansi-regex": "^2.0.0"
6033 6050 }
... ... @@ -6071,12 +6088,14 @@
6071 6088 "wrappy": {
6072 6089 "version": "1.0.2",
6073 6090 "bundled": true,
6074   - "dev": true
  6091 + "dev": true,
  6092 + "optional": true
6075 6093 },
6076 6094 "yallist": {
6077 6095 "version": "3.0.2",
6078 6096 "bundled": true,
6079   - "dev": true
  6097 + "dev": true,
  6098 + "optional": true
6080 6099 }
6081 6100 }
6082 6101 },
... ...
src/components/AppToolbar.vue
Diff comments   View file @ac10393
... ... @@ -90,7 +90,7 @@ export default {
90 90 Util.toggleFullScreen();
91 91 }
92 92 },
93   -mounted(){
  93 + mounted(){
94 94 this.userName = this.$store.state.name;
95 95 }
96 96 };
... ... @@ -103,6 +103,9 @@ mounted(){
103 103 .hide{
104 104 display: none;
105 105 }
  106 +.v-input__slot{
  107 + width: 300px;
  108 +}
106 109 /* }
107 110 @media screen and (max-width: 962px) {
108 111 .imglogo{
... ...
src/pages/Dashboard.vue
Diff comments   View file @ac10393
... ... @@ -70,7 +70,6 @@
70 70 ></v-text-field>
71 71 </v-flex>
72 72 </v-layout>
73   -
74 73 <v-layout>
75 74 <v-flex xs4 class="pt-4 subheading">
76 75 <label>Email ID:</label>
... ... @@ -90,23 +89,30 @@
90 89 <label>Date of Birth:</label>
91 90 </v-flex>
92 91 <v-flex xs8>
93   - <v-menu
94   - :close-on-content-click="false"
95   - v-model="modaledit"
96   - :nudge-right="20"
97   - lazy
98   - transition="scale-transition"
99   - persistent
100   - full-width
101   - max-width="290px"
102   - >
103   - <v-text-field
104   - slot="activator"
105   - v-model="editedItem.dob"
106   - name="dob"
107   - ></v-text-field>
108   - <v-date-picker v-model="editedItem.dob" @input="modaledit = false"></v-date-picker>
109   - </v-menu>
  92 + <v-menu
  93 + ref="menu1"
  94 + :close-on-content-click="false"
  95 + v-model="menu1"
  96 + :nudge-right="40"
  97 + lazy
  98 + transition="scale-transition"
  99 + offset-y
  100 + full-width
  101 + min-width="290px"
  102 + >
  103 + <v-text-field
  104 + slot="activator"
  105 + v-model="editedItem.dob"
  106 + placeholder="Select date"
  107 + ></v-text-field>
  108 + <v-date-picker
  109 + ref="picker"
  110 + v-model="editedItem.dob"
  111 + :max="new Date().toISOString().substr(0, 10)"
  112 + min="1950-01-01"
  113 + @input="menu1 = false"
  114 + ></v-date-picker>
  115 + </v-menu>
110 116 </v-flex>
111 117 </v-layout>
112 118 <v-card-actions>
... ... @@ -121,7 +127,6 @@
121 127 </v-card-text>
122 128 </v-card>
123 129 </v-dialog>
124   -
125 130 <!-- PROFILE VIEW pateints Details-->
126 131 <v-dialog v-model="dialog1" max-width="600px">
127 132 <v-toolbar color="white">
... ... @@ -334,7 +339,8 @@
334 339 </v-flex>
335 340 <v-flex xs6 class="ml-3">
336 341 <v-text-field
337   - placeholder="fill your country Name" :rules="countryRules"
  342 + placeholder="fill your country Name"
  343 + :rules="countryRules"
338 344 v-model="editedItem.country"
339 345 type="text"
340 346 name="country"
... ... @@ -363,26 +369,33 @@
363 369 <label class="right">Date of Birth:</label>
364 370 </v-flex>
365 371 <v-flex xs6 class="ml-3">
366   - <v-menu
367   - :close-on-content-click="false"
368   - v-model="modal"
369   - :nudge-right="20"
370   - lazy
371   - transition="scale-transition"
  372 + <v-menu
  373 + ref="menu"
  374 + :close-on-content-click="false"
  375 + v-model="menu"
  376 + :nudge-right="40"
  377 + lazy
  378 + transition="scale-transition"
372 379 offset-y
373   - persistent
374   - full-width
375   - max-width="290px"
376   - >
377   - <v-text-field
378   - slot="activator"
379   - v-model="editedItem.dob"
380   - name="dob"
381   - ></v-text-field>
382   - <v-date-picker v-model="editedItem.dob" @input="modal = false"></v-date-picker>
383   - </v-menu>
384   - </v-flex>
385   - </v-layout>
  380 + full-width
  381 + min-width="290px"
  382 +
  383 + >
  384 + <v-text-field
  385 + slot="activator"
  386 + v-model="editedItem.date"
  387 + placeholder="Select date"
  388 + ></v-text-field>
  389 + <v-date-picker
  390 + ref="picker"
  391 + v-model="editedItem.date"
  392 + :max="new Date().toISOString().substr(0, 10)"
  393 + min="1950-01-01"
  394 + @input="menu = false"
  395 + ></v-date-picker>
  396 + </v-menu>
  397 + </v-flex>
  398 + </v-layout>
386 399 <v-layout>
387 400 <v-flex xs12 sm9 offset-sm2>
388 401 <v-card-actions>
... ... @@ -429,9 +442,12 @@ export default {
429 442 timeout: 3000,
430 443 text: "",
431 444 loading: false,
  445 + date:null,
432 446 search: "",
433 447 modal: false,
434 448 modaledit:false,
  449 + menu: false,
  450 + menu1:false,
435 451 dialog: false,
436 452 dialog1: false,
437 453 dialog2: false,
... ... @@ -486,7 +502,7 @@ export default {
486 502 name: "",
487 503 lastName: "",
488 504 email: "",
489   - dob: new Date().toISOString().substr(0, 10),
  505 + date: null,
490 506 country: ""
491 507 },
492 508 defaultItem: {
... ... @@ -505,7 +521,18 @@ export default {
505 521 // return Math.ceil(this.pagination.totalItems / this.pagination.rowsPerPage);
506 522 // }
507 523 // },
508   - methods: {
  524 + watch: {
  525 + menu (val) {
  526 + val && this.$nextTick(() => (this.$refs.picker.activePicker = 'YEAR'))
  527 + },
  528 + menu1 (val) {
  529 + val && this.$nextTick(() => (this.$refs.picker.activePicker = 'YEAR'))
  530 + }
  531 + },
  532 + methods: {
  533 + save (date) {
  534 + this.$refs.menu.save(date)
  535 + },
509 536 getPatientList() {
510 537 var token = this.$store.state.token;
511 538 http()
... ... @@ -540,7 +567,7 @@ export default {
540 567 userId: item.userId
541 568 };
542 569 http()
543   - .post("/deletePatient", addUsers)
  570 + .post("/deletePatient", confirm('Are you sure you want to delete this?') && addUsers)
544 571 .then(response => {
545 572 if ((this.snackbar = true)) {
546 573 this.text = "Successfully delete Existing User";
... ... @@ -608,7 +635,7 @@ export default {
608 635 submit() {
609 636 if (this.$refs.form.validate()) {
610 637 let addUsers = {
611   - name: this.editedItem.name + this.editedItem.lastname,
  638 + name: this.editedItem.name + " " +this.editedItem.lastname,
612 639 dob: this.editedItem.dob,
613 640 email: this.editedItem.email,
614 641 country: this.editedItem.country
... ... @@ -643,7 +670,7 @@ export default {
643 670 },
644 671 save() {
645 672 let editUsers = {
646   - name: this.editedItem.name + this.editedItem.lastname,
  673 + name: this.editedItem.name + " " + this.editedItem.lastname,
647 674 dob: this.editedItem.dob,
648 675 email: this.editedItem.email,
649 676 userId: this.editedItem.userId
... ... @@ -677,7 +704,10 @@ export default {
677 704 margin: 0 15px;
678 705 min-width: 120px;
679 706 }
680   -
  707 + .primary {
  708 + background-color: #aaa !important;
  709 + border-color: #aaa !important;
  710 +}
681 711 h4 {
682 712 background-repeat: no-repeat;
683 713 padding: 8px;
... ...
src/pages/Login.vue
Diff comments   View file @ac10393
... ... @@ -50,7 +50,7 @@
50 50 <v-checkbox :label="`Remember me`" v-model="remember"></v-checkbox>
51 51 </v-flex>
52 52 <v-flex xs6>
53   - <h5 class="right mt-4"> <router-link class="link" to="/forgetpassword">Forget Password</router-link></h5>
  53 + <h5 class="right mt-4"> <router-link class="link" to="/forgetpassword" style="border-bottom: 2px solid #aaa;">Forgot Password</router-link></h5>
54 54 </v-flex>
55 55 </v-layout>
56 56 </v-flex>
... ...
src/pages/Provider.vue
Diff comments   View file @ac10393
... ... @@ -12,7 +12,7 @@
12 12 <v-text-field
13 13 justify-right
14 14 prepend-icon="search"
15   - v-model="search"
  15 + v-model="terms"
16 16 label="Find Yours Users"
17 17 color="black"
18 18 ></v-text-field>
... ... @@ -139,7 +139,7 @@
139 139 <v-data-table
140 140 :headers="headers"
141 141 :items="desserts"
142   - :search="search"
  142 + :terms="terms"
143 143 class="elevation-1"
144 144 :pagination.sync="pagination"
145 145 >
... ... @@ -196,7 +196,7 @@
196 196 :value="true"
197 197 color="error"
198 198 icon="warning"
199   - >Your search for "{{ search }}" found no results.</v-alert>
  199 + >Your search for "{{ terms }}" found no results.</v-alert>
200 200 </v-data-table>
201 201 </v-card>
202 202 </v-flex>
... ... @@ -218,7 +218,7 @@ export default {
218 218 dialog: false,
219 219 dialog1: false,
220 220 statusList: ["APPROVED", "DECLINED"],
221   - search: "",
  221 + terms: [],
222 222 e1: "",
223 223 rules: {
224 224 required: value => !!value || "This field is Required.",
... ... @@ -288,6 +288,8 @@ export default {
288 288 })
289 289 .then(response => {
290 290 this.desserts = response.data.data.providerList;
  291 + this.terms = response.data.data
  292 + console.log(terms)
291 293 })
292 294 .catch(err => {
293 295 console.log("err====>", err);
... ... @@ -329,7 +331,7 @@ export default {
329 331 userId: item.userId
330 332 };
331 333 http()
332   - .post("/deleteProvider", addUsers)
  334 + .post("/deleteProvider", confirm('Are you sure you want to delete this?') && addUsers)
333 335 .then(response => {
334 336 if ((this.snackbar = true)) {
335 337 this.text = "Successfully delete Health Care Priovider";
... ... @@ -354,7 +356,7 @@ export default {
354 356  
355 357 save() {
356 358 let editUsers = {
357   - name: this.editedItem.name + this.editedItem.lastname,
  359 + name: this.editedItem.name + " " + this.editedItem.lastname,
358 360 dob: this.editedItem.dob,
359 361 email: this.editedItem.email,
360 362 userId: this.editedItem.userId
... ...