Download as
Browse Code »

Commit 6ff3cbfc868d40bad6981aed43ad05c45a77b9a7

Authored by daniel@ruoso.com
1 parent 5a53e8b3
Exists in master

Corrigindo pequenos bugs 

git-svn-id: http://svn.softwarepublico.gov.br/svn/sistemadeatendimento/sistema/trunk@33 63db2ce5-8a6c-0410-abb9-a418dd412890
Showing 5 changed files with 24 additions and 10 deletions   Show diff stats
Fila-Servico/lib/Fila/Servico/Controller/WS/Gestao/Atendente.pm
  Diff comments   View file @6ff3cbf
@@ -625,7 +625,7 @@ sub concluir_atendimento :WSDLPort('GestaoAtendente') :DBICTransaction('DB') :MI @@ -625,7 +625,7 @@ sub concluir_atendimento :WSDLPort('GestaoAtendente') :DBICTransaction('DB') :MI
625 detail => 'Ocorreu um erro de configuracao no sistema.' }); 625 detail => 'Ocorreu um erro de configuracao no sistema.' });
626 } 626 }
627 627
628 - my $atendimento = $c->stash->{guiche}->atendimento_atual->find; 628 + my $atendimento = $c->stash->{guiche}->atendimento_atual->find({ });
629 629
630 unless ($atendimento) { 630 unless ($atendimento) {
631 die $c->stash->{soap}->fault 631 die $c->stash->{soap}->fault
@@ -645,7 +645,7 @@ sub concluir_atendimento :WSDLPort('GestaoAtendente') :DBICTransaction('DB') :MI @@ -645,7 +645,7 @@ sub concluir_atendimento :WSDLPort('GestaoAtendente') :DBICTransaction('DB') :MI
645 } 645 }
646 646
647 #checa se existem servicos abertos. 647 #checa se existem servicos abertos.
648 - my $servico_atual = $atendimento->atendimento->servico_atual->find; 648 + my $servico_atual = $atendimento->atendimento->servico_atual->find({ });
649 649
650 if ($servico_atual) { 650 if ($servico_atual) {
651 die $c->stash->{soap}->fault 651 die $c->stash->{soap}->fault
Fila-Servico/lib/Fila/Servico/Controller/WS/Gestao/Local.pm
  Diff comments   View file @6ff3cbf
@@ -131,8 +131,7 @@ sub dados_local :WSDLPort('GestaoLocal') :DBICTransaction('DB') :MI { @@ -131,8 +131,7 @@ sub dados_local :WSDLPort('GestaoLocal') :DBICTransaction('DB') :MI {
131 my $status = $c->stash->{local}->estados->search 131 my $status = $c->stash->{local}->estados->search
132 ({ 'me.vt_ini' => { '<=', $now }, 132 ({ 'me.vt_ini' => { '<=', $now },
133 'me.vt_fim' => { '>', $now }}, 133 'me.vt_fim' => { '>', $now }},
134 - {  
135 - prefetch => 'estado' })->first; 134 + { prefetch => 'estado' })->first;
136 135
137 $c->stash->{soap}->compile_return 136 $c->stash->{soap}->compile_return
138 ({ local => 137 ({ local =>
@@ -187,7 +186,7 @@ sub abrir_local :WSDLPort(&#39;GestaoLocal&#39;) :DBICTransaction(&#39;DB&#39;) :MI { @@ -187,7 +186,7 @@ sub abrir_local :WSDLPort(&#39;GestaoLocal&#39;) :DBICTransaction(&#39;DB&#39;) :MI {
187 186
188 $c->model('SOAP')->transport->connection($c->engine->connection($c)); 187 $c->model('SOAP')->transport->connection($c->engine->connection($c));
189 $c->model('SOAP')->transport->addrs([$c->stash->{local}->jid_senhas.'/callback']); 188 $c->model('SOAP')->transport->addrs([$c->stash->{local}->jid_senhas.'/callback']);
190 - $c->model('SOAP::Senha')->local_aberto({ refresh_request => '' }); 189 + $c->model('SOAP::Senha')->local_aberto({ refresh_request => 'non-empty' });
191 190
192 $c->stash->{refresh_gerente} = 1; 191 $c->stash->{refresh_gerente} = 1;
193 } 192 }
@@ -228,7 +227,7 @@ sub encerrar_senhas :WSDLPort(&#39;GestaoLocal&#39;) :DBICTransaction(&#39;DB&#39;) :MI { @@ -228,7 +227,7 @@ sub encerrar_senhas :WSDLPort(&#39;GestaoLocal&#39;) :DBICTransaction(&#39;DB&#39;) :MI {
228 227
229 $c->model('SOAP')->transport->connection($c->engine->connection($c)); 228 $c->model('SOAP')->transport->connection($c->engine->connection($c));
230 $c->model('SOAP')->transport->addrs([$c->stash->{local}->jid_senhas.'/callback']); 229 $c->model('SOAP')->transport->addrs([$c->stash->{local}->jid_senhas.'/callback']);
231 - $c->model('SOAP::Senha')->senhas_encerradas({ refresh_request => '' }); 230 + $c->model('SOAP::Senha')->senhas_encerradas({ refresh_request => 'non-empty' });
232 231
233 $c->stash->{refresh_gerente} = 1; 232 $c->stash->{refresh_gerente} = 1;
234 } 233 }
@@ -989,7 +988,7 @@ sub encerrar_atendimento :WSDLPort(&#39;GestaoLocal&#39;) :DBICTransaction(&#39;DB&#39;) :MI { @@ -989,7 +988,7 @@ sub encerrar_atendimento :WSDLPort(&#39;GestaoLocal&#39;) :DBICTransaction(&#39;DB&#39;) :MI {
989 988
990 $c->model('SOAP')->transport->addrs([$guiche->jid_opiniometro . '/callback/']); 989 $c->model('SOAP')->transport->addrs([$guiche->jid_opiniometro . '/callback/']);
991 $c->model('SOAP::Opiniometro') 990 $c->model('SOAP::Opiniometro')
992 - ->encerrar_opiniometro({ refresh_request => '' }); 991 + ->encerrar_opiniometro({ refresh_request => 'non-empty' });
993 992
994 $c->stash->{refresh_gerente} = 1; 993 $c->stash->{refresh_gerente} = 1;
995 $c->stash->{refresh_guiche} ||= []; 994 $c->stash->{refresh_guiche} ||= [];
Fila-Servico/lib/Fila/Servico/Controller/WS/Gestao/Opiniometro.pm
  Diff comments   View file @6ff3cbf
@@ -164,7 +164,8 @@ sub registrar_avaliacao_praca :WSDLPort(&#39;GestaoOpiniometro&#39;) :DBICTransaction(&#39;D @@ -164,7 +164,8 @@ sub registrar_avaliacao_praca :WSDLPort(&#39;GestaoOpiniometro&#39;) :DBICTransaction(&#39;D
164 ); 164 );
165 } 165 }
166 166
167 - my %perguntas = map { $_ => $ordem_perguntas->get_column("pergunta$_") } 1..5; 167 + my %perguntas = map { $_ => $ordem_perguntas->get_column("pergunta$_") } 1..5;
  168 + warn "Pergunta $_ eh $perguntas{$_}" for keys %perguntas;
168 169
169 foreach my $resposta (@{$query->{avaliacao_atendimento}{resposta}}) { 170 foreach my $resposta (@{$query->{avaliacao_atendimento}{resposta}}) {
170 $c->stash->{local}->respostas_avaliacao->create 171 $c->stash->{local}->respostas_avaliacao->create
Fila-Servico/schemas/FilaOpiniometro.wsdl
  Diff comments   View file @6ff3cbf
@@ -28,8 +28,15 @@ @@ -28,8 +28,15 @@
28 xmlns:filasv="urn:oktiva:fila:web:servico" 28 xmlns:filasv="urn:oktiva:fila:web:servico"
29 targetNamespace="urn:oktiva:fila:web:servico"> 29 targetNamespace="urn:oktiva:fila:web:servico">
30 30
  31 + <wsdl:types>
  32 + <xsd:schema targetNamespace="urn:oktiva:fila:web:tipos"
  33 + elementFormDefault="qualified">
  34 + <xsd:element name="refresh_request" type="xsd:string" />
  35 + </xsd:schema>
  36 + </wsdl:types>
  37 +
31 <wsdl:message name="refresh_request"> 38 <wsdl:message name="refresh_request">
32 - <wsdl:part name="refresh_request" element="xsd:string" /> 39 + <wsdl:part name="refresh_request" element="filatp:refresh_request" />
33 </wsdl:message> 40 </wsdl:message>
34 41
35 <wsdl:portType name="FilaOpiniometroCallback"> 42 <wsdl:portType name="FilaOpiniometroCallback">
Fila-Servico/schemas/FilaSenha.wsdl
  Diff comments   View file @6ff3cbf
@@ -28,8 +28,15 @@ @@ -28,8 +28,15 @@
28 xmlns:filasv="urn:oktiva:fila:web:servico" 28 xmlns:filasv="urn:oktiva:fila:web:servico"
29 targetNamespace="urn:oktiva:fila:web:servico"> 29 targetNamespace="urn:oktiva:fila:web:servico">
30 30
  31 + <wsdl:types>
  32 + <xsd:schema targetNamespace="urn:oktiva:fila:web:tipos"
  33 + elementFormDefault="qualified">
  34 + <xsd:element name="refresh_request" type="xsd:string" />
  35 + </xsd:schema>
  36 + </wsdl:types>
  37 +
31 <wsdl:message name="refresh_request"> 38 <wsdl:message name="refresh_request">
32 - <wsdl:part name="refresh_request" element="xsd:string" /> 39 + <wsdl:part name="refresh_request" element="filatp:refresh_request" />
33 </wsdl:message> 40 </wsdl:message>
34 41
35 <wsdl:portType name="FilaSenhaCallback"> 42 <wsdl:portType name="FilaSenhaCallback">