diff --git a/frontend/components/dropdown/Dropdown.vue b/frontend/components/dropdown/Dropdown.vue index 99fb4da72949fd993e269f08c9afe356d33ce2f8..ba514db9411857babcdd7778f6f4512563a1c008 100644 --- a/frontend/components/dropdown/Dropdown.vue +++ b/frontend/components/dropdown/Dropdown.vue @@ -43,7 +43,7 @@ export default { this.dataset = this.dropdownValue } else { this.dataset = "Choose Folder" - console.log("Dataset: ", this.dataset) + if (!this.isFolderNotExist()) { if (!this.isUpload) { this.dataset = this.config.options[0].value @@ -97,10 +97,10 @@ export default { confirmButtonColor: '#11616F', showCancelButton: true }).then((result) => { - console.log("Result: ", result) + if (!result.value) { this.dataset = "Choose Folder" - console.log("Dataset: ", this.dataset) + } }) }, diff --git a/frontend/components/label/Box.vue b/frontend/components/label/Box.vue index c8ad8984dcc43333fe6744f61dbcb9bd91a97483..657fd461f4e407be0fbe8338f0e4613fec5406cd 100644 --- a/frontend/components/label/Box.vue +++ b/frontend/components/label/Box.vue @@ -123,7 +123,7 @@ export default { if (this.bWidth < 80) { return this.bWidth + 5 } else { - console.log("Length: ", this.bContent.length) + return Math.max(80, (this.bContent.length) * 8 + 7) } }, diff --git a/frontend/components/label/Label.vue b/frontend/components/label/Label.vue index c187308b53ad919b85720004360b0ea432d97d17..0851304d974389d8c194cd5e3520637d6b1a61d9 100644 --- a/frontend/components/label/Label.vue +++ b/frontend/components/label/Label.vue @@ -152,7 +152,7 @@ export default { this.timer = setTimeout(async () => { await this.getAllImagesWithLabelStatus() this.callGetImagesRepeatedly() - }, 5000) + }, 20000) } }, async getAllImages(perPage, page, keyword) { @@ -217,7 +217,7 @@ export default { } return response.data.status } catch (error) { - console.log("Label" , error) + console.error(error) throw error } }, diff --git a/frontend/components/root/Navbar.vue b/frontend/components/root/Navbar.vue index bfae4b4cb665e7c35ebb0003dba26c3332e4d96a..0fa5a0e8256e5058585da2e8da851ea757ff95d3 100644 --- a/frontend/components/root/Navbar.vue +++ b/frontend/components/root/Navbar.vue @@ -182,8 +182,8 @@ export default { }, watch: { activeElmtID (newElmtID, oldElmtID) { - console.log("newElmtID: ", newElmtID) - console.log("oldElmtID: ", oldElmtID) + + this.setClass(oldElmtID, '') this.setClass(newElmtID, 'active') } @@ -191,7 +191,7 @@ export default { mounted () { this.onPathChangeHandler(window.location.pathname) // this.activeElmtID = 'label-dataset' - // console.log(/^\/main\/label(\/|(\?)|$)/.test(window.location.pathname)) + // }, methods: { setClass (elmtID, className) { @@ -244,7 +244,7 @@ export default { }, onPathChangeHandler (browserURL) { var elmtID = '' - console.log("Browser: ", browserURL) + if (((/^\/main\/output-view(\/|(\?)|$)/.test(browserURL)))) { var type = this.$route.query.type if (type === 'xml') { diff --git a/frontend/components/view/Suggest.vue b/frontend/components/view/Suggest.vue index 4216d74f56816cbdd66bdb25fef33629cff2b4cd..fbc717fb8890c13e23018f888043933ec89ae3bb 100644 --- a/frontend/components/view/Suggest.vue +++ b/frontend/components/view/Suggest.vue @@ -69,9 +69,6 @@ export default { }) }, methods: { - showInput (event) { - console.log("event: ", event) - }, disableForm() { this.isDisabled = true this.$refs["form"].isInFocus = false diff --git a/frontend/middleware/auth.js b/frontend/middleware/auth.js index 82fcaf1c36b4e59abdda90ac46c93b76de1db2ab..1af583c5e7b1462f3db36d9929892d166753a305 100644 --- a/frontend/middleware/auth.js +++ b/frontend/middleware/auth.js @@ -7,7 +7,7 @@ export default async function ({ req, route, redirect, store, $axios }) { var userData = await getUserInfo({ req, $axios }) var isUserLoggedIn = !!userData - console.log("userData: ", userData) + // Then test the url var urlRequiresNonAuth = route.fullPath === '/' diff --git a/frontend/mixins/image/getAllLabeledImages.js b/frontend/mixins/image/getAllLabeledImages.js index 301eb469d37b2624bd25d53745d770d0d9237701..75a3b6bc5dedfbfca1899ced6acf760a7aaab5b0 100644 --- a/frontend/mixins/image/getAllLabeledImages.js +++ b/frontend/mixins/image/getAllLabeledImages.js @@ -8,7 +8,7 @@ export default { async getAllLabeledImages () { //Get All Images var url = '/api/label' - var response = await this.$axios(url).catch(error => console.log(error)) + var response = await this.$axios(url).catch(error => console.error(error)) if (response && response.status === 200) { return response.data.data } else { @@ -18,7 +18,7 @@ export default { async getAllImages () { //Get All Images var url = '/api/image/?PerPage=9999999999&Page=1' - var response = await this.$axios(url).catch(error => console.log(error)) + var response = await this.$axios(url).catch(error => console.error(error)) if (response && response.status === 200) { return response.data.data.images } else { @@ -29,8 +29,8 @@ export default { async mounted () { var labeled = await this.getAllLabeledImages() var allImg = await this.getAllImages() - console.log("label: ", labeled) - console.log("allImg: ", allImg) + + var labeledImageID = [] if (labeled && allImg) { //Get Uniqe All of Labeled Image ID diff --git a/frontend/mixins/outputs/datasetMethods.js b/frontend/mixins/outputs/datasetMethods.js index c908336e4273516ccf7861cdb37347e9403a696d..78dcae98d11bb8961ebb2a15cbef9a47906a402e 100644 --- a/frontend/mixins/outputs/datasetMethods.js +++ b/frontend/mixins/outputs/datasetMethods.js @@ -19,7 +19,7 @@ export default { }, handleOnEmpty (isEmpty) { this.empty = isEmpty - console.log("this empty: ", this.empty) + } } } \ No newline at end of file diff --git a/frontend/mixins/outputs/imageAndLabelMethods.js b/frontend/mixins/outputs/imageAndLabelMethods.js index de96d5f78457d847c5e1e7b8a02e08c3aa497997..b5a8b224ae7a44f86ebf95640189f61d955ea862 100644 --- a/frontend/mixins/outputs/imageAndLabelMethods.js +++ b/frontend/mixins/outputs/imageAndLabelMethods.js @@ -2,7 +2,7 @@ export default { methods: { async getLabelContentByID (contentID) { var url = '/api/content/' + contentID - var response = await this.$axios(url).catch(error => console.log(error)) + var response = await this.$axios(url).catch(error => console.error(error)) if (response && response.status === 200) { return response.data.data } else { @@ -11,7 +11,7 @@ export default { }, async getAllLabel(){ var url = '/api/label' - var response = await this.$axios(url).catch(error => console.log(error)) + var response = await this.$axios(url).catch(error => console.error(error)) if (response && response.status === 200) { return response.data.data } else { @@ -20,7 +20,7 @@ export default { }, async getLabelByImageID (imageID) { var url = '/api/label/imagequery/' + imageID - var response = await this.$axios(url).catch(error => console.log(error)) + var response = await this.$axios(url).catch(error => console.error(error)) if (response && response.status === 200) { return response.data.data } else { diff --git a/frontend/mixins/user-management/getAllUsers.js b/frontend/mixins/user-management/getAllUsers.js index 760e5e7411bc1f7cbbad3becc67bfb6b1cc280ad..803c944616a13250af7114d93539a23e6b0e01c7 100644 --- a/frontend/mixins/user-management/getAllUsers.js +++ b/frontend/mixins/user-management/getAllUsers.js @@ -8,7 +8,7 @@ export default { async getAllUsers () { var url = '/api/user' var response = await this.$axios(url).catch(error => console.error(error)) - console.log("response: ", response) + if (response && response.status === 200) { return response.data.data } else { diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue index 21020ad795ebe90131011eee59fed54c0cf72533..90bb66311ec032ae3679c98bf58c1f51bcc40661 100644 --- a/frontend/pages/index.vue +++ b/frontend/pages/index.vue @@ -102,7 +102,7 @@ export default { } var url = '/api/user/login' const response = await this.$axios.post(url, payload).catch(error => console.error(error)) - console.log("Response: ", response) + this.handleResponse(response) } else { this.usernameForm.isDirty = true @@ -119,7 +119,7 @@ export default { handleSuccessResponse (response) { // Set cookie cookies.remove('Authorization') - console.log('Authorization', response.data.data.cookie) + cookies.set('Authorization', response.data.data.cookie) this.$router.push('/main/label') }, diff --git a/frontend/pages/main/add-user.vue b/frontend/pages/main/add-user.vue index f5288b764ba9d5e9029b057abf9906018763a371..6528589afa65a91b42e75aa698635dfc62002022 100644 --- a/frontend/pages/main/add-user.vue +++ b/frontend/pages/main/add-user.vue @@ -92,7 +92,7 @@ export default { } var url = '/api/user/register' // Send to backend - var response = await this.$axios.post(url, payload).catch(error => console.log(error)) + var response = await this.$axios.post(url, payload).catch(error => console.error(error)) if (response && response.status === 200) { this.showInfo(this.username, response.data.data.passcode) } else { diff --git a/frontend/pages/main/output-view/index.vue b/frontend/pages/main/output-view/index.vue index 866234c7d92a6ee3757d6d53c04491355d2d0bd6..0b9728c221674c8c8db97e9a26711a7bdfe06b1b 100644 --- a/frontend/pages/main/output-view/index.vue +++ b/frontend/pages/main/output-view/index.vue @@ -145,8 +145,8 @@ export default { } else { this.json = await this.getPascalXMLPerImage() - console.log("XML AWAIT: ", this.json) - console.log("CONVERT: ", this.convertToXML(this.json)) + + filename += '.xml' element.setAttribute('href', 'data:text/json;charset=utf-8,' + encodeURIComponent(this.convertToXML(this.json))) } @@ -167,15 +167,15 @@ export default { format(){ var xml = this.convertToXML(this.json) xml = xml.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/ /g, ' ').replace(/\n/g,'<br />') - // console.log("xml: ", this.json) + // // var xml = this.convertToXML(this.json) var mydiv = document.getElementById("xml") if (mydiv) { - console.log("1") + mydiv.innerHTML += xml - console.log("2") + } - console.log("3") + } } } diff --git a/frontend/pages/main/upload.vue b/frontend/pages/main/upload.vue index 531f1e198ea1c2014d326458b5cf848b973d7fdf..890fb2ba31b5a555132784b497a82a1653dfc442 100644 --- a/frontend/pages/main/upload.vue +++ b/frontend/pages/main/upload.vue @@ -70,7 +70,7 @@ export default { mounted(){ var instance = this.$refs.myDropzone.dropzone this.files = instance.files - console.log("files",this.files) + }, methods:{ changeDataset (newDataset) { @@ -89,7 +89,7 @@ export default { }, onFileSelected(event){ this.files = event.target.files - console.log("masuk",this.files) + }, removeAllFiles(){ this.files = this.$refs.myDropzone.getAcceptedFiles() @@ -130,7 +130,7 @@ export default { onOpen: () => { this.$swal.stopTimer() Array.from(this.files).forEach(file =>{ - console.log("Size: ",file.dataURL) + if(this.upload(file, file.name)){ count += 1 } @@ -146,7 +146,7 @@ export default { } }) if(count === total){ - console.log("Uploaded : ", count) + this.$swal.resumeTimer() } } @@ -170,7 +170,7 @@ export default { } } }) - console.log("size total: ",size) + } }) }, @@ -184,7 +184,7 @@ export default { const config = { headers: {'Content-Type':'multipart/form-data'} } - var response = await this.$axios.post(url, formData, config).catch(error => console.log(error)) + var response = await this.$axios.post(url, formData, config).catch(error => console.error(error)) return(response && response.status === 200) }, dataURItoBlob(dataURI) { diff --git a/frontend/pages/viewer/index-edit.vue b/frontend/pages/viewer/index-edit.vue index 29304839e2015e3bfc8ef13616b168c1e57e4761..5b7a6d003115f534c45451f4914ebda1a4f813b3 100644 --- a/frontend/pages/viewer/index-edit.vue +++ b/frontend/pages/viewer/index-edit.vue @@ -179,7 +179,7 @@ export default { }, async drawAllBox () { var allLabels = await this.getAllLabels() - console.log(allLabels) + if (allLabels) { var labeledCount = Object.keys(allLabels).length var imageAttributes = { @@ -191,7 +191,7 @@ export default { while(labeledCount > this.labelCount){ this.previouslyCreatedBox[this.labelCount + 1] = allLabels[this.labelCount].label_id var contentName = await this.getContentName(allLabels[this.labelCount].label_content_id) - console.log(contentName) + var screenImagesAttr = this.getScreenAttributes(imageAttributes, allLabels[this.labelCount].label_width, allLabels[this.labelCount].label_height, allLabels[this.labelCount].label_x_center, allLabels[this.labelCount].label_y_center) let newBox = { width: screenImagesAttr.width, @@ -204,20 +204,20 @@ export default { this.labelCount++ this.boxes[this.labelCount] = newBox this.boxesCount++ - // console.log(newBox.content) + // this.changeBoxContent(newBox.content, this.labelCount) // this.makeCurrentBoxActive(this.labelCount) this.resetDrawingBox() } } - console.log("ANJAAY", this.boxes) - console.log("ANJJJAY2", this.previouslyCreatedBox) + + }, async closeViewer () { try { await this.deleteImageAccessControlByImageID(this.image.id) } catch (error) { - console.log(error) + console.error(error) } clearInterval(this.timer) this.$router.push({ path: '/main/edit', query: {dataset: this.dataset }}) @@ -228,7 +228,7 @@ export default { var response = await this.$axios.delete(url) return response.data.status } catch (error) { - console.log("Label" , error) + console.error(error) throw error } }, @@ -240,7 +240,7 @@ export default { } }, startDrawingBox (e) { - console.log("Event: ", e) + this.drawingBox = { width: 0, height: 0, @@ -261,17 +261,17 @@ export default { this.boxes[idxBox].top = attribute.bTop this.boxes[idxBox].width = attribute.bWidth this.boxes[idxBox].height = attribute.bHeight - console.log("idxBox: ", this.boxes[idxBox]) + }, makeCurrentBoxActive (activeBoxIndex) { this.activeBoxIndex = activeBoxIndex }, deleteBox (index) { - console.log("DELETED BOXES", this.boxes[index]) - console.log("DEL BOX KEY", Object.keys(this.boxes)[index-1]) + + this.deletedBoxesCount++ this.deletedBoxKey[this.deletedBoxesCount] = this.boxes[index].label_id - console.log("DEL ALL KEY", this.deletedBoxKey) + this.deletedBoxes[this.deletedBoxesCount] = this.boxes[index] delete this.boxes[index] this.activeBoxIndex = -1 @@ -326,17 +326,11 @@ export default { realHeight: this.$refs.image.naturalHeight } const imagePosition = this.getImagePositionRelativeToScreen(imageAttributes) - console.log('GOGIGU SAVE', this.previouslyCreatedBox) if(this.boxesCount > countBox) { for (let delKey in this.deletedBoxes) { - console.log("AGHUY" + delKey) + if (delKey == Object.keys(this.deletedBoxKey)[delKey - 1 - move] ) { - // delete - console.log("DELETE" + (delKey)) - console.log("BOX YG DIDELETED", this.deletedBoxes[delKey]) try { - console.log('BACKEND') - console.log(Object.values(this.deletedBoxKey)[delKey - 1 - move]) await this.deleteLabelsInImage(Object.values(this.deletedBoxKey)[delKey - 1 - move]) } catch (error) { this.showFailedAlert("Error!", error) @@ -346,18 +340,13 @@ export default { if(Object.keys(this.previouslyCreatedBox)[prevKey] == Object.keys(this.deletedBoxKey)[delKey]) { delete this.previouslyCreatedBox[Object.keys(this.deletedBoxKey)[prevKey]] } - console.log(this.previouslyCreatedBox) } } } } for (let key in this.boxes) { - console.log("EDITTT", key, this.boxes[key]) if (key == Object.keys(this.previouslyCreatedBox)[key - 1 - move] ) { - console.log('key', key) - console.log('prevs', Object.keys(this.previouslyCreatedBox)[key - 1 - move] ) - console.log('PUT' + (key - 1)) // edit boxPosition = this.getBoxPositionRelativeToImage(imagePosition, key, this.boxes) bWidth = this.boxes[key].width @@ -375,9 +364,6 @@ export default { label_content_id: content_id } labelPutPayload.push(singleBackendObj) - console.log('labelPayload: ', labelPutPayload[0]) - console.log('BACKEND') - console.log(Object.values(this.previouslyCreatedBox)[key - 1 - move]) await this.changeLabelsInImage(labelPutPayload[0], Object.values(this.previouslyCreatedBox)[key - 1 - move]) } catch (error) { this.showFailedAlert("Error!", error) @@ -386,14 +372,9 @@ export default { delete this.previouslyCreatedBox[Object.keys(this.previouslyCreatedBox)[key - 1 - move]] move++ labelPutPayload.pop() - console.log(this.previouslyCreatedBox) + } else { - console.log('key', key) - console.log('prevs', Object.keys(this.previouslyCreatedBox)[key - 1] ) - console.log('POST' + (key-1)) tempArray.push(this.boxes[key]) - console.log('huyhuy',this.boxes[key]) - console.log("asdasd", tempArray[(key - 1)]) } } // push new label @@ -415,29 +396,22 @@ export default { label_content_id: content_id } labelPayload.push(singleBackendObj) - console.log('labelPayload: ', labelPayload) } catch (error) { this.showFailedAlert("Error!", error) return } } try { - console.log("LABEL PAYLOAD: ", labelPayload) await this.createAllLabelsInImage(labelPayload) this.showSuccessAlert("Success!", "Image has been saved!").then(() => { this.closeViewer() }) } catch (error) { - console.log(error) + console.error(error) this.showFailedAlert("Error!", error) return } } else { - console.log("ALL DELETED BOXES", this.deletedBoxes) - console.log("BOX COUNT lenght:", this.boxesCount) - console.log("COUNT DELETED BOX", countBox) - console.log("BOX COUNT", this.boxes) - console.log("PREV COUNT", this.previouslyCreatedBox) this.showSuccessAlert("Success!", "Image has been saved!").then(() => { this.closeViewer() }) @@ -532,7 +506,7 @@ export default { var content_id = response.data.data['label_contents_id'] return content_id } catch (error) { - console.log("Content: ", error) + console.error(error) throw error } }, @@ -542,29 +516,28 @@ export default { var response = await this.$axios.post(url, labelPayload) return response.data.status } catch (error) { - console.log("Label" , error) + console.error(error) throw error } }, async changeLabelsInImage (labelPayload, id) { var url ='api/label/' + id - console.log(id) try { var response = await this.$axios.put(url, labelPayload) return response.data.status } catch (error) { - console.log('Edit Label', error) + console.error(error) throw error } }, async deleteLabelsInImage (id) { var url ='api/label/' + id - console.log(id) + try { var response = await this.$axios.delete(url) return response.data.status } catch (error) { - console.log('Delete Label', error) + console.error(error) throw error } } diff --git a/frontend/pages/viewer/index.vue b/frontend/pages/viewer/index.vue index 44b648792aae7095bb662b97e2e901baf8a25903..3c572f951e813305ea0081230c61aba4af54e2c9 100644 --- a/frontend/pages/viewer/index.vue +++ b/frontend/pages/viewer/index.vue @@ -151,7 +151,7 @@ export default { try { await this.deleteImageAccessControlByImageID(this.image.id) } catch (error) { - console.log(error) + console.error(error) } clearInterval(this.timer) this.$router.push({ path: '/main/label', query: {dataset: this.dataset }}) @@ -262,7 +262,7 @@ export default { await this.closeViewer() }) } catch (error) { - console.log(error) + console.error(error) this.showFailedAlert("Error!", error) return } @@ -341,7 +341,7 @@ export default { var content_id = response.data.data['label_contents_id'] return content_id } catch (error) { - console.log("Content: ", error) + console.error(error) throw error } }, @@ -351,7 +351,7 @@ export default { var response = await this.$axios.post(url, labelPayload) return response.data.status } catch (error) { - console.log("Label" , error) + console.error(error) throw error } }, @@ -361,7 +361,7 @@ export default { var response = await this.$axios.delete(url) return response.data.status } catch (error) { - console.log("Label" , error) + console.error(error) throw error } }