From 3853486017c2e9619e402a7be08d02a785e20e86 Mon Sep 17 00:00:00 2001 From: Gustavo Date: Fri, 18 Aug 2017 00:10:06 -0300 Subject: [PATCH] Fixing goals conditional and adjusting difficulties comunication field in the bulletin --- bulletin/templates/bulletin/window_view.html | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/bulletin/templates/bulletin/window_view.html b/bulletin/templates/bulletin/window_view.html index 6cc039d..51e769d 100644 --- a/bulletin/templates/bulletin/window_view.html +++ b/bulletin/templates/bulletin/window_view.html @@ -111,12 +111,11 @@ {% endif %} - - - {% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida %} + + {% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == 100 %} {{ meta.alcancada }}% - {% endif %} - + {% endif %} + {% if meta.alcancada < meta.desejada and meta.alcancada < meta.estabelecida %} @@ -189,14 +188,21 @@ -
-
{% trans 'There are obstructions to your activities?' %}
-

-
-

{% trans 'Click here' %} {% trans 'to communicate the difficulties that may decrease your performance.' %}

+ +
+
+
+ +
+
+
+
{% trans 'There are obstructions to your activities?' %}
+

{% trans 'Click here' %} {% trans 'to communicate the difficulties that may decrease your performance.' %}

+
+
-
-
+
+