diff --git a/package.json b/package.json index 9f81878..9d97061 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "lodash.truncate": "^4.4.2", "moment": "^2.24.0", "nprogress": "^0.2.0", + "papaparse": "^5.1.1", "quill": "^1.3.6", "save": "^2.4.0", "underscore": "^1.9.1", diff --git a/src/pages/Administrator/bulkImport.vue b/src/pages/Administrator/bulkImport.vue index d878048..cb46edb 100644 --- a/src/pages/Administrator/bulkImport.vue +++ b/src/pages/Administrator/bulkImport.vue @@ -403,7 +403,7 @@ export default { let _this = this; reader.onload = function(e) { var data = new Uint8Array(e.target.result); - var workbook = XLSX.read(data, { type: "array" }); + var workbook = XLSX.read(data, { type: "array", cellDates: true }); let sheetName = workbook.SheetNames[0]; // /* DO SOMETHING WITH workbook HERE */ let worksheet = workbook.Sheets[sheetName]; @@ -515,6 +515,7 @@ export default { importStudent() { this.studentLoading = true; var studentfile = {}; + console.log('this.studentFileJson', this.studentFileJson); studentfile.studentData = this.studentFileJson; http() .post("/importStudentData", studentfile, { diff --git a/src/pages/Authentication/Login.vue b/src/pages/Authentication/Login.vue index d8db6e9..bd90457 100644 --- a/src/pages/Authentication/Login.vue +++ b/src/pages/Authentication/Login.vue @@ -93,6 +93,7 @@ export default { mode: "", timeout: 3000, text: "", + append: "", e1: true, loading: false, remember: false, diff --git a/src/pages/Exam/exam.vue b/src/pages/Exam/exam.vue index 44070f0..4225606 100644 --- a/src/pages/Exam/exam.vue +++ b/src/pages/Exam/exam.vue @@ -450,12 +450,14 @@ export default { .then(response => { this.snackbar = true; this.text = "Successfully Delete Exam "; + this.text = response.data.message; + this.color = "green"; this.getExamList(); }) .catch(error => { this.snackbar = true; this.text = error.response.data.message; - this.color = "error"; + this.color = "red"; }); }, close() { @@ -472,7 +474,7 @@ export default { this.color = "green"; this.addExamDialog = false; this.getExamList(); - this.color = "succses"; + this.color = "success"; this.loading = false; this.clear(); }) diff --git a/src/pages/Students/students.vue b/src/pages/Students/students.vue index 4373a2f..fc85eb5 100644 --- a/src/pages/Students/students.vue +++ b/src/pages/Students/students.vue @@ -517,7 +517,7 @@ -
{{ editedItem.dob }}
+
{{ dates(editedItem.dob) }}
@@ -1891,6 +1891,7 @@ export default { y: "top", x: "right", mode: "", + append: "", timeout: 3000, text: "", show: true, @@ -2113,7 +2114,8 @@ export default { this.$refs.editDataImage.click(); }, dates: function(date) { - return moment(date).format("MMM DD, YYYY"); + return moment(date).format("MMMM DD, YYYY"); + return date }, onFilePicked(e) { // console.log(e) diff --git a/src/pages/TimeTable/timeTable.vue b/src/pages/TimeTable/timeTable.vue index 8c12bcd..a9261af 100644 --- a/src/pages/TimeTable/timeTable.vue +++ b/src/pages/TimeTable/timeTable.vue @@ -528,7 +528,7 @@ style="cursor:pointer; width:20px; height:20px; " class="mr-3" @click="editItem(props.item)" - src="/static/icon/dashboard icons-50.png" + src="/static/icon/edit.png" /> Edit diff --git a/static/css/custom.css b/static/css/custom.css index 511b061..b718321 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -145,6 +145,13 @@ h4 { padding: 8px; } +.apexcharts-canvas { + width: 100% !important; +} +.apexcharts-canvas > svg{ + width: 100% !important; +} + #dialog { height: 550px; }