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.

Sign up for GitHub

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

Versão intermediária 2.2.1 #14

Merged
merged 1 commit into from
Nov 6, 2024
Merged

Versão intermediária 2.2.1 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 1 addition & 10 deletions sei/scripts/sei_atualizar_versao_modulo_utilidades.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,6 @@ protected function finalizar($strMsg = null, $bolErro = false)
die;
}

protected function normalizaVersao($versao)
{
$ultimoPonto = strrpos($versao, '.');
if ($ultimoPonto !== false) {
$versao = substr($versao, 0, $ultimoPonto) . substr($versao, $ultimoPonto + 1);
}
return $versao;
}

protected function atualizarVersaoConectado()
{

Expand All @@ -95,7 +86,7 @@ protected function atualizarVersaoConectado()

//testando versao do framework
$numVersaoInfraRequerida = '2.0.18';
if ($this->normalizaVersao(VERSAO_INFRA) < $this->normalizaVersao($numVersaoInfraRequerida)) {
if (version_compare(VERSAO_INFRA, $numVersaoInfraRequerida) < 0) {
$this->finalizar('VERS�O DO FRAMEWORK PHP INCOMPAT�VEL (VERS�O ATUAL ' . VERSAO_INFRA . ', SENDO REQUERIDA VERS�O IGUAL OU SUPERIOR A ' . $numVersaoInfraRequerida . ')', true);
}

Expand Down
2 changes: 1 addition & 1 deletion sei/web/modulos/utilidades/UtilidadesIntegracao.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function getNome()
public function getVersao()
{

return '2.2.0';
return '2.2.1';
}

public function getInstituicao()
Expand Down
2 changes: 1 addition & 1 deletion sei/web/modulos/utilidades/int/MdUtlControleDsmpINT.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ public static function montarSelectPeriodoAnalise($idTipoControleDesempenho, $id
}
$select = '<option value=""></option>';
$vlSelecionado = $periodoInicialSelecionado."|".$periodoFinalSelecionado;
$numLimitador = 15;
$numLimitador = 180;
$arrPeriodosSelecionado = [];
foreach ($periodo as $key => $parametros) {
$periodoExplodido = explode("(", $parametros);
Expand Down
13 changes: 2 additions & 11 deletions sip/scripts/sip_atualizar_versao_modulo_utilidades.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,6 @@ protected function finalizar($strMsg = null, $bolErro = false)
die;
}

protected function normalizaVersao($versao)
{
$ultimoPonto = strrpos($versao, '.');
if ($ultimoPonto !== false) {
$versao = substr($versao, 0, $ultimoPonto) . substr($versao, $ultimoPonto + 1);
}
return $versao;
}

protected function atualizarVersaoConectado()
{

Expand All @@ -102,8 +93,8 @@ protected function atualizarVersaoConectado()

//testando versao do framework
$numVersaoInfraRequerida = '2.0.18';
if ($this->normalizaVersao(VERSAO_INFRA) < $this->normalizaVersao($numVersaoInfraRequerida)) {
$this->finalizar('VERS�O DO FRAMEWORK PHP INCOMPAT�VEL (VERS�O ATUAL ' . VERSAO_INFRA . ', SENDO REQUERIDA VERS�O IGUAL OU SUPERIOR A ' . $numVersaoInfraRequerida . ')', true);
if (version_compare(VERSAO_INFRA, $numVersaoInfraRequerida) < 0) {
$this->finalizar('VERS�O DO FRAMEWORK PHP INCOMPAT�VEL (VERS�O ATUAL ' . VERSAO_INFRA . ', SENDO REQUERIDA VERS�O IGUAL OU SUPERIOR A ' . $numVersaoInfraRequerida . ')', true);
}

//checando permissoes na base de dados
Expand Down