From bd112fc28d609888ed5e7c77d75c941892cbc8ca Mon Sep 17 00:00:00 2001 From: Lara Date: Thu, 11 Jan 2024 12:19:55 -0300 Subject: [PATCH] [MIG] okr: Migration to 17.0 --- okr/__manifest__.py | 3 +- okr/models/__init__.py | 1 + okr/models/okr.py | 19 +++++----- okr/models/okr_results.py | 27 ++++++++++++++ okr/security/ir.model.access.csv | 1 + okr/static/description/icon.png | Bin 0 -> 1809 bytes okr/views/okr_menu.xml | 11 ++++-- okr/views/okr_results_views.xml | 62 +++++++++++++++++++++++++++++++ okr/views/okr_views.xml | 30 +++++++++++++-- 9 files changed, 137 insertions(+), 17 deletions(-) create mode 100644 okr/models/okr_results.py create mode 100644 okr/static/description/icon.png create mode 100644 okr/views/okr_results_views.xml diff --git a/okr/__manifest__.py b/okr/__manifest__.py index 98dd6d43..e8ff172f 100644 --- a/okr/__manifest__.py +++ b/okr/__manifest__.py @@ -1,13 +1,14 @@ { 'name': 'OKR', - 'version': "16.0.1.0.0", + 'version': "17.0.1.0.0", 'depends': ['base'], 'application': True, 'data': [ 'security/ir.model.access.csv', 'views/okr_views.xml', 'views/okr_menu.xml', + 'views/okr_results_views.xml', ], 'license': 'LGPL-3', } diff --git a/okr/models/__init__.py b/okr/models/__init__.py index daf566ba..a0b61ce9 100644 --- a/okr/models/__init__.py +++ b/okr/models/__init__.py @@ -1 +1,2 @@ from . import okr +from . import okr_results diff --git a/okr/models/okr.py b/okr/models/okr.py index b6c7885b..55baa1ea 100644 --- a/okr/models/okr.py +++ b/okr/models/okr.py @@ -1,5 +1,4 @@ from odoo import models,fields -import datetime class Okr(models.Model): @@ -7,13 +6,13 @@ class Okr(models.Model): _description= 'Gestión de Okrs' _order = "id desc" - name= fields.Char(required=True) + name= fields.Char(required=True,) description = fields.Text() - area = fields.Selection([('sistemas', 'Sistemas'),('ventas','Ventas')]) - number_q = fields.Integer() - progress = fields.Float() - peso = fields.Float() - user_id = fields.Many2one('res.users', string='Responsable') - # target - # equipo - # responsable + area = fields.Selection([('i+d', 'I+D'),('aministracion','Administración'),('rrhh', 'Recursos Humanos'), ('ventas', 'Ventas'),('consultoria', 'Consultoria'),('mdea','Mesa de Ayuda'), ('adhoc','Adhoc')]) + number_q = fields.Integer(string='Número de Q') + progress = fields.Float(compute="_compute_progress") + type = fields.Selection([('commitment', 'Commitment'), ('inspiring', 'Inspiring')]) + weight = fields.Float() + responsible = fields.Many2one('res.users') + target = fields.Integer(required=True, default=0) + users_id = fields.Many2one('res.users') diff --git a/okr/models/okr_results.py b/okr/models/okr_results.py new file mode 100644 index 00000000..f9667b03 --- /dev/null +++ b/okr/models/okr_results.py @@ -0,0 +1,27 @@ +from odoo import api, models,fields + + +class OkrResults(models.Model): + _name = 'okr.results' + _description= 'Resultados Okr' + _order = "id desc" + + name= fields.Char(required=True,) + description = fields.Text() + area = fields.Selection([('i+d', 'I+D'),('aministracion','Administración'),('rrhh', 'Recursos Humanos'), ('ventas', 'Ventas'),('consultoria', 'Consultoria'),('mdea','Mesa de Ayuda'), ('adhoc','Adhoc')]) + number_q = fields.Integer(string='Número de Q') + progress = fields.Float(compute="_compute_progress") + type = fields.Selection([('commitment', 'Commitment'), ('inspiring', 'Inspiring')]) + weight = fields.Float() + responsible = fields.Many2one('res.users') + target = fields.Integer(required=True, default=0) + users_id = fields.Many2one('res.users') + results = fields.Integer() + + @api.depends('results', 'target') + def _compute_progress(self): + for rec in self: + if rec.results and rec.target: + rec.progress = (rec.results / rec.target)*100 + else: + rec.progress = 0 diff --git a/okr/security/ir.model.access.csv b/okr/security/ir.model.access.csv index 6e6ab2e8..0638325d 100644 --- a/okr/security/ir.model.access.csv +++ b/okr/security/ir.model.access.csv @@ -1,3 +1,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink okr.access_okr,access_okr,okr.model_okr,base.group_user,1,1,1,1 +access_okr_results,okr_results,model_okr_results,base.group_user,1,1,1,1 diff --git a/okr/static/description/icon.png b/okr/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..14f13d0bde9e72b024addce1dadb165a5d68de75 GIT binary patch literal 1809 zcmV+s2k!WZP)h zWm%SGS(as4mStI%m46Hr!`ei@TW|+}<3YyYIq@L}#IJtwFa2G^8i3GX92$sh-beqZ z(nlX$2SxD0AiY#th2opshXG{bmslnSSm_L6xCF==Vht_%9$qORzg}2r&a*@FOQ4Xl zAgxc%42l&z28;r%S^2U=96ax|ij%B%v;hg>*+Kej``y0M5%i(DX5~l1&WV+F&e=aR z4GN?l#5;9*41tfvjPO`uX4UzMGae_*@`Yh~sT8e^T9t_I{xA0`nRvf z7-a|(kTIGq1-~%F4qR+NOdMjO7)5mFbi^PW_yp~**1w%0tLcbA#JYIiU{n zQXolgPZ^E7CN;=E*g z*v>t4h7?^-%cYTS{+%naV-Q@p5B~ReLATZu#e-pELW3ap2SKBDjQb0a6yAEMJBs*r z47?OJC^U$8FQM;5m9%06bVm`_-YQ{Z!guOS&(T%dF#oZ*p)?o|zM)2O)-bjNiq~5U;t^=Kvpi7Fb`r^Ju!!!P)=q3o>Knzo+iQIK+_q z7(~nv+I+>FDM*hk$PSKlUslvv(i1Vd#hEFHbH(A=A=%-PE-tpXI|7nNTs;?qM4c%N z7aepCLj;k6l#d;2h+~e>>DQAn0`gH%Z01iyeKaBR<@eI@_a_lIKI-b}7y+p$c%n2s zI|&iReqg70>P%hKTyuNSrijsPgMA7D)=T?mM<9koPf&>{QzA;Wy%3u%Mqq6eap@1I zGEekCyGH*dn|f+ zWakuH-F$5_;;INtm+K3OW02HtawtzNjEDt`bvB=46k|NC7$o(deK6sgt zAV#WRgsBH1n;?pk7(_`B(!)`d#URRpkRFVpGzL)`g!E7pF7U1tA$kF){`*G6+!^#n>3c*dRnf6r*Dhql1tXqZl89826(!))OnR zE>`4W1XzUl7TLBfhfI$_jGrNaht(Ye1;#Fm1&;Ki;Y7%L9^$K8>o=7>Z=a^z1R+tQ zXQACe z#6g?`Z0^l#49l`C%d#xXvMkH8EX%Sit5^I3+>_MQh6jwR00000NkvXXu0mjfA{;UK literal 0 HcmV?d00001 diff --git a/okr/views/okr_menu.xml b/okr/views/okr_menu.xml index 986c1389..cf6ad25a 100644 --- a/okr/views/okr_menu.xml +++ b/okr/views/okr_menu.xml @@ -1,5 +1,10 @@ - - - + + + + + + diff --git a/okr/views/okr_results_views.xml b/okr/views/okr_results_views.xml new file mode 100644 index 00000000..b2b449fc --- /dev/null +++ b/okr/views/okr_results_views.xml @@ -0,0 +1,62 @@ + + + + + + Okr Results + okr.results + + + + + + + + okir.view.form + okr.results + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/okr/views/okr_views.xml b/okr/views/okr_views.xml index 69c4374b..717954d1 100644 --- a/okr/views/okr_views.xml +++ b/okr/views/okr_views.xml @@ -14,18 +14,42 @@ + - + okir.view.form okr
- - + + + + + + + + + + + + + + + + + + + + + + + + +