Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: correções iniciais para tramite no sei 5.0.0 #767

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Parâmetros de execução do comando MAKE
# Opções possíveis para spe (sistema de proc eletronico): sei3, sei4, sei41, super
sistema=super
sistema=sei41
base=mysql
teste=

Expand Down Expand Up @@ -159,7 +159,6 @@ install: check-isalive
$(CMD_COMPOSE_FUNC) exec -w /opt/sip/scripts/$(MODULO_PASTAS_CONFIG) org2-http bash -c "$(CMD_INSTALACAO_SIP_MODULO)"

wget -nc -i $(PEN_TEST_FUNC)/assets/arquivos/test_files_index.txt -P $(PEN_TEST_FUNC)/.tmp
cp $(PEN_TEST_FUNC)/.tmp/* /tmp


.env:
Expand Down
4 changes: 2 additions & 2 deletions src/rn/ReceberProcedimentoRN.php
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ private function atualizarProcedimento($parDblIdProcedimento, $objMetadadosProce
$this->registrarAndamentoRecebimentoProcesso($objProcedimentoDTO, $objMetadadosProcedimento);

//Cadastro das atividades para quando o destinatário é desviado pelo receptor (!3!)
if ($this->destinatarioReal->numeroDeIdentificacaoDaEstrutura) {
if (isset($this->destinatarioReal->numeroDeIdentificacaoDaEstrutura) && !empty($this->destinatarioReal->numeroDeIdentificacaoDaEstrutura)) {
$this->gerarAndamentoUnidadeReceptora($parDblIdProcedimento);
}

Expand Down Expand Up @@ -2844,7 +2844,7 @@ private function criarDiretorioAnexo($parObjAnexoDTO)
private function adicionarObservacoesSobreNumeroDocumento($parObjDocumento)
{
$arrObjObservacoes = array();
$strNumeroDocumentoOrigem = isset($parObjDocumento->protocolo) ? $parObjDocumento->protocolo : $parObjDocumento->produtor->numeroDeIdentificacao;
$strNumeroDocumentoOrigem = isset($parObjDocumento->protocolo) ? $parObjDocumento->protocolo : $parObjDocumento->produtor['numeroDeIdentificacao'];
if(!empty($strNumeroDocumentoOrigem)){
$objObservacaoDTO = new ObservacaoDTO();
$objObservacaoDTO->setStrDescricao("Número do Documento na Origem: " . $strNumeroDocumentoOrigem);
Expand Down
4 changes: 2 additions & 2 deletions tests_sei41/funcional/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ services:
### CONTAINERS DO AMBIENTE DO ÓRGÃO 1 ###

org1-database:
image: ${ORG1_DATABASE_IMAGE}:${ENVIRONMENT_VERSION}
image: ${ORG1_DATABASE_IMAGE}
restart: always
environment:
MYSQL_ROOT_PASSWORD: P@ssword
Expand Down Expand Up @@ -184,7 +184,7 @@ services:
### CONTAINERS DO AMBIENTE DO ÓRGÃO 2 ###

org2-database:
image: ${ORG2_DATABASE_IMAGE}:${ENVIRONMENT_VERSION}
image: ${ORG2_DATABASE_IMAGE}
restart: always
environment:
MYSQL_ROOT_PASSWORD: P@ssword
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function existeTabela()
{
try {
$trTh = $this->test->byXPath('//*[@id="divInfraAreaTabela"]/table/tbody/tr[1]/th[2]')->text();
return !empty($trTh) && !is_null($trTh) && count($trTh) >= 1;
return !empty($trTh) && !is_null($trTh);
} catch (Exception $ex) {
return false;
}
Expand Down
Loading