viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit ceb43037a568d9cf3fcbaa517c1f1880a69f2ef6

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

fix bugs

Showing 8 changed files with 34 additions and 94 deletions   Show diff stats
src/pages/Class/addclass.vue
Diff comments   View file @ceb4303
... ... @@ -91,7 +91,7 @@
91 91 <br />
92 92 <v-layout>
93 93 <v-flex xs6 sm6>
94   - <h5 class="right my-1">Class Name:</h5>
  94 + <h5 class="right my-1"><b>Class Name:</b></h5>
95 95 </v-flex>
96 96 <v-flex sm6 xs6>
97 97 <h5 class="my-1">{{ editedItem.classNum }}</h5>
... ...
src/pages/Dashboard/dashboard.vue
Diff comments   View file @ceb4303
... ... @@ -68,12 +68,7 @@ export default {
68 68 return {
69 69 showLoader: false,
70 70 dialog: false,
71   - events: [
72   - {
73   - title: "",
74   - start: ""
75   - }
76   - ],
  71 + events: [],
77 72 eventHoliday: [],
78 73 config: {
79 74 eventClick: event => {
... ... @@ -139,44 +134,7 @@ export default {
139 134 headers: { Authorization: "Bearer " + token }
140 135 })
141 136 .then(response => {
142   - for (var i = 0; i < response.data.data.length; i++) {
143   - this.eventHoliday = [
144   - {
145   - title: response.data.data[i].occasion,
146   - date: response.data.data[i].dateOfHoliday
147   - }
148   - ];
149   - }
150   - this.showLoader = false;
151   - })
152   - .catch(err => {
153   - // console.log("err====>", err);
154   - this.showLoader = false;
155   - if (error.response.status === 401) {
156   - this.$router.replace({ path: "/" });
157   - this.$store.dispatch("setToken", null);
158   - this.$store.dispatch("Id", null);
159   - }
160   - });
161   - }
162   - },
163   - computed: {
164   - getEvents() {
165   - this.showLoader = true;
166   - var token = this.$store.state.token;
167   - http()
168   - .get("/getSchoolEventsList", {
169   - headers: { Authorization: "Bearer " + token }
170   - })
171   - .then(response => {
172   - for (var i = 0; i < response.data.data.length; i++) {
173   - this.events = [
174   - {
175   - title: response.data.data[i].title,
176   - start: response.data.data[i].dateOfEvent
177   - }
178   - ];
179   - }
  137 + this.eventHoliday = response.data.data;
180 138 this.showLoader = false;
181 139 })
182 140 .catch(err => {
... ... @@ -210,23 +168,10 @@ export default {
210 168 headers: { Authorization: "Bearer " + token }
211 169 })
212 170 .then(response => {
213   - // this.events = response.data.data;
214   - // console.log(this.events)
215   - for (var i = 0; i < response.data.data.length; i++) {
216   - this.events = [
217   - {
218   - title: response.data.data[i].title,
219   - date: response.data.data[i].dateOfEvent
220   - }
221   - ];
222   - }
223   - // this.events = [
224   - // { title: "event 1", date: "2019-09-30",desciptiom:"dataA" },
225   - // { title: "event 2", date: "2019-09-29",desciptiom:"dataB" }
226   - // ];
  171 + this.events = response.data.data;
227 172 this.showLoader = false;
228 173 })
229   - .catch(err => {
  174 + .catch(error => {
230 175 // console.log("err====>", err);
231 176 this.showLoader = false;
232 177 if (error.response.status === 401) {
... ...
src/pages/Event/event.vue
Diff comments   View file @ceb4303
... ... @@ -104,7 +104,7 @@
104 104 <v-date-picker
105 105 ref="picker"
106 106 v-model="editedItem.dateOfEvent"
107   - @input="menu = false"
  107 + @input="$refs.menu.save(editedItem.dateOfEvent)"
108 108 ></v-date-picker>
109 109 </v-menu>
110 110 </v-flex>
... ... @@ -151,18 +151,13 @@
151 151 <v-icon @click="close1">close</v-icon>
152 152 </v-toolbar>
153 153 <v-card>
154   - <!-- <v-flex align-center justify-center layout text-xs-center>
155   - <v-avatar size="50px" style="position:absolute; top:20px;">
156   - <img src="/static/icon/user.png" />
157   - </v-avatar>
158   - </v-flex>-->
159 154 <v-card-text>
160 155 <v-container grid-list-md>
161 156 <v-layout wrap>
162 157 <v-flex>
163 158 <v-layout>
164 159 <v-flex xs5 sm6>
165   - <h5 class="right my-1">Title:</h5>
  160 + <h5 class="right my-1"><b>Title:</b></h5>
166 161 </v-flex>
167 162 <v-flex sm6 xs8>
168 163 <h5 class="my-1">{{ editedItem.title }}</h5>
... ... @@ -170,7 +165,7 @@
170 165 </v-layout>
171 166 <v-layout>
172 167 <v-flex xs5 sm6>
173   - <h5 class="right my-1">Date:</h5>
  168 + <h5 class="right my-1"><b>Date:</b></h5>
174 169 </v-flex>
175 170 <v-flex sm6 xs8>
176 171 <h5 class="my-1">{{ dates(editedItem.dateOfEvent) }}</h5>
... ... @@ -178,7 +173,7 @@
178 173 </v-layout>
179 174 <v-layout>
180 175 <v-flex xs5 sm6>
181   - <h5 class="right my-1">Description:</h5>
  176 + <h5 class="right my-1"><b>Description:</b></h5>
182 177 </v-flex>
183 178 <v-flex sm6 xs8>
184 179 <h5 class="my-1">{{ editedItem.description }}</h5>
... ... @@ -311,6 +306,7 @@
311 306 :close-on-content-click="false"
312 307 v-model="menu1"
313 308 :nudge-right="40"
  309 + :return-value.sync="addEvent.dateOfEvent"
314 310 lazy
315 311 transition="scale-transition"
316 312 offset-y
... ... @@ -324,10 +320,9 @@
324 320 placeholder="Select date"
325 321 ></v-text-field>
326 322 <v-date-picker
327   - ref="picker"
328 323 v-model="addEvent.dateOfEvent"
329   - @input="menu1 = false"
330   - ></v-date-picker>
  324 + @input="$refs.menu1.save(addEvent.dateOfEvent)">
  325 + </v-date-picker>
331 326 </v-menu>
332 327 </v-flex>
333 328 </v-layout>
... ...
src/pages/Holiday/holiday.vue
Diff comments   View file @ceb4303
... ... @@ -105,7 +105,7 @@
105 105 <!-- ****** PROFILE VIEW Holiday DEATILS ****** -->
106 106  
107 107 <v-dialog v-model="dialog1" max-width="700px">
108   - <v-toolbar color="white">
  108 + <v-toolbar class="v-toolbar">
109 109 <v-spacer></v-spacer>
110 110 <v-toolbar-title>
111 111 <h3>Holiday</h3>
... ... @@ -120,7 +120,7 @@
120 120 <v-flex>
121 121 <v-layout>
122 122 <v-flex xs5 sm6>
123   - <h5 class="right my-1">Occasion:</h5>
  123 + <h5 class="right my-1"><b>Occasion:</b></h5>
124 124 </v-flex>
125 125 <v-flex sm6 xs8>
126 126 <h5 class="my-1">{{ editedItem.occasion }}</h5>
... ... @@ -128,7 +128,7 @@
128 128 </v-layout>
129 129 <v-layout>
130 130 <v-flex xs5 sm6>
131   - <h5 class="right my-1">Date:</h5>
  131 + <h5 class="right my-1"><b>Date:</b></h5>
132 132 </v-flex>
133 133 <v-flex sm6 xs8>
134 134 <h5 class="my-1">{{ editedItem.dateOfHoliday }}</h5>
... ... @@ -252,7 +252,7 @@
252 252 <v-date-picker
253 253 ref="picker"
254 254 v-model="addHoliday.dateOfHoliday"
255   - @input="menu1 = false"
  255 + @input="$refs.menu1.save(addHoliday.dateOfHoliday)"
256 256 ></v-date-picker>
257 257 </v-menu>
258 258 </v-flex>
... ...
src/pages/NoticeBoard/noticeBoard.vue
Diff comments   View file @ceb4303
... ... @@ -136,7 +136,7 @@
136 136 <!-- ****** VIEW PROFIL NOTICE BOARD ****** -->
137 137  
138 138 <v-dialog v-model="dialog1" max-width="640px" scrollable>
139   - <v-card style="height: 480px;">
  139 + <v-card style="height: 380px;">
140 140 <v-toolbar color="grey lighten-2" flat>
141 141 <v-spacer></v-spacer>
142 142 <v-toolbar-title>
... ... @@ -159,7 +159,7 @@
159 159 <v-flex>
160 160 <v-layout>
161 161 <v-flex xs5 sm6>
162   - <h5 class="right my-1">Title:</h5>
  162 + <h5 class="right my-1"><b>Title:</b></h5>
163 163 </v-flex>
164 164 <v-flex sm6 xs8>
165 165 <h5 class="my-1">{{ editedItem.title }}</h5>
... ... @@ -167,7 +167,7 @@
167 167 </v-layout>
168 168 <v-layout>
169 169 <v-flex xs5 sm6>
170   - <h5 class="right my-1">Description:</h5>
  170 + <h5 class="right my-1"><b>Description:</b></h5>
171 171 </v-flex>
172 172 <v-flex sm6 xs8>
173 173 <h5 class="my-1">{{ editedItem.description }}</h5>
... ...
src/pages/Notification/notification.vue
Diff comments   View file @ceb4303
... ... @@ -132,7 +132,7 @@
132 132 <br />
133 133 <v-layout>
134 134 <v-flex xs5 sm6>
135   - <h5 class="right my-1">Title:</h5>
  135 + <h5 class="right my-1"><b>Title:</b></h5>
136 136 </v-flex>
137 137 <v-flex sm6 xs8>
138 138 <h5 class="my-1">{{ editedItem.title }}</h5>
... ... @@ -140,7 +140,7 @@
140 140 </v-layout>
141 141 <v-layout>
142 142 <v-flex xs5 sm6>
143   - <h5 class="right my-1">Description:</h5>
  143 + <h5 class="right my-1"><b>Description:</b></h5>
144 144 </v-flex>
145 145 <v-flex sm6 xs8>
146 146 <h5 class="my-1">{{ editedItem.description }}</h5>
... ...
src/pages/Teachers/teachers.vue
Diff comments   View file @ceb4303
... ... @@ -339,7 +339,7 @@
339 339 </v-flex>
340 340 <v-layout>
341 341 <v-flex xs5 sm6>
342   - <h5 class="right my-1">Full Name:</h5>
  342 + <h5 class="right my-1"><b>Full Name:</b></h5>
343 343 </v-flex>
344 344 <v-flex sm6 xs8>
345 345 <h5 class="my-1">{{ editedItem.name }}</h5>
... ... @@ -347,7 +347,7 @@
347 347 </v-layout>
348 348 <v-layout>
349 349 <v-flex xs5 sm6>
350   - <h5 class="right my-1">Email:</h5>
  350 + <h5 class="right my-1"><b>Email:</b></h5>
351 351 </v-flex>
352 352 <v-flex sm6 xs8>
353 353 <h5 class="my-1">{{ editedItem.email }}</h5>
... ... @@ -355,7 +355,7 @@
355 355 </v-layout>
356 356 <v-layout>
357 357 <v-flex xs5 sm6>
358   - <h5 class="right my-1">City:</h5>
  358 + <h5 class="right my-1"><b>City:</b></h5>
359 359 </v-flex>
360 360 <v-flex sm6 xs8>
361 361 <h5 class="my-1">{{ editedItem.city }}</h5>
... ... @@ -363,7 +363,7 @@
363 363 </v-layout>
364 364 <v-layout>
365 365 <v-flex xs5 sm6>
366   - <h5 class="right my-1">State:</h5>
  366 + <h5 class="right my-1"><b>State:</b></h5>
367 367 </v-flex>
368 368 <v-flex sm6 xs8>
369 369 <h5 class="my-1">{{ editedItem.state }}</h5>
... ... @@ -371,7 +371,7 @@
371 371 </v-layout>
372 372 <v-layout>
373 373 <v-flex xs5 sm6>
374   - <h5 class="right my-1">Country:</h5>
  374 + <h5 class="right my-1"><b>Country:</b></h5>
375 375 </v-flex>
376 376 <v-flex sm6 xs8>
377 377 <h5 class="my-1">{{ editedItem.country }}</h5>
... ... @@ -379,7 +379,7 @@
379 379 </v-layout>
380 380 <v-layout>
381 381 <v-flex xs5 sm6>
382   - <h5 class="right my-1">Pincode:</h5>
  382 + <h5 class="right my-1"><b>Pincode:</b></h5>
383 383 </v-flex>
384 384 <v-flex sm6 xs8>
385 385 <h5 class="my-1">{{ editedItem.pincode }}</h5>
... ... @@ -387,7 +387,7 @@
387 387 </v-layout>
388 388 <v-layout>
389 389 <v-flex xs5 sm6>
390   - <h5 class="right my-1">Mobile No:</h5>
  390 + <h5 class="right my-1"><b>Mobile No:</b></h5>
391 391 </v-flex>
392 392 <v-flex sm6 xs8>
393 393 <h5 class="my-1">{{ editedItem.mobileNo }}</h5>
... ... @@ -395,7 +395,7 @@
395 395 </v-layout>
396 396 <v-layout>
397 397 <v-flex xs5 sm6>
398   - <h5 class="right my-1">Join Date:</h5>
  398 + <h5 class="right my-1"><b>Join Date:</b></h5>
399 399 </v-flex>
400 400 <v-flex sm6 xs8>
401 401 <h5 class="my-1">{{ dates(editedItem.joinDate) }}</h5>
... ... @@ -403,7 +403,7 @@
403 403 </v-layout>
404 404 <v-layout>
405 405 <v-flex xs5 sm6>
406   - <h5 class="right my-1">Date Of Birth:</h5>
  406 + <h5 class="right my-1"><b>Date Of Birth:</b></h5>
407 407 </v-flex>
408 408 <v-flex sm6 xs8>
409 409 <h5 class="my-1">{{ dates(editedItem.dob) }}</h5>
... ... @@ -411,7 +411,7 @@
411 411 </v-layout>
412 412 <v-layout>
413 413 <v-flex xs6 sm6>
414   - <h5 class="right my-1">Permanent Address:</h5>
  414 + <h5 class="right my-1"><b>Permanent Address:</b></h5>
415 415 </v-flex>
416 416 <v-flex sm6 xs8>
417 417 <h5 class="my-1">{{ editedItem.permanentAddress }}</h5>
... ... @@ -419,7 +419,7 @@
419 419 </v-layout>
420 420 <v-layout>
421 421 <v-flex xs6 sm6>
422   - <h5 class="right my-1">present Address:</h5>
  422 + <h5 class="right my-1"><b>present Address:</b></h5>
423 423 </v-flex>
424 424 <v-flex sm6 xs8>
425 425 <h5 class="my-1">{{ editedItem.presentAddress }}</h5>
... ...
src/pages/socialMedia/socialMedia.vue
Diff comments   View file @ceb4303
... ... @@ -135,7 +135,7 @@
135 135 <br />
136 136 <v-layout>
137 137 <v-flex xs5 sm6>
138   - <h5 class="right my-1">Title:</h5>
  138 + <h5 class="right my-1"><b>Title:</b></h5>
139 139 </v-flex>
140 140 <v-flex sm6 xs8>
141 141 <h5 class="my-1">{{ editedItem.type }}</h5>
... ... @@ -143,7 +143,7 @@
143 143 </v-layout>
144 144 <v-layout>
145 145 <v-flex xs5 sm6>
146   - <h5 class="right my-1">Description:</h5>
  146 + <h5 class="right my-1"><b>Description:</b></h5>
147 147 </v-flex>
148 148 <v-flex sm6 xs8>
149 149 <h5 class="my-1">{{ editedItem.linkUrl }}</h5>
... ...