viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 250d1e021f2b2660c46c1c3f06702cbca6adc27c

Authored by Jatinder Singh
1 parent 7e8044568e
Exists in master and in 3 other branches amber-development, development, ui-design

datatable change

Showing 5 changed files with 57 additions and 46 deletions   Show diff stats
src/pages/Dashboard.vue
Diff comments   View file @250d1e0
... ... @@ -14,23 +14,23 @@
14 14  
15 15 <v-tab-item>
16 16 <v-dialog v-model="dialog" max-width="500px">
17   - <v-toolbar color="white">
  17 + <v-toolbar color="white">
18 18 <v-spacer></v-spacer>
19 19 <v-toolbar-title>Edit Profile</v-toolbar-title>
20 20 <v-spacer></v-spacer>
21 21 </v-toolbar>
22   - <v-card>
23   - <v-flex align-center justify-center layout text-xs-center>
24   - <v-avatar size="50px" style="position:absolute; top:10px; ">
25   - <img src="/static/icon/user.png"/> </v-avatar>
  22 + <v-card>
  23 + <v-flex align-center justify-center layout text-xs-center>
  24 + <v-avatar size="50px" style="position:absolute; top:10px; ">
  25 + <img src="/static/icon/user.png"/></v-avatar>
26 26 </v-flex>
27 27 <v-card-text>
28 28 <v-container>
29 29 <v-layout wrap justify-center>
30   - <v-flex xs12 sm9>
31   - <v-form>
  30 + <v-flex xs12 sm9>
  31 + <v-form>
32 32  
33   - <v-layout style="position:relative; top:15px;">
  33 + <v-layout style="position:relative; top:15px;">
34 34 <v-flex xs4 class="pt-4 subheading">
35 35 <label>First Name: </label>
36 36 </v-flex>
... ... @@ -42,7 +42,7 @@
42 42 data-vv-name="Name"
43 43 required
44 44 ></v-text-field></v-flex></v-layout>
45   - <v-layout>
  45 + <v-layout>
46 46 <v-flex xs4 class="pt-4 subheading">
47 47 <label>Last Name: </label>
48 48 </v-flex>
... ... @@ -83,8 +83,8 @@
83 83 <v-btn round dark @click.native="save">Save</v-btn>
84 84  
85 85 </v-card-actions>
86   - </v-form>
87   - </v-flex>
  86 + </v-form>
  87 + </v-flex>
88 88 </v-layout>
89 89 </v-container>
90 90 </v-card-text>
... ... @@ -491,6 +491,6 @@ h4 {
491 491 color: white !important;
492 492 }
493 493 #flex{
494   - height: 300px;
  494 +height: 300px;
495 495 }
496 496 </style>
497 497 \ No newline at end of file
... ...
src/pages/Provider.vue
Diff comments   View file @250d1e0
... ... @@ -3,7 +3,7 @@
3 3 <v-flex>
4 4 <v-card>
5 5 <v-card-title>
6   - <b><h5> Healthcare Providers </h5></b>
  6 + <b><h5> Healthcare Providers </h5></b>
7 7 <v-spacer></v-spacer>
8 8 <v-flex xs6 sm4>
9 9 <v-text-field justify-right
... ... @@ -15,22 +15,22 @@
15 15 </v-card-title>
16 16  
17 17 <v-dialog v-model="dialog" max-width="500px">
18   - <v-toolbar color="white">
  18 + <v-toolbar color="white">
19 19 <v-spacer></v-spacer>
20 20 <v-toolbar-title>Edit Profile</v-toolbar-title>
21 21 <v-spacer></v-spacer>
22 22 </v-toolbar>
23   - <v-card>
24   - <v-flex align-center justify-center layout text-xs-center>
25   - <v-avatar size="50px" style="position:absolute; top:10px; ">
26   - <img src="/static/icon/user.png"/> </v-avatar>
27   - </v-flex>
  23 + <v-card>
  24 + <v-flex align-center justify-center layout text-xs-center>
  25 + <v-avatar size="50px" style="position:absolute; top:10px; ">
  26 + <img src="/static/icon/user.png"/> </v-avatar>
  27 + </v-flex>
28 28 <v-card-text>
29 29 <v-container grid-list-md>
30 30 <v-layout wrap justify-center>
31 31 <v-flex xs12 sm9>
32 32 <v-form>
33   - <v-layout style="position:relative; top:15px; ">
  33 + <v-layout style="position:relative; top:15px; ">
34 34 <v-flex xs4 class="pt-4 subheading">
35 35 <label>First Name: </label>
36 36 </v-flex>
... ... @@ -39,8 +39,10 @@
39 39 v-model="editedItem.Name"
40 40 :rules="nameRules"
41 41 required
42   - ></v-text-field></v-flex></v-layout>
43   - <v-layout>
  42 + ></v-text-field>
  43 + </v-flex>
  44 + </v-layout>
  45 + <v-layout>
44 46 <v-flex xs4 class="pt-4 subheading">
45 47 <label>Last Name: </label>
46 48 </v-flex>
... ... @@ -49,9 +51,11 @@
49 51 v-model="editedItem.LName"
50 52 :rules="lnameRules"
51 53 required
52   - ></v-text-field></v-flex></v-layout>
  54 + ></v-text-field>
  55 + </v-flex>
  56 + </v-layout>
53 57  
54   - <v-layout>
  58 + <v-layout>
55 59 <v-flex xs4 class="pt-4 subheading">
56 60 <label>Email ID: </label>
57 61 </v-flex>
... ... @@ -62,7 +66,7 @@
62 66 data-vv-name="E-mail"
63 67 required
64 68 ></v-text-field></v-flex></v-layout>
65   - <v-layout>
  69 + <v-layout>
66 70 <v-flex xs4 class="pt-4 subheading">
67 71 <label>Date of Birth: </label>
68 72 </v-flex>
... ... @@ -113,10 +117,10 @@
113 117 <tr><h5><b>Date Of Birth:</b></h5></tr>
114 118 </th>
115 119 <th>
116   - <tr><td><h5><b>{{ editedItem.Name }}</b></h5></td></tr><br>
117   - <tr> <td><h5><b>{{ editedItem.LName }}</b></h5></td></tr><br>
118   - <tr><td><h5><b>{{ editedItem.Email }}</b></h5></td></tr><br>
119   - <tr><td><h5><b>{{ editedItem.DOB }}</b></h5></td></tr>
  120 + <tr><td><h5><b>{{ editedItem.Name }}</b></h5></td></tr><br>
  121 + <tr> <td><h5><b>{{ editedItem.LName }}</b></h5></td></tr><br>
  122 + <tr><td><h5><b>{{ editedItem.Email }}</b></h5></td></tr><br>
  123 + <tr><td><h5><b>{{ editedItem.DOB }}</b></h5></td></tr>
120 124 </th>
121 125  
122 126  
... ... @@ -125,7 +129,7 @@
125 129 </v-layout>
126 130 </v-container>
127 131 </v-card-text>
128   - </v-card>
  132 + </v-card>
129 133 </v-dialog>
130 134 <v-data-table
131 135 :headers="headers"
... ...
src/pages/changepassword.vue
Diff comments   View file @250d1e0
... ... @@ -21,22 +21,19 @@
21 21 <v-form class="mt-3" >
22 22 <v-text-field
23 23 :rules="[rules.required, rules.min]"
24   -
25   - :type="e1 ? 'password' : 'text'"
  24 +
26 25 v-model="password"
27 26 label="Current Password">
28 27 </v-text-field>
29 28 <v-text-field
30 29 v-model="npassword"
31 30 :rules="[rules.required, rules.min]"
32   -
33   - :type="e2 ? 'password' : 'text'"
  31 +
34 32 label="New Password"
35 33 ></v-text-field>
36 34 <v-text-field
37 35 v-model="cnpassword"
38   -
39   - :type="e3 ? 'password' : 'text'"
  36 + :rules="[rules.required, rules.min]"
40 37 label="Confirm Password"
41 38 ></v-text-field>
42 39 </v-form></v-flex>
... ...
src/pages/notification.vue
Diff comments   View file @250d1e0
... ... @@ -4,15 +4,15 @@
4 4 <v-toolbar color="white">
5 5 <h4 class="text-lg-left"><b>Push Notification</b></h4>
6 6 <v-spacer></v-spacer>
7   - <v-flex xs6 sm4>
8   - <v-text-field justify-right
  7 + <v-flex xs6 sm4>
  8 + <v-text-field justify-right
9 9 prepend-icon="search"
10 10 v-model="search"
11 11 label="Find your users"
12 12 single-line
13 13 hide-details
14 14 color="black"
15   - >
  15 + >
16 16 </v-text-field>
17 17 </v-flex>
18 18 </v-toolbar>
... ...
src/pages/questions.vue
Diff comments   View file @250d1e0
... ... @@ -6,7 +6,7 @@
6 6 <v-card-title>
7 7 <h3 style="position:relative; left:px; top:20px;"><b>Forum Questions</b></h3>
8 8 <h5 style="position:relative; left:40px; top:6px;">Select Category</h5>
9   - <span style="position:relative; left:200px; top:-10px;">
  9 + <span style="position:relative; left:70px; top:-10px;">
10 10 <v-btn color="black" flat>Suggestion</v-btn>
11 11 <v-btn color="black" flat>Sex</v-btn>
12 12 <v-btn color="black" flat>Health</v-btn>
... ... @@ -17,9 +17,10 @@
17 17  
18 18 </v-card-title>
19 19  
20   - <v-spacer></v-spacer>
  20 + <v-spacer></v-spacer>
21 21 <v-dialog v-model="dialog" max-width="800px">
22   - <v-btn style="position:relative; top:-10px;" slot="activator" flat class="mb-2">Add New Question<v-icon>add</v-icon></v-btn>
  22 +
  23 + <!-- <v-btn style="position:relative; top:-10px;" slot="activator" flat class="mb-2">Add New Question<v-icon>add</v-icon></v-btn> -->
23 24 <v-card>
24 25 <v-card-title>
25 26 <span class="headline">{{ formTitle }}</span>
... ... @@ -28,7 +29,7 @@
28 29 </v-card-title>
29 30 <v-flex>
30 31 <v-card>
31   - <v-card-text>
  32 + <v-card-text>
32 33 <span>
33 34 <p><b>Ana Suggestion:</b> Select Suggestion</p></span>
34 35 <h5>Select Category:</h5>
... ... @@ -39,13 +40,13 @@
39 40 <v-btn color="black" flat>Skin & Beauty</v-btn>
40 41 <v-btn color="black" flat>Diet & Ex</v-btn>
41 42 </span>
42   - </v-card-text>
  43 + </v-card-text>
43 44 </v-card>
44 45 </v-flex>
45 46 <v-card-text>
46 47 <v-container grid-list-md>
47 48 <v-layout wrap>
48   - <v-flex xs12 sm6 md12>
  49 + <v-flex xs12 sm6 md12>
49 50  
50 51 <v-textarea
51 52 solo
... ... @@ -93,6 +94,15 @@
93 94 class="elevation-1"
94 95 >
95 96 <template slot="items" slot-scope="props">
  97 + <tr>
  98 + <td id="td">&nbsp;</td>
  99 + <td>
  100 + <span style="cursor:pointer" @click="dialog=true"> <v-icon>add</v-icon>Add New Question</span>
  101 + </td>
  102 + <td id="td">&nbsp;</td>
  103 + <td id="td">&nbsp;</td>
  104 + </tr>
  105 + <tr>
96 106 <td id="td" class="text-xs-center">{{ props.item.no }}</td>
97 107 <td id="td">{{ props.item.ques }}</td>
98 108 <td id="td" class="text-xs-center">{{ props.item.res }}</td>
... ... @@ -102,6 +112,7 @@
102 112 <img style="cursor:pointer; height:20px; " class="mr-5" @click="deleteItem(props.item)" src="/static/icon/delete1.png"/>
103 113 </span>
104 114 </td>
  115 + </tr>
105 116 </template>
106 117 </v-data-table>
107 118  
... ... @@ -166,7 +177,6 @@ export default {
166 177 no: '1',
167 178 ques: 'questions',
168 179 res: 9.0,
169   -
170 180 },
171 181 ];
172 182 },
... ...