From 0aa5bb7ada9a32ca632c74c85a8d69a236bef740 Mon Sep 17 00:00:00 2001 From: Martin Geubelle Date: Tue, 12 May 2015 13:29:29 +0200 Subject: [PATCH] [ADD] hr, hr_*: new dashboard view for hr departments --- addons/hr/__openerp__.py | 1 + addons/hr/hr_dashboard.xml | 60 +++++++++++++++ addons/hr/hr_view.xml | 50 ------------ addons/hr/static/src/js/hr.js | 10 --- addons/hr/static/src/less/hr_dashboard.less | 7 ++ addons/hr/static/src/less/hr_department.less | 11 --- addons/hr/views/hr.xml | 2 +- addons/hr_attendance/__openerp__.py | 1 + addons/hr_attendance/hr_dashboard.xml | 23 ++++++ addons/hr_evaluation/__openerp__.py | 1 + addons/hr_evaluation/hr_dashboard.xml | 68 +++++++++++++++++ addons/hr_evaluation/hr_evaluation_view.xml | 30 -------- addons/hr_expense/__openerp__.py | 1 + addons/hr_expense/hr_dashboard.xml | 49 ++++++++++++ addons/hr_expense/hr_expense_view.xml | 22 ------ addons/hr_holidays/__openerp__.py | 1 + addons/hr_holidays/hr_dashboard.xml | 76 +++++++++++++++++++ addons/hr_holidays/hr_holidays_view.xml | 54 ++----------- addons/hr_recruitment/__openerp__.py | 1 + addons/hr_recruitment/hr_dashboard.xml | 51 +++++++++++++ addons/hr_recruitment/hr_recruitment_view.xml | 39 ---------- addons/hr_timesheet/__openerp__.py | 3 +- addons/hr_timesheet/hr_dashboard.xml | 23 ++++++ addons/hr_timesheet_sheet/__openerp__.py | 1 + addons/hr_timesheet_sheet/hr_dashboard.xml | 39 ++++++++++ .../hr_timesheet_sheet_view.xml | 24 ------ .../report/payslip_report_view.xml | 19 +++++ 27 files changed, 432 insertions(+), 235 deletions(-) create mode 100644 addons/hr/hr_dashboard.xml create mode 100644 addons/hr/static/src/less/hr_dashboard.less delete mode 100644 addons/hr/static/src/less/hr_department.less create mode 100644 addons/hr_attendance/hr_dashboard.xml create mode 100644 addons/hr_evaluation/hr_dashboard.xml create mode 100644 addons/hr_expense/hr_dashboard.xml create mode 100644 addons/hr_holidays/hr_dashboard.xml create mode 100644 addons/hr_recruitment/hr_dashboard.xml create mode 100644 addons/hr_timesheet/hr_dashboard.xml create mode 100644 addons/hr_timesheet_sheet/hr_dashboard.xml diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py index 6b118d426b8..80d809626c9 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -66,6 +66,7 @@ You can manage: 'mail_hr_view.xml', 'res_users_view.xml', 'views/hr.xml', + 'hr_dashboard.xml', ], 'demo': ['hr_demo.xml'], 'test': [ diff --git a/addons/hr/hr_dashboard.xml b/addons/hr/hr_dashboard.xml new file mode 100644 index 00000000000..166b2c4fc31 --- /dev/null +++ b/addons/hr/hr_dashboard.xml @@ -0,0 +1,60 @@ + + + hr.department.kanban + hr.department + + + + + + + + +
+
+
+
+
+
+
+ More +
+
+
+
+
+ +
+
+
+
+
+
+
+
+ To Do +
+
+
+
+ To Approve +
+
+
+
+ Reports +
+
+
+
+ Settings +
+
+ +
+
+
+
+
+
+
\ No newline at end of file diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 9293bb8848a..1834b64e00b 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -484,56 +484,6 @@ - - hr.department.kanban - hr.department - - - - - - - -
-
- -
-
- -
-
- To Approve -
-
- To Do -
-
-
-
-
-
-
-
-
- - - - - Departments hr.department diff --git a/addons/hr/static/src/js/hr.js b/addons/hr/static/src/js/hr.js index 60c5af11688..9fda01cef95 100644 --- a/addons/hr/static/src/js/hr.js +++ b/addons/hr/static/src/js/hr.js @@ -3,16 +3,6 @@ odoo.define('hr.hr', function(require) { var common = require('web_kanban.common'); -common.KanbanRecord.include({ - on_card_clicked: function() { - if (this.view.dataset.model === 'hr.department') { - this.$('.oe_kanban_department .oe_kanban_content a').first().click(); - } else { - this._super.apply(this, arguments); - } - }, -}); - }); diff --git a/addons/hr/static/src/less/hr_dashboard.less b/addons/hr/static/src/less/hr_dashboard.less new file mode 100644 index 00000000000..0e9f5ecfc70 --- /dev/null +++ b/addons/hr/static/src/less/hr_dashboard.less @@ -0,0 +1,7 @@ +.o_hr_kanban { + .oe_kanban_record { + max-width: 500px !important; + min-width: 400px !important; + min-height: 200px !important; + } +} \ No newline at end of file diff --git a/addons/hr/static/src/less/hr_department.less b/addons/hr/static/src/less/hr_department.less deleted file mode 100644 index 7f6b3bb0214..00000000000 --- a/addons/hr/static/src/less/hr_department.less +++ /dev/null @@ -1,11 +0,0 @@ -.openerp { - .oe_kanban_view .oe_kanban_department { - width: 365px; - .container{ - width: inherit; - } - .oe_kanban_content div:first-child{ - margin-right: 0px - } - } -} diff --git a/addons/hr/views/hr.xml b/addons/hr/views/hr.xml index aa6238469a6..44fb6d8655e 100644 --- a/addons/hr/views/hr.xml +++ b/addons/hr/views/hr.xml @@ -4,7 +4,7 @@