diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..bf8de5b --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,10 @@ +V1.2 + +* Adicionado o encaminhamento para categoria, faz-se necessária a + criação da tabela categoria_encaminhamento. + +* Adicionados os campos timeout_chamando e timeout_concluido no + guiche, onde será possível configurar, para cada guichê, o tempo que + ele irá passar nesses estados antes de automaticamente marcar como + ausente e tornar-se disponível, respectivamente. + diff --git a/Fila-Web/root/header.tt b/Fila-Web/root/header.tt index 3b206c9..5f726bc 100644 --- a/Fila-Web/root/header.tt +++ b/Fila-Web/root/header.tt @@ -23,11 +23,37 @@ @@ -37,4 +63,5 @@ function disconnected_so_move_away() {
+
diff --git a/Fila-Web/root/render/status_atendente.tt b/Fila-Web/root/render/status_atendente.tt index b5338b2..f90accb 100644 --- a/Fila-Web/root/render/status_atendente.tt +++ b/Fila-Web/root/render/status_atendente.tt @@ -38,6 +38,8 @@
+ + [% IF status_guiche.guiche.estado == 'concluido' || status_guiche.guiche.estado == 'disponivel' %] [% IF lista_no_show %]

Atendimentos Atrasados:


@@ -323,3 +325,15 @@ [% END %] $('header2').replace("[% bloco_senha | js %]"); + + [% IF status_guiche.guiche.estado == 'concluido' %] + set_timeout([% status_guiche.guiche.timeout_concluido %],'disponivel',function() { + new Ajax.Request('/cb/atendente/disponivel', { asynchronous: 1 }); + }); + [% ELSIF status_guiche.guiche.estado == 'chamando' %] + set_timeout([% status_guiche.guiche.timeout_chamando %],'chamando',function() { + new Ajax.Request('/cb/atendente/registrar_no_show', { asynchronous: 1 }); + }); + [% ELSE %] + set_timeout(0,'',null); + [% END %] diff --git a/Fila-Web/root/static/css/main.css b/Fila-Web/root/static/css/main.css index bcb8bae..26d5a4e 100644 --- a/Fila-Web/root/static/css/main.css +++ b/Fila-Web/root/static/css/main.css @@ -216,3 +216,14 @@ background: url('../images/bt_enviar_chat.jpg') no-repeat; width: 182px; height: #ConteudoAjuda a { color: blue; text-decoration: underline; font-weight : bold;} #ConteudoAjuda p { text-indent: 30px; margin: 15px 15px 0 15px; text-align: justify;} +.aviso_timeout { + color: red; + position: absolute; + left: 400px; + top: 20px; + font-weight: bold; + background-color: white; + padding: 20px; + border: solid 1px black; + font-size: 20px; +} \ No newline at end of file diff --git a/patches/Net-XMPP2.patch b/patches/Net-XMPP2.patch new file mode 100644 index 0000000..1c71651 --- /dev/null +++ b/patches/Net-XMPP2.patch @@ -0,0 +1,28 @@ +diff -uNard /srv/perl/lib/site_perl/5.10.0/Net/XMPP2/Connection.pm /usr/share/perl5/Net/XMPP2/Connection.pm +--- /srv/perl/lib/site_perl/5.10.0/Net/XMPP2/Connection.pm 2008-08-01 07:11:23.000000000 -0300 ++++ /usr/share/perl5/Net/XMPP2/Connection.pm 2009-06-09 17:01:13.000000000 -0300 +@@ -609,7 +609,6 @@ + return $self->{writer}->send_iq ( + $iqnode->attr ('id'), $type, $create_cb, + (defined $iqnode->attr ('from') ? (to => $iqnode->attr ('from')) : ()), +- (defined $iqnode->attr ('to') ? (from => $iqnode->attr ('to')) : ()), + %attrs + ); + } +diff -uNard /srv/perl/lib/site_perl/5.10.0/Net/XMPP2/Parser.pm /usr/share/perl5/Net/XMPP2/Parser.pm +--- /srv/perl/lib/site_perl/5.10.0/Net/XMPP2/Parser.pm 2008-04-11 11:43:42.000000000 -0300 ++++ /usr/share/perl5/Net/XMPP2/Parser.pm 2009-06-09 17:42:55.000000000 -0300 +@@ -163,8 +163,12 @@ + + sub cb_start_tag { + my ($self, $p, $el, %attrs) = @_; +- my $node = Net::XMPP2::Node->new ($p->namespace ($el), $el, \%attrs, $self); ++ ++ my %prefixes = map { $p->expand_ns_prefix($_) => $_ } $p->new_ns_prefixes; ++ my $node = Net::XMPP2::Node->new ($p->namespace ($el), $el, \%attrs, $self, \%prefixes); ++ + $node->append_raw ($p->recognized_string); ++ + if (not @{$self->{nodestack}}) { + $self->{stream_cb}->($node); + } -- libgit2 0.21.2