Feature/vue diplo
Merge request reports
Activity
added Story label
added 38 commits
Toggle commit list22 22 this.save = !this.save; 23 23 }.bind(this), 1000); 24 24 }, 25 editNext() { 25 editNext(ev) { 26 26 ev.preventDefault(); 27 // TODO 28 console.log("call editableContent",this.$parent); 27 index = this.part.lines.indexOf(this.editLine); 28 if(index < this.part.lines.length - 1) { 29 this.editLine = this.part.lines[index + 1]; 30 let next = this.$children[index +1].$el.firstElementChild.lastChild; 31 let elt = $("#"+this.editLine.pk); 32 console.log("elt",elt); 33 elt.focus(); changed this line in version 4 of the diff
added 2 commits
added 2 commits
- Resolved by EL HASSANE GARGEM
added 12 commits
- c9af6441 - fix content encoding
- 3190ba24 - fix save call
- f40e1472 - add onpaste
- 9fa966d6 - paste content
- d65b7e65 - diplo panel style
- f179a31d - draggable events
- f7533bf3 - drag n drop lines
- 0681209f - drop with line not order
- 6ebad669 - re order line
- 9a88c5f3 - move line
- e6eacca0 - event move line
- 5078aa3a - enhancement on paste content
Toggle commit listadded 2 commits
added 53 commits
-
6bab5876...9abfa1f8 - 52 commits from branch
develop
- d6c9d2b6 - fix conflocts
-
6bab5876...9abfa1f8 - 52 commits from branch
262 263 @action(detail=False, methods=['PUT']) 264 def bulk_update(self, request, document_pk=None, part_pk=None, pk=None): 265 lines = request.data.get("lines") 266 for line in lines: 267 lt = get_object_or_404(LineTranscription, pk=line["pk"]) 268 serializer = LineTranscriptionSerializer(lt, data=line, partial=True) 269 serializer.is_valid(raise_exception=True) 270 serializer.save() 271 return Response({'response': 'ok'}, status=200) 272 273 @action(detail=False, methods=['POST']) 274 def bulk_delete(self, request, document_pk=None, part_pk=None, pk=None): 275 lines = request.data.get("lines") 276 qs = LineTranscription.objects.filter(pk__in=lines) 277 qs.delete() changed this line in version 12 of the diff
5 this.timeZone = moment.tz.guess(); 6 }, 7 methods: { 8 setEdit(ev) { 9 this.editing = ev.target; 10 11 }, 12 editableContent(ev) { 13 if (this.editing && ev.target == this.editing) 14 this.editing.setAttribute('contenteditable', true); 15 ev.target.focus(); 16 this.$parent.setEditLine(this.line); 17 }, 18 pushUpdate(){ 19 20 clearTimeout(timer); changed this line in version 15 of the diff
24 this.line.transcription.content = this.$refs.content[0].textContent; 25 this.addToList(); 26 // call save of parent method 27 this.$parent.toggleSave(); 28 }.bind(this), 1000); 29 30 }, 31 pushNewVersion(){ 32 33 }, 34 setContent(content){ 35 let id = this.line.pk; 36 $("#" + id).text(content); 37 this.line.transcription.content = content; 38 }, 39 onPast(e) { changed this line in version 12 of the diff
16 this.$parent.setEditLine(this.line); 17 }, 18 pushUpdate(){ 19 20 clearTimeout(timer); 21 timer = setTimeout(function (){ 22 23 //set content of input to line content 24 this.line.transcription.content = this.$refs.content[0].textContent; 25 this.addToList(); 26 // call save of parent method 27 this.$parent.toggleSave(); 28 }.bind(this), 1000); 29 30 }, 31 pushNewVersion(){ changed this line in version 12 of the diff
72 elt.version_updated_at = lt.version_updated_at; 73 } 74 }, 75 dragStart(line,ev){ 76 ev.dataTransfer.setData('Text', "#diplomatic-lines"); 77 ev.target.style.border = 'solid #33A2FF'; 78 ev.dataTransfer.dropEffect = 'move'; 79 let index = this.part.lines.indexOf(line); 80 this.dragging = index; 81 // console.log("draaag start",index); 82 }, 83 dragEnd(){ 84 this.dragging = -1; 85 86 }, 87 dragLeave(){ changed this line in version 12 of the diff