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

[Pariket Trivedi(OpenERP)]

hello sir,

i hanve add new input text autocomplete use partner_id in calendar view.
and add new partner in Add Employee's Meeting in calendar.

thank you,
ptr

[Paramjit Singh Sahota(OpenERP) (psa-openerp)]

Hello ptr,
1/. In your diff, on line no. 11 & 12, Why are you using the context in search when you are not getting the value in context??
2/. In your diff, on line no. 21 & 22, Why are you using the DOM object here??

review: Needs Fixing

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

3956. By Pariket Trivedi(OpenERP) on 2014-03-13

[IMP]: autocomplete input field change position in template.

3957. By Pariket Trivedi(OpenERP) on 2014-03-13

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

[Pariket Trivedi(OpenERP) (pariket.trivedi-openerp)]

review: Needs Resubmitting

=== modified file 'addons/web_calendar/static/src/js/web_calendar.js'
--- addons/web_calendar/static/src/js/web_calendar.js	2014-03-13 11:36:34 +0000
+++ addons/web_calendar/static/src/js/web_calendar.js	2014-03-13 11:40:52 +0000
@@ -1363,13 +1363,33 @@
         },
         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); });
-            });
-            
+            this.$('div.oe_calendar_all_responsibles').prepend(QWeb.render('CalendarView.sidebar.button_add_contact'));
+            var name = new Array();
+            var id = new Array();
+            partner_obj = new instance.web.Model('res.partner')
+            partner_obj.call("search", [[ ]]).then(function (record_ids) {
+                partner_obj.call("read", [record_ids, ['name', 'user_ids']]).then(function (record_data) {
+                    record_data.map(function(i) {
+                        if (i.user_ids[0] != self.session.uid){
+                            name.push(i.name);
+                            id.push(i.id);
+                        }
+                    });
+                    $('input[name=add_partner]').autocomplete({source: name});
+                });
+            });
+            this.$("#add_meeting").on('focusout', function(){
+                partner_id = id[name.indexOf($("#add_meeting").val())];
+                $("#add_meeting").val("");
+                if (partner_id){
+                    new instance.web.Model("calendar.contacts").call('search', [[['partner_id', '=', partner_id]]]).then(function(calendar_data){
+                        if (calendar_data.length == 0){
+                            new instance.web.Model("calendar.contacts").call("create", [{'partner_id': partner_id}]).then(function (result){
+                            });
+                        }
+                    });
+                }
+            });
         },
         destroy_filter: function(e) {
             var self= this;
 
=== modified file 'addons/web_calendar/static/src/xml/web_fullcalendar.xml'
--- addons/web_calendar/static/src/xml/web_fullcalendar.xml	2014-03-13 11:36:34 +0000
+++ addons/web_calendar/static/src/xml/web_fullcalendar.xml	2014-03-13 11:40:52 +0000
@@ -58,9 +58,9 @@
   </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 class="form-group">
+            <input id="add_meeting" type="text" name="add_partner" class="form-control" t-att-value="add_partner" placeholder="Add Employee's Meeting"/>
+        </div>
   </div>