SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Inicia sincronizacao de cronometros no painel do operador

pull/2894/head
Cesar Carvalho 7 years ago
parent
01a5861873
commit
7e31443af8
8 changed files with 143 additions and 44 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. 7
      sapl/base/templatetags/common_tags.py
  2. 26
      sapl/painel/migrations/0010_auto_20190711_1030.py
  3. 20
      sapl/painel/migrations/0011_cronometro_last_stop_duration.py
  4. 21
      sapl/painel/models.py
  5. 17
      sapl/painel/views.py
  6. 7
      sapl/sessao/views.py
  7. 12
      sapl/templates/painel/index.html
  8. 77
      sapl/templates/sessao/painel.html

7
sapl/base/templatetags/common_tags.py
View File

@ -4,6 +4,7 @@ import re
from django import template
from django.template.defaultfilters import stringfilter
from django.utils.safestring import mark_safe
from django.utils import timezone
from webpack_loader import utils
from sapl.base.models import AppConfig
@ -271,6 +272,12 @@ def cronometro_to_seconds(value):
def duration_to_seconds(cronometro_duration):
return cronometro_duration.seconds
@register.filter
def duration_difference(cronometro_duration, last_time):
difference_to_now = timezone.now()-last_time
if difference_to_now < cronometro_duration:
return (cronometro_duration-difference_to_now).seconds
return cronometro_duration.seconds
@register.filter
def to_list_pk(object_list):

26
sapl/painel/migrations/0010_auto_20190711_1030.py
View File

@ -0,0 +1,26 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-07-11 13:30
from __future__ import unicode_literals
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('painel', '0009_painelconfig_mostrar_votos_antecedencia'),
]
operations = [
migrations.AddField(
model_name='cronometro',
name='ultima_alteracao_status',
field=models.DateTimeField(default=django.utils.timezone.now),
),
migrations.AlterField(
model_name='cronometro',
name='status',
field=models.CharField(choices=[('I', 'Start'), ('R', 'Reset'), ('S', 'Stop'), ('C', 'Increment')], default='R', max_length=1, verbose_name='Status do cronômetro'),
),
]

20
sapl/painel/migrations/0011_cronometro_last_stop_duration.py
View File

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-07-11 14:30
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('painel', '0010_auto_20190711_1030'),
]
operations = [
migrations.AddField(
model_name='cronometro',
name='last_stop_duration',
field=models.DurationField(blank=True, null=True, verbose_name='Última duração salva em stop'),
),
]

21
sapl/painel/models.py
View File

@ -2,7 +2,7 @@ import reversion
from django.db import models
from django.utils.translation import ugettext_lazy as _
from sapl.utils import YES_NO_CHOICES
from django.utils import timezone
@reversion.register()
class Painel(models.Model):
@ -24,12 +24,6 @@ class Painel(models.Model):
@reversion.register()
class Cronometro(models.Model):
CRONOMETRO_TYPES = (
('A', _('Aparte')),
('D', _('Discurso')),
('O', _('Ordem do dia')),
('C', _('Considerações finais'))
)
CRONOMETRO_STATUS = (
('I', 'Start'),
@ -42,17 +36,28 @@ class Cronometro(models.Model):
max_length=1,
verbose_name=_('Status do cronômetro'),
choices=CRONOMETRO_STATUS,
default='S')
default='R')
ultima_alteracao_status = models.DateTimeField(default=timezone.now)
last_stop_duration = models.DurationField(
blank=True,
null=True,
verbose_name=_("Última duração salva em stop"))
duracao_cronometro = models.DurationField(
verbose_name=_('Duração do cronômetro'))
tipo = models.CharField(
max_length=100,
verbose_name=_('Tipo Cronômetro'),
unique=True)
ativo = models.BooleanField(
default=False,
choices=YES_NO_CHOICES,
verbose_name=_('Ativo?'))
ordenacao = models.PositiveIntegerField(
blank=True,
null=True,

17
sapl/painel/views.py
View File

@ -336,10 +336,12 @@ def votante_view(request):
@user_passes_test(check_permission)
def painel_view(request, pk):
dict_ultima_alteracao_cronometros = dict(Cronometro.objects.filter(ativo=True).order_by('ordenacao').values_list('id', 'ultima_alteracao_status'))
context = {'head_title': str(_('Painel Plenário')),
'sessao_id': pk,
'cronometros': Cronometro.objects.filter(ativo=True).order_by('ordenacao'),
'painel_config': PainelConfig.objects.first(),
'ult_alteracao_cronometros': dict_ultima_alteracao_cronometros,
'casa': CasaLegislativa.objects.last()
}
return render(request, 'painel/index.html', context)
@ -395,22 +397,13 @@ def cronometro_painel(request):
cronometro_id = request.GET['tipo'].split('cronometro_')[1]
cronometro = Cronometro.objects.get(id=cronometro_id)
cronometro.status = CRONOMETRO_STATUS[acao]
cronometro.ultima_alteracao_status = timezone.now()
# Caso não seja stop, last_time virá como 0
cronometro.last_stop_duration = request.GET.get('last_time')
cronometro.save()
return HttpResponse({})
def get_cronometro_status(request, name):
logger = logging.getLogger(__name__)
username = request.user.username
try:
logger.debug("user=" + username + ". Tentando obter cronometro.")
cronometro = request.session[name]
except KeyError as e:
logger.error("user=" + username + ". Erro ao obter cronometro. Retornado como vazio. " + str(e))
cronometro = ''
return cronometro
def get_materia_aberta(pk):
return OrdemDia.objects.filter(
sessao_plenaria_id=pk, votacao_aberta=True).last()

7
sapl/sessao/views.py
View File

@ -1055,9 +1055,10 @@ class PainelView(PermissionRequiredForAppCrudMixin, TemplateView):
self.template_name = 'painel/index.html'
cronometros = Cronometro.objects.filter(ativo=True).order_by('ordenacao')
for cronometro in cronometros:
cronometro.status = 'S' # Stop
cronometro.save()
# for cronometro in cronometros:
# cronometro.status = 'S' # Stop
# cronometro.ultima_alteracao_status = timezone.now()
# cronometro.save()
return TemplateView.get(self, request, *args, **kwargs)

12
sapl/templates/painel/index.html
View File

@ -330,14 +330,22 @@
};
var ids = [];
var status_cronometros = []
var status_cronometros = [];
for (var key in data['cronometros']) {
if (data['cronometros'].hasOwnProperty(key)) {
ids.push(key);
status_cronometros.push(data['cronometros'][key])
status_cronometros.push(data['cronometros'][key]);
}
}
//var ult_alteracao_cronometros = [];
//for (let id of ids) {
// ult_alteracao_cronometros.push(data['ult_alteracao_cronometros'][id]);
//}
//console.log(data['ult_alteracao_cronometros']);
//console.log(ult_alteracao_cronometros);
for(let i=0; i<status_cronometros.length; i++){
if (!cronometros_previous[i])
cronometros_previous[i] = ''

77
sapl/templates/sessao/painel.html
View File

@ -115,6 +115,28 @@ function playAudioNumVezes(audio, times, ended) {
audio.play();
}
function convertValueToDuration(value){
let h = Math.floor((value/1000) / 3600);
h = checkTime(h);
let m = Math.floor((value/1000) % 3600 / 60);
m = checkTime(m);
let s = Math.floor((value/1000) % 3600 % 60);
s = checkTime(s);
return h.toString() + ":" + m.toString() + ":" + s.toString();
}
function getDifferenceToNow(ultima_alteracao, duracao_cronometro){
var today = new Date();
var djDate = new Date(ultima_alteracao);
var difference = today.getTime() - djDate.getTime();
var dif = convertValueToDuration(difference);
console.log(difference/(1000));
if(dif > convertValueToDuration(duracao_cronometro)){
return 0;
}
return difference/1000;
}
$(document).ready(function(){
let pk_sessao = parseInt("{{root_pk}}");
@ -152,23 +174,40 @@ $(document).ready(function(){
{% for cron in cronometros %}
$('#cronometro_' + "{{cron.id}}").prop('disabled', false);
console.log("{{cron.status}}", "{{cron.last_stop_duration}}")
{% if cron.status == 'I' %}
$('#cronometro_' + "{{cron.id}}" + '_Reset').hide();
$('#cronometro_' + "{{cron.id}}").runner('start');
$('#cronometro_' + "{{cron.id}}" + '_Start').text('Parar');
//var resposta = getDifferenceToNow({{ cron.ultima_alteracao_status|date:"U" }} * 1000, "{{cron.duracao_cronometro|duration_to_seconds}}");
//console.log(resposta);
{% else %}
$('#cronometro_' + "{{cron.id}}" + '_Reset').show();
$('#cronometro_' + "{{cron.id}}").runner('stop');
$('#cronometro_' + "{{cron.id}}" + '_Start').text('Iniciar');
{% endif %}
$('#cronometro_' + "{{cron.id}}").runner({
autostart: false,
autostart: {% if cron.status == "I"%} true {% else %} false {% endif %},
countdown: true,
startAt: parseInt("{{cron.duracao_cronometro|duration_to_seconds}}") * 1000,
startAt:
{% if cron.status == "R"%}
parseInt("{{cron.duracao_cronometro|duration_to_seconds}}") * 1000
{% elif cron.status == "S"%}
{% if cron.last_stop_duration %}
parseInt("{{cron.last_stop_duration|duration_to_seconds}}") * 1000
{% else %}
parseInt("{{cron.duracao_cronometro|duration_to_seconds}}") * 1000
{% endif %}
{% elif cron.status == "I" %}
parseInt("{{cron.duracao_cronometro|duration_difference:cron.ultima_alteracao_status}}") * 1000
{% endif %},
stopAt: 0,
milliseconds: false,
format: function(value) {
let h = Math.floor((value/1000) / 3600);
h = checkTime(h);
let m = Math.floor((value/1000) % 3600 / 60);
m = checkTime(m);
let s = Math.floor((value/1000) % 3600 % 60);
s = checkTime(s);
return h.toString() + ":" + m.toString() + ":" + s.toString();
}
format: convertValueToDuration
}).on('runnerFinish', function(eventObject, info){
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{cron.id}}", action: 'stop' } );
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{cron.id}}", action: 'stop', last_time: $('#cronometro_' + "{{c.id}}").val() } );
playAudioNumVezes(audioAlertFinish, num_vezes_toca_audio);
$('#cronometro_' + "{{cron.id}}" + '_Reset').show();
$('#cronometro_' + "{{cron.id}}").runner('stop');
@ -180,19 +219,19 @@ $(document).ready(function(){
if ($('#cronometro_' + "{{cron.id}}" + '_Start').text() == 'Iniciar'){
{% for c in cronometros %}
{% if c.tipo == "Cronômetro da Questão de Ordem" %}
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{c.id}}", action: 'start' } );
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{c.id}}", action: 'start', last_time: '0' } );
$('#cronometro_' + "{{c.id}}" + '_Reset').hide();
$('#cronometro_' + "{{c.id}}").runner('start');
$('#cronometro_' + "{{c.id}}" + '_Start').text('Parar');
{% else %}
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{c.id}}", action: 'stop' } );
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{c.id}}", action: 'stop', last_time: $('#cronometro_' + "{{c.id}}").val() } );
$('#cronometro_' + "{{c.id}}" + '_Reset').show();
$('#cronometro_' + "{{c.id}}").runner('stop');
$('#cronometro_' + "{{c.id}}" + '_Start').text('Iniciar');
{% endif %}
{% endfor %}
} else{
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{cron.id}}", action: 'stop' } );
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{cron.id}}", action: 'stop', last_time: $('#cronometro_' + "{{cron.id}}").val() } );
$('#cronometro_' + "{{cron.id}}" + '_Reset').show();
$('#cronometro_' + "{{cron.id}}").runner('stop');
$('#cronometro_' + "{{cron.id}}" + '_Start').text('Iniciar');
@ -201,12 +240,12 @@ $(document).ready(function(){
{% else %}
$('#cronometro_' + "{{cron.id}}" + '_Start').click(function() {
if ($('#cronometro_' + "{{cron.id}}" + '_Start').text() == 'Iniciar'){
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{cron.id}}", action: 'start' } );
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{cron.id}}", action: 'start', last_time: '0' } );
$('#cronometro_' + "{{cron.id}}" + '_Reset').hide();
$('#cronometro_' + "{{cron.id}}").runner('start');
$('#cronometro_' + "{{cron.id}}" + '_Start').text('Parar');
} else{
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{cron.id}}", action: 'stop' } );
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{cron.id}}", action: 'stop', last_time: $('#cronometro_' + "{{cron.id}}").val() } );
$('#cronometro_' + "{{cron.id}}" + '_Reset').show();
$('#cronometro_' + "{{cron.id}}").runner('stop');
$('#cronometro_' + "{{cron.id}}" + '_Start').text('Iniciar');
@ -215,8 +254,8 @@ $(document).ready(function(){
{% endif %}
$('#cronometro_' + "{{cron.id}}" + '_Reset').click(function() {
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{cron.id}}", action: 'reset' } );
$('#cronometro_' + "{{cron.id}}").runner('stop');
$.get('/painel/cronometro', { tipo: 'cronometro_' + "{{cron.id}}", action: 'reset', last_time: '0' } );
//$('#cronometro_' + "{{cron.id}}").runner('stop');
$('#cronometro_' + "{{cron.id}}").runner('reset');
});

Write Preview
Loading…
Cancel
Save