viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 495e4037c6307dfe060ab9b653dfe72357d999ee

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

update

Showing 36 changed files with 1579 additions and 1631 deletions   Show diff stats
... ... @@ -133,7 +133,7 @@ const Menu = [
133 133 icon: '/static/schoolIcons/reports.png',
134 134 items: [
135 135 { name: 'studentReport', title: 'Student Report', component: 'studentReport', action: '', },
136   - { name: 'markSheetReport', title: 'Mark Sheet Report', component: 'markSheetReport', action: '', }
  136 + { name: 'progressCardReport', title: 'Progress Card Report', component: 'progressCardReport', action: '', }
137 137 ]
138 138 },
139 139 {
... ...
src/pages/Account/expense.vue
Diff comments   View file @495e403
... ... @@ -34,136 +34,136 @@
34 34 <v-spacer></v-spacer>
35 35 </v-toolbar>
36 36 <v-card-text style="height: 600px;">
37   - <v-layout>
38   - <v-flex
39   - xs12
40   - class="text-xs-center text-sm-center text-md-center text-lg-center my-4 mr-4"
41   - >
42   - <v-avatar size="160px">
43   - <img src="/static/icon/user.png" v-if="!editedItem.fileUrl && !imageUrl" />
44   - <img :src="editedItem.fileUrl" v-else-if="editedItem.fileUrl && !imageUrl" />
45   - <img
46   - v-if="imageUrl"
47   - :src="imageUrl"
48   - height="150"
49   - style="border-radius:50%; width:200px"
50   - />
51   - </v-avatar>
52   - <input
53   - type="file"
54   - style="display:none"
55   - ref="image"
56   - accept="image/*"
57   - @change="onFilePicked"
  37 + <v-layout>
  38 + <v-flex
  39 + xs12
  40 + class="text-xs-center text-sm-center text-md-center text-lg-center my-4 mr-4"
  41 + >
  42 + <v-avatar size="160px">
  43 + <img src="/static/icon/user.png" v-if="!editedItem.fileUrl && !imageUrl" />
  44 + <img :src="editedItem.fileUrl" v-else-if="editedItem.fileUrl && !imageUrl" />
  45 + <img
  46 + v-if="imageUrl"
  47 + :src="imageUrl"
  48 + height="150"
  49 + style="border-radius:50%; width:200px"
58 50 />
59   - </v-flex>
60   - </v-layout>
61   - <v-layout wrap>
62   - <v-flex xs12 sm12>
63   - <v-layout>
64   - <v-flex xs4 class="pt-4 subheading">
65   - <label class="right">Name:</label>
66   - </v-flex>
67   - <v-flex xs6 class="ml-3">
  51 + </v-avatar>
  52 + <input
  53 + type="file"
  54 + style="display:none"
  55 + ref="image"
  56 + accept="image/*"
  57 + @change="onFilePicked"
  58 + />
  59 + </v-flex>
  60 + </v-layout>
  61 + <v-layout wrap>
  62 + <v-flex xs12 sm12>
  63 + <v-layout>
  64 + <v-flex xs4 class="pt-4 subheading">
  65 + <label class="right">Name:</label>
  66 + </v-flex>
  67 + <v-flex xs6 class="ml-3">
  68 + <v-text-field
  69 + v-model="editedItem.name"
  70 + placeholder="fill your full Name"
  71 + name="name"
  72 + type="text"
  73 + required
  74 + ></v-text-field>
  75 + </v-flex>
  76 + </v-layout>
  77 + </v-flex>
  78 + </v-layout>
  79 + <v-layout wrap>
  80 + <v-flex xs12>
  81 + <v-layout>
  82 + <v-flex xs4 class="pt-4 subheading">
  83 + <label class="right">Date:</label>
  84 + </v-flex>
  85 + <v-flex xs6 class="ml-3">
  86 + <v-menu
  87 + ref="menu"
  88 + :close-on-content-click="false"
  89 + v-model="menu3"
  90 + :nudge-right="40"
  91 + lazy
  92 + transition="scale-transition"
  93 + offset-y
  94 + full-width
  95 + min-width="290px"
  96 + >
68 97 <v-text-field
69   - v-model="editedItem.name"
70   - placeholder="fill your full Name"
71   - name="name"
72   - type="text"
73   - required
  98 + slot="activator"
  99 + v-model="editedItem.date"
  100 + placeholder="Select date"
74 101 ></v-text-field>
75   - </v-flex>
76   - </v-layout>
77   - </v-flex>
78   - </v-layout>
  102 + <v-date-picker
  103 + ref="picker"
  104 + v-model="editedItem.date"
  105 + @input="$refs.menu.save(editedItem.date)"
  106 + ></v-date-picker>
  107 + </v-menu>
  108 + </v-flex>
  109 + </v-layout>
  110 + </v-flex>
79 111 <v-layout wrap>
80   - <v-flex xs12>
  112 + <v-flex xs12 sm12>
81 113 <v-layout>
82 114 <v-flex xs4 class="pt-4 subheading">
83   - <label class="right">Date:</label>
  115 + <label class="right">Amount:</label>
84 116 </v-flex>
85 117 <v-flex xs6 class="ml-3">
86   - <v-menu
87   - ref="menu"
88   - :close-on-content-click="false"
89   - v-model="menu3"
90   - :nudge-right="40"
91   - lazy
92   - transition="scale-transition"
93   - offset-y
94   - full-width
95   - min-width="290px"
96   - >
97   - <v-text-field
98   - slot="activator"
99   - v-model="editedItem.date"
100   - placeholder="Select date"
101   - ></v-text-field>
102   - <v-date-picker
103   - ref="picker"
104   - v-model="editedItem.date"
105   - @input="$refs.menu.save(editedItem.date)"
106   - ></v-date-picker>
107   - </v-menu>
  118 + <v-text-field v-model="editedItem.amount" required></v-text-field>
108 119 </v-flex>
109 120 </v-layout>
110 121 </v-flex>
  122 + </v-layout>
  123 + <v-flex xs12>
111 124 <v-layout wrap>
112   - <v-flex xs12 sm12>
113   - <v-layout>
114   - <v-flex xs4 class="pt-4 subheading">
115   - <label class="right">Amount:</label>
116   - </v-flex>
117   - <v-flex xs6 class="ml-3">
118   - <v-text-field v-model="editedItem.amount" required></v-text-field>
119   - </v-flex>
120   - </v-layout>
  125 + <v-flex xs4 class="pt-4 subheading">
  126 + <label class="right hidden-xs-only hidden-sm-only">Uplaod Image:</label>
  127 + <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Uplaod:</label>
  128 + </v-flex>
  129 + <v-flex xs6 class="ml-3">
  130 + <v-text-field
  131 + label="Select Image"
  132 + @click="pickFile"
  133 + v-model="imageName"
  134 + append-icon="attach_file"
  135 + ></v-text-field>
121 136 </v-flex>
122 137 </v-layout>
123   - <v-flex xs12>
124   - <v-layout wrap>
125   - <v-flex xs4 class="pt-4 subheading">
126   - <label class="right hidden-xs-only hidden-sm-only">Uplaod Image:</label>
127   - <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Uplaod:</label>
128   - </v-flex>
129   - <v-flex xs6 class="ml-3">
130   - <v-text-field
131   - label="Select Image"
132   - @click="pickFile"
133   - v-model="imageName"
134   - append-icon="attach_file"
135   - ></v-text-field>
136   - </v-flex>
137   - </v-layout>
138   - </v-flex>
139   - <v-flex xs12>
140   - <v-layout>
141   - <v-flex xs4 class="pt-4 subheading">
142   - <label class="right">Note:</label>
143   - </v-flex>
144   - <v-flex xs6 class="ml-3">
145   - <v-textarea
146   - name="input-7-1"
147   - v-model="editedItem.note"
148   - placeholder="fill your Note"
149   - type="text"
150   - :rules="noteRules"
151   - multi-line
152   - required
153   - ></v-textarea>
154   - </v-flex>
155   - </v-layout>
156   - </v-flex>
157   - </v-layout>
158   - <v-layout>
159   - <v-flex xs12 sm12>
160   - <v-card-actions>
161   - <v-btn round dark @click.native="close">Cancel</v-btn>
162   - <v-spacer></v-spacer>
163   - <v-btn round dark :loading="loading" @click="save">Save</v-btn>
164   - </v-card-actions>
165   - </v-flex>
166   - </v-layout>
  138 + </v-flex>
  139 + <v-flex xs12>
  140 + <v-layout>
  141 + <v-flex xs4 class="pt-4 subheading">
  142 + <label class="right">Note:</label>
  143 + </v-flex>
  144 + <v-flex xs6 class="ml-3">
  145 + <v-textarea
  146 + name="input-7-1"
  147 + v-model="editedItem.note"
  148 + placeholder="fill your Note"
  149 + type="text"
  150 + :rules="noteRules"
  151 + multi-line
  152 + required
  153 + ></v-textarea>
  154 + </v-flex>
  155 + </v-layout>
  156 + </v-flex>
  157 + </v-layout>
  158 + <v-layout>
  159 + <v-flex xs12 sm12>
  160 + <v-card-actions>
  161 + <v-btn round dark @click.native="close">Cancel</v-btn>
  162 + <v-spacer></v-spacer>
  163 + <v-btn round dark :loading="loading" @click="save">Save</v-btn>
  164 + </v-card-actions>
  165 + </v-flex>
  166 + </v-layout>
167 167 </v-card-text>
168 168 </v-card>
169 169 </v-dialog>
... ... @@ -268,24 +268,36 @@
268 268 <td id="td" class="text-xs-center">{{ props.item.note }}</td>
269 269 <td class="text-xs-center">
270 270 <span>
271   - <img
272   - style="cursor:pointer; width:25px; height:18px; "
273   - class="mr-5"
274   - @click="profile(props.item)"
275   - src="/static/icon/eye1.png"
276   - />
277   - <img
278   - style="cursor:pointer; width:20px; height:18px; "
279   - class="mr-5"
280   - @click="editItem(props.item)"
281   - src="/static/icon/edit1.png"
282   - />
283   - <img
284   - style="cursor:pointer;width:20px; height:20px; "
285   - class="mr-5"
286   - @click="deleteItem(props.item)"
287   - src="/static/icon/delete1.png"
288   - />
  271 + <v-tooltip top>
  272 + <img
  273 + slot="activator"
  274 + style="cursor:pointer; width:25px; height:18px; "
  275 + class="mr5"
  276 + @click="profile(props.item)"
  277 + src="/static/icon/eye1.png"
  278 + />
  279 + <span>View</span>
  280 + </v-tooltip>
  281 + <v-tooltip top>
  282 + <img
  283 + slot="activator"
  284 + style="cursor:pointer; width:20px; height:18px; "
  285 + class="mr5"
  286 + @click="editItem(props.item)"
  287 + src="/static/icon/edit1.png"
  288 + />
  289 + <span>Edit</span>
  290 + </v-tooltip>
  291 + <v-tooltip top>
  292 + <img
  293 + slot="activator"
  294 + style="cursor:pointer; width:20px; height:20px; "
  295 + class="mr5"
  296 + @click="deleteItem(props.item)"
  297 + src="/static/icon/delete1.png"
  298 + />
  299 + <span>Delete</span>
  300 + </v-tooltip>
289 301 </span>
290 302 </td>
291 303 </template>
... ... @@ -443,7 +455,7 @@
443 455 </v-flex>
444 456 </v-layout>
445 457 </v-layout>
446   - <v-layout>
  458 + <v-layout>
447 459 <v-flex xs12 sm6 offset-sm3>
448 460 <v-layout>
449 461 <v-flex xs6>
... ...
src/pages/Account/income.vue
Diff comments   View file @495e403
... ... @@ -268,24 +268,36 @@
268 268 <td id="td" class="text-xs-center">{{ props.item.note }}</td>
269 269 <td class="text-xs-center">
270 270 <span>
271   - <img
272   - style="cursor:pointer; width:25px; height:18px; "
273   - class="mr-5"
274   - @click="profile(props.item)"
275   - src="/static/icon/eye1.png"
276   - />
277   - <img
278   - style="cursor:pointer; width:20px; height:18px; "
279   - class="mr-5"
280   - @click="editItem(props.item)"
281   - src="/static/icon/edit1.png"
282   - />
283   - <img
284   - style="cursor:pointer;width:20px; height:20px; "
285   - class="mr-5"
286   - @click="deleteItem(props.item)"
287   - src="/static/icon/delete1.png"
288   - />
  271 + <v-tooltip top>
  272 + <img
  273 + slot="activator"
  274 + style="cursor:pointer; width:25px; height:18px; "
  275 + class="mr5"
  276 + @click="profile(props.item)"
  277 + src="/static/icon/eye1.png"
  278 + />
  279 + <span>View</span>
  280 + </v-tooltip>
  281 + <v-tooltip top>
  282 + <img
  283 + slot="activator"
  284 + style="cursor:pointer; width:20px; height:18px; "
  285 + class="mr5"
  286 + @click="editItem(props.item)"
  287 + src="/static/icon/edit1.png"
  288 + />
  289 + <span>Edit</span>
  290 + </v-tooltip>
  291 + <v-tooltip top>
  292 + <img
  293 + slot="activator"
  294 + style="cursor:pointer; width:20px; height:20px; "
  295 + class="mr5"
  296 + @click="deleteItem(props.item)"
  297 + src="/static/icon/delete1.png"
  298 + />
  299 + <span>Delete</span>
  300 + </v-tooltip>
289 301 </span>
290 302 </td>
291 303 </template>
... ...
src/pages/Administrator/academicYear.vue
Diff comments   View file @495e403
... ... @@ -224,24 +224,36 @@
224 224 <td id="td" class="text-xs-center">{{ dates(props.item.endingDate)}}</td>
225 225 <td id="td" class="text-xs-center">
226 226 <span>
227   - <img
228   - style="cursor:pointer; width:25px; height:18px; "
229   - class="mr-5"
230   - @click="profile(props.item)"
231   - src="/static/icon/eye1.png"
232   - />
233   - <img
234   - style="cursor:pointer; width:20px; height:18px; "
235   - class="mr-5"
236   - @click="editItem(props.item)"
237   - src="/static/icon/edit1.png"
238   - />
239   - <img
240   - style="cursor:pointer;width:20px; height:20px; "
241   - class="mr-5"
242   - @click="deleteItem(props.item)"
243   - src="/static/icon/delete1.png"
244   - />
  227 + <v-tooltip top>
  228 + <img
  229 + slot="activator"
  230 + style="cursor:pointer; width:25px; height:18px; "
  231 + class="mr5"
  232 + @click="profile(props.item)"
  233 + src="/static/icon/eye1.png"
  234 + />
  235 + <span>View</span>
  236 + </v-tooltip>
  237 + <v-tooltip top>
  238 + <img
  239 + slot="activator"
  240 + style="cursor:pointer; width:20px; height:18px; "
  241 + class="mr5"
  242 + @click="editItem(props.item)"
  243 + src="/static/icon/edit1.png"
  244 + />
  245 + <span>Edit</span>
  246 + </v-tooltip>
  247 + <v-tooltip top>
  248 + <img
  249 + slot="activator"
  250 + style="cursor:pointer; width:20px; height:20px; "
  251 + class="mr5"
  252 + @click="deleteItem(props.item)"
  253 + src="/static/icon/delete1.png"
  254 + />
  255 + <span>Delete</span>
  256 + </v-tooltip>
245 257 </span>
246 258 </td>
247 259 </template>
... ...
src/pages/Administrator/role.vue
Diff comments   View file @495e403
... ... @@ -78,18 +78,26 @@
78 78 <td id="tabeleData" class="text-xs-center">{{ props.item.name}}</td>
79 79 <td id="tabeleData" class="text-xs-center">
80 80 <span>
81   - <img
82   - style="cursor:pointer; width:20px; height:18px; "
83   - class="mr-5"
84   - @click="editItem(props.item)"
85   - src="/static/icon/edit1.png"
86   - />
87   - <img
88   - style="cursor:pointer;width:20px; height:20px; "
89   - class="mr-5"
90   - @click="deleteItem(props.item)"
91   - src="/static/icon/delete1.png"
92   - />
  81 + <v-tooltip top>
  82 + <img
  83 + slot="activator"
  84 + style="cursor:pointer; width:20px; height:18px; "
  85 + class="mr5"
  86 + @click="editItem(props.item)"
  87 + src="/static/icon/edit1.png"
  88 + />
  89 + <span>Edit</span>
  90 + </v-tooltip>
  91 + <v-tooltip top>
  92 + <img
  93 + slot="activator"
  94 + style="cursor:pointer; width:20px; height:20px; "
  95 + class="mr5"
  96 + @click="deleteItem(props.item)"
  97 + src="/static/icon/delete1.png"
  98 + />
  99 + <span>Delete</span>
  100 + </v-tooltip>
93 101 </span>
94 102 </td>
95 103 </template>
... ...
src/pages/Administrator/systemAdmin.vue
Diff comments   View file @495e403
... ... @@ -516,24 +516,36 @@
516 516 <!-- <td id="td" class="text-xs-center">{{ props.item.mobileNo }}</td> -->
517 517 <td class="text-xs-center">
518 518 <span>
519   - <img
520   - style="cursor:pointer; width:25px; height:18px; "
521   - class="mr-5"
522   - @click="profile(props.item)"
523   - src="/static/icon/eye1.png"
524   - />
525   - <img
526   - style="cursor:pointer; width:20px; height:18px; "
527   - class="mr-5"
528   - @click="editItem(props.item)"
529   - src="/static/icon/edit1.png"
530   - />
531   - <img
532   - style="cursor:pointer;width:20px; height:20px; "
533   - class="mr-5"
534   - @click="deleteItem(props.item)"
535   - src="/static/icon/delete1.png"
536   - />
  519 + <v-tooltip top>
  520 + <img
  521 + slot="activator"
  522 + style="cursor:pointer; width:25px; height:18px; "
  523 + class="mr5"
  524 + @click="profile(props.item)"
  525 + src="/static/icon/eye1.png"
  526 + />
  527 + <span>View</span>
  528 + </v-tooltip>
  529 + <v-tooltip top>
  530 + <img
  531 + slot="activator"
  532 + style="cursor:pointer; width:20px; height:18px; "
  533 + class="mr5"
  534 + @click="editItem(props.item)"
  535 + src="/static/icon/edit1.png"
  536 + />
  537 + <span>Edit</span>
  538 + </v-tooltip>
  539 + <v-tooltip top>
  540 + <img
  541 + slot="activator"
  542 + style="cursor:pointer; width:20px; height:20px; "
  543 + class="mr5"
  544 + @click="deleteItem(props.item)"
  545 + src="/static/icon/delete1.png"
  546 + />
  547 + <span>Delete</span>
  548 + </v-tooltip>
537 549 </span>
538 550 </td>
539 551 </template>
... ... @@ -854,7 +866,7 @@
854 866 </v-flex> -->
855 867 </v-layout>
856 868 <v-layout class="mx-2">
857   - <v-flex xs12 sm12>
  869 + <v-flex xs12 sm12 offset-sm1>
858 870 <v-layout>
859 871 <v-flex xs6>
860 872 <v-btn @click="clear" round dark>clear</v-btn>
... ...
src/pages/Attendence/studentAttendence.vue
Diff comments   View file @495e403
... ... @@ -59,18 +59,26 @@
59 59 <td id="td" class="text-xs-center">{{ props.item.email }}</td>
60 60 <td class="text-xs-center">
61 61 <router-link :to="{ name:'ViewStudentsAttendence',params: { id:props.item._id } }">
  62 + <v-tooltip top>
  63 + <img
  64 + slot="activator"
  65 + style="cursor:pointer; width:20px; height:18px; "
  66 + class="mr-5"
  67 + src="/static/icon/edit1.png"
  68 + />
  69 + <span>Edit</span>
  70 + </v-tooltip>
  71 + </router-link>
  72 + <v-tooltip top>
62 73 <img
63   - style="cursor:pointer; width:20px; height:18px; "
64   - class="mr-5"
65   - src="/static/icon/edit1.png"
  74 + slot="activator"
  75 + style="cursor:pointer; width:20px; height:20px; "
  76 + class="mr5"
  77 + @click="deleteItem(props.item)"
  78 + src="/static/icon/delete1.png"
66 79 />
67   - </router-link>
68   - <img
69   - style="cursor:pointer;width:20px; height:20px; "
70   - class="mr-5"
71   - @click="deleteItem(props.item)"
72   - src="/static/icon/delete1.png"
73   - />
  80 + <span>Delete</span>
  81 + </v-tooltip>
74 82 <!-- </span> -->
75 83 </td>
76 84 </template>
... ...
src/pages/Class/addclass.vue
Diff comments   View file @495e403
... ... @@ -37,30 +37,30 @@
37 37 <v-spacer></v-spacer>
38 38 </v-toolbar>
39 39 <v-card>
40   - <v-container fluid>
41   - <v-layout justify-center>
42   - <v-flex xs12 sm9>
43   - <v-layout style="position:relative;">
44   - <v-flex xs3 lg2 class="pt-4 subheading">
45   - <label class="right">Class:</label>
46   - </v-flex>
47   - <v-flex xs9 class="ml-2">
48   - <v-autocomplete
49   - v-model="editedItem.classNum"
50   - :label="editedItem.classNum"
51   - :items="classList"
52   - :rules="nameRules"
53   - ></v-autocomplete>
54   - </v-flex>
55   - </v-layout>
56   - <v-card-actions>
57   - <v-btn round dark @click.native="close">Cancel</v-btn>
58   - <v-spacer></v-spacer>
59   - <v-btn round dark @click="save">Save</v-btn>
60   - </v-card-actions>
61   - </v-flex>
62   - </v-layout>
63   - </v-container>
  40 + <v-container fluid>
  41 + <v-layout justify-center>
  42 + <v-flex xs12 sm9>
  43 + <v-layout style="position:relative;">
  44 + <v-flex xs3 lg2 class="pt-4 subheading">
  45 + <label class="right">Class:</label>
  46 + </v-flex>
  47 + <v-flex xs9 class="ml-2">
  48 + <v-autocomplete
  49 + v-model="editedItem.classNum"
  50 + :label="editedItem.classNum"
  51 + :items="classList"
  52 + :rules="nameRules"
  53 + ></v-autocomplete>
  54 + </v-flex>
  55 + </v-layout>
  56 + <v-card-actions>
  57 + <v-btn round dark @click.native="close">Cancel</v-btn>
  58 + <v-spacer></v-spacer>
  59 + <v-btn round dark @click="save">Save</v-btn>
  60 + </v-card-actions>
  61 + </v-flex>
  62 + </v-layout>
  63 + </v-container>
64 64 </v-card>
65 65 </v-flex>
66 66 </v-dialog>
... ... @@ -118,24 +118,36 @@
118 118 <td class="text-xs-center">{{ props.item.classNum}}</td>
119 119 <td class="text-xs-center">
120 120 <span>
121   - <img
122   - style="cursor:pointer; width:25px; height:18px; "
123   - class="mr5"
124   - @click="profile(props.item)"
125   - src="/static/icon/eye1.png"
126   - />
127   - <img
128   - style="cursor:pointer; width:20px; height:18px; "
129   - class="mr5"
130   - @click="editItem(props.item)"
131   - src="/static/icon/edit1.png"
132   - />
133   - <img
134   - style="cursor:pointer; width:20px; height:20px; "
135   - class="mr5"
136   - @click="deleteItem(props.item)"
137   - src="/static/icon/delete1.png"
138   - />
  121 + <v-tooltip top>
  122 + <img
  123 + slot="activator"
  124 + style="cursor:pointer; width:25px; height:18px; "
  125 + class="mr5"
  126 + @click="profile(props.item)"
  127 + src="/static/icon/eye1.png"
  128 + />
  129 + <span>View</span>
  130 + </v-tooltip>
  131 + <v-tooltip top>
  132 + <img
  133 + slot="activator"
  134 + style="cursor:pointer; width:20px; height:18px; "
  135 + class="mr5"
  136 + @click="editItem(props.item)"
  137 + src="/static/icon/edit1.png"
  138 + />
  139 + <span>Edit</span>
  140 + </v-tooltip>
  141 + <v-tooltip top>
  142 + <img
  143 + slot="activator"
  144 + style="cursor:pointer; width:20px; height:20px; "
  145 + class="mr5"
  146 + @click="deleteItem(props.item)"
  147 + src="/static/icon/delete1.png"
  148 + />
  149 + <span>Delete</span>
  150 + </v-tooltip>
139 151 </span>
140 152 </td>
141 153 </template>
... ...
src/pages/Event/event.vue
Diff comments   View file @495e403
... ... @@ -38,79 +38,79 @@
38 38 <v-spacer></v-spacer>
39 39 </v-toolbar>
40 40 <v-card flat>
41   - <v-container fluid>
42   - <v-flex xs12 sm12>
43   - <v-layout>
44   - <v-flex xs4 class="pt-4 subheading">
45   - <label class="right">Title:</label>
46   - </v-flex>
47   - <v-flex xs8 sm5 class="ml-3">
48   - <v-text-field
49   - v-model="editedItem.title"
50   - placeholder="fill your Title"
51   - name="name"
52   - type="text"
53   - ></v-text-field>
54   - </v-flex>
55   - </v-layout>
56   - </v-flex>
57   - <v-flex xs12 sm12>
58   - <v-layout>
59   - <v-flex xs4 class="pt-4 subheading">
60   - <label class="right">Date:</label>
61   - </v-flex>
62   - <v-flex xs8 sm5 class="ml-3">
63   - <v-menu
64   - ref="menu"
65   - :close-on-content-click="false"
66   - v-model="menu"
67   - :nudge-right="40"
68   - lazy
69   - transition="scale-transition"
70   - offset-y
71   - full-width
72   - min-width="290px"
73   - >
74   - <v-text-field
75   - slot="activator"
76   - :rules="dateRules"
77   - v-model="editedItem.dateOfEvent"
78   - placeholder="Select date"
79   - ></v-text-field>
80   - <v-date-picker
81   - color="info"
82   - ref="picker"
83   - v-model="editedItem.dateOfEvent"
84   - @input="$refs.menu.save(editedItem.dateOfEvent)"
85   - ></v-date-picker>
86   - </v-menu>
87   - </v-flex>
88   - </v-layout>
89   - </v-flex>
90   - <v-flex xs12 sm12>
91   - <v-layout>
92   - <v-flex xs4 class="pt-4 subheading">
93   - <label class="right">Description:</label>
94   - </v-flex>
95   - <v-flex xs8 sm5 class="ml-3">
  41 + <v-container fluid>
  42 + <v-flex xs12 sm12>
  43 + <v-layout>
  44 + <v-flex xs4 class="pt-4 subheading">
  45 + <label class="right">Title:</label>
  46 + </v-flex>
  47 + <v-flex xs8 sm5 class="ml-3">
  48 + <v-text-field
  49 + v-model="editedItem.title"
  50 + placeholder="fill your Title"
  51 + name="name"
  52 + type="text"
  53 + ></v-text-field>
  54 + </v-flex>
  55 + </v-layout>
  56 + </v-flex>
  57 + <v-flex xs12 sm12>
  58 + <v-layout>
  59 + <v-flex xs4 class="pt-4 subheading">
  60 + <label class="right">Date:</label>
  61 + </v-flex>
  62 + <v-flex xs8 sm5 class="ml-3">
  63 + <v-menu
  64 + ref="menu"
  65 + :close-on-content-click="false"
  66 + v-model="menu"
  67 + :nudge-right="40"
  68 + lazy
  69 + transition="scale-transition"
  70 + offset-y
  71 + full-width
  72 + min-width="290px"
  73 + >
96 74 <v-text-field
97   - placeholder="fill your Description"
98   - v-model="editedItem.description"
99   - type="text"
  75 + slot="activator"
  76 + :rules="dateRules"
  77 + v-model="editedItem.dateOfEvent"
  78 + placeholder="Select date"
100 79 ></v-text-field>
101   - </v-flex>
102   - </v-layout>
103   - </v-flex>
  80 + <v-date-picker
  81 + color="info"
  82 + ref="picker"
  83 + v-model="editedItem.dateOfEvent"
  84 + @input="$refs.menu.save(editedItem.dateOfEvent)"
  85 + ></v-date-picker>
  86 + </v-menu>
  87 + </v-flex>
  88 + </v-layout>
  89 + </v-flex>
  90 + <v-flex xs12 sm12>
104 91 <v-layout>
105   - <v-flex xs12 sm10 offset-sm1>
106   - <v-card-actions>
107   - <v-btn round dark @click.native="close">Cancel</v-btn>
108   - <v-spacer></v-spacer>
109   - <v-btn round dark @click="save">Save</v-btn>
110   - </v-card-actions>
  92 + <v-flex xs4 class="pt-4 subheading">
  93 + <label class="right">Description:</label>
  94 + </v-flex>
  95 + <v-flex xs8 sm5 class="ml-3">
  96 + <v-text-field
  97 + placeholder="fill your Description"
  98 + v-model="editedItem.description"
  99 + type="text"
  100 + ></v-text-field>
111 101 </v-flex>
112 102 </v-layout>
113   - </v-container>
  103 + </v-flex>
  104 + <v-layout>
  105 + <v-flex xs12 sm10 offset-sm1>
  106 + <v-card-actions>
  107 + <v-btn round dark @click.native="close">Cancel</v-btn>
  108 + <v-spacer></v-spacer>
  109 + <v-btn round dark @click="save">Save</v-btn>
  110 + </v-card-actions>
  111 + </v-flex>
  112 + </v-layout>
  113 + </v-container>
114 114 </v-card>
115 115 </v-flex>
116 116 </v-dialog>
... ... @@ -192,24 +192,36 @@
192 192  
193 193 <td id="td" class="text-xs-center">
194 194 <span>
195   - <img
196   - style="cursor:pointer; width:25px; height:18px; "
197   - class="mr-5"
198   - @click="profile(props.item)"
199   - src="/static/icon/eye1.png"
200   - />
201   - <img
202   - style="cursor:pointer; width:20px; height:18px; "
203   - class="mr-5"
204   - @click="editItem(props.item)"
205   - src="/static/icon/edit1.png"
206   - />
207   - <img
208   - style="cursor:pointer;width:20px; height:20px; "
209   - class="mr-5"
210   - @click="deleteItem(props.item)"
211   - src="/static/icon/delete1.png"
212   - />
  195 + <v-tooltip top>
  196 + <img
  197 + slot="activator"
  198 + style="cursor:pointer; width:25px; height:18px; "
  199 + class="mr5"
  200 + @click="profile(props.item)"
  201 + src="/static/icon/eye1.png"
  202 + />
  203 + <span>View</span>
  204 + </v-tooltip>
  205 + <v-tooltip top>
  206 + <img
  207 + slot="activator"
  208 + style="cursor:pointer; width:20px; height:18px; "
  209 + class="mr5"
  210 + @click="editItem(props.item)"
  211 + src="/static/icon/edit1.png"
  212 + />
  213 + <span>Edit</span>
  214 + </v-tooltip>
  215 + <v-tooltip top>
  216 + <img
  217 + slot="activator"
  218 + style="cursor:pointer; width:20px; height:20px; "
  219 + class="mr5"
  220 + @click="deleteItem(props.item)"
  221 + src="/static/icon/delete1.png"
  222 + />
  223 + <span>Delete</span>
  224 + </v-tooltip>
213 225 </span>
214 226 </td>
215 227 </template>
... ...
src/pages/Exam/exam.vue
Diff comments   View file @495e403
... ... @@ -193,24 +193,36 @@
193 193 <td id="td" class="text-xs-center">{{ props.item.note}}</td>
194 194 <td class="text-xs-center">
195 195 <span>
196   - <img
197   - style="cursor:pointer; width:25px; height:18px; "
198   - class="mr-5"
199   - @click="profile(props.item)"
200   - src="/static/icon/eye1.png"
201   - />
202   - <img
203   - style="cursor:pointer; width:20px; height:18px; "
204   - class="mr-5"
205   - @click="editItem(props.item)"
206   - src="/static/icon/edit1.png"
207   - />
208   - <img
209   - style="cursor:pointer;width:20px; height:20px; "
210   - class="mr-5"
211   - @click="deleteExam(props.item)"
212   - src="/static/icon/delete1.png"
213   - />
  196 + <v-tooltip top>
  197 + <img
  198 + slot="activator"
  199 + style="cursor:pointer; width:25px; height:18px; "
  200 + class="mr5"
  201 + @click="profile(props.item)"
  202 + src="/static/icon/eye1.png"
  203 + />
  204 + <span>View</span>
  205 + </v-tooltip>
  206 + <v-tooltip top>
  207 + <img
  208 + slot="activator"
  209 + style="cursor:pointer; width:20px; height:18px; "
  210 + class="mr5"
  211 + @click="editItem(props.item)"
  212 + src="/static/icon/edit1.png"
  213 + />
  214 + <span>Edit</span>
  215 + </v-tooltip>
  216 + <v-tooltip top>
  217 + <img
  218 + slot="activator"
  219 + style="cursor:pointer; width:20px; height:20px; "
  220 + class="mr5"
  221 + @click="deleteItem(props.item)"
  222 + src="/static/icon/delete1.png"
  223 + />
  224 + <span>Delete</span>
  225 + </v-tooltip>
214 226 </span>
215 227 </td>
216 228 </template>
... ... @@ -307,7 +319,7 @@
307 319 <v-flex xs12 sm6 offset-sm3>
308 320 <v-card-actions>
309 321 <v-btn @click="clear" round dark>clear</v-btn>
310   - <v-spacer class="hidden-xs-only"></v-spacer>
  322 + <v-spacer class="hidden-xs-only"></v-spacer>
311 323 <v-btn @click="submit" round dark :loading="loading">Add</v-btn>
312 324 </v-card-actions>
313 325 </v-flex>
... ...
src/pages/Exam/examSchedule.vue
Diff comments   View file @495e403
... ... @@ -393,24 +393,36 @@
393 393 <td id="td" class="text-xs-center">{{ props.item.room }}</td>
394 394 <td class="text-xs-center">
395 395 <span>
396   - <img
397   - style="cursor:pointer; width:25px; height:18px; "
398   - class="mr-5"
399   - @click="profile(props.item)"
400   - src="/static/icon/eye1.png"
401   - />
402   - <img
403   - style="cursor:pointer; width:20px; height:18px; "
404   - class="mr-5"
405   - @click="editItem(props.item)"
406   - src="/static/icon/edit1.png"
407   - />
408   - <img
409   - style="cursor:pointer;width:20px; height:20px; "
410   - class="mr-5"
411   - @click="deleteSchedule(props.item)"
412   - src="/static/icon/delete1.png"
413   - />
  396 + <v-tooltip top>
  397 + <img
  398 + slot="activator"
  399 + style="cursor:pointer; width:25px; height:18px; "
  400 + class="mr5"
  401 + @click="profile(props.item)"
  402 + src="/static/icon/eye1.png"
  403 + />
  404 + <span>View</span>
  405 + </v-tooltip>
  406 + <v-tooltip top>
  407 + <img
  408 + slot="activator"
  409 + style="cursor:pointer; width:20px; height:18px; "
  410 + class="mr5"
  411 + @click="editItem(props.item)"
  412 + src="/static/icon/edit1.png"
  413 + />
  414 + <span>Edit</span>
  415 + </v-tooltip>
  416 + <v-tooltip top>
  417 + <img
  418 + slot="activator"
  419 + style="cursor:pointer; width:20px; height:20px; "
  420 + class="mr5"
  421 + @click="deleteItem(props.item)"
  422 + src="/static/icon/delete1.png"
  423 + />
  424 + <span>Delete</span>
  425 + </v-tooltip>
414 426 </span>
415 427 </td>
416 428 </template>
... ... @@ -519,7 +531,7 @@
519 531 <v-flex xs5 class="pt-4 subheading">
520 532 <label class="right">Date:</label>
521 533 </v-flex>
522   - <v-flex xs7 sm4 class="ml-3">
  534 + <v-flex xs7 sm4 class="ml-3">
523 535 <v-menu
524 536 ref="menu2"
525 537 :close-on-content-click="false"
... ...
src/pages/Exam/grade.vue
Diff comments   View file @495e403
... ... @@ -210,6 +210,7 @@
210 210 >{{ text }}</v-snackbar>
211 211  
212 212 <!-- ****** EXISTING GRADE TABLE****** -->
  213 +
213 214 <v-card></v-card>
214 215 <v-data-table
215 216 :headers="headers"
... ... @@ -227,24 +228,36 @@
227 228 <td id="td" class="text-xs-center">{{ props.item.note }}</td>
228 229 <td class="text-xs-center">
229 230 <span>
230   - <img
231   - style="cursor:pointer; width:25px; height:18px; "
232   - class="mr-5"
233   - @click="profile(props.item)"
234   - src="/static/icon/eye1.png"
235   - />
236   - <img
237   - style="cursor:pointer; width:20px; height:18px; "
238   - class="mr-5"
239   - @click="editItem(props.item)"
240   - src="/static/icon/edit1.png"
241   - />
242   - <img
243   - style="cursor:pointer;width:20px; height:20px; "
244   - class="mr-5"
245   - @click="deleteGrade(props.item)"
246   - src="/static/icon/delete1.png"
247   - />
  231 + <v-tooltip top>
  232 + <img
  233 + slot="activator"
  234 + style="cursor:pointer; width:25px; height:18px; "
  235 + class="mr5"
  236 + @click="profile(props.item)"
  237 + src="/static/icon/eye1.png"
  238 + />
  239 + <span>View</span>
  240 + </v-tooltip>
  241 + <v-tooltip top>
  242 + <img
  243 + slot="activator"
  244 + style="cursor:pointer; width:20px; height:18px; "
  245 + class="mr5"
  246 + @click="editItem(props.item)"
  247 + src="/static/icon/edit1.png"
  248 + />
  249 + <span>Edit</span>
  250 + </v-tooltip>
  251 + <v-tooltip top>
  252 + <img
  253 + slot="activator"
  254 + style="cursor:pointer; width:20px; height:20px; "
  255 + class="mr5"
  256 + @click="deleteItem(props.item)"
  257 + src="/static/icon/delete1.png"
  258 + />
  259 + <span>Delete</span>
  260 + </v-tooltip>
248 261 </span>
249 262 </td>
250 263 </template>
... ... @@ -292,7 +305,7 @@
292 305 <v-flex xs5 class="pt-4 subheading">
293 306 <label class="right">Grade Point:</label>
294 307 </v-flex>
295   - <v-flex xs7 sm4 class="ml-3">
  308 + <v-flex xs7 sm4 class="ml-3">
296 309 <v-text-field
297 310 placeholder="fill your Grade Point"
298 311 v-model="addGrade.gradePoint"
... ... @@ -306,7 +319,7 @@
306 319 <v-flex xs5 class="pt-4 subheading">
307 320 <label class="right">Mark From:</label>
308 321 </v-flex>
309   - <v-flex xs7 sm4 class="ml-3">
  322 + <v-flex xs7 sm4 class="ml-3">
310 323 <v-text-field
311 324 placeholder="fill your Mark From"
312 325 :rules="markFromRules"
... ... @@ -320,7 +333,7 @@
320 333 <v-flex xs5 class="pt-4 subheading">
321 334 <label class="right">Mark Upto:</label>
322 335 </v-flex>
323   - <v-flex xs7 sm4 class="ml-3">
  336 + <v-flex xs7 sm4 class="ml-3">
324 337 <v-text-field
325 338 placeholder="fill your Mark Upto"
326 339 :rules="markUptoRules"
... ... @@ -334,7 +347,7 @@
334 347 <v-flex xs5 class="pt-4 subheading">
335 348 <label class="right">Note:</label>
336 349 </v-flex>
337   - <v-flex xs7 sm4 class="ml-3">
  350 + <v-flex xs7 sm4 class="ml-3">
338 351 <v-text-field
339 352 placeholder="fill your Note"
340 353 :rules="noteRules"
... ... @@ -348,7 +361,7 @@
348 361 <v-flex xs12 sm7 offset-sm3>
349 362 <v-card-actions>
350 363 <v-btn @click="clear" round dark>clear</v-btn>
351   - <v-spacer class="hidden-xs-only"></v-spacer>
  364 + <v-spacer class="hidden-xs-only"></v-spacer>
352 365 <v-btn @click="submit" round dark :loading="loading">Add</v-btn>
353 366 </v-card-actions>
354 367 </v-flex>
... ... @@ -393,14 +406,11 @@ export default {
393 406 valid: true,
394 407 isActive: true,
395 408 newActive: false,
396   - // addclass: [],
397   - // addSection: [],
398   - // AddUsercredentials: {},
399 409 pagination: {
400 410 rowsPerPage: 15
401 411 },
402 412 gradeNameRules: [v => !!v || "Grade Name is required"],
403   - gradePointRules: [v => !!v || "Grade Pointis required"],
  413 + gradePointRules: [v => !!v || "Grade Point required"],
404 414 markFromRules: [v => !!v || "Mark From is required"],
405 415 markUptoRules: [v => !!v || "Mark Upto is required"],
406 416 authorRules: [v => !!v || "Author is required"],
... ...
src/pages/Gallery/gallery.vue
Diff comments   View file @495e403
... ... @@ -311,25 +311,37 @@
311 311 <td id="td" class="text-xs-center">{{ props.item.description}}</td>
312 312  
313 313 <td id="td" class="text-xs-center">
314   - <span>
315   - <img
316   - style="cursor:pointer; width:25px; height:18px; "
317   - class="mr-5"
318   - @click="profile(props.item)"
319   - src="/static/icon/eye1.png"
320   - />
321   - <img
322   - style="cursor:pointer; width:20px; height:18px; "
323   - class="mr-5"
324   - @click="editItem(props.item)"
325   - src="/static/icon/edit1.png"
326   - />
327   - <img
328   - style="cursor:pointer;width:20px; height:20px; "
329   - class="mr-5"
330   - @click="deleteItem(props.item)"
331   - src="/static/icon/delete1.png"
332   - />
  314 + <span>
  315 + <v-tooltip top>
  316 + <img
  317 + slot="activator"
  318 + style="cursor:pointer; width:25px; height:18px; "
  319 + class="mr5"
  320 + @click="profile(props.item)"
  321 + src="/static/icon/eye1.png"
  322 + />
  323 + <span>View</span>
  324 + </v-tooltip>
  325 + <v-tooltip top>
  326 + <img
  327 + slot="activator"
  328 + style="cursor:pointer; width:20px; height:18px; "
  329 + class="mr5"
  330 + @click="editItem(props.item)"
  331 + src="/static/icon/edit1.png"
  332 + />
  333 + <span>Edit</span>
  334 + </v-tooltip>
  335 + <v-tooltip top>
  336 + <img
  337 + slot="activator"
  338 + style="cursor:pointer; width:20px; height:20px; "
  339 + class="mr5"
  340 + @click="deleteItem(props.item)"
  341 + src="/static/icon/delete1.png"
  342 + />
  343 + <span>Delete</span>
  344 + </v-tooltip>
333 345 </span>
334 346 </td>
335 347 </template>
... ...
src/pages/Holiday/holiday.vue
Diff comments   View file @495e403
... ... @@ -17,7 +17,7 @@
17 17 class="subheading"
18 18 >Add New Holiday</v-tab>
19 19  
20   - <!-- ****** EDITS Holiday DETAILS ****** -->
  20 + <!-- ****** EDIT HOLIDAY DATA ****** -->
21 21  
22 22 <v-tab-item>
23 23 <v-snackbar
... ... @@ -105,7 +105,7 @@
105 105  
106 106 <!-- ****** PROFILE VIEW Holiday DEATILS ****** -->
107 107  
108   - <v-dialog v-model="dialog1" max-width="700px">
  108 + <v-dialog v-model="dialog1" max-width="500px">
109 109 <v-toolbar class="v-toolbar">
110 110 <v-spacer></v-spacer>
111 111 <v-toolbar-title>
... ... @@ -169,24 +169,36 @@
169 169  
170 170 <td id="td" class="text-xs-center">
171 171 <span>
172   - <img
173   - style="cursor:pointer; width:25px; height:18px; "
174   - class="mr-5"
175   - @click="profile(props.item)"
176   - src="/static/icon/eye1.png"
177   - />
178   - <img
179   - style="cursor:pointer; width:20px; height:18px; "
180   - class="mr-5"
181   - @click="editItem(props.item)"
182   - src="/static/icon/edit1.png"
183   - />
184   - <img
185   - style="cursor:pointer;width:20px; height:20px; "
186   - class="mr-5"
187   - @click="deleteItem(props.item)"
188   - src="/static/icon/delete1.png"
189   - />
  172 + <v-tooltip top>
  173 + <img
  174 + slot="activator"
  175 + style="cursor:pointer; width:25px; height:18px; "
  176 + class="mr5"
  177 + @click="profile(props.item)"
  178 + src="/static/icon/eye1.png"
  179 + />
  180 + <span>View</span>
  181 + </v-tooltip>
  182 + <v-tooltip top>
  183 + <img
  184 + slot="activator"
  185 + style="cursor:pointer; width:20px; height:18px; "
  186 + class="mr5"
  187 + @click="editItem(props.item)"
  188 + src="/static/icon/edit1.png"
  189 + />
  190 + <span>Edit</span>
  191 + </v-tooltip>
  192 + <v-tooltip top>
  193 + <img
  194 + slot="activator"
  195 + style="cursor:pointer; width:20px; height:20px; "
  196 + class="mr5"
  197 + @click="deleteItem(props.item)"
  198 + src="/static/icon/delete1.png"
  199 + />
  200 + <span>Delete</span>
  201 + </v-tooltip>
190 202 </span>
191 203 </td>
192 204 </template>
... ... @@ -266,17 +278,16 @@
266 278 </v-flex>
267 279 </v-layout>
268 280 </v-flex>
269   - <v-flex xs12 sm7 offset-sm2>
270   - <v-layout>
271   - <v-flex xs6>
272   - <v-btn @click="clear" round class="ml-3" dark>clear</v-btn>
273   - </v-flex>
274   - <v-flex xs6>
275   - <v-btn @click="submit" round dark :loading="loading" class="right">Add</v-btn>
276   - </v-flex>
277   - </v-layout>
278   - </v-flex>
279   - </v-layout>
  281 + <v-flex xs12 sm7 offset-sm2>
  282 + <v-layout>
  283 + <v-flex xs6>
  284 + <v-btn @click="clear" round class="ml-3" dark>clear</v-btn>
  285 + </v-flex>
  286 + <v-flex xs6>
  287 + <v-btn @click="submit" round dark :loading="loading" class="right">Add</v-btn>
  288 + </v-flex>
  289 + </v-layout>
  290 + </v-flex>
280 291 </v-container>
281 292 </v-form>
282 293 </v-card>
... ...
src/pages/Library/books.vue
Diff comments   View file @495e403
... ... @@ -230,25 +230,37 @@
230 230  
231 231 <td class="text-xs-center">
232 232 <span>
233   - <img
234   - style="cursor:pointer; width:25px; height:18px; "
235   - class="mr-5"
236   - @click="profile(props.item)"
237   - src="/static/icon/eye1.png"
238   - />
239   - <img
240   - style="cursor:pointer; width:20px; height:18px; "
241   - class="mr-5"
242   - @click="editItem(props.item)"
243   - src="/static/icon/edit1.png"
244   - />
245   - <img
246   - style="cursor:pointer; width:20px; height:20px; "
247   - class="mr-5"
248   - @click="deleteItem(props.item)"
249   - src="/static/icon/delete1.png"
250   - />
251   - </span>
  233 + <v-tooltip top>
  234 + <img
  235 + slot="activator"
  236 + style="cursor:pointer; width:25px; height:18px; "
  237 + class="mr5"
  238 + @click="profile(props.item)"
  239 + src="/static/icon/eye1.png"
  240 + />
  241 + <span>View</span>
  242 + </v-tooltip>
  243 + <v-tooltip top>
  244 + <img
  245 + slot="activator"
  246 + style="cursor:pointer; width:20px; height:18px; "
  247 + class="mr5"
  248 + @click="editItem(props.item)"
  249 + src="/static/icon/edit1.png"
  250 + />
  251 + <span>Edit</span>
  252 + </v-tooltip>
  253 + <v-tooltip top>
  254 + <img
  255 + slot="activator"
  256 + style="cursor:pointer; width:20px; height:20px; "
  257 + class="mr5"
  258 + @click="deleteItem(props.item)"
  259 + src="/static/icon/delete1.png"
  260 + />
  261 + <span>Delete</span>
  262 + </v-tooltip>
  263 + </span>
252 264 </td>
253 265 </template>
254 266 <v-alert
... ...
src/pages/Library/eBook.vue
Diff comments   View file @495e403
... ... @@ -240,24 +240,36 @@
240 240  
241 241 <td class="text-xs-center">
242 242 <span>
243   - <img
244   - style="cursor:pointer; width:25px; height:18px; "
245   - class="mr-5"
246   - @click="profile(props.item)"
247   - src="/static/icon/eye1.png"
248   - />
249   - <img
250   - style="cursor:pointer; width:20px; height:18px; "
251   - class="mr-5"
252   - @click="editItem(props.item)"
253   - src="/static/icon/edit1.png"
254   - />
255   - <img
256   - style="cursor:pointer;width:20px; height:20px; "
257   - class="mr-5"
258   - @click="deleteItem(props.item)"
259   - src="/static/icon/delete1.png"
260   - />
  243 + <v-tooltip top>
  244 + <img
  245 + slot="activator"
  246 + style="cursor:pointer; width:25px; height:18px; "
  247 + class="mr5"
  248 + @click="profile(props.item)"
  249 + src="/static/icon/eye1.png"
  250 + />
  251 + <span>View</span>
  252 + </v-tooltip>
  253 + <v-tooltip top>
  254 + <img
  255 + slot="activator"
  256 + style="cursor:pointer; width:20px; height:18px; "
  257 + class="mr5"
  258 + @click="editItem(props.item)"
  259 + src="/static/icon/edit1.png"
  260 + />
  261 + <span>Edit</span>
  262 + </v-tooltip>
  263 + <v-tooltip top>
  264 + <img
  265 + slot="activator"
  266 + style="cursor:pointer; width:20px; height:20px; "
  267 + class="mr5"
  268 + @click="deleteItem(props.item)"
  269 + src="/static/icon/delete1.png"
  270 + />
  271 + <span>Delete</span>
  272 + </v-tooltip>
261 273 </span>
262 274 </td>
263 275 </template>
... ... @@ -650,8 +662,8 @@ export default {
650 662 },
651 663 clear() {
652 664 this.$refs.form.reset();
653   - this.addEBooks.uploadCover = ""
654   - this.files = ""
  665 + this.addEBooks.uploadCover = "";
  666 + this.files = "";
655 667 },
656 668 save() {
657 669 this.loadingUpadte = true;
... ...
src/pages/Library/issue.vue
Diff comments   View file @495e403
... ... @@ -306,25 +306,37 @@
306 306 >{{ props.item.bookId.status}}</span>
307 307 </td>
308 308 <td class="text-xs-center">
309   - <span>
310   - <img
311   - style="cursor:pointer; width:25px; height:18px; "
312   - class="mr-5"
313   - @click="profile(props.item)"
314   - src="/static/icon/eye1.png"
315   - />
316   - <img
317   - style="cursor:pointer; width:20px; height:18px; "
318   - class="mr-5"
319   - @click="editItem(props.item)"
320   - src="/static/icon/edit1.png"
321   - />
322   - <img
323   - style="cursor:pointer;width:20px; height:20px; "
324   - class="mr-5"
325   - @click="returnBook(props.item)"
326   - src="/static/icon/return.jpg"
327   - />
  309 + <span>
  310 + <v-tooltip top>
  311 + <img
  312 + slot="activator"
  313 + style="cursor:pointer; width:25px; height:18px; "
  314 + class="mr5"
  315 + @click="profile(props.item)"
  316 + src="/static/icon/eye1.png"
  317 + />
  318 + <span>View</span>
  319 + </v-tooltip>
  320 + <v-tooltip top>
  321 + <img
  322 + slot="activator"
  323 + style="cursor:pointer; width:20px; height:18px; "
  324 + class="mr5"
  325 + @click="editItem(props.item)"
  326 + src="/static/icon/edit1.png"
  327 + />
  328 + <span>Edit</span>
  329 + </v-tooltip>
  330 + <v-tooltip top>
  331 + <img
  332 + slot="activator"
  333 + style="cursor:pointer; width:20px; height:20px; "
  334 + class="mr5"
  335 + @click="deleteItem(props.item)"
  336 + src="/static/icon/delete1.png"
  337 + />
  338 + <span>Delete</span>
  339 + </v-tooltip>
328 340 </span>
329 341 </td>
330 342 </template>
... ... @@ -525,7 +537,6 @@ export default {
525 537 newActive: false,
526 538 addclass: [],
527 539 addSection: [],
528   - AddUsercredentials: {},
529 540 pagination: {
530 541 rowsPerPage: 15
531 542 },
... ...
src/pages/Library/member.vue
Diff comments   View file @495e403
... ... @@ -425,53 +425,53 @@
425 425 </v-toolbar>
426 426 <v-card>
427 427 <v-card-text>
428   - <v-layout wrap justify-center>
429   - <v-flex xs12 sm12 md10>
430   - <v-form ref="form" v-model="valid" lazy-validation>
431   - <v-layout>
432   - <v-flex xs4 class="pt-4 subheading">
433   - <label class="right pr-3">Library Id:</label>
434   - </v-flex>
435   - <v-flex xs8>
436   - <v-text-field
437   - v-model="addBook.libraryId"
438   - :rules="libraryIdRules"
439   - type="number"
440   - placeholder="fill your Library ID"
441   - ></v-text-field>
442   - </v-flex>
443   - </v-layout>
444   - <v-layout>
445   - <v-flex xs4 class="pt-4 subheading">
446   - <label class="right pr-3">Library Fee:</label>
447   - </v-flex>
448   - <v-flex xs8>
449   - <v-text-field
450   - v-model="addBook.libraryFee"
451   - type="number"
452   - :rules="libraryFeeRules"
453   - placeholder="fill your Library Fee"
454   - ></v-text-field>
455   - </v-flex>
456   - </v-layout>
457   - <v-card-actions>
458   - <v-btn round dark @click.native="addLibrary = false">Cancel</v-btn>
459   - <v-spacer></v-spacer>
460   - <v-btn round dark @click="submit" :loading="loading">Add Member</v-btn>
461   - </v-card-actions>
462   - </v-form>
463   - </v-flex>
464   - </v-layout>
  428 + <v-layout wrap justify-center>
  429 + <v-flex xs12 sm12 md10>
  430 + <v-form ref="form" v-model="valid" lazy-validation>
  431 + <v-layout>
  432 + <v-flex xs4 class="pt-4 subheading">
  433 + <label class="right pr-3">Library Id:</label>
  434 + </v-flex>
  435 + <v-flex xs8>
  436 + <v-text-field
  437 + v-model="addBook.libraryId"
  438 + :rules="libraryIdRules"
  439 + type="number"
  440 + placeholder="fill your Library ID"
  441 + ></v-text-field>
  442 + </v-flex>
  443 + </v-layout>
  444 + <v-layout>
  445 + <v-flex xs4 class="pt-4 subheading">
  446 + <label class="right pr-3">Library Fee:</label>
  447 + </v-flex>
  448 + <v-flex xs8>
  449 + <v-text-field
  450 + v-model="addBook.libraryFee"
  451 + type="number"
  452 + :rules="libraryFeeRules"
  453 + placeholder="fill your Library Fee"
  454 + ></v-text-field>
  455 + </v-flex>
  456 + </v-layout>
  457 + <v-card-actions>
  458 + <v-btn round dark @click.native="addLibrary = false">Cancel</v-btn>
  459 + <v-spacer></v-spacer>
  460 + <v-btn round dark @click="submit" :loading="loading">Add Member</v-btn>
  461 + </v-card-actions>
  462 + </v-form>
  463 + </v-flex>
  464 + </v-layout>
465 465 </v-card-text>
466 466 </v-card>
467 467 </v-dialog>
468 468 <!-- ****** EXISTING MEMBER TABLE ****** -->
469 469 <v-card flat>
470   - <h4
471   - class="text-xs-center pt-4 ml-2 hidden-lg-only hidden-xl-only hidden-md-only"
472   - >Library Member</h4>
  470 + <h4
  471 + class="text-xs-center pt-4 ml-2 hidden-lg-only hidden-xl-only hidden-md-only"
  472 + >Library Member</h4>
473 473 <v-card-actions>
474   - <h3 class="right mt-2 ml-2 hidden-sm-only hidden-xs-only">Library Member</h3>
  474 + <h3 class="right mt-2 ml-2 hidden-sm-only hidden-xs-only">Library Member</h3>
475 475 <v-spacer></v-spacer>
476 476 <v-flex xs12 sm4 md2>
477 477 <v-select
... ... @@ -508,31 +508,47 @@
508 508 <td id="td" class="text-xs-center">{{ props.item.rollNo }}</td>
509 509 <td id="td" class="text-xs-center">{{ props.item.email }}</td>
510 510 <td class="text-xs-center">
511   - <img
512   - v-if="!props.item.libraryId"
513   - style="cursor:pointer; width:25px; height:18px; "
514   - @click="addLibraryData(props.item)"
515   - src="/static/icon/add.png"
516   - />
517   - <span v-if="props.item.libraryId">
  511 + <v-tooltip top>
518 512 <img
  513 + slot="activator"
  514 + v-if="!props.item.libraryId"
519 515 style="cursor:pointer; width:25px; height:18px; "
520   - class="mr-5"
521   - @click="profile(props.item)"
522   - src="/static/icon/eye1.png"
523   - />
524   - <img
525   - style="cursor:pointer; width:20px; height:18px; "
526   - class="mr-5"
527   - @click="editItem(props.item)"
528   - src="/static/icon/edit1.png"
529   - />
530   - <img
531   - style="cursor:pointer;width:20px; height:20px; "
532   - class="mr-5"
533   - @click="deleteItem(props.item)"
534   - src="/static/icon/delete1.png"
  516 + @click="addLibraryData(props.item)"
  517 + src="/static/icon/add.png"
535 518 />
  519 + <span>Add</span>
  520 + </v-tooltip>
  521 + <span v-if="props.item.libraryId">
  522 + <v-tooltip top>
  523 + <img
  524 + slot="activator"
  525 + style="cursor:pointer; width:25px; height:18px; "
  526 + class="mr5"
  527 + @click="profile(props.item)"
  528 + src="/static/icon/eye1.png"
  529 + />
  530 + <span>View</span>
  531 + </v-tooltip>
  532 + <v-tooltip top>
  533 + <img
  534 + slot="activator"
  535 + style="cursor:pointer; width:20px; height:18px; "
  536 + class="mr5"
  537 + @click="editItem(props.item)"
  538 + src="/static/icon/edit1.png"
  539 + />
  540 + <span>Edit</span>
  541 + </v-tooltip>
  542 + <v-tooltip top>
  543 + <img
  544 + slot="activator"
  545 + style="cursor:pointer; width:20px; height:20px; "
  546 + class="mr5"
  547 + @click="deleteItem(props.item)"
  548 + src="/static/icon/delete1.png"
  549 + />
  550 + <span>Delete</span>
  551 + </v-tooltip>
536 552 </span>
537 553 </td>
538 554 </template>
... ...
src/pages/Mark/mark.vue
Diff comments   View file @495e403
... ... @@ -317,11 +317,15 @@
317 317 src="/static/icon/eye1.png"
318 318 />-->
319 319 <router-link :to="{ name:'viewMark',params: { markId:props.item._id } }">
320   - <img
321   - style="cursor:pointer; width:20px; height:18px; "
322   - class="mr-5"
323   - src="/static/icon/edit1.png"
324   - />
  320 + <v-tooltip top>
  321 + <img
  322 + slot="activator"
  323 + style="cursor:pointer; width:20px; height:18px; "
  324 + class="mr-5"
  325 + src="/static/icon/edit1.png"
  326 + />
  327 + <span>Edit</span>
  328 + </v-tooltip>
325 329 </router-link>
326 330 <!-- <img
327 331 style="cursor:pointer;width:20px; height:20px; "
... ... @@ -462,7 +466,7 @@
462 466 class="text-xs-center markTable"
463 467 v-for="marks in props.item.marksObtained"
464 468 >
465   - <v-text-field v-model="marks.marksScored"></v-text-field>
  469 + <v-text-field v-model="marks.marksScored"></v-text-field>
466 470 </td>
467 471 </template>
468 472 <v-alert
... ... @@ -939,6 +943,6 @@ export default {
939 943 color: black !important;
940 944 }
941 945 .markTable {
942   - max-width: 80px !important;
  946 + max-width: 80px !important;
943 947 }
944 948 </style>
945 949 \ No newline at end of file
... ...
src/pages/Mark/promotion.vue
Diff comments   View file @495e403
1 1 <template>
2 2 <v-app id="login">
3 3 <v-container fluid>
  4 + <v-layout>
  5 + <v-card-actions>
  6 + <v-layout>
  7 + <h3 class="right">Promotion</h3>
  8 + </v-layout>
  9 + <v-spacer></v-spacer>
  10 + </v-card-actions>
  11 + </v-layout>
4 12 <v-card class="px-3 grey lighten-2" flat>
5 13 <v-flex xs12>
6 14 <v-layout wrap>
7 15 <v-flex xs12 sm12 md3>
8   - <!-- <v-layout> -->
9 16 <v-flex md12 class="mt-4 body-1">
10 17 <label>Academic Year :</label>
11 18 </v-flex>
12 19 <v-flex md10>
13 20 <v-select :items="acedemicYear" label="Select Academic Year"></v-select>
14 21 </v-flex>
15   - <!-- </v-layout> -->
16 22 </v-flex>
17 23 <v-flex xs12 sm12 md3>
18   - <!-- <v-layout> -->
19 24 <v-flex md12 class="mt-4 body-1">
20 25 <label class>Class :</label>
21 26 </v-flex>
22 27 <v-flex md10 class="ml-2">
23   - <v-select :items="acedemicYear" label="Select Academic Year"></v-select>
  28 + <v-select
  29 + v-model="promtion.classId"
  30 + label="Select your class"
  31 + type="text"
  32 + :rules="classRules"
  33 + :items="classList"
  34 + item-text="classNum"
  35 + item-value="_id"
  36 + required
  37 + ></v-select>
24 38 </v-flex>
25   - <!-- </v-layout> -->
26 39 </v-flex>
27 40 <v-flex xs12 sm12 md3>
28 41 <v-flex md12 class="mt-4 body-1">
... ... @@ -43,13 +56,12 @@
43 56 </v-layout>
44 57 </v-flex>
45 58 </v-card>
46   - <v-container class="pb-0 pt-5">
  59 + <v-container class="pb-0">
47 60 <v-card class="px-3 grey lighten-2" flat>
48 61 <v-flex xs12>
49 62 <v-layout>
50 63 <v-flex xs12 sm12 md12>
51 64 <v-layout>
52   - <!-- <p>{{ radios || 'null' }}</p> -->
53 65 <v-radio-group v-model="radios" :mandatory="false">
54 66 <v-layout>
55 67 <v-flex xs12 sm12 md6>
... ... @@ -82,7 +94,6 @@
82 94 <label>Exam</label>
83 95 </v-flex>
84 96 <v-flex sm12 xs12 md7>
85   - <!-- <p>{{ selected }}</p> -->
86 97 <v-checkbox v-model="selected" label="FIRST TERMINAL" value="John"></v-checkbox>
87 98 <v-checkbox
88 99 v-model="selected"
... ... @@ -90,7 +101,7 @@
90 101 value="Jacob"
91 102 class="mt-0"
92 103 ></v-checkbox>
93   - <v-checkbox v-model="selected" label="Test07" value="Jacob" class="mt-0"></v-checkbox>
  104 + <v-checkbox v-model="selected" label="Test07" value="Jacobs" class="mt-0"></v-checkbox>
94 105 </v-flex>
95 106 </v-layout>
96 107 </v-card>
... ... @@ -106,7 +117,6 @@
106 117 <label>Mark Percentage</label>
107 118 </v-flex>
108 119 <v-flex xs12 sm12 md7>
109   - <!-- <p>{{ selected }}</p> -->
110 120 <v-checkbox v-model="selected" label="Exam " value="John"></v-checkbox>
111 121 <v-checkbox v-model="selected" label="ASSIGNMENT" value="Jacob" class="mt-0"></v-checkbox>
112 122 </v-flex>
... ... @@ -141,7 +151,10 @@
141 151 <label>MATHEMATICS Pass Mark :</label>
142 152 </v-flex>
143 153 <v-flex md10>
144   - <v-text-field v-model="passmark.mathematics" placeholder="fill Mathematics Pass Mark"></v-text-field>
  154 + <v-text-field
  155 + v-model="passmark.mathematics"
  156 + placeholder="fill Mathematics Pass Mark"
  157 + ></v-text-field>
145 158 </v-flex>
146 159 </v-flex>
147 160 <!-- <v-flex xs12 sm12 md3>
... ... @@ -165,18 +178,41 @@
165 178 </template>
166 179  
167 180 <script>
  181 +import http from "@/Services/http.js";
  182 +
168 183 export default {
169 184 data() {
170 185 return {
171 186 radios: "radio-1",
172 187 acedemicYear: [],
  188 + classList: [],
  189 + promtion: {},
173 190 passmark: {
174 191 hindi: "40",
175 192 english: "40",
176 193 mathematics: "40"
177 194 },
178   - selected: ["John"]
  195 + selected: ["John", "Jacob", "Jacobs"],
  196 + token: ""
179 197 };
  198 + },
  199 + mounted() {
  200 + this.token = this.$store.state.token;
  201 + this.getClass();
  202 + },
  203 + methods: {
  204 + getClass() {
  205 + http()
  206 + .get("/getClassesList", {
  207 + headers: { Authorization: "Bearer " + this.token }
  208 + })
  209 + .then(response => {
  210 + this.classList = response.data.data;
  211 + })
  212 + .catch(err => {
  213 + // console.log("err====>", err);
  214 + });
  215 + }
180 216 }
181 217 };
182 218 </script>
183 219 \ No newline at end of file
... ...
src/pages/Mark/viewMark.vue
Diff comments   View file @495e403
1 1 <template>
2 2 <v-app id="pages-dasboard">
3   - <!-- ****** Edit multiple INVOICE ****** -->
  3 + <!-- ****** PROFILE MARK ****** -->
  4 +
4 5 <v-container fluid grid-list-md>
5 6 <v-flex xs12 sm12>
6 7 <v-container fluid>
... ... @@ -79,6 +80,9 @@
79 80 </v-card-text>
80 81 </v-card>
81 82 </v-flex>
  83 +
  84 + <!-- ****** TABLE DATA MARK ****** -->
  85 +
82 86 <v-flex xs12 sm12 md9 class="mt-4">
83 87 <v-card>
84 88 <v-toolbar dark class="fixcolors" flat>
... ... @@ -121,11 +125,11 @@
121 125 </tr>
122 126 <!-- </tr> -->
123 127 <tr v-for="(mark,i) in markData" :key="i">
124   - <td>{{mark.classId.subjects[0].subjectName}}</td>
  128 + <td>{{ mark.classId.subjects[0].subjectName }}</td>
125 129 <td
126 130 v-for="(markDistribution,i) in markParticularDistributionData"
127 131 :key="i"
128   - >{{ markDistribution }}</td>
  132 + >{{ markDistribution }}</td>
129 133 <!-- <td>
130 134 10
131 135 </td>
... ... @@ -202,13 +206,12 @@ export default {
202 206 k++
203 207 ) {
204 208 this.markParticularDistributionData.push(
205   - this.markData[i].studentsMarks[j].marksObtained[k]
206   - .marksScored
  209 + this.markData[i].studentsMarks[j].marksObtained[k].marksScored
207 210 );
208 211 this.markParticularDistributionData.push(
209   - this.markData[i].studentsMarks[j].marksObtained[k]
210   - .markDistributionId.markValue,
211   - );
  212 + this.markData[i].studentsMarks[j].marksObtained[k]
  213 + .markDistributionId.markValue
  214 + );
212 215 console.log(
213 216 "this.markParticularDistributionData",
214 217 this.markParticularDistributionData
... ...
src/pages/News/news.vue
Diff comments   View file @495e403
... ... @@ -229,25 +229,37 @@
229 229 <td id="td" class="text-xs-center">{{ props.item.description}}</td>
230 230  
231 231 <td class="text-xs-center">
232   - <span>
233   - <img
234   - style="cursor:pointer; width:25px; height:18px; "
235   - class="mr-5"
236   - @click="profile(props.item)"
237   - src="/static/icon/eye1.png"
238   - />
239   - <img
240   - style="cursor:pointer; width:20px; height:18px; "
241   - class="mr-5"
242   - @click="editItem(props.item)"
243   - src="/static/icon/edit1.png"
244   - />
245   - <img
246   - style="cursor:pointer;width:20px; height:20px; "
247   - class="mr-5"
248   - @click="deleteItem(props.item)"
249   - src="/static/icon/delete1.png"
250   - />
  232 + <span>
  233 + <v-tooltip top>
  234 + <img
  235 + slot="activator"
  236 + style="cursor:pointer; width:25px; height:18px; "
  237 + class="mr5"
  238 + @click="profile(props.item)"
  239 + src="/static/icon/eye1.png"
  240 + />
  241 + <span>View</span>
  242 + </v-tooltip>
  243 + <v-tooltip top>
  244 + <img
  245 + slot="activator"
  246 + style="cursor:pointer; width:20px; height:18px; "
  247 + class="mr5"
  248 + @click="editItem(props.item)"
  249 + src="/static/icon/edit1.png"
  250 + />
  251 + <span>Edit</span>
  252 + </v-tooltip>
  253 + <v-tooltip top>
  254 + <img
  255 + slot="activator"
  256 + style="cursor:pointer; width:20px; height:20px; "
  257 + class="mr5"
  258 + @click="deleteItem(props.item)"
  259 + src="/static/icon/delete1.png"
  260 + />
  261 + <span>Delete</span>
  262 + </v-tooltip>
251 263 </span>
252 264 </td>
253 265 </template>
... ...
src/pages/NoticeBoard/noticeBoard.vue
Diff comments   View file @495e403
... ... @@ -205,24 +205,36 @@
205 205  
206 206 <td class="text-xs-center">
207 207 <span>
208   - <img
209   - style="cursor:pointer; width:25px; height:18px; "
210   - class="mr-5"
211   - @click="profile(props.item)"
212   - src="/static/icon/eye1.png"
213   - />
214   - <img
215   - style="cursor:pointer; width:20px; height:18px; "
216   - class="mr-5"
217   - @click="editItem(props.item)"
218   - src="/static/icon/edit1.png"
219   - />
220   - <img
221   - style="cursor:pointer;width:20px; height:20px; "
222   - class="mr-5"
223   - @click="deleteItem(props.item)"
224   - src="/static/icon/delete1.png"
225   - />
  208 + <v-tooltip top>
  209 + <img
  210 + slot="activator"
  211 + style="cursor:pointer; width:25px; height:18px; "
  212 + class="mr5"
  213 + @click="profile(props.item)"
  214 + src="/static/icon/eye1.png"
  215 + />
  216 + <span>View</span>
  217 + </v-tooltip>
  218 + <v-tooltip top>
  219 + <img
  220 + slot="activator"
  221 + style="cursor:pointer; width:20px; height:18px; "
  222 + class="mr5"
  223 + @click="editItem(props.item)"
  224 + src="/static/icon/edit1.png"
  225 + />
  226 + <span>Edit</span>
  227 + </v-tooltip>
  228 + <v-tooltip top>
  229 + <img
  230 + slot="activator"
  231 + style="cursor:pointer; width:20px; height:20px; "
  232 + class="mr5"
  233 + @click="deleteItem(props.item)"
  234 + src="/static/icon/delete1.png"
  235 + />
  236 + <span>Delete</span>
  237 + </v-tooltip>
226 238 </span>
227 239 </td>
228 240 </template>
... ...
src/pages/Notification/notification.vue
Diff comments   View file @495e403
... ... @@ -82,7 +82,7 @@
82 82  
83 83 <!-- ****** PROFILE VIEW NOTIFICATION DEATILS ****** -->
84 84  
85   - <v-dialog v-model="dialog1" max-width="600px">
  85 + <v-dialog v-model="dialog1" max-width="500px">
86 86 <v-toolbar color="v-toolbar">
87 87 <v-spacer></v-spacer>
88 88 <v-toolbar-title>
... ... @@ -146,24 +146,36 @@
146 146  
147 147 <td id="td" class="text-xs-center">
148 148 <span>
149   - <img
150   - style="cursor:pointer; width:25px; height:18px; "
151   - class="mr-5"
152   - @click="profile(props.item)"
153   - src="/static/icon/eye1.png"
154   - />
155   - <img
156   - style="cursor:pointer; width:20px; height:18px; "
157   - class="mr-5"
158   - @click="editItem(props.item)"
159   - src="/static/icon/edit1.png"
160   - />
161   - <img
162   - style="cursor:pointer;width:20px; height:20px; "
163   - class="mr-5"
164   - @click="deleteItem(props.item)"
165   - src="/static/icon/delete1.png"
166   - />
  149 + <v-tooltip top>
  150 + <img
  151 + slot="activator"
  152 + style="cursor:pointer; width:25px; height:18px; "
  153 + class="mr5"
  154 + @click="profile(props.item)"
  155 + src="/static/icon/eye1.png"
  156 + />
  157 + <span>View</span>
  158 + </v-tooltip>
  159 + <v-tooltip top>
  160 + <img
  161 + slot="activator"
  162 + style="cursor:pointer; width:20px; height:18px; "
  163 + class="mr5"
  164 + @click="editItem(props.item)"
  165 + src="/static/icon/edit1.png"
  166 + />
  167 + <span>Edit</span>
  168 + </v-tooltip>
  169 + <v-tooltip top>
  170 + <img
  171 + slot="activator"
  172 + style="cursor:pointer; width:20px; height:20px; "
  173 + class="mr5"
  174 + @click="deleteItem(props.item)"
  175 + src="/static/icon/delete1.png"
  176 + />
  177 + <span>Delete</span>
  178 + </v-tooltip>
167 179 </span>
168 180 </td>
169 181 </template>
... ... @@ -224,7 +236,7 @@
224 236 </v-flex>
225 237 </v-layout>
226 238 </v-flex>
227   - <v-layout>
  239 + <v-layout>
228 240 <v-flex xs12 sm9 offset-sm2>
229 241 <v-layout>
230 242 <v-flex xs6>
... ...
src/pages/Parent/parents.vue
Diff comments   View file @495e403
... ... @@ -260,18 +260,26 @@
260 260 <td id="td" class="text-xs-center">{{ props.item.motherCellNo }}</td>
261 261 <td class="text-xs-center">
262 262 <span>
263   - <img
264   - style="cursor:pointer; width:25px; height:18px; "
265   - class="mr-5"
266   - @click="profile(props.item)"
267   - src="/static/icon/eye1.png"
268   - />
269   - <img
270   - style="cursor:pointer; width:20px; height:18px; "
271   - class="mr-5"
272   - @click="editItem(props.item)"
273   - src="/static/icon/edit1.png"
274   - />
  263 + <v-tooltip top>
  264 + <img
  265 + slot="activator"
  266 + style="cursor:pointer; width:25px; height:18px; "
  267 + class="mr5"
  268 + @click="profile(props.item)"
  269 + src="/static/icon/eye1.png"
  270 + />
  271 + <span>View</span>
  272 + </v-tooltip>
  273 + <v-tooltip top>
  274 + <img
  275 + slot="activator"
  276 + style="cursor:pointer; width:20px; height:18px; "
  277 + class="mr5"
  278 + @click="editItem(props.item)"
  279 + src="/static/icon/edit1.png"
  280 + />
  281 + <span>Edit</span>
  282 + </v-tooltip>
275 283 </span>
276 284 </td>
277 285 </template>
... ... @@ -395,17 +403,21 @@
395 403 </v-flex>
396 404 </v-layout>
397 405 <v-flex xs12 sm12>
398   - <v-card-actions>
399   - <v-btn @click="clear" round dark class="ml-4">clear</v-btn>
400   - <v-spacer></v-spacer>
401   - <v-btn
402   - @click="submitParentDetails"
403   - round
404   - dark
405   - :loading="loading"
406   - v-show="showParent"
407   - >Add</v-btn>
408   - </v-card-actions>
  406 + <v-layout>
  407 + <v-flex xs6 sm6 offset-sm1>
  408 + <v-btn @click="clear" round dark class="ml-4">clear</v-btn>
  409 + </v-flex>
  410 + <v-flex xs6 sm6>
  411 + <v-btn
  412 + class="right"
  413 + @click="submitParentDetails"
  414 + round
  415 + dark
  416 + :loading="loading"
  417 + v-show="showParent"
  418 + >Add</v-btn>
  419 + </v-flex>
  420 + </v-layout>
409 421 </v-flex>
410 422 </v-container>
411 423 </v-form>
... ...
src/pages/Report/markSheetReport.vue
View file @0065443
... ... @@ -1,301 +0,0 @@
1   -<template>
2   - <v-app id="pages-dasboard">
3   - <v-snackbar
4   - :timeout="timeout"
5   - :top="y === 'top'"
6   - :right="x === 'right'"
7   - :vertical="mode === 'vertical'"
8   - v-model="snackbar"
9   - color="success"
10   - >{{ text }}</v-snackbar>
11   -
12   - <!-- ****** Mark Sheet Report TABLE****** -->
13   - <v-card flat>
14   - <v-card-actions>
15   - <v-layout>
16   - <h4 class="right mt-2 ml-2">Mark Sheet Report</h4>
17   - </v-layout>
18   - <v-spacer></v-spacer>
19   - </v-card-actions>
20   - </v-card>
21   - <v-card flat>
22   - <v-flex xs12 sm12 lg12>
23   - <v-layout wrap>
24   - <v-flex xs12 sm12 lg3>
25   - <v-layout>
26   - <v-flex xs3 sm6 lg2 class="subheading mt-4">
27   - <label class="right">Exam:</label>
28   - </v-flex>
29   - <v-flex xs12 sm12 lg8 class="ml-2">
30   - <v-select
31   - v-model="getMark.exam"
32   - label="Select your Exam"
33   - type="text"
34   - :items="examList"
35   - item-text="classNum"
36   - item-value="_id"
37   - @change="getSections(getMark.classId)"
38   - required
39   - ></v-select>
40   - </v-flex>
41   - </v-layout>
42   - </v-flex>
43   - <v-flex xs12 sm12 lg3>
44   - <v-layout>
45   - <v-flex xs3 sm6 lg2 class="subheading mt-4">
46   - <label class="right">Class:</label>
47   - </v-flex>
48   - <v-flex xs12 sm12 lg8 class="ml-2">
49   - <v-select
50   - v-model="getMark.classId"
51   - label="Select your class"
52   - type="text"
53   - :items="classList"
54   - item-text="classNum"
55   - item-value="_id"
56   - @change="getSections(getMark.classId)"
57   - required
58   - ></v-select>
59   - </v-flex>
60   - </v-layout>
61   - </v-flex>
62   - <v-flex xs12 sm12 lg3>
63   - <v-layout>
64   - <v-flex xs3 sm6 lg2 class="subheading mt-4">
65   - <label class="right">Section:</label>
66   - </v-flex>
67   - <v-flex xs12 sm12 lg8 class="ml-2">
68   - <v-select
69   - :items="addSection"
70   - label="Select your Section"
71   - v-model="getMark.sectionId"
72   - item-text="name"
73   - item-value="_id"
74   - name="Select Section"
75   - required
76   - ></v-select>
77   - </v-flex>
78   - </v-layout>
79   - </v-flex>
80   - <v-flex xs12 sm12 lg3>
81   - <v-btn @click="getStudents" round dark :loading="loading" class="right mt-3">Get Report</v-btn>
82   - </v-flex>
83   - </v-layout>
84   - </v-flex>
85   - </v-card>
86   - <v-data-table
87   - :headers="headers"
88   - :items="getStudentsList"
89   - :pagination.sync="pagination"
90   - :search="search"
91   - >
92   - <template slot="items" slot-scope="props">
93   - <td class="text-xs-center">{{ props.index + 1}}</td>
94   - <td id="td" class="text-xs-center">
95   - <v-avatar>
96   - <img :src="props.item.profilePicUrl" v-if="props.item.profilePicUrl" />
97   - <img src="/static/icon/user.png" v-else-if="!props.item.profilePicUrl" />
98   - </v-avatar>
99   - </td>
100   - <td id="td" class="text-xs-center">{{ props.item.name}}</td>
101   - <td id="td" class="text-xs-center">{{ props.item.rollNo }}</td>
102   - <td id="td" class="text-xs-center">{{ props.item.email }}</td>
103   - <td class="text-xs-center">
104   - <span>
105   - <!-- <img
106   - style="cursor:pointer; width:25px; height:18px; "
107   - class="mr-5"
108   - @click="profile(props.item)"
109   - src="/static/icon/eye1.png"
110   - />-->
111   - <router-link :to="{ name:'viewMark',params: { markId:props.item._id } }">
112   - <img
113   - style="cursor:pointer; width:20px; height:18px; "
114   - class="mr-5"
115   - src="/static/icon/edit1.png"
116   - />
117   - </router-link>
118   - <!-- <img
119   - style="cursor:pointer;width:20px; height:20px; "
120   - class="mr-5"
121   - @click="deleteSchedule(props.item)"
122   - src="/static/icon/delete1.png"
123   - />-->
124   - </span>
125   - </td>
126   - </template>
127   - <v-alert
128   - slot="no-results"
129   - :value="true"
130   - color="error"
131   - icon="warning"
132   - >Your search for "{{ search }}" found no results.</v-alert>
133   - </v-data-table>
134   - <div class="loader" v-if="showLoader">
135   - <v-progress-circular indeterminate color="white"></v-progress-circular>
136   - </div>
137   - </v-app>
138   -</template>
139   -
140   -<script>
141   -import http from "@/Services/http.js";
142   -import moment from "moment";
143   -
144   -export default {
145   - data: () => ({
146   - snackbar: false,
147   - color: "",
148   - y: "top",
149   - x: "right",
150   - mode: "",
151   - timeout: 10000,
152   - text: "",
153   - loading: false,
154   - search: "",
155   - showLoader: false,
156   - addSection: [],
157   - pagination: {
158   - rowsPerPage: 15
159   - },
160   - headers: [
161   - {
162   - align: "justify-center",
163   - text: "No",
164   - sortable: false,
165   - value: "No"
166   - },
167   - {
168   - text: "Profile Pic",
169   - vaue: "profilePicUrl",
170   - sortable: false,
171   - align: "center"
172   - },
173   - {
174   - text: "Name",
175   - vaue: "name",
176   - sortable: false,
177   - align: "center"
178   - },
179   - {
180   - text: "Roll No.",
181   - value: "rollNo",
182   - sortable: false,
183   - align: "center"
184   - },
185   - {
186   - text: "Email",
187   - value: "email",
188   - sortable: false,
189   - align: "center"
190   - },
191   - { text: "Action", value: "", sortable: false, align: "center" }
192   - ],
193   - classList: [],
194   - getMark: {},
195   - markData: [],
196   - examList: [],
197   - getStudentsList: [],
198   - token: ""
199   - }),
200   - methods: {
201   - getClass() {
202   - http()
203   - .get("/getClassesList", {
204   - headers: { Authorization: "Bearer " + this.token }
205   - })
206   - .then(response => {
207   - this.classList = response.data.data;
208   - })
209   - .catch(err => {
210   - // console.log("err====>", err);
211   - });
212   - },
213   - getSections(_id) {
214   - console.log(_id);
215   - for (let i = 0; i < this.classList.length; i++) {
216   - if (_id == this.classList[i]._id) {
217   - this.subjects = this.classList[i].subjects;
218   - }
219   - }
220   - http()
221   - .get(
222   - "/getSectionsList",
223   - { params: { classId: _id } },
224   - {
225   - headers: { Authorization: "Bearer " + this.token }
226   - }
227   - )
228   - .then(response => {
229   - this.addSection = response.data.data;
230   - })
231   - .catch(err => {
232   - // console.log("err====>", err);
233   - });
234   - },
235   - getStudents() {
236   - this.showLoader = true;
237   - http()
238   - .get("/getStudentWithClass", {
239   - params: {
240   - classId: this.getMark.classId,
241   - sectionId: this.getMark.sectionId
242   - }
243   - })
244   - .then(response => {
245   - this.getStudentsList = response.data.data;
246   - this.showLoader = false;
247   - console.log("getSectionsList=====>", response.data.data);
248   - })
249   - .catch(error => {
250   - console.log("err====>", error);
251   - this.showLoader = false;
252   - });
253   - },
254   - getExamList() {
255   - this.showLoader = true;
256   - http()
257   - .get("/getExamsList", {
258   - headers: { Authorization: "Bearer " + this.token }
259   - })
260   - .then(response => {
261   - this.examList = response.data.data;
262   - this.showLoader = false;
263   - })
264   - .catch(error => {
265   - // console.log("err====>", err);
266   - this.showLoader = false;
267   - this.snackbar = true;
268   - this.text = error.response.data.message;
269   - if (error.response.status === 401) {
270   - this.$router.replace({ path: "/" });
271   - this.$store.dispatch("setToken", null);
272   - this.$store.dispatch("Id", null);
273   - }
274   - });
275   - }
276   - },
277   - mounted() {
278   - this.token = this.$store.state.token;
279   - this.getExamList();
280   - this.getClass();
281   - },
282   - created() {
283   - this.$root.$on("app:search", search => {
284   - this.search = search;
285   - });
286   - },
287   - beforeDestroy() {
288   - // dont forget to remove the listener
289   - this.$root.$off("app:search");
290   - }
291   -};
292   -</script>
293   -<style scoped>
294   -.active {
295   - background-color: gray;
296   - color: white !important;
297   -}
298   -.activebtn {
299   - color: black !important;
300   -}
301   -</style>s
302 0 \ No newline at end of file
src/pages/Report/progressCardReport.vue
Diff comments   View file @495e403
... ... @@ -0,0 +1,299 @@
  1 +<template>
  2 + <v-app id="pages-dasboard">
  3 + <v-snackbar
  4 + :timeout="timeout"
  5 + :top="y === 'top'"
  6 + :right="x === 'right'"
  7 + :vertical="mode === 'vertical'"
  8 + v-model="snackbar"
  9 + color="success"
  10 + >{{ text }}</v-snackbar>
  11 +
  12 + <!-- ****** Progress Card Report Table****** -->
  13 +
  14 + <v-card flat>
  15 + <v-card-actions>
  16 + <v-layout>
  17 + <h4 class="ml-2">Progress Card Report</h4>
  18 + </v-layout>
  19 + </v-card-actions>
  20 + </v-card>
  21 + <v-card flat>
  22 + <v-form ref="form" v-model="valid" lazy-validation>
  23 + <v-flex xs12 sm12 lg12>
  24 + <v-layout wrap>
  25 + <v-flex xs12 sm12 lg3>
  26 + <v-layout>
  27 + <v-flex xs3 sm6 lg2 class="subheading mt-4">
  28 + <label class="right">Class:</label>
  29 + </v-flex>
  30 + <v-flex xs12 sm12 lg8 class="ml-2">
  31 + <v-select
  32 + v-model="getReport.classId"
  33 + label="Select your class"
  34 + type="text"
  35 + :items="classList"
  36 + item-text="classNum"
  37 + item-value="_id"
  38 + :rules="classRules"
  39 + @change="getSections(getReport.classId)"
  40 + required
  41 + ></v-select>
  42 + </v-flex>
  43 + </v-layout>
  44 + </v-flex>
  45 + <v-flex xs12 sm12 lg3>
  46 + <v-layout>
  47 + <v-flex xs3 sm6 lg2 class="subheading mt-4">
  48 + <label class="right">Section:</label>
  49 + </v-flex>
  50 + <v-flex xs12 sm12 lg8 class="ml-2">
  51 + <v-select
  52 + :items="addSection"
  53 + label="Select your Section"
  54 + v-model="getReport.sectionId"
  55 + item-text="name"
  56 + item-value="_id"
  57 + name="Select Section"
  58 + @change="getStudents"
  59 + :rules="sectionRules"
  60 + required
  61 + ></v-select>
  62 + </v-flex>
  63 + </v-layout>
  64 + </v-flex>
  65 + <v-flex xs12 sm12 lg3>
  66 + <v-layout>
  67 + <v-flex xs3 sm6 lg2 class="subheading mt-4">
  68 + <label class="right">Student:</label>
  69 + </v-flex>
  70 + <v-flex xs12 sm12 lg8 class="ml-2">
  71 + <v-select
  72 + :items="getStudentsList"
  73 + label="Select your student"
  74 + v-model="getReport.studentId"
  75 + item-text="name"
  76 + item-value="_id"
  77 + :rules="studentRules"
  78 + required
  79 + ></v-select>
  80 + </v-flex>
  81 + </v-layout>
  82 + </v-flex>
  83 + <v-flex xs12 sm12 lg3>
  84 + <v-btn @click="getReport" round dark :loading="loading" class="right mt-3">Get Report</v-btn>
  85 + </v-flex>
  86 + </v-layout>
  87 + </v-flex>
  88 + </v-form>
  89 + </v-card>
  90 + <!-- <v-data-table
  91 + :headers="headers"
  92 + :items="getStudentsList"
  93 + :pagination.sync="pagination"
  94 + :search="search"
  95 + >
  96 + <template slot="items" slot-scope="props">
  97 + <td class="text-xs-center">{{ props.index + 1}}</td>
  98 + <td id="td" class="text-xs-center">
  99 + <v-avatar>
  100 + <img :src="props.item.profilePicUrl" v-if="props.item.profilePicUrl" />
  101 + <img src="/static/icon/user.png" v-else-if="!props.item.profilePicUrl" />
  102 + </v-avatar>
  103 + </td>
  104 + <td id="td" class="text-xs-center">{{ props.item.name}}</td>
  105 + <td id="td" class="text-xs-center">{{ props.item.rollNo }}</td>
  106 + <td id="td" class="text-xs-center">{{ props.item.email }}</td>
  107 + <td class="text-xs-center">
  108 + <span>
  109 + <router-link :to="{ name:'viewMark',params: { markId:props.item._id } }">
  110 + <img
  111 + style="cursor:pointer; width:20px; height:18px; "
  112 + class="mr-5"
  113 + src="/static/icon/edit1.png"
  114 + />
  115 + </router-link>
  116 + </span>
  117 + </td>
  118 + </template>
  119 + <v-alert
  120 + slot="no-results"
  121 + :value="true"
  122 + color="error"
  123 + icon="warning"
  124 + >Your search for "{{ search }}" found no results.</v-alert>
  125 + </v-data-table>-->
  126 + <div class="loader" v-if="showLoader">
  127 + <v-progress-circular indeterminate color="white"></v-progress-circular>
  128 + </div>
  129 + </v-app>
  130 +</template>
  131 +
  132 +<script>
  133 +import http from "@/Services/http.js";
  134 +import moment from "moment";
  135 +
  136 +export default {
  137 + data: () => ({
  138 + snackbar: false,
  139 + color: "",
  140 + y: "top",
  141 + x: "right",
  142 + mode: "",
  143 + timeout: 10000,
  144 + text: "",
  145 + loading: false,
  146 + search: "",
  147 + showLoader: false,
  148 + valid: true,
  149 + addSection: [],
  150 + classRules: [v => !!v || "Class is required"],
  151 + sectionRules: [v => !!v || "Class is required"],
  152 + studentRules: [v => !!v || "Student is required"],
  153 + pagination: {
  154 + rowsPerPage: 15
  155 + },
  156 + headers: [
  157 + {
  158 + align: "justify-center",
  159 + text: "No",
  160 + sortable: false,
  161 + value: "No"
  162 + },
  163 + {
  164 + text: "Profile Pic",
  165 + vaue: "profilePicUrl",
  166 + sortable: false,
  167 + align: "center"
  168 + },
  169 + {
  170 + text: "Name",
  171 + vaue: "name",
  172 + sortable: false,
  173 + align: "center"
  174 + },
  175 + {
  176 + text: "Roll No.",
  177 + value: "rollNo",
  178 + sortable: false,
  179 + align: "center"
  180 + },
  181 + {
  182 + text: "Email",
  183 + value: "email",
  184 + sortable: false,
  185 + align: "center"
  186 + },
  187 + { text: "Action", value: "", sortable: false, align: "center" }
  188 + ],
  189 + classList: [],
  190 + getReport: {},
  191 + markData: [],
  192 + examList: [],
  193 + getStudentsList: [],
  194 + token: ""
  195 + }),
  196 + methods: {
  197 + clear() {
  198 + this.$refs.form.reset();
  199 + },
  200 + getClass() {
  201 + http()
  202 + .get("/getClassesList", {
  203 + headers: { Authorization: "Bearer " + this.token }
  204 + })
  205 + .then(response => {
  206 + this.classList = response.data.data;
  207 + })
  208 + .catch(err => {
  209 + // console.log("err====>", err);
  210 + });
  211 + },
  212 + getSections(_id) {
  213 + http()
  214 + .get(
  215 + "/getSectionsList",
  216 + { params: { classId: _id } },
  217 + {
  218 + headers: { Authorization: "Bearer " + this.token }
  219 + }
  220 + )
  221 + .then(response => {
  222 + this.addSection = response.data.data;
  223 + })
  224 + .catch(err => {
  225 + // console.log("err====>", err);
  226 + });
  227 + },
  228 + getStudents() {
  229 + this.showLoader = true;
  230 + http()
  231 + .get("/getStudentWithClass", {
  232 + params: {
  233 + classId: this.getReport.classId,
  234 + sectionId: this.getReport.sectionId
  235 + }
  236 + })
  237 + .then(response => {
  238 + this.getStudentsList = response.data.data;
  239 + this.showLoader = false;
  240 + console.log("getSectionsList=====>", response.data.data);
  241 + })
  242 + .catch(error => {
  243 + console.log("err====>", error);
  244 + this.showLoader = false;
  245 + });
  246 + },
  247 + getReport() {
  248 + if (this.$refs.form.validate()) {
  249 + this.showLoader = true;
  250 + http()
  251 + .get("/getParticularMark", {
  252 + params: { studentId: this.getReport.studentId },
  253 + headers: { Authorization: "Bearer " + this.token }
  254 + })
  255 + .then(response => {
  256 + console.log("response.data.data", response.data.data);
  257 + // this.examList = response.data.data;
  258 + this.showLoader = false;
  259 + this.clear();
  260 + })
  261 + .catch(error => {
  262 + console.log("err====>", error);
  263 + this.showLoader = false;
  264 + // this.snackbar = true;
  265 + // this.text = error.response.data.message;
  266 + // if (error.response.status === 401) {
  267 + // this.$router.replace({ path: "/" });
  268 + // this.$store.dispatch("setToken", null);
  269 + // this.$store.dispatch("Id", null);
  270 + // }
  271 + });
  272 + }
  273 + }
  274 + },
  275 + mounted() {
  276 + this.token = this.$store.state.token;
  277 + // this.getExamList();
  278 + this.getClass();
  279 + },
  280 + created() {
  281 + this.$root.$on("app:search", search => {
  282 + this.search = search;
  283 + });
  284 + },
  285 + beforeDestroy() {
  286 + // dont forget to remove the listener
  287 + this.$root.$off("app:search");
  288 + }
  289 +};
  290 +</script>
  291 +<style scoped>
  292 +.active {
  293 + background-color: gray;
  294 + color: white !important;
  295 +}
  296 +.activebtn {
  297 + color: black !important;
  298 +}
  299 +</style>s
0 300 \ No newline at end of file
... ...
src/pages/Report/studentReport.vue
Diff comments   View file @495e403
... ... @@ -18,16 +18,16 @@
18 18 <v-spacer></v-spacer>
19 19 </v-card-actions>
20 20 </v-card>
21   - <v-card flat>
  21 + <v-card flat class="elevation-0">
22 22 <v-form ref="form" v-model="valid" lazy-validation>
23 23 <v-flex xs12 sm12 lg12>
24 24 <v-layout wrap>
25 25 <v-flex xs12 sm12 lg4>
26 26 <v-layout>
27   - <v-flex xs3 sm6 lg3 class="subheading mt-4">
  27 + <v-flex xs4 sm4 lg3 class="subheading mt-4">
28 28 <label class="right">Report For :</label>
29 29 </v-flex>
30   - <v-flex xs12 sm12 lg8 class="ml-2">
  30 + <v-flex xs7 sm6 lg8 class="ml-2">
31 31 <v-select
32 32 v-model="report.form"
33 33 label="Select your report for"
... ... @@ -43,10 +43,10 @@
43 43 </v-flex>
44 44 <v-flex xs12 sm12 lg4 v-if="bloodGroup">
45 45 <v-layout>
46   - <v-flex xs3 sm6 lg4 class="subheading mt-4">
  46 + <v-flex xs4 sm4 lg4 class="subheading mt-4">
47 47 <label class="right">Blood Group :</label>
48 48 </v-flex>
49   - <v-flex xs12 sm12 lg8 class="ml-2">
  49 + <v-flex xs7 sm6 lg8 class="ml-2">
50 50 <v-select
51 51 v-model="report.bloodGroup"
52 52 label="Select your Blood Group "
... ... @@ -59,10 +59,10 @@
59 59 </v-flex>
60 60 <v-flex xs12 sm12 lg4 v-if="genderShow">
61 61 <v-layout>
62   - <v-flex xs3 sm6 lg4 class="subheading mt-4">
  62 + <v-flex xs4 sm4 lg4 class="subheading mt-4">
63 63 <label class="right">Gender:</label>
64 64 </v-flex>
65   - <v-flex xs12 sm12 lg8 class="ml-2">
  65 + <v-flex xs7 sm6 lg8 class="ml-2">
66 66 <v-select
67 67 v-model="report.gender"
68 68 label="Select your gender "
... ... @@ -75,10 +75,10 @@
75 75 </v-flex>
76 76 <v-flex xs12 sm12 lg4 v-if="TransportShow">
77 77 <v-layout>
78   - <v-flex xs3 sm6 lg4 class="subheading mt-4">
  78 + <v-flex xs4 sm4 lg4 class="subheading mt-4">
79 79 <label class="right">Route:</label>
80 80 </v-flex>
81   - <v-flex xs12 sm12 lg8 class="ml-2">
  81 + <v-flex xs7 sm6 lg8 class="ml-2">
82 82 <v-select
83 83 v-model="report.route"
84 84 label="Select your gender "
... ... @@ -91,10 +91,10 @@
91 91 </v-flex>
92 92 <v-flex xs12 sm12 lg4 v-if="HostelShow">
93 93 <v-layout>
94   - <v-flex xs3 sm6 lg4 class="subheading mt-4">
  94 + <v-flex xs4 sm4 lg4 class="subheading mt-4">
95 95 <label class="right">Hostel:</label>
96 96 </v-flex>
97   - <v-flex xs12 sm12 lg8 class="ml-2">
  97 + <v-flex xs7 sm6 lg8 class="ml-2">
98 98 <v-select
99 99 v-model="report.route"
100 100 label="Select your hostel "
... ... @@ -107,10 +107,10 @@
107 107 </v-flex>
108 108 <v-flex xs12 sm12 lg4 v-if="countryShow">
109 109 <v-layout>
110   - <v-flex xs3 sm6 lg4 class="subheading mt-4">
  110 + <v-flex xs4 sm4 lg4 class="subheading mt-4">
111 111 <label class="right">Country :</label>
112 112 </v-flex>
113   - <v-flex xs12 sm12 lg8 class="ml-2">
  113 + <v-flex xs7 sm6 lg8 class="ml-2">
114 114 <v-select
115 115 v-model="report.country"
116 116 label="Select your Country "
... ... @@ -138,10 +138,10 @@
138 138 </v-flex>-->
139 139 <v-flex xs12 sm12 lg4>
140 140 <v-layout>
141   - <v-flex xs3 sm6 lg3 class="subheading mt-4">
  141 + <v-flex xs4 sm4 lg3 class="subheading mt-4">
142 142 <label class="right">Class:</label>
143 143 </v-flex>
144   - <v-flex xs12 sm12 lg8 class="ml-2">
  144 + <v-flex xs7 sm6 lg8 class="ml-2">
145 145 <v-select
146 146 v-model="report.classId"
147 147 label="Select your class"
... ... @@ -158,10 +158,10 @@
158 158 </v-flex>
159 159 <v-flex xs12 sm12 lg4 v-if="sectionShow">
160 160 <v-layout>
161   - <v-flex xs3 sm6 lg3 class="subheading mt-4">
  161 + <v-flex xs4 sm4 lg3 class="subheading mt-4">
162 162 <label class="right">Section:</label>
163 163 </v-flex>
164   - <v-flex xs12 sm12 lg8 class="ml-2">
  164 + <v-flex xs7 sm6 lg8 class="ml-2">
165 165 <v-select
166 166 :items="addSection"
167 167 label="Select your Section"
... ... @@ -175,31 +175,36 @@
175 175 </v-flex>
176 176 </v-layout>
177 177 </v-flex>
178   - <v-flex xs12 sm12 lg4>
  178 + <v-flex xs12 sm12 lg4 class="hidden-xs-only hidden-sm-only">
179 179 <v-btn @click="getStudents" round dark :loading="loading" class="mt-3 ml-5">Get Report</v-btn>
180 180 </v-flex>
  181 + <v-flex xs12 sm12 lg4 class="hidden-lg-only hidden-md-only hidden-xl-only">
  182 + <v-btn @click="getStudents" round dark :loading="loading" class="mt-3 right">Get Report</v-btn>
  183 + </v-flex>
181 184 </v-layout>
182 185 </v-flex>
183 186 </v-form>
184 187 </v-card>
185 188 <v-card flat v-if="getStudentsReportList">
186   - <v-card-actions>
187   - <v-layout>
188   - <h5 class="right mt-2 ml-2">Student Report</h5>
189   - <!-- <h5 class="right mt-2 ml-2">: {{ getStudentsReportList[0].classId.classNum }}</h5> -->
  189 + <v-flex xs12>
  190 + <v-layout v-for="(student,i) in getStudentsReportList" :key="i">
  191 + <v-flex xs12 sm12 md6>
  192 + <h5 class="mt-2 ml-2">Student Report</h5>
  193 + <h5 class="right mt-2 ml-2">: {{ student.classId.classNum }}</h5>
  194 + </v-flex>
  195 + <v-flex xs12 sm12 md6>
  196 + <h5 class="right mt-2 ml-2">Student Report</h5>
  197 + <h5 class="mt-2 ml-2">: {{ student.sectionId.name }}</h5>
  198 + </v-flex>
190 199 </v-layout>
191   - <v-spacer></v-spacer>
192   - <v-layout>
193   - <h5 class=" mt-2 ml-2">Student Report</h5>
194   - <!-- <h5 class=" mt-2 ml-2">: {{ getStudentsReportList[0].sectionId.name }}</h5> -->
195   - </v-layout>
196   - </v-card-actions>
  200 + </v-flex>
197 201 </v-card>
198 202 <v-data-table
199 203 :headers="headers"
200 204 :items="getStudentsReportList"
201 205 :pagination.sync="pagination"
202 206 :search="search"
  207 + v-show="showTable"
203 208 >
204 209 <template slot="items" slot-scope="props">
205 210 <td class="text-xs-center">{{ props.index + 1}}</td>
... ... @@ -324,7 +329,6 @@ export default {
324 329 methods: {
325 330 clear() {
326 331 this.$refs.form.reset();
327   - // console.log("this.clear()", this.$refs.form.reset;
328 332 },
329 333 getClass() {
330 334 http()
... ... @@ -391,16 +395,6 @@ export default {
391 395 getStudents() {
392 396 if (this.$refs.form.validate()) {
393 397 this.showLoader = true;
394   - // for (let i = 0; i < this.classList.length; i++) {
395   - // if (this.report.classId === this.classList[i]._id) {
396   - // Number(this.studentReort.className) = this.classList[i].classNum;
397   - // }
398   - // }
399   - // for (let i = 0; i < this.addSection.length; i++) {
400   - // if (this.report.sectionId === this.addSection[i]._id) {
401   - // this.studentReort.sectionName = this.addSection[i].name;
402   - // }
403   - // }
404 398 http()
405 399 .get("/getStudentReport", {
406 400 params: {
... ... @@ -470,8 +464,8 @@ export default {
470 464 },
471 465 mounted() {
472 466 this.token = this.$store.state.token;
473   - const getindustryList = countryList();
474   - this.countryList = getindustryList;
  467 + const getCountryList = countryList();
  468 + this.countryList = getCountryList;
475 469 // console.log("getindustryList", this.countryList);
476 470 // this.getExamList();
477 471 this.getClass();
... ...
src/pages/Section/section.vue
Diff comments   View file @495e403
... ... @@ -119,10 +119,10 @@
119 119 <br />
120 120 <v-layout>
121 121 <v-flex xs7 sm6>
122   - <h5 class="right my-1 hidden-xs-only hidden-sm-only">
  122 + <h5 class="right my-1 hidden-xs-only hidden-sm-only">
123 123 <b>Class Name:</b>
124 124 </h5>
125   - <h5 class="right my-1 hidden-lg-only hidden-md-only hidden-xl-only">
  125 + <h5 class="right my-1 hidden-lg-only hidden-md-only hidden-xl-only">
126 126 <b>Class:</b>
127 127 </h5>
128 128 </v-flex>
... ... @@ -192,24 +192,36 @@
192 192  
193 193 <td class="text-xs-center">
194 194 <span>
195   - <img
196   - style="cursor:pointer; width:25px; height:18px; "
197   - class="mr5"
198   - @click="profile(props.item)"
199   - src="/static/icon/eye1.png"
200   - />
201   - <img
202   - style="cursor:pointer; width:20px; height:18px; "
203   - class="mr5"
204   - @click="editItem(props.item)"
205   - src="/static/icon/edit1.png"
206   - />
207   - <img
208   - style="cursor:pointer; width:20px; height:20px; "
209   - class="mr5"
210   - @click="deleteItem(props.item)"
211   - src="/static/icon/delete1.png"
212   - />
  195 + <v-tooltip top>
  196 + <img
  197 + slot="activator"
  198 + style="cursor:pointer; width:25px; height:18px; "
  199 + class="mr5"
  200 + @click="profile(props.item)"
  201 + src="/static/icon/eye1.png"
  202 + />
  203 + <span>View</span>
  204 + </v-tooltip>
  205 + <v-tooltip top>
  206 + <img
  207 + slot="activator"
  208 + style="cursor:pointer; width:20px; height:18px; "
  209 + class="mr5"
  210 + @click="editItem(props.item)"
  211 + src="/static/icon/edit1.png"
  212 + />
  213 + <span>Edit</span>
  214 + </v-tooltip>
  215 + <v-tooltip top>
  216 + <img
  217 + slot="activator"
  218 + style="cursor:pointer; width:20px; height:20px; "
  219 + class="mr5"
  220 + @click="deleteItem(props.item)"
  221 + src="/static/icon/delete1.png"
  222 + />
  223 + <span>Delete</span>
  224 + </v-tooltip>
213 225 </span>
214 226 </td>
215 227 </template>
... ...
src/pages/Students/students.vue
Diff comments   View file @495e403
... ... @@ -971,24 +971,36 @@
971 971  
972 972 <td class="text-xs-center">
973 973 <span>
974   - <img
975   - style="cursor:pointer; width:25px; height:18px; "
976   - class="mr-5"
977   - @click="profile(props.item)"
978   - src="/static/icon/eye1.png"
979   - />
980   - <img
981   - style="cursor:pointer; width:20px; height:18px; "
982   - class="mr-5"
983   - @click="editItem(props.item)"
984   - src="/static/icon/edit1.png"
985   - />
986   - <img
987   - style="cursor:pointer;width:20px; height:20px; "
988   - class="mr-5"
989   - @click="deleteItem(props.item)"
990   - src="/static/icon/delete1.png"
991   - />
  974 + <v-tooltip top>
  975 + <img
  976 + slot="activator"
  977 + style="cursor:pointer; width:25px; height:18px; "
  978 + class="mr5"
  979 + @click="profile(props.item)"
  980 + src="/static/icon/eye1.png"
  981 + />
  982 + <span>View</span>
  983 + </v-tooltip>
  984 + <v-tooltip top>
  985 + <img
  986 + slot="activator"
  987 + style="cursor:pointer; width:20px; height:18px; "
  988 + class="mr5"
  989 + @click="editItem(props.item)"
  990 + src="/static/icon/edit1.png"
  991 + />
  992 + <span>Edit</span>
  993 + </v-tooltip>
  994 + <v-tooltip top>
  995 + <img
  996 + slot="activator"
  997 + style="cursor:pointer; width:20px; height:20px; "
  998 + class="mr5"
  999 + @click="deleteItem(props.item)"
  1000 + src="/static/icon/delete1.png"
  1001 + />
  1002 + <span>Delete</span>
  1003 + </v-tooltip>
992 1004 </span>
993 1005 </td>
994 1006 </template>
... ... @@ -1663,10 +1675,8 @@
1663 1675 </v-layout>
1664 1676 </v-flex>
1665 1677 </v-layout>
1666   - <!-- </v-container> -->
1667 1678 </v-form>
1668 1679 </v-flex>
1669   - <!-- </v-container> -->
1670 1680 </v-stepper-content>
1671 1681 </v-stepper-items>
1672 1682 </v-stepper>
... ... @@ -1685,8 +1695,8 @@
1685 1695  
1686 1696 <script>
1687 1697 import http from "@/Services/http.js";
1688   -import Util from "@/util";
1689 1698 import moment from "moment";
  1699 +import countryList from "@/script/country.js";
1690 1700  
1691 1701 export default {
1692 1702 data: () => ({
... ... @@ -1713,7 +1723,6 @@ export default {
1713 1723 addclass: [],
1714 1724 addSection: [],
1715 1725 gender: ["Male", "Female"],
1716   - AddUsercredentials: {},
1717 1726 pagination: {
1718 1727 rowsPerPage: 15
1719 1728 },
... ... @@ -1745,214 +1754,7 @@ export default {
1745 1754 /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) ||
1746 1755 "E-mail must be valid"
1747 1756 ],
1748   - countries: [
1749   - "Afghanistan",
1750   - "Albania",
1751   - "Algeria",
1752   - "Andorra",
1753   - "Angola",
1754   - "Anguilla",
1755   - "Antigua &amp; Barbuda",
1756   - "Argentina",
1757   - "Armenia",
1758   - "Aruba",
1759   - "Australia",
1760   - "Austria",
1761   - "Azerbaijan",
1762   - "Bahamas",
1763   - "Bahrain",
1764   - "Bangladesh",
1765   - "Barbados",
1766   - "Belarus",
1767   - "Belgium",
1768   - "Belize",
1769   - "Benin",
1770   - "Bermuda",
1771   - "Bhutan",
1772   - "Bolivia",
1773   - "Bosnia &amp; Herzegovina",
1774   - "Botswana",
1775   - "Brazil",
1776   - "British Virgin Islands",
1777   - "Brunei",
1778   - "Bulgaria",
1779   - "Burkina Faso",
1780   - "Burundi",
1781   - "Cambodia",
1782   - "Cameroon",
1783   - "Cape Verde",
1784   - "Cayman Islands",
1785   - "Chad",
1786   - "Chile",
1787   - "China",
1788   - "Colombia",
1789   - "Congo",
1790   - "Cook Islands",
1791   - "Costa Rica",
1792   - "Cote D Ivoire",
1793   - "Croatia",
1794   - "Cruise Ship",
1795   - "Cuba",
1796   - "Cyprus",
1797   - "Czech Republic",
1798   - "Denmark",
1799   - "Djibouti",
1800   - "Dominica",
1801   - "Dominican Republic",
1802   - "Ecuador",
1803   - "Egypt",
1804   - "El Salvador",
1805   - "Equatorial Guinea",
1806   - "Estonia",
1807   - "Ethiopia",
1808   - "Falkland Islands",
1809   - "Faroe Islands",
1810   - "Fiji",
1811   - "Finland",
1812   - "France",
1813   - "French Polynesia",
1814   - "French West Indies",
1815   - "Gabon",
1816   - "Gambia",
1817   - "Georgia",
1818   - "Germany",
1819   - "Ghana",
1820   - "Gibraltar",
1821   - "Greece",
1822   - "Greenland",
1823   - "Grenada",
1824   - "Guam",
1825   - "Guatemala",
1826   - "Guernsey",
1827   - "Guinea",
1828   - "Guinea Bissau",
1829   - "Guyana",
1830   - "Haiti",
1831   - "Honduras",
1832   - "Hong Kong",
1833   - "Hungary",
1834   - "Iceland",
1835   - "India",
1836   - "Indonesia",
1837   - "Iran",
1838   - "Iraq",
1839   - "Ireland",
1840   - "Isle of Man",
1841   - "Israel",
1842   - "Italy",
1843   - "Jamaica",
1844   - "Japan",
1845   - "Jersey",
1846   - "Jordan",
1847   - "Kazakhstan",
1848   - "Kenya",
1849   - "Kuwait",
1850   - "Kyrgyz Republic",
1851   - "Laos",
1852   - "Latvia",
1853   - "Lebanon",
1854   - "Lesotho",
1855   - "Liberia",
1856   - "Libya",
1857   - "Liechtenstein",
1858   - "Lithuania",
1859   - "Luxembourg",
1860   - "Macau",
1861   - "Macedonia",
1862   - "Madagascar",
1863   - "Malawi",
1864   - "Malaysia",
1865   - "Maldives",
1866   - "Mali",
1867   - "Malta",
1868   - "Mauritania",
1869   - "Mauritius",
1870   - "Mexico",
1871   - "Moldova",
1872   - "Monaco",
1873   - "Mongolia",
1874   - "Montenegro",
1875   - "Montserrat",
1876   - "Morocco",
1877   - "Mozambique",
1878   - "Namibia",
1879   - "Nepal",
1880   - "Netherlands",
1881   - "Netherlands Antilles",
1882   - "New Caledonia",
1883   - "New Zealand",
1884   - "Nicaragua",
1885   - "Niger",
1886   - "Nigeria",
1887   - "Norway",
1888   - "Oman",
1889   - "Pakistan",
1890   - "Palestine",
1891   - "Panama",
1892   - "Papua New Guinea",
1893   - "Paraguay",
1894   - "Peru",
1895   - "Philippines",
1896   - "Poland",
1897   - "Portugal",
1898   - "Puerto Rico",
1899   - "Qatar",
1900   - "Reunion",
1901   - "Romania",
1902   - "Russia",
1903   - "Rwanda",
1904   - "Saint Pierre &amp; Miquelon",
1905   - "Samoa",
1906   - "San Marino",
1907   - "Satellite",
1908   - "Saudi Arabia",
1909   - "Senegal",
1910   - "Serbia",
1911   - "Seychelles",
1912   - "Sierra Leone",
1913   - "Singapore",
1914   - "Slovakia",
1915   - "Slovenia",
1916   - "South Africa",
1917   - "South Korea",
1918   - "Spain",
1919   - "Sri Lanka",
1920   - "St Kitts &amp; Nevis",
1921   - "St Lucia",
1922   - "St Vincent",
1923   - "St. Lucia",
1924   - "Sudan",
1925   - "Suriname",
1926   - "Swaziland",
1927   - "Sweden",
1928   - "Switzerland",
1929   - "Syria",
1930   - "Taiwan",
1931   - "Tajikistan",
1932   - "Tanzania",
1933   - "Thailand",
1934   - "Timor L'Este",
1935   - "Togo",
1936   - "Tonga",
1937   - "Trinidad &amp; Tobago",
1938   - "Tunisia",
1939   - "Turkey",
1940   - "Turkmenistan",
1941   - "Turks &amp; Caicos",
1942   - "Uganda",
1943   - "Ukraine",
1944   - "United Arab Emirates",
1945   - "United Kingdom",
1946   - "United States",
1947   - "Uruguay",
1948   - "Uzbekistan",
1949   - "Venezuela",
1950   - "Vietnam",
1951   - "Virgin Islands (US)",
1952   - "Yemen",
1953   - "Zambia",
1954   - "Zimbabwe"
1955   - ],
  1757 + countries: [],
1956 1758 headers: [
1957 1759 {
1958 1760 text: "Roll No.",
... ... @@ -2045,11 +1847,6 @@ export default {
2045 1847 rollNo: "",
2046 1848 establishmentYear: new Date().getFullYear()
2047 1849 },
2048   - defaultItem: {
2049   - role: "STUDENT",
2050   - name: "",
2051   - email: ""
2052   - }
2053 1850 }),
2054 1851 watch: {
2055 1852 menu(val) {
... ... @@ -2394,7 +2191,8 @@ export default {
2394 2191 }
2395 2192 },
2396 2193 mounted() {
2397   - // this.getStudentList();
  2194 + const getCountryList = countryList();
  2195 + this.countries = getCountryList;
2398 2196 var token = this.$store.state.token;
2399 2197 http()
2400 2198 .get("/getClassesList", {
... ...
src/pages/Subjects/subjects.vue
Diff comments   View file @495e403
... ... @@ -38,46 +38,46 @@
38 38 <v-spacer></v-spacer>
39 39 </v-toolbar>
40 40 <v-card flat>
41   - <v-container fluid>
42   - <v-layout>
43   - <v-flex xs4 class="pt-4 subheading">
44   - <label class="right">Class:</label>
45   - </v-flex>
46   - <v-flex xs6 class="ml-3">
47   - <v-select
48   - :items="classList"
49   - label="Select Class"
50   - v-model="addSubject.selectName"
51   - item-text="classNum"
52   - item-value="_id"
53   - name="Select Class"
54   - :rules="nameRules"
55   - required
56   - ></v-select>
57   - </v-flex>
58   - </v-layout>
59   - <v-layout>
60   - <v-flex xs4 class="pt-4 subheading">
61   - <label class="right">Subject:</label>
62   - </v-flex>
63   - <v-flex xs6 class="ml-3">
64   - <v-text-field
65   - placeholder="fill your Subject"
66   - v-model="editedItem.subjectName"
67   - type="text"
68   - name="email"
69   - required
70   - ></v-text-field>
71   - </v-flex>
72   - </v-layout>
73   - <v-flex xs12 sm9 offset-sm2>
74   - <v-card-actions>
75   - <v-btn round dark @click.native="close">Cancel</v-btn>
76   - <v-spacer></v-spacer>
77   - <v-btn round dark @click="save">Save</v-btn>
78   - </v-card-actions>
  41 + <v-container fluid>
  42 + <v-layout>
  43 + <v-flex xs4 class="pt-4 subheading">
  44 + <label class="right">Class:</label>
79 45 </v-flex>
80   - </v-container>
  46 + <v-flex xs6 class="ml-3">
  47 + <v-select
  48 + :items="classList"
  49 + label="Select Class"
  50 + v-model="addSubject.selectName"
  51 + item-text="classNum"
  52 + item-value="_id"
  53 + name="Select Class"
  54 + :rules="nameRules"
  55 + required
  56 + ></v-select>
  57 + </v-flex>
  58 + </v-layout>
  59 + <v-layout>
  60 + <v-flex xs4 class="pt-4 subheading">
  61 + <label class="right">Subject:</label>
  62 + </v-flex>
  63 + <v-flex xs6 class="ml-3">
  64 + <v-text-field
  65 + placeholder="fill your Subject"
  66 + v-model="editedItem.subjectName"
  67 + type="text"
  68 + name="email"
  69 + required
  70 + ></v-text-field>
  71 + </v-flex>
  72 + </v-layout>
  73 + <v-flex xs12 sm9 offset-sm2>
  74 + <v-card-actions>
  75 + <v-btn round dark @click.native="close">Cancel</v-btn>
  76 + <v-spacer></v-spacer>
  77 + <v-btn round dark @click="save">Save</v-btn>
  78 + </v-card-actions>
  79 + </v-flex>
  80 + </v-container>
81 81 </v-card>
82 82 </v-flex>
83 83 </v-dialog>
... ... @@ -131,7 +131,7 @@
131 131 <v-flex xs4 sm1>
132 132 <label class="right mt-4">Select Class:</label>
133 133 </v-flex>
134   - <v-flex xs8 sm3 >
  134 + <v-flex xs8 sm3>
135 135 <v-select
136 136 :items="classList"
137 137 label="Select Class"
... ... @@ -155,29 +155,41 @@
155 155 :search="search"
156 156 >
157 157 <template slot="items" slot-scope="props">
158   - <td id="td" class="text-xs-center">{{ props.index + 1}}</td>
  158 + <td id="td" class="text-xs-center">{{ props.index + 1}}</td>
159 159 <td id="td" class="text-xs-center">{{ props.item.subjectName}}</td>
160 160  
161 161 <td class="text-xs-center">
162 162 <span>
163   - <img
164   - style="cursor:pointer; width:25px; height:18px; "
165   - class="mr-5"
166   - @click="profile(props.item)"
167   - src="/static/icon/eye1.png"
168   - />
169   - <img
170   - style="cursor:pointer; width:20px; height:18px; "
171   - class="mr-5"
172   - @click="editItem(props.item)"
173   - src="/static/icon/edit1.png"
174   - />
175   - <img
176   - style="cursor:pointer;width:20px; height:20px; "
177   - class="mr-5"
178   - @click="deleteItem(props.item)"
179   - src="/static/icon/delete1.png"
180   - />
  163 + <v-tooltip top>
  164 + <img
  165 + slot="activator"
  166 + style="cursor:pointer; width:25px; height:18px; "
  167 + class="mr5"
  168 + @click="profile(props.item)"
  169 + src="/static/icon/eye1.png"
  170 + />
  171 + <span>View</span>
  172 + </v-tooltip>
  173 + <v-tooltip top>
  174 + <img
  175 + slot="activator"
  176 + style="cursor:pointer; width:20px; height:18px; "
  177 + class="mr5"
  178 + @click="editItem(props.item)"
  179 + src="/static/icon/edit1.png"
  180 + />
  181 + <span>Edit</span>
  182 + </v-tooltip>
  183 + <v-tooltip top>
  184 + <img
  185 + slot="activator"
  186 + style="cursor:pointer; width:20px; height:20px; "
  187 + class="mr5"
  188 + @click="deleteItem(props.item)"
  189 + src="/static/icon/delete1.png"
  190 + />
  191 + <span>Delete</span>
  192 + </v-tooltip>
181 193 </span>
182 194 </td>
183 195 </template>
... ...
src/pages/Teachers/teachers.vue
Diff comments   View file @495e403
... ... @@ -516,24 +516,36 @@
516 516 <td id="td" class="text-xs-center">{{ props.item.mobileNo }}</td>
517 517 <td class="text-xs-center">
518 518 <span>
519   - <img
520   - style="cursor:pointer; width:25px; height:18px; "
521   - class="mr-5"
522   - @click="profile(props.item)"
523   - src="/static/icon/eye1.png"
524   - />
525   - <img
526   - style="cursor:pointer; width:20px; height:18px; "
527   - class="mr-5"
528   - @click="editItem(props.item)"
529   - src="/static/icon/edit1.png"
530   - />
531   - <img
532   - style="cursor:pointer;width:20px; height:20px; "
533   - class="mr-5"
534   - @click="deleteItem(props.item)"
535   - src="/static/icon/delete1.png"
536   - />
  519 + <v-tooltip top>
  520 + <img
  521 + slot="activator"
  522 + style="cursor:pointer; width:25px; height:18px; "
  523 + class="mr5"
  524 + @click="profile(props.item)"
  525 + src="/static/icon/eye1.png"
  526 + />
  527 + <span>View</span>
  528 + </v-tooltip>
  529 + <v-tooltip top>
  530 + <img
  531 + slot="activator"
  532 + style="cursor:pointer; width:20px; height:18px; "
  533 + class="mr5"
  534 + @click="editItem(props.item)"
  535 + src="/static/icon/edit1.png"
  536 + />
  537 + <span>Edit</span>
  538 + </v-tooltip>
  539 + <v-tooltip top>
  540 + <img
  541 + slot="activator"
  542 + style="cursor:pointer; width:20px; height:20px; "
  543 + class="mr5"
  544 + @click="deleteItem(props.item)"
  545 + src="/static/icon/delete1.png"
  546 + />
  547 + <span>Delete</span>
  548 + </v-tooltip>
537 549 </span>
538 550 </td>
539 551 </template>
... ... @@ -877,7 +889,7 @@
877 889 <v-layout class="mx-2">
878 890 <v-flex xs12 sm11 offset-sm1>
879 891 <v-layout>
880   - <v-flex xs6 class="">
  892 + <v-flex xs6 class>
881 893 <v-btn @click="clear" round dark>clear</v-btn>
882 894 </v-flex>
883 895 <v-flex xs6>
... ... @@ -901,8 +913,8 @@
901 913  
902 914 <script>
903 915 import http from "@/Services/http.js";
904   -import Util from "@/util";
905 916 import moment from "moment";
  917 +import countryList from "@/script/country.js";
906 918  
907 919 export default {
908 920 data: () => ({
... ... @@ -950,214 +962,7 @@ export default {
950 962 /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) ||
951 963 "E-mail must be valid"
952 964 ],
953   - countries: [
954   - "Afghanistan",
955   - "Albania",
956   - "Algeria",
957   - "Andorra",
958   - "Angola",
959   - "Anguilla",
960   - "Antigua &amp; Barbuda",
961   - "Argentina",
962   - "Armenia",
963   - "Aruba",
964   - "Australia",
965   - "Austria",
966   - "Azerbaijan",
967   - "Bahamas",
968   - "Bahrain",
969   - "Bangladesh",
970   - "Barbados",
971   - "Belarus",
972   - "Belgium",
973   - "Belize",
974   - "Benin",
975   - "Bermuda",
976   - "Bhutan",
977   - "Bolivia",
978   - "Bosnia &amp; Herzegovina",
979   - "Botswana",
980   - "Brazil",
981   - "British Virgin Islands",
982   - "Brunei",
983   - "Bulgaria",
984   - "Burkina Faso",
985   - "Burundi",
986   - "Cambodia",
987   - "Cameroon",
988   - "Cape Verde",
989   - "Cayman Islands",
990   - "Chad",
991   - "Chile",
992   - "China",
993   - "Colombia",
994   - "Congo",
995   - "Cook Islands",
996   - "Costa Rica",
997   - "Cote D Ivoire",
998   - "Croatia",
999   - "Cruise Ship",
1000   - "Cuba",
1001   - "Cyprus",
1002   - "Czech Republic",
1003   - "Denmark",
1004   - "Djibouti",
1005   - "Dominica",
1006   - "Dominican Republic",
1007   - "Ecuador",
1008   - "Egypt",
1009   - "El Salvador",
1010   - "Equatorial Guinea",
1011   - "Estonia",
1012   - "Ethiopia",
1013   - "Falkland Islands",
1014   - "Faroe Islands",
1015   - "Fiji",
1016   - "Finland",
1017   - "France",
1018   - "French Polynesia",
1019   - "French West Indies",
1020   - "Gabon",
1021   - "Gambia",
1022   - "Georgia",
1023   - "Germany",
1024   - "Ghana",
1025   - "Gibraltar",
1026   - "Greece",
1027   - "Greenland",
1028   - "Grenada",
1029   - "Guam",
1030   - "Guatemala",
1031   - "Guernsey",
1032   - "Guinea",
1033   - "Guinea Bissau",
1034   - "Guyana",
1035   - "Haiti",
1036   - "Honduras",
1037   - "Hong Kong",
1038   - "Hungary",
1039   - "Iceland",
1040   - "India",
1041   - "Indonesia",
1042   - "Iran",
1043   - "Iraq",
1044   - "Ireland",
1045   - "Isle of Man",
1046   - "Israel",
1047   - "Italy",
1048   - "Jamaica",
1049   - "Japan",
1050   - "Jersey",
1051   - "Jordan",
1052   - "Kazakhstan",
1053   - "Kenya",
1054   - "Kuwait",
1055   - "Kyrgyz Republic",
1056   - "Laos",
1057   - "Latvia",
1058   - "Lebanon",
1059   - "Lesotho",
1060   - "Liberia",
1061   - "Libya",
1062   - "Liechtenstein",
1063   - "Lithuania",
1064   - "Luxembourg",
1065   - "Macau",
1066   - "Macedonia",
1067   - "Madagascar",
1068   - "Malawi",
1069   - "Malaysia",
1070   - "Maldives",
1071   - "Mali",
1072   - "Malta",
1073   - "Mauritania",
1074   - "Mauritius",
1075   - "Mexico",
1076   - "Moldova",
1077   - "Monaco",
1078   - "Mongolia",
1079   - "Montenegro",
1080   - "Montserrat",
1081   - "Morocco",
1082   - "Mozambique",
1083   - "Namibia",
1084   - "Nepal",
1085   - "Netherlands",
1086   - "Netherlands Antilles",
1087   - "New Caledonia",
1088   - "New Zealand",
1089   - "Nicaragua",
1090   - "Niger",
1091   - "Nigeria",
1092   - "Norway",
1093   - "Oman",
1094   - "Pakistan",
1095   - "Palestine",
1096   - "Panama",
1097   - "Papua New Guinea",
1098   - "Paraguay",
1099   - "Peru",
1100   - "Philippines",
1101   - "Poland",
1102   - "Portugal",
1103   - "Puerto Rico",
1104   - "Qatar",
1105   - "Reunion",
1106   - "Romania",
1107   - "Russia",
1108   - "Rwanda",
1109   - "Saint Pierre &amp; Miquelon",
1110   - "Samoa",
1111   - "San Marino",
1112   - "Satellite",
1113   - "Saudi Arabia",
1114   - "Senegal",
1115   - "Serbia",
1116   - "Seychelles",
1117   - "Sierra Leone",
1118   - "Singapore",
1119   - "Slovakia",
1120   - "Slovenia",
1121   - "South Africa",
1122   - "South Korea",
1123   - "Spain",
1124   - "Sri Lanka",
1125   - "St Kitts &amp; Nevis",
1126   - "St Lucia",
1127   - "St Vincent",
1128   - "St. Lucia",
1129   - "Sudan",
1130   - "Suriname",
1131   - "Swaziland",
1132   - "Sweden",
1133   - "Switzerland",
1134   - "Syria",
1135   - "Taiwan",
1136   - "Tajikistan",
1137   - "Tanzania",
1138   - "Thailand",
1139   - "Timor L'Este",
1140   - "Togo",
1141   - "Tonga",
1142   - "Trinidad &amp; Tobago",
1143   - "Tunisia",
1144   - "Turkey",
1145   - "Turkmenistan",
1146   - "Turks &amp; Caicos",
1147   - "Uganda",
1148   - "Ukraine",
1149   - "United Arab Emirates",
1150   - "United Kingdom",
1151   - "United States",
1152   - "Uruguay",
1153   - "Uzbekistan",
1154   - "Venezuela",
1155   - "Vietnam",
1156   - "Virgin Islands (US)",
1157   - "Yemen",
1158   - "Zambia",
1159   - "Zimbabwe"
1160   - ],
  965 + countries: [],
1161 966 headers: [
1162 967 {
1163 968 text: "No",
... ... @@ -1444,6 +1249,8 @@ export default {
1444 1249 }
1445 1250 },
1446 1251 mounted() {
  1252 + const getCountryList = countryList();
  1253 + this.countries = getCountryList;
1447 1254 this.getTeacherList();
1448 1255 },
1449 1256 created() {
... ...
src/pages/TimeTable/timeTable.vue
Diff comments   View file @495e403
... ... @@ -492,23 +492,35 @@
492 492 <td class="text-xs-center">{{ props.item.sectionData.name }}</td>
493 493 <td class="text-xs-center">
494 494 <span>
495   - <img
496   - style="cursor:pointer; width:20px; height:18px; "
497   - class="mr-3 mt-2"
498   - @click="editItem(props.item)"
499   - src="/static/icon/edit1.png"
500   - />
501   - <img
502   - style="cursor:pointer;width:20px; height:20px; "
503   - class="mr-3"
504   - @click="deleteItem(props.item)"
505   - src="/static/icon/delete1.png"
506   - />
507   - <img
508   - style="cursor:pointer; width:20px; height:20px; "
509   - src="/static/icon/add1.png"
510   - @click="addSchedule(props.item._id)"
511   - />
  495 + <v-tooltip top>
  496 + <img
  497 + slot="activator"
  498 + style="cursor:pointer; width:20px; height:18px; "
  499 + class="mr5"
  500 + @click="editItem(props.item)"
  501 + src="/static/icon/edit1.png"
  502 + />
  503 + <span>Edit</span>
  504 + </v-tooltip>
  505 + <v-tooltip top>
  506 + <img
  507 + slot="activator"
  508 + style="cursor:pointer; width:20px; height:20px; "
  509 + class="mr5"
  510 + @click="deleteItem(props.item)"
  511 + src="/static/icon/delete1.png"
  512 + />
  513 + <span>Delete</span>
  514 + </v-tooltip>
  515 + <v-tooltip top>
  516 + <img
  517 + slot="activator"
  518 + style="cursor:pointer; width:20px; height:20px; "
  519 + src="/static/icon/add1.png"
  520 + @click="addSchedule(props.item._id)"
  521 + />
  522 + <span>Add</span>
  523 + </v-tooltip>
512 524 <!-- <v-icon color="black" >add_circle_outline</v-icon> -->
513 525 </span>
514 526 </td>
... ... @@ -552,10 +564,14 @@
552 564 {{list.timeOut}}
553 565 </td>
554 566 <td>
555   - <v-icon
556   - color="black"
557   - @click="addLecture(props.item._id, timeTableList._id)"
558   - >add_circle_outline</v-icon>
  567 + <v-tooltip top>
  568 + <v-icon
  569 + slot="activator"
  570 + color="black"
  571 + @click="addLecture(props.item._id, timeTableList._id)"
  572 + >add_circle_outline</v-icon>
  573 + <span>Add</span>
  574 + </v-tooltip>
559 575 </td>
560 576 </tr>
561 577 </template>
... ... @@ -747,7 +763,7 @@
747 763 <v-layout>
748 764 <v-flex xs12 sm12>
749 765 <v-layout>
750   - <v-flex xs4 md4 class="ml-4">
  766 + <v-flex xs4 md4 class="ml-4">
751 767 <v-btn @click="clear" round class="right" dark>clear</v-btn>
752 768 </v-flex>
753 769 <v-flex xs8 sm5 md4>
... ...
src/pages/User/user.vue
Diff comments   View file @495e403
... ... @@ -435,24 +435,36 @@
435 435 <td id="td" class="text-xs-center">{{ props.item.phone }}</td>
436 436 <td class="text-xs-center">
437 437 <span>
438   - <img
439   - style="cursor:pointer; width:25px; height:18px; "
440   - class="mr-5"
441   - @click="profile(props.item)"
442   - src="/static/icon/eye1.png"
443   - />
444   - <img
445   - style="cursor:pointer; width:20px; height:18px; "
446   - class="mr-5"
447   - @click="editItem(props.item)"
448   - src="/static/icon/edit1.png"
449   - />
450   - <img
451   - style="cursor:pointer;width:20px; height:20px; "
452   - class="mr-5"
453   - @click="deleteItem(props.item)"
454   - src="/static/icon/delete1.png"
455   - />
  438 + <v-tooltip top>
  439 + <img
  440 + slot="activator"
  441 + style="cursor:pointer; width:25px; height:18px; "
  442 + class="mr5"
  443 + @click="profile(props.item)"
  444 + src="/static/icon/eye1.png"
  445 + />
  446 + <span>View</span>
  447 + </v-tooltip>
  448 + <v-tooltip top>
  449 + <img
  450 + slot="activator"
  451 + style="cursor:pointer; width:20px; height:18px; "
  452 + class="mr5"
  453 + @click="editItem(props.item)"
  454 + src="/static/icon/edit1.png"
  455 + />
  456 + <span>Edit</span>
  457 + </v-tooltip>
  458 + <v-tooltip top>
  459 + <img
  460 + slot="activator"
  461 + style="cursor:pointer; width:20px; height:20px; "
  462 + class="mr5"
  463 + @click="deleteItem(props.item)"
  464 + src="/static/icon/delete1.png"
  465 + />
  466 + <span>Delete</span>
  467 + </v-tooltip>
456 468 </span>
457 469 </td>
458 470 </template>
... ...
src/pages/socialMedia/socialMedia.vue
Diff comments   View file @495e403
... ... @@ -149,24 +149,36 @@
149 149  
150 150 <td id="tabeleData" class="text-xs-center">
151 151 <span>
152   - <img
153   - style="cursor:pointer; width:25px; height:18px; "
154   - class="mr-5"
155   - @click="profile(props.item)"
156   - src="/static/icon/eye1.png"
157   - />
158   - <img
159   - style="cursor:pointer; width:20px; height:18px; "
160   - class="mr-5"
161   - @click="editItem(props.item)"
162   - src="/static/icon/edit1.png"
163   - />
164   - <img
165   - style="cursor:pointer;width:20px; height:20px; "
166   - class="mr-5"
167   - @click="deleteItem(props.item)"
168   - src="/static/icon/delete1.png"
169   - />
  152 + <v-tooltip top>
  153 + <img
  154 + slot="activator"
  155 + style="cursor:pointer; width:25px; height:18px; "
  156 + class="mr5"
  157 + @click="profile(props.item)"
  158 + src="/static/icon/eye1.png"
  159 + />
  160 + <span>View</span>
  161 + </v-tooltip>
  162 + <v-tooltip top>
  163 + <img
  164 + slot="activator"
  165 + style="cursor:pointer; width:20px; height:18px; "
  166 + class="mr5"
  167 + @click="editItem(props.item)"
  168 + src="/static/icon/edit1.png"
  169 + />
  170 + <span>Edit</span>
  171 + </v-tooltip>
  172 + <v-tooltip top>
  173 + <img
  174 + slot="activator"
  175 + style="cursor:pointer; width:20px; height:20px; "
  176 + class="mr5"
  177 + @click="deleteItem(props.item)"
  178 + src="/static/icon/delete1.png"
  179 + />
  180 + <span>Delete</span>
  181 + </v-tooltip>
170 182 </span>
171 183 </td>
172 184 </template>
... ...
src/router/paths.js
Diff comments   View file @495e403
... ... @@ -598,15 +598,15 @@ export default [{
598 598 )
599 599 },
600 600 {
601   - path: '/markSheetReport',
  601 + path: '/progressCardReport',
602 602 meta: {},
603   - name: 'markSheetReport',
  603 + name: 'progressCardReport',
604 604 props: (route) => ({ type: route.query.type }),
605 605 component: () =>
606 606 import (
607 607 /* webpackChunkName: "routes" */
608 608 /* webpackMode: "lazy-once" */
609   - `@/pages/Report/markSheetReport.vue`
  609 + `@/pages/Report/progressCardReport.vue`
610 610 )
611 611 }
612 612 ];
613 613 \ No newline at end of file
... ...