From 1d4069695c4ead8fb6707fa824380f8b870d8677 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 9 Apr 2012 17:01:31 +0530 Subject: [PATCH 1/9] [IMP] bzr revid: apa@tinyerp.com-20120409113131-629ryv9q060m1q2a --- addons/project/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 72673430868..afceca516a9 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -179,7 +179,7 @@
-
  • +
  • B
    • Edit...
      • From 038bb177a6a1c12fa085e3c8b6e9e75a925b84a4 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 9 Apr 2012 18:47:03 +0530 Subject: [PATCH 2/9] [IMP] bzr revid: apa@tinyerp.com-20120409131703-dn3hpa5x5yj4prlo --- addons/project/static/src/css/project.css | 14 +++++++++++++- addons/project/static/src/js/project.js | 22 +++++++++++++--------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 6f4153659d8..46e2aa5a99b 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -136,9 +136,21 @@ a.oe_project_kanban_action { width: 18px; height: 18px; } -.oe_kanban_color_2 { +.oe_kanban_color_1 { background: steelblue; } +.oe_kanban_color_2 { + background: firebrick; +} +.oe_kanban_color_3 { + background: khaki; +} +.oe_kanban_color_4 { + background: thistle; +} +.oe_kanban_color_5 { + background: orange; +} .steelblue { 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(); From 389c2f9804332655da5ee8814c4fac5eb0979e09 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 12:05:43 +0530 Subject: [PATCH 3/9] [IMP]:set bgcolor bzr revid: apa@tinyerp.com-20120410063543-kmw7fkbht8d7s3qe --- addons/project/project_view.xml | 10 +++++----- addons/project/static/src/js/project.js | 26 ++++++++++++++++++++----- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index afceca516a9..c1cf4948b04 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -186,11 +186,11 @@
    • Delete
      • -
        • -
        • -
        • -
        • -
        • +
        • +
        • +
        • +
        • +
    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(); } From 4916d46cf9f1935393c693f568709fb9fe3c7f78 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 15:03:17 +0530 Subject: [PATCH 4/9] [IMP] bzr revid: apa@tinyerp.com-20120410093317-yufo0pu7grib5ksw --- addons/project/project_view.xml | 2 +- addons/project/static/src/js/project.js | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index c1cf4948b04..cae0d54bb88 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -179,7 +179,7 @@
    -
  • +
  • B
    • Edit...
      • 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()); + }); }; From 86f4ac5277f7bb37b5240d776aa71a157f2841af Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 15:24:43 +0530 Subject: [PATCH 5/9] [IMP] bzr revid: apa@tinyerp.com-20120410095443-oeugi1oblh3ugnhx --- addons/project/static/src/css/project.css | 4 ++-- addons/project/static/src/js/project.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 46e2aa5a99b..792e8921c19 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -43,7 +43,7 @@ table { color: #4c4c4c; } .project_vignettes > li { - height: 175px; + height: 165px; width: 250px; padding: 8px; margin: 4px; } @@ -81,7 +81,7 @@ table { .click_button { display: inline-block; background-color: transparent; - min-height: 145px; + min-height: 140px; min-width: 265px; border: hidden; margin-left: -6px !important; 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()); From 2279fc7d1f1b99c7fe948aba10689425b83de4a2 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 15:50:15 +0530 Subject: [PATCH 6/9] [IMP] bzr revid: apa@tinyerp.com-20120410102015-5c35tsmwkcjfaziw --- addons/project/static/src/css/project.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 792e8921c19..6f437cce70c 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -43,7 +43,7 @@ table { color: #4c4c4c; } .project_vignettes > li { - height: 165px; + height: 170px; width: 250px; padding: 8px; margin: 4px; } @@ -81,7 +81,7 @@ table { .click_button { display: inline-block; background-color: transparent; - min-height: 140px; + min-height: 145px; min-width: 265px; border: hidden; margin-left: -6px !important; From 6cb72a66da942566ed1b10d8743c20c6ed746afe Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 15:52:22 +0530 Subject: [PATCH 7/9] [IMP] bzr revid: apa@tinyerp.com-20120410102222-ex1cik0yu11tq2l4 --- addons/project/static/src/js/project.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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}); }); From 7e3496f9c1d315762de4b620afde1258d1a3eab6 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 16:05:57 +0530 Subject: [PATCH 8/9] [IMP] bzr revid: apa@tinyerp.com-20120410103557-zrktokx6c0bzw3wy --- addons/project/static/src/js/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) }); }); From af9a103d1ffcac0e0e744ac1238bb5c2c34ae2fc Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 16:57:06 +0530 Subject: [PATCH 9/9] [IMP] bzr revid: apa@tinyerp.com-20120410112706-l59vip42hgnrwlmz --- addons/project/static/src/css/project.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 6f437cce70c..8ca54e020d4 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -43,7 +43,7 @@ table { color: #4c4c4c; } .project_vignettes > li { - height: 170px; + height: 180px; width: 250px; padding: 8px; margin: 4px; } @@ -81,7 +81,7 @@ table { .click_button { display: inline-block; background-color: transparent; - min-height: 145px; + min-height: 155px; min-width: 265px; border: hidden; margin-left: -6px !important;