Skip to content
Snippets Groups Projects
Commit 7332975a authored by Eka Sunandika's avatar Eka Sunandika
Browse files

can delete but still have bug

parent d4e3ba48
Branches
Tags
3 merge requests!40Release First Version,!37Feature delete,!21Add dockerize
Pipeline #24544 passed with stage
in 11 minutes and 51 seconds
// Environment Variables // Environment Variables
// For development // For development
export const backendURL = "http://192.168.1.5:8081" export const backendURL = "http://localhost:3000"
export const frontendURL = 'http://0.0.0.0:3000/' export const frontendURL = 'http://localhost:6969/'
// For deployment // For deployment
// export const backendURL = "http://api....." // export const backendURL = "http://api....."
......
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
baseURL: backendURL baseURL: backendURL
}, },
server: { server: {
port: 3000, // default: 3000 port: 6969, // default: 3000
host: '0.0.0.0' // default: localhost host: '0.0.0.0' // default: localhost
}, },
/* /*
......
This diff is collapsed.
...@@ -19,9 +19,12 @@ ...@@ -19,9 +19,12 @@
"debounce": "^1.2.0", "debounce": "^1.2.0",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"nuxt": "^2.0.0", "nuxt": "^2.0.0",
"vue-dynamic-dropdown": "^1.0.12",
"vue-json-viewer": "^2.2.11",
"vue-simple-suggest": "^1.10.1", "vue-simple-suggest": "^1.10.1",
"vue-sweetalert2": "^3.0.1", "vue-sweetalert2": "^3.0.1",
"vue2-dropzone": "^3.6.0" "vue2-dropzone": "^3.6.0",
"xml-js": "^1.6.11"
}, },
"devDependencies": { "devDependencies": {
"@vue/test-utils": "^1.0.0-beta.27", "@vue/test-utils": "^1.0.0-beta.27",
......
...@@ -105,7 +105,11 @@ export default { ...@@ -105,7 +105,11 @@ export default {
timer: '', timer: '',
previouslyCreatedBox: {}, previouslyCreatedBox: {},
dataReady: true, dataReady: true,
isEdited: false isEdited: false,
boxesCount: 0,
deletedBoxesCount: 0,
deletedBoxes: {},
deletedBoxKey: {}
} }
}, },
async created () { async created () {
...@@ -192,17 +196,19 @@ export default { ...@@ -192,17 +196,19 @@ export default {
height: screenImagesAttr.height, height: screenImagesAttr.height,
left: screenImagesAttr.left, left: screenImagesAttr.left,
top: screenImagesAttr.top, top: screenImagesAttr.top,
content: contentName content: contentName,
label_id: allLabels[this.labelCount].label_id
} }
this.labelCount++ this.labelCount++
this.boxes[this.labelCount] = newBox this.boxes[this.labelCount] = newBox
this.boxesCount++
// console.log(newBox.content) // console.log(newBox.content)
this.changeBoxContent(newBox.content, this.labelCount) this.changeBoxContent(newBox.content, this.labelCount)
// this.makeCurrentBoxActive(this.labelCount) // this.makeCurrentBoxActive(this.labelCount)
this.resetDrawingBox() this.resetDrawingBox()
} }
console.log(this.boxes) console.log("ANJAAY", this.boxes)
console.log(this.previouslyCreatedBox) console.log("ANJJJAY2", this.previouslyCreatedBox)
}, },
async closeViewer () { async closeViewer () {
try { try {
...@@ -258,6 +264,12 @@ export default { ...@@ -258,6 +264,12 @@ export default {
this.activeBoxIndex = activeBoxIndex this.activeBoxIndex = activeBoxIndex
}, },
deleteBox (index) { 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] delete this.boxes[index]
this.activeBoxIndex = -1 this.activeBoxIndex = -1
}, },
...@@ -302,6 +314,7 @@ export default { ...@@ -302,6 +314,7 @@ export default {
var content_id var content_id
var singleBackendObj var singleBackendObj
var move = 0 var move = 0
var countBox = Object.keys(this.boxes).length
var imageAttributes = { var imageAttributes = {
screenWidth: this.$refs.image.clientWidth, screenWidth: this.$refs.image.clientWidth,
screenHeight: this.$refs.image.clientHeight, screenHeight: this.$refs.image.clientHeight,
...@@ -309,9 +322,34 @@ export default { ...@@ -309,9 +322,34 @@ export default {
realHeight: this.$refs.image.naturalHeight realHeight: this.$refs.image.naturalHeight
} }
const imagePosition = this.getImagePositionRelativeToScreen(imageAttributes) const imagePosition = this.getImagePositionRelativeToScreen(imageAttributes)
console.log('GOGIGU', this.previouslyCreatedBox) 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)
return
}
for (let prevKey in this.previouslyCreatedBox) {
if(Object.keys(this.previouslyCreatedBox)[prevKey] == Object.keys(this.deletedBoxKey)[delKey]) {
delete this.previouslyCreatedBox[Object.keys(this.deletedBoxKey)[prevKey - 1]]
}
console.log(this.previouslyCreatedBox)
}
}
}
}
for (let key in this.boxes) { for (let key in this.boxes) {
console.log(key, this.boxes[key]) console.log("EDITTT", key, this.boxes[key])
if (key == Object.keys(this.previouslyCreatedBox)[key - 1 - move] ) { if (key == Object.keys(this.previouslyCreatedBox)[key - 1 - move] ) {
console.log('key', key) console.log('key', key)
console.log('prevs', Object.keys(this.previouslyCreatedBox)[key - 1 - move] ) console.log('prevs', Object.keys(this.previouslyCreatedBox)[key - 1 - move] )
...@@ -391,6 +429,11 @@ export default { ...@@ -391,6 +429,11 @@ export default {
return return
} }
} else { } 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.showSuccessAlert("Success!", "Image has been saved!").then(() => {
this.closeViewer() this.closeViewer()
}) })
...@@ -509,9 +552,21 @@ export default { ...@@ -509,9 +552,21 @@ export default {
console.log('Edit Label', error) console.log('Edit Label', error)
throw 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)
throw error
}
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment