Miguel Barão / perguntations

Download as
Browse Code »

Commit b573c04471aa4fb3a6cd67219964061a255a3621

Authored by Miguel Barão
1 parent 50a03cac
Exists in master and in 1 other branch dev

Fix badges in admin (bootstrap)

Showing 2 changed files with 8 additions and 5 deletions   Show diff stats
@@ -17,6 +17,10 @@ @@ -17,6 +17,10 @@
17 17
18 ## TODO 18 ## TODO
19 19
  20 +- update datatables para 1.11
  21 +- update codemirror para 6.0
  22 +- update mathjax para 3.2
  23 +- assinalar a vermelho os alunos que excederam o tempo.
20 - pagina de login semelhante ao aprendizations 24 - pagina de login semelhante ao aprendizations
21 - QuestionTextArea falta reportar nos comments os vários erros que podem ocorrer 25 - QuestionTextArea falta reportar nos comments os vários erros que podem ocorrer
22 (timeout, etc) 26 (timeout, etc)
perguntations/static/js/admin.js
  Diff comments   View file @b573c04
@@ -117,13 +117,12 @@ $(document).ready(function() { @@ -117,13 +117,12 @@ $(document).ready(function() {
117 d = json.data[i]; 117 d = json.data[i];
118 var uid = d['uid']; 118 var uid = d['uid'];
119 var checked = d['allowed'] ? 'checked' : ''; 119 var checked = d['allowed'] ? 'checked' : '';
120 - // var password_defined = d['password_defined'] ? ' <span class="badge badge-secondary"><i class="fa fa-key" aria-hidden="true"></i></span>' : '';  
121 - var hora_inicio = d['start_time'] ? ' <span class="badge badge-success"><i class="fas fa-hourglass-start"></i> ' + d['start_time'].slice(11,16) + '</span>': '';  
122 - var unfocus = d['unfocus'] ? ' <span class="badge badge-danger">unfocus</span>' : ''; 120 + var hora_inicio = d['start_time'] ? ' <span class="badge bg-success">' + d['start_time'].slice(11,16) + '</span>': '';
  121 + var unfocus = d['unfocus'] ? ' <span class="badge bg-danger">unfocus</span>' : '';
123 if (d['area'] > 75) 122 if (d['area'] > 75)
124 - area = ' <span class="badge badge-success"><i class="fas fa-desktop"></i>' + Math.round(d['area']) + '%</span>'; 123 + area = ' <span class="badge bg-success">' + Math.round(d['area']) + '%</span>';
125 else 124 else
126 - area = ' <span class="badge badge-danger"><i class="fas fa-desktop"></i> ' + Math.round(d['area']) + '%</span>'; 125 + area = ' <span class="badge bg-danger">' + Math.round(d['area']) + '%</span>';
127 var g = d['grades']; 126 var g = d['grades'];
128 127
129 t[i] = []; 128 t[i] = [];