OCA
/
reporting-engine
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Highlight invalid ranges

pull/267/head
Iván Todorovich 7 years ago
committed by Adrià Gil Sorribes
parent
46ebc0ee5b
commit
e8321a7341
7 changed files with 116 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      kpi/models/kpi_threshold.py
  2. 8
      kpi/models/kpi_threshold_range.py
  3. 2
      kpi/views/kpi.xml
  4. 2
      kpi/views/kpi_category.xml
  5. 2
      kpi/views/kpi_history.xml
  6. 7
      kpi/views/kpi_threshold.xml
  7. 8
      kpi/views/kpi_threshold_range.xml

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

2
kpi/views/kpi.xml
View File

@ -48,6 +48,7 @@
<field name="model">kpi</field>
<field name="arch" type="xml">
<form string="Key Performance Indicator">
<sheet>
<group col="6" colspan="6">
<field name="name" colspan="2"/>
<field name="threshold_id" colspan="2"/>
@ -79,6 +80,7 @@
<field name="description" nolabel="1"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>

2
kpi/views/kpi_category.xml
View File

@ -23,11 +23,13 @@
<field name="model">kpi.category</field>
<field name="arch" type="xml">
<form string="Category">
<sheet>
<group col="2" colspan="2">
<field name="name" colspan="2"/>
<newline/>
<field name="description" colspan="2"/>
</group>
</sheet>
</form>
</field>
</record>

2
kpi/views/kpi_history.xml
View File

@ -23,6 +23,7 @@
<field name="model">kpi.history</field>
<field name="arch" type="xml">
<form string="KPI History">
<sheet>
<group col="4" colspan="4">
<field name="kpi_id"/>
<field name="name"/>
@ -31,6 +32,7 @@
<field name="color" widget="color"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
</sheet>
</form>
</field>
</record>

7
kpi/views/kpi_threshold.xml
View File

@ -9,7 +9,7 @@
<field name="name">kpi.threshold.tree</field>
<field name="model">kpi.threshold</field>
<field name="arch" type="xml">
<tree string="Thresholds">
<tree string="Thresholds" decoration-danger="invalid_message">
<field name="name"/>
<field name="invalid_message"/>
<field name="company_id" groups="base.group_multi_company"/>
@ -22,6 +22,7 @@
<field name="model">kpi.threshold</field>
<field name="arch" type="xml">
<form string="Threshold">
<sheet>
<group col="6" colspan="6">
<field name="name" colspan="2"/>
<field name="company_id" groups="base.group_multi_company" colspan="2"/>
@ -34,9 +35,11 @@
<newline/>
<field name="kpi_ids" nolabel="1" colspan="6"/>
<newline/>
<field name="invalid_message" nolabel="1" attrs="{'invisible' : [('invalid_message', '=', '')]}" colspan="2"/>
<separator string="Errors" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
<field name="invalid_message" nolabel="1" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
<newline/>
</group>
</sheet>
</form>
</field>
</record>

8
kpi/views/kpi_threshold_range.xml
View File

@ -9,7 +9,7 @@
<field name="name">kpi.threshold.range.tree</field>
<field name="model">kpi.threshold.range</field>
<field name="arch" type="xml">
<tree string="Ranges">
<tree string="Ranges" decoration-danger="invalid_message">
<field name="name"/>
<field name="min_value"/>
<field name="max_value"/>
@ -25,6 +25,7 @@
<field name="model">kpi.threshold.range</field>
<field name="arch" type="xml">
<form string="Range">
<sheet>
<group col="6" colspan="6">
<field name="name"/>
<field name="color"/>
@ -53,9 +54,10 @@
<newline/>
<separator string="Thresholds" colspan="4"/>
<field name="threshold_ids" nolabel="1" colspan="4"/>
<separator string="Errors" attrs="{'invisible' : [('invalid_message', '=', '')]}" colspan="4"/>
<field name="invalid_message" nolabel="1" attrs="{'invisible' : [('invalid_message', '=', '')]}" colspan="4"/>
<separator string="Errors" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
<field name="invalid_message" nolabel="1" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
</group>
</sheet>
</form>
</field>
</record>

Write Preview
Loading…
Cancel
Save