From 595501d67ab26eee373d26118983050eb628125f Mon Sep 17 00:00:00 2001 From: Alessandro Costa de Oliveira Date: Wed, 8 Apr 2026 10:25:03 -0300 Subject: [PATCH 1/7] Up uspdev/laravel-usp-theme --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 7b5c40b..f49c421 100644 --- a/composer.lock +++ b/composer.lock @@ -7856,16 +7856,16 @@ }, { "name": "uspdev/laravel-usp-theme", - "version": "2.8.27", + "version": "2.8.28", "source": { "type": "git", "url": "https://github.com/uspdev/laravel-usp-theme.git", - "reference": "75f09e02929d5588bd26f9ccad8f7b5300cb7162" + "reference": "466d42a78b0ce30ccb1aba25f0a1762fc555adf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/uspdev/laravel-usp-theme/zipball/75f09e02929d5588bd26f9ccad8f7b5300cb7162", - "reference": "75f09e02929d5588bd26f9ccad8f7b5300cb7162", + "url": "https://api.github.com/repos/uspdev/laravel-usp-theme/zipball/466d42a78b0ce30ccb1aba25f0a1762fc555adf1", + "reference": "466d42a78b0ce30ccb1aba25f0a1762fc555adf1", "shasum": "" }, "require": { @@ -7903,9 +7903,9 @@ "description": "usp theme for laravel", "support": { "issues": "https://github.com/uspdev/laravel-usp-theme/issues", - "source": "https://github.com/uspdev/laravel-usp-theme/tree/2.8.27" + "source": "https://github.com/uspdev/laravel-usp-theme/tree/2.8.28" }, - "time": "2026-03-27T14:35:42+00:00" + "time": "2026-04-07T18:57:38+00:00" }, { "name": "uspdev/laravel-usp-validators", From f1946dc7a4adec748419481aa46cbb30d3380879 Mon Sep 17 00:00:00 2001 From: Alessandro Costa de Oliveira Date: Wed, 8 Apr 2026 10:28:19 -0300 Subject: [PATCH 2/7] Retirado o timeout da mensagem flash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Agora pode ser controlado pela variável de ambiente CADASTROS_AUXILIARES_MENSAGENS_TIMEOUT --- resources/views/messages/flash.blade.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/resources/views/messages/flash.blade.php b/resources/views/messages/flash.blade.php index 88aa6a3..24ee764 100644 --- a/resources/views/messages/flash.blade.php +++ b/resources/views/messages/flash.blade.php @@ -7,15 +7,3 @@ @endif @endforeach - -@section('javascripts_bottom') -@parent - -@endsection From 80fd77d4919eece85c00b031a39aab9827cbd724 Mon Sep 17 00:00:00 2001 From: Alessandro Costa de Oliveira Date: Wed, 8 Apr 2026 10:39:12 -0300 Subject: [PATCH 3/7] =?UTF-8?q?Se=20for=20usu=C3=A1rio=20local,=20codpes?= =?UTF-8?q?=20=3D=200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/User.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/Models/User.php b/app/Models/User.php index 74dca18..08a568b 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -53,6 +53,15 @@ class User extends Authenticatable 'config' => 'array', ]; + protected static function booted() + { + static::creating(function ($user) { + if ($user->local && is_null($user->codpes)) { + $user->codpes = 0; + } + }); + } + public const rules = [ 'codpes' => 'required', 'name' => 'required', From 57f3f963f1612ec8a1783ceab7a2f2fc589f479e Mon Sep 17 00:00:00 2001 From: Alessandro Costa de Oliveira Date: Wed, 8 Apr 2026 10:44:14 -0300 Subject: [PATCH 4/7] =?UTF-8?q?Permite=20adicionar=20um=20usu=C3=A1rio=20l?= =?UTF-8?q?ocal=20no=20chamado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/ChamadoController.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ChamadoController.php b/app/Http/Controllers/ChamadoController.php index 37dd29d..d0d593e 100644 --- a/app/Http/Controllers/ChamadoController.php +++ b/app/Http/Controllers/ChamadoController.php @@ -484,20 +484,32 @@ public function storePessoa(Request $request, Chamado $chamado) $request->validate( [ - 'codpes' => 'required|integer', + 'codpes' => ['required', 'regex:/^((codpes|id)-)?\d+$/'], 'papel' => 'required|in:' . implode(',', Chamado::pessoaPapeis()), ] ); $papel = $request->papel; - $codpes = $request->codpes; + $codpesField = (string) $request->codpes; # para cadastrar autor e atendente, vamos negar se usuário não for atendente if ('Autor' == $papel || 'Atendente' == $papel) { $this->authorize('atendente'); } - $user = User::obterOuCriarPorCodpes($codpes); + if (is_numeric($codpesField)) { + $user = User::obterOuCriarPorCodpes((int) $codpesField); + } else { + [$searchField, $valueField] = explode('-', $codpesField, 2); + + $user = $searchField === 'codpes' + ? User::obterOuCriarPorCodpes((int) $valueField) + : User::find((int) $valueField); + } + + if (empty($user)) { + return back()->withErrors(['codpes' => 'Usuário não encontrado.'])->withInput(); + } # O usuário já existe nesse papel? if ($chamado->users()->where('users.id', $user->id)->wherePivot('papel', $papel)->first()) { From 196b35bf130635e6bb825a8d3b0de8cbb29dc2f1 Mon Sep 17 00:00:00 2001 From: Alessandro Costa de Oliveira Date: Thu, 9 Apr 2026 11:14:56 -0300 Subject: [PATCH 5/7] Revert "Retirado o timeout da mensagem flash" This reverts commit f1946dc7a4adec748419481aa46cbb30d3380879. --- resources/views/messages/flash.blade.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/views/messages/flash.blade.php b/resources/views/messages/flash.blade.php index 24ee764..88aa6a3 100644 --- a/resources/views/messages/flash.blade.php +++ b/resources/views/messages/flash.blade.php @@ -7,3 +7,15 @@ @endif @endforeach + +@section('javascripts_bottom') +@parent + +@endsection From d87a79de4436abe8d588422ae2bfd3e041a183a0 Mon Sep 17 00:00:00 2001 From: Alessandro Costa de Oliveira Date: Thu, 9 Apr 2026 11:16:12 -0300 Subject: [PATCH 6/7] =?UTF-8?q?Revert=20"Se=20for=20usu=C3=A1rio=20local,?= =?UTF-8?q?=20codpes=20=3D=200"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 80fd77d4919eece85c00b031a39aab9827cbd724. --- app/Models/User.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index 08a568b..74dca18 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -53,15 +53,6 @@ class User extends Authenticatable 'config' => 'array', ]; - protected static function booted() - { - static::creating(function ($user) { - if ($user->local && is_null($user->codpes)) { - $user->codpes = 0; - } - }); - } - public const rules = [ 'codpes' => 'required', 'name' => 'required', From 091ca533edf74c8fc156bcf85594c37e2347e419 Mon Sep 17 00:00:00 2001 From: Alessandro Costa de Oliveira Date: Thu, 9 Apr 2026 11:39:58 -0300 Subject: [PATCH 7/7] =?UTF-8?q?Comportamento=20das=20mensagens=20mantido?= =?UTF-8?q?=20na=20aplica=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/chamados/show/user-detail.blade.php | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/resources/views/chamados/show/user-detail.blade.php b/resources/views/chamados/show/user-detail.blade.php index 2358006..a4177d4 100644 --- a/resources/views/chamados/show/user-detail.blade.php +++ b/resources/views/chamados/show/user-detail.blade.php @@ -5,20 +5,23 @@ $setor_vinculo = $user->setores()->wherePivot('funcao', '!=', 'Gerente')->first(); $setor_sigla = $setor_vinculo->sigla ?? 'sem setor'; $setor_funcao = $setor_vinculo->pivot->funcao ?? ''; +$codpes = is_numeric($user->codpes) ? (int) $user->codpes : null; -$vinculos = array_values(array_filter( - \Uspdev\Replicado\Pessoa::vinculos($user->codpes), - function ($vinculo) { - return trim(explode('-', $vinculo)[0]) !== 'Servidor Designado'; # Exclui o vinculo com o tipo 'Servidor Designado' - } -)); +$vinculos = $codpes + ? array_values(array_filter( + \Uspdev\Replicado\Pessoa::vinculos($codpes), + function ($vinculo) { + return trim(explode('-', $vinculo)[0]) !== 'Servidor Designado'; # Exclui o vinculo com o tipo 'Servidor Designado' + } + )) + : []; $ultimo_vinculo = !empty($vinculos) ? end($vinculos) : null; # Nos testes, trazer o último vínculo funcionou bem $tipvinext = $ultimo_vinculo ? trim(explode('-', $ultimo_vinculo)[0]) : $setor_funcao; # Se não houver vínculo, usa a funcao do setor -if ($usar_foto) { - $foto_base64 = \Uspdev\Wsfoto::obter((int) $user->codpes); +if ($usar_foto && $codpes) { + $foto_base64 = \Uspdev\Wsfoto::obter($codpes); $foto_src = 'data:image/png;base64,' . $foto_base64; } ?> @@ -31,7 +34,7 @@ function ($vinculo) {
- @if ($usar_foto) + @if ($usar_foto && $codpes)
Foto de {{ $user->name }}
@@ -48,7 +51,7 @@ function ($vinculo) {
{{ $user->telefone ?? 'não disponível' }}
- @if (config('chamados.sistemaPessoas')) + @if (config('chamados.sistemaPessoas') && $codpes)