Skip to content

Commit 7272ff1

Browse files
authored
Foto e vínculo por extenso
Adicionando a foto e mostrando o vínculo por extenso
2 parents 0966b83 + 0e755f7 commit 7272ff1

6 files changed

Lines changed: 196 additions & 21 deletions

File tree

.env.example

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,3 +201,22 @@ PUSHER_APP_CLUSTER=mt1
201201

202202
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
203203
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
204+
205+
# WSFOTO
206+
# true or false (default)
207+
USAR_FOTO=false
208+
209+
# https://github.com/uspdev/wsfoto
210+
WSFOTO_USER=
211+
WSFOTO_PASS=
212+
213+
# Se necessário desative a funcionalidade do wsfoto (foto fake apenas).
214+
#WSFOTO_DISABLE=0
215+
216+
# Caso a biblioteca retorne sempre a foto fake, pode estar tendo
217+
# algum problema na biblioteca. Ative o debug para ver os erros.
218+
#WSFOTO_DEBUG=0
219+
220+
# Caminho para o arquivo de imagem desejada para ser utilizada
221+
# como a foto fake
222+
WS_FOTO_FAKE_PATH=

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ php.ini
2727

2828
# DDEV
2929
.ddev
30+
31+
.codex

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
"laravel/framework": "^12.0",
1616
"laravel/tinker": "^2.0",
1717
"laravel/ui": "^4.0",
18-
"spatie/laravel-html": "^3.12",
1918
"masakik/supervisor": "dev-master",
19+
"spatie/laravel-html": "^3.12",
2020
"spatie/simple-excel": "^3.8",
2121
"uspdev/laravel-replicado": "^1.0",
2222
"uspdev/laravel-tools": "^1.3",
2323
"uspdev/laravel-usp-theme": "^2.8",
2424
"uspdev/laravel-usp-validators": "^1.0",
25-
"uspdev/senhaunica-socialite": "^4.3"
25+
"uspdev/senhaunica-socialite": "^4.3",
26+
"uspdev/wsfoto": "^2.0"
2627
},
2728
"require-dev": {
2829
"spatie/laravel-ignition": "^2.0",

composer.lock

Lines changed: 145 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/chamados.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
'admins' => env('ADMINS'),
66

77
'usar_replicado' => env('USAR_REPLICADO', true),
8+
'usar_foto' => env('USAR_FOTO', false),
89
'upload_max_filesize' => (int) env('UPLOAD_MAX_FILESIZE', '16') * 1024,
910

1011
// deprecado em 2/23. Remover no próximo release

resources/views/chamados/show/user-detail.blade.php

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
{{-- Mostra o icone do usuário e o respectivo card ao clicar --}}
22
<?php
33
$user_detail_id = 'user-detail-' . Str::random(5);
4+
$usar_foto = config('chamados.usar_foto');
5+
$setor_vinculo = $user->setores()->wherePivot('funcao', '!=', 'Gerente')->first();
6+
$setor_sigla = $setor_vinculo->sigla ?? 'sem setor';
7+
$setor_funcao = $setor_vinculo->pivot->funcao ?? '';
8+
9+
$vinculos = array_values(array_filter(
10+
\Uspdev\Replicado\Pessoa::vinculos($user->codpes),
11+
function ($vinculo) {
12+
return trim(explode('-', $vinculo)[0]) !== 'Servidor Designado'; # Exclui o vinculo com o tipo 'Servidor Designado'
13+
}
14+
));
15+
$ultimo_vinculo = !empty($vinculos) ? end($vinculos) : null; # Nos testes, trazer o último vínculo funcionou bem
16+
$tipvinext = $ultimo_vinculo
17+
? trim(explode('-', $ultimo_vinculo)[0])
18+
: $setor_funcao; # Se não houver vínculo, usa a funcao do setor
19+
20+
if ($usar_foto) {
21+
$foto_base64 = \Uspdev\Wsfoto::obter((int) $user->codpes);
22+
$foto_src = 'data:image/png;base64,' . $foto_base64;
23+
}
424
?>
525

626
<a class="btn btn-sm btn-light text-primary py-0" data-toggle="collapse" href="#{{ $user_detail_id }}" role="button"
@@ -11,12 +31,16 @@
1131
<div class="collapse" id="{{ $user_detail_id }}">
1232
<div class="card card-body">
1333
<span class="text-dark">
34+
@if ($usar_foto)
35+
<div class="mb-2">
36+
<img src="{{ $foto_src }}" alt="Foto de {{ $user->name }}" class="img-thumbnail" style="max-width: 120px;">
37+
</div>
38+
@endif
1439
<div>
1540
{{ $user->codpes }} - {{ $user->name }}
1641
</div>
1742
<div>
18-
Setor: {{ $user->setores()->wherePivot('funcao', '!=', 'Gerente')->first()->sigla ?? 'sem setor' }} -
19-
{{ $user->setores()->wherePivot('funcao', '!=', 'Gerente')->first()->pivot->funcao ?? '' }}
43+
Setor: {{ $setor_sigla }} - {{ $tipvinext }}
2044
</div>
2145
<div>
2246
<i class="fas fa-envelope-square mr-2"></i> <a href="mailto:{{ $user->email }}">{{ $user->email }}</a>

0 commit comments

Comments
 (0)