From 5c5edd965f7db39e8657cde66a5d3393cda2c829 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 4 Apr 2012 14:11:44 +0530 Subject: [IMP]kannban view extends bzr revid: kbh@tinyerp.com-20120404084144-1t9fs970zbztpv7p --- addons/project/static/src/js/project.js | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 addons/project/static/src/js/project.js (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js new file mode 100644 index 00000000000..ba9372ba937 --- /dev/null +++ b/addons/project/static/src/js/project.js @@ -0,0 +1,11 @@ +openerp.project = function(openerp) { + openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ + bind_events: function() { + self = this + self._super() + if(this.view.dataset.model == 'project.project') { + console.log("this"); + } + } + }); +} -- cgit v1.2.3 From 7a42d939a34a5252cbe0e94ecc82ba03524ad111 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 4 Apr 2012 14:25:52 +0530 Subject: [IMP]dropdown menu bzr revid: kbh@tinyerp.com-20120404085552-5ykkcivzdpowarnn --- addons/project/static/src/js/project.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index ba9372ba937..ae1ecbaaa91 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -4,7 +4,14 @@ openerp.project = function(openerp) { self = this self._super() if(this.view.dataset.model == 'project.project') { - console.log("this"); + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); + }); + $('.oe_project_kanban_action').click(function(){ + $('.dropdown-toggle').dropdown(); + }) } } }); -- cgit v1.2.3 From 419b4cb926cbc6b35bb5bb6ec568d5460e386bb1 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 15:05:39 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404093539-6zvauic4qy4v11l6 --- addons/project/static/src/js/project.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index ae1ecbaaa91..1a5f3088a9a 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -9,6 +9,7 @@ openerp.project = function(openerp) { }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); + $('.dropdown-toggle').dropdown(); $('.oe_project_kanban_action').click(function(){ $('.dropdown-toggle').dropdown(); }) -- cgit v1.2.3 From a8f8ad68229b3ca0d8badac922f637dc3b3294e0 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 15:06:20 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404093620-pspxexidgf2jy21d --- addons/project/static/src/js/project.js | 3 --- 1 file changed, 3 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 1a5f3088a9a..8ce27661788 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -10,9 +10,6 @@ openerp.project = function(openerp) { return $(this).find('.oe_project_kanban_action').hide(); }); $('.dropdown-toggle').dropdown(); - $('.oe_project_kanban_action').click(function(){ - $('.dropdown-toggle').dropdown(); - }) } } }); -- cgit v1.2.3 From 9cee7d8b8e3fcc63a7d86df535173bc2b868bb35 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 17:54:35 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404122435-321j5dapi882s830 --- addons/project/static/src/js/project.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 8ce27661788..eb69002d28e 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,16 +1,14 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { - self = this - self._super() - if(this.view.dataset.model == 'project.project') { - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - $('.dropdown-toggle').dropdown(); - } + self = this; + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); + }); + $('.dropdown-toggle').dropdown(); + self._super(); } }); } -- cgit v1.2.3 From 9c0f7a28360b04c831583c7279d4853bc36c4982 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 18:01:05 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404123105-oe7jqrs7ym2uy2r7 --- addons/project/static/src/js/project.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index eb69002d28e..e23e873a05f 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -2,12 +2,14 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { self = this; - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - $('.dropdown-toggle').dropdown(); + if(this.view.dataset.model == 'project.project') { + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); + }); + $('.dropdown-toggle').dropdown(); + } self._super(); } }); -- cgit v1.2.3 From d81e6c2c531f26b364f5057607bbc8a49e3b9601 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 18:43:30 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404131330-w2kzw1tz2gdh407b --- addons/project/static/src/js/project.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index e23e873a05f..1a444441016 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,16 +1,13 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { - self = this; - if(this.view.dataset.model == 'project.project') { - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - $('.dropdown-toggle').dropdown(); - } - self._super(); + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); + }); + $('.dropdown-toggle').dropdown(); + this._super(); } }); } -- cgit v1.2.3 From 47811aeb883d679572981775e53fc92600283775 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 18:46:39 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404131639-cmaibsfn7wj2kkx5 --- addons/project/static/src/js/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 1a444441016..ea30b556f46 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,12 +1,12 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { + $('.dropdown-toggle').dropdown(); $('.oe_project_kanban_vignette').mouseover(function() { return $(this).find('.oe_project_kanban_action').show(); }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - $('.dropdown-toggle').dropdown(); this._super(); } }); -- cgit v1.2.3 From 161633386248bfeab3c09dd97061564fc9f22688 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 5 Apr 2012 13:01:08 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120405073108-yhlqao1nrm3casck --- addons/project/static/src/js/project.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index ea30b556f46..6fcb9586222 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,13 +1,24 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { + self = this; + self._super(); $('.dropdown-toggle').dropdown(); $('.oe_project_kanban_vignette').mouseover(function() { return $(this).find('.oe_project_kanban_action').show(); }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - this._super(); + _.each($('.oe_project_kanban_vignette'),function(record){ + _.each(record.getElementsByTagName('img'),function(img){ + var domain = [['id','=',img.getAttribute("id")]]; + var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, domain); + dataset.read_slice([]).then(function(result){ + img.setAttribute("title",result[0].name) + }); + }); + + }); } }); } -- cgit v1.2.3 From d3c4b80fb86b43c8e9aed022548e6241a092204f Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Thu, 5 Apr 2012 15:12:53 +0530 Subject: [IMP]click on kanban opens tasks bzr revid: sgo@tinyerp.com-20120405094253-f0fzyua28m5opuoy --- addons/project/static/src/js/project.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 6fcb9586222..d2c577067dd 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -9,6 +9,9 @@ openerp.project = function(openerp) { }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); + $('.test').click(function(){ + $('#open_tasks').click() + }); _.each($('.oe_project_kanban_vignette'),function(record){ _.each(record.getElementsByTagName('img'),function(img){ var domain = [['id','=',img.getAttribute("id")]]; -- cgit v1.2.3 From ce822419f418e86a8f38ddf5109cc78a4eef78fe Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Thu, 5 Apr 2012 16:14:05 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120405104405-vwymux3s0pxepe86 --- addons/project/static/src/js/project.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 022b2b78ae9..c08a96ff92c 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -9,6 +9,8 @@ openerp.project = function(openerp) { }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); + if(self.record.task.raw_value)$('.click_button').attr('data-name','open_tasks'); + _.each($('.oe_project_kanban_vignette'),function(record){ _.each(record.getElementsByTagName('img'),function(img){ var domain = [['id','=',img.getAttribute("id")]]; @@ -19,7 +21,7 @@ openerp.project = function(openerp) { }); }); - $('.click_button').attr('data-name','open_tasks'); + } }); } -- cgit v1.2.3 From c8d952e725a36c897d8ca3a94aa1d66f3c380517 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 5 Apr 2012 16:34:26 +0530 Subject: [MERGE] bzr revid: apa@tinyerp.com-20120405110426-sq3inlu6p7wx5m4a --- addons/project/static/src/js/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index c08a96ff92c..48fbb6103c3 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -9,7 +9,7 @@ openerp.project = function(openerp) { }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - if(self.record.task.raw_value)$('.click_button').attr('data-name','open_tasks'); + $('.click_button').attr('data-name','open_tasks'); _.each($('.oe_project_kanban_vignette'),function(record){ _.each(record.getElementsByTagName('img'),function(img){ -- cgit v1.2.3 From fb994730974ca1e0ac17864387ed9bad52281f51 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 6 Apr 2012 12:50:40 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120406072040-kzcd9fql1if5vyz9 --- addons/project/static/src/js/project.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 48fbb6103c3..74f0fae3fc9 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -2,26 +2,20 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { self = this; - self._super(); $('.dropdown-toggle').dropdown(); $('.oe_project_kanban_vignette').mouseover(function() { return $(this).find('.oe_project_kanban_action').show(); }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - $('.click_button').attr('data-name','open_tasks'); - - _.each($('.oe_project_kanban_vignette'),function(record){ - _.each(record.getElementsByTagName('img'),function(img){ - var domain = [['id','=',img.getAttribute("id")]]; - var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, domain); - dataset.read_slice([]).then(function(result){ - img.setAttribute("title",result[0].name) - }); + $('.project_avatar').mouseover(function() { + avatar = this + var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.getAttribute("id")]]); + dataset.read_slice([]).then(function(result){ + avatar.setAttribute("title",result[0].name) }); - }); - + self._super(); } }); } -- cgit v1.2.3 From e6f47e03ea42df2d636cb52459cb8f0bd9318b21 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Fri, 6 Apr 2012 13:54:58 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120406082458-zd2qrvy3i9yd071o --- addons/project/static/src/js/project.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 48fbb6103c3..2a61f89cce4 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -9,7 +9,22 @@ openerp.project = function(openerp) { }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - $('.click_button').attr('data-name','open_tasks'); + + + $('.click_button').mouseover(function() { + click_button = this + var domain = [['id','=',this.getAttribute("id")]]; + var dataset = new openerp.web.DataSetSearch(self, 'project.project', self.session.context, domain); + dataset.read_slice([]).then(function(result){ + if(result[0].task){ + click_button.setAttribute('data-name','open_tasks'); + } + else + { + click_button.setAttribute('data-name','dummy'); + } + }); + }); _.each($('.oe_project_kanban_vignette'),function(record){ _.each(record.getElementsByTagName('img'),function(img){ -- cgit v1.2.3 From 715dcf10b7d6902d5c8da3e549b1c2a34d909678 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 6 Apr 2012 16:35:47 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120406110547-8y1s1vx1v7j04p78 --- addons/project/static/src/js/project.js | 55 ++++++++++++++------------------- 1 file changed, 24 insertions(+), 31 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index a688d69de6d..0cd0ae7f4b5 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -2,38 +2,31 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { self = this; - self._super(); - $('.dropdown-toggle').dropdown(); - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - - - $('.click_button').mouseover(function() { - click_button = this - var domain = [['id','=',this.getAttribute("id")]]; - var dataset = new openerp.web.DataSetSearch(self, 'project.project', self.session.context, domain); - dataset.read_slice([]).then(function(result){ - if(result[0].task){ - click_button.setAttribute('data-name','open_tasks'); - } - else - { - click_button.setAttribute('data-name','dummy'); - } - }); - }); - - $('.project_avatar').mouseover(function() { - avatar = this - var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.getAttribute("id")]]); - dataset.read_slice([]).then(function(result){ - avatar.setAttribute("title",result[0].name) + if(this.view.dataset.model == 'project.project') { + //open dropdwon when click on the icon. + $('.dropdown-toggle').dropdown(); + + //show and hide the dropdown icon when mouseover and mouseour. + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); }); - }); - + + //set avatar title for members. + _.each($(this.$element).find('.project_avatar'),function(avatar){ + console.log(avatar.id) + var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]); + dataset.read_slice([]).then(function(result){ + avatar.setAttribute("title",result[0].name) + }); + }); + + //if task is true , then open the task when clickd on the anywhere in the box. + if(this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); + if(!this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); + }; + self._super(); } }); } -- cgit v1.2.3 From 2fc51533ad4278da75c666b00be874860ea5a314 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 6 Apr 2012 16:38:05 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120406110805-dn421xsf2kja73ye --- addons/project/static/src/js/project.js | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 0cd0ae7f4b5..38fc90893b5 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -15,7 +15,6 @@ openerp.project = function(openerp) { //set avatar title for members. _.each($(this.$element).find('.project_avatar'),function(avatar){ - console.log(avatar.id) var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]); dataset.read_slice([]).then(function(result){ avatar.setAttribute("title",result[0].name) -- cgit v1.2.3 From 36a433ddcd0371d2aa4a318d7ed5006558050060 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Fri, 6 Apr 2012 17:53:07 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120406122307-iqdyfnqsyljy17rs --- addons/project/static/src/js/project.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 38fc90893b5..5096817f8a6 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -16,12 +16,12 @@ openerp.project = function(openerp) { //set avatar title for members. _.each($(this.$element).find('.project_avatar'),function(avatar){ var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]); - dataset.read_slice([]).then(function(result){ - avatar.setAttribute("title",result[0].name) + dataset.read_slice([]).then(function(result){ + avatar.setAttribute("title",result[0].name) }); }); - //if task is true , then open the task when clickd on the anywhere in the box. + //if task is true , then open the task when click on the anywhere in the box. if(this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); if(!this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); }; -- cgit v1.2.3 From 89194da727ebb8cc3d9a0f7d7aeca7741338fd9a Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 9 Apr 2012 15:01:32 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120409093132-lxrojybxcy3u4bb1 --- addons/project/static/src/js/project.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 5096817f8a6..abe2b1c8da1 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -24,6 +24,18 @@ openerp.project = function(openerp) { //if task is true , then open the task when click on the anywhere in the box. if(this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); if(!this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); + + // set sequence like Tasks,Issues,Timesheets and Phases + my_list = $("#list a") + my_list.sort(function (a, b) { + var aValue = parseInt(a.id); + var bValue = parseInt(b.id); + // ASC + //return aValue == bValue ? 0 : aValue < bValue ? -1 : 1; + // DESC + return aValue == bValue ? 0 : aValue < bValue ? -1 : 1; + }); + $('#list').replaceWith(my_list); }; self._super(); } -- cgit v1.2.3 From 5cb201f5eb634d976dc353f2ece2f518f1c5a599 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 9 Apr 2012 16:28:30 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120409105830-9xg6ikpqshravpdf --- addons/project/static/src/js/project.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index abe2b1c8da1..be44580f7a5 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,5 +1,6 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ + bind_events: function() { self = this; if(this.view.dataset.model == 'project.project') { @@ -36,6 +37,19 @@ openerp.project = function(openerp) { return aValue == bValue ? 0 : aValue < bValue ? -1 : 1; }); $('#list').replaceWith(my_list); + + + $('.steelblue').click(function(){ + //$(this).closest('.oe_project_kanban_vignette').css('background-color', 'steelblue'); + $action = $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); + //var data = {}; + //data[$action.data('name')] = $(this).data('color'); + //self.view.dataset.write(2, {'color':2}, {}, function() { + // //self.record[$action.data('name')] = $(this).data('color'); + // self.do_reload(); + //}); + + }); }; self._super(); } -- cgit v1.2.3 From 038bb177a6a1c12fa085e3c8b6e9e75a925b84a4 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 9 Apr 2012 18:47:03 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120409131703-dn3hpa5x5yj4prlo --- addons/project/static/src/js/project.js | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index be44580f7a5..f80e3b6d91c 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -40,15 +40,19 @@ openerp.project = function(openerp) { $('.steelblue').click(function(){ - //$(this).closest('.oe_project_kanban_vignette').css('background-color', 'steelblue'); - $action = $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); - //var data = {}; - //data[$action.data('name')] = $(this).data('color'); - //self.view.dataset.write(2, {'color':2}, {}, function() { - // //self.record[$action.data('name')] = $(this).data('color'); - // self.do_reload(); - //}); - + $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(1)); + }); + $('.firebrick').click(function(){ + $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); + }); + $('.khaki').click(function(){ + $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(3)); + }); + $('.thistle').click(function(){ + $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(4)); + }); + $('.orange').click(function(){ + $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(5)); }); }; self._super(); -- cgit v1.2.3 From 389c2f9804332655da5ee8814c4fac5eb0979e09 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 12:05:43 +0530 Subject: [IMP]:set bgcolor bzr revid: apa@tinyerp.com-20120410063543-kmw7fkbht8d7s3qe --- addons/project/static/src/js/project.js | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index f80e3b6d91c..9c2f546423e 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -38,22 +38,38 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); + console.log(this.$element.find('.steelblue')) - $('.steelblue').click(function(){ + this.$element.find('.bgcolor_steelblue').click(function(){ + console.log(this) $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(1)); + self.view.dataset.write(parseInt(this.id), {color:1},self.do_reload()); }); - $('.firebrick').click(function(){ + + this.$element.find('.bgcolor_firebrick').click(function(){ + console.log(this) $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); + self.view.dataset.write(parseInt(this.id), {color:2},self.do_reload()); }); - $('.khaki').click(function(){ + + this.$element.find('.bgcolor_khaki').click(function(){ + console.log(this) $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(3)); + self.view.dataset.write(parseInt(this.id), {color:3},self.do_reload()); }); - $('.thistle').click(function(){ + + this.$element.find('.bgcolor_thistle').click(function(){ + console.log(this) $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(4)); + self.view.dataset.write(parseInt(this.id), {color:4},self.do_reload()); }); - $('.orange').click(function(){ + + this.$element.find('.bgcolor_orange').click(function(){ + console.log(this) $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(5)); + self.view.dataset.write(parseInt(this.id), {color:5},self.do_reload()); }); + }; self._super(); } -- cgit v1.2.3 From 4916d46cf9f1935393c693f568709fb9fe3c7f78 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 15:03:17 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120410093317-yufo0pu7grib5ksw --- addons/project/static/src/js/project.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 9c2f546423e..219838e08c6 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -38,36 +38,34 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); - console.log(this.$element.find('.steelblue')) this.$element.find('.bgcolor_steelblue').click(function(){ - console.log(this) - $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(1)); + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:1},self.do_reload()); }); this.$element.find('.bgcolor_firebrick').click(function(){ - console.log(this) - $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:2},self.do_reload()); + }); this.$element.find('.bgcolor_khaki').click(function(){ - console.log(this) - $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(3)); + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:3},self.do_reload()); + }); this.$element.find('.bgcolor_thistle').click(function(){ - console.log(this) - $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(4)); + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:4},self.do_reload()); + }); this.$element.find('.bgcolor_orange').click(function(){ - console.log(this) - $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(5)); + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:5},self.do_reload()); + }); }; -- cgit v1.2.3 From 86f4ac5277f7bb37b5240d776aa71a157f2841af Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 15:24:43 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120410095443-oeugi1oblh3ugnhx --- addons/project/static/src/js/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 219838e08c6..fd86dc7d566 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -38,7 +38,7 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); - + // set background color this.$element.find('.bgcolor_steelblue').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:1},self.do_reload()); -- cgit v1.2.3 From 6cb72a66da942566ed1b10d8743c20c6ed746afe Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 15:52:22 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120410102222-ex1cik0yu11tq2l4 --- addons/project/static/src/js/project.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index fd86dc7d566..5ed8247ff23 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -41,30 +41,30 @@ openerp.project = function(openerp) { // set background color this.$element.find('.bgcolor_steelblue').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:1},self.do_reload()); + self.view.dataset.write(parseInt(this.id), {color:1}); }); this.$element.find('.bgcolor_firebrick').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:2},self.do_reload()); + self.view.dataset.write(parseInt(this.id), {color:2}); }); this.$element.find('.bgcolor_khaki').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:3},self.do_reload()); + self.view.dataset.write(parseInt(this.id), {color:3}); }); this.$element.find('.bgcolor_thistle').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:4},self.do_reload()); + self.view.dataset.write(parseInt(this.id), {color:4}); }); this.$element.find('.bgcolor_orange').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:5},self.do_reload()); + self.view.dataset.write(parseInt(this.id), {color:5}); }); -- cgit v1.2.3 From 7e3496f9c1d315762de4b620afde1258d1a3eab6 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 16:05:57 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120410103557-zrktokx6c0bzw3wy --- addons/project/static/src/js/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 5ed8247ff23..e4a5f817180 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -17,7 +17,7 @@ openerp.project = function(openerp) { //set avatar title for members. _.each($(this.$element).find('.project_avatar'),function(avatar){ var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]); - dataset.read_slice([]).then(function(result){ + dataset.read_slice(['name']).then(function(result){ avatar.setAttribute("title",result[0].name) }); }); -- cgit v1.2.3 From 59e07ee6f05dde3e1916b4a9f195ab29dc7a0781 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Wed, 11 Apr 2012 11:13:56 +0530 Subject: [IMP]add white color background bzr revid: sgo@tinyerp.com-20120411054356-9bfsxnvb4zkfcphm --- addons/project/static/src/js/project.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index e4a5f817180..567c381cc27 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -39,6 +39,11 @@ openerp.project = function(openerp) { $('#list').replaceWith(my_list); // set background color + this.$element.find('.bgcolor_white').click(function(){ + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(0) + ' oe_project_kanban_vignette'); + self.view.dataset.write(parseInt(this.id), {color:0}); + }); + this.$element.find('.bgcolor_steelblue').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:1}); @@ -65,7 +70,6 @@ openerp.project = function(openerp) { this.$element.find('.bgcolor_orange').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:5}); - }); }; -- cgit v1.2.3 From 3b5ccc5a77db22f3877894c49baa1baabeca928c Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 12 Apr 2012 11:16:31 +0530 Subject: [IMP]:improved bgcolor code. bzr revid: apa@tinyerp.com-20120412054631-xs2nk19n3w858qpn --- addons/project/static/src/js/project.js | 63 +++++++++++++++++---------------- 1 file changed, 33 insertions(+), 30 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 567c381cc27..3dae71e8170 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -39,38 +39,41 @@ openerp.project = function(openerp) { $('#list').replaceWith(my_list); // set background color - this.$element.find('.bgcolor_white').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(0) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:0}); + this.$element.find('.bgcolor').click(function(){ + color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) + color_class = $(this).find('span').attr('class').split(' ')[0] + console.log($(this).find('span').attr('class').split(' ')[0].substring(16)) + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(color_class + ' oe_project_kanban_vignette'); + self.view.dataset.write(parseInt(this.id), {color:color}); }); - this.$element.find('.bgcolor_steelblue').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:1}); - }); - - this.$element.find('.bgcolor_firebrick').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:2}); - - }); - - this.$element.find('.bgcolor_khaki').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:3}); - - }); - - this.$element.find('.bgcolor_thistle').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:4}); - - }); - - this.$element.find('.bgcolor_orange').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:5}); - }); + //this.$element.find('.bgcolor_steelblue').click(function(){ + // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); + // self.view.dataset.write(parseInt(this.id), {color:1}); + //}); + // + //this.$element.find('.bgcolor_firebrick').click(function(){ + // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette'); + // self.view.dataset.write(parseInt(this.id), {color:2}); + // + //}); + // + //this.$element.find('.bgcolor_khaki').click(function(){ + // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette'); + // self.view.dataset.write(parseInt(this.id), {color:3}); + // + //}); + // + //this.$element.find('.bgcolor_thistle').click(function(){ + // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette'); + // self.view.dataset.write(parseInt(this.id), {color:4}); + // + //}); + // + //this.$element.find('.bgcolor_orange').click(function(){ + // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); + // self.view.dataset.write(parseInt(this.id), {color:5}); + //}); }; self._super(); -- cgit v1.2.3 From 4804c6f75d2873c1053bf1abeb88921cb9266cd8 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 12 Apr 2012 11:29:21 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120412055921-eo0dumz60cimx62c --- addons/project/static/src/js/project.js | 35 +-------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 3dae71e8170..a7d0c689784 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -3,6 +3,7 @@ openerp.project = function(openerp) { bind_events: function() { self = this; + self._super(); if(this.view.dataset.model == 'project.project') { //open dropdwon when click on the icon. $('.dropdown-toggle').dropdown(); @@ -31,9 +32,6 @@ openerp.project = function(openerp) { my_list.sort(function (a, b) { var aValue = parseInt(a.id); var bValue = parseInt(b.id); - // ASC - //return aValue == bValue ? 0 : aValue < bValue ? -1 : 1; - // DESC return aValue == bValue ? 0 : aValue < bValue ? -1 : 1; }); $('#list').replaceWith(my_list); @@ -42,41 +40,10 @@ openerp.project = function(openerp) { this.$element.find('.bgcolor').click(function(){ color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) color_class = $(this).find('span').attr('class').split(' ')[0] - console.log($(this).find('span').attr('class').split(' ')[0].substring(16)) $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(color_class + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:color}); }); - - //this.$element.find('.bgcolor_steelblue').click(function(){ - // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); - // self.view.dataset.write(parseInt(this.id), {color:1}); - //}); - // - //this.$element.find('.bgcolor_firebrick').click(function(){ - // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette'); - // self.view.dataset.write(parseInt(this.id), {color:2}); - // - //}); - // - //this.$element.find('.bgcolor_khaki').click(function(){ - // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette'); - // self.view.dataset.write(parseInt(this.id), {color:3}); - // - //}); - // - //this.$element.find('.bgcolor_thistle').click(function(){ - // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette'); - // self.view.dataset.write(parseInt(this.id), {color:4}); - // - //}); - // - //this.$element.find('.bgcolor_orange').click(function(){ - // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); - // self.view.dataset.write(parseInt(this.id), {color:5}); - //}); - }; - self._super(); } }); } -- cgit v1.2.3 From c1e3987744c4eca177354d11177a6a5ff1039045 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 26 Apr 2012 22:55:29 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120426172529-7xeaex0nulxeul1l --- addons/project/static/src/js/project.js | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index a7d0c689784..a1cb503af59 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,6 +1,5 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ - bind_events: function() { self = this; self._super(); -- cgit v1.2.3 From f8e076e9a4c1f08d33ab81a33706c645be75739a Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 27 Apr 2012 11:57:25 +0530 Subject: [IMP]:improved code. bzr revid: apa@tinyerp.com-20120427062725-0lpfbxs0xkdmm7zf --- addons/project/static/src/js/project.js | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index a1cb503af59..e2384d50d27 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -4,17 +4,11 @@ openerp.project = function(openerp) { self = this; self._super(); if(this.view.dataset.model == 'project.project') { - //open dropdwon when click on the icon. - $('.dropdown-toggle').dropdown(); - - //show and hide the dropdown icon when mouseover and mouseour. - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - - //set avatar title for members. + + /*set avatar title for members. + In many2many fields, returns only list of ids. + we can implement return value of m2m fields like [(1,"Adminstration"),...]. + */ _.each($(this.$element).find('.project_avatar'),function(avatar){ var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]); dataset.read_slice(['name']).then(function(result){ @@ -35,7 +29,9 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); - // set background color + /* set background color. + we can do other way to implement new widget. + */ this.$element.find('.bgcolor').click(function(){ color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) color_class = $(this).find('span').attr('class').split(' ')[0] -- cgit v1.2.3 From 49eb72d417485457c9ec93570ae3e82739563a30 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 27 Apr 2012 12:01:52 +0530 Subject: [IMP]:improved code. bzr revid: apa@tinyerp.com-20120427063152-9qp4k3mz6dhgz7ho --- addons/project/static/src/js/project.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index e2384d50d27..5365e0b0942 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -31,6 +31,7 @@ openerp.project = function(openerp) { /* set background color. we can do other way to implement new widget. + because we need to rpc call for that. */ this.$element.find('.bgcolor').click(function(){ color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) -- cgit v1.2.3 From bfd96de42bc942fa24158a8c87b9e905c2460b72 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 7 May 2012 12:50:49 +0530 Subject: [IMP]rename all fields which r required in project and another module and improve code and bzr revid: sgo@tinyerp.com-20120507072049-u00lsqra9x34nf73 --- addons/project/static/src/js/project.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 5365e0b0942..001777103d6 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -17,8 +17,8 @@ openerp.project = function(openerp) { }); //if task is true , then open the task when click on the anywhere in the box. - if(this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); - if(!this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); + if(this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); + if(!this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); // set sequence like Tasks,Issues,Timesheets and Phases my_list = $("#list a") -- cgit v1.2.3 From 38fd7fa19df5d752c05eb21fad9f07daccca4395 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 7 May 2012 18:27:08 +0530 Subject: [IMP]:project:Used a relate action like 'project.act_project_project_2_project_task_all' instead (easier to configure and maintain) and remove default value for project_id. bzr revid: apa@tinyerp.com-20120507125708-7gcxl8915us0xoio --- addons/project/static/src/js/project.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 001777103d6..27874b24f25 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -16,9 +16,6 @@ openerp.project = function(openerp) { }); }); - //if task is true , then open the task when click on the anywhere in the box. - if(this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); - if(!this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); // set sequence like Tasks,Issues,Timesheets and Phases my_list = $("#list a") @@ -29,6 +26,9 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); + //if task is true , then open the task when click on the anywhere in the box. + if(this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name',my_list[0].getAttribute('data-name')); + /* set background color. we can do other way to implement new widget. because we need to rpc call for that. -- cgit v1.2.3 From a6a7276d890488085bc2eec46f57e44425df3a4b Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Tue, 8 May 2012 14:51:43 +0530 Subject: [IMP]remove open_model method from project related module and add action as per required bzr revid: sgo@tinyerp.com-20120508092143-ah3siaudwp7jixc8 --- addons/project/static/src/js/project.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 27874b24f25..d841734bacf 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -16,7 +16,6 @@ openerp.project = function(openerp) { }); }); - // set sequence like Tasks,Issues,Timesheets and Phases my_list = $("#list a") my_list.sort(function (a, b) { @@ -26,8 +25,16 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); - //if task is true , then open the task when click on the anywhere in the box. - if(this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name',my_list[0].getAttribute('data-name')); + //it opens action in sequence which ever is first. + if (my_list.length!=0){ + $(this.$element).find('.click_button').attr('data-name',my_list[0].getAttribute('data-name')); + } + else{ + $(this.$element).find('.click_button').attr('data-name','dummy'); + } + if(isNaN(parseInt($(this.$element).find('.click_button').attr('data-name')))){ + $(this.$element).find('.click_button').attr('data-type',"object") + } /* set background color. we can do other way to implement new widget. -- cgit v1.2.3 From 5e1413aca654901cdabb93c72e9a32e4da0320da Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 8 May 2012 16:16:07 +0530 Subject: [IMP]:improved js code. bzr revid: apa@tinyerp.com-20120508104607-w3q12gphejt3zauw --- addons/project/static/src/js/project.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index cc228e5e931..d00b0762f86 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -26,10 +26,12 @@ openerp.project = function(openerp) { $('#list').replaceWith(my_list); //it opens action in sequence which ever is first. + if (my_list.length!=0){ - $(this.$element).find('.click_button').attr('data-name',my_list[0].getAttribute('data-name')); - if(isNaN(parseInt($(this.$element).find('.click_button').attr('data-name')))){ - $(this.$element).find('.click_button').attr('data-type',"object") + click_button = $(this.$element).find('.click_button') + click_button.attr('data-name',my_list[0].getAttribute('data-name')); + if(isNaN(parseInt(click_button.attr('data-name')))){ + click_button.attr('data-type',"object") } } /* set background color. -- cgit v1.2.3 From 645d2437e0a3897c9731ba22152c7351c4c5ff52 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 8 May 2012 16:17:05 +0530 Subject: [IMP]:set indentation in js file. bzr revid: apa@tinyerp.com-20120508104705-zri4xvoc4k1d4e9q --- addons/project/static/src/js/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index d00b0762f86..f5e6bdd99d6 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -31,7 +31,7 @@ openerp.project = function(openerp) { click_button = $(this.$element).find('.click_button') click_button.attr('data-name',my_list[0].getAttribute('data-name')); if(isNaN(parseInt(click_button.attr('data-name')))){ - click_button.attr('data-type',"object") + click_button.attr('data-type',"object") } } /* set background color. -- cgit v1.2.3 From abdc6e0383c795190ccffc226a536504d67e9271 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 8 May 2012 16:25:21 +0530 Subject: [IMP]:added def dummy bzr revid: apa@tinyerp.com-20120508105521-1mqur1isvkw0j5n7 --- addons/project/static/src/js/project.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index f5e6bdd99d6..b7c37d9671e 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -26,14 +26,15 @@ openerp.project = function(openerp) { $('#list').replaceWith(my_list); //it opens action in sequence which ever is first. - + click_button = $(this.$element).find('.click_button') if (my_list.length!=0){ - click_button = $(this.$element).find('.click_button') click_button.attr('data-name',my_list[0].getAttribute('data-name')); - if(isNaN(parseInt(click_button.attr('data-name')))){ - click_button.attr('data-type',"object") - } } + else{ + click_button.attr('data-name','dummy'); + } + if(isNaN(parseInt(click_button.attr('data-name'))))click_button.attr('data-type',"object"); + /* set background color. we can do other way to implement new widget. because we need to rpc call for that. -- cgit v1.2.3 From 7dab19c32b6a8303711cdfb6d5da5d96d177e43d Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 9 May 2012 08:55:22 +0200 Subject: [IMP] project: small code cleanup for project kanban view bzr revid: rco@openerp.com-20120509065522-16ouzxqiwqgjdcyd --- addons/project/static/src/js/project.js | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'addons/project/static/src/js/project.js') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index b7c37d9671e..09a7c9eb256 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,7 +1,7 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { - self = this; + var self = this; self._super(); if(this.view.dataset.model == 'project.project') { @@ -17,7 +17,7 @@ openerp.project = function(openerp) { }); // set sequence like Tasks,Issues,Timesheets and Phases - my_list = $("#list a") + var my_list = $("#list a") my_list.sort(function (a, b) { var aValue = parseInt(a.id); var bValue = parseInt(b.id); @@ -25,27 +25,24 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); - //it opens action in sequence which ever is first. - click_button = $(this.$element).find('.click_button') - if (my_list.length!=0){ - click_button.attr('data-name',my_list[0].getAttribute('data-name')); + // when vignette is clicked, it opens the first action in sequence + if (my_list.length != 0) { + var click_button = $(this.$element).find('.click_button') + click_button.attr('data-name', my_list[0].getAttribute('data-name')); + click_button.attr('data-type', "action"); } - else{ - click_button.attr('data-name','dummy'); - } - if(isNaN(parseInt(click_button.attr('data-name'))))click_button.attr('data-type',"object"); /* set background color. we can do other way to implement new widget. because we need to rpc call for that. */ this.$element.find('.bgcolor').click(function(){ - color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) - color_class = $(this).find('span').attr('class').split(' ')[0] + var color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) + var color_class = $(this).find('span').attr('class').split(' ')[0] $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(color_class + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:color}); }); - }; + } } }); } -- cgit v1.2.3