audrius/reporting-engine
1
0
Fork 1
mirror of https://github.com/OCA/reporting-engine.git synced 2025-02-16 16:30:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Highlight invalid ranges

Browse Source
This commit is contained in:
Iván Todorovich
2017-12-13 14:32:11 -03:00
committed by flachica
parent c025c00cac
commit cd45a7ff91
7 changed files with 116 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
kpi/models/kpi_threshold.py
View File

@@ -13,27 +13,25 @@ class KPIThreshold(models.Model):
@api.multi
def _compute_is_valid_threshold(self):
result = {}
for obj in self:
# check if ranges overlap
# TODO: This code can be done better
obj.valid = True
for range1 in obj.range_ids:
for range2 in obj.range_ids:
if (range1.valid and range2.valid and
range1.min_value < range2.min_value):
result[obj.id] = range1.max_value <= range2.min_value
return result
@api.multi
def _compute_generate_invalid_message(self):
result = {}
for obj in self:
if not range1.valid:
obj.valid = False
break
for range2 in (obj.range_ids-range1):
if (range1.max_value >= range2.min_value and
range1.min_value <= range2.max_value):
obj.valid = False
break
if obj.valid:
result[obj.id] = ""
obj.invalid_message = None
else:
result[obj.id] = ("Two of your ranges are overlapping. Please "
"make sure your ranges do not overlap.")
return result
obj.invalid_message = (
"Some ranges are invalid or overlapping. "
"Please make sure your ranges do not overlap.")
name = fields.Char('Name', size=50, required=True)
range_ids = fields.Many2many(
@@ -46,7 +44,7 @@ class KPIThreshold(models.Model):
valid = fields.Boolean(string='Valid', required=True,
compute="_compute_is_valid_threshold", default=True)
invalid_message = fields.Char(string='Message', size=100,
compute="_compute_generate_invalid_message")
compute="_compute_is_valid_threshold")
kpi_ids = fields.One2many('kpi', 'threshold_id', 'KPIs')
company_id = fields.Many2one(
'res.company', 'Company',

8
kpi/models/kpi_threshold_range.py
View File

@@ -92,10 +92,8 @@ class KPIThresholdRange(models.Model):
'res.company', 'Company',
default=lambda self: self.env.user.company_id.id)
@api.multi
def _compute_min_value(self):
result = {}
for obj in self:
value = None
error = None
@@ -121,11 +119,9 @@ class KPIThresholdRange(models.Model):
error = str(e)
obj.min_value = value
obj.min_error = error
return result
@api.multi
def _compute_max_value(self):
result = {}
for obj in self:
value = None
error = None
@@ -151,11 +147,9 @@ class KPIThresholdRange(models.Model):
error = str(e)
obj.max_value = value
obj.max_error = error
return result
@api.multi
def _compute_is_valid_range(self):
result = {}
for obj in self:
if obj.min_error or obj.max_error:
obj.valid = False
@@ -170,5 +164,3 @@ class KPIThresholdRange(models.Model):
else:
obj.valid = True
obj.invalid_message = ""
return result