Commit 34a2a2609b12b678dfeeafe5a8e59707c9a0eb98
1 parent
de958fcfc5
Exists in
master
and in
2 other branches
added upload files option
Showing
4 changed files
with
24 additions
and
48 deletions
Show diff stats
src/Services/AllApiCalls.js
... | ... | @@ -20,18 +20,11 @@ export default { |
20 | 20 | /************************** METHODS USED FOR COMMON FILES *********************/ |
21 | 21 | /* METHODS USED FOR UploadPdf.vue */ |
22 | 22 | pdfFileSelected(e, message) { |
23 | - if (message == "uploadPPT") { | |
24 | - this.pptFile = e.fileInBase64; | |
25 | - this.pptFileName = e.selectedFileName; | |
26 | - this.trigger = e.trigger; | |
27 | - console.log("ppt file - ", this.pptFile); | |
28 | - } | |
29 | - if (message == "uploadPDF") { | |
30 | - this.pdfFile = e.fileInBase64; | |
31 | - this.pdfFileName = e.selectedFileName; | |
32 | - this.emptyPdf = e.trigger; | |
33 | - console.log("pdf file - ", this.pdfFile); | |
34 | - } | |
23 | + | |
24 | + this.pdfFile = e.fileInBase64; | |
25 | + this.pdfFileName = e.selectedFileName; | |
26 | + this.emptyPdf = e.emptyPdf; | |
27 | + | |
35 | 28 | }, |
36 | 29 | |
37 | 30 | /* METHODS USED FOR UploadFiles.vue */ |
... | ... | @@ -40,13 +33,11 @@ export default { |
40 | 33 | this.pptFile = e.fileInBase64; |
41 | 34 | this.pptFileName = e.selectedFileName; |
42 | 35 | this.trigger = e.trigger; |
43 | - console.log("ppt file - ", this.pptFile); | |
44 | 36 | } |
45 | 37 | if (message == "uploadPDF") { |
46 | 38 | this.pdfFile = e.fileInBase64; |
47 | 39 | this.pdfFileName = e.selectedFileName; |
48 | 40 | this.emptyPdf = e.trigger; |
49 | - console.log("pdf file - ", this.pdfFile); | |
50 | 41 | } |
51 | 42 | }, |
52 | 43 | ... | ... |
src/pages/Common/UploadFiles.vue
... | ... | @@ -39,19 +39,15 @@ export default { |
39 | 39 | // Select the very first file from list |
40 | 40 | this.fileToLoad = selectedFile[0]; |
41 | 41 | this.fileName = selectedFile[0].name; |
42 | - console.log("file name - ", this.fileName); | |
43 | 42 | // FileReader function for read the file. |
44 | 43 | var fileReader = new FileReader(); |
45 | 44 | // Onload of file read the file content |
46 | 45 | let vm = this; |
47 | 46 | fileReader.onload = function(fileLoadedEvent) { |
48 | 47 | vm.fileInBase64 = fileLoadedEvent.target.result; |
49 | - // Print data in console | |
50 | - console.log(vm.fileInBase64); | |
51 | 48 | |
52 | 49 | var str = vm.fileInBase64; |
53 | 50 | const [baseUrl, requiredUrl] = str.split(/,/); |
54 | - console.log("required - ", requiredUrl); | |
55 | 51 | |
56 | 52 | let fileData = { |
57 | 53 | fileName: this.fileName, |
... | ... | @@ -67,25 +63,23 @@ export default { |
67 | 63 | }, |
68 | 64 | resetInput(params) { |
69 | 65 | // RESET INPUT ELEMENT,fileName and selectedfile array |
70 | - | |
71 | - this.$refs[this.reference].type = "text"; | |
72 | - this.$refs[this.reference].type = "file"; | |
73 | - this.fileName = ""; | |
74 | 66 | this.fileToLoad = null; |
67 | + this.fileName = null; | |
75 | 68 | this.fileInBase64 = null; |
69 | + document.getElementById(this.id).type = "text"; | |
70 | + document.getElementById(this.id).type = "file"; | |
71 | + | |
76 | 72 | let fileData = { |
77 | 73 | fileName: this.fileName, |
78 | 74 | fileInBase64: this.fileInBase64, |
79 | 75 | trigger: "" |
80 | 76 | }; |
81 | 77 | this.$emit("fileSelected", fileData); |
82 | - console.log("its reset - ", fileData); | |
83 | 78 | } |
84 | 79 | }, |
85 | 80 | watch: { |
86 | 81 | respondToTrigger() { |
87 | 82 | if (this.respondToTrigger == "reset") { |
88 | - console.log("Resets - ", this.trigger); | |
89 | 83 | this.resetInput(); |
90 | 84 | } |
91 | 85 | } | ... | ... |
src/pages/Common/UploadPdf.vue
... | ... | @@ -39,7 +39,7 @@ export default { |
39 | 39 | // Select the very first file from list |
40 | 40 | this.fileToLoad = selectedFile[0]; |
41 | 41 | this.fileName = selectedFile[0].name; |
42 | - console.log("file name - ", this.fileName); | |
42 | + // console.log("file name - ", this.fileName); | |
43 | 43 | // FileReader function for read the file. |
44 | 44 | var fileReader = new FileReader(); |
45 | 45 | // Onload of file read the file content |
... | ... | @@ -47,16 +47,16 @@ export default { |
47 | 47 | fileReader.onload = function(fileLoadedEvent) { |
48 | 48 | vm.fileInBase64 = fileLoadedEvent.target.result; |
49 | 49 | // Print data in console |
50 | - console.log(vm.fileInBase64); | |
50 | + // console.log(vm.fileInBase64); | |
51 | 51 | |
52 | 52 | var str = vm.fileInBase64; |
53 | 53 | const [baseUrl, requiredUrl] = str.split(/,/); |
54 | - console.log("required - ", requiredUrl); | |
54 | + // console.log("required - ", requiredUrl); | |
55 | 55 | |
56 | 56 | let fileData = { |
57 | 57 | fileName: this.fileName, |
58 | 58 | fileInBase64: requiredUrl, |
59 | - trigger: "" | |
59 | + emptyPdf: "" | |
60 | 60 | }; |
61 | 61 | vm.$emit("pdfFileSelected", fileData); |
62 | 62 | }; |
... | ... | @@ -67,25 +67,25 @@ export default { |
67 | 67 | }, |
68 | 68 | resetInput(params) { |
69 | 69 | // RESET INPUT ELEMENT,fileName and selectedfile array |
70 | - | |
71 | - this.$refs[this.reference].type = "text"; | |
72 | - this.$refs[this.reference].type = "file"; | |
73 | - this.fileName = ""; | |
74 | 70 | this.fileToLoad = null; |
71 | + this.fileName = null; | |
75 | 72 | this.fileInBase64 = null; |
73 | + document.getElementById(this.id).type = "text"; | |
74 | + document.getElementById(this.id).type = "file"; | |
75 | + | |
76 | 76 | let fileData = { |
77 | 77 | fileName: this.fileName, |
78 | 78 | fileInBase64: this.fileInBase64, |
79 | - trigger: "" | |
79 | + emptyPdf: "" | |
80 | 80 | }; |
81 | 81 | this.$emit("pdfFileSelected", fileData); |
82 | - console.log("its reset - ", fileData); | |
82 | + // console.log("its reset - ", fileData); | |
83 | 83 | } |
84 | 84 | }, |
85 | 85 | watch: { |
86 | 86 | respondToTrigger() { |
87 | 87 | if (this.respondToTrigger == "reset") { |
88 | - console.log("Resets - ", this.emptyPdf); | |
88 | + // console.log("Reset pdf - ", this.emptyPdf); | |
89 | 89 | this.resetInput(); |
90 | 90 | } |
91 | 91 | } | ... | ... |
src/pages/Course/courseDetail.vue
... | ... | @@ -143,7 +143,7 @@ |
143 | 143 | label="Add PDF" |
144 | 144 | reference="editPdf" |
145 | 145 | id="editPdfInput" |
146 | - :trigger="emptyPdf" | |
146 | + :emptyPdf="emptyPdf" | |
147 | 147 | ></UploadPdf> |
148 | 148 | </v-flex> |
149 | 149 | </v-layout> |
... | ... | @@ -294,7 +294,7 @@ |
294 | 294 | label="Add PDF" |
295 | 295 | reference="newChapterPdf" |
296 | 296 | id="newChapterPdfInput" |
297 | - :trigger="emptyPdf" | |
297 | + :emptyPdf="emptyPdf" | |
298 | 298 | ></UploadPdf> |
299 | 299 | </v-flex> |
300 | 300 | </v-layout> |
... | ... | @@ -697,7 +697,7 @@ |
697 | 697 | label="Add PDF" |
698 | 698 | reference="newCoursePdf" |
699 | 699 | id="newCoursePdfInput" |
700 | - :trigger="emptyPdf" | |
700 | + :emptyPdf="emptyPdf" | |
701 | 701 | ></UploadPdf> |
702 | 702 | </v-flex> |
703 | 703 | </v-layout> |
... | ... | @@ -728,12 +728,7 @@ |
728 | 728 | <v-layout> |
729 | 729 | <v-flex xs12 sm12> |
730 | 730 | <v-layout class="right"> |
731 | - <v-btn | |
732 | - @click="clear;trigger = 'reset'; emptyPdf = 'reset';" | |
733 | - round | |
734 | - dark | |
735 | - class="clear-button" | |
736 | - >Clear</v-btn> | |
731 | + <v-btn @click="clear;" round dark class="clear-button">Clear</v-btn> | |
737 | 732 | <v-btn @click="submit" round dark :loading="loading" class="add-button">Add</v-btn> |
738 | 733 | </v-layout> |
739 | 734 | </v-flex> |
... | ... | @@ -1063,7 +1058,6 @@ export default { |
1063 | 1058 | // console.log("this.updates", this.updates); |
1064 | 1059 | var chapterPoints = []; |
1065 | 1060 | for (let i = 0; i < this.updates.length; i++) { |
1066 | - console.log("this.updates[i]", this.updates[i]); | |
1067 | 1061 | chapterPoints.push(this.updates[i].value); |
1068 | 1062 | } |
1069 | 1063 | var updateData = { |
... | ... | @@ -1075,7 +1069,6 @@ export default { |
1075 | 1069 | uploadPdf: this.pdfFile, |
1076 | 1070 | uploadPpt: this.pptFile |
1077 | 1071 | }; |
1078 | - console.log("chapterPoints", updateData); | |
1079 | 1072 | this.editLoading = true; |
1080 | 1073 | http() |
1081 | 1074 | .put("/updateChapters", updateData) |
... | ... | @@ -1098,7 +1091,6 @@ export default { |
1098 | 1091 | }); |
1099 | 1092 | }, |
1100 | 1093 | save() { |
1101 | - // console.log("utykgigiu", this.editedCourse); | |
1102 | 1094 | var updateData = { |
1103 | 1095 | courseDetailId: this.editedCourse._id, |
1104 | 1096 | courseId: this.editedCourse.courseId, |
... | ... | @@ -1147,7 +1139,6 @@ export default { |
1147 | 1139 | }, |
1148 | 1140 | addChapterPoint: function() { |
1149 | 1141 | this.findsChapterPoint.push({ value: "" }); |
1150 | - console.log("this.findsChapterPoint", this.findsChapterPoint); | |
1151 | 1142 | }, |
1152 | 1143 | update: function() { |
1153 | 1144 | this.updates.push({ value: "" }); | ... | ... |