From 385996f5b4c6c6743d12bfd6dfcf2b796a706639 Mon Sep 17 00:00:00 2001 From: blackbelts <74664702+eslamtalaat74@users.noreply.github.com> Date: Tue, 24 Jun 2025 10:08:26 +0300 Subject: [PATCH 1/2] appraial fin --- .../employee_requests/models/other_request.py | 25 +++++---------- .../exp_hr_appraisal/models/appraisal.py | 32 +++++++++---------- 2 files changed, 23 insertions(+), 34 deletions(-) diff --git a/odex25_hr/employee_requests/models/other_request.py b/odex25_hr/employee_requests/models/other_request.py index 71960bf1e..ae33457e4 100644 --- a/odex25_hr/employee_requests/models/other_request.py +++ b/odex25_hr/employee_requests/models/other_request.py @@ -93,17 +93,12 @@ class EmployeeOtherRequest(models.Model): if item.request_type == 'dependent': if not item.employee_dependant: raise exceptions.Warning(_('Please The dependents were not Included')) - #if item.employee_id.contract_id.contract_status == 'single': - #raise exceptions.Warning(_('You can not Add Fimaly record Because Employee is Single')) + # if item.employee_id.contract_id.contract_status == 'single': + # raise exceptions.Warning(_('You can not Add Fimaly record Because Employee is Single')) else: for rec in item.employee_dependant: - if not rec.attachment: - raise exceptions.Warning(_('Please Insert dependents Attachments Files Below!')) - - - item.state = "submit" - - + if not rec.attachment: + raise exceptions.Warning(_('Please Insert dependents Attachments Files Below!')) if item.request_type == 'qualification': if not item.qualification_employee: @@ -111,22 +106,18 @@ class EmployeeOtherRequest(models.Model): for rec in item.qualification_employee: if not rec.attachment: raise exceptions.Warning(_('Please Insert Attachments Files Below!')) - else: - item.state = "submit" + if item.request_type == 'certification': if not item.certification_employee: raise exceptions.Warning(_('Please The qualification or certification were not Insert Below!')) for rec in item.certification_employee: if not rec.attachment: raise exceptions.Warning(_('Please Insert Attachments Files Below!')) - else: - item.state = "submit" + if item.request_type in ['suggestion', 'complaint']: + item.state = "submit" else: - if item.request_type in ['suggestion', 'complaint']: - item.state = "submit" - else: - item.state = "confirm" + item.state = "confirm" def confirm(self): #self.state = 'confirm' diff --git a/odex25_hr/exp_hr_appraisal/models/appraisal.py b/odex25_hr/exp_hr_appraisal/models/appraisal.py index 2bf8ccfdb..24232a1ea 100644 --- a/odex25_hr/exp_hr_appraisal/models/appraisal.py +++ b/odex25_hr/exp_hr_appraisal/models/appraisal.py @@ -257,6 +257,7 @@ class StandardAppraisalLines(models.Model): _name = 'standard.appraisal.line' _rec_name = 'greed' _description = 'Standard Appraisal line' + standard_appraisal_employee_line = fields.Many2one('hr.employee.appraisal') greed = fields.Float() accrued_greed = fields.Float() @@ -269,38 +270,36 @@ class StandardAppraisalLines(models.Model): ('3', '3'), ('4', '4'), ('5', '5'), - ('6', '6'), + # ('6', '6'), ], string='Priority', - compute='_compute_priority', - inverse='_inverse_priority', + store=True ) - - standard_appraisal_employee_line = fields.Many2one('hr.employee.appraisal') - - @api.depends('greed', 'great_level') + # compute = '_compute_priority', + # inverse = '_inverse_priority', + # inverse='_inverse_priority', + # @api.depends('greed', 'great_level','priority') + @api.onchange('greed', 'great_level') def _compute_priority(self): for rec in self: if rec.great_level: value = rec.greed / (rec.great_level / 5) - # 3.5 - if 1 <= value <= 2: + if 1 <= value < 2: rec.priority = '1' - elif 2 < value <= 3: + elif 2 <= value < 3: rec.priority = '2' - # 3.5 - elif 3 < value <= 4: + elif 3 <= value < 4: rec.priority = '3' - # 4 - elif 4 < value <= 5: + elif 4 <= value < 5: rec.priority = '4' - elif value > 5: + elif value >= 5: rec.priority = '5' else: rec.priority = '0' # fallback else: rec.priority = '0' + print("lllll") print(rec.priority) @@ -308,11 +307,10 @@ class StandardAppraisalLines(models.Model): def _inverse_priority(self): for rec in self: if rec.great_level and rec.priority: - # 3*2 - # 2*4 print("kkkkkkkkk") print(int(rec.priority) * (rec.great_level / 5)) rec.greed = int(rec.priority) * (rec.great_level / 5) + print(rec.greed) @api.constrains('greed', 'great_level') def greed_constrains(self): From 5930697b8eaf79d852bc2651e04a3079ffef163d Mon Sep 17 00:00:00 2001 From: blackbelts <74664702+eslamtalaat74@users.noreply.github.com> Date: Tue, 24 Jun 2025 10:10:30 +0300 Subject: [PATCH 2/2] appraial fin --- odex25_hr/exp_hr_appraisal/models/appraisal.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/odex25_hr/exp_hr_appraisal/models/appraisal.py b/odex25_hr/exp_hr_appraisal/models/appraisal.py index 24232a1ea..dbcb1c768 100644 --- a/odex25_hr/exp_hr_appraisal/models/appraisal.py +++ b/odex25_hr/exp_hr_appraisal/models/appraisal.py @@ -299,8 +299,6 @@ class StandardAppraisalLines(models.Model): rec.priority = '0' # fallback else: rec.priority = '0' - - print("lllll") print(rec.priority) @api.onchange('priority')