Blame view
src/pages/Mark/mark.vue
19.8 KB
68d742034
implement new des...
|
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 |
<template>
<v-container fluid class="body-color">
<!-- ****** EXISTING MARK TABLE ****** -->
<v-toolbar color="transparent" flat>
<v-btn
fab
dark
class="open-dialog-button hidden-xl-only hidden-md-only hidden-lg-only"
small
@click="addMarkDialog = true"
>
<v-icon dark>add</v-icon>
</v-btn>
<v-btn
round
class="open-dialog-button hidden-sm-only hidden-xs-only"
dark
@click="addMarkDialog = true"
>
<v-icon class="white--text pr-1" size="20">add</v-icon>Add Mark
</v-btn>
<v-layout class="hidden-sm-only hidden-xs-only">
<v-flex md3 lg2 class="ml-2">
<v-select
v-model="getMark.classId"
label="Select your class"
type="text"
:items="classList"
item-text="classNum"
item-value="_id"
@change="getSections(getMark.classId)"
required
></v-select>
</v-flex>
<v-flex md3 lg2 class="ml-2">
<v-select
:items="addSection"
label="Select your Section"
v-model="getMark.sectionId"
item-text="name"
item-value="_id"
name="Select Section"
required
></v-select>
</v-flex>
<v-spacer></v-spacer>
<v-btn
@click="getStudents"
round
dark
:loading="loading"
class="right open-dialog-button mt-2"
>Mark</v-btn>
</v-layout>
<v-spacer class="hidden-lg-only hidden-xl-only hidden-md-only"></v-spacer>
<v-card-title class="body-1" v-show="show">
<v-btn icon large flat @click="displaySearch">
<v-avatar size="27">
|
aa310d61a
added functionali...
|
59 |
<img src="/static/icon/search.png" alt="icon" /> |
|
68d742034
implement new des...
|
60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 |
</v-avatar>
</v-btn>
</v-card-title>
<v-flex xs8 sm8 md3 lg2 v-show="showSearch">
<v-layout>
<v-text-field v-model="search" label="Search" prepend-inner-icon="search" color="primary"></v-text-field>
<v-icon @click="closeSearch" color="error">close</v-icon>
</v-layout>
</v-flex>
</v-toolbar>
<v-card flat class="elevation-0 transparent hidden-lg-only hidden-xl-only hidden-md-only">
<v-flex xs12 sm12 lg12>
<v-layout wrap>
<v-flex xs12 sm12 lg3>
<v-layout>
<v-flex xs3 sm6 lg2 class="subheading mt-4">
<label class="right">Class:</label>
|
|
006544386
implement task
|
77 |
</v-flex> |
|
68d742034
implement new des...
|
78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 |
<v-flex xs12 sm12 lg8 class="ml-2">
<v-select
v-model="getMark.classId"
label="Select your class"
type="text"
:items="classList"
item-text="classNum"
item-value="_id"
@change="getSections(getMark.classId)"
required
></v-select>
</v-flex>
</v-layout>
</v-flex>
<v-flex xs12 sm12 lg3>
<v-layout>
<v-flex xs3 sm6 lg2 class="subheading mt-4">
<label class="right">Section:</label>
|
|
006544386
implement task
|
96 |
</v-flex> |
|
68d742034
implement new des...
|
97 98 99 100 101 102 103 104 105 106 |
<v-flex xs12 sm12 lg8 class="ml-2">
<v-select
:items="addSection"
label="Select your Section"
v-model="getMark.sectionId"
item-text="name"
item-value="_id"
name="Select Section"
required
></v-select>
|
|
006544386
implement task
|
107 108 109 |
</v-flex>
</v-layout>
</v-flex>
|
|
68d742034
implement new des...
|
110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 |
<v-flex xs12 sm12 lg6>
<v-btn
@click="getStudents"
round
dark
:loading="loading"
class="right mt-3 open-dialog-button"
>Mark</v-btn>
</v-flex>
</v-layout>
</v-flex>
</v-card>
<v-data-table
:headers="headers"
:items="getStudentsList"
:pagination.sync="pagination"
:search="search"
>
<template slot="items" slot-scope="props">
<tr class="tr">
<td class="td td-row">{{ props.index + 1}}</td>
<td class="td td-row text-xs-center">
<v-avatar size="40">
<img :src="props.item.profilePicUrl" v-if="props.item.profilePicUrl" />
<img src="/static/icon/user.png" v-else-if="!props.item.profilePicUrl" />
</v-avatar>
</td>
<td class="td td-row text-xs-center">{{ props.item.name}}</td>
<td class="td td-row text-xs-center">{{ props.item.rollNo }}</td>
<td class="td td-row text-xs-center">{{ props.item.email }}</td>
<td class="td td-row text-xs-center">
<span>
|
|
2fe1115d8
added csv button ...
|
142 |
<router-link :to="{ name:'view Mark',params: { markId:props.item._id } }">
|
|
68d742034
implement new des...
|
143 144 145 146 |
<v-tooltip top>
<img
slot="activator"
style="cursor:pointer; width:25px; height:25px; "
|
|
aa310d61a
added functionali...
|
147 |
src="/static/icon/view.png" |
|
68d742034
implement new des...
|
148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 |
/>
<span>View</span>
</v-tooltip>
</router-link>
</span>
</td>
</tr>
</template>
<v-alert
slot="no-results"
:value="true"
color="error"
icon="warning"
>Your search for "{{ search }}" found no results.</v-alert>
</v-data-table>
<!-- ****** ADD Mark Schedule ****** -->
<v-dialog v-model="addMarkDialog" max-width>
<v-card flat class>
<v-layout class="pa-3 card-style white--text">
<v-flex xs12>
<label class="title text-xs-center">Add Mark</label>
<v-icon size="24" class="right white--text" @click="addMarkDialog = false">cancel</v-icon>
</v-flex>
</v-layout>
|
|
006544386
implement task
|
172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 |
<v-form ref="form" v-model="valid" lazy-validation>
<v-container fluid>
<v-flex xs12 sm12 lg12>
<v-layout wrap>
<v-flex xs12 sm12 lg10>
<v-layout wrap>
<v-flex xs12 sm12 lg3>
<v-flex xs3 sm2 lg2 class="subheading">
<label>Exam:</label>
</v-flex>
<v-flex xs12 sm12 lg10>
<v-select
label="Select your Exam Name"
:items="examList"
v-model="addMark.examId"
:rules="examRules"
item-text="examName"
item-value="_id"
></v-select>
</v-flex>
</v-flex>
<v-flex xs12 sm12 lg3>
<v-flex xs3 sm6 lg2 class="subheading">
<label>Class:</label>
</v-flex>
<v-flex xs12 sm12 lg10 class>
<v-select
v-model="addMark.classId"
label="Select your class"
type="text"
:items="classList"
item-text="classNum"
item-value="_id"
:rules="classRules"
@change="getSections(addMark.classId)"
required
></v-select>
</v-flex>
</v-flex>
<v-flex xs12 sm12 lg3>
<v-flex xs3 sm6 lg2 class="subheading">
<label>Section:</label>
</v-flex>
<v-flex xs12 sm12 lg10 class>
<v-select
:items="addSection"
label="Select your Section"
v-model="addMark.sectionId"
item-text="name"
item-value="_id"
name="Select Section"
:rules="sectionRules"
required
></v-select>
</v-flex>
</v-flex>
<v-flex xs12 sm12 lg3>
<v-flex xs3 sm6 lg2 class="subheading">
<label>Subject:</label>
</v-flex>
<v-flex xs12 sm12 lg10 class>
<v-select
:items="subjects"
label="Select your Subject"
v-model="addMark.subjectId"
item-text="subjectName"
item-value="_id"
name="Select Section"
:rules="subjectRules"
required
></v-select>
</v-flex>
</v-flex>
</v-layout>
</v-flex>
<v-flex xs12 sm12 lg2>
<v-flex xs12 sm12 lg12>
<v-btn
@click="findStudents"
round
dark
:loading="loading"
|
|
68d742034
implement new des...
|
254 |
class="right mt-4 open-dialog-button" |
|
006544386
implement task
|
255 256 257 258 259 |
>Mark</v-btn>
</v-flex>
</v-flex>
</v-layout>
</v-flex>
|
|
66a5c3b75
implement gloabal...
|
260 |
<!-- ****** ADD MARK TABLE DATA ****** --> |
|
68d742034
implement new des...
|
261 |
<v-card class="mt-4 elevation-0 body-color"> |
|
006544386
implement task
|
262 263 264 265 266 |
<v-data-table
:headers="headerOfMark"
:items="getStudentData"
:pagination.sync="pagination"
:search="search"
|
|
68d742034
implement new des...
|
267 |
class="body-color" |
|
006544386
implement task
|
268 269 |
>
<template slot="items" slot-scope="props">
|
|
68d742034
implement new des...
|
270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 |
<tr class="tr">
<td class="td td-row">{{ props.index + 1}}</td>
<td class="text-xs-center td td-row">
<v-avatar size="40">
<img :src="props.item.profilePicUrl" v-if="props.item.profilePicUrl" />
<img src="/static/icon/user.png" v-else-if="!props.item.profilePicUrl" />
</v-avatar>
</td>
<td class="text-xs-center td td-row">{{ props.item.name}}</td>
<td class="text-xs-center td td-row">{{ props.item.rollNo }}</td>
<td
class="text-xs-center markTable td td-row"
v-for="(marks, index) in props.item.marksObtained"
:key="'A'+ index"
>
<v-text-field v-model="marks.marksScored"></v-text-field>
</td>
</tr>
|
|
006544386
implement task
|
288 289 290 291 292 293 294 295 296 297 298 299 300 |
</template>
<v-alert
slot="no-results"
:value="true"
color="error"
icon="warning"
>Your search for "{{ search }}" found no results.</v-alert>
</v-data-table>
</v-card>
<v-layout class="mt-2">
<v-flex xs12 sm12>
<v-layout>
<v-flex xs12>
|
|
67a276510
fixed all bugs
|
301 302 303 304 305 306 307 |
<v-btn
@click="submit"
round
dark
:loading="loading"
class="right add-button"
>Add Mark</v-btn>
|
|
006544386
implement task
|
308 309 310 311 312 313 |
</v-flex>
</v-layout>
</v-flex>
</v-layout>
</v-container>
</v-form>
|
|
68d742034
implement new des...
|
314 315 |
</v-card>
</v-dialog>
|
|
006544386
implement task
|
316 317 318 |
<div class="loader" v-if="showLoader">
<v-progress-circular indeterminate color="white"></v-progress-circular>
</div>
|
|
68d742034
implement new des...
|
319 320 321 322 323 324 325 326 327 |
<v-snackbar
:timeout="timeout"
:top="y === 'top'"
:right="x === 'right'"
:vertical="mode === 'vertical'"
v-model="snackbar"
:color="color"
>{{ text }}</v-snackbar>
</v-container>
|
|
006544386
implement task
|
328 329 330 331 332 333 334 335 |
</template>
<script>
import http from "@/Services/http.js";
import moment from "moment";
export default {
data: () => ({
|
|
68d742034
implement new des...
|
336 337 |
show: true,
showSearch: false,
|
|
006544386
implement task
|
338 339 |
snackbar: false,
date: null,
|
|
006544386
implement task
|
340 341 342 343 344 345 346 |
color: "",
y: "top",
x: "right",
mode: "",
timeout: 10000,
text: "",
loading: false,
|
|
006544386
implement task
|
347 |
search: "", |
|
68d742034
implement new des...
|
348 349 |
show: true,
showSearch: false,
|
|
006544386
implement task
|
350 351 352 353 |
showLoader: false,
dialog: false,
dialog1: false,
valid: true,
|
|
68d742034
implement new des...
|
354 355 |
addMarkDialog: false,
|
|
006544386
implement task
|
356 357 |
addSection: [],
pagination: {
|
|
68d742034
implement new des...
|
358 |
rowsPerPage: 10 |
|
006544386
implement task
|
359 360 361 362 363 364 365 |
},
classRules: [v => !!v || "Class is required"],
sectionRules: [v => !!v || "section is required"],
subjectRules: [v => !!v || "Subject is required"],
examRules: [v => !!v || "Exam is required"],
headerOfMark: [
|
|
006544386
implement task
|
366 |
{
|
|
68d742034
implement new des...
|
367 |
align: "", |
|
006544386
implement task
|
368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 |
text: "No",
sortable: false,
value: "No"
},
{
text: "Profile Pic",
vaue: "profilePicUrl",
sortable: false,
align: "center"
},
{
text: "Name",
vaue: "name",
sortable: false,
align: "center"
},
{
text: "Roll No.",
value: "rollNo",
sortable: false,
align: "center"
}
|
|
006544386
implement task
|
390 391 392 |
],
headers: [
{
|
|
68d742034
implement new des...
|
393 |
align: "", |
|
006544386
implement task
|
394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 |
text: "No",
sortable: false,
value: "No"
},
{
text: "Profile Pic",
vaue: "profilePicUrl",
sortable: false,
align: "center"
},
{
text: "Name",
vaue: "name",
sortable: false,
align: "center"
},
{
text: "Roll No.",
value: "rollNo",
sortable: false,
align: "center"
},
{
text: "Email",
value: "email",
sortable: false,
align: "center"
},
{ text: "Action", value: "", sortable: false, align: "center" }
],
classList: [],
examList: [],
subjects: [],
addMark: {},
getMark: {},
|
|
006544386
implement task
|
429 430 431 432 433 434 435 |
getScheduleData: {},
markData: [],
getStudentData: [],
getStudentsList: [],
token: ""
}),
methods: {
|
|
006544386
implement task
|
436 437 438 439 440 441 442 443 444 |
getClass() {
this.showLoader = true;
http()
.get("/getClassesList", {
headers: { Authorization: "Bearer " + this.token }
})
.then(response => {
this.classList = response.data.data;
this.showLoader = false;
|
|
006544386
implement task
|
445 446 447 448 449 450 451 452 453 454 |
})
.catch(err => {
// console.log("err====>", err);
this.showLoader = false;
});
},
getSections(_id) {
this.showLoader = true;
for (let i = 0; i < this.classList.length; i++) {
if (_id == this.classList[i]._id) {
|
|
006544386
implement task
|
455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 |
this.subjects = this.classList[i].subjects;
}
}
http()
.get(
"/getSectionsList",
{ params: { classId: _id } },
{
headers: { Authorization: "Bearer " + this.token }
}
)
.then(response => {
this.addSection = response.data.data;
this.showLoader = false;
})
.catch(err => {
|
|
66a5c3b75
implement gloabal...
|
471 |
this.showLoader = false; |
|
006544386
implement task
|
472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 |
// console.log("err====>", err);
});
},
getExamList() {
this.showLoader = true;
this.loadingSearch = true;
http()
.get("/getExamsList", {
headers: { Authorization: "Bearer " + this.token }
})
.then(response => {
this.examList = response.data.data;
this.showLoader = false;
this.loadingSearch = false;
})
.catch(error => {
// console.log("err====>", err);
this.showLoader = false;
this.loadingSearch = false;
this.snackbar = true;
this.text = error.response.data.message;
if (error.response.status === 401) {
this.$router.replace({ path: "/" });
this.$store.dispatch("setToken", null);
this.$store.dispatch("Id", null);
|
|
00e4bc4e1
fixed auntentication
|
497 |
this.$store.dispatch("Role", null);
|
|
006544386
implement task
|
498 499 500 501 |
}
});
},
findStudents() {
|
|
ec5677f43
implement print o...
|
502 |
this.getStudentData = []; |
|
006544386
implement task
|
503 504 505 506 507 508 509 510 511 512 513 514 |
if (this.$refs.form.validate()) {
this.showLoader = true;
http()
.get("/getStudentWithClass", {
params: {
classId: this.addMark.classId,
sectionId: this.addMark.sectionId
}
})
.then(response => {
this.getStudentData = response.data.data;
this.showLoader = false;
|
|
006544386
implement task
|
515 516 517 518 519 520 521 |
this.showLoader = true;
http()
.get("/getMarkDistributionsList", {
params: this.addMark
})
.then(response => {
this.showLoader = false;
|
|
ec5677f43
implement print o...
|
522 |
this.headerOfMark.length = 4; |
|
006544386
implement task
|
523 524 525 526 527 528 529 530 531 532 533 |
for (var i = 0; i < response.data.data.length; i++) {
this.headerOfMark.push({
text:
response.data.data[i].distributionType +
" (" +
response.data.data[i].markValue +
")",
sortable: false,
align: "center"
});
}
|
|
ec5677f43
implement print o...
|
534 535 |
for (var n = 0; n < this.getStudentData.length; n++) {
this.getStudentData[n].marksObtained = [];
|
|
006544386
implement task
|
536 |
for (var j = 0; j < response.data.data.length; j++) {
|
|
ec5677f43
implement print o...
|
537 |
this.getStudentData[n].marksObtained.push({
|
|
006544386
implement task
|
538 |
markDistributionId: response.data.data[j]._id, |
|
c34b2bc04
solved issues rel...
|
539 |
marksScored: 0 |
|
006544386
implement task
|
540 541 |
});
}
|
|
46993dc1d
solve issue login
|
542 543 544 545 |
// if (marks.marksScored > marks.marksObtained) {
// this.getStudentData[n].marksScored = this.getStudentData[n].marksObtained;
// this.marks.marksScored = marks.marksObtained;
// }
|
|
006544386
implement task
|
546 |
} |
|
006544386
implement task
|
547 548 |
})
.catch(error => {
|
|
006544386
implement task
|
549 550 551 552 |
this.showLoader = false;
});
})
.catch(error => {
|
|
006544386
implement task
|
553 554 555 556 557 |
this.showLoader = false;
});
}
},
submit() {
|
|
006544386
implement task
|
558 |
for (var j = 0; j < this.getStudentData.length; j++) {
|
|
79583580d
implement task ma...
|
559 560 561 562 563 |
let data = {
examId: this.addMark.examId,
classId: this.addMark.classId,
sectionId: this.addMark.sectionId,
subjectId: this.addMark.subjectId,
|
|
006544386
implement task
|
564 |
studentId: this.getStudentData[j]._id, |
|
79583580d
implement task ma...
|
565 566 |
studentsMarks: this.getStudentData[j].marksObtained
};
|
|
006544386
implement task
|
567 |
http() |
|
79583580d
implement task ma...
|
568 |
.post("/createMark", data)
|
|
006544386
implement task
|
569 |
.then(response => {
|
|
ec5677f43
implement print o...
|
570 |
this.getStudentData = []; |
|
006544386
implement task
|
571 |
this.snackbar = true; |
|
67a276510
fixed all bugs
|
572 |
this.addMarkDialog = false; |
|
006544386
implement task
|
573 574 575 |
this.text = response.data.message;
this.color = "green";
this.loading = false;
|
|
006544386
implement task
|
576 577 |
})
.catch(error => {
|
|
79583580d
implement task ma...
|
578 579 580 |
this.snackbar = true;
this.text = error.response.data.message;
this.color = "red";
|
|
006544386
implement task
|
581 |
}); |
|
46993dc1d
solve issue login
|
582 583 584 585 |
// if (data.marksScored > data.marksObtained) {
// this.getStudentData[j].marksScored = this.getStudentData[j].marksObtained;
// this.data.marksScored = data.marksObtained;
// }
|
|
006544386
implement task
|
586 587 588 589 590 591 592 593 594 595 596 597 598 599 |
}
},
getStudents() {
this.showLoader = true;
http()
.get("/getStudentWithClass", {
params: {
classId: this.getMark.classId,
sectionId: this.getMark.sectionId
}
})
.then(response => {
this.getStudentsList = response.data.data;
this.showLoader = false;
|
|
006544386
implement task
|
600 601 602 603 604 |
})
.catch(error => {
console.log("err====>", error);
this.showLoader = false;
});
|
|
68d742034
implement new des...
|
605 606 607 608 609 610 611 612 |
},
displaySearch() {
(this.show = false), (this.showSearch = true);
},
closeSearch() {
this.showSearch = false;
this.show = true;
this.search = "";
|
|
006544386
implement task
|
613 614 615 616 |
}
},
mounted() {
this.token = this.$store.state.token;
|
|
006544386
implement task
|
617 618 |
this.getClass();
this.getExamList();
|
|
006544386
implement task
|
619 620 621 622 |
} }; </script> <style scoped> |
|
006544386
implement task
|
623 |
.markTable {
|
|
495e4037c
update
|
624 |
max-width: 80px !important; |
|
006544386
implement task
|
625 |
} |
|
ec5677f43
implement print o...
|
626 |
</style> |