From 0c3921a698607e97e8c618d6d58337c375a0d03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 13 Mar 2012 12:16:12 +0100 Subject: [PATCH 1/7] [IMP] hr_employee: cleaned code. Kanban view now uses photo_mini instead of photo. bzr revid: tde@openerp.com-20120313111612-qij93zfg6uolcnvd --- addons/hr/hr.py | 40 ++++++++++++++++++++++------------------ addons/hr/hr_view.xml | 4 ++-- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 07b04998018..7c548101090 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -149,25 +149,29 @@ class hr_employee(osv.osv): _description = "Employee" _inherits = {'resource.resource': "resource_id"} + def onchange_photo_mini(self, cr, uid, ids, value, context=None): + print 'cacacaporinfeorinf' + return {'value': {'photo': value, 'photo_mini': self._photo_resize(cr, uid, value) } } + + def _set_photo_mini(self, cr, uid, id, name, value, args, context=None): + return self.write(cr, uid, [id], {'photo': value}, context=context) + + def _photo_resize(self, cr, uid, photo, context=None): + image_stream = io.BytesIO(photo.decode('base64')) + img = Image.open(image_stream) + img.thumbnail((180, 150), Image.ANTIALIAS) + img_stream = StringIO.StringIO() + img.save(img_stream, "JPEG") + return img_stream.getvalue().encode('base64') + def _get_photo_mini(self, cr, uid, ids, name, args, context=None): result = {} - for obj in self.browse(cr, uid, ids, context=context): - print obj - if not obj.photo: - result[obj.id] = False - continue - - image_stream = io.BytesIO(obj.photo.decode('base64')) - img = Image.open(image_stream) - img.thumbnail((180, 150), Image.ANTIALIAS) - img_stream = StringIO.StringIO() - img.save(img_stream, "JPEG") - result[obj.id] = img_stream.getvalue().encode('base64') + for hr_empl in self.browse(cr, uid, ids, context=context): + if not hr_empl.photo: + result[hr_empl.id] = False + else: + result[hr_empl.id] = self._photo_resize(cr, uid, hr_empl.photo) return result - - def _set_photo_mini(self, cr, uid, id, name, value, args, context=None): - self.write(cr, uid, [id], {'photo': value}, context=context) - return True _columns = { 'country_id': fields.many2one('res.country', 'Nationality'), @@ -245,11 +249,11 @@ class hr_employee(osv.osv): def _get_photo(self, cr, uid, context=None): photo_path = addons.get_module_resource('hr','images','photo.png') - return open(photo_path, 'rb').read().encode('base64') + return self._photo_resize(cr, uid, open(photo_path, 'rb').read().encode('base64')) _defaults = { 'active': 1, - 'photo': _get_photo, + 'photo_mini': _get_photo, 'marital': 'single', 'color': 0, } diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 81f1c655d33..c2961f2ccde 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -33,7 +33,7 @@ - + @@ -135,7 +135,7 @@
- +

()

From fe9dcb1966a6a22313812c042dae52e934737736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 13 Mar 2012 12:28:38 +0100 Subject: [PATCH 2/7] [IMP] crm: opportunity kanban view: added use of res.users avatar bzr revid: tde@openerp.com-20120313112838-2h2l8j65y6n8yrsh --- addons/crm/__openerp__.py | 3 ++ addons/crm/crm_lead_view.xml | 66 +++++++++++++++++++----------------- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 4968176e826..a5b31528761 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -130,6 +130,9 @@ Creates a dashboard for CRM that includes: 'test/ui/duplicate_lead.yml', 'test/ui/delete_lead.yml' ], + 'css': [ + 'static/src/css/crm_kanban.css', + ], 'installable': True, 'application': True, 'auto_install': False, diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 44d83f47634..f156b4ffa40 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -291,40 +291,42 @@ oe_kanban_color_red
- - - - - - -
- - - - - - - - - -
- -
-
- - - - - - -
-
- -
-
- : +
+ +
+
+ + + + + +
+ + + + + + - + + +
+
+
+ + + + + + +
+
+ +
+
+ : +
-
From c25c66c83d1a1e039febaa52f4be53e9329554d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 13 Mar 2012 12:29:14 +0100 Subject: [PATCH 3/7] [ADD] Added css file for crm.opportunity kanban view bzr revid: tde@openerp.com-20120313112914-7pn226gyfwufvo9v --- addons/crm/static/src/css/crm_kanban.css | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 addons/crm/static/src/css/crm_kanban.css diff --git a/addons/crm/static/src/css/crm_kanban.css b/addons/crm/static/src/css/crm_kanban.css new file mode 100644 index 00000000000..c029df7b2ba --- /dev/null +++ b/addons/crm/static/src/css/crm_kanban.css @@ -0,0 +1,21 @@ +.openerp .oe_proj_task_content_box { + margin-right: 41px; +} + +.openerp .oe_proj_task_avatar_box { + float: right; + width: 40px; +} + +.openerp .oe_kanban_avatar { + display: block; + width: 40px; + height: auto; + clip: rect(5px, 40px, 45px, 0px); +} + +.openerp .oe_kanban_avatar_wide { + height: 40px; + width: auto; + clip: rect(0px, 45px, 40px, 05px); +} From 07570c565d601a61126b5c1cd1545951d6457777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 13 Mar 2012 12:55:40 +0100 Subject: [PATCH 4/7] [DOC] Added doc initial directory for crm, hr and project; added specifications related to hr photo and user avatar for crm, hr and project. bzr revid: tde@openerp.com-20120313115540-swptqg726tqbrhvb --- addons/crm/doc/crm_kanban_avatar.rst | 4 ++++ addons/crm/doc/index.rst | 6 ++++++ addons/crm/doc/index.rst.inc | 8 ++++++++ addons/hr/doc/hr_employee_img.rst | 8 ++++++++ addons/hr/doc/index.rst | 6 ++++++ addons/hr/doc/index.rst.inc | 8 ++++++++ addons/project/doc/index.rst | 6 ++++++ addons/project/doc/index.rst.inc | 8 ++++++++ addons/project/doc/task_kanban_avatar.rst | 4 ++++ 9 files changed, 58 insertions(+) create mode 100644 addons/crm/doc/crm_kanban_avatar.rst create mode 100644 addons/crm/doc/index.rst create mode 100644 addons/crm/doc/index.rst.inc create mode 100644 addons/hr/doc/hr_employee_img.rst create mode 100644 addons/hr/doc/index.rst create mode 100644 addons/hr/doc/index.rst.inc create mode 100644 addons/project/doc/index.rst create mode 100644 addons/project/doc/index.rst.inc create mode 100644 addons/project/doc/task_kanban_avatar.rst diff --git a/addons/crm/doc/crm_kanban_avatar.rst b/addons/crm/doc/crm_kanban_avatar.rst new file mode 100644 index 00000000000..6d5a2702fc6 --- /dev/null +++ b/addons/crm/doc/crm_kanban_avatar.rst @@ -0,0 +1,4 @@ +CRM kanban avatar specs +======================= + +Kanban view of opportunities has been updated to use the newly-introduced avatar_mini field of res.users. The avatar is placed in the right-side of the containing kanban box. CSS file has been added to hold the css definitions necessary to update the boxes. diff --git a/addons/crm/doc/index.rst b/addons/crm/doc/index.rst new file mode 100644 index 00000000000..b67e59ac1e5 --- /dev/null +++ b/addons/crm/doc/index.rst @@ -0,0 +1,6 @@ +:orphan: + +CRM module documentation +======================== + +.. include:: index.rst.inc diff --git a/addons/crm/doc/index.rst.inc b/addons/crm/doc/index.rst.inc new file mode 100644 index 00000000000..42b8c576854 --- /dev/null +++ b/addons/crm/doc/index.rst.inc @@ -0,0 +1,8 @@ + +CRM Module +'''''''''' + +.. toctree:: + :maxdepth: 1 + + crm_kanban_avatar diff --git a/addons/hr/doc/hr_employee_img.rst b/addons/hr/doc/hr_employee_img.rst new file mode 100644 index 00000000000..0c7ca0bd9c6 --- /dev/null +++ b/addons/hr/doc/hr_employee_img.rst @@ -0,0 +1,8 @@ +HR photo specs +============== + +This revision modifies the photo for HR employees. Two fields now exist in the hr.employee model: + - photo, a binary field holding the image + - photo_mini, a binary field holding an automatically resized version of the avatar. Dimensions of the resized avatar are 180x150. + +Employee photo should be used only when dealing with employees, using the photo_mini field. When dealing with users, use the res.users avatar_mini field instead. diff --git a/addons/hr/doc/index.rst b/addons/hr/doc/index.rst new file mode 100644 index 00000000000..0a7d4a7132d --- /dev/null +++ b/addons/hr/doc/index.rst @@ -0,0 +1,6 @@ +:orphan: + +HR module documentation +======================= + +.. include:: index.rst.inc diff --git a/addons/hr/doc/index.rst.inc b/addons/hr/doc/index.rst.inc new file mode 100644 index 00000000000..9e5d4c277c8 --- /dev/null +++ b/addons/hr/doc/index.rst.inc @@ -0,0 +1,8 @@ + +HR Module +''''''''' + +.. toctree:: + :maxdepth: 1 + + hr_employee_img diff --git a/addons/project/doc/index.rst b/addons/project/doc/index.rst new file mode 100644 index 00000000000..d3e68870773 --- /dev/null +++ b/addons/project/doc/index.rst @@ -0,0 +1,6 @@ +:orphan: + +Project module documentation +============================ + +.. include:: index.rst.inc diff --git a/addons/project/doc/index.rst.inc b/addons/project/doc/index.rst.inc new file mode 100644 index 00000000000..4d9fcc34b5b --- /dev/null +++ b/addons/project/doc/index.rst.inc @@ -0,0 +1,8 @@ + +Project Module +'''''''''''''' + +.. toctree:: + :maxdepth: 1 + + task_kanban_avatar diff --git a/addons/project/doc/task_kanban_avatar.rst b/addons/project/doc/task_kanban_avatar.rst new file mode 100644 index 00000000000..8403b22a227 --- /dev/null +++ b/addons/project/doc/task_kanban_avatar.rst @@ -0,0 +1,4 @@ +Task kanban avatar specs +======================== + +Kanban view of tasks has been updated to use the newly-introduced avatar_mini field of res.users. The avatar is placed in the right-side of the containing kanban box. CSS file has been added to hold the css definitions necessary to update the boxes. From 7290cb348449e5864b0d2273303021d3972c0dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 13 Mar 2012 17:10:22 +0100 Subject: [PATCH 5/7] [IMP] Removed a debug print; added context propagation in one method bzr revid: tde@openerp.com-20120313161022-mxkbk34zis7lmez9 --- addons/hr/hr.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 7c548101090..27e429c8206 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -150,7 +150,6 @@ class hr_employee(osv.osv): _inherits = {'resource.resource': "resource_id"} def onchange_photo_mini(self, cr, uid, ids, value, context=None): - print 'cacacaporinfeorinf' return {'value': {'photo': value, 'photo_mini': self._photo_resize(cr, uid, value) } } def _set_photo_mini(self, cr, uid, id, name, value, args, context=None): @@ -170,7 +169,7 @@ class hr_employee(osv.osv): if not hr_empl.photo: result[hr_empl.id] = False else: - result[hr_empl.id] = self._photo_resize(cr, uid, hr_empl.photo) + result[hr_empl.id] = self._photo_resize(cr, uid, hr_empl.photo, context=context) return result _columns = { From e755f171555466201f919a01397e41f7e4969bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 14 Mar 2012 19:03:52 +0100 Subject: [PATCH 6/7] [REM] Removed some css changes. user image now only replaces the gravatar. bzr revid: tde@openerp.com-20120314180352-8jpbv9j01jt5mq0y --- addons/crm/crm_lead_view.xml | 69 +++++++++-------- addons/crm/doc/crm_kanban_avatar.rst | 2 +- addons/crm/static/src/css/crm_kanban.css | 21 ----- addons/project/doc/task_kanban_avatar.rst | 2 +- addons/project/project_view.xml | 77 +++++++++---------- .../project/static/src/css/project_task.css | 21 ----- 6 files changed, 75 insertions(+), 117 deletions(-) delete mode 100644 addons/crm/static/src/css/crm_kanban.css delete mode 100644 addons/project/static/src/css/project_task.css diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index f156b4ffa40..52cb1b217d2 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -291,42 +291,43 @@ oe_kanban_color_red
-
- -
-
- - - - - -
- - - - - - - - - -
-
- -
- -
-
- : -
+ + + + + + +
+ + + + + + - + + + + +
+ +
+
+ + + + + + +
+
+ +
+
+ :
+
diff --git a/addons/crm/doc/crm_kanban_avatar.rst b/addons/crm/doc/crm_kanban_avatar.rst index 6d5a2702fc6..90998b0b1b9 100644 --- a/addons/crm/doc/crm_kanban_avatar.rst +++ b/addons/crm/doc/crm_kanban_avatar.rst @@ -1,4 +1,4 @@ CRM kanban avatar specs ======================= -Kanban view of opportunities has been updated to use the newly-introduced avatar_mini field of res.users. The avatar is placed in the right-side of the containing kanban box. CSS file has been added to hold the css definitions necessary to update the boxes. +Kanban view of opportunities has been updated to use the newly-introduced avatar_mini field of res.users. The avatar is placed in the right-side of the containing kanban box. diff --git a/addons/crm/static/src/css/crm_kanban.css b/addons/crm/static/src/css/crm_kanban.css deleted file mode 100644 index c029df7b2ba..00000000000 --- a/addons/crm/static/src/css/crm_kanban.css +++ /dev/null @@ -1,21 +0,0 @@ -.openerp .oe_proj_task_content_box { - margin-right: 41px; -} - -.openerp .oe_proj_task_avatar_box { - float: right; - width: 40px; -} - -.openerp .oe_kanban_avatar { - display: block; - width: 40px; - height: auto; - clip: rect(5px, 40px, 45px, 0px); -} - -.openerp .oe_kanban_avatar_wide { - height: 40px; - width: auto; - clip: rect(0px, 45px, 40px, 05px); -} diff --git a/addons/project/doc/task_kanban_avatar.rst b/addons/project/doc/task_kanban_avatar.rst index 8403b22a227..af0a460f51c 100644 --- a/addons/project/doc/task_kanban_avatar.rst +++ b/addons/project/doc/task_kanban_avatar.rst @@ -1,4 +1,4 @@ Task kanban avatar specs ======================== -Kanban view of tasks has been updated to use the newly-introduced avatar_mini field of res.users. The avatar is placed in the right-side of the containing kanban box. CSS file has been added to hold the css definitions necessary to update the boxes. +Kanban view of tasks has been updated to use the newly-introduced avatar_mini field of res.users. The avatar is placed in the right-side of the containing kanban box. diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 9f791f81053..3716187dedc 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -344,46 +344,45 @@ oe_kanban_color_green
-
- -
-
- - - - - -
- - - - -
-
-
- - - , - - - - - - - ! - -
-
+ + + + + + +
+ + + + + + +
+
+
+ + + , + + + + + + + ! +
+
diff --git a/addons/project/static/src/css/project_task.css b/addons/project/static/src/css/project_task.css deleted file mode 100644 index c029df7b2ba..00000000000 --- a/addons/project/static/src/css/project_task.css +++ /dev/null @@ -1,21 +0,0 @@ -.openerp .oe_proj_task_content_box { - margin-right: 41px; -} - -.openerp .oe_proj_task_avatar_box { - float: right; - width: 40px; -} - -.openerp .oe_kanban_avatar { - display: block; - width: 40px; - height: auto; - clip: rect(5px, 40px, 45px, 0px); -} - -.openerp .oe_kanban_avatar_wide { - height: 40px; - width: auto; - clip: rect(0px, 45px, 40px, 05px); -} From aa0ff4a15f2810a7c97487c3527a8aca8f53ddbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 14 Mar 2012 19:06:47 +0100 Subject: [PATCH 7/7] [REM] Removed call to removed css files bzr revid: tde@openerp.com-20120314180647-3nsk77xpd3mwo83i --- addons/crm/__openerp__.py | 3 --- addons/project/__openerp__.py | 3 --- 2 files changed, 6 deletions(-) diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index a5b31528761..4968176e826 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -130,9 +130,6 @@ Creates a dashboard for CRM that includes: 'test/ui/duplicate_lead.yml', 'test/ui/delete_lead.yml' ], - 'css': [ - 'static/src/css/crm_kanban.css', - ], 'installable': True, 'application': True, 'auto_install': False, diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index fc196890f78..96a7dc4f28f 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -67,9 +67,6 @@ Dashboard for project members that includes: 'test/project_process.yml', 'test/task_process.yml', ], - 'css': [ - 'static/src/css/project_task.css', - ], 'installable': True, 'auto_install': False, 'application': True,