Merge lp:~openerp-dev/openerp-web/trunk-calendar-favorite-meeting-psa into lp:openerp-web

[Paramjit Singh Sahota(OpenERP)]

Hello,

Improved calendar's favorite meeting list and added a input box to directly insert the partner in favorite list and 'X' to remove the partner's name from the favorite meeting list in calendar view.

Related branch: https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-favorite-meeting-psa

Thankz.

[lp:~openerp-dev/openerp-web/trunk-calendar-favorite-meeting-psa]

3958. By Paramjit Singh Sahota(OpenERP) on 2014-03-14

[IMP] Improved code and typo and removed unused class

3959. By Paramjit Singh Sahota(OpenERP) on 2014-03-19

[IMP] Improved code and added m2o inline in calendar view.

3960. By Paramjit Singh Sahota(OpenERP) on 2014-03-19

[MERGE] Merged lp:openerp-web

3961. By Paramjit Singh Sahota(OpenERP) on 2014-03-19

[IMP] Improved code according to inline m2o.

3962. By Paramjit Singh Sahota(OpenERP) on 2014-03-25

[MERGE] MERged lp:openerp-web.

3963. By Paramjit Singh Sahota(OpenERP) on 2014-03-26

[IMP] Improved code
1/. Filters will be visible to the user who has created means users are able to view there own filters only.
2/. The 'X' remove icon is not visible in the filter name of the logined user.

3964. By Paramjit Singh Sahota(OpenERP) on 2014-04-07

[MERGE] Merged lp:openerp-web.

3965. By Pariket Trivedi(OpenERP) on 2014-04-07

[IMP]: clear the m2o input field.

3966. By Paramjit Singh Sahota(OpenERP) on 2014-04-08

[MERGE] Merged lp:openerp-web

3967. By Pariket Trivedi(OpenERP) on 2014-04-09

[IMP]: add style and chnage css.

3968. By Pariket Trivedi(OpenERP) on 2014-04-10

[IMP]: m2o field display after favorite calendar.

3969. By Pariket Trivedi(OpenERP) on 2014-04-11

[MERGE] :latest web

3970. By Pariket Trivedi(OpenERP) on 2014-04-15

[IMP]: close button color lightgray.

3971. By Pariket Trivedi(OpenERP) on 2014-04-15

[IMP]: chnage create contact for get_value methods.

3972. By Pariket Trivedi(OpenERP) on 2014-04-15

[IMP]: clear input box after repeat partner.

3973. By Pariket Trivedi(OpenERP) on 2014-04-16

[MERGE]: lp:openerp-web.

3974. By Pariket Trivedi(OpenERP) on 2014-04-16

[IMP] revert last 2 revision.

3975. By Pariket Trivedi(OpenERP) on 2014-04-16

[IMP]: minor improvement.

3976. By Pariket Trivedi(OpenERP) on 2014-04-22

[IMP]: add Condition for filter visiable only calendar contact

3977. By Pariket Trivedi(OpenERP) on 2014-04-22

[IMP]: minor change in Condition for filter visiable only calendar contact

Unmerged revisions

3977. By Pariket Trivedi(OpenERP) on 2014-04-22

[IMP]: minor change in Condition for filter visiable only calendar contact

3976. By Pariket Trivedi(OpenERP) on 2014-04-22

[IMP]: add Condition for filter visiable only calendar contact

3975. By Pariket Trivedi(OpenERP) on 2014-04-16

[IMP]: minor improvement.

3974. By Pariket Trivedi(OpenERP) on 2014-04-16

[IMP] revert last 2 revision.

3973. By Pariket Trivedi(OpenERP) on 2014-04-16

[MERGE]: lp:openerp-web.

3972. By Pariket Trivedi(OpenERP) on 2014-04-15

[IMP]: clear input box after repeat partner.

3971. By Pariket Trivedi(OpenERP) on 2014-04-15

[IMP]: chnage create contact for get_value methods.

3970. By Pariket Trivedi(OpenERP) on 2014-04-15

[IMP]: close button color lightgray.

3969. By Pariket Trivedi(OpenERP) on 2014-04-11

[MERGE] :latest web

3968. By Pariket Trivedi(OpenERP) on 2014-04-10

[IMP]: m2o field display after favorite calendar.

=== modified file 'addons/web_calendar/static/src/css/web_fullcalendar.css'
--- addons/web_calendar/static/src/css/web_fullcalendar.css	2014-01-10 17:03:33 +0000
+++ addons/web_calendar/static/src/css/web_fullcalendar.css	2014-04-22 09:29:10 +0000
@@ -11,6 +11,27 @@
 .openerp td.oe_calendar_sidebar_container {
   padding: 10px; }
 
+.openerp .oe_calendar_responsible .oe_remove_follower {
+  cursor: pointer;
+  position: absolute;
+  right: 0px;
+  line-height: 20px;
+  color: #D3D3D3; }
+
+.openerp .oe_calendar_all_responsibles .oe_favorite_name {
+  width: 200px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis; }
+
+.openerp .oe_calendar_sidebar .oe_calendar_mini_bottom {
+  margin-bottom: 20px;
+}
+
+.openerp .oe_calendar_sidebar .oe_add_input_box > div > input{
+  width: 200px;
+}
+
 img.attendee_head {
   height: 18px;
   width: 18px; }
@@ -271,5 +292,3 @@
   color: #cd74e6; }
 .openerp .oe_calendar_table .color_24 {
   color: #a47ae2; }
-.openerp .oe_calendar_table .oe_calendar_buttons_add_contact .add_contacts_link_btn {
-  margin-top: 10px; }

=== modified file 'addons/web_calendar/static/src/css/web_fullcalendar.sass'
--- addons/web_calendar/static/src/css/web_fullcalendar.sass	2014-01-10 17:03:33 +0000
+++ addons/web_calendar/static/src/css/web_fullcalendar.sass	2014-04-22 09:29:10 +0000
@@ -53,7 +53,26 @@
 
 .openerp 
     td.oe_calendar_sidebar_container
-        padding: 10px         
+        padding: 10px
+    .oe_calendar_responsible
+        .oe_remove_follower
+            cursor: pointer
+            position: absolute
+            right: 0px
+            line-height: 20px
+            color: #D3D3D3
+    .oe_calendar_all_responsibles
+        .oe_favorite_name
+            width: 200px
+            overflow: hidden
+            white-space: nowrap
+            text-overflow: ellipsis
+    .oe_calendar_sidebar
+        .oe_calendar_mini_bottom
+            margin-bottom: 20px
+    .oe_add_input_box > div > input
+        width: 200px
+
 
 img.attendee_head
     height: 18px
@@ -415,7 +434,3 @@
     
     .color_24
         color: $color24
-        
-    .oe_calendar_buttons_add_contact
-        .add_contacts_link_btn
-            margin-top: 10px    
\ No newline at end of file

=== modified file 'addons/web_calendar/static/src/js/web_calendar.js'
--- addons/web_calendar/static/src/js/web_calendar.js	2014-04-16 15:15:43 +0000
+++ addons/web_calendar/static/src/js/web_calendar.js	2014-04-22 09:29:10 +0000
@@ -313,60 +313,10 @@
                     firstDay: translate.firstDay,
                 });
 
-            
                 if (this.useContacts) {
-                    //Get my Partner ID
-                    
-                    new instance.web.Model("res.users").query(["partner_id"]).filter([["id", "=",this.dataset.context.uid]]).first()
-                        .done(
-                            function(result) {
-                                var sidebar_items = {};
-                                var filter_value = result.partner_id[0];
-                                var filter_item = {
-                                    value: filter_value,
-                                    label: result.partner_id[1] + _lt(" [Me]"),
-                                    color: self.get_color(filter_value),
-                                    avatar_model: self.avatar_model,
-                                    is_checked: true
-                                };
-
-                                sidebar_items[filter_value] = filter_item ;
-                                filter_item = {
-                                        value: -1,
-                                        label: _lt("Everybody's calendars"),
-                                        color: self.get_color(-1),
-                                        avatar_model: self.avatar_model,
-                                        is_checked: false
-                                    };
-                                sidebar_items[-1] = filter_item ;
-                                //Get my coworkers/contacts
-                                new instance.web.Model("calendar.contacts").query(["partner_id"]).filter([["user_id", "=",self.dataset.context.uid]]).all().then(function(result) {
-                                    _.each(result, function(item) {
-                                        filter_value = item.partner_id[0];
-                                        filter_item = {
-                                            value: filter_value,
-                                            label: item.partner_id[1],
-                                            color: self.get_color(filter_value),
-                                            avatar_model: self.avatar_model,
-                                            is_checked: true
-                                        };
-                                        sidebar_items[filter_value] = filter_item ;
-                                    });
-
-                                    self.all_filters = sidebar_items;
-                                    self.now_filter_ids = $.map(self.all_filters, function(o) { return o.value; });
-                                    
-                                    self.sidebar.filter.events_loaded(self.all_filters);
-                                    self.sidebar.filter.set_filters();
-                                                                        
-                                    self.sidebar.filter.addUpdateButton();
-                                }).done(function () {
-                                    self.$calendar.fullCalendar('refetchEvents');
-                                });
-                            }
-                         );
+                    new reload_favorite_list(this);
                 }
-                this.extraSideBar();                
+                this.extraSideBar();
             }
             self.$calendar.fullCalendar(self.get_fc_init_options());
             
@@ -1377,20 +1327,23 @@
 
     instance.web_calendar.Sidebar = instance.web.Widget.extend({
         template: 'CalendarView.sidebar',
-        
+
         start: function() {
             this._super();
             this.filter = new instance.web_calendar.SidebarFilter(this, this.getParent());
             this.filter.appendTo(this.$el.find('.oe_calendar_filter'));
-        }
+        },
     });
+
     instance.web_calendar.SidebarFilter = instance.web.Widget.extend({
         events: {
-            'change input:checkbox': 'filter_click'
+            'change input:checkbox': 'filter_click',
+            'click span.oe_remove_follower': 'destroy_filter',
         },
         init: function(parent, view) {
             this._super(parent);
             this.view = view;
+            this.ds_message = new instance.web.DataSetSearch(this, 'calendar.contacts');
         },
         set_filters: function() {
             var self = this;
@@ -1399,6 +1352,12 @@
                     self.$('div.oe_calendar_responsible input[value=' + o.value + ']').prop('checked',o.is_checked);
                 }
             });
+            // When mouse-enter the favorite list it will show the 'X' for removing partner from the favorite list.
+            if (self.view.useContacts){
+                self.$('.oe_calendar_all_responsibles').on('mouseenter mouseleave', function(e) {
+                    self.$('.oe_remove_follower').toggleClass('hidden', e.type == 'mouseleave');
+                });
+            }
         },
         events_loaded: function(filters) {
             var self = this;
@@ -1409,24 +1368,108 @@
                         filters.push(o);
                     }
                 });
-            }            
-            this.$el.html(QWeb.render('CalendarView.sidebar.responsible', { filters: filters }));
+            }
+
+            this.$el.html(QWeb.render('CalendarView.sidebar.responsible', { filters: filters, this: self }));
         },
         filter_click: function(e) {
-            var self = this;            
+            var self = this;
             self.view.all_filters[parseInt(e.target.value)].is_checked = e.target.checked;
             self.view.$calendar.fullCalendar('refetchEvents');
         },
-        addUpdateButton: function() {
-            var self=this;
-            this.$('div.oe_calendar_all_responsibles').append(QWeb.render('CalendarView.sidebar.button_add_contact'));
-            this.$(".add_contacts_link_btn").on('click', function() {
-                self.rpc("/web/action/load", {
-                    action_id: "calendar.action_calendar_contacts"
-                }).then( function(result) { return self.do_action(result); });
-            });
-            
+        addInputBox: function() {
+            var self = this;
+            if (this.dfm)
+                return;
+            this.dfm = new instance.web.form.DefaultFieldManager(self);
+            this.dfm.extend_field_desc({
+                partner_id: {
+                    relation: "res.partner",
+                },
+            });
+            this.ir_model_m2o = new instance.web.form.FieldMany2One(self.dfm, {
+                attrs: {
+                    class: 'oe_add_input_box',
+                    name: "partner_id",
+                    type: "many2one",
+                    options: '{"no_open": True}',
+                    placeholder:"Select Favorite Calendar",
+                },
+            });
+            this.ir_model_m2o.insertAfter($('div.oe_calendar_filter'));
+            this.ir_model_m2o.on('change:value', self, function() { 
+                self.add_filter();
+            });
+        },
+        add_filter: function() {
+            $.map(this.ir_model_m2o.display_value, function(element,index) {
+                 new instance.web.Model('calendar.contacts').call("create", [{'partner_id': index}]);
+            });
+            new reload_favorite_list(this);
+        },
+        destroy_filter: function(e) {
+            var self= this;
+            if (! confirm(_t("Do you really want to delete this filter from favorite?"))) { return false; }
+            var id = $(e.currentTarget)[0].dataset.id;
+            this.ds_message.call('search', [[['partner_id', '=', parseInt(id)]]]).then(function(record){
+                return self.ds_message.unlink(record);
+            }).done(function() {
+                new reload_favorite_list(self);
+            });
         },
     });
 
+    function reload_favorite_list(result) {
+        var self = current = result;
+        if (result.view) {
+            self = result.view;
+        }
+        //Get my Partner ID
+        new instance.web.Model("res.users").query(["partner_id"]).filter([["id", "=",self.dataset.context.uid]]).first()
+            .done(function(result) {
+                var sidebar_items = {};
+                var filter_value = result.partner_id[0];
+                var filter_item = {
+                    value: filter_value,
+                    label: result.partner_id[1] + _lt(" [Me]"),
+                    color: self.get_color(filter_value),
+                    avatar_model: self.avatar_model,
+                    is_checked: true,
+                    is_remove: false,
+                };
+                sidebar_items[filter_value] = filter_item ;
+                filter_item = {
+                    value: -1,
+                    label: _lt("All Meetings"),
+                    color: self.get_color(-1),
+                    avatar_model: self.avatar_model,
+                    is_checked: false
+                };
+                sidebar_items[-1] = filter_item ;
+                new instance.web.Model("calendar.contacts").query(["partner_id"]).filter([["user_id", "=",self.dataset.context.uid]]).all().then(function(result) {
+                    _.each(result, function(item) {
+                        filter_value = item.partner_id[0];
+                        filter_item = {
+                            value: filter_value,
+                            label: item.partner_id[1],
+                            color: self.get_color(filter_value),
+                            avatar_model: self.avatar_model,
+                            is_checked: true
+                        };
+                        sidebar_items[filter_value] = filter_item ;
+                     });
+                    self.all_filters = sidebar_items;
+                    self.now_filter_ids = $.map(self.all_filters, function(o) { return o.value; });
+                    self.sidebar.filter.events_loaded(self.all_filters);
+                    self.sidebar.filter.set_filters();
+                    self.sidebar.filter.addInputBox();
+                }).done(function () {
+                    self.$calendar.fullCalendar('refetchEvents');
+                    if (current.ir_model_m2o) {
+                        current.ir_model_m2o.set_value(false);
+                    }
+                });
+            });
+    }
+
 };

=== modified file 'addons/web_calendar/static/src/xml/web_fullcalendar.xml'
--- addons/web_calendar/static/src/xml/web_fullcalendar.xml	2014-01-10 17:03:33 +0000
+++ addons/web_calendar/static/src/xml/web_fullcalendar.xml	2014-04-22 09:29:10 +0000
@@ -16,30 +16,33 @@
     </table>
   </t>
   
-   <t t-name="CalendarView.sidebar">
+  <t t-name="CalendarView.sidebar">
       <div class="oe_calendar_sidebar">
-           <div class="oe_calendar_mini" />
-           <div class="oe_calendar_filter">
-               <h3><t t-esc="widget.getParent().color_string"/></h3>
-           </div>           
-       </div>
-   </t>
-   <t t-name="CalendarView.sidebar.responsible">
-       <div class="oe_calendar_all_responsibles"> 
-            <div t-foreach="filters" class="oe_calendar_responsible" > 
-                <t t-if="filters_value.value&gt;=-1"> <!-- don't display if no value given (or undefined) -->
-                   <input type="checkbox" name="selection" t-att-value="filters_value.value" checked="checked" />
-                   <t t-if="filters_value.value == -1">
-                       <span><i t-attf-class="fa fa-users fa-fw cal_avatar" ></i></span>
-                   </t>
-                   <t t-if="(filters_value.value != -1) &amp;&amp; filters_value.avatar_model ">
-                       <img t-att-src="'/web/binary/image?model=' + filters_value.avatar_model + '&amp;field=image_small&amp;id=' + filters_value.value"  class="cal_avatar"/>     
-                   </t>
-                   <span t-attf-class="cal_opacity underline_color_#{filters_value.color}" ><t t-esc="filters_value.label" /></span>
-               </t>
-           </div>
-       </div>
-   </t>
+          <div class="oe_calendar_mini oe_calendar_mini_bottom"/>
+          <div class="oe_calendar_filter">
+              <h3><t t-esc="widget.name"/></h3>
+          </div>
+      </div>
+  </t>
+  <t t-name="CalendarView.sidebar.responsible">
+      <div class="oe_calendar_all_responsibles"> 
+          <div t-foreach="filters" class="oe_favorite_name oe_calendar_responsible" > 
+              <t t-if="filters_value.value&gt;=-1"> <!-- don't display if no value given (or undefined) -->
+                  <input type="checkbox" name="selection" t-att-value="filters_value.value" checked="checked" />
+                  <t t-if="filters_value.value == -1">
+                      <span><i t-attf-class="fa fa-users fa-fw cal_avatar" ></i></span>
+                  </t>
+                  <t t-if="(filters_value.value != -1) &amp;&amp; filters_value.avatar_model ">
+                      <img t-att-src="'/web/binary/image?model=' + filters_value.avatar_model + '&amp;field=image_small&amp;id=' + filters_value.value" class="cal_avatar"/>
+                  </t>
+                  <span t-att-title='filters_value.label' t-attf-class="cal_opacity underline_color_#{filters_value.color}" ><t t-esc="filters_value.label" /></span>
+                  <t t-if="(filters_value.value != -1) &amp;&amp; (filters_value.is_remove != false)">
+                      <span class="oe_remove_follower oe_e hidden" title="Remove this favorite from the list" t-att-data-id="filters_value.value">X</span>
+                  </t>
+              </t>
+          </div>
+      </div>
+  </t>
 
   <div t-name="CalendarView.buttons" class="oe_calendar_buttons">
     <t t-if="widget.options.action_buttons !== false">
@@ -53,13 +56,6 @@
       </t>
     </t>
   </div>
-  
-  <div t-name="CalendarView.sidebar.button_add_contact" class="oe_calendar_buttons_add_contact">
-        <button class='oe_button oe_form_button oe_link add_contacts_link_btn' style='margin-top:10px'>
-            <span class='add_contacts_link'>See Employee's Meeting</span>
-        </button>
-  </div>
-
 
   <div t-name="CalendarView.quick_create" class="oe_calendar_quick_create openerp">