Browse Source

[FIX][12.0] web_timeline: Scroll Issue.

12.0^2
HemanginiPatel 6 years ago
committed by OCA-git-bot
parent
commit
2b009c7a46
  1. 1
      web_timeline/README.rst
  2. 1
      web_timeline/readme/CONTRIBUTORS.rst
  3. 32
      web_timeline/static/src/css/web_timeline.css
  4. 11
      web_timeline/static/src/js/timeline_renderer.js

1
web_timeline/README.rst

@ -183,6 +183,7 @@ Contributors
* Leonardo Donelli <donelli@webmonks.it> * Leonardo Donelli <donelli@webmonks.it>
* Adrien Didenot <adrien.didenot@horanet.com> * Adrien Didenot <adrien.didenot@horanet.com>
* Dennis Sluijk <d.sluijk@onestein.nl> * Dennis Sluijk <d.sluijk@onestein.nl>
* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
Other credits Other credits
~~~~~~~~~~~~~ ~~~~~~~~~~~~~

1
web_timeline/readme/CONTRIBUTORS.rst

@ -4,3 +4,4 @@
* Leonardo Donelli <donelli@webmonks.it> * Leonardo Donelli <donelli@webmonks.it>
* Adrien Didenot <adrien.didenot@horanet.com> * Adrien Didenot <adrien.didenot@horanet.com>
* Dennis Sluijk <d.sluijk@onestein.nl> * Dennis Sluijk <d.sluijk@onestein.nl>
* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>

32
web_timeline/static/src/css/web_timeline.css

@ -29,3 +29,35 @@
left: 0px; left: 0px;
top: 0px; top: 0px;
} }
.vis-labelset {
position: relative;
width: 100%;
height: 100%;
overflow: visible !important;
}
.vis-labelset .vis-label:first-child {
background: lightgrey;
position: sticky;
top: 0px !important;
z-index: 999;
max-height: 100px;
height: 100px !important;
display: -webkit-flex;
}
.vis-foreground .vis-group:first-child {
background: lightgrey;
position: sticky;
top: 0px !important;
z-index: 999;
max-height: 100px;
height: 100px !important;
display: -webkit-flex;
overflow: auto;
}
.vis-background .vis-group:nth-child(2) .vis-line{
display:none !important;
}

11
web_timeline/static/src/js/timeline_renderer.js

@ -210,7 +210,10 @@ odoo.define('web_timeline.TimelineRenderer', function (require) {
onAdd: self.on_add, onAdd: self.on_add,
onMove: self.on_move, onMove: self.on_move,
onUpdate: self.on_update, onUpdate: self.on_update,
onRemove: self.on_remove
onRemove: self.on_remove,
horizontalScroll: false,
verticalScroll:true,
zoomKey: 'ctrlKey',
}); });
this.qweb = new QWeb(session.debug, {_s: session.origin}, false); this.qweb = new QWeb(session.debug, {_s: session.origin}, false);
if (this.arch.children.length) { if (this.arch.children.length) {
@ -223,6 +226,12 @@ odoo.define('web_timeline.TimelineRenderer', function (require) {
} }
this.timeline = new vis.Timeline(self.$timeline.empty().get(0)); this.timeline = new vis.Timeline(self.$timeline.empty().get(0));
$(this.timeline.dom.leftContainer).scroll(function() {
var hei = ($('.vis-foreground .vis-group:first-child')[0].style.height).split("px");
var itemset_height = ($('.vis-itemset')[0].style.height).split("px");
var new_height = parseInt(itemset_height[0]) - (parseInt(hei[0]) - 100)
$('.vis-itemset').css('height', new_height)
});
this.timeline.setOptions(this.options); this.timeline.setOptions(this.options);
if (self.mode && self['on_scale_' + self.mode + '_clicked']) { if (self.mode && self['on_scale_' + self.mode + '_clicked']) {
self['on_scale_' + self.mode + '_clicked'](); self['on_scale_' + self.mode + '_clicked']();

Loading…
Cancel
Save