Download as
Browse Code »

Commit 3853486017c2e9619e402a7be08d02a785e20e86

Authored by Gustavo
1 parent 8bb2c82e
Exists in master and in 2 other branches amadeus_univasf, refactoring

Fixing goals conditional and adjusting difficulties comunication field in the bulletin

Showing 1 changed file with 18 additions and 12 deletions   Show diff stats
bulletin/templates/bulletin/window_view.html
  Diff comments   View file @3853486
... ... @@ -111,12 +111,11 @@
111 111 {% endif %}
112 112 <!-- Cor amarela -->
113 113  
114   -
115   - <!-- Cor verde -->
116   - {% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida %}
  114 + <!-- Cor verde -->
  115 + {% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == 100 %}
117 116 <th style="text-align:center;background-color:#00d337; text-shadow: 1px 1px 10px #000; color:#fff; font-weight: normal;">{{ meta.alcancada }}%</th>
118   - {% endif %}
119   - <!-- Cor verde -->
  117 + {% endif %}
  118 + <!-- Cor verde -->
120 119  
121 120 <!-- Cor vermelha -->
122 121 {% if meta.alcancada < meta.desejada and meta.alcancada < meta.estabelecida %}
... ... @@ -189,14 +188,21 @@
189 188 </div>
190 189 </div>
191 190 </div>
192   - <div style=" padding-left: 0px;padding-right: 0px;">
193   - <div align="left" style="font-size:22px; color: #878787; padding-top: 15px;"><img src="{% static 'img/warning.png' %}" height="40" width="50" align= "bottom"/>{% trans 'There are obstructions to your activities?' %}</div>
194   - <hr style="height:2px; background-color:#878787; margin-top: 5px;"><br>
195   - <div style="background-color:#fff; box-shadow: 1px 1px 10px #c0beaf; margin-top: -20px;">
196   - <p align="left" style="font-size:16px; padding-left: 15px; padding-top: 20px; padding-bottom: 20px; "><a data-toggle="modal" data-target="#bulletin-difficulties-modal" href=""><b>{% trans 'Click here' %}</b></a> {% trans 'to communicate the difficulties that may decrease your performance.' %}</p>
  191 +
  192 + <div class="form-group" style="background-color:#fff; box-shadow: 1px 1px 25px #c0beaf; margin-top: 15px;">
  193 + <div class="row">
  194 + <div class="col-md-1" align="left" style="padding-left: 25px; padding-top: 10px;">
  195 + <img src="{% static 'img/warning.png' %}" height="80" width="95"/>
  196 + </div>
  197 + <div class="col-md-11">
  198 + <div class="row">
  199 + <div align="left" style="padding-left: 25px; font-size:22px; color: #878787; padding-top: 15px;padding-bottom: 20px;">{% trans 'There are obstructions to your activities?' %}</div>
  200 + <div align="left" style="padding-left: 25px; padding-right:35px; font-size:16px;"><p><a data-toggle="modal" data-target="#bulletin-difficulties-modal" href=""><b>{% trans 'Click here' %}</b></a> {% trans 'to communicate the difficulties that may decrease your performance.' %}</p></div>
  201 + </div>
  202 + </div>
197 203 </div>
198   - <br>
199   - </div>
  204 + </div>
  205 + </br>
200 206 <div class="modal fade" tabindex="-1" role="dialog" id="bulletin-difficulties-modal">
201 207 <div class="modal-dialog" role="document">
202 208 <div class="modal-content">
... ...