viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 5f2dd99ed850307be017788f340ba48e7be1057a

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

add full name in add user,view user detail and edit user

Showing 3 changed files with 23 additions and 21 deletions   Show diff stats
1 1 {
2   - "name": "vue-material-admin",
  2 + "name": "ana-admin",
3 3 "version": "1.0.0",
4   - "description": "A Vue Material Admin Template",
5   - "author": "Micahel Wang <wangqiangshen@gmail.com>",
  4 + "description": "A ana Dashboard",
  5 + "author": "Neeraj Sharma<neeraj.sharma@viithiisys.com>",
6 6 "private": true,
7 7 "scripts": {
8 8 "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
... ...
src/pages/Dashboard.vue
Diff comments   View file @5f2dd99
... ... @@ -84,7 +84,7 @@
84 84 <v-form ref="form" v-model="valid" lazy-validation>
85 85 <v-layout style="position:relative; top:15px;">
86 86 <v-flex xs4 class="pt-4 subheading">
87   - <label>First Name:</label>
  87 + <label>Full Name:</label>
88 88 </v-flex>
89 89 <v-flex xs8>
90 90 <v-text-field
... ... @@ -96,7 +96,7 @@
96 96 ></v-text-field>
97 97 </v-flex>
98 98 </v-layout>
99   - <v-layout>
  99 + <!-- <v-layout>
100 100 <v-flex xs4 class="pt-4 subheading">
101 101 <label>Last Name:</label>
102 102 </v-flex>
... ... @@ -109,7 +109,7 @@
109 109 required
110 110 ></v-text-field>
111 111 </v-flex>
112   - </v-layout>
  112 + </v-layout> -->
113 113 <v-layout>
114 114 <v-flex xs4 class="pt-4 subheading">
115 115 <label>Email ID:</label>
... ... @@ -187,20 +187,20 @@
187 187 <v-flex><br><br>
188 188 <v-layout>
189 189 <v-flex xs5 sm6>
190   - <h5 class="right">First Name:</h5>
  190 + <h5 class="right">Full Name:</h5>
191 191 </v-flex>
192 192 <v-flex sm6 xs8>
193 193 <h5>{{ editedItem.name }}</h5>
194 194 </v-flex>
195 195 </v-layout>
196   - <v-layout>
  196 + <!-- <v-layout>
197 197 <v-flex xs5 sm6>
198 198 <h5 class="right my-3">Last Name:</h5>
199 199 </v-flex>
200 200 <v-flex sm5 xs8>
201 201 <h5 class="my-3">{{ editedItem.name }}</h5>
202 202 </v-flex>
203   - </v-layout>
  203 + </v-layout> -->
204 204 <v-layout>
205 205 <v-flex xs5 sm6>
206 206 <h5 class="right">Email:</h5>
... ... @@ -232,7 +232,7 @@
232 232 </h4>
233 233 <h5 id="name">
234 234 <b>Patient Name:</b>
235   - {{ editedItem.name+' '+editedItem.lastName }}
  235 + {{ editedItem.name }}
236 236 </h5>
237 237 <h5 id="m">Select Month:</h5>
238 238 <v-btn color="grey darken-3" id="G" v-on:click="component='report-generate'">Generate</v-btn>
... ... @@ -351,12 +351,12 @@
351 351 <v-form ref="form" v-model="valid" lazy-validation>
352 352 <v-layout>
353 353 <v-flex xs4 class="pt-4 subheading">
354   - <label class="right">First Name:</label>
  354 + <label class="right">Full Name:</label>
355 355 </v-flex>
356 356 <v-flex xs6 class="ml-3">
357 357 <v-text-field
358 358 v-model="editedItem.name"
359   - placeholder="fill your first Name"
  359 + placeholder="fill your full Name"
360 360 name="name"
361 361 type="text"
362 362 :rules="nameRules"
... ... @@ -364,7 +364,7 @@
364 364 ></v-text-field>
365 365 </v-flex>
366 366 </v-layout>
367   - <v-layout>
  367 + <!-- <v-layout>
368 368 <v-flex xs4 class="pt-4 subheading">
369 369 <label class="right">Last Name:</label>
370 370 </v-flex>
... ... @@ -378,7 +378,7 @@
378 378 required
379 379 ></v-text-field>
380 380 </v-flex>
381   - </v-layout>
  381 + </v-layout> -->
382 382 <v-layout>
383 383 <v-flex xs4 class="pt-4 subheading">
384 384 <label class="right">Country:</label>
... ... @@ -531,12 +531,11 @@ export default {
531 531 v.length > 0) ||
532 532 "Please enter a date in the format dd/mm/yyyy"
533 533 },
534   - nameRules: [v => !!v || " First Name is required"],
  534 + nameRules: [v => !!v || " Full Name is required"],
535 535 emailRules: [
536 536 v => !!v || "E-mail is required",
537 537 v => /.+@.+/.test(v) || "E-mail must be valid"
538 538 ],
539   - lastnameRules: [v => !!v || " Last Name is required"],
540 539 countryRules: [v => !!v || " Country Name is required"],
541 540 headers: [
542 541 {
... ... @@ -554,7 +553,6 @@ export default {
554 553 editedItem: {
555 554 No: "",
556 555 name: "",
557   - lastName: "",
558 556 email: "",
559 557 date: null,
560 558 country: ""
... ... @@ -562,7 +560,6 @@ export default {
562 560 defaultItem: {
563 561 No: "",
564 562 name: "",
565   - lastname: "",
566 563 email: "",
567 564 date: null,
568 565 dob: ""
... ... @@ -699,7 +696,7 @@ export default {
699 696 submit() {
700 697 if (this.$refs.form.validate()) {
701 698 let addUsers = {
702   - name: this.editedItem.name + " " +this.editedItem.lastname,
  699 + name: this.editedItem.name,
703 700 dob: this.editedItem.date,
704 701 email: this.editedItem.email,
705 702 country: this.editedItem.country
... ... @@ -732,7 +729,7 @@ export default {
732 729 },
733 730 save() {
734 731 let editUsers = {
735   - name: this.editedItem.name + " " + this.editedItem.lastname,
  732 + name: this.editedItem.name,
736 733 dob: this.editedItem.dob,
737 734 email: this.editedItem.email,
738 735 userId: this.editedItem.userId
... ...
src/pages/changepassword.vue
Diff comments   View file @5f2dd99
... ... @@ -4,8 +4,9 @@
4 4 <v-toolbar-items>
5 5 <img src="/static/ana@2x.png" height="36" alt="ana">
6 6 </v-toolbar-items>
7   - </v-toolbar>-->
  7 + </v-toolbar> -->
8 8 <!-- <v-content> -->
  9 + <app-toolbar class="app--toolbar"></app-toolbar>
9 10 <v-container fluid fill-height>
10 11 <v-layout>
11 12 <v-flex xs12 sm8 md8 lg5 offset-sm2 offset-lg3>
... ... @@ -70,8 +71,12 @@
70 71 </template>
71 72 <script>
72 73 import http from '@/Services/http.js';
  74 +import AppToolbar from '@/components/AppToolbar';
73 75  
74 76 export default {
  77 + components: {
  78 + AppToolbar,
  79 + },
75 80 data () {
76 81 return {
77 82 snackbar: false,
... ...