Commit 080d885477da0f1837cda4340a54b0f21ee38e03
1 parent
c8fc8e42e9
Exists in
master
and in
3 other branches
issues solved
Showing
7 changed files
with
20 additions
and
6 deletions
Show diff stats
package.json
src/pages/Administrator/bulkImport.vue
| ... | ... | @@ -403,7 +403,7 @@ export default { |
| 403 | 403 | let _this = this; |
| 404 | 404 | reader.onload = function(e) { |
| 405 | 405 | var data = new Uint8Array(e.target.result); |
| 406 | - var workbook = XLSX.read(data, { type: "array" }); | |
| 406 | + var workbook = XLSX.read(data, { type: "array", cellDates: true }); | |
| 407 | 407 | let sheetName = workbook.SheetNames[0]; |
| 408 | 408 | // /* DO SOMETHING WITH workbook HERE */ |
| 409 | 409 | let worksheet = workbook.Sheets[sheetName]; |
| ... | ... | @@ -515,6 +515,7 @@ export default { |
| 515 | 515 | importStudent() { |
| 516 | 516 | this.studentLoading = true; |
| 517 | 517 | var studentfile = {}; |
| 518 | + console.log('this.studentFileJson', this.studentFileJson); | |
| 518 | 519 | studentfile.studentData = this.studentFileJson; |
| 519 | 520 | http() |
| 520 | 521 | .post("/importStudentData", studentfile, { | ... | ... |
src/pages/Authentication/Login.vue
src/pages/Exam/exam.vue
| ... | ... | @@ -450,12 +450,14 @@ export default { |
| 450 | 450 | .then(response => { |
| 451 | 451 | this.snackbar = true; |
| 452 | 452 | this.text = "Successfully Delete Exam "; |
| 453 | + this.text = response.data.message; | |
| 454 | + this.color = "green"; | |
| 453 | 455 | this.getExamList(); |
| 454 | 456 | }) |
| 455 | 457 | .catch(error => { |
| 456 | 458 | this.snackbar = true; |
| 457 | 459 | this.text = error.response.data.message; |
| 458 | - this.color = "error"; | |
| 460 | + this.color = "red"; | |
| 459 | 461 | }); |
| 460 | 462 | }, |
| 461 | 463 | close() { |
| ... | ... | @@ -472,7 +474,7 @@ export default { |
| 472 | 474 | this.color = "green"; |
| 473 | 475 | this.addExamDialog = false; |
| 474 | 476 | this.getExamList(); |
| 475 | - this.color = "succses"; | |
| 477 | + this.color = "success"; | |
| 476 | 478 | this.loading = false; |
| 477 | 479 | this.clear(); |
| 478 | 480 | }) | ... | ... |
src/pages/Students/students.vue
| ... | ... | @@ -517,7 +517,7 @@ |
| 517 | 517 | </b> |
| 518 | 518 | </v-flex> |
| 519 | 519 | <v-flex sm8 xs6> |
| 520 | - <h5 class="my-1">{{ editedItem.dob }}</h5> | |
| 520 | + <h5 class="my-1">{{ dates(editedItem.dob) }}</h5> | |
| 521 | 521 | </v-flex> |
| 522 | 522 | </v-layout> |
| 523 | 523 | </v-flex> |
| ... | ... | @@ -1891,6 +1891,7 @@ export default { |
| 1891 | 1891 | y: "top", |
| 1892 | 1892 | x: "right", |
| 1893 | 1893 | mode: "", |
| 1894 | + append: "", | |
| 1894 | 1895 | timeout: 3000, |
| 1895 | 1896 | text: "", |
| 1896 | 1897 | show: true, |
| ... | ... | @@ -2113,7 +2114,8 @@ export default { |
| 2113 | 2114 | this.$refs.editDataImage.click(); |
| 2114 | 2115 | }, |
| 2115 | 2116 | dates: function(date) { |
| 2116 | - return moment(date).format("MMM DD, YYYY"); | |
| 2117 | + return moment(date).format("MMMM DD, YYYY"); | |
| 2118 | + return date | |
| 2117 | 2119 | }, |
| 2118 | 2120 | onFilePicked(e) { |
| 2119 | 2121 | // console.log(e) | ... | ... |
src/pages/TimeTable/timeTable.vue
static/css/custom.css