Skip to content

Commit

Permalink
[FIX] rental_timeline : fix error when user add/remove filters on tim…
Browse files Browse the repository at this point in the history 
…eline view
  • Loading branch information
@chandni299
chandni299 committed Dec 15, 2023
1 parent bf1bef6 commit 6e60c14
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 70 deletions.
1 change: 1 addition & 0 deletions rental_timeline/models/sale.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ def unlink(self):

@api.multi
def update_start_end_date(self, date_start, date_end):
# update dates
super(SaleOrderLine, self).update_start_end_date(date_start, date_end)
for line in self:
line._reset_timeline(
Expand Down
127 changes: 57 additions & 70 deletions rental_timeline/static/src/js/timeline_renderer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -645,83 +645,70 @@ odoo.define("rental_timeline.RentalTimelineRenderer", function(require) {
group_categ_again++;
}

if (x2x) {
groups = this.groups;
this.selected_groups = this.groups;
this.createSelectGroups();
} else {
if (typeof this.$select_groups !== "undefined") {
this.$(".selected-groups").html("");
this.$select_groups.remove();
}
groups = this.split_groups(events, group_bys);

if (group_bys[0] === "partner_id") {
for (let i = 0; i < groups.length; i++) {
data.forEach(item => {
if (!("nestedGroups" in groups[i])) {
// If(item.group === groups[i].id && !_.isEqual(item.evt.partner_id, groups[i].partner_id)){
// if(i +1 < groups.length) {
// for(let j = i +1 ; j < groups.length; j ++) {
// if(!('nestedGroups' in groups[j])) {
// if(_.isEqual(item.evt.product_id, groups[j].product_id)){
// if(_.isEqual(item.evt.partner_id, groups[j].partner_id)) {
// item.original_group = item.group
// item.group = groups[j].id
// }
// }
// }
// }
// }
// } else
if (
item.group !== groups[i].id &&
_.isEqual(
item.evt.product_id,
groups[i].product_id
) &&
_.isEqual(item.evt.partner_id, groups[i].partner_id)
) {
item.group = groups[i].id;
}
if (typeof this.$select_groups !== "undefined") {
this.$(".selected-groups").html("");
this.$select_groups.remove();
}
groups = this.split_groups(events, group_bys);

if (group_bys[0] === "partner_id") {
for (let i = 0; i < groups.length; i++) {
data.forEach(item => {
if (!("nestedGroups" in groups[i])) {
// If(item.group === groups[i].id && !_.isEqual(item.evt.partner_id, groups[i].partner_id)){
// if(i +1 < groups.length) {
// for(let j = i +1 ; j < groups.length; j ++) {
// if(!('nestedGroups' in groups[j])) {
// if(_.isEqual(item.evt.product_id, groups[j].product_id)){
// if(_.isEqual(item.evt.partner_id, groups[j].partner_id)) {
// item.original_group = item.group
// item.group = groups[j].id
// }
// }
// }
// }
// }
// } else
if (
item.group !== groups[i].id &&
_.isEqual(item.evt.product_id, groups[i].product_id) &&
_.isEqual(item.evt.partner_id, groups[i].partner_id)
) {
item.group = groups[i].id;
}
});
}
}
});
}
}

if (group_bys[0] === "order_name") {
for (let i = 0; i < groups.length; i++) {
data.forEach(item => {
if (!("nestedGroups" in groups[i])) {
// If(item.group === groups[i].id && item.evt.order_name !== groups[i].order_name){
// if(i +1 < groups.length) {
// for(let j = i +1 ; j < groups.length; j ++) {
// if( item.evt.order_name === groups[j].order_name && _.isEqual(item.evt.product_id, groups[j].product_id)){
// item.original_group = item.group
// item.group = groups[j].id
// }
// }
// }
// } else
if (
item.group !== groups[i].id &&
_.isEqual(
item.evt.product_id,
groups[i].product_id
) &&
item.evt.order_name === groups[i].order_name
) {
item.group = groups[i].id;
}
if (group_bys[0] === "order_name") {
for (let i = 0; i < groups.length; i++) {
data.forEach(item => {
if (!("nestedGroups" in groups[i])) {
// If(item.group === groups[i].id && item.evt.order_name !== groups[i].order_name){
// if(i +1 < groups.length) {
// for(let j = i +1 ; j < groups.length; j ++) {
// if( item.evt.order_name === groups[j].order_name && _.isEqual(item.evt.product_id, groups[j].product_id)){
// item.original_group = item.group
// item.group = groups[j].id
// }
// }
// }
// } else
if (
item.group !== groups[i].id &&
_.isEqual(item.evt.product_id, groups[i].product_id) &&
item.evt.order_name === groups[i].order_name
) {
item.group = groups[i].id;
}
});
}
}
});
}

groups = new vis.DataSet(groups);
}
this.timeline.setGroups(groups);

groups = new vis.DataSet(groups);
this.timeline.setGroups(groups);
this.timeline.setItems(data);
var mode = !this.mode || this.mode === "fit";
var adjust = _.isUndefined(adjust_window) || adjust_window;
Expand Down

0 comments on commit 6e60c14

Please sign in to comment.