diff --git a/sigi/apps/metas/models.py b/sigi/apps/metas/models.py index e30d648..6086fd1 100644 --- a/sigi/apps/metas/models.py +++ b/sigi/apps/metas/models.py @@ -53,14 +53,14 @@ class Meta(models.Model): meses_gastos = (date.today() - self.data_inicio).days / 30 meta_mensal = self.valor_meta / total_meses return meta_mensal * meses_gastos - + @property - def valor_desejado_high(self): - return self.valor_desejado * 1.1 - + def percentual_desejado_low(self): + return self.valor_desejado * 0.9 / self.valor_meta + @property - def valor_desejado_low(self): - return self.valor_desejado * 0.9 + def percentual_desejado_high(self): + return self.valor_desejado * 1.1 / self.valor_meta @property def saude(self): diff --git a/sigi/templates/snippets/modules/charts-convenios.html b/sigi/templates/snippets/modules/charts-convenios.html index ccfae74..e1708bb 100644 --- a/sigi/templates/snippets/modules/charts-convenios.html +++ b/sigi/templates/snippets/modules/charts-convenios.html @@ -127,11 +127,8 @@ {% for meta in metas %} {{ meta.titulo }} - - {{ meta.percentual_concluido }}%