← Back to branch summary

~openerp-dev/openerp-web/trunk-widget-tooltip-mba

« back to all changes in this revision

Viewing changes to addons/web_calendar/static/src/js/web_calendar.js

  • Committer: Gery Debongnie
  • Date: 2014-05-02 12:33:55 UTC
  • mfrom: (3910.1.92 trunk)
  • mto: (3910.1.93 web)
  • mto: This revision was merged to the branch mainline in revision 3944.
  • Revision ID: ged@openerp.com-20140502123355-9dqpwq1g9rrpisxj
[MERGE] merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/web_calendar/static/src/js/web_calendar.js
11
11
};
12
12
 
13
13
openerp.web_calendar = function(instance) {
14
 
 
15
14
    var _t = instance.web._t,
16
15
        _lt = instance.web._lt,
17
16
        QWeb = instance.web.qweb;
197
196
            } else {
198
197
                this.avatar_title = attrs.avatar_title;
199
198
            }
 
199
 
 
200
            if (isNullOrUndef(attrs.avatar_filter)) {
 
201
                this.avatar_filter = this.avatar_model;
 
202
            } else {
 
203
                this.avatar_filter = attrs.avatar_filter;
 
204
            }
 
205
 
200
206
            this.color_field = attrs.color;
201
207
 
202
208
            if (this.color_field && this.selected_filters.length === 0) {
578
584
                                    if (!self.colorIsAttendee || the_attendee_people != temp_ret[self.color_field]) {
579
585
                                            tempColor = (self.all_filters[the_attendee_people] !== undefined) 
580
586
                                                        ? self.all_filters[the_attendee_people].color
581
 
                                                        : self.all_filters[-1].color;
 
587
                                                        : (self.all_filters[-1] ? self.all_filters[-1].color : 1);
582
588
                                        the_title_avatar += '<i class="fa fa-user attendee_head color_'+tempColor+'" title="' + self.all_attendees[the_attendee_people] + '" ></i>';
583
589
                                    }//else don't add myself
584
590
                                }
701
707
                        }
702
708
                        
703
709
                        if (!self.useContacts) {  // If we use all peoples displayed in the current month as filter in sidebars
704
 
                                                        
705
710
                            var filter_value;
706
711
                            var filter_item;
707
712
                            
714
719
                                        value: filter_value,
715
720
                                        label: e[self.color_field][1],
716
721
                                        color: self.get_color(filter_value),
717
 
                                        avatar_model: self.avatar_model,
 
722
                                        avatar_model: (_.str.toBoolElse(self.avatar_filter, true) ? self.avatar_filter : false ),
718
723
                                        is_checked: true
719
724
                                    };
720
725
                                    self.all_filters[e[self.color_field][0]] = filter_item;
735
740
                                    return null;
736
741
                                });
737
742
                            }
738
 
                            return self.perform_necessary_name_gets(events).then(callback);
 
743
                            
739
744
                        }
740
745
                        else { //WE USE CONTACT
741
746
                            if (self.attendee_people !== undefined) {
752
757
                                }
753
758
                            }
754
759
 
755
 
                            var all_attendees = $.map(events, function (e) { return e[self.attendee_people]; });
756
 
                            all_attendees = _.chain(all_attendees).flatten().uniq().value();
757
 
 
758
 
                            self.all_attendees = {};
759
 
                            if (self.avatar_title !== null) {
760
 
                                new instance.web.Model(self.avatar_title).query(["name"]).filter([["id", "in", all_attendees]]).all().then(function(result) {
761
 
                                    _.each(result, function(item) {
762
 
                                        self.all_attendees[item.id] = item.name;
763
 
                                    });
764
 
                                }).done(function() {
765
 
                                    return self.perform_necessary_name_gets(events).then(callback);
766
 
                                });
767
 
                            }
768
 
                            else {
769
 
                                _.each(all_attendees,function(item){
770
 
                                        self.all_attendees[item] = '';
771
 
                                });
 
760
                            
 
761
                        }
 
762
 
 
763
                        var all_attendees = $.map(events, function (e) { return e[self.attendee_people]; });
 
764
                        all_attendees = _.chain(all_attendees).flatten().uniq().value();
 
765
 
 
766
                        self.all_attendees = {};
 
767
                        if (self.avatar_title !== null) {
 
768
                            new instance.web.Model(self.avatar_title).query(["name"]).filter([["id", "in", all_attendees]]).all().then(function(result) {
 
769
                                _.each(result, function(item) {
 
770
                                    self.all_attendees[item.id] = item.name;
 
771
                                });
 
772
                            }).done(function() {
772
773
                                return self.perform_necessary_name_gets(events).then(callback);
773
 
                            }
 
774
                            });
 
775
                        }
 
776
                        else {
 
777
                            _.each(all_attendees,function(item){
 
778
                                    self.all_attendees[item] = '';
 
779
                            });
 
780
                            return self.perform_necessary_name_gets(events).then(callback);
774
781
                        }
775
782
                    });
776
783
                },