From 5ceb88b4443fe6dede631114f0a9402cd8b704ec Mon Sep 17 00:00:00 2001 From: shikha Date: Mon, 27 Apr 2020 11:23:47 +0530 Subject: [PATCH] added pdf option while uploading file in assignment and ser roution option in academic --- src/pages/Academic/assignment.vue | 92 +++- src/pages/Academic/routine.vue | 985 +++++++++++++++++++------------------- 2 files changed, 556 insertions(+), 521 deletions(-) diff --git a/src/pages/Academic/assignment.vue b/src/pages/Academic/assignment.vue index 137074c..91e0ea2 100644 --- a/src/pages/Academic/assignment.vue +++ b/src/pages/Academic/assignment.vue @@ -12,6 +12,34 @@ + + + + + + + + + + @@ -114,18 +142,11 @@ - @@ -253,10 +274,22 @@ {{ props.item.description }} {{ props.item.deadline }} {{ props.item.sectionId.name }} - {{ props.item.teacherId.name }} - {{ props.item.schoolId .name }} + {{ props.item.teacherId.name }} + {{ props.item.schoolId .name }} + + + + + + + + + + + + + + @@ -442,7 +488,7 @@ ", this.upload); + console.log("imageData-upload========>", this.upload); if (files[0] !== undefined) { this.imageName = files[0].name; if (this.imageName.lastIndexOf(".") <= 0) { @@ -820,9 +866,9 @@ export default { fr.addEventListener("load", () => { this.imageUrl = fr.result; this.imageFile = files[0]; // this is an image file that can be sent to server... - this.imageData.imageUrl = URL.createObjectURL(this.imageFile); - // console.log("upload=======>", this.imageData.imageUrl); - // console.log("imageFile", this.imageUrl); + // this.imageData.imageUrl = URL.createObjectURL(this.imageFile); + // console.log("upload=======>", this.imageData.imageUrl); + console.log("imageFile", this.imageUrl); }); } else { this.imageName = ""; diff --git a/src/pages/Academic/routine.vue b/src/pages/Academic/routine.vue index a98ab4e..e967c3d 100644 --- a/src/pages/Academic/routine.vue +++ b/src/pages/Academic/routine.vue @@ -5,25 +5,85 @@ - + cancel - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -47,174 +107,116 @@ - + - + + + + - + - + + + + - - + + - + - + - - - - - + + + + Update Routine + - - - - Update Subject - - - - - - - + @@ -285,168 +289,136 @@
- +
+
+
+
+ -
- - -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
MONDAY
TUESDAY
WEDNESDAY
THURSDAY
FRIDAY
SATURDAY
SUNDAY
-
-
-
- - - @@ -498,11 +459,10 @@ @@ -587,7 +546,7 @@ :close-on-content-click="false" v-model="menuB" :nudge-right="40" - :return-value.sync="addRoutine.staringTime" + :return-value.sync="addRoutine.startingTime" lazy transition="scale-transition" offset-y @@ -597,15 +556,15 @@ > @@ -649,7 +608,7 @@ !!v || "End Time is required"], roomRules: [v => !!v || "Room is required"], periodRules: [v => !!v || "Period is required"], - headers: [ - { - text: "No", - align: "", - sortable: false, - value: "No" - }, - { - text: "Subject Name", - value: "subjectName", - sortable: false, - align: "center" - }, - { - text: "Subject Author", - value: "subjectAuthor", - sortable: false, - align: "center" - }, - { - text: "Subject Code", - value: "subjectCode", - sortable: false, - align: "center" - }, - // { - // text: "Teacher", - // value: "teacherId", - // sortable: false, - // align: "center" - // }, - { - text: "Pass Marks", - value: "passMarks", - sortable: false, - align: "center" - }, - { - text: "Final Marks", - value: "finalMarks", - sortable: false, - align: "center" - }, - { - text: "Type", - value: "type", - sortable: false, - align: "center" - }, - { text: "Action", value: "", sortable: false, align: "center" } - ], - subjectList: [], + classList: [], addSection: [], subjectList: [], @@ -814,45 +722,47 @@ export default { routineList: [], editedIndex: -1, addRoutine: {}, + startingTime: "", + editedItem: {} - editedItem: { - // subjectName: "", - // subjectAuthor: "" - } + // editedItem: { + // schoolYear: "", + // day: "", + // teacherId: "", + // classId: "", + // sectionId: "", + // startingTime: "", + // endingTime: "", + // room: "", + // period: "", + // subjectName: "" + // } }), methods: { - pickFile() { - this.$refs.image.click(); - }, editItem(item) { - this.editedIndex = this.subjectList.subjects; + this.editedIndex = this.routineList; this.editedItem = Object.assign({}, item); + // this.editedItem.subjectName = item.lectureRoutine.subjectName; this.dialog = true; this.editRoutineDialog = true; }, - // profile(item) { - // this.editedIndex = this.subjectList.subjects; - // this.editedItem = Object.assign({}, item); - // this.dialog1 = true; - // this.viewSubjectDialog = true; - // }, deleteItem(item) { - let deleteSubject = { - classId: this.addRoutine.classId, - subjectId: item._id + let deleteLecture = { + routineId: item._id, + lectureId: item.lectureRoutine[0]._id }; http() .delete( - "/deleteSubject", + "/deleteRoutineLecture", confirm("Are you sure you want to delete this?") && { - params: deleteSubject + params: deleteLecture } ) .then(response => { - this.getClassSubject(_id); this.snackbar = true; - this.text = "Successfully delete Existing Subject"; + this.text = "Successfully delete Existing Routine"; this.color = "green"; + this.getRoutineList(); }) .catch(error => { this.snackbar = true; @@ -875,7 +785,7 @@ export default { if (this.$refs.form.validate()) { routineData.lectureRoutine.push({ teacherId: this.addRoutine.teacherId, - staringTime: this.addRoutine.staringTime, + startingTime: this.addRoutine.startingTime, endingTime: this.addRoutine.endingTime, room: this.addRoutine.room, period: this.addRoutine.period, @@ -884,6 +794,7 @@ export default { http() .post("/createRoutine", routineData) .then(response => { + this.getRoutineList(); this.text = "Routine added successfully"; this.clear(); this.snackbar = true; @@ -902,72 +813,53 @@ export default { this.$refs.form.reset(); }, - save() { - if (this.$refs.formEditRoutine.validate()) { - let editSubject = { - classId: this.editedItem.classId, - subjectId: this.editedItem._id, - teacherId: this.editedItem.teacherId, - type: this.editedItem.type, - passMarks: this.editedItem.passMarks, - finalMarks: this.editedItem.finalMarks, - subjectAuthor: this.editedItem.subjectAuthor, - subjectCode: this.editedItem.subjectCode, - subjectName: this.editedItem.subjectName - }; - this.editLoading = true; - http() - .put("/updateSubject", editSubject) - .then(response => { - this.snackbar = true; - this.text = "Successfully Edit Existing Subject"; - this.color = "green"; - this.editLoading = false; - this.editRoutineDialog = false; - http() - .get( - "/getParticularClass", - { params: { classId: _id } }, - { - headers: { Authorization: "Bearer " + this.token } - } - ) - .then(response => { - this.subjectList = response.data.data; - this.snackbar = true; - this.color = "green"; - this.text = response.data.message; - this.close(); - }) - .catch(err => { - console.log("err====>", err); - }); - }) - .catch(error => { - this.editLoading = false; + update() { + // if (this.$refs.formEditRoutine.validate()) { + // let editSubject = { + // classId: this.editedItem.classId, + // subjectId: this.editedItem._id, + // teacherId: this.editedItem.teacherId, + // type: this.editedItem.type, + // passMarks: this.editedItem.passMarks, + // finalMarks: this.editedItem.finalMarks, + // subjectAuthor: this.editedItem.subjectAuthor, + // subjectCode: this.editedItem.subjectCode, + // subjectName: this.editedItem.subjectName + // }; + // this.editLoading = true; + // http() + // .put("/updateSubject", editSubject) + // .then(response => { + // this.snackbar = true; + // this.text = "Successfully Edit Existing Subject"; + // this.color = "green"; + // this.editLoading = false; + // this.editRoutineDialog = false; + // http() + // .get( + // "/getParticularClass", + // { params: { classId: _id } }, + // { + // headers: { Authorization: "Bearer " + this.token } + // } + // ) + // .then(response => { + // this.subjectList = response.data.data; + // this.snackbar = true; + // this.color = "green"; + // this.text = response.data.message; + // this.close(); + // }) + // .catch(err => { + // console.log("err====>", err); + // }); + // }) + // .catch(error => { + // this.editLoading = false; - // console.log(error); - }); - } - }, - getClassSubject(_id) { - this.showLoader = true; - // this.classId = this.classId; - http() - .get( - "/getParticularClass", - { params: { classId: _id } }, - { - headers: { Authorization: "Bearer " + this.token } - } - ) - .then(response => { - this.subjectList = response.data.data; - this.showLoader = false; - }) - .catch(err => { - this.showLoader = false; - }); + // // console.log(error); + // }); + // } }, getClass() { http() @@ -1062,6 +954,8 @@ export default { .then(response => { this.routineList = response.data.data; this.showLoader = false; + this.showTable = true; + this.hideTable = false; }) .catch(err => { this.showLoader = false; @@ -1078,7 +972,6 @@ export default { }, mounted() { this.token = this.$store.state.token; - // this.getNoticeDataList(); this.getClass(); this.getTeacherList(); this.role = this.$store.state.role; @@ -1087,16 +980,22 @@ export default {